From 86b44e8e78716fbfc1783d692debcbb201fb9bd4 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 5 Dec 2014 15:06:44 +0200 Subject: fdo#38835 strip out OUString globals Change-Id: I8bc386ffa88e31988bdc778a845403bec0772799 --- extensions/source/abpilot/admininvokationimpl.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'extensions') diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index d924faf64149..424ef337d380 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -67,8 +67,8 @@ namespace abp try { // the service name of the administration dialog - const static OUString s_sAdministrationServiceName = "com.sun.star.sdb.DatasourceAdministrationDialog"; - const static OUString s_sDataSourceTypeChangeDialog = "com.sun.star.sdb.DataSourceTypeChangeDialog"; + static const char s_sAdministrationServiceName[] = "com.sun.star.sdb.DatasourceAdministrationDialog"; + static const char s_sDataSourceTypeChangeDialog[] = "com.sun.star.sdb.DataSourceTypeChangeDialog"; // the parameters for the call Sequence< Any > aArguments(3); @@ -91,7 +91,8 @@ namespace abp // creating the dialog service is potentially expensive (if all the libraries invoked need to be loaded) // so we display a wait cursor WaitObject aWaitCursor(m_pMessageParent); - xDialog = Reference< XExecutableDialog >( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(_bFixedType ? s_sAdministrationServiceName : s_sDataSourceTypeChangeDialog, aArguments, m_xContext), UNO_QUERY ); + Reference x = m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(_bFixedType ? OUString(s_sAdministrationServiceName) : OUString(s_sDataSourceTypeChangeDialog), aArguments, m_xContext); + xDialog = Reference< XExecutableDialog >( x, UNO_QUERY ); // just for a smoother UI: What the dialog does upon execution, is (amongst other things) creating // the DriverManager service -- cgit