From 705c48d32eec0aa5180e60ca157daca4b154e4a3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 3 Nov 2014 14:03:54 +0200 Subject: fdo#38835 strip out OUString globals they are largely unnecessary these days, since our OUString infrastructure gained optimised handling for static char constants. Change-Id: I07f73484f82d0582252cb4324d4107c998432c37 --- extensions/source/abpilot/fieldmappingimpl.cxx | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'extensions/source/abpilot') diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 99c93ef2c58e..7103319d8b6d 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -50,18 +50,8 @@ namespace abp using namespace ::com::sun::star::ui::dialogs; - static const OUString& lcl_getDriverSettingsNodeName() - { - static const OUString s_sDriverSettingsNodeName( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" ); - return s_sDriverSettingsNodeName; - } - - - static const OUString& lcl_getAddressBookNodeName() - { - static const OUString s_sAddressBookNodeName( "/org.openoffice.Office.DataAccess/AddressBook" ); - return s_sAddressBookNodeName; - } + static const char sDriverSettingsNodeName[] = "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver"; + static const char sAddressBookNodeName[] = "/org.openoffice.Office.DataAccess/AddressBook"; namespace fieldmapping @@ -169,7 +159,7 @@ namespace abp // access the configuration information which the driver uses for determining it's column names - OUString sDriverAliasesNodeName = lcl_getDriverSettingsNodeName(); + OUString sDriverAliasesNodeName = sDriverSettingsNodeName; sDriverAliasesNodeName += OUString( "/ColumnAliases" ); // create a config node for this @@ -224,7 +214,6 @@ namespace abp MapString2String aFieldAssignment( _rFieldAssignment ); // access the configuration information which the driver uses for determining it's column names - const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName(); // create a config node for this OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext( @@ -301,7 +290,6 @@ namespace abp const OUString& _rDataSourceName, const OUString& _rTableName ) { // access the configuration information which the driver uses for determining it's column names - const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName(); // create a config node for this OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext( @@ -319,7 +307,6 @@ namespace abp void markPilotSuccess( const Reference< XComponentContext >& _rxContext ) { // access the configuration information which the driver uses for determining it's column names - const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName(); // create a config node for this OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext( -- cgit