framework/source/layoutmanager/layoutmanager.cxx | 2 +-
framework/source/services/pathsettings.cxx | 2 +-
framework/source/uiconfiguration/imagemanager.cxx | 2 +-
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 2 +-
framework/source/uiconfiguration/uicategorydescription.cxx | 4 ++--
framework/source/uielement/popuptoolbarcontroller.cxx | 6 +++---
6 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 2f750d86cf77835d325e04467180a506411e2889
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Sep 9 01:40:53 2013 +0300
Try to keep older(?) gcc versions happy
Change-Id: Id563e644356a9265ded66cf08a711078c804ac84
diff --git a/framework/source/layoutmanager/layoutmanager.cxx
b/framework/source/layoutmanager/layoutmanager.cxx
index a1b21c7..7f4037a 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 a6996fe..1722064 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 ecf89ec..642b239 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 a6970ca..215f445 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 56f0e97..973c157 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 2844cbd..26cb385 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, {} )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
