Skip to content

C
core
Kaydet (Commit) bdf13d15 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

some small startup optimizations

üst 0dd92103
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 32 deletions
unotools/source/config/configmgr.cxx
Dosyayı görüntüle @ bdf13d15
...@@ -55,13 +55,11 @@ using namespace com::sun::star::lang; ...@@ -55,13 +55,11 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans; using namespace com::sun::star::beans;
using namespace com::sun::star::container; using namespace com::sun::star::container;
#define C2U(cChar) OUString::createFromAscii(cChar)
#define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)) #define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
const char* cConfigBaseURL = "/org.openoffice."; const char* pConfigBaseURL = "/org.openoffice.";
//const char* cConfigBaseURL = "/com.sun.star."; const char* pAccessSrvc = "com.sun.star.configuration.ConfigurationUpdateAccess";
const char* cAccessSrvc = "com.sun.star.configuration.ConfigurationUpdateAccess";
namespace namespace
{ {
...@@ -152,7 +150,7 @@ Reference< XMultiServiceFactory > ConfigManager::GetConfigurationProvider() ...@@ -152,7 +150,7 @@ Reference< XMultiServiceFactory > ConfigManager::GetConfigurationProvider()
{ {
xConfigurationProvider = Reference< XMultiServiceFactory > xConfigurationProvider = Reference< XMultiServiceFactory >
(xMSF->createInstance( (xMSF->createInstance(
C2U("com.sun.star.configuration.ConfigurationProvider")), UNISTRING("com.sun.star.configuration.ConfigurationProvider")),
UNO_QUERY); UNO_QUERY);
} }
#ifdef DBG_UTIL #ifdef DBG_UTIL
...@@ -254,17 +252,17 @@ Reference< XHierarchicalNameAccess> ConfigManager::AcquireTree(utl::ConfigItem& ...@@ -254,17 +252,17 @@ Reference< XHierarchicalNameAccess> ConfigManager::AcquireTree(utl::ConfigItem&
} }
OSL_ENSURE(bFound, "AcquireTree: ConfigItem unknown!"); OSL_ENSURE(bFound, "AcquireTree: ConfigItem unknown!");
#endif #endif
OUString sPath = C2U(cConfigBaseURL); OUString sPath(OUString::createFromAscii(pConfigBaseURL));
sPath += rCfgItem.GetSubTreeName(); sPath += rCfgItem.GetSubTreeName();
Sequence< Any > aArgs(2); Sequence< Any > aArgs(2);
Any* pArgs = aArgs.getArray(); Any* pArgs = aArgs.getArray();
PropertyValue aPath; PropertyValue aPath;
aPath.Name = C2U("nodepath"); aPath.Name = UNISTRING("nodepath");
aPath.Value <<= sPath; aPath.Value <<= sPath;
pArgs[0] <<= aPath; pArgs[0] <<= aPath;
sal_Bool bLazy = 0 != (rCfgItem.GetMode()&CONFIG_MODE_DELAYED_UPDATE); sal_Bool bLazy = 0 != (rCfgItem.GetMode()&CONFIG_MODE_DELAYED_UPDATE);
PropertyValue aUpdate; PropertyValue aUpdate;
aUpdate.Name = C2U("lazywrite"); aUpdate.Name = UNISTRING("lazywrite");
aUpdate.Value.setValue(&bLazy, ::getBooleanCppuType()); aUpdate.Value.setValue(&bLazy, ::getBooleanCppuType());
pArgs[1] <<= aUpdate; pArgs[1] <<= aUpdate;
...@@ -277,8 +275,8 @@ Reference< XHierarchicalNameAccess> ConfigManager::AcquireTree(utl::ConfigItem& ...@@ -277,8 +275,8 @@ Reference< XHierarchicalNameAccess> ConfigManager::AcquireTree(utl::ConfigItem&
aArgs.realloc(nCount+1); aArgs.realloc(nCount+1);
PropertyValue aAllLocale; PropertyValue aAllLocale;
aAllLocale.Name = C2U("locale"); aAllLocale.Name = UNISTRING("locale");
aAllLocale.Value <<= C2U("*" ); aAllLocale.Value <<= UNISTRING("*" );
aArgs[nCount] <<= aAllLocale; aArgs[nCount] <<= aAllLocale;
} }
...@@ -289,7 +287,7 @@ Reference< XHierarchicalNameAccess> ConfigManager::AcquireTree(utl::ConfigItem& ...@@ -289,7 +287,7 @@ Reference< XHierarchicalNameAccess> ConfigManager::AcquireTree(utl::ConfigItem&
try try
{ {
xIFace = xCfgProvider->createInstanceWithArguments( xIFace = xCfgProvider->createInstanceWithArguments(
C2U(cAccessSrvc), OUString::createFromAscii(pAccessSrvc),
aArgs); aArgs);
} }
catch(Exception& rEx) catch(Exception& rEx)
...@@ -367,7 +365,7 @@ ConfigManager& ConfigManager::GetConfigManager() ...@@ -367,7 +365,7 @@ ConfigManager& ConfigManager::GetConfigManager()
---------------------------------------------------------------------------*/ ---------------------------------------------------------------------------*/
rtl::OUString ConfigManager::GetConfigBaseURL() rtl::OUString ConfigManager::GetConfigBaseURL()
{ {
return C2U(cConfigBaseURL); return OUString::createFromAscii(pConfigBaseURL);
} }
/* -----------------------------25.09.00 16:34-------------------------------- /* -----------------------------25.09.00 16:34--------------------------------
...@@ -479,10 +477,10 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) ...@@ -479,10 +477,10 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
} }
} }
OUString sPath = C2U(cConfigBaseURL); OUString sPath = OUString::createFromAscii(pConfigBaseURL);
switch(eProp) switch(eProp)
{ {
case LOCALE: sPath += C2U("Setup/L10N"); break; case LOCALE: sPath += UNISTRING("Setup/L10N"); break;
case PRODUCTNAME: case PRODUCTNAME:
case PRODUCTVERSION: case PRODUCTVERSION:
...@@ -491,12 +489,12 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) ...@@ -491,12 +489,12 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
case PRODUCTXMLFILEFORMATVERSION: case PRODUCTXMLFILEFORMATVERSION:
case OPENSOURCECONTEXT: case OPENSOURCECONTEXT:
case OOOVENDOR: case OOOVENDOR:
case ABOUTBOXPRODUCTVERSION: sPath += C2U("Setup/Product"); break; case ABOUTBOXPRODUCTVERSION: sPath += UNISTRING("Setup/Product"); break;
case DEFAULTCURRENCY: sPath += C2U("Setup/L10N"); break; case DEFAULTCURRENCY: sPath += UNISTRING("Setup/L10N"); break;
case WRITERCOMPATIBILITYVERSIONOOO11: case WRITERCOMPATIBILITYVERSIONOOO11:
sPath += C2U("Office.Compatibility/WriterCompatibilityVersion"); break; sPath += UNISTRING("Office.Compatibility/WriterCompatibilityVersion"); break;
default: default:
break; break;
} }
...@@ -509,7 +507,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) ...@@ -509,7 +507,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
try try
{ {
xIFace = xCfgProvider->createInstanceWithArguments( xIFace = xCfgProvider->createInstanceWithArguments(
C2U(cAccessSrvc), OUString::createFromAscii(pAccessSrvc),
aArgs); aArgs);
} }
...@@ -520,17 +518,17 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) ...@@ -520,17 +518,17 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
OUString sProperty; OUString sProperty;
switch(eProp) switch(eProp)
{ {
case LOCALE: sProperty = C2U("ooLocale"); break; case LOCALE: sProperty = UNISTRING("ooLocale"); break;
case PRODUCTNAME: sProperty = C2U("ooName"); break; case PRODUCTNAME: sProperty = UNISTRING("ooName"); break;
case PRODUCTVERSION: sProperty = C2U("ooSetupVersion"); break; case PRODUCTVERSION: sProperty = UNISTRING("ooSetupVersion"); break;
case ABOUTBOXPRODUCTVERSION: sProperty = C2U("ooSetupVersionAboutBox"); break; case ABOUTBOXPRODUCTVERSION: sProperty = UNISTRING("ooSetupVersionAboutBox"); break;
case OOOVENDOR: sProperty = C2U("ooVendor"); break; case OOOVENDOR: sProperty = UNISTRING("ooVendor"); break;
case PRODUCTEXTENSION: sProperty = C2U("ooSetupExtension"); break; case PRODUCTEXTENSION: sProperty = UNISTRING("ooSetupExtension"); break;
case PRODUCTXMLFILEFORMATNAME: sProperty = C2U("ooXMLFileFormatName"); break; case PRODUCTXMLFILEFORMATNAME: sProperty = UNISTRING("ooXMLFileFormatName"); break;
case PRODUCTXMLFILEFORMATVERSION: sProperty = C2U("ooXMLFileFormatVersion"); break; case PRODUCTXMLFILEFORMATVERSION: sProperty = UNISTRING("ooXMLFileFormatVersion"); break;
case OPENSOURCECONTEXT: sProperty = C2U("ooOpenSourceContext"); break; case OPENSOURCECONTEXT: sProperty = UNISTRING("ooOpenSourceContext"); break;
case DEFAULTCURRENCY: sProperty = C2U("ooSetupCurrency"); break; case DEFAULTCURRENCY: sProperty = UNISTRING("ooSetupCurrency"); break;
case WRITERCOMPATIBILITYVERSIONOOO11: sProperty = C2U("OOo11"); break; case WRITERCOMPATIBILITYVERSIONOOO11: sProperty = UNISTRING("OOo11"); break;
default: default:
break; break;
} }
...@@ -642,7 +640,7 @@ Reference< XHierarchicalNameAccess> ConfigManager::GetHierarchyAccess(const OUSt ...@@ -642,7 +640,7 @@ Reference< XHierarchicalNameAccess> ConfigManager::GetHierarchyAccess(const OUSt
try try
{ {
xIFace = xCfgProvider->createInstanceWithArguments( xIFace = xCfgProvider->createInstanceWithArguments(
C2U(cAccessSrvc), OUString::createFromAscii(pAccessSrvc),
aArgs); aArgs);
} }
#ifdef DBG_UTIL #ifdef DBG_UTIL
...@@ -665,7 +663,7 @@ Reference< XHierarchicalNameAccess> ConfigManager::GetHierarchyAccess(const OUSt ...@@ -665,7 +663,7 @@ Reference< XHierarchicalNameAccess> ConfigManager::GetHierarchyAccess(const OUSt
---------------------------------------------------------------------------*/ ---------------------------------------------------------------------------*/
Any ConfigManager::GetLocalProperty(const OUString& rProperty) Any ConfigManager::GetLocalProperty(const OUString& rProperty)
{ {
OUString sPath = C2U(cConfigBaseURL); OUString sPath(OUString::createFromAscii(pConfigBaseURL));
sPath += rProperty; sPath += rProperty;
OUString sNode, sProperty; OUString sNode, sProperty;
...@@ -697,7 +695,7 @@ Any ConfigManager::GetLocalProperty(const OUString& rProperty) ...@@ -697,7 +695,7 @@ Any ConfigManager::GetLocalProperty(const OUString& rProperty)
---------------------------------------------------------------------------*/ ---------------------------------------------------------------------------*/
void ConfigManager::PutLocalProperty(const OUString& rProperty, const Any& rValue) void ConfigManager::PutLocalProperty(const OUString& rProperty, const Any& rValue)
{ {
OUString sPath = C2U(cConfigBaseURL); OUString sPath(OUString::createFromAscii(pConfigBaseURL));
sPath += rProperty; sPath += rProperty;
OUString sNode, sProperty; OUString sNode, sProperty;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment