diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-11-02 20:49:14 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-11-02 20:49:14 +0100 |
| commit | bd249877a47bb1c97b46be1ff0b1b3c356ebd42d (patch) | |
| tree | 62e905e16d2c1114d4118aa2811531464fb13745 /cui/source/options | |
| parent | da1f577a71b8bfc0f15d1015475f505265481459 (diff) | |
#i106421#: create new cui resource file
Diffstat (limited to 'cui/source/options')
61 files changed, 808 insertions, 819 deletions
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 31915733c660..822a3632a76d 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -37,8 +37,8 @@ // header for SAL_STATIC_CAST #include <sal/types.h> #include "cfgchart.hxx" -#include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> +#include <dialmgr.hxx> +#include <cuires.hrc> #define ROW_COLOR_COUNT 12 @@ -126,7 +126,7 @@ void SvxChartColorTable::useDefault() clear(); - String aResName( SVX_RES( RID_SVXSTR_DIAGRAM_ROW ) ); + String aResName( CUI_RES( RID_SVXSTR_DIAGRAM_ROW ) ); String aPrefix, aPostfix, aName; xub_StrLen nPos = aResName.SearchAscii( "$(ROW)" ); if( nPos != STRING_NOTFOUND ) @@ -216,7 +216,7 @@ BOOL SvxChartOptions::RetrieveOptions() Color aCol; // create strings for entry names - String aResName( SVX_RES( RID_SVXSTR_DIAGRAM_ROW ) ); + String aResName( CUI_RES( RID_SVXSTR_DIAGRAM_ROW ) ); String aPrefix, aPostfix, aName; xub_StrLen nPos = aResName.SearchAscii( "$(ROW)" ); if( nPos != STRING_NOTFOUND ) diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index de86053a1376..fd195b18a7e3 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -43,9 +43,9 @@ #include "connpoolsettings.hxx" #include <svl/eitem.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> //........................................................................ namespace offapp @@ -158,11 +158,11 @@ namespace offapp DriverListControl_Base::Init(); Size aColWidth = LogicToPixel(Size(160, 0), MAP_APPFONT); - InsertDataColumn(1, String(SVX_RES(STR_DRIVER_NAME)), aColWidth.Width()); + InsertDataColumn(1, String(CUI_RES(STR_DRIVER_NAME)), aColWidth.Width()); aColWidth = LogicToPixel(Size(30, 0), MAP_APPFONT); - InsertDataColumn(2, String(SVX_RES(STR_POOLED_FLAG)), aColWidth.Width()); + InsertDataColumn(2, String(CUI_RES(STR_POOLED_FLAG)), aColWidth.Width()); aColWidth = LogicToPixel(Size(60, 0), MAP_APPFONT); - InsertDataColumn(3, String(SVX_RES(STR_POOL_TIMEOUT)), aColWidth.Width()); + InsertDataColumn(3, String(CUI_RES(STR_POOL_TIMEOUT)), aColWidth.Width()); // Attention: the resource of the string is local to the resource of the enclosing dialog! } @@ -338,16 +338,16 @@ namespace offapp //==================================================================== //-------------------------------------------------------------------- ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet) - :SfxTabPage(_pParent, SVX_RES(RID_OFAPAGE_CONNPOOLOPTIONS ), _rAttrSet) - ,m_aFrame (this, SVX_RES(FL_POOLING)) - ,m_aEnablePooling (this, SVX_RES(CB_POOL_CONNS)) - ,m_aDriversLabel (this, SVX_RES(FT_DRIVERS)) - ,m_pDriverList(new DriverListControl(this, SVX_RES(CTRL_DRIVER_LIST))) - ,m_aDriverLabel (this, SVX_RES(FT_DRIVERLABEL)) - ,m_aDriver (this, SVX_RES(FT_DRIVER)) - ,m_aDriverPoolingEnabled(this, SVX_RES(CB_DRIVERPOOLING)) - ,m_aTimeoutLabel (this, SVX_RES(FT_TIMEOUT)) - ,m_aTimeout (this, SVX_RES(NF_TIMEOUT)) + :SfxTabPage(_pParent, CUI_RES(RID_OFAPAGE_CONNPOOLOPTIONS ), _rAttrSet) + ,m_aFrame (this, CUI_RES(FL_POOLING)) + ,m_aEnablePooling (this, CUI_RES(CB_POOL_CONNS)) + ,m_aDriversLabel (this, CUI_RES(FT_DRIVERS)) + ,m_pDriverList(new DriverListControl(this, CUI_RES(CTRL_DRIVER_LIST))) + ,m_aDriverLabel (this, CUI_RES(FT_DRIVERLABEL)) + ,m_aDriver (this, CUI_RES(FT_DRIVER)) + ,m_aDriverPoolingEnabled(this, CUI_RES(CB_DRIVERPOOLING)) + ,m_aTimeoutLabel (this, CUI_RES(FT_TIMEOUT)) + ,m_aTimeout (this, CUI_RES(NF_TIMEOUT)) { m_pDriverList->Init(); m_pDriverList->Show(); diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src index 9218efda609a..c8d1dd03e47d 100644 --- a/cui/source/options/connpooloptions.src +++ b/cui/source/options/connpooloptions.src @@ -29,7 +29,7 @@ ************************************************************************/ #include "connpooloptions.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #define PAGE_SIZE_X 260 #define PAGE_SIZE_Y 185 diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index cc9d4ab740dc..0bf652aa648a 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -50,14 +50,14 @@ #define _CUI_SRCHDLG_CXX #include "cuisrchdlg.hxx" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include <svx/svxitems.hrc> #define ITEMID_SETITEM 0 #include <sfx2/srchitem.hxx> #include <svx/pageitem.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <svx/dlgutil.hxx> #include <optjsearch.hxx> #include <svx/brshitem.hxx> @@ -68,7 +68,7 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog( Window *pParent, - const SfxItemSet& rOptionsSet, USHORT /*nUniqueId*/, INT32 nInitialFlags ) : + const SfxItemSet& rOptionsSet, INT32 nInitialFlags ) : SfxSingleTabDialog ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ), nInitialTlFlags( nInitialFlags ) { diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 5ab8a0e2a0d1..c9834ad0b71d 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -36,11 +36,11 @@ #include "dbregistersettings.hxx" #include "connpooloptions.hxx" #include <svl/filenotation.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include <svx/svxids.hrc> #include "helpid.hrc" #include <svtools/editbrowsebox.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include <vcl/field.hxx> #include <svl/eitem.hxx> #include <comphelper/processfactory.hxx> @@ -57,8 +57,9 @@ #include <unotools/localfilehelper.hxx> #include "optHeaderTabListbox.hxx" #include <sfx2/docfilt.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "dbregisterednamesconfig.hxx" +#include <svx/dialogs.hrc> #define TAB_WIDTH1 80 #define TAB_WIDTH_MIN 10 @@ -119,15 +120,15 @@ short DatabaseRegistrationDialog::Execute() DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_DBREGISTER), rSet ), + SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_DBREGISTER), rSet ), - aTypeText ( this, SVX_RES( FT_TYPE ) ), - aPathText ( this, SVX_RES( FT_PATH ) ), - aPathCtrl ( this, SVX_RES( LB_PATH ) ), - m_aNew ( this, SVX_RES( BTN_NEW ) ), - m_aEdit ( this, SVX_RES( BTN_EDIT ) ), - m_aDelete ( this, SVX_RES( BTN_DELETE ) ), - aStdBox ( this, SVX_RES( GB_STD ) ), + aTypeText ( this, CUI_RES( FT_TYPE ) ), + aPathText ( this, CUI_RES( FT_PATH ) ), + aPathCtrl ( this, CUI_RES( LB_PATH ) ), + m_aNew ( this, CUI_RES( BTN_NEW ) ), + m_aEdit ( this, CUI_RES( BTN_EDIT ) ), + m_aDelete ( this, CUI_RES( BTN_DELETE ) ), + aStdBox ( this, CUI_RES( GB_STD ) ), pHeaderBar ( NULL ), pPathBox ( NULL ), m_pCurEntry ( NULL ), @@ -297,7 +298,7 @@ IMPL_LINK( DbRegistrationOptionsPage, DeleteHdl, void *, EMPTYARG ) SvLBoxEntry* pEntry = pPathBox->FirstSelected(); if ( pEntry ) { - QueryBox aQuery(this,SVX_RES(QUERY_DELETE_CONFIRM)); + QueryBox aQuery(this,CUI_RES(QUERY_DELETE_CONFIRM)); if ( aQuery.Execute() == RET_YES ) pPathBox->GetModel()->Remove(pEntry); } diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src index bead1ae683cf..98d32f09013d 100644 --- a/cui/source/options/dbregister.src +++ b/cui/source/options/dbregister.src @@ -29,13 +29,10 @@ ************************************************************************/ #include "dbregister.hrc" -#include <svx/dialogs.hrc> -#ifndef _SVX_SVXIDS_HRC //autogen +#include <cuires.hrc> #include <svx/svxids.hrc> -#endif -#ifndef _SVX_DIALOGS_HRC //autogen +#include <cuires.hrc> #include <svx/dialogs.hrc> -#endif // RID_SFXPAGE_PATH ----------------------------------------------------- #define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; } diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 22969dffc212..81d92e1e184a 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -38,7 +38,7 @@ #ifndef _SVX_DOCLINKDIALOG_HRC_ #include "doclinkdialog.hrc" #endif -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include <svx/svxids.hrc> #include <tools/debug.hxx> #ifndef SVTOOLS_FILENOTATION_HXX_ @@ -46,7 +46,7 @@ #endif #include <vcl/msgbox.hxx> #include <ucbhelper/content.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <tools/urlobj.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/docfilt.hxx> @@ -64,19 +64,19 @@ namespace svx //================================================================== //------------------------------------------------------------------ ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew ) - :ModalDialog( _pParent, SVX_RES(DLG_DOCUMENTLINK) ) - ,m_aURLLabel (this, SVX_RES(FT_URL)) - ,m_aURL (this, SVX_RES(CMB_URL)) - ,m_aBrowseFile (this, SVX_RES(PB_BROWSEFILE)) - ,m_aNameLabel (this, SVX_RES(FT_NAME)) - ,m_aName (this, SVX_RES(ET_NAME)) - ,m_aBottomLine (this, SVX_RES(FL_BOTTOM)) - ,m_aOK (this, SVX_RES(BTN_OK)) - ,m_aCancel (this, SVX_RES(BTN_CANCEL)) - ,m_aHelp (this, SVX_RES(BTN_HELP)) + :ModalDialog( _pParent, CUI_RES(DLG_DOCUMENTLINK) ) + ,m_aURLLabel (this, CUI_RES(FT_URL)) + ,m_aURL (this, CUI_RES(CMB_URL)) + ,m_aBrowseFile (this, CUI_RES(PB_BROWSEFILE)) + ,m_aNameLabel (this, CUI_RES(FT_NAME)) + ,m_aName (this, CUI_RES(ET_NAME)) + ,m_aBottomLine (this, CUI_RES(FL_BOTTOM)) + ,m_aOK (this, CUI_RES(BTN_OK)) + ,m_aCancel (this, CUI_RES(BTN_CANCEL)) + ,m_aHelp (this, CUI_RES(BTN_HELP)) ,m_bCreatingNew(_bCreateNew) { - String sText = String( SVX_RES( m_bCreatingNew ? STR_NEW_LINK : STR_EDIT_LINK ) ); + String sText = String( CUI_RES( m_bCreatingNew ? STR_NEW_LINK : STR_EDIT_LINK ) ); SetText(sText); FreeResource(); @@ -141,7 +141,7 @@ namespace svx if (!bFileExists) { - String sMsg = String(SVX_RES(STR_LINKEDDOC_DOESNOTEXIST)); + String sMsg = String(CUI_RES(STR_LINKEDDOC_DOESNOTEXIST)); sMsg.SearchAndReplaceAscii("$file$", m_aURL.GetText()); ErrorBox aError(this, WB_OK , sMsg); aError.Execute(); @@ -150,7 +150,7 @@ namespace svx INetURLObject aURL( sURL ); if ( aURL.GetProtocol() != INET_PROT_FILE ) { - String sMsg = String(SVX_RES(STR_LINKEDDOC_NO_SYSTEM_FILE)); + String sMsg = String(CUI_RES(STR_LINKEDDOC_NO_SYSTEM_FILE)); sMsg.SearchAndReplaceAscii("$file$", m_aURL.GetText()); ErrorBox aError(this, WB_OK , sMsg); aError.Execute(); @@ -162,7 +162,7 @@ namespace svx { if ( !m_aNameValidator.Call( &sCurrentText ) ) { - String sMsg = String(SVX_RES(STR_NAME_CONFLICT)); + String sMsg = String(CUI_RES(STR_NAME_CONFLICT)); sMsg.SearchAndReplaceAscii("$file$", sCurrentText); InfoBox aError(this, sMsg); aError.Execute(); diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src index e4c8ceb3de87..9fe56360b82a 100644 --- a/cui/source/options/doclinkdialog.src +++ b/cui/source/options/doclinkdialog.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <svx/dialogs.hrc> +#include <cuires.hrc> #ifndef _SVX_DOCLINKDIALOG_HRC_ #include "doclinkdialog.hrc" #endif diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 9ea708dc0d65..614993aeb91f 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -38,9 +38,9 @@ #include <unotools/sourceviewconfig.hxx> #include "fontsubs.hrc" #include "fontsubs.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> /*********************************************************************/ /* */ @@ -54,32 +54,32 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage(pParent, SVX_RES(RID_SVX_FONT_SUBSTITUTION), rSet), - aUseTableCB (this, SVX_RES(CB_USETABLE)), - aFont1FT (this, SVX_RES(FT_FONT1)), - aFont1CB (this, SVX_RES(CB_FONT1)), - aFont2FT (this, SVX_RES(FT_FONT2)), - aFont2CB (this, SVX_RES(CB_FONT2)), - aNewDelTBX (this, SVX_RES(TBX_SUBSTNEWDEL)), - aCheckLB (this, SVX_RES(CLB_SUBSTITUTES)), - - aSourceViewFontsFL (this, SVX_RES(FL_SOURCEVIEW )), - aFontNameFT (this, SVX_RES(FT_FONTNAME )), - aFontNameLB (this, SVX_RES(LB_FONTNAME )), - aNonPropFontsOnlyCB(this, SVX_RES(CB_NONPROP )), - aFontHeightFT (this, SVX_RES(FT_FONTHEIGHT )), - aFontHeightLB (this, SVX_RES(LB_FONTHEIGHT )), - - aImageList (SVX_RES(IL_ICON)), - - sAutomatic (SVX_RES( STR_AUTOMATIC )), + SfxTabPage(pParent, CUI_RES(RID_SVX_FONT_SUBSTITUTION), rSet), + aUseTableCB (this, CUI_RES(CB_USETABLE)), + aFont1FT (this, CUI_RES(FT_FONT1)), + aFont1CB (this, CUI_RES(CB_FONT1)), + aFont2FT (this, CUI_RES(FT_FONT2)), + aFont2CB (this, CUI_RES(CB_FONT2)), + aNewDelTBX (this, CUI_RES(TBX_SUBSTNEWDEL)), + aCheckLB (this, CUI_RES(CLB_SUBSTITUTES)), + + aSourceViewFontsFL (this, CUI_RES(FL_SOURCEVIEW )), + aFontNameFT (this, CUI_RES(FT_FONTNAME )), + aFontNameLB (this, CUI_RES(LB_FONTNAME )), + aNonPropFontsOnlyCB(this, CUI_RES(CB_NONPROP )), + aFontHeightFT (this, CUI_RES(FT_FONTHEIGHT )), + aFontHeightLB (this, CUI_RES(LB_FONTHEIGHT )), + + aImageList (CUI_RES(IL_ICON)), + + sAutomatic (CUI_RES( STR_AUTOMATIC )), pConfig(new SvtFontSubstConfig), pSourceViewConfig(new utl::SourceViewConfig), - sHeader1 (SVX_RES( STR_HEADER1 )), - sHeader2 (SVX_RES( STR_HEADER2 )), - sHeader3 (SVX_RES( STR_HEADER3 )), - sHeader4 (SVX_RES( STR_HEADER4 )), + sHeader1 (CUI_RES( STR_HEADER1 )), + sHeader2 (CUI_RES( STR_HEADER2 )), + sHeader3 (CUI_RES( STR_HEADER3 )), + sHeader4 (CUI_RES( STR_HEADER4 )), sFontGroup ("FontSubstitution"), pCheckButtonData(0) diff --git a/cui/source/options/fontsubs.hrc b/cui/source/options/fontsubs.hrc index 9344d41c0fc7..6ef1c7a9047a 100644 --- a/cui/source/options/fontsubs.hrc +++ b/cui/source/options/fontsubs.hrc @@ -30,7 +30,7 @@ #ifndef _SVX_FONT_SUBSTITUTION #define _SVX_FONT_SUBSTITUTION -#include <svx/dialogs.hrc> +#include <cuires.hrc> // defines ------------------------------------------------------------------ diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx index 7bcb021f9cbf..5544197e7246 100644 --- a/cui/source/options/internationaloptions.cxx +++ b/cui/source/options/internationaloptions.cxx @@ -34,9 +34,9 @@ #include "internationaloptions.hxx" #include "internationaloptions.hrc" #include <svl/eitem.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> namespace offapp { @@ -62,12 +62,12 @@ namespace offapp }; inline InternationalOptionsPage::IMPL::IMPL( Window* _pParent ) : - m_aFL_DefaultTextDirection ( _pParent, SVX_RES( FL_DEFTXTDIRECTION ) ) - ,m_aRB_TxtDirLeft2Right ( _pParent, SVX_RES( RB_TXTDIR_LEFT2RIGHT ) ) - ,m_aRB_TxtDirRight2Left ( _pParent, SVX_RES( RB_TXTDIR_RIGHT2LEFT ) ) - ,m_aFL_SheetView ( _pParent, SVX_RES( FL_SHEETVIEW ) ) - ,m_aCB_ShtVwRight2Left ( _pParent, SVX_RES( CB_SHTVW_RIGHT2LEFT ) ) - ,m_aCB_ShtVwCurrentDocOnly ( _pParent, SVX_RES( CB_SHTVW_CURRENTDOCONLY ) ) + m_aFL_DefaultTextDirection ( _pParent, CUI_RES( FL_DEFTXTDIRECTION ) ) + ,m_aRB_TxtDirLeft2Right ( _pParent, CUI_RES( RB_TXTDIR_LEFT2RIGHT ) ) + ,m_aRB_TxtDirRight2Left ( _pParent, CUI_RES( RB_TXTDIR_RIGHT2LEFT ) ) + ,m_aFL_SheetView ( _pParent, CUI_RES( FL_SHEETVIEW ) ) + ,m_aCB_ShtVwRight2Left ( _pParent, CUI_RES( CB_SHTVW_RIGHT2LEFT ) ) + ,m_aCB_ShtVwCurrentDocOnly ( _pParent, CUI_RES( CB_SHTVW_CURRENTDOCONLY ) ) ,m_bEnable_SheetView_Opt ( FALSE ) { @@ -128,7 +128,7 @@ namespace offapp } InternationalOptionsPage::InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) : - SfxTabPage ( _pParent, SVX_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet ) + SfxTabPage ( _pParent, CUI_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet ) ,m_pImpl ( new IMPL( this ) ) { diff --git a/cui/source/options/internationaloptions.src b/cui/source/options/internationaloptions.src index ab725d9c4f0b..be9155fb3707 100644 --- a/cui/source/options/internationaloptions.src +++ b/cui/source/options/internationaloptions.src @@ -30,7 +30,7 @@ #include "internationaloptions.hrc" #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> TabPage RID_OFA_TP_INTERNATIONAL { diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 7cdc58198f9a..ee03b9653b8d 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -33,8 +33,8 @@ #include <optaccessibility.hxx> #include <optaccessibility.hrc> -#include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> +#include <dialmgr.hxx> +#include <cuires.hrc> #include <svtools/accessibilityoptions.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> @@ -55,19 +55,19 @@ struct SvxAccessibilityOptionsTabPage_Impl }; SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) - :SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_ACCESSIBILITYCONFIG ), rSet) - ,m_aMiscellaneousLabel (this, SVX_RES(FL_MISCELLANEOUS )) - ,m_aAccessibilityTool (this, SVX_RES(CB_ACCESSIBILITY_TOOL )) - ,m_aTextSelectionInReadonly (this, SVX_RES(CB_TEXTSELECTION )) - ,m_aAnimatedGraphics (this, SVX_RES(CB_ANIMATED_GRAPHICS )) - ,m_aAnimatedTexts (this, SVX_RES(CB_ANIMATED_TEXTS )) - ,m_aTipHelpCB (this, SVX_RES(CB_TIPHELP )) - ,m_aTipHelpNF (this, SVX_RES(NF_TIPHELP )) - ,m_aTipHelpFT (this, SVX_RES(FT_TIPHELP )) - ,m_aHCOptionsLabel (this, SVX_RES(FL_HC_OPTIONS )) - ,m_aAutoDetectHC (this, SVX_RES(CB_AUTO_DETECT_HC )) - ,m_aAutomaticFontColor (this, SVX_RES(CB_AUTOMATIC_FONT_COLOR)) - ,m_aPagePreviews (this, SVX_RES(CB_PAGE_PREVIEWS )) + :SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ACCESSIBILITYCONFIG ), rSet) + ,m_aMiscellaneousLabel (this, CUI_RES(FL_MISCELLANEOUS )) + ,m_aAccessibilityTool (this, CUI_RES(CB_ACCESSIBILITY_TOOL )) + ,m_aTextSelectionInReadonly (this, CUI_RES(CB_TEXTSELECTION )) + ,m_aAnimatedGraphics (this, CUI_RES(CB_ANIMATED_GRAPHICS )) + ,m_aAnimatedTexts (this, CUI_RES(CB_ANIMATED_TEXTS )) + ,m_aTipHelpCB (this, CUI_RES(CB_TIPHELP )) + ,m_aTipHelpNF (this, CUI_RES(NF_TIPHELP )) + ,m_aTipHelpFT (this, CUI_RES(FT_TIPHELP )) + ,m_aHCOptionsLabel (this, CUI_RES(FL_HC_OPTIONS )) + ,m_aAutoDetectHC (this, CUI_RES(CB_AUTO_DETECT_HC )) + ,m_aAutomaticFontColor (this, CUI_RES(CB_AUTOMATIC_FONT_COLOR)) + ,m_aPagePreviews (this, CUI_RES(CB_PAGE_PREVIEWS )) ,m_pImpl(new SvxAccessibilityOptionsTabPage_Impl) { FreeResource(); diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src index 676c54f6ee61..ef375fb80117 100644 --- a/cui/source/options/optaccessibility.src +++ b/cui/source/options/optaccessibility.src @@ -31,7 +31,7 @@ #include <optaccessibility.hrc> #include <sfx2/sfx.hrc> #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG { diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index cb247edd3f87..0bbf0ac287bd 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -35,8 +35,8 @@ #include <svx/langitem.hxx> #include <svx/unolingu.hxx> #include <optasian.hrc> -#include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> +#include <dialmgr.hxx> +#include <cuires.hrc> #include <tools/table.hxx> #include <tools/shl.hxx> #include <svx/asiancfg.hxx> @@ -151,23 +151,23 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters( static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX; SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_ASIAN_LAYOUT ), rSet), - aKerningGB( this, SVX_RES(GB_KERNING )), - aCharKerningRB( this, SVX_RES(RB_CHAR_KERNING )), - aCharPunctKerningRB( this, SVX_RES(RB_CHAR_PUNCT )), - aCharDistGB( this, SVX_RES(GB_CHAR_DIST )), - aNoCompressionRB( this, SVX_RES(RB_NO_COMP )), - aPunctCompressionRB( this, SVX_RES(RB_PUNCT_COMP )), - aPunctKanaCompressionRB(this, SVX_RES(RB_PUNCT_KANA_COMP )), - aStartEndGB( this, SVX_RES(GB_START_END )), - aLanguageFT( this, SVX_RES(FT_LANGUAGE )), - aLanguageLB( this, SVX_RES(LB_LANGUAGE )), - aStandardCB( this, SVX_RES(CB_STANDARD )), - aStartFT( this, SVX_RES(FT_START )), - aStartED( this, SVX_RES(ED_START )), - aEndFT( this, SVX_RES(FT_END )), - aEndED( this, SVX_RES(ED_END )), - aHintFT( this, SVX_RES(FT_HINT )), + SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ASIAN_LAYOUT ), rSet), + aKerningGB( this, CUI_RES(GB_KERNING )), + aCharKerningRB( this, CUI_RES(RB_CHAR_KERNING )), + aCharPunctKerningRB( this, CUI_RES(RB_CHAR_PUNCT )), + aCharDistGB( this, CUI_RES(GB_CHAR_DIST )), + aNoCompressionRB( this, CUI_RES(RB_NO_COMP )), + aPunctCompressionRB( this, CUI_RES(RB_PUNCT_COMP )), + aPunctKanaCompressionRB(this, CUI_RES(RB_PUNCT_KANA_COMP )), + aStartEndGB( this, CUI_RES(GB_START_END )), + aLanguageFT( this, CUI_RES(FT_LANGUAGE )), + aLanguageLB( this, CUI_RES(LB_LANGUAGE )), + aStandardCB( this, CUI_RES(CB_STANDARD )), + aStartFT( this, CUI_RES(FT_START )), + aStartED( this, CUI_RES(ED_START )), + aEndFT( this, CUI_RES(FT_END )), + aEndED( this, CUI_RES(ED_END )), + aHintFT( this, CUI_RES(FT_HINT )), pImpl(new SvxAsianLayoutPage_Impl) { FreeResource(); diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src index 6a09421fcf2c..f8286ea1186c 100644 --- a/cui/source/options/optasian.src +++ b/cui/source/options/optasian.src @@ -31,7 +31,7 @@ #include <optasian.hrc> #include <sfx2/sfx.hrc> #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> TabPage RID_SVXPAGE_ASIAN_LAYOUT { diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 6d953edcc80e..306f30b5850e 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -31,10 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" #include <unotools/pathoptions.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optchart.hxx" #include "optchart.hrc" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> // ==================== // class ChartColorLB @@ -57,13 +57,13 @@ void ChartColorLB::FillBox( const SvxChartColorTable & rTab ) // ==================== SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSet& rInAttrs ) : - SfxTabPage( pParent, SVX_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ), + SfxTabPage( pParent, CUI_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ), - aGbChartColors ( this, SVX_RES( FL_CHART_COLOR_LIST ) ), - aLbChartColors ( this, SVX_RES( LB_CHART_COLOR_LIST ) ), - aGbColorBox ( this, SVX_RES( FL_COLOR_BOX ) ), - aValSetColorBox ( this, SVX_RES( CT_COLOR_BOX ) ), - aPBDefault ( this, SVX_RES( PB_RESET_TO_DEFAULT ) ) + aGbChartColors ( this, CUI_RES( FL_CHART_COLOR_LIST ) ), + aLbChartColors ( this, CUI_RES( LB_CHART_COLOR_LIST ) ), + aGbColorBox ( this, CUI_RES( FL_COLOR_BOX ) ), + aValSetColorBox ( this, CUI_RES( CT_COLOR_BOX ) ), + aPBDefault ( this, CUI_RES( PB_RESET_TO_DEFAULT ) ) { FreeResource(); diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src index bab97295d291..1008f5383a11 100644 --- a/cui/source/options/optchart.src +++ b/cui/source/options/optchart.src @@ -29,7 +29,7 @@ ************************************************************************/ #include "optchart.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" // tab page for setting the default colors used for new charts diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index c0a703f2a5b1..f82a04d21d79 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -45,9 +45,9 @@ #include <svx/svxdlg.hxx> #include <helpid.hrc> #include <svx/svxids.hrc> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "optcolor.hxx" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optcolor.hrc" #include <svx/dlgutil.hxx> @@ -1435,17 +1435,17 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl) ---------------------------------------------------------------------------*/ SvxColorOptionsTabPage::SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rCoreSet) : - SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_COLORCONFIG ), rCoreSet ), - aColorSchemeFL( this, SVX_RES( FL_COLORSCHEME ) ), - aColorSchemeFT( this, SVX_RES( FT_COLORSCHEME ) ), - aColorSchemeLB( this, SVX_RES( LB_COLORSCHEME ) ), - aSaveSchemePB( this, SVX_RES( PB_SAVESCHEME) ), - aDeleteSchemePB( this, SVX_RES( PB_DELETESCHEME ) ), - aCustomColorsFL( this, SVX_RES( FL_CUSTOMCOLORS ) ), + SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_COLORCONFIG ), rCoreSet ), + aColorSchemeFL( this, CUI_RES( FL_COLORSCHEME ) ), + aColorSchemeFT( this, CUI_RES( FT_COLORSCHEME ) ), + aColorSchemeLB( this, CUI_RES( LB_COLORSCHEME ) ), + aSaveSchemePB( this, CUI_RES( PB_SAVESCHEME) ), + aDeleteSchemePB( this, CUI_RES( PB_DELETESCHEME ) ), + aCustomColorsFL( this, CUI_RES( FL_CUSTOMCOLORS ) ), bFillItemSetCalled(FALSE), pColorConfig(0), pExtColorConfig(0), - pColorConfigCT( new ColorConfigCtrl_Impl(this, SVX_RES( CT_COLORCONFIG ) )) + pColorConfigCT( new ColorConfigCtrl_Impl(this, CUI_RES( CT_COLORCONFIG ) )) { FreeResource(); aColorSchemeLB.SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl)); @@ -1574,14 +1574,14 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) String sName; //CHINA001 SvxNameDialog aNameDlg(pButton, //CHINA001 sName, - //CHINA001 String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2))); + //CHINA001 String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2))); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( pButton, - sName, String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)), RID_SVXDLG_NAME ); + sName, String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)) ); DBG_ASSERT(aNameDlg, "Dialogdiet fail!");//CHINA001 aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl)); - aNameDlg->SetText(String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1))); + aNameDlg->SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1))); aNameDlg->SetHelpId(HID_OPTIONS_COLORCONFIG_SAVE_SCHEME); aNameDlg->SetEditHelpId(HID_OPTIONS_COLORCONFIG_NAME_SCHEME); aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl)); @@ -1599,8 +1599,8 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) else { DBG_ASSERT(aColorSchemeLB.GetEntryCount() > 1, "don't delete the last scheme"); - QueryBox aQuery(pButton, SVX_RES(RID_SVXQB_DELETE_COLOR_CONFIG)); - aQuery.SetText(String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_DELETE))); + QueryBox aQuery(pButton, CUI_RES(RID_SVXQB_DELETE_COLOR_CONFIG)); + aQuery.SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE))); if(RET_YES == aQuery.Execute()) { rtl::OUString sDeleteScheme(aColorSchemeLB.GetSelectEntry()); diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src index 593439807c14..9f3b42e0be30 100644 --- a/cui/source/options/optcolor.src +++ b/cui/source/options/optcolor.src @@ -30,7 +30,7 @@ // include --------------------------------------------------------------- #include <sfx2/sfx.hrc> #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optcolor.hrc" // pragma ---------------------------------------------------------------- diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 053bd1f4462b..199fcc38090b 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -31,9 +31,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" #include "optctl.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "optctl.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include <svl/ctloptions.hxx> // class SvxCTLOptionsPage ----------------------------------------------------- @@ -54,19 +54,19 @@ IMPL_LINK( SvxCTLOptionsPage, SequenceCheckingCB_Hdl, void*, EMPTYARG ) SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_OPTIONS_CTL ), rSet ), - - m_aSequenceCheckingFL ( this, SVX_RES( FL_SEQUENCECHECKING ) ), - m_aSequenceCheckingCB ( this, SVX_RES( CB_SEQUENCECHECKING ) ), - m_aRestrictedCB ( this, SVX_RES( CB_RESTRICTED ) ), - m_aTypeReplaceCB ( this, SVX_RES( CB_TYPE_REPLACE ) ), - m_aCursorControlFL ( this, SVX_RES( FL_CURSORCONTROL ) ), - m_aMovementFT ( this, SVX_RES( FT_MOVEMENT ) ), - m_aMovementLogicalRB ( this, SVX_RES( RB_MOVEMENT_LOGICAL ) ), - m_aMovementVisualRB ( this, SVX_RES( RB_MOVEMENT_VISUAL ) ), - m_aGeneralFL ( this, SVX_RES( FL_GENERAL ) ), - m_aNumeralsFT ( this, SVX_RES( FT_NUMERALS ) ), - m_aNumeralsLB ( this, SVX_RES( LB_NUMERALS ) ) + SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_CTL ), rSet ), + + m_aSequenceCheckingFL ( this, CUI_RES( FL_SEQUENCECHECKING ) ), + m_aSequenceCheckingCB ( this, CUI_RES( CB_SEQUENCECHECKING ) ), + m_aRestrictedCB ( this, CUI_RES( CB_RESTRICTED ) ), + m_aTypeReplaceCB ( this, CUI_RES( CB_TYPE_REPLACE ) ), + m_aCursorControlFL ( this, CUI_RES( FL_CURSORCONTROL ) ), + m_aMovementFT ( this, CUI_RES( FT_MOVEMENT ) ), + m_aMovementLogicalRB ( this, CUI_RES( RB_MOVEMENT_LOGICAL ) ), + m_aMovementVisualRB ( this, CUI_RES( RB_MOVEMENT_VISUAL ) ), + m_aGeneralFL ( this, CUI_RES( FL_GENERAL ) ), + m_aNumeralsFT ( this, CUI_RES( FT_NUMERALS ) ), + m_aNumeralsLB ( this, CUI_RES( LB_NUMERALS ) ) { FreeResource(); diff --git a/cui/source/options/optctl.src b/cui/source/options/optctl.src index 2cf9ad051f67..f750264a1df1 100644 --- a/cui/source/options/optctl.src +++ b/cui/source/options/optctl.src @@ -30,7 +30,7 @@ #include "optctl.hrc" #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include <sfx2/sfx.hrc> diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 5111c72088fa..e56089dd351e 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -42,14 +42,15 @@ #include <unotools/intlwrapper.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> +#include <svx/dialogs.hrc> #define _SVX_OPTDICT_CXX #include <linguistic/misc.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optdict.hrc" #include "optdict.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <svx/svxerr.hxx> using namespace ::com::sun::star; @@ -101,17 +102,17 @@ static CDE_RESULT cmpDicEntry_Impl( const String &rText1, const String &rText2 ) SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent, Reference< XSpellChecker1 > &xSpl ) : - ModalDialog( pParent, SVX_RES( RID_SFXDLG_NEWDICT ) ), - - aNameText ( this, SVX_RES( FT_DICTNAME ) ), - aNameEdit ( this, SVX_RES( ED_DICTNAME ) ), - aLanguageText ( this, SVX_RES( FT_DICTLANG ) ), - aLanguageLB ( this, SVX_RES( LB_DICTLANG ) ), - aExceptBtn ( this, SVX_RES( BTN_EXCEPT ) ), - aNewDictBox ( this, SVX_RES( GB_NEWDICT ) ), - aOKBtn ( this, SVX_RES( BTN_NEWDICT_OK ) ), - aCancelBtn ( this, SVX_RES( BTN_NEWDICT_ESC ) ), - aHelpBtn ( this, SVX_RES( BTN_NEWDICT_HLP ) ), + ModalDialog( pParent, CUI_RES( RID_SFXDLG_NEWDICT ) ), + + aNameText ( this, CUI_RES( FT_DICTNAME ) ), + aNameEdit ( this, CUI_RES( ED_DICTNAME ) ), + aLanguageText ( this, CUI_RES( FT_DICTLANG ) ), + aLanguageLB ( this, CUI_RES( LB_DICTLANG ) ), + aExceptBtn ( this, CUI_RES( BTN_EXCEPT ) ), + aNewDictBox ( this, CUI_RES( GB_NEWDICT ) ), + aOKBtn ( this, CUI_RES( BTN_NEWDICT_OK ) ), + aCancelBtn ( this, CUI_RES( BTN_NEWDICT_ESC ) ), + aHelpBtn ( this, CUI_RES( BTN_NEWDICT_HLP ) ), xSpell( xSpl ) { // Handler installieren @@ -152,7 +153,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG ) if ( bFound ) { // Doppelte Namen? - InfoBox( this, SVX_RESSTR( RID_SVXSTR_OPT_DOUBLE_DICTS ) ).Execute(); + InfoBox( this, CUI_RESSTR( RID_SVXSTR_OPT_DOUBLE_DICTS ) ).Execute(); aNameEdit.GrabFocus(); return 0; } @@ -179,7 +180,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG ) // Fehler: konnte neues W"orterbuch nicht anlegen SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, String(), - this, RID_SVXERRCTX, &DIALOG_MGR() ); + this, RID_SVXERRCTX, &CUI_MGR() ); ErrorHandler::HandleError( *new StringErrorInfo( ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) ); @@ -225,23 +226,23 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( const String& rName, Reference< XSpellChecker1 > &xSpl ) : - ModalDialog( pParent, SVX_RES( RID_SFXDLG_EDITDICT ) ), - - aBookFT ( this, SVX_RES( FT_BOOK ) ), - aAllDictsLB ( this, SVX_RES( LB_ALLDICTS ) ), - aLangFT ( this, SVX_RES( FT_DICTLANG ) ), - aLangLB ( this, SVX_RES( LB_DICTLANG ) ), - aWordFT ( this, SVX_RES( FT_WORD ) ), - aWordED ( this, SVX_RES( ED_WORD ) ), - aReplaceFT ( this, SVX_RES( FT_REPLACE ) ), - aReplaceED ( this, SVX_RES( ED_REPLACE ) ), - aWordsLB ( this, SVX_RES( TLB_REPLACE ) ), - aNewReplacePB ( this, SVX_RES( PB_NEW_REPLACE ) ), - aDeletePB ( this, SVX_RES( PB_DELETE_REPLACE ) ), - aEditDictsBox ( this, SVX_RES( GB_EDITDICTS ) ), - aCloseBtn ( this, SVX_RES( BTN_EDITCLOSE ) ), - aHelpBtn ( this, SVX_RES( BTN_EDITHELP ) ), - sModify (SVX_RES(STR_MODIFY)), + ModalDialog( pParent, CUI_RES( RID_SFXDLG_EDITDICT ) ), + + aBookFT ( this, CUI_RES( FT_BOOK ) ), + aAllDictsLB ( this, CUI_RES( LB_ALLDICTS ) ), + aLangFT ( this, CUI_RES( FT_DICTLANG ) ), + aLangLB ( this, CUI_RES( LB_DICTLANG ) ), + aWordFT ( this, CUI_RES( FT_WORD ) ), + aWordED ( this, CUI_RES( ED_WORD ) ), + aReplaceFT ( this, CUI_RES( FT_REPLACE ) ), + aReplaceED ( this, CUI_RES( ED_REPLACE ) ), + aWordsLB ( this, CUI_RES( TLB_REPLACE ) ), + aNewReplacePB ( this, CUI_RES( PB_NEW_REPLACE ) ), + aDeletePB ( this, CUI_RES( PB_DELETE_REPLACE ) ), + aEditDictsBox ( this, CUI_RES( GB_EDITDICTS ) ), + aCloseBtn ( this, CUI_RES( BTN_EDITCLOSE ) ), + aHelpBtn ( this, CUI_RES( BTN_EDITHELP ) ), + sModify (CUI_RES(STR_MODIFY)), sNew (aNewReplacePB.GetText()), aDecoView ( this), xSpell ( xSpl ), @@ -458,7 +459,7 @@ IMPL_LINK( SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox *, EMPTYARG ) if ( nLang != nOldLang ) { - QueryBox aBox( this, SVX_RES( RID_SFXQB_SET_LANGUAGE ) ); + QueryBox aBox( this, CUI_RES( RID_SFXQB_SET_LANGUAGE ) ); String sTxt( aBox.GetMessText() ); sTxt.SearchAndReplaceAscii( "%1", aAllDictsLB.GetSelectEntry() ); aBox.SetMessText( sTxt ); diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src index 740853410a61..589f73b4f46b 100644 --- a/cui/source/options/optdict.src +++ b/cui/source/options/optdict.src @@ -30,7 +30,7 @@ // include --------------------------------------------------------------- #include <sfx2/sfx.hrc> #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optdict.hrc" // pragma ---------------------------------------------------------------- diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 998d4cccbcc8..feb38daff447 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -36,9 +36,9 @@ #include <unotools/fltrcfg.hxx> #include "optfltr.hxx" #include "optfltr.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> enum MSFltrPg2_CheckBoxEntries { Math, @@ -54,17 +54,17 @@ enum MSFltrPg2_CheckBoxEntries { // ----------------------------------------------------------------------- OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet) - : SfxTabPage( pParent, SVX_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ), - aMSWordGB ( this, SVX_RES( GB_WORD ) ), - aWBasicCodeCB ( this, SVX_RES( CB_WBAS_CODE ) ), - aWBasicStgCB ( this, SVX_RES( CB_WBAS_STG ) ), - aMSExcelGB ( this, SVX_RES( GB_EXCEL ) ), - aEBasicCodeCB ( this, SVX_RES( CB_EBAS_CODE ) ), - aEBasicExectblCB( this, SVX_RES( CB_EBAS_EXECTBL ) ), - aEBasicStgCB ( this, SVX_RES( CB_EBAS_STG ) ), - aMSPPointGB ( this, SVX_RES( GB_PPOINT ) ), - aPBasicCodeCB ( this, SVX_RES( CB_PBAS_CODE ) ), - aPBasicStgCB ( this, SVX_RES( CB_PBAS_STG ) ) + : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ), + aMSWordGB ( this, CUI_RES( GB_WORD ) ), + aWBasicCodeCB ( this, CUI_RES( CB_WBAS_CODE ) ), + aWBasicStgCB ( this, CUI_RES( CB_WBAS_STG ) ), + aMSExcelGB ( this, CUI_RES( GB_EXCEL ) ), + aEBasicCodeCB ( this, CUI_RES( CB_EBAS_CODE ) ), + aEBasicExectblCB( this, CUI_RES( CB_EBAS_EXECTBL ) ), + aEBasicStgCB ( this, CUI_RES( CB_EBAS_STG ) ), + aMSPPointGB ( this, CUI_RES( GB_PPOINT ) ), + aPBasicCodeCB ( this, CUI_RES( CB_PBAS_CODE ) ), + aPBasicStgCB ( this, CUI_RES( CB_PBAS_STG ) ) { FreeResource(); @@ -145,16 +145,16 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& ) * --------------------------------------------------*/ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ) - : SfxTabPage( pParent, SVX_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ), - aCheckLB ( this, SVX_RES( CLB_SETTINGS )), - aHeader1FT ( this, SVX_RES( FT_HEADER1_EXPLANATION )), - aHeader2FT ( this, SVX_RES( FT_HEADER2_EXPLANATION )), - sHeader1 ( SVX_RES( ST_HEADER1 )), - sHeader2 ( SVX_RES( ST_HEADER2 )), - sChgToFromMath ( SVX_RES( ST_CHG_MATH )), - sChgToFromWriter ( SVX_RES( ST_CHG_WRITER )), - sChgToFromCalc ( SVX_RES( ST_CHG_CALC )), - sChgToFromImpress ( SVX_RES( ST_CHG_IMPRESS )), + : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ), + aCheckLB ( this, CUI_RES( CLB_SETTINGS )), + aHeader1FT ( this, CUI_RES( FT_HEADER1_EXPLANATION )), + aHeader2FT ( this, CUI_RES( FT_HEADER2_EXPLANATION )), + sHeader1 ( CUI_RES( ST_HEADER1 )), + sHeader2 ( CUI_RES( ST_HEADER2 )), + sChgToFromMath ( CUI_RES( ST_CHG_MATH )), + sChgToFromWriter ( CUI_RES( ST_CHG_WRITER )), + sChgToFromCalc ( CUI_RES( ST_CHG_CALC )), + sChgToFromImpress ( CUI_RES( ST_CHG_IMPRESS )), pCheckButtonData(0) { FreeResource(); diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src index 9e932406b265..a03a3bc1cc9c 100644 --- a/cui/source/options/optfltr.src +++ b/cui/source/options/optfltr.src @@ -29,7 +29,7 @@ ************************************************************************/ // include ----------------------------------------------------------------- #include "optfltr.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> // pragma ------------------------------------------------------------------ // RID_OFAPAGE_MSFILTEROPT ----------------------------------------------------- diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index ca2a6f32fd23..2a8e8ed2c001 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -68,7 +68,7 @@ #include <svx/xpool.hxx> #include <svx/dlgutil.hxx> #include "cuitabarea.hxx" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include <svx/unolingu.hxx> #include <svx/svxids.hrc> #include <svx/langitem.hxx> @@ -76,7 +76,7 @@ #include <rtl/ustrbuf.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <svtools/helpopt.hxx> #include <unotools/saveopt.hxx> @@ -195,26 +195,26 @@ namespace OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( OFA_TP_MISC ), rSet ), - - aHelpFL ( this, SVX_RES( FL_HELP ) ), - aToolTipsCB ( this, SVX_RES( CB_TOOLTIP ) ), - aExtHelpCB ( this, SVX_RES( CB_EXTHELP ) ), - aHelpAgentCB ( this, SVX_RES( CB_HELPAGENT ) ), - aHelpAgentResetBtn ( this, SVX_RES( PB_HELPAGENT_RESET ) ), - aHelpFormatFT ( this, SVX_RES( FT_HELPFORMAT ) ), - aHelpFormatLB ( this, SVX_RES( LB_HELPFORMAT ) ), - aFileDlgFL ( this, SVX_RES( FL_FILEDLG ) ), - aFileDlgROImage ( this, SVX_RES( FI_FILEDLG_RO ) ), - aFileDlgCB ( this, SVX_RES( CB_FILEDLG ) ), - aPrintDlgFL ( this, SVX_RES( FL_PRINTDLG ) ), - aPrintDlgCB ( this, SVX_RES( CB_PRINTDLG ) ), - aDocStatusFL ( this, SVX_RES( FL_DOCSTATUS ) ), - aDocStatusCB ( this, SVX_RES( CB_DOCSTATUS ) ), - aTwoFigureFL ( this, SVX_RES( FL_TWOFIGURE ) ), - aInterpretFT ( this, SVX_RES( FT_INTERPRET ) ), - aYearValueField ( this, SVX_RES( NF_YEARVALUE ) ), - aToYearFT ( this, SVX_RES( FT_TOYEAR ) ) + SfxTabPage( pParent, CUI_RES( OFA_TP_MISC ), rSet ), + + aHelpFL ( this, CUI_RES( FL_HELP ) ), + aToolTipsCB ( this, CUI_RES( CB_TOOLTIP ) ), + aExtHelpCB ( this, CUI_RES( CB_EXTHELP ) ), + aHelpAgentCB ( this, CUI_RES( CB_HELPAGENT ) ), + aHelpAgentResetBtn ( this, CUI_RES( PB_HELPAGENT_RESET ) ), + aHelpFormatFT ( this, CUI_RES( FT_HELPFORMAT ) ), + aHelpFormatLB ( this, CUI_RES( LB_HELPFORMAT ) ), + aFileDlgFL ( this, CUI_RES( FL_FILEDLG ) ), + aFileDlgROImage ( this, CUI_RES( FI_FILEDLG_RO ) ), + aFileDlgCB ( this, CUI_RES( CB_FILEDLG ) ), + aPrintDlgFL ( this, CUI_RES( FL_PRINTDLG ) ), + aPrintDlgCB ( this, CUI_RES( CB_PRINTDLG ) ), + aDocStatusFL ( this, CUI_RES( FL_DOCSTATUS ) ), + aDocStatusCB ( this, CUI_RES( CB_DOCSTATUS ) ), + aTwoFigureFL ( this, CUI_RES( FL_TWOFIGURE ) ), + aInterpretFT ( this, CUI_RES( FT_INTERPRET ) ), + aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ), + aToYearFT ( this, CUI_RES( FT_TOYEAR ) ) { FreeResource(); @@ -662,40 +662,40 @@ void CanvasSettings::EnabledHardwareAcceleration( BOOL _bEnabled ) const OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( OFA_TP_VIEW ), rSet ), + SfxTabPage( pParent, CUI_RES( OFA_TP_VIEW ), rSet ), - aUserInterfaceFL ( this, SVX_RES( FL_USERINTERFACE ) ), - aWindowSizeFT ( this, SVX_RES( FT_WINDOWSIZE ) ), - aWindowSizeMF ( this, SVX_RES( MF_WINDOWSIZE ) ), - aIconSizeStyleFT ( this, SVX_RES( FT_ICONSIZESTYLE ) ), - aIconSizeLB ( this, SVX_RES( LB_ICONSIZE ) ), - aIconStyleLB ( this, SVX_RES( LB_ICONSTYLE ) ), - m_aSystemFont (this, SVX_RES( CB_SYSTEM_FONT ) ), + aUserInterfaceFL ( this, CUI_RES( FL_USERINTERFACE ) ), + aWindowSizeFT ( this, CUI_RES( FT_WINDOWSIZE ) ), + aWindowSizeMF ( this, CUI_RES( MF_WINDOWSIZE ) ), + aIconSizeStyleFT ( this, CUI_RES( FT_ICONSIZESTYLE ) ), + aIconSizeLB ( this, CUI_RES( LB_ICONSIZE ) ), + aIconStyleLB ( this, CUI_RES( LB_ICONSTYLE ) ), + m_aSystemFont (this, CUI_RES( CB_SYSTEM_FONT ) ), #if defined( UNX ) - aFontAntiAliasing ( this, SVX_RES( CB_FONTANTIALIASING )), - aAAPointLimitLabel ( this, SVX_RES( FT_POINTLIMIT_LABEL )), - aAAPointLimit ( this, SVX_RES( NF_AA_POINTLIMIT )), - aAAPointLimitUnits ( this, SVX_RES( FT_POINTLIMIT_UNIT )), + aFontAntiAliasing ( this, CUI_RES( CB_FONTANTIALIASING )), + aAAPointLimitLabel ( this, CUI_RES( FT_POINTLIMIT_LABEL )), + aAAPointLimit ( this, CUI_RES( NF_AA_POINTLIMIT )), + aAAPointLimitUnits ( this, CUI_RES( FT_POINTLIMIT_UNIT )), #endif - aMenuFL ( this, SVX_RES( FL_MENU ) ), - aMenuIconsFT ( this, SVX_RES( FT_MENU_ICONS )), - aMenuIconsLB ( this, SVX_RES( LB_MENU_ICONS )), - aFontListsFL ( this, SVX_RES( FL_FONTLISTS) ), - aFontShowCB ( this, SVX_RES( CB_FONT_SHOW ) ), - aFontHistoryCB ( this, SVX_RES( CB_FONT_HISTORY ) ), - aRenderingFL ( this, SVX_RES( FL_RENDERING ) ), - aUseHardwareAccell ( this, SVX_RES( CB_USE_HARDACCELL ) ), - aUseAntiAliase ( this, SVX_RES( CB_USE_ANTIALIASE ) ), - aMouseFL ( this, SVX_RES( FL_MOUSE ) ), - aMousePosFT ( this, SVX_RES( FT_MOUSEPOS ) ), - aMousePosLB ( this, SVX_RES( LB_MOUSEPOS ) ), - aMouseMiddleFT ( this, SVX_RES( FT_MOUSEMIDDLE ) ), - aMouseMiddleLB ( this, SVX_RES( LB_MOUSEMIDDLE ) ), + aMenuFL ( this, CUI_RES( FL_MENU ) ), + aMenuIconsFT ( this, CUI_RES( FT_MENU_ICONS )), + aMenuIconsLB ( this, CUI_RES( LB_MENU_ICONS )), + aFontListsFL ( this, CUI_RES( FL_FONTLISTS) ), + aFontShowCB ( this, CUI_RES( CB_FONT_SHOW ) ), + aFontHistoryCB ( this, CUI_RES( CB_FONT_HISTORY ) ), + aRenderingFL ( this, CUI_RES( FL_RENDERING ) ), + aUseHardwareAccell ( this, CUI_RES( CB_USE_HARDACCELL ) ), + aUseAntiAliase ( this, CUI_RES( CB_USE_ANTIALIASE ) ), + aMouseFL ( this, CUI_RES( FL_MOUSE ) ), + aMousePosFT ( this, CUI_RES( FT_MOUSEPOS ) ), + aMousePosLB ( this, CUI_RES( LB_MOUSEPOS ) ), + aMouseMiddleFT ( this, CUI_RES( FT_MOUSEMIDDLE ) ), + aMouseMiddleLB ( this, CUI_RES( LB_MOUSEMIDDLE ) ), // #i97672# - maSelectionFL(this, SVX_RES(FL_SELECTION)), - maSelectionCB(this, SVX_RES(CB_SELECTION)), - maSelectionMF(this, SVX_RES(MF_SELECTION)), + maSelectionFL(this, CUI_RES(FL_SELECTION)), + maSelectionCB(this, CUI_RES(CB_SELECTION)), + maSelectionMF(this, CUI_RES(MF_SELECTION)), nSizeLB_InitialSelection(0), nStyleLB_InitialSelection(0), @@ -745,7 +745,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : }; // temporaryly create the checkbox for the anti aliasing (we need to to determine it's pos) - CheckBox* pFontAntiAliasing = new CheckBox( this, SVX_RES( CB_FONTANTIALIASING ) ); + CheckBox* pFontAntiAliasing = new CheckBox( this, CUI_RES( CB_FONTANTIALIASING ) ); sal_Int32 nMoveUp = aMenuFL.GetPosPixel().Y() - pFontAntiAliasing->GetPosPixel().Y(); DELETEZ( pFontAntiAliasing ); @@ -1232,34 +1232,34 @@ static const OUString sOfficeLocaleKey = OUString::createFromAscii("ooLocale"); static Sequence< OUString > seqInstalledLanguages; OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( OFA_TP_LANGUAGES ), rSet ), - aUILanguageGB(this, SVX_RES(FL_UI_LANG )), - aLocaleSettingFI(this, SVX_RES(FI_LOCALESETTING)), - aUserInterfaceFT(this, SVX_RES(FT_USERINTERFACE)), - aUserInterfaceLB(this, SVX_RES(LB_USERINTERFACE)), - aLocaleSettingFT(this, SVX_RES(FT_LOCALESETTING)), - aLocaleSettingLB(this, SVX_RES(LB_LOCALESETTING)), - aCurrencyFI( this, SVX_RES(FI_CURRENCY )), - aDecimalSeparatorFT(this, SVX_RES(FT_DECIMALSEPARATOR)), - aDecimalSeparatorCB(this, SVX_RES(CB_DECIMALSEPARATOR)), - aCurrencyFT( this, SVX_RES(FT_CURRENCY )), - aCurrencyLB( this, SVX_RES(LB_CURRENCY )), - aLinguLanguageGB(this, SVX_RES(FL_LINGU_LANG )), - aWesternLanguageFI(this, SVX_RES(FI_WEST_LANG )), - aWesternLanguageFT(this, SVX_RES(FT_WEST_LANG )), - aWesternLanguageLB(this, SVX_RES(LB_WEST_LANG )), - aAsianLanguageFI(this, SVX_RES(FI_ASIAN_LANG )), - aAsianLanguageFT(this, SVX_RES(FT_ASIAN_LANG )), - aAsianLanguageLB(this, SVX_RES(LB_ASIAN_LANG )), - aComplexLanguageFI(this, SVX_RES(FI_COMPLEX_LANG )), - aComplexLanguageFT(this, SVX_RES(FT_COMPLEX_LANG )), - aComplexLanguageLB(this, SVX_RES(LB_COMPLEX_LANG )), - aCurrentDocCB(this, SVX_RES(CB_CURRENT_DOC )), - aEnhancedFL(this, SVX_RES(FL_ENHANCED )), - aAsianSupportFI(this, SVX_RES(FI_ASIANSUPPORT )), - aAsianSupportCB(this, SVX_RES(CB_ASIANSUPPORT )), - aCTLSupportFI(this, SVX_RES(FI_CTLSUPPORT )), - aCTLSupportCB(this, SVX_RES(CB_CTLSUPPORT )), + SfxTabPage( pParent, CUI_RES( OFA_TP_LANGUAGES ), rSet ), + aUILanguageGB(this, CUI_RES(FL_UI_LANG )), + aLocaleSettingFI(this, CUI_RES(FI_LOCALESETTING)), + aUserInterfaceFT(this, CUI_RES(FT_USERINTERFACE)), + aUserInterfaceLB(this, CUI_RES(LB_USERINTERFACE)), + aLocaleSettingFT(this, CUI_RES(FT_LOCALESETTING)), + aLocaleSettingLB(this, CUI_RES(LB_LOCALESETTING)), + aCurrencyFI( this, CUI_RES(FI_CURRENCY )), + aDecimalSeparatorFT(this, CUI_RES(FT_DECIMALSEPARATOR)), + aDecimalSeparatorCB(this, CUI_RES(CB_DECIMALSEPARATOR)), + aCurrencyFT( this, CUI_RES(FT_CURRENCY )), + aCurrencyLB( this, CUI_RES(LB_CURRENCY )), + aLinguLanguageGB(this, CUI_RES(FL_LINGU_LANG )), + aWesternLanguageFI(this, CUI_RES(FI_WEST_LANG )), + aWesternLanguageFT(this, CUI_RES(FT_WEST_LANG )), + aWesternLanguageLB(this, CUI_RES(LB_WEST_LANG )), + aAsianLanguageFI(this, CUI_RES(FI_ASIAN_LANG )), + aAsianLanguageFT(this, CUI_RES(FT_ASIAN_LANG )), + aAsianLanguageLB(this, CUI_RES(LB_ASIAN_LANG )), + aComplexLanguageFI(this, CUI_RES(FI_COMPLEX_LANG )), + aComplexLanguageFT(this, CUI_RES(FT_COMPLEX_LANG )), + aComplexLanguageLB(this, CUI_RES(LB_COMPLEX_LANG )), + aCurrentDocCB(this, CUI_RES(CB_CURRENT_DOC )), + aEnhancedFL(this, CUI_RES(FL_ENHANCED )), + aAsianSupportFI(this, CUI_RES(FI_ASIANSUPPORT )), + aAsianSupportCB(this, CUI_RES(CB_ASIANSUPPORT )), + aCTLSupportFI(this, CUI_RES(FI_CTLSUPPORT )), + aCTLSupportCB(this, CUI_RES(CB_CTLSUPPORT )), sDecimalSeparatorLabel(aDecimalSeparatorCB.GetText()), pLangConfig(new LanguageConfig_Impl) { @@ -1492,7 +1492,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) xProp->setPropertyValue(sUserLocaleKey, makeAny(aLangString)); Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges(); // display info - InfoBox aBox(this, SVX_RES(RID_SVX_MSGBOX_LANGUAGE_RESTART)); + InfoBox aBox(this, CUI_RES(RID_SVX_MSGBOX_LANGUAGE_RESTART)); aBox.Execute(); // tell quickstarter to stop being a veto listener diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index f663a7ed44ef..e8c8b9edf9a5 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -29,7 +29,7 @@ ************************************************************************/ // include --------------------------------------------------------------- -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optgdlg.hrc" #include "helpid.hrc" diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 8812ed0efc2e..71d30851f2bd 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -39,11 +39,11 @@ #define _SVX_OPTGENRL_CXX -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optgenrl.hrc" #include <unotools/useroptions.hxx> #include "cuioptgenrl.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <svx/dlgutil.hxx> #include <svx/strarray.hxx> @@ -93,53 +93,53 @@ String ConvertToStore_Impl( const String& rText ) SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : - SfxTabPage( pParent, SVX_RES(RID_SFXPAGE_GENERAL), rCoreSet ), - - aCompanyLbl ( this, SVX_RES( FT_COMPANY ), true ), - aCompanyEdit ( this, SVX_RES( ED_COMPANY ), INDEX_NOTSET, &aCompanyLbl ), - aNameLbl ( this, SVX_RES( FT_NAME ), true ), - aNameLblRuss ( this, SVX_RES( FT_NAME_RUSS ), true ), - aNameLblEastern ( this, SVX_RES( FT_NAME_EASTERN ), true ), - aFirstName ( this, SVX_RES( ED_FIRSTNAME ), 0, &aNameLbl ), - aFatherName ( this, SVX_RES( ED_FATHERNAME ) ), - aName ( this, SVX_RES( ED_NAME ), 1, &aNameLbl ), - aShortName ( this, SVX_RES( ED_SHORTNAME ), 2, &aNameLbl ), - aStreetLbl ( this, SVX_RES( FT_STREET ), true ), - aStreetLblRuss ( this, SVX_RES( FT_STREET_RUSS ), true ), - aStreetEdit ( this, SVX_RES( ED_STREET ), 0, &aStreetLbl ), - aApartmentNrEdit( this, SVX_RES( ED_APARTMENTNR ), 1, &aStreetLblRuss ), - aCityLbl ( this, SVX_RES( FT_CITY ), true ), - aPLZEdit ( this, SVX_RES( ED_PLZ ), 0, &aCityLbl ), - aCityEdit ( this, SVX_RES( ED_CITY ), 1, &aCityLbl ), - aUsCityEdit ( this, SVX_RES( ED_US_CITY ), 0, &aCityLbl ), - aUsStateEdit ( this, SVX_RES( ED_US_STATE ), 1, &aCityLbl ), - aUsZipEdit ( this, SVX_RES( ED_US_ZIPCODE ), 2, &aCityLbl ), - aCountryLbl ( this, SVX_RES( FT_COUNTRY ), true ), - aCountryEdit ( this, SVX_RES( ED_COUNTRY ), INDEX_NOTSET, &aCountryLbl ), - aTitlePosLbl ( this, SVX_RES( FT_TITLEPOS ), true ), - aTitleEdit ( this, SVX_RES( ED_TITLE ), 0, &aTitlePosLbl ), - aPositionEdit ( this, SVX_RES( ED_POSITION ), 1, &aTitlePosLbl ), - aPhoneLbl ( this, SVX_RES( FT_PHONE ), true ), - aTelPrivEdit ( this, SVX_RES( ED_TELPRIVAT ), 0, &aPhoneLbl ), - aTelCompanyEdit ( this, SVX_RES( ED_TELCOMPANY ), 1, &aPhoneLbl ), - aFaxMailLbl ( this, SVX_RES( FT_FAXMAIL ), true ), - aFaxEdit ( this, SVX_RES( ED_FAX ), 0, &aFaxMailLbl ), - aEmailEdit ( this, SVX_RES( ED_EMAIL ), 1, &aFaxMailLbl ), - aAddrFrm ( this, SVX_RES( GB_ADDRESS ) ), - aUseDataCB ( this, SVX_RES( CB_USEDATA ) ), + SfxTabPage( pParent, CUI_RES(RID_SFXPAGE_GENERAL), rCoreSet ), + + aCompanyLbl ( this, CUI_RES( FT_COMPANY ), true ), + aCompanyEdit ( this, CUI_RES( ED_COMPANY ), INDEX_NOTSET, &aCompanyLbl ), + aNameLbl ( this, CUI_RES( FT_NAME ), true ), + aNameLblRuss ( this, CUI_RES( FT_NAME_RUSS ), true ), + aNameLblEastern ( this, CUI_RES( FT_NAME_EASTERN ), true ), + aFirstName ( this, CUI_RES( ED_FIRSTNAME ), 0, &aNameLbl ), + aFatherName ( this, CUI_RES( ED_FATHERNAME ) ), + aName ( this, CUI_RES( ED_NAME ), 1, &aNameLbl ), + aShortName ( this, CUI_RES( ED_SHORTNAME ), 2, &aNameLbl ), + aStreetLbl ( this, CUI_RES( FT_STREET ), true ), + aStreetLblRuss ( this, CUI_RES( FT_STREET_RUSS ), true ), + aStreetEdit ( this, CUI_RES( ED_STREET ), 0, &aStreetLbl ), + aApartmentNrEdit( this, CUI_RES( ED_APARTMENTNR ), 1, &aStreetLblRuss ), + aCityLbl ( this, CUI_RES( FT_CITY ), true ), + aPLZEdit ( this, CUI_RES( ED_PLZ ), 0, &aCityLbl ), + aCityEdit ( this, CUI_RES( ED_CITY ), 1, &aCityLbl ), + aUsCityEdit ( this, CUI_RES( ED_US_CITY ), 0, &aCityLbl ), + aUsStateEdit ( this, CUI_RES( ED_US_STATE ), 1, &aCityLbl ), + aUsZipEdit ( this, CUI_RES( ED_US_ZIPCODE ), 2, &aCityLbl ), + aCountryLbl ( this, CUI_RES( FT_COUNTRY ), true ), + aCountryEdit ( this, CUI_RES( ED_COUNTRY ), INDEX_NOTSET, &aCountryLbl ), + aTitlePosLbl ( this, CUI_RES( FT_TITLEPOS ), true ), + aTitleEdit ( this, CUI_RES( ED_TITLE ), 0, &aTitlePosLbl ), + aPositionEdit ( this, CUI_RES( ED_POSITION ), 1, &aTitlePosLbl ), + aPhoneLbl ( this, CUI_RES( FT_PHONE ), true ), + aTelPrivEdit ( this, CUI_RES( ED_TELPRIVAT ), 0, &aPhoneLbl ), + aTelCompanyEdit ( this, CUI_RES( ED_TELCOMPANY ), 1, &aPhoneLbl ), + aFaxMailLbl ( this, CUI_RES( FT_FAXMAIL ), true ), + aFaxEdit ( this, CUI_RES( ED_FAX ), 0, &aFaxMailLbl ), + aEmailEdit ( this, CUI_RES( ED_EMAIL ), 1, &aFaxMailLbl ), + aAddrFrm ( this, CUI_RES( GB_ADDRESS ) ), + aUseDataCB ( this, CUI_RES( CB_USEDATA ) ), pImpl ( new GeneralTabPage_Impl ) { LanguageType eLang = Application::GetSettings().GetUILanguage(); - pImpl->maQueryStr = String( SVX_RES( STR_QUERY_REG ) ); + pImpl->maQueryStr = String( CUI_RES( STR_QUERY_REG ) ); if ( LANGUAGE_ENGLISH_US == eLang ) { // amerikanische Postadresse aufbauen aPLZEdit.Hide(); aCityEdit.Hide(); - aCityLbl.SetText( SVX_RES( STR_US_STATE ) ); + aCityLbl.SetText( CUI_RES( STR_US_STATE ) ); } else if ( LANGUAGE_RUSSIAN == eLang ) { diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src index cff6f8d4216c..1d0b049dd204 100644 --- a/cui/source/options/optgenrl.src +++ b/cui/source/options/optgenrl.src @@ -33,7 +33,7 @@ #include <sfx2/sfx.hrc> #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optgenrl.hrc" // RID_SFXPAGE_GENERAL ------------------------------------------------------ @@ -276,24 +276,6 @@ QueryBox RID_SVXQB_CHANGEDATA Message [ en-US ] = "The User Data have been changed.\nNote that, if you continue, the registration key will become invalid.\nTherefore, a new registration key is needed within 30 days.\nYou can find the registration form in the menu Help - Registration...\nDo you really want to change your User Data?"; }; - // RID_SVXSTR_FIELDUNIT_TABLE -------------------------------------------- - -StringArray RID_SVXSTR_FIELDUNIT_TABLE -{ - ItemList [ en-US ] = - { - < "Millimeter" ; FUNIT_MM ; > ; - < "Centimeter" ; FUNIT_CM ; > ; - < "Meter" ; FUNIT_M ; > ; - < "Kilometer" ; FUNIT_KM ; > ; - < "Inch" ; FUNIT_INCH ; > ; - < "Foot" ; FUNIT_FOOT ; > ; - < "Miles" ; FUNIT_MILE ; > ; - < "Pica" ; FUNIT_PICA ; > ; - < "Point" ; FUNIT_POINT ; > ; - }; - }; - // ********************************************************************** EOF diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 2737dc33051f..bddcd4a9e182 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -38,9 +38,9 @@ #include <svx/htmlcfg.hxx> #include "opthtml.hxx" #include "opthtml.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> // Umwandlung der Modi zu den Positionen in der Listbox const USHORT aPosToExportArr[] = @@ -63,34 +63,34 @@ const USHORT aExportToPosArr[] = // ----------------------------------------------------------------------- OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) : - SfxTabPage( pParent, SVX_RES( RID_OFAPAGE_HTMLOPT ), rSet ), - aFontSizeGB ( this, SVX_RES( GB_FONTSIZE ) ), - aSize1FT ( this, SVX_RES( FT_SIZE1 ) ), - aSize1NF ( this, SVX_RES( NF_SIZE1 ) ), - aSize2FT ( this, SVX_RES( FT_SIZE2 ) ), - aSize2NF ( this, SVX_RES( NF_SIZE2 ) ), - aSize3FT ( this, SVX_RES( FT_SIZE3 ) ), - aSize3NF ( this, SVX_RES( NF_SIZE3 ) ), - aSize4FT ( this, SVX_RES( FT_SIZE4 ) ), - aSize4NF ( this, SVX_RES( NF_SIZE4 ) ), - aSize5FT ( this, SVX_RES( FT_SIZE5 ) ), - aSize5NF ( this, SVX_RES( NF_SIZE5 ) ), - aSize6FT ( this, SVX_RES( FT_SIZE6 ) ), - aSize6NF ( this, SVX_RES( NF_SIZE6 ) ), - aSize7FT ( this, SVX_RES( FT_SIZE7 ) ), - aSize7NF ( this, SVX_RES( NF_SIZE7 ) ), - aImportGB ( this, SVX_RES( GB_IMPORT ) ), - aNumbersEnglishUSCB ( this, SVX_RES( CB_NUMBERS_ENGLISH_US ) ), - aUnknownTagCB ( this, SVX_RES( CB_UNKNOWN_TAGS ) ), - aIgnoreFontNamesCB( this, SVX_RES( CB_IGNORE_FONTNAMES ) ), - aExportGB ( this, SVX_RES( GB_EXPORT ) ), - aExportLB ( this, SVX_RES( LB_EXPORT ) ), - aStarBasicCB ( this, SVX_RES( CB_STARBASIC ) ), - aStarBasicWarningCB(this, SVX_RES( CB_STARBASIC_WARNING ) ), - aPrintExtensionCB( this,SVX_RES(CB_PRINT_EXTENSION )), - aSaveGrfLocalCB ( this, SVX_RES( CB_LOCAL_GRF ) ), - aCharSetFT ( this, SVX_RES( FT_CHARSET ) ), - aCharSetLB ( this, SVX_RES( LB_CHARSET ) ) + SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_HTMLOPT ), rSet ), + aFontSizeGB ( this, CUI_RES( GB_FONTSIZE ) ), + aSize1FT ( this, CUI_RES( FT_SIZE1 ) ), + aSize1NF ( this, CUI_RES( NF_SIZE1 ) ), + aSize2FT ( this, CUI_RES( FT_SIZE2 ) ), + aSize2NF ( this, CUI_RES( NF_SIZE2 ) ), + aSize3FT ( this, CUI_RES( FT_SIZE3 ) ), + aSize3NF ( this, CUI_RES( NF_SIZE3 ) ), + aSize4FT ( this, CUI_RES( FT_SIZE4 ) ), + aSize4NF ( this, CUI_RES( NF_SIZE4 ) ), + aSize5FT ( this, CUI_RES( FT_SIZE5 ) ), + aSize5NF ( this, CUI_RES( NF_SIZE5 ) ), + aSize6FT ( this, CUI_RES( FT_SIZE6 ) ), + aSize6NF ( this, CUI_RES( NF_SIZE6 ) ), + aSize7FT ( this, CUI_RES( FT_SIZE7 ) ), + aSize7NF ( this, CUI_RES( NF_SIZE7 ) ), + aImportGB ( this, CUI_RES( GB_IMPORT ) ), + aNumbersEnglishUSCB ( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ), + aUnknownTagCB ( this, CUI_RES( CB_UNKNOWN_TAGS ) ), + aIgnoreFontNamesCB( this, CUI_RES( CB_IGNORE_FONTNAMES ) ), + aExportGB ( this, CUI_RES( GB_EXPORT ) ), + aExportLB ( this, CUI_RES( LB_EXPORT ) ), + aStarBasicCB ( this, CUI_RES( CB_STARBASIC ) ), + aStarBasicWarningCB(this, CUI_RES( CB_STARBASIC_WARNING ) ), + aPrintExtensionCB( this,CUI_RES(CB_PRINT_EXTENSION )), + aSaveGrfLocalCB ( this, CUI_RES( CB_LOCAL_GRF ) ), + aCharSetFT ( this, CUI_RES( FT_CHARSET ) ), + aCharSetLB ( this, CUI_RES( LB_CHARSET ) ) { FreeResource(); diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src index dc5b5f9431c7..29f5ff1fe78e 100644 --- a/cui/source/options/opthtml.src +++ b/cui/source/options/opthtml.src @@ -30,7 +30,7 @@ // include ----------------------------------------------------------------- #include "opthtml.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> // RID_OFAPAGE_HTMLOPT ----------------------------------------------------- TabPage RID_OFAPAGE_HTMLOPT diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx index e6240aa7a797..c8f52a63e708 100644 --- a/cui/source/options/optimprove.cxx +++ b/cui/source/options/optimprove.cxx @@ -36,12 +36,12 @@ #define _SVX_OPTIMPROVE_CXX #include <optimprove.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <vcl/msgbox.hxx> - +#include <svx/dialogs.hrc> #include "optimprove.hrc" #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -61,21 +61,21 @@ using namespace com::sun::star::system; SvxImprovementPage::SvxImprovementPage( Window* pParent ) : - TabPage( pParent, SVX_RES( RID_SVXPAGE_IMPROVEMENT ) ), - - m_aImproveFL ( this, SVX_RES( FL_IMPROVE ) ), - m_aInvitationFT ( this, SVX_RES( FT_INVITATION ) ), - m_aYesRB ( this, SVX_RES( RB_YES ) ), - m_aNoRB ( this, SVX_RES( RB_NO ) ), - m_aDataFL ( this, SVX_RES( FL_DATA ) ), - m_aNumberOfReportsFT ( this, SVX_RES( FT_NR_REPORTS ) ), - m_aNumberOfReportsValueFT ( this, SVX_RES( FT_NR_REPORTS_VALUE ) ), - m_aNumberOfActionsFT ( this, SVX_RES( FT_NR_ACTIONS ) ), - m_aNumberOfActionsValueFT ( this, SVX_RES( FT_NR_ACTIONS_VALUE ) ), - m_aShowDataPB ( this, SVX_RES( PB_SHOWDATA ) ), - - m_sInfo ( SVX_RES( STR_INFO ) ), - m_sMoreInfo ( SVX_RES( STR_MOREINFO ) ) + TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) ), + + m_aImproveFL ( this, CUI_RES( FL_IMPROVE ) ), + m_aInvitationFT ( this, CUI_RES( FT_INVITATION ) ), + m_aYesRB ( this, CUI_RES( RB_YES ) ), + m_aNoRB ( this, CUI_RES( RB_NO ) ), + m_aDataFL ( this, CUI_RES( FL_DATA ) ), + m_aNumberOfReportsFT ( this, CUI_RES( FT_NR_REPORTS ) ), + m_aNumberOfReportsValueFT ( this, CUI_RES( FT_NR_REPORTS_VALUE ) ), + m_aNumberOfActionsFT ( this, CUI_RES( FT_NR_ACTIONS ) ), + m_aNumberOfActionsValueFT ( this, CUI_RES( FT_NR_ACTIONS_VALUE ) ), + m_aShowDataPB ( this, CUI_RES( PB_SHOWDATA ) ), + + m_sInfo ( CUI_RES( STR_INFO ) ), + m_sMoreInfo ( CUI_RES( STR_MOREINFO ) ) { FreeResource(); diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src index 86fc6d1c1a5d..d8782144cdb3 100644 --- a/cui/source/options/optimprove.src +++ b/cui/source/options/optimprove.src @@ -31,8 +31,9 @@ // include -------------------------------------------------------------- #include "optimprove.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" +#include <svx/dialogs.hrc> TabPage RID_SVXPAGE_IMPROVEMENT { diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx index de44e7979471..797c0dce0534 100644 --- a/cui/source/options/optimprove2.cxx +++ b/cui/source/options/optimprove2.cxx @@ -36,13 +36,13 @@ #define _SVX_OPTIMPROVE_CXX #include <optimprove.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <vcl/msgbox.hxx> #include "optimprove.hrc" #include "helpid.hrc" +#include <cuires.hrc> #include <svx/dialogs.hrc> - #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/oooimprovement/XCore.hpp> @@ -68,7 +68,7 @@ using namespace com::sun::star::system; SvxEmptyPage::SvxEmptyPage( Window* pParent ) : - TabPage( pParent, SVX_RES( RID_SVXPAGE_IMPROVEMENT ) ) + TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) ) { FreeResource(); @@ -78,22 +78,22 @@ SvxEmptyPage::SvxEmptyPage( Window* pParent ) : SvxImprovementOptionsPage::SvxImprovementOptionsPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_IMPROVEMENT ), rSet ), - - m_aImproveFL ( this, SVX_RES( FL_IMPROVE ) ), - m_aInvitationFT ( this, SVX_RES( FT_INVITATION ) ), - m_aYesRB ( this, SVX_RES( RB_YES ) ), - m_aNoRB ( this, SVX_RES( RB_NO ) ), - m_aInfoFI ( this, SVX_RES( FI_INFO ) ), - m_aDataFL ( this, SVX_RES( FL_DATA ) ), - m_aNumberOfReportsFT ( this, SVX_RES( FT_NR_REPORTS ) ), - m_aNumberOfReportsValueFT ( this, SVX_RES( FT_NR_REPORTS_VALUE ) ), - m_aNumberOfActionsFT ( this, SVX_RES( FT_NR_ACTIONS ) ), - m_aNumberOfActionsValueFT ( this, SVX_RES( FT_NR_ACTIONS_VALUE ) ), - m_aShowDataPB ( this, SVX_RES( PB_SHOWDATA ) ), - - m_sInfo ( SVX_RES( STR_INFO ) ), - m_sMoreInfo ( SVX_RES( STR_MOREINFO ) ) + SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ), rSet ), + + m_aImproveFL ( this, CUI_RES( FL_IMPROVE ) ), + m_aInvitationFT ( this, CUI_RES( FT_INVITATION ) ), + m_aYesRB ( this, CUI_RES( RB_YES ) ), + m_aNoRB ( this, CUI_RES( RB_NO ) ), + m_aInfoFI ( this, CUI_RES( FI_INFO ) ), + m_aDataFL ( this, CUI_RES( FL_DATA ) ), + m_aNumberOfReportsFT ( this, CUI_RES( FT_NR_REPORTS ) ), + m_aNumberOfReportsValueFT ( this, CUI_RES( FT_NR_REPORTS_VALUE ) ), + m_aNumberOfActionsFT ( this, CUI_RES( FT_NR_ACTIONS ) ), + m_aNumberOfActionsValueFT ( this, CUI_RES( FT_NR_ACTIONS_VALUE ) ), + m_aShowDataPB ( this, CUI_RES( PB_SHOWDATA ) ), + + m_sInfo ( CUI_RES( STR_INFO ) ), + m_sMoreInfo ( CUI_RES( STR_MOREINFO ) ) { FreeResource(); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 94f850eb1d32..22d24391a953 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -62,10 +62,10 @@ #include <unotools/extendedsecurityoptions.hxx> #include <com/sun/star/uno/Sequence.hxx> #define _SVX_OPTINET2_CXX -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "optinet2.hxx" #include <svx/svxdlg.hxx> //CHINA001 -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optinet2.hrc" #include "helpid.hrc" #include <svx/ofaitem.hxx> @@ -212,7 +212,7 @@ void SvxNoSpaceEdit::Modify() if ( !ByteString(::rtl::OUStringToOString(aValue,RTL_TEXTENCODING_UTF8)).IsNumericAscii() || (long)aValue.ToInt32() > USHRT_MAX ) // der H�chstwert einer Portnummer ist USHRT_MAX - ErrorBox( this, SVX_RES( RID_SVXERR_OPT_PROXYPORTS ) ).Execute(); + ErrorBox( this, CUI_RES( RID_SVXERR_OPT_PROXYPORTS ) ).Execute(); } } @@ -226,31 +226,31 @@ void SvxNoSpaceEdit::Modify() /********************************************************************/ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_PROXY ), rSet ), - aOptionGB (this, SVX_RES(GB_SETTINGS)), - - aProxyModeFT (this, SVX_RES(FT_PROXYMODE)), - aProxyModeLB (this, SVX_RES(LB_PROXYMODE)), - - aHttpProxyFT (this, SVX_RES( FT_HTTP_PROXY )), - aHttpProxyED (this, SVX_RES( ED_HTTP_PROXY )), - aHttpPortFT (this, SVX_RES( FT_HTTP_PORT )), - aHttpPortED (this, SVX_RES( ED_HTTP_PORT ), TRUE), - - aHttpsProxyFT (this, SVX_RES( FT_HTTPS_PROXY )), - aHttpsProxyED (this, SVX_RES( ED_HTTPS_PROXY )), - aHttpsPortFT (this, SVX_RES( FT_HTTPS_PORT )), - aHttpsPortED (this, SVX_RES( ED_HTTPS_PORT ), TRUE), - - aFtpProxyFT (this, SVX_RES( FT_FTP_PROXY )), - aFtpProxyED (this, SVX_RES( ED_FTP_PROXY )), - aFtpPortFT (this, SVX_RES( FT_FTP_PORT )), - aFtpPortED (this, SVX_RES( ED_FTP_PORT ), TRUE), - - aNoProxyForFT (this, SVX_RES( FT_NOPROXYFOR )), - aNoProxyForED (this, SVX_RES( ED_NOPROXYFOR )), - aNoProxyDescFT (this, SVX_RES( ED_NOPROXYDESC )), - sFromBrowser ( SVX_RES( ST_PROXY_FROM_BROWSER ) ), + SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_PROXY ), rSet ), + aOptionGB (this, CUI_RES(GB_SETTINGS)), + + aProxyModeFT (this, CUI_RES(FT_PROXYMODE)), + aProxyModeLB (this, CUI_RES(LB_PROXYMODE)), + + aHttpProxyFT (this, CUI_RES( FT_HTTP_PROXY )), + aHttpProxyED (this, CUI_RES( ED_HTTP_PROXY )), + aHttpPortFT (this, CUI_RES( FT_HTTP_PORT )), + aHttpPortED (this, CUI_RES( ED_HTTP_PORT ), TRUE), + + aHttpsProxyFT (this, CUI_RES( FT_HTTPS_PROXY )), + aHttpsProxyED (this, CUI_RES( ED_HTTPS_PROXY )), + aHttpsPortFT (this, CUI_RES( FT_HTTPS_PORT )), + aHttpsPortED (this, CUI_RES( ED_HTTPS_PORT ), TRUE), + + aFtpProxyFT (this, CUI_RES( FT_FTP_PROXY )), + aFtpProxyED (this, CUI_RES( ED_FTP_PROXY )), + aFtpPortFT (this, CUI_RES( FT_FTP_PORT )), + aFtpPortED (this, CUI_RES( ED_FTP_PORT ), TRUE), + + aNoProxyForFT (this, CUI_RES( FT_NOPROXYFOR )), + aNoProxyForED (this, CUI_RES( ED_NOPROXYFOR )), + aNoProxyDescFT (this, CUI_RES( ED_NOPROXYDESC )), + sFromBrowser ( CUI_RES( ST_PROXY_FROM_BROWSER ) ), aProxyModePN(RTL_CONSTASCII_USTRINGPARAM("ooInetProxyType")), aHttpProxyPN(RTL_CONSTASCII_USTRINGPARAM("ooInetHTTPProxyName")), aHttpPortPN(RTL_CONSTASCII_USTRINGPARAM("ooInetHTTPProxyPort")), @@ -726,33 +726,33 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_SEARCH ), rSet ), + SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_SEARCH ), rSet ), - aSearchGB ( this, SVX_RES( GB_SEARCH ) ), - aSearchLB ( this, SVX_RES( LB_SEARCH ) ), - aSearchNameFT ( this, SVX_RES( FT_SEARCH_NAME ) ), - aSearchNameED ( this, SVX_RES( ED_SEARCH_NAME ) ), - aSearchFT ( this, SVX_RES( FT_SEARCH ) ), - aAndRB ( this, SVX_RES( RB_AND ) ), - aOrRB ( this, SVX_RES( RB_OR ) ), - aExactRB ( this, SVX_RES( RB_EXACT ) ), + aSearchGB ( this, CUI_RES( GB_SEARCH ) ), + aSearchLB ( this, CUI_RES( LB_SEARCH ) ), + aSearchNameFT ( this, CUI_RES( FT_SEARCH_NAME ) ), + aSearchNameED ( this, CUI_RES( ED_SEARCH_NAME ) ), + aSearchFT ( this, CUI_RES( FT_SEARCH ) ), + aAndRB ( this, CUI_RES( RB_AND ) ), + aOrRB ( this, CUI_RES( RB_OR ) ), + aExactRB ( this, CUI_RES( RB_EXACT ) ), - aURLFT ( this, SVX_RES( FT_URL ) ), - aURLED ( this, SVX_RES( ED_URL ) ), + aURLFT ( this, CUI_RES( FT_URL ) ), + aURLED ( this, CUI_RES( ED_URL ) ), - aPostFixFT ( this, SVX_RES( FT_POSTFIX ) ), - aPostFixED ( this, SVX_RES( ED_POSTFIX ) ), - aSeparatorFT ( this, SVX_RES( FT_SEPARATOR ) ), - aSeparatorED ( this, SVX_RES( ED_SEPARATOR ) ), - aCaseFT ( this, SVX_RES( FT_CASE ) ), - aCaseED ( this, SVX_RES( ED_CASE ) ), + aPostFixFT ( this, CUI_RES( FT_POSTFIX ) ), + aPostFixED ( this, CUI_RES( ED_POSTFIX ) ), + aSeparatorFT ( this, CUI_RES( FT_SEPARATOR ) ), + aSeparatorED ( this, CUI_RES( ED_SEPARATOR ) ), + aCaseFT ( this, CUI_RES( FT_CASE ) ), + aCaseED ( this, CUI_RES( ED_CASE ) ), - aNewPB ( this, SVX_RES( PB_NEW ) ), - aAddPB ( this, SVX_RES( PB_ADD ) ), - aChangePB ( this, SVX_RES( PB_CHANGE ) ), - aDeletePB ( this, SVX_RES( PB_DELETE ) ), + aNewPB ( this, CUI_RES( PB_NEW ) ), + aAddPB ( this, CUI_RES( PB_ADD ) ), + aChangePB ( this, CUI_RES( PB_CHANGE ) ), + aDeletePB ( this, CUI_RES( PB_DELETE ) ), - sModifyMsg(SVX_RES(MSG_MODIFY)) + sModifyMsg(CUI_RES(MSG_MODIFY)) { FreeResource(); @@ -1256,13 +1256,13 @@ public: JavaScriptDisableQueryBox_Impl::JavaScriptDisableQueryBox_Impl( Window* pParent ) : - ModalDialog( pParent, SVX_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ), + ModalDialog( pParent, CUI_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ), - aImage ( this, SVX_RES( IMG_JSCPT_WARNING ) ), - aWarningFT ( this, SVX_RES( FT_JSCPT_WARNING ) ), - aDisableCB ( this, SVX_RES( CB_JSCPT_DISABLE ) ), - aYesBtn ( this, SVX_RES( BTN_JSCPT_YES ) ), - aNoBtn ( this, SVX_RES( BTN_JSCPT_NO ) ) + aImage ( this, CUI_RES( IMG_JSCPT_WARNING ) ), + aWarningFT ( this, CUI_RES( FT_JSCPT_WARNING ) ), + aDisableCB ( this, CUI_RES( CB_JSCPT_DISABLE ) ), + aYesBtn ( this, CUI_RES( BTN_JSCPT_YES ) ), + aNoBtn ( this, CUI_RES( BTN_JSCPT_NO ) ) { FreeResource(); @@ -1315,34 +1315,34 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt ) /********************************************************************/ SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet ) - :SfxTabPage ( pParent, SVX_RES( RID_SVXPAGE_INET_SECURITY ), rSet ) - - ,maSecurityOptionsFL( this, SVX_RES( FL_SEC_SECURITYOPTIONS ) ) - ,maSecurityOptionsFI( this, SVX_RES( FI_SEC_SECURITYOPTIONS ) ) - ,maSecurityOptionsPB( this, SVX_RES( PB_SEC_SECURITYOPTIONS ) ) - - ,maPasswordsFL ( this, SVX_RES( FL_SEC_PASSWORDS ) ) - ,maSavePasswordsCB ( this, SVX_RES( CB_SEC_SAVEPASSWORDS ) ) - ,maShowConnectionsPB( this, SVX_RES( PB_SEC_CONNECTIONS ) ) - ,maMasterPasswordCB ( this, SVX_RES( CB_SEC_MASTERPASSWORD ) ) - ,maMasterPasswordFI ( this, SVX_RES( FI_SEC_MASTERPASSWORD ) ) - ,maMasterPasswordPB ( this, SVX_RES( PB_SEC_MASTERPASSWORD ) ) - - ,maMacroSecFL ( this, SVX_RES( FL_SEC_MACROSEC ) ) - ,maMacroSecFI ( this, SVX_RES( FI_SEC_MACROSEC ) ) - ,maMacroSecPB ( this, SVX_RES( PB_SEC_MACROSEC ) ) - ,maFilesharingFL ( this, SVX_RES( FL_SEC_FILESHARING ) ) - ,maRecommReadOnlyCB ( this, SVX_RES( CB_SEC_RECOMMREADONLY ) ) - ,maRecordChangesCB ( this, SVX_RES( CB_SEC_RECORDCHANGES ) ) - ,maProtectRecordsPB ( this, SVX_RES( PB_SEC_PROTRECORDS ) ) + :SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_INET_SECURITY ), rSet ) + + ,maSecurityOptionsFL( this, CUI_RES( FL_SEC_SECURITYOPTIONS ) ) + ,maSecurityOptionsFI( this, CUI_RES( FI_SEC_SECURITYOPTIONS ) ) + ,maSecurityOptionsPB( this, CUI_RES( PB_SEC_SECURITYOPTIONS ) ) + + ,maPasswordsFL ( this, CUI_RES( FL_SEC_PASSWORDS ) ) + ,maSavePasswordsCB ( this, CUI_RES( CB_SEC_SAVEPASSWORDS ) ) + ,maShowConnectionsPB( this, CUI_RES( PB_SEC_CONNECTIONS ) ) + ,maMasterPasswordCB ( this, CUI_RES( CB_SEC_MASTERPASSWORD ) ) + ,maMasterPasswordFI ( this, CUI_RES( FI_SEC_MASTERPASSWORD ) ) + ,maMasterPasswordPB ( this, CUI_RES( PB_SEC_MASTERPASSWORD ) ) + + ,maMacroSecFL ( this, CUI_RES( FL_SEC_MACROSEC ) ) + ,maMacroSecFI ( this, CUI_RES( FI_SEC_MACROSEC ) ) + ,maMacroSecPB ( this, CUI_RES( PB_SEC_MACROSEC ) ) + ,maFilesharingFL ( this, CUI_RES( FL_SEC_FILESHARING ) ) + ,maRecommReadOnlyCB ( this, CUI_RES( CB_SEC_RECOMMREADONLY ) ) + ,maRecordChangesCB ( this, CUI_RES( CB_SEC_RECORDCHANGES ) ) + ,maProtectRecordsPB ( this, CUI_RES( PB_SEC_PROTRECORDS ) ) ,mpSecOptions ( new SvtSecurityOptions ) ,mpSecOptDlg ( NULL ) ,meRedlingMode ( RL_NONE ) - ,msProtectRecordsStr( SVX_RES( STR_SEC_PROTRECORDS ) ) - ,msUnprotectRecordsStr( SVX_RES( STR_SEC_UNPROTRECORDS ) ) - ,msPasswordStoringDeactivateStr( SVX_RES( STR_SEC_NOPASSWDSAVE ) ) + ,msProtectRecordsStr( CUI_RES( STR_SEC_PROTRECORDS ) ) + ,msUnprotectRecordsStr( CUI_RES( STR_SEC_UNPROTRECORDS ) ) + ,msPasswordStoringDeactivateStr( CUI_RES( STR_SEC_NOPASSWDSAVE ) ) { FreeResource(); @@ -1925,9 +1925,9 @@ void SvxSecurityTabPage::Reset( const SfxItemSet& ) //added by jmeng begin MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet) - : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ), - aMSWordGB ( this, SVX_RES( GB_MOZPLUGIN ) ), - aWBasicCodeCB ( this, SVX_RES( CB_MOZPLUGIN_CODE ) ) + : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ), + aMSWordGB ( this, CUI_RES( GB_MOZPLUGIN ) ), + aWBasicCodeCB ( this, CUI_RES( CB_MOZPLUGIN_CODE ) ) { FreeResource(); } @@ -2224,13 +2224,13 @@ struct SvxEMailTabPage_Impl }; SvxEMailTabPage::SvxEMailTabPage(Window* pParent, const SfxItemSet& rSet) : - SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_INET_MAIL ), rSet), - aMailFL(this, SVX_RES(FL_MAIL )), - aMailerURLFI(this, SVX_RES(FI_MAILERURL )), - aMailerURLFT(this, SVX_RES(FT_MAILERURL )), - aMailerURLED(this, SVX_RES(ED_MAILERURL )), - aMailerURLPB(this, SVX_RES(PB_MAILERURL )), - m_sDefaultFilterName( SVX_RES(STR_DEFAULT_FILENAME )), + SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_INET_MAIL ), rSet), + aMailFL(this, CUI_RES(FL_MAIL )), + aMailerURLFI(this, CUI_RES(FI_MAILERURL )), + aMailerURLFT(this, CUI_RES(FT_MAILERURL )), + aMailerURLED(this, CUI_RES(ED_MAILERURL )), + aMailerURLPB(this, CUI_RES(PB_MAILERURL )), + m_sDefaultFilterName( CUI_RES(STR_DEFAULT_FILENAME )), pImpl(new SvxEMailTabPage_Impl) { FreeResource(); diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc index da394d6d249f..1e9a3f65efeb 100644 --- a/cui/source/options/optinet2.hrc +++ b/cui/source/options/optinet2.hrc @@ -169,6 +169,11 @@ #define PB_MAILERURL 5 #define STR_DEFAULT_FILENAME 6 +// plugin +#define GB_MOZPLUGIN 1 +#define CB_MOZPLUGIN_CODE 2 + + #endif // #ifndef _SVX_OPTINET_HRC // ******************************************************************* EOF diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index 2ef6dc59c2e4..e7bdc9eff17c 100644 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -30,7 +30,7 @@ // include ------------------------------------------------------------------ #include <sfx2/sfx.hrc> #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optinet2.hrc" // pragma ------------------------------------------------------------------- diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index ec145ddacb3a..fdc36dadbbb7 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -34,10 +34,10 @@ // include --------------------------------------------------------------- #include "optjava.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "optjava.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" #include <vcl/svapp.hxx> #include <vcl/help.hxx> @@ -149,16 +149,16 @@ bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< : SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_OPTIONS_JAVA ), rSet ), + SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_JAVA ), rSet ), - m_aJavaLine ( this, SVX_RES( FL_JAVA ) ), - m_aJavaEnableCB ( this, SVX_RES( CB_JAVA_ENABLE ) ), - m_aJavaFoundLabel ( this, SVX_RES( FT_JAVA_FOUND ) ), - m_aJavaList ( this, SVX_RES( LB_JAVA ) ), - m_aJavaPathText ( this, SVX_RES( FT_JAVA_PATH ) ), - m_aAddBtn ( this, SVX_RES( PB_ADD ) ), - m_aParameterBtn ( this, SVX_RES( PB_PARAMETER ) ), - m_aClassPathBtn ( this, SVX_RES( PB_CLASSPATH ) ), + m_aJavaLine ( this, CUI_RES( FL_JAVA ) ), + m_aJavaEnableCB ( this, CUI_RES( CB_JAVA_ENABLE ) ), + m_aJavaFoundLabel ( this, CUI_RES( FT_JAVA_FOUND ) ), + m_aJavaList ( this, CUI_RES( LB_JAVA ) ), + m_aJavaPathText ( this, CUI_RES( FT_JAVA_PATH ) ), + m_aAddBtn ( this, CUI_RES( PB_ADD ) ), + m_aParameterBtn ( this, CUI_RES( PB_PARAMETER ) ), + m_aClassPathBtn ( this, CUI_RES( PB_CLASSPATH ) ), m_pParamDlg ( NULL ), m_pPathDlg ( NULL ), @@ -167,9 +167,9 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet m_pClassPath ( NULL ), m_nInfoSize ( 0 ), m_nParamSize ( 0 ), - m_sInstallText ( SVX_RES( STR_INSTALLED_IN ) ), - m_sAccessibilityText( SVX_RES( STR_ACCESSIBILITY ) ), - m_sAddDialogText ( SVX_RES( STR_ADDDLGTEXT ) ), + m_sInstallText ( CUI_RES( STR_INSTALLED_IN ) ), + m_sAccessibilityText( CUI_RES( STR_ACCESSIBILITY ) ), + m_sAddDialogText ( CUI_RES( STR_ADDDLGTEXT ) ), xDialogListener ( new ::svt::DialogClosedListener() ) @@ -192,11 +192,11 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet m_aJavaList.SvxSimpleTable::SetTabs( aStaticTabs ); String sHeader( '\t' ); - sHeader += String( SVX_RES( STR_HEADER_VENDOR ) ); + sHeader += String( CUI_RES( STR_HEADER_VENDOR ) ); sHeader += '\t'; - sHeader += String( SVX_RES( STR_HEADER_VERSION ) ); + sHeader += String( CUI_RES( STR_HEADER_VERSION ) ); sHeader += '\t'; - sHeader += String( SVX_RES( STR_HEADER_FEATURES ) ); + sHeader += String( CUI_RES( STR_HEADER_FEATURES ) ); sHeader += '\t'; m_aJavaList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT ); @@ -365,7 +365,7 @@ IMPL_LINK( SvxJavaOptionsPage, ParameterHdl_Impl, PushButton *, EMPTYARG ) (void)eErr; if ( bRunning ) { - WarningBox aWarnBox( this, SVX_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) ); + WarningBox aWarnBox( this, CUI_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) ); aWarnBox.Execute(); } } @@ -409,7 +409,7 @@ IMPL_LINK( SvxJavaOptionsPage, ClassPathHdl_Impl, PushButton *, EMPTYARG ) (void)eErr; if ( bRunning ) { - WarningBox aWarnBox( this, SVX_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) ); + WarningBox aWarnBox( this, CUI_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) ); aWarnBox.Execute(); } } @@ -634,12 +634,12 @@ void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder ) } else if ( JFW_E_NOT_RECOGNIZED == eErr ) { - ErrorBox aErrBox( this, SVX_RES( RID_SVXERR_JRE_NOT_RECOGNIZED ) ); + ErrorBox aErrBox( this, CUI_RES( RID_SVXERR_JRE_NOT_RECOGNIZED ) ); aErrBox.Execute(); } else if ( JFW_E_FAILED_VERSION == eErr ) { - ErrorBox aErrBox( this, SVX_RES( RID_SVXERR_JRE_FAILED_VERSION ) ); + ErrorBox aErrBox( this, CUI_RES( RID_SVXERR_JRE_FAILED_VERSION ) ); aErrBox.Execute(); } @@ -716,7 +716,7 @@ BOOL SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) if ( bRunning || ( ( pInfo->nRequirements & JFW_REQUIRE_NEEDRESTART ) == JFW_REQUIRE_NEEDRESTART ) ) { - WarningBox aWarnBox( this, SVX_RES( RID_SVX_MSGBOX_JAVA_RESTART ) ); + WarningBox aWarnBox( this, CUI_RES( RID_SVX_MSGBOX_JAVA_RESTART ) ); aWarnBox.Execute(); } @@ -775,19 +775,19 @@ void SvxJavaOptionsPage::FillUserData() SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) : - ModalDialog( pParent, SVX_RES( RID_SVXDLG_JAVA_PARAMETER ) ), + ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_PARAMETER ) ), - m_aParameterLabel ( this, SVX_RES( FT_PARAMETER ) ), - m_aParameterEdit ( this, SVX_RES( ED_PARAMETER ) ), - m_aAssignBtn ( this, SVX_RES( PB_ASSIGN ) ), - m_aAssignedLabel ( this, SVX_RES( FT_ASSIGNED ) ), - m_aAssignedList ( this, SVX_RES( LB_ASSIGNED ) ), - m_aExampleText ( this, SVX_RES( FT_EXAMPLE ) ), - m_aRemoveBtn ( this, SVX_RES( PB_REMOVE ) ), - m_aButtonsLine ( this, SVX_RES( FL_BUTTONS ) ), - m_aOKBtn ( this, SVX_RES( PB_PARAMETER_OK ) ), - m_aCancelBtn ( this, SVX_RES( PB_PARAMETER_ESC ) ), - m_aHelpBtn ( this, SVX_RES( PB_PARAMETER_HLP ) ) + m_aParameterLabel ( this, CUI_RES( FT_PARAMETER ) ), + m_aParameterEdit ( this, CUI_RES( ED_PARAMETER ) ), + m_aAssignBtn ( this, CUI_RES( PB_ASSIGN ) ), + m_aAssignedLabel ( this, CUI_RES( FT_ASSIGNED ) ), + m_aAssignedList ( this, CUI_RES( LB_ASSIGNED ) ), + m_aExampleText ( this, CUI_RES( FT_EXAMPLE ) ), + m_aRemoveBtn ( this, CUI_RES( PB_REMOVE ) ), + m_aButtonsLine ( this, CUI_RES( FL_BUTTONS ) ), + m_aOKBtn ( this, CUI_RES( PB_PARAMETER_OK ) ), + m_aCancelBtn ( this, CUI_RES( PB_PARAMETER_ESC ) ), + m_aHelpBtn ( this, CUI_RES( PB_PARAMETER_HLP ) ) { FreeResource(); @@ -915,17 +915,17 @@ void SvxJavaParameterDlg::SetParameters( Sequence< ::rtl::OUString >& rParams ) SvxJavaClassPathDlg::SvxJavaClassPathDlg( Window* pParent ) : - ModalDialog( pParent, SVX_RES( RID_SVXDLG_JAVA_CLASSPATH ) ), + ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_CLASSPATH ) ), - m_aPathLabel ( this, SVX_RES( FT_PATH ) ), - m_aPathList ( this, SVX_RES( LB_PATH ) ), - m_aAddArchiveBtn ( this, SVX_RES( PB_ADDARCHIVE ) ), - m_aAddPathBtn ( this, SVX_RES( PB_ADDPATH ) ), - m_aRemoveBtn ( this, SVX_RES( PB_REMOVE_PATH ) ), - m_aButtonsLine ( this, SVX_RES( FL_PATH_BUTTONS ) ), - m_aOKBtn ( this, SVX_RES( PB_PATH_OK ) ), - m_aCancelBtn ( this, SVX_RES( PB_PATH_ESC ) ), - m_aHelpBtn ( this, SVX_RES( PB_PATH_HLP ) ) + m_aPathLabel ( this, CUI_RES( FT_PATH ) ), + m_aPathList ( this, CUI_RES( LB_PATH ) ), + m_aAddArchiveBtn ( this, CUI_RES( PB_ADDARCHIVE ) ), + m_aAddPathBtn ( this, CUI_RES( PB_ADDPATH ) ), + m_aRemoveBtn ( this, CUI_RES( PB_REMOVE_PATH ) ), + m_aButtonsLine ( this, CUI_RES( FL_PATH_BUTTONS ) ), + m_aOKBtn ( this, CUI_RES( PB_PATH_OK ) ), + m_aCancelBtn ( this, CUI_RES( PB_PATH_ESC ) ), + m_aHelpBtn ( this, CUI_RES( PB_PATH_HLP ) ) { FreeResource(); @@ -977,8 +977,8 @@ SvxJavaClassPathDlg::~SvxJavaClassPathDlg() IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG ) { sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 ); - aDlg.SetTitle( SVX_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); - aDlg.AddFilter( SVX_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") ); + aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); + aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") ); String sFolder; if ( m_aPathList.GetSelectEntryCount() > 0 ) { @@ -1000,7 +1000,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG ) } else { - String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) ); + String sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) ); sMsg.SearchAndReplaceAscii( "%1", sFile ); ErrorBox( this, WB_OK, sMsg ).Execute(); } @@ -1038,7 +1038,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddPathHdl_Impl, PushButton *, EMPTYARG ) } else { - String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) ); + String sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) ); sMsg.SearchAndReplaceAscii( "%1", sNewFolder ); ErrorBox( this, WB_OK, sMsg ).Execute(); } diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src index 56ea49e1b3fd..b1cce0a3e50b 100644 --- a/cui/source/options/optjava.src +++ b/cui/source/options/optjava.src @@ -31,7 +31,7 @@ // include -------------------------------------------------------------- #include "optjava.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" // RID_SVXPAGE_OPTIONS_JAVA ---------------------------------------------- diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 8e1c8e39af0f..ab08478e6caa 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -34,8 +34,8 @@ #include <tools/shl.hxx> #include <unotools/searchopt.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> -#include <svx/dialogs.hrc> -#include <svx/dialmgr.hxx> +#include <cuires.hrc> +#include <dialmgr.hxx> #include <optjsearch.hxx> #include "optjsearch.hrc" @@ -44,29 +44,29 @@ using namespace com::sun::star::i18n; ////////////////////////////////////////////////////////////////////// SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ), + SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ), - aTreatAsEqual ( this, SVX_RES( FL_TREAT_AS_EQUAL ) ), - aMatchCase ( this, SVX_RES( CB_MATCH_CASE ) ), - aMatchFullHalfWidth ( this, SVX_RES( CB_MATCH_FULL_HALF_WIDTH ) ), - aMatchHiraganaKatakana ( this, SVX_RES( CB_MATCH_HIRAGANA_KATAKANA ) ), - aMatchContractions ( this, SVX_RES( CB_MATCH_CONTRACTIONS ) ), - aMatchMinusDashChoon ( this, SVX_RES( CB_MATCH_MINUS_DASH_CHOON ) ), - aMatchRepeatCharMarks ( this, SVX_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ), - aMatchVariantFormKanji ( this, SVX_RES( CB_MATCH_VARIANT_FORM_KANJI ) ), - aMatchOldKanaForms ( this, SVX_RES( CB_MATCH_OLD_KANA_FORMS ) ), - aMatchDiziDuzu ( this, SVX_RES( CB_MATCH_DIZI_DUZU ) ), - aMatchBavaHafa ( this, SVX_RES( CB_MATCH_BAVA_HAFA ) ), - aMatchTsithichiDhizi ( this, SVX_RES( CB_MATCH_TSITHICHI_DHIZI ) ), - aMatchHyuiyuByuvyu ( this, SVX_RES( CB_MATCH_HYUFYU_BYUVYU ) ), - aMatchSesheZeje ( this, SVX_RES( CB_MATCH_SESHE_ZEJE ) ), - aMatchIaiya ( this, SVX_RES( CB_MATCH_IAIYA ) ), - aMatchKiku ( this, SVX_RES( CB_MATCH_KIKU ) ), - aMatchProlongedSoundMark ( this, SVX_RES( CB_MATCH_PROLONGED_SOUNDMARK ) ), - aIgnore ( this, SVX_RES( FL_IGNORE ) ), - aIgnorePunctuation ( this, SVX_RES( CB_IGNORE_PUNCTUATION ) ), - aIgnoreWhitespace ( this, SVX_RES( CB_IGNORE_WHITESPACES ) ), - aIgnoreMiddleDot ( this, SVX_RES( CB_IGNORE_MIDDLE_DOT ) ) + aTreatAsEqual ( this, CUI_RES( FL_TREAT_AS_EQUAL ) ), + aMatchCase ( this, CUI_RES( CB_MATCH_CASE ) ), + aMatchFullHalfWidth ( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ), + aMatchHiraganaKatakana ( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA ) ), + aMatchContractions ( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ), + aMatchMinusDashChoon ( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ), + aMatchRepeatCharMarks ( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ), + aMatchVariantFormKanji ( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI ) ), + aMatchOldKanaForms ( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ), + aMatchDiziDuzu ( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ), + aMatchBavaHafa ( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ), + aMatchTsithichiDhizi ( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ), + aMatchHyuiyuByuvyu ( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ), + aMatchSesheZeje ( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ), + aMatchIaiya ( this, CUI_RES( CB_MATCH_IAIYA ) ), + aMatchKiku ( this, CUI_RES( CB_MATCH_KIKU ) ), + aMatchProlongedSoundMark ( this, CUI_RES( CB_MATCH_PROLONGED_SOUNDMARK ) ), + aIgnore ( this, CUI_RES( FL_IGNORE ) ), + aIgnorePunctuation ( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ), + aIgnoreWhitespace ( this, CUI_RES( CB_IGNORE_WHITESPACES ) ), + aIgnoreMiddleDot ( this, CUI_RES( CB_IGNORE_MIDDLE_DOT ) ) { FreeResource(); bSaveOptions = TRUE; diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src index a0480b7492df..00496ecf8d6b 100644 --- a/cui/source/options/optjsearch.src +++ b/cui/source/options/optjsearch.src @@ -29,7 +29,7 @@ ************************************************************************/ #include <helpid.hrc> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optjsearch.hrc" diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index a7184823eca7..7ca67a553278 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -75,8 +75,8 @@ #include <svx/svxdlg.hxx> #include <svx/optitems.hxx> #include "optlingu.hxx" -#include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> +#include <dialmgr.hxx> +#include <cuires.hrc> #include "helpid.hrc" #include <ucbhelper/content.hxx> @@ -349,18 +349,18 @@ class OptionsBreakSet : public ModalDialog public: OptionsBreakSet(Window* pParent, int nRID) : - ModalDialog(pParent, SVX_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )), - aOKPB (this, SVX_RES(BT_OK_PREBREAK)), - aCancelPB (this, SVX_RES(BT_CANCEL_PREBREAK)), - aValFL (this, SVX_RES(FL_NUMVAL_PREBREAK)), - aValNF (this, SVX_RES(ED_PREBREAK)) + ModalDialog(pParent, CUI_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )), + aOKPB (this, CUI_RES(BT_OK_PREBREAK)), + aCancelPB (this, CUI_RES(BT_CANCEL_PREBREAK)), + aValFL (this, CUI_RES(FL_NUMVAL_PREBREAK)), + aValNF (this, CUI_RES(ED_PREBREAK)) { DBG_ASSERT( STR_NUM_PRE_BREAK_DLG == nRID || STR_NUM_POST_BREAK_DLG == nRID || STR_NUM_MIN_WORDLEN_DLG == nRID, "unexpected RID" ); if (nRID != -1) - aValFL.SetText( String( SVX_RES(nRID) ) ); + aValFL.SetText( String( CUI_RES(nRID) ) ); FreeResource(); } @@ -1112,32 +1112,32 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, BOOL bEnable SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ): - SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_LINGU ), rSet ), - - aLinguisticFL ( this, SVX_RES( FL_LINGUISTIC ) ), - aLinguModulesFT ( this, SVX_RES( FT_LINGU_MODULES ) ), - aLinguModulesCLB ( this, SVX_RES( CLB_LINGU_MODULES ) ), - aLinguModulesEditPB ( this, SVX_RES( PB_LINGU_MODULES_EDIT ) ), - aLinguDicsFT ( this, SVX_RES( FT_LINGU_DICS ) ), - aLinguDicsCLB ( this, SVX_RES( CLB_LINGU_DICS ) ), - aLinguDicsNewPB ( this, SVX_RES( PB_LINGU_DICS_NEW_DIC ) ), - aLinguDicsEditPB ( this, SVX_RES( PB_LINGU_DICS_EDIT_DIC ) ), - aLinguDicsDelPB ( this, SVX_RES( PB_LINGU_DICS_DEL_DIC ) ), - aLinguOptionsFT ( this, SVX_RES( FT_LINGU_OPTIONS ) ), - aLinguOptionsCLB ( this, SVX_RES( CLB_LINGU_OPTIONS ) ), - aLinguOptionsEditPB ( this, SVX_RES( PB_LINGU_OPTIONS_EDIT ) ), - aMoreDictsLink ( this, SVX_RES( FT_LINGU_OPTIONS_MOREDICTS ) ), - sCapitalWords ( SVX_RES( STR_CAPITAL_WORDS ) ), - sWordsWithDigits ( SVX_RES( STR_WORDS_WITH_DIGITS ) ), - sCapitalization ( SVX_RES( STR_CAPITALIZATION ) ), - sSpellSpecial ( SVX_RES( STR_SPELL_SPECIAL ) ), - sSpellAuto ( SVX_RES( STR_SPELL_AUTO ) ), - sGrammarAuto ( SVX_RES( STR_GRAMMAR_AUTO ) ), - sNumMinWordlen ( SVX_RES( STR_NUM_MIN_WORDLEN ) ), - sNumPreBreak ( SVX_RES( STR_NUM_PRE_BREAK ) ), - sNumPostBreak ( SVX_RES( STR_NUM_POST_BREAK ) ), - sHyphAuto ( SVX_RES( STR_HYPH_AUTO ) ), - sHyphSpecial ( SVX_RES( STR_HYPH_SPECIAL ) ), + SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_LINGU ), rSet ), + + aLinguisticFL ( this, CUI_RES( FL_LINGUISTIC ) ), + aLinguModulesFT ( this, CUI_RES( FT_LINGU_MODULES ) ), + aLinguModulesCLB ( this, CUI_RES( CLB_LINGU_MODULES ) ), + aLinguModulesEditPB ( this, CUI_RES( PB_LINGU_MODULES_EDIT ) ), + aLinguDicsFT ( this, CUI_RES( FT_LINGU_DICS ) ), + aLinguDicsCLB ( this, CUI_RES( CLB_LINGU_DICS ) ), + aLinguDicsNewPB ( this, CUI_RES( PB_LINGU_DICS_NEW_DIC ) ), + aLinguDicsEditPB ( this, CUI_RES( PB_LINGU_DICS_EDIT_DIC ) ), + aLinguDicsDelPB ( this, CUI_RES( PB_LINGU_DICS_DEL_DIC ) ), + aLinguOptionsFT ( this, CUI_RES( FT_LINGU_OPTIONS ) ), + aLinguOptionsCLB ( this, CUI_RES( CLB_LINGU_OPTIONS ) ), + aLinguOptionsEditPB ( this, CUI_RES( PB_LINGU_OPTIONS_EDIT ) ), + aMoreDictsLink ( this, CUI_RES( FT_LINGU_OPTIONS_MOREDICTS ) ), + sCapitalWords ( CUI_RES( STR_CAPITAL_WORDS ) ), + sWordsWithDigits ( CUI_RES( STR_WORDS_WITH_DIGITS ) ), + sCapitalization ( CUI_RES( STR_CAPITALIZATION ) ), + sSpellSpecial ( CUI_RES( STR_SPELL_SPECIAL ) ), + sSpellAuto ( CUI_RES( STR_SPELL_AUTO ) ), + sGrammarAuto ( CUI_RES( STR_GRAMMAR_AUTO ) ), + sNumMinWordlen ( CUI_RES( STR_NUM_MIN_WORDLEN ) ), + sNumPreBreak ( CUI_RES( STR_NUM_PRE_BREAK ) ), + sNumPostBreak ( CUI_RES( STR_NUM_POST_BREAK ) ), + sHyphAuto ( CUI_RES( STR_HYPH_AUTO ) ), + sHyphSpecial ( CUI_RES( STR_HYPH_SPECIAL ) ), pLinguData ( NULL ) { @@ -1811,7 +1811,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) else if (&aLinguDicsDelPB == pBtn) { if ( RET_NO == - QueryBox( this, SVX_RES( RID_SFXQB_DELDICT ) ).Execute() ) + QueryBox( this, CUI_RES( RID_SFXQB_DELDICT ) ).Execute() ) return 0; SvLBoxEntry *pEntry = aLinguDicsCLB.GetCurEntry(); @@ -2030,22 +2030,22 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) --------------------------------------------------*/ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) : - ModalDialog( pParent, SVX_RES(RID_SVXDLG_EDIT_MODULES ) ), - aModulesFL ( this, SVX_RES( FL_EDIT_MODULES_OPTIONS ) ), - aLanguageFT ( this, SVX_RES( FT_EDIT_MODULES_LANGUAGE ) ), - aLanguageLB ( this, SVX_RES( LB_EDIT_MODULES_LANGUAGE ), FALSE ), - aModulesCLB ( this, SVX_RES( CLB_EDIT_MODULES_MODULES ) ), - aPrioUpPB ( this, SVX_RES( PB_EDIT_MODULES_PRIO_UP ) ), - aPrioDownPB ( this, SVX_RES( PB_EDIT_MODULES_PRIO_DOWN ) ), - aBackPB ( this, SVX_RES( PB_EDIT_MODULES_PRIO_BACK ) ), - aMoreDictsLink ( this, SVX_RES( FT_EDIT_MODULES_NEWDICTSLINK ) ), - aButtonsFL ( this, SVX_RES( FL_EDIT_MODULES_BUTTONS ) ), - aHelpPB ( this, SVX_RES( PB_HELP ) ), - aClosePB ( this, SVX_RES( PB_OK ) ), - sSpell ( SVX_RES( ST_SPELL ) ), - sHyph ( SVX_RES( ST_HYPH ) ), - sThes ( SVX_RES( ST_THES ) ), - sGrammar ( SVX_RES( ST_GRAMMAR ) ), + ModalDialog( pParent, CUI_RES(RID_SVXDLG_EDIT_MODULES ) ), + aModulesFL ( this, CUI_RES( FL_EDIT_MODULES_OPTIONS ) ), + aLanguageFT ( this, CUI_RES( FT_EDIT_MODULES_LANGUAGE ) ), + aLanguageLB ( this, CUI_RES( LB_EDIT_MODULES_LANGUAGE ), FALSE ), + aModulesCLB ( this, CUI_RES( CLB_EDIT_MODULES_MODULES ) ), + aPrioUpPB ( this, CUI_RES( PB_EDIT_MODULES_PRIO_UP ) ), + aPrioDownPB ( this, CUI_RES( PB_EDIT_MODULES_PRIO_DOWN ) ), + aBackPB ( this, CUI_RES( PB_EDIT_MODULES_PRIO_BACK ) ), + aMoreDictsLink ( this, CUI_RES( FT_EDIT_MODULES_NEWDICTSLINK ) ), + aButtonsFL ( this, CUI_RES( FL_EDIT_MODULES_BUTTONS ) ), + aHelpPB ( this, CUI_RES( PB_HELP ) ), + aClosePB ( this, CUI_RES( PB_OK ) ), + sSpell ( CUI_RES( ST_SPELL ) ), + sHyph ( CUI_RES( ST_HYPH ) ), + sThes ( CUI_RES( ST_THES ) ), + sGrammar ( CUI_RES( ST_GRAMMAR ) ), rLinguData ( rData ) { pCheckButtonData = NULL; diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src index a550451193f2..c0cb4489cd59 100644 --- a/cui/source/options/optlingu.src +++ b/cui/source/options/optlingu.src @@ -35,7 +35,7 @@ #include <svtools/controldims.hrc> #include <sfx2/sfx.hrc> -#include <svx/dialogs.hrc> +#include <cuires.hrc> // RID_SVXDLG_EDIT_MODULES --------------------------------------------------- diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 3ba69fa6e42c..a72660ba2e0f 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -64,13 +64,13 @@ #include <svx/xpool.hxx> #include <svx/dlgutil.hxx> #include "cuitabarea.hxx" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optmemory.hrc" #include "optmemory.hxx" #include <svx/ofaitem.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #define CONFIG_LANGUAGES "OfficeLanguages" @@ -127,30 +127,30 @@ int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( OFA_TP_MEMORY ), rSet ), - - aUndoBox ( this, SVX_RES( GB_UNDO ) ), - aUndoText ( this, SVX_RES( FT_UNDO ) ), - aUndoEdit ( this, SVX_RES( ED_UNDO ) ), - aGbGraphicCache ( this, SVX_RES( GB_GRAPHICCACHE ) ), - aFtGraphicCache ( this, SVX_RES( FT_GRAPHICCACHE ) ), - aNfGraphicCache ( this, SVX_RES( NF_GRAPHICCACHE ) ), - aFtGraphicCacheUnit ( this, SVX_RES( FT_GRAPHICCACHE_UNIT ) ), - aFtGraphicObjectCache ( this, SVX_RES( FT_GRAPHICOBJECTCACHE ) ), - aNfGraphicObjectCache ( this, SVX_RES( NF_GRAPHICOBJECTCACHE ) ), - aFtGraphicObjectCacheUnit(this, SVX_RES( FT_GRAPHICOBJECTCACHE_UNIT ) ), - aFtGraphicObjectTime ( this, SVX_RES( FT_GRAPHICOBJECTTIME ) ), - aTfGraphicObjectTime ( this, SVX_RES( TF_GRAPHICOBJECTTIME ) ), - aFtGraphicObjectTimeUnit( this, SVX_RES( FT_GRAPHICOBJECTTIME_UNIT ) ), - - aGbOLECache ( this, SVX_RES( GB_OLECACHE ) ), - aFtOLECache ( this, SVX_RES( FT_OLECACHE ) ), - aNfOLECache ( this, SVX_RES( NF_OLECACHE ) ), - aQuickLaunchFL ( this, SVX_RES( FL_QUICKLAUNCH ) ), - aQuickLaunchCB ( this, SVX_RES( CB_QUICKLAUNCH ) )//, + SfxTabPage( pParent, CUI_RES( OFA_TP_MEMORY ), rSet ), + + aUndoBox ( this, CUI_RES( GB_UNDO ) ), + aUndoText ( this, CUI_RES( FT_UNDO ) ), + aUndoEdit ( this, CUI_RES( ED_UNDO ) ), + aGbGraphicCache ( this, CUI_RES( GB_GRAPHICCACHE ) ), + aFtGraphicCache ( this, CUI_RES( FT_GRAPHICCACHE ) ), + aNfGraphicCache ( this, CUI_RES( NF_GRAPHICCACHE ) ), + aFtGraphicCacheUnit ( this, CUI_RES( FT_GRAPHICCACHE_UNIT ) ), + aFtGraphicObjectCache ( this, CUI_RES( FT_GRAPHICOBJECTCACHE ) ), + aNfGraphicObjectCache ( this, CUI_RES( NF_GRAPHICOBJECTCACHE ) ), + aFtGraphicObjectCacheUnit(this, CUI_RES( FT_GRAPHICOBJECTCACHE_UNIT ) ), + aFtGraphicObjectTime ( this, CUI_RES( FT_GRAPHICOBJECTTIME ) ), + aTfGraphicObjectTime ( this, CUI_RES( TF_GRAPHICOBJECTTIME ) ), + aFtGraphicObjectTimeUnit( this, CUI_RES( FT_GRAPHICOBJECTTIME_UNIT ) ), + + aGbOLECache ( this, CUI_RES( GB_OLECACHE ) ), + aFtOLECache ( this, CUI_RES( FT_OLECACHE ) ), + aNfOLECache ( this, CUI_RES( NF_OLECACHE ) ), + aQuickLaunchFL ( this, CUI_RES( FL_QUICKLAUNCH ) ), + aQuickLaunchCB ( this, CUI_RES( CB_QUICKLAUNCH ) )//, { #if defined(UNX) - aQuickLaunchCB.SetText( SVX_RES( STR_QUICKLAUNCH_UNX ) ); + aQuickLaunchCB.SetText( CUI_RES( STR_QUICKLAUNCH_UNX ) ); #endif FreeResource(); diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src index fce14b15551d..e54dbde11eb7 100644 --- a/cui/source/options/optmemory.src +++ b/cui/source/options/optmemory.src @@ -30,7 +30,7 @@ // include --------------------------------------------------------------- -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optmemory.hrc" #include "helpid.hrc" diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index dad30f0d853a..db2fc6cca26c 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -54,9 +54,9 @@ #define _SVX_OPTPATH_CXX #include "optpath.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "optpath.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" #include <comphelper/processfactory.hxx> #include <comphelper/configurationhelper.hxx> @@ -218,22 +218,22 @@ BOOL IsMultiPath_Impl( const USHORT nIndex ) SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_PATH ), rSet ), + SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_PATH ), rSet ), - aTypeText ( this, SVX_RES( FT_TYPE ) ), - aPathText ( this, SVX_RES( FT_PATH ) ), - aPathCtrl ( this, SVX_RES( LB_PATH ) ), - aStandardBtn ( this, SVX_RES( BTN_STANDARD ) ), - aPathBtn ( this, SVX_RES( BTN_PATH ) ), - aStdBox ( this, SVX_RES( GB_STD ) ), + aTypeText ( this, CUI_RES( FT_TYPE ) ), + aPathText ( this, CUI_RES( FT_PATH ) ), + aPathCtrl ( this, CUI_RES( LB_PATH ) ), + aStandardBtn ( this, CUI_RES( BTN_STANDARD ) ), + aPathBtn ( this, CUI_RES( BTN_PATH ) ), + aStdBox ( this, CUI_RES( GB_STD ) ), pHeaderBar ( NULL ), pPathBox ( NULL ), - pImpl ( new OptPath_Impl( SVX_RES(IMG_LOCK), SVX_RES(IMG_LOCK_HC) ) ), + pImpl ( new OptPath_Impl( CUI_RES(IMG_LOCK), CUI_RES(IMG_LOCK_HC) ) ), xDialogListener ( new ::svt::DialogClosedListener() ) { - pImpl->m_sMultiPathDlg = String( SVX_RES( STR_MULTIPATHDLG ) ); + pImpl->m_sMultiPathDlg = String( CUI_RES( STR_MULTIPATHDLG ) ); aStandardBtn.SetClickHdl( LINK( this, SvxPathTabPage, StandardHdl_Impl ) ); Link aLink = LINK( this, SvxPathTabPage, PathHdl_Impl ); aPathBtn.SetClickHdl( aLink ); @@ -344,7 +344,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& ) #endif case SvtPathOptions::PATH_WORK: { - String aStr( SVX_RES( RID_SVXSTR_PATH_NAME_START + i ) ); + String aStr( CUI_RES( RID_SVXSTR_PATH_NAME_START + i ) ); String sInternal, sUser, sWritable; sal_Bool bReadOnly = sal_False; GetPathList( i, sInternal, sUser, sWritable, bReadOnly ); diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src index 65280895a506..7d0c3425636d 100644 --- a/cui/source/options/optpath.src +++ b/cui/source/options/optpath.src @@ -29,7 +29,7 @@ ************************************************************************/ // include -------------------------------------------------------------- #include "optpath.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #ifndef _SFX_HRC #include <sfx2/sfx.hrc> #endif diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index a486efdc224d..f405fb4b0acd 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -38,10 +38,10 @@ #define _SVX_OPTSAVE_CXX #include "optsave.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "optsave.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceasvector.hxx> #include <comphelper/sequenceashashmap.hxx> @@ -96,11 +96,11 @@ class FilterWarningDialog_Impl : public ModalDialog }; // ---------------------------------------------------------------------- FilterWarningDialog_Impl::FilterWarningDialog_Impl(Window* pParent) : - ModalDialog(pParent, SVX_RES( RID_SVXDLG_FILTER_WARNING ) ), - aOk( this, SVX_RES(PB_OK )), - aCancel( this, SVX_RES(PB_CANCEL )), - aImage( this, SVX_RES(IMG_WARNING )), - aFilterWarningFT( this, SVX_RES(FT_FILTER_WARNING )) + ModalDialog(pParent, CUI_RES( RID_SVXDLG_FILTER_WARNING ) ), + aOk( this, CUI_RES(PB_OK )), + aCancel( this, CUI_RES(PB_CANCEL )), + aImage( this, CUI_RES(IMG_WARNING )), + aFilterWarningFT( this, CUI_RES(FT_FILTER_WARNING )) { FreeResource(); aImage.SetImage(WarningBox::GetStandardImage()); @@ -197,41 +197,41 @@ SvxSaveTabPage_Impl::~SvxSaveTabPage_Impl() SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : - SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_SAVE ), rCoreSet ), - - aLoadFL ( this, SVX_RES( LB_LOAD ) ), - aLoadUserSettingsCB ( this, SVX_RES( CB_LOAD_SETTINGS ) ), - aLoadDocPrinterCB ( this, SVX_RES( CB_LOAD_DOCPRINTER ) ), - - aSaveFL ( this, SVX_RES( GB_SAVE ) ), - aDocInfoCB ( this, SVX_RES( BTN_DOCINFO ) ), - aBackupFI ( this, SVX_RES( FI_BACKUP ) ), - aBackupCB ( this, SVX_RES( BTN_BACKUP ) ), - aAutoSaveCB ( this, SVX_RES( BTN_AUTOSAVE ) ), - aAutoSaveEdit ( this, SVX_RES( ED_AUTOSAVE ) ), - aMinuteFT ( this, SVX_RES( FT_MINUTE ) ), - aRelativeFsysCB ( this, SVX_RES( BTN_RELATIVE_FSYS ) ), - aRelativeInetCB ( this, SVX_RES( BTN_RELATIVE_INET ) ), - - aDefaultFormatFL ( this, SVX_RES( FL_FILTER ) ), - aODFVersionFT ( this, SVX_RES( FT_ODF_VERSION ) ), - aODFVersionLB ( this, SVX_RES( LB_ODF_VERSION ) ), - aSizeOptimizationCB ( this, SVX_RES( BTN_NOPRETTYPRINTING ) ), - aWarnAlienFormatCB ( this, SVX_RES( BTN_WARNALIENFORMAT ) ), - aDocTypeFT ( this, SVX_RES( FT_APP ) ), - aDocTypeLB ( this, SVX_RES( LB_APP ) ), - aSaveAsFT ( this, SVX_RES( FT_FILTER ) ), - aSaveAsFI ( this, SVX_RES( FI_FILTER ) ), - aSaveAsLB ( this, SVX_RES( LB_FILTER ) ), - aODFWarningFI ( this, SVX_RES( FI_ODF_WARNING ) ), - aODFWarningFT ( this, SVX_RES( FT_WARN ) ), + SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_SAVE ), rCoreSet ), + + aLoadFL ( this, CUI_RES( LB_LOAD ) ), + aLoadUserSettingsCB ( this, CUI_RES( CB_LOAD_SETTINGS ) ), + aLoadDocPrinterCB ( this, CUI_RES( CB_LOAD_DOCPRINTER ) ), + + aSaveFL ( this, CUI_RES( GB_SAVE ) ), + aDocInfoCB ( this, CUI_RES( BTN_DOCINFO ) ), + aBackupFI ( this, CUI_RES( FI_BACKUP ) ), + aBackupCB ( this, CUI_RES( BTN_BACKUP ) ), + aAutoSaveCB ( this, CUI_RES( BTN_AUTOSAVE ) ), + aAutoSaveEdit ( this, CUI_RES( ED_AUTOSAVE ) ), + aMinuteFT ( this, CUI_RES( FT_MINUTE ) ), + aRelativeFsysCB ( this, CUI_RES( BTN_RELATIVE_FSYS ) ), + aRelativeInetCB ( this, CUI_RES( BTN_RELATIVE_INET ) ), + + aDefaultFormatFL ( this, CUI_RES( FL_FILTER ) ), + aODFVersionFT ( this, CUI_RES( FT_ODF_VERSION ) ), + aODFVersionLB ( this, CUI_RES( LB_ODF_VERSION ) ), + aSizeOptimizationCB ( this, CUI_RES( BTN_NOPRETTYPRINTING ) ), + aWarnAlienFormatCB ( this, CUI_RES( BTN_WARNALIENFORMAT ) ), + aDocTypeFT ( this, CUI_RES( FT_APP ) ), + aDocTypeLB ( this, CUI_RES( LB_APP ) ), + aSaveAsFT ( this, CUI_RES( FT_FILTER ) ), + aSaveAsFI ( this, CUI_RES( FI_FILTER ) ), + aSaveAsLB ( this, CUI_RES( LB_FILTER ) ), + aODFWarningFI ( this, CUI_RES( FI_ODF_WARNING ) ), + aODFWarningFT ( this, CUI_RES( FT_WARN ) ), pImpl ( new SvxSaveTabPage_Impl ) { sal_Bool bHighContrast = GetDisplayBackground().GetColor().IsDark(); aODFWarningFI.SetImage( - Image( SVX_RES( bHighContrast ? IMG_ODF_WARNING_HC : IMG_ODF_WARNING ) ) ); + Image( CUI_RES( bHighContrast ? IMG_ODF_WARNING_HC : IMG_ODF_WARNING ) ) ); FreeResource(); diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src index 374f53ef618f..cffff43cd23a 100644 --- a/cui/source/options/optsave.src +++ b/cui/source/options/optsave.src @@ -30,7 +30,7 @@ // include --------------------------------------------------------------- #include <sfx2/sfx.hrc> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" #include "optsave.hrc" diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index c0a58604d1ff..0fb6e113c40d 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -37,8 +37,8 @@ #include <svl/zforlist.hxx> #include "optupdt.hxx" #include "optupdt.hrc" -#include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> +#include <dialmgr.hxx> +#include <cuires.hrc> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> @@ -66,20 +66,20 @@ namespace util = ::com::sun::star::util; SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_ONLINEUPDATE ), rSet ), - m_aOptionsLine( this, SVX_RES( FL_OPTIONS ) ), - m_aAutoCheckCheckBox( this, SVX_RES( CB_AUTOCHECK ) ), - m_aEveryDayButton( this, SVX_RES( RB_EVERYDAY ) ), - m_aEveryWeekButton( this, SVX_RES( RB_EVERYWEEK ) ), - m_aEveryMonthButton( this, SVX_RES( RB_EVERYMONTH ) ), - m_aCheckNowButton( this, SVX_RES( PB_CHECKNOW ) ), - m_aAutoDownloadCheckBox( this, SVX_RES( CB_AUTODOWNLOAD ) ), - m_aDestPathLabel( this, SVX_RES( FT_DESTPATHLABEL ) ), - m_aDestPath( this, SVX_RES( FT_DESTPATH ) ), - m_aChangePathButton( this, SVX_RES( PB_CHANGEPATH ) ), - m_aLastChecked( this, SVX_RES( FT_LASTCHECKED ) ) + SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_ONLINEUPDATE ), rSet ), + m_aOptionsLine( this, CUI_RES( FL_OPTIONS ) ), + m_aAutoCheckCheckBox( this, CUI_RES( CB_AUTOCHECK ) ), + m_aEveryDayButton( this, CUI_RES( RB_EVERYDAY ) ), + m_aEveryWeekButton( this, CUI_RES( RB_EVERYWEEK ) ), + m_aEveryMonthButton( this, CUI_RES( RB_EVERYMONTH ) ), + m_aCheckNowButton( this, CUI_RES( PB_CHECKNOW ) ), + m_aAutoDownloadCheckBox( this, CUI_RES( CB_AUTODOWNLOAD ) ), + m_aDestPathLabel( this, CUI_RES( FT_DESTPATHLABEL ) ), + m_aDestPath( this, CUI_RES( FT_DESTPATH ) ), + m_aChangePathButton( this, CUI_RES( PB_CHANGEPATH ) ), + m_aLastChecked( this, CUI_RES( FT_LASTCHECKED ) ) { - m_aNeverChecked = String( SVX_RES( STR_NEVERCHECKED ) ); + m_aNeverChecked = String( CUI_RES( STR_NEVERCHECKED ) ); FreeResource(); m_aAutoCheckCheckBox.SetClickHdl( LINK( this, SvxOnlineUpdateTabPage, AutoCheckHdl_Impl ) ); diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src index 043abb8b6a95..55d213978672 100644 --- a/cui/source/options/optupdt.src +++ b/cui/source/options/optupdt.src @@ -30,7 +30,7 @@ // include -------------------------------------------------------------- #include "optupdt.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" // RID_SVXPAGE_ONLINEUPDATE -------------------------------------------- diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index 1d98966525b9..a3cf9719bf59 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -34,7 +34,7 @@ // include --------------------------------------------------------------- #include "radiobtnbox.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> namespace svx { diff --git a/cui/source/options/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx index ea5d5e368972..ce97d352d44d 100644 --- a/cui/source/options/readonlyimage.cxx +++ b/cui/source/options/readonlyimage.cxx @@ -33,8 +33,8 @@ #include <readonlyimage.hxx> #include <vcl/help.hxx> -#include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> +#include <dialmgr.hxx> +#include <cuires.hrc> /*-- 26.02.2004 13:31:04--------------------------------------------------- @@ -43,7 +43,7 @@ ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) : FixedImage(pParent, rResId) { sal_Bool bHighContrast = pParent->GetDisplayBackground().GetColor().IsDark(); - SetImage( Image(SVX_RES(bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK ))); + SetImage( Image(CUI_RES(bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK ))); } /*-- 26.02.2004 13:31:04--------------------------------------------------- @@ -79,6 +79,6 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt ) -----------------------------------------------------------------------*/ const String& ReadOnlyImage::GetHelpTip() { - static String aStr(SVX_RES(RID_SVXSTR_READONLY_CONFIG_TIP)); + static String aStr(CUI_RES(RID_SVXSTR_READONLY_CONFIG_TIP)); return aStr; } diff --git a/cui/source/options/readonlyimage.src b/cui/source/options/readonlyimage.src index 0f698a833c46..92b7d2b73fb3 100644 --- a/cui/source/options/readonlyimage.src +++ b/cui/source/options/readonlyimage.src @@ -30,7 +30,7 @@ // include --------------------------------------------------------------- -#include <svx/dialogs.hrc> +#include <cuires.hrc> String RID_SVXSTR_READONLY_CONFIG_TIP { diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index 489016970bdb..85afe1476d5b 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -35,8 +35,8 @@ #include <unotools/securityoptions.hxx> #include <svtools/stdctrl.hxx> -#include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> +#include <dialmgr.hxx> +#include <cuires.hrc> #include "securityoptions.hxx" #include "securityoptions.hrc" @@ -60,29 +60,29 @@ namespace svx //........................................................................ SecurityOptionsDialog::SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions ) : - ModalDialog( pParent, SVX_RES( RID_SVXDLG_SECURITY_OPTIONS ) ) - ,m_aWarningsFL ( this, SVX_RES( FL_WARNINGS ) ) - ,m_aWarningsFI ( this, SVX_RES( FI_WARNINGS ) ) - ,m_aSaveOrSendDocsFI( this, SVX_RES( FI_SAVESENDDOCS ) ) - ,m_aSaveOrSendDocsCB( this, SVX_RES( CB_SAVESENDDOCS ) ) - ,m_aSignDocsFI ( this, SVX_RES( FI_SIGNDOCS ) ) - ,m_aSignDocsCB ( this, SVX_RES( CB_SIGNDOCS ) ) - ,m_aPrintDocsFI ( this, SVX_RES( FI_PRINTDOCS ) ) - ,m_aPrintDocsCB ( this, SVX_RES( CB_PRINTDOCS ) ) - ,m_aCreatePdfFI ( this, SVX_RES( FI_CREATEPDF ) ) - ,m_aCreatePdfCB ( this, SVX_RES( CB_CREATEPDF ) ) - ,m_aOptionsFL ( this, SVX_RES( FL_OPTIONS ) ) - ,m_aRemovePersInfoFI( this, SVX_RES( FI_REMOVEINFO ) ) - ,m_aRemovePersInfoCB( this, SVX_RES( CB_REMOVEINFO ) ) - ,m_aRecommPasswdFI ( this, SVX_RES( FI_RECOMMENDPWD ) ) - ,m_aRecommPasswdCB ( this, SVX_RES( CB_RECOMMENDPWD ) ) - ,m_aCtrlHyperlinkFI ( this, SVX_RES( FI_CTRLHYPERLINK ) ) - ,m_aCtrlHyperlinkCB ( this, SVX_RES( CB_CTRLHYPERLINK ) ) + ModalDialog( pParent, CUI_RES( RID_SVXDLG_SECURITY_OPTIONS ) ) + ,m_aWarningsFL ( this, CUI_RES( FL_WARNINGS ) ) + ,m_aWarningsFI ( this, CUI_RES( FI_WARNINGS ) ) + ,m_aSaveOrSendDocsFI( this, CUI_RES( FI_SAVESENDDOCS ) ) + ,m_aSaveOrSendDocsCB( this, CUI_RES( CB_SAVESENDDOCS ) ) + ,m_aSignDocsFI ( this, CUI_RES( FI_SIGNDOCS ) ) + ,m_aSignDocsCB ( this, CUI_RES( CB_SIGNDOCS ) ) + ,m_aPrintDocsFI ( this, CUI_RES( FI_PRINTDOCS ) ) + ,m_aPrintDocsCB ( this, CUI_RES( CB_PRINTDOCS ) ) + ,m_aCreatePdfFI ( this, CUI_RES( FI_CREATEPDF ) ) + ,m_aCreatePdfCB ( this, CUI_RES( CB_CREATEPDF ) ) + ,m_aOptionsFL ( this, CUI_RES( FL_OPTIONS ) ) + ,m_aRemovePersInfoFI( this, CUI_RES( FI_REMOVEINFO ) ) + ,m_aRemovePersInfoCB( this, CUI_RES( CB_REMOVEINFO ) ) + ,m_aRecommPasswdFI ( this, CUI_RES( FI_RECOMMENDPWD ) ) + ,m_aRecommPasswdCB ( this, CUI_RES( CB_RECOMMENDPWD ) ) + ,m_aCtrlHyperlinkFI ( this, CUI_RES( FI_CTRLHYPERLINK ) ) + ,m_aCtrlHyperlinkCB ( this, CUI_RES( CB_CTRLHYPERLINK ) ) - ,m_aButtonsFL ( this, SVX_RES( FL_BUTTONS ) ) - ,m_aOKBtn ( this, SVX_RES( PB_OK ) ) - ,m_aCancelBtn ( this, SVX_RES( PB_CANCEL ) ) - ,m_aHelpBtn ( this, SVX_RES( PB_HELP ) ) + ,m_aButtonsFL ( this, CUI_RES( FL_BUTTONS ) ) + ,m_aOKBtn ( this, CUI_RES( PB_OK ) ) + ,m_aCancelBtn ( this, CUI_RES( PB_CANCEL ) ) + ,m_aHelpBtn ( this, CUI_RES( PB_HELP ) ) { FreeResource(); diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src index 7f921bea1dd2..386f92a91fe3 100644 --- a/cui/source/options/securityoptions.src +++ b/cui/source/options/securityoptions.src @@ -32,7 +32,7 @@ #include <svtools/controldims.hrc> #include "securityoptions.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" ModalDialog RID_SVXDLG_SECURITY_OPTIONS diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 045bac7b9126..8bd00f3a260f 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -107,9 +107,9 @@ #include "optgdlg.hxx" #include "optmemory.hxx" #include "optfltr.hxx" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "treeopt.hxx" #include "treeopt.hrc" #include "fontsubs.hxx" @@ -119,6 +119,7 @@ #include "dbregister.hxx" #include "dbregisterednamesconfig.hxx" #include "cfgchart.hxx" +#include <svx/dialogs.hrc> #ifndef _SVX_LANGITEM_HXX #define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE @@ -548,19 +549,19 @@ sal_Bool OfaOptionsTreeListBox::Collapse( SvLBoxEntry* pParent ) // ----------------------------------------------------------------------- #define INI_LIST() \ - aOkPB ( this, SVX_RES( PB_OK ) ),\ - aCancelPB ( this, SVX_RES( PB_CANCEL ) ),\ - aHelpPB ( this, SVX_RES( PB_HELP ) ),\ - aBackPB ( this, SVX_RES( PB_BACK ) ),\ - aHiddenGB ( this, SVX_RES( FB_BORDER ) ),\ - aPageTitleFT ( this, SVX_RES( FT_PAGE_TITLE ) ),\ - aLine1FL ( this, SVX_RES( FL_LINE_1 ) ),\ - aHelpFT ( this, SVX_RES( FT_HELPTEXT ) ),\ - aHelpImg ( this, SVX_RES( IMG_HELP ) ),\ - aHelpTextsArr ( SVX_RES( STR_HELPTEXTS ) ),\ - aTreeLB ( this, SVX_RES( TLB_PAGES ) ),\ + aOkPB ( this, CUI_RES( PB_OK ) ),\ + aCancelPB ( this, CUI_RES( PB_CANCEL ) ),\ + aHelpPB ( this, CUI_RES( PB_HELP ) ),\ + aBackPB ( this, CUI_RES( PB_BACK ) ),\ + aHiddenGB ( this, CUI_RES( FB_BORDER ) ),\ + aPageTitleFT ( this, CUI_RES( FT_PAGE_TITLE ) ),\ + aLine1FL ( this, CUI_RES( FL_LINE_1 ) ),\ + aHelpFT ( this, CUI_RES( FT_HELPTEXT ) ),\ + aHelpImg ( this, CUI_RES( IMG_HELP ) ),\ + aHelpTextsArr ( CUI_RES( STR_HELPTEXTS ) ),\ + aTreeLB ( this, CUI_RES( TLB_PAGES ) ),\ sTitle ( GetText() ),\ - sNotLoadedError ( SVX_RES( ST_LOAD_ERROR ) ),\ + sNotLoadedError ( CUI_RES( ST_LOAD_ERROR ) ),\ pCurrentPageEntry ( NULL ),\ pColorPageItemSet ( NULL ),\ pColorTab ( NULL ),\ @@ -581,7 +582,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( const Reference< XFrame >& _xFrame, bool bActivateLastSelection ) : - SfxModalDialog( pParent, SVX_RES( RID_OFADLG_OPTIONS_TREE ) ), + SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ), INI_LIST() { FreeResource(); @@ -598,7 +599,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId ) : - SfxModalDialog( pParent, SVX_RES( RID_OFADLG_OPTIONS_TREE ) ), + SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ), INI_LIST() @@ -1438,19 +1439,19 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) * --------------------------------------------------*/ OfaPageResource::OfaPageResource() : - Resource(SVX_RES(RID_OFADLG_OPTIONS_TREE_PAGES)), - aGeneralDlgAry(SVX_RES(SID_GENERAL_OPTIONS)), - aInetDlgAry(SVX_RES(SID_INET_DLG)), - aLangDlgAry(SVX_RES(SID_LANGUAGE_OPTIONS)), - aTextDlgAry(SVX_RES(SID_SW_EDITOPTIONS)), - aHTMLDlgAry(SVX_RES(SID_SW_ONLINEOPTIONS)), - aCalcDlgAry(SVX_RES(SID_SC_EDITOPTIONS)), - aStarMathDlgAry(SVX_RES(SID_SM_EDITOPTIONS)), - aImpressDlgAry(SVX_RES(SID_SD_EDITOPTIONS)), - aDrawDlgAry(SVX_RES(SID_SD_GRAPHIC_OPTIONS)), - aChartDlgAry(SVX_RES(SID_SCH_EDITOPTIONS)), - aFilterDlgAry(SVX_RES(SID_FILTER_DLG)), - aDatasourcesDlgAry(SVX_RES(SID_SB_STARBASEOPTIONS)) + Resource(CUI_RES(RID_OFADLG_OPTIONS_TREE_PAGES)), + aGeneralDlgAry(CUI_RES(SID_GENERAL_OPTIONS)), + aInetDlgAry(CUI_RES(SID_INET_DLG)), + aLangDlgAry(CUI_RES(SID_LANGUAGE_OPTIONS)), + aTextDlgAry(CUI_RES(SID_SW_EDITOPTIONS)), + aHTMLDlgAry(CUI_RES(SID_SW_ONLINEOPTIONS)), + aCalcDlgAry(CUI_RES(SID_SC_EDITOPTIONS)), + aStarMathDlgAry(CUI_RES(SID_SM_EDITOPTIONS)), + aImpressDlgAry(CUI_RES(SID_SD_EDITOPTIONS)), + aDrawDlgAry(CUI_RES(SID_SD_GRAPHIC_OPTIONS)), + aChartDlgAry(CUI_RES(SID_SCH_EDITOPTIONS)), + aFilterDlgAry(CUI_RES(SID_FILTER_DLG)), + aDatasourcesDlgAry(CUI_RES(SID_SB_STARBASEOPTIONS)) { FreeResource(); } diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index 2bf5d0825cdc..05a67948da04 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -29,8 +29,9 @@ ************************************************************************/ #include "treeopt.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" +#include <svx/dialogs.hrc> #define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; } diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 37be48be6233..162758a524fe 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -32,8 +32,8 @@ #include "precompiled_cui.hxx" // include --------------------------------------------------------------- -#include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> +#include <dialmgr.hxx> +#include <cuires.hrc> #include <com/sun/star/task/UrlRecord.hpp> #include <com/sun/star/task/XPasswordContainer.hpp> #include <com/sun/star/task/XMasterPasswordHandling.hpp> @@ -99,22 +99,22 @@ void PasswordTable::Resort( bool bForced ) // ----------------------------------------------------------------------- WebConnectionInfoDialog::WebConnectionInfoDialog( Window* pParent ) : - ModalDialog( pParent, SVX_RES( RID_SVXDLG_WEBCONNECTION_INFO ) ) - ,m_aNeverShownFI ( this, SVX_RES( FI_NEVERSHOWN ) ) - ,m_aPasswordsLB ( this, SVX_RES( LB_PASSWORDS ) ) - ,m_aRemoveBtn ( this, SVX_RES( PB_REMOVE ) ) - ,m_aRemoveAllBtn ( this, SVX_RES( PB_REMOVEALL ) ) - ,m_aChangeBtn ( this, SVX_RES( PB_CHANGE ) ) - ,m_aButtonsFL ( this, SVX_RES( FL_BUTTONS ) ) - ,m_aCloseBtn ( this, SVX_RES( PB_CLOSE ) ) - ,m_aHelpBtn ( this, SVX_RES( PB_HELP ) ) + ModalDialog( pParent, CUI_RES( RID_SVXDLG_WEBCONNECTION_INFO ) ) + ,m_aNeverShownFI ( this, CUI_RES( FI_NEVERSHOWN ) ) + ,m_aPasswordsLB ( this, CUI_RES( LB_PASSWORDS ) ) + ,m_aRemoveBtn ( this, CUI_RES( PB_REMOVE ) ) + ,m_aRemoveAllBtn ( this, CUI_RES( PB_REMOVEALL ) ) + ,m_aChangeBtn ( this, CUI_RES( PB_CHANGE ) ) + ,m_aButtonsFL ( this, CUI_RES( FL_BUTTONS ) ) + ,m_aCloseBtn ( this, CUI_RES( PB_CLOSE ) ) + ,m_aHelpBtn ( this, CUI_RES( PB_HELP ) ) ,m_nPos ( -1 ) { static long aStaticTabs[]= { 3, 0, 150, 250 }; m_aPasswordsLB.SetTabs( aStaticTabs ); - m_aPasswordsLB.InsertHeaderItem( 1, SVX_RESSTR( STR_WEBSITE ), + m_aPasswordsLB.InsertHeaderItem( 1, CUI_RESSTR( STR_WEBSITE ), HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS | HIB_CLICKABLE | HIB_UPARROW ); - m_aPasswordsLB.InsertHeaderItem( 2, SVX_RESSTR( STR_USERNAME ), + m_aPasswordsLB.InsertHeaderItem( 2, CUI_RESSTR( STR_USERNAME ), HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS ); m_aPasswordsLB.ResetTabs(); diff --git a/cui/source/options/webconninfo.src b/cui/source/options/webconninfo.src index 328478c56e83..9252a698b29c 100644 --- a/cui/source/options/webconninfo.src +++ b/cui/source/options/webconninfo.src @@ -32,7 +32,7 @@ #include <svtools/controldims.hrc> #include "webconninfo.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" ModalDialog RID_SVXDLG_WEBCONNECTION_INFO |