Commits

Anonymous committed cdcb4ac

vcl117: more HelpID cleanup

Comments (0)

Files changed (6)

sc/source/ui/unoobj/docuno.cxx

     String aAppGroupname( aStrings.GetString( 9 ) );
     aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ),
                                     aOpt.GetModuleName( SvtModuleOptions::E_SCALC ) ); 
-    m_aUIProperties[0].Value = getGroupControlOpt( aAppGroupname, rtl::OUString() );
+    m_aUIProperties[0].Value = getGroupControlOpt( aAppGroupname, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:TabPage:AppPage" ) ) );
 
     // create subgroup for pages
     m_aUIProperties[1].Value = getSubgroupControlOpt( rtl::OUString( aStrings.GetString( 0 ) ), rtl::OUString() );

sd/source/ui/view/DocumentRenderer.cxx

                                            aOpt.GetModuleName( mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) ); 
             AddDialogControl( vcl::PrinterOptionsHelper::getGroupControlOpt(
                                 aAppGroupname,
-                                rtl::OUString()
+                                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:TabPage:AppPage" ) )
                                 ) );
 
             uno::Sequence< rtl::OUString > aHelpIds;

starmath/source/unomodel.cxx

     String aAppGroupname( aLocalizedStrings.GetString( 0 ) );
     aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ),
                                     aOpt.GetModuleName( SvtModuleOptions::E_SMATH ) ); 
-    m_aUIProperties[0].Value = getGroupControlOpt( aAppGroupname, rtl::OUString() );
+    m_aUIProperties[0].Value = getGroupControlOpt( aAppGroupname, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:TabPage:AppPage" ) ) );
 
     // create subgroup for print options
     m_aUIProperties[1].Value = getSubgroupControlOpt( aLocalizedStrings.GetString( 1 ), rtl::OUString() );

sw/source/core/view/printdata.cxx

     String aAppGroupname( aLocalizedStrings.GetString( 0 ) );
     aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ),
                                     aModOpt.GetModuleName( SvtModuleOptions::E_SWRITER ) ); 
-    m_aUIProperties[ nIdx++ ].Value = getGroupControlOpt( aAppGroupname, rtl::OUString() );
+    m_aUIProperties[ nIdx++ ].Value = getGroupControlOpt( aAppGroupname, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:TabPage:AppPage" ) ) );
 
     // create sub section for Contents 
     m_aUIProperties[ nIdx++ ].Value = getSubgroupControlOpt( aLocalizedStrings.GetString( 1 ), rtl::OUString() );

testautomation/global/win/edia_p_s.win

    
 PrintingTabControl .HelpID:vcl:PrintDialog:TabPages
 TabPrintGeneral .HelpID:vcl:PrintDialog:JobPage
-TabApplication .HelpID:vcl:PrintDialog:TabPage:10
+TabApplication .HelpID:vcl:PrintDialog:TabPage:AppPage
 TabLayout .HelpID:vcl:PrintDialog:NUpPage
 TabOptions .HelpID:vcl:PrintDialog:OptPage
 

vcl/source/src/print.src

 
     TabPage SV_PRINT_TAB_NUP
     {
-        HelpID = ".HelpID:vcl:PrintDialog:TabNUp";
+        HelpID = ".HelpID:vcl:PrintDialog:NUpPage";
         Text [en-US] = "Page Layout";
         Hide = TRUE;
         
     
     TabPage SV_PRINT_TAB_JOB
     {
-        HelpID = ".HelpID:vcl:PrintDialog:TabJob";
+        HelpID = ".HelpID:vcl:PrintDialog:JobPage";
         Text [en-US] = "General";
         Hide = TRUE;
         
     {
         Text [en-US] = "Options";
         Hide = TRUE;
-        HelpID = ".HelpID:vcl:PrintDialog:TabOpt";
+        HelpID = ".HelpID:vcl:PrintDialog:OptPage";
 
         FixedLine SV_PRINT_OPT_PRINT_FL
         {