diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-02-01 09:33:19 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-14 13:20:14 +0000 |
| commit | 77fd448d0990adc79406e13a127b2b1834984b71 (patch) | |
| tree | 3b8d1b23e7029dedcb97eb1d38ba83c91dfdac51 /unotools | |
| parent | 5502501a8848c771aff5a77448a02451e22398a4 (diff) | |
Removed several useless macros: UNISTRING, USTR, USTR_ASCII, ASCII_STR, ASCII_STRING, CONST_ASCII, ASCSTR, ASCII, DEFINE_CONST_UNICODE, DEFINE_CONST_OUSTRING
Change-Id: I96d690bf9f9b319e9eeafcf218ec5ce87f21215f
Reviewed-on: https://gerrit.libreoffice.org/1954
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/defaultoptions.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/config/viewoptions.cxx | 28 |
2 files changed, 12 insertions, 20 deletions
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx index 227e858cf32f..418854443ef9 100644 --- a/unotools/source/config/defaultoptions.cxx +++ b/unotools/source/config/defaultoptions.cxx @@ -40,8 +40,6 @@ using ::rtl::OUString; // define ---------------------------------------------------------------- -#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) - #define DEFAULTPATH__ADDIN 0 #define DEFAULTPATH__AUTOCORRECT 1 #define DEFAULTPATH__AUTOTEXT 2 @@ -219,7 +217,7 @@ String SvtDefaultOptions_Impl::GetDefaultPath( sal_uInt16 nId ) const // ----------------------------------------------------------------------- -SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( ASCII_STR("Office.Common/Path/Default") ) +SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( "Office.Common/Path/Default" ) { Sequence< OUString > aNames = GetDefaultPropertyNames(); Sequence< Any > aValues = GetProperties( aNames ); diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 461f6fcbb338..27e864c9fdb8 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -32,23 +32,17 @@ #include <itemholder1.hxx> -#ifdef CONST_ASCII - #error "Who define CONST_ASCII before! I use it to create const ascii strings ..." -#else - #define CONST_ASCII(SASCIIVALUE) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SASCIIVALUE)) -#endif - -#define PACKAGE_VIEWS CONST_ASCII("org.openoffice.Office.Views") - -#define LIST_DIALOGS CONST_ASCII("Dialogs" ) -#define LIST_TABDIALOGS CONST_ASCII("TabDialogs") -#define LIST_TABPAGES CONST_ASCII("TabPages" ) -#define LIST_WINDOWS CONST_ASCII("Windows" ) - -#define PROPERTY_WINDOWSTATE CONST_ASCII("WindowState") -#define PROPERTY_PAGEID CONST_ASCII("PageID" ) -#define PROPERTY_VISIBLE CONST_ASCII("Visible" ) -#define PROPERTY_USERDATA CONST_ASCII("UserData" ) +#define PACKAGE_VIEWS "org.openoffice.Office.Views" + +#define LIST_DIALOGS "Dialogs" +#define LIST_TABDIALOGS "TabDialogs" +#define LIST_TABPAGES "TabPages" +#define LIST_WINDOWS "Windows" + +#define PROPERTY_WINDOWSTATE "WindowState" +#define PROPERTY_PAGEID "PageID" +#define PROPERTY_VISIBLE "Visible" +#define PROPERTY_USERDATA "UserData" #define DEFAULT_WINDOWSTATE ::rtl::OUString() #define DEFAULT_USERDATA css::uno::Sequence< css::beans::NamedValue >() |