connectivity/source/commontools/DriversConfig.cxx | 6 -
connectivity/source/commontools/dbtools2.cxx | 4
connectivity/source/drivers/jdbc/JConnection.cxx | 2
cui/source/customize/CustomNotebookbarGenerator.cxx | 2
cui/source/dialogs/toolbarmodedlg.cxx | 2
cui/source/options/optsave.cxx | 14 +-
dbaccess/source/ui/browser/unodatbr.cxx | 2
dbaccess/source/ui/dlg/generalpage.cxx | 2
framework/source/uielement/toolbarmodemenucontroller.cxx | 12 +-
include/unotools/confignode.hxx | 5
reportdesign/source/ui/report/propbrw.cxx | 2
sfx2/source/appl/appserv.cxx | 14 +-
sfx2/source/dialog/filtergrouping.cxx | 6 -
sfx2/source/notebookbar/SfxNotebookBar.cxx | 10 -
sfx2/source/sidebar/ResourceManager.cxx | 76 +++++++--------
svx/source/form/databaselocationinput.cxx | 2
svx/source/form/fmPropBrw.cxx | 2
sw/source/ui/fldui/fldtdlg.cxx | 3
uui/source/iahndl.cxx | 4
vcl/source/app/settings.cxx | 2
vcl/source/window/toolbox2.cxx | 4
21 files changed, 85 insertions(+), 91 deletions(-)
New commits:
commit d4f07d4c08724602d0a13045bec957e285d45c0d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 8 11:24:50 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat May 11 23:05:38 2024 +0200
replace createFromAscii with OUString literals in OConfigurationNode
Change-Id: I19017bc993f0adafdae32313e0e01e69e1bbe80b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167517
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/connectivity/source/commontools/DriversConfig.cxx
b/connectivity/source/commontools/DriversConfig.cxx
index 3c5fe27e8327..fac2feb872ed 100644
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -61,17 +61,17 @@ namespace
return;
OUString sParentURLPattern;
- aURLPatternNode.getNodeValue("ParentURLPattern") >>= sParentURLPattern;
+ aURLPatternNode.getNodeValue(u"ParentURLPattern"_ustr) >>=
sParentURLPattern;
if ( !sParentURLPattern.isEmpty() )
lcl_readURLPatternNode(_aInstalled,sParentURLPattern,_rInstalledDriver);
OUString sDriverFactory;
- aURLPatternNode.getNodeValue("Driver") >>= sDriverFactory;
+ aURLPatternNode.getNodeValue(u"Driver"_ustr) >>= sDriverFactory;
if ( !sDriverFactory.isEmpty() )
_rInstalledDriver.sDriverFactory = sDriverFactory;
OUString sDriverTypeDisplayName;
- aURLPatternNode.getNodeValue("DriverTypeDisplayName") >>=
sDriverTypeDisplayName;
+ aURLPatternNode.getNodeValue(u"DriverTypeDisplayName"_ustr) >>=
sDriverTypeDisplayName;
OSL_ENSURE(!sDriverTypeDisplayName.isEmpty(),"No valid
DriverTypeDisplayName property!");
if ( !sDriverTypeDisplayName.isEmpty() )
_rInstalledDriver.sDriverTypeDisplayName = sDriverTypeDisplayName;
diff --git a/connectivity/source/commontools/dbtools2.cxx
b/connectivity/source/commontools/dbtools2.cxx
index e6088c513711..8590878dbcf6 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -947,7 +947,7 @@ OUString getDefaultReportEngineServiceName(const Reference<
XComponentContext >&
if ( aReportEngines.isValid() )
{
OUString sDefaultReportEngineName;
- aReportEngines.getNodeValue("DefaultReportEngine") >>=
sDefaultReportEngineName;
+ aReportEngines.getNodeValue(u"DefaultReportEngine"_ustr) >>=
sDefaultReportEngineName;
if ( !sDefaultReportEngineName.isEmpty() )
{
::utl::OConfigurationNode aReportEngineNames =
aReportEngines.openNode(u"ReportEngineNames"_ustr);
@@ -957,7 +957,7 @@ OUString getDefaultReportEngineServiceName(const Reference<
XComponentContext >&
if ( aReportEngine.isValid() )
{
OUString sRet;
- aReportEngine.getNodeValue("ServiceName") >>= sRet;
+ aReportEngine.getNodeValue(u"ServiceName"_ustr) >>= sRet;
return sRet;
}
}
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx
b/connectivity/source/drivers/jdbc/JConnection.cxx
index ed92faf87dba..00a868d92595 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -702,7 +702,7 @@ OUString
java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const OUString
if ( aNamesRoot.isValid() && aNamesRoot.hasByName( _sDriverClass ) )
{
::utl::OConfigurationNode aRegisterObj = aNamesRoot.openNode(
_sDriverClass );
- OSL_VERIFY( aRegisterObj.getNodeValue( "Path" ) >>= sURL );
+ OSL_VERIFY( aRegisterObj.getNodeValue( u"Path"_ustr ) >>= sURL );
}
return sURL;
}
diff --git a/cui/source/customize/CustomNotebookbarGenerator.cxx
b/cui/source/customize/CustomNotebookbarGenerator.cxx
index df065fb81e7b..d14de28de1ee 100644
--- a/cui/source/customize/CustomNotebookbarGenerator.cxx
+++ b/cui/source/customize/CustomNotebookbarGenerator.cxx
@@ -260,7 +260,7 @@ Sequence<OUString>
CustomNotebookbarGenerator::getCustomizedUIItem(OUString sNot
const utl::OConfigurationNode aModesNode =
aAppNode.openNode(u"Modes"_ustr);
const utl::OConfigurationNode
aModeNode(aModesNode.openNode(sNotebookbarConfigType));
- const Any aValue = aModeNode.getNodeValue("UIItemProperties");
+ const Any aValue = aModeNode.getNodeValue(u"UIItemProperties"_ustr);
Sequence<OUString> aValues;
aValue >>= aValues;
return aValues;
diff --git a/cui/source/dialogs/toolbarmodedlg.cxx
b/cui/source/dialogs/toolbarmodedlg.cxx
index 61754e614ed5..fed0f053bf4f 100644
--- a/cui/source/dialogs/toolbarmodedlg.cxx
+++ b/cui/source/dialogs/toolbarmodedlg.cxx
@@ -73,7 +73,7 @@ static OUString GetCurrentMode()
const utl::OConfigurationTreeRoot aAppNode(
xContext, "org.openoffice.Office.UI.ToolbarMode/Applications/" +
GetCurrentApp(), true);
if (aAppNode.isValid())
- sResult = comphelper::getString(aAppNode.getNodeValue("Active"));
+ sResult =
comphelper::getString(aAppNode.getNodeValue(u"Active"_ustr));
};
return sResult;
}
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index dac57c660295..84ecc43b5766 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -126,13 +126,13 @@ SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage,
weld::DialogController* p
utl::OConfigurationTreeRoot::CM_READONLY
);
- m_xDocTypeLB->append(OUString::number(APP_WRITER),
aFilterClassesNode.getNodeValue("com.sun.star.text.TextDocument/DisplayName").get<OUString>());
- m_xDocTypeLB->append(OUString::number(APP_WRITER_WEB),
aFilterClassesNode.getNodeValue("com.sun.star.text.WebDocument/DisplayName").get<OUString>());
- m_xDocTypeLB->append(OUString::number(APP_WRITER_GLOBAL),
aFilterClassesNode.getNodeValue("com.sun.star.text.GlobalDocument/DisplayName").get<OUString>());
- m_xDocTypeLB->append(OUString::number(APP_CALC),
aFilterClassesNode.getNodeValue("com.sun.star.sheet.SpreadsheetDocument/DisplayName").get<OUString>());
- m_xDocTypeLB->append(OUString::number(APP_IMPRESS),
aFilterClassesNode.getNodeValue("com.sun.star.presentation.PresentationDocument/DisplayName").get<OUString>());
- m_xDocTypeLB->append(OUString::number(APP_DRAW),
aFilterClassesNode.getNodeValue("com.sun.star.drawing.DrawingDocument/DisplayName").get<OUString>());
- m_xDocTypeLB->append(OUString::number(APP_MATH),
aFilterClassesNode.getNodeValue("com.sun.star.formula.FormulaProperties/DisplayName").get<OUString>());
+ m_xDocTypeLB->append(OUString::number(APP_WRITER),
aFilterClassesNode.getNodeValue(u"com.sun.star.text.TextDocument/DisplayName"_ustr).get<OUString>());
+ m_xDocTypeLB->append(OUString::number(APP_WRITER_WEB),
aFilterClassesNode.getNodeValue(u"com.sun.star.text.WebDocument/DisplayName"_ustr).get<OUString>());
+ m_xDocTypeLB->append(OUString::number(APP_WRITER_GLOBAL),
aFilterClassesNode.getNodeValue(u"com.sun.star.text.GlobalDocument/DisplayName"_ustr).get<OUString>());
+ m_xDocTypeLB->append(OUString::number(APP_CALC),
aFilterClassesNode.getNodeValue(u"com.sun.star.sheet.SpreadsheetDocument/DisplayName"_ustr).get<OUString>());
+ m_xDocTypeLB->append(OUString::number(APP_IMPRESS),
aFilterClassesNode.getNodeValue(u"com.sun.star.presentation.PresentationDocument/DisplayName"_ustr).get<OUString>());
+ m_xDocTypeLB->append(OUString::number(APP_DRAW),
aFilterClassesNode.getNodeValue(u"com.sun.star.drawing.DrawingDocument/DisplayName"_ustr).get<OUString>());
+ m_xDocTypeLB->append(OUString::number(APP_MATH),
aFilterClassesNode.getNodeValue(u"com.sun.star.formula.FormulaProperties/DisplayName"_ustr).get<OUString>());
m_xAutoSaveCB->connect_toggled( LINK( this, SvxSaveTabPage,
AutoClickHdl_Impl ) );
m_xBackupCB->connect_toggled(LINK(this, SvxSaveTabPage,
BackupClickHdl_Impl));
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index cbebe4fff75c..a989356bbdcb 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1657,7 +1657,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16
nId) const
::utl::OConfigurationTreeRoot aConfig(
::utl::OConfigurationTreeRoot::createWithComponentContext( getORB(),
u"/org.openoffice.Office.DataAccess/Policies/Features/Common"_ustr ) );
bool bHaveEditDatabase( true );
- OSL_VERIFY( aConfig.getNodeValue(
"EditDatabaseFromDataSourceView" ) >>= bHaveEditDatabase );
+ OSL_VERIFY( aConfig.getNodeValue(
u"EditDatabaseFromDataSourceView"_ustr ) >>= bHaveEditDatabase );
aReturn.bEnabled = getORB().is() && xDataSourceEntry &&
bHaveEditDatabase;
}
else if ( nId == ID_BROWSER_COPY )
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx
b/dbaccess/source/ui/dlg/generalpage.cxx
index bd87bb8a0f1b..2030860d1ac6 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -471,7 +471,7 @@ namespace dbaui
u"/org.openoffice.Office.DataAccess/Policies/Features/Base"_ustr
) );
bool bAllowCreateLocalDatabase( true );
- OSL_VERIFY( aConfig.getNodeValue( "CreateLocalDatabase" ) >>=
bAllowCreateLocalDatabase );
+ OSL_VERIFY( aConfig.getNodeValue( u"CreateLocalDatabase"_ustr ) >>=
bAllowCreateLocalDatabase );
if ( !bAllowCreateLocalDatabase )
bHideCreateNew = true;
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx
b/framework/source/uielement/toolbarmodemenucontroller.cxx
index d7e2de9773b7..1b6c9964b698 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -131,11 +131,11 @@ void ToolbarModeMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu >
if ( !aModeNode.isValid() )
continue;
- OUString aLabel = comphelper::getString( aModeNode.getNodeValue(
"Label" ) );
- OUString aCommandArg = comphelper::getString( aModeNode.getNodeValue(
"CommandArg" ) );
- tools::Long nPosition = comphelper::getINT32( aModeNode.getNodeValue(
"MenuPosition" ) );
- bool isExperimental = comphelper::getBOOL( aModeNode.getNodeValue(
"IsExperimental" ) );
- bool hasNotebookbar = comphelper::getBOOL( aModeNode.getNodeValue(
"HasNotebookbar" ) );
+ OUString aLabel = comphelper::getString( aModeNode.getNodeValue(
u"Label"_ustr ) );
+ OUString aCommandArg = comphelper::getString( aModeNode.getNodeValue(
u"CommandArg"_ustr ) );
+ tools::Long nPosition = comphelper::getINT32( aModeNode.getNodeValue(
u"MenuPosition"_ustr ) );
+ bool isExperimental = comphelper::getBOOL( aModeNode.getNodeValue(
u"IsExperimental"_ustr ) );
+ bool hasNotebookbar = comphelper::getBOOL( aModeNode.getNodeValue(
u"HasNotebookbar"_ustr ) );
// Allow Notebookbar only in experimental mode
if ( isExperimental &&
!officecfg::Office::Common::Misc::ExperimentalMode::get() )
@@ -253,7 +253,7 @@ void SAL_CALL ToolbarModeMenuController::itemActivated(
const css::awt::MenuEven
if ( !aModesNode.isValid() )
return;
- OUString aMode = comphelper::getString( aModesNode.getNodeValue( "Active"
) );
+ OUString aMode = comphelper::getString( aModesNode.getNodeValue(
u"Active"_ustr ) );
for ( int i = 0; i < m_xPopupMenu->getItemCount(); ++i )
{
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index c95acd8bdbdb..bd8d13d4420e 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -107,11 +107,6 @@ namespace utl
*/
css::uno::Any getNodeValue(const OUString& _rPath) const
noexcept;
- css::uno::Any getNodeValue( const char* _pAsciiPath ) const
- {
- return getNodeValue( OUString::createFromAscii( _pAsciiPath ) );
- }
-
/** write a node value<p/>
The value given is written into the node specified by the given
relative path.<br/>
In opposite to <method>getNodeValue</method>, _rName must refer to
a leaf in the configuration tree, not an inner
diff --git a/reportdesign/source/ui/report/propbrw.cxx
b/reportdesign/source/ui/report/propbrw.cxx
index 18ba6bede8a9..31b94c79a924 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -71,7 +71,7 @@ namespace
_rxContext,
u"/org.openoffice.Office.ReportDesign/PropertyBrowser/"_ustr ) );
bool bEnabled = false;
- OSL_VERIFY( aConfiguration.getNodeValue( "DirectHelp" ) >>= bEnabled
);
+ OSL_VERIFY( aConfiguration.getNodeValue( u"DirectHelp"_ustr ) >>=
bEnabled );
return bEnabled;
}
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 28a3b325cc2a..461bdd87f01c 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -896,7 +896,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
break;
}
- aCurrentMode = comphelper::getString( aAppNode.getNodeValue(
"Active" ) );
+ aCurrentMode = comphelper::getString( aAppNode.getNodeValue(
u"Active"_ustr ) );
if ( !comphelper::LibreOfficeKit::isActive() && aCurrentMode
== aNewName )
{
@@ -980,13 +980,13 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
if ( !aModeNode.isValid() )
continue;
- OUString aCommandArg = comphelper::getString(
aModeNode.getNodeValue( "CommandArg" ) );
+ OUString aCommandArg = comphelper::getString(
aModeNode.getNodeValue( u"CommandArg"_ustr ) );
if ( aCommandArg == aNewName )
{
- aMandatoryToolbars = aModeNode.getNodeValue(
"Toolbars" ).get< uno::Sequence<OUString> >();
- aUserToolbars = aModeNode.getNodeValue(
"UserToolbars" ).get< uno::Sequence<OUString> >();
- aSidebarMode = comphelper::getString(
aModeNode.getNodeValue( "Sidebar" ) );
+ aMandatoryToolbars = aModeNode.getNodeValue(
u"Toolbars"_ustr ).get< uno::Sequence<OUString> >();
+ aUserToolbars = aModeNode.getNodeValue(
u"UserToolbars"_ustr ).get< uno::Sequence<OUString> >();
+ aSidebarMode = comphelper::getString(
aModeNode.getNodeValue( u"Sidebar"_ustr ) );
break;
}
}
@@ -1078,7 +1078,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
if ( !aModeNode.isValid() )
continue;
- OUString aCommandArg = comphelper::getString(
aModeNode.getNodeValue( "CommandArg" ) );
+ OUString aCommandArg = comphelper::getString(
aModeNode.getNodeValue( u"CommandArg"_ustr ) );
if ( aCommandArg == aCurrentMode )
{
@@ -1209,7 +1209,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
xContext,
u"org.openoffice.Office.UI.GlobalSettings/Toolbars/States"_ustr, true);
if (aAppNode.isValid())
{
- bool isLocked =
comphelper::getBOOL(aAppNode.getNodeValue("Locked"));
+ bool isLocked =
comphelper::getBOOL(aAppNode.getNodeValue(u"Locked"_ustr));
aAppNode.setNodeValue("Locked", Any(!isLocked));
aAppNode.commit();
//TODO: apply immediately w/o restart needed
diff --git a/sfx2/source/dialog/filtergrouping.cxx
b/sfx2/source/dialog/filtergrouping.cxx
index dfa9d0295466..6fd58613c2ef 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -158,8 +158,8 @@ namespace sfx2
OConfigurationNode aClassDesc = _rClassesNode.openNode(
_rLogicalClassName );
// the values
- aClassDesc.getNodeValue( "DisplayName" ) >>= _rClass.sDisplayName;
- aClassDesc.getNodeValue( "Filters" ) >>= _rClass.aSubFilters;
+ aClassDesc.getNodeValue( u"DisplayName"_ustr ) >>=
_rClass.sDisplayName;
+ aClassDesc.getNodeValue( u"Filters"_ustr ) >>= _rClass.aSubFilters;
}
namespace {
@@ -232,7 +232,7 @@ namespace sfx2
// get the list describing the order of all global classes
Sequence< OUString > aGlobalClasses;
- _rFilterClassification.getNodeValue( "GlobalFilters/Order" ) >>=
aGlobalClasses;
+ _rFilterClassification.getNodeValue( u"GlobalFilters/Order"_ustr ) >>=
aGlobalClasses;
// copy the logical names
comphelper::sequenceToContainer(_rGlobalClassNames, aGlobalClasses);
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 4866db50c866..2709b4ec3f84 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -245,7 +245,7 @@ static utl::OConfigurationNode
lcl_getCurrentImplConfigNode(const Reference<css:
if ( !aImplNode.isValid() )
continue;
- OUString aCommandArg = comphelper::getString( aImplNode.getNodeValue(
"CommandArg" ) );
+ OUString aCommandArg = comphelper::getString( aImplNode.getNodeValue(
u"CommandArg"_ustr ) );
if ( aCommandArg == aActive )
{
@@ -346,7 +346,7 @@ bool SfxNotebookBar::IsActive(bool bConsiderSingleToolbar)
if ( !aAppNode.isValid() )
return false;
- OUString aActive = comphelper::getString( aAppNode.getNodeValue( "Active"
) );
+ OUString aActive = comphelper::getString( aAppNode.getNodeValue(
u"Active"_ustr ) );
if (bConsiderSingleToolbar && aActive == "Single")
return true;
@@ -363,11 +363,11 @@ bool SfxNotebookBar::IsActive(bool bConsiderSingleToolbar)
if ( !aModeNode.isValid() )
continue;
- OUString aCommandArg = comphelper::getString( aModeNode.getNodeValue(
"CommandArg" ) );
+ OUString aCommandArg = comphelper::getString( aModeNode.getNodeValue(
u"CommandArg"_ustr ) );
if ( aCommandArg == aActive )
{
- return comphelper::getBOOL( aModeNode.getNodeValue(
"HasNotebookbar" ) );
+ return comphelper::getBOOL( aModeNode.getNodeValue(
u"HasNotebookbar"_ustr ) );
}
}
return false;
@@ -527,7 +527,7 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
utl::OConfigurationTreeRoot aRoot(lcl_getCurrentImplConfigRoot());
const utl::OConfigurationNode
aModeNode(lcl_getCurrentImplConfigNode(xFrame, aRoot));
- SfxNotebookBar::ShowMenubar( comphelper::getBOOL(
aModeNode.getNodeValue( "HasMenubar" ) ) );
+ SfxNotebookBar::ShowMenubar( comphelper::getBOOL(
aModeNode.getNodeValue( u"HasMenubar"_ustr ) ) );
SfxViewFrame* pView = SfxViewFrame::Current();
diff --git a/sfx2/source/sidebar/ResourceManager.cxx
b/sfx2/source/sidebar/ResourceManager.cxx
index 8215e80aee6d..fc18d0f77d52 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -50,17 +50,17 @@ namespace sfx2::sidebar {
namespace
{
-OUString getString(utl::OConfigurationNode const & aNode, const char*
pNodeName)
+OUString getString(utl::OConfigurationNode const & aNode, const OUString&
rNodeName)
{
- return comphelper::getString(aNode.getNodeValue(pNodeName));
+ return comphelper::getString(aNode.getNodeValue(rNodeName));
}
-sal_Int32 getInt32(utl::OConfigurationNode const & aNode, const char*
pNodeName)
+sal_Int32 getInt32(utl::OConfigurationNode const & aNode, const OUString&
rNodeName)
{
- return comphelper::getINT32(aNode.getNodeValue(pNodeName));
+ return comphelper::getINT32(aNode.getNodeValue(rNodeName));
}
-bool getBool(utl::OConfigurationNode const & aNode, const char* pNodeName)
+bool getBool(utl::OConfigurationNode const & aNode, const OUString& rNodeName)
{
- return comphelper::getBOOL(aNode.getNodeValue(pNodeName));
+ return comphelper::getBOOL(aNode.getNodeValue(rNodeName));
}
css::uno::Sequence<OUString> BuildContextList (const ContextList& rContextList)
@@ -271,16 +271,16 @@ void ResourceManager::ReadDeckList()
maDecks.push_back(std::make_shared<DeckDescriptor>());
DeckDescriptor& rDeckDescriptor (*maDecks.back());
- rDeckDescriptor.msTitle = getString(aDeckNode, "Title");
- rDeckDescriptor.msId = getString(aDeckNode, "Id");
- rDeckDescriptor.msIconURL = getString(aDeckNode, "IconURL");
- rDeckDescriptor.msHighContrastIconURL = getString(aDeckNode,
"HighContrastIconURL");
- rDeckDescriptor.msTitleBarIconURL = getString(aDeckNode,
"TitleBarIconURL");
- rDeckDescriptor.msHighContrastTitleBarIconURL = getString(aDeckNode,
"HighContrastTitleBarIconURL");
+ rDeckDescriptor.msTitle = getString(aDeckNode, u"Title"_ustr);
+ rDeckDescriptor.msId = getString(aDeckNode, u"Id"_ustr);
+ rDeckDescriptor.msIconURL = getString(aDeckNode, u"IconURL"_ustr);
+ rDeckDescriptor.msHighContrastIconURL = getString(aDeckNode,
u"HighContrastIconURL"_ustr);
+ rDeckDescriptor.msTitleBarIconURL = getString(aDeckNode,
u"TitleBarIconURL"_ustr);
+ rDeckDescriptor.msHighContrastTitleBarIconURL = getString(aDeckNode,
u"HighContrastTitleBarIconURL"_ustr);
rDeckDescriptor.msHelpText = rDeckDescriptor.msTitle;
rDeckDescriptor.msHelpId = "SIDEBAR_" +
rDeckDescriptor.msId.toAsciiUpperCase();
- rDeckDescriptor.mnOrderIndex = getInt32(aDeckNode, "OrderIndex");
- rDeckDescriptor.mbExperimental = getBool(aDeckNode, "IsExperimental");
+ rDeckDescriptor.mnOrderIndex = getInt32(aDeckNode, u"OrderIndex"_ustr);
+ rDeckDescriptor.mbExperimental = getBool(aDeckNode,
u"IsExperimental"_ustr);
rDeckDescriptor.msNodeName = aDeckName;
@@ -327,17 +327,17 @@ void ResourceManager::SaveDeckSettings(const
DeckDescriptor* pDeckDesc)
css::uno::Any aContextList(sContextList);
bool bChanged = false;
- if (aTitle != aDeckNode.getNodeValue("Title"))
+ if (aTitle != aDeckNode.getNodeValue(u"Title"_ustr))
{
aDeckNode.setNodeValue("Title", aTitle);
bChanged = true;
}
- if (aOrder != aDeckNode.getNodeValue("OrderIndex"))
+ if (aOrder != aDeckNode.getNodeValue(u"OrderIndex"_ustr))
{
aDeckNode.setNodeValue("OrderIndex", aOrder);
bChanged = true;
}
- if (aContextList != aDeckNode.getNodeValue("ContextList"))
+ if (aContextList != aDeckNode.getNodeValue(u"ContextList"_ustr))
{
aDeckNode.setNodeValue("ContextList", aContextList);
bChanged = true;
@@ -375,17 +375,17 @@ void ResourceManager::SaveDeckSettings(const
DeckDescriptor* pDeckDesc)
aOrder <<= xPanelDesc->mnOrderIndex;
aContextList <<= sPanelContextList;
- if (aTitle != aPanelNode.getNodeValue("Title"))
+ if (aTitle != aPanelNode.getNodeValue(u"Title"_ustr))
{
aPanelNode.setNodeValue("Title", aTitle);
bChanged = true;
}
- if (aOrder != aPanelNode.getNodeValue("OrderIndex"))
+ if (aOrder != aPanelNode.getNodeValue(u"OrderIndex"_ustr))
{
aPanelNode.setNodeValue("OrderIndex", aOrder);
bChanged = true;
}
- if (aContextList != aPanelNode.getNodeValue("ContextList"))
+ if (aContextList != aPanelNode.getNodeValue(u"ContextList"_ustr))
{
aPanelNode.setNodeValue("ContextList", aContextList);
bChanged = true;
@@ -431,7 +431,7 @@ void ResourceManager::ReadPanelList()
if (comphelper::LibreOfficeKit::isActive())
{
// Hide these panels in LOK as they aren't fully functional.
- OUString aPanelId = getString(aPanelNode, "Id");
+ OUString aPanelId = getString(aPanelNode, u"Id"_ustr);
if (aPanelId == "PageStylesPanel" || aPanelId == "PageHeaderPanel"
|| aPanelId == "PageFooterPanel")
continue;
@@ -440,19 +440,19 @@ void ResourceManager::ReadPanelList()
maPanels.push_back(std::make_shared<PanelDescriptor>());
PanelDescriptor& rPanelDescriptor(*maPanels.back());
- rPanelDescriptor.msTitle = getString(aPanelNode, "Title");
- rPanelDescriptor.mbIsTitleBarOptional = getBool(aPanelNode,
"TitleBarIsOptional");
- rPanelDescriptor.msId = getString(aPanelNode, "Id");
- rPanelDescriptor.msDeckId = getString(aPanelNode, "DeckId");
- rPanelDescriptor.msTitleBarIconURL = getString(aPanelNode,
"TitleBarIconURL");
- rPanelDescriptor.msHighContrastTitleBarIconURL = getString(aPanelNode,
"HighContrastTitleBarIconURL");
- rPanelDescriptor.msImplementationURL = getString(aPanelNode,
"ImplementationURL");
- rPanelDescriptor.mnOrderIndex = getInt32(aPanelNode, "OrderIndex");
- rPanelDescriptor.mbShowForReadOnlyDocuments = getBool(aPanelNode,
"ShowForReadOnlyDocument");
- rPanelDescriptor.mbWantsCanvas = getBool(aPanelNode, "WantsCanvas");
- rPanelDescriptor.mbWantsAWT = getBool(aPanelNode, "WantsAWT");
- rPanelDescriptor.mbExperimental = getBool(aPanelNode,
"IsExperimental");
- const OUString sDefaultMenuCommand(getString(aPanelNode,
"DefaultMenuCommand"));
+ rPanelDescriptor.msTitle = getString(aPanelNode, u"Title"_ustr);
+ rPanelDescriptor.mbIsTitleBarOptional = getBool(aPanelNode,
u"TitleBarIsOptional"_ustr);
+ rPanelDescriptor.msId = getString(aPanelNode, u"Id"_ustr);
+ rPanelDescriptor.msDeckId = getString(aPanelNode, u"DeckId"_ustr);
+ rPanelDescriptor.msTitleBarIconURL = getString(aPanelNode,
u"TitleBarIconURL"_ustr);
+ rPanelDescriptor.msHighContrastTitleBarIconURL = getString(aPanelNode,
u"HighContrastTitleBarIconURL"_ustr);
+ rPanelDescriptor.msImplementationURL = getString(aPanelNode,
u"ImplementationURL"_ustr);
+ rPanelDescriptor.mnOrderIndex = getInt32(aPanelNode,
u"OrderIndex"_ustr);
+ rPanelDescriptor.mbShowForReadOnlyDocuments = getBool(aPanelNode,
u"ShowForReadOnlyDocument"_ustr);
+ rPanelDescriptor.mbWantsCanvas = getBool(aPanelNode,
u"WantsCanvas"_ustr);
+ rPanelDescriptor.mbWantsAWT = getBool(aPanelNode, u"WantsAWT"_ustr);
+ rPanelDescriptor.mbExperimental = getBool(aPanelNode,
u"IsExperimental"_ustr);
+ const OUString sDefaultMenuCommand(getString(aPanelNode,
u"DefaultMenuCommand"_ustr));
rPanelDescriptor.msNodeName = rPanelNodeName;
@@ -493,7 +493,7 @@ void ResourceManager::ReadContextList (
ContextList& rContextList,
const OUString& rsDefaultMenuCommand)
{
- const Any aValue = rParentNode.getNodeValue("ContextList");
+ const Any aValue = rParentNode.getNodeValue(u"ContextList"_ustr);
Sequence<OUString> aValues;
if (!(aValue >>= aValues))
return;
@@ -676,9 +676,9 @@ void ResourceManager::ReadLegacyAddons (const
Reference<frame::XController>& rxC
maDecks.push_back(std::make_shared<DeckDescriptor>());
DeckDescriptor& rDeckDescriptor(*maDecks.back());
- rDeckDescriptor.msTitle = getString(aChildNode, "UIName");
+ rDeckDescriptor.msTitle = getString(aChildNode, u"UIName"_ustr);
rDeckDescriptor.msId = rsNodeName;
- rDeckDescriptor.msIconURL = getString(aChildNode, "ImageURL");
+ rDeckDescriptor.msIconURL = getString(aChildNode, u"ImageURL"_ustr);
rDeckDescriptor.msHighContrastIconURL = rDeckDescriptor.msIconURL;
rDeckDescriptor.msTitleBarIconURL.clear();
rDeckDescriptor.msHighContrastTitleBarIconURL.clear();
@@ -689,7 +689,7 @@ void ResourceManager::ReadLegacyAddons (const
Reference<frame::XController>& rxC
maPanels.push_back(std::make_shared<PanelDescriptor>());
PanelDescriptor& rPanelDescriptor(*maPanels.back());
- rPanelDescriptor.msTitle = getString(aChildNode, "UIName");
+ rPanelDescriptor.msTitle = getString(aChildNode, u"UIName"_ustr);
rPanelDescriptor.mbIsTitleBarOptional = true;
rPanelDescriptor.msId = rsNodeName;
rPanelDescriptor.msDeckId = rsNodeName;
diff --git a/svx/source/form/databaselocationinput.cxx
b/svx/source/form/databaselocationinput.cxx
index dfe71dc68634..51898c99cbb5 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -142,7 +142,7 @@ namespace svx
u"/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument"_ustr
) );
OUString sDatabaseFilter;
- OSL_VERIFY( aConfig.getNodeValue( "ooSetupFactoryActualFilter" )
>>= sDatabaseFilter );
+ OSL_VERIFY( aConfig.getNodeValue(
u"ooSetupFactoryActualFilter"_ustr ) >>= sDatabaseFilter );
// get the type this filter is responsible for
Reference< XNameAccess > xFilterFactory(
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index f39e2c71adc0..8516cb2d49f3 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -408,7 +408,7 @@ namespace
u"/org.openoffice.Office.Common/Forms/PropertyBrowser/"_ustr )
);
bool bEnabled = false;
- OSL_VERIFY( aConfiguration.getNodeValue( "DirectHelp" ) >>= bEnabled );
+ OSL_VERIFY( aConfiguration.getNodeValue( u"DirectHelp"_ustr ) >>=
bEnabled );
return bEnabled;
}
}
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 5691935136e3..9504a2d4c022 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -78,8 +78,7 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper*
pCW, weld::Window *pP
#if HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS
bool bDatabaseFields = true;
- aCfgRoot.getNodeValue(
- OUString("DatabaseFields")) >>= bDatabaseFields;
+ aCfgRoot.getNodeValue(u"DatabaseFields"_ustr) >>= bDatabaseFields;
if (bDatabaseFields)
AddTabPage("database", SwFieldDBPage::Create, nullptr);
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 2f039a85fc67..7e3bcca41313 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -344,12 +344,12 @@ bool
UUIInteractionHelper::handleTypedHandlerImplementations( Reference< XIntera
::utl::OConfigurationNode aType( aTypesNode.openNode( type ) );
// and there's a child denoting how the responsibility propagates
OUString sPropagation;
- OSL_VERIFY( aType.getNodeValue( "Propagation" ) >>= sPropagation );
+ OSL_VERIFY( aType.getNodeValue( u"Propagation"_ustr ) >>=
sPropagation );
if ( lcl_matchesRequest( aRequest, type, sPropagation ) )
{
// retrieve the service/implementation name of the handler
OUString sServiceName;
- OSL_VERIFY( aHandlerNode.getNodeValue( "ServiceName" ) >>=
sServiceName );
+ OSL_VERIFY( aHandlerNode.getNodeValue( u"ServiceName"_ustr )
>>= sServiceName );
// cache the information who feels responsible for requests of
this type
m_aTypedCustomHandlers[ aRequest.getValueTypeName() ] =
sServiceName;
// actually handle the request
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 4716d56bc784..15079736df29 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -3104,7 +3104,7 @@ namespace
if ( aNode.isValid() )
{
bool bTmp = bool();
- css::uno::Any aValue = aNode.getNodeValue( "UIMirroring" );
+ css::uno::Any aValue = aNode.getNodeValue( u"UIMirroring"_ustr
);
if( aValue >>= bTmp )
{
// found true or false; if it was nil, nothing is changed
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 37a0c4c75fe0..8460dcf680c1 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1684,7 +1684,7 @@ bool ToolBox::AlwaysLocked()
{
// feature enabled ?
bool bStatesEnabled = bool();
- css::uno::Any aValue = aNode.getNodeValue( "StatesEnabled" );
+ css::uno::Any aValue = aNode.getNodeValue( u"StatesEnabled"_ustr );
if( aValue >>= bStatesEnabled )
{
if( bStatesEnabled )
@@ -1695,7 +1695,7 @@ bool ToolBox::AlwaysLocked()
u"/org.openoffice.Office.UI.GlobalSettings/Toolbars/States"_ustr ); // note:
case sensitive !
bool bLocked = bool();
- css::uno::Any aValue2 = aNode2.getNodeValue( "Locked" );
+ css::uno::Any aValue2 = aNode2.getNodeValue(
u"Locked"_ustr );
if( aValue2 >>= bLocked )
nAlwaysLocked = bLocked ? 1 : 0;
}
