diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-25 12:50:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-25 14:19:03 +0100 |
| commit | 2c757293b819118780eef3a30bb4434528d38673 (patch) | |
| tree | 35beab468034fbeab06137452542d0d9191bb309 /connectivity | |
| parent | 2ce31e56efaf1e429ecc13fd80b6767cb9ea585b (diff) | |
reduce static_initialization_and_destruction chain
Change-Id: I0c1b2f2d908c31d1510662880c13504d81445a6a
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/DriversConfig.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx index 7e480c7ea8f5..6a204bfb8bdc 100644 --- a/connectivity/source/commontools/DriversConfig.cxx +++ b/connectivity/source/commontools/DriversConfig.cxx @@ -63,31 +63,25 @@ namespace const ::utl::OConfigurationNode aURLPatternNode = _aInstalled.openNode(_sEntry); if ( aURLPatternNode.isValid() ) { - static const ::rtl::OUString s_sParentURLPattern(RTL_CONSTASCII_USTRINGPARAM("ParentURLPattern")); - static const ::rtl::OUString s_sDriver(RTL_CONSTASCII_USTRINGPARAM("Driver")); - static const ::rtl::OUString s_sDriverTypeDisplayName(RTL_CONSTASCII_USTRINGPARAM("DriverTypeDisplayName")); - static const ::rtl::OUString s_sProperties(RTL_CONSTASCII_USTRINGPARAM("Properties")); - static const ::rtl::OUString s_sFeatures(RTL_CONSTASCII_USTRINGPARAM("Features")); - static const ::rtl::OUString s_sMetaData(RTL_CONSTASCII_USTRINGPARAM("MetaData")); ::rtl::OUString sParentURLPattern; - aURLPatternNode.getNodeValue(s_sParentURLPattern) >>= sParentURLPattern; + aURLPatternNode.getNodeValue("ParentURLPattern") >>= sParentURLPattern; if ( !sParentURLPattern.isEmpty() ) lcl_readURLPatternNode(_aInstalled,sParentURLPattern,_rInstalledDriver); ::rtl::OUString sDriverFactory; - aURLPatternNode.getNodeValue(s_sDriver) >>= sDriverFactory; + aURLPatternNode.getNodeValue("Driver") >>= sDriverFactory; if ( !sDriverFactory.isEmpty() ) _rInstalledDriver.sDriverFactory = sDriverFactory; ::rtl::OUString sDriverTypeDisplayName; - aURLPatternNode.getNodeValue(s_sDriverTypeDisplayName) >>= sDriverTypeDisplayName; + aURLPatternNode.getNodeValue("DriverTypeDisplayName") >>= sDriverTypeDisplayName; OSL_ENSURE(!sDriverTypeDisplayName.isEmpty(),"No valid DriverTypeDisplayName property!"); if ( !sDriverTypeDisplayName.isEmpty() ) _rInstalledDriver.sDriverTypeDisplayName = sDriverTypeDisplayName; - lcl_fillValues(aURLPatternNode,s_sProperties,_rInstalledDriver.aProperties); - lcl_fillValues(aURLPatternNode,s_sFeatures,_rInstalledDriver.aFeatures); - lcl_fillValues(aURLPatternNode,s_sMetaData,_rInstalledDriver.aMetaData); + lcl_fillValues(aURLPatternNode,"Properties",_rInstalledDriver.aProperties); + lcl_fillValues(aURLPatternNode,"Features",_rInstalledDriver.aFeatures); + lcl_fillValues(aURLPatternNode,"MetaData",_rInstalledDriver.aMetaData); } } } |