diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-09-09 01:40:53 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2013-09-09 01:42:07 +0300 |
commit | 2f750d86cf77835d325e04467180a506411e2889 (patch) | |
tree | 0da0c3d250966d066ae668ae14694f584831bc3e /framework | |
parent | a3474bab691dc555c6fe81805740ecf765f23f18 (diff) |
Try to keep older(?) gcc versions happy
Change-Id: Id563e644356a9265ded66cf08a711078c804ac84
Diffstat (limited to 'framework')
6 files changed, 9 insertions, 9 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index a1b21c7800c7..7f4037afcab6 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -105,7 +105,7 @@ namespace framework IMPLEMENT_FORWARD_XTYPEPROVIDER2( LayoutManager, LayoutManager_Base, LayoutManager_PBase ) IMPLEMENT_FORWARD_XINTERFACE2( LayoutManager, LayoutManager_Base, LayoutManager_PBase ) -DEFINE_XSERVICEINFO_MULTISERVICE_2( LayoutManager, ::cppu::OWeakObject, "com.sun.star.frame.LayoutManager", "com.sun.star.comp.framework.LayoutManager") +DEFINE_XSERVICEINFO_MULTISERVICE_2( LayoutManager, ::cppu::OWeakObject, "com.sun.star.frame.LayoutManager", OUString("com.sun.star.comp.framework.LayoutManager")) DEFINE_INIT_SERVICE( LayoutManager, {} ) LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) : LayoutManager_Base() diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index a6996fe26cac..1722064f8560 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -82,7 +82,7 @@ namespace framework DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( PathSettings , ::cppu::OWeakObject , "com.sun.star.util.PathSettings" , - "com.sun.star.comp.framework.PathSettings" + OUString("com.sun.star.comp.framework.PathSettings") ) DEFINE_INIT_SERVICE ( PathSettings, diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index ecf89ec12b59..642b2397f486 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -79,7 +79,7 @@ namespace framework DEFINE_XSERVICEINFO_MULTISERVICE_2 ( ImageManager , ::cppu::OWeakObject , "com.sun.star.ui.ImageManager" , - "com.sun.star.comp.framework.ImageManager" + OUString("com.sun.star.comp.framework.ImageManager") ) DEFINE_INIT_SERVICE ( ImageManager, {} ) diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index a6970ca43fc0..215f4454d508 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -63,7 +63,7 @@ namespace framework DEFINE_XSERVICEINFO_MULTISERVICE_2 ( ModuleUIConfigurationManager , ::cppu::OWeakObject , "com.sun.star.ui.ModuleUIConfigurationManager" , - "com.sun.star.comp.framework.ModuleUIConfigurationManager" + OUString("com.sun.star.comp.framework.ModuleUIConfigurationManager") ) DEFINE_INIT_SERVICE ( ModuleUIConfigurationManager, {} ) diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 56f0e977fe8b..973c157c342e 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -400,10 +400,10 @@ void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEve // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2 ( UICategoryDescription , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2 ( UICategoryDescription , ::cppu::OWeakObject , "com.sun.star.ui.UICategoryDescription", - "com.sun.star.comp.framework.UICategoryDescription" + OUString("com.sun.star.comp.framework.UICategoryDescription") ) DEFINE_INIT_SERVICE ( UICategoryDescription, {} ) diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 2844cbd012fd..26cb38534b92 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -211,7 +211,7 @@ void PopupMenuToolbarController::createPopupMenuController() DEFINE_XSERVICEINFO_MULTISERVICE_2( WizardsToolbarController, ::cppu::OWeakObject, "com.sun.star.frame.ToolbarController", - "org.apache.openoffice.comp.framework.WizardsToolbarController" + OUString("org.apache.openoffice.comp.framework.WizardsToolbarController") ) DEFINE_INIT_SERVICE( WizardsToolbarController, {} ) @@ -230,7 +230,7 @@ sal_uInt16 WizardsToolbarController::getDropDownStyle() const DEFINE_XSERVICEINFO_MULTISERVICE_2( OpenToolbarController, ::cppu::OWeakObject, "com.sun.star.frame.ToolbarController", - "org.apache.openoffice.comp.framework.OpenToolbarController" + OUString("org.apache.openoffice.comp.framework.OpenToolbarController") ) DEFINE_INIT_SERVICE( OpenToolbarController, {} ) @@ -245,7 +245,7 @@ OpenToolbarController::OpenToolbarController( DEFINE_XSERVICEINFO_MULTISERVICE_2( NewToolbarController, ::cppu::OWeakObject, "com.sun.star.frame.ToolbarController", - "org.apache.openoffice.comp.framework.NewToolbarController" + OUString("org.apache.openoffice.comp.framework.NewToolbarController") ) DEFINE_INIT_SERVICE( NewToolbarController, {} ) |