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 /desktop/source/app/check_ext_deps.cxx | |
| 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 'desktop/source/app/check_ext_deps.cxx')
| -rw-r--r-- | desktop/source/app/check_ext_deps.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index d26f4de54b6b..f01e3e835583 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -59,8 +59,6 @@ using rtl::OUString; using namespace desktop; using namespace com::sun::star; -#define UNISTRING(s) OUString(s) - namespace { //For use with XExtensionManager.synchronize @@ -219,14 +217,14 @@ static const char aAccessSrvc[] = "com.sun.star.configuration.ConfigurationUpdat static sal_Int16 impl_showExtensionDialog( uno::Reference< uno::XComponentContext > &xContext ) { - rtl::OUString sServiceName = UNISTRING("com.sun.star.deployment.ui.UpdateRequiredDialog"); + rtl::OUString sServiceName = "com.sun.star.deployment.ui.UpdateRequiredDialog"; uno::Reference< uno::XInterface > xService; sal_Int16 nRet = 0; uno::Reference< lang::XMultiComponentFactory > xServiceManager( xContext->getServiceManager() ); if( !xServiceManager.is() ) throw uno::RuntimeException( - UNISTRING( "impl_showExtensionDialog(): unable to obtain service manager from component context" ), uno::Reference< uno::XInterface > () ); + "impl_showExtensionDialog(): unable to obtain service manager from component context", uno::Reference< uno::XInterface > () ); xService = xServiceManager->createInstanceWithContext( sServiceName, xContext ); uno::Reference< ui::dialogs::XExecutableDialog > xExecuteable( xService, uno::UNO_QUERY ); @@ -346,8 +344,8 @@ static void impl_setNeedsCompatCheck() static bool impl_needsCompatCheck() { bool bNeedsCheck = false; - rtl::OUString aLastCheckBuildID; - rtl::OUString aCurrentBuildID( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) ); + OUString aLastCheckBuildID; + OUString aCurrentBuildID( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ); rtl::Bootstrap::expandMacros( aCurrentBuildID ); try { |