Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1878
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/1878/1
Remove more STRINGPARAM macros form dbaccess
Change-Id: I283ccd03dc811dda2f10963f400cd517f42ea7b3
---
M dbaccess/source/core/dataaccess/databasecontext.cxx
M dbaccess/source/core/dataaccess/databaseregistrations.cxx
M dbaccess/source/core/dataaccess/definitioncontainer.cxx
M dbaccess/source/core/dataaccess/documentcontainer.cxx
M dbaccess/source/core/dataaccess/intercept.cxx
M dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
M dbaccess/source/core/misc/DatabaseDataProvider.cxx
M dbaccess/source/core/misc/dsntypes.cxx
M dbaccess/source/core/misc/sdbcoretools.cxx
M dbaccess/source/core/recovery/dbdocrecovery.cxx
M dbaccess/source/core/recovery/settingsimport.cxx
M dbaccess/source/core/recovery/storagetextstream.cxx
M dbaccess/source/core/recovery/subcomponentloader.cxx
M dbaccess/source/core/recovery/subcomponentrecovery.cxx
14 files changed, 95 insertions(+), 126 deletions(-)
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index b5372d4..8144f82 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -204,10 +204,9 @@
}
// Helper
-rtl::OUString ODatabaseContext::getImplementationName_static() throw(
RuntimeException )
-
+OUString ODatabaseContext::getImplementationName_static() throw(
RuntimeException )
{
-return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.comp.dba.ODatabaseContext));
+return OUString(com.sun.star.comp.dba.ODatabaseContext);
}
Reference XInterface ODatabaseContext::Create(const Reference
XComponentContext _rxContext)
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 344c15c..5886fbd 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -53,21 +53,21 @@
using ::com::sun::star::uno::XAggregation;
/** === end UNO using === **/
-static const ::rtl::OUString getConfigurationRootPath()
+static const OUString getConfigurationRootPath()
{
-static ::rtl::OUString
s_sNodeName(RTL_CONSTASCII_USTRINGPARAM(org.openoffice.Office.DataAccess/RegisteredNames));
+static OUString
s_sNodeName(org.openoffice.Office.DataAccess/RegisteredNames);
return s_sNodeName;
}
-const ::rtl::OUString getLocationNodeName()
+const OUString getLocationNodeName()
{
-static ::rtl::OUString
s_sNodeName(RTL_CONSTASCII_USTRINGPARAM(Location));
+static OUString s_sNodeName(Location);
return s_sNodeName;
}
-const ::rtl::OUString getNameNodeName()
+const OUString getNameNodeName()
{
-static ::rtl::OUString
s_sNodeName(RTL_CONSTASCII_USTRINGPARAM(Name));
+static OUString s_sNodeName(Name);
return s_sNodeName;
}
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 928f2cf..8c8cd98 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -159,16 +159,16 @@
IMPLEMENT_FORWARD_XINTERFACE2(
ODefinitionContainer,OContentHelper,ODefinitionContainer_Base)
IMPLEMENT_TYPEPROVIDER2(ODefinitionContainer,OContentHelper,ODefinitionContainer_Base);
// XServiceInfo
-::rtl::OUString SAL_CALL ODefinitionContainer::getImplementationName( )
throw(RuntimeException)
+OUString SAL_CALL ODefinitionContainer::getImplementationName( )
throw(RuntimeException)
{
-return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sdb.ODefinitionContainer));
+return OUString(com.sun.star.sdb.ODefinitionContainer);
}
-Sequence ::rtl::OUString SAL_CALL
ODefinitionContainer::getSupportedServiceNames( ) throw(RuntimeException)
+Sequence OUString SAL_CALL ODefinitionContainer::getSupportedServiceNames(
) throw(RuntimeException)
{
-Sequence ::rtl::OUString aReturn(2);
-aReturn.getArray()[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sdb.DefinitionContainer));
-aReturn.getArray()[1] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ucb.Content));
+Sequence OUString aReturn(2);
+aReturn.getArray()[0] = com.sun.star.sdb.DefinitionContainer;
+aReturn.getArray()[1] = com.sun.star.ucb.Content;
return aReturn;
}
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx
b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 9e91fd4..90a8af5 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -733,7 +733,7 @@
{
Command aCommand;
-