summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcui/prj/d.lst6
-rw-r--r--cui/source/customize/acccfg.cxx46
-rw-r--r--cui/source/customize/acccfg.src2
-rw-r--r--cui/source/customize/cfg.cxx174
-rw-r--r--cui/source/customize/cfg.src2
-rw-r--r--cui/source/customize/cfgutil.cxx44
-rw-r--r--cui/source/customize/eventdlg.cxx30
-rw-r--r--cui/source/customize/eventdlg.hrc2
-rw-r--r--cui/source/customize/macropg.cxx44
-rw-r--r--cui/source/customize/macropg.src3
-rw-r--r--cui/source/customize/selector.cxx34
-rw-r--r--cui/source/customize/selector.src2
-rw-r--r--cui/source/dialogs/SpellDialog.cxx76
-rw-r--r--cui/source/dialogs/SpellDialog.src2
-rw-r--r--cui/source/dialogs/charmap.src3
-rw-r--r--cui/source/dialogs/commonlingui.cxx34
-rw-r--r--cui/source/dialogs/commonlingui.src2
-rw-r--r--cui/source/dialogs/cuicharmap.cxx8
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx82
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx51
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx38
-rwxr-xr-xcui/source/dialogs/cuiimapdlg.hrc5
-rw-r--r--cui/source/dialogs/cuiimapwnd.cxx34
-rw-r--r--cui/source/dialogs/cuitbxform.cxx14
-rw-r--r--cui/source/dialogs/dlgname.cxx58
-rw-r--r--cui/source/dialogs/dlgname.src2
-rw-r--r--cui/source/dialogs/grfflt.src3
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx112
-rw-r--r--cui/source/dialogs/hangulhanjadlg.src2
-rw-r--r--cui/source/dialogs/hldocntp.cxx22
-rw-r--r--cui/source/dialogs/hldoctp.cxx24
-rw-r--r--cui/source/dialogs/hlinettp.cxx30
-rw-r--r--cui/source/dialogs/hlmailtp.cxx18
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx16
-rw-r--r--cui/source/dialogs/hlmarkwn.src2
-rw-r--r--cui/source/dialogs/hltpbase.cxx12
-rw-r--r--cui/source/dialogs/hyperdlg.src2
-rw-r--r--cui/source/dialogs/iconcdlg.cxx6
-rw-r--r--cui/source/dialogs/iconcdlg.src2
-rw-r--r--cui/source/dialogs/insdlg.cxx196
-rw-r--r--cui/source/dialogs/insrc.cxx28
-rw-r--r--cui/source/dialogs/insrc.src2
-rw-r--r--cui/source/dialogs/linkdlg.cxx60
-rw-r--r--cui/source/dialogs/multifil.cxx14
-rw-r--r--cui/source/dialogs/multipat.cxx36
-rw-r--r--cui/source/dialogs/multipat.src2
-rw-r--r--cui/source/dialogs/newtabledlg.cxx22
-rw-r--r--cui/source/dialogs/newtabledlg.src2
-rw-r--r--cui/source/dialogs/pastedlg.cxx28
-rw-r--r--cui/source/dialogs/postdlg.cxx37
-rw-r--r--cui/source/dialogs/postdlg.src4
-rw-r--r--cui/source/dialogs/scriptdlg.cxx86
-rw-r--r--cui/source/dialogs/scriptdlg.src2
-rw-r--r--cui/source/dialogs/sdrcelldlg.cxx7
-rw-r--r--cui/source/dialogs/sdrcelldlg.src2
-rw-r--r--cui/source/dialogs/showcols.cxx12
-rw-r--r--cui/source/dialogs/splitcelldlg.cxx30
-rw-r--r--cui/source/dialogs/splitcelldlg.src2
-rw-r--r--cui/source/dialogs/srchxtra.cxx53
-rw-r--r--cui/source/dialogs/srchxtra.src3
-rw-r--r--cui/source/dialogs/zoom.cxx52
-rw-r--r--cui/source/dialogs/zoom.src4
-rw-r--r--cui/source/factory/cuiresmgr.cxx53
-rw-r--r--cui/source/factory/dlgfact.cxx503
-rw-r--r--cui/source/factory/dlgfact.hxx52
-rwxr-xr-xcui/source/factory/makefile.mk1
-rw-r--r--cui/source/inc/cuires.hrc431
-rw-r--r--cui/source/inc/cuisrchdlg.hxx2
-rw-r--r--cui/source/inc/dialmgr.hxx48
-rw-r--r--cui/source/inc/gallery.hrc42
-rw-r--r--cui/source/inc/helpid.hrc2
-rw-r--r--cui/source/inc/hltpbase.hxx4
-rw-r--r--cui/source/options/cfgchart.cxx8
-rw-r--r--cui/source/options/connpooloptions.cxx30
-rw-r--r--cui/source/options/connpooloptions.src2
-rw-r--r--cui/source/options/cuisrchdlg.cxx6
-rw-r--r--cui/source/options/dbregister.cxx25
-rw-r--r--cui/source/options/dbregister.src7
-rw-r--r--cui/source/options/doclinkdialog.cxx32
-rw-r--r--cui/source/options/doclinkdialog.src2
-rw-r--r--cui/source/options/fontsubs.cxx50
-rw-r--r--cui/source/options/fontsubs.hrc2
-rw-r--r--cui/source/options/internationaloptions.cxx18
-rw-r--r--cui/source/options/internationaloptions.src2
-rw-r--r--cui/source/options/optaccessibility.cxx30
-rw-r--r--cui/source/options/optaccessibility.src2
-rw-r--r--cui/source/options/optasian.cxx38
-rw-r--r--cui/source/options/optasian.src2
-rw-r--r--cui/source/options/optchart.cxx16
-rw-r--r--cui/source/options/optchart.src2
-rw-r--r--cui/source/options/optcolor.cxx30
-rw-r--r--cui/source/options/optcolor.src2
-rw-r--r--cui/source/options/optctl.cxx30
-rw-r--r--cui/source/options/optctl.src2
-rw-r--r--cui/source/options/optdict.cxx67
-rw-r--r--cui/source/options/optdict.src2
-rw-r--r--cui/source/options/optfltr.cxx46
-rw-r--r--cui/source/options/optfltr.src2
-rw-r--r--cui/source/options/optgdlg.cxx162
-rw-r--r--cui/source/options/optgdlg.src2
-rw-r--r--cui/source/options/optgenrl.cxx76
-rw-r--r--cui/source/options/optgenrl.src20
-rw-r--r--cui/source/options/opthtml.cxx60
-rw-r--r--cui/source/options/opthtml.src2
-rw-r--r--cui/source/options/optimprove.cxx36
-rw-r--r--cui/source/options/optimprove.src3
-rw-r--r--cui/source/options/optimprove2.cxx38
-rw-r--r--cui/source/options/optinet2.cxx178
-rw-r--r--cui/source/options/optinet2.hrc5
-rw-r--r--cui/source/options/optinet2.src2
-rw-r--r--cui/source/options/optjava.cxx96
-rw-r--r--cui/source/options/optjava.src2
-rw-r--r--cui/source/options/optjsearch.cxx48
-rw-r--r--cui/source/options/optjsearch.src2
-rw-r--r--cui/source/options/optlingu.cxx102
-rw-r--r--cui/source/options/optlingu.src2
-rw-r--r--cui/source/options/optmemory.cxx50
-rw-r--r--cui/source/options/optmemory.src2
-rw-r--r--cui/source/options/optpath.cxx24
-rw-r--r--cui/source/options/optpath.src2
-rw-r--r--cui/source/options/optsave.cxx72
-rw-r--r--cui/source/options/optsave.src2
-rw-r--r--cui/source/options/optupdt.cxx30
-rw-r--r--cui/source/options/optupdt.src2
-rw-r--r--cui/source/options/radiobtnbox.cxx2
-rw-r--r--cui/source/options/readonlyimage.cxx8
-rw-r--r--cui/source/options/readonlyimage.src2
-rw-r--r--cui/source/options/securityoptions.cxx48
-rw-r--r--cui/source/options/securityoptions.src2
-rw-r--r--cui/source/options/treeopt.cxx59
-rw-r--r--cui/source/options/treeopt.src3
-rw-r--r--cui/source/options/webconninfo.cxx26
-rw-r--r--cui/source/options/webconninfo.src2
-rw-r--r--cui/source/tabpages/align.cxx68
-rw-r--r--cui/source/tabpages/align.src4
-rw-r--r--cui/source/tabpages/autocdlg.cxx230
-rw-r--r--cui/source/tabpages/autocdlg.hrc2
-rw-r--r--cui/source/tabpages/autocdlg.src2
-rw-r--r--cui/source/tabpages/backgrnd.cxx66
-rw-r--r--cui/source/tabpages/backgrnd.src4
-rw-r--r--cui/source/tabpages/bbdlg.cxx6
-rw-r--r--cui/source/tabpages/bbdlg.src2
-rw-r--r--cui/source/tabpages/border.cxx95
-rw-r--r--cui/source/tabpages/border.src4
-rw-r--r--cui/source/tabpages/chardlg.cxx214
-rw-r--r--cui/source/tabpages/chardlg.src9
-rw-r--r--cui/source/tabpages/connect.cxx52
-rw-r--r--cui/source/tabpages/connect.src4
-rw-r--r--cui/source/tabpages/dstribut.cxx64
-rw-r--r--cui/source/tabpages/dstribut.src3
-rw-r--r--cui/source/tabpages/frmdirlbox.src96
-rw-r--r--cui/source/tabpages/grfpage.cxx55
-rw-r--r--cui/source/tabpages/grfpage.src3
-rw-r--r--cui/source/tabpages/labdlg.cxx56
-rw-r--r--cui/source/tabpages/labdlg.hrc2
-rw-r--r--cui/source/tabpages/labdlg.src2
-rw-r--r--cui/source/tabpages/macroass.cxx30
-rw-r--r--cui/source/tabpages/macroass.src4
-rwxr-xr-xcui/source/tabpages/makefile.mk7
-rw-r--r--cui/source/tabpages/measure.cxx65
-rw-r--r--cui/source/tabpages/measure.src4
-rw-r--r--cui/source/tabpages/numfmt.cxx78
-rw-r--r--cui/source/tabpages/numfmt.src4
-rw-r--r--cui/source/tabpages/numpages.cxx164
-rw-r--r--cui/source/tabpages/numpages.src104
-rw-r--r--cui/source/tabpages/page.cxx106
-rw-r--r--cui/source/tabpages/page.src165
-rw-r--r--cui/source/tabpages/paragrph.cxx179
-rw-r--r--cui/source/tabpages/paragrph.src3
-rw-r--r--cui/source/tabpages/strings.src178
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx83
-rw-r--r--cui/source/tabpages/swpossizetabpage.src5
-rw-r--r--cui/source/tabpages/tabarea.cxx9
-rw-r--r--cui/source/tabpages/tabarea.src3
-rw-r--r--cui/source/tabpages/tabline.cxx9
-rw-r--r--cui/source/tabpages/tabline.src3
-rw-r--r--cui/source/tabpages/tabstpge.cxx62
-rw-r--r--cui/source/tabpages/tabstpge.src4
-rw-r--r--cui/source/tabpages/textanim.cxx57
-rw-r--r--cui/source/tabpages/textanim.src3
-rw-r--r--cui/source/tabpages/textattr.cxx51
-rw-r--r--cui/source/tabpages/textattr.src4
-rw-r--r--cui/source/tabpages/tparea.cxx141
-rw-r--r--cui/source/tabpages/tpbitmap.cxx86
-rw-r--r--cui/source/tabpages/tpcolor.cxx96
-rw-r--r--cui/source/tabpages/tpgradnt.cxx99
-rw-r--r--cui/source/tabpages/tphatch.cxx85
-rw-r--r--cui/source/tabpages/tpline.cxx82
-rw-r--r--cui/source/tabpages/tplnedef.cxx89
-rw-r--r--cui/source/tabpages/tplneend.cxx64
-rw-r--r--cui/source/tabpages/tpshadow.cxx31
-rw-r--r--cui/source/tabpages/transfrm.cxx108
-rw-r--r--cui/source/tabpages/transfrm.src4
193 files changed, 3984 insertions, 3826 deletions
diff --git a/cui/prj/d.lst b/cui/prj/d.lst
index 3765f7d97a96..3397d2dc5413 100755
--- a/cui/prj/d.lst
+++ b/cui/prj/d.lst
@@ -1 +1,7 @@
+mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\res%_EXT%
+
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index f8a141234e37..8a1c38157b01 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -36,7 +36,7 @@
#include "acccfg.hxx"
#include "cfgutil.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <sfx2/msg.hxx>
#include <sfx2/macrconf.hxx>
@@ -45,7 +45,7 @@
#include <sfx2/minfitem.hxx>
#include <svl/stritem.hxx>
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
#include "acccfg.hrc"
//-----------------------------------------------
@@ -699,31 +699,31 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
//-----------------------------------------------
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxItemSet& aSet )
- : SfxTabPage (pParent, SVX_RES(RID_SVXPAGE_KEYBOARD), aSet)
+ : SfxTabPage (pParent, CUI_RES(RID_SVXPAGE_KEYBOARD), aSet)
, m_pMacroInfoItem ()
, m_pStringItem ()
, m_pFontItem ()
, m_pFileDlg (NULL)
- , aEntriesBox (this , this, SVX_RES(BOX_ACC_ENTRIES ))
- , aKeyboardGroup (this , SVX_RES(GRP_ACC_KEYBOARD ))
- , aOfficeButton (this , SVX_RES(RB_OFFICE ))
- , aModuleButton (this , SVX_RES(RB_MODULE ))
- , aChangeButton (this , SVX_RES(BTN_ACC_CHANGE ))
- , aRemoveButton (this , SVX_RES(BTN_ACC_REMOVE ))
- , aGroupText (this , SVX_RES(TXT_ACC_GROUP ))
- , pGroupLBox(new SfxConfigGroupListBox_Impl( this, SVX_RES(BOX_ACC_GROUP), SFX_SLOT_ACCELCONFIG ))
- , aFunctionText (this , SVX_RES(TXT_ACC_FUNCTION ))
- , pFunctionBox(new SfxConfigFunctionListBox_Impl( this, SVX_RES( BOX_ACC_FUNCTION )))
- , aKeyText (this , SVX_RES(TXT_ACC_KEY ))
- , aKeyBox (this , SVX_RES(BOX_ACC_KEY ))
- , aFunctionsGroup (this , SVX_RES(GRP_ACC_FUNCTIONS ))
- , aLoadButton (this , SVX_RES(BTN_LOAD ))
- , aSaveButton (this , SVX_RES(BTN_SAVE ))
- , aResetButton (this , SVX_RES(BTN_RESET ))
- , aLoadAccelConfigStr ( SVX_RES( STR_LOADACCELCONFIG ) )
- , aSaveAccelConfigStr ( SVX_RES( STR_SAVEACCELCONFIG ) )
- , aFilterAllStr ( SVX_RES( STR_SFX_FILTERNAME_ALL ) )
- , aFilterCfgStr ( SVX_RES( STR_FILTERNAME_CFG ) )
+ , aEntriesBox (this , this, CUI_RES(BOX_ACC_ENTRIES ))
+ , aKeyboardGroup (this , CUI_RES(GRP_ACC_KEYBOARD ))
+ , aOfficeButton (this , CUI_RES(RB_OFFICE ))
+ , aModuleButton (this , CUI_RES(RB_MODULE ))
+ , aChangeButton (this , CUI_RES(BTN_ACC_CHANGE ))
+ , aRemoveButton (this , CUI_RES(BTN_ACC_REMOVE ))
+ , aGroupText (this , CUI_RES(TXT_ACC_GROUP ))
+ , pGroupLBox(new SfxConfigGroupListBox_Impl( this, CUI_RES(BOX_ACC_GROUP), SFX_SLOT_ACCELCONFIG ))
+ , aFunctionText (this , CUI_RES(TXT_ACC_FUNCTION ))
+ , pFunctionBox(new SfxConfigFunctionListBox_Impl( this, CUI_RES( BOX_ACC_FUNCTION )))
+ , aKeyText (this , CUI_RES(TXT_ACC_KEY ))
+ , aKeyBox (this , CUI_RES(BOX_ACC_KEY ))
+ , aFunctionsGroup (this , CUI_RES(GRP_ACC_FUNCTIONS ))
+ , aLoadButton (this , CUI_RES(BTN_LOAD ))
+ , aSaveButton (this , CUI_RES(BTN_SAVE ))
+ , aResetButton (this , CUI_RES(BTN_RESET ))
+ , aLoadAccelConfigStr ( CUI_RES( STR_LOADACCELCONFIG ) )
+ , aSaveAccelConfigStr ( CUI_RES( STR_SAVEACCELCONFIG ) )
+ , aFilterAllStr ( CUI_RES( STR_SFX_FILTERNAME_ALL ) )
+ , aFilterCfgStr ( CUI_RES( STR_FILTERNAME_CFG ) )
, m_bStylesInfoInitialized(sal_False)
, m_xGlobal ()
, m_xModule ()
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index df0e0922da12..4c26725a69d9 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -29,7 +29,7 @@
************************************************************************/
// include ---------------------------------------------------------------
#include "helpid.hrc"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
#include "acccfg.hrc"
#define MASKCOLOR MaskColor = \
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5a51d2409e60..8e492e0ebcfa 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -69,14 +69,14 @@
#include <algorithm>
//add
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "cfg.hrc"
#include "helpid.hrc"
#include "acccfg.hxx"
#include "cfg.hxx"
#include "eventdlg.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <comphelper/documentinfo.hxx>
#include <comphelper/processfactory.hxx>
@@ -856,7 +856,7 @@ SvxConfigDialog::SvxConfigDialog(
Window * pParent, const SfxItemSet* pSet_ )
:
SfxTabDialog( pParent,
- SVX_RES( RID_SVXDLG_CUSTOMIZE ), pSet_ )
+ CUI_RES( RID_SVXDLG_CUSTOMIZE ), pSet_ )
{
FreeResource();
@@ -1669,25 +1669,25 @@ void SvxDescriptionEdit::SetNewText( const String& _rText )
SvxConfigPage::SvxConfigPage(
Window *pParent, const SfxItemSet& rSet )
:
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_MENUS ), rSet ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_MENUS ), rSet ),
bInitialised( FALSE ),
pCurrentSaveInData( 0 ),
- aTopLevelSeparator( this, SVX_RES( GRP_MENUS ) ),
- aTopLevelLabel( this, SVX_RES( FT_MENUS ) ),
- aTopLevelListBox( this, SVX_RES( LB_MENUS ) ),
- aNewTopLevelButton( this, SVX_RES( BTN_NEW ) ),
- aModifyTopLevelButton( this, SVX_RES( BTN_CHANGE ) ),
- aContentsSeparator( this, SVX_RES( GRP_MENU_SEPARATOR ) ),
- aContentsLabel( this, SVX_RES( GRP_MENU_ENTRIES ) ),
+ aTopLevelSeparator( this, CUI_RES( GRP_MENUS ) ),
+ aTopLevelLabel( this, CUI_RES( FT_MENUS ) ),
+ aTopLevelListBox( this, CUI_RES( LB_MENUS ) ),
+ aNewTopLevelButton( this, CUI_RES( BTN_NEW ) ),
+ aModifyTopLevelButton( this, CUI_RES( BTN_CHANGE ) ),
+ aContentsSeparator( this, CUI_RES( GRP_MENU_SEPARATOR ) ),
+ aContentsLabel( this, CUI_RES( GRP_MENU_ENTRIES ) ),
aContentsListBox( 0 ),
- aAddCommandsButton( this, SVX_RES( BTN_ADD_COMMANDS ) ),
- aModifyCommandButton( this, SVX_RES( BTN_CHANGE_ENTRY ) ),
- aMoveUpButton( this, SVX_RES( BTN_UP ) ),
- aMoveDownButton( this, SVX_RES( BTN_DOWN ) ),
- aSaveInText( this, SVX_RES( TXT_SAVEIN ) ),
- aSaveInListBox( this, SVX_RES( LB_SAVEIN ) ),
- aDescriptionLabel( this, SVX_RES( FT_DESCRIPTION ) ),
- aDescriptionField( this, SVX_RES( ED_DESCRIPTION ) ),
+ aAddCommandsButton( this, CUI_RES( BTN_ADD_COMMANDS ) ),
+ aModifyCommandButton( this, CUI_RES( BTN_CHANGE_ENTRY ) ),
+ aMoveUpButton( this, CUI_RES( BTN_UP ) ),
+ aMoveDownButton( this, CUI_RES( BTN_DOWN ) ),
+ aSaveInText( this, CUI_RES( TXT_SAVEIN ) ),
+ aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ),
+ aDescriptionLabel( this, CUI_RES( FT_DESCRIPTION ) ),
+ aDescriptionField( this, CUI_RES( ED_DESCRIPTION ) ),
pSelectorDlg( 0 )
{
aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
@@ -2293,7 +2293,7 @@ IMPL_LINK( SvxConfigPage, AsyncInfoMsg, String*, pMsg )
(void)pMsg;
// Asynchronous msg because of D&D
- InfoBox( this, SVX_RES(
+ InfoBox( this, CUI_RES(
IBX_MNUCFG_ALREADY_INCLUDED ) ).Execute();
return 0;
@@ -2397,7 +2397,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(
:
SvxConfigPage( pParent, rSet )
{
- aContentsListBox = new SvxMenuEntriesListBox( this, SVX_RES( BOX_ENTRIES ) );
+ aContentsListBox = new SvxMenuEntriesListBox( this, CUI_RES( BOX_ENTRIES ) );
FreeResource();
PositionContentsListBox();
@@ -2418,7 +2418,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(
aAddCommandsButton.SetClickHdl (
LINK( this, SvxMenuConfigPage, AddCommandsHdl ) );
- PopupMenu* pMenu = new PopupMenu( SVX_RES( MODIFY_MENU ) );
+ PopupMenu* pMenu = new PopupMenu( CUI_RES( MODIFY_MENU ) );
pMenu->SetMenuFlags(
pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
@@ -2426,7 +2426,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(
aModifyTopLevelButton.SetSelectHdl(
LINK( this, SvxMenuConfigPage, MenuSelectHdl ) );
- PopupMenu* pEntry = new PopupMenu( SVX_RES( MODIFY_ENTRY ) );
+ PopupMenu* pEntry = new PopupMenu( CUI_RES( MODIFY_ENTRY ) );
pEntry->SetMenuFlags(
pEntry->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
@@ -2576,7 +2576,7 @@ bool SvxMenuConfigPage::DeleteSelectedContent()
short SvxMenuConfigPage::QueryReset()
{
String msg =
- String( SVX_RES( RID_SVXSTR_CONFIRM_MENU_RESET ) );
+ String( CUI_RES( RID_SVXSTR_CONFIRM_MENU_RESET ) );
String saveInName = aSaveInListBox.GetEntry(
aSaveInListBox.GetSelectEntryPos() );
@@ -2629,11 +2629,11 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
SvxConfigEntry* pMenuData = GetTopLevelSelection();
String aNewName( stripHotKey( pMenuData->GetName() ) );
- String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU );
- pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_MENU ) );
+ pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) );
bool ret = pNameDialog->Execute();
@@ -2687,11 +2687,11 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
case ID_ADD_SUBMENU:
{
String aNewName;
- String aDesc = SVX_RESSSTR( RID_SVXSTR_SUBMENU_NAME );
+ String aDesc = CUI_RESSSTR( RID_SVXSTR_SUBMENU_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU );
- pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_ADD_SUBMENU ) );
+ pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_ADD_SUBMENU ) );
bool ret = pNameDialog->Execute();
@@ -2733,11 +2733,11 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
(SvxConfigEntry*) pActEntry->GetUserData();
String aNewName( stripHotKey( pEntry->GetName() ) );
- String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM );
- pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_MENU ) );
+ pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) );
bool ret = pNameDialog->Execute();
@@ -2813,7 +2813,7 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton )
LINK( this, SvxMenuConfigPage, AddFunctionHdl ) );
pSelectorDlg->SetDialogDescription( String(
- SVX_RES( RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION ) ) );
+ CUI_RES( RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION ) ) );
}
// Position the Script Selector over the Add button so it is
@@ -2841,16 +2841,16 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
Window* pParent, SvxEntries* entries,
SvxConfigEntry* selection, bool bCreateMenu )
:
- ModalDialog( pParent, SVX_RES( MD_MENU_ORGANISER ) ),
- aMenuNameText( this, SVX_RES( TXT_MENU_NAME ) ),
- aMenuNameEdit( this, SVX_RES( EDIT_MENU_NAME ) ),
- aMenuListText( this, SVX_RES( TXT_MENU ) ),
- aMenuListBox( this, SVX_RES( BOX_MAIN_MENUS ) ),
- aMoveUpButton( this, SVX_RES( BTN_MENU_UP ) ),
- aMoveDownButton( this, SVX_RES( BTN_MENU_DOWN ) ),
- aOKButton( this, SVX_RES( BTN_MENU_ADD ) ),
- aCloseButton( this, SVX_RES( BTN_MENU_CLOSE ) ),
- aHelpButton( this, SVX_RES( BTN_MENU_HELP ) ),
+ ModalDialog( pParent, CUI_RES( MD_MENU_ORGANISER ) ),
+ aMenuNameText( this, CUI_RES( TXT_MENU_NAME ) ),
+ aMenuNameEdit( this, CUI_RES( EDIT_MENU_NAME ) ),
+ aMenuListText( this, CUI_RES( TXT_MENU ) ),
+ aMenuListBox( this, CUI_RES( BOX_MAIN_MENUS ) ),
+ aMoveUpButton( this, CUI_RES( BTN_MENU_UP ) ),
+ aMoveDownButton( this, CUI_RES( BTN_MENU_DOWN ) ),
+ aOKButton( this, CUI_RES( BTN_MENU_ADD ) ),
+ aCloseButton( this, CUI_RES( BTN_MENU_CLOSE ) ),
+ aHelpButton( this, CUI_RES( BTN_MENU_HELP ) ),
bModified( FALSE )
{
FreeResource();
@@ -2884,7 +2884,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
{
// Generate custom name for new menu
String prefix =
- String( SVX_RES( RID_SVXSTR_NEW_MENU ) );
+ String( CUI_RES( RID_SVXSTR_NEW_MENU ) );
OUString newname = generateCustomName( prefix, entries );
OUString newurl = generateCustomMenuURL( pEntries );
@@ -2939,7 +2939,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
aMenuNameEdit.Hide();
// change the title
- SetText( SVX_RES( RID_SVXSTR_MOVE_MENU ) );
+ SetText( CUI_RES( RID_SVXSTR_MOVE_MENU ) );
}
aMenuListBox.SetSelectHdl(
@@ -3348,7 +3348,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
{
SetHelpId( HID_SVX_CONFIG_TOOLBAR );
- aContentsListBox = new SvxToolbarEntriesListBox(this, SVX_RES(BOX_ENTRIES));
+ aContentsListBox = new SvxToolbarEntriesListBox(this, CUI_RES(BOX_ENTRIES));
FreeResource();
PositionContentsListBox();
aContentsListBox->SetZOrder( &aAddCommandsButton, WINDOW_ZORDER_BEFOR );
@@ -3361,12 +3361,12 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
aSaveInListBox.SetHelpId( HID_SVX_SAVE_IN );
aTopLevelSeparator.SetText(
- SVX_RES ( RID_SVXSTR_PRODUCTNAME_TOOLBARS ) );
+ CUI_RES ( RID_SVXSTR_PRODUCTNAME_TOOLBARS ) );
- aTopLevelLabel.SetText( SVX_RES( RID_SVXSTR_TOOLBAR ) );
- aModifyTopLevelButton.SetText( SVX_RES( RID_SVXSTR_TOOLBAR ) );
- aContentsSeparator.SetText( SVX_RES( RID_SVXSTR_TOOLBAR_CONTENT ) );
- aContentsLabel.SetText( SVX_RES( RID_SVXSTR_COMMANDS ) );
+ aTopLevelLabel.SetText( CUI_RES( RID_SVXSTR_TOOLBAR ) );
+ aModifyTopLevelButton.SetText( CUI_RES( RID_SVXSTR_TOOLBAR ) );
+ aContentsSeparator.SetText( CUI_RES( RID_SVXSTR_TOOLBAR_CONTENT ) );
+ aContentsLabel.SetText( CUI_RES( RID_SVXSTR_COMMANDS ) );
aTopLevelListBox.SetSelectHdl(
LINK( this, SvxToolbarConfigPage, SelectToolbar ) );
@@ -3386,7 +3386,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
aMoveDownButton.Enable( TRUE );
aMoveUpButton.Enable( TRUE );
- PopupMenu* pMenu = new PopupMenu( SVX_RES( MODIFY_TOOLBAR ) );
+ PopupMenu* pMenu = new PopupMenu( CUI_RES( MODIFY_TOOLBAR ) );
pMenu->SetMenuFlags(
pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
@@ -3395,7 +3395,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
LINK( this, SvxToolbarConfigPage, ToolbarSelectHdl ) );
PopupMenu* pEntry = new PopupMenu(
- SVX_RES( MODIFY_TOOLBAR_CONTENT ) );
+ CUI_RES( MODIFY_TOOLBAR_CONTENT ) );
pEntry->SetMenuFlags(
pEntry->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
@@ -3516,7 +3516,7 @@ bool SvxToolbarConfigPage::DeleteSelectedContent()
GetTopLevelSelection()->IsDeletable() )
{
QueryBox qbox( this,
- SVX_RES( QBX_CONFIRM_DELETE_TOOLBAR ) );
+ CUI_RES( QBX_CONFIRM_DELETE_TOOLBAR ) );
if ( qbox.Execute() == RET_YES )
{
@@ -3571,11 +3571,11 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
case ID_RENAME:
{
String aNewName( stripHotKey( pToolbar->GetName() ) );
- String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR );
- pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
+ pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
bool ret = pNameDialog->Execute();
@@ -3601,7 +3601,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
case ID_DEFAULT_STYLE:
{
QueryBox qbox( this,
- SVX_RES( QBX_CONFIRM_RESTORE_DEFAULT ) );
+ CUI_RES( QBX_CONFIRM_RESTORE_DEFAULT ) );
if ( qbox.Execute() == RET_YES )
{
@@ -3662,11 +3662,11 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
(SvxConfigEntry*) pActEntry->GetUserData();
String aNewName( stripHotKey( pEntry->GetName() ) );
- String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM );
- pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
+ pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
bool ret = pNameDialog->Execute();
@@ -4887,7 +4887,7 @@ void SvxToolbarConfigPage::UpdateButtonStates()
short SvxToolbarConfigPage::QueryReset()
{
String msg =
- String( SVX_RES( RID_SVXSTR_CONFIRM_TOOLBAR_RESET ) );
+ String( CUI_RES( RID_SVXSTR_CONFIRM_TOOLBAR_RESET ) );
String saveInName = aSaveInListBox.GetEntry(
aSaveInListBox.GetSelectEntryPos() );
@@ -4975,7 +4975,7 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton )
(void)pButton;
String prefix =
- String( SVX_RES( RID_SVXSTR_NEW_TOOLBAR ) );
+ String( CUI_RES( RID_SVXSTR_NEW_TOOLBAR ) );
OUString aNewName =
generateCustomName( prefix, GetSaveInData()->GetEntries() );
@@ -5303,14 +5303,14 @@ BOOL SvxToolbarEntriesListBox::NotifyCopying(
SvxNewToolbarDialog::SvxNewToolbarDialog(
Window* pWindow, const String& rName )
:
- ModalDialog ( pWindow, SVX_RES( MD_NEW_TOOLBAR ) ),
- aFtDescription ( this, SVX_RES( FT_NAME ) ),
- aEdtName ( this, SVX_RES( EDT_STRING ) ),
- aSaveInText ( this, SVX_RES( TXT_SAVEIN ) ),
- aBtnOK ( this, SVX_RES( BTN_OK ) ),
- aBtnCancel ( this, SVX_RES( BTN_CANCEL ) ),
- aBtnHelp ( this, SVX_RES( BTN_HELP ) ),
- aSaveInListBox ( this, SVX_RES( LB_SAVEIN ) )
+ ModalDialog ( pWindow, CUI_RES( MD_NEW_TOOLBAR ) ),
+ aFtDescription ( this, CUI_RES( FT_NAME ) ),
+ aEdtName ( this, CUI_RES( EDT_STRING ) ),
+ aSaveInText ( this, CUI_RES( TXT_SAVEIN ) ),
+ aBtnOK ( this, CUI_RES( BTN_OK ) ),
+ aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
+ aBtnHelp ( this, CUI_RES( BTN_HELP ) ),
+ aSaveInListBox ( this, CUI_RES( LB_SAVEIN ) )
{
FreeResource();
@@ -5339,16 +5339,16 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
const uno::Reference< css::ui::XImageManager >& rXImageManager,
const uno::Reference< css::ui::XImageManager >& rXParentImageManager )
:
- ModalDialog ( pWindow, SVX_RES( MD_ICONSELECTOR ) ),
- aFtDescription ( this, SVX_RES( FT_SYMBOLS ) ),
- aTbSymbol ( this, SVX_RES( TB_SYMBOLS ) ),
- aFtNote ( this, SVX_RES( FT_NOTE ) ),
- aBtnOK ( this, SVX_RES( BTN_OK ) ),
- aBtnCancel ( this, SVX_RES( BTN_CANCEL ) ),
- aBtnHelp ( this, SVX_RES( BTN_HELP ) ),
- aBtnImport ( this, SVX_RES( BTN_IMPORT ) ),
- aBtnDelete ( this, SVX_RES( BTN_DELETE ) ),
- aFlSeparator ( this, SVX_RES( FL_SEPARATOR ) ),
+ ModalDialog ( pWindow, CUI_RES( MD_ICONSELECTOR ) ),
+ aFtDescription ( this, CUI_RES( FT_SYMBOLS ) ),
+ aTbSymbol ( this, CUI_RES( TB_SYMBOLS ) ),
+ aFtNote ( this, CUI_RES( FT_NOTE ) ),
+ aBtnOK ( this, CUI_RES( BTN_OK ) ),
+ aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
+ aBtnHelp ( this, CUI_RES( BTN_HELP ) ),
+ aBtnImport ( this, CUI_RES( BTN_IMPORT ) ),
+ aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
+ aFlSeparator ( this, CUI_RES( FL_SEPARATOR ) ),
m_nNextId ( 0 ),
m_xImageManager ( rXImageManager ),
m_xParentImageManager( rXParentImageManager )
@@ -5641,7 +5641,7 @@ IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton )
{
(void)pButton;
- OUString message = String( SVX_RES( RID_SVXSTR_DELETE_ICON_CONFIRM ) );
+ OUString message = String( CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM ) );
bool ret = WarningBox( this, WinBits(WB_OK_CANCEL), message ).Execute();
if ( ret == RET_OK )
@@ -5940,14 +5940,14 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
SvxIconReplacementDialog :: SvxIconReplacementDialog(
Window *pWindow, const rtl::OUString& aMessage, bool /*bYestoAll*/ )
:
-MessBox( pWindow, WB_DEF_YES, String( SVX_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( SVX_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
+MessBox( pWindow, WB_DEF_YES, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
{
SetImage( WarningBox::GetStandardImage() );
SetMessText( ReplaceIconName( aMessage ) );
RemoveButton( 1 );
AddButton( BUTTON_YES, 2, 0 );
- AddButton( String( SVX_RES( RID_SVXSTR_YESTOALL ) ), 5, 0 );
+ AddButton( String( CUI_RES( RID_SVXSTR_YESTOALL ) ), 5, 0 );
AddButton( BUTTON_NO, 3, 0 );
AddButton( BUTTON_CANCEL, 4, 0 );
}
@@ -5955,7 +5955,7 @@ MessBox( pWindow, WB_DEF_YES, String( SVX_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM )
SvxIconReplacementDialog :: SvxIconReplacementDialog(
Window *pWindow, const rtl::OUString& aMessage )
:
-MessBox( pWindow, WB_YES_NO_CANCEL, String( SVX_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( SVX_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
+MessBox( pWindow, WB_YES_NO_CANCEL, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
{
SetImage( WarningBox::GetStandardImage() );
SetMessText( ReplaceIconName( aMessage ));
@@ -5964,7 +5964,7 @@ MessBox( pWindow, WB_YES_NO_CANCEL, String( SVX_RES( RID_SVXSTR_REPLACE_ICON_CON
rtl::OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMessage )
{
rtl::OUString name;
- rtl::OUString message = String( SVX_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) );
+ rtl::OUString message = String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) );
rtl::OUString placeholder = OUString::createFromAscii( "%ICONNAME" );
sal_Int32 pos = message.indexOf( placeholder );
if ( pos != -1 )
@@ -5988,11 +5988,11 @@ USHORT SvxIconReplacementDialog :: ShowDialog()
SvxIconChangeDialog::SvxIconChangeDialog(
Window *pWindow, const rtl::OUString& aMessage)
:
- ModalDialog ( pWindow, SVX_RES( MD_ICONCHANGE ) ),
- aFImageInfo (this, SVX_RES( FI_INFO ) ),
- aBtnOK (this, SVX_RES(MD_BTN_OK)),
- aDescriptionLabel (this, SVX_RES(FTCHGE_DESCRIPTION)),
- aLineEditDescription (this, SVX_RES(EDT_ADDR))
+ ModalDialog ( pWindow, CUI_RES( MD_ICONCHANGE ) ),
+ aFImageInfo (this, CUI_RES( FI_INFO ) ),
+ aBtnOK (this, CUI_RES(MD_BTN_OK)),
+ aDescriptionLabel (this, CUI_RES(FTCHGE_DESCRIPTION)),
+ aLineEditDescription (this, CUI_RES(EDT_ADDR))
{
FreeResource();
aFImageInfo.SetImage(InfoBox::GetStandardImage());
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 69f1ccc9c61f..15ac23125668 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "cfg.hrc"
#include "helpid.hrc"
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index dcd348fe4f8b..37b2b9a54ab0 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -60,7 +60,7 @@
#include <basic/sbmod.hxx>
#include <basic/basmgr.hxx>
#include <tools/urlobj.hxx>
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
#include <sfx2/app.hxx>
#include <sfx2/macrconf.hxx>
#include <sfx2/minfitem.hxx>
@@ -70,7 +70,7 @@
#include <rtl/ustrbuf.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <unotools/configmgr.hxx>
-#include "svx/dialmgr.hxx"
+#include "dialmgr.hxx"
#include <svl/stritem.hxx>
#define _SVSTDARR_STRINGSDTOR
@@ -550,26 +550,26 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
};
SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
- Resource(SVX_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
- m_hdImage(SVX_RES(IMG_HARDDISK)),
- m_hdImage_hc(SVX_RES(IMG_HARDDISK_HC)),
- m_libImage(SVX_RES(IMG_LIB)),
- m_libImage_hc(SVX_RES(IMG_LIB_HC)),
- m_macImage(SVX_RES(IMG_MACRO)),
- m_macImage_hc(SVX_RES(IMG_MACRO_HC)),
- m_docImage(SVX_RES(IMG_DOC)),
- m_docImage_hc(SVX_RES(IMG_DOC_HC)),
- m_sMyMacros(String(SVX_RES(STR_MYMACROS))),
- m_sProdMacros(String(SVX_RES(STR_PRODMACROS))),
- m_sMacros(String(SVX_RES(STR_BASICMACROS))),
- m_sDlgMacros(String(SVX_RES(STR_DLG_MACROS))),
- m_aHumanAppName(String(SVX_RES(STR_HUMAN_APPNAME))),
- m_aStrGroupStyles(String(SVX_RES(STR_GROUP_STYLES))),
- m_aScriptType(String(SVX_RES(STR_BASICNAME))),
- m_collapsedImage(SVX_RES(BMP_COLLAPSED)),
- m_collapsedImage_hc(SVX_RES(BMP_COLLAPSED_HC)),
- m_expandedImage(SVX_RES(BMP_EXPANDED)),
- m_expandedImage_hc(SVX_RES(BMP_EXPANDED_HC))
+ Resource(CUI_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
+ m_hdImage(CUI_RES(IMG_HARDDISK)),
+ m_hdImage_hc(CUI_RES(IMG_HARDDISK_HC)),
+ m_libImage(CUI_RES(IMG_LIB)),
+ m_libImage_hc(CUI_RES(IMG_LIB_HC)),
+ m_macImage(CUI_RES(IMG_MACRO)),
+ m_macImage_hc(CUI_RES(IMG_MACRO_HC)),
+ m_docImage(CUI_RES(IMG_DOC)),
+ m_docImage_hc(CUI_RES(IMG_DOC_HC)),
+ m_sMyMacros(String(CUI_RES(STR_MYMACROS))),
+ m_sProdMacros(String(CUI_RES(STR_PRODMACROS))),
+ m_sMacros(String(CUI_RES(STR_BASICMACROS))),
+ m_sDlgMacros(String(CUI_RES(STR_DLG_MACROS))),
+ m_aHumanAppName(String(CUI_RES(STR_HUMAN_APPNAME))),
+ m_aStrGroupStyles(String(CUI_RES(STR_GROUP_STYLES))),
+ m_aScriptType(String(CUI_RES(STR_BASICNAME))),
+ m_collapsedImage(CUI_RES(BMP_COLLAPSED)),
+ m_collapsedImage_hc(CUI_RES(BMP_COLLAPSED_HC)),
+ m_expandedImage(CUI_RES(BMP_EXPANDED)),
+ m_expandedImage_hc(CUI_RES(BMP_EXPANDED_HC))
{
FreeResource();
}
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index f103bc077d7f..7f90560d5ab1 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -57,8 +57,8 @@
#include "headertablistbox.hxx"
#include "macropg_impl.hxx"
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include "eventdlg.hrc"
#include "helpid.hrc"
#include "selector.hxx"
@@ -71,21 +71,21 @@ using namespace ::com::sun::star;
SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, SvxEventConfigPage::EarlyInit ) :
- _SvxMacroTabPage( pParent, SVX_RES(RID_SVXPAGE_EVENTS), rSet ),
- aSaveInText( this, SVX_RES( TXT_SAVEIN ) ),
- aSaveInListBox( this, SVX_RES( LB_SAVEIN ) ),
+ _SvxMacroTabPage( pParent, CUI_RES(RID_SVXPAGE_EVENTS), rSet ),
+ aSaveInText( this, CUI_RES( TXT_SAVEIN ) ),
+ aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ),
bAppConfig ( TRUE )
{
- mpImpl->pStrEvent = new String( SVX_RES( STR_EVENT ));
- mpImpl->pAssignedMacro = new String( SVX_RES( STR_ASSMACRO ));
- mpImpl->pEventLB = new _HeaderTabListBox( this, SVX_RES( LB_EVENT ));
- mpImpl->pAssignFT = new FixedText( this, SVX_RES( FT_ASSIGN ));
- mpImpl->pAssignPB = new PushButton( this, SVX_RES( PB_ASSIGN ));
- mpImpl->pDeletePB = new PushButton( this, SVX_RES( PB_DELETE ));
- mpImpl->pMacroImg = new Image( SVX_RES( IMG_MACRO) );
- mpImpl->pComponentImg = new Image( SVX_RES( IMG_COMPONENT) );
- mpImpl->pMacroImg_h = new Image( SVX_RES( IMG_MACRO_H) );
- mpImpl->pComponentImg_h = new Image( SVX_RES( IMG_COMPONENT_H) );
+ mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ));
+ mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ));
+ mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ));
+ mpImpl->pAssignFT = new FixedText( this, CUI_RES( FT_ASSIGN ));
+ mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ));
+ mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ));
+ mpImpl->pMacroImg = new Image( CUI_RES( IMG_MACRO) );
+ mpImpl->pComponentImg = new Image( CUI_RES( IMG_COMPONENT) );
+ mpImpl->pMacroImg_h = new Image( CUI_RES( IMG_MACRO_H) );
+ mpImpl->pComponentImg_h = new Image( CUI_RES( IMG_COMPONENT_H) );
FreeResource();
diff --git a/cui/source/customize/eventdlg.hrc b/cui/source/customize/eventdlg.hrc
index 245ff183313e..6340186d527c 100644
--- a/cui/source/customize/eventdlg.hrc
+++ b/cui/source/customize/eventdlg.hrc
@@ -32,7 +32,7 @@
////DF temp to figure out what's needed from these
//DF #include "sfx.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "macropg.hrc"
#define TXT_SAVEIN 10
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index d215de1ee9fb..f5110321fdc9 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -45,15 +45,15 @@
#include <sfx2/sfxdefs.hxx>
#include <com/sun/star/container/NoSuchElementException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "selector.hxx"
#include "cfg.hxx"
#include "macropg.hrc"
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "headertablistbox.hxx"
#include "macropg_impl.hxx"
-
+#include <svx/dialogs.hrc>
#include <comphelper/namedvaluecollection.hxx>
#include <algorithm>
@@ -569,7 +569,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
}
::rtl::OUString eventURL = h_it->second.second;
- String displayName( SVX_RES( displayableEvent->nEventResourceID ) );
+ String displayName( CUI_RES( displayableEvent->nEventResourceID ) );
displayName += '\t';
SvLBoxEntry* _pE = rListBox.InsertEntry( displayName );
@@ -841,19 +841,19 @@ Any _SvxMacroTabPage::GetPropsByName( const ::rtl::OUString& eventName, EventsHa
}
SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, Reference< container::XNameReplace > xNameReplace, sal_uInt16 nSelectedIndex )
- : _SvxMacroTabPage( pParent, SVX_RES( RID_SVXPAGE_MACROASSIGN ), rSet )
+ : _SvxMacroTabPage( pParent, CUI_RES( RID_SVXPAGE_MACROASSIGN ), rSet )
{
- mpImpl->pStrEvent = new String( SVX_RES( STR_EVENT ) );
- mpImpl->pAssignedMacro = new String( SVX_RES( STR_ASSMACRO ) );
- mpImpl->pEventLB = new _HeaderTabListBox( this, SVX_RES( LB_EVENT ) );
- mpImpl->pAssignFT = new FixedText( this, SVX_RES( FT_ASSIGN ) );
- mpImpl->pAssignPB = new PushButton( this, SVX_RES( PB_ASSIGN ) );
- mpImpl->pDeletePB = new PushButton( this, SVX_RES( PB_DELETE ) );
- mpImpl->pAssignComponentPB = new PushButton( this, SVX_RES( PB_ASSIGN_COMPONENT ) );
- mpImpl->pMacroImg = new Image( SVX_RES(IMG_MACRO) );
- mpImpl->pComponentImg = new Image( SVX_RES(IMG_COMPONENT) );
- mpImpl->pMacroImg_h = new Image( SVX_RES(IMG_MACRO_H) );
- mpImpl->pComponentImg_h = new Image( SVX_RES(IMG_COMPONENT_H) );
+ mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ) );
+ mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ) );
+ mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ) );
+ mpImpl->pAssignFT = new FixedText( this, CUI_RES( FT_ASSIGN ) );
+ mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ) );
+ mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ) );
+ mpImpl->pAssignComponentPB = new PushButton( this, CUI_RES( PB_ASSIGN_COMPONENT ) );
+ mpImpl->pMacroImg = new Image( CUI_RES(IMG_MACRO) );
+ mpImpl->pComponentImg = new Image( CUI_RES(IMG_COMPONENT) );
+ mpImpl->pMacroImg_h = new Image( CUI_RES(IMG_MACRO_H) );
+ mpImpl->pComponentImg_h = new Image( CUI_RES(IMG_COMPONENT_H) );
FreeResource();
@@ -921,12 +921,12 @@ IMPL_LINK(AssignComponentDialog, ButtonHandler, Button *, EMPTYARG)
}
AssignComponentDialog::AssignComponentDialog( Window * pParent, const ::rtl::OUString& rURL )
- : ModalDialog( pParent, SVX_RES( RID_SVXDLG_ASSIGNCOMPONENT ) )
- , maMethodLabel( this, SVX_RES( FT_METHOD ) )
- , maMethodEdit( this, SVX_RES( EDIT_METHOD ) )
- , maOKButton( this, SVX_RES( RID_PB_OK ) )
- , maCancelButton( this, SVX_RES( RID_PB_CANCEL ) )
- , maHelpButton( this, SVX_RES( RID_PB_HELP ) )
+ : ModalDialog( pParent, CUI_RES( RID_SVXDLG_ASSIGNCOMPONENT ) )
+ , maMethodLabel( this, CUI_RES( FT_METHOD ) )
+ , maMethodEdit( this, CUI_RES( EDIT_METHOD ) )
+ , maOKButton( this, CUI_RES( RID_PB_OK ) )
+ , maCancelButton( this, CUI_RES( RID_PB_CANCEL ) )
+ , maHelpButton( this, CUI_RES( RID_PB_HELP ) )
, maURL( rURL )
{
FreeResource();
diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
index 92e1e718ba61..c5db4bab6af7 100644
--- a/cui/source/customize/macropg.src
+++ b/cui/source/customize/macropg.src
@@ -30,8 +30,9 @@
#include <sfx2/sfx.hrc>
#include "macropg.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
#define MASKCOLOR MaskColor = \
Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index c202d6ad2584..865ff5625b53 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -34,10 +34,10 @@
#include <vcl/msgbox.hxx>
#include <vcl/metric.hxx>
#include "selector.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "selector.hrc"
#include <svx/fmresids.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <sfx2/app.hxx>
#include <sfx2/msg.hxx>
#include <sfx2/msgpool.hxx>
@@ -266,7 +266,7 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl(
SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
- ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
+ ImageList aNavigatorImages( CUI_RES( RID_SVXIMGLIST_FMEXPL ) );
SetNodeBitmaps(
aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
@@ -614,7 +614,7 @@ void SvxConfigGroupListBox_Impl::Init()
new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, rootNode );
String aTitle =
- String( SVX_RES( STR_SELECTOR_MACROS ) );
+ String( CUI_RES( STR_SELECTOR_MACROS ) );
SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
pNewEntry->SetUserData( pInfo );
@@ -1006,21 +1006,21 @@ void SvxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
SvxScriptSelectorDialog::SvxScriptSelectorDialog(
Window* pParent, BOOL bShowSlots, const Reference< frame::XFrame >& xFrame )
:
- ModelessDialog( pParent, SVX_RES( RID_DLG_SCRIPTSELECTOR ) ),
- aDialogDescription( this, SVX_RES( TXT_SELECTOR_DIALOG_DESCRIPTION ) ),
- aGroupText( this, SVX_RES( TXT_SELECTOR_CATEGORIES ) ),
- aCategories( this, SVX_RES( BOX_SELECTOR_CATEGORIES ), bShowSlots, xFrame ),
- aFunctionText( this, SVX_RES( TXT_SELECTOR_COMMANDS ) ),
- aCommands( this, SVX_RES( BOX_SELECTOR_COMMANDS ) ),
- aOKButton( this, SVX_RES( BTN_SELECTOR_OK ) ),
- aCancelButton( this, SVX_RES( BTN_SELECTOR_CANCEL ) ),
- aHelpButton( this, SVX_RES( BTN_SELECTOR_HELP ) ),
- aDescription( this, SVX_RES( GRP_SELECTOR_DESCRIPTION ) ),
- aDescriptionText( this, SVX_RES( TXT_SELECTOR_DESCRIPTION ) ),
+ ModelessDialog( pParent, CUI_RES( RID_DLG_SCRIPTSELECTOR ) ),
+ aDialogDescription( this, CUI_RES( TXT_SELECTOR_DIALOG_DESCRIPTION ) ),
+ aGroupText( this, CUI_RES( TXT_SELECTOR_CATEGORIES ) ),
+ aCategories( this, CUI_RES( BOX_SELECTOR_CATEGORIES ), bShowSlots, xFrame ),
+ aFunctionText( this, CUI_RES( TXT_SELECTOR_COMMANDS ) ),
+ aCommands( this, CUI_RES( BOX_SELECTOR_COMMANDS ) ),
+ aOKButton( this, CUI_RES( BTN_SELECTOR_OK ) ),
+ aCancelButton( this, CUI_RES( BTN_SELECTOR_CANCEL ) ),
+ aHelpButton( this, CUI_RES( BTN_SELECTOR_HELP ) ),
+ aDescription( this, CUI_RES( GRP_SELECTOR_DESCRIPTION ) ),
+ aDescriptionText( this, CUI_RES( TXT_SELECTOR_DESCRIPTION ) ),
m_bShowSlots( bShowSlots )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
// If we are showing Slot API commands update labels in the UI, and
// enable drag'n'drop
@@ -1207,7 +1207,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton )
void
SvxScriptSelectorDialog::SetRunLabel()
{
- aOKButton.SetText( String( SVX_RES( STR_SELECTOR_RUN ) ) );
+ aOKButton.SetText( String( CUI_RES( STR_SELECTOR_RUN ) ) );
}
void
diff --git a/cui/source/customize/selector.src b/cui/source/customize/selector.src
index de972cdebc01..3985975fb4cf 100644
--- a/cui/source/customize/selector.src
+++ b/cui/source/customize/selector.src
@@ -28,7 +28,7 @@
*
************************************************************************/
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "selector.hrc"
#define MASKCOLOR MaskColor = \
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
{
diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx
new file mode 100644
index 000000000000..b46f4bca2f56
--- /dev/null
+++ b/cui/source/factory/cuiresmgr.cxx
@@ -0,0 +1,53 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: dialmgr.cxx,v $
+ * $Revision: 1.9 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_cui.hxx"
+
+// include ---------------------------------------------------------------
+
+#include <dialmgr.hxx>
+#include <tools/rc.hxx>
+#include <svl/solar.hrc>
+#include <vcl/svapp.hxx>
+
+static ResMgr* pResMgr=0;
+
+// struct DialogsResMgr --------------------------------------------------
+ResMgr* CuiResMgr::GetResMgr()
+{
+ if ( !pResMgr )
+ {
+ ByteString aName( "cui" );
+ pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILocale() );
+ }
+
+ return pResMgr;
+}
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 14b15e50192a..75c0c1a0f8c8 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -37,8 +37,8 @@
#include <sfx2/basedlgs.hxx>
#include <sfx2/app.hxx>
#include <sfx2/request.hxx>
+#include <cuires.hrc>
#include <svx/dialogs.hrc>
-
#include "numfmt.hxx"
#include "optimprove.hxx"
#include "splitcelldlg.hxx"
@@ -210,12 +210,12 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
-//add by CHINA001
+
const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
-//add by CHINA001
+
void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
{
pDlg->SetInputSet( pInSet );
@@ -230,7 +230,6 @@ String AbstractTabDialog_Impl::GetText() const
return pDlg->GetText();
}
-// AbstractTabDialog_Impl end
const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const
{
@@ -247,7 +246,6 @@ String AbstractSfxDialog_Impl::GetText() const
return pDlg->GetText();
}
-//for SvxDistributeDialog begin
SvxDistributeHorizontal AbstractSvxDistributeDialog_Impl::GetDistributeHor()const
{
return pDlg->GetDistributeHor();
@@ -256,9 +254,7 @@ SvxDistributeVertical AbstractSvxDistributeDialog_Impl::GetDistributeVer()const
{
return pDlg->GetDistributeVer();
}
-//for SvxDistributeDialog end
-// for HangulHanjaConversionDialog begin
void AbstractHangulHanjaConversionDialog_Impl::EndDialog(long nResult)
{
pDlg->EndDialog(nResult);
@@ -392,16 +388,11 @@ ULONG AbstractPasteDialog_Impl::GetFormat( const TransferableDataHelper& aHelper
return pDlg->GetFormat( aHelper, pFormats, pDesc );
}
-// for HangulHanjaConversionDialog end
-// for FmShowColsDialog begin
void AbstractFmShowColsDialog_Impl::SetColumns(const ::Reference< ::com::sun::star::container::XIndexContainer>& xCols)
{
pDlg->SetColumns(xCols);
}
-//for FmShowColsDialog end
-
-//for SvxZoomDialog begin
void AbstractSvxZoomDialog_Impl::SetLimits( USHORT nMin, USHORT nMax )
{
pDlg->SetLimits( nMin, nMax );
@@ -417,74 +408,31 @@ const SfxItemSet* AbstractSvxZoomDialog_Impl::GetOutputItemSet() const
return pDlg->GetOutputItemSet();
}
-//for SvxZoomDialog end
-// svx::SvxSpellDialog
-/*-- 04.05.2004 08:26:12---------------------------------------------------
-
- -----------------------------------------------------------------------*/
void AbstractSpellDialog_Impl::SetLanguage( sal_uInt16 nLang )
{
pDlg->SetLanguage(nLang);
}
-/*-- 04.05.2004 08:26:13---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool AbstractSpellDialog_Impl::Close()
{
return pDlg->Close();
}
-/*-- 04.05.2004 08:26:13---------------------------------------------------
- -----------------------------------------------------------------------*/
void AbstractSpellDialog_Impl::Invalidate()
{
pDlg->InvalidateDialog();
}
-/*-- 04.05.2004 08:26:13---------------------------------------------------
- -----------------------------------------------------------------------*/
Window* AbstractSpellDialog_Impl::GetWindow()
{
return pDlg;
}
-/*-- 04.05.2004 08:26:13---------------------------------------------------
- -----------------------------------------------------------------------*/
SfxBindings& AbstractSpellDialog_Impl::GetBindings()
{
return pDlg->GetBindings();
}
-// end svx::SvxSpellDialog
-
-//for SvxSpellCheckDialog begin
-//STRIP001 void AbstractSvxSpellCheckDialog_Impl::SetNewEditWord( const String& _rNew )
-//STRIP001 {
-//STRIP001 return pDlg->SetNewEditWord(_rNew );
-//STRIP001 }
-//STRIP001
-//STRIP001 void AbstractSvxSpellCheckDialog_Impl::SetLanguage( sal_uInt16 nLang )
-//STRIP001 {
-//STRIP001 return pDlg->SetLanguage( nLang );
-//STRIP001 }
-//STRIP001
-//STRIP001 void AbstractSvxSpellCheckDialog_Impl::HideAutoCorrect()
-//STRIP001 {
-//STRIP001 return pDlg->HideAutoCorrect();
-//STRIP001 }
-//STRIP001
-//STRIP001 String AbstractSvxSpellCheckDialog_Impl::GetNewEditWord()
-//STRIP001 {
-//STRIP001 return pDlg->GetNewEditWord();
-//STRIP001 }
-//STRIP001
-//STRIP001 void AbstractSvxSpellCheckDialog_Impl::SetNewEditWord( const String& _rNew )
-//STRIP001 {
-//STRIP001 return pDlg->SetNewEditWord( _rNew );
-//STRIP001 }
-//STRIP001
-//for SvxSpellCheckDialog end
-
-//for SearchProgress begin
+
void AbstractSearchProgress_Impl::Update()
{
pDlg->Update();
@@ -508,9 +456,7 @@ PLinkStub AbstractSearchProgress_Impl::GetLinkStubCleanUpHdl()
{
return SearchProgress::LinkStubCleanUpHdl;
}
-//for SearchProgress end
-//for TakeProgress begin
void AbstractTakeProgress_Impl::Update()
{
pDlg->Update();
@@ -530,23 +476,17 @@ PLinkStub AbstractTakeProgress_Impl::GetLinkStubCleanUpHdl()
{
return TakeProgress::LinkStubCleanUpHdl;
}
-//for TakeProgress end
-//for TitleDialog begin
String AbstractTitleDialog_Impl::GetTitle() const
{
return pDlg->GetTitle();
}
-//for TitleDialog end
-//for GalleryIdDialog begin
ULONG AbstractGalleryIdDialog_Impl::GetId() const
{
return pDlg->GetId();
}
-//for GalleryIdDialog end
-//for VclAbstracRefreshableDialog begin
void VclAbstractRefreshableDialog_Impl::Update()
{
pDlg->Update();
@@ -556,9 +496,7 @@ void VclAbstractRefreshableDialog_Impl::Sync()
{
pDlg-> Sync();
}
-//for VclAbstracRefreshableDialog end
-//for URLDlg begin
String AbstractURLDlg_Impl::GetURL() const
{
return pDlg->GetURL();
@@ -583,9 +521,6 @@ String AbstractURLDlg_Impl::GetName() const
{
return pDlg->GetName();
}
-//for URLDlg end
-
-// AbstractSvxHlinkDlgMarkWnd_Impl begin
void AbstractSvxHlinkDlgMarkWnd_Impl::Hide( USHORT nFlags )
{
@@ -637,9 +572,6 @@ USHORT AbstractSvxHlinkDlgMarkWnd_Impl::SetError( USHORT nError)
return pDlg->SetError(nError);
}
-// AbstractSvxHlinkDlgMarkWnd_Impl end
-
-//for SvxSearchSimilarityDialog begin
USHORT AbstractSvxSearchSimilarityDialog_Impl::GetOther()
{
return pDlg->GetOther();
@@ -659,7 +591,6 @@ BOOL AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed()
{
return pDlg-> IsRelaxed();
}
-//for SvxSearchSimilarityDialog end
// AbstractSvxTransformTabDialog implementations just forwards everything to the dialog
void AbstractSvxTransformTabDialog_Impl::SetCurPageId( USHORT nId )
@@ -693,7 +624,6 @@ void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link& rL
{
pDlg->SetValidateFramePosLink( rLink );
}
-// AbstractSvxTransformTabDialog end
// AbstractSvxCaptionDialog implementations just forwards everything to the dialog
void AbstractSvxCaptionDialog_Impl::SetCurPageId( USHORT nId )
@@ -727,16 +657,12 @@ void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link& rLink )
{
pDlg->SetValidateFramePosLink( rLink );
}
-// SvxAbstractCaptionDialog end
-//for SvxJSearchOptionsDialog begin
INT32 AbstractSvxJSearchOptionsDialog_Impl::GetTransliterationFlags() const
{
return pDlg->GetTransliterationFlags();
}
-//for SvxJSearchOptionsDialog end
-//for FmInputRecordNoDialog begin
void AbstractFmInputRecordNoDialog_Impl::SetValue(long nNew)
{
pDlg->SetValue(nNew);
@@ -746,21 +672,18 @@ long AbstractFmInputRecordNoDialog_Impl::GetValue() const
{
return pDlg->GetValue();
}
-//for FmInputRecordNoDialog end
-//for SvxNewDictionaryDialog begin
::Reference<
::com::sun::star::linguistic2::XDictionary > AbstractSvxNewDictionaryDialog_Impl::GetNewDictionary()
{
return pDlg->GetNewDictionary();
}
-//for SvxNewDictionaryDialog end
-//for SvxNameDialog begin
void AbstractSvxNameDialog_Impl::GetName( String& rName )
{
pDlg->GetName( rName );
}
+
void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheckImmediately )
{
aCheckNameHdl = rLink;
@@ -787,10 +710,6 @@ IMPL_LINK( AbstractSvxNameDialog_Impl, CheckNameHdl, Window*, EMPTYARG )
return aCheckNameHdl.Call(this);
return 0;
}
-//for SvxNameDialog end
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
void AbstractSvxObjectNameDialog_Impl::GetName(String& rName)
{
@@ -821,9 +740,6 @@ IMPL_LINK(AbstractSvxObjectNameDialog_Impl, CheckNameHdl, Window*, EMPTYARG)
return 0;
}
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
-
void AbstractSvxObjectTitleDescDialog_Impl::GetTitle(String& rTitle)
{
pDlg->GetTitle(rTitle);
@@ -834,16 +750,11 @@ void AbstractSvxObjectTitleDescDialog_Impl::GetDescription(String& rDescription)
pDlg->GetDescription(rDescription);
}
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-//for SvxMessDialog begin
void AbstractSvxMessDialog_Impl::SetButtonText( USHORT nBtnId, const String& rNewTxt )
{
pDlg->SetButtonText( nBtnId, rNewTxt );
}
-//for SvxMessDialog end
-//for SvxMultiPathDialog begin
String AbstractSvxMultiPathDialog_Impl::GetPath() const
{
return pDlg->GetPath();
@@ -863,9 +774,7 @@ void AbstractSvxMultiPathDialog_Impl::SetTitle( const String& rNewTitle )
{
pDlg->SetText( rNewTitle );
}
-//for SvxMultiPathDialog end
-//for SvxMultiFileDialog begin
String AbstractSvxMultiFileDialog_Impl::GetPath() const
{
return pDlg->GetPath();
@@ -905,9 +814,7 @@ void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId )
{
pDlg->SetHelpId( nHelpId );
}
-//for SvxMultiFileDialog end
-//for SvxHpLinkDlg begin
Window * AbstractSvxHpLinkDlg_Impl::GetWindow()
{
return (Window *)pDlg;
@@ -917,10 +824,8 @@ sal_Bool AbstractSvxHpLinkDlg_Impl::QueryClose()
{
return pDlg->QueryClose();
}
-//for SvxHpLinkDlg end
-//for FmSearchDialog begin
void AbstractFmSearchDialog_Impl::SetFoundHandler(const Link& lnk)
{
pDlg->SetFoundHandler(lnk);
@@ -933,14 +838,11 @@ void AbstractFmSearchDialog_Impl::SetActiveField(const String& strField)
{
pDlg->SetActiveField(strField);
}
-//for FmSearchDialog end
-//for GraphicFilterDialog begin
Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY )
{
return pDlg->GetFilteredGraphic( rGraphic, fScaleX, fScaleY );
}
-//for GraphicFilterDialog end
// AbstractSvxAreaTabDialog implementations just forwards everything to the dialog
void AbstractSvxAreaTabDialog_Impl::SetCurPageId( USHORT nId )
@@ -952,12 +854,12 @@ const SfxItemSet* AbstractSvxAreaTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
-//add by CHINA001
+
const USHORT* AbstractSvxAreaTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
-//add by CHINA001
+
void AbstractSvxAreaTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
{
pDlg->SetInputSet( pInSet );
@@ -976,9 +878,7 @@ void AbstractSvxAreaTabDialog_Impl::DontDeleteColorTable()
{
return pDlg->DontDeleteColorTable();
}
-// AbstractSvxAreaTabDialog_Impl end
-// add SvxPostItDialog begin
void AbstractSvxPostItDialog_Impl::SetText( const XubString& rStr )
{
pDlg->SetText( rStr );
@@ -1052,9 +952,6 @@ Window * AbstractSvxPostItDialog_Impl::GetWindow()
return (Window *)pDlg;
}
-// SvxPostItDialog end
-
-//--------------------------------------------------------------
// Create dialogs with simplest interface
VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, sal_uInt32 nResId )
{
@@ -1178,84 +1075,36 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR
// TabDialog that use functionality of the drawing layer
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* pParent,
const SfxItemSet* pAttrSet,
- sal_uInt32 nResId,
SdrView* pView,
SdrModel* )
{
- SfxTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_TEXT :
- pDlg = new SvxTextTabDialog( pParent, pAttrSet, pView );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractTabDialog_Impl( pDlg );
- return 0;
+ SfxTabDialog* pDlg = new SvxTextTabDialog( pParent, pAttrSet, pView );
+ return new AbstractTabDialog_Impl( pDlg );
}
//TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog CHINA001
AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( Window* pParent,
const SdrView* pView,
- sal_uInt32 nResId,
USHORT nAnchorTypes )
{
- SvxCaptionTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_CAPTION :
- pDlg = new SvxCaptionTabDialog( pParent, pView, nAnchorTypes );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxCaptionDialog_Impl( pDlg );
- return 0;
+ SvxCaptionTabDialog* pDlg = new SvxCaptionTabDialog( pParent, pView, nAnchorTypes );
+ return new AbstractSvxCaptionDialog_Impl( pDlg );
}
AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(Window* pParent,
const SfxItemSet& rAttr,
- sal_uInt32 nResId,
SvxDistributeHorizontal eHor ,
SvxDistributeVertical eVer)
{
- SvxDistributeDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXPAGE_DISTRIBUTE :
- pDlg = new SvxDistributeDialog( pParent, rAttr, eHor, eVer);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxDistributeDialog_Impl( pDlg );
- return 0;
+ SvxDistributeDialog* pDlg = new SvxDistributeDialog( pParent, rAttr, eHor, eVer);
+ return new AbstractSvxDistributeDialog_Impl( pDlg );
}
AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(Window* pParent,
- HangulHanjaConversion::ConversionDirection _ePrimaryDirection,
- sal_uInt32 nResId)
+ HangulHanjaConversion::ConversionDirection _ePrimaryDirection )
{
- HangulHanjaConversionDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVX_MDLG_HANGULHANJA :
- pDlg = new HangulHanjaConversionDialog( pParent, _ePrimaryDirection);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractHangulHanjaConversionDialog_Impl( pDlg );
- return 0;
+ HangulHanjaConversionDialog* pDlg = new HangulHanjaConversionDialog( pParent, _ePrimaryDirection);
+ return new AbstractHangulHanjaConversionDialog_Impl( pDlg );
}
AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( Window* pParent )
@@ -1264,27 +1113,12 @@ AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( W
return new AbstractFmShowColsDialog_Impl( pDlg );
}
AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog
- const SfxItemSet& rCoreSet,
- sal_uInt32 nResId)
+ const SfxItemSet& rCoreSet)
{
- SvxZoomDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_ZOOM :
- pDlg = new SvxZoomDialog( pParent, rCoreSet);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxZoomDialog_Impl( pDlg );
- return 0;
+ SvxZoomDialog* pDlg = new SvxZoomDialog( pParent, rCoreSet);
+ return new AbstractSvxZoomDialog_Impl( pDlg );
}
-/*-- 04.05.2004 08:18:17---------------------------------------------------
-
- -----------------------------------------------------------------------*/
AbstractSpellDialog * AbstractDialogFactory_Impl::CreateSvxSpellDialog(
Window* pParent,
SfxBindings* pBindings,
@@ -1294,7 +1128,6 @@ AbstractSpellDialog * AbstractDialogFactory_Impl::CreateSvxSpellDialog(
return new AbstractSpellDialog_Impl(pDlg);
}
-//CHINA001 GalleryDialog start
VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm )
{
Dialog* pDlg = new ActualizeProgress( pParent, pThm);
@@ -1392,9 +1225,7 @@ AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( Window* pParent,
URLDlg* pDlg = new URLDlg( pParent, rURL, rAltText, rDescription, rTarget, rName, rTargetList);
return new AbstractURLDlg_Impl( pDlg );
}
-//CHINA001 URLDlg end
-//CHINA001 SvxHlinkDlgMarkWnd begin
AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId )
{
SvxHlinkDlgMarkWnd* pDlg=NULL;
@@ -1411,7 +1242,6 @@ AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWnd
return new AbstractSvxHlinkDlgMarkWnd_Impl( pDlg );
return 0;
}
-//CHINA001 SvxHlinkDlgMarkWnd end
SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32 nResId,
Window* pParent,
@@ -1432,9 +1262,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32 nResI
return new AbstractSfxDialog_Impl( pDlg );
return 0;
}
-//CHINA001 SvxCharacterMap end
-//CHINA001 SvxSearchFormatDialog begin
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* pParent,
const SfxItemSet& rSet,
sal_uInt32 nResId)
@@ -1453,31 +1281,15 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* p
return new AbstractTabDialog_Impl( pDlg );
return 0;
}
-//CHINA001 SvxSearchFormatDialog end
-//CHINA001 SvxSearchAttributeDialog begin
VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( Window* pParent,
SearchAttrItemList& rLst,
- const USHORT* pWhRanges,
- sal_uInt32 nResId ) //add for SvxSearchAttributeDialog
+ const USHORT* pWhRanges )
{
- Dialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_SEARCHATTR :
- pDlg = new SvxSearchAttributeDialog( pParent, rLst, pWhRanges);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new VclAbstractDialog_Impl( pDlg );
- return 0;
+ Dialog* pDlg = new SvxSearchAttributeDialog( pParent, rLst, pWhRanges);
+ return new VclAbstractDialog_Impl( pDlg );
}
-//CHINA001 SvxSearchAttributeDialog end
-//CHINA001 SvxSearchSimilarityDialog begin
AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( Window* pParent,
BOOL bRelax,
USHORT nOther,
@@ -1489,55 +1301,24 @@ AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchS
return new AbstractSvxSearchSimilarityDialog_Impl( pDlg );
return NULL;
}
-//CHINA001 SvxSearchSimilarityDialog end
-//CHINA001 SvxBorderBackgroundDlg begin
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( Window* pParent,
const SfxItemSet& rCoreSet,
- sal_uInt32 nResId,
BOOL bEnableSelector)
{
- SfxTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_BBDLG :
- pDlg = new SvxBorderBackgroundDlg( pParent, rCoreSet, bEnableSelector);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractTabDialog_Impl( pDlg );
- return 0;
+ SfxTabDialog* pDlg = new SvxBorderBackgroundDlg( pParent, rCoreSet, bEnableSelector);
+ return new AbstractTabDialog_Impl( pDlg );
}
-//CHINA001 SvxBorderBackgroundDlg end
-//CHINA001 SvxTransformTabDialog begin
AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pView,
- sal_uInt32 nResId,
USHORT nAnchorTypes )
{
- SvxTransformTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_TRANSFORM :
- pDlg = new SvxTransformTabDialog( pParent, pAttr,pView, nAnchorTypes);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxTransformTabDialog_Impl( pDlg );
- return 0;
+ SvxTransformTabDialog* pDlg = new SvxTransformTabDialog( pParent, pAttr,pView, nAnchorTypes);
+ return new AbstractSvxTransformTabDialog_Impl( pDlg );
}
-//CHINA001 SvxTransformTabDialog end
-
-//CHINA001 SchTransformTabDialog begin
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView,
@@ -1569,39 +1350,21 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W
return new AbstractTabDialog_Impl( pDlg );
return 0;
}
-//CHINA001 SchTransformTabDialog end
-//CHINA001 SvxJSearchOptionsDialog begin
AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( Window* pParent,
- const SfxItemSet& rOptionsSet, USHORT nUniqueId,
- INT32 nInitialFlags,
- sal_uInt32 nResId)
+ const SfxItemSet& rOptionsSet,
+ INT32 nInitialFlags)
{
- SvxJSearchOptionsDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXPAGE_JSEARCH_OPTIONS :
- pDlg = new SvxJSearchOptionsDialog( pParent, rOptionsSet, nUniqueId, nInitialFlags );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxJSearchOptionsDialog_Impl( pDlg );
- return 0;
+ SvxJSearchOptionsDialog* pDlg = new SvxJSearchOptionsDialog( pParent, rOptionsSet, nInitialFlags );
+ return new AbstractSvxJSearchOptionsDialog_Impl( pDlg );
}
-//CHINA001 SvxJSearchOptionsDialog end
-//CHINA001 FmInputRecordNoDialog begin
AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( Window* pParent )
{
FmInputRecordNoDialog* pDlg = new FmInputRecordNoDialog( pParent );
return new AbstractFmInputRecordNoDialog_Impl( pDlg );
}
-//CHINA001 FmInputRecordNoDialog end
-//CHINA001 SvxNewDictionaryDialog begin
AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( Window* pParent,
::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl,
sal_uInt32 nResId )
@@ -1620,9 +1383,7 @@ AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDiction
return new AbstractSvxNewDictionaryDialog_Impl( pDlg );
return 0;
}
-//CHINA001 SvxNewDictionaryDialog end
-//CHINA001 SvxEditDictionaryDialog begin
VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent,
const String& rName,
::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
@@ -1642,52 +1403,24 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialo
return new VclAbstractDialog_Impl( pDlg );
return 0;
}
-//CHINA001 SvxEditDictionaryDialog end
-//CHINA001 SvxNameDialog begin
AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( Window* pParent,
- const String& rName, const String& rDesc,
- sal_uInt32 nResId )
+ const String& rName, const String& rDesc )
{
- SvxNameDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_NAME :
- pDlg = new SvxNameDialog( pParent, rName, rDesc );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxNameDialog_Impl( pDlg );
- return 0;
+ SvxNameDialog* pDlg = new SvxNameDialog( pParent, rName, rDesc );
+ return new AbstractSvxNameDialog_Impl( pDlg );
}
-//CHINA001 SvxNameDialog end
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
-AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(Window* pParent, const String& rName, sal_uInt32 nResId)
+AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(Window* pParent, const String& rName )
{
- return ((RID_SVXDLG_OBJECT_NAME == nResId)
- ? new AbstractSvxObjectNameDialog_Impl(new SvxObjectNameDialog(pParent, rName))
- : NULL);
+ return new AbstractSvxObjectNameDialog_Impl(new SvxObjectNameDialog(pParent, rName));
}
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
-
-AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription, sal_uInt32 nResId)
+AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription)
{
- return ((RID_SVXDLG_OBJECT_TITLE_DESC == nResId)
- ? new AbstractSvxObjectTitleDescDialog_Impl(new SvxObjectTitleDescDialog(pParent, rTitle, rDescription))
- : NULL);
+ return new AbstractSvxObjectTitleDescDialog_Impl(new SvxObjectTitleDescDialog(pParent, rTitle, rDescription));
}
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-//CHINA001 SvxMessDialog begin
AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
const String& rText, const String& rDesc, Image* pImg )
{
@@ -1705,49 +1438,19 @@ AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window*
return new AbstractSvxMessDialog_Impl( pDlg );
return 0;
}
-//CHINA001 SvxMessDialog end
-//CHINA001 SvxMultiPathDialog begin
-AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, sal_uInt32 nResId,
- BOOL bEmptyAllowed )
+AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed )
{
- SvxMultiPathDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_MULTIPATH :
- pDlg = new SvxMultiPathDialog( pParent, bEmptyAllowed );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxMultiPathDialog_Impl( pDlg );
- return 0;
+ SvxMultiPathDialog* pDlg = new SvxMultiPathDialog( pParent, bEmptyAllowed );
+ return new AbstractSvxMultiPathDialog_Impl( pDlg );
}
-//CHINA001 SvxMultiPathDialog end
-//CHINA001 SvxMultiFileDialog begin
-AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, sal_uInt32 nResId,
- BOOL bEmptyAllowed )
+AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed )
{
- SvxMultiFileDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_MULTIPATH :
- pDlg = new SvxMultiFileDialog( pParent, bEmptyAllowed );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxMultiFileDialog_Impl( pDlg );
- return 0;
+ SvxMultiFileDialog* pDlg = new SvxMultiFileDialog( pParent, bEmptyAllowed );
+ return new AbstractSvxMultiFileDialog_Impl( pDlg );
}
-//CHINA001 SvxMultiFileDialog end
-//CHINA001 SvxHpLinkDlg begin
AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* pParent, //add for SvxMultiFileDialog
SfxBindings* pBindings,
sal_uInt32 nResId)
@@ -1766,9 +1469,7 @@ AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* p
return new AbstractSvxHpLinkDlg_Impl( pDlg );
return 0;
}
-//CHINA001 SvxHpLinkDlg end
-//CHINA001 FmSearchDialog begin
AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
const String& strInitialText,
const ::std::vector< String >& _rContexts,
@@ -1781,32 +1482,16 @@ AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window
return 0;
}
-//CHINA001 FmSearchDialog end
-
-//CHINA001 GraphicFilterEmboss begin
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss
const Graphic& rGraphic,
RECT_POINT eLightSource,
- sal_uInt32 nResId)
+ sal_uInt32)
{
- GraphicFilterDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVX_GRFFILTER_DLG_EMBOSS :
- pDlg = new GraphicFilterEmboss( pParent, rGraphic, eLightSource );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractGraphicFilterDialog_Impl( pDlg );
- return 0;
+ GraphicFilterDialog* pDlg = new GraphicFilterEmboss( pParent, rGraphic, eLightSource );
+ return new AbstractGraphicFilterDialog_Impl( pDlg );
}
-//CHINA001 GraphicFilterEmboss end
-//CHINA001 GraphicFilterPoster & GraphicFilterSepia begin
-AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia
+AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPosterSepia (Window* pParent,
const Graphic& rGraphic,
USHORT nCount,
sal_uInt32 nResId)
@@ -1829,31 +1514,15 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPos
return new AbstractGraphicFilterDialog_Impl( pDlg );
return 0;
}
-//CHINA001 GraphicFilterPoster & GraphicFilterSepia end
-//CHINA001 GraphicFilterSolarize begin
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize
const Graphic& rGraphic,
- BYTE nGreyThreshold, BOOL bInvert,
- sal_uInt32 nResId)
+ BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 )
{
- GraphicFilterDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVX_GRFFILTER_DLG_SOLARIZE :
- pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractGraphicFilterDialog_Impl( pDlg );
- return 0;
+ GraphicFilterDialog* pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert );
+ return new AbstractGraphicFilterDialog_Impl( pDlg );
}
-//CHINA001 GraphicFilterSolarize end
-//CHINA001 GraphicFilterMosaic begin
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic
const Graphic& rGraphic,
USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges,
@@ -1873,51 +1542,24 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMos
return new AbstractGraphicFilterDialog_Impl( pDlg );
return 0;
}
-//CHINA001 GraphicFilterMosaic end
-//CHINA001 SvxAreaTabDialog begin
+
AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
- sal_uInt32 nResId,
const SdrView* pSdrView )
{
- SvxAreaTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_AREA :
- pDlg = new SvxAreaTabDialog( pParent, pAttr, pModel,pSdrView );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxAreaTabDialog_Impl( pDlg );
- return 0;
+ SvxAreaTabDialog* pDlg = new SvxAreaTabDialog( pParent, pAttr, pModel,pSdrView );
+ return new AbstractSvxAreaTabDialog_Impl( pDlg );
}
-//CHINA001 SvxAreaTabDialog end
-//CHINA001 SvxLineTabDialog begin
+
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
SdrModel* pModel,
- sal_uInt32 nResId,
const SdrObject* pObj ,
BOOL bHasObj)
{
- SfxTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_LINE :
- pDlg = new SvxLineTabDialog( pParent, pAttr, pModel,pObj,bHasObj );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractTabDialog_Impl( pDlg );
- return 0;
+ SfxTabDialog* pDlg = new SvxLineTabDialog( pParent, pAttr, pModel,pObj,bHasObj );
+ return new AbstractTabDialog_Impl( pDlg );
}
-//CHINA001 SvxLineTabDialog end
SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
const SfxItemSet& rAttr,
@@ -1946,7 +1588,6 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
return 0;
}
-//CHINA001 SvxMeasureDialog & SvxConnectionDialog begin
SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
const SfxItemSet& rAttr,
const SdrView* pView,
@@ -1982,27 +1623,13 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
return 0;
}
-//CHINA001 SvxPostItDialog begin
AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Window* pParent,
const SfxItemSet& rCoreSet,
- sal_uInt32 nResId,
BOOL bPrevNext, BOOL bRedline )
{
- SvxPostItDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_POSTIT :
- pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext, bRedline );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxPostItDialog_Impl( pDlg );
- return 0;
+ SvxPostItDialog* pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext, bRedline );
+ return new AbstractSvxPostItDialog_Impl( pDlg );
}
-//CHINA001 SvxPostItDialog end
class SvxMacroAssignDialog : public VclAbstractDialog
{
@@ -2120,18 +1747,12 @@ CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
return 0;
}
-CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorFunc(USHORT nId )
-{
- switch ( nId )
- {
- case RID_SVXPAGE_DISTRIBUTE:
- return SvxDistributePage::Create;
- default:
- break;
- }
- return 0;
+CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorFunc()
+{
+ return SvxDistributePage::Create;
}
+
DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc( USHORT nId )
{
switch ( nId )
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index e6b956d580af..eb3c7b932597 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -611,7 +611,6 @@ public:
const String *pUserButtonText=0 );
virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent,
const SfxItemSet* pAttrSet,
- sal_uInt32 nResId,
SdrView* pView,
SdrModel* pModel=0 ); //add for SvxTextTabDialog
virtual SfxAbstractTabDialog* CreateTabItemDialog( Window* pParent,
@@ -619,11 +618,9 @@ public:
sal_uInt32 nResId); //add by CHINA001
virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent,
const SdrView* pView,
- sal_uInt32 nResId,
USHORT nAnchorTypes = 0 ); //add for SvxCaptionTabDialog CHINA001
virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent,
const SfxItemSet& rAttr,
- sal_uInt32 nResId,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
SvxDistributeVertical eVer = SvxDistributeVerticalNone);
virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId,
@@ -635,21 +632,17 @@ public:
virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::SvLinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0 );
virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog CHINA001
- HangulHanjaConversion::ConversionDirection _ePrimaryDirection,
- sal_uInt32 nResId);
+ HangulHanjaConversion::ConversionDirection _ePrimaryDirection );
virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ); //add for FmShowColsDialog
virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog
- const SfxItemSet& rCoreSet,
- sal_uInt32 nResId);
+ const SfxItemSet& rCoreSet);
virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg
const SfxItemSet& rCoreSet,
- sal_uInt32 nResId,
BOOL bEnableSelector = FALSE) ;
virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog
const SfxItemSet* pAttr,
const SdrView* pView,
- sal_uInt32 nResId,
USHORT nAnchorTypes = 0) ;
virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, //add for SchTransformTabDialog
const SfxItemSet* pAttr,
@@ -686,17 +679,15 @@ public:
virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent,
SearchAttrItemList& rLst,
- const USHORT* pWhRanges,
- sal_uInt32 nResId ); //add for SvxSearchAttributeDialog
+ const USHORT* pWhRanges);
virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent,
BOOL bRelax,
USHORT nOther,
USHORT nShorter,
USHORT nLonger); //add for SvxSearchSimilarityDialog
virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent,
- const SfxItemSet& rOptionsSet, USHORT nUniqueId,
- INT32 nInitialFlags,
- sal_uInt32 nResId); //add for SvxJSearchOptionsDialog
+ const SfxItemSet& rOptionsSet,
+ INT32 nInitialFlags);
virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent );
virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent,
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl,
@@ -706,63 +697,52 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
sal_uInt32 nResId);//add for SvxEditDictionaryDialog
virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent,
- const String& rName, const String& rDesc,
- sal_uInt32 nResId ); //add for SvxNameDialog
-
+ const String& rName, const String& rDesc );
// #i68101#
- virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName, sal_uInt32 nResId);
- virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription, sal_uInt32 nResId);
+ virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName );
+ virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription);
- virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
+ virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
const String& rText, const String& rDesc,
Image* pImg = NULL ); //add for SvxMessDialog
- virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_uInt32 nResId,
- BOOL bEmptyAllowed = FALSE ); //add for SvxMultiPathDialog
- virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_uInt32 nResId,
- BOOL bEmptyAllowed = FALSE ); //add for SvxMultiFileDialog
+ virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiPathDialog
+ virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiFileDialog
virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxHpLink
SfxBindings* pBindings,
sal_uInt32 nResId);
- virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
+ virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
const String& strInitialText,
const ::std::vector< String >& _rContexts,
sal_Int16 nInitialContext,
const Link& lnkContextSupplier);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss
const Graphic& rGraphic,
- RECT_POINT eLightSource,
- sal_uInt32 nResId);
+ RECT_POINT eLightSource, sal_uInt32 nResId);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia
const Graphic& rGraphic,
USHORT nCount,
sal_uInt32 nResId);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize
const Graphic& rGraphic,
- BYTE nGreyThreshold, BOOL bInvert,
- sal_uInt32 nResId);
+ BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic
const Graphic& rGraphic,
- USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges,
- sal_uInt32 nResId);
+ USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId);
virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
const SfxItemSet* pAttr,
SdrModel* pModel,
- sal_uInt32 nResId,
const SdrView* pSdrView = NULL ); //add for SvxAreaTabDialog
virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add for SvxLineTabDialog
SdrModel* pModel,
- sal_uInt32 nResId,
const SdrObject* pObj = NULL,
BOOL bHasObj = TRUE );
virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
const SfxItemSet& rCoreSet,
- sal_uInt32 nResId,
BOOL bPrevNext = FALSE, BOOL bRedline = FALSE );
// For TabPage
virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId );
- virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc(USHORT nId );
-
+ virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc();
virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId );
virtual DialogGetRanges GetDialogGetRangesFunc( USHORT nId ); //add for SvxPostItDialog
diff --git a/cui/source/factory/makefile.mk b/cui/source/factory/makefile.mk
index 81d1562ec835..cb374cd26aea 100755
--- a/cui/source/factory/makefile.mk
+++ b/cui/source/factory/makefile.mk
@@ -47,6 +47,7 @@ CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/i
SLOFILES+=\
$(SLO)$/dlgfact.obj \
$(SLO)$/cuiexp.obj \
+ $(SLO)$/cuiresmgr.obj \
$(SLO)$/init.obj \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
new file mode 100644
index 000000000000..ffc098fd57cb
--- /dev/null
+++ b/cui/source/inc/cuires.hrc
@@ -0,0 +1,431 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: dialogs.hrc,v $
+ * $Revision: 1.15 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _CUI_RESID_HRC
+#define _CUI_REDID_HRC
+
+// include ------------------------------------------------------------------
+
+#include <sfx2/sfx.hrc>
+#include <svx/svxids.hrc>
+#include <sfx2/dialogs.hrc>
+
+// Resource-Id's ------------------------------------------------------------
+
+// Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
+#define RID_SVX_FIRSTFREE 305
+
+// Gallery
+#define RID_CUI_GALLERY_START (RID_SVX_START + 360)
+#define RID_CUI_GALLERY_END (RID_SVX_START + 410)
+
+// tab pages
+// used in "dialogs"
+#define RID_SVX_FORMAT_CELLS_DLG ( RID_SVX_START + 42 )
+
+// used in "tabpages"
+#define RID_SVXDLG_TEXT (RID_SVX_START + 183)
+#define RID_SVXDLG_TRANSFORM (RID_SVX_START + 45)
+#define RID_SVXDLG_LINE (RID_SVX_START + 50)
+#define RID_SVXDLG_BBDLG (RID_SVX_START + 40)
+#define RID_SVXDLG_CAPTION (RID_SVX_START + 151)
+#define RID_SVXDLG_AREA (RID_SVX_START + 55)
+#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142)
+#define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 143)
+#define RID_SVXSTR_TABLE_PRESET_NONE (RID_SVX_START + 969)
+#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER (RID_SVX_START + 970)
+#define RID_SVXSTR_TABLE_PRESET_OUTERHORI (RID_SVX_START + 971)
+#define RID_SVXSTR_TABLE_PRESET_OUTERALL (RID_SVX_START + 972)
+#define RID_SVXSTR_TABLE_PRESET_OUTERINNER (RID_SVX_START + 973)
+#define RID_SVXSTR_PARA_PRESET_DIAGONAL (RID_SVX_START + 974)
+#define RID_SVXSTR_PARA_PRESET_ALL (RID_SVX_START + 975)
+#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT (RID_SVX_START + 976)
+#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM (RID_SVX_START + 977)
+#define RID_SVXSTR_PARA_PRESET_ONLYLEFT (RID_SVX_START + 978)
+#define RID_SVXSTR_SHADOW_STYLE_NONE (RID_SVX_START + 979)
+#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT (RID_SVX_START + 980)
+#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT (RID_SVX_START + 981)
+#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT (RID_SVX_START + 982)
+#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT (RID_SVX_START + 983)
+#define RID_SVXSTR_HOR_PRESET_ONLYHOR (RID_SVX_START + 1113)
+#define RID_SVXSTR_VER_PRESET_ONLYVER (RID_SVX_START + 1114)
+#define RID_SVXSTR_FRAMEDIR_LTR (RID_SVX_START + 960)
+#define RID_SVXSTR_FRAMEDIR_RTL (RID_SVX_START + 961)
+#define RID_SVXSTR_FRAMEDIR_SUPER (RID_SVX_START + 962)
+#define RID_SVXSTR_PAGEDIR_LTR_HORI (RID_SVX_START + 965)
+#define RID_SVXSTR_PAGEDIR_RTL_HORI (RID_SVX_START + 966)
+#define RID_SVXSTR_PAGEDIR_RTL_VERT (RID_SVX_START + 967)
+#define RID_SVXSTR_PAGEDIR_LTR_VERT (RID_SVX_START + 968)
+#define RID_STR_EDIT_GRAPHIC (RID_SVX_START + 509)
+#define RID_SVXIMG_LOAD_H (RID_SVX_START + 283)
+#define RID_SVXIMG_SAVE_H (RID_SVX_START + 284)
+
+#define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163)
+#define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165)
+#define RID_SVXSTR_ASK_CHANGE_GRADIENT (RID_SVX_START + 166)
+#define RID_SVXSTR_ASK_DEL_BITMAP (RID_SVX_START + 171)
+#define RID_SVXSTR_ASK_CHANGE_BITMAP (RID_SVX_START + 172)
+#define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168)
+#define RID_SVXSTR_DESC_EXT_BITMAP (RID_SVX_START + 169)
+#define RID_SVXSTR_DESC_LINESTYLE (RID_SVX_START + 174)
+#define RID_SVXSTR_ASK_DEL_LINESTYLE (RID_SVX_START + 176)
+#define RID_SVXSTR_ASK_CHANGE_LINESTYLE (RID_SVX_START + 177)
+#define RID_SVXSTR_DESC_HATCH (RID_SVX_START + 232)
+#define RID_SVXSTR_ASK_DEL_HATCH (RID_SVX_START + 234)
+#define RID_SVXSTR_ASK_CHANGE_HATCH (RID_SVX_START + 235)
+#define RID_SVXSTR_CHANGE (RID_SVX_START + 181)
+#define RID_SVXSTR_ADD (RID_SVX_START + 182)
+#define RID_SVXSTR_DESC_COLOR (RID_SVX_START + 215)
+#define RID_SVXSTR_ASK_DEL_COLOR (RID_SVX_START + 217)
+#define RID_SVXSTR_ASK_CHANGE_COLOR (RID_SVX_START + 218)
+#define RID_SVXSTR_TABLE (RID_SVX_START + 220)
+#define RID_SVXSTR_WRITE_DATA_ERROR (RID_SVX_START + 229)
+#define RID_SVXSTR_READ_DATA_ERROR (RID_SVX_START + 230)
+#define RID_SVXSTR_WARN_TABLE_OVERWRITE (RID_SVX_START + 231)
+#define RID_SVXSTR_ASK_CHANGE_LINEEND (RID_SVX_START + 184)
+#define RID_SVXSTR_ASK_DEL_LINEEND (RID_SVX_START + 219)
+#define RID_SVXSTR_DESC_LINEEND (RID_SVX_START + 238)
+#define RID_SVXSTR_WARN_NAME_DUPLICATE (RID_SVX_START + 236)
+
+// autocor
+#define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
+#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102)
+#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110)
+#define RID_OFAPAGE_AUTOCORR_REPLACE (RID_OFA_START + 103)
+#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104)
+#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109)
+#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111)
+
+// options
+#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162)
+#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122)
+#define QUERY_DELETE_CONFIRM (RID_SVX_START + 1110)
+#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840)
+#define DLG_DOCUMENTLINK (RID_OFA_START + 124)
+#define STR_LINKEDDOC_DOESNOTEXIST (RID_SVX_START + 1111)
+#define STR_LINKEDDOC_NO_SYSTEM_FILE (RID_SVX_START + 1169)
+#define STR_NAME_CONFLICT (RID_SVX_START + 1112)
+#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18)
+
+// treeopt
+#define RID_SVXPAGE_COLOR (RID_SVX_START + 60)
+#define RID_SVXPAGE_SSO (RID_SVX_START + 251)
+#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE ( RID_OFA_START + 256 )
+#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116)
+#define RID_OFADLG_OPTIONS_TREE (RID_OFA_START + 115)
+#define RID_IMGLIST_TREEOPT (RID_OFA_START + 174)
+#define RID_IMGLIST_TREEOPT_HC (RID_OFA_START + 175)
+#define RID_RIDER_SLL_SITE (RID_OFA_START + 100)//?
+#define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101)//?
+#define RID_OFADLG_OPTIONS_TREE_HINT (RID_OFA_START + 118)//?
+
+// options
+#define RID_SVXDLG_WEBCONNECTION_INFO (RID_SVX_START + 301)
+#define RID_SVXDLG_SECURITY_OPTIONS (RID_SVX_START + 300)
+#define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298)
+#define OFA_TP_MEMORY (RID_OFA_START + 250)
+#define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200)
+#define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160)
+#define RID_SVXPAGE_INET_PROXY (RID_SVX_START + 157)
+#define RID_SVXPAGE_INET_MAIL (RID_SVX_START + 155)
+#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161)
+#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100)
+#define OFA_TP_LANGUAGES (RID_OFA_START + 205)
+#define OFA_TP_MISC (RID_OFA_START + 200)
+#define OFA_TP_VIEW (RID_OFA_START + 202)
+#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120)
+#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121)
+#define RID_OFAPAGE_SMARTTAG_OPTIONS (RID_OFA_START + 125)
+#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252)
+#define RID_SVXPAGE_OPTIONS_JAVA (RID_SVX_START + 253)
+#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
+#define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246)
+#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
+#define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249)
+#define RID_SVXQB_DELETE_COLOR_CONFIG (RID_SVX_START + 324)
+#define RID_SVXSTR_COLOR_CONFIG_SAVE1 (RID_SVX_START + 853)
+#define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854)
+#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855)
+#define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320)
+#define RID_SVX_MSGBOX_LANGUAGE_RESTART ( RID_SVX_START + 2 )
+#define RID_SVXERR_OPT_PROXYPORTS (RID_SVX_START + 224)
+#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE (RID_SVX_START + 225)
+#define RID_SVXDLG_JAVA_PARAMETER (RID_SVX_START + 254)
+#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255)
+#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256)
+#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257)
+#define RID_SVX_MSGBOX_JAVA_RESTART ( RID_SVX_START + 0 )
+#define RID_SVX_MSGBOX_JAVA_RESTART2 ( RID_SVX_START + 1 )
+#define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830)
+#define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831)
+#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
+#define RID_SVXDLG_FILTER_WARNING (RID_SVX_START + 248)
+#define RID_SVXBMP_LOCK (RID_SVX_START + 118)
+#define RID_SVXBMP_LOCK_HC (RID_SVX_START + 119)
+#define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026)
+#define RID_SVXQB_CHANGEDATA (RID_SVX_START + 214) //?
+#define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) //?
+#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //?
+#define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)//?
+#define RID_SVXSTR_KEY_LINGUISTIC_DIR (RID_SVX_START + 1016)//?
+#define RID_SVXSTR_KEY_USERCONFIG_PATH (RID_SVX_START + 1023)//?
+#define RID_SVXSTR_KEY_FILTER_PATH (RID_SVX_START + 1012)//?
+#define RID_SVXSTR_KEY_ADDINS_PATH (RID_SVX_START + 1003)//?
+#define RID_SVXSTR_KEY_FAVORITES_DIR (RID_SVX_START + 1011)//?
+#define RID_SVXSTR_KEY_PLUGINS_PATH (RID_SVX_START + 1019)//?
+#define RID_SVXSTR_KEY_TEMP_PATH (RID_SVX_START + 1021)//?
+#define RID_SVXSTR_KEY_STORAGE_DIR (RID_SVX_START + 1020)//?
+#define RID_SVXSTR_KEY_GALLERY_DIR (RID_SVX_START + 1013)//?
+#define RID_SVXSTR_KEY_HELP_DIR (RID_SVX_START + 1015)//?
+#define RID_SVXSTR_KEY_GLOSSARY_PATH (RID_SVX_START + 1005)//?
+#define RID_SVXSTR_KEY_TEMPLATE_PATH (RID_SVX_START + 1022)//?
+#define RID_SVXSTR_KEY_MODULES_PATH (RID_SVX_START + 1017)//?
+#define RID_SVXSTR_KEY_BACKUP_PATH (RID_SVX_START + 1006)//?
+#define RID_SVXSTR_KEY_PALETTE_PATH (RID_SVX_START + 1018)//?
+#define RID_SVXSTR_KEY_CONFIG_DIR (RID_SVX_START + 1009)//?
+#define RID_SVXSTR_KEY_WORK_PATH (RID_SVX_START + 1024)//?
+#define RID_SVXSTR_KEY_GRAPHICS_PATH (RID_SVX_START + 1014)//?
+#define RID_SVXSTR_KEY_BASIC_PATH (RID_SVX_START + 1007)//?
+#define RID_SVXSTR_KEY_BITMAP_PATH (RID_SVX_START + 1008)//?
+#define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025)//?
+
+// dialogs
+#define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 )
+#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337)
+#define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22)
+
+// hyperlink dialog
+#define RID_SVXDLG_NEWHYPERLINK (RID_SVX_START + 227)
+#define RID_SVXBMP_HLINETTP_H (RID_SVX_START + 272)
+#define RID_SVXBMP_HLMAILTP_H (RID_SVX_START + 273)
+#define RID_SVXBMP_HLDOCTP_H (RID_SVX_START + 274)
+#define RID_SVXBMP_HLDOCNTP_H (RID_SVX_START + 275)
+#define RID_SVXBMP_HLINETTP (RID_SVX_START + 556)
+#define RID_SVXBMP_HLMAILTP (RID_SVX_START + 557)
+#define RID_SVXBMP_HLDOCTP (RID_SVX_START + 558)
+#define RID_SVXBMP_HLDOCNTP (RID_SVX_START + 559)
+#define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228)
+#define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229)
+#define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230)
+#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231)
+#define RID_SVXSTR_HYPERDLG_HLINETTP (RID_SVX_START + 581)
+#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP (RID_SVX_START + 582)
+#define RID_SVXSTR_HYPERDLG_HLMAILTP (RID_SVX_START + 583)
+#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP (RID_SVX_START + 584)
+#define RID_SVXSTR_HYPERDLG_HLDOCTP (RID_SVX_START + 585)
+#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP (RID_SVX_START + 586)
+#define RID_SVXSTR_HYPERDLG_HLDOCNTP (RID_SVX_START + 587)
+#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP (RID_SVX_START + 588)
+#define RID_SVXSTR_HYPDLG_APPLYBUT (RID_SVX_START + 548)
+#define RID_SVXSTR_HYPDLG_CLOSEBUT (RID_SVX_START + 549)
+#define RID_SVXSTR_HYPDLG_NOVALIDFILENAME (RID_SVX_START + 553)
+#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE (RID_SVX_START + 815)
+#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES (RID_SVX_START + 800)
+#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801)
+#define RID_SVXFLOAT_HYPERLINK_MARKWND (RID_SVX_START + 232)
+#define RID_SVXSTR_HYPDLG_MACROACT1 (RID_SVX_START + 550)
+#define RID_SVXSTR_HYPDLG_MACROACT2 (RID_SVX_START + 551)
+#define RID_SVXSTR_HYPDLG_MACROACT3 (RID_SVX_START + 552)
+#define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813)
+#define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814)
+
+// imap dialog
+#define RID_SVX_IMAPDLG_START (RID_SVX_START + 100)
+#define RID_SVXDLG_IMAPURL (RID_SVX_IMAPDLG_START + 2)
+
+// name dialog
+#define RID_SVXDLG_NAME (RID_SVX_START + 62)
+#define RID_SVXDLG_MESSBOX (RID_SVX_START + 63)
+#define RID_SVXDLG_OBJECT_NAME (RID_SVX_START + 64)
+#define RID_SVXDLG_OBJECT_TITLE_DESC (RID_SVX_START + 67)
+
+// hangulhanja
+#define RID_SVX_MDLG_HANGULHANJA (RID_SVX_START + 1 )
+#define RID_SVX_MDLG_HANGULHANJA_OPT ( RID_SVX_START + 4 )
+#define RID_SVX_MDLG_HANGULHANJA_EDIT ( RID_SVX_START + 5 )
+#define RID_SVX_MDLG_HANGULHANJA_NEWDICT ( RID_SVX_START + 6 )
+
+// icon choice
+#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580)
+
+// insert rows&cols
+#define DLG_INS_ROW_COL (RID_SVX_START + 156)
+
+// SvxMultiFileDialog
+#define RID_SVXSTR_FILE_TITLE (RID_SVX_START + 482)
+#define RID_SVXSTR_FILE_HEADLINE (RID_SVX_START + 483)
+#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484)
+#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485)
+#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486)
+
+// multi path dialog
+#define RID_SVXDLG_MULTIPATH (RID_SVX_START + 201)
+#define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207)
+
+// new table dialog
+#define RID_SVX_NEWTABLE_DLG ( RID_SVX_START + 44 )
+
+// script organizer
+#define RID_DLG_SCRIPTORGANIZER (RID_SVX_START + 258)
+#define RID_DLG_NEWLIB (RID_SVX_START + 290)
+#define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027)
+#define RID_SVXSTR_DELQUERY_TITLE (RID_SVX_START + 1028)
+#define RID_SVXSTR_DELFAILED (RID_SVX_START + 1029)
+#define RID_SVXSTR_DELFAILEDPERM (RID_SVX_START + 1030)
+#define RID_SVXSTR_DELFAILED_TITLE (RID_SVX_START + 1031)
+#define RID_SVXSTR_CREATEFAILED (RID_SVX_START + 1032)
+#define RID_SVXSTR_CREATEFAILEDPERM (RID_SVX_START + 1033)
+#define RID_SVXSTR_CREATEFAILEDDUP (RID_SVX_START + 1034)
+#define RID_SVXSTR_CREATEFAILED_TITLE (RID_SVX_START + 1035)
+#define RID_SVXSTR_RENAMEFAILED (RID_SVX_START + 1036)
+#define RID_SVXSTR_RENAMEFAILEDPERM (RID_SVX_START + 1037)
+#define RID_SVXSTR_RENAMEFAILED_TITLE (RID_SVX_START + 1038)
+#define RID_SVXSTR_ERROR_TITLE (RID_SVX_START + 1100)
+#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED (RID_SVX_START + 1101)
+#define RID_SVXSTR_ERROR_RUNNING (RID_SVX_START + 1102)
+#define RID_SVXSTR_EXCEPTION_RUNNING (RID_SVX_START + 1103)
+#define RID_SVXSTR_ERROR_AT_LINE (RID_SVX_START + 1104)
+#define RID_SVXSTR_EXCEPTION_AT_LINE (RID_SVX_START + 1105)
+#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING (RID_SVX_START + 1106)
+#define RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE (RID_SVX_START + 1107)
+#define RID_SVXSTR_ERROR_TYPE_LABEL (RID_SVX_START + 1108)
+#define RID_SVXSTR_ERROR_MESSAGE_LABEL (RID_SVX_START + 1109)
+
+// spell check dialog
+#define RID_SVXDLG_SPELLCHECK (RID_SVX_START + 32)
+
+// split cells
+#define RID_SVX_SPLITCELLDLG ( RID_SVX_START + 43 )
+
+// searching
+#define RID_SVXDLG_SEARCHSIMILARITY (RID_SVX_START + 23)
+
+// customize
+
+#define RID_SVXDLG_CUSTOMIZE (RID_SVX_START + 291)
+#define RID_SVXPAGE_MENUS (RID_SVX_START + 292)
+#define RID_SVXPAGE_KEYBOARD (RID_SVX_START + 293)
+#define RID_SVXPAGE_TOOLBARS (RID_SVX_START + 294)
+#define RID_SVXPAGE_EVENTS (RID_SVX_START + 295)
+#define RID_SVXPAGE_CONFIGGROUPBOX (RID_SVX_START + 304)
+#define RID_SVXDLG_ASSIGNCOMPONENT (RID_SVX_START + 297)
+#define RID_DLG_SCRIPTSELECTOR (RID_SVX_START + 259)
+#define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039)
+#define RID_SVXSTR_NEW_TOOLBAR (RID_SVX_START + 1040)
+#define RID_SVXSTR_MOVE_MENU (RID_SVX_START + 1041)
+#define RID_SVXSTR_ADD_SUBMENU (RID_SVX_START + 1048)
+#define RID_SVXSTR_SUBMENU_NAME (RID_SVX_START + 1049)
+#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050)
+#define RID_SVXSTR_IMPORT_ICON_ERROR (RID_SVX_START + 1117)
+#define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355
+#define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355
+#define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355
+#define RID_SVXSTR_YESTOALL (RID_SVX_START + 1166) //added for issue73355
+#define RID_SVXSTR_PRODUCTNAME_TOOLBARS (RID_SVX_START + 1042)
+#define RID_SVXSTR_TOOLBAR (RID_SVX_START + 1043)
+#define RID_SVXSTR_TOOLBAR_CONTENT (RID_SVX_START + 1044)
+#define RID_SVXSTR_COMMANDS (RID_SVX_START + 1045)
+#define RID_SVXSTR_COMMAND (RID_SVX_START + 1046)
+#define RID_SVXSTR_TOOLBAR_NAME (RID_SVX_START + 1047)
+#define RID_SVXSTR_CONFIRM_MENU_RESET (RID_SVX_START + 1115)
+#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET (RID_SVX_START + 1116)
+#define RID_SVXSTR_LABEL_NEW_NAME (RID_SVX_START + 1135)
+#define RID_SVXSTR_RENAME_MENU (RID_SVX_START + 1136)
+#define RID_SVXSTR_RENAME_TOOLBAR (RID_SVX_START + 1137)
+#define RID_SVXSTR_EVENT_STARTAPP (RID_SVX_START + 1051)
+#define RID_SVXSTR_EVENT_CLOSEAPP (RID_SVX_START + 1052)
+#define RID_SVXSTR_EVENT_NEWDOC (RID_SVX_START + 1053)
+#define RID_SVXSTR_EVENT_CLOSEDOC (RID_SVX_START + 1054)
+#define RID_SVXSTR_EVENT_PREPARECLOSEDOC (RID_SVX_START + 1055)
+#define RID_SVXSTR_EVENT_OPENDOC (RID_SVX_START + 1056)
+#define RID_SVXSTR_EVENT_SAVEDOC (RID_SVX_START + 1057)
+#define RID_SVXSTR_EVENT_SAVEASDOC (RID_SVX_START + 1058)
+#define RID_SVXSTR_EVENT_SAVEDOCDONE (RID_SVX_START + 1059)
+#define RID_SVXSTR_EVENT_SAVEASDOCDONE (RID_SVX_START + 1060)
+#define RID_SVXSTR_EVENT_ACTIVATEDOC (RID_SVX_START + 1061)
+#define RID_SVXSTR_EVENT_DEACTIVATEDOC (RID_SVX_START + 1062)
+#define RID_SVXSTR_EVENT_PRINTDOC (RID_SVX_START + 1063)
+#define RID_SVXSTR_EVENT_MODIFYCHANGED (RID_SVX_START + 1064)
+#define RID_SVXSTR_EVENT_MAILMERGE (RID_SVX_START + 1065)
+#define RID_SVXSTR_EVENT_PAGECOUNTCHANGE (RID_SVX_START + 1066)
+#define RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED (RID_SVX_START + 1067)
+#define RID_SVXSTR_EVENT_ACTIONPERFORMED (RID_SVX_START + 1068)
+#define RID_SVXSTR_EVENT_CHANGED (RID_SVX_START + 1069)
+#define RID_SVXSTR_EVENT_TEXTCHANGED (RID_SVX_START + 1070)
+#define RID_SVXSTR_EVENT_ITEMSTATECHANGED (RID_SVX_START + 1071)
+#define RID_SVXSTR_EVENT_FOCUSGAINED (RID_SVX_START + 1072)
+#define RID_SVXSTR_EVENT_FOCUSLOST (RID_SVX_START + 1073)
+#define RID_SVXSTR_EVENT_KEYTYPED (RID_SVX_START + 1074)
+#define RID_SVXSTR_EVENT_KEYUP (RID_SVX_START + 1075)
+#define RID_SVXSTR_EVENT_MOUSEENTERED (RID_SVX_START + 1076)
+#define RID_SVXSTR_EVENT_MOUSEDRAGGED (RID_SVX_START + 1077)
+#define RID_SVXSTR_EVENT_MOUSEMOVED (RID_SVX_START + 1078)
+#define RID_SVXSTR_EVENT_MOUSEPRESSED (RID_SVX_START + 1079)
+#define RID_SVXSTR_EVENT_MOUSERELEASED (RID_SVX_START + 1080)
+#define RID_SVXSTR_EVENT_MOUSEEXITED (RID_SVX_START + 1081)
+#define RID_SVXSTR_EVENT_APPROVERESETTED (RID_SVX_START + 1082)
+#define RID_SVXSTR_EVENT_SUBMITTED (RID_SVX_START + 1083)
+#define RID_SVXSTR_EVENT_BEFOREUPDATE (RID_SVX_START + 1084)
+#define RID_SVXSTR_EVENT_AFTERUPDATE (RID_SVX_START + 1085)
+#define RID_SVXSTR_EVENT_LOADED (RID_SVX_START + 1086)
+#define RID_SVXSTR_EVENT_RELOADING (RID_SVX_START + 1087)
+#define RID_SVXSTR_EVENT_RELOADED (RID_SVX_START + 1088)
+#define RID_SVXSTR_EVENT_UNLOADING (RID_SVX_START + 1089)
+#define RID_SVXSTR_EVENT_UNLOADED (RID_SVX_START + 1090)
+#define RID_SVXSTR_EVENT_CONFIRMDELETE (RID_SVX_START + 1091)
+#define RID_SVXSTR_EVENT_APPROVEROWCHANGE (RID_SVX_START + 1092)
+#define RID_SVXSTR_EVENT_ROWCHANGE (RID_SVX_START + 1093)
+#define RID_SVXSTR_EVENT_POSITIONING (RID_SVX_START + 1094)
+#define RID_SVXSTR_EVENT_POSITIONED (RID_SVX_START + 1095)
+#define RID_SVXSTR_EVENT_APPROVEPARAMETER (RID_SVX_START + 1096)
+#define RID_SVXSTR_EVENT_ERROROCCURED (RID_SVX_START + 1097)
+#define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED (RID_SVX_START + 1098)
+#define RID_SVXSTR_EVENT_RESETTED (RID_SVX_START + 1099)
+#define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED (RID_SVX_START + 1170)
+#define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED (RID_SVX_START + 1171)
+#define RID_SVXSTR_EVENT_CREATEDOC (RID_SVX_START + 1172)
+#define RID_SVXSTR_EVENT_LOADDOCFINISHED (RID_SVX_START + 1173)
+#define RID_SVXSTR_EVENT_SAVEDOCFAILED (RID_SVX_START + 1174)
+#define RID_SVXSTR_EVENT_SAVEASDOCFAILED (RID_SVX_START + 1175)
+#define RID_SVXSTR_EVENT_COPYTODOC (RID_SVX_START + 1176)
+#define RID_SVXSTR_EVENT_COPYTODOCDONE (RID_SVX_START + 1177)
+#define RID_SVXSTR_EVENT_COPYTODOCFAILED (RID_SVX_START + 1178)
+#define RID_SVXSTR_EVENT_VIEWCREATED (RID_SVX_START + 1179)
+#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180)
+#define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181)
+#define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182)
+#define RID_SVXSTR_EVENT_MODECHANGED (RID_SVX_START + 1183)
+#define RID_SVXSTR_EVENT_VISAREACHANGED (RID_SVX_START + 1184)
+#define RID_SVXSTR_EVENT_STORAGECHANGED (RID_SVX_START + 1185)
+#define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186)
+#define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187)
+#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188)
+#define RID_SVXSTR_EVENT_LAYOUT_FINISHED (RID_SVX_START + 1189)
+
+#endif
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index c26cf91688cf..93c7779d0ee9 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -76,7 +76,7 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog
public:
SvxJSearchOptionsDialog( Window *pParent,
- const SfxItemSet& rOptionsSet, USHORT nUniqueId,
+ const SfxItemSet& rOptionsSet,
INT32 nInitialFlags );
virtual ~SvxJSearchOptionsDialog();
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
new file mode 100644
index 000000000000..f4d0ad883470
--- /dev/null
+++ b/cui/source/inc/dialmgr.hxx
@@ -0,0 +1,48 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _CUI_DIALMGR_HXX
+#define _CUI_DIALMGR_HXX
+
+// include ---------------------------------------------------------------
+
+#include <tools/resid.hxx>
+
+// forward ---------------------------------------------------------------
+
+class ResMgr;
+struct CuiResMgr
+{
+ static ResMgr* GetResMgr();
+};
+
+#define CUI_MGR() (*CuiResMgr::GetResMgr())
+#define CUI_RES(i) ResId(i,CUI_MGR())
+#define CUI_RESSTR(i) UniString(ResId(i,CUI_MGR()))
+#define CUI_RESSSTR(i) String(ResId(i,CUI_MGR()))
+
+#endif
+
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
index 9a0daf6a8c2f..abc533e2e921 100644
--- a/cui/source/inc/gallery.hrc
+++ b/cui/source/inc/gallery.hrc
@@ -27,36 +27,36 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// Gallery-TabDialoge/-TabPages
-#define RID_SVXTABDLG_GALLERY (RID_SVX_GALLERY_START )
-#define RID_SVXTABDLG_GALLERYTHEME (RID_SVX_GALLERY_START + 2)
-#define RID_SVXDLG_GALLERY_TITLE (RID_SVX_GALLERY_START + 82)
+#define RID_SVXTABDLG_GALLERY (RID_CUI_GALLERY_START )
+#define RID_SVXTABDLG_GALLERYTHEME (RID_CUI_GALLERY_START + 2)
+#define RID_SVXDLG_GALLERY_TITLE (RID_CUI_GALLERY_START + 82)
-#define RID_SVXTABPAGE_GALLERY_GENERAL (RID_SVX_GALLERY_START + 1)
-#define RID_SVXTABPAGE_GALLERYTHEME_FILES (RID_SVX_GALLERY_START + 4)
+#define RID_SVXTABPAGE_GALLERY_GENERAL (RID_CUI_GALLERY_START + 1)
+#define RID_SVXTABPAGE_GALLERYTHEME_FILES (RID_CUI_GALLERY_START + 4)
// Dialoge
-#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS (RID_SVX_GALLERY_START + 6)
-#define RID_SVXDLG_GALLERY_TAKE_PROGRESS (RID_SVX_GALLERY_START + 7)
-#define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS (RID_SVX_GALLERY_START + 8)
-#define RID_SVXDLG_GALLERY_THEMEID (RID_SVX_GALLERY_START + 9)
+#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS (RID_CUI_GALLERY_START + 6)
+#define RID_SVXDLG_GALLERY_TAKE_PROGRESS (RID_CUI_GALLERY_START + 7)
+#define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS (RID_CUI_GALLERY_START + 8)
+#define RID_SVXDLG_GALLERY_THEMEID (RID_CUI_GALLERY_START + 9)
// Gallery-Strings
-#define RID_SVXSTR_GALLERY_NOFILES (RID_SVX_GALLERY_START + 12)
-#define RID_SVXSTR_GALLERY_SEARCH (RID_SVX_GALLERY_START + 30)
-#define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_SVX_GALLERY_START + 39)
-#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_SVX_GALLERY_START + 40)
-#define RID_SVXSTR_GALLERY_READONLY (RID_SVX_GALLERY_START + 43)
-#define RID_SVXSTR_GALLERY_ALLFILES (RID_SVX_GALLERY_START + 44)
-#define RID_SVXSTR_GALLERY_ID_EXISTS (RID_SVX_GALLERY_START + 81)
+#define RID_SVXSTR_GALLERY_NOFILES (RID_CUI_GALLERY_START + 12)
+#define RID_SVXSTR_GALLERY_SEARCH (RID_CUI_GALLERY_START + 30)
+#define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_CUI_GALLERY_START + 39)
+#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_CUI_GALLERY_START + 40)
+#define RID_SVXSTR_GALLERY_READONLY (RID_CUI_GALLERY_START + 43)
+#define RID_SVXSTR_GALLERY_ALLFILES (RID_CUI_GALLERY_START + 44)
+#define RID_SVXSTR_GALLERY_ID_EXISTS (RID_CUI_GALLERY_START + 81)
// Images
-#define RID_SVXBMP_THEME_NORMAL_BIG (RID_SVX_GALLERY_START + 49)
-#define RID_SVXBMP_THEME_IMPORTED_BIG (RID_SVX_GALLERY_START + 51)
-#define RID_SVXBMP_THEME_READONLY_BIG (RID_SVX_GALLERY_START + 53)
-#define RID_SVXBMP_THEME_DEFAULT_BIG (RID_SVX_GALLERY_START + 55)
+#define RID_SVXBMP_THEME_NORMAL_BIG (RID_CUI_GALLERY_START + 49)
+#define RID_SVXBMP_THEME_IMPORTED_BIG (RID_CUI_GALLERY_START + 51)
+#define RID_SVXBMP_THEME_READONLY_BIG (RID_CUI_GALLERY_START + 53)
+#define RID_SVXBMP_THEME_DEFAULT_BIG (RID_CUI_GALLERY_START + 55)
// lokale Defines
#define BTN_OK 1
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 899808ac0cb5..d80e31b0d10f 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -241,7 +241,7 @@
#define HID_SEARCH_BTN_CLOSE (HID_CUI_START + 204)
#define HID_GALLERY_BROWSER (HID_CUI_START + 205)
#define HID_GALLERY_SEARCH (HID_CUI_START + 206)
-#define HID_GALLERY_APPLY (HID_CUI_START + 207
+#define HID_GALLERY_APPLY (HID_CUI_START + 207)
#define HID_SPLDLG_BUTTON_IGNORERULE (HID_CUI_START + 208)
#define HID_CONFIG_ACCEL (HID_CUI_START + 209)
#define HID_ACCELCONFIG_LISTBOX (HID_CUI_START + 210)
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 821742d34946..3f0306659b83 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -50,9 +50,9 @@
#include <svtools/inettbc.hxx>
#include <vcl/timer.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <sfx2/docfile.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <com/sun/star/frame/XFrame.hpp>
#include "helpid.hrc"
#include <svx/hlnkitem.hxx>
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 31915733c660..822a3632a76d 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -37,8 +37,8 @@
// header for SAL_STATIC_CAST
#include <sal/types.h>
#include "cfgchart.hxx"
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#define ROW_COLOR_COUNT 12
@@ -126,7 +126,7 @@ void SvxChartColorTable::useDefault()
clear();
- String aResName( SVX_RES( RID_SVXSTR_DIAGRAM_ROW ) );
+ String aResName( CUI_RES( RID_SVXSTR_DIAGRAM_ROW ) );
String aPrefix, aPostfix, aName;
xub_StrLen nPos = aResName.SearchAscii( "$(ROW)" );
if( nPos != STRING_NOTFOUND )
@@ -216,7 +216,7 @@ BOOL SvxChartOptions::RetrieveOptions()
Color aCol;
// create strings for entry names
- String aResName( SVX_RES( RID_SVXSTR_DIAGRAM_ROW ) );
+ String aResName( CUI_RES( RID_SVXSTR_DIAGRAM_ROW ) );
String aPrefix, aPostfix, aName;
xub_StrLen nPos = aResName.SearchAscii( "$(ROW)" );
if( nPos != STRING_NOTFOUND )
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index de86053a1376..fd195b18a7e3 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -43,9 +43,9 @@
#include "connpoolsettings.hxx"
#include <svl/eitem.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
//........................................................................
namespace offapp
@@ -158,11 +158,11 @@ namespace offapp
DriverListControl_Base::Init();
Size aColWidth = LogicToPixel(Size(160, 0), MAP_APPFONT);
- InsertDataColumn(1, String(SVX_RES(STR_DRIVER_NAME)), aColWidth.Width());
+ InsertDataColumn(1, String(CUI_RES(STR_DRIVER_NAME)), aColWidth.Width());
aColWidth = LogicToPixel(Size(30, 0), MAP_APPFONT);
- InsertDataColumn(2, String(SVX_RES(STR_POOLED_FLAG)), aColWidth.Width());
+ InsertDataColumn(2, String(CUI_RES(STR_POOLED_FLAG)), aColWidth.Width());
aColWidth = LogicToPixel(Size(60, 0), MAP_APPFONT);
- InsertDataColumn(3, String(SVX_RES(STR_POOL_TIMEOUT)), aColWidth.Width());
+ InsertDataColumn(3, String(CUI_RES(STR_POOL_TIMEOUT)), aColWidth.Width());
// Attention: the resource of the string is local to the resource of the enclosing dialog!
}
@@ -338,16 +338,16 @@ namespace offapp
//====================================================================
//--------------------------------------------------------------------
ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet)
- :SfxTabPage(_pParent, SVX_RES(RID_OFAPAGE_CONNPOOLOPTIONS ), _rAttrSet)
- ,m_aFrame (this, SVX_RES(FL_POOLING))
- ,m_aEnablePooling (this, SVX_RES(CB_POOL_CONNS))
- ,m_aDriversLabel (this, SVX_RES(FT_DRIVERS))
- ,m_pDriverList(new DriverListControl(this, SVX_RES(CTRL_DRIVER_LIST)))
- ,m_aDriverLabel (this, SVX_RES(FT_DRIVERLABEL))
- ,m_aDriver (this, SVX_RES(FT_DRIVER))
- ,m_aDriverPoolingEnabled(this, SVX_RES(CB_DRIVERPOOLING))
- ,m_aTimeoutLabel (this, SVX_RES(FT_TIMEOUT))
- ,m_aTimeout (this, SVX_RES(NF_TIMEOUT))
+ :SfxTabPage(_pParent, CUI_RES(RID_OFAPAGE_CONNPOOLOPTIONS ), _rAttrSet)
+ ,m_aFrame (this, CUI_RES(FL_POOLING))
+ ,m_aEnablePooling (this, CUI_RES(CB_POOL_CONNS))
+ ,m_aDriversLabel (this, CUI_RES(FT_DRIVERS))
+ ,m_pDriverList(new DriverListControl(this, CUI_RES(CTRL_DRIVER_LIST)))
+ ,m_aDriverLabel (this, CUI_RES(FT_DRIVERLABEL))
+ ,m_aDriver (this, CUI_RES(FT_DRIVER))
+ ,m_aDriverPoolingEnabled(this, CUI_RES(CB_DRIVERPOOLING))
+ ,m_aTimeoutLabel (this, CUI_RES(FT_TIMEOUT))
+ ,m_aTimeout (this, CUI_RES(NF_TIMEOUT))
{
m_pDriverList->Init();
m_pDriverList->Show();
diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src
index 9218efda609a..c8d1dd03e47d 100644
--- a/cui/source/options/connpooloptions.src
+++ b/cui/source/options/connpooloptions.src
@@ -29,7 +29,7 @@
************************************************************************/
#include "connpooloptions.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#define PAGE_SIZE_X 260
#define PAGE_SIZE_Y 185
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index cc9d4ab740dc..0bf652aa648a 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -50,14 +50,14 @@
#define _CUI_SRCHDLG_CXX
#include "cuisrchdlg.hxx"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <svx/svxitems.hrc>
#define ITEMID_SETITEM 0
#include <sfx2/srchitem.hxx>
#include <svx/pageitem.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svx/dlgutil.hxx>
#include <optjsearch.hxx>
#include <svx/brshitem.hxx>
@@ -68,7 +68,7 @@
SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(
Window *pParent,
- const SfxItemSet& rOptionsSet, USHORT /*nUniqueId*/, INT32 nInitialFlags ) :
+ const SfxItemSet& rOptionsSet, INT32 nInitialFlags ) :
SfxSingleTabDialog ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ),
nInitialTlFlags( nInitialFlags )
{
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 5ab8a0e2a0d1..c9834ad0b71d 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -36,11 +36,11 @@
#include "dbregistersettings.hxx"
#include "connpooloptions.hxx"
#include <svl/filenotation.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <svx/svxids.hrc>
#include "helpid.hrc"
#include <svtools/editbrowsebox.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <vcl/field.hxx>
#include <svl/eitem.hxx>
#include <comphelper/processfactory.hxx>
@@ -57,8 +57,9 @@
#include <unotools/localfilehelper.hxx>
#include "optHeaderTabListbox.hxx"
#include <sfx2/docfilt.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "dbregisterednamesconfig.hxx"
+#include <svx/dialogs.hrc>
#define TAB_WIDTH1 80
#define TAB_WIDTH_MIN 10
@@ -119,15 +120,15 @@ short DatabaseRegistrationDialog::Execute()
DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_DBREGISTER), rSet ),
+ SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_DBREGISTER), rSet ),
- aTypeText ( this, SVX_RES( FT_TYPE ) ),
- aPathText ( this, SVX_RES( FT_PATH ) ),
- aPathCtrl ( this, SVX_RES( LB_PATH ) ),
- m_aNew ( this, SVX_RES( BTN_NEW ) ),
- m_aEdit ( this, SVX_RES( BTN_EDIT ) ),
- m_aDelete ( this, SVX_RES( BTN_DELETE ) ),
- aStdBox ( this, SVX_RES( GB_STD ) ),
+ aTypeText ( this, CUI_RES( FT_TYPE ) ),
+ aPathText ( this, CUI_RES( FT_PATH ) ),
+ aPathCtrl ( this, CUI_RES( LB_PATH ) ),
+ m_aNew ( this, CUI_RES( BTN_NEW ) ),
+ m_aEdit ( this, CUI_RES( BTN_EDIT ) ),
+ m_aDelete ( this, CUI_RES( BTN_DELETE ) ),
+ aStdBox ( this, CUI_RES( GB_STD ) ),
pHeaderBar ( NULL ),
pPathBox ( NULL ),
m_pCurEntry ( NULL ),
@@ -297,7 +298,7 @@ IMPL_LINK( DbRegistrationOptionsPage, DeleteHdl, void *, EMPTYARG )
SvLBoxEntry* pEntry = pPathBox->FirstSelected();
if ( pEntry )
{
- QueryBox aQuery(this,SVX_RES(QUERY_DELETE_CONFIRM));
+ QueryBox aQuery(this,CUI_RES(QUERY_DELETE_CONFIRM));
if ( aQuery.Execute() == RET_YES )
pPathBox->GetModel()->Remove(pEntry);
}
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
index bead1ae683cf..98d32f09013d 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -29,13 +29,10 @@
************************************************************************/
#include "dbregister.hrc"
-#include <svx/dialogs.hrc>
-#ifndef _SVX_SVXIDS_HRC //autogen
+#include <cuires.hrc>
#include <svx/svxids.hrc>
-#endif
-#ifndef _SVX_DIALOGS_HRC //autogen
+#include <cuires.hrc>
#include <svx/dialogs.hrc>
-#endif
// RID_SFXPAGE_PATH -----------------------------------------------------
#define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 22969dffc212..81d92e1e184a 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -38,7 +38,7 @@
#ifndef _SVX_DOCLINKDIALOG_HRC_
#include "doclinkdialog.hrc"
#endif
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <svx/svxids.hrc>
#include <tools/debug.hxx>
#ifndef SVTOOLS_FILENOTATION_HXX_
@@ -46,7 +46,7 @@
#endif
#include <vcl/msgbox.hxx>
#include <ucbhelper/content.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/docfilt.hxx>
@@ -64,19 +64,19 @@ namespace svx
//==================================================================
//------------------------------------------------------------------
ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew )
- :ModalDialog( _pParent, SVX_RES(DLG_DOCUMENTLINK) )
- ,m_aURLLabel (this, SVX_RES(FT_URL))
- ,m_aURL (this, SVX_RES(CMB_URL))
- ,m_aBrowseFile (this, SVX_RES(PB_BROWSEFILE))
- ,m_aNameLabel (this, SVX_RES(FT_NAME))
- ,m_aName (this, SVX_RES(ET_NAME))
- ,m_aBottomLine (this, SVX_RES(FL_BOTTOM))
- ,m_aOK (this, SVX_RES(BTN_OK))
- ,m_aCancel (this, SVX_RES(BTN_CANCEL))
- ,m_aHelp (this, SVX_RES(BTN_HELP))
+ :ModalDialog( _pParent, CUI_RES(DLG_DOCUMENTLINK) )
+ ,m_aURLLabel (this, CUI_RES(FT_URL))
+ ,m_aURL (this, CUI_RES(CMB_URL))
+ ,m_aBrowseFile (this, CUI_RES(PB_BROWSEFILE))
+ ,m_aNameLabel (this, CUI_RES(FT_NAME))
+ ,m_aName (this, CUI_RES(ET_NAME))
+ ,m_aBottomLine (this, CUI_RES(FL_BOTTOM))
+ ,m_aOK (this, CUI_RES(BTN_OK))
+ ,m_aCancel (this, CUI_RES(BTN_CANCEL))
+ ,m_aHelp (this, CUI_RES(BTN_HELP))
,m_bCreatingNew(_bCreateNew)
{
- String sText = String( SVX_RES( m_bCreatingNew ? STR_NEW_LINK : STR_EDIT_LINK ) );
+ String sText = String( CUI_RES( m_bCreatingNew ? STR_NEW_LINK : STR_EDIT_LINK ) );
SetText(sText);
FreeResource();
@@ -141,7 +141,7 @@ namespace svx
if (!bFileExists)
{
- String sMsg = String(SVX_RES(STR_LINKEDDOC_DOESNOTEXIST));
+ String sMsg = String(CUI_RES(STR_LINKEDDOC_DOESNOTEXIST));
sMsg.SearchAndReplaceAscii("$file$", m_aURL.GetText());
ErrorBox aError(this, WB_OK , sMsg);
aError.Execute();
@@ -150,7 +150,7 @@ namespace svx
INetURLObject aURL( sURL );
if ( aURL.GetProtocol() != INET_PROT_FILE )
{
- String sMsg = String(SVX_RES(STR_LINKEDDOC_NO_SYSTEM_FILE));
+ String sMsg = String(CUI_RES(STR_LINKEDDOC_NO_SYSTEM_FILE));
sMsg.SearchAndReplaceAscii("$file$", m_aURL.GetText());
ErrorBox aError(this, WB_OK , sMsg);
aError.Execute();
@@ -162,7 +162,7 @@ namespace svx
{
if ( !m_aNameValidator.Call( &sCurrentText ) )
{
- String sMsg = String(SVX_RES(STR_NAME_CONFLICT));
+ String sMsg = String(CUI_RES(STR_NAME_CONFLICT));
sMsg.SearchAndReplaceAscii("$file$", sCurrentText);
InfoBox aError(this, sMsg);
aError.Execute();
diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src
index e4c8ceb3de87..9fe56360b82a 100644
--- a/cui/source/options/doclinkdialog.src
+++ b/cui/source/options/doclinkdialog.src
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#ifndef _SVX_DOCLINKDIALOG_HRC_
#include "doclinkdialog.hrc"
#endif
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 9ea708dc0d65..614993aeb91f 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -38,9 +38,9 @@
#include <unotools/sourceviewconfig.hxx>
#include "fontsubs.hrc"
#include "fontsubs.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
/*********************************************************************/
/* */
@@ -54,32 +54,32 @@
SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES(RID_SVX_FONT_SUBSTITUTION), rSet),
- aUseTableCB (this, SVX_RES(CB_USETABLE)),
- aFont1FT (this, SVX_RES(FT_FONT1)),
- aFont1CB (this, SVX_RES(CB_FONT1)),
- aFont2FT (this, SVX_RES(FT_FONT2)),
- aFont2CB (this, SVX_RES(CB_FONT2)),
- aNewDelTBX (this, SVX_RES(TBX_SUBSTNEWDEL)),
- aCheckLB (this, SVX_RES(CLB_SUBSTITUTES)),
-
- aSourceViewFontsFL (this, SVX_RES(FL_SOURCEVIEW )),
- aFontNameFT (this, SVX_RES(FT_FONTNAME )),
- aFontNameLB (this, SVX_RES(LB_FONTNAME )),
- aNonPropFontsOnlyCB(this, SVX_RES(CB_NONPROP )),
- aFontHeightFT (this, SVX_RES(FT_FONTHEIGHT )),
- aFontHeightLB (this, SVX_RES(LB_FONTHEIGHT )),
-
- aImageList (SVX_RES(IL_ICON)),
-
- sAutomatic (SVX_RES( STR_AUTOMATIC )),
+ SfxTabPage(pParent, CUI_RES(RID_SVX_FONT_SUBSTITUTION), rSet),
+ aUseTableCB (this, CUI_RES(CB_USETABLE)),
+ aFont1FT (this, CUI_RES(FT_FONT1)),
+ aFont1CB (this, CUI_RES(CB_FONT1)),
+ aFont2FT (this, CUI_RES(FT_FONT2)),
+ aFont2CB (this, CUI_RES(CB_FONT2)),
+ aNewDelTBX (this, CUI_RES(TBX_SUBSTNEWDEL)),
+ aCheckLB (this, CUI_RES(CLB_SUBSTITUTES)),
+
+ aSourceViewFontsFL (this, CUI_RES(FL_SOURCEVIEW )),
+ aFontNameFT (this, CUI_RES(FT_FONTNAME )),
+ aFontNameLB (this, CUI_RES(LB_FONTNAME )),
+ aNonPropFontsOnlyCB(this, CUI_RES(CB_NONPROP )),
+ aFontHeightFT (this, CUI_RES(FT_FONTHEIGHT )),
+ aFontHeightLB (this, CUI_RES(LB_FONTHEIGHT )),
+
+ aImageList (CUI_RES(IL_ICON)),
+
+ sAutomatic (CUI_RES( STR_AUTOMATIC )),
pConfig(new SvtFontSubstConfig),
pSourceViewConfig(new utl::SourceViewConfig),
- sHeader1 (SVX_RES( STR_HEADER1 )),
- sHeader2 (SVX_RES( STR_HEADER2 )),
- sHeader3 (SVX_RES( STR_HEADER3 )),
- sHeader4 (SVX_RES( STR_HEADER4 )),
+ sHeader1 (CUI_RES( STR_HEADER1 )),
+ sHeader2 (CUI_RES( STR_HEADER2 )),
+ sHeader3 (CUI_RES( STR_HEADER3 )),
+ sHeader4 (CUI_RES( STR_HEADER4 )),
sFontGroup ("FontSubstitution"),
pCheckButtonData(0)
diff --git a/cui/source/options/fontsubs.hrc b/cui/source/options/fontsubs.hrc
index 9344d41c0fc7..6ef1c7a9047a 100644
--- a/cui/source/options/fontsubs.hrc
+++ b/cui/source/options/fontsubs.hrc
@@ -30,7 +30,7 @@
#ifndef _SVX_FONT_SUBSTITUTION
#define _SVX_FONT_SUBSTITUTION
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// defines ------------------------------------------------------------------
diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx
index 7bcb021f9cbf..5544197e7246 100644
--- a/cui/source/options/internationaloptions.cxx
+++ b/cui/source/options/internationaloptions.cxx
@@ -34,9 +34,9 @@
#include "internationaloptions.hxx"
#include "internationaloptions.hrc"
#include <svl/eitem.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
namespace offapp
{
@@ -62,12 +62,12 @@ namespace offapp
};
inline InternationalOptionsPage::IMPL::IMPL( Window* _pParent ) :
- m_aFL_DefaultTextDirection ( _pParent, SVX_RES( FL_DEFTXTDIRECTION ) )
- ,m_aRB_TxtDirLeft2Right ( _pParent, SVX_RES( RB_TXTDIR_LEFT2RIGHT ) )
- ,m_aRB_TxtDirRight2Left ( _pParent, SVX_RES( RB_TXTDIR_RIGHT2LEFT ) )
- ,m_aFL_SheetView ( _pParent, SVX_RES( FL_SHEETVIEW ) )
- ,m_aCB_ShtVwRight2Left ( _pParent, SVX_RES( CB_SHTVW_RIGHT2LEFT ) )
- ,m_aCB_ShtVwCurrentDocOnly ( _pParent, SVX_RES( CB_SHTVW_CURRENTDOCONLY ) )
+ m_aFL_DefaultTextDirection ( _pParent, CUI_RES( FL_DEFTXTDIRECTION ) )
+ ,m_aRB_TxtDirLeft2Right ( _pParent, CUI_RES( RB_TXTDIR_LEFT2RIGHT ) )
+ ,m_aRB_TxtDirRight2Left ( _pParent, CUI_RES( RB_TXTDIR_RIGHT2LEFT ) )
+ ,m_aFL_SheetView ( _pParent, CUI_RES( FL_SHEETVIEW ) )
+ ,m_aCB_ShtVwRight2Left ( _pParent, CUI_RES( CB_SHTVW_RIGHT2LEFT ) )
+ ,m_aCB_ShtVwCurrentDocOnly ( _pParent, CUI_RES( CB_SHTVW_CURRENTDOCONLY ) )
,m_bEnable_SheetView_Opt ( FALSE )
{
@@ -128,7 +128,7 @@ namespace offapp
}
InternationalOptionsPage::InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) :
- SfxTabPage ( _pParent, SVX_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet )
+ SfxTabPage ( _pParent, CUI_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet )
,m_pImpl ( new IMPL( this ) )
{
diff --git a/cui/source/options/internationaloptions.src b/cui/source/options/internationaloptions.src
index ab725d9c4f0b..be9155fb3707 100644
--- a/cui/source/options/internationaloptions.src
+++ b/cui/source/options/internationaloptions.src
@@ -30,7 +30,7 @@
#include "internationaloptions.hrc"
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
TabPage RID_OFA_TP_INTERNATIONAL
{
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 7cdc58198f9a..ee03b9653b8d 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -33,8 +33,8 @@
#include <optaccessibility.hxx>
#include <optaccessibility.hrc>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include <svtools/accessibilityoptions.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
@@ -55,19 +55,19 @@ struct SvxAccessibilityOptionsTabPage_Impl
};
SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage( Window* pParent, const SfxItemSet& rSet )
- :SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_ACCESSIBILITYCONFIG ), rSet)
- ,m_aMiscellaneousLabel (this, SVX_RES(FL_MISCELLANEOUS ))
- ,m_aAccessibilityTool (this, SVX_RES(CB_ACCESSIBILITY_TOOL ))
- ,m_aTextSelectionInReadonly (this, SVX_RES(CB_TEXTSELECTION ))
- ,m_aAnimatedGraphics (this, SVX_RES(CB_ANIMATED_GRAPHICS ))
- ,m_aAnimatedTexts (this, SVX_RES(CB_ANIMATED_TEXTS ))
- ,m_aTipHelpCB (this, SVX_RES(CB_TIPHELP ))
- ,m_aTipHelpNF (this, SVX_RES(NF_TIPHELP ))
- ,m_aTipHelpFT (this, SVX_RES(FT_TIPHELP ))
- ,m_aHCOptionsLabel (this, SVX_RES(FL_HC_OPTIONS ))
- ,m_aAutoDetectHC (this, SVX_RES(CB_AUTO_DETECT_HC ))
- ,m_aAutomaticFontColor (this, SVX_RES(CB_AUTOMATIC_FONT_COLOR))
- ,m_aPagePreviews (this, SVX_RES(CB_PAGE_PREVIEWS ))
+ :SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ACCESSIBILITYCONFIG ), rSet)
+ ,m_aMiscellaneousLabel (this, CUI_RES(FL_MISCELLANEOUS ))
+ ,m_aAccessibilityTool (this, CUI_RES(CB_ACCESSIBILITY_TOOL ))
+ ,m_aTextSelectionInReadonly (this, CUI_RES(CB_TEXTSELECTION ))
+ ,m_aAnimatedGraphics (this, CUI_RES(CB_ANIMATED_GRAPHICS ))
+ ,m_aAnimatedTexts (this, CUI_RES(CB_ANIMATED_TEXTS ))
+ ,m_aTipHelpCB (this, CUI_RES(CB_TIPHELP ))
+ ,m_aTipHelpNF (this, CUI_RES(NF_TIPHELP ))
+ ,m_aTipHelpFT (this, CUI_RES(FT_TIPHELP ))
+ ,m_aHCOptionsLabel (this, CUI_RES(FL_HC_OPTIONS ))
+ ,m_aAutoDetectHC (this, CUI_RES(CB_AUTO_DETECT_HC ))
+ ,m_aAutomaticFontColor (this, CUI_RES(CB_AUTOMATIC_FONT_COLOR))
+ ,m_aPagePreviews (this, CUI_RES(CB_PAGE_PREVIEWS ))
,m_pImpl(new SvxAccessibilityOptionsTabPage_Impl)
{
FreeResource();
diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src
index 676c54f6ee61..ef375fb80117 100644
--- a/cui/source/options/optaccessibility.src
+++ b/cui/source/options/optaccessibility.src
@@ -31,7 +31,7 @@
#include <optaccessibility.hrc>
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
{
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index cb247edd3f87..0bbf0ac287bd 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -35,8 +35,8 @@
#include <svx/langitem.hxx>
#include <svx/unolingu.hxx>
#include <optasian.hrc>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include <tools/table.hxx>
#include <tools/shl.hxx>
#include <svx/asiancfg.hxx>
@@ -151,23 +151,23 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX;
SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_ASIAN_LAYOUT ), rSet),
- aKerningGB( this, SVX_RES(GB_KERNING )),
- aCharKerningRB( this, SVX_RES(RB_CHAR_KERNING )),
- aCharPunctKerningRB( this, SVX_RES(RB_CHAR_PUNCT )),
- aCharDistGB( this, SVX_RES(GB_CHAR_DIST )),
- aNoCompressionRB( this, SVX_RES(RB_NO_COMP )),
- aPunctCompressionRB( this, SVX_RES(RB_PUNCT_COMP )),
- aPunctKanaCompressionRB(this, SVX_RES(RB_PUNCT_KANA_COMP )),
- aStartEndGB( this, SVX_RES(GB_START_END )),
- aLanguageFT( this, SVX_RES(FT_LANGUAGE )),
- aLanguageLB( this, SVX_RES(LB_LANGUAGE )),
- aStandardCB( this, SVX_RES(CB_STANDARD )),
- aStartFT( this, SVX_RES(FT_START )),
- aStartED( this, SVX_RES(ED_START )),
- aEndFT( this, SVX_RES(FT_END )),
- aEndED( this, SVX_RES(ED_END )),
- aHintFT( this, SVX_RES(FT_HINT )),
+ SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ASIAN_LAYOUT ), rSet),
+ aKerningGB( this, CUI_RES(GB_KERNING )),
+ aCharKerningRB( this, CUI_RES(RB_CHAR_KERNING )),
+ aCharPunctKerningRB( this, CUI_RES(RB_CHAR_PUNCT )),
+ aCharDistGB( this, CUI_RES(GB_CHAR_DIST )),
+ aNoCompressionRB( this, CUI_RES(RB_NO_COMP )),
+ aPunctCompressionRB( this, CUI_RES(RB_PUNCT_COMP )),
+ aPunctKanaCompressionRB(this, CUI_RES(RB_PUNCT_KANA_COMP )),
+ aStartEndGB( this, CUI_RES(GB_START_END )),
+ aLanguageFT( this, CUI_RES(FT_LANGUAGE )),
+ aLanguageLB( this, CUI_RES(LB_LANGUAGE )),
+ aStandardCB( this, CUI_RES(CB_STANDARD )),
+ aStartFT( this, CUI_RES(FT_START )),
+ aStartED( this, CUI_RES(ED_START )),
+ aEndFT( this, CUI_RES(FT_END )),
+ aEndED( this, CUI_RES(ED_END )),
+ aHintFT( this, CUI_RES(FT_HINT )),
pImpl(new SvxAsianLayoutPage_Impl)
{
FreeResource();
diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src
index 6a09421fcf2c..f8286ea1186c 100644
--- a/cui/source/options/optasian.src
+++ b/cui/source/options/optasian.src
@@ -31,7 +31,7 @@
#include <optasian.hrc>
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
TabPage RID_SVXPAGE_ASIAN_LAYOUT
{
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 6d953edcc80e..306f30b5850e 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -31,10 +31,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
#include <unotools/pathoptions.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optchart.hxx"
#include "optchart.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
// ====================
// class ChartColorLB
@@ -57,13 +57,13 @@ void ChartColorLB::FillBox( const SvxChartColorTable & rTab )
// ====================
SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SfxTabPage( pParent, SVX_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ),
+ SfxTabPage( pParent, CUI_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ),
- aGbChartColors ( this, SVX_RES( FL_CHART_COLOR_LIST ) ),
- aLbChartColors ( this, SVX_RES( LB_CHART_COLOR_LIST ) ),
- aGbColorBox ( this, SVX_RES( FL_COLOR_BOX ) ),
- aValSetColorBox ( this, SVX_RES( CT_COLOR_BOX ) ),
- aPBDefault ( this, SVX_RES( PB_RESET_TO_DEFAULT ) )
+ aGbChartColors ( this, CUI_RES( FL_CHART_COLOR_LIST ) ),
+ aLbChartColors ( this, CUI_RES( LB_CHART_COLOR_LIST ) ),
+ aGbColorBox ( this, CUI_RES( FL_COLOR_BOX ) ),
+ aValSetColorBox ( this, CUI_RES( CT_COLOR_BOX ) ),
+ aPBDefault ( this, CUI_RES( PB_RESET_TO_DEFAULT ) )
{
FreeResource();
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
index bab97295d291..1008f5383a11 100644
--- a/cui/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -29,7 +29,7 @@
************************************************************************/
#include "optchart.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
// tab page for setting the default colors used for new charts
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index c0a703f2a5b1..f82a04d21d79 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -45,9 +45,9 @@
#include <svx/svxdlg.hxx>
#include <helpid.hrc>
#include <svx/svxids.hrc>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "optcolor.hxx"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optcolor.hrc"
#include <svx/dlgutil.hxx>
@@ -1435,17 +1435,17 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl)
---------------------------------------------------------------------------*/
SvxColorOptionsTabPage::SvxColorOptionsTabPage(
Window* pParent, const SfxItemSet& rCoreSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_COLORCONFIG ), rCoreSet ),
- aColorSchemeFL( this, SVX_RES( FL_COLORSCHEME ) ),
- aColorSchemeFT( this, SVX_RES( FT_COLORSCHEME ) ),
- aColorSchemeLB( this, SVX_RES( LB_COLORSCHEME ) ),
- aSaveSchemePB( this, SVX_RES( PB_SAVESCHEME) ),
- aDeleteSchemePB( this, SVX_RES( PB_DELETESCHEME ) ),
- aCustomColorsFL( this, SVX_RES( FL_CUSTOMCOLORS ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_COLORCONFIG ), rCoreSet ),
+ aColorSchemeFL( this, CUI_RES( FL_COLORSCHEME ) ),
+ aColorSchemeFT( this, CUI_RES( FT_COLORSCHEME ) ),
+ aColorSchemeLB( this, CUI_RES( LB_COLORSCHEME ) ),
+ aSaveSchemePB( this, CUI_RES( PB_SAVESCHEME) ),
+ aDeleteSchemePB( this, CUI_RES( PB_DELETESCHEME ) ),
+ aCustomColorsFL( this, CUI_RES( FL_CUSTOMCOLORS ) ),
bFillItemSetCalled(FALSE),
pColorConfig(0),
pExtColorConfig(0),
- pColorConfigCT( new ColorConfigCtrl_Impl(this, SVX_RES( CT_COLORCONFIG ) ))
+ pColorConfigCT( new ColorConfigCtrl_Impl(this, CUI_RES( CT_COLORCONFIG ) ))
{
FreeResource();
aColorSchemeLB.SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl));
@@ -1574,14 +1574,14 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
String sName;
//CHINA001 SvxNameDialog aNameDlg(pButton,
//CHINA001 sName,
- //CHINA001 String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)));
+ //CHINA001 String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)));
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( pButton,
- sName, String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)), RID_SVXDLG_NAME );
+ sName, String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)) );
DBG_ASSERT(aNameDlg, "Dialogdiet fail!");//CHINA001
aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
- aNameDlg->SetText(String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1)));
+ aNameDlg->SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1)));
aNameDlg->SetHelpId(HID_OPTIONS_COLORCONFIG_SAVE_SCHEME);
aNameDlg->SetEditHelpId(HID_OPTIONS_COLORCONFIG_NAME_SCHEME);
aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
@@ -1599,8 +1599,8 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
else
{
DBG_ASSERT(aColorSchemeLB.GetEntryCount() > 1, "don't delete the last scheme");
- QueryBox aQuery(pButton, SVX_RES(RID_SVXQB_DELETE_COLOR_CONFIG));
- aQuery.SetText(String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_DELETE)));
+ QueryBox aQuery(pButton, CUI_RES(RID_SVXQB_DELETE_COLOR_CONFIG));
+ aQuery.SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE)));
if(RET_YES == aQuery.Execute())
{
rtl::OUString sDeleteScheme(aColorSchemeLB.GetSelectEntry());
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
index 593439807c14..9f3b42e0be30 100644
--- a/cui/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optcolor.hrc"
// pragma ----------------------------------------------------------------
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 053bd1f4462b..199fcc38090b 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -31,9 +31,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cui.hxx"
#include "optctl.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "optctl.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <svl/ctloptions.hxx>
// class SvxCTLOptionsPage -----------------------------------------------------
@@ -54,19 +54,19 @@ IMPL_LINK( SvxCTLOptionsPage, SequenceCheckingCB_Hdl, void*, EMPTYARG )
SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_OPTIONS_CTL ), rSet ),
-
- m_aSequenceCheckingFL ( this, SVX_RES( FL_SEQUENCECHECKING ) ),
- m_aSequenceCheckingCB ( this, SVX_RES( CB_SEQUENCECHECKING ) ),
- m_aRestrictedCB ( this, SVX_RES( CB_RESTRICTED ) ),
- m_aTypeReplaceCB ( this, SVX_RES( CB_TYPE_REPLACE ) ),
- m_aCursorControlFL ( this, SVX_RES( FL_CURSORCONTROL ) ),
- m_aMovementFT ( this, SVX_RES( FT_MOVEMENT ) ),
- m_aMovementLogicalRB ( this, SVX_RES( RB_MOVEMENT_LOGICAL ) ),
- m_aMovementVisualRB ( this, SVX_RES( RB_MOVEMENT_VISUAL ) ),
- m_aGeneralFL ( this, SVX_RES( FL_GENERAL ) ),
- m_aNumeralsFT ( this, SVX_RES( FT_NUMERALS ) ),
- m_aNumeralsLB ( this, SVX_RES( LB_NUMERALS ) )
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_CTL ), rSet ),
+
+ m_aSequenceCheckingFL ( this, CUI_RES( FL_SEQUENCECHECKING ) ),
+ m_aSequenceCheckingCB ( this, CUI_RES( CB_SEQUENCECHECKING ) ),
+ m_aRestrictedCB ( this, CUI_RES( CB_RESTRICTED ) ),
+ m_aTypeReplaceCB ( this, CUI_RES( CB_TYPE_REPLACE ) ),
+ m_aCursorControlFL ( this, CUI_RES( FL_CURSORCONTROL ) ),
+ m_aMovementFT ( this, CUI_RES( FT_MOVEMENT ) ),
+ m_aMovementLogicalRB ( this, CUI_RES( RB_MOVEMENT_LOGICAL ) ),
+ m_aMovementVisualRB ( this, CUI_RES( RB_MOVEMENT_VISUAL ) ),
+ m_aGeneralFL ( this, CUI_RES( FL_GENERAL ) ),
+ m_aNumeralsFT ( this, CUI_RES( FT_NUMERALS ) ),
+ m_aNumeralsLB ( this, CUI_RES( LB_NUMERALS ) )
{
FreeResource();
diff --git a/cui/source/options/optctl.src b/cui/source/options/optctl.src
index 2cf9ad051f67..f750264a1df1 100644
--- a/cui/source/options/optctl.src
+++ b/cui/source/options/optctl.src
@@ -30,7 +30,7 @@
#include "optctl.hrc"
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <sfx2/sfx.hrc>
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 5111c72088fa..e56089dd351e 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -42,14 +42,15 @@
#include <unotools/intlwrapper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_OPTDICT_CXX
#include <linguistic/misc.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optdict.hrc"
#include "optdict.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svx/svxerr.hxx>
using namespace ::com::sun::star;
@@ -101,17 +102,17 @@ static CDE_RESULT cmpDicEntry_Impl( const String &rText1, const String &rText2 )
SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
Reference< XSpellChecker1 > &xSpl ) :
- ModalDialog( pParent, SVX_RES( RID_SFXDLG_NEWDICT ) ),
-
- aNameText ( this, SVX_RES( FT_DICTNAME ) ),
- aNameEdit ( this, SVX_RES( ED_DICTNAME ) ),
- aLanguageText ( this, SVX_RES( FT_DICTLANG ) ),
- aLanguageLB ( this, SVX_RES( LB_DICTLANG ) ),
- aExceptBtn ( this, SVX_RES( BTN_EXCEPT ) ),
- aNewDictBox ( this, SVX_RES( GB_NEWDICT ) ),
- aOKBtn ( this, SVX_RES( BTN_NEWDICT_OK ) ),
- aCancelBtn ( this, SVX_RES( BTN_NEWDICT_ESC ) ),
- aHelpBtn ( this, SVX_RES( BTN_NEWDICT_HLP ) ),
+ ModalDialog( pParent, CUI_RES( RID_SFXDLG_NEWDICT ) ),
+
+ aNameText ( this, CUI_RES( FT_DICTNAME ) ),
+ aNameEdit ( this, CUI_RES( ED_DICTNAME ) ),
+ aLanguageText ( this, CUI_RES( FT_DICTLANG ) ),
+ aLanguageLB ( this, CUI_RES( LB_DICTLANG ) ),
+ aExceptBtn ( this, CUI_RES( BTN_EXCEPT ) ),
+ aNewDictBox ( this, CUI_RES( GB_NEWDICT ) ),
+ aOKBtn ( this, CUI_RES( BTN_NEWDICT_OK ) ),
+ aCancelBtn ( this, CUI_RES( BTN_NEWDICT_ESC ) ),
+ aHelpBtn ( this, CUI_RES( BTN_NEWDICT_HLP ) ),
xSpell( xSpl )
{
// Handler installieren
@@ -152,7 +153,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG )
if ( bFound )
{
// Doppelte Namen?
- InfoBox( this, SVX_RESSTR( RID_SVXSTR_OPT_DOUBLE_DICTS ) ).Execute();
+ InfoBox( this, CUI_RESSTR( RID_SVXSTR_OPT_DOUBLE_DICTS ) ).Execute();
aNameEdit.GrabFocus();
return 0;
}
@@ -179,7 +180,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG )
// Fehler: konnte neues W"orterbuch nicht anlegen
SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, String(),
- this, RID_SVXERRCTX, &DIALOG_MGR() );
+ this, RID_SVXERRCTX, &CUI_MGR() );
ErrorHandler::HandleError( *new StringErrorInfo(
ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) );
@@ -225,23 +226,23 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
const String& rName,
Reference< XSpellChecker1 > &xSpl ) :
- ModalDialog( pParent, SVX_RES( RID_SFXDLG_EDITDICT ) ),
-
- aBookFT ( this, SVX_RES( FT_BOOK ) ),
- aAllDictsLB ( this, SVX_RES( LB_ALLDICTS ) ),
- aLangFT ( this, SVX_RES( FT_DICTLANG ) ),
- aLangLB ( this, SVX_RES( LB_DICTLANG ) ),
- aWordFT ( this, SVX_RES( FT_WORD ) ),
- aWordED ( this, SVX_RES( ED_WORD ) ),
- aReplaceFT ( this, SVX_RES( FT_REPLACE ) ),
- aReplaceED ( this, SVX_RES( ED_REPLACE ) ),
- aWordsLB ( this, SVX_RES( TLB_REPLACE ) ),
- aNewReplacePB ( this, SVX_RES( PB_NEW_REPLACE ) ),
- aDeletePB ( this, SVX_RES( PB_DELETE_REPLACE ) ),
- aEditDictsBox ( this, SVX_RES( GB_EDITDICTS ) ),
- aCloseBtn ( this, SVX_RES( BTN_EDITCLOSE ) ),
- aHelpBtn ( this, SVX_RES( BTN_EDITHELP ) ),
- sModify (SVX_RES(STR_MODIFY)),
+ ModalDialog( pParent, CUI_RES( RID_SFXDLG_EDITDICT ) ),
+
+ aBookFT ( this, CUI_RES( FT_BOOK ) ),
+ aAllDictsLB ( this, CUI_RES( LB_ALLDICTS ) ),
+ aLangFT ( this, CUI_RES( FT_DICTLANG ) ),
+ aLangLB ( this, CUI_RES( LB_DICTLANG ) ),
+ aWordFT ( this, CUI_RES( FT_WORD ) ),
+ aWordED ( this, CUI_RES( ED_WORD ) ),
+ aReplaceFT ( this, CUI_RES( FT_REPLACE ) ),
+ aReplaceED ( this, CUI_RES( ED_REPLACE ) ),
+ aWordsLB ( this, CUI_RES( TLB_REPLACE ) ),
+ aNewReplacePB ( this, CUI_RES( PB_NEW_REPLACE ) ),
+ aDeletePB ( this, CUI_RES( PB_DELETE_REPLACE ) ),
+ aEditDictsBox ( this, CUI_RES( GB_EDITDICTS ) ),
+ aCloseBtn ( this, CUI_RES( BTN_EDITCLOSE ) ),
+ aHelpBtn ( this, CUI_RES( BTN_EDITHELP ) ),
+ sModify (CUI_RES(STR_MODIFY)),
sNew (aNewReplacePB.GetText()),
aDecoView ( this),
xSpell ( xSpl ),
@@ -458,7 +459,7 @@ IMPL_LINK( SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox *, EMPTYARG )
if ( nLang != nOldLang )
{
- QueryBox aBox( this, SVX_RES( RID_SFXQB_SET_LANGUAGE ) );
+ QueryBox aBox( this, CUI_RES( RID_SFXQB_SET_LANGUAGE ) );
String sTxt( aBox.GetMessText() );
sTxt.SearchAndReplaceAscii( "%1", aAllDictsLB.GetSelectEntry() );
aBox.SetMessText( sTxt );
diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src
index 740853410a61..589f73b4f46b 100644
--- a/cui/source/options/optdict.src
+++ b/cui/source/options/optdict.src
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optdict.hrc"
// pragma ----------------------------------------------------------------
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 998d4cccbcc8..feb38daff447 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -36,9 +36,9 @@
#include <unotools/fltrcfg.hxx>
#include "optfltr.hxx"
#include "optfltr.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
enum MSFltrPg2_CheckBoxEntries {
Math,
@@ -54,17 +54,17 @@ enum MSFltrPg2_CheckBoxEntries {
// -----------------------------------------------------------------------
OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage( pParent, SVX_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ),
- aMSWordGB ( this, SVX_RES( GB_WORD ) ),
- aWBasicCodeCB ( this, SVX_RES( CB_WBAS_CODE ) ),
- aWBasicStgCB ( this, SVX_RES( CB_WBAS_STG ) ),
- aMSExcelGB ( this, SVX_RES( GB_EXCEL ) ),
- aEBasicCodeCB ( this, SVX_RES( CB_EBAS_CODE ) ),
- aEBasicExectblCB( this, SVX_RES( CB_EBAS_EXECTBL ) ),
- aEBasicStgCB ( this, SVX_RES( CB_EBAS_STG ) ),
- aMSPPointGB ( this, SVX_RES( GB_PPOINT ) ),
- aPBasicCodeCB ( this, SVX_RES( CB_PBAS_CODE ) ),
- aPBasicStgCB ( this, SVX_RES( CB_PBAS_STG ) )
+ : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ),
+ aMSWordGB ( this, CUI_RES( GB_WORD ) ),
+ aWBasicCodeCB ( this, CUI_RES( CB_WBAS_CODE ) ),
+ aWBasicStgCB ( this, CUI_RES( CB_WBAS_STG ) ),
+ aMSExcelGB ( this, CUI_RES( GB_EXCEL ) ),
+ aEBasicCodeCB ( this, CUI_RES( CB_EBAS_CODE ) ),
+ aEBasicExectblCB( this, CUI_RES( CB_EBAS_EXECTBL ) ),
+ aEBasicStgCB ( this, CUI_RES( CB_EBAS_STG ) ),
+ aMSPPointGB ( this, CUI_RES( GB_PPOINT ) ),
+ aPBasicCodeCB ( this, CUI_RES( CB_PBAS_CODE ) ),
+ aPBasicStgCB ( this, CUI_RES( CB_PBAS_STG ) )
{
FreeResource();
@@ -145,16 +145,16 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& )
* --------------------------------------------------*/
OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent,
const SfxItemSet& rSet )
- : SfxTabPage( pParent, SVX_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ),
- aCheckLB ( this, SVX_RES( CLB_SETTINGS )),
- aHeader1FT ( this, SVX_RES( FT_HEADER1_EXPLANATION )),
- aHeader2FT ( this, SVX_RES( FT_HEADER2_EXPLANATION )),
- sHeader1 ( SVX_RES( ST_HEADER1 )),
- sHeader2 ( SVX_RES( ST_HEADER2 )),
- sChgToFromMath ( SVX_RES( ST_CHG_MATH )),
- sChgToFromWriter ( SVX_RES( ST_CHG_WRITER )),
- sChgToFromCalc ( SVX_RES( ST_CHG_CALC )),
- sChgToFromImpress ( SVX_RES( ST_CHG_IMPRESS )),
+ : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ),
+ aCheckLB ( this, CUI_RES( CLB_SETTINGS )),
+ aHeader1FT ( this, CUI_RES( FT_HEADER1_EXPLANATION )),
+ aHeader2FT ( this, CUI_RES( FT_HEADER2_EXPLANATION )),
+ sHeader1 ( CUI_RES( ST_HEADER1 )),
+ sHeader2 ( CUI_RES( ST_HEADER2 )),
+ sChgToFromMath ( CUI_RES( ST_CHG_MATH )),
+ sChgToFromWriter ( CUI_RES( ST_CHG_WRITER )),
+ sChgToFromCalc ( CUI_RES( ST_CHG_CALC )),
+ sChgToFromImpress ( CUI_RES( ST_CHG_IMPRESS )),
pCheckButtonData(0)
{
FreeResource();
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index 9e932406b265..a03a3bc1cc9c 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -29,7 +29,7 @@
************************************************************************/
// include -----------------------------------------------------------------
#include "optfltr.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// pragma ------------------------------------------------------------------
// RID_OFAPAGE_MSFILTEROPT -----------------------------------------------------
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ca2a6f32fd23..2a8e8ed2c001 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -68,7 +68,7 @@
#include <svx/xpool.hxx>
#include <svx/dlgutil.hxx>
#include "cuitabarea.hxx"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <svx/unolingu.hxx>
#include <svx/svxids.hrc>
#include <svx/langitem.hxx>
@@ -76,7 +76,7 @@
#include <rtl/ustrbuf.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svtools/helpopt.hxx>
#include <unotools/saveopt.hxx>
@@ -195,26 +195,26 @@ namespace
OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( OFA_TP_MISC ), rSet ),
-
- aHelpFL ( this, SVX_RES( FL_HELP ) ),
- aToolTipsCB ( this, SVX_RES( CB_TOOLTIP ) ),
- aExtHelpCB ( this, SVX_RES( CB_EXTHELP ) ),
- aHelpAgentCB ( this, SVX_RES( CB_HELPAGENT ) ),
- aHelpAgentResetBtn ( this, SVX_RES( PB_HELPAGENT_RESET ) ),
- aHelpFormatFT ( this, SVX_RES( FT_HELPFORMAT ) ),
- aHelpFormatLB ( this, SVX_RES( LB_HELPFORMAT ) ),
- aFileDlgFL ( this, SVX_RES( FL_FILEDLG ) ),
- aFileDlgROImage ( this, SVX_RES( FI_FILEDLG_RO ) ),
- aFileDlgCB ( this, SVX_RES( CB_FILEDLG ) ),
- aPrintDlgFL ( this, SVX_RES( FL_PRINTDLG ) ),
- aPrintDlgCB ( this, SVX_RES( CB_PRINTDLG ) ),
- aDocStatusFL ( this, SVX_RES( FL_DOCSTATUS ) ),
- aDocStatusCB ( this, SVX_RES( CB_DOCSTATUS ) ),
- aTwoFigureFL ( this, SVX_RES( FL_TWOFIGURE ) ),
- aInterpretFT ( this, SVX_RES( FT_INTERPRET ) ),
- aYearValueField ( this, SVX_RES( NF_YEARVALUE ) ),
- aToYearFT ( this, SVX_RES( FT_TOYEAR ) )
+ SfxTabPage( pParent, CUI_RES( OFA_TP_MISC ), rSet ),
+
+ aHelpFL ( this, CUI_RES( FL_HELP ) ),
+ aToolTipsCB ( this, CUI_RES( CB_TOOLTIP ) ),
+ aExtHelpCB ( this, CUI_RES( CB_EXTHELP ) ),
+ aHelpAgentCB ( this, CUI_RES( CB_HELPAGENT ) ),
+ aHelpAgentResetBtn ( this, CUI_RES( PB_HELPAGENT_RESET ) ),
+ aHelpFormatFT ( this, CUI_RES( FT_HELPFORMAT ) ),
+ aHelpFormatLB ( this, CUI_RES( LB_HELPFORMAT ) ),
+ aFileDlgFL ( this, CUI_RES( FL_FILEDLG ) ),
+ aFileDlgROImage ( this, CUI_RES( FI_FILEDLG_RO ) ),
+ aFileDlgCB ( this, CUI_RES( CB_FILEDLG ) ),
+ aPrintDlgFL ( this, CUI_RES( FL_PRINTDLG ) ),
+ aPrintDlgCB ( this, CUI_RES( CB_PRINTDLG ) ),
+ aDocStatusFL ( this, CUI_RES( FL_DOCSTATUS ) ),
+ aDocStatusCB ( this, CUI_RES( CB_DOCSTATUS ) ),
+ aTwoFigureFL ( this, CUI_RES( FL_TWOFIGURE ) ),
+ aInterpretFT ( this, CUI_RES( FT_INTERPRET ) ),
+ aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ),
+ aToYearFT ( this, CUI_RES( FT_TOYEAR ) )
{
FreeResource();
@@ -662,40 +662,40 @@ void CanvasSettings::EnabledHardwareAcceleration( BOOL _bEnabled ) const
OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( OFA_TP_VIEW ), rSet ),
+ SfxTabPage( pParent, CUI_RES( OFA_TP_VIEW ), rSet ),
- aUserInterfaceFL ( this, SVX_RES( FL_USERINTERFACE ) ),
- aWindowSizeFT ( this, SVX_RES( FT_WINDOWSIZE ) ),
- aWindowSizeMF ( this, SVX_RES( MF_WINDOWSIZE ) ),
- aIconSizeStyleFT ( this, SVX_RES( FT_ICONSIZESTYLE ) ),
- aIconSizeLB ( this, SVX_RES( LB_ICONSIZE ) ),
- aIconStyleLB ( this, SVX_RES( LB_ICONSTYLE ) ),
- m_aSystemFont (this, SVX_RES( CB_SYSTEM_FONT ) ),
+ aUserInterfaceFL ( this, CUI_RES( FL_USERINTERFACE ) ),
+ aWindowSizeFT ( this, CUI_RES( FT_WINDOWSIZE ) ),
+ aWindowSizeMF ( this, CUI_RES( MF_WINDOWSIZE ) ),
+ aIconSizeStyleFT ( this, CUI_RES( FT_ICONSIZESTYLE ) ),
+ aIconSizeLB ( this, CUI_RES( LB_ICONSIZE ) ),
+ aIconStyleLB ( this, CUI_RES( LB_ICONSTYLE ) ),
+ m_aSystemFont (this, CUI_RES( CB_SYSTEM_FONT ) ),
#if defined( UNX )
- aFontAntiAliasing ( this, SVX_RES( CB_FONTANTIALIASING )),
- aAAPointLimitLabel ( this, SVX_RES( FT_POINTLIMIT_LABEL )),
- aAAPointLimit ( this, SVX_RES( NF_AA_POINTLIMIT )),
- aAAPointLimitUnits ( this, SVX_RES( FT_POINTLIMIT_UNIT )),
+ aFontAntiAliasing ( this, CUI_RES( CB_FONTANTIALIASING )),
+ aAAPointLimitLabel ( this, CUI_RES( FT_POINTLIMIT_LABEL )),
+ aAAPointLimit ( this, CUI_RES( NF_AA_POINTLIMIT )),
+ aAAPointLimitUnits ( this, CUI_RES( FT_POINTLIMIT_UNIT )),
#endif
- aMenuFL ( this, SVX_RES( FL_MENU ) ),
- aMenuIconsFT ( this, SVX_RES( FT_MENU_ICONS )),
- aMenuIconsLB ( this, SVX_RES( LB_MENU_ICONS )),
- aFontListsFL ( this, SVX_RES( FL_FONTLISTS) ),
- aFontShowCB ( this, SVX_RES( CB_FONT_SHOW ) ),
- aFontHistoryCB ( this, SVX_RES( CB_FONT_HISTORY ) ),
- aRenderingFL ( this, SVX_RES( FL_RENDERING ) ),
- aUseHardwareAccell ( this, SVX_RES( CB_USE_HARDACCELL ) ),
- aUseAntiAliase ( this, SVX_RES( CB_USE_ANTIALIASE ) ),
- aMouseFL ( this, SVX_RES( FL_MOUSE ) ),
- aMousePosFT ( this, SVX_RES( FT_MOUSEPOS ) ),
- aMousePosLB ( this, SVX_RES( LB_MOUSEPOS ) ),
- aMouseMiddleFT ( this, SVX_RES( FT_MOUSEMIDDLE ) ),
- aMouseMiddleLB ( this, SVX_RES( LB_MOUSEMIDDLE ) ),
+ aMenuFL ( this, CUI_RES( FL_MENU ) ),
+ aMenuIconsFT ( this, CUI_RES( FT_MENU_ICONS )),
+ aMenuIconsLB ( this, CUI_RES( LB_MENU_ICONS )),
+ aFontListsFL ( this, CUI_RES( FL_FONTLISTS) ),
+ aFontShowCB ( this, CUI_RES( CB_FONT_SHOW ) ),
+ aFontHistoryCB ( this, CUI_RES( CB_FONT_HISTORY ) ),
+ aRenderingFL ( this, CUI_RES( FL_RENDERING ) ),
+ aUseHardwareAccell ( this, CUI_RES( CB_USE_HARDACCELL ) ),
+ aUseAntiAliase ( this, CUI_RES( CB_USE_ANTIALIASE ) ),
+ aMouseFL ( this, CUI_RES( FL_MOUSE ) ),
+ aMousePosFT ( this, CUI_RES( FT_MOUSEPOS ) ),
+ aMousePosLB ( this, CUI_RES( LB_MOUSEPOS ) ),
+ aMouseMiddleFT ( this, CUI_RES( FT_MOUSEMIDDLE ) ),
+ aMouseMiddleLB ( this, CUI_RES( LB_MOUSEMIDDLE ) ),
// #i97672#
- maSelectionFL(this, SVX_RES(FL_SELECTION)),
- maSelectionCB(this, SVX_RES(CB_SELECTION)),
- maSelectionMF(this, SVX_RES(MF_SELECTION)),
+ maSelectionFL(this, CUI_RES(FL_SELECTION)),
+ maSelectionCB(this, CUI_RES(CB_SELECTION)),
+ maSelectionMF(this, CUI_RES(MF_SELECTION)),
nSizeLB_InitialSelection(0),
nStyleLB_InitialSelection(0),
@@ -745,7 +745,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
};
// temporaryly create the checkbox for the anti aliasing (we need to to determine it's pos)
- CheckBox* pFontAntiAliasing = new CheckBox( this, SVX_RES( CB_FONTANTIALIASING ) );
+ CheckBox* pFontAntiAliasing = new CheckBox( this, CUI_RES( CB_FONTANTIALIASING ) );
sal_Int32 nMoveUp = aMenuFL.GetPosPixel().Y() - pFontAntiAliasing->GetPosPixel().Y();
DELETEZ( pFontAntiAliasing );
@@ -1232,34 +1232,34 @@ static const OUString sOfficeLocaleKey = OUString::createFromAscii("ooLocale");
static Sequence< OUString > seqInstalledLanguages;
OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( OFA_TP_LANGUAGES ), rSet ),
- aUILanguageGB(this, SVX_RES(FL_UI_LANG )),
- aLocaleSettingFI(this, SVX_RES(FI_LOCALESETTING)),
- aUserInterfaceFT(this, SVX_RES(FT_USERINTERFACE)),
- aUserInterfaceLB(this, SVX_RES(LB_USERINTERFACE)),
- aLocaleSettingFT(this, SVX_RES(FT_LOCALESETTING)),
- aLocaleSettingLB(this, SVX_RES(LB_LOCALESETTING)),
- aCurrencyFI( this, SVX_RES(FI_CURRENCY )),
- aDecimalSeparatorFT(this, SVX_RES(FT_DECIMALSEPARATOR)),
- aDecimalSeparatorCB(this, SVX_RES(CB_DECIMALSEPARATOR)),
- aCurrencyFT( this, SVX_RES(FT_CURRENCY )),
- aCurrencyLB( this, SVX_RES(LB_CURRENCY )),
- aLinguLanguageGB(this, SVX_RES(FL_LINGU_LANG )),
- aWesternLanguageFI(this, SVX_RES(FI_WEST_LANG )),
- aWesternLanguageFT(this, SVX_RES(FT_WEST_LANG )),
- aWesternLanguageLB(this, SVX_RES(LB_WEST_LANG )),
- aAsianLanguageFI(this, SVX_RES(FI_ASIAN_LANG )),
- aAsianLanguageFT(this, SVX_RES(FT_ASIAN_LANG )),
- aAsianLanguageLB(this, SVX_RES(LB_ASIAN_LANG )),
- aComplexLanguageFI(this, SVX_RES(FI_COMPLEX_LANG )),
- aComplexLanguageFT(this, SVX_RES(FT_COMPLEX_LANG )),
- aComplexLanguageLB(this, SVX_RES(LB_COMPLEX_LANG )),
- aCurrentDocCB(this, SVX_RES(CB_CURRENT_DOC )),
- aEnhancedFL(this, SVX_RES(FL_ENHANCED )),
- aAsianSupportFI(this, SVX_RES(FI_ASIANSUPPORT )),
- aAsianSupportCB(this, SVX_RES(CB_ASIANSUPPORT )),
- aCTLSupportFI(this, SVX_RES(FI_CTLSUPPORT )),
- aCTLSupportCB(this, SVX_RES(CB_CTLSUPPORT )),
+ SfxTabPage( pParent, CUI_RES( OFA_TP_LANGUAGES ), rSet ),
+ aUILanguageGB(this, CUI_RES(FL_UI_LANG )),
+ aLocaleSettingFI(this, CUI_RES(FI_LOCALESETTING)),
+ aUserInterfaceFT(this, CUI_RES(FT_USERINTERFACE)),
+ aUserInterfaceLB(this, CUI_RES(LB_USERINTERFACE)),
+ aLocaleSettingFT(this, CUI_RES(FT_LOCALESETTING)),
+ aLocaleSettingLB(this, CUI_RES(LB_LOCALESETTING)),
+ aCurrencyFI( this, CUI_RES(FI_CURRENCY )),
+ aDecimalSeparatorFT(this, CUI_RES(FT_DECIMALSEPARATOR)),
+ aDecimalSeparatorCB(this, CUI_RES(CB_DECIMALSEPARATOR)),
+ aCurrencyFT( this, CUI_RES(FT_CURRENCY )),
+ aCurrencyLB( this, CUI_RES(LB_CURRENCY )),
+ aLinguLanguageGB(this, CUI_RES(FL_LINGU_LANG )),
+ aWesternLanguageFI(this, CUI_RES(FI_WEST_LANG )),
+ aWesternLanguageFT(this, CUI_RES(FT_WEST_LANG )),
+ aWesternLanguageLB(this, CUI_RES(LB_WEST_LANG )),
+ aAsianLanguageFI(this, CUI_RES(FI_ASIAN_LANG )),
+ aAsianLanguageFT(this, CUI_RES(FT_ASIAN_LANG )),
+ aAsianLanguageLB(this, CUI_RES(LB_ASIAN_LANG )),
+ aComplexLanguageFI(this, CUI_RES(FI_COMPLEX_LANG )),
+ aComplexLanguageFT(this, CUI_RES(FT_COMPLEX_LANG )),
+ aComplexLanguageLB(this, CUI_RES(LB_COMPLEX_LANG )),
+ aCurrentDocCB(this, CUI_RES(CB_CURRENT_DOC )),
+ aEnhancedFL(this, CUI_RES(FL_ENHANCED )),
+ aAsianSupportFI(this, CUI_RES(FI_ASIANSUPPORT )),
+ aAsianSupportCB(this, CUI_RES(CB_ASIANSUPPORT )),
+ aCTLSupportFI(this, CUI_RES(FI_CTLSUPPORT )),
+ aCTLSupportCB(this, CUI_RES(CB_CTLSUPPORT )),
sDecimalSeparatorLabel(aDecimalSeparatorCB.GetText()),
pLangConfig(new LanguageConfig_Impl)
{
@@ -1492,7 +1492,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
xProp->setPropertyValue(sUserLocaleKey, makeAny(aLangString));
Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
// display info
- InfoBox aBox(this, SVX_RES(RID_SVX_MSGBOX_LANGUAGE_RESTART));
+ InfoBox aBox(this, CUI_RES(RID_SVX_MSGBOX_LANGUAGE_RESTART));
aBox.Execute();
// tell quickstarter to stop being a veto listener
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index f663a7ed44ef..e8c8b9edf9a5 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -29,7 +29,7 @@
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optgdlg.hrc"
#include "helpid.hrc"
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 8812ed0efc2e..71d30851f2bd 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -39,11 +39,11 @@
#define _SVX_OPTGENRL_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optgenrl.hrc"
#include <unotools/useroptions.hxx>
#include "cuioptgenrl.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svx/dlgutil.hxx>
#include <svx/strarray.hxx>
@@ -93,53 +93,53 @@ String ConvertToStore_Impl( const String& rText )
SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
- SfxTabPage( pParent, SVX_RES(RID_SFXPAGE_GENERAL), rCoreSet ),
-
- aCompanyLbl ( this, SVX_RES( FT_COMPANY ), true ),
- aCompanyEdit ( this, SVX_RES( ED_COMPANY ), INDEX_NOTSET, &aCompanyLbl ),
- aNameLbl ( this, SVX_RES( FT_NAME ), true ),
- aNameLblRuss ( this, SVX_RES( FT_NAME_RUSS ), true ),
- aNameLblEastern ( this, SVX_RES( FT_NAME_EASTERN ), true ),
- aFirstName ( this, SVX_RES( ED_FIRSTNAME ), 0, &aNameLbl ),
- aFatherName ( this, SVX_RES( ED_FATHERNAME ) ),
- aName ( this, SVX_RES( ED_NAME ), 1, &aNameLbl ),
- aShortName ( this, SVX_RES( ED_SHORTNAME ), 2, &aNameLbl ),
- aStreetLbl ( this, SVX_RES( FT_STREET ), true ),
- aStreetLblRuss ( this, SVX_RES( FT_STREET_RUSS ), true ),
- aStreetEdit ( this, SVX_RES( ED_STREET ), 0, &aStreetLbl ),
- aApartmentNrEdit( this, SVX_RES( ED_APARTMENTNR ), 1, &aStreetLblRuss ),
- aCityLbl ( this, SVX_RES( FT_CITY ), true ),
- aPLZEdit ( this, SVX_RES( ED_PLZ ), 0, &aCityLbl ),
- aCityEdit ( this, SVX_RES( ED_CITY ), 1, &aCityLbl ),
- aUsCityEdit ( this, SVX_RES( ED_US_CITY ), 0, &aCityLbl ),
- aUsStateEdit ( this, SVX_RES( ED_US_STATE ), 1, &aCityLbl ),
- aUsZipEdit ( this, SVX_RES( ED_US_ZIPCODE ), 2, &aCityLbl ),
- aCountryLbl ( this, SVX_RES( FT_COUNTRY ), true ),
- aCountryEdit ( this, SVX_RES( ED_COUNTRY ), INDEX_NOTSET, &aCountryLbl ),
- aTitlePosLbl ( this, SVX_RES( FT_TITLEPOS ), true ),
- aTitleEdit ( this, SVX_RES( ED_TITLE ), 0, &aTitlePosLbl ),
- aPositionEdit ( this, SVX_RES( ED_POSITION ), 1, &aTitlePosLbl ),
- aPhoneLbl ( this, SVX_RES( FT_PHONE ), true ),
- aTelPrivEdit ( this, SVX_RES( ED_TELPRIVAT ), 0, &aPhoneLbl ),
- aTelCompanyEdit ( this, SVX_RES( ED_TELCOMPANY ), 1, &aPhoneLbl ),
- aFaxMailLbl ( this, SVX_RES( FT_FAXMAIL ), true ),
- aFaxEdit ( this, SVX_RES( ED_FAX ), 0, &aFaxMailLbl ),
- aEmailEdit ( this, SVX_RES( ED_EMAIL ), 1, &aFaxMailLbl ),
- aAddrFrm ( this, SVX_RES( GB_ADDRESS ) ),
- aUseDataCB ( this, SVX_RES( CB_USEDATA ) ),
+ SfxTabPage( pParent, CUI_RES(RID_SFXPAGE_GENERAL), rCoreSet ),
+
+ aCompanyLbl ( this, CUI_RES( FT_COMPANY ), true ),
+ aCompanyEdit ( this, CUI_RES( ED_COMPANY ), INDEX_NOTSET, &aCompanyLbl ),
+ aNameLbl ( this, CUI_RES( FT_NAME ), true ),
+ aNameLblRuss ( this, CUI_RES( FT_NAME_RUSS ), true ),
+ aNameLblEastern ( this, CUI_RES( FT_NAME_EASTERN ), true ),
+ aFirstName ( this, CUI_RES( ED_FIRSTNAME ), 0, &aNameLbl ),
+ aFatherName ( this, CUI_RES( ED_FATHERNAME ) ),
+ aName ( this, CUI_RES( ED_NAME ), 1, &aNameLbl ),
+ aShortName ( this, CUI_RES( ED_SHORTNAME ), 2, &aNameLbl ),
+ aStreetLbl ( this, CUI_RES( FT_STREET ), true ),
+ aStreetLblRuss ( this, CUI_RES( FT_STREET_RUSS ), true ),
+ aStreetEdit ( this, CUI_RES( ED_STREET ), 0, &aStreetLbl ),
+ aApartmentNrEdit( this, CUI_RES( ED_APARTMENTNR ), 1, &aStreetLblRuss ),
+ aCityLbl ( this, CUI_RES( FT_CITY ), true ),
+ aPLZEdit ( this, CUI_RES( ED_PLZ ), 0, &aCityLbl ),
+ aCityEdit ( this, CUI_RES( ED_CITY ), 1, &aCityLbl ),
+ aUsCityEdit ( this, CUI_RES( ED_US_CITY ), 0, &aCityLbl ),
+ aUsStateEdit ( this, CUI_RES( ED_US_STATE ), 1, &aCityLbl ),
+ aUsZipEdit ( this, CUI_RES( ED_US_ZIPCODE ), 2, &aCityLbl ),
+ aCountryLbl ( this, CUI_RES( FT_COUNTRY ), true ),
+ aCountryEdit ( this, CUI_RES( ED_COUNTRY ), INDEX_NOTSET, &aCountryLbl ),
+ aTitlePosLbl ( this, CUI_RES( FT_TITLEPOS ), true ),
+ aTitleEdit ( this, CUI_RES( ED_TITLE ), 0, &aTitlePosLbl ),
+ aPositionEdit ( this, CUI_RES( ED_POSITION ), 1, &aTitlePosLbl ),
+ aPhoneLbl ( this, CUI_RES( FT_PHONE ), true ),
+ aTelPrivEdit ( this, CUI_RES( ED_TELPRIVAT ), 0, &aPhoneLbl ),
+ aTelCompanyEdit ( this, CUI_RES( ED_TELCOMPANY ), 1, &aPhoneLbl ),
+ aFaxMailLbl ( this, CUI_RES( FT_FAXMAIL ), true ),
+ aFaxEdit ( this, CUI_RES( ED_FAX ), 0, &aFaxMailLbl ),
+ aEmailEdit ( this, CUI_RES( ED_EMAIL ), 1, &aFaxMailLbl ),
+ aAddrFrm ( this, CUI_RES( GB_ADDRESS ) ),
+ aUseDataCB ( this, CUI_RES( CB_USEDATA ) ),
pImpl ( new GeneralTabPage_Impl )
{
LanguageType eLang = Application::GetSettings().GetUILanguage();
- pImpl->maQueryStr = String( SVX_RES( STR_QUERY_REG ) );
+ pImpl->maQueryStr = String( CUI_RES( STR_QUERY_REG ) );
if ( LANGUAGE_ENGLISH_US == eLang )
{
// amerikanische Postadresse aufbauen
aPLZEdit.Hide();
aCityEdit.Hide();
- aCityLbl.SetText( SVX_RES( STR_US_STATE ) );
+ aCityLbl.SetText( CUI_RES( STR_US_STATE ) );
}
else if ( LANGUAGE_RUSSIAN == eLang )
{
diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src
index cff6f8d4216c..1d0b049dd204 100644
--- a/cui/source/options/optgenrl.src
+++ b/cui/source/options/optgenrl.src
@@ -33,7 +33,7 @@
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optgenrl.hrc"
// RID_SFXPAGE_GENERAL ------------------------------------------------------
@@ -276,24 +276,6 @@ QueryBox RID_SVXQB_CHANGEDATA
Message [ en-US ] = "The User Data have been changed.\nNote that, if you continue, the registration key will become invalid.\nTherefore, a new registration key is needed within 30 days.\nYou can find the registration form in the menu Help - Registration...\nDo you really want to change your User Data?";
};
- // RID_SVXSTR_FIELDUNIT_TABLE --------------------------------------------
-
-StringArray RID_SVXSTR_FIELDUNIT_TABLE
-{
- ItemList [ en-US ] =
- {
- < "Millimeter" ; FUNIT_MM ; > ;
- < "Centimeter" ; FUNIT_CM ; > ;
- < "Meter" ; FUNIT_M ; > ;
- < "Kilometer" ; FUNIT_KM ; > ;
- < "Inch" ; FUNIT_INCH ; > ;
- < "Foot" ; FUNIT_FOOT ; > ;
- < "Miles" ; FUNIT_MILE ; > ;
- < "Pica" ; FUNIT_PICA ; > ;
- < "Point" ; FUNIT_POINT ; > ;
- };
- };
-
// ********************************************************************** EOF
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 2737dc33051f..bddcd4a9e182 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -38,9 +38,9 @@
#include <svx/htmlcfg.hxx>
#include "opthtml.hxx"
#include "opthtml.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
// Umwandlung der Modi zu den Positionen in der Listbox
const USHORT aPosToExportArr[] =
@@ -63,34 +63,34 @@ const USHORT aExportToPosArr[] =
// -----------------------------------------------------------------------
OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_OFAPAGE_HTMLOPT ), rSet ),
- aFontSizeGB ( this, SVX_RES( GB_FONTSIZE ) ),
- aSize1FT ( this, SVX_RES( FT_SIZE1 ) ),
- aSize1NF ( this, SVX_RES( NF_SIZE1 ) ),
- aSize2FT ( this, SVX_RES( FT_SIZE2 ) ),
- aSize2NF ( this, SVX_RES( NF_SIZE2 ) ),
- aSize3FT ( this, SVX_RES( FT_SIZE3 ) ),
- aSize3NF ( this, SVX_RES( NF_SIZE3 ) ),
- aSize4FT ( this, SVX_RES( FT_SIZE4 ) ),
- aSize4NF ( this, SVX_RES( NF_SIZE4 ) ),
- aSize5FT ( this, SVX_RES( FT_SIZE5 ) ),
- aSize5NF ( this, SVX_RES( NF_SIZE5 ) ),
- aSize6FT ( this, SVX_RES( FT_SIZE6 ) ),
- aSize6NF ( this, SVX_RES( NF_SIZE6 ) ),
- aSize7FT ( this, SVX_RES( FT_SIZE7 ) ),
- aSize7NF ( this, SVX_RES( NF_SIZE7 ) ),
- aImportGB ( this, SVX_RES( GB_IMPORT ) ),
- aNumbersEnglishUSCB ( this, SVX_RES( CB_NUMBERS_ENGLISH_US ) ),
- aUnknownTagCB ( this, SVX_RES( CB_UNKNOWN_TAGS ) ),
- aIgnoreFontNamesCB( this, SVX_RES( CB_IGNORE_FONTNAMES ) ),
- aExportGB ( this, SVX_RES( GB_EXPORT ) ),
- aExportLB ( this, SVX_RES( LB_EXPORT ) ),
- aStarBasicCB ( this, SVX_RES( CB_STARBASIC ) ),
- aStarBasicWarningCB(this, SVX_RES( CB_STARBASIC_WARNING ) ),
- aPrintExtensionCB( this,SVX_RES(CB_PRINT_EXTENSION )),
- aSaveGrfLocalCB ( this, SVX_RES( CB_LOCAL_GRF ) ),
- aCharSetFT ( this, SVX_RES( FT_CHARSET ) ),
- aCharSetLB ( this, SVX_RES( LB_CHARSET ) )
+ SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_HTMLOPT ), rSet ),
+ aFontSizeGB ( this, CUI_RES( GB_FONTSIZE ) ),
+ aSize1FT ( this, CUI_RES( FT_SIZE1 ) ),
+ aSize1NF ( this, CUI_RES( NF_SIZE1 ) ),
+ aSize2FT ( this, CUI_RES( FT_SIZE2 ) ),
+ aSize2NF ( this, CUI_RES( NF_SIZE2 ) ),
+ aSize3FT ( this, CUI_RES( FT_SIZE3 ) ),
+ aSize3NF ( this, CUI_RES( NF_SIZE3 ) ),
+ aSize4FT ( this, CUI_RES( FT_SIZE4 ) ),
+ aSize4NF ( this, CUI_RES( NF_SIZE4 ) ),
+ aSize5FT ( this, CUI_RES( FT_SIZE5 ) ),
+ aSize5NF ( this, CUI_RES( NF_SIZE5 ) ),
+ aSize6FT ( this, CUI_RES( FT_SIZE6 ) ),
+ aSize6NF ( this, CUI_RES( NF_SIZE6 ) ),
+ aSize7FT ( this, CUI_RES( FT_SIZE7 ) ),
+ aSize7NF ( this, CUI_RES( NF_SIZE7 ) ),
+ aImportGB ( this, CUI_RES( GB_IMPORT ) ),
+ aNumbersEnglishUSCB ( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ),
+ aUnknownTagCB ( this, CUI_RES( CB_UNKNOWN_TAGS ) ),
+ aIgnoreFontNamesCB( this, CUI_RES( CB_IGNORE_FONTNAMES ) ),
+ aExportGB ( this, CUI_RES( GB_EXPORT ) ),
+ aExportLB ( this, CUI_RES( LB_EXPORT ) ),
+ aStarBasicCB ( this, CUI_RES( CB_STARBASIC ) ),
+ aStarBasicWarningCB(this, CUI_RES( CB_STARBASIC_WARNING ) ),
+ aPrintExtensionCB( this,CUI_RES(CB_PRINT_EXTENSION )),
+ aSaveGrfLocalCB ( this, CUI_RES( CB_LOCAL_GRF ) ),
+ aCharSetFT ( this, CUI_RES( FT_CHARSET ) ),
+ aCharSetLB ( this, CUI_RES( LB_CHARSET ) )
{
FreeResource();
diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src
index dc5b5f9431c7..29f5ff1fe78e 100644
--- a/cui/source/options/opthtml.src
+++ b/cui/source/options/opthtml.src
@@ -30,7 +30,7 @@
// include -----------------------------------------------------------------
#include "opthtml.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// RID_OFAPAGE_HTMLOPT -----------------------------------------------------
TabPage RID_OFAPAGE_HTMLOPT
diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx
index e6240aa7a797..c8f52a63e708 100644
--- a/cui/source/options/optimprove.cxx
+++ b/cui/source/options/optimprove.cxx
@@ -36,12 +36,12 @@
#define _SVX_OPTIMPROVE_CXX
#include <optimprove.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <vcl/msgbox.hxx>
-
+#include <svx/dialogs.hrc>
#include "optimprove.hrc"
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -61,21 +61,21 @@ using namespace com::sun::star::system;
SvxImprovementPage::SvxImprovementPage( Window* pParent ) :
- TabPage( pParent, SVX_RES( RID_SVXPAGE_IMPROVEMENT ) ),
-
- m_aImproveFL ( this, SVX_RES( FL_IMPROVE ) ),
- m_aInvitationFT ( this, SVX_RES( FT_INVITATION ) ),
- m_aYesRB ( this, SVX_RES( RB_YES ) ),
- m_aNoRB ( this, SVX_RES( RB_NO ) ),
- m_aDataFL ( this, SVX_RES( FL_DATA ) ),
- m_aNumberOfReportsFT ( this, SVX_RES( FT_NR_REPORTS ) ),
- m_aNumberOfReportsValueFT ( this, SVX_RES( FT_NR_REPORTS_VALUE ) ),
- m_aNumberOfActionsFT ( this, SVX_RES( FT_NR_ACTIONS ) ),
- m_aNumberOfActionsValueFT ( this, SVX_RES( FT_NR_ACTIONS_VALUE ) ),
- m_aShowDataPB ( this, SVX_RES( PB_SHOWDATA ) ),
-
- m_sInfo ( SVX_RES( STR_INFO ) ),
- m_sMoreInfo ( SVX_RES( STR_MOREINFO ) )
+ TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) ),
+
+ m_aImproveFL ( this, CUI_RES( FL_IMPROVE ) ),
+ m_aInvitationFT ( this, CUI_RES( FT_INVITATION ) ),
+ m_aYesRB ( this, CUI_RES( RB_YES ) ),
+ m_aNoRB ( this, CUI_RES( RB_NO ) ),
+ m_aDataFL ( this, CUI_RES( FL_DATA ) ),
+ m_aNumberOfReportsFT ( this, CUI_RES( FT_NR_REPORTS ) ),
+ m_aNumberOfReportsValueFT ( this, CUI_RES( FT_NR_REPORTS_VALUE ) ),
+ m_aNumberOfActionsFT ( this, CUI_RES( FT_NR_ACTIONS ) ),
+ m_aNumberOfActionsValueFT ( this, CUI_RES( FT_NR_ACTIONS_VALUE ) ),
+ m_aShowDataPB ( this, CUI_RES( PB_SHOWDATA ) ),
+
+ m_sInfo ( CUI_RES( STR_INFO ) ),
+ m_sMoreInfo ( CUI_RES( STR_MOREINFO ) )
{
FreeResource();
diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src
index 86fc6d1c1a5d..d8782144cdb3 100644
--- a/cui/source/options/optimprove.src
+++ b/cui/source/options/optimprove.src
@@ -31,8 +31,9 @@
// include --------------------------------------------------------------
#include "optimprove.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
TabPage RID_SVXPAGE_IMPROVEMENT
{
diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx
index de44e7979471..797c0dce0534 100644
--- a/cui/source/options/optimprove2.cxx
+++ b/cui/source/options/optimprove2.cxx
@@ -36,13 +36,13 @@
#define _SVX_OPTIMPROVE_CXX
#include <optimprove.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <vcl/msgbox.hxx>
#include "optimprove.hrc"
#include "helpid.hrc"
+#include <cuires.hrc>
#include <svx/dialogs.hrc>
-
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/oooimprovement/XCore.hpp>
@@ -68,7 +68,7 @@ using namespace com::sun::star::system;
SvxEmptyPage::SvxEmptyPage( Window* pParent ) :
- TabPage( pParent, SVX_RES( RID_SVXPAGE_IMPROVEMENT ) )
+ TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) )
{
FreeResource();
@@ -78,22 +78,22 @@ SvxEmptyPage::SvxEmptyPage( Window* pParent ) :
SvxImprovementOptionsPage::SvxImprovementOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_IMPROVEMENT ), rSet ),
-
- m_aImproveFL ( this, SVX_RES( FL_IMPROVE ) ),
- m_aInvitationFT ( this, SVX_RES( FT_INVITATION ) ),
- m_aYesRB ( this, SVX_RES( RB_YES ) ),
- m_aNoRB ( this, SVX_RES( RB_NO ) ),
- m_aInfoFI ( this, SVX_RES( FI_INFO ) ),
- m_aDataFL ( this, SVX_RES( FL_DATA ) ),
- m_aNumberOfReportsFT ( this, SVX_RES( FT_NR_REPORTS ) ),
- m_aNumberOfReportsValueFT ( this, SVX_RES( FT_NR_REPORTS_VALUE ) ),
- m_aNumberOfActionsFT ( this, SVX_RES( FT_NR_ACTIONS ) ),
- m_aNumberOfActionsValueFT ( this, SVX_RES( FT_NR_ACTIONS_VALUE ) ),
- m_aShowDataPB ( this, SVX_RES( PB_SHOWDATA ) ),
-
- m_sInfo ( SVX_RES( STR_INFO ) ),
- m_sMoreInfo ( SVX_RES( STR_MOREINFO ) )
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ), rSet ),
+
+ m_aImproveFL ( this, CUI_RES( FL_IMPROVE ) ),
+ m_aInvitationFT ( this, CUI_RES( FT_INVITATION ) ),
+ m_aYesRB ( this, CUI_RES( RB_YES ) ),
+ m_aNoRB ( this, CUI_RES( RB_NO ) ),
+ m_aInfoFI ( this, CUI_RES( FI_INFO ) ),
+ m_aDataFL ( this, CUI_RES( FL_DATA ) ),
+ m_aNumberOfReportsFT ( this, CUI_RES( FT_NR_REPORTS ) ),
+ m_aNumberOfReportsValueFT ( this, CUI_RES( FT_NR_REPORTS_VALUE ) ),
+ m_aNumberOfActionsFT ( this, CUI_RES( FT_NR_ACTIONS ) ),
+ m_aNumberOfActionsValueFT ( this, CUI_RES( FT_NR_ACTIONS_VALUE ) ),
+ m_aShowDataPB ( this, CUI_RES( PB_SHOWDATA ) ),
+
+ m_sInfo ( CUI_RES( STR_INFO ) ),
+ m_sMoreInfo ( CUI_RES( STR_MOREINFO ) )
{
FreeResource();
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 94f850eb1d32..22d24391a953 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -62,10 +62,10 @@
#include <unotools/extendedsecurityoptions.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#define _SVX_OPTINET2_CXX
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "optinet2.hxx"
#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optinet2.hrc"
#include "helpid.hrc"
#include <svx/ofaitem.hxx>
@@ -212,7 +212,7 @@ void SvxNoSpaceEdit::Modify()
if ( !ByteString(::rtl::OUStringToOString(aValue,RTL_TEXTENCODING_UTF8)).IsNumericAscii() || (long)aValue.ToInt32() > USHRT_MAX )
// der H�chstwert einer Portnummer ist USHRT_MAX
- ErrorBox( this, SVX_RES( RID_SVXERR_OPT_PROXYPORTS ) ).Execute();
+ ErrorBox( this, CUI_RES( RID_SVXERR_OPT_PROXYPORTS ) ).Execute();
}
}
@@ -226,31 +226,31 @@ void SvxNoSpaceEdit::Modify()
/********************************************************************/
SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_PROXY ), rSet ),
- aOptionGB (this, SVX_RES(GB_SETTINGS)),
-
- aProxyModeFT (this, SVX_RES(FT_PROXYMODE)),
- aProxyModeLB (this, SVX_RES(LB_PROXYMODE)),
-
- aHttpProxyFT (this, SVX_RES( FT_HTTP_PROXY )),
- aHttpProxyED (this, SVX_RES( ED_HTTP_PROXY )),
- aHttpPortFT (this, SVX_RES( FT_HTTP_PORT )),
- aHttpPortED (this, SVX_RES( ED_HTTP_PORT ), TRUE),
-
- aHttpsProxyFT (this, SVX_RES( FT_HTTPS_PROXY )),
- aHttpsProxyED (this, SVX_RES( ED_HTTPS_PROXY )),
- aHttpsPortFT (this, SVX_RES( FT_HTTPS_PORT )),
- aHttpsPortED (this, SVX_RES( ED_HTTPS_PORT ), TRUE),
-
- aFtpProxyFT (this, SVX_RES( FT_FTP_PROXY )),
- aFtpProxyED (this, SVX_RES( ED_FTP_PROXY )),
- aFtpPortFT (this, SVX_RES( FT_FTP_PORT )),
- aFtpPortED (this, SVX_RES( ED_FTP_PORT ), TRUE),
-
- aNoProxyForFT (this, SVX_RES( FT_NOPROXYFOR )),
- aNoProxyForED (this, SVX_RES( ED_NOPROXYFOR )),
- aNoProxyDescFT (this, SVX_RES( ED_NOPROXYDESC )),
- sFromBrowser ( SVX_RES( ST_PROXY_FROM_BROWSER ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_PROXY ), rSet ),
+ aOptionGB (this, CUI_RES(GB_SETTINGS)),
+
+ aProxyModeFT (this, CUI_RES(FT_PROXYMODE)),
+ aProxyModeLB (this, CUI_RES(LB_PROXYMODE)),
+
+ aHttpProxyFT (this, CUI_RES( FT_HTTP_PROXY )),
+ aHttpProxyED (this, CUI_RES( ED_HTTP_PROXY )),
+ aHttpPortFT (this, CUI_RES( FT_HTTP_PORT )),
+ aHttpPortED (this, CUI_RES( ED_HTTP_PORT ), TRUE),
+
+ aHttpsProxyFT (this, CUI_RES( FT_HTTPS_PROXY )),
+ aHttpsProxyED (this, CUI_RES( ED_HTTPS_PROXY )),
+ aHttpsPortFT (this, CUI_RES( FT_HTTPS_PORT )),
+ aHttpsPortED (this, CUI_RES( ED_HTTPS_PORT ), TRUE),
+
+ aFtpProxyFT (this, CUI_RES( FT_FTP_PROXY )),
+ aFtpProxyED (this, CUI_RES( ED_FTP_PROXY )),
+ aFtpPortFT (this, CUI_RES( FT_FTP_PORT )),
+ aFtpPortED (this, CUI_RES( ED_FTP_PORT ), TRUE),
+
+ aNoProxyForFT (this, CUI_RES( FT_NOPROXYFOR )),
+ aNoProxyForED (this, CUI_RES( ED_NOPROXYFOR )),
+ aNoProxyDescFT (this, CUI_RES( ED_NOPROXYDESC )),
+ sFromBrowser ( CUI_RES( ST_PROXY_FROM_BROWSER ) ),
aProxyModePN(RTL_CONSTASCII_USTRINGPARAM("ooInetProxyType")),
aHttpProxyPN(RTL_CONSTASCII_USTRINGPARAM("ooInetHTTPProxyName")),
aHttpPortPN(RTL_CONSTASCII_USTRINGPARAM("ooInetHTTPProxyPort")),
@@ -726,33 +726,33 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_SEARCH ), rSet ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_SEARCH ), rSet ),
- aSearchGB ( this, SVX_RES( GB_SEARCH ) ),
- aSearchLB ( this, SVX_RES( LB_SEARCH ) ),
- aSearchNameFT ( this, SVX_RES( FT_SEARCH_NAME ) ),
- aSearchNameED ( this, SVX_RES( ED_SEARCH_NAME ) ),
- aSearchFT ( this, SVX_RES( FT_SEARCH ) ),
- aAndRB ( this, SVX_RES( RB_AND ) ),
- aOrRB ( this, SVX_RES( RB_OR ) ),
- aExactRB ( this, SVX_RES( RB_EXACT ) ),
+ aSearchGB ( this, CUI_RES( GB_SEARCH ) ),
+ aSearchLB ( this, CUI_RES( LB_SEARCH ) ),
+ aSearchNameFT ( this, CUI_RES( FT_SEARCH_NAME ) ),
+ aSearchNameED ( this, CUI_RES( ED_SEARCH_NAME ) ),
+ aSearchFT ( this, CUI_RES( FT_SEARCH ) ),
+ aAndRB ( this, CUI_RES( RB_AND ) ),
+ aOrRB ( this, CUI_RES( RB_OR ) ),
+ aExactRB ( this, CUI_RES( RB_EXACT ) ),
- aURLFT ( this, SVX_RES( FT_URL ) ),
- aURLED ( this, SVX_RES( ED_URL ) ),
+ aURLFT ( this, CUI_RES( FT_URL ) ),
+ aURLED ( this, CUI_RES( ED_URL ) ),
- aPostFixFT ( this, SVX_RES( FT_POSTFIX ) ),
- aPostFixED ( this, SVX_RES( ED_POSTFIX ) ),
- aSeparatorFT ( this, SVX_RES( FT_SEPARATOR ) ),
- aSeparatorED ( this, SVX_RES( ED_SEPARATOR ) ),
- aCaseFT ( this, SVX_RES( FT_CASE ) ),
- aCaseED ( this, SVX_RES( ED_CASE ) ),
+ aPostFixFT ( this, CUI_RES( FT_POSTFIX ) ),
+ aPostFixED ( this, CUI_RES( ED_POSTFIX ) ),
+ aSeparatorFT ( this, CUI_RES( FT_SEPARATOR ) ),
+ aSeparatorED ( this, CUI_RES( ED_SEPARATOR ) ),
+ aCaseFT ( this, CUI_RES( FT_CASE ) ),
+ aCaseED ( this, CUI_RES( ED_CASE ) ),
- aNewPB ( this, SVX_RES( PB_NEW ) ),
- aAddPB ( this, SVX_RES( PB_ADD ) ),
- aChangePB ( this, SVX_RES( PB_CHANGE ) ),
- aDeletePB ( this, SVX_RES( PB_DELETE ) ),
+ aNewPB ( this, CUI_RES( PB_NEW ) ),
+ aAddPB ( this, CUI_RES( PB_ADD ) ),
+ aChangePB ( this, CUI_RES( PB_CHANGE ) ),
+ aDeletePB ( this, CUI_RES( PB_DELETE ) ),
- sModifyMsg(SVX_RES(MSG_MODIFY))
+ sModifyMsg(CUI_RES(MSG_MODIFY))
{
FreeResource();
@@ -1256,13 +1256,13 @@ public:
JavaScriptDisableQueryBox_Impl::JavaScriptDisableQueryBox_Impl( Window* pParent ) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ),
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ),
- aImage ( this, SVX_RES( IMG_JSCPT_WARNING ) ),
- aWarningFT ( this, SVX_RES( FT_JSCPT_WARNING ) ),
- aDisableCB ( this, SVX_RES( CB_JSCPT_DISABLE ) ),
- aYesBtn ( this, SVX_RES( BTN_JSCPT_YES ) ),
- aNoBtn ( this, SVX_RES( BTN_JSCPT_NO ) )
+ aImage ( this, CUI_RES( IMG_JSCPT_WARNING ) ),
+ aWarningFT ( this, CUI_RES( FT_JSCPT_WARNING ) ),
+ aDisableCB ( this, CUI_RES( CB_JSCPT_DISABLE ) ),
+ aYesBtn ( this, CUI_RES( BTN_JSCPT_YES ) ),
+ aNoBtn ( this, CUI_RES( BTN_JSCPT_NO ) )
{
FreeResource();
@@ -1315,34 +1315,34 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
/********************************************************************/
SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet )
- :SfxTabPage ( pParent, SVX_RES( RID_SVXPAGE_INET_SECURITY ), rSet )
-
- ,maSecurityOptionsFL( this, SVX_RES( FL_SEC_SECURITYOPTIONS ) )
- ,maSecurityOptionsFI( this, SVX_RES( FI_SEC_SECURITYOPTIONS ) )
- ,maSecurityOptionsPB( this, SVX_RES( PB_SEC_SECURITYOPTIONS ) )
-
- ,maPasswordsFL ( this, SVX_RES( FL_SEC_PASSWORDS ) )
- ,maSavePasswordsCB ( this, SVX_RES( CB_SEC_SAVEPASSWORDS ) )
- ,maShowConnectionsPB( this, SVX_RES( PB_SEC_CONNECTIONS ) )
- ,maMasterPasswordCB ( this, SVX_RES( CB_SEC_MASTERPASSWORD ) )
- ,maMasterPasswordFI ( this, SVX_RES( FI_SEC_MASTERPASSWORD ) )
- ,maMasterPasswordPB ( this, SVX_RES( PB_SEC_MASTERPASSWORD ) )
-
- ,maMacroSecFL ( this, SVX_RES( FL_SEC_MACROSEC ) )
- ,maMacroSecFI ( this, SVX_RES( FI_SEC_MACROSEC ) )
- ,maMacroSecPB ( this, SVX_RES( PB_SEC_MACROSEC ) )
- ,maFilesharingFL ( this, SVX_RES( FL_SEC_FILESHARING ) )
- ,maRecommReadOnlyCB ( this, SVX_RES( CB_SEC_RECOMMREADONLY ) )
- ,maRecordChangesCB ( this, SVX_RES( CB_SEC_RECORDCHANGES ) )
- ,maProtectRecordsPB ( this, SVX_RES( PB_SEC_PROTRECORDS ) )
+ :SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_INET_SECURITY ), rSet )
+
+ ,maSecurityOptionsFL( this, CUI_RES( FL_SEC_SECURITYOPTIONS ) )
+ ,maSecurityOptionsFI( this, CUI_RES( FI_SEC_SECURITYOPTIONS ) )
+ ,maSecurityOptionsPB( this, CUI_RES( PB_SEC_SECURITYOPTIONS ) )
+
+ ,maPasswordsFL ( this, CUI_RES( FL_SEC_PASSWORDS ) )
+ ,maSavePasswordsCB ( this, CUI_RES( CB_SEC_SAVEPASSWORDS ) )
+ ,maShowConnectionsPB( this, CUI_RES( PB_SEC_CONNECTIONS ) )
+ ,maMasterPasswordCB ( this, CUI_RES( CB_SEC_MASTERPASSWORD ) )
+ ,maMasterPasswordFI ( this, CUI_RES( FI_SEC_MASTERPASSWORD ) )
+ ,maMasterPasswordPB ( this, CUI_RES( PB_SEC_MASTERPASSWORD ) )
+
+ ,maMacroSecFL ( this, CUI_RES( FL_SEC_MACROSEC ) )
+ ,maMacroSecFI ( this, CUI_RES( FI_SEC_MACROSEC ) )
+ ,maMacroSecPB ( this, CUI_RES( PB_SEC_MACROSEC ) )
+ ,maFilesharingFL ( this, CUI_RES( FL_SEC_FILESHARING ) )
+ ,maRecommReadOnlyCB ( this, CUI_RES( CB_SEC_RECOMMREADONLY ) )
+ ,maRecordChangesCB ( this, CUI_RES( CB_SEC_RECORDCHANGES ) )
+ ,maProtectRecordsPB ( this, CUI_RES( PB_SEC_PROTRECORDS ) )
,mpSecOptions ( new SvtSecurityOptions )
,mpSecOptDlg ( NULL )
,meRedlingMode ( RL_NONE )
- ,msProtectRecordsStr( SVX_RES( STR_SEC_PROTRECORDS ) )
- ,msUnprotectRecordsStr( SVX_RES( STR_SEC_UNPROTRECORDS ) )
- ,msPasswordStoringDeactivateStr( SVX_RES( STR_SEC_NOPASSWDSAVE ) )
+ ,msProtectRecordsStr( CUI_RES( STR_SEC_PROTRECORDS ) )
+ ,msUnprotectRecordsStr( CUI_RES( STR_SEC_UNPROTRECORDS ) )
+ ,msPasswordStoringDeactivateStr( CUI_RES( STR_SEC_NOPASSWDSAVE ) )
{
FreeResource();
@@ -1925,9 +1925,9 @@ void SvxSecurityTabPage::Reset( const SfxItemSet& )
//added by jmeng begin
MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
- aMSWordGB ( this, SVX_RES( GB_MOZPLUGIN ) ),
- aWBasicCodeCB ( this, SVX_RES( CB_MOZPLUGIN_CODE ) )
+ : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
+ aMSWordGB ( this, CUI_RES( GB_MOZPLUGIN ) ),
+ aWBasicCodeCB ( this, CUI_RES( CB_MOZPLUGIN_CODE ) )
{
FreeResource();
}
@@ -2224,13 +2224,13 @@ struct SvxEMailTabPage_Impl
};
SvxEMailTabPage::SvxEMailTabPage(Window* pParent, const SfxItemSet& rSet) :
- SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_INET_MAIL ), rSet),
- aMailFL(this, SVX_RES(FL_MAIL )),
- aMailerURLFI(this, SVX_RES(FI_MAILERURL )),
- aMailerURLFT(this, SVX_RES(FT_MAILERURL )),
- aMailerURLED(this, SVX_RES(ED_MAILERURL )),
- aMailerURLPB(this, SVX_RES(PB_MAILERURL )),
- m_sDefaultFilterName( SVX_RES(STR_DEFAULT_FILENAME )),
+ SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_INET_MAIL ), rSet),
+ aMailFL(this, CUI_RES(FL_MAIL )),
+ aMailerURLFI(this, CUI_RES(FI_MAILERURL )),
+ aMailerURLFT(this, CUI_RES(FT_MAILERURL )),
+ aMailerURLED(this, CUI_RES(ED_MAILERURL )),
+ aMailerURLPB(this, CUI_RES(PB_MAILERURL )),
+ m_sDefaultFilterName( CUI_RES(STR_DEFAULT_FILENAME )),
pImpl(new SvxEMailTabPage_Impl)
{
FreeResource();
diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index da394d6d249f..1e9a3f65efeb 100644
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -169,6 +169,11 @@
#define PB_MAILERURL 5
#define STR_DEFAULT_FILENAME 6
+// plugin
+#define GB_MOZPLUGIN 1
+#define CB_MOZPLUGIN_CODE 2
+
+
#endif // #ifndef _SVX_OPTINET_HRC
// ******************************************************************* EOF
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 2ef6dc59c2e4..e7bdc9eff17c 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -30,7 +30,7 @@
// include ------------------------------------------------------------------
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optinet2.hrc"
// pragma -------------------------------------------------------------------
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index ec145ddacb3a..fdc36dadbbb7 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -34,10 +34,10 @@
// include ---------------------------------------------------------------
#include "optjava.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "optjava.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
@@ -149,16 +149,16 @@ bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< :
SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_OPTIONS_JAVA ), rSet ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_JAVA ), rSet ),
- m_aJavaLine ( this, SVX_RES( FL_JAVA ) ),
- m_aJavaEnableCB ( this, SVX_RES( CB_JAVA_ENABLE ) ),
- m_aJavaFoundLabel ( this, SVX_RES( FT_JAVA_FOUND ) ),
- m_aJavaList ( this, SVX_RES( LB_JAVA ) ),
- m_aJavaPathText ( this, SVX_RES( FT_JAVA_PATH ) ),
- m_aAddBtn ( this, SVX_RES( PB_ADD ) ),
- m_aParameterBtn ( this, SVX_RES( PB_PARAMETER ) ),
- m_aClassPathBtn ( this, SVX_RES( PB_CLASSPATH ) ),
+ m_aJavaLine ( this, CUI_RES( FL_JAVA ) ),
+ m_aJavaEnableCB ( this, CUI_RES( CB_JAVA_ENABLE ) ),
+ m_aJavaFoundLabel ( this, CUI_RES( FT_JAVA_FOUND ) ),
+ m_aJavaList ( this, CUI_RES( LB_JAVA ) ),
+ m_aJavaPathText ( this, CUI_RES( FT_JAVA_PATH ) ),
+ m_aAddBtn ( this, CUI_RES( PB_ADD ) ),
+ m_aParameterBtn ( this, CUI_RES( PB_PARAMETER ) ),
+ m_aClassPathBtn ( this, CUI_RES( PB_CLASSPATH ) ),
m_pParamDlg ( NULL ),
m_pPathDlg ( NULL ),
@@ -167,9 +167,9 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
m_pClassPath ( NULL ),
m_nInfoSize ( 0 ),
m_nParamSize ( 0 ),
- m_sInstallText ( SVX_RES( STR_INSTALLED_IN ) ),
- m_sAccessibilityText( SVX_RES( STR_ACCESSIBILITY ) ),
- m_sAddDialogText ( SVX_RES( STR_ADDDLGTEXT ) ),
+ m_sInstallText ( CUI_RES( STR_INSTALLED_IN ) ),
+ m_sAccessibilityText( CUI_RES( STR_ACCESSIBILITY ) ),
+ m_sAddDialogText ( CUI_RES( STR_ADDDLGTEXT ) ),
xDialogListener ( new ::svt::DialogClosedListener() )
@@ -192,11 +192,11 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
m_aJavaList.SvxSimpleTable::SetTabs( aStaticTabs );
String sHeader( '\t' );
- sHeader += String( SVX_RES( STR_HEADER_VENDOR ) );
+ sHeader += String( CUI_RES( STR_HEADER_VENDOR ) );
sHeader += '\t';
- sHeader += String( SVX_RES( STR_HEADER_VERSION ) );
+ sHeader += String( CUI_RES( STR_HEADER_VERSION ) );
sHeader += '\t';
- sHeader += String( SVX_RES( STR_HEADER_FEATURES ) );
+ sHeader += String( CUI_RES( STR_HEADER_FEATURES ) );
sHeader += '\t';
m_aJavaList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT );
@@ -365,7 +365,7 @@ IMPL_LINK( SvxJavaOptionsPage, ParameterHdl_Impl, PushButton *, EMPTYARG )
(void)eErr;
if ( bRunning )
{
- WarningBox aWarnBox( this, SVX_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) );
+ WarningBox aWarnBox( this, CUI_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) );
aWarnBox.Execute();
}
}
@@ -409,7 +409,7 @@ IMPL_LINK( SvxJavaOptionsPage, ClassPathHdl_Impl, PushButton *, EMPTYARG )
(void)eErr;
if ( bRunning )
{
- WarningBox aWarnBox( this, SVX_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) );
+ WarningBox aWarnBox( this, CUI_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) );
aWarnBox.Execute();
}
}
@@ -634,12 +634,12 @@ void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder )
}
else if ( JFW_E_NOT_RECOGNIZED == eErr )
{
- ErrorBox aErrBox( this, SVX_RES( RID_SVXERR_JRE_NOT_RECOGNIZED ) );
+ ErrorBox aErrBox( this, CUI_RES( RID_SVXERR_JRE_NOT_RECOGNIZED ) );
aErrBox.Execute();
}
else if ( JFW_E_FAILED_VERSION == eErr )
{
- ErrorBox aErrBox( this, SVX_RES( RID_SVXERR_JRE_FAILED_VERSION ) );
+ ErrorBox aErrBox( this, CUI_RES( RID_SVXERR_JRE_FAILED_VERSION ) );
aErrBox.Execute();
}
@@ -716,7 +716,7 @@ BOOL SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
if ( bRunning ||
( ( pInfo->nRequirements & JFW_REQUIRE_NEEDRESTART ) == JFW_REQUIRE_NEEDRESTART ) )
{
- WarningBox aWarnBox( this, SVX_RES( RID_SVX_MSGBOX_JAVA_RESTART ) );
+ WarningBox aWarnBox( this, CUI_RES( RID_SVX_MSGBOX_JAVA_RESTART ) );
aWarnBox.Execute();
}
@@ -775,19 +775,19 @@ void SvxJavaOptionsPage::FillUserData()
SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_JAVA_PARAMETER ) ),
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_PARAMETER ) ),
- m_aParameterLabel ( this, SVX_RES( FT_PARAMETER ) ),
- m_aParameterEdit ( this, SVX_RES( ED_PARAMETER ) ),
- m_aAssignBtn ( this, SVX_RES( PB_ASSIGN ) ),
- m_aAssignedLabel ( this, SVX_RES( FT_ASSIGNED ) ),
- m_aAssignedList ( this, SVX_RES( LB_ASSIGNED ) ),
- m_aExampleText ( this, SVX_RES( FT_EXAMPLE ) ),
- m_aRemoveBtn ( this, SVX_RES( PB_REMOVE ) ),
- m_aButtonsLine ( this, SVX_RES( FL_BUTTONS ) ),
- m_aOKBtn ( this, SVX_RES( PB_PARAMETER_OK ) ),
- m_aCancelBtn ( this, SVX_RES( PB_PARAMETER_ESC ) ),
- m_aHelpBtn ( this, SVX_RES( PB_PARAMETER_HLP ) )
+ m_aParameterLabel ( this, CUI_RES( FT_PARAMETER ) ),
+ m_aParameterEdit ( this, CUI_RES( ED_PARAMETER ) ),
+ m_aAssignBtn ( this, CUI_RES( PB_ASSIGN ) ),
+ m_aAssignedLabel ( this, CUI_RES( FT_ASSIGNED ) ),
+ m_aAssignedList ( this, CUI_RES( LB_ASSIGNED ) ),
+ m_aExampleText ( this, CUI_RES( FT_EXAMPLE ) ),
+ m_aRemoveBtn ( this, CUI_RES( PB_REMOVE ) ),
+ m_aButtonsLine ( this, CUI_RES( FL_BUTTONS ) ),
+ m_aOKBtn ( this, CUI_RES( PB_PARAMETER_OK ) ),
+ m_aCancelBtn ( this, CUI_RES( PB_PARAMETER_ESC ) ),
+ m_aHelpBtn ( this, CUI_RES( PB_PARAMETER_HLP ) )
{
FreeResource();
@@ -915,17 +915,17 @@ void SvxJavaParameterDlg::SetParameters( Sequence< ::rtl::OUString >& rParams )
SvxJavaClassPathDlg::SvxJavaClassPathDlg( Window* pParent ) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_JAVA_CLASSPATH ) ),
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_CLASSPATH ) ),
- m_aPathLabel ( this, SVX_RES( FT_PATH ) ),
- m_aPathList ( this, SVX_RES( LB_PATH ) ),
- m_aAddArchiveBtn ( this, SVX_RES( PB_ADDARCHIVE ) ),
- m_aAddPathBtn ( this, SVX_RES( PB_ADDPATH ) ),
- m_aRemoveBtn ( this, SVX_RES( PB_REMOVE_PATH ) ),
- m_aButtonsLine ( this, SVX_RES( FL_PATH_BUTTONS ) ),
- m_aOKBtn ( this, SVX_RES( PB_PATH_OK ) ),
- m_aCancelBtn ( this, SVX_RES( PB_PATH_ESC ) ),
- m_aHelpBtn ( this, SVX_RES( PB_PATH_HLP ) )
+ m_aPathLabel ( this, CUI_RES( FT_PATH ) ),
+ m_aPathList ( this, CUI_RES( LB_PATH ) ),
+ m_aAddArchiveBtn ( this, CUI_RES( PB_ADDARCHIVE ) ),
+ m_aAddPathBtn ( this, CUI_RES( PB_ADDPATH ) ),
+ m_aRemoveBtn ( this, CUI_RES( PB_REMOVE_PATH ) ),
+ m_aButtonsLine ( this, CUI_RES( FL_PATH_BUTTONS ) ),
+ m_aOKBtn ( this, CUI_RES( PB_PATH_OK ) ),
+ m_aCancelBtn ( this, CUI_RES( PB_PATH_ESC ) ),
+ m_aHelpBtn ( this, CUI_RES( PB_PATH_HLP ) )
{
FreeResource();
@@ -977,8 +977,8 @@ SvxJavaClassPathDlg::~SvxJavaClassPathDlg()
IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG )
{
sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 );
- aDlg.SetTitle( SVX_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
- aDlg.AddFilter( SVX_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
+ aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
+ aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
String sFolder;
if ( m_aPathList.GetSelectEntryCount() > 0 )
{
@@ -1000,7 +1000,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG )
}
else
{
- String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
+ String sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
sMsg.SearchAndReplaceAscii( "%1", sFile );
ErrorBox( this, WB_OK, sMsg ).Execute();
}
@@ -1038,7 +1038,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddPathHdl_Impl, PushButton *, EMPTYARG )
}
else
{
- String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
+ String sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
sMsg.SearchAndReplaceAscii( "%1", sNewFolder );
ErrorBox( this, WB_OK, sMsg ).Execute();
}
diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
index 56ea49e1b3fd..b1cce0a3e50b 100644
--- a/cui/source/options/optjava.src
+++ b/cui/source/options/optjava.src
@@ -31,7 +31,7 @@
// include --------------------------------------------------------------
#include "optjava.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
// RID_SVXPAGE_OPTIONS_JAVA ----------------------------------------------
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 8e1c8e39af0f..ab08478e6caa 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -34,8 +34,8 @@
#include <tools/shl.hxx>
#include <unotools/searchopt.hxx>
#include <com/sun/star/i18n/TransliterationModules.hpp>
-#include <svx/dialogs.hrc>
-#include <svx/dialmgr.hxx>
+#include <cuires.hrc>
+#include <dialmgr.hxx>
#include <optjsearch.hxx>
#include "optjsearch.hrc"
@@ -44,29 +44,29 @@ using namespace com::sun::star::i18n;
//////////////////////////////////////////////////////////////////////
SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ),
- aTreatAsEqual ( this, SVX_RES( FL_TREAT_AS_EQUAL ) ),
- aMatchCase ( this, SVX_RES( CB_MATCH_CASE ) ),
- aMatchFullHalfWidth ( this, SVX_RES( CB_MATCH_FULL_HALF_WIDTH ) ),
- aMatchHiraganaKatakana ( this, SVX_RES( CB_MATCH_HIRAGANA_KATAKANA ) ),
- aMatchContractions ( this, SVX_RES( CB_MATCH_CONTRACTIONS ) ),
- aMatchMinusDashChoon ( this, SVX_RES( CB_MATCH_MINUS_DASH_CHOON ) ),
- aMatchRepeatCharMarks ( this, SVX_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ),
- aMatchVariantFormKanji ( this, SVX_RES( CB_MATCH_VARIANT_FORM_KANJI ) ),
- aMatchOldKanaForms ( this, SVX_RES( CB_MATCH_OLD_KANA_FORMS ) ),
- aMatchDiziDuzu ( this, SVX_RES( CB_MATCH_DIZI_DUZU ) ),
- aMatchBavaHafa ( this, SVX_RES( CB_MATCH_BAVA_HAFA ) ),
- aMatchTsithichiDhizi ( this, SVX_RES( CB_MATCH_TSITHICHI_DHIZI ) ),
- aMatchHyuiyuByuvyu ( this, SVX_RES( CB_MATCH_HYUFYU_BYUVYU ) ),
- aMatchSesheZeje ( this, SVX_RES( CB_MATCH_SESHE_ZEJE ) ),
- aMatchIaiya ( this, SVX_RES( CB_MATCH_IAIYA ) ),
- aMatchKiku ( this, SVX_RES( CB_MATCH_KIKU ) ),
- aMatchProlongedSoundMark ( this, SVX_RES( CB_MATCH_PROLONGED_SOUNDMARK ) ),
- aIgnore ( this, SVX_RES( FL_IGNORE ) ),
- aIgnorePunctuation ( this, SVX_RES( CB_IGNORE_PUNCTUATION ) ),
- aIgnoreWhitespace ( this, SVX_RES( CB_IGNORE_WHITESPACES ) ),
- aIgnoreMiddleDot ( this, SVX_RES( CB_IGNORE_MIDDLE_DOT ) )
+ aTreatAsEqual ( this, CUI_RES( FL_TREAT_AS_EQUAL ) ),
+ aMatchCase ( this, CUI_RES( CB_MATCH_CASE ) ),
+ aMatchFullHalfWidth ( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ),
+ aMatchHiraganaKatakana ( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA ) ),
+ aMatchContractions ( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ),
+ aMatchMinusDashChoon ( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ),
+ aMatchRepeatCharMarks ( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ),
+ aMatchVariantFormKanji ( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI ) ),
+ aMatchOldKanaForms ( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ),
+ aMatchDiziDuzu ( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ),
+ aMatchBavaHafa ( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ),
+ aMatchTsithichiDhizi ( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ),
+ aMatchHyuiyuByuvyu ( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ),
+ aMatchSesheZeje ( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ),
+ aMatchIaiya ( this, CUI_RES( CB_MATCH_IAIYA ) ),
+ aMatchKiku ( this, CUI_RES( CB_MATCH_KIKU ) ),
+ aMatchProlongedSoundMark ( this, CUI_RES( CB_MATCH_PROLONGED_SOUNDMARK ) ),
+ aIgnore ( this, CUI_RES( FL_IGNORE ) ),
+ aIgnorePunctuation ( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ),
+ aIgnoreWhitespace ( this, CUI_RES( CB_IGNORE_WHITESPACES ) ),
+ aIgnoreMiddleDot ( this, CUI_RES( CB_IGNORE_MIDDLE_DOT ) )
{
FreeResource();
bSaveOptions = TRUE;
diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src
index a0480b7492df..00496ecf8d6b 100644
--- a/cui/source/options/optjsearch.src
+++ b/cui/source/options/optjsearch.src
@@ -29,7 +29,7 @@
************************************************************************/
#include <helpid.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optjsearch.hrc"
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index a7184823eca7..7ca67a553278 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -75,8 +75,8 @@
#include <svx/svxdlg.hxx>
#include <svx/optitems.hxx>
#include "optlingu.hxx"
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include "helpid.hrc"
#include <ucbhelper/content.hxx>
@@ -349,18 +349,18 @@ class OptionsBreakSet : public ModalDialog
public:
OptionsBreakSet(Window* pParent, int nRID) :
- ModalDialog(pParent, SVX_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )),
- aOKPB (this, SVX_RES(BT_OK_PREBREAK)),
- aCancelPB (this, SVX_RES(BT_CANCEL_PREBREAK)),
- aValFL (this, SVX_RES(FL_NUMVAL_PREBREAK)),
- aValNF (this, SVX_RES(ED_PREBREAK))
+ ModalDialog(pParent, CUI_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )),
+ aOKPB (this, CUI_RES(BT_OK_PREBREAK)),
+ aCancelPB (this, CUI_RES(BT_CANCEL_PREBREAK)),
+ aValFL (this, CUI_RES(FL_NUMVAL_PREBREAK)),
+ aValNF (this, CUI_RES(ED_PREBREAK))
{
DBG_ASSERT( STR_NUM_PRE_BREAK_DLG == nRID ||
STR_NUM_POST_BREAK_DLG == nRID ||
STR_NUM_MIN_WORDLEN_DLG == nRID, "unexpected RID" );
if (nRID != -1)
- aValFL.SetText( String( SVX_RES(nRID) ) );
+ aValFL.SetText( String( CUI_RES(nRID) ) );
FreeResource();
}
@@ -1112,32 +1112,32 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, BOOL bEnable
SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
const SfxItemSet& rSet ):
- SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_LINGU ), rSet ),
-
- aLinguisticFL ( this, SVX_RES( FL_LINGUISTIC ) ),
- aLinguModulesFT ( this, SVX_RES( FT_LINGU_MODULES ) ),
- aLinguModulesCLB ( this, SVX_RES( CLB_LINGU_MODULES ) ),
- aLinguModulesEditPB ( this, SVX_RES( PB_LINGU_MODULES_EDIT ) ),
- aLinguDicsFT ( this, SVX_RES( FT_LINGU_DICS ) ),
- aLinguDicsCLB ( this, SVX_RES( CLB_LINGU_DICS ) ),
- aLinguDicsNewPB ( this, SVX_RES( PB_LINGU_DICS_NEW_DIC ) ),
- aLinguDicsEditPB ( this, SVX_RES( PB_LINGU_DICS_EDIT_DIC ) ),
- aLinguDicsDelPB ( this, SVX_RES( PB_LINGU_DICS_DEL_DIC ) ),
- aLinguOptionsFT ( this, SVX_RES( FT_LINGU_OPTIONS ) ),
- aLinguOptionsCLB ( this, SVX_RES( CLB_LINGU_OPTIONS ) ),
- aLinguOptionsEditPB ( this, SVX_RES( PB_LINGU_OPTIONS_EDIT ) ),
- aMoreDictsLink ( this, SVX_RES( FT_LINGU_OPTIONS_MOREDICTS ) ),
- sCapitalWords ( SVX_RES( STR_CAPITAL_WORDS ) ),
- sWordsWithDigits ( SVX_RES( STR_WORDS_WITH_DIGITS ) ),
- sCapitalization ( SVX_RES( STR_CAPITALIZATION ) ),
- sSpellSpecial ( SVX_RES( STR_SPELL_SPECIAL ) ),
- sSpellAuto ( SVX_RES( STR_SPELL_AUTO ) ),
- sGrammarAuto ( SVX_RES( STR_GRAMMAR_AUTO ) ),
- sNumMinWordlen ( SVX_RES( STR_NUM_MIN_WORDLEN ) ),
- sNumPreBreak ( SVX_RES( STR_NUM_PRE_BREAK ) ),
- sNumPostBreak ( SVX_RES( STR_NUM_POST_BREAK ) ),
- sHyphAuto ( SVX_RES( STR_HYPH_AUTO ) ),
- sHyphSpecial ( SVX_RES( STR_HYPH_SPECIAL ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_LINGU ), rSet ),
+
+ aLinguisticFL ( this, CUI_RES( FL_LINGUISTIC ) ),
+ aLinguModulesFT ( this, CUI_RES( FT_LINGU_MODULES ) ),
+ aLinguModulesCLB ( this, CUI_RES( CLB_LINGU_MODULES ) ),
+ aLinguModulesEditPB ( this, CUI_RES( PB_LINGU_MODULES_EDIT ) ),
+ aLinguDicsFT ( this, CUI_RES( FT_LINGU_DICS ) ),
+ aLinguDicsCLB ( this, CUI_RES( CLB_LINGU_DICS ) ),
+ aLinguDicsNewPB ( this, CUI_RES( PB_LINGU_DICS_NEW_DIC ) ),
+ aLinguDicsEditPB ( this, CUI_RES( PB_LINGU_DICS_EDIT_DIC ) ),
+ aLinguDicsDelPB ( this, CUI_RES( PB_LINGU_DICS_DEL_DIC ) ),
+ aLinguOptionsFT ( this, CUI_RES( FT_LINGU_OPTIONS ) ),
+ aLinguOptionsCLB ( this, CUI_RES( CLB_LINGU_OPTIONS ) ),
+ aLinguOptionsEditPB ( this, CUI_RES( PB_LINGU_OPTIONS_EDIT ) ),
+ aMoreDictsLink ( this, CUI_RES( FT_LINGU_OPTIONS_MOREDICTS ) ),
+ sCapitalWords ( CUI_RES( STR_CAPITAL_WORDS ) ),
+ sWordsWithDigits ( CUI_RES( STR_WORDS_WITH_DIGITS ) ),
+ sCapitalization ( CUI_RES( STR_CAPITALIZATION ) ),
+ sSpellSpecial ( CUI_RES( STR_SPELL_SPECIAL ) ),
+ sSpellAuto ( CUI_RES( STR_SPELL_AUTO ) ),
+ sGrammarAuto ( CUI_RES( STR_GRAMMAR_AUTO ) ),
+ sNumMinWordlen ( CUI_RES( STR_NUM_MIN_WORDLEN ) ),
+ sNumPreBreak ( CUI_RES( STR_NUM_PRE_BREAK ) ),
+ sNumPostBreak ( CUI_RES( STR_NUM_POST_BREAK ) ),
+ sHyphAuto ( CUI_RES( STR_HYPH_AUTO ) ),
+ sHyphSpecial ( CUI_RES( STR_HYPH_SPECIAL ) ),
pLinguData ( NULL )
{
@@ -1811,7 +1811,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
else if (&aLinguDicsDelPB == pBtn)
{
if ( RET_NO ==
- QueryBox( this, SVX_RES( RID_SFXQB_DELDICT ) ).Execute() )
+ QueryBox( this, CUI_RES( RID_SFXQB_DELDICT ) ).Execute() )
return 0;
SvLBoxEntry *pEntry = aLinguDicsCLB.GetCurEntry();
@@ -2030,22 +2030,22 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
--------------------------------------------------*/
SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) :
- ModalDialog( pParent, SVX_RES(RID_SVXDLG_EDIT_MODULES ) ),
- aModulesFL ( this, SVX_RES( FL_EDIT_MODULES_OPTIONS ) ),
- aLanguageFT ( this, SVX_RES( FT_EDIT_MODULES_LANGUAGE ) ),
- aLanguageLB ( this, SVX_RES( LB_EDIT_MODULES_LANGUAGE ), FALSE ),
- aModulesCLB ( this, SVX_RES( CLB_EDIT_MODULES_MODULES ) ),
- aPrioUpPB ( this, SVX_RES( PB_EDIT_MODULES_PRIO_UP ) ),
- aPrioDownPB ( this, SVX_RES( PB_EDIT_MODULES_PRIO_DOWN ) ),
- aBackPB ( this, SVX_RES( PB_EDIT_MODULES_PRIO_BACK ) ),
- aMoreDictsLink ( this, SVX_RES( FT_EDIT_MODULES_NEWDICTSLINK ) ),
- aButtonsFL ( this, SVX_RES( FL_EDIT_MODULES_BUTTONS ) ),
- aHelpPB ( this, SVX_RES( PB_HELP ) ),
- aClosePB ( this, SVX_RES( PB_OK ) ),
- sSpell ( SVX_RES( ST_SPELL ) ),
- sHyph ( SVX_RES( ST_HYPH ) ),
- sThes ( SVX_RES( ST_THES ) ),
- sGrammar ( SVX_RES( ST_GRAMMAR ) ),
+ ModalDialog( pParent, CUI_RES(RID_SVXDLG_EDIT_MODULES ) ),
+ aModulesFL ( this, CUI_RES( FL_EDIT_MODULES_OPTIONS ) ),
+ aLanguageFT ( this, CUI_RES( FT_EDIT_MODULES_LANGUAGE ) ),
+ aLanguageLB ( this, CUI_RES( LB_EDIT_MODULES_LANGUAGE ), FALSE ),
+ aModulesCLB ( this, CUI_RES( CLB_EDIT_MODULES_MODULES ) ),
+ aPrioUpPB ( this, CUI_RES( PB_EDIT_MODULES_PRIO_UP ) ),
+ aPrioDownPB ( this, CUI_RES( PB_EDIT_MODULES_PRIO_DOWN ) ),
+ aBackPB ( this, CUI_RES( PB_EDIT_MODULES_PRIO_BACK ) ),
+ aMoreDictsLink ( this, CUI_RES( FT_EDIT_MODULES_NEWDICTSLINK ) ),
+ aButtonsFL ( this, CUI_RES( FL_EDIT_MODULES_BUTTONS ) ),
+ aHelpPB ( this, CUI_RES( PB_HELP ) ),
+ aClosePB ( this, CUI_RES( PB_OK ) ),
+ sSpell ( CUI_RES( ST_SPELL ) ),
+ sHyph ( CUI_RES( ST_HYPH ) ),
+ sThes ( CUI_RES( ST_THES ) ),
+ sGrammar ( CUI_RES( ST_GRAMMAR ) ),
rLinguData ( rData )
{
pCheckButtonData = NULL;
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index a550451193f2..c0cb4489cd59 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -35,7 +35,7 @@
#include <svtools/controldims.hrc>
#include <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// RID_SVXDLG_EDIT_MODULES ---------------------------------------------------
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 3ba69fa6e42c..a72660ba2e0f 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -64,13 +64,13 @@
#include <svx/xpool.hxx>
#include <svx/dlgutil.hxx>
#include "cuitabarea.hxx"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optmemory.hrc"
#include "optmemory.hxx"
#include <svx/ofaitem.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#define CONFIG_LANGUAGES "OfficeLanguages"
@@ -127,30 +127,30 @@ int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( OFA_TP_MEMORY ), rSet ),
-
- aUndoBox ( this, SVX_RES( GB_UNDO ) ),
- aUndoText ( this, SVX_RES( FT_UNDO ) ),
- aUndoEdit ( this, SVX_RES( ED_UNDO ) ),
- aGbGraphicCache ( this, SVX_RES( GB_GRAPHICCACHE ) ),
- aFtGraphicCache ( this, SVX_RES( FT_GRAPHICCACHE ) ),
- aNfGraphicCache ( this, SVX_RES( NF_GRAPHICCACHE ) ),
- aFtGraphicCacheUnit ( this, SVX_RES( FT_GRAPHICCACHE_UNIT ) ),
- aFtGraphicObjectCache ( this, SVX_RES( FT_GRAPHICOBJECTCACHE ) ),
- aNfGraphicObjectCache ( this, SVX_RES( NF_GRAPHICOBJECTCACHE ) ),
- aFtGraphicObjectCacheUnit(this, SVX_RES( FT_GRAPHICOBJECTCACHE_UNIT ) ),
- aFtGraphicObjectTime ( this, SVX_RES( FT_GRAPHICOBJECTTIME ) ),
- aTfGraphicObjectTime ( this, SVX_RES( TF_GRAPHICOBJECTTIME ) ),
- aFtGraphicObjectTimeUnit( this, SVX_RES( FT_GRAPHICOBJECTTIME_UNIT ) ),
-
- aGbOLECache ( this, SVX_RES( GB_OLECACHE ) ),
- aFtOLECache ( this, SVX_RES( FT_OLECACHE ) ),
- aNfOLECache ( this, SVX_RES( NF_OLECACHE ) ),
- aQuickLaunchFL ( this, SVX_RES( FL_QUICKLAUNCH ) ),
- aQuickLaunchCB ( this, SVX_RES( CB_QUICKLAUNCH ) )//,
+ SfxTabPage( pParent, CUI_RES( OFA_TP_MEMORY ), rSet ),
+
+ aUndoBox ( this, CUI_RES( GB_UNDO ) ),
+ aUndoText ( this, CUI_RES( FT_UNDO ) ),
+ aUndoEdit ( this, CUI_RES( ED_UNDO ) ),
+ aGbGraphicCache ( this, CUI_RES( GB_GRAPHICCACHE ) ),
+ aFtGraphicCache ( this, CUI_RES( FT_GRAPHICCACHE ) ),
+ aNfGraphicCache ( this, CUI_RES( NF_GRAPHICCACHE ) ),
+ aFtGraphicCacheUnit ( this, CUI_RES( FT_GRAPHICCACHE_UNIT ) ),
+ aFtGraphicObjectCache ( this, CUI_RES( FT_GRAPHICOBJECTCACHE ) ),
+ aNfGraphicObjectCache ( this, CUI_RES( NF_GRAPHICOBJECTCACHE ) ),
+ aFtGraphicObjectCacheUnit(this, CUI_RES( FT_GRAPHICOBJECTCACHE_UNIT ) ),
+ aFtGraphicObjectTime ( this, CUI_RES( FT_GRAPHICOBJECTTIME ) ),
+ aTfGraphicObjectTime ( this, CUI_RES( TF_GRAPHICOBJECTTIME ) ),
+ aFtGraphicObjectTimeUnit( this, CUI_RES( FT_GRAPHICOBJECTTIME_UNIT ) ),
+
+ aGbOLECache ( this, CUI_RES( GB_OLECACHE ) ),
+ aFtOLECache ( this, CUI_RES( FT_OLECACHE ) ),
+ aNfOLECache ( this, CUI_RES( NF_OLECACHE ) ),
+ aQuickLaunchFL ( this, CUI_RES( FL_QUICKLAUNCH ) ),
+ aQuickLaunchCB ( this, CUI_RES( CB_QUICKLAUNCH ) )//,
{
#if defined(UNX)
- aQuickLaunchCB.SetText( SVX_RES( STR_QUICKLAUNCH_UNX ) );
+ aQuickLaunchCB.SetText( CUI_RES( STR_QUICKLAUNCH_UNX ) );
#endif
FreeResource();
diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src
index fce14b15551d..e54dbde11eb7 100644
--- a/cui/source/options/optmemory.src
+++ b/cui/source/options/optmemory.src
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optmemory.hrc"
#include "helpid.hrc"
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index dad30f0d853a..db2fc6cca26c 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -54,9 +54,9 @@
#define _SVX_OPTPATH_CXX
#include "optpath.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "optpath.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include <comphelper/processfactory.hxx>
#include <comphelper/configurationhelper.hxx>
@@ -218,22 +218,22 @@ BOOL IsMultiPath_Impl( const USHORT nIndex )
SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_PATH ), rSet ),
+ SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_PATH ), rSet ),
- aTypeText ( this, SVX_RES( FT_TYPE ) ),
- aPathText ( this, SVX_RES( FT_PATH ) ),
- aPathCtrl ( this, SVX_RES( LB_PATH ) ),
- aStandardBtn ( this, SVX_RES( BTN_STANDARD ) ),
- aPathBtn ( this, SVX_RES( BTN_PATH ) ),
- aStdBox ( this, SVX_RES( GB_STD ) ),
+ aTypeText ( this, CUI_RES( FT_TYPE ) ),
+ aPathText ( this, CUI_RES( FT_PATH ) ),
+ aPathCtrl ( this, CUI_RES( LB_PATH ) ),
+ aStandardBtn ( this, CUI_RES( BTN_STANDARD ) ),
+ aPathBtn ( this, CUI_RES( BTN_PATH ) ),
+ aStdBox ( this, CUI_RES( GB_STD ) ),
pHeaderBar ( NULL ),
pPathBox ( NULL ),
- pImpl ( new OptPath_Impl( SVX_RES(IMG_LOCK), SVX_RES(IMG_LOCK_HC) ) ),
+ pImpl ( new OptPath_Impl( CUI_RES(IMG_LOCK), CUI_RES(IMG_LOCK_HC) ) ),
xDialogListener ( new ::svt::DialogClosedListener() )
{
- pImpl->m_sMultiPathDlg = String( SVX_RES( STR_MULTIPATHDLG ) );
+ pImpl->m_sMultiPathDlg = String( CUI_RES( STR_MULTIPATHDLG ) );
aStandardBtn.SetClickHdl( LINK( this, SvxPathTabPage, StandardHdl_Impl ) );
Link aLink = LINK( this, SvxPathTabPage, PathHdl_Impl );
aPathBtn.SetClickHdl( aLink );
@@ -344,7 +344,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& )
#endif
case SvtPathOptions::PATH_WORK:
{
- String aStr( SVX_RES( RID_SVXSTR_PATH_NAME_START + i ) );
+ String aStr( CUI_RES( RID_SVXSTR_PATH_NAME_START + i ) );
String sInternal, sUser, sWritable;
sal_Bool bReadOnly = sal_False;
GetPathList( i, sInternal, sUser, sWritable, bReadOnly );
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
index 65280895a506..7d0c3425636d 100644
--- a/cui/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -29,7 +29,7 @@
************************************************************************/
// include --------------------------------------------------------------
#include "optpath.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#ifndef _SFX_HRC
#include <sfx2/sfx.hrc>
#endif
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index a486efdc224d..f405fb4b0acd 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -38,10 +38,10 @@
#define _SVX_OPTSAVE_CXX
#include "optsave.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optsave.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceasvector.hxx>
#include <comphelper/sequenceashashmap.hxx>
@@ -96,11 +96,11 @@ class FilterWarningDialog_Impl : public ModalDialog
};
// ----------------------------------------------------------------------
FilterWarningDialog_Impl::FilterWarningDialog_Impl(Window* pParent) :
- ModalDialog(pParent, SVX_RES( RID_SVXDLG_FILTER_WARNING ) ),
- aOk( this, SVX_RES(PB_OK )),
- aCancel( this, SVX_RES(PB_CANCEL )),
- aImage( this, SVX_RES(IMG_WARNING )),
- aFilterWarningFT( this, SVX_RES(FT_FILTER_WARNING ))
+ ModalDialog(pParent, CUI_RES( RID_SVXDLG_FILTER_WARNING ) ),
+ aOk( this, CUI_RES(PB_OK )),
+ aCancel( this, CUI_RES(PB_CANCEL )),
+ aImage( this, CUI_RES(IMG_WARNING )),
+ aFilterWarningFT( this, CUI_RES(FT_FILTER_WARNING ))
{
FreeResource();
aImage.SetImage(WarningBox::GetStandardImage());
@@ -197,41 +197,41 @@ SvxSaveTabPage_Impl::~SvxSaveTabPage_Impl()
SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_SAVE ), rCoreSet ),
-
- aLoadFL ( this, SVX_RES( LB_LOAD ) ),
- aLoadUserSettingsCB ( this, SVX_RES( CB_LOAD_SETTINGS ) ),
- aLoadDocPrinterCB ( this, SVX_RES( CB_LOAD_DOCPRINTER ) ),
-
- aSaveFL ( this, SVX_RES( GB_SAVE ) ),
- aDocInfoCB ( this, SVX_RES( BTN_DOCINFO ) ),
- aBackupFI ( this, SVX_RES( FI_BACKUP ) ),
- aBackupCB ( this, SVX_RES( BTN_BACKUP ) ),
- aAutoSaveCB ( this, SVX_RES( BTN_AUTOSAVE ) ),
- aAutoSaveEdit ( this, SVX_RES( ED_AUTOSAVE ) ),
- aMinuteFT ( this, SVX_RES( FT_MINUTE ) ),
- aRelativeFsysCB ( this, SVX_RES( BTN_RELATIVE_FSYS ) ),
- aRelativeInetCB ( this, SVX_RES( BTN_RELATIVE_INET ) ),
-
- aDefaultFormatFL ( this, SVX_RES( FL_FILTER ) ),
- aODFVersionFT ( this, SVX_RES( FT_ODF_VERSION ) ),
- aODFVersionLB ( this, SVX_RES( LB_ODF_VERSION ) ),
- aSizeOptimizationCB ( this, SVX_RES( BTN_NOPRETTYPRINTING ) ),
- aWarnAlienFormatCB ( this, SVX_RES( BTN_WARNALIENFORMAT ) ),
- aDocTypeFT ( this, SVX_RES( FT_APP ) ),
- aDocTypeLB ( this, SVX_RES( LB_APP ) ),
- aSaveAsFT ( this, SVX_RES( FT_FILTER ) ),
- aSaveAsFI ( this, SVX_RES( FI_FILTER ) ),
- aSaveAsLB ( this, SVX_RES( LB_FILTER ) ),
- aODFWarningFI ( this, SVX_RES( FI_ODF_WARNING ) ),
- aODFWarningFT ( this, SVX_RES( FT_WARN ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_SAVE ), rCoreSet ),
+
+ aLoadFL ( this, CUI_RES( LB_LOAD ) ),
+ aLoadUserSettingsCB ( this, CUI_RES( CB_LOAD_SETTINGS ) ),
+ aLoadDocPrinterCB ( this, CUI_RES( CB_LOAD_DOCPRINTER ) ),
+
+ aSaveFL ( this, CUI_RES( GB_SAVE ) ),
+ aDocInfoCB ( this, CUI_RES( BTN_DOCINFO ) ),
+ aBackupFI ( this, CUI_RES( FI_BACKUP ) ),
+ aBackupCB ( this, CUI_RES( BTN_BACKUP ) ),
+ aAutoSaveCB ( this, CUI_RES( BTN_AUTOSAVE ) ),
+ aAutoSaveEdit ( this, CUI_RES( ED_AUTOSAVE ) ),
+ aMinuteFT ( this, CUI_RES( FT_MINUTE ) ),
+ aRelativeFsysCB ( this, CUI_RES( BTN_RELATIVE_FSYS ) ),
+ aRelativeInetCB ( this, CUI_RES( BTN_RELATIVE_INET ) ),
+
+ aDefaultFormatFL ( this, CUI_RES( FL_FILTER ) ),
+ aODFVersionFT ( this, CUI_RES( FT_ODF_VERSION ) ),
+ aODFVersionLB ( this, CUI_RES( LB_ODF_VERSION ) ),
+ aSizeOptimizationCB ( this, CUI_RES( BTN_NOPRETTYPRINTING ) ),
+ aWarnAlienFormatCB ( this, CUI_RES( BTN_WARNALIENFORMAT ) ),
+ aDocTypeFT ( this, CUI_RES( FT_APP ) ),
+ aDocTypeLB ( this, CUI_RES( LB_APP ) ),
+ aSaveAsFT ( this, CUI_RES( FT_FILTER ) ),
+ aSaveAsFI ( this, CUI_RES( FI_FILTER ) ),
+ aSaveAsLB ( this, CUI_RES( LB_FILTER ) ),
+ aODFWarningFI ( this, CUI_RES( FI_ODF_WARNING ) ),
+ aODFWarningFT ( this, CUI_RES( FT_WARN ) ),
pImpl ( new SvxSaveTabPage_Impl )
{
sal_Bool bHighContrast = GetDisplayBackground().GetColor().IsDark();
aODFWarningFI.SetImage(
- Image( SVX_RES( bHighContrast ? IMG_ODF_WARNING_HC : IMG_ODF_WARNING ) ) );
+ Image( CUI_RES( bHighContrast ? IMG_ODF_WARNING_HC : IMG_ODF_WARNING ) ) );
FreeResource();
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 374f53ef618f..cffff43cd23a 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
#include <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "optsave.hrc"
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index c0a58604d1ff..0fb6e113c40d 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -37,8 +37,8 @@
#include <svl/zforlist.hxx>
#include "optupdt.hxx"
#include "optupdt.hrc"
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
@@ -66,20 +66,20 @@ namespace util = ::com::sun::star::util;
SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_ONLINEUPDATE ), rSet ),
- m_aOptionsLine( this, SVX_RES( FL_OPTIONS ) ),
- m_aAutoCheckCheckBox( this, SVX_RES( CB_AUTOCHECK ) ),
- m_aEveryDayButton( this, SVX_RES( RB_EVERYDAY ) ),
- m_aEveryWeekButton( this, SVX_RES( RB_EVERYWEEK ) ),
- m_aEveryMonthButton( this, SVX_RES( RB_EVERYMONTH ) ),
- m_aCheckNowButton( this, SVX_RES( PB_CHECKNOW ) ),
- m_aAutoDownloadCheckBox( this, SVX_RES( CB_AUTODOWNLOAD ) ),
- m_aDestPathLabel( this, SVX_RES( FT_DESTPATHLABEL ) ),
- m_aDestPath( this, SVX_RES( FT_DESTPATH ) ),
- m_aChangePathButton( this, SVX_RES( PB_CHANGEPATH ) ),
- m_aLastChecked( this, SVX_RES( FT_LASTCHECKED ) )
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_ONLINEUPDATE ), rSet ),
+ m_aOptionsLine( this, CUI_RES( FL_OPTIONS ) ),
+ m_aAutoCheckCheckBox( this, CUI_RES( CB_AUTOCHECK ) ),
+ m_aEveryDayButton( this, CUI_RES( RB_EVERYDAY ) ),
+ m_aEveryWeekButton( this, CUI_RES( RB_EVERYWEEK ) ),
+ m_aEveryMonthButton( this, CUI_RES( RB_EVERYMONTH ) ),
+ m_aCheckNowButton( this, CUI_RES( PB_CHECKNOW ) ),
+ m_aAutoDownloadCheckBox( this, CUI_RES( CB_AUTODOWNLOAD ) ),
+ m_aDestPathLabel( this, CUI_RES( FT_DESTPATHLABEL ) ),
+ m_aDestPath( this, CUI_RES( FT_DESTPATH ) ),
+ m_aChangePathButton( this, CUI_RES( PB_CHANGEPATH ) ),
+ m_aLastChecked( this, CUI_RES( FT_LASTCHECKED ) )
{
- m_aNeverChecked = String( SVX_RES( STR_NEVERCHECKED ) );
+ m_aNeverChecked = String( CUI_RES( STR_NEVERCHECKED ) );
FreeResource();
m_aAutoCheckCheckBox.SetClickHdl( LINK( this, SvxOnlineUpdateTabPage, AutoCheckHdl_Impl ) );
diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src
index 043abb8b6a95..55d213978672 100644
--- a/cui/source/options/optupdt.src
+++ b/cui/source/options/optupdt.src
@@ -30,7 +30,7 @@
// include --------------------------------------------------------------
#include "optupdt.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
// RID_SVXPAGE_ONLINEUPDATE --------------------------------------------
diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx
index 1d98966525b9..a3cf9719bf59 100644
--- a/cui/source/options/radiobtnbox.cxx
+++ b/cui/source/options/radiobtnbox.cxx
@@ -34,7 +34,7 @@
// include ---------------------------------------------------------------
#include "radiobtnbox.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
namespace svx {
diff --git a/cui/source/options/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx
index ea5d5e368972..ce97d352d44d 100644
--- a/cui/source/options/readonlyimage.cxx
+++ b/cui/source/options/readonlyimage.cxx
@@ -33,8 +33,8 @@
#include <readonlyimage.hxx>
#include <vcl/help.hxx>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
/*-- 26.02.2004 13:31:04---------------------------------------------------
@@ -43,7 +43,7 @@ ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) :
FixedImage(pParent, rResId)
{
sal_Bool bHighContrast = pParent->GetDisplayBackground().GetColor().IsDark();
- SetImage( Image(SVX_RES(bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK )));
+ SetImage( Image(CUI_RES(bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK )));
}
/*-- 26.02.2004 13:31:04---------------------------------------------------
@@ -79,6 +79,6 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
-----------------------------------------------------------------------*/
const String& ReadOnlyImage::GetHelpTip()
{
- static String aStr(SVX_RES(RID_SVXSTR_READONLY_CONFIG_TIP));
+ static String aStr(CUI_RES(RID_SVXSTR_READONLY_CONFIG_TIP));
return aStr;
}
diff --git a/cui/source/options/readonlyimage.src b/cui/source/options/readonlyimage.src
index 0f698a833c46..92b7d2b73fb3 100644
--- a/cui/source/options/readonlyimage.src
+++ b/cui/source/options/readonlyimage.src
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
String RID_SVXSTR_READONLY_CONFIG_TIP
{
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index 489016970bdb..85afe1476d5b 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -35,8 +35,8 @@
#include <unotools/securityoptions.hxx>
#include <svtools/stdctrl.hxx>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include "securityoptions.hxx"
#include "securityoptions.hrc"
@@ -60,29 +60,29 @@ namespace svx
//........................................................................
SecurityOptionsDialog::SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions ) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_SECURITY_OPTIONS ) )
- ,m_aWarningsFL ( this, SVX_RES( FL_WARNINGS ) )
- ,m_aWarningsFI ( this, SVX_RES( FI_WARNINGS ) )
- ,m_aSaveOrSendDocsFI( this, SVX_RES( FI_SAVESENDDOCS ) )
- ,m_aSaveOrSendDocsCB( this, SVX_RES( CB_SAVESENDDOCS ) )
- ,m_aSignDocsFI ( this, SVX_RES( FI_SIGNDOCS ) )
- ,m_aSignDocsCB ( this, SVX_RES( CB_SIGNDOCS ) )
- ,m_aPrintDocsFI ( this, SVX_RES( FI_PRINTDOCS ) )
- ,m_aPrintDocsCB ( this, SVX_RES( CB_PRINTDOCS ) )
- ,m_aCreatePdfFI ( this, SVX_RES( FI_CREATEPDF ) )
- ,m_aCreatePdfCB ( this, SVX_RES( CB_CREATEPDF ) )
- ,m_aOptionsFL ( this, SVX_RES( FL_OPTIONS ) )
- ,m_aRemovePersInfoFI( this, SVX_RES( FI_REMOVEINFO ) )
- ,m_aRemovePersInfoCB( this, SVX_RES( CB_REMOVEINFO ) )
- ,m_aRecommPasswdFI ( this, SVX_RES( FI_RECOMMENDPWD ) )
- ,m_aRecommPasswdCB ( this, SVX_RES( CB_RECOMMENDPWD ) )
- ,m_aCtrlHyperlinkFI ( this, SVX_RES( FI_CTRLHYPERLINK ) )
- ,m_aCtrlHyperlinkCB ( this, SVX_RES( CB_CTRLHYPERLINK ) )
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_SECURITY_OPTIONS ) )
+ ,m_aWarningsFL ( this, CUI_RES( FL_WARNINGS ) )
+ ,m_aWarningsFI ( this, CUI_RES( FI_WARNINGS ) )
+ ,m_aSaveOrSendDocsFI( this, CUI_RES( FI_SAVESENDDOCS ) )
+ ,m_aSaveOrSendDocsCB( this, CUI_RES( CB_SAVESENDDOCS ) )
+ ,m_aSignDocsFI ( this, CUI_RES( FI_SIGNDOCS ) )
+ ,m_aSignDocsCB ( this, CUI_RES( CB_SIGNDOCS ) )
+ ,m_aPrintDocsFI ( this, CUI_RES( FI_PRINTDOCS ) )
+ ,m_aPrintDocsCB ( this, CUI_RES( CB_PRINTDOCS ) )
+ ,m_aCreatePdfFI ( this, CUI_RES( FI_CREATEPDF ) )
+ ,m_aCreatePdfCB ( this, CUI_RES( CB_CREATEPDF ) )
+ ,m_aOptionsFL ( this, CUI_RES( FL_OPTIONS ) )
+ ,m_aRemovePersInfoFI( this, CUI_RES( FI_REMOVEINFO ) )
+ ,m_aRemovePersInfoCB( this, CUI_RES( CB_REMOVEINFO ) )
+ ,m_aRecommPasswdFI ( this, CUI_RES( FI_RECOMMENDPWD ) )
+ ,m_aRecommPasswdCB ( this, CUI_RES( CB_RECOMMENDPWD ) )
+ ,m_aCtrlHyperlinkFI ( this, CUI_RES( FI_CTRLHYPERLINK ) )
+ ,m_aCtrlHyperlinkCB ( this, CUI_RES( CB_CTRLHYPERLINK ) )
- ,m_aButtonsFL ( this, SVX_RES( FL_BUTTONS ) )
- ,m_aOKBtn ( this, SVX_RES( PB_OK ) )
- ,m_aCancelBtn ( this, SVX_RES( PB_CANCEL ) )
- ,m_aHelpBtn ( this, SVX_RES( PB_HELP ) )
+ ,m_aButtonsFL ( this, CUI_RES( FL_BUTTONS ) )
+ ,m_aOKBtn ( this, CUI_RES( PB_OK ) )
+ ,m_aCancelBtn ( this, CUI_RES( PB_CANCEL ) )
+ ,m_aHelpBtn ( this, CUI_RES( PB_HELP ) )
{
FreeResource();
diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src
index 7f921bea1dd2..386f92a91fe3 100644
--- a/cui/source/options/securityoptions.src
+++ b/cui/source/options/securityoptions.src
@@ -32,7 +32,7 @@
#include <svtools/controldims.hrc>
#include "securityoptions.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
ModalDialog RID_SVXDLG_SECURITY_OPTIONS
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 045bac7b9126..8bd00f3a260f 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -107,9 +107,9 @@
#include "optgdlg.hxx"
#include "optmemory.hxx"
#include "optfltr.hxx"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "treeopt.hxx"
#include "treeopt.hrc"
#include "fontsubs.hxx"
@@ -119,6 +119,7 @@
#include "dbregister.hxx"
#include "dbregisterednamesconfig.hxx"
#include "cfgchart.hxx"
+#include <svx/dialogs.hrc>
#ifndef _SVX_LANGITEM_HXX
#define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE
@@ -548,19 +549,19 @@ sal_Bool OfaOptionsTreeListBox::Collapse( SvLBoxEntry* pParent )
// -----------------------------------------------------------------------
#define INI_LIST() \
- aOkPB ( this, SVX_RES( PB_OK ) ),\
- aCancelPB ( this, SVX_RES( PB_CANCEL ) ),\
- aHelpPB ( this, SVX_RES( PB_HELP ) ),\
- aBackPB ( this, SVX_RES( PB_BACK ) ),\
- aHiddenGB ( this, SVX_RES( FB_BORDER ) ),\
- aPageTitleFT ( this, SVX_RES( FT_PAGE_TITLE ) ),\
- aLine1FL ( this, SVX_RES( FL_LINE_1 ) ),\
- aHelpFT ( this, SVX_RES( FT_HELPTEXT ) ),\
- aHelpImg ( this, SVX_RES( IMG_HELP ) ),\
- aHelpTextsArr ( SVX_RES( STR_HELPTEXTS ) ),\
- aTreeLB ( this, SVX_RES( TLB_PAGES ) ),\
+ aOkPB ( this, CUI_RES( PB_OK ) ),\
+ aCancelPB ( this, CUI_RES( PB_CANCEL ) ),\
+ aHelpPB ( this, CUI_RES( PB_HELP ) ),\
+ aBackPB ( this, CUI_RES( PB_BACK ) ),\
+ aHiddenGB ( this, CUI_RES( FB_BORDER ) ),\
+ aPageTitleFT ( this, CUI_RES( FT_PAGE_TITLE ) ),\
+ aLine1FL ( this, CUI_RES( FL_LINE_1 ) ),\
+ aHelpFT ( this, CUI_RES( FT_HELPTEXT ) ),\
+ aHelpImg ( this, CUI_RES( IMG_HELP ) ),\
+ aHelpTextsArr ( CUI_RES( STR_HELPTEXTS ) ),\
+ aTreeLB ( this, CUI_RES( TLB_PAGES ) ),\
sTitle ( GetText() ),\
- sNotLoadedError ( SVX_RES( ST_LOAD_ERROR ) ),\
+ sNotLoadedError ( CUI_RES( ST_LOAD_ERROR ) ),\
pCurrentPageEntry ( NULL ),\
pColorPageItemSet ( NULL ),\
pColorTab ( NULL ),\
@@ -581,7 +582,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(
const Reference< XFrame >& _xFrame,
bool bActivateLastSelection ) :
- SfxModalDialog( pParent, SVX_RES( RID_OFADLG_OPTIONS_TREE ) ),
+ SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ),
INI_LIST()
{
FreeResource();
@@ -598,7 +599,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(
OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId ) :
- SfxModalDialog( pParent, SVX_RES( RID_OFADLG_OPTIONS_TREE ) ),
+ SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ),
INI_LIST()
@@ -1438,19 +1439,19 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
* --------------------------------------------------*/
OfaPageResource::OfaPageResource() :
- Resource(SVX_RES(RID_OFADLG_OPTIONS_TREE_PAGES)),
- aGeneralDlgAry(SVX_RES(SID_GENERAL_OPTIONS)),
- aInetDlgAry(SVX_RES(SID_INET_DLG)),
- aLangDlgAry(SVX_RES(SID_LANGUAGE_OPTIONS)),
- aTextDlgAry(SVX_RES(SID_SW_EDITOPTIONS)),
- aHTMLDlgAry(SVX_RES(SID_SW_ONLINEOPTIONS)),
- aCalcDlgAry(SVX_RES(SID_SC_EDITOPTIONS)),
- aStarMathDlgAry(SVX_RES(SID_SM_EDITOPTIONS)),
- aImpressDlgAry(SVX_RES(SID_SD_EDITOPTIONS)),
- aDrawDlgAry(SVX_RES(SID_SD_GRAPHIC_OPTIONS)),
- aChartDlgAry(SVX_RES(SID_SCH_EDITOPTIONS)),
- aFilterDlgAry(SVX_RES(SID_FILTER_DLG)),
- aDatasourcesDlgAry(SVX_RES(SID_SB_STARBASEOPTIONS))
+ Resource(CUI_RES(RID_OFADLG_OPTIONS_TREE_PAGES)),
+ aGeneralDlgAry(CUI_RES(SID_GENERAL_OPTIONS)),
+ aInetDlgAry(CUI_RES(SID_INET_DLG)),
+ aLangDlgAry(CUI_RES(SID_LANGUAGE_OPTIONS)),
+ aTextDlgAry(CUI_RES(SID_SW_EDITOPTIONS)),
+ aHTMLDlgAry(CUI_RES(SID_SW_ONLINEOPTIONS)),
+ aCalcDlgAry(CUI_RES(SID_SC_EDITOPTIONS)),
+ aStarMathDlgAry(CUI_RES(SID_SM_EDITOPTIONS)),
+ aImpressDlgAry(CUI_RES(SID_SD_EDITOPTIONS)),
+ aDrawDlgAry(CUI_RES(SID_SD_GRAPHIC_OPTIONS)),
+ aChartDlgAry(CUI_RES(SID_SCH_EDITOPTIONS)),
+ aFilterDlgAry(CUI_RES(SID_FILTER_DLG)),
+ aDatasourcesDlgAry(CUI_RES(SID_SB_STARBASEOPTIONS))
{
FreeResource();
}
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 2bf5d0825cdc..05a67948da04 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -29,8 +29,9 @@
************************************************************************/
#include "treeopt.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
#define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 37be48be6233..162758a524fe 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -32,8 +32,8 @@
#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include <com/sun/star/task/UrlRecord.hpp>
#include <com/sun/star/task/XPasswordContainer.hpp>
#include <com/sun/star/task/XMasterPasswordHandling.hpp>
@@ -99,22 +99,22 @@ void PasswordTable::Resort( bool bForced )
// -----------------------------------------------------------------------
WebConnectionInfoDialog::WebConnectionInfoDialog( Window* pParent ) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_WEBCONNECTION_INFO ) )
- ,m_aNeverShownFI ( this, SVX_RES( FI_NEVERSHOWN ) )
- ,m_aPasswordsLB ( this, SVX_RES( LB_PASSWORDS ) )
- ,m_aRemoveBtn ( this, SVX_RES( PB_REMOVE ) )
- ,m_aRemoveAllBtn ( this, SVX_RES( PB_REMOVEALL ) )
- ,m_aChangeBtn ( this, SVX_RES( PB_CHANGE ) )
- ,m_aButtonsFL ( this, SVX_RES( FL_BUTTONS ) )
- ,m_aCloseBtn ( this, SVX_RES( PB_CLOSE ) )
- ,m_aHelpBtn ( this, SVX_RES( PB_HELP ) )
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_WEBCONNECTION_INFO ) )
+ ,m_aNeverShownFI ( this, CUI_RES( FI_NEVERSHOWN ) )
+ ,m_aPasswordsLB ( this, CUI_RES( LB_PASSWORDS ) )
+ ,m_aRemoveBtn ( this, CUI_RES( PB_REMOVE ) )
+ ,m_aRemoveAllBtn ( this, CUI_RES( PB_REMOVEALL ) )
+ ,m_aChangeBtn ( this, CUI_RES( PB_CHANGE ) )
+ ,m_aButtonsFL ( this, CUI_RES( FL_BUTTONS ) )
+ ,m_aCloseBtn ( this, CUI_RES( PB_CLOSE ) )
+ ,m_aHelpBtn ( this, CUI_RES( PB_HELP ) )
,m_nPos ( -1 )
{
static long aStaticTabs[]= { 3, 0, 150, 250 };
m_aPasswordsLB.SetTabs( aStaticTabs );
- m_aPasswordsLB.InsertHeaderItem( 1, SVX_RESSTR( STR_WEBSITE ),
+ m_aPasswordsLB.InsertHeaderItem( 1, CUI_RESSTR( STR_WEBSITE ),
HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS | HIB_CLICKABLE | HIB_UPARROW );
- m_aPasswordsLB.InsertHeaderItem( 2, SVX_RESSTR( STR_USERNAME ),
+ m_aPasswordsLB.InsertHeaderItem( 2, CUI_RESSTR( STR_USERNAME ),
HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS );
m_aPasswordsLB.ResetTabs();
diff --git a/cui/source/options/webconninfo.src b/cui/source/options/webconninfo.src
index 328478c56e83..9252a698b29c 100644
--- a/cui/source/options/webconninfo.src
+++ b/cui/source/options/webconninfo.src
@@ -32,7 +32,7 @@
#include <svtools/controldims.hrc>
#include "webconninfo.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
ModalDialog RID_SVXDLG_WEBCONNECTION_INFO
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 9edac23e6669..4f4b4fcbd593 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -34,15 +34,15 @@
// include ---------------------------------------------------------------
#include <svx/svxenum.hxx>
-
#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "align.hrc"
#include <svx/rotmodit.hxx>
#include <svx/algitem.hxx>
#include <svx/frmdiritem.hxx>
#include "align.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svx/dlgutil.hxx>
#include <tools/shl.hxx>
#include <sfx2/app.hxx>
@@ -123,32 +123,32 @@ static USHORT s_pRanges[] =
AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_ALIGNMENT ), rCoreAttrs ),
-
- maFlAlignment ( this, SVX_RES( FL_ALIGNMENT ) ),
- maFtHorAlign ( this, SVX_RES( FT_HORALIGN ) ),
- maLbHorAlign ( this, SVX_RES( LB_HORALIGN ) ),
- maFtIndent ( this, SVX_RES( FT_INDENT ) ),
- maEdIndent ( this, SVX_RES( ED_INDENT ) ),
- maFtVerAlign ( this, SVX_RES( FT_VERALIGN ) ),
- maLbVerAlign ( this, SVX_RES( LB_VERALIGN ) ),
-
- maFlOrient ( this, SVX_RES( FL_ORIENTATION ) ),
- maCtrlDial ( this, SVX_RES( CTR_DIAL ) ),
- maFtRotate ( this, SVX_RES( FT_DEGREES ) ),
- maNfRotate ( this, SVX_RES( NF_DEGREES ) ),
- maFtRefEdge ( this, SVX_RES( FT_BORDER_LOCK ) ),
- maVsRefEdge ( this, SVX_RES( CTR_BORDER_LOCK ) ),
- maCbStacked ( this, SVX_RES( BTN_TXTSTACKED ) ),
- maCbAsianMode ( this, SVX_RES( BTN_ASIAN_VERTICAL ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_ALIGNMENT ), rCoreAttrs ),
+
+ maFlAlignment ( this, CUI_RES( FL_ALIGNMENT ) ),
+ maFtHorAlign ( this, CUI_RES( FT_HORALIGN ) ),
+ maLbHorAlign ( this, CUI_RES( LB_HORALIGN ) ),
+ maFtIndent ( this, CUI_RES( FT_INDENT ) ),
+ maEdIndent ( this, CUI_RES( ED_INDENT ) ),
+ maFtVerAlign ( this, CUI_RES( FT_VERALIGN ) ),
+ maLbVerAlign ( this, CUI_RES( LB_VERALIGN ) ),
+
+ maFlOrient ( this, CUI_RES( FL_ORIENTATION ) ),
+ maCtrlDial ( this, CUI_RES( CTR_DIAL ) ),
+ maFtRotate ( this, CUI_RES( FT_DEGREES ) ),
+ maNfRotate ( this, CUI_RES( NF_DEGREES ) ),
+ maFtRefEdge ( this, CUI_RES( FT_BORDER_LOCK ) ),
+ maVsRefEdge ( this, CUI_RES( CTR_BORDER_LOCK ) ),
+ maCbStacked ( this, CUI_RES( BTN_TXTSTACKED ) ),
+ maCbAsianMode ( this, CUI_RES( BTN_ASIAN_VERTICAL ) ),
maOrientHlp ( maCtrlDial, maNfRotate, maCbStacked ),
- maFlProperties ( this, SVX_RES( FL_WRAP ) ),
- maBtnWrap ( this, SVX_RES( BTN_WRAP ) ),
- maBtnHyphen ( this, SVX_RES( BTN_HYPH ) ),
- maBtnShrink ( this, SVX_RES( BTN_SHRINK ) ),
- maFtFrameDir ( this, SVX_RES( FT_TEXTFLOW ) ),
- maLbFrameDir ( this, SVX_RES( LB_FRAMEDIR ) )
+ maFlProperties ( this, CUI_RES( FL_WRAP ) ),
+ maBtnWrap ( this, CUI_RES( BTN_WRAP ) ),
+ maBtnHyphen ( this, CUI_RES( BTN_HYPH ) ),
+ maBtnShrink ( this, CUI_RES( BTN_SHRINK ) ),
+ maFtFrameDir ( this, CUI_RES( FT_TEXTFLOW ) ),
+ maLbFrameDir ( this, CUI_RES( LB_FRAMEDIR ) )
{
InitVsRefEgde();
@@ -168,9 +168,9 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttr
maCbAsianMode.Show( SvtCJKOptions().IsVerticalTextEnabled() );
// CTL frame direction
- maLbFrameDir.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
- maLbFrameDir.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
- maLbFrameDir.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
+ maLbFrameDir.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
+ maLbFrameDir.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
+ maLbFrameDir.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
if( !SvtLanguageOptions().IsCTLFontEnabled() )
{
maFtFrameDir.Hide();
@@ -234,7 +234,7 @@ void AlignmentTabPage::DataChanged( const DataChangedEvent& rDCEvt )
SfxTabPage::DataChanged( rDCEvt );
if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- svt::OLocalResourceAccess aLocalResAcc( SVX_RES( RID_SVXPAGE_ALIGNMENT ), RSC_TABPAGE );
+ svt::OLocalResourceAccess aLocalResAcc( CUI_RES( RID_SVXPAGE_ALIGNMENT ), RSC_TABPAGE );
InitVsRefEgde();
}
}
@@ -244,7 +244,7 @@ void AlignmentTabPage::InitVsRefEgde()
// remember selection - is deleted in call to ValueSet::Clear()
USHORT nSel = maVsRefEdge.GetSelectItemId();
- ResId aResId( GetBackground().GetColor().IsDark() ? IL_LOCK_BMPS_HC : IL_LOCK_BMPS, DIALOG_MGR() );
+ ResId aResId( GetBackground().GetColor().IsDark() ? IL_LOCK_BMPS_HC : IL_LOCK_BMPS, CUI_MGR() );
ImageList aImageList( aResId );
Size aItemSize( aImageList.GetImage( IID_BOTTOMLOCK ).GetSizePixel() );
@@ -252,9 +252,9 @@ void AlignmentTabPage::InitVsRefEgde()
maVsRefEdge.SetStyle( maVsRefEdge.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER );
maVsRefEdge.SetColCount( 3 );
- maVsRefEdge.InsertItem( IID_BOTTOMLOCK, aImageList.GetImage( IID_BOTTOMLOCK ), String( SVX_RES( STR_BOTTOMLOCK ) ) );
- maVsRefEdge.InsertItem( IID_TOPLOCK, aImageList.GetImage( IID_TOPLOCK ), String( SVX_RES( STR_TOPLOCK ) ) );
- maVsRefEdge.InsertItem( IID_CELLLOCK, aImageList.GetImage( IID_CELLLOCK ), String( SVX_RES( STR_CELLLOCK ) ) );
+ maVsRefEdge.InsertItem( IID_BOTTOMLOCK, aImageList.GetImage( IID_BOTTOMLOCK ), String( CUI_RES( STR_BOTTOMLOCK ) ) );
+ maVsRefEdge.InsertItem( IID_TOPLOCK, aImageList.GetImage( IID_TOPLOCK ), String( CUI_RES( STR_TOPLOCK ) ) );
+ maVsRefEdge.InsertItem( IID_CELLLOCK, aImageList.GetImage( IID_CELLLOCK ), String( CUI_RES( STR_CELLLOCK ) ) );
maVsRefEdge.SetSizePixel( maVsRefEdge.CalcWindowSizePixel( aItemSize ) );
diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src
index 24e88b77a8a0..077e38105271 100644
--- a/cui/source/tabpages/align.src
+++ b/cui/source/tabpages/align.src
@@ -28,10 +28,10 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "align.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
#define MASKCOLOR \
MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 3e6908293871..315e2b9a6a58 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -65,7 +65,7 @@
#include <svx/svxacorr.hxx>
#include "cuicharmap.hxx"
#include <svx/unolingu.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
static LanguageType eLastDialogLanguage = LANGUAGE_SYSTEM;
@@ -87,9 +87,9 @@ static ::com::sun::star::uno::Reference<
--------------------------------------------------*/
OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
- SfxTabDialog(pParent, SVX_RES( RID_OFA_AUTOCORR_DLG ), _pSet),
- aLanguageFT( this, SVX_RES(FT_LANG )),
- aLanguageLB( this, SVX_RES(LB_LANG ))
+ SfxTabDialog(pParent, CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet),
+ aLanguageFT( this, CUI_RES(FT_LANG )),
+ aLanguageLB( this, CUI_RES(LB_LANG ))
{
BOOL bShowSWOptions = FALSE;
BOOL bOpenSmartTagOptions = FALSE;
@@ -217,18 +217,18 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox)
OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent,
const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCORR_OPTIONS ), rSet),
- aCheckLB (this, SVX_RES(CLB_SETTINGS )),
-
- sInput (SVX_RES(ST_USE_REPLACE )),
- sDoubleCaps (SVX_RES(ST_CPTL_STT_WORD )),
- sStartCap (SVX_RES(ST_CPTL_STT_SENT )),
- sBoldUnderline (SVX_RES(ST_BOLD_UNDER )),
- sURL (SVX_RES(ST_DETECT_URL )),
- sNoDblSpaces (SVX_RES(STR_NO_DBL_SPACES )),
- sHalf (SVX_RES(ST_FRACTION )),
- sDash (SVX_RES(ST_DASH )),
- sFirst (SVX_RES(ST_ORDINAL ))
+ SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_OPTIONS ), rSet),
+ aCheckLB (this, CUI_RES(CLB_SETTINGS )),
+
+ sInput (CUI_RES(ST_USE_REPLACE )),
+ sDoubleCaps (CUI_RES(ST_CPTL_STT_WORD )),
+ sStartCap (CUI_RES(ST_CPTL_STT_SENT )),
+ sBoldUnderline (CUI_RES(ST_BOLD_UNDER )),
+ sURL (CUI_RES(ST_DETECT_URL )),
+ sNoDblSpaces (CUI_RES(STR_NO_DBL_SPACES )),
+ sHalf (CUI_RES(ST_FRACTION )),
+ sDash (CUI_RES(ST_DASH )),
+ sFirst (CUI_RES(ST_ORDINAL ))
{
FreeResource();
@@ -361,11 +361,11 @@ class OfaAutoFmtPrcntSet : public ModalDialog
public:
OfaAutoFmtPrcntSet(Window* pParent) :
- ModalDialog(pParent, SVX_RES(RID_OFADLG_PRCNT_SET)),
- aOKPB(this, SVX_RES(BT_OK)),
- aCancelPB(this, SVX_RES(BT_CANCEL)),
- aPrcntFL(this, SVX_RES(FL_PRCNT)),
- aPrcntMF(this, SVX_RES(ED_RIGHT_MARGIN))
+ ModalDialog(pParent, CUI_RES(RID_OFADLG_PRCNT_SET)),
+ aOKPB(this, CUI_RES(BT_OK)),
+ aCancelPB(this, CUI_RES(BT_CANCEL)),
+ aPrcntFL(this, CUI_RES(FL_PRCNT)),
+ aPrcntMF(this, CUI_RES(ED_RIGHT_MARGIN))
{
FreeResource();
}
@@ -471,33 +471,33 @@ enum OfaAutoFmtOptions
OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES(RID_OFAPAGE_AUTOFMT_APPLY), rSet),
- aCheckLB (this, SVX_RES(CLB_SETTINGS)),
- aEditPB (this, SVX_RES(PB_EDIT)),
- aHeader1Expl (this, SVX_RES(FT_HEADER1_EXPLANATION)),
- aHeader2Expl (this, SVX_RES(FT_HEADER2_EXPLANATION)),
- sHeader1 (SVX_RES( STR_HEADER1 )),
- sHeader2 (SVX_RES( STR_HEADER2 )),
- sDeleteEmptyPara (SVX_RES( ST_DEL_EMPTY_PARA)),
- sUseReplaceTbl (SVX_RES( ST_USE_REPLACE )),
- sCptlSttWord (SVX_RES( ST_CPTL_STT_WORD)),
- sCptlSttSent (SVX_RES( ST_CPTL_STT_SENT)),
- sTypo (SVX_RES( ST_TYPO )),
- sUserStyle (SVX_RES( ST_USER_STYLE )),
- sBullet (SVX_RES( ST_BULLET )),
- sBoldUnder (SVX_RES( ST_BOLD_UNDER )),
- sNoDblSpaces (SVX_RES( STR_NO_DBL_SPACES)),
- sFraction (SVX_RES( ST_FRACTION )),
- sDetectURL (SVX_RES( ST_DETECT_URL )),
- sDash (SVX_RES( ST_DASH )),
- sOrdinal (SVX_RES( ST_ORDINAL )),
- sRightMargin (SVX_RES( ST_RIGHT_MARGIN )),
- sNum (SVX_RES( STR_NUM )),
- sBorder (SVX_RES( STR_BORDER )),
- sTable (SVX_RES( STR_TABLE )),
- sReplaceTemplates (SVX_RES( STR_REPLACE_TEMPLATES)),
- sDelSpaceAtSttEnd (SVX_RES( STR_DEL_SPACES_AT_STT_END)),
- sDelSpaceBetweenLines(SVX_RES(STR_DEL_SPACES_BETWEEN_LINES)),
+ SfxTabPage(pParent, CUI_RES(RID_OFAPAGE_AUTOFMT_APPLY), rSet),
+ aCheckLB (this, CUI_RES(CLB_SETTINGS)),
+ aEditPB (this, CUI_RES(PB_EDIT)),
+ aHeader1Expl (this, CUI_RES(FT_HEADER1_EXPLANATION)),
+ aHeader2Expl (this, CUI_RES(FT_HEADER2_EXPLANATION)),
+ sHeader1 (CUI_RES( STR_HEADER1 )),
+ sHeader2 (CUI_RES( STR_HEADER2 )),
+ sDeleteEmptyPara (CUI_RES( ST_DEL_EMPTY_PARA)),
+ sUseReplaceTbl (CUI_RES( ST_USE_REPLACE )),
+ sCptlSttWord (CUI_RES( ST_CPTL_STT_WORD)),
+ sCptlSttSent (CUI_RES( ST_CPTL_STT_SENT)),
+ sTypo (CUI_RES( ST_TYPO )),
+ sUserStyle (CUI_RES( ST_USER_STYLE )),
+ sBullet (CUI_RES( ST_BULLET )),
+ sBoldUnder (CUI_RES( ST_BOLD_UNDER )),
+ sNoDblSpaces (CUI_RES( STR_NO_DBL_SPACES)),
+ sFraction (CUI_RES( ST_FRACTION )),
+ sDetectURL (CUI_RES( ST_DETECT_URL )),
+ sDash (CUI_RES( ST_DASH )),
+ sOrdinal (CUI_RES( ST_ORDINAL )),
+ sRightMargin (CUI_RES( ST_RIGHT_MARGIN )),
+ sNum (CUI_RES( STR_NUM )),
+ sBorder (CUI_RES( STR_BORDER )),
+ sTable (CUI_RES( STR_TABLE )),
+ sReplaceTemplates (CUI_RES( STR_REPLACE_TEMPLATES)),
+ sDelSpaceAtSttEnd (CUI_RES( STR_DEL_SPACES_AT_STT_END)),
+ sDelSpaceBetweenLines(CUI_RES(STR_DEL_SPACES_BETWEEN_LINES)),
nPercent ( 50 ),
pCheckButtonData( NULL )
@@ -1034,16 +1034,16 @@ void lcl_ClearTable(DoubleStringTable& rTable)
OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent,
const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCORR_REPLACE ), rSet),
- aTextOnlyCB( this, SVX_RES(CB_TEXT_ONLY )),
- aShortFT ( this, SVX_RES(FT_SHORT )),
- aShortED ( this, SVX_RES(ED_SHORT )),
- aReplaceFT( this, SVX_RES(FT_REPLACE )),
- aReplaceED( this, SVX_RES(ED_REPLACE )),
- aReplaceTLB( this, SVX_RES(TLB_REPLACE )),
- aNewReplacePB( this, SVX_RES(PB_NEW_REPLACE )),
- aDeleteReplacePB(this,SVX_RES(PB_DELETE_REPLACE )),
- sModify(SVX_RES(STR_MODIFY)),
+ SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_REPLACE ), rSet),
+ aTextOnlyCB( this, CUI_RES(CB_TEXT_ONLY )),
+ aShortFT ( this, CUI_RES(FT_SHORT )),
+ aShortED ( this, CUI_RES(ED_SHORT )),
+ aReplaceFT( this, CUI_RES(FT_REPLACE )),
+ aReplaceED( this, CUI_RES(ED_REPLACE )),
+ aReplaceTLB( this, CUI_RES(TLB_REPLACE )),
+ aNewReplacePB( this, CUI_RES(PB_NEW_REPLACE )),
+ aDeleteReplacePB(this,CUI_RES(PB_DELETE_REPLACE )),
+ sModify(CUI_RES(STR_MODIFY)),
sNew(aNewReplacePB.GetText()),
pFormatText(0),
eLang(eLastDialogLanguage),
@@ -1637,19 +1637,19 @@ void lcl_ClearTable(StringsTable& rTable)
OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent,
const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet),
- aAbbrevFL (this, SVX_RES(FL_ABBREV )),
- aAbbrevED (this, SVX_RES(ED_ABBREV )),
- aAbbrevLB (this, SVX_RES(LB_ABBREV )),
- aNewAbbrevPB (this, SVX_RES(PB_NEWABBREV )),
- aDelAbbrevPB (this, SVX_RES(PB_DELABBREV )),
- aAutoAbbrevCB (this, SVX_RES(CB_AUTOABBREV )),
- aDoubleCapsFL (this, SVX_RES(FL_DOUBLECAPS )),
- aDoubleCapsED (this, SVX_RES(ED_DOUBLE_CAPS )),
- aDoubleCapsLB (this, SVX_RES(LB_DOUBLE_CAPS )),
- aNewDoublePB (this, SVX_RES(PB_NEWDOUBLECAPS)),
- aDelDoublePB (this, SVX_RES(PB_DELDOUBLECAPS)),
- aAutoCapsCB (this, SVX_RES(CB_AUTOCAPS )),
+ SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet),
+ aAbbrevFL (this, CUI_RES(FL_ABBREV )),
+ aAbbrevED (this, CUI_RES(ED_ABBREV )),
+ aAbbrevLB (this, CUI_RES(LB_ABBREV )),
+ aNewAbbrevPB (this, CUI_RES(PB_NEWABBREV )),
+ aDelAbbrevPB (this, CUI_RES(PB_DELABBREV )),
+ aAutoAbbrevCB (this, CUI_RES(CB_AUTOABBREV )),
+ aDoubleCapsFL (this, CUI_RES(FL_DOUBLECAPS )),
+ aDoubleCapsED (this, CUI_RES(ED_DOUBLE_CAPS )),
+ aDoubleCapsLB (this, CUI_RES(LB_DOUBLE_CAPS )),
+ aNewDoublePB (this, CUI_RES(PB_NEWDOUBLECAPS)),
+ aDelDoublePB (this, CUI_RES(PB_DELDOUBLECAPS)),
+ aAutoCapsCB (this, CUI_RES(CB_AUTOCAPS )),
eLang(eLastDialogLanguage)
{
FreeResource();
@@ -2035,31 +2035,31 @@ void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt )
--------------------------------------------------*/
OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCORR_QUOTE ), rSet),
- aSingleFL (this, SVX_RES(FL_SINGLE )),
- aSingleTypoCB (this, SVX_RES(CB_SGL_TYPO )),
- aSglStartQuoteFT (this, SVX_RES(FT_SGL_STARTQUOTE )),
- aSglStartQuotePB (this, SVX_RES(PB_SGL_STARTQUOTE )),
- aSglStartExFT (this, SVX_RES(FT_SGSTEX )),
- aSglEndQuoteFT (this, SVX_RES(FT_SGL_ENDQUOTE )),
- aSglEndQuotePB (this, SVX_RES(PB_SGL_ENDQUOTE )),
- aSglEndExFT (this, SVX_RES(FT_SGENEX )),
- aSglStandardPB (this, SVX_RES(PB_SGL_STD )),
-
- aDoubleFL (this, SVX_RES(FL_DOUBLE )),
- aTypoCB (this, SVX_RES(CB_TYPO )),
- aStartQuoteFT (this, SVX_RES(FT_STARTQUOTE )),
- aStartQuotePB (this, SVX_RES(PB_STARTQUOTE )),
- aDblStartExFT (this, SVX_RES(FT_DBSTEX )),
- aEndQuoteFT (this, SVX_RES(FT_ENDQUOTE )),
- aEndQuotePB (this, SVX_RES(PB_ENDQUOTE )),
- aDblEndExFT (this, SVX_RES(FT_DBECEX )),
- aDblStandardPB (this, SVX_RES(PB_DBL_STD )),
-
- sStartQuoteDlg (SVX_RES(STR_CHANGE_START)),
- sEndQuoteDlg (SVX_RES(STR_CHANGE_END)),
-
- sStandard(SVX_RES(ST_STANDARD))
+ SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_QUOTE ), rSet),
+ aSingleFL (this, CUI_RES(FL_SINGLE )),
+ aSingleTypoCB (this, CUI_RES(CB_SGL_TYPO )),
+ aSglStartQuoteFT (this, CUI_RES(FT_SGL_STARTQUOTE )),
+ aSglStartQuotePB (this, CUI_RES(PB_SGL_STARTQUOTE )),
+ aSglStartExFT (this, CUI_RES(FT_SGSTEX )),
+ aSglEndQuoteFT (this, CUI_RES(FT_SGL_ENDQUOTE )),
+ aSglEndQuotePB (this, CUI_RES(PB_SGL_ENDQUOTE )),
+ aSglEndExFT (this, CUI_RES(FT_SGENEX )),
+ aSglStandardPB (this, CUI_RES(PB_SGL_STD )),
+
+ aDoubleFL (this, CUI_RES(FL_DOUBLE )),
+ aTypoCB (this, CUI_RES(CB_TYPO )),
+ aStartQuoteFT (this, CUI_RES(FT_STARTQUOTE )),
+ aStartQuotePB (this, CUI_RES(PB_STARTQUOTE )),
+ aDblStartExFT (this, CUI_RES(FT_DBSTEX )),
+ aEndQuoteFT (this, CUI_RES(FT_ENDQUOTE )),
+ aEndQuotePB (this, CUI_RES(PB_ENDQUOTE )),
+ aDblEndExFT (this, CUI_RES(FT_DBECEX )),
+ aDblStandardPB (this, CUI_RES(PB_DBL_STD )),
+
+ sStartQuoteDlg (CUI_RES(STR_CHANGE_START)),
+ sEndQuoteDlg (CUI_RES(STR_CHANGE_END)),
+
+ sStandard(CUI_RES(ST_STANDARD))
{
FreeResource();
@@ -2298,20 +2298,20 @@ String OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar )
OfaAutoCompleteTabPage::OfaAutoCompleteTabPage( Window* pParent,
const SfxItemSet& rSet )
- : SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCOMPLETE_OPTIONS ), rSet),
- aCBActiv (this, SVX_RES(CB_ACTIV)),
- aCBAppendSpace (this, SVX_RES(CB_APPEND_SPACE)),
- aCBAsTip (this, SVX_RES(CB_AS_TIP)),
- aCBCollect (this, SVX_RES(CB_COLLECT)),
- aCBRemoveList (this, SVX_RES(CB_REMOVE_LIST)),
- aFTExpandKey (this, SVX_RES(FT_EXPAND_KEY)),
- aDCBExpandKey (this, SVX_RES(DCB_EXPAND_KEY)),
- aFTMinWordlen (this, SVX_RES(FT_MIN_WORDLEN)),
- aNFMinWordlen (this, SVX_RES(NF_MIN_WORDLEN)),
- aFTMaxEntries (this, SVX_RES(FT_MAX_ENTRIES)),
- aNFMaxEntries (this, SVX_RES(NF_MAX_ENTRIES)),
- aLBEntries (*this, SVX_RES(LB_ENTRIES)),
- aPBEntries (this, SVX_RES(PB_ENTRIES)),
+ : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCOMPLETE_OPTIONS ), rSet),
+ aCBActiv (this, CUI_RES(CB_ACTIV)),
+ aCBAppendSpace (this, CUI_RES(CB_APPEND_SPACE)),
+ aCBAsTip (this, CUI_RES(CB_AS_TIP)),
+ aCBCollect (this, CUI_RES(CB_COLLECT)),
+ aCBRemoveList (this, CUI_RES(CB_REMOVE_LIST)),
+ aFTExpandKey (this, CUI_RES(FT_EXPAND_KEY)),
+ aDCBExpandKey (this, CUI_RES(DCB_EXPAND_KEY)),
+ aFTMinWordlen (this, CUI_RES(FT_MIN_WORDLEN)),
+ aNFMinWordlen (this, CUI_RES(NF_MIN_WORDLEN)),
+ aFTMaxEntries (this, CUI_RES(FT_MAX_ENTRIES)),
+ aNFMaxEntries (this, CUI_RES(NF_MAX_ENTRIES)),
+ aLBEntries (*this, CUI_RES(LB_ENTRIES)),
+ aPBEntries (this, CUI_RES(PB_ENTRIES)),
pAutoCmpltList( 0 ),
nAutoCmpltListCnt( 0 )
{
@@ -2546,11 +2546,11 @@ long OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify(
OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( Window* pParent,
const SfxItemSet& rSet )
- : SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_SMARTTAG_OPTIONS ), rSet),
- m_aMainCB( this, SVX_RES(CB_SMARTTAGS) ),
- m_aSmartTagTypesLB( this, SVX_RES(LB_SMARTTAGS) ),
- m_aPropertiesPB( this, SVX_RES(PB_SMARTTAGS) ),
- m_aTitleFT( this, SVX_RES(FT_SMARTTAGS) )
+ : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_SMARTTAG_OPTIONS ), rSet),
+ m_aMainCB( this, CUI_RES(CB_SMARTTAGS) ),
+ m_aSmartTagTypesLB( this, CUI_RES(LB_SMARTTAGS) ),
+ m_aPropertiesPB( this, CUI_RES(PB_SMARTTAGS) ),
+ m_aTitleFT( this, CUI_RES(FT_SMARTTAGS) )
{
FreeResource();
diff --git a/cui/source/tabpages/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc
index 6a698b4397d7..f1817b3f3f36 100644
--- a/cui/source/tabpages/autocdlg.hrc
+++ b/cui/source/tabpages/autocdlg.hrc
@@ -30,7 +30,7 @@
#ifndef _SVX_AUTOCDLG_HRC
#define _SVX_AUTOCDLG_HRC
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// defines ------------------------------------------------------------------
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index a087bd7d59dc..8da8db3d39c3 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -30,7 +30,7 @@
// include ------------------------------------------------------------------
#include <svx/svxids.hrc>
#include "autocdlg.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
// pragma -------------------------------------------------------------------
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index fb3820dd2774..6e3b46a990bf 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -41,12 +41,14 @@
#include <svtools/wallitem.hxx>
#include <svl/cntwall.hxx>
#include <sfx2/cntids.hrc>
+#include <svx/dialogs.hrc>
#define _SVX_BACKGRND_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "backgrnd.hrc"
#include <svx/svxitems.hrc>
+#include <svx/dialmgr.hxx>
// Tabellenhintergrund
#define TBL_DEST_CELL 0
@@ -61,7 +63,7 @@
#include <svx/impgrf.hxx>
#include <svx/svxerr.hxx>
#include <svx/drawitem.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svx/htmlmode.hxx>
#include <svtools/controldims.hrc>
#include <svx/svxids.hrc> //CHINA001
@@ -342,36 +344,36 @@ SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent,
*/
- SvxTabPage( pParent, SVX_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ),
+ SvxTabPage( pParent, CUI_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ),
- aBorderWin ( this, SVX_RES(CT_BORDER) ),
- aBackgroundColorSet ( &aBorderWin, SVX_RES( SET_BGDCOLOR ) ),
- aBackgroundColorBox ( this, SVX_RES( GB_BGDCOLOR ) ),
+ aBorderWin ( this, CUI_RES(CT_BORDER) ),
+ aBackgroundColorSet ( &aBorderWin, CUI_RES( SET_BGDCOLOR ) ),
+ aBackgroundColorBox ( this, CUI_RES( GB_BGDCOLOR ) ),
pPreviewWin1 ( new BackgroundPreviewImpl(
- this, SVX_RES( WIN_PREVIEW1 ), FALSE ) ),
- aColTransFT ( this, SVX_RES( FT_COL_TRANS ) ),
- aColTransMF ( this, SVX_RES( MF_COL_TRANS ) ),
- aBtnBrowse ( this, SVX_RES( BTN_BROWSE ) ),
- aBtnLink ( this, SVX_RES( BTN_LINK ) ),
- aBtnPreview ( this, SVX_RES( BTN_PREVIEW ) ),
- aFtFile ( this, SVX_RES( FT_FILE ) ),
- aGbFile ( this, SVX_RES( GB_FILE ) ),
- aBtnPosition ( this, SVX_RES( BTN_POSITION ) ),
- aBtnArea ( this, SVX_RES( BTN_AREA ) ),
- aBtnTile ( this, SVX_RES( BTN_TILE ) ),
- aWndPosition ( this, SVX_RES( WND_POSITION ), RP_MM ),
- aGbPosition ( this, SVX_RES( GB_POSITION ) ),
- aGraphTransFL ( this, SVX_RES( FL_GRAPH_TRANS ) ),
- aGraphTransMF ( this, SVX_RES( MF_GRAPH_TRANS ) ),
+ this, CUI_RES( WIN_PREVIEW1 ), FALSE ) ),
+ aColTransFT ( this, CUI_RES( FT_COL_TRANS ) ),
+ aColTransMF ( this, CUI_RES( MF_COL_TRANS ) ),
+ aBtnBrowse ( this, CUI_RES( BTN_BROWSE ) ),
+ aBtnLink ( this, CUI_RES( BTN_LINK ) ),
+ aBtnPreview ( this, CUI_RES( BTN_PREVIEW ) ),
+ aFtFile ( this, CUI_RES( FT_FILE ) ),
+ aGbFile ( this, CUI_RES( GB_FILE ) ),
+ aBtnPosition ( this, CUI_RES( BTN_POSITION ) ),
+ aBtnArea ( this, CUI_RES( BTN_AREA ) ),
+ aBtnTile ( this, CUI_RES( BTN_TILE ) ),
+ aWndPosition ( this, CUI_RES( WND_POSITION ), RP_MM ),
+ aGbPosition ( this, CUI_RES( GB_POSITION ) ),
+ aGraphTransFL ( this, CUI_RES( FL_GRAPH_TRANS ) ),
+ aGraphTransMF ( this, CUI_RES( MF_GRAPH_TRANS ) ),
pPreviewWin2 ( new BackgroundPreviewImpl(
- this, SVX_RES( WIN_PREVIEW2 ), TRUE ) ),
- aSelectTxt ( this, SVX_RES( FT_SELECTOR ) ),
- aLbSelect ( this, SVX_RES( LB_SELECTOR ) ),
- aStrBrowse ( SVX_RES( STR_BROWSE ) ),
- aStrUnlinked ( SVX_RES( STR_UNLINKED ) ),
- aTblDesc ( this, SVX_RES( FT_TBL_DESC ) ),
- aTblLBox ( this, SVX_RES( LB_TBL_BOX ) ),
- aParaLBox ( this, SVX_RES( LB_PARA_BOX ) ),
+ this, CUI_RES( WIN_PREVIEW2 ), TRUE ) ),
+ aSelectTxt ( this, CUI_RES( FT_SELECTOR ) ),
+ aLbSelect ( this, CUI_RES( LB_SELECTOR ) ),
+ aStrBrowse ( CUI_RES( STR_BROWSE ) ),
+ aStrUnlinked ( CUI_RES( STR_UNLINKED ) ),
+ aTblDesc ( this, CUI_RES( FT_TBL_DESC ) ),
+ aTblLBox ( this, CUI_RES( LB_TBL_BOX ) ),
+ aParaLBox ( this, CUI_RES( LB_PARA_BOX ) ),
nHtmlMode ( 0 ),
bAllowShowSelector ( TRUE ),
bIsGraphicValid ( FALSE ),
@@ -1153,7 +1155,7 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl()
String(),
this,
RID_SVXERRCTX,
- &DIALOG_MGR() );
+ &CUI_MGR() );
ErrorHandler::HandleError(
*new StringErrorInfo( ERRCODE_SVX_GRAPHIC_NOTREADABLE,
@@ -1208,9 +1210,9 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
long nCount = pColorTable->Count();
XColorEntry* pEntry = NULL;
Color aColWhite( COL_WHITE );
- String aStrWhite( SVX_RES( RID_SVXITEMS_COLOR_WHITE ) );
+ String aStrWhite( CUI_RES( RID_SVXITEMS_COLOR_WHITE ) );
WinBits nBits = ( aBackgroundColorSet.GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD );
- aBackgroundColorSet.SetText( String( SVX_RES( RID_SVXSTR_TRANSPARENT ) ) );
+ aBackgroundColorSet.SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
aBackgroundColorSet.SetStyle( nBits );
for ( i = 0; i < nCount; i++ )
{
diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src
index c89361a18ae3..1ad9beca658c 100644
--- a/cui/source/tabpages/backgrnd.src
+++ b/cui/source/tabpages/backgrnd.src
@@ -30,8 +30,10 @@
// include ---------------------------------------------------------------
#include <svtools/controldims.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "backgrnd.hrc"
+#include <svx/dialogs.hrc>
+
// define ----------------------------------------------------------------
#define UNLINKED_IMAGE \
Text [ en-US ] = "Unlinked graphic" ; \
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index d243160facf5..bc50eaecca07 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -33,14 +33,14 @@
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
-
#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "page.hrc"
#include "bbdlg.hxx"
#include "border.hxx"
#include "backgrnd.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
// class SvxBorderBackgroundDlg ------------------------------------------
@@ -48,7 +48,7 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg( Window *pParent,
const SfxItemSet& rCoreSet,
BOOL bEnableSelector ) :
- SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_BBDLG ), &rCoreSet ),
+ SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_BBDLG ), &rCoreSet ),
bEnableBackgroundSelector( bEnableSelector )
{
FreeResource();
diff --git a/cui/source/tabpages/bbdlg.src b/cui/source/tabpages/bbdlg.src
index 98b4bf01767e..b87576b9c975 100644
--- a/cui/source/tabpages/bbdlg.src
+++ b/cui/source/tabpages/bbdlg.src
@@ -28,8 +28,8 @@
*
************************************************************************/
// include ---------------------------------------------------------------
+#include <cuires.hrc>
#include <svx/dialogs.hrc>
- // pragma ----------------------------------------------------------------
// RID_SVXDLG_BBDLG ------------------------------------------------------
TabDialog RID_SVXDLG_BBDLG
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 39efc210b6d1..fdaccdb67ba8 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -35,10 +35,11 @@
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/module.hxx>
-
+#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
#define _SVX_BORDER_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <svx/svxitems.hrc>
#include "border.hrc"
#include "helpid.hrc"
@@ -51,7 +52,7 @@
#include <svx/shaditem.hxx>
#include "border.hxx"
#include <svx/dlgutil.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "svx/htmlmode.hxx"
#include <vcl/msgbox.hxx>
#include <svx/svxids.hrc> //CHINA001
@@ -181,47 +182,47 @@ void lcl_SetDecimalDigitsTo1(MetricField& rField)
SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
const SfxItemSet& rCoreAttrs )
- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_BORDER ), rCoreAttrs ),
-
- aFlBorder ( this, SVX_RES( FL_BORDER ) ),
- aDefaultFT ( this, SVX_RES( FT_DEFAULT ) ),
- aWndPresets ( this, SVX_RES( WIN_PRESETS ) ),
- aUserDefFT ( this, SVX_RES( FT_USERDEF ) ),
- aFrameSel ( this, SVX_RES( WIN_FRAMESEL ) ),
-
- aFlSep1 ( this, SVX_RES( FL_SEPARATOR1 ) ),
- aFlLine ( this, SVX_RES( FL_LINE ) ),
- aStyleFT ( this, SVX_RES( FT_STYLE ) ),
- aLbLineStyle ( this, SVX_RES( LB_LINESTYLE ) ),
- aColorFT ( this, SVX_RES( FT_COLOR ) ),
- aLbLineColor ( this, SVX_RES( LB_LINECOLOR ) ),
-
- aFlSep2 ( this, SVX_RES( FL_SEPARATOR2 ) ),
- aDistanceFL ( this, SVX_RES( FL_DISTANCE ) ),
- aLeftFT ( this, SVX_RES( FT_LEFT ) ),
- aLeftMF ( this, SVX_RES( MF_LEFT ) ),
- aRightFT ( this, SVX_RES( FT_RIGHT ) ),
- aRightMF ( this, SVX_RES( MF_RIGHT ) ),
- aTopFT ( this, SVX_RES( FT_TOP ) ),
- aTopMF ( this, SVX_RES( MF_TOP ) ),
- aBottomFT ( this, SVX_RES( FT_BOTTOM ) ),
- aBottomMF ( this, SVX_RES( MF_BOTTOM ) ),
- aSynchronizeCB ( this, SVX_RES( CB_SYNC ) ),
-
- aFlShadow ( this, SVX_RES( FL_SHADOW ) ),
- aFtShadowPos ( this, SVX_RES( FT_SHADOWPOS ) ),
- aWndShadows ( this, SVX_RES( WIN_SHADOWS ) ),
- aFtShadowSize ( this, SVX_RES( FT_SHADOWSIZE ) ),
- aEdShadowSize ( this, SVX_RES( ED_SHADOWSIZE ) ),
- aFtShadowColor ( this, SVX_RES( FT_SHADOWCOLOR ) ),
- aLbShadowColor ( this, SVX_RES( LB_SHADOWCOLOR ) ),
- aPropertiesFL ( this, SVX_RES( FL_PROPERTIES ) ),
- aMergeWithNextCB( this, SVX_RES( CB_MERGEWITHNEXT ) ),
- aMergeAdjacentBordersCB( this, SVX_RES( CB_MERGEADJACENTBORDERS ) ),
- aShadowImgLstH( SVX_RES(ILH_SDW_BITMAPS)),
- aShadowImgLst( SVX_RES(IL_SDW_BITMAPS)),
- aBorderImgLstH( SVX_RES(ILH_PRE_BITMAPS)),
- aBorderImgLst( SVX_RES(IL_PRE_BITMAPS)),
+ : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_BORDER ), rCoreAttrs ),
+
+ aFlBorder ( this, CUI_RES( FL_BORDER ) ),
+ aDefaultFT ( this, CUI_RES( FT_DEFAULT ) ),
+ aWndPresets ( this, CUI_RES( WIN_PRESETS ) ),
+ aUserDefFT ( this, CUI_RES( FT_USERDEF ) ),
+ aFrameSel ( this, CUI_RES( WIN_FRAMESEL ) ),
+
+ aFlSep1 ( this, CUI_RES( FL_SEPARATOR1 ) ),
+ aFlLine ( this, CUI_RES( FL_LINE ) ),
+ aStyleFT ( this, CUI_RES( FT_STYLE ) ),
+ aLbLineStyle ( this, CUI_RES( LB_LINESTYLE ) ),
+ aColorFT ( this, CUI_RES( FT_COLOR ) ),
+ aLbLineColor ( this, CUI_RES( LB_LINECOLOR ) ),
+
+ aFlSep2 ( this, CUI_RES( FL_SEPARATOR2 ) ),
+ aDistanceFL ( this, CUI_RES( FL_DISTANCE ) ),
+ aLeftFT ( this, CUI_RES( FT_LEFT ) ),
+ aLeftMF ( this, CUI_RES( MF_LEFT ) ),
+ aRightFT ( this, CUI_RES( FT_RIGHT ) ),
+ aRightMF ( this, CUI_RES( MF_RIGHT ) ),
+ aTopFT ( this, CUI_RES( FT_TOP ) ),
+ aTopMF ( this, CUI_RES( MF_TOP ) ),
+ aBottomFT ( this, CUI_RES( FT_BOTTOM ) ),
+ aBottomMF ( this, CUI_RES( MF_BOTTOM ) ),
+ aSynchronizeCB ( this, CUI_RES( CB_SYNC ) ),
+
+ aFlShadow ( this, CUI_RES( FL_SHADOW ) ),
+ aFtShadowPos ( this, CUI_RES( FT_SHADOWPOS ) ),
+ aWndShadows ( this, CUI_RES( WIN_SHADOWS ) ),
+ aFtShadowSize ( this, CUI_RES( FT_SHADOWSIZE ) ),
+ aEdShadowSize ( this, CUI_RES( ED_SHADOWSIZE ) ),
+ aFtShadowColor ( this, CUI_RES( FT_SHADOWCOLOR ) ),
+ aLbShadowColor ( this, CUI_RES( LB_SHADOWCOLOR ) ),
+ aPropertiesFL ( this, CUI_RES( FL_PROPERTIES ) ),
+ aMergeWithNextCB( this, CUI_RES( CB_MERGEWITHNEXT ) ),
+ aMergeAdjacentBordersCB( this, CUI_RES( CB_MERGEADJACENTBORDERS ) ),
+ aShadowImgLstH( CUI_RES(ILH_SDW_BITMAPS)),
+ aShadowImgLst( CUI_RES(IL_SDW_BITMAPS)),
+ aBorderImgLstH( CUI_RES(ILH_PRE_BITMAPS)),
+ aBorderImgLst( CUI_RES(IL_PRE_BITMAPS)),
nMinValue(0),
nSWMode(0),
mbHorEnabled( false ),
@@ -1044,7 +1045,7 @@ void SvxBorderTabPage::FillPresetVS()
{
aWndPresets.InsertItem( nVSIdx );
aWndPresets.SetItemImage( nVSIdx, rImgList.GetImage( GetPresetImageId( nVSIdx ) ) );
- aWndPresets.SetItemText( nVSIdx, SVX_RESSTR( GetPresetStringId( nVSIdx ) ) );
+ aWndPresets.SetItemText( nVSIdx, CUI_RESSTR( GetPresetStringId( nVSIdx ) ) );
}
// show the control
@@ -1078,7 +1079,7 @@ void SvxBorderTabPage::FillShadowVS()
{
aWndShadows.InsertItem( nVSIdx );
aWndShadows.SetItemImage( nVSIdx, rImgList.GetImage( pnImgIds[ nVSIdx - 1 ] ) );
- aWndShadows.SetItemText( nVSIdx, SVX_RESSTR( pnStrIds[ nVSIdx - 1 ] ) );
+ aWndShadows.SetItemText( nVSIdx, CUI_RESSTR( pnStrIds[ nVSIdx - 1 ] ) );
}
// show the control
@@ -1102,7 +1103,7 @@ void SvxBorderTabPage::FillLineListBox_Impl()
aLbLineStyle.SetSourceUnit( FUNIT_TWIP );
// Writer 2.0 Defaults:
- aLbLineStyle.InsertEntry( SVX_RESSTR( STR_NONE ) );
+ aLbLineStyle.InsertEntry( CUI_RESSTR( STR_NONE ) );
aLbLineStyle.InsertEntry( LINE_WIDTH0 );
aLbLineStyle.InsertEntry( LINE_WIDTH5 );
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index 27f977a6dc3b..4359e78e84d6 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -29,9 +29,9 @@
************************************************************************/
// include ---------------------------------------------------------------
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "border.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
// define ---------------------------------------------------------------
#define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index f942e9db6a43..1e5b0646d527 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -43,16 +43,16 @@
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
#include <vcl/msgbox.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_CHARDLG_CXX
#include <svl/languageoptions.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <svx/svxitems.hrc>
#include "chardlg.hrc"
-//Erstmal definieren, damit die Klassendeklarionen angezogen werden.
-
#include <svx/xtable.hxx> // XColorTable
#include "chardlg.hxx"
#include "svx/fontitem.hxx"
@@ -76,7 +76,7 @@
#include <svx/colritem.hxx>
#include "svx/drawitem.hxx"
#include "svx/dlgutil.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "svx/htmlmode.hxx"
#include "cuicharmap.hxx"
#include "chardlg.h"
@@ -88,7 +88,7 @@
#include <svx/charscaleitem.hxx>
#include <svx/charrotateitem.hxx>
#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <cuires.hrc> //CHINA001
#include <svl/intitem.hxx> //CHINA001
#include <sfx2/request.hxx> //CHINA001
#include "svx/flagsdef.hxx" //CHINA001
@@ -570,58 +570,58 @@ struct SvxCharNamePage_Impl
SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) :
- SvxCharBasePage( pParent, SVX_RES( RID_SVXPAGE_CHAR_NAME ), rInSet, WIN_CHAR_PREVIEW, FT_CHAR_FONTTYPE ),
+ SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_NAME ), rInSet, WIN_CHAR_PREVIEW, FT_CHAR_FONTTYPE ),
m_pImpl ( new SvxCharNamePage_Impl )
{
- m_pImpl->m_aNoStyleText = String( SVX_RES( STR_CHARNAME_NOSTYLE ) );
- m_pImpl->m_aTransparentText = String( SVX_RES( STR_CHARNAME_TRANSPARENT ) );
+ m_pImpl->m_aNoStyleText = String( CUI_RES( STR_CHARNAME_NOSTYLE ) );
+ m_pImpl->m_aTransparentText = String( CUI_RES( STR_CHARNAME_TRANSPARENT ) );
SvtLanguageOptions aLanguageOptions;
sal_Bool bCJK = ( aLanguageOptions.IsCJKFontEnabled() || aLanguageOptions.IsCTLFontEnabled() );
- m_pWestLine = new FixedLine( this, SVX_RES( FL_WEST ) );
- m_pWestFontNameFT = new FixedText( this, SVX_RES( bCJK ? FT_WEST_NAME : FT_WEST_NAME_NOCJK ) );
- m_pWestFontNameLB = new FontNameBox( this, SVX_RES( bCJK ? LB_WEST_NAME : LB_WEST_NAME_NOCJK ) );
- m_pWestFontStyleFT = new FixedText( this, SVX_RES( bCJK ? FT_WEST_STYLE : FT_WEST_STYLE_NOCJK ) );
- m_pWestFontStyleLB = new FontStyleBox( this, SVX_RES( bCJK ? LB_WEST_STYLE : LB_WEST_STYLE_NOCJK ) );
- m_pWestFontSizeFT = new FixedText( this, SVX_RES( bCJK ? FT_WEST_SIZE : FT_WEST_SIZE_NOCJK ) );
- m_pWestFontSizeLB = new FontSizeBox( this, SVX_RES( bCJK ? LB_WEST_SIZE : LB_WEST_SIZE_NOCJK ) );
+ m_pWestLine = new FixedLine( this, CUI_RES( FL_WEST ) );
+ m_pWestFontNameFT = new FixedText( this, CUI_RES( bCJK ? FT_WEST_NAME : FT_WEST_NAME_NOCJK ) );
+ m_pWestFontNameLB = new FontNameBox( this, CUI_RES( bCJK ? LB_WEST_NAME : LB_WEST_NAME_NOCJK ) );
+ m_pWestFontStyleFT = new FixedText( this, CUI_RES( bCJK ? FT_WEST_STYLE : FT_WEST_STYLE_NOCJK ) );
+ m_pWestFontStyleLB = new FontStyleBox( this, CUI_RES( bCJK ? LB_WEST_STYLE : LB_WEST_STYLE_NOCJK ) );
+ m_pWestFontSizeFT = new FixedText( this, CUI_RES( bCJK ? FT_WEST_SIZE : FT_WEST_SIZE_NOCJK ) );
+ m_pWestFontSizeLB = new FontSizeBox( this, CUI_RES( bCJK ? LB_WEST_SIZE : LB_WEST_SIZE_NOCJK ) );
if( !bCJK )
{
- m_pColorFL = new FixedLine( this, SVX_RES( FL_COLOR2 ) );
- m_pColorFT = new FixedText( this, SVX_RES( FT_COLOR2 ) );
- m_pColorLB = new ColorListBox( this, SVX_RES( LB_COLOR2 ) );
- }
-
- m_pWestFontLanguageFT = new FixedText( this, SVX_RES( bCJK ? FT_WEST_LANG : FT_WEST_LANG_NOCJK ) );
- m_pWestFontLanguageLB = new SvxLanguageBox( this, SVX_RES( bCJK ? LB_WEST_LANG : LB_WEST_LANG_NOCJK ) );
-
- m_pEastLine = new FixedLine( this, SVX_RES( FL_EAST ) );
- m_pEastFontNameFT = new FixedText( this, SVX_RES( FT_EAST_NAME ) );
- m_pEastFontNameLB = new FontNameBox( this, SVX_RES( LB_EAST_NAME ) );
- m_pEastFontStyleFT = new FixedText( this, SVX_RES( FT_EAST_STYLE ) );
- m_pEastFontStyleLB = new FontStyleBox( this, SVX_RES( LB_EAST_STYLE ) );
- m_pEastFontSizeFT = new FixedText( this, SVX_RES( FT_EAST_SIZE ) );
- m_pEastFontSizeLB = new FontSizeBox( this, SVX_RES( LB_EAST_SIZE ) );
- m_pEastFontLanguageFT = new FixedText( this, SVX_RES( FT_EAST_LANG ) );
- m_pEastFontLanguageLB = new SvxLanguageBox( this, SVX_RES( LB_EAST_LANG ) );
-
- m_pCTLLine = new FixedLine( this, SVX_RES( FL_CTL ) );
- m_pCTLFontNameFT = new FixedText( this, SVX_RES( FT_CTL_NAME ) );
- m_pCTLFontNameLB = new FontNameBox( this, SVX_RES( LB_CTL_NAME ) );
- m_pCTLFontStyleFT = new FixedText( this, SVX_RES( FT_CTL_STYLE ) );
- m_pCTLFontStyleLB = new FontStyleBox( this, SVX_RES( LB_CTL_STYLE ) );
- m_pCTLFontSizeFT = new FixedText( this, SVX_RES( FT_CTL_SIZE ) );
- m_pCTLFontSizeLB = new FontSizeBox( this, SVX_RES( LB_CTL_SIZE ) );
- m_pCTLFontLanguageFT = new FixedText( this, SVX_RES( FT_CTL_LANG ) );
- m_pCTLFontLanguageLB = new SvxLanguageBox( this, SVX_RES( LB_CTL_LANG ) );
+ m_pColorFL = new FixedLine( this, CUI_RES( FL_COLOR2 ) );
+ m_pColorFT = new FixedText( this, CUI_RES( FT_COLOR2 ) );
+ m_pColorLB = new ColorListBox( this, CUI_RES( LB_COLOR2 ) );
+ }
+
+ m_pWestFontLanguageFT = new FixedText( this, CUI_RES( bCJK ? FT_WEST_LANG : FT_WEST_LANG_NOCJK ) );
+ m_pWestFontLanguageLB = new SvxLanguageBox( this, CUI_RES( bCJK ? LB_WEST_LANG : LB_WEST_LANG_NOCJK ) );
+
+ m_pEastLine = new FixedLine( this, CUI_RES( FL_EAST ) );
+ m_pEastFontNameFT = new FixedText( this, CUI_RES( FT_EAST_NAME ) );
+ m_pEastFontNameLB = new FontNameBox( this, CUI_RES( LB_EAST_NAME ) );
+ m_pEastFontStyleFT = new FixedText( this, CUI_RES( FT_EAST_STYLE ) );
+ m_pEastFontStyleLB = new FontStyleBox( this, CUI_RES( LB_EAST_STYLE ) );
+ m_pEastFontSizeFT = new FixedText( this, CUI_RES( FT_EAST_SIZE ) );
+ m_pEastFontSizeLB = new FontSizeBox( this, CUI_RES( LB_EAST_SIZE ) );
+ m_pEastFontLanguageFT = new FixedText( this, CUI_RES( FT_EAST_LANG ) );
+ m_pEastFontLanguageLB = new SvxLanguageBox( this, CUI_RES( LB_EAST_LANG ) );
+
+ m_pCTLLine = new FixedLine( this, CUI_RES( FL_CTL ) );
+ m_pCTLFontNameFT = new FixedText( this, CUI_RES( FT_CTL_NAME ) );
+ m_pCTLFontNameLB = new FontNameBox( this, CUI_RES( LB_CTL_NAME ) );
+ m_pCTLFontStyleFT = new FixedText( this, CUI_RES( FT_CTL_STYLE ) );
+ m_pCTLFontStyleLB = new FontStyleBox( this, CUI_RES( LB_CTL_STYLE ) );
+ m_pCTLFontSizeFT = new FixedText( this, CUI_RES( FT_CTL_SIZE ) );
+ m_pCTLFontSizeLB = new FontSizeBox( this, CUI_RES( LB_CTL_SIZE ) );
+ m_pCTLFontLanguageFT = new FixedText( this, CUI_RES( FT_CTL_LANG ) );
+ m_pCTLFontLanguageLB = new SvxLanguageBox( this, CUI_RES( LB_CTL_LANG ) );
if( bCJK )
{
- m_pColorFL = new FixedLine( this, SVX_RES( FL_COLOR2 ) );
- m_pColorFT = new FixedText( this, SVX_RES( FT_COLOR2 ) );
- m_pColorLB = new ColorListBox( this, SVX_RES( LB_COLOR2 ) );
+ m_pColorFL = new FixedLine( this, CUI_RES( FL_COLOR2 ) );
+ m_pColorFT = new FixedText( this, CUI_RES( FT_COLOR2 ) );
+ m_pColorLB = new ColorListBox( this, CUI_RES( LB_COLOR2 ) );
}
m_pWestLine ->Show( bCJK );
@@ -1765,46 +1765,46 @@ void SvxCharNamePage::PageCreated (SfxAllItemSet aSet) //add CHINA001
SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSet ) :
- SvxCharBasePage( pParent, SVX_RES( RID_SVXPAGE_CHAR_EFFECTS ), rInSet, WIN_EFFECTS_PREVIEW, FT_EFFECTS_FONTTYPE ),
+ SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_EFFECTS ), rInSet, WIN_EFFECTS_PREVIEW, FT_EFFECTS_FONTTYPE ),
- m_aFontColorFT ( this, SVX_RES( FT_FONTCOLOR ) ),
- m_aFontColorLB ( this, SVX_RES( LB_FONTCOLOR ) ),
+ m_aFontColorFT ( this, CUI_RES( FT_FONTCOLOR ) ),
+ m_aFontColorLB ( this, CUI_RES( LB_FONTCOLOR ) ),
- m_aEffectsFT ( this, SVX_RES( FT_EFFECTS ) ),
+ m_aEffectsFT ( this, CUI_RES( FT_EFFECTS ) ),
m_aEffectsLB ( this, 0 ),
- m_aEffects2LB ( this, SVX_RES( LB_EFFECTS2 ) ),
+ m_aEffects2LB ( this, CUI_RES( LB_EFFECTS2 ) ),
- m_aReliefFT ( this, SVX_RES( FT_RELIEF ) ),
- m_aReliefLB ( this, SVX_RES( LB_RELIEF ) ),
+ m_aReliefFT ( this, CUI_RES( FT_RELIEF ) ),
+ m_aReliefLB ( this, CUI_RES( LB_RELIEF ) ),
- m_aOutlineBtn ( this, SVX_RES( CB_OUTLINE ) ),
- m_aShadowBtn ( this, SVX_RES( CB_SHADOW ) ),
- m_aBlinkingBtn ( this, SVX_RES( CB_BLINKING ) ),
- m_aHiddenBtn ( this, SVX_RES( CB_CHARHIDDEN ) ),
+ m_aOutlineBtn ( this, CUI_RES( CB_OUTLINE ) ),
+ m_aShadowBtn ( this, CUI_RES( CB_SHADOW ) ),
+ m_aBlinkingBtn ( this, CUI_RES( CB_BLINKING ) ),
+ m_aHiddenBtn ( this, CUI_RES( CB_CHARHIDDEN ) ),
- m_aVerticalLine ( this, SVX_RES( FL_EFFECTS_VERTICAL ) ),
+ m_aVerticalLine ( this, CUI_RES( FL_EFFECTS_VERTICAL ) ),
- m_aOverlineFT ( this, SVX_RES( FT_OVERLINE ) ),
- m_aOverlineLB ( this, SVX_RES( LB_OVERLINE ) ),
- m_aOverlineColorFT ( this, SVX_RES( FT_OVERLINE_COLOR ) ),
- m_aOverlineColorLB ( this, SVX_RES( LB_OVERLINE_COLOR ) ),
- m_aStrikeoutFT ( this, SVX_RES( FT_STRIKEOUT ) ),
- m_aStrikeoutLB ( this, SVX_RES( LB_STRIKEOUT ) ),
- m_aUnderlineFT ( this, SVX_RES( FT_UNDERLINE ) ),
- m_aUnderlineLB ( this, SVX_RES( LB_UNDERLINE ) ),
- m_aUnderlineColorFT ( this, SVX_RES( FT_UNDERLINE_COLOR ) ),
- m_aUnderlineColorLB ( this, SVX_RES( LB_UNDERLINE_COLOR ) ),
- m_aIndividualWordsBtn ( this, SVX_RES( CB_INDIVIDUALWORDS ) ),
+ m_aOverlineFT ( this, CUI_RES( FT_OVERLINE ) ),
+ m_aOverlineLB ( this, CUI_RES( LB_OVERLINE ) ),
+ m_aOverlineColorFT ( this, CUI_RES( FT_OVERLINE_COLOR ) ),
+ m_aOverlineColorLB ( this, CUI_RES( LB_OVERLINE_COLOR ) ),
+ m_aStrikeoutFT ( this, CUI_RES( FT_STRIKEOUT ) ),
+ m_aStrikeoutLB ( this, CUI_RES( LB_STRIKEOUT ) ),
+ m_aUnderlineFT ( this, CUI_RES( FT_UNDERLINE ) ),
+ m_aUnderlineLB ( this, CUI_RES( LB_UNDERLINE ) ),
+ m_aUnderlineColorFT ( this, CUI_RES( FT_UNDERLINE_COLOR ) ),
+ m_aUnderlineColorLB ( this, CUI_RES( LB_UNDERLINE_COLOR ) ),
+ m_aIndividualWordsBtn ( this, CUI_RES( CB_INDIVIDUALWORDS ) ),
- m_aAsianLine ( this, SVX_RES( FL_EFFECTS_ASIAN ) ),
+ m_aAsianLine ( this, CUI_RES( FL_EFFECTS_ASIAN ) ),
- m_aEmphasisFT ( this, SVX_RES( FT_EMPHASIS ) ),
- m_aEmphasisLB ( this, SVX_RES( LB_EMPHASIS ) ),
- m_aPositionFT ( this, SVX_RES( FT_POSITION ) ),
- m_aPositionLB ( this, SVX_RES( LB_POSITION ) ),
+ m_aEmphasisFT ( this, CUI_RES( FT_EMPHASIS ) ),
+ m_aEmphasisLB ( this, CUI_RES( LB_EMPHASIS ) ),
+ m_aPositionFT ( this, CUI_RES( FT_POSITION ) ),
+ m_aPositionLB ( this, CUI_RES( LB_POSITION ) ),
- m_aTransparentColorName ( SVX_RES( STR_CHARNAME_TRANSPARENT ) )
+ m_aTransparentColorName ( CUI_RES( STR_CHARNAME_TRANSPARENT ) )
{
m_aEffectsLB.Hide();
@@ -3038,31 +3038,31 @@ void SvxCharEffectsPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
SvxCharPositionPage::SvxCharPositionPage( Window* pParent, const SfxItemSet& rInSet ) :
- SvxCharBasePage( pParent, SVX_RES( RID_SVXPAGE_CHAR_POSITION ), rInSet, WIN_POS_PREVIEW, FT_POS_FONTTYPE ),
-
- m_aPositionLine ( this, SVX_RES( FL_POSITION ) ),
- m_aHighPosBtn ( this, SVX_RES( RB_HIGHPOS ) ),
- m_aNormalPosBtn ( this, SVX_RES( RB_NORMALPOS ) ),
- m_aLowPosBtn ( this, SVX_RES( RB_LOWPOS ) ),
- m_aHighLowFT ( this, SVX_RES( FT_HIGHLOW ) ),
- m_aHighLowEdit ( this, SVX_RES( ED_HIGHLOW ) ),
- m_aHighLowRB ( this, SVX_RES( CB_HIGHLOW ) ),
- m_aFontSizeFT ( this, SVX_RES( FT_FONTSIZE ) ),
- m_aFontSizeEdit ( this, SVX_RES( ED_FONTSIZE ) ),
- m_aRotationScalingFL( this, SVX_RES( FL_ROTATION_SCALING ) ),
- m_aScalingFL ( this, SVX_RES( FL_SCALING ) ),
- m_a0degRB ( this, SVX_RES( RB_0_DEG ) ),
- m_a90degRB ( this, SVX_RES( RB_90_DEG ) ),
- m_a270degRB ( this, SVX_RES( RB_270_DEG ) ),
- m_aFitToLineCB ( this, SVX_RES( CB_FIT_TO_LINE ) ),
- m_aScaleWidthFT ( this, SVX_RES( FT_SCALE_WIDTH ) ),
- m_aScaleWidthMF ( this, SVX_RES( MF_SCALE_WIDTH ) ),
-
- m_aKerningLine ( this, SVX_RES( FL_KERNING2 ) ),
- m_aKerningLB ( this, SVX_RES( LB_KERNING2 ) ),
- m_aKerningFT ( this, SVX_RES( FT_KERNING2 ) ),
- m_aKerningEdit ( this, SVX_RES( ED_KERNING2 ) ),
- m_aPairKerningBtn ( this, SVX_RES( CB_PAIRKERNING ) ),
+ SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_POSITION ), rInSet, WIN_POS_PREVIEW, FT_POS_FONTTYPE ),
+
+ m_aPositionLine ( this, CUI_RES( FL_POSITION ) ),
+ m_aHighPosBtn ( this, CUI_RES( RB_HIGHPOS ) ),
+ m_aNormalPosBtn ( this, CUI_RES( RB_NORMALPOS ) ),
+ m_aLowPosBtn ( this, CUI_RES( RB_LOWPOS ) ),
+ m_aHighLowFT ( this, CUI_RES( FT_HIGHLOW ) ),
+ m_aHighLowEdit ( this, CUI_RES( ED_HIGHLOW ) ),
+ m_aHighLowRB ( this, CUI_RES( CB_HIGHLOW ) ),
+ m_aFontSizeFT ( this, CUI_RES( FT_FONTSIZE ) ),
+ m_aFontSizeEdit ( this, CUI_RES( ED_FONTSIZE ) ),
+ m_aRotationScalingFL( this, CUI_RES( FL_ROTATION_SCALING ) ),
+ m_aScalingFL ( this, CUI_RES( FL_SCALING ) ),
+ m_a0degRB ( this, CUI_RES( RB_0_DEG ) ),
+ m_a90degRB ( this, CUI_RES( RB_90_DEG ) ),
+ m_a270degRB ( this, CUI_RES( RB_270_DEG ) ),
+ m_aFitToLineCB ( this, CUI_RES( CB_FIT_TO_LINE ) ),
+ m_aScaleWidthFT ( this, CUI_RES( FT_SCALE_WIDTH ) ),
+ m_aScaleWidthMF ( this, CUI_RES( MF_SCALE_WIDTH ) ),
+
+ m_aKerningLine ( this, CUI_RES( FL_KERNING2 ) ),
+ m_aKerningLB ( this, CUI_RES( LB_KERNING2 ) ),
+ m_aKerningFT ( this, CUI_RES( FT_KERNING2 ) ),
+ m_aKerningEdit ( this, CUI_RES( ED_KERNING2 ) ),
+ m_aPairKerningBtn ( this, CUI_RES( CB_PAIRKERNING ) ),
m_nSuperEsc ( (short)DFLT_ESC_SUPER ),
m_nSubEsc ( (short)DFLT_ESC_SUB ),
@@ -3806,16 +3806,16 @@ void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
SvxCharTwoLinesPage::SvxCharTwoLinesPage( Window* pParent, const SfxItemSet& rInSet ) :
- SvxCharBasePage( pParent, SVX_RES( RID_SVXPAGE_CHAR_TWOLINES ), rInSet, WIN_TWOLINES_PREVIEW, FT_TWOLINES_FONTTYPE ),
+ SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_TWOLINES ), rInSet, WIN_TWOLINES_PREVIEW, FT_TWOLINES_FONTTYPE ),
- m_aSwitchOnLine ( this, SVX_RES( FL_SWITCHON ) ),
- m_aTwoLinesBtn ( this, SVX_RES( CB_TWOLINES ) ),
+ m_aSwitchOnLine ( this, CUI_RES( FL_SWITCHON ) ),
+ m_aTwoLinesBtn ( this, CUI_RES( CB_TWOLINES ) ),
- m_aEncloseLine ( this, SVX_RES( FL_ENCLOSE ) ),
- m_aStartBracketFT ( this, SVX_RES( FT_STARTBRACKET ) ),
- m_aStartBracketLB ( this, SVX_RES( ED_STARTBRACKET ) ),
- m_aEndBracketFT ( this, SVX_RES( FT_ENDBRACKET ) ),
- m_aEndBracketLB ( this, SVX_RES( ED_ENDBRACKET ) ),
+ m_aEncloseLine ( this, CUI_RES( FL_ENCLOSE ) ),
+ m_aStartBracketFT ( this, CUI_RES( FT_STARTBRACKET ) ),
+ m_aStartBracketLB ( this, CUI_RES( ED_STARTBRACKET ) ),
+ m_aEndBracketFT ( this, CUI_RES( FT_ENDBRACKET ) ),
+ m_aEndBracketLB ( this, CUI_RES( ED_ENDBRACKET ) ),
m_nStartBracketPosition( 0 ),
m_nEndBracketPosition( 0 )
{
diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src
index 19ad1e090435..2fd998b88d18 100644
--- a/cui/source/tabpages/chardlg.src
+++ b/cui/source/tabpages/chardlg.src
@@ -29,15 +29,10 @@
************************************************************************/
// include ---------------------------------------------------------------
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "chardlg.hrc"
#include "chardlg.h"
-
-// unbekannte Zeichenfarbe
-String RID_SVXSTR_COLOR_USER
-{
- Text [ en-US ] = "User" ;
-};
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_CHAR_NAME ----------------------------------------------------
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index dad2c336043c..cd62234aeb2d 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -37,6 +37,8 @@
#include <tools/shl.hxx>
#include "svx/ofaitem.hxx" // add CHINA001
#include <sfx2/request.hxx> // add CHINA001
+#include <svx/dialogs.hrc>
+
#define _SVX_CONNECT_CXX
#include <svx/svdoedge.hxx>
@@ -47,10 +49,10 @@
#include "svx/connctrl.hxx"
#include "connect.hxx"
#include "connect.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
static USHORT pRanges[] =
{
@@ -95,31 +97,31 @@ SvxConnectionDialog::~SvxConnectionDialog()
\************************************************************************/
SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
- SfxTabPage ( pWindow, SVX_RES( RID_SVXPAGE_CONNECTION ),
+ SfxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_CONNECTION ),
rInAttrs ),
- aFtType ( this, SVX_RES( FT_TYPE ) ),
- aLbType ( this, SVX_RES( LB_TYPE ) ),
-
- aFlDelta ( this, SVX_RES( FL_DELTA ) ),
- aFtLine1 ( this, SVX_RES( FT_LINE_1 ) ),
- aMtrFldLine1 ( this, SVX_RES( MTR_FLD_LINE_1 ) ),
- aFtLine2 ( this, SVX_RES( FT_LINE_2 ) ),
- aMtrFldLine2 ( this, SVX_RES( MTR_FLD_LINE_2 ) ),
- aFtLine3 ( this, SVX_RES( FT_LINE_3 ) ),
- aMtrFldLine3 ( this, SVX_RES( MTR_FLD_LINE_3 ) ),
-
- aFlDistance ( this, SVX_RES( FL_DISTANCE ) ),
- aFtHorz1 ( this, SVX_RES( FT_HORZ_1 ) ),
- aMtrFldHorz1 ( this, SVX_RES( MTR_FLD_HORZ_1 ) ),
- aFtVert1 ( this, SVX_RES( FT_VERT_1 ) ),
- aMtrFldVert1 ( this, SVX_RES( MTR_FLD_VERT_1 ) ),
- aFtHorz2 ( this, SVX_RES( FT_HORZ_2 ) ),
- aMtrFldHorz2 ( this, SVX_RES( MTR_FLD_HORZ_2 ) ),
- aFtVert2 ( this, SVX_RES( FT_VERT_2 ) ),
- aMtrFldVert2 ( this, SVX_RES( MTR_FLD_VERT_2 ) ),
-
- aCtlPreview ( this, SVX_RES( CTL_PREVIEW ), rInAttrs ),
+ aFtType ( this, CUI_RES( FT_TYPE ) ),
+ aLbType ( this, CUI_RES( LB_TYPE ) ),
+
+ aFlDelta ( this, CUI_RES( FL_DELTA ) ),
+ aFtLine1 ( this, CUI_RES( FT_LINE_1 ) ),
+ aMtrFldLine1 ( this, CUI_RES( MTR_FLD_LINE_1 ) ),
+ aFtLine2 ( this, CUI_RES( FT_LINE_2 ) ),
+ aMtrFldLine2 ( this, CUI_RES( MTR_FLD_LINE_2 ) ),
+ aFtLine3 ( this, CUI_RES( FT_LINE_3 ) ),
+ aMtrFldLine3 ( this, CUI_RES( MTR_FLD_LINE_3 ) ),
+
+ aFlDistance ( this, CUI_RES( FL_DISTANCE ) ),
+ aFtHorz1 ( this, CUI_RES( FT_HORZ_1 ) ),
+ aMtrFldHorz1 ( this, CUI_RES( MTR_FLD_HORZ_1 ) ),
+ aFtVert1 ( this, CUI_RES( FT_VERT_1 ) ),
+ aMtrFldVert1 ( this, CUI_RES( MTR_FLD_VERT_1 ) ),
+ aFtHorz2 ( this, CUI_RES( FT_HORZ_2 ) ),
+ aMtrFldHorz2 ( this, CUI_RES( MTR_FLD_HORZ_2 ) ),
+ aFtVert2 ( this, CUI_RES( FT_VERT_2 ) ),
+ aMtrFldVert2 ( this, CUI_RES( MTR_FLD_VERT_2 ) ),
+
+ aCtlPreview ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ),
rOutAttrs ( rInAttrs ),
aAttrSet ( *rInAttrs.GetPool() )
{
diff --git a/cui/source/tabpages/connect.src b/cui/source/tabpages/connect.src
index a2bd502e1717..9193dd4808cb 100644
--- a/cui/source/tabpages/connect.src
+++ b/cui/source/tabpages/connect.src
@@ -32,8 +32,10 @@
// include ---------------------------------------------------------------
#include <svtools/controldims.hrc>
#include "connect.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
+
// RID_SVXPAGE_CONNECTION ------------------------------------------------
TabPage RID_SVXPAGE_CONNECTION
{
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 43fdfe507627..e7ec2a0e8ef6 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -32,12 +32,12 @@
#include "precompiled_cui.hxx"
#include <sfx2/basedlgs.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "dstribut.hxx"
#include "dstribut.hrc"
-
+#include <svx/dialogs.hrc>
#include <svx/svddef.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <tools/shl.hxx>
static USHORT pRanges[] =
@@ -87,38 +87,38 @@ SvxDistributePage::SvxDistributePage(
const SfxItemSet& rInAttrs,
SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer)
-: SvxTabPage(pWindow, SVX_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs),
+: SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs),
meDistributeHor(eHor),
meDistributeVer(eVer),
- maFlHorizontal (this, SVX_RES(FL_HORIZONTAL )),
- maBtnHorNone (this, SVX_RES(BTN_HOR_NONE )),
- maBtnHorLeft (this, SVX_RES(BTN_HOR_LEFT )),
- maBtnHorCenter (this, SVX_RES(BTN_HOR_CENTER )),
- maBtnHorDistance (this, SVX_RES(BTN_HOR_DISTANCE )),
- maBtnHorRight (this, SVX_RES(BTN_HOR_RIGHT )),
- maHorLow (this, SVX_RES(IMG_HOR_LOW )),
- maHorCenter (this, SVX_RES(IMG_HOR_CENTER )),
- maHorDistance (this, SVX_RES(IMG_HOR_DISTANCE )),
- maHorHigh (this, SVX_RES(IMG_HOR_HIGH )),
- maFlVertical (this, SVX_RES(FL_VERTICAL )),
- maBtnVerNone (this, SVX_RES(BTN_VER_NONE )),
- maBtnVerTop (this, SVX_RES(BTN_VER_TOP )),
- maBtnVerCenter (this, SVX_RES(BTN_VER_CENTER )),
- maBtnVerDistance (this, SVX_RES(BTN_VER_DISTANCE )),
- maBtnVerBottom (this, SVX_RES(BTN_VER_BOTTOM )),
- maVerLow (this, SVX_RES(IMG_VER_LOW )),
- maVerCenter (this, SVX_RES(IMG_VER_CENTER )),
- maVerDistance (this, SVX_RES(IMG_VER_DISTANCE )),
- maVerHigh (this, SVX_RES(IMG_VER_HIGH ))
+ maFlHorizontal (this, CUI_RES(FL_HORIZONTAL )),
+ maBtnHorNone (this, CUI_RES(BTN_HOR_NONE )),
+ maBtnHorLeft (this, CUI_RES(BTN_HOR_LEFT )),
+ maBtnHorCenter (this, CUI_RES(BTN_HOR_CENTER )),
+ maBtnHorDistance (this, CUI_RES(BTN_HOR_DISTANCE )),
+ maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )),
+ maHorLow (this, CUI_RES(IMG_HOR_LOW )),
+ maHorCenter (this, CUI_RES(IMG_HOR_CENTER )),
+ maHorDistance (this, CUI_RES(IMG_HOR_DISTANCE )),
+ maHorHigh (this, CUI_RES(IMG_HOR_HIGH )),
+ maFlVertical (this, CUI_RES(FL_VERTICAL )),
+ maBtnVerNone (this, CUI_RES(BTN_VER_NONE )),
+ maBtnVerTop (this, CUI_RES(BTN_VER_TOP )),
+ maBtnVerCenter (this, CUI_RES(BTN_VER_CENTER )),
+ maBtnVerDistance (this, CUI_RES(BTN_VER_DISTANCE )),
+ maBtnVerBottom (this, CUI_RES(BTN_VER_BOTTOM )),
+ maVerLow (this, CUI_RES(IMG_VER_LOW )),
+ maVerCenter (this, CUI_RES(IMG_VER_CENTER )),
+ maVerDistance (this, CUI_RES(IMG_VER_DISTANCE )),
+ maVerHigh (this, CUI_RES(IMG_VER_HIGH ))
{
- maHorLow.SetModeImage( Image( SVX_RES( IMG_HOR_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
- maHorCenter.SetModeImage( Image( SVX_RES( IMG_HOR_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
- maHorDistance.SetModeImage( Image( SVX_RES( IMG_HOR_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
- maHorHigh.SetModeImage( Image( SVX_RES( IMG_HOR_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
- maVerDistance.SetModeImage( Image( SVX_RES( IMG_VER_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
- maVerLow.SetModeImage( Image( SVX_RES( IMG_VER_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
- maVerCenter.SetModeImage( Image( SVX_RES( IMG_VER_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
- maVerHigh.SetModeImage( Image( SVX_RES( IMG_VER_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maHorLow.SetModeImage( Image( CUI_RES( IMG_HOR_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maHorCenter.SetModeImage( Image( CUI_RES( IMG_HOR_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maHorDistance.SetModeImage( Image( CUI_RES( IMG_HOR_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maHorHigh.SetModeImage( Image( CUI_RES( IMG_HOR_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maVerDistance.SetModeImage( Image( CUI_RES( IMG_VER_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maVerLow.SetModeImage( Image( CUI_RES( IMG_VER_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maVerCenter.SetModeImage( Image( CUI_RES( IMG_VER_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maVerHigh.SetModeImage( Image( CUI_RES( IMG_VER_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
FreeResource();
}
diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src
index e9e0ede56590..88998dc674c5 100644
--- a/cui/source/tabpages/dstribut.src
+++ b/cui/source/tabpages/dstribut.src
@@ -29,9 +29,10 @@
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "dstribut.hrc"
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_DISTRIBUTE ---------------------------------------------------
#define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
diff --git a/cui/source/tabpages/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src
new file mode 100644
index 000000000000..4edc347908e0
--- /dev/null
+++ b/cui/source/tabpages/frmdirlbox.src
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: frmdirlbox.src,v $
+ * $Revision: 1.14 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <svx/dialogs.hrc>
+
+// frame direction ------------------------------------------------------------
+
+String RID_SVXSTR_FRAMEDIR_LTR
+{
+ Text [ en-US ] = "Left-to-right";
+};
+
+String RID_SVXSTR_FRAMEDIR_RTL
+{
+ Text [ en-US ] = "Right-to-left";
+};
+
+String RID_SVXSTR_FRAMEDIR_SUPER
+{
+ Text [ en-US ] = "Use superordinate object settings";
+};
+
+// page direction -------------------------------------------------------------
+
+String RID_SVXSTR_PAGEDIR_LTR_HORI
+{
+ Text [ en-US ] = "Left-to-right (horizontal)";
+};
+
+String RID_SVXSTR_PAGEDIR_RTL_HORI
+{
+ Text [ en-US ] = "Right-to-left (horizontal)";
+};
+
+String RID_SVXSTR_PAGEDIR_RTL_VERT
+{
+ Text [ en-US ] = "Right-to-left (vertical)";
+};
+
+String RID_SVXSTR_PAGEDIR_LTR_VERT
+{
+ Text [ en-US ] = "Left-to-right (vertical)";
+};
+
+// ----------------------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 4b3087c7a9b2..6eb477c8e772 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -36,15 +36,16 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <sfx2/sfxsids.hrc>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svx/dlgutil.hxx>
#include <svx/sizeitem.hxx>
#include <svx/brshitem.hxx>
#include <grfpage.hxx>
#include <svx/grfcrop.hxx>
#include <grfpage.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <svx/svxids.hrc>
+#include <svx/dialogs.hrc>
#define CM_1_TO_TWIP 567
@@ -59,31 +60,31 @@ inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit )
--------------------------------------------------------------------*/
SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_GRFCROP ), rSet ),
- aCropFL( this, SVX_RES( FL_CROP )),
- aZoomConstRB( this, SVX_RES( RB_ZOOMCONST)),
- aSizeConstRB( this, SVX_RES( RB_SIZECONST)),
- aLeftFT( this, SVX_RES( FT_LEFT )),
- aLeftMF( this, SVX_RES( MF_LEFT )),
- aRightFT( this, SVX_RES( FT_RIGHT )),
- aRightMF( this, SVX_RES( MF_RIGHT )),
- aTopFT( this, SVX_RES( FT_TOP )),
- aTopMF( this, SVX_RES( MF_TOP )),
- aBottomFT( this, SVX_RES( FT_BOTTOM )),
- aBottomMF( this, SVX_RES( MF_BOTTOM )),
- aZoomFL( this, SVX_RES( FL_ZOOM )),
- aWidthZoomFT( this, SVX_RES( FT_WIDTHZOOM )),
- aWidthZoomMF( this, SVX_RES( MF_WIDTHZOOM )),
- aHeightZoomFT( this, SVX_RES( FT_HEIGHTZOOM)),
- aHeightZoomMF( this, SVX_RES( MF_HEIGHTZOOM)),
- aSizeFL( this, SVX_RES( FL_SIZE )),
- aWidthFT( this, SVX_RES( FT_WIDTH )),
- aWidthMF( this, SVX_RES( MF_WIDTH )),
- aHeightFT( this, SVX_RES( FT_HEIGHT )),
- aHeightMF( this, SVX_RES( MF_HEIGHT )),
- aOrigSizeFT( this, SVX_RES(FT_ORIG_SIZE)),
- aOrigSizePB( this, SVX_RES( PB_ORGSIZE )),
- aExampleWN( this, SVX_RES( WN_BSP )),
+ : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_GRFCROP ), rSet ),
+ aCropFL( this, CUI_RES( FL_CROP )),
+ aZoomConstRB( this, CUI_RES( RB_ZOOMCONST)),
+ aSizeConstRB( this, CUI_RES( RB_SIZECONST)),
+ aLeftFT( this, CUI_RES( FT_LEFT )),
+ aLeftMF( this, CUI_RES( MF_LEFT )),
+ aRightFT( this, CUI_RES( FT_RIGHT )),
+ aRightMF( this, CUI_RES( MF_RIGHT )),
+ aTopFT( this, CUI_RES( FT_TOP )),
+ aTopMF( this, CUI_RES( MF_TOP )),
+ aBottomFT( this, CUI_RES( FT_BOTTOM )),
+ aBottomMF( this, CUI_RES( MF_BOTTOM )),
+ aZoomFL( this, CUI_RES( FL_ZOOM )),
+ aWidthZoomFT( this, CUI_RES( FT_WIDTHZOOM )),
+ aWidthZoomMF( this, CUI_RES( MF_WIDTHZOOM )),
+ aHeightZoomFT( this, CUI_RES( FT_HEIGHTZOOM)),
+ aHeightZoomMF( this, CUI_RES( MF_HEIGHTZOOM)),
+ aSizeFL( this, CUI_RES( FL_SIZE )),
+ aWidthFT( this, CUI_RES( FT_WIDTH )),
+ aWidthMF( this, CUI_RES( MF_WIDTH )),
+ aHeightFT( this, CUI_RES( FT_HEIGHT )),
+ aHeightMF( this, CUI_RES( MF_HEIGHT )),
+ aOrigSizeFT( this, CUI_RES(FT_ORIG_SIZE)),
+ aOrigSizePB( this, CUI_RES( PB_ORGSIZE )),
+ aExampleWN( this, CUI_RES( WN_BSP )),
pLastCropField(0),
bInitialized(FALSE),
bSetOrigSize(FALSE)
diff --git a/cui/source/tabpages/grfpage.src b/cui/source/tabpages/grfpage.src
index 0d6791fd917d..23004c704582 100644
--- a/cui/source/tabpages/grfpage.src
+++ b/cui/source/tabpages/grfpage.src
@@ -28,9 +28,10 @@
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "grfpage.hrc"
+#include <svx/dialogs.hrc>
/************************************************************/
/* */
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 259e32a5aaae..7f0bd3d39ed2 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -36,12 +36,12 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <swpossizetabpage.hxx>
-
+#include <svx/dialogs.hrc>
#define _SVX_LABDLG_CXX
#include <svx/svdattrx.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/dialmgr.hxx>
+#include <cuires.hrc>
+#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
#include "transfrm.hxx"
@@ -86,25 +86,25 @@ static USHORT pCaptionRanges[] =
// -----------------------------------------------------------------------
SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_CAPTION ), rInAttrs ),
-
- aCT_CAPTTYPE( this, SVX_RES( CT_CAPTTYPE ) ),
- aFT_ABSTAND( this, SVX_RES( FT_ABSTAND ) ),
- aMF_ABSTAND( this, SVX_RES( MF_ABSTAND ) ),
- aFT_WINKEL( this, SVX_RES( FT_WINKEL ) ),
- aLB_WINKEL( this, SVX_RES( LB_WINKEL ) ),
- aFT_ANSATZ( this, SVX_RES( FT_ANSATZ ) ),
- aLB_ANSATZ( this, SVX_RES( LB_ANSATZ ) ),
- aFT_UM( this, SVX_RES( FT_UM ) ),
- aMF_ANSATZ( this, SVX_RES( MF_ANSATZ ) ),
- aFT_ANSATZ_REL( this, SVX_RES( FT_ANSATZ_REL ) ),
- aLB_ANSATZ_REL( this, SVX_RES( LB_ANSATZ_REL ) ),
- aFT_LAENGE( this, SVX_RES( FT_LAENGE ) ),
- aMF_LAENGE( this, SVX_RES( MF_LAENGE ) ),
- aCB_LAENGE( this, SVX_RES( CB_LAENGE ) ),
-
- aStrHorzList( SVX_RES(STR_HORZ_LIST) ),
- aStrVertList( SVX_RES(STR_VERT_LIST) ),
+ : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_CAPTION ), rInAttrs ),
+
+ aCT_CAPTTYPE( this, CUI_RES( CT_CAPTTYPE ) ),
+ aFT_ABSTAND( this, CUI_RES( FT_ABSTAND ) ),
+ aMF_ABSTAND( this, CUI_RES( MF_ABSTAND ) ),
+ aFT_WINKEL( this, CUI_RES( FT_WINKEL ) ),
+ aLB_WINKEL( this, CUI_RES( LB_WINKEL ) ),
+ aFT_ANSATZ( this, CUI_RES( FT_ANSATZ ) ),
+ aLB_ANSATZ( this, CUI_RES( LB_ANSATZ ) ),
+ aFT_UM( this, CUI_RES( FT_UM ) ),
+ aMF_ANSATZ( this, CUI_RES( MF_ANSATZ ) ),
+ aFT_ANSATZ_REL( this, CUI_RES( FT_ANSATZ_REL ) ),
+ aLB_ANSATZ_REL( this, CUI_RES( LB_ANSATZ_REL ) ),
+ aFT_LAENGE( this, CUI_RES( FT_LAENGE ) ),
+ aMF_LAENGE( this, CUI_RES( MF_LAENGE ) ),
+ aCB_LAENGE( this, CUI_RES( CB_LAENGE ) ),
+
+ aStrHorzList( CUI_RES(STR_HORZ_LIST) ),
+ aStrVertList( CUI_RES(STR_VERT_LIST) ),
rOutAttrs ( rInAttrs )
{
@@ -129,8 +129,8 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs
sal_uInt16 nBitmap;
for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ )
{
- mpBmpCapTypes[nBitmap] = new Image(Bitmap(SVX_RES(BMP_CAPTTYPE_1 + nBitmap)), COL_LIGHTMAGENTA );
- mpBmpCapTypesH[nBitmap] = new Image(Bitmap(SVX_RES(BMP_CAPTTYPE_1_H + nBitmap)), COL_LIGHTMAGENTA );
+ mpBmpCapTypes[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1 + nBitmap)), COL_LIGHTMAGENTA );
+ mpBmpCapTypesH[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1_H + nBitmap)), COL_LIGHTMAGENTA );
}
//------------ValueSet installieren--------------------------
@@ -140,9 +140,9 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs
aCT_CAPTTYPE.SetSelectHdl(LINK( this, SvxCaptionTabPage, SelectCaptTypeHdl_Impl));
Image aImage;
- aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage, String(SVX_RES(STR_CAPTTYPE_1)));
- aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2, aImage, String(SVX_RES(STR_CAPTTYPE_2)));
- aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3, aImage, String(SVX_RES(STR_CAPTTYPE_3)));
+ aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage, String(CUI_RES(STR_CAPTTYPE_1)));
+ aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2, aImage, String(CUI_RES(STR_CAPTTYPE_2)));
+ aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3, aImage, String(CUI_RES(STR_CAPTTYPE_3)));
FillValueSet();
@@ -582,7 +582,7 @@ void SvxCaptionTabPage::FillValueSet()
SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrView, USHORT nAnchorTypes)
- : SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_CAPTION ) ),
+ : SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_CAPTION ) ),
pView ( pSdrView ),
nAnchorCtrls(nAnchorTypes)
{
diff --git a/cui/source/tabpages/labdlg.hrc b/cui/source/tabpages/labdlg.hrc
index 82ea64c1620c..f75da680a0e0 100644
--- a/cui/source/tabpages/labdlg.hrc
+++ b/cui/source/tabpages/labdlg.hrc
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
//#define RID_SVXPAGE_CAPTION 1000
//#define RID_SVXDLG_CAPTION 1001
diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src
index f3d464a1558e..e128fe7c1734 100644
--- a/cui/source/tabpages/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
#include "helpid.hrc"
#include "labdlg.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_CAPTION ---------------------------------------------------
TabPage RID_SVXPAGE_CAPTION
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index b75ce5b8ebd4..3839bc5034ea 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -38,8 +38,8 @@
#include "macroass.hxx"
#include <basic/basmgr.hxx>
-#include <svx/dialmgr.hxx>
-
+#include <dialmgr.hxx>
+#include <svx/dialogs.hrc>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
@@ -48,7 +48,7 @@
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include "macroass.hrc"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
#include <sfx2/macrconf.hxx>
#include "headertablistbox.hxx"
@@ -676,19 +676,19 @@ SvStringsDtor* __EXPORT _ImpGetMacrosOfRangeHdl(
SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const ResId& rResId, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
: _SfxMacroTabPage( pParent, rResId, rSet )
{
- mpImpl->pStrEvent = new String( SVX_RES( STR_EVENT ) );
- mpImpl->pAssignedMacro = new String( SVX_RES( STR_ASSMACRO ) );
- mpImpl->pEventLB = new _HeaderTabListBox( this, SVX_RES( LB_EVENT ) );
- mpImpl->pAssignPB = new PushButton( this, SVX_RES( PB_ASSIGN ) );
- mpImpl->pDeletePB = new PushButton( this, SVX_RES( PB_DELETE ) );
- mpImpl->pScriptTypeLB = new ListBox(this, SVX_RES( LB_SCRIPTTYPE ) );
+ mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ) );
+ mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ) );
+ mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ) );
+ mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ) );
+ mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ) );
+ mpImpl->pScriptTypeLB = new ListBox(this, CUI_RES( LB_SCRIPTTYPE ) );
mpImpl->pScriptTypeLB->Hide();
- mpImpl->pMacroFT = new FixedText( this, SVX_RES( FT_MACRO ) );
- mpImpl->pGroupLB = new SfxConfigGroupListBox_Impl( this, SVX_RES( LB_GROUP ) );
- mpImpl->pFT_MacroLBLabel = new FixedText( this, SVX_RES( FT_LABEL4LB_MACROS ) );
+ mpImpl->pMacroFT = new FixedText( this, CUI_RES( FT_MACRO ) );
+ mpImpl->pGroupLB = new SfxConfigGroupListBox_Impl( this, CUI_RES( LB_GROUP ) );
+ mpImpl->pFT_MacroLBLabel = new FixedText( this, CUI_RES( FT_LABEL4LB_MACROS ) );
mpImpl->maStaticMacroLBLabel= mpImpl->pFT_MacroLBLabel->GetText();
- mpImpl->pMacroLB = new SfxConfigFunctionListBox_Impl( this, SVX_RES( LB_MACROS ) );
- mpImpl->pMacroStr = new String( SVX_RES( STR_MACROS ) );
+ mpImpl->pMacroLB = new SfxConfigFunctionListBox_Impl( this, CUI_RES( LB_MACROS ) );
+ mpImpl->pMacroStr = new String( CUI_RES( STR_MACROS ) );
FreeResource();
@@ -701,7 +701,7 @@ SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const ResId& rResId, const Re
SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
{
- return new SfxMacroTabPage( pParent, SVX_RES( RID_SVXPAGE_EVENTASSIGN ), NULL, rAttrSet );
+ return new SfxMacroTabPage( pParent, CUI_RES( RID_SVXPAGE_EVENTASSIGN ), NULL, rAttrSet );
}
SfxMacroAssignDlg::SfxMacroAssignDlg( Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src
index bb56baae45f6..3f8fad19cf59 100644
--- a/cui/source/tabpages/macroass.src
+++ b/cui/source/tabpages/macroass.src
@@ -29,8 +29,10 @@
************************************************************************/
#include "macroass.hrc"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
+
TabPage RID_SVXPAGE_EVENTASSIGN
{
Hide = TRUE ;
diff --git a/cui/source/tabpages/makefile.mk b/cui/source/tabpages/makefile.mk
index a43bf143c2a6..8ff70830aa8b 100755
--- a/cui/source/tabpages/makefile.mk
+++ b/cui/source/tabpages/makefile.mk
@@ -55,19 +55,20 @@ SRC1FILES = \
connect.src \
dstribut.src \
grfpage.src \
+ labdlg.src \
macroass.src \
measure.src \
numfmt.src \
numpages.src \
page.src \
paragrph.src \
+ strings.src \
swpossizetabpage.src \
+ tabarea.src \
+ tabline.src \
tabstpge.src \
textanim.src \
textattr.src \
- labdlg.src \
- tabarea.src \
- tabline.src \
transfrm.src
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index dc964f3f0080..4b00f3289338 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -36,7 +36,7 @@
#include <sfx2/module.hxx>
#include <tools/shl.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#define _SVX_MEASURE_CXX
@@ -44,11 +44,12 @@
#include <svx/svdattr.hxx>
#include <svx/svdattrx.hxx>
#include <svx/svdview.hxx>
-
+#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
#include "svx/measctrl.hxx"
#include "measure.hxx"
#include "measure.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
#include <svx/strarray.hxx>
#include <sfx2/request.hxx> //add CHINA001
@@ -97,35 +98,35 @@ SvxMeasureDialog::~SvxMeasureDialog()
\************************************************************************/
SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) :
- SvxTabPage ( pWindow, SVX_RES( RID_SVXPAGE_MEASURE ),
+ SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_MEASURE ),
rInAttrs ),
- aFlLine ( this, SVX_RES( FL_LINE ) ),
- aFtLineDist ( this, SVX_RES( FT_LINE_DIST ) ),
- aMtrFldLineDist ( this, SVX_RES( MTR_LINE_DIST ) ),
- aFtHelplineOverhang ( this, SVX_RES( FT_HELPLINE_OVERHANG ) ),
- aMtrFldHelplineOverhang ( this, SVX_RES( MTR_FLD_HELPLINE_OVERHANG ) ),
- aFtHelplineDist ( this, SVX_RES( FT_HELPLINE_DIST ) ),
- aMtrFldHelplineDist ( this, SVX_RES( MTR_FLD_HELPLINE_DIST ) ),
- aFtHelpline1Len ( this, SVX_RES( FT_HELPLINE1_LEN ) ),
- aMtrFldHelpline1Len ( this, SVX_RES( MTR_FLD_HELPLINE1_LEN ) ),
- aFtHelpline2Len ( this, SVX_RES( FT_HELPLINE2_LEN ) ),
- aMtrFldHelpline2Len ( this, SVX_RES( MTR_FLD_HELPLINE2_LEN ) ),
- aTsbBelowRefEdge ( this, SVX_RES( TSB_BELOW_REF_EDGE ) ),
- aFtDecimalPlaces ( this, SVX_RES( FT_DECIMALPLACES ) ),
- aMtrFldDecimalPlaces ( this, SVX_RES( MTR_FLD_DECIMALPLACES ) ),
-
- aFlLabel ( this, SVX_RES( FL_LABEL ) ),
- aFtPosition ( this, SVX_RES( FT_POSITION ) ),
- aCtlPosition ( this, SVX_RES( CTL_POSITION ) ),
- aTsbAutoPosV ( this, SVX_RES( TSB_AUTOPOSV ) ),
- aTsbAutoPosH ( this, SVX_RES( TSB_AUTOPOSH ) ),
- aTsbShowUnit ( this, SVX_RES( TSB_SHOW_UNIT ) ),
- aLbUnit ( this, SVX_RES( LB_UNIT ) ),
- aTsbParallel ( this, SVX_RES( TSB_PARALLEL ) ),
- aCtlPreview ( this, SVX_RES( CTL_PREVIEW ), rInAttrs ),
-
- aFlVert ( this, SVX_RES( FL_VERT ) ),
+ aFlLine ( this, CUI_RES( FL_LINE ) ),
+ aFtLineDist ( this, CUI_RES( FT_LINE_DIST ) ),
+ aMtrFldLineDist ( this, CUI_RES( MTR_LINE_DIST ) ),
+ aFtHelplineOverhang ( this, CUI_RES( FT_HELPLINE_OVERHANG ) ),
+ aMtrFldHelplineOverhang ( this, CUI_RES( MTR_FLD_HELPLINE_OVERHANG ) ),
+ aFtHelplineDist ( this, CUI_RES( FT_HELPLINE_DIST ) ),
+ aMtrFldHelplineDist ( this, CUI_RES( MTR_FLD_HELPLINE_DIST ) ),
+ aFtHelpline1Len ( this, CUI_RES( FT_HELPLINE1_LEN ) ),
+ aMtrFldHelpline1Len ( this, CUI_RES( MTR_FLD_HELPLINE1_LEN ) ),
+ aFtHelpline2Len ( this, CUI_RES( FT_HELPLINE2_LEN ) ),
+ aMtrFldHelpline2Len ( this, CUI_RES( MTR_FLD_HELPLINE2_LEN ) ),
+ aTsbBelowRefEdge ( this, CUI_RES( TSB_BELOW_REF_EDGE ) ),
+ aFtDecimalPlaces ( this, CUI_RES( FT_DECIMALPLACES ) ),
+ aMtrFldDecimalPlaces ( this, CUI_RES( MTR_FLD_DECIMALPLACES ) ),
+
+ aFlLabel ( this, CUI_RES( FL_LABEL ) ),
+ aFtPosition ( this, CUI_RES( FT_POSITION ) ),
+ aCtlPosition ( this, CUI_RES( CTL_POSITION ) ),
+ aTsbAutoPosV ( this, CUI_RES( TSB_AUTOPOSV ) ),
+ aTsbAutoPosH ( this, CUI_RES( TSB_AUTOPOSH ) ),
+ aTsbShowUnit ( this, CUI_RES( TSB_SHOW_UNIT ) ),
+ aLbUnit ( this, CUI_RES( LB_UNIT ) ),
+ aTsbParallel ( this, CUI_RES( TSB_PARALLEL ) ),
+ aCtlPreview ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ),
+
+ aFlVert ( this, CUI_RES( FL_VERT ) ),
rOutAttrs ( rInAttrs ),
aAttrSet ( *rInAttrs.GetPool() ),
pView( 0 ),
@@ -849,10 +850,10 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p )
void SvxMeasurePage::FillUnitLB()
{
// fill ListBox with metrics
- SvxStringArray aMetricArr( RID_SVXSTR_FIELDUNIT_TABLE );
+ SvxStringArray aMetricArr( SVX_RES( RID_SVXSTR_FIELDUNIT_TABLE ) );
long nUnit = FUNIT_NONE;
- String aStrMetric( SVX_RES( STR_MEASURE_AUTOMATIC ) );
+ String aStrMetric( CUI_RES( STR_MEASURE_AUTOMATIC ) );
USHORT nPos = aLbUnit.InsertEntry( aStrMetric );
aLbUnit.SetEntryData( nPos, (void*)nUnit );
diff --git a/cui/source/tabpages/measure.src b/cui/source/tabpages/measure.src
index df394e4bdbe3..75cb09737766 100644
--- a/cui/source/tabpages/measure.src
+++ b/cui/source/tabpages/measure.src
@@ -28,9 +28,11 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "measure.hrc"
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
+
#define DELTA 20
// pragma ----------------------------------------------------------------
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 1dbd8e46963d..7a4fe198e6fe 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -42,7 +42,7 @@
#include <vcl/svapp.hxx>
#include <unotools/localedatawrapper.hxx>
#include <i18npool/lang.h>
-
+#include <svx/dialogs.hrc>
#define _SVSTDARR_STRINGS
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
@@ -50,14 +50,14 @@
#define _SVX_NUMFMT_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "numfmt.hrc"
#include <svx/numinf.hxx>
#include "numfmt.hxx"
#include <svx/numfmtsh.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <sfx2/request.hxx> //CHINA001
#include <sfx2/app.hxx> //CHINA001
#include <sfx2/basedlgs.hxx>
@@ -239,56 +239,56 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
#include <layout/layout-pre.hxx>
#if ENABLE_LAYOUT
-#undef SVX_RES
-#define SVX_RES(x) #x
-#define SVX_RES_PLAIN(x) ResId (x, DIALOG_MGR ())
-#define THIS_SVX_RES(x) this, #x
+#undef CUI_RES
+#define CUI_RES(x) #x
+#define CUI_RES_PLAIN(x) ResId (x, CUI_MGR ())
+#define THIS_CUI_RES(x) this, #x
#undef SfxTabPage
#define SfxTabPage( parent, id, args ) SfxTabPage( parent, "number-format.xml", id, &args )
#else /* !ENABLE_LAYOUT */
-#define SVX_RES_PLAIN SVX_RES
-#define THIS_SVX_RES SVX_RES
+#define CUI_RES_PLAIN CUI_RES
+#define THIS_CUI_RES CUI_RES
#endif /* !ENABLE_LAYOUT */
SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent,
const SfxItemSet& rCoreAttrs )
- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ),
-
- aFtCategory ( this, SVX_RES( FT_CATEGORY ) ),
- aLbCategory ( this, SVX_RES( LB_CATEGORY ) ),
- aFtFormat ( this, SVX_RES( FT_FORMAT ) ),
- aLbCurrency ( this, SVX_RES( LB_CURRENCY) ),
- aLbFormat ( this, SVX_RES( LB_FORMAT ) ),
- aFtLanguage ( this, SVX_RES( FT_LANGUAGE ) ),
- aLbLanguage ( this, SVX_RES( LB_LANGUAGE ), FALSE ),
- aCbSourceFormat ( this, SVX_RES( CB_SOURCEFORMAT ) ),
- aFtDecimals ( this, SVX_RES( FT_DECIMALS ) ),
- aEdDecimals ( this, SVX_RES( ED_DECIMALS ) ),
- aFtLeadZeroes ( this, SVX_RES( FT_LEADZEROES ) ),
- aEdLeadZeroes ( this, SVX_RES( ED_LEADZEROES ) ),
- aBtnNegRed ( this, SVX_RES( BTN_NEGRED ) ),
- aBtnThousand ( this, SVX_RES( BTN_THOUSAND ) ),
- aFlOptions ( this, SVX_RES( FL_OPTIONS ) ),
-
- aFtEdFormat ( this, SVX_RES( FT_EDFORMAT ) ),
- aEdFormat ( this, SVX_RES( ED_FORMAT ) ),
- aIbAdd ( this, SVX_RES( IB_ADD ) ),
- aIbInfo ( this, SVX_RES( IB_INFO ) ),
- aIbRemove ( this, SVX_RES( IB_REMOVE ) ),
- aFtComment ( this, SVX_RES( FT_COMMENT ) ),
- aEdComment ( this, SVX_RES( ED_COMMENT ) ),
+ : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ),
+
+ aFtCategory ( this, CUI_RES( FT_CATEGORY ) ),
+ aLbCategory ( this, CUI_RES( LB_CATEGORY ) ),
+ aFtFormat ( this, CUI_RES( FT_FORMAT ) ),
+ aLbCurrency ( this, CUI_RES( LB_CURRENCY) ),
+ aLbFormat ( this, CUI_RES( LB_FORMAT ) ),
+ aFtLanguage ( this, CUI_RES( FT_LANGUAGE ) ),
+ aLbLanguage ( this, CUI_RES( LB_LANGUAGE ), FALSE ),
+ aCbSourceFormat ( this, CUI_RES( CB_SOURCEFORMAT ) ),
+ aFtDecimals ( this, CUI_RES( FT_DECIMALS ) ),
+ aEdDecimals ( this, CUI_RES( ED_DECIMALS ) ),
+ aFtLeadZeroes ( this, CUI_RES( FT_LEADZEROES ) ),
+ aEdLeadZeroes ( this, CUI_RES( ED_LEADZEROES ) ),
+ aBtnNegRed ( this, CUI_RES( BTN_NEGRED ) ),
+ aBtnThousand ( this, CUI_RES( BTN_THOUSAND ) ),
+ aFlOptions ( this, CUI_RES( FL_OPTIONS ) ),
+
+ aFtEdFormat ( this, CUI_RES( FT_EDFORMAT ) ),
+ aEdFormat ( this, CUI_RES( ED_FORMAT ) ),
+ aIbAdd ( this, CUI_RES( IB_ADD ) ),
+ aIbInfo ( this, CUI_RES( IB_INFO ) ),
+ aIbRemove ( this, CUI_RES( IB_REMOVE ) ),
+ aFtComment ( this, CUI_RES( FT_COMMENT ) ),
+ aEdComment ( this, CUI_RES( ED_COMMENT ) ),
#if ENABLE_LAYOUT
- aWndPreview ( LAYOUT_THIS_WINDOW(this), SVX_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
+ aWndPreview ( LAYOUT_THIS_WINDOW(this), CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
#else
- aWndPreview ( this, SVX_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
+ aWndPreview ( this, CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
#endif
pNumItem ( NULL ),
pNumFmtShell ( NULL ),
nInitFormat ( ULONG_MAX ),
- sAutomaticEntry ( THIS_SVX_RES( STR_AUTO_ENTRY)),
+ sAutomaticEntry ( THIS_CUI_RES( STR_AUTO_ENTRY)),
pLastActivWindow( NULL )
{
#if ENABLE_LAYOUT
@@ -309,8 +309,8 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage()
void SvxNumberFormatTabPage::Init_Impl()
{
- ImageList aIconList( SVX_RES_PLAIN ( IL_ICON ) );
- ImageList aIconListHC( SVX_RES_PLAIN ( IL_ICON_HC ) );
+ ImageList aIconList( CUI_RES_PLAIN ( IL_ICON ) );
+ ImageList aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) );
bNumItemFlag=TRUE;
bOneAreaFlag=FALSE;
diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src
index 96269bb9ec09..7e2b5706fb70 100644
--- a/cui/source/tabpages/numfmt.src
+++ b/cui/source/tabpages/numfmt.src
@@ -28,10 +28,10 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "numfmt.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_NUMBERFORMAT ----------------------------------------------
TabPage RID_SVXPAGE_NUMBERFORMAT
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e8852c666b6c..272942ec7385 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -37,8 +37,8 @@
#include <numpages.hxx>
#include <numpages.hrc>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include <tools/shl.hxx>
#include <i18npool/mslangid.hxx>
#include <svtools/valueset.hxx>
@@ -71,12 +71,14 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/text/XNumberingTypeInfo.hpp>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
#include <algorithm>
#include <vector>
#include "svx/opengrf.hxx"
-#include <svx/dialogs.hrc> //CHINA001
+#include <cuires.hrc> //CHINA001
#include <sfx2/request.hxx> //CHINA001
#include <svl/aeitem.hxx> //add CHINA001
#include <svl/stritem.hxx>//add CHINA001
@@ -230,9 +232,9 @@ Font& lcl_GetDefaultBulletFont()
SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent,
const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PICK_SINGLE_NUM ), rSet ),
- aValuesFL( this, SVX_RES(FL_VALUES) ),
- pExamplesVS( new SvxNumValueSet(this, SVX_RES(VS_VALUES), NUM_PAGETYPE_SINGLENUM )),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_SINGLE_NUM ), rSet ),
+ aValuesFL( this, CUI_RES(FL_VALUES) ),
+ pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_SINGLENUM )),
pActNum(0),
pSaveNum(0),
nActNumLvl( USHRT_MAX ),
@@ -453,9 +455,9 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent,
const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PICK_BULLET ), rSet ),
- aValuesFL( this, SVX_RES(FL_VALUES) ),
- pExamplesVS( new SvxNumValueSet(this, SVX_RES(VS_VALUES), NUM_PAGETYPE_BULLET )),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_BULLET ), rSet ),
+ aValuesFL( this, CUI_RES(FL_VALUES) ),
+ pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_BULLET )),
pActNum(0),
pSaveNum(0),
nActNumLvl( USHRT_MAX ),
@@ -646,9 +648,9 @@ void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet)
SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent,
const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PICK_NUM ), rSet ),
- aValuesFL( this, SVX_RES(FL_VALUES) ),
- pExamplesVS( new SvxNumValueSet(this, SVX_RES(VS_VALUES), NUM_PAGETYPE_NUM )),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_NUM ), rSet ),
+ aValuesFL( this, CUI_RES(FL_VALUES) ),
+ pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_NUM )),
pActNum(0),
pSaveNum(0),
nActNumLvl( USHRT_MAX ),
@@ -950,11 +952,11 @@ void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PICK_BMP ), rSet ),
- aValuesFL( this, SVX_RES(FL_VALUES) ),
- pExamplesVS( new SvxBmpNumValueSet(this, SVX_RES(VS_VALUES)/*, aGrfNames*/ )),
- aErrorText( this, SVX_RES(FT_ERROR)),
- aLinkedCB( this, SVX_RES(CB_LINKED)),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_BMP ), rSet ),
+ aValuesFL( this, CUI_RES(FL_VALUES) ),
+ pExamplesVS( new SvxBmpNumValueSet(this, CUI_RES(VS_VALUES)/*, aGrfNames*/ )),
+ aErrorText( this, CUI_RES(FT_ERROR)),
+ aLinkedCB( this, CUI_RES(CB_LINKED)),
pActNum(0),
pSaveNum(0),
nActNumLvl( USHRT_MAX ),
@@ -1279,42 +1281,42 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG )
#define NUM_NO_GRAPHIC 1000
SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_NUM_OPTIONS ), rSet ),
-
- aFormatFL( this, SVX_RES(FL_FORMAT )),
- aLevelFT( this, SVX_RES(FT_LEVEL )),
- aLevelLB( this, SVX_RES(LB_LEVEL )),
- aFmtFT( this, SVX_RES(FT_FMT )),
- aFmtLB( this, SVX_RES(LB_FMT )),
- aPrefixFT( this, SVX_RES(FT_PREFIX )),
- aPrefixED( this, SVX_RES(ED_PREFIX )),
- aSuffixFT( this, SVX_RES(FT_SUFFIX )),
- aSuffixED( this, SVX_RES(ED_SUFFIX )),
- aCharFmtFT( this, SVX_RES(FT_CHARFMT )),
- aCharFmtLB( this, SVX_RES(LB_CHARFMT )),
- aBulColorFT( this, SVX_RES(FT_BUL_COLOR)),
- aBulColLB( this, SVX_RES(LB_BUL_COLOR)),
- aBulRelSizeFT( this, SVX_RES(FT_BUL_REL_SIZE)),
- aBulRelSizeMF( this, SVX_RES(MF_BUL_REL_SIZE)),
- aAllLevelFT( this, SVX_RES(FT_ALL_LEVEL)),
- aAllLevelNF( this, SVX_RES(NF_ALL_LEVEL)),
- aStartFT( this, SVX_RES(FT_START )),
- aStartED( this, SVX_RES(ED_START )),
- aBulletPB( this, SVX_RES(PB_BULLET )),
- aAlignFT( this, SVX_RES(FT_ALIGN )),
- aAlignLB( this, SVX_RES(LB_ALIGN )),
- aBitmapFT( this, SVX_RES(FT_BITMAP )),
- aBitmapMB( this, SVX_RES(MB_BITMAP )),
- aSizeFT( this, SVX_RES(FT_SIZE )),
- aWidthMF( this, SVX_RES(MF_WIDTH )),
- aMultFT( this, SVX_RES(FT_MULT )),
- aHeightMF( this, SVX_RES(MF_HEIGHT )),
- aRatioCB( this, SVX_RES(CB_RATIO )),
- aOrientFT( this, SVX_RES(FT_ORIENT )),
- aOrientLB( this, SVX_RES(LB_ORIENT )),
- aSameLevelFL( this, SVX_RES(FL_SAME_LEVEL)),
- aSameLevelCB( this, SVX_RES(CB_SAME_LEVEL)),
- pPreviewWIN( new SvxNumberingPreview(this, SVX_RES(WIN_PREVIEW ))),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_OPTIONS ), rSet ),
+
+ aFormatFL( this, CUI_RES(FL_FORMAT )),
+ aLevelFT( this, CUI_RES(FT_LEVEL )),
+ aLevelLB( this, CUI_RES(LB_LEVEL )),
+ aFmtFT( this, CUI_RES(FT_FMT )),
+ aFmtLB( this, CUI_RES(LB_FMT )),
+ aPrefixFT( this, CUI_RES(FT_PREFIX )),
+ aPrefixED( this, CUI_RES(ED_PREFIX )),
+ aSuffixFT( this, CUI_RES(FT_SUFFIX )),
+ aSuffixED( this, CUI_RES(ED_SUFFIX )),
+ aCharFmtFT( this, CUI_RES(FT_CHARFMT )),
+ aCharFmtLB( this, CUI_RES(LB_CHARFMT )),
+ aBulColorFT( this, CUI_RES(FT_BUL_COLOR)),
+ aBulColLB( this, CUI_RES(LB_BUL_COLOR)),
+ aBulRelSizeFT( this, CUI_RES(FT_BUL_REL_SIZE)),
+ aBulRelSizeMF( this, CUI_RES(MF_BUL_REL_SIZE)),
+ aAllLevelFT( this, CUI_RES(FT_ALL_LEVEL)),
+ aAllLevelNF( this, CUI_RES(NF_ALL_LEVEL)),
+ aStartFT( this, CUI_RES(FT_START )),
+ aStartED( this, CUI_RES(ED_START )),
+ aBulletPB( this, CUI_RES(PB_BULLET )),
+ aAlignFT( this, CUI_RES(FT_ALIGN )),
+ aAlignLB( this, CUI_RES(LB_ALIGN )),
+ aBitmapFT( this, CUI_RES(FT_BITMAP )),
+ aBitmapMB( this, CUI_RES(MB_BITMAP )),
+ aSizeFT( this, CUI_RES(FT_SIZE )),
+ aWidthMF( this, CUI_RES(MF_WIDTH )),
+ aMultFT( this, CUI_RES(FT_MULT )),
+ aHeightMF( this, CUI_RES(MF_HEIGHT )),
+ aRatioCB( this, CUI_RES(CB_RATIO )),
+ aOrientFT( this, CUI_RES(FT_ORIENT )),
+ aOrientLB( this, CUI_RES(LB_ORIENT )),
+ aSameLevelFL( this, CUI_RES(FL_SAME_LEVEL)),
+ aSameLevelCB( this, CUI_RES(CB_SAME_LEVEL)),
+ pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))),
pActNum(0),
pSaveNum(0),
bLastWidthModified(FALSE),
@@ -1323,7 +1325,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
bAutomaticCharStyles(TRUE),
bHTMLMode(FALSE),
bMenuButtonInitialized(FALSE),
- sBullet(SVX_RES(STR_BULLET)),
+ sBullet(CUI_RES(STR_BULLET)),
nBullet(0xff),
nActNumLvl(USHRT_MAX),
nNumItemId(SID_ATTR_NUMBERING_RULE)
@@ -1356,7 +1358,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
PopupMenu* pPopup = new PopupMenu;
aBitmapMB.GetPopupMenu()->SetPopupMenu( MN_GALLERY, pPopup );
- pPopup->InsertItem( NUM_NO_GRAPHIC, String(SVX_RES(ST_POPUP_EMPTY_ENTRY)) );
+ pPopup->InsertItem( NUM_NO_GRAPHIC, String(CUI_RES(ST_POPUP_EMPTY_ENTRY)) );
pPopup->EnableItem( NUM_NO_GRAPHIC, FALSE );
eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
@@ -2235,7 +2237,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
String aGrfName;
Size aSize;
sal_Bool bSucc(sal_False);
- SvxOpenGraphicDialog aGrfDlg( SVX_RES(RID_STR_EDIT_GRAPHIC) );
+ SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) );
// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE );
if(MN_GALLERY_ENTRY <= nItemId )
@@ -2957,33 +2959,33 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
--------------------------------------------------*/
SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_NUM_POSITION ), rSet ),
- aPositionFL( this, SVX_RES(FL_POSITION )),
- aLevelFT( this, SVX_RES(FT_LEVEL )),
- aLevelLB( this, SVX_RES(LB_LEVEL )),
- aDistBorderFT( this, SVX_RES(FT_BORDERDIST )),
- aDistBorderMF( this, SVX_RES(MF_BORDERDIST )),
- aRelativeCB( this, SVX_RES(CB_RELATIVE )),
- aIndentFT( this, SVX_RES(FT_INDENT )),
- aIndentMF( this, SVX_RES(MF_INDENT )),
- aDistNumFT( this, SVX_RES(FT_NUMDIST )),
- aDistNumMF( this, SVX_RES(MF_NUMDIST )),
- aAlignFT( this, SVX_RES(FT_ALIGN )),
- aAlignLB( this, SVX_RES(LB_ALIGN )),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_POSITION ), rSet ),
+ aPositionFL( this, CUI_RES(FL_POSITION )),
+ aLevelFT( this, CUI_RES(FT_LEVEL )),
+ aLevelLB( this, CUI_RES(LB_LEVEL )),
+ aDistBorderFT( this, CUI_RES(FT_BORDERDIST )),
+ aDistBorderMF( this, CUI_RES(MF_BORDERDIST )),
+ aRelativeCB( this, CUI_RES(CB_RELATIVE )),
+ aIndentFT( this, CUI_RES(FT_INDENT )),
+ aIndentMF( this, CUI_RES(MF_INDENT )),
+ aDistNumFT( this, CUI_RES(FT_NUMDIST )),
+ aDistNumMF( this, CUI_RES(MF_NUMDIST )),
+ aAlignFT( this, CUI_RES(FT_ALIGN )),
+ aAlignLB( this, CUI_RES(LB_ALIGN )),
// --> OD 2008-01-10 #newlistlevelattrs#
- aLabelFollowedByFT( this, SVX_RES(FT_LABEL_FOLLOWED_BY) ),
- aLabelFollowedByLB( this, SVX_RES(LB_LABEL_FOLLOWED_BY) ),
- aListtabFT( this, SVX_RES(FT_LISTTAB) ),
- aListtabMF( this, SVX_RES(MF_LISTTAB) ),
- aAlign2FT( this, SVX_RES(FT_ALIGN_2) ),
- aAlign2LB( this, SVX_RES(LB_ALIGN_2) ),
- aAlignedAtFT( this, SVX_RES(FT_ALIGNED_AT) ),
- aAlignedAtMF( this, SVX_RES(MF_ALIGNED_AT) ),
- aIndentAtFT( this, SVX_RES(FT_INDENT_AT) ),
- aIndentAtMF( this, SVX_RES(MF_INDENT_AT) ),
+ aLabelFollowedByFT( this, CUI_RES(FT_LABEL_FOLLOWED_BY) ),
+ aLabelFollowedByLB( this, CUI_RES(LB_LABEL_FOLLOWED_BY) ),
+ aListtabFT( this, CUI_RES(FT_LISTTAB) ),
+ aListtabMF( this, CUI_RES(MF_LISTTAB) ),
+ aAlign2FT( this, CUI_RES(FT_ALIGN_2) ),
+ aAlign2LB( this, CUI_RES(LB_ALIGN_2) ),
+ aAlignedAtFT( this, CUI_RES(FT_ALIGNED_AT) ),
+ aAlignedAtMF( this, CUI_RES(MF_ALIGNED_AT) ),
+ aIndentAtFT( this, CUI_RES(FT_INDENT_AT) ),
+ aIndentAtMF( this, CUI_RES(MF_INDENT_AT) ),
// <--
- aStandardPB( this, SVX_RES(PB_STANDARD )),
- pPreviewWIN( new SvxNumberingPreview(this, SVX_RES(WIN_PREVIEW ))),
+ aStandardPB( this, CUI_RES(PB_STANDARD )),
+ pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))),
pActNum(0),
pSaveNum(0),
nActNumLvl( USHRT_MAX ),
diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src
index e202b2d13a84..731630b29840 100644
--- a/cui/source/tabpages/numpages.src
+++ b/cui/source/tabpages/numpages.src
@@ -28,9 +28,10 @@
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <helpid.hrc>
#include <numpages.hrc>
+#include <svx/dialogs.hrc>
/**************************************************************************/
/* */
@@ -772,6 +773,7 @@ String RID_STR_EDIT_GRAPHIC
{
Text [ en-US ] = "Link" ;
};
+/*
String RID_STR_FULLNUMS_1 { Text = "1.|1.1|a)|61589|61589" ; };
String RID_STR_FULLNUMS_2 { Text = "1.|a)|61589|61589|61589" ; };
String RID_STR_FULLNUMS_3 { Text = "1.|(a)|i.|A.|61589" ; };
@@ -781,105 +783,7 @@ String RID_STR_FULLNUMS_6 { Text = "A.|I.|a.|i.|61589" ; };
String RID_STR_FULLNUMS_7 { Text = "1|1.1|1.1.1|1.1.1.1|1.1.1.1.1" ; };
String RID_STR_FULLNUMS_8 { Text = "61487|61488|61485|61589|61589" ; };
String RID_STR_FULLNUMS_7_HTML { Text = "I.|I.|I|I.|I." ; };
-
-String RID_SVXSTR_BULLET_DESCRIPTION_0
-{
- Text [en-US] = "Solid small circular bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_1
-{
- Text [en-US] = "Solid large circular bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_2
-{
- Text [en-US] = "Solid diamond bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_3
-{
- Text [en-US] = "Solid large square bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_4
-{
- Text [en-US] = "Right pointing arrow bullets filled out";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_5
-{
- Text [en-US] = "Right pointing arrow bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_6
-{
- Text [en-US] = "Check mark bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_7
-{
- Text [en-US] = "Tick mark bullets";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_0
-{
- Text [en-US] = "Number 1) 2) 3)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_1
-{
- Text [en-US] = "Number 1. 2. 3.";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_2
-{
- Text [en-US] = "Number (1) (2) (3)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_3
-{
- Text [en-US] = "Uppercase Roman number I. II. III.";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_4
-{
- Text [en-US] = "Uppercase letter A) B) C)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_5
-{
- Text [en-US] = "Lowercase letter a) b) c)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_6
-{
- Text [en-US] = "Lowercase letter (a) (b) (c)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_7
-{
- Text [en-US] = "Lowercase Roman number i. ii. iii.";
-};
-
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_0
-{
- Text [en-US] = "Numeric, numeric, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_1
-{
- Text [en-US] = "Numeric, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_2
-{
- Text [en-US] = "Numeric, lowercase letters, lowercase Roman, uppercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_3
-{
- Text [en-US] = "Numeric";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_4
-{
- Text [en-US] = "Uppercase Roman, uppercase letters, lowercase Roman, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_5
-{
- Text [en-US] = "Uppercase letters, uppercase Roman, lowercase letters, lowercase Roman, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_6
-{
- Text [en-US] = "Numeric with all sublevels";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
-{
- Text [en-US] = "Right pointing bullet, right pointing arrow bullet, solid diamond bullet, solid small circular bullet";
-};
-
+*/
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 082363ebed23..928f952d0287 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -45,7 +45,7 @@
#define _SVX_PAGE_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "page.hrc"
#include "helpid.hrc"
#include "page.hxx"
@@ -59,12 +59,14 @@
#include <svx/sizeitem.hxx>
#include <svx/frmdiritem.hxx>
#include "svx/dlgutil.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svx/paperinf.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <sfx2/module.hxx>
#include <svl/stritem.hxx>
#include <svx/svxids.hrc> //CHINA001
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
// #i4219#
#include <svtools/optionsdrawinglayer.hxx>
@@ -246,50 +248,50 @@ SfxTabPage* SvxPageDescPage::Create( Window* pParent, const SfxItemSet& rSet )
SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PAGE ), rAttr ),
-
- aPaperSizeFl ( this, SVX_RES( FL_PAPER_SIZE ) ),
- aPaperFormatText ( this, SVX_RES( FT_PAPER_FORMAT ) ),
- aPaperSizeBox ( this, SVX_RES( LB_PAPER_SIZE ) ),
- aPaperWidthText ( this, SVX_RES( FT_PAPER_WIDTH ) ),
- aPaperWidthEdit ( this, SVX_RES( ED_PAPER_WIDTH ) ),
- aPaperHeightText ( this, SVX_RES( FT_PAPER_HEIGHT ) ),
- aPaperHeightEdit ( this, SVX_RES( ED_PAPER_HEIGHT ) ),
- aOrientationFT ( this, SVX_RES( FT_ORIENTATION ) ),
- aPortraitBtn ( this, SVX_RES( RB_PORTRAIT ) ),
- aLandscapeBtn ( this, SVX_RES( RB_LANDSCAPE ) ),
- aBspWin ( this, SVX_RES( WN_BSP ) ),
- aTextFlowLbl ( this, SVX_RES( FT_TEXT_FLOW ) ),
- aTextFlowBox ( this, SVX_RES( LB_TEXT_FLOW ) ),
- aPaperTrayLbl ( this, SVX_RES( FT_PAPER_TRAY ) ),
- aPaperTrayBox ( this, SVX_RES( LB_PAPER_TRAY ) ),
- aMarginFl ( this, SVX_RES( FL_MARGIN ) ),
- aLeftMarginLbl ( this, SVX_RES( FT_LEFT_MARGIN ) ),
- aLeftMarginEdit ( this, SVX_RES( ED_LEFT_MARGIN ) ),
- aRightMarginLbl ( this, SVX_RES( FT_RIGHT_MARGIN ) ),
- aRightMarginEdit ( this, SVX_RES( ED_RIGHT_MARGIN ) ),
- aTopMarginLbl ( this, SVX_RES( FT_TOP_MARGIN ) ),
- aTopMarginEdit ( this, SVX_RES( ED_TOP_MARGIN ) ),
- aBottomMarginLbl ( this, SVX_RES( FT_BOTTOM_MARGIN ) ),
- aBottomMarginEdit ( this, SVX_RES( ED_BOTTOM_MARGIN ) ),
-
- aLayoutFL ( this, SVX_RES( FL_LAYOUT ) ),
- aPageText ( this, SVX_RES( FT_PAGELAYOUT ) ),
- aLayoutBox ( this, SVX_RES( LB_LAYOUT ) ),
- aNumberFormatText ( this, SVX_RES( FT_NUMBER_FORMAT ) ),
- aNumberFormatBox ( this, SVX_RES( LB_NUMBER_FORMAT ) ),
- aBottomSeparatorFl ( this, SVX_RES( FL_BOTTOM_SEP ) ),
- aTblAlignFT ( this, SVX_RES( FT_TBL_ALIGN ) ),
- aHorzBox ( this, SVX_RES( CB_HORZ ) ),
- aVertBox ( this, SVX_RES( CB_VERT ) ),
- aAdaptBox ( this, SVX_RES( CB_ADAPT ) ),
- aRegisterCB ( this, SVX_RES( CB_REGISTER ) ),
- aRegisterFT ( this, SVX_RES( FT_REGISTER ) ),
- aRegisterLB ( this, SVX_RES( LB_REGISTER ) ),
-
- aInsideText ( SVX_RES( STR_INSIDE ) ),
- aOutsideText ( SVX_RES( STR_OUTSIDE ) ),
- aPrintRangeQueryText( SVX_RES( STR_QUERY_PRINTRANGE ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PAGE ), rAttr ),
+
+ aPaperSizeFl ( this, CUI_RES( FL_PAPER_SIZE ) ),
+ aPaperFormatText ( this, CUI_RES( FT_PAPER_FORMAT ) ),
+ aPaperSizeBox ( this, CUI_RES( LB_PAPER_SIZE ) ),
+ aPaperWidthText ( this, CUI_RES( FT_PAPER_WIDTH ) ),
+ aPaperWidthEdit ( this, CUI_RES( ED_PAPER_WIDTH ) ),
+ aPaperHeightText ( this, CUI_RES( FT_PAPER_HEIGHT ) ),
+ aPaperHeightEdit ( this, CUI_RES( ED_PAPER_HEIGHT ) ),
+ aOrientationFT ( this, CUI_RES( FT_ORIENTATION ) ),
+ aPortraitBtn ( this, CUI_RES( RB_PORTRAIT ) ),
+ aLandscapeBtn ( this, CUI_RES( RB_LANDSCAPE ) ),
+ aBspWin ( this, CUI_RES( WN_BSP ) ),
+ aTextFlowLbl ( this, CUI_RES( FT_TEXT_FLOW ) ),
+ aTextFlowBox ( this, CUI_RES( LB_TEXT_FLOW ) ),
+ aPaperTrayLbl ( this, CUI_RES( FT_PAPER_TRAY ) ),
+ aPaperTrayBox ( this, CUI_RES( LB_PAPER_TRAY ) ),
+ aMarginFl ( this, CUI_RES( FL_MARGIN ) ),
+ aLeftMarginLbl ( this, CUI_RES( FT_LEFT_MARGIN ) ),
+ aLeftMarginEdit ( this, CUI_RES( ED_LEFT_MARGIN ) ),
+ aRightMarginLbl ( this, CUI_RES( FT_RIGHT_MARGIN ) ),
+ aRightMarginEdit ( this, CUI_RES( ED_RIGHT_MARGIN ) ),
+ aTopMarginLbl ( this, CUI_RES( FT_TOP_MARGIN ) ),
+ aTopMarginEdit ( this, CUI_RES( ED_TOP_MARGIN ) ),
+ aBottomMarginLbl ( this, CUI_RES( FT_BOTTOM_MARGIN ) ),
+ aBottomMarginEdit ( this, CUI_RES( ED_BOTTOM_MARGIN ) ),
+
+ aLayoutFL ( this, CUI_RES( FL_LAYOUT ) ),
+ aPageText ( this, CUI_RES( FT_PAGELAYOUT ) ),
+ aLayoutBox ( this, CUI_RES( LB_LAYOUT ) ),
+ aNumberFormatText ( this, CUI_RES( FT_NUMBER_FORMAT ) ),
+ aNumberFormatBox ( this, CUI_RES( LB_NUMBER_FORMAT ) ),
+ aBottomSeparatorFl ( this, CUI_RES( FL_BOTTOM_SEP ) ),
+ aTblAlignFT ( this, CUI_RES( FT_TBL_ALIGN ) ),
+ aHorzBox ( this, CUI_RES( CB_HORZ ) ),
+ aVertBox ( this, CUI_RES( CB_VERT ) ),
+ aAdaptBox ( this, CUI_RES( CB_ADAPT ) ),
+ aRegisterCB ( this, CUI_RES( CB_REGISTER ) ),
+ aRegisterFT ( this, CUI_RES( FT_REGISTER ) ),
+ aRegisterLB ( this, CUI_RES( LB_REGISTER ) ),
+
+ aInsideText ( CUI_RES( STR_INSIDE ) ),
+ aOutsideText ( CUI_RES( STR_OUTSIDE ) ),
+ aPrintRangeQueryText( CUI_RES( STR_QUERY_PRINTRANGE ) ),
bLandscape ( FALSE ),
eMode ( SVX_PAGE_MODE_STANDARD ),
@@ -322,16 +324,16 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
bool bHTML32 = SvxHtmlExportModeConfigItem_Impl().IsExportModeHTML32();
// fill text flow listbox with valid entries
- aTextFlowBox.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_PAGEDIR_LTR_HORI ), FRMDIR_HORI_LEFT_TOP );
+ aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_LTR_HORI ), FRMDIR_HORI_LEFT_TOP );
if( bCTL )
- aTextFlowBox.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_PAGEDIR_RTL_HORI ), FRMDIR_HORI_RIGHT_TOP );
+ aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_RTL_HORI ), FRMDIR_HORI_RIGHT_TOP );
// #109989# do not show vertical directions in Writer/Web
if( !bWeb )
{
if( bCJK )
- aTextFlowBox.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_PAGEDIR_RTL_VERT ), FRMDIR_VERT_TOP_RIGHT );
+ aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_RTL_VERT ), FRMDIR_VERT_TOP_RIGHT );
// if( ... )
-// aTextFlowBox.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_PAGEDIR_LTR_VERT ), FRMDIR_VERT_TOP_LEFT );
+// aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_LTR_VERT ), FRMDIR_VERT_TOP_LEFT );
}
// #109989# show the text direction box in Writer/Web too, but only, if HTML export mode is not HTML3.2.
@@ -602,7 +604,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
if ( ePaperStart != PAPER_A3 )
nAryId = RID_SVXSTRARY_PAPERSIZE_DRAW;
- ResStringArray aPaperAry( SVX_RES( nAryId ) );
+ ResStringArray aPaperAry( CUI_RES( nAryId ) );
sal_uInt32 nCnt = aPaperAry.Count();
for ( sal_uInt32 i = 0; i < nCnt; ++i )
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 6a44e41729a7..e8b83078f26a 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -30,10 +30,11 @@
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "page.hrc"
#include "page.h"
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_PAGE ------------------------------------------------------
@@ -369,160 +370,6 @@ TabPage RID_SVXPAGE_PAGE
Text [ en-US ] = "The margin settings are out of print range.\n\nDo you still want to apply these settings?";
};
};
- // App-spezifische Res
-String RID_SVXSTR_WRITER_PAGE
-{
- Text [ en-US ] = "Continuation page" ;
-};
- // Papierformate
-String RID_SVXSTR_PAPER_A0
-{
- Text = "A0" ;
-};
-String RID_SVXSTR_PAPER_A1
-{
- Text = "A1" ;
-};
-String RID_SVXSTR_PAPER_A2
-{
- Text = "A2" ;
-};
-String RID_SVXSTR_PAPER_A3
-{
- Text = "A3" ;
-};
-String RID_SVXSTR_PAPER_A4
-{
- Text = "A4" ;
-};
-String RID_SVXSTR_PAPER_A5
-{
- Text = "A5" ;
-};
-String RID_SVXSTR_PAPER_B4_ISO
-{
- Text = "B4 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_B5_ISO
-{
- Text = "B5 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_LETTER
-{
- Text = "Letter" ;
-};
-String RID_SVXSTR_PAPER_LEGAL
-{
- Text = "Legal" ;
-};
-String RID_SVXSTR_PAPER_TABLOID
-{
- Text = "Tabloid" ;
-};
-String RID_SVXSTR_PAPER_USER
-{
- Text [ en-US ] = "User Defined" ;
-};
-String RID_SVXSTR_PAPER_B6_ISO
-{
- Text = "B6 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_C4
-{
- Text = "C4 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C5
-{
- Text = "C5 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C6
-{
- Text = "C6 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C65
-{
- Text = "C6/5 Envelope" ;
-};
-String RID_SVXSTR_PAPER_DL
-{
- Text = "DL Envelope" ;
-};
-String RID_SVXSTR_PAPER_DIA
-{
- Text = "Dia Slide" ;
-};
-String RID_SVXSTR_PAPER_SCREEN
-{
- Text [ en-US ] = "Screen" ;
-};
-String RID_SVXSTR_PAPER_C
-{
- Text = "C" ;
-};
-String RID_SVXSTR_PAPER_D
-{
- Text = "D" ;
-};
-String RID_SVXSTR_PAPER_E
-{
- Text = "E" ;
-};
-String RID_SVXSTR_PAPER_EXECUTIVE
-{
- Text = "Executive" ;
-};
-String RID_SVXSTR_PAPER_LEGAL2
-{
- Text = "Long Bond" ;
-};
-String RID_SVXSTR_PAPER_MONARCH
-{
- Text = "#8 (Monarch) Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM675
-{
- Text = "#6 3/4 (Personal) Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM9
-{
- Text = "#9 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM10
-{
- Text = "#10 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM11
-{
- Text = "#11 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM12
-{
- Text = "#12 Envelope" ;
-};
-String RID_SVXSTR_PAPER_KAI16
-{
- Text = "16 Kai" ;
-};
-String RID_SVXSTR_PAPER_KAI32
-{
- Text = "32 Kai" ;
-};
-String RID_SVXSTR_PAPER_KAI32BIG
-{
- Text = "Big 32 Kai" ;
-};
-String RID_SVXSTR_PAPER_B4_JIS
-{
- Text = "B4 (JIS)" ;
-};
-String RID_SVXSTR_PAPER_B5_JIS
-{
- Text = "B5 (JIS)" ;
-};
-String RID_SVXSTR_PAPER_B6_JIS
-{
- Text = "B6 (JIS)" ;
-};
StringArray RID_SVXSTRARY_PAPERSIZE_STD
{
ItemList [ en-US ] =
@@ -590,14 +437,6 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
< "Screen" ; PAPERSIZE_SCREEN ; > ;
};
};
-String RID_SVXSTR_PAPERBIN
-{
- Text [ en-US ] = "Paper tray" ;
-};
-String RID_SVXSTR_PAPERBIN_SETTINGS
-{
- Text [ en-US ] = "[From printer settings]" ;
-};
// ********************************************************************** EOF
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 40920fa38c97..8800e63d0f86 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -36,12 +36,13 @@
#include <sfx2/objsh.hxx>
#include <sfx2/module.hxx>
#include <vcl/mnemonic.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_PARAGRPH_CXX 0
#include <svl/languageoptions.hxx>
#include <svx/pgrditem.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "paragrph.hrc"
#include "paragrph.hxx"
#include <svx/frmdiritem.hxx>
@@ -58,7 +59,7 @@
#include <svx/brkitem.hxx>
#include <svx/keepitem.hxx>
#include "svx/dlgutil.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "svx/htmlmode.hxx"
#include <svx/paravertalignitem.hxx>
#include <svl/eitem.hxx> //add CHINA001
@@ -637,31 +638,31 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent,
const SfxItemSet& rAttr ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_STD_PARAGRAPH ), rAttr ),
-
- aLeftLabel ( this, SVX_RES( FT_LEFTINDENT ) ),
- aLeftIndent ( this, SVX_RES( ED_LEFTINDENT ) ),
- aRightLabel ( this, SVX_RES( FT_RIGHTINDENT ) ),
- aRightIndent ( this, SVX_RES( ED_RIGHTINDENT ) ),
-
- aFLineLabel ( this, SVX_RES( FT_FLINEINDENT ) ),
- aFLineIndent ( this, SVX_RES( ED_FLINEINDENT ) ),
- aAutoCB ( this, SVX_RES( CB_AUTO ) ),
- aIndentFrm ( this, SVX_RES( FL_INDENT ) ),
- aTopLabel ( this, SVX_RES( FT_TOPDIST ) ),
- aTopDist ( this, SVX_RES( ED_TOPDIST ) ),
- aBottomLabel ( this, SVX_RES( FT_BOTTOMDIST ) ),
- aBottomDist ( this, SVX_RES( ED_BOTTOMDIST ) ),
- aDistFrm ( this, SVX_RES( FL_DIST ) ),
- aLineDist ( this, SVX_RES( LB_LINEDIST ) ),
- aLineDistAtLabel ( this, SVX_RES( FT_LINEDIST ) ),
- aLineDistAtPercentBox ( this, SVX_RES( ED_LINEDISTPERCENT ) ),
- aLineDistAtMetricBox ( this, SVX_RES( ED_LINEDISTMETRIC ) ),
- aLineDistFrm ( this, SVX_RES( FL_LINEDIST ) ),
- sAbsDist ( SVX_RES(ST_LINEDIST_ABS) ),
- aExampleWin ( this, SVX_RES( WN_EXAMPLE ) ),
- aRegisterCB ( this, SVX_RES( CB_REGISTER ) ),
- aRegisterFL ( this, SVX_RES( FL_REGISTER ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_STD_PARAGRAPH ), rAttr ),
+
+ aLeftLabel ( this, CUI_RES( FT_LEFTINDENT ) ),
+ aLeftIndent ( this, CUI_RES( ED_LEFTINDENT ) ),
+ aRightLabel ( this, CUI_RES( FT_RIGHTINDENT ) ),
+ aRightIndent ( this, CUI_RES( ED_RIGHTINDENT ) ),
+
+ aFLineLabel ( this, CUI_RES( FT_FLINEINDENT ) ),
+ aFLineIndent ( this, CUI_RES( ED_FLINEINDENT ) ),
+ aAutoCB ( this, CUI_RES( CB_AUTO ) ),
+ aIndentFrm ( this, CUI_RES( FL_INDENT ) ),
+ aTopLabel ( this, CUI_RES( FT_TOPDIST ) ),
+ aTopDist ( this, CUI_RES( ED_TOPDIST ) ),
+ aBottomLabel ( this, CUI_RES( FT_BOTTOMDIST ) ),
+ aBottomDist ( this, CUI_RES( ED_BOTTOMDIST ) ),
+ aDistFrm ( this, CUI_RES( FL_DIST ) ),
+ aLineDist ( this, CUI_RES( LB_LINEDIST ) ),
+ aLineDistAtLabel ( this, CUI_RES( FT_LINEDIST ) ),
+ aLineDistAtPercentBox ( this, CUI_RES( ED_LINEDISTPERCENT ) ),
+ aLineDistAtMetricBox ( this, CUI_RES( ED_LINEDISTMETRIC ) ),
+ aLineDistFrm ( this, CUI_RES( FL_LINEDIST ) ),
+ sAbsDist ( CUI_RES(ST_LINEDIST_ABS) ),
+ aExampleWin ( this, CUI_RES( WN_EXAMPLE ) ),
+ aRegisterCB ( this, CUI_RES( CB_REGISTER ) ),
+ aRegisterFL ( this, CUI_RES( FL_REGISTER ) ),
pActLineDistFld ( &aLineDistAtPercentBox ),
nAbst ( MAX_DURCH ),
nWidth ( 11905 /*567 * 50*/ ),
@@ -1037,34 +1038,34 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
--------------------------------------------------*/
SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet )
- : SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet),
- aAlignFrm ( this, SVX_RES( FL_ALIGN ) ),
- aLeft ( this, SVX_RES( BTN_LEFTALIGN ) ),
- aRight ( this, SVX_RES( BTN_RIGHTALIGN ) ),
- aCenter ( this, SVX_RES( BTN_CENTERALIGN ) ),
- aJustify ( this, SVX_RES( BTN_JUSTIFYALIGN ) ),
- aLastLineFT ( this, SVX_RES( FT_LASTLINE ) ),
- aLastLineLB ( this, SVX_RES( LB_LASTLINE ) ),
- aExpandCB ( this, SVX_RES( CB_EXPAND ) ),
- aSnapToGridCB ( this, SVX_RES( CB_SNAP ) ),
- aExampleWin ( this, SVX_RES( WN_EXAMPLE ) ),
-
- aVertAlignFL ( this, SVX_RES( FL_VERTALIGN ) ),
- aVertAlignFT ( this, SVX_RES( FT_VERTALIGN ) ),
- aVertAlignLB ( this, SVX_RES( LB_VERTALIGN ) ),
-
- aPropertiesFL ( this, SVX_RES( FL_PROPERTIES )),
- aTextDirectionFT ( this, SVX_RES( FT_TEXTDIRECTION )),
- aTextDirectionLB ( this, SVX_RES( LB_TEXTDIRECTION ))
+ : SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet),
+ aAlignFrm ( this, CUI_RES( FL_ALIGN ) ),
+ aLeft ( this, CUI_RES( BTN_LEFTALIGN ) ),
+ aRight ( this, CUI_RES( BTN_RIGHTALIGN ) ),
+ aCenter ( this, CUI_RES( BTN_CENTERALIGN ) ),
+ aJustify ( this, CUI_RES( BTN_JUSTIFYALIGN ) ),
+ aLastLineFT ( this, CUI_RES( FT_LASTLINE ) ),
+ aLastLineLB ( this, CUI_RES( LB_LASTLINE ) ),
+ aExpandCB ( this, CUI_RES( CB_EXPAND ) ),
+ aSnapToGridCB ( this, CUI_RES( CB_SNAP ) ),
+ aExampleWin ( this, CUI_RES( WN_EXAMPLE ) ),
+
+ aVertAlignFL ( this, CUI_RES( FL_VERTALIGN ) ),
+ aVertAlignFT ( this, CUI_RES( FT_VERTALIGN ) ),
+ aVertAlignLB ( this, CUI_RES( LB_VERTALIGN ) ),
+
+ aPropertiesFL ( this, CUI_RES( FL_PROPERTIES )),
+ aTextDirectionFT ( this, CUI_RES( FT_TEXTDIRECTION )),
+ aTextDirectionLB ( this, CUI_RES( LB_TEXTDIRECTION ))
{
SvtLanguageOptions aLangOptions;
USHORT nLastLinePos = LASTLINEPOS_DEFAULT;
if ( aLangOptions.IsAsianTypographyEnabled() )
{
- String sLeft(SVX_RES(ST_LEFTALIGN_ASIAN));
+ String sLeft(CUI_RES(ST_LEFTALIGN_ASIAN));
aLeft.SetText(sLeft);
- aRight.SetText(String(SVX_RES(ST_RIGHTALIGN_ASIAN)));
+ aRight.SetText(String(CUI_RES(ST_RIGHTALIGN_ASIAN)));
sLeft = MnemonicGenerator::EraseAllMnemonicChars( sLeft );
if ( aLastLineLB.GetEntryCount() == LASTLINECOUNT_OLD )
@@ -1093,9 +1094,9 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe
{
if( aLangOptions.IsCTLFontEnabled() )
{
- aTextDirectionLB.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
- aTextDirectionLB.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
- aTextDirectionLB.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
+ aTextDirectionLB.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
+ aTextDirectionLB.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
+ aTextDirectionLB.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
aPropertiesFL.Show();
aTextDirectionFT.Show();
@@ -1940,39 +1941,39 @@ void SvxExtParagraphTabPage::DisablePageBreak()
SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_EXT_PARAGRAPH ), rAttr ),
-
- aHyphenBox ( this, SVX_RES( BTN_HYPHEN ) ),
- aBeforeText ( this, SVX_RES( FT_HYPHENBEFORE ) ),
- aExtHyphenBeforeBox ( this, SVX_RES( ED_HYPHENBEFORE ) ),
- aAfterText ( this, SVX_RES( FT_HYPHENAFTER ) ),
- aExtHyphenAfterBox ( this, SVX_RES( ED_HYPHENAFTER ) ),
- aMaxHyphenLabel ( this, SVX_RES( FT_MAXHYPH ) ),
- aMaxHyphenEdit ( this, SVX_RES( ED_MAXHYPH ) ),
- aExtFL ( this, SVX_RES( FL_HYPHEN ) ),
- aBreaksFL ( this, SVX_RES( FL_BREAKS ) ),
- aPageBreakBox ( this, SVX_RES( BTN_PAGEBREAK ) ),
- aBreakTypeFT ( this, SVX_RES( FT_BREAKTYPE )),
- aBreakTypeLB ( this, SVX_RES( LB_BREAKTYPE )),
- aBreakPositionFT ( this, SVX_RES( FT_BREAKPOSITION )),
- aBreakPositionLB ( this, SVX_RES( LB_BREAKPOSITION )),
-// aPageBox ( this, SVX_RES( BTN_BREAKPAGE ) ),
-// aColumnBox ( this, SVX_RES( BTN_BREAKCOLUMN ) ),
-// aBeforeBox ( this, SVX_RES( BTN_PAGEBREAKBEFORE ) ),
-// aAfterBox ( this, SVX_RES( BTN_PAGEBREAKAFTER ) ),
- aApplyCollBtn ( this, SVX_RES( BTN_PAGECOLL ) ),
- aApplyCollBox ( this, SVX_RES( LB_PAGECOLL ) ),
- aPagenumText ( this, SVX_RES( FT_PAGENUM ) ),
- aPagenumEdit ( this, SVX_RES( ED_PAGENUM ) ),
- aExtendFL ( this, SVX_RES( FL_OPTIONS ) ),
- aKeepTogetherBox ( this, SVX_RES( BTN_KEEPTOGETHER ) ),
- aKeepParaBox ( this, SVX_RES( CB_KEEPTOGETHER ) ),
- aOrphanBox ( this, SVX_RES( BTN_ORPHANS ) ),
- aOrphanRowNo ( this, SVX_RES( ED_ORPHANS ) ),
- aOrphanRowLabel ( this, SVX_RES( FT_ORPHANS ) ),
- aWidowBox ( this, SVX_RES( BTN_WIDOWS ) ),
- aWidowRowNo ( this, SVX_RES( ED_WIDOWS ) ),
- aWidowRowLabel ( this, SVX_RES( FT_WIDOWS ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_EXT_PARAGRAPH ), rAttr ),
+
+ aHyphenBox ( this, CUI_RES( BTN_HYPHEN ) ),
+ aBeforeText ( this, CUI_RES( FT_HYPHENBEFORE ) ),
+ aExtHyphenBeforeBox ( this, CUI_RES( ED_HYPHENBEFORE ) ),
+ aAfterText ( this, CUI_RES( FT_HYPHENAFTER ) ),
+ aExtHyphenAfterBox ( this, CUI_RES( ED_HYPHENAFTER ) ),
+ aMaxHyphenLabel ( this, CUI_RES( FT_MAXHYPH ) ),
+ aMaxHyphenEdit ( this, CUI_RES( ED_MAXHYPH ) ),
+ aExtFL ( this, CUI_RES( FL_HYPHEN ) ),
+ aBreaksFL ( this, CUI_RES( FL_BREAKS ) ),
+ aPageBreakBox ( this, CUI_RES( BTN_PAGEBREAK ) ),
+ aBreakTypeFT ( this, CUI_RES( FT_BREAKTYPE )),
+ aBreakTypeLB ( this, CUI_RES( LB_BREAKTYPE )),
+ aBreakPositionFT ( this, CUI_RES( FT_BREAKPOSITION )),
+ aBreakPositionLB ( this, CUI_RES( LB_BREAKPOSITION )),
+// aPageBox ( this, CUI_RES( BTN_BREAKPAGE ) ),
+// aColumnBox ( this, CUI_RES( BTN_BREAKCOLUMN ) ),
+// aBeforeBox ( this, CUI_RES( BTN_PAGEBREAKBEFORE ) ),
+// aAfterBox ( this, CUI_RES( BTN_PAGEBREAKAFTER ) ),
+ aApplyCollBtn ( this, CUI_RES( BTN_PAGECOLL ) ),
+ aApplyCollBox ( this, CUI_RES( LB_PAGECOLL ) ),
+ aPagenumText ( this, CUI_RES( FT_PAGENUM ) ),
+ aPagenumEdit ( this, CUI_RES( ED_PAGENUM ) ),
+ aExtendFL ( this, CUI_RES( FL_OPTIONS ) ),
+ aKeepTogetherBox ( this, CUI_RES( BTN_KEEPTOGETHER ) ),
+ aKeepParaBox ( this, CUI_RES( CB_KEEPTOGETHER ) ),
+ aOrphanBox ( this, CUI_RES( BTN_ORPHANS ) ),
+ aOrphanRowNo ( this, CUI_RES( ED_ORPHANS ) ),
+ aOrphanRowLabel ( this, CUI_RES( FT_ORPHANS ) ),
+ aWidowBox ( this, CUI_RES( BTN_WIDOWS ) ),
+ aWidowRowNo ( this, CUI_RES( ED_WIDOWS ) ),
+ aWidowRowLabel ( this, CUI_RES( FT_WIDOWS ) ),
bPageBreak ( TRUE ),
bHtmlMode ( FALSE ),
nStdPos ( 0 )
@@ -2253,11 +2254,11 @@ void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet)
-----------------------------------------------------------------------*/
SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_PARA_ASIAN ), rSet),
- aOptionsFL( this, SVX_RES(FL_AS_OPTIONS )),
- aForbiddenRulesCB( this, SVX_RES(CB_AS_FORBIDDEN )),
- aHangingPunctCB( this, SVX_RES(CB_AS_HANG_PUNC )),
- aScriptSpaceCB( this, SVX_RES(CB_AS_SCRIPT_SPACE ))//,
+ SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_PARA_ASIAN ), rSet),
+ aOptionsFL( this, CUI_RES(FL_AS_OPTIONS )),
+ aForbiddenRulesCB( this, CUI_RES(CB_AS_FORBIDDEN )),
+ aHangingPunctCB( this, CUI_RES(CB_AS_HANG_PUNC )),
+ aScriptSpaceCB( this, CUI_RES(CB_AS_SCRIPT_SPACE ))//,
{
FreeResource();
diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index 996242dccbda..2e4ad98da17a 100644
--- a/cui/source/tabpages/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -28,9 +28,10 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "paragrph.hrc"
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_STD_PARAGRAPH ---------------------------------------------
TabPage RID_SVXPAGE_STD_PARAGRAPH
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
new file mode 100644
index 000000000000..316e8741dcc9
--- /dev/null
+++ b/cui/source/tabpages/strings.src
@@ -0,0 +1,178 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ // include ------------------------------------------------------------------
+#include <cuires.hrc>
+
+String RID_SVXSTR_DESC_GRADIENT
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */
+ Text [ en-US ] = "Please enter a name for the gradient:" ;
+};
+String RID_SVXSTR_ASK_DEL_GRADIENT
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */
+ Text [ en-US ] = "Do you want to delete the gradient?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_GRADIENT
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */
+ /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */
+ Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ;
+};
+String RID_SVXSTR_DESC_NEW_BITMAP
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */
+ Text [ en-US ] = "Please enter a name for the bitmap:" ;
+};
+String RID_SVXSTR_DESC_EXT_BITMAP
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */
+ Text [ en-US ] = "Please enter a name for the external bitmap:" ;
+};
+String RID_SVXSTR_ASK_DEL_BITMAP
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */
+ Text [ en-US ] = "Are you sure you want to delete the bitmap?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_BITMAP
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */
+ /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */
+ Text [ en-US ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ;
+};
+String RID_SVXSTR_DESC_LINESTYLE
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */
+ Text [ en-US ] = "Please enter a name for the line style:" ;
+};
+String RID_SVXSTR_ASK_DEL_LINESTYLE
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */
+ Text [ en-US ] = "Do you want to delete the line style?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_LINESTYLE
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */
+ /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */
+ Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ;
+};
+String RID_SVXSTR_DESC_HATCH
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */
+ Text [ en-US ] = "Please enter a name for the hatching:" ;
+};
+String RID_SVXSTR_ASK_DEL_HATCH
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */
+ Text [ en-US ] = "Do you want to delete the hatching?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_HATCH
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */
+ /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */
+ Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ;
+};
+String RID_SVXSTR_CHANGE
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Ändern : Žndern */
+ /* ### ACHTUNG: Neuer Text in Resource? Ändern : Žndern */
+ Text [ en-US ] = "Modify" ;
+};
+String RID_SVXSTR_ADD
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */
+ /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */
+ Text [ en-US ] = "Add" ;
+};
+String RID_SVXSTR_DESC_COLOR
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */
+ Text [ en-US ] = "Please enter a name for the new color:" ;
+};
+String RID_SVXSTR_ASK_DEL_COLOR
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */
+ Text [ en-US ] = "Do you want to delete the color?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_COLOR
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */
+ /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */
+ Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ;
+};
+String RID_SVXSTR_TABLE
+{
+ Text [ en-US ] = "Table" ;
+};
+String RID_SVXSTR_WRITE_DATA_ERROR
+{
+ Text [ en-US ] = "The file could not be saved!" ;
+};
+String RID_SVXSTR_READ_DATA_ERROR
+{
+ Text [ en-US ] = "The file could not be loaded!" ;
+};
+String RID_SVXSTR_WARN_TABLE_OVERWRITE
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */
+ Text [ en-US ] = "The list was modified without saving. Would you like to save the list now?" ;
+};
+String RID_SVXSTR_WARN_NAME_DUPLICATE
+{
+ Text [ en-US ] = "The name you have entered already exists. \nPlease choose another name." ;
+};
+String RID_SVXSTR_DESC_LINEEND
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */
+ Text [ en-US ] = "Please enter a name for the new arrowhead:" ;
+};
+String RID_SVXSTR_ASK_DEL_LINEEND
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */
+ Text [ en-US ] = "Do you want to delete the arrowhead?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_LINEEND
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */
+ /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */
+ Text [ en-US ] = "The arrowhead was modified without saving.\nWould you like to save the arrowhead now?" ;
+};
+
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 09168fc9a16e..488eb057418f 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -33,13 +33,13 @@
#include <cstddef>
#include <swpossizetabpage.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svx/dlgutil.hxx>
#include <svx/anchorid.hxx>
#include <svl/aeitem.hxx>
#include <svx/swframevalidation.hxx>
#include <tools/debug.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <swpossizetabpage.hrc>
#include <svx/htmlmode.hxx>
#include <svx/svdview.hxx>
@@ -49,6 +49,7 @@
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
+#include <svx/dialogs.hrc>
using namespace ::com::sun::star::text;
#define SwFPos SvxSwFramePosString
@@ -525,48 +526,48 @@ ULONG lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
-----------------------------------------------------------------------*/
SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_SWPOSSIZE ), rInAttrs ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_SWPOSSIZE ), rInAttrs ),
#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
- m_aSizeFL( this, SVX_RES( FL_SIZE ) ),
- m_aWidthFT( this, SVX_RES( FT_WIDTH ) ),
- m_aWidthMF( this, SVX_RES( MF_WIDTH ) ),
- m_aHeightFT( this, SVX_RES( FT_HEIGHT ) ),
- m_aHeightMF( this, SVX_RES( MF_HEIGHT ) ),
- m_aKeepRatioCB(this,SVX_RES( CB_KEEPRATIO) ),
- m_aSeparatorFL(this,SVX_RES( FL_SEPARATOR) ),
-
- m_aAnchorFL( this, SVX_RES( FL_ANCHOR ) ),
- m_aToPageRB( this, SVX_RES( RB_TOPAGE ) ),
- m_aToParaRB( this, SVX_RES( RB_TOPARA ) ),
- m_aToCharRB( this, SVX_RES( RB_TOCHAR ) ),
- m_aAsCharRB( this, SVX_RES( RB_ASCHAR ) ),
- m_aToFrameRB( this, SVX_RES( RB_TOFRAME) ),
-
- m_aProtectionFL( this, SVX_RES( FL_PROTECTION ) ),
- m_aPositionCB( this, SVX_RES( CB_POSITION ) ),
- m_aSizeCB( this, SVX_RES( CB_SIZE ) ),
-
- m_aPositionFL( this, SVX_RES( FL_POSITION ) ),
- m_aHoriFT( this, SVX_RES( FT_HORI ) ),
- m_aHoriLB( this, SVX_RES( LB_HORI ) ),
- m_aHoriByFT( this, SVX_RES( FT_HORIBY ) ),
- m_aHoriByMF( this, SVX_RES( MF_HORIBY ) ),
- m_aHoriToFT( this, SVX_RES( FT_HORITO ) ),
- m_aHoriToLB( this, SVX_RES( LB_HORITO ) ),
-
- m_aHoriMirrorCB( this, SVX_RES( CB_HORIMIRROR ) ),
-
- m_aVertFT( this, SVX_RES( FT_VERT ) ),
- m_aVertLB( this, SVX_RES( LB_VERT ) ),
- m_aVertByFT( this, SVX_RES( FT_VERTBY ) ),
- m_aVertByMF( this, SVX_RES( MF_VERTBY ) ),
- m_aVertToFT( this, SVX_RES( FT_VERTTO ) ),
- m_aVertToLB( this, SVX_RES( LB_VERTTO ) ),
-
- m_aFollowCB( this, SVX_RES( CB_FOLLOW ) ),
- m_aExampleWN( this, SVX_RES( WN_EXAMPLE ) ),
+ m_aSizeFL( this, CUI_RES( FL_SIZE ) ),
+ m_aWidthFT( this, CUI_RES( FT_WIDTH ) ),
+ m_aWidthMF( this, CUI_RES( MF_WIDTH ) ),
+ m_aHeightFT( this, CUI_RES( FT_HEIGHT ) ),
+ m_aHeightMF( this, CUI_RES( MF_HEIGHT ) ),
+ m_aKeepRatioCB(this,CUI_RES( CB_KEEPRATIO) ),
+ m_aSeparatorFL(this,CUI_RES( FL_SEPARATOR) ),
+
+ m_aAnchorFL( this, CUI_RES( FL_ANCHOR ) ),
+ m_aToPageRB( this, CUI_RES( RB_TOPAGE ) ),
+ m_aToParaRB( this, CUI_RES( RB_TOPARA ) ),
+ m_aToCharRB( this, CUI_RES( RB_TOCHAR ) ),
+ m_aAsCharRB( this, CUI_RES( RB_ASCHAR ) ),
+ m_aToFrameRB( this, CUI_RES( RB_TOFRAME) ),
+
+ m_aProtectionFL( this, CUI_RES( FL_PROTECTION ) ),
+ m_aPositionCB( this, CUI_RES( CB_POSITION ) ),
+ m_aSizeCB( this, CUI_RES( CB_SIZE ) ),
+
+ m_aPositionFL( this, CUI_RES( FL_POSITION ) ),
+ m_aHoriFT( this, CUI_RES( FT_HORI ) ),
+ m_aHoriLB( this, CUI_RES( LB_HORI ) ),
+ m_aHoriByFT( this, CUI_RES( FT_HORIBY ) ),
+ m_aHoriByMF( this, CUI_RES( MF_HORIBY ) ),
+ m_aHoriToFT( this, CUI_RES( FT_HORITO ) ),
+ m_aHoriToLB( this, CUI_RES( LB_HORITO ) ),
+
+ m_aHoriMirrorCB( this, CUI_RES( CB_HORIMIRROR ) ),
+
+ m_aVertFT( this, CUI_RES( FT_VERT ) ),
+ m_aVertLB( this, CUI_RES( LB_VERT ) ),
+ m_aVertByFT( this, CUI_RES( FT_VERTBY ) ),
+ m_aVertByMF( this, CUI_RES( MF_VERTBY ) ),
+ m_aVertToFT( this, CUI_RES( FT_VERTTO ) ),
+ m_aVertToLB( this, CUI_RES( LB_VERTTO ) ),
+
+ m_aFollowCB( this, CUI_RES( CB_FOLLOW ) ),
+ m_aExampleWN( this, CUI_RES( WN_EXAMPLE ) ),
#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
diff --git a/cui/source/tabpages/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src
index ee8bac14f688..e84893c37457 100644
--- a/cui/source/tabpages/swpossizetabpage.src
+++ b/cui/source/tabpages/swpossizetabpage.src
@@ -29,10 +29,9 @@
************************************************************************/
// include ------------------------------------------------------------------
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "swpossizetabpage.hrc"
- // pragma -------------------------------------------------------------------
-
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_POSITION_SIZE ------------------------------------------------
TabPage RID_SVXPAGE_SWPOSSIZE
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 412b1affe5c4..86361fe2fea5 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -41,10 +41,11 @@
#include <svx/svdmark.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdview.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_TABAREA_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <svx/xtable.hxx>
#include "svx/globl3d.hxx"
#include <svx/svdmodel.hxx>
@@ -53,7 +54,7 @@
#include "tabarea.hrc"
#include "dlgname.hxx"
//#include "dlgname.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#define DLGWIN this->GetParent()->GetParent()
@@ -71,7 +72,7 @@ SvxAreaTabDialog::SvxAreaTabDialog
const SdrView* /* pSdrView */
) :
- SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_AREA ), pAttr ),
+ SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_AREA ), pAttr ),
mpDrawModel ( pModel ),
// mpView ( pSdrView ),
@@ -108,7 +109,7 @@ SvxAreaTabDialog::SvxAreaTabDialog
CancelButton& rBtnCancel = GetCancelButton();
rBtnCancel.SetClickHdl( LINK( this, SvxAreaTabDialog, CancelHdlImpl ) );
-//! rBtnCancel.SetText( SVX_RESSTR( RID_SVXSTR_CLOSE ) );
+//! rBtnCancel.SetText( CUI_RESSTR( RID_SVXSTR_CLOSE ) );
}
// -----------------------------------------------------------------------
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index 877d1c5799fd..cbb4020b6bd3 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -29,8 +29,9 @@
************************************************************************/
// include ---------------------------------------------------------------
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabarea.hrc"
+#include <svx/dialogs.hrc>
#define MASKCOLOR MaskColor = Color{ Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index c25aabb5aeed..fe344770a7db 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -37,16 +37,17 @@
#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_TABLINE_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabline.hrc"
//#include "dlgname.hrc"
#include "cuitabarea.hxx"
#include "cuitabline.hxx"
#include "dlgname.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svx/svdmodel.hxx>
#include <svx/xtable.hxx>
#include "svx/drawitem.hxx"
@@ -72,7 +73,7 @@ SvxLineTabDialog::SvxLineTabDialog
BOOL bHasObj
) :
- SfxTabDialog ( pParent, SVX_RES( RID_SVXDLG_LINE ), pAttr ),
+ SfxTabDialog ( pParent, CUI_RES( RID_SVXDLG_LINE ), pAttr ),
pDrawModel ( pModel ),
pObj ( pSdrObj ),
rOutAttrs ( *pAttr ),
@@ -130,7 +131,7 @@ SvxLineTabDialog::SvxLineTabDialog
CancelButton& rBtnCancel = GetCancelButton();
rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) );
-//! rBtnCancel.SetText( SVX_RESSTR( RID_SVXSTR_CLOSE ) );
+//! rBtnCancel.SetText( CUI_RESSTR( RID_SVXSTR_CLOSE ) );
}
// -----------------------------------------------------------------------
diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src
index 55e50c0e78b4..ed2d308970db 100644
--- a/cui/source/tabpages/tabline.src
+++ b/cui/source/tabpages/tabline.src
@@ -28,9 +28,10 @@
*
************************************************************************/
// include ------------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "tabline.hrc"
+#include <svx/dialogs.hrc>
// Selecting LineStyle / Color / Width --------------------
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index a1effa923086..5674ca1dc2b3 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -36,14 +36,16 @@
#include <sfx2/app.hxx>
#include <tools/shl.hxx>
#include <svtools/ruler.hxx>
+#include <svx/dialogs.hrc>
+#include <svx/dialogs.hrc>
#define _SVX_TABSTPGE_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabstpge.hrc"
#include <svx/lrspitem.hxx>
#include "tabstpge.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
#include <sfx2/module.hxx>
#include <svl/cjkoptions.hxx>
@@ -106,32 +108,32 @@ void TabWin_Impl::Paint( const Rectangle& )
SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
const SfxItemSet& rAttr ):
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_TABULATOR ), rAttr ),
-
- aTabBox ( this, SVX_RES( ED_TABPOS ) ),
- aTabLabel ( this, SVX_RES( FL_TABPOS ) ),
- aTabLabelVert ( this, SVX_RES( FL_TABPOS_VERT ) ),
- aLeftTab ( this, SVX_RES( BTN_TABTYPE_LEFT ) ),
- aRightTab ( this, SVX_RES( BTN_TABTYPE_RIGHT ) ),
- aCenterTab ( this, SVX_RES( BTN_TABTYPE_CENTER ) ),
- aDezTab ( this, SVX_RES( BTN_TABTYPE_DECIMAL ) ),
- pLeftWin ( new TabWin_Impl( this, SVX_RES( WIN_TABLEFT ), (USHORT)(RULER_TAB_LEFT|WB_HORZ) ) ),
- pRightWin ( new TabWin_Impl( this, SVX_RES( WIN_TABRIGHT ), (USHORT)(RULER_TAB_RIGHT|WB_HORZ) ) ),
- pCenterWin ( new TabWin_Impl( this, SVX_RES( WIN_TABCENTER ), (USHORT)(RULER_TAB_CENTER|WB_HORZ) ) ),
- pDezWin ( new TabWin_Impl( this, SVX_RES( WIN_TABDECIMAL ), (USHORT)(RULER_TAB_DECIMAL|WB_HORZ) ) ),
- aDezCharLabel ( this, SVX_RES( FT_TABTYPE_DECCHAR ) ),
- aDezChar ( this, SVX_RES( ED_TABTYPE_DECCHAR ) ),
- aTabTypeLabel ( this, SVX_RES( FL_TABTYPE ) ),
- aNoFillChar ( this, SVX_RES( BTN_FILLCHAR_NO ) ),
- aFillPoints ( this, SVX_RES( BTN_FILLCHAR_POINTS ) ),
- aFillDashLine ( this, SVX_RES( BTN_FILLCHAR_DASHLINE ) ),
- aFillSolidLine ( this, SVX_RES( BTN_FILLCHAR_UNDERSCORE ) ),
- aFillSpecial ( this, SVX_RES( BTN_FILLCHAR_OTHER ) ),
- aFillChar ( this, SVX_RES( ED_FILLCHAR_OTHER ) ),
- aFillLabel ( this, SVX_RES( FL_FILLCHAR ) ),
- aNewBtn ( this, SVX_RES( BTN_NEW ) ),
- aDelAllBtn ( this, SVX_RES( BTN_DELALL ) ),
- aDelBtn ( this, SVX_RES( BTN_DEL ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_TABULATOR ), rAttr ),
+
+ aTabBox ( this, CUI_RES( ED_TABPOS ) ),
+ aTabLabel ( this, CUI_RES( FL_TABPOS ) ),
+ aTabLabelVert ( this, CUI_RES( FL_TABPOS_VERT ) ),
+ aLeftTab ( this, CUI_RES( BTN_TABTYPE_LEFT ) ),
+ aRightTab ( this, CUI_RES( BTN_TABTYPE_RIGHT ) ),
+ aCenterTab ( this, CUI_RES( BTN_TABTYPE_CENTER ) ),
+ aDezTab ( this, CUI_RES( BTN_TABTYPE_DECIMAL ) ),
+ pLeftWin ( new TabWin_Impl( this, CUI_RES( WIN_TABLEFT ), (USHORT)(RULER_TAB_LEFT|WB_HORZ) ) ),
+ pRightWin ( new TabWin_Impl( this, CUI_RES( WIN_TABRIGHT ), (USHORT)(RULER_TAB_RIGHT|WB_HORZ) ) ),
+ pCenterWin ( new TabWin_Impl( this, CUI_RES( WIN_TABCENTER ), (USHORT)(RULER_TAB_CENTER|WB_HORZ) ) ),
+ pDezWin ( new TabWin_Impl( this, CUI_RES( WIN_TABDECIMAL ), (USHORT)(RULER_TAB_DECIMAL|WB_HORZ) ) ),
+ aDezCharLabel ( this, CUI_RES( FT_TABTYPE_DECCHAR ) ),
+ aDezChar ( this, CUI_RES( ED_TABTYPE_DECCHAR ) ),
+ aTabTypeLabel ( this, CUI_RES( FL_TABTYPE ) ),
+ aNoFillChar ( this, CUI_RES( BTN_FILLCHAR_NO ) ),
+ aFillPoints ( this, CUI_RES( BTN_FILLCHAR_POINTS ) ),
+ aFillDashLine ( this, CUI_RES( BTN_FILLCHAR_DASHLINE ) ),
+ aFillSolidLine ( this, CUI_RES( BTN_FILLCHAR_UNDERSCORE ) ),
+ aFillSpecial ( this, CUI_RES( BTN_FILLCHAR_OTHER ) ),
+ aFillChar ( this, CUI_RES( ED_FILLCHAR_OTHER ) ),
+ aFillLabel ( this, CUI_RES( FL_FILLCHAR ) ),
+ aNewBtn ( this, CUI_RES( BTN_NEW ) ),
+ aDelAllBtn ( this, CUI_RES( BTN_DELALL ) ),
+ aDelBtn ( this, CUI_RES( BTN_DEL ) ),
aAktTab ( 0 ),
aNewTabs ( 0, 0, SVX_TAB_ADJUST_LEFT, GetWhich( SID_ATTR_TABSTOP ) ),
@@ -143,8 +145,8 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
SvtCJKOptions aCJKOptions;
if(aCJKOptions.IsAsianTypographyEnabled())
{
- aLeftTab .SetText(String(SVX_RES( ST_LEFTTAB_ASIAN )));
- aRightTab .SetText(String(SVX_RES( ST_RIGHTTAB_ASIAN )));
+ aLeftTab .SetText(String(CUI_RES( ST_LEFTTAB_ASIAN )));
+ aRightTab .SetText(String(CUI_RES( ST_RIGHTTAB_ASIAN )));
}
// diese Page braucht ExchangeSupport
diff --git a/cui/source/tabpages/tabstpge.src b/cui/source/tabpages/tabstpge.src
index 2b3649ef968f..b314e0ef53fb 100644
--- a/cui/source/tabpages/tabstpge.src
+++ b/cui/source/tabpages/tabstpge.src
@@ -29,9 +29,9 @@
************************************************************************/
// include ---------------------------------------------------------------
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabstpge.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_TABULATOR -------------------------------------------------
TabPage RID_SVXPAGE_TABULATOR
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index a278d11970bf..3c7bdbcd4653 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -36,6 +36,7 @@
#include <sfx2/module.hxx>
#include <tools/shl.hxx>
+#include <cuires.hrc>
#include <svx/dialogs.hrc>
#ifndef _SVX_TEXTANIM_CXX
@@ -44,7 +45,7 @@
#include "textanim.hxx"
#include "textanim.hrc"
#include "textattr.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
static USHORT pRanges[] =
@@ -63,7 +64,7 @@ static USHORT pRanges[] =
__EXPORT SvxTextTabDialog::SvxTextTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView ) :
- SfxTabDialog ( pParent, SVX_RES( RID_SVXDLG_TEXT ), pAttr ),
+ SfxTabDialog ( pParent, CUI_RES( RID_SVXDLG_TEXT ), pAttr ),
rOutAttrs ( *pAttr ),
pView ( pSdrView )
{
@@ -106,33 +107,33 @@ void __EXPORT SvxTextTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
\************************************************************************/
SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
- SfxTabPage ( pWindow, SVX_RES( RID_SVXPAGE_TEXTANIMATION ),
+ SfxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTANIMATION ),
rInAttrs ),
- aFlEffect ( this, SVX_RES(FL_EFFECT)),
- aFtEffects ( this, SVX_RES(FT_EFFECTS)),
- aLbEffect ( this, SVX_RES( LB_EFFECT ) ),
- //aCtlEffect ( this, SVX_RES( CTL_EFFECT ) ),
- aFtDirection ( this, SVX_RES(FT_DIRECTION) ),
- aBtnUp ( this, SVX_RES( BTN_UP ) ),
- aBtnLeft ( this, SVX_RES( BTN_LEFT ) ),
- aBtnRight ( this, SVX_RES( BTN_RIGHT ) ),
- aBtnDown ( this, SVX_RES( BTN_DOWN ) ),
-
- aFlProperties ( this, SVX_RES(FL_PROPERTIES)),
- aTsbStartInside ( this, SVX_RES( TSB_START_INSIDE ) ),
- aTsbStopInside ( this, SVX_RES( TSB_STOP_INSIDE ) ),
-
- aFtCount ( this, SVX_RES(FT_COUNT)),
- aTsbEndless ( this, SVX_RES( TSB_ENDLESS ) ),
- aNumFldCount ( this, SVX_RES( NUM_FLD_COUNT ) ),
-
- aFtAmount ( this, SVX_RES(FT_AMOUNT)),
- aTsbPixel ( this, SVX_RES( TSB_PIXEL ) ),
- aMtrFldAmount ( this, SVX_RES( MTR_FLD_AMOUNT ) ),
-
- aFtDelay ( this, SVX_RES(FT_DELAY)),
- aTsbAuto ( this, SVX_RES( TSB_AUTO ) ),
- aMtrFldDelay ( this, SVX_RES( MTR_FLD_DELAY ) ),
+ aFlEffect ( this, CUI_RES(FL_EFFECT)),
+ aFtEffects ( this, CUI_RES(FT_EFFECTS)),
+ aLbEffect ( this, CUI_RES( LB_EFFECT ) ),
+ //aCtlEffect ( this, CUI_RES( CTL_EFFECT ) ),
+ aFtDirection ( this, CUI_RES(FT_DIRECTION) ),
+ aBtnUp ( this, CUI_RES( BTN_UP ) ),
+ aBtnLeft ( this, CUI_RES( BTN_LEFT ) ),
+ aBtnRight ( this, CUI_RES( BTN_RIGHT ) ),
+ aBtnDown ( this, CUI_RES( BTN_DOWN ) ),
+
+ aFlProperties ( this, CUI_RES(FL_PROPERTIES)),
+ aTsbStartInside ( this, CUI_RES( TSB_START_INSIDE ) ),
+ aTsbStopInside ( this, CUI_RES( TSB_STOP_INSIDE ) ),
+
+ aFtCount ( this, CUI_RES(FT_COUNT)),
+ aTsbEndless ( this, CUI_RES( TSB_ENDLESS ) ),
+ aNumFldCount ( this, CUI_RES( NUM_FLD_COUNT ) ),
+
+ aFtAmount ( this, CUI_RES(FT_AMOUNT)),
+ aTsbPixel ( this, CUI_RES( TSB_PIXEL ) ),
+ aMtrFldAmount ( this, CUI_RES( MTR_FLD_AMOUNT ) ),
+
+ aFtDelay ( this, CUI_RES(FT_DELAY)),
+ aTsbAuto ( this, CUI_RES( TSB_AUTO ) ),
+ aMtrFldDelay ( this, CUI_RES( MTR_FLD_DELAY ) ),
rOutAttrs ( rInAttrs ),
eAniKind ( SDRTEXTANI_NONE )
diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src
index d9c211a020f5..851096104479 100644
--- a/cui/source/tabpages/textanim.src
+++ b/cui/source/tabpages/textanim.src
@@ -30,8 +30,9 @@
// pragma ----------------------------------------------------------------
#include <svtools/controldims.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "textanim.hrc"
+#include <svx/dialogs.hrc>
// direction image buttons
#define MA_HALFBUTTON_WIDTH 7
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index a4549b3b1d40..c25a06158e98 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -35,7 +35,7 @@
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <tools/shl.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <svx/svddef.hxx>
#include <svx/sdtditm.hxx>
#include <svx/sdtagitm.hxx>
@@ -46,13 +46,14 @@
#include <svx/svdmark.hxx>
#include <svx/svdview.hxx>
#include <svx/svdotext.hxx>
+#include <svx/dialogs.hrc>
#ifndef _SVX_TEXTATTR_CXX
#define _SVX_TEXTATTR_CXX
#endif
#include "textattr.hxx"
#include "textattr.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
#include <sfx2/request.hxx> //add CHINA001
#include <svx/ofaitem.hxx> //add CHINA001
@@ -102,32 +103,32 @@ static USHORT pRanges[] =
\************************************************************************/
SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
- SvxTabPage ( pWindow, SVX_RES( RID_SVXPAGE_TEXTATTR ),
+ SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTATTR ),
rInAttrs ),
- aFlText ( this, SVX_RES( FL_TEXT ) ),
- aTsbAutoGrowWidth ( this, SVX_RES( TSB_AUTOGROW_WIDTH ) ),
- aTsbAutoGrowHeight ( this, SVX_RES( TSB_AUTOGROW_HEIGHT ) ),
- aTsbFitToSize ( this, SVX_RES( TSB_FIT_TO_SIZE ) ),
- aTsbContour ( this, SVX_RES( TSB_CONTOUR ) ),
- aTsbWordWrapText( this, SVX_RES( TSB_WORDWRAP_TEXT ) ),
- aTsbAutoGrowSize( this, SVX_RES( TSB_AUTOGROW_SIZE ) ),
- aFlDistance ( this, SVX_RES( FL_DISTANCE ) ),
- aFtLeft ( this, SVX_RES( FT_LEFT ) ),
- aMtrFldLeft ( this, SVX_RES( MTR_FLD_LEFT ) ),
- aFtRight ( this, SVX_RES( FT_RIGHT ) ),
- aMtrFldRight ( this, SVX_RES( MTR_FLD_RIGHT ) ),
- aFtTop ( this, SVX_RES( FT_TOP ) ),
- aMtrFldTop ( this, SVX_RES( MTR_FLD_TOP ) ),
- aFtBottom ( this, SVX_RES( FT_BOTTOM ) ),
- aMtrFldBottom ( this, SVX_RES( MTR_FLD_BOTTOM ) ),
-
- aFlSeparator ( this, SVX_RES( FL_SEPARATOR ) ),
-
- aFlPosition ( this, SVX_RES( FL_POSITION ) ),
- aCtlPosition ( this, SVX_RES( CTL_POSITION ),
+ aFlText ( this, CUI_RES( FL_TEXT ) ),
+ aTsbAutoGrowWidth ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ),
+ aTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ),
+ aTsbFitToSize ( this, CUI_RES( TSB_FIT_TO_SIZE ) ),
+ aTsbContour ( this, CUI_RES( TSB_CONTOUR ) ),
+ aTsbWordWrapText( this, CUI_RES( TSB_WORDWRAP_TEXT ) ),
+ aTsbAutoGrowSize( this, CUI_RES( TSB_AUTOGROW_SIZE ) ),
+ aFlDistance ( this, CUI_RES( FL_DISTANCE ) ),
+ aFtLeft ( this, CUI_RES( FT_LEFT ) ),
+ aMtrFldLeft ( this, CUI_RES( MTR_FLD_LEFT ) ),
+ aFtRight ( this, CUI_RES( FT_RIGHT ) ),
+ aMtrFldRight ( this, CUI_RES( MTR_FLD_RIGHT ) ),
+ aFtTop ( this, CUI_RES( FT_TOP ) ),
+ aMtrFldTop ( this, CUI_RES( MTR_FLD_TOP ) ),
+ aFtBottom ( this, CUI_RES( FT_BOTTOM ) ),
+ aMtrFldBottom ( this, CUI_RES( MTR_FLD_BOTTOM ) ),
+
+ aFlSeparator ( this, CUI_RES( FL_SEPARATOR ) ),
+
+ aFlPosition ( this, CUI_RES( FL_POSITION ) ),
+ aCtlPosition ( this, CUI_RES( CTL_POSITION ),
RP_MM, 240, 100 ),
- aTsbFullWidth ( this, SVX_RES( TSB_FULL_WIDTH ) ),
+ aTsbFullWidth ( this, CUI_RES( TSB_FULL_WIDTH ) ),
rOutAttrs ( rInAttrs )
{
diff --git a/cui/source/tabpages/textattr.src b/cui/source/tabpages/textattr.src
index d0d22044bb51..c5636d15cbfa 100644
--- a/cui/source/tabpages/textattr.src
+++ b/cui/source/tabpages/textattr.src
@@ -29,10 +29,10 @@
************************************************************************/
// include ---------------------------------------------------------------
#include <svtools/controldims.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "textattr.hrc"
#include "helpid.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_TEXTATTR --------------------------------------------------
TabPage RID_SVXPAGE_TEXTATTR
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 82992149715d..ddeb02a20c1d 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -36,6 +36,7 @@
#include <tools/urlobj.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_TPAREA_CXX
@@ -45,7 +46,7 @@
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabarea.hrc"
//#include "dlgname.hrc"
#include <svx/xflbckit.hxx>
@@ -55,7 +56,7 @@
#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
#include "dlgname.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
#include <svl/intitem.hxx> //add CHINA001
#include <sfx2/request.hxx>//add CHINA001
@@ -254,35 +255,35 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
}
SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs)
-: SvxTabPage ( pParent, SVX_RES( RID_SVXPAGE_TRANSPARENCE ), rInAttrs),
+: SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_TRANSPARENCE ), rInAttrs),
rOutAttrs ( rInAttrs ),
nPageType(0),
nDlgType(0),
- aFlProp ( this, SVX_RES( FL_PROP ) ),
- aRbtTransOff ( this, SVX_RES( RBT_TRANS_OFF ) ),
- aRbtTransLinear ( this, SVX_RES( RBT_TRANS_LINEAR ) ),
- aRbtTransGradient ( this, SVX_RES( RBT_TRANS_GRADIENT ) ),
-
- aMtrTransparent ( this, SVX_RES( MTR_TRANSPARENT ) ),
-
- aFtTrgrType ( this, SVX_RES( FT_TRGR_TYPE ) ),
- aLbTrgrGradientType ( this, SVX_RES( LB_TRGR_GRADIENT_TYPES ) ),
- aFtTrgrCenterX ( this, SVX_RES( FT_TRGR_CENTER_X ) ),
- aMtrTrgrCenterX ( this, SVX_RES( MTR_TRGR_CENTER_X ) ),
- aFtTrgrCenterY ( this, SVX_RES( FT_TRGR_CENTER_Y ) ),
- aMtrTrgrCenterY ( this, SVX_RES( MTR_TRGR_CENTER_Y ) ),
- aFtTrgrAngle ( this, SVX_RES( FT_TRGR_ANGLE ) ),
- aMtrTrgrAngle ( this, SVX_RES( MTR_TRGR_ANGLE ) ),
- aFtTrgrBorder ( this, SVX_RES( FT_TRGR_BORDER ) ),
- aMtrTrgrBorder ( this, SVX_RES( MTR_TRGR_BORDER ) ),
- aFtTrgrStartValue ( this, SVX_RES( FT_TRGR_START_VALUE ) ),
- aMtrTrgrStartValue ( this, SVX_RES( MTR_TRGR_START_VALUE ) ),
- aFtTrgrEndValue ( this, SVX_RES( FT_TRGR_END_VALUE ) ),
- aMtrTrgrEndValue ( this, SVX_RES( MTR_TRGR_END_VALUE ) ),
-
- aCtlBitmapPreview ( this, SVX_RES( CTL_BITMAP_PREVIEW ) ),
- aCtlXRectPreview ( this, SVX_RES( CTL_TRANS_PREVIEW ) ),
+ aFlProp ( this, CUI_RES( FL_PROP ) ),
+ aRbtTransOff ( this, CUI_RES( RBT_TRANS_OFF ) ),
+ aRbtTransLinear ( this, CUI_RES( RBT_TRANS_LINEAR ) ),
+ aRbtTransGradient ( this, CUI_RES( RBT_TRANS_GRADIENT ) ),
+
+ aMtrTransparent ( this, CUI_RES( MTR_TRANSPARENT ) ),
+
+ aFtTrgrType ( this, CUI_RES( FT_TRGR_TYPE ) ),
+ aLbTrgrGradientType ( this, CUI_RES( LB_TRGR_GRADIENT_TYPES ) ),
+ aFtTrgrCenterX ( this, CUI_RES( FT_TRGR_CENTER_X ) ),
+ aMtrTrgrCenterX ( this, CUI_RES( MTR_TRGR_CENTER_X ) ),
+ aFtTrgrCenterY ( this, CUI_RES( FT_TRGR_CENTER_Y ) ),
+ aMtrTrgrCenterY ( this, CUI_RES( MTR_TRGR_CENTER_Y ) ),
+ aFtTrgrAngle ( this, CUI_RES( FT_TRGR_ANGLE ) ),
+ aMtrTrgrAngle ( this, CUI_RES( MTR_TRGR_ANGLE ) ),
+ aFtTrgrBorder ( this, CUI_RES( FT_TRGR_BORDER ) ),
+ aMtrTrgrBorder ( this, CUI_RES( MTR_TRGR_BORDER ) ),
+ aFtTrgrStartValue ( this, CUI_RES( FT_TRGR_START_VALUE ) ),
+ aMtrTrgrStartValue ( this, CUI_RES( MTR_TRGR_START_VALUE ) ),
+ aFtTrgrEndValue ( this, CUI_RES( FT_TRGR_END_VALUE ) ),
+ aMtrTrgrEndValue ( this, CUI_RES( MTR_TRGR_END_VALUE ) ),
+
+ aCtlBitmapPreview ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ),
+ aCtlXRectPreview ( this, CUI_RES( CTL_TRANS_PREVIEW ) ),
bBitmap ( FALSE ),
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
aXFillAttr ( pXPool ),
@@ -619,45 +620,45 @@ void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SvxTabPage ( pParent, SVX_RES( RID_SVXPAGE_AREA ), rInAttrs ),
-
- aFlProp ( this, SVX_RES( FL_PROP ) ),
- aTypeLB ( this, SVX_RES( LB_AREA_TYPE ) ),
-
- aLbColor ( this, SVX_RES( LB_COLOR ) ),
- aLbGradient ( this, SVX_RES( LB_GRADIENT ) ),
- aLbHatching ( this, SVX_RES( LB_HATCHING ) ),
- aLbBitmap ( this, SVX_RES( LB_BITMAP ) ),
- aCtlBitmapPreview ( this, SVX_RES( CTL_BITMAP_PREVIEW ) ),
-
- aTsbStepCount ( this, SVX_RES( TSB_STEPCOUNT ) ),
- aFlStepCount ( this, SVX_RES( FL_STEPCOUNT ) ),
- aNumFldStepCount ( this, SVX_RES( NUM_FLD_STEPCOUNT ) ),
-
- aCbxHatchBckgrd ( this, SVX_RES( CB_HATCHBCKGRD ) ),
- aLbHatchBckgrdColor ( this, SVX_RES( LB_HATCHBCKGRDCOLOR ) ),
-
- aFlSize ( this, SVX_RES( FL_SIZE ) ),
- aTsbOriginal ( this, SVX_RES( TSB_ORIGINAL ) ),
- aTsbScale ( this, SVX_RES( TSB_SCALE ) ),
- aFtXSize ( this, SVX_RES( FT_X_SIZE ) ),
- aMtrFldXSize ( this, SVX_RES( MTR_FLD_X_SIZE ) ),
- aFtYSize ( this, SVX_RES( FT_Y_SIZE ) ),
- aMtrFldYSize ( this, SVX_RES( MTR_FLD_Y_SIZE ) ),
- aFlPosition ( this, SVX_RES( FL_POSITION ) ),
- aCtlPosition ( this, SVX_RES( CTL_POSITION ), RP_RM, 110, 80, CS_RECT ),
- aFtXOffset ( this, SVX_RES( FT_X_OFFSET ) ),
- aMtrFldXOffset ( this, SVX_RES( MTR_FLD_X_OFFSET ) ),
- aFtYOffset ( this, SVX_RES( FT_Y_OFFSET ) ),
- aMtrFldYOffset ( this, SVX_RES( MTR_FLD_Y_OFFSET ) ),
- aTsbTile ( this, SVX_RES( TSB_TILE ) ),
- aTsbStretch ( this, SVX_RES( TSB_STRETCH ) ),
- aFlOffset ( this, SVX_RES( FL_OFFSET ) ),
- aRbtRow ( this, SVX_RES( RBT_ROW ) ),
- aRbtColumn ( this, SVX_RES( RBT_COLUMN ) ),
- aMtrFldOffset ( this, SVX_RES( MTR_FLD_OFFSET ) ),
-
- aCtlXRectPreview ( this, SVX_RES( CTL_COLOR_PREVIEW ) ),
+ SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_AREA ), rInAttrs ),
+
+ aFlProp ( this, CUI_RES( FL_PROP ) ),
+ aTypeLB ( this, CUI_RES( LB_AREA_TYPE ) ),
+
+ aLbColor ( this, CUI_RES( LB_COLOR ) ),
+ aLbGradient ( this, CUI_RES( LB_GRADIENT ) ),
+ aLbHatching ( this, CUI_RES( LB_HATCHING ) ),
+ aLbBitmap ( this, CUI_RES( LB_BITMAP ) ),
+ aCtlBitmapPreview ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ),
+
+ aTsbStepCount ( this, CUI_RES( TSB_STEPCOUNT ) ),
+ aFlStepCount ( this, CUI_RES( FL_STEPCOUNT ) ),
+ aNumFldStepCount ( this, CUI_RES( NUM_FLD_STEPCOUNT ) ),
+
+ aCbxHatchBckgrd ( this, CUI_RES( CB_HATCHBCKGRD ) ),
+ aLbHatchBckgrdColor ( this, CUI_RES( LB_HATCHBCKGRDCOLOR ) ),
+
+ aFlSize ( this, CUI_RES( FL_SIZE ) ),
+ aTsbOriginal ( this, CUI_RES( TSB_ORIGINAL ) ),
+ aTsbScale ( this, CUI_RES( TSB_SCALE ) ),
+ aFtXSize ( this, CUI_RES( FT_X_SIZE ) ),
+ aMtrFldXSize ( this, CUI_RES( MTR_FLD_X_SIZE ) ),
+ aFtYSize ( this, CUI_RES( FT_Y_SIZE ) ),
+ aMtrFldYSize ( this, CUI_RES( MTR_FLD_Y_SIZE ) ),
+ aFlPosition ( this, CUI_RES( FL_POSITION ) ),
+ aCtlPosition ( this, CUI_RES( CTL_POSITION ), RP_RM, 110, 80, CS_RECT ),
+ aFtXOffset ( this, CUI_RES( FT_X_OFFSET ) ),
+ aMtrFldXOffset ( this, CUI_RES( MTR_FLD_X_OFFSET ) ),
+ aFtYOffset ( this, CUI_RES( FT_Y_OFFSET ) ),
+ aMtrFldYOffset ( this, CUI_RES( MTR_FLD_Y_OFFSET ) ),
+ aTsbTile ( this, CUI_RES( TSB_TILE ) ),
+ aTsbStretch ( this, CUI_RES( TSB_STRETCH ) ),
+ aFlOffset ( this, CUI_RES( FL_OFFSET ) ),
+ aRbtRow ( this, CUI_RES( RBT_ROW ) ),
+ aRbtColumn ( this, CUI_RES( RBT_COLUMN ) ),
+ aMtrFldOffset ( this, CUI_RES( MTR_FLD_OFFSET ) ),
+
+ aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ),
rOutAttrs ( rInAttrs ),
@@ -1857,7 +1858,7 @@ IMPL_LINK( SvxAreaTabPage, ClickColorHdl_Impl, void *, EMPTYARG )
aLbHatchBckgrdColor.Hide();
// Text der Tabelle setzen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pColorTab->GetPath() );
aURL.Append( pColorTab->GetName() );
@@ -1947,7 +1948,7 @@ IMPL_LINK( SvxAreaTabPage, ClickGradientHdl_Impl, void *, EMPTYARG )
aLbHatchBckgrdColor.Hide();
// Text der Tabelle setzen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pGradientList->GetPath() );
aURL.Append( pGradientList->GetName() );
@@ -2042,7 +2043,7 @@ IMPL_LINK( SvxAreaTabPage, ClickHatchingHdl_Impl, void *, EMPTYARG )
aLbHatchBckgrdColor.Enable();
// Text der Tabelle setzen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pHatchingList->GetPath() );
aURL.Append( pHatchingList->GetName() );
@@ -2210,7 +2211,7 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG )
aFlOffset.Show();
// Text der Tabelle setzen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pBitmapList->GetPath() );
aURL.Append( pBitmapList->GetName() );
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 6ced6dd266f8..f34afb49a823 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -54,11 +54,13 @@
#include <sfx2/filedlghelper.hxx>
#include <unotools/localfilehelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <svx/dialmgr.hxx>
#include <vcl/bmpacc.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_TPBITMAP_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
@@ -70,7 +72,7 @@
#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
//#include "dlgname.hrc"
#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "svx/opengrf.hxx"
#define DLGWIN this->GetParent()->GetParent()
@@ -87,26 +89,26 @@ SvxBitmapTabPage::SvxBitmapTabPage
const SfxItemSet& rInAttrs
) :
- SvxTabPage ( pParent, SVX_RES( RID_SVXPAGE_BITMAP ), rInAttrs ),
+ SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_BITMAP ), rInAttrs ),
- aCtlPixel ( this, SVX_RES( CTL_PIXEL ) ),
- aFtPixelEdit ( this, SVX_RES( FT_PIXEL_EDIT ) ),
- aFtColor ( this, SVX_RES( FT_COLOR ) ),
- aLbColor ( this, SVX_RES( LB_COLOR ) ),
- aFtBackgroundColor ( this, SVX_RES( FT_BACKGROUND_COLOR ) ),
- aLbBackgroundColor ( this, SVX_RES( LB_BACKGROUND_COLOR ) ),
+ aCtlPixel ( this, CUI_RES( CTL_PIXEL ) ),
+ aFtPixelEdit ( this, CUI_RES( FT_PIXEL_EDIT ) ),
+ aFtColor ( this, CUI_RES( FT_COLOR ) ),
+ aLbColor ( this, CUI_RES( LB_COLOR ) ),
+ aFtBackgroundColor ( this, CUI_RES( FT_BACKGROUND_COLOR ) ),
+ aLbBackgroundColor ( this, CUI_RES( LB_BACKGROUND_COLOR ) ),
// This fix text is used only to provide the name for the following
// bitmap list box. The fixed text is not displayed.
- aLbBitmapsHidden ( this, SVX_RES( FT_BITMAPS_HIDDEN ) ),
- aLbBitmaps ( this, SVX_RES( LB_BITMAPS ) ),
- aFlProp ( this, SVX_RES( FL_PROP ) ),
- aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ),
- aBtnAdd ( this, SVX_RES( BTN_ADD ) ),
- aBtnModify ( this, SVX_RES( BTN_MODIFY ) ),
- aBtnImport ( this, SVX_RES( BTN_IMPORT ) ),
- aBtnDelete ( this, SVX_RES( BTN_DELETE ) ),
- aBtnLoad ( this, SVX_RES( BTN_LOAD ) ),
- aBtnSave ( this, SVX_RES( BTN_SAVE ) ),
+ aLbBitmapsHidden ( this, CUI_RES( FT_BITMAPS_HIDDEN ) ),
+ aLbBitmaps ( this, CUI_RES( LB_BITMAPS ) ),
+ aFlProp ( this, CUI_RES( FL_PROP ) ),
+ aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ),
+ aBtnAdd ( this, CUI_RES( BTN_ADD ) ),
+ aBtnModify ( this, CUI_RES( BTN_MODIFY ) ),
+ aBtnImport ( this, CUI_RES( BTN_IMPORT ) ),
+ aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
+ aBtnLoad ( this, CUI_RES( BTN_LOAD ) ),
+ aBtnSave ( this, CUI_RES( BTN_SAVE ) ),
aBitmapCtl ( this, aCtlPreview.GetSizePixel() ),
rOutAttrs ( rInAttrs ),
@@ -120,8 +122,8 @@ SvxBitmapTabPage::SvxBitmapTabPage
aXFillAttr ( pXPool ),
rXFSet ( aXFillAttr.GetItemSet() )
{
- aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
FreeResource();
// diese Page braucht ExchangeSupport
@@ -213,7 +215,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& )
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pBitmapList->GetPath() );
aURL.Append( pBitmapList->GetName() );
@@ -549,17 +551,13 @@ long SvxBitmapTabPage::CheckChanges_Impl()
if( bBmpChanged )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- //CHINA001 SvxMessDialog aMessDlg( DLGWIN,
- //CHINA001 String( SVX_RES( RID_SVXSTR_BITMAP, rMgr ) ),
- //CHINA001 String( SVX_RES( RID_SVXSTR_ASK_CHANGE_BITMAP, rMgr ) ),
- //CHINA001 &aWarningBoxImage );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
- String( ResId( RID_SVXSTR_BITMAP, rMgr ) ),
- String( ResId( RID_SVXSTR_ASK_CHANGE_BITMAP, rMgr ) ),
+ String( SVX_RES( RID_SVXSTR_BITMAP ) ),
+ String( CUI_RES( RID_SVXSTR_ASK_CHANGE_BITMAP ) ),
&aWarningBoxImage );
DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1,
@@ -602,9 +600,9 @@ long SvxBitmapTabPage::CheckChanges_Impl()
IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
{
- ResMgr& rMgr = DIALOG_MGR();
- String aNewName( ResId( RID_SVXSTR_BITMAP, rMgr ) );
- String aDesc( ResId( RID_SVXSTR_DESC_NEW_BITMAP, rMgr ) );
+ ResMgr& rMgr = CUI_MGR();
+ String aNewName( SVX_RES( RID_SVXSTR_BITMAP ) );
+ String aDesc( CUI_RES( RID_SVXSTR_DESC_NEW_BITMAP ) );
String aName;
long nCount = pBitmapList->Count();
@@ -623,10 +621,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
bDifferent = FALSE;
}
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
WarningBox* pWarnBox = NULL;
USHORT nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
@@ -733,7 +730,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
SvxOpenGraphicDialog aDlg( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Import" ) ) );
aDlg.EnableLink(sal_False);
@@ -754,10 +751,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
// convert file URL to UI name
String aName;
INetURLObject aURL( aDlg.GetPath() );
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aURL.GetName().GetToken( 0, '.' ), aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, String(aURL.GetName()).GetToken( 0, '.' ), aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, String(aURL.GetName()).GetToken( 0, '.' ), aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
@@ -841,16 +837,15 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ResMgr& rMgr = DIALOG_MGR();
- String aNewName( ResId( RID_SVXSTR_BITMAP, rMgr ) );
+ ResMgr& rMgr = CUI_MGR();
+ String aNewName( SVX_RES( RID_SVXSTR_BITMAP ) );
String aDesc( ResId( RID_SVXSTR_DESC_NEW_BITMAP, rMgr ) );
String aName( pBitmapList->GetBitmap( nPos )->GetName() );
String aOldName = aName;
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
long nCount = pBitmapList->Count();
@@ -913,8 +908,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//! SVX_RES( RID_SVXSTR_DEL_BITMAP ),
- String( SVX_RES( RID_SVXSTR_ASK_DEL_BITMAP ) ) );
+ String( CUI_RES( RID_SVXSTR_ASK_DEL_BITMAP ) ) );
if( aQueryBox.Execute() == RET_YES )
{
@@ -946,7 +940,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxBitmapTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
{
USHORT nReturn = RET_YES;
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
if ( *pnBitmapListState & CT_MODIFIED )
{
@@ -1077,7 +1071,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
{
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
if ( aURL.getBase().getLength() > 18 )
@@ -1096,7 +1090,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
else
{
ErrorBox( DLGWIN, WinBits( WB_OK ),
- String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+ String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
}
}
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 86c1b5ab7565..616dba0169e8 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -44,7 +44,7 @@
#define _SVX_TPCOLOR_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
@@ -55,8 +55,10 @@
#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
//#include "dlgname.hrc"
#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <cuitabline.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
#define DLGWIN GetParentDialog( this )
@@ -85,35 +87,35 @@ SvxColorTabPage::SvxColorTabPage
const SfxItemSet& rInAttrs
) :
- SfxTabPage ( pParent, SVX_RES( RID_SVXPAGE_COLOR ), rInAttrs ),
-
- aFlProp ( this, SVX_RES( FL_PROP ) ),
- aFtName ( this, SVX_RES( FT_NAME ) ),
- aEdtName ( this, SVX_RES( EDT_NAME ) ),
- aFtColor ( this, SVX_RES( FT_COLOR ) ),
- aLbColor ( this, SVX_RES( LB_COLOR ) ),
-
- aTableNameFT ( this, SVX_RES( FT_TABLE_NAME ) ),
- aValSetColorTable ( this, SVX_RES( CTL_COLORTABLE ) ),
-
- aCtlPreviewOld ( this, SVX_RES( CTL_PREVIEW_OLD ) ),
- aCtlPreviewNew ( this, SVX_RES( CTL_PREVIEW_NEW ) ),
-
- aLbColorModel ( this, SVX_RES( LB_COLORMODEL ) ),
- aFtColorModel1 ( this, SVX_RES( FT_1 ) ),
- aMtrFldColorModel1 ( this, SVX_RES( MTR_FLD_1 ) ),
- aFtColorModel2 ( this, SVX_RES( FT_2 ) ),
- aMtrFldColorModel2 ( this, SVX_RES( MTR_FLD_2 ) ),
- aFtColorModel3 ( this, SVX_RES( FT_3 ) ),
- aMtrFldColorModel3 ( this, SVX_RES( MTR_FLD_3 ) ),
- aFtColorModel4 ( this, SVX_RES( FT_4 ) ),
- aMtrFldColorModel4 ( this, SVX_RES( MTR_FLD_4 ) ),
- aBtnAdd ( this, SVX_RES( BTN_ADD ) ),
- aBtnModify ( this, SVX_RES( BTN_MODIFY ) ),
- aBtnWorkOn ( this, SVX_RES( BTN_WORK_ON ) ),
- aBtnDelete ( this, SVX_RES( BTN_DELETE ) ),
- aBtnLoad ( this, SVX_RES( BTN_LOAD ) ),
- aBtnSave ( this, SVX_RES( BTN_SAVE ) ),
+ SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_COLOR ), rInAttrs ),
+
+ aFlProp ( this, CUI_RES( FL_PROP ) ),
+ aFtName ( this, CUI_RES( FT_NAME ) ),
+ aEdtName ( this, CUI_RES( EDT_NAME ) ),
+ aFtColor ( this, CUI_RES( FT_COLOR ) ),
+ aLbColor ( this, CUI_RES( LB_COLOR ) ),
+
+ aTableNameFT ( this, CUI_RES( FT_TABLE_NAME ) ),
+ aValSetColorTable ( this, CUI_RES( CTL_COLORTABLE ) ),
+
+ aCtlPreviewOld ( this, CUI_RES( CTL_PREVIEW_OLD ) ),
+ aCtlPreviewNew ( this, CUI_RES( CTL_PREVIEW_NEW ) ),
+
+ aLbColorModel ( this, CUI_RES( LB_COLORMODEL ) ),
+ aFtColorModel1 ( this, CUI_RES( FT_1 ) ),
+ aMtrFldColorModel1 ( this, CUI_RES( MTR_FLD_1 ) ),
+ aFtColorModel2 ( this, CUI_RES( FT_2 ) ),
+ aMtrFldColorModel2 ( this, CUI_RES( MTR_FLD_2 ) ),
+ aFtColorModel3 ( this, CUI_RES( FT_3 ) ),
+ aMtrFldColorModel3 ( this, CUI_RES( MTR_FLD_3 ) ),
+ aFtColorModel4 ( this, CUI_RES( FT_4 ) ),
+ aMtrFldColorModel4 ( this, CUI_RES( MTR_FLD_4 ) ),
+ aBtnAdd ( this, CUI_RES( BTN_ADD ) ),
+ aBtnModify ( this, CUI_RES( BTN_MODIFY ) ),
+ aBtnWorkOn ( this, CUI_RES( BTN_WORK_ON ) ),
+ aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
+ aBtnLoad ( this, CUI_RES( BTN_LOAD ) ),
+ aBtnSave ( this, CUI_RES( BTN_SAVE ) ),
rOutAttrs ( rInAttrs ),
pColorTab( NULL ),
@@ -129,8 +131,8 @@ SvxColorTabPage::SvxColorTabPage
eCM ( CM_RGB )
{
- aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
FreeResource();
@@ -229,7 +231,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pColorTab->GetPath() );
aURL.Append( pColorTab->GetName() );
@@ -301,16 +303,12 @@ long SvxColorTabPage::CheckChanges_Impl()
ColorToPercent_Impl( aTmpColor.GetBlue() ) != ColorToPercent_Impl( aColor.GetBlue() ) ||
aString != aEdtName.GetText() )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- //CHINA001 SvxMessDialog aMessDlg( DLGWIN,
- //CHINA001 String( SVX_RES( RID_SVXSTR_COLOR, pMgr ) ),
- //CHINA001 String( ResId( RID_SVXSTR_ASK_CHANGE_COLOR, pMgr ) ),
- //CHINA001 &aWarningBoxImage );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
- String( ResId( RID_SVXSTR_COLOR, rMgr ) ),
+ SVX_RESSTR( RID_SVXSTR_COLOR ),
String( ResId( RID_SVXSTR_ASK_CHANGE_COLOR, rMgr ) ),
&aWarningBoxImage );
DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
@@ -476,7 +474,7 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
pWindow = pWindow->GetParent();
}
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
String aDesc( ResId( RID_SVXSTR_DESC_COLOR, rMgr ) );
String aName( aEdtName.GetText() );
XColorEntry* pEntry;
@@ -496,10 +494,9 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
aWarningBox.Execute();
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
BOOL bLoop = TRUE;
@@ -564,7 +561,7 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
String aDesc( ResId( RID_SVXSTR_DESC_COLOR, rMgr ) );
String aName( aEdtName.GetText() );
long nCount = pColorTab->Count();
@@ -583,10 +580,9 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
aWarningBox.Execute();
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
BOOL bLoop = TRUE;
@@ -687,7 +683,7 @@ IMPL_LINK( SvxColorTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
- String( SVX_RES( RID_SVXSTR_ASK_DEL_COLOR ) ) );
+ String( CUI_RES( RID_SVXSTR_ASK_DEL_COLOR ) ) );
if( aQueryBox.Execute() == RET_YES )
{
@@ -739,7 +735,7 @@ IMPL_LINK( SvxColorTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )