diff options
| author | Felix Zhang <fezhang@suse.com> | 2011-11-15 16:57:53 +0800 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-11-15 14:39:55 +0100 |
| commit | d52f57837e302a9ef483e042b58da8b54d266597 (patch) | |
| tree | 032a95dfe8f7798bef9d0715b4b4bbba1c66c788 /svx | |
| parent | d11a82acfd1f529eb399780a1ec2d7a8edb2a40d (diff) | |
remove obsolete layout macros
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/srchdlg.hxx | 3 | ||||
| -rw-r--r-- | svx/source/dialog/srchdlg.cxx | 5 |
2 files changed, 2 insertions, 6 deletions
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 ), \ |