[Libreoffice-commits] .: 4 commits - framework/source linguistic/source shell/source ucb/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 17 03:14:24 PST 2011
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 2
framework/source/uiconfiguration/windowstateconfiguration.cxx | 2
framework/source/uifactory/menubarfactory.cxx | 10 -
linguistic/source/convdic.cxx | 2
linguistic/source/convdiclist.cxx | 2
linguistic/source/convdicxml.cxx | 16 -
linguistic/source/hhconvdic.cxx | 4
linguistic/source/lngprophelp.cxx | 2
shell/source/backends/gconfbe/gconfaccess.cxx | 90 +++++-----
shell/source/backends/gconfbe/gconfaccess.hxx | 1
shell/source/backends/gconfbe/gconfbackend.cxx | 8
ucb/source/ucp/file/filglob.cxx | 2
12 files changed, 72 insertions(+), 69 deletions(-)
New commits:
commit 410bc1e5a466531cfe052f7c25f50f97262d80c1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 17 11:11:14 2011 +0000
equalsAsciiL faster than equalsAscii
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index db799fd..1043a26 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -211,7 +211,7 @@ throw ( NoSuchElementException, RuntimeException)
xCont->getByName(ModuleIdentifier) >>= lProps;
for (sal_Int32 i=0; i<lProps.getLength(); ++i)
{
- if (lProps[i].Name.equalsAscii("ooSetupFactoryShortName"))
+ if (lProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryShortName")))
{
lProps[i].Value >>= sShort;
break;
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index b2429d5..e4f2de7 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1393,7 +1393,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi
::rtl::OUString aWindowStateFileStr;
for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
{
- if ( aSeq[y].Name.equalsAscii("ooSetupFactoryWindowStateConfigRef") )
+ if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryWindowStateConfigRef")) )
{
aSeq[y].Value >>= aWindowStateFileStr;
break;
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index ce06278..4ae733e 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -133,17 +133,17 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL
for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
{
- if ( Args[n].Name.equalsAscii( "ConfigurationSource" ))
+ if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ConfigurationSource")) )
Args[n].Value >>= xConfigSource;
- else if ( Args[n].Name.equalsAscii( "Frame" ))
+ else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Frame")) )
Args[n].Value >>= xFrame;
- else if ( Args[n].Name.equalsAscii( "ResourceURL" ))
+ else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ResourceURL")) )
Args[n].Value >>= aResourceURL;
- else if ( Args[n].Name.equalsAscii( "Persistent" ))
+ else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Persistent")) )
Args[n].Value >>= bPersistent;
else if ( _pExtraMode && Args[n].Name.equalsAscii( _pExtraMode ))
Args[n].Value >>= bExtraMode;
- } // for ( sal_Int32 n = 0; n < Args.getLength(); n++ )
+ }
if ( aResourceURL.indexOf( rtl::OUString::createFromAscii(_pAsciiName)) != 0 )
throw IllegalArgumentException();
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index c5dcd4c..3b7af59 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -224,7 +224,7 @@ namespace fileaccess {
if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 )
aParent += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- if( 0 == aParent.compareToAscii( "file://" ) )
+ if( aParent.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("file://")) )
aParent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
return aParent;
commit 40c202b083b865ac733b9456cd018e48bb508031
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 17 10:42:03 2011 +0000
equalsAsciiL faster than equalsAscii
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index f8210eb..716c76a 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -718,7 +718,7 @@ sal_Bool SAL_CALL ConvDic::supportsService( const OUString& rServiceName )
{
MutexGuard aGuard( GetLinguMutex() );
sal_Bool bRes = sal_False;
- if (rServiceName.equalsAscii( SN_CONV_DICTIONARY ))
+ if (rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_CONV_DICTIONARY)))
bRes = sal_True;
return bRes;
}
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index ca187b5..c6f5da7 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -661,7 +661,7 @@ sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName )
throw (RuntimeException)
{
MutexGuard aGuard( GetLinguMutex() );
- return rServiceName.equalsAscii( SN_CONV_DICTIONARY_LIST );
+ return rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_CONV_DICTIONARY_LIST));
}
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 988bdd7..d2196d4 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -224,7 +224,7 @@ SvXMLImportContext * ConvDicXMLImportContext::CreateChildContext(
const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ )
{
SvXMLImportContext *pContext = 0;
- if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAscii( "text-conversion-dictionary" ))
+ if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text-conversion-dictionary")))
pContext = new ConvDicXMLDictionaryContext_Impl( GetConvDicImport(), nPrefix, rLocalName );
else
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
@@ -245,9 +245,9 @@ void ConvDicXMLDictionaryContext_Impl::StartElement(
GetKeyByAttrName( aAttrName, &aLocalName );
OUString aValue = rxAttrList->getValueByIndex(i);
- if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAscii( "lang" ))
+ if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("lang")))
nLanguage = MsLangId::convertIsoStringToLanguage( aValue );
- else if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAscii( "conversion-type" ))
+ else if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("conversion-type")))
nConversionType = GetConversionTypeFromText( aValue );
}
GetConvDicImport().SetLanguage( nLanguage );
@@ -264,7 +264,7 @@ SvXMLImportContext * ConvDicXMLDictionaryContext_Impl::CreateChildContext(
const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ )
{
SvXMLImportContext *pContext = 0;
- if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAscii( "entry" ))
+ if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("entry")))
pContext = new ConvDicXMLEntryTextContext_Impl( GetConvDicImport(), nPrefix, rLocalName, *this );
else
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
@@ -278,7 +278,7 @@ SvXMLImportContext * ConvDicXMLEntryTextContext_Impl::CreateChildContext(
const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ )
{
SvXMLImportContext *pContext = 0;
- if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAscii( "right-text" ))
+ if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("right-text")))
pContext = new ConvDicXMLRightTextContext_Impl( GetConvDicImport(), nPrefix, rLocalName, *this );
else
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
@@ -297,9 +297,9 @@ void ConvDicXMLEntryTextContext_Impl::StartElement(
GetKeyByAttrName( aAttrName, &aLocalName );
OUString aValue = rxAttrList->getValueByIndex(i);
- if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAscii( "left-text" ))
+ if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("left-text")))
aLeftText = aValue;
- if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAscii( "property-type" ))
+ if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("property-type")))
nPropertyType = (sal_Int16) aValue.toInt32();
}
}
@@ -443,7 +443,7 @@ SvXMLImportContext * ConvDicXMLImport::CreateContext(
const uno::Reference < xml::sax::XAttributeList > & /*rxAttrList*/ )
{
SvXMLImportContext *pContext = 0;
- if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAscii( "text-conversion-dictionary" ))
+ if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text-conversion-dictionary")))
pContext = new ConvDicXMLDictionaryContext_Impl( *this, nPrefix, rLocalName );
else
pContext = new SvXMLImportContext( *this, nPrefix, rLocalName );
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 4fe78e8..45d6192 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -140,8 +140,8 @@ sal_Bool SAL_CALL HHConvDic::supportsService( const OUString& rServiceName )
{
MutexGuard aGuard( GetLinguMutex() );
sal_Bool bRes = sal_False;
- if (rServiceName.equalsAscii( SN_CONV_DICTIONARY )||
- rServiceName.equalsAscii( SN_HH_CONV_DICTIONARY ))
+ if (rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_CONV_DICTIONARY)) ||
+ rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_HH_CONV_DICTIONARY)))
bRes = sal_True;
return bRes;
}
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index 5a81077..2619282 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -537,7 +537,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
const PropertyValue *pVal = rPropVals.getConstArray();
for (INT32 i = 0; i < nLen; ++i)
{
- if (pVal[i].Name.equalsAscii( UPN_MAX_NUMBER_OF_SUGGESTIONS ))
+ if (pVal[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UPN_MAX_NUMBER_OF_SUGGESTIONS)))
{
pVal[i].Value >>= nResMaxNumberOfSuggestions;
}
commit 3245eb50d6fa635684b9ad78df9f560c26c80034
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 17 10:31:31 2011 +0000
equalsAsciiL faster than equalsAscii
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 41f0c8a..2fcca95 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -431,7 +431,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* aClient, const Configurati
{
rtl::OUString aCompleteName( rtl::OStringToOUString(
g_get_real_name(), osl_getThreadTextEncoding() ) );
- if( !aCompleteName.equalsAscii( "Unknown" ) )
+ if( !aCompleteName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Unknown")) )
return sal_True;
}
break;
@@ -440,7 +440,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* aClient, const Configurati
{
rtl::OUString aCompleteName( rtl::OStringToOUString(
g_get_real_name(), osl_getThreadTextEncoding() ) );
- if( !aCompleteName.equalsAscii( "Unknown" ) )
+ if( !aCompleteName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Unknown")) )
{
if( aCompleteName.trim().indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")), 0) != -1 )
return sal_True;
commit 47cfe443cd7f2eb9c32a18f40bc0442ce79a5557
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 17 10:29:58 2011 +0000
speed up startup a little bit
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 67d3d09..41f0c8a 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -478,7 +478,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_ENABLE_ACCESSIBILITY,
"/desktop/gnome/interface/accessibility",
- "EnableATToolSupport",
+ RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport"),
sal_True,
SETTINGS_LAST
},
@@ -486,7 +486,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_MODE,
GCONF_PROXY_MODE_KEY,
- "ooInetProxyType",
+ RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"),
sal_True,
SETTINGS_LAST
},
@@ -494,7 +494,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_HTTP_HOST,
"/system/http_proxy/host",
- "ooInetHTTPProxyName",
+ RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName"),
sal_False,
SETTING_PROXY_MODE
},
@@ -502,7 +502,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_HTTP_PORT,
"/system/http_proxy/port",
- "ooInetHTTPProxyPort",
+ RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort"),
sal_False,
SETTING_PROXY_MODE
},
@@ -510,7 +510,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_HTTPS_HOST,
"/system/proxy/secure_host",
- "ooInetHTTPSProxyName",
+ RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName"),
sal_False,
SETTING_PROXY_MODE
},
@@ -518,7 +518,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_HTTPS_PORT,
"/system/proxy/secure_port",
- "ooInetHTTPSProxyPort",
+ RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort"),
sal_False,
SETTING_PROXY_MODE
},
@@ -526,7 +526,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_FTP_HOST,
"/system/proxy/ftp_host",
- "ooInetFTPProxyName",
+ RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName"),
sal_False,
SETTING_PROXY_MODE
},
@@ -534,7 +534,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PROXY_FTP_PORT,
"/system/proxy/ftp_port",
- "ooInetFTPProxyPort",
+ RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort"),
sal_False,
SETTING_PROXY_MODE
},
@@ -542,7 +542,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_NO_PROXY_FOR,
"/system/http_proxy/ignore_hosts",
- "ooInetNoProxy",
+ RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy"),
sal_True,
SETTING_PROXY_MODE
},
@@ -550,21 +550,21 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_MAILER_PROGRAM,
"/desktop/gnome/url-handlers/mailto/command",
- "ExternalMailer",
+ RTL_CONSTASCII_STRINGPARAM("ExternalMailer"),
sal_True,
SETTINGS_LAST
},
{
SETTING_SOURCEVIEWFONT_NAME,
"/desktop/gnome/interface/monospace_font_name",
- "SourceViewFontName",
+ RTL_CONSTASCII_STRINGPARAM("SourceViewFontName"),
sal_True,
SETTINGS_LAST
},
{
SETTING_SOURCEVIEWFONT_HEIGHT,
"/desktop/gnome/interface/monospace_font_name",
- "SourceViewFontHeight",
+ RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight"),
sal_True,
SETTINGS_LAST
},
@@ -572,7 +572,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WORK_DIRECTORY,
"/desktop/gnome/url-handlers/mailto/command", // dummy
- "WorkPathVariable",
+ RTL_CONSTASCII_STRINGPARAM("WorkPathVariable"),
sal_True,
SETTING_WORK_DIRECTORY, // so that the existence of the dir can be checked
},
@@ -581,7 +581,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WRITER_DEFAULT_DOC_FORMAT,
"/apps/openoffice/writer_default_document_format",
- "TextDocumentSetupFactoryDefaultFilter",
+ RTL_CONSTASCII_STRINGPARAM("TextDocumentSetupFactoryDefaultFilter"),
sal_False,
SETTINGS_LAST
},
@@ -589,7 +589,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_IMPRESS_DEFAULT_DOC_FORMAT,
"/apps/openoffice/impress_default_document_format",
- "PresentationDocumentSetupFactoryDefaultFilter",
+ RTL_CONSTASCII_STRINGPARAM("PresentationDocumentSetupFactoryDefaultFilter"),
sal_False,
SETTINGS_LAST
},
@@ -597,7 +597,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_CALC_DEFAULT_DOC_FORMAT,
"/apps/openoffice/calc_default_document_format",
- "SpreadsheetDocumentSetupFactoryDefaultFilter",
+ RTL_CONSTASCII_STRINGPARAM("SpreadsheetDocumentSetupFactoryDefaultFilter"),
sal_False,
SETTINGS_LAST
},
@@ -605,7 +605,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_AUTO_SAVE,
GCONF_AUTO_SAVE_KEY,
- "AutoSaveEnabled",
+ RTL_CONSTASCII_STRINGPARAM("AutoSaveEnabled"),
sal_False,
SETTINGS_LAST
},
@@ -613,7 +613,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_AUTO_SAVE_INTERVAL,
"/apps/openoffice/auto_save_interval",
- "AutoSaveTimeIntervall",
+ RTL_CONSTASCII_STRINGPARAM("AutoSaveTimeIntervall"),
sal_False,
SETTING_AUTO_SAVE
},
@@ -621,7 +621,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_USER_GIVENNAME,
"/desktop/gnome/url-handlers/mailto/command", // dummy
- "givenname",
+ RTL_CONSTASCII_STRINGPARAM("givenname"),
sal_True,
SETTING_USER_GIVENNAME
},
@@ -629,7 +629,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_USER_SURNAME,
"/desktop/gnome/url-handlers/mailto/command", // dummy
- "sn",
+ RTL_CONSTASCII_STRINGPARAM("sn"),
sal_True,
SETTING_USER_SURNAME
},
@@ -637,7 +637,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_DISABLE_PRINTING,
"/desktop/gnome/lockdown/disable_printing",
- "DisablePrinting",
+ RTL_CONSTASCII_STRINGPARAM("DisablePrinting"),
sal_True,
SETTINGS_LAST
},
@@ -645,7 +645,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_USE_SYSTEM_FILE_DIALOG,
"/apps/openoffice/use_system_file_dialog",
- "UseSystemFileDialog",
+ RTL_CONSTASCII_STRINGPARAM("UseSystemFileDialog"),
sal_False,
SETTINGS_LAST
},
@@ -653,7 +653,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_PRINTING_MODIFIES_DOCUMENT,
"/apps/openoffice/printing_modifies_doc",
- "PrintingModifiesDocument",
+ RTL_CONSTASCII_STRINGPARAM("PrintingModifiesDocument"),
sal_False,
SETTINGS_LAST
},
@@ -661,7 +661,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_SHOW_ICONS_IN_MENUS,
"/apps/openoffice/show_menu_icons",
- "ShowIconsInMenues",
+ RTL_CONSTASCII_STRINGPARAM("ShowIconsInMenues"),
sal_False,
SETTINGS_LAST
},
@@ -669,7 +669,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_SHOW_INACTIVE_MENUITEMS,
"/apps/openoffice/show_menu_inactive_items",
- "DontHideDisabledEntry",
+ RTL_CONSTASCII_STRINGPARAM("DontHideDisabledEntry"),
sal_False,
SETTINGS_LAST
},
@@ -677,7 +677,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_SHOW_FONT_PREVIEW,
"/apps/openoffice/show_font_preview",
- "ShowFontBoxWYSIWYG",
+ RTL_CONSTASCII_STRINGPARAM("ShowFontBoxWYSIWYG"),
sal_False,
SETTINGS_LAST
},
@@ -685,7 +685,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_SHOW_FONT_HISTORY,
"/apps/openoffice/show_font_history",
- "FontViewHistory",
+ RTL_CONSTASCII_STRINGPARAM("FontViewHistory"),
sal_False,
SETTINGS_LAST
},
@@ -693,7 +693,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_ENABLE_OPENGL,
"/apps/openoffice/use_opengl",
- "OpenGL",
+ RTL_CONSTASCII_STRINGPARAM("OpenGL"),
sal_False,
SETTINGS_LAST
},
@@ -701,7 +701,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_OPTIMIZE_OPENGL,
"/apps/openoffice/optimize_opengl",
- "OpenGL_Faster",
+ RTL_CONSTASCII_STRINGPARAM("OpenGL_Faster"),
sal_False,
SETTINGS_LAST
},
@@ -709,7 +709,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_USE_SYSTEM_FONT,
"/apps/openoffice/use_system_font",
- "AccessibilityIsSystemFont",
+ RTL_CONSTASCII_STRINGPARAM("AccessibilityIsSystemFont"),
sal_False,
SETTINGS_LAST
},
@@ -717,7 +717,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_USE_FONT_ANTI_ALIASING,
"/apps/openoffice/use_font_anti_aliasing",
- "FontAntiAliasingEnabled",
+ RTL_CONSTASCII_STRINGPARAM("FontAntiAliasingEnabled"),
sal_False,
SETTINGS_LAST
},
@@ -725,7 +725,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_FONT_ANTI_ALIASING_MIN_PIXEL,
"/apps/openoffice/font_anti_aliasing_min_pixel",
- "FontAntiAliasingMinPixelHeight",
+ RTL_CONSTASCII_STRINGPARAM("FontAntiAliasingMinPixelHeight"),
sal_True,
SETTINGS_LAST
},
@@ -733,7 +733,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WARN_CREATE_PDF,
"/apps/openoffice/lockdown/warn_info_create_pdf",
- "WarnCreatePDF",
+ RTL_CONSTASCII_STRINGPARAM("WarnCreatePDF"),
sal_False,
SETTINGS_LAST
},
@@ -741,7 +741,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WARN_PRINT_DOC,
"/apps/openoffice/lockdown/warn_info_printing",
- "WarnPrintDoc",
+ RTL_CONSTASCII_STRINGPARAM("WarnPrintDoc"),
sal_False,
SETTINGS_LAST
},
@@ -749,7 +749,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WARN_SAVEORSEND_DOC,
"/apps/openoffice/lockdown/warn_info_saving",
- "WarnSaveOrSendDoc",
+ RTL_CONSTASCII_STRINGPARAM("WarnSaveOrSendDoc"),
sal_False,
SETTINGS_LAST
},
@@ -757,7 +757,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WARN_SIGN_DOC,
"/apps/openoffice/lockdown/warn_info_signing",
- "WarnSignDoc",
+ RTL_CONSTASCII_STRINGPARAM("WarnSignDoc"),
sal_False,
SETTINGS_LAST
},
@@ -765,7 +765,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_REMOVE_PERSONAL_INFO,
"/apps/openoffice/lockdown/remove_personal_info_on_save",
- "RemovePersonalInfoOnSaving",
+ RTL_CONSTASCII_STRINGPARAM("RemovePersonalInfoOnSaving"),
sal_False,
SETTINGS_LAST
},
@@ -773,7 +773,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_RECOMMEND_PASSWORD,
"/apps/openoffice/lockdown/recommend_password_on_save",
- "RecommendPasswordProtection",
+ RTL_CONSTASCII_STRINGPARAM("RecommendPasswordProtection"),
sal_False,
SETTINGS_LAST
},
@@ -781,7 +781,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_UNDO_STEPS,
"/apps/openoffice/undo_steps",
- "UndoSteps",
+ RTL_CONSTASCII_STRINGPARAM("UndoSteps"),
sal_False,
SETTINGS_LAST
},
@@ -789,7 +789,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_SYMBOL_SET,
"/apps/openoffice/icon_size",
- "SymbolSet",
+ RTL_CONSTASCII_STRINGPARAM("SymbolSet"),
sal_True,
SETTINGS_LAST
},
@@ -797,7 +797,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_MACRO_SECURITY_LEVEL,
"/apps/openoffice/lockdown/macro_security_level",
- "MacroSecurityLevel",
+ RTL_CONSTASCII_STRINGPARAM("MacroSecurityLevel"),
sal_False,
SETTINGS_LAST
},
@@ -805,7 +805,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_CREATE_BACKUP,
"/apps/openoffice/create_backup",
- "CreateBackup",
+ RTL_CONSTASCII_STRINGPARAM("CreateBackup"),
sal_False,
SETTINGS_LAST
},
@@ -813,7 +813,7 @@ ConfigurationValue const ConfigurationValues[] =
{
SETTING_WARN_ALIEN_FORMAT,
"/apps/openoffice/warn_alien_format",
- "WarnAlienFormat",
+ RTL_CONSTASCII_STRINGPARAM("WarnAlienFormat"),
sal_False,
SETTINGS_LAST
},
diff --git a/shell/source/backends/gconfbe/gconfaccess.hxx b/shell/source/backends/gconfbe/gconfaccess.hxx
index 2b9fd17..6c45ef5 100644
--- a/shell/source/backends/gconfbe/gconfaccess.hxx
+++ b/shell/source/backends/gconfbe/gconfaccess.hxx
@@ -104,6 +104,7 @@ struct ConfigurationValue
const ConfigurationSetting nSettingId;
const gchar *GconfItem;
const char *OOoConfItem;
+ const sal_Int32 nOOoConfItemLen;
const sal_Bool bNeedsTranslation;
const ConfigurationSetting nDependsOn;
};
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index 7a548ac..70e39f3 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -190,9 +190,11 @@ css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName)
css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
css::uno::RuntimeException)
{
- for (std::size_t i = 0; i < gconfaccess::nConfigurationValues; ++i) {
- if (PropertyName.equalsAscii(
- gconfaccess::ConfigurationValues[i].OOoConfItem))
+ for (std::size_t i = 0; i < gconfaccess::nConfigurationValues; ++i)
+ {
+ if (PropertyName.equalsAsciiL(
+ gconfaccess::ConfigurationValues[i].OOoConfItem,
+ gconfaccess::ConfigurationValues[i].nOOoConfItemLen))
{
return css::uno::makeAny(
enabled_
More information about the Libreoffice-commits
mailing list