summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/inc/numfmt.hxx3
-rw-r--r--cui/source/tabpages/numfmt.cxx9
-rw-r--r--sc/source/ui/inc/tpsort.hxx8
-rw-r--r--sfx2/source/dialog/tabdlg.cxx6
-rw-r--r--svx/inc/svx/srchdlg.hxx3
-rw-r--r--svx/source/dialog/srchdlg.cxx5
6 files changed, 11 insertions, 23 deletions
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 9b5abb4a6709..2d20de4a60ee 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -71,7 +71,6 @@ public:
// -----------------------------------------------------------------------
#include <sfx2/layout.hxx>
-#define LocalizedString String
class SvxNumberFormatTabPage : public SfxTabPage
{
@@ -142,7 +141,7 @@ private:
long nCurFormatHeight;
long nStdFormatY;
long nStdFormatHeight;
- LocalizedString sAutomaticEntry;
+ String sAutomaticEntry;
Window* pLastActivWindow;
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 2adfd5c12867..8c9ec83c2498 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -215,9 +215,6 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
#define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl )
-#define CUI_RES_PLAIN CUI_RES
-#define THIS_CUI_RES CUI_RES
-
SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent,
const SfxItemSet& rCoreAttrs )
@@ -231,7 +228,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent,
aFtLanguage ( this, CUI_RES( FT_LANGUAGE ) ),
aLbLanguage ( this, CUI_RES( LB_LANGUAGE ), sal_False ),
aCbSourceFormat ( this, CUI_RES( CB_SOURCEFORMAT ) ),
- aWndPreview ( this, CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
+ aWndPreview ( this, CUI_RES( WND_NUMBER_PREVIEW ) ),
aFlOptions ( this, CUI_RES( FL_OPTIONS ) ),
aFtDecimals ( this, CUI_RES( FT_DECIMALS ) ),
aEdDecimals ( this, CUI_RES( ED_DECIMALS ) ),
@@ -252,7 +249,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent,
pNumFmtShell ( NULL ),
nInitFormat ( ULONG_MAX ),
- sAutomaticEntry ( THIS_CUI_RES( STR_AUTO_ENTRY)),
+ sAutomaticEntry ( CUI_RES( STR_AUTO_ENTRY)),
pLastActivWindow( NULL )
{
Init_Impl();
@@ -269,7 +266,7 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage()
void SvxNumberFormatTabPage::Init_Impl()
{
- ImageList aIconList( CUI_RES_PLAIN ( IL_ICON ) );
+ ImageList aIconList( CUI_RES ( IL_ICON ) );
bNumItemFlag=sal_True;
bOneAreaFlag=sal_False;
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index a94dda50311f..059a5f4f7da5 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -130,8 +130,6 @@ class ScRangeData;
class CollatorRessource;
class CollatorWrapper;
-#define LocalizedString String
-
class ScTabPageSortOptions : public SfxTabPage
{
public:
@@ -180,9 +178,9 @@ private:
// FixedText aFtAreaLabel;
// FixedInfo aFtArea;
- LocalizedString aStrRowLabel;
- LocalizedString aStrColLabel;
- LocalizedString aStrUndefined;
+ String aStrRowLabel;
+ String aStrColLabel;
+ String aStrUndefined;
String aStrAreaLabel;
const sal_uInt16 nWhichSort;
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index c2ec5d9d5c5c..0c9511fd7380 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1192,8 +1192,6 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
// -----------------------------------------------------------------------
-#define tabControlWindow pTabCtrl
-
IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
/* [Description]
@@ -1230,10 +1228,10 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
}
if ( pTmpSet && !pDataObject->bOnDemand )
- pTabPage = (pDataObject->fnCreatePage)( tabControlWindow, *pTmpSet );
+ pTabPage = (pDataObject->fnCreatePage)( pTabCtrl, *pTmpSet );
else
pTabPage = (pDataObject->fnCreatePage)
- ( tabControlWindow, *CreateInputItemSet( nId ) );
+ ( pTabCtrl, *CreateInputItemSet( nId ) );
DBG_ASSERT( NULL == pDataObject->pTabPage, "create TabPage more than once" );
pDataObject->pTabPage = pTabPage;
diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index 79e848df26c9..b7f19a88962b 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -101,7 +101,6 @@ public:
// class SvxSearchDialogWrapper ------------------------------------------
#include <sfx2/layout.hxx>
-#define LocalizedString String
class SvxSearchDialog;
class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow
@@ -227,7 +226,7 @@ private:
sal_uIntPtr nModifyFlag;
String aStylesStr;
String aLayoutStr;
- LocalizedString aCalcStr;
+ String aCalcStr;
SvStringsDtor aSearchStrings;
SvStringsDtor aReplaceStrings;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 023da7f60300..1d05b81b6517 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -275,9 +275,6 @@ void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
SrchAttrItemList::Remove( nPos, nLen );
}
-#define SVX_RES_PLAIN SVX_RES
-#define THIS_SVX_RES SVX_RES
-
#undef INI_LIST
#define INI_LIST() \
aSearchText ( this, SVX_RES( FT_SEARCH ) ), \
@@ -332,7 +329,7 @@ void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
bReadOnly ( sal_False ), \
bConstruct ( sal_True ), \
nModifyFlag ( 0 ), \
- aCalcStr ( THIS_SVX_RES( STR_WORDCALC ) ), \
+ aCalcStr ( SVX_RES( STR_WORDCALC ) ), \
pImpl ( NULL ), \
pSearchList ( NULL ), \
pReplaceList ( new SearchAttrItemList ), \
generated by cgit (git 2.34.1) at 2025-01-16 03:45:50 +0000