diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-07-10 18:21:24 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-07-10 18:21:24 +0200 |
commit | c61aa274cb5631305cfbaea6f1894db756e911c8 (patch) | |
tree | 7ba0d80cc7314143cf37d016e0e15c558781cec5 /cui | |
parent | aa7147590570dcb0813b6fcebb6496179b9df5cb (diff) |
CWS changehid: #i111874#: change code to support HelpIds as byte strings
Diffstat (limited to 'cui')
45 files changed, 583 insertions, 690 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 154e79811186..b21671b344e5 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -112,7 +112,6 @@ #define ENTRY_HEIGHT 16 static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; -static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL"; static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer"; static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; @@ -518,7 +517,6 @@ bool GetMenuItemData( const uno::Reference< container::XIndexAccess >& rItemContainer, sal_Int32 nIndex, OUString& rCommandURL, - OUString& rHelpURL, OUString& rLabel, sal_uInt16& rType, uno::Reference< container::XIndexAccess >& rSubMenu ) @@ -534,10 +532,6 @@ bool GetMenuItemData( { aProp[i].Value >>= rCommandURL; } - else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL )) - { - aProp[i].Value >>= rHelpURL; - } else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER )) { aProp[i].Value >>= rSubMenu; @@ -566,7 +560,6 @@ bool GetToolbarItemData( const uno::Reference< container::XIndexAccess >& rItemContainer, sal_Int32 nIndex, OUString& rCommandURL, - OUString& rHelpURL, OUString& rLabel, sal_uInt16& rType, sal_Bool& rIsVisible, @@ -588,10 +581,6 @@ bool GetToolbarItemData( { aProp[i].Value >>= rStyle; } - else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL )) - { - aProp[i].Value >>= rHelpURL; - } else if (aProp[i].Name.equalsAscii(ITEM_DESCRIPTOR_CONTAINER)) { aProp[i].Value >>= rSubMenu; @@ -634,13 +623,10 @@ ConvertSvxConfigEntry( static const OUString aDescriptorLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) ); - static const OUString aDescriptorHelpURL( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) ); - static const OUString aDescriptorContainer( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) ); - uno::Sequence< beans::PropertyValue > aPropSeq( 4 ); + uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); aPropSeq[0].Name = aDescriptorCommandURL; aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() ); @@ -698,9 +684,6 @@ ConvertSvxConfigEntry( aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); } - aPropSeq[3].Name = aDescriptorHelpURL; - aPropSeq[3].Value <<= rtl::OUString( pEntry->GetHelpURL() ); - return aPropSeq; } @@ -718,16 +701,13 @@ ConvertToolbarEntry( static const OUString aDescriptorLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) ); - static const OUString aDescriptorHelpURL( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) ); - static const OUString aDescriptorContainer( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) ); static const OUString aIsVisible( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_ISVISIBLE ) ); - uno::Sequence< beans::PropertyValue > aPropSeq( 5 ); + uno::Sequence< beans::PropertyValue > aPropSeq( 4 ); aPropSeq[0].Name = aDescriptorCommandURL; aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() ); @@ -785,11 +765,8 @@ ConvertToolbarEntry( aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); } - aPropSeq[3].Name = aDescriptorHelpURL; - aPropSeq[3].Value <<= rtl::OUString( pEntry->GetHelpURL() ); - - aPropSeq[4].Name = aIsVisible; - aPropSeq[4].Value <<= pEntry->IsVisible(); + aPropSeq[3].Name = aIsVisible; + aPropSeq[3].Value <<= pEntry->IsVisible(); return aPropSeq; } @@ -1183,14 +1160,13 @@ bool MenuSaveInData::LoadSubMenus( { uno::Reference< container::XIndexAccess > xSubMenu; OUString aCommandURL; - OUString aHelpURL; OUString aLabel; bool bIsUserDefined = TRUE; sal_uInt16 nType( css::ui::ItemType::DEFAULT ); bool bItem = GetMenuItemData( xMenuSettings, nIndex, - aCommandURL, aHelpURL, aLabel, nType, xSubMenu ); + aCommandURL, aLabel, nType, xSubMenu ); if ( bItem ) { @@ -1232,7 +1208,6 @@ bool MenuSaveInData::LoadSubMenus( aLabel, aCommandURL, TRUE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntries->push_back( pEntry ); @@ -1257,7 +1232,6 @@ bool MenuSaveInData::LoadSubMenus( SvxConfigEntry* pEntry = new SvxConfigEntry( aLabel, aCommandURL, FALSE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntries->push_back( pEntry ); } } @@ -2154,7 +2128,6 @@ SvLBoxEntry* SvxConfigPage::AddFunction( SvxConfigEntry* pNewEntryData = new SvxConfigEntry( aDisplayName, aURL, FALSE ); pNewEntryData->SetUserDefined( TRUE ); - pNewEntryData->SetHelpURL( aURL ); // check that this function is not already in the menu SvxConfigEntry* pParent = GetTopLevelSelection(); @@ -2629,8 +2602,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_MENU*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) ); bool ret = pNameDialog->Execute(); @@ -2688,8 +2660,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_SUBMENU_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_NAME_SUBMENU*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_ADD_SUBMENU ) ); bool ret = pNameDialog->Execute(); @@ -2735,8 +2706,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_MENU_ITEM*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) ); bool ret = pNameDialog->Execute(); @@ -3073,7 +3043,6 @@ SvxConfigEntry::SvxConfigEntry( pEntries( 0 ) { sal_uInt16 nType( css::ui::ItemType::DEFAULT ); - OUString aHelpURL_; for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ ) { @@ -3081,10 +3050,6 @@ SvxConfigEntry::SvxConfigEntry( { rProperties[i].Value >>= aCommand; } - else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL )) - { - rProperties[i].Value >>= aHelpURL_; - } else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL )) { rProperties[i].Value >>= aLabel; @@ -3132,26 +3097,9 @@ SvxConfigEntry::GetHelpText() { if ( aHelpText.getLength() == 0 ) { - #if 0 - OUString helpid = OUString::createFromAscii( "helpid:" ); - if ( aHelpURL.indexOf( helpid ) != -1 ) - { - aHelpURL = aHelpURL.copy( helpid.getLength() ); - } - #endif - - Help* pHelp = Application::GetHelp(); - #if 0 - if ( aHelpURL.toInt32() != 0 ) - #endif - { - // FIXME: HELPID - aHelpText = pHelp->GetHelpText( aHelpURL/*.toInt32()*/, NULL ); - } - - if ( aHelpText.getLength() == 0 && aCommand.getLength() != 0 ) + if ( aCommand.getLength() ) { - aHelpText = pHelp->GetHelpText( aCommand, NULL ); + aHelpText = Application::GetHelp()->GetHelpText( aCommand, NULL ); } } @@ -3182,10 +3130,7 @@ SvxConfigEntry::GetProperties( static const OUString aDescriptorLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) ); - static const OUString aDescriptorHelpURL( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) ); - - uno::Sequence< beans::PropertyValue > aPropSeq( 4 ); + uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); aPropSeq[0].Name = aDescriptorCommandURL; aPropSeq[0].Value <<= rtl::OUString( GetCommand() ); @@ -3243,9 +3188,6 @@ SvxConfigEntry::GetProperties( aPropSeq[2].Value <<= rtl::OUString( GetName() ); } - aPropSeq[3].Name = aDescriptorHelpURL; - aPropSeq[3].Value <<= rtl::OUString( GetHelpURL() ); - return aPropSeq; } @@ -3351,26 +3293,19 @@ SvxToolbarConfigPage::SvxToolbarConfigPage( : SvxConfigPage( pParent, rSet ) { - // FIXME: HELPID - SetHelpId( ""/*HID_SVX_CONFIG_TOOLBAR*/ ); + SetHelpId( HID_SVX_CONFIG_TOOLBAR ); aContentsListBox = new SvxToolbarEntriesListBox(this, CUI_RES(BOX_ENTRIES)); FreeResource(); PositionContentsListBox(); aContentsListBox->SetZOrder( &aAddCommandsButton, WINDOW_ZORDER_BEFOR ); - // FIXME: HELPID - aContentsListBox->SetHelpId( ""/*HID_SVX_CONFIG_TOOLBAR_CONTENTS*/ ); - // FIXME: HELPID - aNewTopLevelButton.SetHelpId( ""/*HID_SVX_NEW_TOOLBAR*/ ); - // FIXME: HELPID - aModifyTopLevelButton.SetHelpId( ""/*HID_SVX_MODIFY_TOOLBAR*/ ); - // FIXME: HELPID - aAddCommandsButton.SetHelpId( ""/*HID_SVX_NEW_TOOLBAR_ITEM*/ ); - // FIXME: HELPID - aModifyCommandButton.SetHelpId( ""/*HID_SVX_MODIFY_TOOLBAR_ITEM*/ ); - // FIXME: HELPID - aSaveInListBox.SetHelpId( ""/*HID_SVX_SAVE_IN*/ ); + aContentsListBox->SetHelpId( HID_SVX_CONFIG_TOOLBAR_CONTENTS ); + aNewTopLevelButton.SetHelpId( HID_SVX_NEW_TOOLBAR ); + aModifyTopLevelButton.SetHelpId( HID_SVX_MODIFY_TOOLBAR ); + aAddCommandsButton.SetHelpId( HID_SVX_NEW_TOOLBAR_ITEM ); + aModifyCommandButton.SetHelpId( HID_SVX_MODIFY_TOOLBAR_ITEM ); + aSaveInListBox.SetHelpId( HID_SVX_SAVE_IN ); aTopLevelSeparator.SetText( CUI_RES ( RID_SVXSTR_PRODUCTNAME_TOOLBARS ) ); @@ -3586,8 +3521,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_TOOLBAR*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) ); bool ret = pNameDialog->Execute(); @@ -3678,8 +3612,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) ); bool ret = pNameDialog->Execute(); @@ -4767,7 +4700,6 @@ bool ToolbarSaveInData::LoadToolbar( { uno::Reference< container::XIndexAccess > xSubMenu; OUString aCommandURL; - OUString aHelpURL; OUString aLabel; bool bIsUserDefined = TRUE; sal_Bool bIsVisible; @@ -4776,7 +4708,7 @@ bool ToolbarSaveInData::LoadToolbar( sal_uInt16 nType( css::ui::ItemType::DEFAULT ); bool bItem = GetToolbarItemData( xToolbarSettings, nIndex, aCommandURL, - aHelpURL, aLabel, nType, bIsVisible, nStyle, xSubMenu ); + aLabel, nType, bIsVisible, nStyle, xSubMenu ); if ( bItem ) { @@ -4817,7 +4749,6 @@ bool ToolbarSaveInData::LoadToolbar( aLabel, aCommandURL, TRUE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntry->SetVisible( bIsVisible ); pEntries->push_back( pEntry ); @@ -4829,7 +4760,6 @@ bool ToolbarSaveInData::LoadToolbar( SvxConfigEntry* pEntry = new SvxConfigEntry( aLabel, aCommandURL, FALSE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntry->SetVisible( bIsVisible ); pEntry->SetStyle( nStyle ); pEntries->push_back( pEntry ); diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 5a6cc5505d94..8592dbaded5f 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -89,8 +89,7 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, // must be done after FreeResource is called InitResources(); - // FIXME: HELPID - mpImpl->pEventLB->GetListBox().SetHelpId( ""/*HID_SVX_MACRO_LB_EVENT*/ ); + mpImpl->pEventLB->GetListBox().SetHelpId( HID_SVX_MACRO_LB_EVENT ); aSaveInListBox.SetSelectHdl( LINK( this, SvxEventConfigPage, SelectHdl_Impl ) ); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 944fd10f8533..e7d70dd9d396 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -170,8 +170,7 @@ _HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) : maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ), maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ) { - // FIXME: HELPID - maListBox.SetHelpId( ""/*HID_MACRO_HEADERTABLISTBOX*/ ); + maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX ); } _HeaderTabListBox::~_HeaderTabListBox() @@ -875,8 +874,7 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram // must be done after FreeResource is called InitResources(); - // FIXME: HELPID - mpImpl->pEventLB->GetListBox().SetHelpId( ""/*HID_SVX_MACRO_LB_EVENT*/ ); + mpImpl->pEventLB->GetListBox().SetHelpId( HID_SVX_MACRO_LB_EVENT ); InitAndSetHandler( xNameReplace, Reference< container::XNameReplace>(0), Reference< util::XModifiable >(0)); DisplayAppEvents(true); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 052809d07bd8..d243ce96f27c 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -249,20 +249,13 @@ SpellDialog::SpellDialog( pImpl = new SpellDialog_Impl; //HelpIds - // FIXME: HELPID - aClosePB. SetHelpId(""/*HID_SPLDLG_BUTTON_CLOSE*/ ); - // FIXME: HELPID - aIgnorePB. SetHelpId(""/*HID_SPLDLG_BUTTON_IGNORE*/ ); - // FIXME: HELPID - aIgnoreAllPB. SetHelpId(""/*HID_SPLDLG_BUTTON_IGNOREALL*/); - // FIXME: HELPID - aIgnoreRulePB. SetHelpId(""/*HID_SPLDLG_BUTTON_IGNORERULE*/); - // FIXME: HELPID - aChangePB. SetHelpId(""/*HID_SPLDLG_BUTTON_CHANGE*/ ); - // FIXME: HELPID - aChangeAllPB. SetHelpId(""/*HID_SPLDLG_BUTTON_CHANGEALL*/); - // FIXME: HELPID - aExplainPB. SetHelpId(""/*HID_SPLDLG_BUTTON_EXPLAIN*/ ); + aClosePB. SetHelpId(HID_SPLDLG_BUTTON_CLOSE ); + aIgnorePB. SetHelpId(HID_SPLDLG_BUTTON_IGNORE ); + aIgnoreAllPB. SetHelpId(HID_SPLDLG_BUTTON_IGNOREALL); + aIgnoreRulePB. SetHelpId(HID_SPLDLG_BUTTON_IGNORERULE); + aChangePB. SetHelpId(HID_SPLDLG_BUTTON_CHANGE ); + aChangeAllPB. SetHelpId(HID_SPLDLG_BUTTON_CHANGEALL); + aExplainPB. SetHelpId(HID_SPLDLG_BUTTON_EXPLAIN ); Init_Impl(); // disable controls if service is missing diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src index 02e2e728f412..3605eee00ed6 100644 --- a/cui/source/dialogs/charmap.src +++ b/cui/source/dialogs/charmap.src @@ -35,10 +35,9 @@ // RID_SVXDLG_CHARMAP ---------------------------------------------------- ModalDialog RID_SVXDLG_CHARMAP { - HelpId = SID_CHARMAP ; + HelpId = CMD_SID_CHARMAP ; SvLook = TRUE ; Text [ en-US ] = "Special Characters"; -/* Size = MAP_APPFONT ( 297 , 169 ) ; */ Size = MAP_APPFONT ( 297 , 153 ) ; OutputSize = TRUE ; Moveable = TRUE ; @@ -92,7 +91,6 @@ ModalDialog RID_SVXDLG_CHARMAP { HelpId = HID_CHARMAP_CTL_SHOWTEXT ; Pos = MAP_APPFONT ( 46 , 137 ) ; -/* Size = MAP_APPFONT ( 190 , 16 ) ; */ Size = MAP_APPFONT ( 244 , 16 ) ; Group = TRUE ; }; @@ -134,26 +132,6 @@ ModalDialog RID_SVXDLG_CHARMAP Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete"; }; -/* - PushButton BT_ASSIGN - { - Pos = MAP_APPFONT ( 242 , 140 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Assign shortcut..."; - }; - FixedText FT_ASSIGN - { - Pos = MAP_APPFONT ( 6 , 156 ) ; - Size = MAP_APPFONT ( 100 , 8 ) ; - Left = TRUE ; - Text [ en-US ] = "Shortcut key: "; - }; - Control CT_ASSIGN - { - Pos = MAP_APPFONT ( 60 , 156 ) ; - Size = MAP_APPFONT ( 160 , 8 ) ; - }; -*/ }; // ********************************************************************** EOF diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 58962c458281..a205db2a28c9 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -678,8 +678,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) String aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); BOOL bReadOnly = pThm->IsReadOnly() && !pThm->IsImported(); - // FIXME: HELPID - aEdtMSName.SetHelpId( ""/*HID_GALLERY_EDIT_MSNAME*/ ); + aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME ); aEdtMSName.SetText( pThm->GetName() ); aEdtMSName.SetReadOnly( bReadOnly ); diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index a94161c0a1ed..19fac6b9a4cd 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -37,7 +37,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC { - HelpID = SID_GRFFILTER_MOSAIC; + HelpID = CMD_SID_GRFFILTER_MOSAIC; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -141,7 +141,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE { - HelpID = SID_GRFFILTER_SOLARIZE; + HelpID = CMD_SID_GRFFILTER_SOLARIZE; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -218,7 +218,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA { - HelpID = SID_GRFFILTER_SEPIA; + HelpID = CMD_SID_GRFFILTER_SEPIA; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -290,7 +290,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA ModalDialog RID_SVX_GRFFILTER_DLG_POSTER { - HelpID = SID_GRFFILTER_POSTER; + HelpID = CMD_SID_GRFFILTER_POSTER; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -365,7 +365,7 @@ TabPage RID_SVX_GRFFILTER_DLG_EMBOSS_TAB ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS { - HelpID = SID_GRFFILTER_EMBOSS; + HelpID = CMD_SID_GRFFILTER_EMBOSS; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index f59a64879c87..2198a42c3fcf 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -511,12 +511,9 @@ namespace svx } void SuggestionDisplay::SetHelpIds() { - // FIXME: HELPID - this->SetHelpId( ""/*HID_HANGULDLG_SUGGESTIONS*/ ); - // FIXME: HELPID - m_aValueSet.SetHelpId( ""/*HID_HANGULDLG_SUGGESTIONS_GRID*/ ); - // FIXME: HELPID - m_aListBox.SetHelpId( ""/*HID_HANGULDLG_SUGGESTIONS_LIST*/ ); + this->SetHelpId( HID_HANGULDLG_SUGGESTIONS ); + m_aValueSet.SetHelpId( HID_HANGULDLG_SUGGESTIONS_GRID ); + m_aListBox.SetHelpId( HID_HANGULDLG_SUGGESTIONS_LIST ); } //========================================================================= @@ -622,20 +619,13 @@ namespace svx // initial control values m_aSimpleConversion.Check(); - // FIXME: HELPID - m_pPlayground->GetButton(SvxCommonLinguisticControl::eClose )->SetHelpId(""/*HID_HANGULDLG_BUTTON_CLOSE*/ ); - // FIXME: HELPID - m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnore )->SetHelpId(""/*HID_HANGULDLG_BUTTON_IGNORE*/ ); - // FIXME: HELPID - m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnoreAll )->SetHelpId(""/*HID_HANGULDLG_BUTTON_IGNOREALL*/); - // FIXME: HELPID - m_pPlayground->GetButton(SvxCommonLinguisticControl::eChange )->SetHelpId(""/*HID_HANGULDLG_BUTTON_CHANGE*/ ); - // FIXME: HELPID - m_pPlayground->GetButton(SvxCommonLinguisticControl::eChangeAll )->SetHelpId(""/*HID_HANGULDLG_BUTTON_CHANGEALL*/); - // FIXME: HELPID - m_pPlayground->GetButton(SvxCommonLinguisticControl::eOptions )->SetHelpId(""/*HID_HANGULDLG_BUTTON_OPTIONS*/ ); - // FIXME: HELPID - m_pPlayground->GetWordInputControl().SetHelpId(""/*HID_HANGULDLG_EDIT_NEWWORD*/); + m_pPlayground->GetButton(SvxCommonLinguisticControl::eClose )->SetHelpId(HID_HANGULDLG_BUTTON_CLOSE ); + m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnore )->SetHelpId(HID_HANGULDLG_BUTTON_IGNORE ); + m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnoreAll )->SetHelpId(HID_HANGULDLG_BUTTON_IGNOREALL); + m_pPlayground->GetButton(SvxCommonLinguisticControl::eChange )->SetHelpId(HID_HANGULDLG_BUTTON_CHANGE ); + m_pPlayground->GetButton(SvxCommonLinguisticControl::eChangeAll )->SetHelpId(HID_HANGULDLG_BUTTON_CHANGEALL); + m_pPlayground->GetButton(SvxCommonLinguisticControl::eOptions )->SetHelpId(HID_HANGULDLG_BUTTON_OPTIONS ); + m_pPlayground->GetWordInputControl().SetHelpId(HID_HANGULDLG_EDIT_NEWWORD); FreeResource(); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index f4f1dfefb352..a87d7710f484 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -78,8 +78,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS maCbbPath.Show(); String aFileScheme( INET_FILE_SCHEME, RTL_TEXTENCODING_ASCII_US ); maCbbPath.SetBaseURL(aFileScheme); - // FIXME: HELPID - maCbbPath.SetHelpId( ""/*HID_HYPERDLG_DOC_PATH*/ ); + maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH ); SetExchangeSupport (); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index bc932dba7a78..79fde6c7a64c 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -83,8 +83,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maCbbTarget.SetPosSizePixel ( LogicToPixel( Point( COL_2, 25 ), MAP_APPFONT ), LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbTarget.Show(); - // FIXME: HELPID - maCbbTarget.SetHelpId( ""/*HID_HYPERDLG_INET_PATH*/ ); + maCbbTarget.SetHelpId( HID_HYPERDLG_INET_PATH ); // Find Path to Std-Doc String aStrBasePaths( SvtPathOptions().GetTemplatePath() ); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index e60716483526..5ea43e165883 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -74,8 +74,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbReceiver.Show(); - // FIXME: HELPID - maCbbReceiver.SetHelpId( ""/*HID_HYPERDLG_MAIL_PATH*/ ); + maCbbReceiver.SetHelpId( HID_HYPERDLG_MAIL_PATH ); SetExchangeSupport (); diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index 4ed7d1419bba..8f9f7a54adbe 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -746,7 +746,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT *************************************************************************/ ModalDialog RID_SVXDLG_NEWHYPERLINK { - HelpID = SID_HYPERLINK_DIALOG; + HelpID = CMD_SID_HYPERLINK_DIALOG; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 325 , 185 ) ; diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 97d1f83a6dd2..adea20068499 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -300,8 +300,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, maIconCtrl.Show(); maIconCtrl.SetChoiceWithCursor ( TRUE ); maIconCtrl.SetSelectionMode( SINGLE_SELECTION ); - // FIXME: HELPID - maIconCtrl.SetHelpId( ""/*HID_ICCDIALOG_CHOICECTRL*/ ); + maIconCtrl.SetHelpId( HID_ICCDIALOG_CHOICECTRL ); // ItemSet if ( pSet ) @@ -312,14 +311,11 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, // Buttons aOKBtn.SetClickHdl ( LINK( this, IconChoiceDialog, OkHdl ) ); - // FIXME: HELPID - aOKBtn.SetHelpId( ""/*HID_ICCDIALOG_OK_BTN*/ ); - // FIXME: HELPID - aCancelBtn.SetHelpId( ""/*HID_ICCDIALOG_CANCEL_BTN*/ ); + aOKBtn.SetHelpId( HID_ICCDIALOG_OK_BTN ); + aCancelBtn.SetHelpId( HID_ICCDIALOG_CANCEL_BTN ); aResetBtn.SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) ); aResetBtn.SetText( CUI_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) ); - // FIXME: HELPID - aResetBtn.SetHelpId( ""/*HID_ICCDIALOG_RESET_BTN*/ ); + aResetBtn.SetHelpId( HID_ICCDIALOG_RESET_BTN ); aOKBtn.Show(); aCancelBtn.Show(); aHelpBtn.Show(); diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 6e0cd2881161..4929c45b93e8 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -44,7 +44,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const return static_cast< sal_uInt16 >( aCountEdit.GetValue() ); } -SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) +SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString& sHelpId ) : ModalDialog( pParent, CUI_RES(DLG_INS_ROW_COL) ), aCount( this, CUI_RES( FT_COUNT ) ), aCountEdit( this, CUI_RES( ED_COUNT ) ), @@ -70,9 +70,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) aTmp += aRow; } SetText( aTmp ); - // FIXME: HELPID - SetHelpId( ""/*nHelpId*/ ); - (void)nHelpId; + SetHelpId( sHelpId ); } short SvxInsRowColDlg::Execute(void) diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index e571e94880c9..0193cefa2964 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -109,8 +109,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml { FreeResource(); - // FIXME: HELPID - aTbLinks.SetHelpId(""/*HID_LINKDLG_TABLB*/); + aTbLinks.SetHelpId(HID_LINKDLG_TABLB); aTbLinks.SetSelectionMode( MULTIPLE_SELECTION ); aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT ); aTbLinks.Resize(); // OS: Hack fuer richtige Selektion diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index d5e023e33da4..2fe952b9197a 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -63,10 +63,8 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent ) aSObject( CUI_RES( S_OBJECT ) ) { FreeResource(); - // FIXME: HELPID - SetHelpId( ""/*HID_PASTE_DLG*/ ); - // FIXME: HELPID - SetUniqueId( ""/*HID_PASTE_DLG*/ ); + SetHelpId( HID_PASTE_DLG ); + SetUniqueId( HID_PASTE_DLG ); Font aFont = aFtObjectSource.GetFont(); aFont.SetWeight( WEIGHT_LIGHT ); diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 6b9038b0949f..8ff20084f591 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -89,14 +89,10 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, { if (bRedline) // HelpIDs fuer Redlining { - // FIXME: HELPID - SetHelpId(""/*HID_REDLINING_DLG*/); - // FIXME: HELPID - aEditED.SetHelpId(""/*HID_REDLINING_EDIT*/); - // FIXME: HELPID - aPrevBtn.SetHelpId(""/*HID_REDLINING_PREV*/); - // FIXME: HELPID - aNextBtn.SetHelpId(""/*HID_REDLINING_NEXT*/); + SetHelpId(HID_REDLINING_DLG); + aEditED.SetHelpId(HID_REDLINING_EDIT); + aPrevBtn.SetHelpId(HID_REDLINING_PREV); + aNextBtn.SetHelpId(HID_REDLINING_NEXT); } aPrevBtn.SetClickHdl( LINK( this, SvxPostItDialog, PrevHdl ) ); diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index 904319d45355..e1ff3b32d98b 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -27,12 +27,13 @@ // include --------------------------------------------------------------- #include <cuires.hrc> #include "postdlg.hrc" +#include "helpid.hrc" #include <svx/dialogs.hrc> // for RID_SVXDLG_POSTIT // RID_SVXDLG_POSTIT ----------------------------------------------------- ModalDialog RID_SVXDLG_POSTIT { - HelpId = SID_POSTIT ; + HelpId = HID_POSTIT_DIALOG ; OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 198 , 134 ) ; diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src index c7caa659b1c0..84671c050e9a 100644 --- a/cui/source/dialogs/thesdlg.src +++ b/cui/source/dialogs/thesdlg.src @@ -35,7 +35,7 @@ // RID_SVXDLG_THES ------------------------------------------------------- ModalDialog RID_SVXDLG_THESAURUS { - HelpId = SID_THESAURUS ; + HelpId = CMD_SID_THESAURUS ; OutputSize = TRUE ; Size = MAP_APPFONT ( 285 , 116 ) ; Text [ en-US ] = "Thesaurus" ; diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 1b6d1c37651e..bfb3320d7ac6 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -218,7 +218,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : { #if ENABLE_LAYOUT - SetHelpId (SID_ATTR_ZOOM); + SetHelpId (".uno:Zoom"); #endif /* ENABLE_LAYOUT */ Link aLink = LINK( this, SvxZoomDialog, UserHdl ); a100Btn.SetClickHdl( aLink ); diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 8137b1c7bb89..3abf0f4d557b 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -28,11 +28,12 @@ #include <cuires.hrc> #include "zoom.hrc" #include <svx/dialogs.hrc> // for RID_SVXDLG_ZOOM +#include "helpid.hrc" // RID_SVXDLG_ZOOM ------------------------------------------------------- ModalDialog RID_SVXDLG_ZOOM { - HelpId = SID_ATTR_ZOOM ; + HelpId = CMD_SID_ATTR_ZOOM; OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 242 , 112 ) ; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 91ec831ab5dc..00412e7bf400 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -723,15 +723,13 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheck else pDlg->SetCheckNameHdl( Link(), bCheckImmediately ); } -void AbstractSvxNameDialog_Impl::SetEditHelpId(ULONG nHelpId) +void AbstractSvxNameDialog_Impl::SetEditHelpId(const rtl::OString& aHelpId) { - pDlg->SetEditHelpId( nHelpId ); + pDlg->SetEditHelpId( aHelpId ); } -void AbstractSvxNameDialog_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSvxNameDialog_Impl::SetHelpId( const rtl::OString& aHelpId ) { - // FIXME: HELPID - pDlg->SetHelpId( ""/*nHelpId*/ ); - (void)nHelpId; + pDlg->SetHelpId( aHelpId ); } void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr ) { @@ -843,11 +841,9 @@ void AbstractSvxMultiFileDialog_Impl::SetTitle( const String& rNewTitle ) pDlg->SetText( rNewTitle ); } -void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSvxMultiFileDialog_Impl::SetHelpId( const rtl::OString& aHelpId ) { - // FIXME: HELPID - pDlg->SetHelpId( ""/*nHelpId*/ ); - (void)nHelpId; + pDlg->SetHelpId( aHelpId ); } Window * AbstractSvxHpLinkDlg_Impl::GetWindow() @@ -1877,49 +1873,41 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( USHORT nId ) return 0; } -SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, USHORT nSlotId, +SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand, const Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList ) { InsertObjectDialog_Impl* pDlg=0; - switch ( nSlotId ) - { - case SID_INSERT_OBJECT : pDlg = new SvInsertOleDlg( pParent, xStor, pList ); break; - case SID_INSERT_PLUGIN : pDlg = new SvInsertPlugInDialog( pParent, xStor ); break; - case SID_INSERT_APPLET : pDlg = new SvInsertAppletDialog( pParent, xStor ); break; - case SID_INSERT_FLOATINGFRAME : pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor ); break; - default: break; - } + if ( rCommand.equalsAscii(".uno:InsertObject" ) ) + pDlg = new SvInsertOleDlg( pParent, xStor, pList ); + else if ( rCommand.equalsAscii(".uno:InsertPlugin" ) ) + pDlg = new SvInsertPlugInDialog( pParent, xStor ); + else if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) ) + pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor ); if ( pDlg ) { - // FIXME: HELPID - pDlg->SetHelpId( ""/*nSlotId*/ ); + pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) ); return new AbstractInsertObjectDialog_Impl( pDlg ); } return 0; } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, USHORT nSlotId, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand, const Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) { InsertObjectDialog_Impl* pDlg=0; - switch ( nSlotId ) - { - case SID_INSERT_APPLET : pDlg = new SvInsertAppletDialog( pParent, xObj ); break; - case SID_INSERT_FLOATINGFRAME : pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); break; - default: break; - } - - if ( pDlg ) + if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) ) { - // FIXME: HELPID - pDlg->SetHelpId( ""/*nSlotId*/ ); + pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); + pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) ); return new VclAbstractDialog_Impl( pDlg ); } return 0; } + + SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* pParent ) { return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) ); @@ -1954,7 +1942,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog( return new VclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); } -SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ) +SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) { - return new SvxInsRowColDlg( pParent, bCol, nHelpId ); + return new SvxInsRowColDlg( pParent, bCol, sHelpId ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 844439efbf61..d57057501fe0 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -414,9 +414,9 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog) virtual void GetName( String& rName ) ; virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) ; - virtual void SetEditHelpId(ULONG nHelpId) ; + virtual void SetEditHelpId(const rtl::OString&) ; //from class Window - virtual void SetHelpId( ULONG nHelpId ) ; + virtual void SetHelpId( const rtl::OString& ) ; virtual void SetText( const XubString& rStr ) ; private: Link aCheckNameHdl; @@ -486,7 +486,7 @@ class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog virtual void EnableRadioButtonMode(); virtual void SetTitle( const String& rNewTitle ); //From Class Window - virtual void SetHelpId( ULONG nHelpId ) ; + virtual void SetHelpId( const rtl::OString& ) ; }; //for SvxMultiFileDialog end @@ -636,10 +636,10 @@ public: const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 ); - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, USHORT nSlotId, + virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ); virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0 ); @@ -795,7 +795,7 @@ public: virtual VclAbstractDialog* CreateOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& rApplicationContext ); - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ); + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ); }; #endif diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 875a06ce332f..daff47bdf0af 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -744,8 +744,7 @@ public: aBtnOK.Enable( rLink.Call( this ) > 0 ); } - // FIXME: HELPID - void SetEditHelpId(ULONG /*nHelpId*/) {aEdtName.SetHelpId(""/*nHelpId*/);} + void SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);} }; class SvxIconSelectorDialog : public ModalDialog diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 593a3045b592..173ef8e45139 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -91,8 +91,7 @@ public: aBtnOK.Enable( rLink.Call( this ) > 0 ); } - // FIXME: HELPID - void SetEditHelpId(ULONG /*nHelpId*/) {aEdtName.SetHelpId(""/*nHelpId*/);} + void SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);} }; /////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 1d98daa179e1..1a5bd8562f20 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -29,362 +29,352 @@ // include --------------------------------------------------------------- #include <svl/solar.hrc> +#include <svx/svxcommands.h> +#include <sfx2/sfxcommands.h> // Help-Ids -------------------------------------------------------------- -#define HID_OPTIONS_COLOR (HID_CUI_START + 1) -#define HID_OPTIONS_SAVE (HID_CUI_START + 2) -#define HID_OPTIONS_PATH (HID_CUI_START + 3) -#define HID_OPTIONS_GENERAL (HID_CUI_START + 4) -#define HID_OPTIONS_LINGU (HID_CUI_START + 5) -#define HID_OPTIONS_SPELL (HID_CUI_START + 6) -#define HID_OPTIONS_DICT_NEW (HID_CUI_START + 7) -#define HID_OPTIONS_DICT_EDIT (HID_CUI_START + 8) -#define HID_OPTIONS_INET (HID_CUI_START + 9) -#define HID_OPTIONS_CHART_DEFCOLORS (HID_CUI_START + 10) -#define HID_OPTIONS_CTL (HID_CUI_START + 11) -#define HID_OPTIONS_PROXY (HID_CUI_START + 12) -#define HID_OPTIONS_SEARCH (HID_CUI_START + 13) -#define HID_OPTIONS_MAIL (HID_CUI_START + 14) -#define HID_OPTIONS_ASIAN_LAYOUT (HID_CUI_START + 15) -#define HID_CLB_EDIT_MODULES_DICS (HID_CUI_START + 16) -#define HID_CLB_EDIT_MODULES_MODULES (HID_CUI_START + 17) -#define HID_CLB_LINGU_MODULES (HID_CUI_START + 18) -#define HID_CLB_LINGU_OPTIONS (HID_CUI_START + 19) -#define HID_EDIT_MODULES (HID_CUI_START + 20) -#define HID_LNGDLG_NUM_PREBREAK (HID_CUI_START + 21) -#define HID_OPTIONS_COLORCONFIG (HID_CUI_START + 22) -#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME (HID_CUI_START + 23) -#define HID_OPTIONS_ACCESSIBILITYCONFIG (HID_CUI_START + 24) -#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN (HID_CUI_START + 25) -#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME (HID_CUI_START + 26) -#define HID_OPTIONS_PATHS_SELECTFOLDER (HID_CUI_START + 27) -#define HID_OPTIONS_JAVA (HID_CUI_START + 28) -#define HID_OPTIONS_JAVA_LIST (HID_CUI_START + 29) -#define HID_OPTIONS_JAVA_PARAMETER (HID_CUI_START + 30) -#define HID_OPTIONS_JAVA_CLASSPATH (HID_CUI_START + 31) -#define HID_SVXPAGE_JSEARCH_OPTIONS (HID_CUI_START + 32) -#define HID_SVXDLG_FILTER_WARNING (HID_CUI_START + 33) -#define HID_SVX_OPTIONS_ONLINEUPDATE (HID_CUI_START + 34) -#define HID_DLG_SECURITY_OPTIONS (HID_CUI_START + 35) -#define HID_OFADLG_OPTIONS_TREE (HID_CUI_START + 36) -#define HID_OFA_CONNPOOL_DRIVERLIST (HID_CUI_START + 37) -#define UID_OFA_CONNPOOL_DRIVERLIST_BACK (HID_CUI_START + 38) -#define HID_OFA_FONT_SUBST_CLB (HID_CUI_START + 39) -#define HID_OFA_TP_MISC (HID_CUI_START + 40) -#define HID_OFA_TP_VIEW (HID_CUI_START + 41) -#define HID_OFA_TP_LANGUAGES (HID_CUI_START + 42) -#define HID_OFA_TP_MEMORY (HID_CUI_START + 43) -#define HID_DBPATH_CTL_PATH (HID_CUI_START + 44) -#define HID_DBPATH_HEADERBAR (HID_CUI_START + 45) -#define HID_OFAPAGE_SMARTTAG_OPTIONS (HID_CUI_START + 46) -#define HID_OFAPAGE_MSFLTR2_CLB (HID_CUI_START + 47) -#define HID_OPTPATH_CTL_PATH (HID_CUI_START + 48) -#define HID_OFADLG_TREELISTBOX (HID_CUI_START + 49) -#define HID_DLG_WEBCONNECTION_INFO (HID_CUI_START + 50) -#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST (HID_CUI_START + 51) -#define HID_OPTPATH_HEADERBAR (HID_CUI_START + 52) -#define HID_WARN_NAME_DUPLICATE (HID_CUI_START + 53) -#define HID_COLORPAGE_LISTBOX_START (HID_CUI_START + 54) -#define HID_COLORPAGE_DOCCOLOR_LB (HID_CUI_START + 54) -#define HID_COLORPAGE_DOCBOUNDARIES_LB (HID_CUI_START + 55) -#define HID_COLORPAGE_APPBACKGROUND_LB (HID_CUI_START + 56) -#define HID_COLORPAGE_OBJECTBOUNDARIES_LB (HID_CUI_START + 57) -#define HID_COLORPAGE_TABLEBOUNDARIES_LB (HID_CUI_START + 58) -#define HID_COLORPAGE_FONTCOLOR_LB (HID_CUI_START + 59) -#define HID_COLORPAGE_LINKS_LB (HID_CUI_START + 60) -#define HID_COLORPAGE_LINKSVISITED_LB (HID_CUI_START + 61) -#define HID_COLORPAGE_ANCHOR_LB (HID_CUI_START + 62) -#define HID_COLORPAGE_SPELL_LB (HID_CUI_START + 63) -#define HID_COLORPAGE_WRITERTEXTGRID_LB (HID_CUI_START + 64) -#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB (HID_CUI_START + 65) -#define HID_COLORPAGE_WRITERIDXSHADINGS_LB (HID_CUI_START + 66) -#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB (HID_CUI_START + 67) -#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB (HID_CUI_START + 68) -#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB (HID_CUI_START + 69) -#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB (HID_CUI_START + 70) -#define HID_COLORPAGE_WRITERPAGEBREAKS_LB (HID_CUI_START + 71) -#define HID_COLORPAGE_HTMLSGML_LB (HID_CUI_START + 72) -#define HID_COLORPAGE_HTMLCOMMENT_LB (HID_CUI_START + 73) -#define HID_COLORPAGE_HTMLKEYWORD_LB (HID_CUI_START + 74) -#define HID_COLORPAGE_HTMLUNKNOWN_LB (HID_CUI_START + 75) -#define HID_COLORPAGE_CALCGRID_LB (HID_CUI_START + 76) -#define HID_COLORPAGE_CALCPAGEBREAK_LB (HID_CUI_START + 77) -#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB (HID_CUI_START + 78) -#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB (HID_CUI_START + 79) -#define HID_COLORPAGE_CALCDETECTIVE_LB (HID_CUI_START + 80) -#define HID_COLORPAGE_CALCDETECTIVEERROR_LB (HID_CUI_START + 81) -#define HID_COLORPAGE_CALCREFERENCE_LB (HID_CUI_START + 82) -#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB (HID_CUI_START + 83) -#define HID_COLORPAGE_DRAWGRID_LB (HID_CUI_START + 84) -#define HID_COLORPAGE_DRAWDRAWING_LB (HID_CUI_START + 85) -#define HID_COLORPAGE_DRAWFILL_LB (HID_CUI_START + 86) -#define HID_COLORPAGE_BASICIDENTIFIER_LB (HID_CUI_START + 87) -#define HID_COLORPAGE_BASICCOMMENT_LB (HID_CUI_START + 88) -#define HID_COLORPAGE_BASICNUMBER_LB (HID_CUI_START + 89) -#define HID_COLORPAGE_BASICSTRING_LB (HID_CUI_START + 90) -#define HID_COLORPAGE_BASICOPERATOR_LB (HID_CUI_START + 91) -#define HID_COLORPAGE_BASICKEYWORD_LB (HID_CUI_START + 92) -#define HID_COLORPAGE_BASICERROR_LB (HID_CUI_START + 93) -#define HID_COLORPAGE_CHECKBOX_START (HID_CUI_START + 94) -#define HID_COLORPAGE_DOCCOLOR_CB (HID_CUI_START + 94) -#define HID_COLORPAGE_DOCBOUNDARIES_CB (HID_CUI_START + 95) -#define HID_COLORPAGE_APPBACKGROUND_CB (HID_CUI_START + 96) -#define HID_COLORPAGE_OBJECTBOUNDARIES_CB (HID_CUI_START + 97) -#define HID_COLORPAGE_TABLEBOUNDARIES_CB (HID_CUI_START + 98) -#define HID_COLORPAGE_FONTCOLOR_CB (HID_CUI_START + 99) -#define HID_COLORPAGE_LINKS_CB (HID_CUI_START + 100) -#define HID_COLORPAGE_LINKSVISITED_CB (HID_CUI_START + 101) -#define HID_COLORPAGE_ANCHOR_CB (HID_CUI_START + 102) -#define HID_COLORPAGE_SPELL_CB (HID_CUI_START + 103) -#define HID_COLORPAGE_WRITERTEXTGRID_CB (HID_CUI_START + 104) -#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB (HID_CUI_START + 105) -#define HID_COLORPAGE_WRITERIDXSHADINGS_CB (HID_CUI_START + 106) -#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB (HID_CUI_START + 107) -#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB (HID_CUI_START + 108) -#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB (HID_CUI_START + 109) -#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB (HID_CUI_START + 110) -#define HID_COLORPAGE_WRITERPAGEBREAKS_CB (HID_CUI_START + 111) -#define HID_COLORPAGE_HTMLSGML_CB (HID_CUI_START + 112) -#define HID_COLORPAGE_HTMLCOMMENT_CB (HID_CUI_START + 113) -#define HID_COLORPAGE_HTMLKEYWORD_CB (HID_CUI_START + 114) -#define HID_COLORPAGE_HTMLUNKNOWN_CB (HID_CUI_START + 115) -#define HID_COLORPAGE_CALCGRID_CB (HID_CUI_START + 116) -#define HID_COLORPAGE_CALCPAGEBREAK_CB (HID_CUI_START + 117) -#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB (HID_CUI_START + 118) -#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB (HID_CUI_START + 119) -#define HID_COLORPAGE_CALCDETECTIVE_CB (HID_CUI_START + 120) -#define HID_COLORPAGE_CALCDETECTIVEERROR_CB (HID_CUI_START + 121) -#define HID_COLORPAGE_CALCREFERENCE_CB (HID_CUI_START + 122) -#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB (HID_CUI_START + 123) -#define HID_COLORPAGE_DRAWGRID_CB (HID_CUI_START + 124) -#define HID_COLORPAGE_DRAWDRAWING_CB (HID_CUI_START + 125) -#define HID_COLORPAGE_DRAWFILL_CB (HID_CUI_START + 126) -#define HID_COLORPAGE_BASICIDENTIFIER_CB (HID_CUI_START + 127) -#define HID_COLORPAGE_BASICCOMMENT_CB (HID_CUI_START + 128) -#define HID_COLORPAGE_BASICNUMBER_CB (HID_CUI_START + 129) -#define HID_COLORPAGE_BASICSTRING_CB (HID_CUI_START + 130) -#define HID_COLORPAGE_BASICOPERATOR_CB (HID_CUI_START + 131) -#define HID_COLORPAGE_BASICKEYWORD_CB (HID_CUI_START + 132) -#define HID_COLORPAGE_BASICERROR_CB (HID_CUI_START + 133) -#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE (HID_CUI_START + 134) -#define HID_SVX_MACRO_LB_EVENT (HID_CUI_START + 135) -#define HID_SVX_CONFIG_EVENT (HID_CUI_START + 136) -#define HID_CONFIG_EVENT_OFFICE_BASED (HID_CUI_START + 137) -#define HID_CONFIG_EVENT_DOCUMENT_BASED (HID_CUI_START + 138) -#define HID_SELECTOR_DIALOG (HID_CUI_START + 139) -#define HID_SELECTOR_CATEGORIES (HID_CUI_START + 140) -#define HID_SVX_CONFIG_TOOLBAR (HID_CUI_START + 141) -#define HID_SVX_CONFIG_TOOLBAR_CONTENTS (HID_CUI_START + 142) -#define HID_SELECTOR_COMMANDS (HID_CUI_START + 143) -#define HID_GALLERY_EDIT_MSNAME (HID_CUI_START + 144) -#define HID_SVX_CONFIG_MENU (HID_CUI_START + 145) -#define HID_SVX_CONFIG_MENU_CONTENTS (HID_CUI_START + 146) -#define HID_GALLERY_NEWTHEME_FINDFILES (HID_CUI_START + 147) -#define HID_GALLERY_NEWTHEME_ADDFILES (HID_CUI_START + 148) -#define HID_HANGULDLG_BUTTON_OPTIONS (HID_CUI_START + 149) -#define HID_HANGULDLG_BUTTON_CLOSE (HID_CUI_START + 150) -#define HID_HANGULDLG_BUTTON_IGNORE (HID_CUI_START + 151) -#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_CUI_START + 152) -#define HID_HANGULDLG_BUTTON_CHANGE (HID_CUI_START + 153) -#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_CUI_START + 154) -#define HID_OFA_FONT_SUBSTITUTION (HID_CUI_START + 155) -#define HID_HANGULDLG_EDIT_NEWWORD (HID_CUI_START + 156) -#define HID_OFA_SUBST_APPLY (HID_CUI_START + 157) -#define HID_OFA_SUBST_DELETE (HID_CUI_START + 158) -#define HID_SPLDLG_BUTTON_CLOSE (HID_CUI_START + 159) -#define HID_SPLDLG_BUTTON_IGNORE (HID_CUI_START + 160) -#define HID_SPLDLG_BUTTON_IGNOREALL (HID_CUI_START + 161) -#define HID_SPLDLG_BUTTON_CHANGE (HID_CUI_START + 162) -#define HID_SPLDLG_BUTTON_CHANGEALL (HID_CUI_START + 163) -#define HID_SPLDLG_BUTTON_EXPLAIN (HID_CUI_START + 164) -#define HID_CHARMAP_CTL_SHOWSET (HID_CUI_START + 165) -#define HID_CHARMAP_CTL_SHOWTEXT (HID_CUI_START + 166) -#define HID_CHARMAP_CTL_SHOWCHAR (HID_CUI_START + 167) -#define HID_DLG_NAME (HID_CUI_START + 168) -#define HID_DLG_MESSBOX (HID_CUI_START + 169) -#define HID_HANGULDLG_SUGGESTIONS (HID_CUI_START + 170) -#define HID_HANGULDLG_SUGGESTIONS_GRID (HID_CUI_START + 171) -#define HID_HANGULDLG_SUGGESTIONS_LIST (HID_CUI_START + 172) -#define HID_DLG_OBJECT_NAME (HID_CUI_START + 173) -#define HID_DLG_OBJECT_TITLE_DESC (HID_CUI_START + 174) -#define HID_SVX_CONFIG_MENU_ORGANIZER (HID_CUI_START + 175) -#define HID_SVX_CONFIG_ICON_SELECTOR (HID_CUI_START + 176) -#define HID_SVX_CONFIG_NAME_SUBMENU (HID_CUI_START + 177) -#define HID_SVX_CONFIG_RENAME_MENU (HID_CUI_START + 178) -#define HID_SVX_CONFIG_RENAME_MENU_ITEM (HID_CUI_START + 179) -#define HID_SVX_CONFIG_RENAME_TOOLBAR (HID_CUI_START + 180) -#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM (HID_CUI_START + 181) -#define HID_SVX_NEW_TOOLBAR (HID_CUI_START + 182) -#define HID_SVX_MODIFY_TOOLBAR (HID_CUI_START + 183) -#define HID_SVX_NEW_TOOLBAR_ITEM (HID_CUI_START + 184) -#define HID_SVX_CONFIG_MENU_LISTBOX (HID_CUI_START + 185) -#define HID_SVX_MODIFY_TOOLBAR_ITEM (HID_CUI_START + 186) -#define HID_SVX_SAVE_IN (HID_CUI_START + 187) -#define HID_OPTIONS_MULTIPATH_LIST (HID_CUI_START + 188) -#define HID_FM_DLG_SEARCH (HID_CUI_START + 189) -#define HID_SEARCH_TEXT (HID_CUI_START + 190) -#define HID_SEARCH_ALLFIELDS (HID_CUI_START + 191) -#define HID_GALLERY_PROPERTIES_GENERAL (HID_CUI_START + 192) -#define HID_SEARCH_FIELDSELECTION (HID_CUI_START + 193) -#define HID_SEARCH_POSITION (HID_CUI_START + 194) -#define HID_SEARCH_FORMATTER (HID_CUI_START + 195) -#define HID_SEARCH_CASE (HID_CUI_START + 196) -#define HID_SEARCH_BACKWARD (HID_CUI_START + 197) -#define HID_SEARCH_STARTOVER (HID_CUI_START + 198) -#define HID_SEARCH_WILDCARD (HID_CUI_START + 199) -#define HID_SEARCH_REGULAR (HID_CUI_START + 200) -#define HID_SEARCH_APPROX (HID_CUI_START + 201) -#define HID_SEARCH_APPROXSETTINGS (HID_CUI_START + 202) -#define HID_SEARCH_BTN_SEARCH (HID_CUI_START + 203) -#define HID_SEARCH_BTN_CLOSE (HID_CUI_START + 204) -#define HID_GALLERY_BROWSER (HID_CUI_START + 205) -#define HID_GALLERY_SEARCH (HID_CUI_START + 206) -#define HID_GALLERY_APPLY (HID_CUI_START + 207) -#define HID_SPLDLG_BUTTON_IGNORERULE (HID_CUI_START + 208) -#define HID_CONFIG_ACCEL (HID_CUI_START + 209) -#define HID_ACCELCONFIG_LISTBOX (HID_CUI_START + 210) -#define HID_CONFIGGROUP_ACC_LISTBOX (HID_CUI_START + 211) -#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_CUI_START + 212) -#define HID_MACRO_LB_EVENT (HID_CUI_START + 213) -#define HID_MACRO_GROUP (HID_CUI_START + 214) -#define HID_MACRO_MACROS (HID_CUI_START + 215) -#define HID_DIALOG_HANGULHANJA (HID_CUI_START + 216) -#define HID_HANGULHANJA_OPT_DLG (HID_CUI_START + 217) -#define HID_HANGULHANJA_NEWDICT_DLG (HID_CUI_START + 218) -#define HID_HANGULHANJA_EDIT_DLG (HID_CUI_START + 219) -#define HID_HANGULHANJA_OPT_DICTS_LB (HID_CUI_START + 220) -#define HID_MULTIPATH (HID_CUI_START + 221) -#define HID_SCRIPTORG_DIALOG (HID_CUI_START + 222) -#define HID_SCRIPTSBOX (HID_CUI_START + 223) -#define HID_SPELLCHECK (HID_CUI_START + 224) -#define HID_TPSIZE_CTRL (HID_CUI_START + 225) -#define HID_TPROTATION_CTRL1 (HID_CUI_START + 226) -#define HID_TPROTATION_CTRL2 (HID_CUI_START + 227) -#define HID_TRANS_ANGLE (HID_CUI_START + 228) -#define HID_TPPOSITION_CTRL (HID_CUI_START + 229) -#define HID_NUMBERFORMAT_LB_FORMAT (HID_CUI_START + 230) -#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_CUI_START + 231) -#define HID_TRANS_SLANT (HID_CUI_START + 232) -#define HID_TPHATCH_CTRL (HID_CUI_START + 233) -#define HID_SEARCHATTR_CTL_ATTR (HID_CUI_START + 234) -#define HID_NUMBERFORMAT_TBI_INFO (HID_CUI_START + 235) -#define HID_SEARCHATTR (HID_CUI_START + 236) -#define HID_ALIGNMENT_CTR_DIAL (HID_CUI_START + 237) -#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_CUI_START + 238) -#define HID_SEARCHSIMILARITY (HID_CUI_START + 239) -#define UID_SEARCH_RECORDSTATUS (HID_CUI_START + 240) -#define HID_OFAPAGE_AUTOCORR_CLB (HID_CUI_START + 241) -#define HID_AUTOCORR_LANGUAGE (HID_CUI_START + 242) -#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_CUI_START + 243) -#define HID_TPCOLOR_RGB_1 (HID_CUI_START + 244) -#define HID_TPCOLOR_RGB_2 (HID_CUI_START + 245) -#define HID_TPCOLOR_RGB_3 (HID_CUI_START + 246) -#define HID_TPCOLOR_CMYK_1 (HID_CUI_START + 247) -#define HID_TPCOLOR_CMYK_2 (HID_CUI_START + 248) -#define HID_TPCOLOR_CMYK_3 (HID_CUI_START + 249) -#define HID_ALIGNMENT (HID_CUI_START + 250) -#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_CUI_START + 251) -#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_CUI_START + 252) -#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_CUI_START + 253) -#define HID_OFACTL_AUTOCORR_REPLACE (HID_CUI_START + 254) -#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_CUI_START + 255) -#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_CUI_START + 256) -#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_CUI_START + 257) -#define HID_BACKGROUND (HID_CUI_START + 258) -#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_CUI_START + 259) -#define HID_BACKGROUND_CTL_POSITION (HID_CUI_START + 260) -#define HID_BORDER (HID_CUI_START + 261) -#define HID_BORDER_CTL_PRESETS (HID_CUI_START + 262) -#define HID_BORDER_CTL_SHADOWS (HID_CUI_START + 263) -#define HID_PAGE_CONNECTION (HID_CUI_START + 264) -#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_CUI_START + 265) -#define HID_PAGE_DISTRIBUTE (HID_CUI_START + 266) -#define HID_SVXPAGE_GRFCROP (HID_CUI_START + 267) -#define HID_CAPTION (HID_CUI_START + 268) -#define HID_CAPTION_CTL_TYPE (HID_CUI_START + 269) -#define HID_PAGE_MEASURE (HID_CUI_START + 270) -#define HID_MEASURE_CTL_POSITION (HID_CUI_START + 271) -#define HID_NUMBERFORMAT (HID_CUI_START + 272) -#define HID_NUMBERFORMAT_TBI_ADD (HID_CUI_START + 273) -#define HID_NUMBERFORMAT_TBI_REMOVE (HID_CUI_START + 274) -#define HID_FORMAT_PAGE (HID_CUI_START + 275) -#define HID_REDLINING_DLG (HID_CUI_START + 276) -#define HID_REDLINING_EDIT (HID_CUI_START + 277) -#define HID_REDLINING_PREV (HID_CUI_START + 278) -#define HID_REDLINING_NEXT (HID_CUI_START + 279) -#define HID_FORMAT_PARAGRAPH_STD (HID_CUI_START + 280) -#define HID_VALUESET_SINGLENUM (HID_CUI_START + 281) -#define HID_VALUESET_BULLET (HID_CUI_START + 282) -#define HID_VALUESET_NUM (HID_CUI_START + 283) -#define HID_VALUESET_NUMBMP (HID_CUI_START + 284) -#define HID_SVXPAGE_PICK_NUM (HID_CUI_START + 285) -#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_CUI_START + 286) -#define HID_SVXPAGE_PICK_BMP (HID_CUI_START + 287) -#define HID_SVXPAGE_PICK_BULLET (HID_CUI_START + 288) -#define HID_SVXPAGE_NUM_OPTIONS (HID_CUI_START + 289) -#define HID_SVXPAGE_NUM_POSITION (HID_CUI_START + 290) -#define HID_MEASURE_CTL_PREVIEW (HID_CUI_START + 291) -#define HID_FORMAT_PARAGRAPH_EXT (HID_CUI_START + 292) -#define HID_FORMAT_PARAGRAPH_ALIGN (HID_CUI_START + 293) -#define HID_SVXPAGE_PARA_ASIAN (HID_CUI_START + 294) -#define HID_SVXPAGE_SWPOSSIZE (HID_CUI_START + 295) -#define HID_AREA_TRANSPARENCE (HID_CUI_START + 296) -#define HID_AREA_AREA (HID_CUI_START + 297) -#define HID_AREA_SHADOW (HID_CUI_START + 298) -#define HID_AREA_HATCH (HID_CUI_START + 299) -#define HID_AREA_BITMAP (HID_CUI_START + 300) -#define HID_TPSHADOW_CTRL (HID_CUI_START + 301) -#define HID_AREA_GRADIENT (HID_CUI_START + 302) -#define HID_LINE_ENDDEF (HID_CUI_START + 303) -#define HID_LINE_LINE (HID_CUI_START + 304) -#define HID_LINE_DEF (HID_CUI_START + 305) -#define HID_SPELLDLG_SETWORD (HID_CUI_START + 306) -#define HID_TABULATOR (HID_CUI_START + 307) -#define HID_PAGE_TEXTATTR (HID_CUI_START + 308) -#define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309) -#define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310) -#define HID_HYPHENATE (HID_CUI_START + 311) -#define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312) -#define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313) -#define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314) -#define HID_HYPERLINK_INTERNET (HID_CUI_START + 315) -#define HID_HYPERLINK_MAIL (HID_CUI_START + 316) -#define HID_HYPERLINK_DOCUMENT (HID_CUI_START + 317) -#define HID_HYPERLINK_NEWDOCUMENT (HID_CUI_START + 318) -#define HID_HYPERLINK_MARKWND (HID_CUI_START + 319) -#define HID_ICCDIALOG_RESET_BTN (HID_CUI_START + 320) -#define HID_ICCDIALOG_CHOICECTRL (HID_CUI_START + 321) -#define HID_HYPERDLG_INET_PATH (HID_CUI_START + 322) -#define HID_HYPERDLG_MAIL_PATH (HID_CUI_START + 323) -#define HID_HYPERDLG_DOC_PATH (HID_CUI_START + 324) -#define HID_ICCDIALOG_OK_BTN (HID_CUI_START + 325) -#define HID_ICCDIALOG_CANCEL_BTN (HID_CUI_START + 326) -#define HID_HYPERLINK_MARKWND_APPLY (HID_CUI_START + 327) -#define HID_HYPERLINK_MARKWND_CLOSE (HID_CUI_START + 328) -#define HID_HYPERLINK_MARKWND_TREE (HID_CUI_START + 329) -#define HID_SVXPAGE_CHAR_TWOLINES (HID_CUI_START + 330) -#define HID_GRFFILTER_EMBOSS_LIGHT (HID_CUI_START + 331) -#define HID_PASTE_DLG (HID_CUI_START + 333) -#define HID_LINKDLG_TABLB (HID_CUI_START + 334) -#define HID_MACRO_HEADERTABLISTBOX (HID_CUI_START + 335) -#define HID_GALLERY_ENTER_TITLE (HID_CUI_START + 336) -#define HID_GALLERY_TITLE_EDIT (HID_CUI_START + 337) -#define HID_THES_LANGUAGE (HID_CUI_START + 338) -#define HID_OFAPAGE_QUOTE_SW_CLB (HID_CUI_START + 339) -#define HID_OFAPAGE_QUOTE_CLB (HID_CUI_START + 340) - -// please adjust ACT_SVX_HID_END2 below if you add entries here! - -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_CUI_HID_END HID_CUI_START + 340 - -#if ACT_CUI_HID_END > HID_CUI_END -#error Resource-Ueberlauf in #line, #file -#endif - +#define HID_OPTIONS_COLOR "CUI_HID_OPTIONS_COLOR" +#define HID_OPTIONS_SAVE "CUI_HID_OPTIONS_SAVE" +#define HID_OPTIONS_PATH "CUI_HID_OPTIONS_PATH" +#define HID_OPTIONS_GENERAL "CUI_HID_OPTIONS_GENERAL" +#define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU" +#define HID_OPTIONS_SPELL "CUI_HID_OPTIONS_SPELL" +#define HID_OPTIONS_DICT_NEW "CUI_HID_OPTIONS_DICT_NEW" +#define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT" +#define HID_OPTIONS_INET "CUI_HID_OPTIONS_INET" +#define HID_OPTIONS_CHART_DEFCOLORS "CUI_HID_OPTIONS_CHART_DEFCOLORS" +#define HID_OPTIONS_CTL "CUI_HID_OPTIONS_CTL" +#define HID_OPTIONS_PROXY "CUI_HID_OPTIONS_PROXY" +#define HID_OPTIONS_SEARCH "CUI_HID_OPTIONS_SEARCH" +#define HID_OPTIONS_MAIL "CUI_HID_OPTIONS_MAIL" +#define HID_OPTIONS_ASIAN_LAYOUT "CUI_HID_OPTIONS_ASIAN_LAYOUT" +#define HID_CLB_EDIT_MODULES_DICS "CUI_HID_CLB_EDIT_MODULES_DICS" +#define HID_CLB_EDIT_MODULES_MODULES "CUI_HID_CLB_EDIT_MODULES_MODULES" +#define HID_CLB_LINGU_MODULES "CUI_HID_CLB_LINGU_MODULES" +#define HID_CLB_LINGU_OPTIONS "CUI_HID_CLB_LINGU_OPTIONS" +#define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES" +#define HID_LNGDLG_NUM_PREBREAK "CUI_HID_LNGDLG_NUM_PREBREAK" +#define HID_OPTIONS_COLORCONFIG "CUI_HID_OPTIONS_COLORCONFIG" +#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME" +#define HID_OPTIONS_ACCESSIBILITYCONFIG "CUI_HID_OPTIONS_ACCESSIBILITYCONFIG" +#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN "CUI_HID_OPTIONS_COLORCONFIG_COLORLIST_WIN" +#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME" +#define HID_OPTIONS_PATHS_SELECTFOLDER "CUI_HID_OPTIONS_PATHS_SELECTFOLDER" +#define HID_OPTIONS_JAVA "CUI_HID_OPTIONS_JAVA" +#define HID_OPTIONS_JAVA_LIST "CUI_HID_OPTIONS_JAVA_LIST" +#define HID_OPTIONS_JAVA_PARAMETER "CUI_HID_OPTIONS_JAVA_PARAMETER" +#define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH" +#define HID_SVXPAGE_JSEARCH_OPTIONS "CUI_HID_SVXPAGE_JSEARCH_OPTIONS" +#define HID_SVXDLG_FILTER_WARNING "CUI_HID_SVXDLG_FILTER_WARNING" +#define HID_SVX_OPTIONS_ONLINEUPDATE "CUI_HID_SVX_OPTIONS_ONLINEUPDATE" +#define HID_DLG_SECURITY_OPTIONS "CUI_HID_DLG_SECURITY_OPTIONS" +#define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE" +#define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST" +#define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK" +#define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB" +#define HID_OFA_TP_MISC "CUI_HID_OFA_TP_MISC" +#define HID_OFA_TP_VIEW "CUI_HID_OFA_TP_VIEW" +#define HID_OFA_TP_LANGUAGES "CUI_HID_OFA_TP_LANGUAGES" +#define HID_OFA_TP_MEMORY "CUI_HID_OFA_TP_MEMORY" +#define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH" +#define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR" +#define HID_OFAPAGE_SMARTTAG_OPTIONS "CUI_HID_OFAPAGE_SMARTTAG_OPTIONS" +#define HID_OFAPAGE_MSFLTR2_CLB "CUI_HID_OFAPAGE_MSFLTR2_CLB" +#define HID_OPTPATH_CTL_PATH "CUI_HID_OPTPATH_CTL_PATH" +#define HID_OFADLG_TREELISTBOX "CUI_HID_OFADLG_TREELISTBOX" +#define HID_DLG_WEBCONNECTION_INFO "CUI_HID_DLG_WEBCONNECTION_INFO" +#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST "CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST" +#define HID_OPTPATH_HEADERBAR "CUI_HID_OPTPATH_HEADERBAR" +#define HID_WARN_NAME_DUPLICATE "CUI_HID_WARN_NAME_DUPLICATE" +#define HID_COLORPAGE_LISTBOX_START "CUI_HID_COLORPAGE_LISTBOX_START" +#define HID_COLORPAGE_DOCCOLOR_LB "CUI_HID_COLORPAGE_DOCCOLOR_LB" +#define HID_COLORPAGE_DOCBOUNDARIES_LB "CUI_HID_COLORPAGE_DOCBOUNDARIES_LB" +#define HID_COLORPAGE_APPBACKGROUND_LB "CUI_HID_COLORPAGE_APPBACKGROUND_LB" +#define HID_COLORPAGE_OBJECTBOUNDARIES_LB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_LB" +#define HID_COLORPAGE_TABLEBOUNDARIES_LB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_LB" +#define HID_COLORPAGE_FONTCOLOR_LB "CUI_HID_COLORPAGE_FONTCOLOR_LB" +#define HID_COLORPAGE_LINKS_LB "CUI_HID_COLORPAGE_LINKS_LB" +#define HID_COLORPAGE_LINKSVISITED_LB "CUI_HID_COLORPAGE_LINKSVISITED_LB" +#define HID_COLORPAGE_ANCHOR_LB "CUI_HID_COLORPAGE_ANCHOR_LB" +#define HID_COLORPAGE_SPELL_LB "CUI_HID_COLORPAGE_SPELL_LB" +#define HID_COLORPAGE_WRITERTEXTGRID_LB "CUI_HID_COLORPAGE_WRITERTEXTGRID_LB" +#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_LB" +#define HID_COLORPAGE_WRITERIDXSHADINGS_LB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_LB" +#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_LB" +#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_LB" +#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB" +#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB" +#define HID_COLORPAGE_WRITERPAGEBREAKS_LB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_LB" +#define HID_COLORPAGE_HTMLSGML_LB "CUI_HID_COLORPAGE_HTMLSGML_LB" +#define HID_COLORPAGE_HTMLCOMMENT_LB "CUI_HID_COLORPAGE_HTMLCOMMENT_LB" +#define HID_COLORPAGE_HTMLKEYWORD_LB "CUI_HID_COLORPAGE_HTMLKEYWORD_LB" +#define HID_COLORPAGE_HTMLUNKNOWN_LB "CUI_HID_COLORPAGE_HTMLUNKNOWN_LB" +#define HID_COLORPAGE_CALCGRID_LB "CUI_HID_COLORPAGE_CALCGRID_LB" +#define HID_COLORPAGE_CALCPAGEBREAK_LB "CUI_HID_COLORPAGE_CALCPAGEBREAK_LB" +#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB" +#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB" +#define HID_COLORPAGE_CALCDETECTIVE_LB "CUI_HID_COLORPAGE_CALCDETECTIVE_LB" +#define HID_COLORPAGE_CALCDETECTIVEERROR_LB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_LB" +#define HID_COLORPAGE_CALCREFERENCE_LB "CUI_HID_COLORPAGE_CALCREFERENCE_LB" +#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_LB" +#define HID_COLORPAGE_DRAWGRID_LB "CUI_HID_COLORPAGE_DRAWGRID_LB" +#define HID_COLORPAGE_DRAWDRAWING_LB "CUI_HID_COLORPAGE_DRAWDRAWING_LB" +#define HID_COLORPAGE_DRAWFILL_LB "CUI_HID_COLORPAGE_DRAWFILL_LB" +#define HID_COLORPAGE_BASICIDENTIFIER_LB "CUI_HID_COLORPAGE_BASICIDENTIFIER_LB" +#define HID_COLORPAGE_BASICCOMMENT_LB "CUI_HID_COLORPAGE_BASICCOMMENT_LB" +#define HID_COLORPAGE_BASICNUMBER_LB "CUI_HID_COLORPAGE_BASICNUMBER_LB" +#define HID_COLORPAGE_BASICSTRING_LB "CUI_HID_COLORPAGE_BASICSTRING_LB" +#define HID_COLORPAGE_BASICOPERATOR_LB "CUI_HID_COLORPAGE_BASICOPERATOR_LB" +#define HID_COLORPAGE_BASICKEYWORD_LB "CUI_HID_COLORPAGE_BASICKEYWORD_LB" +#define HID_COLORPAGE_BASICERROR_LB "CUI_HID_COLORPAGE_BASICERROR_LB" +#define HID_COLORPAGE_CHECKBOX_START "CUI_HID_COLORPAGE_CHECKBOX_START" +#define HID_COLORPAGE_DOCCOLOR_CB "CUI_HID_COLORPAGE_DOCCOLOR_CB" +#define HID_COLORPAGE_DOCBOUNDARIES_CB "CUI_HID_COLORPAGE_DOCBOUNDARIES_CB" +#define HID_COLORPAGE_APPBACKGROUND_CB "CUI_HID_COLORPAGE_APPBACKGROUND_CB" +#define HID_COLORPAGE_OBJECTBOUNDARIES_CB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_CB" +#define HID_COLORPAGE_TABLEBOUNDARIES_CB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_CB" +#define HID_COLORPAGE_FONTCOLOR_CB "CUI_HID_COLORPAGE_FONTCOLOR_CB" +#define HID_COLORPAGE_LINKS_CB "CUI_HID_COLORPAGE_LINKS_CB" +#define HID_COLORPAGE_LINKSVISITED_CB "CUI_HID_COLORPAGE_LINKSVISITED_CB" +#define HID_COLORPAGE_ANCHOR_CB "CUI_HID_COLORPAGE_ANCHOR_CB" +#define HID_COLORPAGE_SPELL_CB "CUI_HID_COLORPAGE_SPELL_CB" +#define HID_COLORPAGE_WRITERTEXTGRID_CB "CUI_HID_COLORPAGE_WRITERTEXTGRID_CB" +#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_CB" +#define HID_COLORPAGE_WRITERIDXSHADINGS_CB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_CB" +#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_CB" +#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_CB" +#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB" +#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB" +#define HID_COLORPAGE_WRITERPAGEBREAKS_CB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_CB" +#define HID_COLORPAGE_HTMLSGML_CB "CUI_HID_COLORPAGE_HTMLSGML_CB" +#define HID_COLORPAGE_HTMLCOMMENT_CB "CUI_HID_COLORPAGE_HTMLCOMMENT_CB" +#define HID_COLORPAGE_HTMLKEYWORD_CB "CUI_HID_COLORPAGE_HTMLKEYWORD_CB" +#define HID_COLORPAGE_HTMLUNKNOWN_CB "CUI_HID_COLORPAGE_HTMLUNKNOWN_CB" +#define HID_COLORPAGE_CALCGRID_CB "CUI_HID_COLORPAGE_CALCGRID_CB" +#define HID_COLORPAGE_CALCPAGEBREAK_CB "CUI_HID_COLORPAGE_CALCPAGEBREAK_CB" +#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB" +#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB" +#define HID_COLORPAGE_CALCDETECTIVE_CB "CUI_HID_COLORPAGE_CALCDETECTIVE_CB" +#define HID_COLORPAGE_CALCDETECTIVEERROR_CB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_CB" +#define HID_COLORPAGE_CALCREFERENCE_CB "CUI_HID_COLORPAGE_CALCREFERENCE_CB" +#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_CB" +#define HID_COLORPAGE_DRAWGRID_CB "CUI_HID_COLORPAGE_DRAWGRID_CB" +#define HID_COLORPAGE_DRAWDRAWING_CB "CUI_HID_COLORPAGE_DRAWDRAWING_CB" +#define HID_COLORPAGE_DRAWFILL_CB "CUI_HID_COLORPAGE_DRAWFILL_CB" +#define HID_COLORPAGE_BASICIDENTIFIER_CB "CUI_HID_COLORPAGE_BASICIDENTIFIER_CB" +#define HID_COLORPAGE_BASICCOMMENT_CB "CUI_HID_COLORPAGE_BASICCOMMENT_CB" +#define HID_COLORPAGE_BASICNUMBER_CB "CUI_HID_COLORPAGE_BASICNUMBER_CB" +#define HID_COLORPAGE_BASICSTRING_CB "CUI_HID_COLORPAGE_BASICSTRING_CB" +#define HID_COLORPAGE_BASICOPERATOR_CB "CUI_HID_COLORPAGE_BASICOPERATOR_CB" +#define HID_COLORPAGE_BASICKEYWORD_CB "CUI_HID_COLORPAGE_BASICKEYWORD_CB" +#define HID_COLORPAGE_BASICERROR_CB "CUI_HID_COLORPAGE_BASICERROR_CB" +#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE "CUI_HID_NUMBERINGOPT_SEL_GRF_FROM_FILE" +#define HID_SVX_MACRO_LB_EVENT "CUI_HID_SVX_MACRO_LB_EVENT" +#define HID_SVX_CONFIG_EVENT "CUI_HID_SVX_CONFIG_EVENT" +#define HID_CONFIG_EVENT_OFFICE_BASED "CUI_HID_CONFIG_EVENT_OFFICE_BASED" +#define HID_CONFIG_EVENT_DOCUMENT_BASED "CUI_HID_CONFIG_EVENT_DOCUMENT_BASED" +#define HID_SELECTOR_DIALOG "CUI_HID_SELECTOR_DIALOG" +#define HID_SELECTOR_CATEGORIES "CUI_HID_SELECTOR_CATEGORIES" +#define HID_SVX_CONFIG_TOOLBAR "CUI_HID_SVX_CONFIG_TOOLBAR" +#define HID_SVX_CONFIG_TOOLBAR_CONTENTS "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS" +#define HID_SELECTOR_COMMANDS "CUI_HID_SELECTOR_COMMANDS" +#define HID_GALLERY_EDIT_MSNAME "CUI_HID_GALLERY_EDIT_MSNAME" +#define HID_SVX_CONFIG_MENU "CUI_HID_SVX_CONFIG_MENU" +#define HID_SVX_CONFIG_MENU_CONTENTS "CUI_HID_SVX_CONFIG_MENU_CONTENTS" +#define HID_GALLERY_NEWTHEME_FINDFILES "CUI_HID_GALLERY_NEWTHEME_FINDFILES" +#define HID_GALLERY_NEWTHEME_ADDFILES "CUI_HID_GALLERY_NEWTHEME_ADDFILES" +#define HID_HANGULDLG_BUTTON_OPTIONS "CUI_HID_HANGULDLG_BUTTON_OPTIONS" +#define HID_HANGULDLG_BUTTON_CLOSE "CUI_HID_HANGULDLG_BUTTON_CLOSE" +#define HID_HANGULDLG_BUTTON_IGNORE "CUI_HID_HANGULDLG_BUTTON_IGNORE" +#define HID_HANGULDLG_BUTTON_IGNOREALL "CUI_HID_HANGULDLG_BUTTON_IGNOREALL" +#define HID_HANGULDLG_BUTTON_CHANGE "CUI_HID_HANGULDLG_BUTTON_CHANGE" +#define HID_HANGULDLG_BUTTON_CHANGEALL "CUI_HID_HANGULDLG_BUTTON_CHANGEALL" +#define HID_OFA_FONT_SUBSTITUTION "CUI_HID_OFA_FONT_SUBSTITUTION" +#define HID_HANGULDLG_EDIT_NEWWORD "CUI_HID_HANGULDLG_EDIT_NEWWORD" +#define HID_OFA_SUBST_APPLY "CUI_HID_OFA_SUBST_APPLY" +#define HID_OFA_SUBST_DELETE "CUI_HID_OFA_SUBST_DELETE" +#define HID_SPLDLG_BUTTON_CLOSE "CUI_HID_SPLDLG_BUTTON_CLOSE" +#define HID_SPLDLG_BUTTON_IGNORE "CUI_HID_SPLDLG_BUTTON_IGNORE" +#define HID_SPLDLG_BUTTON_IGNOREALL "CUI_HID_SPLDLG_BUTTON_IGNOREALL" +#define HID_SPLDLG_BUTTON_CHANGE "CUI_HID_SPLDLG_BUTTON_CHANGE" +#define HID_SPLDLG_BUTTON_CHANGEALL "CUI_HID_SPLDLG_BUTTON_CHANGEALL" +#define HID_SPLDLG_BUTTON_EXPLAIN "CUI_HID_SPLDLG_BUTTON_EXPLAIN" +#define HID_CHARMAP_CTL_SHOWSET "CUI_HID_CHARMAP_CTL_SHOWSET" +#define HID_CHARMAP_CTL_SHOWTEXT "CUI_HID_CHARMAP_CTL_SHOWTEXT" +#define HID_CHARMAP_CTL_SHOWCHAR "CUI_HID_CHARMAP_CTL_SHOWCHAR" +#define HID_DLG_NAME "CUI_HID_DLG_NAME" +#define HID_DLG_MESSBOX "CUI_HID_DLG_MESSBOX" +#define HID_HANGULDLG_SUGGESTIONS "CUI_HID_HANGULDLG_SUGGESTIONS" +#define HID_HANGULDLG_SUGGESTIONS_GRID "CUI_HID_HANGULDLG_SUGGESTIONS_GRID" +#define HID_HANGULDLG_SUGGESTIONS_LIST "CUI_HID_HANGULDLG_SUGGESTIONS_LIST" +#define HID_DLG_OBJECT_NAME "CUI_HID_DLG_OBJECT_NAME" +#define HID_DLG_OBJECT_TITLE_DESC "CUI_HID_DLG_OBJECT_TITLE_DESC" +#define HID_SVX_CONFIG_MENU_ORGANIZER "CUI_HID_SVX_CONFIG_MENU_ORGANIZER" +#define HID_SVX_CONFIG_ICON_SELECTOR "CUI_HID_SVX_CONFIG_ICON_SELECTOR" +#define HID_SVX_CONFIG_NAME_SUBMENU "CUI_HID_SVX_CONFIG_NAME_SUBMENU" +#define HID_SVX_CONFIG_RENAME_MENU "CUI_HID_SVX_CONFIG_RENAME_MENU" +#define HID_SVX_CONFIG_RENAME_MENU_ITEM "CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM" +#define HID_SVX_CONFIG_RENAME_TOOLBAR "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR" +#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM" +#define HID_SVX_NEW_TOOLBAR "CUI_HID_SVX_NEW_TOOLBAR" +#define HID_SVX_MODIFY_TOOLBAR "CUI_HID_SVX_MODIFY_TOOLBAR" +#define HID_SVX_NEW_TOOLBAR_ITEM "CUI_HID_SVX_NEW_TOOLBAR_ITEM" +#define HID_SVX_CONFIG_MENU_LISTBOX "CUI_HID_SVX_CONFIG_MENU_LISTBOX" +#define HID_SVX_MODIFY_TOOLBAR_ITEM "CUI_HID_SVX_MODIFY_TOOLBAR_ITEM" +#define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN" +#define HID_OPTIONS_MULTIPATH_LIST "CUI_HID_OPTIONS_MULTIPATH_LIST" +#define HID_FM_DLG_SEARCH "CUI_HID_FM_DLG_SEARCH" +#define HID_SEARCH_TEXT "CUI_HID_SEARCH_TEXT" +#define HID_SEARCH_ALLFIELDS "CUI_HID_SEARCH_ALLFIELDS" +#define HID_GALLERY_PROPERTIES_GENERAL "CUI_HID_GALLERY_PROPERTIES_GENERAL" +#define HID_SEARCH_FIELDSELECTION "CUI_HID_SEARCH_FIELDSELECTION" +#define HID_SEARCH_POSITION "CUI_HID_SEARCH_POSITION" +#define HID_SEARCH_FORMATTER "CUI_HID_SEARCH_FORMATTER" +#define HID_SEARCH_CASE "CUI_HID_SEARCH_CASE" +#define HID_SEARCH_BACKWARD "CUI_HID_SEARCH_BACKWARD" +#define HID_SEARCH_STARTOVER "CUI_HID_SEARCH_STARTOVER" +#define HID_SEARCH_WILDCARD "CUI_HID_SEARCH_WILDCARD" +#define HID_SEARCH_REGULAR "CUI_HID_SEARCH_REGULAR" +#define HID_SEARCH_APPROX "CUI_HID_SEARCH_APPROX" +#define HID_SEARCH_APPROXSETTINGS "CUI_HID_SEARCH_APPROXSETTINGS" +#define HID_SEARCH_BTN_SEARCH "CUI_HID_SEARCH_BTN_SEARCH" +#define HID_SEARCH_BTN_CLOSE "CUI_HID_SEARCH_BTN_CLOSE" +#define HID_GALLERY_BROWSER "CUI_HID_GALLERY_BROWSER" +#define HID_GALLERY_SEARCH "CUI_HID_GALLERY_SEARCH" +#define HID_GALLERY_APPLY "CUI_HID_GALLERY_APPLY" +#define HID_SPLDLG_BUTTON_IGNORERULE "CUI_HID_SPLDLG_BUTTON_IGNORERULE" +#define HID_CONFIG_ACCEL "CUI_HID_CONFIG_ACCEL" +#define HID_ACCELCONFIG_LISTBOX "CUI_HID_ACCELCONFIG_LISTBOX" +#define HID_CONFIGGROUP_ACC_LISTBOX "CUI_HID_CONFIGGROUP_ACC_LISTBOX" +#define HID_CONFIGFUNCTION_ACC_LISTBOX "CUI_HID_CONFIGFUNCTION_ACC_LISTBOX" +#define HID_MACRO_LB_EVENT "CUI_HID_MACRO_LB_EVENT" +#define HID_MACRO_GROUP "CUI_HID_MACRO_GROUP" +#define HID_MACRO_MACROS "CUI_HID_MACRO_MACROS" +#define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA" +#define HID_HANGULHANJA_OPT_DLG "CUI_HID_HANGULHANJA_OPT_DLG" +#define HID_HANGULHANJA_NEWDICT_DLG "CUI_HID_HANGULHANJA_NEWDICT_DLG" +#define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG" +#define HID_HANGULHANJA_OPT_DICTS_LB "CUI_HID_HANGULHANJA_OPT_DICTS_LB" +#define HID_MULTIPATH "CUI_HID_MULTIPATH" +#define HID_SCRIPTORG_DIALOG "CUI_HID_SCRIPTORG_DIALOG" +#define HID_SCRIPTSBOX "CUI_HID_SCRIPTSBOX" +#define HID_SPELLCHECK "CUI_HID_SPELLCHECK" +#define HID_TPSIZE_CTRL "CUI_HID_TPSIZE_CTRL" +#define HID_TPROTATION_CTRL1 "CUI_HID_TPROTATION_CTRL1" +#define HID_TPROTATION_CTRL2 "CUI_HID_TPROTATION_CTRL2" +#define HID_TRANS_ANGLE "CUI_HID_TRANS_ANGLE" +#define HID_TPPOSITION_CTRL "CUI_HID_TPPOSITION_CTRL" +#define HID_NUMBERFORMAT_LB_FORMAT "CUI_HID_NUMBERFORMAT_LB_FORMAT" +#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW "CUI_HID_NUMBERFORMAT_WND_NUMBER_PREVIEW" +#define HID_TRANS_SLANT "CUI_HID_TRANS_SLANT" +#define HID_TPHATCH_CTRL "CUI_HID_TPHATCH_CTRL" +#define HID_SEARCHATTR_CTL_ATTR "CUI_HID_SEARCHATTR_CTL_ATTR" +#define HID_NUMBERFORMAT_TBI_INFO "CUI_HID_NUMBERFORMAT_TBI_INFO" +#define HID_SEARCHATTR "CUI_HID_SEARCHATTR" +#define HID_ALIGNMENT_CTR_DIAL "CUI_HID_ALIGNMENT_CTR_DIAL" +#define HID_ALIGNMENT_CTR_BORDER_LOCK "CUI_HID_ALIGNMENT_CTR_BORDER_LOCK" +#define HID_SEARCHSIMILARITY "CUI_HID_SEARCHSIMILARITY" +#define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS" +#define HID_OFAPAGE_AUTOCORR_CLB "CUI_HID_OFAPAGE_AUTOCORR_CLB" +#define HID_AUTOCORR_LANGUAGE "CUI_HID_AUTOCORR_LANGUAGE" +#define HID_OFAPAGE_AUTOFORMAT_CLB "CUI_HID_OFAPAGE_AUTOFORMAT_CLB" +#define HID_TPCOLOR_RGB_1 "CUI_HID_TPCOLOR_RGB_1" +#define HID_TPCOLOR_RGB_2 "CUI_HID_TPCOLOR_RGB_2" +#define HID_TPCOLOR_RGB_3 "CUI_HID_TPCOLOR_RGB_3" +#define HID_TPCOLOR_CMYK_1 "CUI_HID_TPCOLOR_CMYK_1" +#define HID_TPCOLOR_CMYK_2 "CUI_HID_TPCOLOR_CMYK_2" +#define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3" +#define HID_ALIGNMENT "CUI_HID_ALIGNMENT" +#define HID_OFAPAGE_AUTOCORR_OPTIONS "CUI_HID_OFAPAGE_AUTOCORR_OPTIONS" +#define HID_OFAPAGE_AUTOFMT_OPTIONS "CUI_HID_OFAPAGE_AUTOFMT_OPTIONS" +#define HID_OFAPAGE_AUTOCORR_REPLACE "CUI_HID_OFAPAGE_AUTOCORR_REPLACE" +#define HID_OFACTL_AUTOCORR_REPLACE "CUI_HID_OFACTL_AUTOCORR_REPLACE" +#define HID_OFAPAGE_AUTOCORR_EXCEPT "CUI_HID_OFAPAGE_AUTOCORR_EXCEPT" +#define HID_OFAPAGE_AUTOCORR_QUOTE "CUI_HID_OFAPAGE_AUTOCORR_QUOTE" +#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS" +#define HID_BACKGROUND "CUI_HID_BACKGROUND" +#define HID_BACKGROUND_CTL_BGDCOLORSET "CUI_HID_BACKGROUND_CTL_BGDCOLORSET" +#define HID_BACKGROUND_CTL_POSITION "CUI_HID_BACKGROUND_CTL_POSITION" +#define HID_BORDER "CUI_HID_BORDER" +#define HID_BORDER_CTL_PRESETS "CUI_HID_BORDER_CTL_PRESETS" +#define HID_BORDER_CTL_SHADOWS "CUI_HID_BORDER_CTL_SHADOWS" +#define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION" +#define HID_PAGE_CONNECTION_CTL_PREVIEW "CUI_HID_PAGE_CONNECTION_CTL_PREVIEW" +#define HID_PAGE_DISTRIBUTE "CUI_HID_PAGE_DISTRIBUTE" +#define HID_SVXPAGE_GRFCROP "CUI_HID_SVXPAGE_GRFCROP" +#define HID_CAPTION "CUI_HID_CAPTION" +#define HID_CAPTION_CTL_TYPE "CUI_HID_CAPTION_CTL_TYPE" +#define HID_PAGE_MEASURE "CUI_HID_PAGE_MEASURE" +#define HID_MEASURE_CTL_POSITION "CUI_HID_MEASURE_CTL_POSITION" +#define HID_NUMBERFORMAT "CUI_HID_NUMBERFORMAT" +#define HID_NUMBERFORMAT_TBI_ADD "CUI_HID_NUMBERFORMAT_TBI_ADD" +#define HID_NUMBERFORMAT_TBI_REMOVE "CUI_HID_NUMBERFORMAT_TBI_REMOVE" +#define HID_FORMAT_PAGE "CUI_HID_FORMAT_PAGE" +#define HID_REDLINING_DLG "CUI_HID_REDLINING_DLG" +#define HID_REDLINING_EDIT "CUI_HID_REDLINING_EDIT" +#define HID_REDLINING_PREV "CUI_HID_REDLINING_PREV" +#define HID_REDLINING_NEXT "CUI_HID_REDLINING_NEXT" +#define HID_FORMAT_PARAGRAPH_STD "CUI_HID_FORMAT_PARAGRAPH_STD" +#define HID_VALUESET_SINGLENUM "CUI_HID_VALUESET_SINGLENUM" +#define HID_VALUESET_BULLET "CUI_HID_VALUESET_BULLET" +#define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM" +#define HID_VALUESET_NUMBMP "CUI_HID_VALUESET_NUMBMP" +#define HID_SVXPAGE_PICK_NUM "CUI_HID_SVXPAGE_PICK_NUM" +#define HID_SVXPAGE_PICK_SINGLE_NUM "CUI_HID_SVXPAGE_PICK_SINGLE_NUM" +#define HID_SVXPAGE_PICK_BMP "CUI_HID_SVXPAGE_PICK_BMP" +#define HID_SVXPAGE_PICK_BULLET "CUI_HID_SVXPAGE_PICK_BULLET" +#define HID_SVXPAGE_NUM_OPTIONS "CUI_HID_SVXPAGE_NUM_OPTIONS" +#define HID_SVXPAGE_NUM_POSITION "CUI_HID_SVXPAGE_NUM_POSITION" +#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW" +#define HID_FORMAT_PARAGRAPH_EXT "CUI_HID_FORMAT_PARAGRAPH_EXT" +#define HID_FORMAT_PARAGRAPH_ALIGN "CUI_HID_FORMAT_PARAGRAPH_ALIGN" +#define HID_SVXPAGE_PARA_ASIAN "CUI_HID_SVXPAGE_PARA_ASIAN" +#define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE" +#define HID_AREA_TRANSPARENCE "CUI_HID_AREA_TRANSPARENCE" +#define HID_AREA_AREA "CUI_HID_AREA_AREA" +#define HID_AREA_SHADOW "CUI_HID_AREA_SHADOW" +#define HID_AREA_HATCH "CUI_HID_AREA_HATCH" +#define HID_AREA_BITMAP "CUI_HID_AREA_BITMAP" +#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL" +#define HID_AREA_GRADIENT "CUI_HID_AREA_GRADIENT" +#define HID_LINE_ENDDEF "CUI_HID_LINE_ENDDEF" +#define HID_LINE_LINE "CUI_HID_LINE_LINE" +#define HID_LINE_DEF "CUI_HID_LINE_DEF" +#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD" +#define HID_TABULATOR "CUI_HID_TABULATOR" +#define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR" +#define HID_TEXTATTR_CTL_POSITION "CUI_HID_TEXTATTR_CTL_POSITION" +#define HID_TRANS_POSITION_SIZE "CUI_HID_TRANS_POSITION_SIZE" +#define HID_HYPHENATE "CUI_HID_HYPHENATE" +#define HID_SVXPAGE_CHAR_NAME "CUI_HID_SVXPAGE_CHAR_NAME" +#define HID_SVXPAGE_CHAR_EFFECTS "CUI_HID_SVXPAGE_CHAR_EFFECTS" +#define HID_SVXPAGE_CHAR_POSITION "CUI_HID_SVXPAGE_CHAR_POSITION" +#define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET" +#define HID_HYPERLINK_MAIL "CUI_HID_HYPERLINK_MAIL" +#define HID_HYPERLINK_DOCUMENT "CUI_HID_HYPERLINK_DOCUMENT" +#define HID_HYPERLINK_NEWDOCUMENT "CUI_HID_HYPERLINK_NEWDOCUMENT" +#define HID_HYPERLINK_MARKWND "CUI_HID_HYPERLINK_MARKWND" +#define HID_ICCDIALOG_RESET_BTN "CUI_HID_ICCDIALOG_RESET_BTN" +#define HID_ICCDIALOG_CHOICECTRL "CUI_HID_ICCDIALOG_CHOICECTRL" +#define HID_HYPERDLG_INET_PATH "CUI_HID_HYPERDLG_INET_PATH" +#define HID_HYPERDLG_MAIL_PATH "CUI_HID_HYPERDLG_MAIL_PATH" +#define HID_HYPERDLG_DOC_PATH "CUI_HID_HYPERDLG_DOC_PATH" +#define HID_ICCDIALOG_OK_BTN "CUI_HID_ICCDIALOG_OK_BTN" +#define HID_ICCDIALOG_CANCEL_BTN "CUI_HID_ICCDIALOG_CANCEL_BTN" +#define HID_HYPERLINK_MARKWND_APPLY "CUI_HID_HYPERLINK_MARKWND_APPLY" +#define HID_HYPERLINK_MARKWND_CLOSE "CUI_HID_HYPERLINK_MARKWND_CLOSE" +#define HID_HYPERLINK_MARKWND_TREE "CUI_HID_HYPERLINK_MARKWND_TREE" +#define HID_SVXPAGE_CHAR_TWOLINES "CUI_HID_SVXPAGE_CHAR_TWOLINES" +#define HID_GRFFILTER_EMBOSS_LIGHT "CUI_HID_GRFFILTER_EMBOSS_LIGHT" +#define HID_PASTE_DLG "CUI_HID_PASTE_DLG" +#define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB" +#define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX" +#define HID_GALLERY_ENTER_TITLE "CUI_HID_GALLERY_ENTER_TITLE" +#define HID_GALLERY_TITLE_EDIT "CUI_HID_GALLERY_TITLE_EDIT" +#define HID_THES_LANGUAGE "CUI_HID_THES_LANGUAGE" +#define HID_OFAPAGE_QUOTE_SW_CLB "CUI_HID_OFAPAGE_QUOTE_SW_CLB" +#define HID_OFAPAGE_QUOTE_CLB "CUI_HID_OFAPAGE_QUOTE_CLB" +#define HID_POSTIT_DIALOG "CUI_HID_POSTIT_DIALOG" #endif diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index b0c678009093..f75ab2471923 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -57,7 +57,7 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog bool bColumn; public: - SvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ); + SvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ); virtual short Execute(void); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 585839b45fe8..76bbafa54faa 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -114,10 +114,8 @@ namespace offapp { SetStyle((GetStyle() & ~WB_HSCROLL) | WB_AUTOHSCROLL); - // FIXME: HELPID - SetUniqueId(""/*UID_OFA_CONNPOOL_DRIVERLIST_BACK*/); - // FIXME: HELPID - GetDataWindow().SetHelpId(""/*HID_OFA_CONNPOOL_DRIVERLIST*/); + SetUniqueId(UID_OFA_CONNPOOL_DRIVERLIST_BACK); + GetDataWindow().SetHelpId(HID_OFA_CONNPOOL_DRIVERLIST); } //-------------------------------------------------------------------- diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 555bc5290f37..c617a3e4c515 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -169,10 +169,8 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx pPathBox->InitHeaderBar( pHeaderBar ); pPathBox->SetHighlightRange(); - // FIXME: HELPID - pPathBox->SetHelpId( ""/*HID_DBPATH_CTL_PATH*/ ); - // FIXME: HELPID - pHeaderBar->SetHelpId( ""/*HID_DBPATH_HEADERBAR*/ ); + pPathBox->SetHelpId( HID_DBPATH_CTL_PATH ); + pHeaderBar->SetHelpId( HID_DBPATH_HEADERBAR ); pPathBox->Show(); pHeaderBar->Show(); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 6903cae224d0..36e43a88ecce 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -97,8 +97,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, aNewPnt.Y() += nDelta; aNewDelTBX.SetPosPixel( aNewPnt ); - // FIXME: HELPID - aCheckLB.SetHelpId(""/*HID_OFA_FONT_SUBST_CLB*/); + aCheckLB.SetHelpId(HID_OFA_FONT_SUBST_CLB); aCheckLB.SetWindowBits(aCheckLB.GetStyle()|WB_HSCROLL|WB_VSCROLL); aCheckLB.SetSelectionMode(MULTIPLE_SELECTION); aCheckLB.SortByCol(2); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 3de833cfd814..ff10e2744533 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -60,6 +60,94 @@ using namespace ::svtools; #define GROUP_BASIC 5 #define GROUP_SQL 6 +const char* aColorLBHids[] = +{ + HID_COLORPAGE_DOCCOLOR_LB, + HID_COLORPAGE_DOCBOUNDARIES_LB, + HID_COLORPAGE_APPBACKGROUND_LB, + HID_COLORPAGE_OBJECTBOUNDARIES_LB, + HID_COLORPAGE_TABLEBOUNDARIES_LB, + HID_COLORPAGE_FONTCOLOR_LB, + HID_COLORPAGE_LINKS_LB, + HID_COLORPAGE_LINKSVISITED_LB, + HID_COLORPAGE_ANCHOR_LB, + HID_COLORPAGE_SPELL_LB, + HID_COLORPAGE_WRITERTEXTGRID_LB, + HID_COLORPAGE_WRITERFIELDSHADINGS_LB, + HID_COLORPAGE_WRITERIDXSHADINGS_LB, + HID_COLORPAGE_WRITERDIRECTCURSOR_LB, + HID_COLORPAGE_WRITERNOTESINDICATOR_LB, + HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB, + HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB, + HID_COLORPAGE_WRITERPAGEBREAKS_LB, + HID_COLORPAGE_HTMLSGML_LB, + HID_COLORPAGE_HTMLCOMMENT_LB, + HID_COLORPAGE_HTMLKEYWORD_LB, + HID_COLORPAGE_HTMLUNKNOWN_LB, + HID_COLORPAGE_CALCGRID_LB, + HID_COLORPAGE_CALCPAGEBREAK_LB, + HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB, + HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB, + HID_COLORPAGE_CALCDETECTIVE_LB, + HID_COLORPAGE_CALCDETECTIVEERROR_LB, + HID_COLORPAGE_CALCREFERENCE_LB, + HID_COLORPAGE_CALCNOTESBACKGROUND_LB, + HID_COLORPAGE_DRAWGRID_LB, + HID_COLORPAGE_DRAWDRAWING_LB, + HID_COLORPAGE_DRAWFILL_LB, + HID_COLORPAGE_BASICIDENTIFIER_LB, + HID_COLORPAGE_BASICCOMMENT_LB, + HID_COLORPAGE_BASICNUMBER_LB, + HID_COLORPAGE_BASICSTRING_LB, + HID_COLORPAGE_BASICOPERATOR_LB, + HID_COLORPAGE_BASICKEYWORD_LB, + HID_COLORPAGE_BASICERROR_LB +}; + +const char* aColorCBHids[] = +{ + HID_COLORPAGE_DOCCOLOR_CB, + HID_COLORPAGE_DOCBOUNDARIES_CB, + HID_COLORPAGE_APPBACKGROUND_CB, + HID_COLORPAGE_OBJECTBOUNDARIES_CB, + HID_COLORPAGE_TABLEBOUNDARIES_CB, + HID_COLORPAGE_FONTCOLOR_CB, + HID_COLORPAGE_LINKS_CB, + HID_COLORPAGE_LINKSVISITED_CB, + HID_COLORPAGE_ANCHOR_CB, + HID_COLORPAGE_SPELL_CB, + HID_COLORPAGE_WRITERTEXTGRID_CB, + HID_COLORPAGE_WRITERFIELDSHADINGS_CB, + HID_COLORPAGE_WRITERIDXSHADINGS_CB, + HID_COLORPAGE_WRITERDIRECTCURSOR_CB, + HID_COLORPAGE_WRITERNOTESINDICATOR_CB, + HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB, + HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB, + HID_COLORPAGE_WRITERPAGEBREAKS_CB, + HID_COLORPAGE_HTMLSGML_CB, + HID_COLORPAGE_HTMLCOMMENT_CB, + HID_COLORPAGE_HTMLKEYWORD_CB, + HID_COLORPAGE_HTMLUNKNOWN_CB, + HID_COLORPAGE_CALCGRID_CB, + HID_COLORPAGE_CALCPAGEBREAK_CB, + HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB, + HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB, + HID_COLORPAGE_CALCDETECTIVE_CB, + HID_COLORPAGE_CALCDETECTIVEERROR_CB, + HID_COLORPAGE_CALCREFERENCE_CB, + HID_COLORPAGE_CALCNOTESBACKGROUND_CB, + HID_COLORPAGE_DRAWGRID_CB, + HID_COLORPAGE_DRAWDRAWING_CB, + HID_COLORPAGE_DRAWFILL_CB, + HID_COLORPAGE_BASICIDENTIFIER_CB, + HID_COLORPAGE_BASICCOMMENT_CB, + HID_COLORPAGE_BASICNUMBER_CB, + HID_COLORPAGE_BASICSTRING_CB, + HID_COLORPAGE_BASICOPERATOR_CB, + HID_COLORPAGE_BASICKEYWORD_CB, + HID_COLORPAGE_BASICERROR_CB +}; + /* -----------------------------2002/06/26 10:48------------------------------ ---------------------------------------------------------------------------*/ @@ -815,8 +903,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe else aCheckBoxes[i]->Hide(); aCheckBoxes[i]->SetBackground(aTransparentWall); - // FIXME: HELPID - aCheckBoxes[i]->SetHelpId(""/*HID_COLORPAGE_CHECKBOX_START + i*/); + aCheckBoxes[i]->SetHelpId( aColorCBHids[i] ); if(bSetTextColor) aCheckBoxes[i]->SetTextColor(aRCheckCol); } @@ -855,15 +942,15 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe XColorEntry* pEntry = aColorTable.GetColor(i); aColorBoxes[0]->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - // FIXME: HELPID - aColorBoxes[0]->SetHelpId(""/*HID_COLORPAGE_LISTBOX_START*/); + + aColorBoxes[0]->SetHelpId( aColorLBHids[0] ); + for( sal_Int32 i = 1; i < nCount; i++ ) { if(aColorBoxes[i]) { aColorBoxes[i]->CopyEntries( *aColorBoxes[0] ); - // FIXME: HELPID - aColorBoxes[i]->SetHelpId(""/*HID_COLORPAGE_LISTBOX_START + i*/); + aColorBoxes[i]->SetHelpId( aColorLBHids[i] ); } } } @@ -1021,8 +1108,7 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl( const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); aScrollWindow.SetBackground(Wallpaper(rStyleSettings.GetFieldColor())); - // FIXME: HELPID - aScrollWindow.SetHelpId( ""/*HID_OPTIONS_COLORCONFIG_COLORLIST_WIN*/ ); + aScrollWindow.SetHelpId( HID_OPTIONS_COLORCONFIG_COLORLIST_WIN ); aVScroll.EnableDrag(); aVScroll.Show(); aHeaderHB.SetPosSizePixel( diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 06e4bdb16bba..637230587e6b 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -164,8 +164,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, aCheckLB.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED ); - // FIXME: HELPID - aCheckLB.SetHelpId( ""/*HID_OFAPAGE_MSFLTR2_CLB*/ ); + aCheckLB.SetHelpId( HID_OFAPAGE_MSFLTR2_CLB ); aCheckLB.SetWindowBits( WB_HSCROLL| WB_VSCROLL ); } diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index c1c864f6c831..31a40f2cd221 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -197,8 +197,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet sHeader += '\t'; m_aJavaList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT ); - // FIXME: HELPID - m_aJavaList.SetHelpId( ""/*HID_OPTIONS_JAVA_LIST*/ ); + m_aJavaList.SetHelpId( HID_OPTIONS_JAVA_LIST ); FreeResource(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 29a4376a1a54..f5bfd351ae45 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1141,8 +1141,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, pCheckButtonData = NULL; aLinguModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - // FIXME: HELPID - aLinguModulesCLB.SetHelpId(""/*HID_CLB_LINGU_MODULES*/ ); + aLinguModulesCLB.SetHelpId(HID_CLB_LINGU_MODULES ); aLinguModulesCLB.SetHighlightRange(); aLinguModulesCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguModulesCLB.SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl)); @@ -1152,8 +1151,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, aLinguOptionsEditPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl )); aLinguDicsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - // FIXME: HELPID - aLinguDicsCLB.SetHelpId(""/*HID_CLB_EDIT_MODULES_DICS*/ ); + aLinguDicsCLB.SetHelpId(HID_CLB_EDIT_MODULES_DICS ); aLinguDicsCLB.SetHighlightRange(); aLinguDicsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguDicsCLB.SetCheckButtonHdl(LINK(this, SvxLinguTabPage, BoxCheckButtonHdl_Impl)); @@ -1163,8 +1161,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, aLinguDicsDelPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl )); aLinguOptionsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - // FIXME: HELPID - aLinguOptionsCLB.SetHelpId(""/*HID_CLB_LINGU_OPTIONS*/ ); + aLinguOptionsCLB.SetHelpId(HID_CLB_LINGU_OPTIONS ); aLinguOptionsCLB.SetHighlightRange(); aLinguOptionsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguOptionsCLB.SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl)); @@ -2055,8 +2052,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) aModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); aModulesCLB.SetHighlightRange(); - // FIXME: HELPID - aModulesCLB.SetHelpId(""/*HID_CLB_EDIT_MODULES_MODULES*/ ); + aModulesCLB.SetHelpId(HID_CLB_EDIT_MODULES_MODULES ); aModulesCLB.SetSelectHdl( LINK( this, SvxEditModulesDlg, SelectHdl_Impl )); aModulesCLB.SetCheckButtonHdl( LINK( this, SvxEditModulesDlg, BoxCheckButtonHdl_Impl) ); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index feb0b35efe41..f3d31aa33025 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -263,10 +263,8 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) : pPathBox->SetTabs( &nTabs[0], MAP_APPFONT ); pPathBox->InitHeaderBar( pHeaderBar ); pPathBox->SetHighlightRange(); - // FIXME: HELPID - pPathBox->SetHelpId( ""/*HID_OPTPATH_CTL_PATH*/ ); - // FIXME: HELPID - pHeaderBar->SetHelpId( ""/*HID_OPTPATH_HEADERBAR*/ ); + pPathBox->SetHelpId( HID_OPTPATH_CTL_PATH ); + pHeaderBar->SetHelpId( HID_OPTPATH_HEADERBAR ); pPathBox->Show(); pHeaderBar->Show(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index bbdb4bb17a1f..b63d9afc647e 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -889,8 +889,7 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() aPageImagesHC = ImageList( ResId( RID_IMGLIST_TREEOPT_HC, *pIsoRes ) ); delete pIsoRes; - // FIXME: HELPID - aTreeLB.SetHelpId( ""/*HID_OFADLG_TREELISTBOX*/ ); + aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX ); aTreeLB.SetWindowBits( WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINES | WB_HASLINESATROOT | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 3b01ba9c0e1f..0ee3c38c1e1d 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -105,8 +105,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : aLanguageFT.SetZOrder(0, WINDOW_ZORDER_FIRST); aLanguageLB.SetZOrder(&aLanguageFT, WINDOW_ZORDER_BEHIND); - // FIXME: HELPID - aLanguageLB.SetHelpId(""/*HID_AUTOCORR_LANGUAGE*/); + aLanguageLB.SetHelpId(HID_AUTOCORR_LANGUAGE); FreeResource(); AddTabPage(RID_OFAPAGE_AUTOCORR_OPTIONS, OfaAutocorrOptionsPage::Create, 0); @@ -229,8 +228,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, { FreeResource(); - // FIXME: HELPID - aCheckLB.SetHelpId(""/*HID_OFAPAGE_AUTOCORR_CLB*/); + aCheckLB.SetHelpId(HID_OFAPAGE_AUTOCORR_CLB); } /*-----------------14.10.96 15.58------------------- @@ -494,8 +492,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, //typ. Anfuehrungszeichen einsetzen SvtSysLocale aSysLcl; - // FIXME: HELPID - aCheckLB.SetHelpId(""/*HID_OFAPAGE_AUTOFORMAT_CLB*/); + aCheckLB.SetHelpId(HID_OFAPAGE_AUTOFORMAT_CLB); aCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL); aCheckLB.SetSelectHdl(LINK(this, OfaSwAutoFmtOptionsPage, SelectHdl)); @@ -2065,10 +2062,8 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : BOOL bShowSWOptions = FALSE; - // FIXME: HELPID - aCheckLB.SetHelpId( ""/*HID_OFAPAGE_QUOTE_CLB*/ ); - // FIXME: HELPID - aSwCheckLB.SetHelpId( ""/*HID_OFAPAGE_QUOTE_SW_CLB*/ ); + aCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_CLB ); + aSwCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_SW_CLB ); SFX_ITEMSET_ARG( &rSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, FALSE ); if ( pItem && pItem->GetValue() ) diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index 9db3dbeb43b4..2fb063ede772 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -247,7 +247,7 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY ModalDialog RID_OFADLG_PRCNT_SET { - HelpID = SID_AUTOFORMAT ; + HelpID = CMD_SID_AUTOFORMAT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 155 , 43 ) ; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index e531c2ccda55..9bf88e151770 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -243,8 +243,7 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, SetExchangeSupport(); pExamplesVS->SetSelectHdl(LINK(this, SvxSingleNumPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxSingleNumPickTabPage, DoubleClickHdl_Impl)); - // FIXME: HELPID - pExamplesVS->SetHelpId(""/*HID_VALUESET_SINGLENUM*/ ); + pExamplesVS->SetHelpId(HID_VALUESET_SINGLENUM ); Reference<XDefaultNumberingProvider> xDefNum = lcl_GetNumberingProvider(); if(xDefNum.is()) @@ -473,8 +472,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, SetExchangeSupport(); pExamplesVS->SetSelectHdl(LINK(this, SvxBulletPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxBulletPickTabPage, DoubleClickHdl_Impl)); - // FIXME: HELPID - pExamplesVS->SetHelpId(""/*HID_VALUESET_BULLET*/ ); + pExamplesVS->SetHelpId(HID_VALUESET_BULLET ); } /*-----------------07.02.97 12.10------------------- @@ -677,8 +675,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, pExamplesVS->SetSelectHdl(LINK(this, SvxNumPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxNumPickTabPage, DoubleClickHdl_Impl)); - // FIXME: HELPID - pExamplesVS->SetHelpId(""/*HID_VALUESET_NUM*/ ); + pExamplesVS->SetHelpId(HID_VALUESET_NUM ); Reference<XDefaultNumberingProvider> xDefNum = lcl_GetNumberingProvider(); if(xDefNum.is()) @@ -994,8 +991,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, // Grafiknamen ermitteln GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); - // FIXME: HELPID - pExamplesVS->SetHelpId(""/*HID_VALUESET_NUMBMP*/ ); + pExamplesVS->SetHelpId(HID_VALUESET_NUMBMP ); for(USHORT i = 0; i < aGrfNames.Count(); i++) { pExamplesVS->InsertItem( i + 1, i); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 14c51452feeb..9060b6fb013e 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -645,8 +645,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - // FIXME: HELPID - pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } if( pWarnBox->Execute() != RET_OK ) @@ -776,8 +775,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - // FIXME: HELPID - pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } @@ -889,8 +887,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 48178ca4d0e7..5152bd0e9478 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -488,8 +488,7 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -575,8 +574,7 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -1038,12 +1036,9 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG ) aMtrFldColorModel4.Hide(); aMtrFldColorModel4.SetValue( 0L ); - // FIXME: HELPID - aMtrFldColorModel1.SetHelpId( ""/*HID_TPCOLOR_RGB_1*/ ); - // FIXME: HELPID - aMtrFldColorModel2.SetHelpId( ""/*HID_TPCOLOR_RGB_2*/ ); - // FIXME: HELPID - aMtrFldColorModel3.SetHelpId( ""/*HID_TPCOLOR_RGB_3*/ ); + aMtrFldColorModel1.SetHelpId( HID_TPCOLOR_RGB_1 ); + aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_RGB_2 ); + aMtrFldColorModel3.SetHelpId( HID_TPCOLOR_RGB_3 ); // Da der alte HelpText noch am Control steht wuerde // ein Umsetzen der HelpID alleine nichts bewirken @@ -1087,12 +1082,9 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG ) aFtColorModel4.Show(); aMtrFldColorModel4.Show(); - // FIXME: HELPID - aMtrFldColorModel1.SetHelpId( ""/*HID_TPCOLOR_CMYK_1*/ ); - // FIXME: HELPID - aMtrFldColorModel2.SetHelpId( ""/*HID_TPCOLOR_CMYK_2*/ ); - // FIXME: HELPID - aMtrFldColorModel3.SetHelpId( ""/*HID_TPCOLOR_CMYK_3*/ ); + aMtrFldColorModel1.SetHelpId( HID_TPCOLOR_CMYK_1 ); + aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_CMYK_2 ); + aMtrFldColorModel3.SetHelpId( HID_TPCOLOR_CMYK_3 ); // s.o. aMtrFldColorModel1.SetHelpText( String() ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index f7f8d2319846..1de256416b9d 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -482,8 +482,7 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - // FIXME: HELPID - pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } if( pWarnBox->Execute() != RET_OK ) @@ -600,8 +599,7 @@ IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 70de87806a78..4fa65d95221a 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -546,8 +546,7 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - // FIXME: HELPID - pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } if( pWarnBox->Execute() != RET_OK ) @@ -660,8 +659,7 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index dd105e0ed682..5f1b385e8137 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -639,8 +639,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } @@ -721,8 +720,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index ed7ff628060f..4949ce4da6fa 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -372,8 +372,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -521,8 +520,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } |