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/dialogs | |
| parent | da1f577a71b8bfc0f15d1015475f505265481459 (diff) | |
#i106421#: create new cui resource file
Diffstat (limited to 'cui/source/dialogs')
50 files changed, 676 insertions, 668 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 34f496a18a83..d6837554f30f 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -61,7 +61,7 @@ #include <vcl/graph.hxx> #include <osl/file.hxx> #include <svx/impgrf.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include <helpid.hrc> #include "SpellDialog.hrc" #include <svx/optitems.hxx> @@ -70,7 +70,7 @@ #include "SpellDialog.hxx" #include <svx/dlgutil.hxx> #include "optlingu.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <svx/svxerr.hxx> #include "treeopt.hxx" @@ -204,43 +204,43 @@ SpellDialog::SpellDialog( : SfxModelessDialog (_pBindings, pChildWindow, pParent, - SVX_RES(RID_SVXDLG_SPELLCHECK)), - - aVendorImageFI ( this , SVX_RES( IMG_VENDOR ) ), - aLanguageFT ( this, SVX_RES( FT_LANGUAGE ) ), - aLanguageLB ( this, SVX_RES( LB_LANGUAGE ) ), - aNotInDictFT ( this, SVX_RES( FT_NOTINDICT ) ), - aSentenceED ( this, SVX_RES( ED_NEWWORD ) ), - aSuggestionFT ( this, SVX_RES( FT_SUGGESTION ) ), - aSuggestionLB ( this, SVX_RES( LB_SUGGESTION ) ), - - aIgnorePB ( this, SVX_RES( PB_IGNORE ) ), - aIgnoreAllPB ( this, SVX_RES( PB_IGNOREALL ) ), - aIgnoreRulePB ( this, SVX_RES( PB_IGNORERULE ) ), - aAddToDictMB ( this, SVX_RES( MB_ADDTODICT ) ), - - aChangePB ( this, SVX_RES( PB_CHANGE ) ), - aChangeAllPB ( this, SVX_RES( PB_CHANGEALL ) ), - aExplainPB ( this, SVX_RES( PB_EXPLAIN) ), - aAutoCorrPB ( this, SVX_RES( PB_AUTOCORR ) ), - - aCheckGrammarCB ( this, SVX_RES( CB_CHECK_GRAMMAR ) ), - - aHelpPB ( this, SVX_RES( PB_HELP ) ), - aOptionsPB ( this, SVX_RES( PB_OPTIONS ) ), - aUndoPB ( this, SVX_RES( PB_UNDO ) ), - aClosePB ( this, SVX_RES( PB_CLOSE ) ), - aBackgroundGB ( this, SVX_RES( GB_BACKGROUND ) ), - - aVendorImage ( SVX_RES( IMG_DEFAULT_VENDOR ) ), - aVendorImageHC ( SVX_RES( IMG_DEFAULT_VENDOR_HC ) ), - - aResumeST ( SVX_RES(ST_RESUME )), + CUI_RES(RID_SVXDLG_SPELLCHECK)), + + aVendorImageFI ( this , CUI_RES( IMG_VENDOR ) ), + aLanguageFT ( this, CUI_RES( FT_LANGUAGE ) ), + aLanguageLB ( this, CUI_RES( LB_LANGUAGE ) ), + aNotInDictFT ( this, CUI_RES( FT_NOTINDICT ) ), + aSentenceED ( this, CUI_RES( ED_NEWWORD ) ), + aSuggestionFT ( this, CUI_RES( FT_SUGGESTION ) ), + aSuggestionLB ( this, CUI_RES( LB_SUGGESTION ) ), + + aIgnorePB ( this, CUI_RES( PB_IGNORE ) ), + aIgnoreAllPB ( this, CUI_RES( PB_IGNOREALL ) ), + aIgnoreRulePB ( this, CUI_RES( PB_IGNORERULE ) ), + aAddToDictMB ( this, CUI_RES( MB_ADDTODICT ) ), + + aChangePB ( this, CUI_RES( PB_CHANGE ) ), + aChangeAllPB ( this, CUI_RES( PB_CHANGEALL ) ), + aExplainPB ( this, CUI_RES( PB_EXPLAIN) ), + aAutoCorrPB ( this, CUI_RES( PB_AUTOCORR ) ), + + aCheckGrammarCB ( this, CUI_RES( CB_CHECK_GRAMMAR ) ), + + aHelpPB ( this, CUI_RES( PB_HELP ) ), + aOptionsPB ( this, CUI_RES( PB_OPTIONS ) ), + aUndoPB ( this, CUI_RES( PB_UNDO ) ), + aClosePB ( this, CUI_RES( PB_CLOSE ) ), + aBackgroundGB ( this, CUI_RES( GB_BACKGROUND ) ), + + aVendorImage ( CUI_RES( IMG_DEFAULT_VENDOR ) ), + aVendorImageHC ( CUI_RES( IMG_DEFAULT_VENDOR_HC ) ), + + aResumeST ( CUI_RES(ST_RESUME )), aIgnoreOnceST ( aIgnorePB.GetText()), - aNoSuggestionsST( SVX_RES(ST_NOSUGGESTIONS)), - m_sTitleSpelling ( SVX_RES( ST_SPELLING ) ), - m_sTitleSpellingGrammar ( SVX_RES( ST_SPELLING_AND_GRAMMAR ) ), - m_sTitleSpellingGrammarVendor ( SVX_RES( ST_SPELLING_AND_GRAMMAR_VENDORNAME ) ), + aNoSuggestionsST( CUI_RES(ST_NOSUGGESTIONS)), + m_sTitleSpelling ( CUI_RES( ST_SPELLING ) ), + m_sTitleSpellingGrammar ( CUI_RES( ST_SPELLING_AND_GRAMMAR ) ), + m_sTitleSpellingGrammarVendor ( CUI_RES( ST_SPELLING_AND_GRAMMAR_VENDORNAME ) ), aDialogUndoLink( LINK (this, SpellDialog, DialogUndoHdl)), bModified( false ), bFocusLocked( true ), diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src index f7cccd5febc2..61ef8b4e6ab2 100644 --- a/cui/source/dialogs/SpellDialog.src +++ b/cui/source/dialogs/SpellDialog.src @@ -28,7 +28,7 @@ * ************************************************************************/ // include --------------------------------------------------------------- -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" #include "SpellDialog.hrc" // pragma ---------------------------------------------------------------- diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src index 8b93fe850887..cf39acab5025 100644 --- a/cui/source/dialogs/charmap.src +++ b/cui/source/dialogs/charmap.src @@ -30,9 +30,10 @@ // include --------------------------------------------------------------- #include <svx/svxids.hrc> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "charmap.hrc" #include "helpid.hrc" +#include <svx/dialogs.hrc> // RID_SVXDLG_CHARMAP ---------------------------------------------------- ModalDialog RID_SVXDLG_CHARMAP diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index 70ceacd47c47..4f2ab5677b63 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -32,8 +32,8 @@ #include "precompiled_cui.hxx" #include "commonlingui.hxx" -#include <svx/dialogs.hrc> -#include <svx/dialmgr.hxx> +#include <cuires.hrc> +#include <dialmgr.hxx> #include <vcl/decoview.hxx> #include "hangulhanjadlg.hrc" @@ -90,21 +90,21 @@ __EXPORT SvxClickInfoCtr::~SvxClickInfoCtr() //============================================================================= //----------------------------------------------------------------------------- SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent ) - :Window( _pParent, SVX_RES( RID_SVX_WND_COMMON_LINGU ) ) - ,aWordText ( this, SVX_RES( FT_WORD ) ) - ,aAktWord ( this, SVX_RES( FT_AKTWORD ) ) - ,aNewWord ( this, SVX_RES( FT_NEWWORD ) ) - ,aNewWordED ( this, SVX_RES( ED_NEWWORD ) ) - ,aSuggestionFT ( this, SVX_RES( FT_SUGGESTION ) ) - ,aIgnoreBtn ( this, SVX_RES( BTN_IGNORE ) ) - ,aIgnoreAllBtn ( this, SVX_RES( BTN_IGNOREALL ) ) - ,aChangeBtn ( this, SVX_RES( BTN_CHANGE ) ) - ,aChangeAllBtn ( this, SVX_RES( BTN_CHANGEALL ) ) - ,aOptionsBtn ( this, SVX_RES( BTN_OPTIONS ) ) - ,aStatusText ( this, SVX_RES( FT_STATUS ) ) - ,aHelpBtn ( this, SVX_RES( BTN_SPL_HELP ) ) - ,aCancelBtn ( this, SVX_RES( BTN_SPL_CANCEL ) ) - ,aAuditBox ( this, SVX_RES( GB_AUDIT ) ) + :Window( _pParent, CUI_RES( RID_SVX_WND_COMMON_LINGU ) ) + ,aWordText ( this, CUI_RES( FT_WORD ) ) + ,aAktWord ( this, CUI_RES( FT_AKTWORD ) ) + ,aNewWord ( this, CUI_RES( FT_NEWWORD ) ) + ,aNewWordED ( this, CUI_RES( ED_NEWWORD ) ) + ,aSuggestionFT ( this, CUI_RES( FT_SUGGESTION ) ) + ,aIgnoreBtn ( this, CUI_RES( BTN_IGNORE ) ) + ,aIgnoreAllBtn ( this, CUI_RES( BTN_IGNOREALL ) ) + ,aChangeBtn ( this, CUI_RES( BTN_CHANGE ) ) + ,aChangeAllBtn ( this, CUI_RES( BTN_CHANGEALL ) ) + ,aOptionsBtn ( this, CUI_RES( BTN_OPTIONS ) ) + ,aStatusText ( this, CUI_RES( FT_STATUS ) ) + ,aHelpBtn ( this, CUI_RES( BTN_SPL_HELP ) ) + ,aCancelBtn ( this, CUI_RES( BTN_SPL_CANCEL ) ) + ,aAuditBox ( this, CUI_RES( GB_AUDIT ) ) { FreeResource(); diff --git a/cui/source/dialogs/commonlingui.src b/cui/source/dialogs/commonlingui.src index c229953ad3c8..1a58a9ef7fa8 100644 --- a/cui/source/dialogs/commonlingui.src +++ b/cui/source/dialogs/commonlingui.src @@ -28,7 +28,7 @@ * ************************************************************************/ // include --------------------------------------------------------------- -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" #include "hangulhanjadlg.hrc" diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 4a5344de54b3..a638be860035 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -47,8 +47,8 @@ #include <rtl/textenc.h> #include <svx/ucsubset.hxx> -#include <svx/dialogs.hrc> -#include <svx/dialmgr.hxx> +#include <cuires.hrc> +#include <dialmgr.hxx> #include "cuicharmap.hxx" #include <sfx2/request.hxx> #include <sfx2/sfxsids.hrc> @@ -60,7 +60,7 @@ // class SvxCharacterMap ================================================= SvxCharacterMap::SvxCharacterMap( Window* pParent, BOOL bOne, const SfxItemSet* pSet ) : - SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_CHARMAP ) ), + SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_CHARMAP ) ), mpCharMapData( 0 ) { SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, FALSE ); @@ -71,7 +71,7 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, BOOL bOne, const SfxItemSet* if ( pCharItem ) SetChar( pItem->GetValue() ); - mpCharMapData = new SvxCharMapData( this, bOne, &DIALOG_MGR() ); + mpCharMapData = new SvxCharMapData( this, bOne, &CUI_MGR() ); SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, FALSE ); if ( pDisableItem && pDisableItem->GetValue() ) diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index d7667dff869a..47b6dba7dcf2 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -36,11 +36,11 @@ #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <tools/shl.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <sfx2/tabdlg.hxx> #include <osl/mutex.hxx> #include <sfx2/app.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include <svl/filerec.hxx> #include <svx/fmsrccfg.hxx> #include <svx/fmsrcimp.hxx> @@ -99,39 +99,39 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) //------------------------------------------------------------------------ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier) - :ModalDialog(pParent, SVX_RES(RID_SVXDLG_SEARCHFORM)) - ,m_flSearchFor (this, SVX_RES(FL_SEARCHFOR)) - ,m_rbSearchForText (this, SVX_RES(RB_SEARCHFORTEXT)) - ,m_rbSearchForNull (this, SVX_RES(RB_SEARCHFORNULL)) - ,m_rbSearchForNotNull (this, SVX_RES(RB_SEARCHFORNOTNULL)) - ,m_cmbSearchText (this, SVX_RES(CMB_SEARCHTEXT)) - ,m_flWhere (this, SVX_RES(FL_WHERE)) - ,m_ftForm (this, SVX_RES(FT_FORM)) - ,m_lbForm (this, SVX_RES(LB_FORM)) - ,m_rbAllFields (this, SVX_RES(RB_ALLFIELDS)) - ,m_rbSingleField (this, SVX_RES(RB_SINGLEFIELD)) - ,m_lbField (this, SVX_RES(LB_FIELD)) - ,m_flOptions (this, SVX_RES(FL_OPTIONS)) - ,m_ftPosition (this, SVX_RES(FT_POSITION)) - ,m_lbPosition (this, SVX_RES(LB_POSITION)) - ,m_cbUseFormat (this, SVX_RES(CB_USEFORMATTER)) - ,m_cbCase (this, SVX_RES(CB_CASE)) - ,m_cbBackwards (this, SVX_RES(CB_BACKWARD)) - ,m_cbStartOver (this, SVX_RES(CB_STARTOVER)) - ,m_cbWildCard (this, SVX_RES(CB_WILDCARD)) - ,m_cbRegular (this, SVX_RES(CB_REGULAR)) - ,m_cbApprox (this, SVX_RES(CB_APPROX)) - ,m_pbApproxSettings (this, SVX_RES(PB_APPROXSETTINGS)) - ,m_aHalfFullFormsCJK (this, SVX_RES(CB_HALFFULLFORMS)) - ,m_aSoundsLikeCJK (this, SVX_RES(CB_SOUNDSLIKECJK)) - ,m_aSoundsLikeCJKSettings (this, SVX_RES(PB_SOUNDSLIKESETTINGS)) - ,m_flState (this, SVX_RES(FL_STATE)) - ,m_ftRecordLabel (this, SVX_RES(FT_RECORDLABEL)) - ,m_ftRecord (this, SVX_RES(FT_RECORD)) - ,m_ftHint (this, SVX_RES(FT_HINT)) - ,m_pbSearchAgain (this, SVX_RES(PB_SEARCH)) - ,m_pbClose (this, SVX_RES(1)) - ,m_pbHelp (this, SVX_RES(1)) + :ModalDialog(pParent, CUI_RES(RID_SVXDLG_SEARCHFORM)) + ,m_flSearchFor (this, CUI_RES(FL_SEARCHFOR)) + ,m_rbSearchForText (this, CUI_RES(RB_SEARCHFORTEXT)) + ,m_rbSearchForNull (this, CUI_RES(RB_SEARCHFORNULL)) + ,m_rbSearchForNotNull (this, CUI_RES(RB_SEARCHFORNOTNULL)) + ,m_cmbSearchText (this, CUI_RES(CMB_SEARCHTEXT)) + ,m_flWhere (this, CUI_RES(FL_WHERE)) + ,m_ftForm (this, CUI_RES(FT_FORM)) + ,m_lbForm (this, CUI_RES(LB_FORM)) + ,m_rbAllFields (this, CUI_RES(RB_ALLFIELDS)) + ,m_rbSingleField (this, CUI_RES(RB_SINGLEFIELD)) + ,m_lbField (this, CUI_RES(LB_FIELD)) + ,m_flOptions (this, CUI_RES(FL_OPTIONS)) + ,m_ftPosition (this, CUI_RES(FT_POSITION)) + ,m_lbPosition (this, CUI_RES(LB_POSITION)) + ,m_cbUseFormat (this, CUI_RES(CB_USEFORMATTER)) + ,m_cbCase (this, CUI_RES(CB_CASE)) + ,m_cbBackwards (this, CUI_RES(CB_BACKWARD)) + ,m_cbStartOver (this, CUI_RES(CB_STARTOVER)) + ,m_cbWildCard (this, CUI_RES(CB_WILDCARD)) + ,m_cbRegular (this, CUI_RES(CB_REGULAR)) + ,m_cbApprox (this, CUI_RES(CB_APPROX)) + ,m_pbApproxSettings (this, CUI_RES(PB_APPROXSETTINGS)) + ,m_aHalfFullFormsCJK (this, CUI_RES(CB_HALFFULLFORMS)) + ,m_aSoundsLikeCJK (this, CUI_RES(CB_SOUNDSLIKECJK)) + ,m_aSoundsLikeCJKSettings (this, CUI_RES(PB_SOUNDSLIKESETTINGS)) + ,m_flState (this, CUI_RES(FL_STATE)) + ,m_ftRecordLabel (this, CUI_RES(FT_RECORDLABEL)) + ,m_ftRecord (this, CUI_RES(FT_RECORD)) + ,m_ftHint (this, CUI_RES(FT_HINT)) + ,m_pbSearchAgain (this, CUI_RES(PB_SEARCH)) + ,m_pbClose (this, CUI_RES(1)) + ,m_pbHelp (this, CUI_RES(1)) ,m_sSearch ( m_pbSearchAgain.GetText() ) ,m_sCancel ( Button::GetStandardText( BUTTON_CANCEL ) ) ,m_pPreSearchFocus( NULL ) @@ -280,7 +280,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI RID_STR_SEARCH_WHOLE }; for ( size_t i=0; i<sizeof(nResIds)/sizeof(nResIds[0]); ++i ) - m_lbPosition.InsertEntry( String( SVX_RES( nResIds[i] ) ) ); + m_lbPosition.InsertEntry( String( CUI_RES( nResIds[i] ) ) ); m_lbPosition.SelectEntryPos(MATCHING_ANYWHERE); // die Feld-Listbox @@ -419,7 +419,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, RID_SVXPAGE_JSEARCH_OPTIONS, m_pSearchEngine->GetTransliterationFlags(), RID_SVXPAGE_JSEARCH_OPTIONS ); + AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, m_pSearchEngine->GetTransliterationFlags() ); DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 aDlg->Execute(); //CHINA001 aDlg.Execute(); @@ -488,7 +488,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) // Richtung -> weiterreichen und Checkbox-Text fuer StartOver neu setzen else if (pBox == &m_cbBackwards) { - m_cbStartOver.SetText( String( SVX_RES( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) ); + m_cbStartOver.SetText( String( CUI_RES( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) ); m_pSearchEngine->SetDirection(!bChecked); } // Aehnlichkeitssuche oder regulaerer Ausdruck @@ -782,7 +782,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) case FmSearchProgress::STATE_PROGRESS: if (pProgress->bOverflow) { - String sHint( SVX_RES( m_cbBackwards.IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) ); + String sHint( CUI_RES( m_cbBackwards.IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) ); m_ftHint.SetText( sHint ); m_ftHint.Invalidate(); } @@ -792,7 +792,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) break; case FmSearchProgress::STATE_PROGRESS_COUNTING: - m_ftHint.SetText(SVX_RESSTR(RID_STR_SEARCH_COUNTING)); + m_ftHint.SetText(CUI_RESSTR(RID_STR_SEARCH_COUNTING)); m_ftHint.Invalidate(); m_ftRecord.SetText(String::CreateFromInt32(pProgress->nCurrentRecord)); @@ -810,7 +810,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) sal_uInt16 nErrorId = (FmSearchProgress::STATE_ERROR == pProgress->aSearchState) ? RID_SVXERR_SEARCH_GENERAL_ERROR : RID_SVXERR_SEARCH_NORECORD; - ErrorBox(this, SVX_RES(nErrorId)).Execute(); + ErrorBox(this, CUI_RES(nErrorId)).Execute(); } // KEIN break ! case FmSearchProgress::STATE_CANCELED: diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 60e4d4af86b5..1106a9290aa7 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -37,9 +37,10 @@ #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "cuigrfflt.hxx" #include "grfflt.hrc" +#include <cuires.hrc> #include <svx/dialogs.hrc> // -------------------- @@ -370,11 +371,11 @@ GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId, mfScaleX ( 0.0 ), mfScaleY ( 0.0 ), maSizePixel ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ), - maPreview ( this, SVX_RES( CTL_PREVIEW ) ), - maFlParameter ( this, SVX_RES( FL_PARAMETER ) ), - maBtnOK ( this, SVX_RES( BTN_OK ) ), - maBtnCancel ( this, SVX_RES( BTN_CANCEL ) ), - maBtnHelp ( this, SVX_RES( BTN_HELP ) ) + maPreview ( this, CUI_RES( CTL_PREVIEW ) ), + maFlParameter ( this, CUI_RES( FL_PARAMETER ) ), + maBtnOK ( this, CUI_RES( BTN_OK ) ), + maBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + maBtnHelp ( this, CUI_RES( BTN_HELP ) ) { const Size aPreviewSize( maPreview.GetOutputSizePixel() ); Size aGrfSize( maSizePixel ); @@ -449,12 +450,12 @@ IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, EMPTYARG ) GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic, USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ) : - GraphicFilterDialog( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ), - maFtWidth ( this, SVX_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ), - maMtrWidth ( this, SVX_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ), - maFtHeight ( this, SVX_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ), - maMtrHeight ( this, SVX_RES( DLG_FILTERMOSAIC_MTR_HEIGHT ) ), - maCbxEdges ( this, SVX_RES( DLG_FILTERMOSAIC_CBX_EDGES ) ) + GraphicFilterDialog( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ), + maFtWidth ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ), + maMtrWidth ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ), + maFtHeight ( this, CUI_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ), + maMtrHeight ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_HEIGHT ) ), + maCbxEdges ( this, CUI_RES( DLG_FILTERMOSAIC_CBX_EDGES ) ) { FreeResource(); @@ -522,10 +523,10 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, BYTE cGreyThreshold, BOOL bInvert ) : - GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ), - maFtThreshold ( this, SVX_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ), - maMtrThreshold ( this, SVX_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ), - maCbxInvert ( this, SVX_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) ) + GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ), + maFtThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ), + maMtrThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ), + maCbxInvert ( this, CUI_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) ) { FreeResource(); @@ -586,9 +587,9 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic, USHORT nSepiaPercent ) : - GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ), - maFtSepia ( this, SVX_RES( DLG_FILTERSEPIA_FT_SEPIA ) ), - maMtrSepia ( this, SVX_RES( DLG_FILTERSEPIA_MTR_SEPIA ) ) + GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ), + maFtSepia ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ), + maMtrSepia ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) ) { FreeResource(); @@ -636,9 +637,9 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic, USHORT nPosterCount ) : - GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ), - maFtPoster ( this, SVX_RES( DLG_FILTERPOSTER_FT_POSTER ) ), - maNumPoster ( this, SVX_RES( DLG_FILTERPOSTER_NUM_POSTER ) ) + GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ), + maFtPoster ( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ), + maNumPoster ( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) ) { FreeResource(); @@ -699,9 +700,9 @@ void GraphicFilterEmboss::EmbossControl::MouseButtonDown( const MouseEvent& rEvt GraphicFilterEmboss::GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource ) : - GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ), - maFtLight ( this, SVX_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ), - maCtlLight ( this, SVX_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource ) + GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ), + maFtLight ( this, CUI_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ), + maCtlLight ( this, CUI_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource ) { FreeResource(); diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index b3ed7397799a..dcba27401184 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -103,7 +103,7 @@ void SvxHlinkCtrl::StateChanged( USHORT nSID, SfxItemState eState, |************************************************************************/ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) -: IconChoiceDialog( pParent, SVX_RES ( RID_SVXDLG_NEWHYPERLINK ) ), +: IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ), maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ), mpBindings ( pBindings ), mbReadOnly ( sal_False ), @@ -116,26 +116,26 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) String aStrTitle; SvxIconChoiceCtrlEntry* pEntry = NULL; - aStrTitle = SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP ); - aImage = Image( SVX_RES ( RID_SVXBMP_HLINETTP ) ); - aImageHC = Image( SVX_RES ( RID_SVXBMP_HLINETTP_H ) ); + aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP ); + aImage = Image( CUI_RES ( RID_SVXBMP_HLINETTP ) ); + aImageHC = Image( CUI_RES ( RID_SVXBMP_HLINETTP_H ) ); pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, aImage, aImageHC, SvxHyperlinkInternetTp::Create ); - pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) ); - aStrTitle = SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP ); - aImage = Image( SVX_RES ( RID_SVXBMP_HLMAILTP ) ); - aImageHC = Image( SVX_RES ( RID_SVXBMP_HLMAILTP_H ) ); + pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) ); + aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP ); + aImage = Image( CUI_RES ( RID_SVXBMP_HLMAILTP ) ); + aImageHC = Image( CUI_RES ( RID_SVXBMP_HLMAILTP_H ) ); pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, aImage, aImageHC, SvxHyperlinkMailTp::Create ); - pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) ); - aStrTitle = SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP ); - aImage = Image( SVX_RES ( RID_SVXBMP_HLDOCTP ) ); - aImageHC = Image( SVX_RES ( RID_SVXBMP_HLDOCTP_H ) ); + pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) ); + aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP ); + aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCTP ) ); + aImageHC = Image( CUI_RES ( RID_SVXBMP_HLDOCTP_H ) ); pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkDocTp::Create ); - pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) ); - aStrTitle = SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP ); - aImage = Image( SVX_RES ( RID_SVXBMP_HLDOCNTP ) ); - aImageHC = Image( SVX_RES ( RID_SVXBMP_HLDOCNTP_H ) ); + pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) ); + aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP ); + aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP ) ); + aImageHC = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP_H ) ); pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkNewDocTp::Create ); - pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) ); + pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) ); // all tab pages set -> create mnemonics // CreateIconTextAutoMnemonics(); #99671# not useful, because this is not what user expects when using mnemonics on the pages @@ -155,8 +155,8 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) pBindings->Update( SID_READONLY_MODE ); // set OK/Cancel - button - GetOKButton().SetText ( SVX_RESSTR(RID_SVXSTR_HYPDLG_APPLYBUT) ); - GetCancelButton().SetText ( SVX_RESSTR(RID_SVXSTR_HYPDLG_CLOSEBUT) ); + GetOKButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_APPLYBUT) ); + GetCancelButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_CLOSEBUT) ); GetOKButton().SetClickHdl ( LINK ( this, SvxHpLinkDlg, ClickApplyHdl_Impl ) ); GetCancelButton().SetClickHdl( LINK ( this, SvxHpLinkDlg, ClickCloseHdl_Impl ) ); diff --git a/cui/source/dialogs/cuiimapdlg.hrc b/cui/source/dialogs/cuiimapdlg.hrc index 00df9f23ee7a..9424d94c1f05 100755 --- a/cui/source/dialogs/cuiimapdlg.hrc +++ b/cui/source/dialogs/cuiimapdlg.hrc @@ -27,12 +27,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include <svx/dialogs.hrc> +#include <cuires.hrc> // ImapDlg-Dialoge -#define RID_SVX_IMAPDLG_START RID_SVX_IMAP_START - -#define RID_SVXDLG_IMAPURL (RID_SVX_IMAPDLG_START + 2) #define FT_URLDESCRIPTION 1 #define FT_URL1 2 diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 09fe5168556d..d1c4ed2ccc95 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -42,8 +42,8 @@ #include <svtools/imappoly.hxx> #include <svl/urlbmk.hxx> #include <svx/xoutbmp.hxx> -#include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> +#include <dialmgr.hxx> +#include <cuires.hrc> #include <svx/svxids.hrc> #include <cuiimapdlg.hrc> #include <cuiimapwnd.hxx> @@ -68,21 +68,21 @@ \************************************************************************/ URLDlg::URLDlg( Window* pWindow, const String& rURL, const String& rAlternativeText, const String& rDescription, const String& rTarget, const String& rName, TargetList& rTargetList ) -: ModalDialog( pWindow, SVX_RES( RID_SVXDLG_IMAPURL ) ) -, maFtURL( this, SVX_RES( FT_URL1 ) ) -, maEdtURL( this, SVX_RES( EDT_URL ) ) -, maFtTarget( this, SVX_RES( FT_TARGET ) ) -, maCbbTargets( this, SVX_RES( CBB_TARGETS ) ) -, maFtName( this, SVX_RES( FT_NAME ) ) -, maEdtName( this, SVX_RES( EDT_NAME ) ) -, maFtAlternativeText( this, SVX_RES( FT_URLDESCRIPTION ) ) -, maEdtAlternativeText( this, SVX_RES( EDT_URLDESCRIPTION ) ) -, maFtDescription( this, SVX_RES( FT_DESCRIPTION ) ) -, maEdtDescription( this, SVX_RES( EDT_DESCRIPTION ) ) -, maFlURL( this, SVX_RES( FL_URL ) ) -, maBtnHelp( this, SVX_RES( BTN_HELP1 ) ) -, maBtnOk( this, SVX_RES( BTN_OK1 ) ) -, maBtnCancel( this, SVX_RES( BTN_CANCEL1 ) ) +: ModalDialog( pWindow, CUI_RES( RID_SVXDLG_IMAPURL ) ) +, maFtURL( this, CUI_RES( FT_URL1 ) ) +, maEdtURL( this, CUI_RES( EDT_URL ) ) +, maFtTarget( this, CUI_RES( FT_TARGET ) ) +, maCbbTargets( this, CUI_RES( CBB_TARGETS ) ) +, maFtName( this, CUI_RES( FT_NAME ) ) +, maEdtName( this, CUI_RES( EDT_NAME ) ) +, maFtAlternativeText( this, CUI_RES( FT_URLDESCRIPTION ) ) +, maEdtAlternativeText( this, CUI_RES( EDT_URLDESCRIPTION ) ) +, maFtDescription( this, CUI_RES( FT_DESCRIPTION ) ) +, maEdtDescription( this, CUI_RES( EDT_DESCRIPTION ) ) +, maFlURL( this, CUI_RES( FL_URL ) ) +, maBtnHelp( this, CUI_RES( BTN_HELP1 ) ) +, maBtnOk( this, CUI_RES( BTN_OK1 ) ) +, maBtnCancel( this, CUI_RES( BTN_CANCEL1 ) ) { FreeResource(); diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index 2a5da5084c5c..1ca37f425a10 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -41,8 +41,8 @@ #include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> #include <vcl/sound.hxx> -#include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> +#include <dialmgr.hxx> +#include <cuires.hrc> #include "cuitbxform.hxx" #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> @@ -53,11 +53,11 @@ //======================================================================== FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent) - :ModalDialog( pParent, SVX_RES(RID_SVX_DLG_INPUTRECORDNO)) - ,m_aLabel(this, SVX_RES(1)) - ,m_aRecordNo(this, SVX_RES(1)) - ,m_aOk(this, SVX_RES(1)) - ,m_aCancel(this, SVX_RES(1)) + :ModalDialog( pParent, CUI_RES(RID_SVX_DLG_INPUTRECORDNO)) + ,m_aLabel(this, CUI_RES(1)) + ,m_aRecordNo(this, CUI_RES(1)) + ,m_aOk(this, CUI_RES(1)) + ,m_aCancel(this, CUI_RES(1)) { m_aRecordNo.SetMin(1); m_aRecordNo.SetMax(0x7FFFFFFF); diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 12b58542f605..8cf36980decf 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -37,12 +37,12 @@ #include <tools/debug.hxx> #include <vcl/msgbox.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "dlgname.hxx" #include "defdlgname.hxx" //CHINA001 #include "dlgname.hrc" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #define MAX_DESCRIPTION_LINES ((long)5) @@ -53,12 +53,12 @@ \************************************************************************/ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc ) : - ModalDialog ( pWindow, SVX_RES( RID_SVXDLG_NAME ) ), - aFtDescription ( this, SVX_RES( FT_DESCRIPTION ) ), - aEdtName ( this, SVX_RES( EDT_STRING ) ), - aBtnOK ( this, SVX_RES( BTN_OK ) ), - aBtnCancel ( this, SVX_RES( BTN_CANCEL ) ), - aBtnHelp ( this, SVX_RES( BTN_HELP ) ) + ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_NAME ) ), + aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ), + aEdtName ( this, CUI_RES( EDT_STRING ) ), + aBtnOK ( this, CUI_RES( BTN_OK ) ), + aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), + aBtnHelp ( this, CUI_RES( BTN_HELP ) ) { FreeResource(); @@ -101,13 +101,13 @@ IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG) SvxObjectNameDialog::SvxObjectNameDialog( Window* pWindow, const String& rName) -: ModalDialog(pWindow, SVX_RES(RID_SVXDLG_OBJECT_NAME)), - aFtName(this, SVX_RES(NTD_FT_NAME)), - aEdtName(this, SVX_RES(NTD_EDT_NAME)), - aFlSeparator(this, SVX_RES(FL_SEPARATOR_A)), - aBtnHelp(this, SVX_RES(BTN_HELP)), - aBtnOK(this, SVX_RES(BTN_OK)), - aBtnCancel(this, SVX_RES(BTN_CANCEL)) +: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)), + aFtName(this, CUI_RES(NTD_FT_NAME)), + aEdtName(this, CUI_RES(NTD_EDT_NAME)), + aFlSeparator(this, CUI_RES(FL_SEPARATOR_A)), + aBtnHelp(this, CUI_RES(BTN_HELP)), + aBtnOK(this, CUI_RES(BTN_OK)), + aBtnCancel(this, CUI_RES(BTN_CANCEL)) { FreeResource(); @@ -138,15 +138,15 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( Window* pWindow, const String& rTitle, const String& rDescription) -: ModalDialog(pWindow, SVX_RES(RID_SVXDLG_OBJECT_TITLE_DESC)), - aFtTitle(this, SVX_RES(NTD_FT_TITLE)), - aEdtTitle(this, SVX_RES(NTD_EDT_TITLE)), - aFtDescription(this, SVX_RES(NTD_FT_DESC)), - aEdtDescription(this, SVX_RES(NTD_EDT_DESC)), - aFlSeparator(this, SVX_RES(FL_SEPARATOR_B)), - aBtnHelp(this, SVX_RES(BTN_HELP)), - aBtnOK(this, SVX_RES(BTN_OK)), - aBtnCancel(this, SVX_RES(BTN_CANCEL)) +: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_TITLE_DESC)), + aFtTitle(this, CUI_RES(NTD_FT_TITLE)), + aEdtTitle(this, CUI_RES(NTD_EDT_TITLE)), + aFtDescription(this, CUI_RES(NTD_FT_DESC)), + aEdtDescription(this, CUI_RES(NTD_EDT_DESC)), + aFlSeparator(this, CUI_RES(FL_SEPARATOR_B)), + aBtnHelp(this, CUI_RES(BTN_HELP)), + aBtnOK(this, CUI_RES(BTN_OK)), + aBtnCancel(this, CUI_RES(BTN_CANCEL)) { FreeResource(); @@ -167,11 +167,11 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( \************************************************************************/ SvxMessDialog::SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg ) : - ModalDialog ( pWindow, SVX_RES( RID_SVXDLG_MESSBOX ) ), - aFtDescription ( this, SVX_RES( FT_DESCRIPTION ) ), - aBtn1 ( this, SVX_RES( BTN_1 ) ), - aBtn2 ( this, SVX_RES( BTN_2 ) ), - aBtnCancel ( this, SVX_RES( BTN_CANCEL ) ), + ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_MESSBOX ) ), + aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ), + aBtn1 ( this, CUI_RES( BTN_1 ) ), + aBtn2 ( this, CUI_RES( BTN_2 ) ), + aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ), aFtImage ( this ) { FreeResource(); diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src index 5647bb347e69..93a2e5979671 100644 --- a/cui/source/dialogs/dlgname.src +++ b/cui/source/dialogs/dlgname.src @@ -30,7 +30,7 @@ // include ------------------------------------------------------------------ -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" #include "dlgname.hrc" diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index ba1398d98b59..c01dc4060b6c 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -29,9 +29,10 @@ ************************************************************************/ #include <svtools/controldims.hrc> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" #include "grfflt.hrc" +#include <svx/dialogs.hrc> // -------------------- // - DLG_FILTERMOSAIC - diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 5f062c643443..afef3c1edb5f 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -34,9 +34,9 @@ #include "hangulhanjadlg.hxx" #include "hangulhanjadlg.hrc" #include "commonlingui.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" #include <algorithm> @@ -524,28 +524,28 @@ namespace svx //========================================================================= //------------------------------------------------------------------------- HangulHanjaConversionDialog::HangulHanjaConversionDialog( Window* _pParent, HHC::ConversionDirection _ePrimaryDirection ) - :ModalDialog( _pParent, SVX_RES( RID_SVX_MDLG_HANGULHANJA ) ) + :ModalDialog( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA ) ) ,m_pPlayground( new SvxCommonLinguisticControl( this ) ) - ,m_aFind ( m_pPlayground.get(), SVX_RES( PB_FIND ) ) - ,m_aSuggestions ( m_pPlayground.get(), SVX_RES( CTL_SUGGESTIONS ) ) - ,m_aFormat ( m_pPlayground.get(), SVX_RES( FT_FORMAT ) ) - ,m_aSimpleConversion( m_pPlayground.get(), SVX_RES( RB_SIMPLE_CONVERSION ) ) - ,m_aHangulBracketed ( m_pPlayground.get(), SVX_RES( RB_HANJA_HANGUL_BRACKETED ) ) - ,m_aHanjaBracketed ( m_pPlayground.get(), SVX_RES( RB_HANGUL_HANJA_BRACKETED ) ) - ,m_aConversion ( m_pPlayground.get(), SVX_RES( FT_CONVERSION ) ) - ,m_aHangulOnly ( m_pPlayground.get(), SVX_RES( CB_HANGUL_ONLY ) ) - ,m_aHanjaOnly ( m_pPlayground.get(), SVX_RES( CB_HANJA_ONLY ) ) - ,m_aReplaceByChar ( m_pPlayground.get(), SVX_RES( CB_REPLACE_BY_CHARACTER ) ) + ,m_aFind ( m_pPlayground.get(), CUI_RES( PB_FIND ) ) + ,m_aSuggestions ( m_pPlayground.get(), CUI_RES( CTL_SUGGESTIONS ) ) + ,m_aFormat ( m_pPlayground.get(), CUI_RES( FT_FORMAT ) ) + ,m_aSimpleConversion( m_pPlayground.get(), CUI_RES( RB_SIMPLE_CONVERSION ) ) + ,m_aHangulBracketed ( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_BRACKETED ) ) + ,m_aHanjaBracketed ( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_BRACKETED ) ) + ,m_aConversion ( m_pPlayground.get(), CUI_RES( FT_CONVERSION ) ) + ,m_aHangulOnly ( m_pPlayground.get(), CUI_RES( CB_HANGUL_ONLY ) ) + ,m_aHanjaOnly ( m_pPlayground.get(), CUI_RES( CB_HANJA_ONLY ) ) + ,m_aReplaceByChar ( m_pPlayground.get(), CUI_RES( CB_REPLACE_BY_CHARACTER ) ) ,m_pIgnoreNonPrimary( NULL ) ,m_bDocumentMode( true ) { // special creation of the 4 pseudo-ruby radio buttons - String sSecondaryHangul( SVX_RES( STR_HANGUL ) ); - String sSecondaryHanja( SVX_RES( STR_HANJA ) ); - m_pHanjaAbove.reset( new RubyRadioButton( m_pPlayground.get(), SVX_RES( RB_HANGUL_HANJA_ABOVE ), sSecondaryHanja, PseudoRubyText::eAbove ) ); - m_pHanjaBelow.reset( new RubyRadioButton( m_pPlayground.get(), SVX_RES( RB_HANGUL_HANJA_BELOW ), sSecondaryHanja, PseudoRubyText::eBelow ) ); - m_pHangulAbove.reset( new RubyRadioButton( m_pPlayground.get(), SVX_RES( RB_HANJA_HANGUL_ABOVE ), sSecondaryHangul, PseudoRubyText::eAbove ) ); - m_pHangulBelow.reset( new RubyRadioButton( m_pPlayground.get(), SVX_RES( RB_HANJA_HANGUL_BELOW ), sSecondaryHangul, PseudoRubyText::eBelow ) ); + String sSecondaryHangul( CUI_RES( STR_HANGUL ) ); + String sSecondaryHanja( CUI_RES( STR_HANJA ) ); + m_pHanjaAbove.reset( new RubyRadioButton( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_ABOVE ), sSecondaryHanja, PseudoRubyText::eAbove ) ); + m_pHanjaBelow.reset( new RubyRadioButton( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_BELOW ), sSecondaryHanja, PseudoRubyText::eBelow ) ); + m_pHangulAbove.reset( new RubyRadioButton( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_ABOVE ), sSecondaryHangul, PseudoRubyText::eAbove ) ); + m_pHangulBelow.reset( new RubyRadioButton( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_BELOW ), sSecondaryHangul, PseudoRubyText::eBelow ) ); // since these 4 buttons are not created within the other members, they have a wrong initial Z-Order // correct this @@ -578,7 +578,7 @@ namespace svx // additionall, the playground is not wide enough (in it's default size) sal_Int32 nEnlargeWidth = 0; { - FixedText aBottomAnchor( m_pPlayground.get(), SVX_RES( FT_RESIZE_ANCHOR ) ); + FixedText aBottomAnchor( m_pPlayground.get(), CUI_RES( FT_RESIZE_ANCHOR ) ); Point aAnchorPos = aBottomAnchor.GetPosPixel(); nEnlargeWidth = aAnchorPos.X() - m_pPlayground->GetActionButtonsLocation().X(); @@ -1155,19 +1155,19 @@ namespace svx } HangulHanjaOptionsDialog::HangulHanjaOptionsDialog( Window* _pParent ) - :ModalDialog ( _pParent, SVX_RES( RID_SVX_MDLG_HANGULHANJA_OPT ) ) - ,m_aUserdefdictFT ( this, SVX_RES( FT_USERDEFDICT ) ) - ,m_aDictsLB ( this, SVX_RES( LB_DICTS ) ) - ,m_aOptionsFL ( this, SVX_RES( FL_OPTIONS ) ) - ,m_aIgnorepostCB ( this, SVX_RES( CB_IGNOREPOST ) ) - ,m_aShowrecentlyfirstCB ( this, SVX_RES( CB_SHOWRECENTLYFIRST ) ) - ,m_aAutoreplaceuniqueCB ( this, SVX_RES( CB_AUTOREPLACEUNIQUE ) ) - ,m_aNewPB ( this, SVX_RES( PB_HHO_NEW ) ) - ,m_aEditPB ( this, SVX_RES( PB_HHO_EDIT ) ) - ,m_aDeletePB ( this, SVX_RES( PB_HHO_DELETE ) ) - ,m_aOkPB ( this, SVX_RES( PB_HHO_OK ) ) - ,m_aCancelPB ( this, SVX_RES( PB_HHO_CANCEL ) ) - ,m_aHelpPB ( this, SVX_RES( PB_HHO_HELP ) ) + :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_OPT ) ) + ,m_aUserdefdictFT ( this, CUI_RES( FT_USERDEFDICT ) ) + ,m_aDictsLB ( this, CUI_RES( LB_DICTS ) ) + ,m_aOptionsFL ( this, CUI_RES( FL_OPTIONS ) ) + ,m_aIgnorepostCB ( this, CUI_RES( CB_IGNOREPOST ) ) + ,m_aShowrecentlyfirstCB ( this, CUI_RES( CB_SHOWRECENTLYFIRST ) ) + ,m_aAutoreplaceuniqueCB ( this, CUI_RES( CB_AUTOREPLACEUNIQUE ) ) + ,m_aNewPB ( this, CUI_RES( PB_HHO_NEW ) ) + ,m_aEditPB ( this, CUI_RES( PB_HHO_EDIT ) ) + ,m_aDeletePB ( this, CUI_RES( PB_HHO_DELETE ) ) + ,m_aOkPB ( this, CUI_RES( PB_HHO_OK ) ) + ,m_aCancelPB ( this, CUI_RES( PB_HHO_CANCEL ) ) + ,m_aHelpPB ( this, CUI_RES( PB_HHO_HELP ) ) ,m_pCheckButtonData ( NULL ) ,m_xConversionDictionaryList( NULL ) @@ -1256,13 +1256,13 @@ namespace svx } HangulHanjaNewDictDialog::HangulHanjaNewDictDialog( Window* _pParent ) - :ModalDialog ( _pParent, SVX_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT ) ) - ,m_aNewDictFL ( this, SVX_RES( FL_NEWDICT ) ) - ,m_aDictNameFT ( this, SVX_RES( FT_DICTNAME ) ) - ,m_aDictNameED ( this, SVX_RES( ED_DICTNAME ) ) - ,m_aOkBtn ( this, SVX_RES( PB_NEWDICT_OK ) ) - ,m_aCancelBtn ( this, SVX_RES( PB_NEWDICT_ESC ) ) - ,m_aHelpBtn ( this, SVX_RES( PB_NEWDICT_HLP ) ) + :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT ) ) + ,m_aNewDictFL ( this, CUI_RES( FL_NEWDICT ) ) + ,m_aDictNameFT ( this, CUI_RES( FT_DICTNAME ) ) + ,m_aDictNameED ( this, CUI_RES( ED_DICTNAME ) ) + ,m_aOkBtn ( this, CUI_RES( PB_NEWDICT_OK ) ) + ,m_aCancelBtn ( this, CUI_RES( PB_NEWDICT_ESC ) ) + ,m_aHelpBtn ( this, CUI_RES( PB_NEWDICT_HLP ) ) ,m_bEntered ( false ) { @@ -1825,25 +1825,25 @@ namespace svx } HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ) - :ModalDialog ( _pParent, SVX_RES( RID_SVX_MDLG_HANGULHANJA_EDIT ) ) - ,m_aEditHintText ( SVX_RES( STR_EDITHINT ) ) + :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_EDIT ) ) + ,m_aEditHintText ( CUI_RES( STR_EDITHINT ) ) ,m_rDictList ( _rDictList ) ,m_nCurrentDict ( 0xFFFFFFFF ) ,m_pSuggestions ( NULL ) - ,m_aBookFT ( this, SVX_RES( FT_BOOK ) ) - ,m_aBookLB ( this, SVX_RES( LB_BOOK ) ) - ,m_aOriginalFT ( this, SVX_RES( FT_ORIGINAL ) ) - ,m_aOriginalLB ( this, SVX_RES( LB_ORIGINAL ) ) - ,m_aSuggestionsFT ( this, SVX_RES( FT_SUGGESTIONS ) ) - ,m_aEdit1 ( this, SVX_RES( ED_1 ), m_aScrollSB, NULL, &m_aEdit2 ) - ,m_aEdit2 ( this, SVX_RES( ED_2 ), m_aScrollSB, &m_aEdit1, &m_aEdit3 ) - ,m_aEdit3 ( this, SVX_RES( ED_3 ), m_aScrollSB, &m_aEdit2, &m_aEdit4 ) - ,m_aEdit4 ( this, SVX_RES( ED_4 ), m_aScrollSB, &m_aEdit3, NULL ) - ,m_aScrollSB ( this, SVX_RES( SB_SCROLL ) ) - ,m_aNewPB ( this, SVX_RES( PB_HHE_NEW ) ) - ,m_aDeletePB ( this, SVX_RES( PB_HHE_DELETE ) ) - ,m_aHelpPB ( this, SVX_RES( PB_HHE_HELP ) ) - ,m_aClosePB ( this, SVX_RES( PB_HHE_CLOSE ) ) + ,m_aBookFT ( this, CUI_RES( FT_BOOK ) ) + ,m_aBookLB ( this, CUI_RES( LB_BOOK ) ) + ,m_aOriginalFT ( this, CUI_RES( FT_ORIGINAL ) ) + ,m_aOriginalLB ( this, CUI_RES( LB_ORIGINAL ) ) + ,m_aSuggestionsFT ( this, CUI_RES( FT_SUGGESTIONS ) ) + ,m_aEdit1 ( this, CUI_RES( ED_1 ), m_aScrollSB, NULL, &m_aEdit2 ) + ,m_aEdit2 ( this, CUI_RES( ED_2 ), m_aScrollSB, &m_aEdit1, &m_aEdit3 ) + ,m_aEdit3 ( this, CUI_RES( ED_3 ), m_aScrollSB, &m_aEdit2, &m_aEdit4 ) + ,m_aEdit4 ( this, CUI_RES( ED_4 ), m_aScrollSB, &m_aEdit3, NULL ) + ,m_aScrollSB ( this, CUI_RES( SB_SCROLL ) ) + ,m_aNewPB ( this, CUI_RES( PB_HHE_NEW ) ) + ,m_aDeletePB ( this, CUI_RES( PB_HHE_DELETE ) ) + ,m_aHelpPB ( this, CUI_RES( PB_HHE_HELP ) ) + ,m_aClosePB ( this, CUI_RES( PB_HHE_CLOSE ) ) ,m_nTopPos ( 0 ) ,m_bModifiedSuggestions ( false ) ,m_bModifiedOriginal ( false ) diff --git a/cui/source/dialogs/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src index 920f99e03aec..93d58755b14b 100644 --- a/cui/source/dialogs/hangulhanjadlg.src +++ b/cui/source/dialogs/hangulhanjadlg.src @@ -27,7 +27,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" #ifndef SVX_HANGUL_HANJA_DLG_HRC diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 3c7b14d476ed..0a2dfa9955f5 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -115,18 +115,18 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const String& rPath, const Stri |************************************************************************/ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& rItemSet) -: SvxHyperlinkTabPageBase ( pParent, SVX_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ), - maGrpNewDoc ( this, SVX_RES (GRP_NEWDOCUMENT) ), - maRbtEditNow ( this, SVX_RES (RB_EDITNOW) ), - maRbtEditLater ( this, SVX_RES (RB_EDITLATER) ), - maFtPath ( this, SVX_RES (FT_PATH_NEWDOC) ), +: SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ), + maGrpNewDoc ( this, CUI_RES (GRP_NEWDOCUMENT) ), + maRbtEditNow ( this, CUI_RES (RB_EDITNOW) ), + maRbtEditLater ( this, CUI_RES (RB_EDITLATER) ), + maFtPath ( this, CUI_RES (FT_PATH_NEWDOC) ), maCbbPath ( this, INET_PROT_FILE ), - maBtCreate ( this, SVX_RES (BTN_CREATE) ), - maFtDocTypes ( this, SVX_RES (FT_DOCUMENT_TYPES) ), - maLbDocTypes ( this, SVX_RES (LB_DOCUMENT_TYPES) ) + maBtCreate ( this, CUI_RES (BTN_CREATE) ), + maFtDocTypes ( this, CUI_RES (FT_DOCUMENT_TYPES) ), + maLbDocTypes ( this, CUI_RES (LB_DOCUMENT_TYPES) ) { // Set HC bitmaps and disable display of bitmap names. - maBtCreate.SetModeImage( Image( SVX_RES( IMG_CREATE_HC ) ), BMP_COLOR_HIGHCONTRAST ); + maBtCreate.SetModeImage( Image( CUI_RES( IMG_CREATE_HC ) ), BMP_COLOR_HIGHCONTRAST ); maBtCreate.EnableTextDisplay (FALSE); InitStdControls(); @@ -319,7 +319,7 @@ BOOL SvxHyperlinkNewDocTp::AskApply() sal_Bool bRet = ImplGetURLObject( maCbbPath.GetText(), maCbbPath.GetBaseURL(), aINetURLObject ); if ( !bRet ) { - WarningBox aWarning( this, WB_OK, SVX_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) ); + WarningBox aWarning( this, WB_OK, CUI_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) ); aWarning.Execute(); } return bRet; @@ -369,7 +369,7 @@ void SvxHyperlinkNewDocTp::DoApply () if( bOk ) { - WarningBox aWarning( this, WB_YES_NO, SVX_RESSTR(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) ); + WarningBox aWarning( this, WB_YES_NO, CUI_RESSTR(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) ); bCreate = aWarning.Execute() == BUTTON_YES; } } diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 229b30818184..1f4689c33fff 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -54,23 +54,23 @@ sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME; |************************************************************************/ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemSet) - : SvxHyperlinkTabPageBase ( pParent, SVX_RES( RID_SVXPAGE_HYPERLINK_DOCUMENT ), rItemSet ), - maGrpDocument ( this, SVX_RES (GRP_DOCUMENT) ), - maFtPath ( this, SVX_RES (FT_PATH_DOC) ), + : SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_DOCUMENT ), rItemSet ), + maGrpDocument ( this, CUI_RES (GRP_DOCUMENT) ), + maFtPath ( this, CUI_RES (FT_PATH_DOC) ), maCbbPath ( this, INET_PROT_FILE ), - maBtFileopen ( this, SVX_RES (BTN_FILEOPEN) ), - maGrpTarget ( this, SVX_RES (GRP_TARGET) ), - maFtTarget ( this, SVX_RES (FT_TARGET_DOC) ), - maEdTarget ( this, SVX_RES (ED_TARGET_DOC) ), - maFtURL ( this, SVX_RES (FT_URL) ), - maFtFullURL ( this, SVX_RES (FT_FULL_URL) ), - maBtBrowse ( this, SVX_RES (BTN_BROWSE) ), + maBtFileopen ( this, CUI_RES (BTN_FILEOPEN) ), + maGrpTarget ( this, CUI_RES (GRP_TARGET) ), + maFtTarget ( this, CUI_RES (FT_TARGET_DOC) ), + maEdTarget ( this, CUI_RES (ED_TARGET_DOC) ), + maFtURL ( this, CUI_RES (FT_URL) ), + maFtFullURL ( this, CUI_RES (FT_FULL_URL) ), + maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), mbMarkWndOpen ( FALSE ) { // Set HC bitmaps and disable display of bitmap names. - maBtBrowse.SetModeImage( Image( SVX_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST ); + maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST ); maBtBrowse.EnableTextDisplay (FALSE); - maBtFileopen.SetModeImage( Image( SVX_RES( IMG_FILEOPEN_HC ) ), BMP_COLOR_HIGHCONTRAST ); + maBtFileopen.SetModeImage( Image( CUI_RES( IMG_FILEOPEN_HC ) ), BMP_COLOR_HIGHCONTRAST ); maBtFileopen.EnableTextDisplay (FALSE); InitStdControls(); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 8b967298eb8e..ef0a330f00ef 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -56,27 +56,27 @@ sal_Char __READONLY_DATA sTelnetScheme[] = INET_TELNET_SCHEME; SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, const SfxItemSet& rItemSet) -: SvxHyperlinkTabPageBase ( pParent, SVX_RES( RID_SVXPAGE_HYPERLINK_INTERNET ), +: SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_INTERNET ), rItemSet ) , - maGrpLinkTyp ( this, SVX_RES (GRP_LINKTYPE) ), - maRbtLinktypInternet ( this, SVX_RES (RB_LINKTYP_INTERNET) ), - maRbtLinktypFTP ( this, SVX_RES (RB_LINKTYP_FTP) ), - maRbtLinktypTelnet ( this, SVX_RES (RB_LINKTYP_TELNET) ), - maFtTarget ( this, SVX_RES (FT_TARGET_HTML) ), + maGrpLinkTyp ( this, CUI_RES (GRP_LINKTYPE) ), + maRbtLinktypInternet ( this, CUI_RES (RB_LINKTYP_INTERNET) ), + maRbtLinktypFTP ( this, CUI_RES (RB_LINKTYP_FTP) ), + maRbtLinktypTelnet ( this, CUI_RES (RB_LINKTYP_TELNET) ), + maFtTarget ( this, CUI_RES (FT_TARGET_HTML) ), maCbbTarget ( this, INET_PROT_HTTP ), - maFtLogin ( this, SVX_RES (FT_LOGIN) ), - maEdLogin ( this, SVX_RES (ED_LOGIN) ), - maFtPassword ( this, SVX_RES (FT_PASSWD) ), - maEdPassword ( this, SVX_RES (ED_PASSWD) ), - maCbAnonymous ( this, SVX_RES (CBX_ANONYMOUS) ), - maBtBrowse ( this, SVX_RES (BTN_BROWSE) ), - maBtTarget ( this, SVX_RES (BTN_TARGET) ), + maFtLogin ( this, CUI_RES (FT_LOGIN) ), + maEdLogin ( this, CUI_RES (ED_LOGIN) ), + maFtPassword ( this, CUI_RES (FT_PASSWD) ), + maEdPassword ( this, CUI_RES (ED_PASSWD) ), + maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ), + maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), + maBtTarget ( this, CUI_RES (BTN_TARGET) ), mbMarkWndOpen ( FALSE ) { // Set HC bitmaps and display display of bitmap names. - maBtBrowse.SetModeImage( Image( SVX_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST ); + maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST ); maBtBrowse.EnableTextDisplay (FALSE); - maBtTarget.SetModeImage( Image( SVX_RES( IMG_TARGET_HC ) ), BMP_COLOR_HIGHCONTRAST ); + maBtTarget.SetModeImage( Image( CUI_RES( IMG_TARGET_HC ) ), BMP_COLOR_HIGHCONTRAST ); maBtTarget.EnableTextDisplay (FALSE); InitStdControls(); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 78ed448e3884..389fb20bf48b 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -54,19 +54,19 @@ using namespace ::com::sun::star; |************************************************************************/ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rItemSet) -: SvxHyperlinkTabPageBase ( pParent, SVX_RES( RID_SVXPAGE_HYPERLINK_MAIL ), +: SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_MAIL ), rItemSet ), - maGrpMailNews ( this, SVX_RES (GRP_MAILNEWS) ), - maRbtMail ( this, SVX_RES (RB_LINKTYP_MAIL) ), - maRbtNews ( this, SVX_RES (RB_LINKTYP_NEWS) ), - maFtReceiver ( this, SVX_RES (FT_RECEIVER) ), + maGrpMailNews ( this, CUI_RES (GRP_MAILNEWS) ), + maRbtMail ( this, CUI_RES (RB_LINKTYP_MAIL) ), + maRbtNews ( this, CUI_RES (RB_LINKTYP_NEWS) ), + maFtReceiver ( this, CUI_RES (FT_RECEIVER) ), maCbbReceiver ( this, INET_PROT_MAILTO ), - maBtAdrBook ( this, SVX_RES (BTN_ADRESSBOOK) ), - maFtSubject ( this, SVX_RES (FT_SUBJECT) ), - maEdSubject ( this, SVX_RES (ED_SUBJECT) ) + maBtAdrBook ( this, CUI_RES (BTN_ADRESSBOOK) ), + maFtSubject ( this, CUI_RES (FT_SUBJECT) ), + maEdSubject ( this, CUI_RES (ED_SUBJECT) ) { // Set HC bitmaps and disable display of bitmap names. - maBtAdrBook.SetModeImage( Image( SVX_RES( IMG_ADRESSBOOK_HC ) ), BMP_COLOR_HIGHCONTRAST ); + maBtAdrBook.SetModeImage( Image( CUI_RES( IMG_ADRESSBOOK_HC ) ), BMP_COLOR_HIGHCONTRAST ); maBtAdrBook.EnableTextDisplay (FALSE); InitStdControls(); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 608dc613eea7..f5005dbedfd7 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -32,7 +32,7 @@ #include "precompiled_cui.hxx" #include <vcl/wrkwin.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <sfx2/docfile.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -49,7 +49,7 @@ #include <toolkit/unohlp.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "hlmarkwn.hrc" #include "hlmarkwn.hxx" #include "hltpbase.hxx" @@ -107,10 +107,10 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect ) switch( mpParentWnd->mnError ) { case LERR_NOENTRIES : - aStrMessage = SVX_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES ); + aStrMessage = CUI_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES ); break; case LERR_DOCNOTOPEN : - aStrMessage = SVX_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN ); + aStrMessage = CUI_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN ); break; } @@ -132,10 +132,10 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect ) |************************************************************************/ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent ) -: ModalDialog( (Window*)pParent, SVX_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ), - maBtApply( this, SVX_RES (BT_APPLY) ), - maBtClose( this, SVX_RES (BT_CLOSE) ), - maLbTree ( this, SVX_RES (TLB_MARK) ), +: ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ), + maBtApply( this, CUI_RES (BT_APPLY) ), + maBtClose( this, CUI_RES (BT_CLOSE) ), + maLbTree ( this, CUI_RES (TLB_MARK) ), mbUserMoved ( FALSE ), mbFirst ( TRUE ), mpParent ( pParent ), diff --git a/cui/source/dialogs/hlmarkwn.src b/cui/source/dialogs/hlmarkwn.src index 4618ee6c9549..48bf6d40fcb6 100644 --- a/cui/source/dialogs/hlmarkwn.src +++ b/cui/source/dialogs/hlmarkwn.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" #include "hlmarkwn.hrc" diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 77a98602c408..8ee78806ab0e 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -43,7 +43,7 @@ #include "hltpbase.hxx" #include "macroass.hxx" #include <svx/svxdlg.hxx> //CHINA001 -#include <svx/dialogs.hrc> //CHINA001 +#include <cuires.hrc> //CHINA001 using namespace ::ucbhelper; @@ -440,8 +440,8 @@ void SvxHyperlinkTabPageBase::FillStandardDlgFields ( SvxHyperlinkItem* pHyperli mpCbbFrame->SetText ( pHyperlinkItem->GetTargetFrame() ); // Form - String aStrFormText = SVX_RESSTR( RID_SVXSTR_HYPERDLG_FROM_TEXT ); - String aStrFormButton = SVX_RESSTR( RID_SVXSTR_HYPERDLG_FORM_BUTTON ); + String aStrFormText = CUI_RESSTR( RID_SVXSTR_HYPERDLG_FROM_TEXT ); + String aStrFormButton = CUI_RESSTR( RID_SVXSTR_HYPERDLG_FORM_BUTTON ); if( pHyperlinkItem->GetInsertMode() & HLINK_HTMLMODE ) { @@ -589,13 +589,13 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG ) SfxMacroTabPage *pMacroPage = (SfxMacroTabPage*) aDlg.GetTabPage(); if ( pHyperlinkItem->GetMacroEvents() & HYPERDLG_EVENT_MOUSEOVER_OBJECT ) - pMacroPage->AddEvent( String( SVX_RESSTR(RID_SVXSTR_HYPDLG_MACROACT1) ), + pMacroPage->AddEvent( String( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT1) ), SFX_EVENT_MOUSEOVER_OBJECT ); if ( pHyperlinkItem->GetMacroEvents() & HYPERDLG_EVENT_MOUSECLICK_OBJECT ) - pMacroPage->AddEvent( String( SVX_RESSTR(RID_SVXSTR_HYPDLG_MACROACT2) ), + pMacroPage->AddEvent( String( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT2) ), SFX_EVENT_MOUSECLICK_OBJECT); if ( pHyperlinkItem->GetMacroEvents() & HYPERDLG_EVENT_MOUSEOUT_OBJECT ) - pMacroPage->AddEvent( String( SVX_RESSTR(RID_SVXSTR_HYPDLG_MACROACT3) ), + pMacroPage->AddEvent( String( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT3) ), SFX_EVENT_MOUSEOUT_OBJECT); // --> PB 2006-01-13 #123474# diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index 9375ac96ba09..4811fa4662e6 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -29,7 +29,7 @@ ************************************************************************/ #include <svtools/controldims.hrc> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "helpid.hrc" #include "hyperdlg.hrc" diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index fdba34fec1df..95f49308acb4 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -37,12 +37,12 @@ #define _SVSTDARR_USHORTS #include <svl/svstdarr.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "iconcdlg.hxx" #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include <unotools/viewoptions.hxx> #include <svtools/apearcfg.hxx> #include <vcl/mnemonic.hxx> @@ -317,7 +317,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, aOKBtn.SetHelpId( HID_ICCDIALOG_OK_BTN ); aCancelBtn.SetHelpId( HID_ICCDIALOG_CANCEL_BTN ); aResetBtn.SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) ); - aResetBtn.SetText( SVX_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) ); + aResetBtn.SetText( CUI_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) ); aResetBtn.SetHelpId( HID_ICCDIALOG_RESET_BTN ); aOKBtn.Show(); aCancelBtn.Show(); diff --git a/cui/source/dialogs/iconcdlg.src b/cui/source/dialogs/iconcdlg.src index 1594eb43a8c7..83c8b8825aaf 100644 --- a/cui/source/dialogs/iconcdlg.src +++ b/cui/source/dialogs/iconcdlg.src @@ -27,7 +27,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include <svx/dialogs.hrc> +#include <cuires.hrc> String RID_SVXSTR_ICONCHOICEDLG_RESETBUT { diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index ae16447904d6..3bbcf25643e0 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include "insdlg.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <svtools/sores.hxx> #include <stdio.h> @@ -211,18 +211,18 @@ SvInsertOleDlg::SvInsertOleDlg const Reference < embed::XStorage >& xStorage, const SvObjectServerList* pServers ) - : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OLEOBJECT ), xStorage ), - aRbNewObject( this, SVX_RES( RB_NEW_OBJECT ) ), - aRbObjectFromfile( this, SVX_RES( RB_OBJECT_FROMFILE ) ), - aLbObjecttype( this, SVX_RES( LB_OBJECTTYPE ) ), - aEdFilepath( this, SVX_RES( ED_FILEPATH ) ), - aBtnFilepath( this, SVX_RES( BTN_FILEPATH ) ), - aCbFilelink( this, SVX_RES( CB_FILELINK ) ), - aGbObject( this, SVX_RES( GB_OBJECT ) ), - aOKButton1( this, SVX_RES( 1 ) ), - aCancelButton1( this, SVX_RES( 1 ) ), - aHelpButton1( this, SVX_RES( 1 ) ), - aStrFile( SVX_RES( STR_FILE ) ), + : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OLEOBJECT ), xStorage ), + aRbNewObject( this, CUI_RES( RB_NEW_OBJECT ) ), + aRbObjectFromfile( this, CUI_RES( RB_OBJECT_FROMFILE ) ), + aLbObjecttype( this, CUI_RES( LB_OBJECTTYPE ) ), + aEdFilepath( this, CUI_RES( ED_FILEPATH ) ), + aBtnFilepath( this, CUI_RES( BTN_FILEPATH ) ), + aCbFilelink( this, CUI_RES( CB_FILELINK ) ), + aGbObject( this, CUI_RES( GB_OBJECT ) ), + aOKButton1( this, CUI_RES( 1 ) ), + aCancelButton1( this, CUI_RES( 1 ) ), + aHelpButton1( this, CUI_RES( 1 ) ), + aStrFile( CUI_RES( STR_FILE ) ), m_pServers( pServers ) { FreeResource(); @@ -456,15 +456,15 @@ IMPL_LINK( SvInsertPlugInDialog, BrowseHdl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- SvInsertPlugInDialog::SvInsertPlugInDialog( Window* pParent, const uno::Reference < embed::XStorage >& xStorage ) - : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_PLUGIN ), xStorage ), - aEdFileurl( this, SVX_RES( ED_FILEURL ) ), - aBtnFileurl( this, SVX_RES( BTN_FILEURL ) ), - aGbFileurl( this, SVX_RES( GB_FILEURL ) ), - aEdPluginsOptions( this, SVX_RES( ED_PLUGINS_OPTIONS ) ), - aGbPluginsOptions( this, SVX_RES( GB_PLUGINS_OPTIONS ) ), - aOKButton1( this, SVX_RES( 1 ) ), - aCancelButton1( this, SVX_RES( 1 ) ), - aHelpButton1( this, SVX_RES( 1 ) ), + : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_PLUGIN ), xStorage ), + aEdFileurl( this, CUI_RES( ED_FILEURL ) ), + aBtnFileurl( this, CUI_RES( BTN_FILEURL ) ), + aGbFileurl( this, CUI_RES( GB_FILEURL ) ), + aEdPluginsOptions( this, CUI_RES( ED_PLUGINS_OPTIONS ) ), + aGbPluginsOptions( this, CUI_RES( GB_PLUGINS_OPTIONS ) ), + aOKButton1( this, CUI_RES( 1 ) ), + aCancelButton1( this, CUI_RES( 1 ) ), + aHelpButton1( this, CUI_RES( 1 ) ), m_pURL(0) { FreeResource(); @@ -600,18 +600,18 @@ IMPL_LINK( SvInsertAppletDialog, BrowseHdl, PushButton *, EMPTYARG ) // ----------------------------------------------------------------------- SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Reference < embed::XStorage >& xStorage ) - : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_APPLET ), xStorage ), - aFtClassfile( this, SVX_RES( FT_CLASSFILE ) ), - aEdClassfile( this, SVX_RES( ED_CLASSFILE ) ), - aFtClasslocation( this, SVX_RES( FT_CLASSLOCATION ) ), - aEdClasslocation( this, SVX_RES( ED_CLASSLOCATION ) ), - aBtnClass( this, SVX_RES( BTN_CLASS ) ), - aGbClass( this, SVX_RES( GB_CLASS ) ), - aEdAppletOptions( this, SVX_RES( ED_APPLET_OPTIONS ) ), - aGbAppletOptions( this, SVX_RES( GB_APPLET_OPTIONS ) ), - aOKButton1( this, SVX_RES( 1 ) ), - aCancelButton1( this, SVX_RES( 1 ) ), - aHelpButton1( this, SVX_RES( 1 ) ), + : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_APPLET ), xStorage ), + aFtClassfile( this, CUI_RES( FT_CLASSFILE ) ), + aEdClassfile( this, CUI_RES( ED_CLASSFILE ) ), + aFtClasslocation( this, CUI_RES( FT_CLASSLOCATION ) ), + aEdClasslocation( this, CUI_RES( ED_CLASSLOCATION ) ), + aBtnClass( this, CUI_RES( BTN_CLASS ) ), + aGbClass( this, CUI_RES( GB_CLASS ) ), + aEdAppletOptions( this, CUI_RES( ED_APPLET_OPTIONS ) ), + aGbAppletOptions( this, CUI_RES( GB_APPLET_OPTIONS ) ), + aOKButton1( this, CUI_RES( 1 ) ), + aCancelButton1( this, CUI_RES( 1 ) ), + aHelpButton1( this, CUI_RES( 1 ) ), m_pURL(0) { FreeResource(); @@ -619,18 +619,18 @@ SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Referenc } SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Reference < embed::XEmbeddedObject >& xObj ) - : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_APPLET ), uno::Reference < embed::XStorage >() ), - aFtClassfile( this, SVX_RES( FT_CLASSFILE ) ), - aEdClassfile( this, SVX_RES( ED_CLASSFILE ) ), - aFtClasslocation( this, SVX_RES( FT_CLASSLOCATION ) ), - aEdClasslocation( this, SVX_RES( ED_CLASSLOCATION ) ), - aBtnClass( this, SVX_RES( BTN_CLASS ) ), - aGbClass( this, SVX_RES( GB_CLASS ) ), - aEdAppletOptions( this, SVX_RES( ED_APPLET_OPTIONS ) ), - aGbAppletOptions( this, SVX_RES( GB_APPLET_OPTIONS ) ), - aOKButton1( this, SVX_RES( 1 ) ), - aCancelButton1( this, SVX_RES( 1 ) ), - aHelpButton1( this, SVX_RES( 1 ) ), + : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_APPLET ), uno::Reference < embed::XStorage >() ), + aFtClassfile( this, CUI_RES( FT_CLASSFILE ) ), + aEdClassfile( this, CUI_RES( ED_CLASSFILE ) ), + aFtClasslocation( this, CUI_RES( FT_CLASSLOCATION ) ), + aEdClasslocation( this, CUI_RES( ED_CLASSLOCATION ) ), + aBtnClass( this, CUI_RES( BTN_CLASS ) ), + aGbClass( this, CUI_RES( GB_CLASS ) ), + aEdAppletOptions( this, CUI_RES( ED_APPLET_OPTIONS ) ), + aGbAppletOptions( this, CUI_RES( GB_APPLET_OPTIONS ) ), + aOKButton1( this, CUI_RES( 1 ) ), + aCancelButton1( this, CUI_RES( 1 ) ), + aHelpButton1( this, CUI_RES( 1 ) ), m_pURL(0) { m_xObj = xObj; @@ -675,7 +675,7 @@ short SvInsertAppletDialog::Execute() SetAppletOptions( aList.GetCommands() ); } - String aText( SVX_RES( STR_EDIT_APPLET ) ); + String aText( CUI_RES( STR_EDIT_APPLET ) ); SetText( aText ); bOK = TRUE; } @@ -741,31 +741,31 @@ short SvInsertAppletDialog::Execute() SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ) - : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_IFRAME ), xStorage ) - , aFTName ( this, SVX_RES( FT_FRAMENAME ) ) - , aEDName ( this, SVX_RES( ED_FRAMENAME ) ) - , aFTURL ( this, SVX_RES( FT_URL ) ) - , aEDURL ( this, SVX_RES( ED_URL ) ) - , aBTOpen ( this, SVX_RES(BT_FILEOPEN ) ) - , aRBScrollingOn ( this, SVX_RES( RB_SCROLLINGON ) ) - , aRBScrollingOff ( this, SVX_RES( RB_SCROLLINGOFF ) ) - , aRBScrollingAuto ( this, SVX_RES( RB_SCROLLINGAUTO ) ) - , aFLScrolling ( this, SVX_RES( GB_SCROLLING ) ) - , aFLSepLeft( this, SVX_RES( FL_SEP_LEFT ) ) - , aRBFrameBorderOn ( this, SVX_RES( RB_FRMBORDER_ON ) ) - , aRBFrameBorderOff ( this, SVX_RES( RB_FRMBORDER_OFF ) ) - , aFLFrameBorder( this, SVX_RES( GB_BORDER ) ) - , aFLSepRight( this, SVX_RES( FL_SEP_RIGHT ) ) - , aFTMarginWidth ( this, SVX_RES( FT_MARGINWIDTH ) ) - , aNMMarginWidth ( this, SVX_RES( NM_MARGINWIDTH ) ) - , aCBMarginWidthDefault( this, SVX_RES( CB_MARGINHEIGHTDEFAULT ) ) - , aFTMarginHeight ( this, SVX_RES( FT_MARGINHEIGHT ) ) - , aNMMarginHeight ( this, SVX_RES( NM_MARGINHEIGHT ) ) - , aCBMarginHeightDefault( this, SVX_RES( CB_MARGINHEIGHTDEFAULT ) ) - , aFLMargin( this, SVX_RES( GB_MARGIN ) ) - , aOKButton1( this, SVX_RES( 1 ) ) - , aCancelButton1( this, SVX_RES( 1 ) ) - , aHelpButton1( this, SVX_RES( 1 ) ) + : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_IFRAME ), xStorage ) + , aFTName ( this, CUI_RES( FT_FRAMENAME ) ) + , aEDName ( this, CUI_RES( ED_FRAMENAME ) ) + , aFTURL ( this, CUI_RES( FT_URL ) ) + , aEDURL ( this, CUI_RES( ED_URL ) ) + , aBTOpen ( this, CUI_RES(BT_FILEOPEN ) ) + , aRBScrollingOn ( this, CUI_RES( RB_SCROLLINGON ) ) + , aRBScrollingOff ( this, CUI_RES( RB_SCROLLINGOFF ) ) + , aRBScrollingAuto ( this, CUI_RES( RB_SCROLLINGAUTO ) ) + , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) ) + , aFLSepLeft( this, CUI_RES( FL_SEP_LEFT ) ) + , aRBFrameBorderOn ( this, CUI_RES( RB_FRMBORDER_ON ) ) + , aRBFrameBorderOff ( this, CUI_RES( RB_FRMBORDER_OFF ) ) + , aFLFrameBorder( this, CUI_RES( GB_BORDER ) ) + , aFLSepRight( this, CUI_RES( FL_SEP_RIGHT ) ) + , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) ) + , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) ) + , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) ) + , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) ) + , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) ) + , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) ) + , aFLMargin( this, CUI_RES( GB_MARGIN ) ) + , aOKButton1( this, CUI_RES( 1 ) ) + , aCancelButton1( this, CUI_RES( 1 ) ) + , aHelpButton1( this, CUI_RES( 1 ) ) { FreeResource(); @@ -785,31 +785,31 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, } SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, const uno::Reference < embed::XEmbeddedObject >& xObj ) - : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_IFRAME ), uno::Reference < embed::XStorage >() ) - , aFTName ( this, SVX_RES( FT_FRAMENAME ) ) - , aEDName ( this, SVX_RES( ED_FRAMENAME ) ) - , aFTURL ( this, SVX_RES( FT_URL ) ) - , aEDURL ( this, SVX_RES( ED_URL ) ) - , aBTOpen ( this, SVX_RES(BT_FILEOPEN ) ) - , aRBScrollingOn ( this, SVX_RES( RB_SCROLLINGON ) ) - , aRBScrollingOff ( this, SVX_RES( RB_SCROLLINGOFF ) ) - , aRBScrollingAuto ( this, SVX_RES( RB_SCROLLINGAUTO ) ) - , aFLScrolling ( this, SVX_RES( GB_SCROLLING ) ) - , aFLSepLeft( this, SVX_RES( FL_SEP_LEFT ) ) - , aRBFrameBorderOn ( this, SVX_RES( RB_FRMBORDER_ON ) ) - , aRBFrameBorderOff ( this, SVX_RES( RB_FRMBORDER_OFF ) ) - , aFLFrameBorder( this, SVX_RES( GB_BORDER ) ) - , aFLSepRight( this, SVX_RES( FL_SEP_RIGHT ) ) - , aFTMarginWidth ( this, SVX_RES( FT_MARGINWIDTH ) ) - , aNMMarginWidth ( this, SVX_RES( NM_MARGINWIDTH ) ) - , aCBMarginWidthDefault( this, SVX_RES( CB_MARGINHEIGHTDEFAULT ) ) - , aFTMarginHeight ( this, SVX_RES( FT_MARGINHEIGHT ) ) - , aNMMarginHeight ( this, SVX_RES( NM_MARGINHEIGHT ) ) - , aCBMarginHeightDefault( this, SVX_RES( CB_MARGINHEIGHTDEFAULT ) ) - , aFLMargin( this, SVX_RES( GB_MARGIN ) ) - , aOKButton1( this, SVX_RES( 1 ) ) - , aCancelButton1( this, SVX_RES( 1 ) ) - , aHelpButton1( this, SVX_RES( 1 ) ) + : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_IFRAME ), uno::Reference < embed::XStorage >() ) + , aFTName ( this, CUI_RES( FT_FRAMENAME ) ) + , aEDName ( this, CUI_RES( ED_FRAMENAME ) ) + , aFTURL ( this, CUI_RES( FT_URL ) ) + , aEDURL ( this, CUI_RES( ED_URL ) ) + , aBTOpen ( this, CUI_RES(BT_FILEOPEN ) ) + , aRBScrollingOn ( this, CUI_RES( RB_SCROLLINGON ) ) + , aRBScrollingOff ( this, CUI_RES( RB_SCROLLINGOFF ) ) + , aRBScrollingAuto ( this, CUI_RES( RB_SCROLLINGAUTO ) ) + , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) ) + , aFLSepLeft( this, CUI_RES( FL_SEP_LEFT ) ) + , aRBFrameBorderOn ( this, CUI_RES( RB_FRMBORDER_ON ) ) + , aRBFrameBorderOff ( this, CUI_RES( RB_FRMBORDER_OFF ) ) + , aFLFrameBorder( this, CUI_RES( GB_BORDER ) ) + , aFLSepRight( this, CUI_RES( FL_SEP_RIGHT ) ) + , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) ) + , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) ) + , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) ) + , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) ) + , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) ) + , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) ) + , aFLMargin( this, CUI_RES( GB_MARGIN ) ) + , aOKButton1( this, CUI_RES( 1 ) ) + , aCancelButton1( this, CUI_RES( 1 ) ) + , aHelpButton1( this, CUI_RES( 1 ) ) { FreeResource(); @@ -1047,7 +1047,7 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG ) sfx2::FileDialogHelper aFileDlg( WB_OPEN | SFXWB_PASSWORD, String() ); // set the title - aFileDlg.SetTitle( OUString( String( SVX_RES( MD_INSERT_OBJECT_IFRAME ) ) ) ); + aFileDlg.SetTitle( OUString( String( CUI_RES( MD_INSERT_OBJECT_IFRAME ) ) ) ); // show the dialog if ( aFileDlg.Execute() == ERRCODE_NONE ) diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index b28f005d56f7..270a36202c90 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -31,9 +31,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <svx/svxdlg.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "insrc.hxx" #include "insrc.hrc" @@ -48,18 +48,18 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const } SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) - : ModalDialog( pParent, SVX_RES(DLG_INS_ROW_COL) ), - aCount( this, SVX_RES( FT_COUNT ) ), - aCountEdit( this, SVX_RES( ED_COUNT ) ), - aInsFL( this, SVX_RES( FL_INS ) ), - aBeforeBtn( this, SVX_RES( CB_POS_BEFORE ) ), - aAfterBtn( this, SVX_RES( CB_POS_AFTER ) ), - aPosFL( this, SVX_RES( FL_POS ) ), - aRow(SVX_RES(STR_ROW)), - aCol(SVX_RES(STR_COL)), - aOKBtn( this, SVX_RES( BT_OK ) ), - aCancelBtn( this, SVX_RES( BT_CANCEL ) ), - aHelpBtn( this, SVX_RES( BT_HELP ) ), + : ModalDialog( pParent, CUI_RES(DLG_INS_ROW_COL) ), + aCount( this, CUI_RES( FT_COUNT ) ), + aCountEdit( this, CUI_RES( ED_COUNT ) ), + aInsFL( this, CUI_RES( FL_INS ) ), + aBeforeBtn( this, CUI_RES( CB_POS_BEFORE ) ), + aAfterBtn( this, CUI_RES( CB_POS_AFTER ) ), + aPosFL( this, CUI_RES( FL_POS ) ), + aRow(CUI_RES(STR_ROW)), + aCol(CUI_RES(STR_COL)), + aOKBtn( this, CUI_RES( BT_OK ) ), + aCancelBtn( this, CUI_RES( BT_CANCEL ) ), + aHelpBtn( this, CUI_RES( BT_HELP ) ), bColumn( bCol ) { FreeResource(); diff --git a/cui/source/dialogs/insrc.src b/cui/source/dialogs/insrc.src index 6023e94604ef..7d6845c32910 100644 --- a/cui/source/dialogs/insrc.src +++ b/cui/source/dialogs/insrc.src @@ -29,7 +29,7 @@ ************************************************************************/ -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "insrc.hrc" ModalDialog DLG_INS_ROW_COL diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 4ecf63e302eb..2337aeb3046e 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -54,7 +54,7 @@ #include <sfx2/lnkbase.hxx> #include <sfx2/objsh.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #define _SVSTDARR_USHORTS #include <svl/svstdarr.hxx> @@ -78,37 +78,37 @@ static long nTabs[] = SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, SvLinkManager* pMgr, BOOL bHtml ) - : ModalDialog( pParent, SVX_RES( MD_UPDATE_BASELINKS ) ), - aFtFiles( this, SVX_RES( FT_FILES ) ), - aFtLinks( this, SVX_RES( FT_LINKS ) ), - aFtType( this, SVX_RES( FT_TYPE ) ), - aFtStatus( this, SVX_RES( FT_STATUS ) ), - aCancelButton1( this, SVX_RES( 1 ) ), - aHelpButton1( this, SVX_RES( 1 ) ), - aPbUpdateNow( this, SVX_RES( PB_UPDATE_NOW ) ), - aPbOpenSource( this, SVX_RES( PB_OPEN_SOURCE ) ), - aPbChangeSource( this, SVX_RES( PB_CHANGE_SOURCE ) ), - aPbBreakLink( this, SVX_RES( PB_BREAK_LINK ) ), - aFtFiles2( this, SVX_RES( FT_FILES2 ) ), - aFtSource2( this, SVX_RES( FT_SOURCE2 ) ), - aFtType2( this, SVX_RES( FT_TYPE2 ) ), - aFtUpdate( this, SVX_RES( FT_UPDATE ) ), - aRbAutomatic( this, SVX_RES( RB_AUTOMATIC ) ), - aRbManual( this, SVX_RES( RB_MANUAL ) ), - aFtFullFileName( this, SVX_RES( FT_FULL_FILE_NAME ) ), - aFtFullSourceName( this, SVX_RES( FT_FULL_SOURCE_NAME ) ), - aFtFullTypeName( this, SVX_RES( FT_FULL_TYPE_NAME ) ), - aStrAutolink( SVX_RES( STR_AUTOLINK ) ), - aStrManuallink( SVX_RES( STR_MANUALLINK ) ), - aStrBrokenlink( SVX_RES( STR_BROKENLINK ) ), - aStrGraphiclink( SVX_RES( STR_GRAPHICLINK ) ), - aStrButtonclose( SVX_RES( STR_BUTTONCLOSE ) ), - aStrCloselinkmsg( SVX_RES( STR_CLOSELINKMSG ) ), - aStrCloselinkmsgMulti( SVX_RES( STR_CLOSELINKMSG_MULTI ) ), - aStrWaitinglink( SVX_RES( STR_WAITINGLINK ) ), + : ModalDialog( pParent, CUI_RES( MD_UPDATE_BASELINKS ) ), + aFtFiles( this, CUI_RES( FT_FILES ) ), + aFtLinks( this, CUI_RES( FT_LINKS ) ), + aFtType( this, CUI_RES( FT_TYPE ) ), + aFtStatus( this, CUI_RES( FT_STATUS ) ), + aCancelButton1( this, CUI_RES( 1 ) ), + aHelpButton1( this, CUI_RES( 1 ) ), + aPbUpdateNow( this, CUI_RES( PB_UPDATE_NOW ) ), + aPbOpenSource( this, CUI_RES( PB_OPEN_SOURCE ) ), + aPbChangeSource( this, CUI_RES( PB_CHANGE_SOURCE ) ), + aPbBreakLink( this, CUI_RES( PB_BREAK_LINK ) ), + aFtFiles2( this, CUI_RES( FT_FILES2 ) ), + aFtSource2( this, CUI_RES( FT_SOURCE2 ) ), + aFtType2( this, CUI_RES( FT_TYPE2 ) ), + aFtUpdate( this, CUI_RES( FT_UPDATE ) ), + aRbAutomatic( this, CUI_RES( RB_AUTOMATIC ) ), + aRbManual( this, CUI_RES( RB_MANUAL ) ), + aFtFullFileName( this, CUI_RES( FT_FULL_FILE_NAME ) ), + aFtFullSourceName( this, CUI_RES( FT_FULL_SOURCE_NAME ) ), + aFtFullTypeName( this, CUI_RES( FT_FULL_TYPE_NAME ) ), + aStrAutolink( CUI_RES( STR_AUTOLINK ) ), + aStrManuallink( CUI_RES( STR_MANUALLINK ) ), + aStrBrokenlink( CUI_RES( STR_BROKENLINK ) ), + aStrGraphiclink( CUI_RES( STR_GRAPHICLINK ) ), + aStrButtonclose( CUI_RES( STR_BUTTONCLOSE ) ), + aStrCloselinkmsg( CUI_RES( STR_CLOSELINKMSG ) ), + aStrCloselinkmsgMulti( CUI_RES( STR_CLOSELINKMSG_MULTI ) ), + aStrWaitinglink( CUI_RES( STR_WAITINGLINK ) ), pLinkMgr( NULL ), bHtmlMode(bHtml), - aTbLinks( this, SVX_RES(TB_LINKS ) ) + aTbLinks( this, CUI_RES(TB_LINKS ) ) { FreeResource(); diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx index a3c78f2d4738..8f5eadae306a 100644 --- a/cui/source/dialogs/multifil.cxx +++ b/cui/source/dialogs/multifil.cxx @@ -40,10 +40,10 @@ #include "multipat.hxx" #include "multifil.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "multipat.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> // #97807# ------------- #include <com/sun/star/ucb/XContentProvider.hpp> @@ -63,8 +63,8 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn ) if ( IsClassPathMode() ) { - 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") ); } if ( aDlg.Execute() == ERRCODE_NONE ) @@ -131,7 +131,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn ) if ( bDuplicated ) // #97807# -------------------- { - String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) ); + String sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) ); sMsg.SearchAndReplaceAscii( "%1", sInsFile ); InfoBox( pBtn, sMsg ).Execute(); } @@ -173,8 +173,8 @@ SvxMultiFileDialog::SvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed ) : { aAddBtn.SetClickHdl( LINK( this, SvxMultiFileDialog, AddHdl_Impl ) ); aDelBtn.SetClickHdl( LINK( this, SvxMultiFileDialog, DelHdl_Impl ) ); - SetText( SVX_RES( RID_SVXSTR_FILE_TITLE ) ); - aPathFL.SetText( SVX_RES( RID_SVXSTR_FILE_HEADLINE ) ); + SetText( CUI_RES( RID_SVXSTR_FILE_TITLE ) ); + aPathFL.SetText( CUI_RES( RID_SVXSTR_FILE_HEADLINE ) ); aDelBtn.Enable(); } diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index a28f256040d6..6d55f4de9f35 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -38,10 +38,10 @@ #include <sfx2/filedlghelper.hxx> #include "multipat.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "multipat.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> @@ -119,7 +119,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG ) } else { - String sMsg( SVX_RES( RID_MULTIPATH_DBL_ERR ) ); + String sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) ); sMsg.SearchAndReplaceAscii( "%1", sInsPath ); InfoBox( this, sMsg ).Execute(); } @@ -128,7 +128,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG ) { if ( LISTBOX_ENTRY_NOTFOUND != aPathLB.GetEntryPos( sInsPath ) ) { - String sMsg( SVX_RES( RID_MULTIPATH_DBL_ERR ) ); + String sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) ); sMsg.SearchAndReplaceAscii( "%1", sInsPath ); InfoBox( this, sMsg ).Execute(); } @@ -193,23 +193,23 @@ IMPL_LINK( SvxMultiPathDialog, DelHdl_Impl, PushButton *, EMPTYARG ) SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed ) : - ModalDialog( pParent, SVX_RES( RID_SVXDLG_MULTIPATH ) ), - - aPathFL ( this, SVX_RES( FL_MULTIPATH) ), - aPathLB ( this, SVX_RES( LB_MULTIPATH ) ), - aRadioLB ( this, SVX_RES( LB_RADIOBUTTON ) ), - aRadioFT ( this, SVX_RES( FT_RADIOBUTTON ) ), - aAddBtn ( this, SVX_RES( BTN_ADD_MULTIPATH ) ), - aDelBtn ( this, SVX_RES( BTN_DEL_MULTIPATH ) ), - aOKBtn ( this, SVX_RES( BTN_MULTIPATH_OK ) ), - aCancelBtn ( this, SVX_RES( BTN_MULTIPATH_CANCEL ) ), - aHelpButton ( this, SVX_RES( BTN_MULTIPATH_HELP ) ), + ModalDialog( pParent, CUI_RES( RID_SVXDLG_MULTIPATH ) ), + + aPathFL ( this, CUI_RES( FL_MULTIPATH) ), + aPathLB ( this, CUI_RES( LB_MULTIPATH ) ), + aRadioLB ( this, CUI_RES( LB_RADIOBUTTON ) ), + aRadioFT ( this, CUI_RES( FT_RADIOBUTTON ) ), + aAddBtn ( this, CUI_RES( BTN_ADD_MULTIPATH ) ), + aDelBtn ( this, CUI_RES( BTN_DEL_MULTIPATH ) ), + aOKBtn ( this, CUI_RES( BTN_MULTIPATH_OK ) ), + aCancelBtn ( this, CUI_RES( BTN_MULTIPATH_CANCEL ) ), + aHelpButton ( this, CUI_RES( BTN_MULTIPATH_HELP ) ), pImpl ( new MultiPath_Impl( bEmptyAllowed ) ) { static long aStaticTabs[]= { 2, 0, 12 }; aRadioLB.SvxSimpleTable::SetTabs( aStaticTabs ); - String sHeader( SVX_RES( STR_HEADER_PATHS ) ); + String sHeader( CUI_RES( STR_HEADER_PATHS ) ); aRadioLB.SetQuickHelpText( sHeader ); sHeader.Insert( '\t', 0 ); aRadioLB.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT ); @@ -329,8 +329,8 @@ void SvxMultiPathDialog::SetPath( const String& rPath ) void SvxMultiPathDialog::SetClassPathMode() { pImpl->bIsClassPathMode = TRUE; - SetText( SVX_RES( RID_SVXSTR_ARCHIVE_TITLE )); - aPathFL.SetText( SVX_RES( RID_SVXSTR_ARCHIVE_HEADLINE ) ); + SetText( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE )); + aPathFL.SetText( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ) ); } // ----------------------------------------------------------------------- diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src index ff7e5d027202..64dc9b412311 100644 --- a/cui/source/dialogs/multipat.src +++ b/cui/source/dialogs/multipat.src @@ -30,7 +30,7 @@ #include "multipat.hrc" #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> // RID_SVXDLG_MULTIPATH -------------------------------------------------- diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index aa111191e6fc..6309de2c3b7d 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -33,21 +33,21 @@ // include --------------------------------------------------------------- -#include "svx/dialogs.hrc" -#include "svx/dialmgr.hxx" +#include "cuires.hrc" +#include "dialmgr.hxx" #include "newtabledlg.hxx" #include "newtabledlg.hrc" SvxNewTableDialog::SvxNewTableDialog( Window* pParent ) -: ModalDialog( pParent, SVX_RES( RID_SVX_NEWTABLE_DLG ) ) -, maFtColumns( this, SVX_RES( FT_COLUMNS ) ) -, maNumColumns( this, SVX_RES( NF_COLUMNS ) ) -, maFtRows( this, SVX_RES( FT_ROWS ) ) -, maNumRows( this, SVX_RES( NF_ROWS ) ) -, maFlSep( this, SVX_RES( FL_SEP ) ) -, maHelpButton( this, SVX_RES( BTN_HELP ) ) -, maOkButton( this, SVX_RES( BTN_OK ) ) -, maCancelButton( this, SVX_RES( BTN_CANCEL ) ) +: ModalDialog( pParent, CUI_RES( RID_SVX_NEWTABLE_DLG ) ) +, maFtColumns( this, CUI_RES( FT_COLUMNS ) ) +, maNumColumns( this, CUI_RES( NF_COLUMNS ) ) +, maFtRows( this, CUI_RES( FT_ROWS ) ) +, maNumRows( this, CUI_RES( NF_ROWS ) ) +, maFlSep( this, CUI_RES( FL_SEP ) ) +, maHelpButton( this, CUI_RES( BTN_HELP ) ) +, maOkButton( this, CUI_RES( BTN_OK ) ) +, maCancelButton( this, CUI_RES( BTN_CANCEL ) ) { maNumRows.SetValue(2); maNumColumns.SetValue(5); diff --git a/cui/source/dialogs/newtabledlg.src b/cui/source/dialogs/newtabledlg.src index e72756da03db..e02338d6085e 100644 --- a/cui/source/dialogs/newtabledlg.src +++ b/cui/source/dialogs/newtabledlg.src @@ -29,7 +29,7 @@ ************************************************************************/ #include "newtabledlg.hrc" -#include "svx/dialogs.hrc" +#include "cuires.hrc" ModalDialog RID_SVX_NEWTABLE_DLG { diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 939606f8981f..e0892bfca427 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -47,23 +47,23 @@ #include <svtools/sores.hxx> #include <vcl/svapp.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent ) - : ModalDialog( pParent, SVX_RES( MD_PASTE_OBJECT ) ), - aFtSource( this, SVX_RES( FT_SOURCE ) ), - aFtObjectSource( this, SVX_RES( FT_OBJECT_SOURCE ) ), - aRbPaste( this, SVX_RES( RB_PASTE ) ), - aRbPasteLink( this, SVX_RES( RB_PASTE_LINK ) ), - aLbInsertList( this, SVX_RES( LB_INSERT_LIST ) ), - aCbDisplayAsIcon( this, SVX_RES( CB_DISPLAY_AS_ICON ) ), - aPbChangeIcon( this, SVX_RES( PB_CHANGE_ICON ) ), - aFlChoice( this, SVX_RES( FL_CHOICE ) ), - aOKButton1( this, SVX_RES( 1 ) ), - aCancelButton1( this, SVX_RES( 1 ) ), - aHelpButton1( this, SVX_RES( 1 ) ), - aSObject( SVX_RES( S_OBJECT ) ) + : ModalDialog( pParent, CUI_RES( MD_PASTE_OBJECT ) ), + aFtSource( this, CUI_RES( FT_SOURCE ) ), + aFtObjectSource( this, CUI_RES( FT_OBJECT_SOURCE ) ), + aRbPaste( this, CUI_RES( RB_PASTE ) ), + aRbPasteLink( this, CUI_RES( RB_PASTE_LINK ) ), + aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ), + aCbDisplayAsIcon( this, CUI_RES( CB_DISPLAY_AS_ICON ) ), + aPbChangeIcon( this, CUI_RES( PB_CHANGE_ICON ) ), + aFlChoice( this, CUI_RES( FL_CHOICE ) ), + aOKButton1( this, CUI_RES( 1 ) ), + aCancelButton1( this, CUI_RES( 1 ) ), + aHelpButton1( this, CUI_RES( 1 ) ), + aSObject( CUI_RES( S_OBJECT ) ) { FreeResource(); SetHelpId( HID_PASTE_DLG ); diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 2ccf2d1c664b..7d682cdf425f 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -42,14 +42,15 @@ #include <unotools/useroptions.hxx> #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> +#include <svx/dialogs.hrc> #define _SVX_POSTDLG_CXX -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "postdlg.hrc" #include <svx/postattr.hxx> #include "postdlg.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "helpid.hrc" @@ -69,20 +70,20 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, BOOL bPrevNext, BOOL bRedline ) : - SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_POSTIT ) ), - - aPostItFL ( this, SVX_RES( FL_POSTIT ) ), - aLastEditLabelFT( this, SVX_RES( FT_LASTEDITLABEL ) ), - aLastEditFT ( this, SVX_RES( FT_LASTEDIT ) ), - aEditFT ( this, SVX_RES( FT_EDIT ) ), - aEditED ( this, SVX_RES( ED_EDIT ) ), - aAuthorFT ( this, SVX_RES( FT_AUTHOR) ), - aAuthorBtn ( this, SVX_RES( BTN_AUTHOR ) ), - aOKBtn ( this, SVX_RES( BTN_POST_OK ) ), - aCancelBtn ( this, SVX_RES( BTN_POST_CANCEL ) ), - aHelpBtn ( this, SVX_RES( BTN_POST_HELP ) ), - aPrevBtn ( this, SVX_RES( BTN_PREV ) ), - aNextBtn ( this, SVX_RES( BTN_NEXT ) ), + SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_POSTIT ) ), + + aPostItFL ( this, CUI_RES( FL_POSTIT ) ), + aLastEditLabelFT( this, CUI_RES( FT_LASTEDITLABEL ) ), + aLastEditFT ( this, CUI_RES( FT_LASTEDIT ) ), + aEditFT ( this, CUI_RES( FT_EDIT ) ), + aEditED ( this, CUI_RES( ED_EDIT ) ), + aAuthorFT ( this, CUI_RES( FT_AUTHOR) ), + aAuthorBtn ( this, CUI_RES( BTN_AUTHOR ) ), + aOKBtn ( this, CUI_RES( BTN_POST_OK ) ), + aCancelBtn ( this, CUI_RES( BTN_POST_CANCEL ) ), + aHelpBtn ( this, CUI_RES( BTN_POST_HELP ) ), + aPrevBtn ( this, CUI_RES( BTN_PREV ) ), + aNextBtn ( this, CUI_RES( BTN_NEXT ) ), rSet ( rCoreSet ), pOutSet ( 0 ) @@ -154,10 +155,10 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, aEditED.SetText( aTextStr.ConvertLineEnd() ); if ( !bNew ) - SetText( SVX_RESSTR( STR_NOTIZ_EDIT ) ); + SetText( CUI_RESSTR( STR_NOTIZ_EDIT ) ); else // neu anlegen - SetText( SVX_RESSTR( STR_NOTIZ_INSERT ) ); + SetText( CUI_RESSTR( STR_NOTIZ_INSERT ) ); FreeResource(); } diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index 23dbef26e0a8..10fbbdc5d13a 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -29,9 +29,9 @@ ************************************************************************/ // include --------------------------------------------------------------- #include <svx/svxids.hrc> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "postdlg.hrc" - // pragma ---------------------------------------------------------------- +#include <svx/dialogs.hrc> // RID_SVXDLG_POSTIT ----------------------------------------------------- ModalDialog RID_SVXDLG_POSTIT diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 08c6674ee881..d68792732d7e 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -38,10 +38,10 @@ #include <vcl/msgbox.hxx> #include <vos/mutex.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "scriptdlg.hrc" #include "scriptdlg.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "selector.hxx" #include <com/sun/star/uno/XComponentContext.hpp> @@ -487,26 +487,26 @@ void __EXPORT SFTreeListBox::ExpandedHdl() // InputDialog ------------------------------------------------------------ // ---------------------------------------------------------------------------- InputDialog::InputDialog(Window * pParent, USHORT nMode ) - : ModalDialog( pParent, SVX_RES( RID_DLG_NEWLIB ) ), - aText( this, SVX_RES( FT_NEWLIB ) ), - aEdit( this, SVX_RES( ED_LIBNAME ) ), - aOKButton( this, SVX_RES( PB_OK ) ), - aCancelButton( this, SVX_RES( PB_CANCEL ) ) + : ModalDialog( pParent, CUI_RES( RID_DLG_NEWLIB ) ), + aText( this, CUI_RES( FT_NEWLIB ) ), + aEdit( this, CUI_RES( ED_LIBNAME ) ), + aOKButton( this, CUI_RES( PB_OK ) ), + aCancelButton( this, CUI_RES( PB_CANCEL ) ) { aEdit.GrabFocus(); if ( nMode == INPUTMODE_NEWLIB ) { - SetText( String( SVX_RES( STR_NEWLIB ) ) ); + SetText( String( CUI_RES( STR_NEWLIB ) ) ); } else if ( nMode == INPUTMODE_NEWMACRO ) { - SetText( String( SVX_RES( STR_NEWMACRO ) ) ); - aText.SetText( String( SVX_RES( STR_FT_NEWMACRO ) ) ); + SetText( String( CUI_RES( STR_NEWMACRO ) ) ); + aText.SetText( String( CUI_RES( STR_FT_NEWMACRO ) ) ); } else if ( nMode == INPUTMODE_RENAME ) { - SetText( String( SVX_RES( STR_RENAME ) ) ); - aText.SetText( String( SVX_RES( STR_FT_RENAME ) ) ); + SetText( String( CUI_RES( STR_RENAME ) ) ); + aText.SetText( String( CUI_RES( STR_FT_RENAME ) ) ); } FreeResource(); @@ -548,26 +548,26 @@ InputDialog::~InputDialog() // ScriptOrgDialog ------------------------------------------------------------ // ---------------------------------------------------------------------------- SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString language ) - : SfxModalDialog( pParent, SVX_RES( RID_DLG_SCRIPTORGANIZER ) ), - aScriptsTxt( this, SVX_RES( SF_TXT_SCRIPTS ) ), - aScriptsBox( this, SVX_RES( SF_CTRL_SCRIPTSBOX ) ), - aRunButton( this, SVX_RES( SF_PB_RUN ) ), - aCloseButton( this, SVX_RES( SF_PB_CLOSE ) ), - aCreateButton( this, SVX_RES( SF_PB_CREATE ) ), - aEditButton( this, SVX_RES( SF_PB_EDIT ) ), - aRenameButton(this, SVX_RES( SF_PB_RENAME ) ), - aDelButton( this, SVX_RES( SF_PB_DEL ) ), - aHelpButton( this, SVX_RES( SF_PB_HELP ) ), + : SfxModalDialog( pParent, CUI_RES( RID_DLG_SCRIPTORGANIZER ) ), + aScriptsTxt( this, CUI_RES( SF_TXT_SCRIPTS ) ), + aScriptsBox( this, CUI_RES( SF_CTRL_SCRIPTSBOX ) ), + aRunButton( this, CUI_RES( SF_PB_RUN ) ), + aCloseButton( this, CUI_RES( SF_PB_CLOSE ) ), + aCreateButton( this, CUI_RES( SF_PB_CREATE ) ), + aEditButton( this, CUI_RES( SF_PB_EDIT ) ), + aRenameButton(this, CUI_RES( SF_PB_RENAME ) ), + aDelButton( this, CUI_RES( SF_PB_DEL ) ), + aHelpButton( this, CUI_RES( SF_PB_HELP ) ), m_sLanguage( language ), - m_delErrStr( SVX_RES( RID_SVXSTR_DELFAILED ) ), - m_delErrTitleStr( SVX_RES( RID_SVXSTR_DELFAILED_TITLE ) ), - m_delQueryStr( SVX_RES( RID_SVXSTR_DELQUERY ) ), - m_delQueryTitleStr( SVX_RES( RID_SVXSTR_DELQUERY_TITLE ) ) , - m_createErrStr( SVX_RES ( RID_SVXSTR_CREATEFAILED ) ), - m_createDupStr( SVX_RES ( RID_SVXSTR_CREATEFAILEDDUP ) ), - m_createErrTitleStr( SVX_RES( RID_SVXSTR_CREATEFAILED_TITLE ) ), - m_renameErrStr( SVX_RES ( RID_SVXSTR_RENAMEFAILED ) ), - m_renameErrTitleStr( SVX_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) ) + m_delErrStr( CUI_RES( RID_SVXSTR_DELFAILED ) ), + m_delErrTitleStr( CUI_RES( RID_SVXSTR_DELFAILED_TITLE ) ), + m_delQueryStr( CUI_RES( RID_SVXSTR_DELQUERY ) ), + m_delQueryTitleStr( CUI_RES( RID_SVXSTR_DELQUERY_TITLE ) ) , + m_createErrStr( CUI_RES ( RID_SVXSTR_CREATEFAILED ) ), + m_createDupStr( CUI_RES ( RID_SVXSTR_CREATEFAILEDDUP ) ), + m_createErrTitleStr( CUI_RES( RID_SVXSTR_CREATEFAILED_TITLE ) ), + m_renameErrStr( CUI_RES ( RID_SVXSTR_RENAMEFAILED ) ), + m_renameErrTitleStr( CUI_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) ) { // must be a neater way to deal with the strings than as above @@ -1433,7 +1433,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, if ( type.getLength() != 0 ) { result += ::rtl::OUString::createFromAscii( "\n\n" ); - result += ::rtl::OUString(String(SVX_RES(RID_SVXSTR_ERROR_TYPE_LABEL))); + result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL))); result += ::rtl::OUString::createFromAscii( " " ); result += type; } @@ -1441,7 +1441,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, if ( message.getLength() != 0 ) { result += ::rtl::OUString::createFromAscii( "\n\n" ); - result += ::rtl::OUString(String(SVX_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL))); + result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL))); result += ::rtl::OUString::createFromAscii( " " ); result += message; } @@ -1452,7 +1452,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, ::rtl::OUString GetErrorMessage( const provider::ScriptErrorRaisedException& eScriptError ) { - ::rtl::OUString unformatted = String( SVX_RES( RID_SVXSTR_ERROR_AT_LINE ) ); + ::rtl::OUString unformatted = String( CUI_RES( RID_SVXSTR_ERROR_AT_LINE ) ); ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" ); ::rtl::OUString language = unknown; @@ -1479,12 +1479,12 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, { line = ::rtl::OUString::valueOf( eScriptError.lineNum ); unformatted = String( - SVX_RES( RID_SVXSTR_ERROR_AT_LINE ) ); + CUI_RES( RID_SVXSTR_ERROR_AT_LINE ) ); } else { unformatted = String( - SVX_RES( RID_SVXSTR_ERROR_RUNNING ) ); + CUI_RES( RID_SVXSTR_ERROR_RUNNING ) ); } return FormatErrorString( @@ -1495,7 +1495,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, const provider::ScriptExceptionRaisedException& eScriptException ) { ::rtl::OUString unformatted = - String( SVX_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) ); + String( CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) ); ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" ); ::rtl::OUString language = unknown; @@ -1522,12 +1522,12 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, { line = ::rtl::OUString::valueOf( eScriptException.lineNum ); unformatted = String( - SVX_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) ); + CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) ); } else { unformatted = String( - SVX_RES( RID_SVXSTR_EXCEPTION_RUNNING ) ); + CUI_RES( RID_SVXSTR_EXCEPTION_RUNNING ) ); } if ( eScriptException.exceptionType.getLength() != 0 ) @@ -1543,7 +1543,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, const provider::ScriptFrameworkErrorException& sError ) { ::rtl::OUString unformatted = String( - SVX_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) ); + CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) ); ::rtl::OUString language = ::rtl::OUString::createFromAscii( "UNKNOWN" ); @@ -1564,7 +1564,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1, if ( sError.errorType == provider::ScriptFrameworkErrorType::NOTSUPPORTED ) { message = String( - SVX_RES( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) ); + CUI_RES( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) ); message = ReplaceString( message, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language ); @@ -1680,11 +1680,11 @@ IMPL_LINK( SvxScriptErrorDialog, ShowDialog, ::rtl::OUString*, pMessage ) } else { - message = String( SVX_RES( RID_SVXSTR_ERROR_TITLE ) ); + message = String( CUI_RES( RID_SVXSTR_ERROR_TITLE ) ); } MessBox* pBox = new WarningBox( NULL, WB_OK, message ); - pBox->SetText( SVX_RES( RID_SVXSTR_ERROR_TITLE ) ); + pBox->SetText( CUI_RES( RID_SVXSTR_ERROR_TITLE ) ); pBox->Execute(); if ( pBox ) delete pBox; diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src index 3c5b2739abfa..cceca0bc64ff 100644 --- a/cui/source/dialogs/scriptdlg.src +++ b/cui/source/dialogs/scriptdlg.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "scriptdlg.hrc" #include "helpid.hrc" diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 29fe21131b02..ddac02ae2c6b 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -33,15 +33,16 @@ #include <svl/cjkoptions.hxx> #include <svx/flagsdef.hxx> -#include "svx/dialogs.hrc" +#include "cuires.hrc" #include "sdrcelldlg.hxx" -#include "svx/dialmgr.hxx" +#include "dialmgr.hxx" #include "cuitabarea.hxx" #include "svx/svdmodel.hxx" #include "border.hxx" +#include <svx/dialogs.hrc> SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ) -: SfxTabDialog ( pParent, SVX_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr ) +: SfxTabDialog ( pParent, CUI_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr ) , mrOutAttrs ( *pAttr ) , mpColorTab ( pModel->GetColorTable() ) , mpGradientList ( pModel->GetGradientList() ) diff --git a/cui/source/dialogs/sdrcelldlg.src b/cui/source/dialogs/sdrcelldlg.src index 71374302a276..0c721bc11d2b 100644 --- a/cui/source/dialogs/sdrcelldlg.src +++ b/cui/source/dialogs/sdrcelldlg.src @@ -28,7 +28,9 @@ * ************************************************************************/ +#include <cuires.hrc> #include <svx/dialogs.hrc> + TabDialog RID_SVX_FORMAT_CELLS_DLG { OutputSize = TRUE ; diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 563110004258..4b3930a692c1 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -35,7 +35,7 @@ #include "fmsearch.hrc" #include <tools/shl.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <vcl/msgbox.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/extract.hxx> @@ -50,11 +50,11 @@ DBG_NAME(FmShowColsDialog) //-------------------------------------------------------------------------- FmShowColsDialog::FmShowColsDialog(Window* pParent) - :ModalDialog(pParent, SVX_RES(RID_SVX_DLG_SHOWGRIDCOLUMNS)) - ,m_aList(this, SVX_RES(1)) - ,m_aLabel(this, SVX_RES(1)) - ,m_aOK(this, SVX_RES(1)) - ,m_aCancel(this, SVX_RES(1)) + :ModalDialog(pParent, CUI_RES(RID_SVX_DLG_SHOWGRIDCOLUMNS)) + ,m_aList(this, CUI_RES(1)) + ,m_aLabel(this, CUI_RES(1)) + ,m_aOK(this, CUI_RES(1)) + ,m_aCancel(this, CUI_RES(1)) { DBG_CTOR(FmShowColsDialog,NULL); m_aList.EnableMultiSelection(sal_True); diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 68d04bbbc57c..c6c1f173322c 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -34,28 +34,28 @@ #include <sfx2/dispatch.hxx> #include <svl/intitem.hxx> #include <svl/eitem.hxx> -#include "svx/dialmgr.hxx" +#include "dialmgr.hxx" #include "splitcelldlg.hxx" -#include "svx/dialogs.hrc" +#include "cuires.hrc" #include "splitcelldlg.hrc" SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) -: SvxStandardDialog(pParent, SVX_RES(RID_SVX_SPLITCELLDLG)) -, maCountLbl(this, SVX_RES(FT_COUNT)) -, maCountEdit(this, SVX_RES(ED_COUNT)) -, maCountFL(this, SVX_RES(FL_COUNT)) -, maHorzBox(this, SVX_RES(RB_HORZ)) -, maVertBox(this, SVX_RES(RB_VERT)) -, maPropCB(this, SVX_RES(CB_PROP)) -, maDirFL(this, SVX_RES(FL_DIR)) -, maOKBtn(this, SVX_RES(BT_OK)) -, maCancelBtn(this, SVX_RES(BT_CANCEL)) -, maHelpBtn( this, SVX_RES( BT_HELP ) ) +: SvxStandardDialog(pParent, CUI_RES(RID_SVX_SPLITCELLDLG)) +, maCountLbl(this, CUI_RES(FT_COUNT)) +, maCountEdit(this, CUI_RES(ED_COUNT)) +, maCountFL(this, CUI_RES(FL_COUNT)) +, maHorzBox(this, CUI_RES(RB_HORZ)) +, maVertBox(this, CUI_RES(RB_VERT)) +, maPropCB(this, CUI_RES(CB_PROP)) +, maDirFL(this, CUI_RES(FL_DIR)) +, maOKBtn(this, CUI_RES(BT_OK)) +, maCancelBtn(this, CUI_RES(BT_CANCEL)) +, maHelpBtn( this, CUI_RES( BT_HELP ) ) , mnMaxVertical( nMaxVertical ) , mnMaxHorizontal( nMaxHorizontal ) { - maVertBox.SetModeRadioImage(Image(SVX_RES(BMP_SPLIT_VERT)), BMP_COLOR_HIGHCONTRAST); - maHorzBox.SetModeRadioImage(Image(SVX_RES(BMP_SPLIT_HORZ)), BMP_COLOR_HIGHCONTRAST); + maVertBox.SetModeRadioImage(Image(CUI_RES(BMP_SPLIT_VERT)), BMP_COLOR_HIGHCONTRAST); + maHorzBox.SetModeRadioImage(Image(CUI_RES(BMP_SPLIT_HORZ)), BMP_COLOR_HIGHCONTRAST); FreeResource(); maHorzBox.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl )); maPropCB.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl )); diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src index 17285cecd05f..f33243450e07 100644 --- a/cui/source/dialogs/splitcelldlg.src +++ b/cui/source/dialogs/splitcelldlg.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "splitcelldlg.hrc" ModalDialog RID_SVX_SPLITCELLDLG diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index c33eaf532d24..23527407dc7d 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -39,20 +39,21 @@ #include <svl/cjkoptions.hxx> #include <svl/whiter.hxx> #include <sfx2/objsh.hxx> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "srchxtra.hrc" #include <svx/svxitems.hrc> #include <svx/flstitem.hxx> #include "chardlg.hxx" #include "paragrph.hxx" -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include "backgrnd.hxx" +#include <svx/dialogs.hrc> // class SvxSearchFormatDialog ------------------------------------------- SvxSearchFormatDialog::SvxSearchFormatDialog( Window* pParent, const SfxItemSet& rSet ) : - SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_SEARCHFORMAT ), &rSet ), + SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHFORMAT ), &rSet ), pFontList( NULL ) @@ -138,13 +139,13 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst, const USHORT* pWhRanges ) : - ModalDialog( pParent, SVX_RES( RID_SVXDLG_SEARCHATTR ) ), + ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHATTR ) ), - aAttrFL ( this, SVX_RES( FL_ATTR ) ), - aAttrLB ( this, SVX_RES( LB_ATTR ) ), - aOKBtn ( this, SVX_RES( BTN_ATTR_OK ) ), - aEscBtn ( this, SVX_RES( BTN_ATTR_CANCEL ) ), - aHelpBtn( this, SVX_RES( BTN_ATTR_HELP ) ), + aAttrFL ( this, CUI_RES( FL_ATTR ) ), + aAttrLB ( this, CUI_RES( LB_ATTR ) ), + aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ), + aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ), + aHelpBtn( this, CUI_RES( BTN_ATTR_HELP ) ), rList( rLst ) @@ -182,10 +183,10 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, USHORT nResId = nSlot - SID_SVX_START + RID_ATTR_BEGIN; SvLBoxEntry* pEntry = NULL; - ResId aId( nResId, DIALOG_MGR() ); + ResId aId( nResId, CUI_MGR() ); aId.SetRT( RSC_STRING ); - if ( DIALOG_MGR().IsAvailable( aId ) ) - pEntry = aAttrLB.SvTreeListBox::InsertEntry( SVX_RESSTR( nResId ) ); + if ( CUI_MGR().IsAvailable( aId ) ) + pEntry = aAttrLB.SvTreeListBox::InsertEntry( CUI_RESSTR( nResId ) ); else { ByteString sError( "no resource for slot id\nslot = " ); @@ -265,20 +266,20 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog USHORT nShorter, USHORT nLonger ) : - ModalDialog( pParent, SVX_RES( RID_SVXDLG_SEARCHSIMILARITY ) ), - - aFixedLine ( this, SVX_RES( FL_SIMILARITY ) ), - aOtherTxt ( this, SVX_RES( FT_OTHER ) ), - aOtherFld ( this, SVX_RES( NF_OTHER ) ), - aLongerTxt ( this, SVX_RES( FT_LONGER ) ), - aLongerFld ( this, SVX_RES( NF_LONGER ) ), - aShorterTxt ( this, SVX_RES( FT_SHORTER ) ), - aShorterFld ( this, SVX_RES( NF_SHORTER ) ), - aRelaxBox ( this, SVX_RES( CB_RELAX ) ), - - aOKBtn ( this, SVX_RES( BTN_ATTR_OK ) ), - aEscBtn ( this, SVX_RES( BTN_ATTR_CANCEL ) ), - aHelpBtn ( this, SVX_RES( BTN_ATTR_HELP ) ) + ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHSIMILARITY ) ), + + aFixedLine ( this, CUI_RES( FL_SIMILARITY ) ), + aOtherTxt ( this, CUI_RES( FT_OTHER ) ), + aOtherFld ( this, CUI_RES( NF_OTHER ) ), + aLongerTxt ( this, CUI_RES( FT_LONGER ) ), + aLongerFld ( this, CUI_RES( NF_LONGER ) ), + aShorterTxt ( this, CUI_RES( FT_SHORTER ) ), + aShorterFld ( this, CUI_RES( NF_SHORTER ) ), + aRelaxBox ( this, CUI_RES( CB_RELAX ) ), + + aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ), + aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ), + aHelpBtn ( this, CUI_RES( BTN_ATTR_HELP ) ) { FreeResource(); diff --git a/cui/source/dialogs/srchxtra.src b/cui/source/dialogs/srchxtra.src index 980b952adc76..bde692af7447 100644 --- a/cui/source/dialogs/srchxtra.src +++ b/cui/source/dialogs/srchxtra.src @@ -29,8 +29,9 @@ ************************************************************************/ // include --------------------------------------------------------------- #include "helpid.hrc" -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "srchxtra.hrc" +#include <svx/dialogs.hrc> // RID_SVXDLG_SEARCHFORMAT ----------------------------------------------- TabDialog RID_SVXDLG_SEARCHFORMAT diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 3afc3ee4c332..37029819f0b8 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -41,20 +41,20 @@ #define _SVX_ZOOM_CXX -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "zoom.hrc" #include "zoom.hxx" #include <svx/zoomitem.hxx> #include <svx/viewlayoutitem.hxx> -#include <svx/dialmgr.hxx> +#include <dialmgr.hxx> #include <svx/zoom_def.hxx> - +#include <svx/dialogs.hrc> #include <layout/layout-pre.hxx> #if ENABLE_LAYOUT -#undef SVX_RES -#define SVX_RES(x) #x +#undef CUI_RES +#define CUI_RES(x) #x #undef SfxModalDialog #define SfxModalDialog( parent, id ) Dialog( parent, "zoom.xml", id ) #endif /* ENABLE_LAYOUT */ @@ -193,27 +193,27 @@ void SvxZoomDialog::SetSpinSize( USHORT nNewSpin ) SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : - SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_ZOOM ) ), - - aZoomFl ( this, SVX_RES( FL_ZOOM ) ), - aOptimalBtn ( this, SVX_RES( BTN_OPTIMAL ) ), - aWholePageBtn ( this, SVX_RES( BTN_WHOLE_PAGE ) ), - aPageWidthBtn ( this, SVX_RES( BTN_PAGE_WIDTH ) ), - a100Btn ( this, SVX_RES( BTN_100 ) ), - aUserBtn ( this, SVX_RES( BTN_USER ) ), - aUserEdit ( this, SVX_RES( ED_USER ) ), - - aViewLayoutFl ( this, SVX_RES( FL_VIEWLAYOUT ) ), - aAutomaticBtn ( this, SVX_RES( BTN_AUTOMATIC ) ), - aSingleBtn ( this, SVX_RES( BTN_SINGLE ) ), - aColumnsBtn ( this, SVX_RES( BTN_COLUMNS ) ), - aColumnsEdit ( this, SVX_RES( ED_COLUMNS ) ), - aBookModeChk ( this, SVX_RES( CHK_BOOK ) ), - - aBottomFl ( this, SVX_RES( FL_BOTTOM ) ), - aOKBtn ( this, SVX_RES( BTN_ZOOM_OK ) ), - aCancelBtn ( this, SVX_RES( BTN_ZOOM_CANCEL ) ), - aHelpBtn ( this, SVX_RES( BTN_ZOOM_HELP ) ), + SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_ZOOM ) ), + + aZoomFl ( this, CUI_RES( FL_ZOOM ) ), + aOptimalBtn ( this, CUI_RES( BTN_OPTIMAL ) ), + aWholePageBtn ( this, CUI_RES( BTN_WHOLE_PAGE ) ), + aPageWidthBtn ( this, CUI_RES( BTN_PAGE_WIDTH ) ), + a100Btn ( this, CUI_RES( BTN_100 ) ), + aUserBtn ( this, CUI_RES( BTN_USER ) ), + aUserEdit ( this, CUI_RES( ED_USER ) ), + + aViewLayoutFl ( this, CUI_RES( FL_VIEWLAYOUT ) ), + aAutomaticBtn ( this, CUI_RES( BTN_AUTOMATIC ) ), + aSingleBtn ( this, CUI_RES( BTN_SINGLE ) ), + aColumnsBtn ( this, CUI_RES( BTN_COLUMNS ) ), + aColumnsEdit ( this, CUI_RES( ED_COLUMNS ) ), + aBookModeChk ( this, CUI_RES( CHK_BOOK ) ), + + aBottomFl ( this, CUI_RES( FL_BOTTOM ) ), + aOKBtn ( this, CUI_RES( BTN_ZOOM_OK ) ), + aCancelBtn ( this, CUI_RES( BTN_ZOOM_CANCEL ) ), + aHelpBtn ( this, CUI_RES( BTN_ZOOM_HELP ) ), rSet ( rCoreSet ), pOutSet ( NULL ), diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 197d1e2f2959..1bc0e85db56c 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -29,8 +29,10 @@ ************************************************************************/ // include --------------------------------------------------------------- #include <svx/svxids.hrc> -#include <svx/dialogs.hrc> +#include <cuires.hrc> #include "zoom.hrc" +#include <svx/dialogs.hrc> + // RID_SVXDLG_ZOOM ------------------------------------------------------- ModalDialog RID_SVXDLG_ZOOM { |