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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/source/dispatch/oxt_handler.cxx | 6 | ||||
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index b8885ca2d8fc..52ff88e6f165 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -34,8 +34,6 @@ namespace framework{ -#define UNISTRING(s) rtl::OUString(s) - //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** @@ -141,7 +139,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL, // SAFE { ResetableGuard aLock( m_aLock ); - rtl::OUString sServiceName = UNISTRING( "com.sun.star.deployment.ui.PackageManagerDialog" ); + rtl::OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog"; css::uno::Sequence< css::uno::Any > lParams(1); lParams[0] <<= aURL.Main; @@ -205,7 +203,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& ::rtl::OUString sURL = aDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString() ); long nLength = sURL.getLength(); - if ( ( nLength > 4 ) && sURL.matchIgnoreAsciiCase( UNISTRING(".oxt"), nLength-4 ) ) + if ( ( nLength > 4 ) && sURL.matchIgnoreAsciiCase( ".oxt", nLength-4 ) ) { // "IsSoundFile" idffer between different "wav" and "au" file versions ... // couldn't return this information ... because: He use the OS to detect it! diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 5db956ddcd22..6bbdb003c06f 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -51,13 +51,11 @@ #define STRPOS_NOTFOUND (sal_Int32)-1 -#define ASCII_STR( val ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( val )) - #define SEARCHPATH_DELIMITER ';' // Variable start/end characters -#define SIGN_STARTVARIABLE ASCII_STR("$(") -#define SIGN_ENDVARIABLE ASCII_STR(")") +#define SIGN_STARTVARIABLE "$(" +#define SIGN_ENDVARIABLE ")" // Length of SUBSTITUTE_... to replace it with real values. #define REPLACELENGTH_INST 7 |