summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2024-05-08 10:36:51 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2024-05-11 23:05:30 +0200
commit9dac3118ee80bea900cede71e4ef616bad165401 (patch)
treeb63486d7281cf9f0e22c9c650a9523e1b89565c0
parentreplace createFromAscii with OUString literals in ImageManagerImpl (diff)
downloadcore-9dac3118ee80bea900cede71e4ef616bad165401.tar.gz
core-9dac3118ee80bea900cede71e4ef616bad165401.zip
replace createFromAscii with OUString literals in OConfigurationNode
Change-Id: I6029cd4c894c6ab079cc508ba15df41ec5d4f8db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167516 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins
-rw-r--r--connectivity/source/commontools/dbtools2.cxx2
-rw-r--r--cui/source/customize/CustomNotebookbarGenerator.cxx4
-rw-r--r--include/unotools/confignode.hxx5
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx4
-rw-r--r--sfx2/source/notebookbar/SfxNotebookBar.cxx2
-rw-r--r--uui/source/iahndl.cxx2
6 files changed, 7 insertions, 12 deletions
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index f43cd2f77d89..e6088c513711 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -950,7 +950,7 @@ OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >&
aReportEngines.getNodeValue("DefaultReportEngine") >>= sDefaultReportEngineName;
if ( !sDefaultReportEngineName.isEmpty() )
{
- ::utl::OConfigurationNode aReportEngineNames = aReportEngines.openNode("ReportEngineNames");
+ ::utl::OConfigurationNode aReportEngineNames = aReportEngines.openNode(u"ReportEngineNames"_ustr);
if ( aReportEngineNames.isValid() )
{
::utl::OConfigurationNode aReportEngine = aReportEngineNames.openNode(sDefaultReportEngineName);
diff --git a/cui/source/customize/CustomNotebookbarGenerator.cxx b/cui/source/customize/CustomNotebookbarGenerator.cxx
index 20610dc9b096..df065fb81e7b 100644
--- a/cui/source/customize/CustomNotebookbarGenerator.cxx
+++ b/cui/source/customize/CustomNotebookbarGenerator.cxx
@@ -258,7 +258,7 @@ Sequence<OUString> CustomNotebookbarGenerator::getCustomizedUIItem(OUString sNot
const utl::OConfigurationTreeRoot aAppNode(::comphelper::getProcessComponentContext(), aPath,
false);
- const utl::OConfigurationNode aModesNode = aAppNode.openNode("Modes");
+ const utl::OConfigurationNode aModesNode = aAppNode.openNode(u"Modes"_ustr);
const utl::OConfigurationNode aModeNode(aModesNode.openNode(sNotebookbarConfigType));
const Any aValue = aModeNode.getNodeValue("UIItemProperties");
Sequence<OUString> aValues;
@@ -272,7 +272,7 @@ void CustomNotebookbarGenerator::setCustomizedUIItem(const Sequence<OUString>& r
OUString aPath = getAppNameRegistryPath();
const utl::OConfigurationTreeRoot aAppNode(::comphelper::getProcessComponentContext(), aPath,
true);
- const utl::OConfigurationNode aModesNode = aAppNode.openNode("Modes");
+ const utl::OConfigurationNode aModesNode = aAppNode.openNode(u"Modes"_ustr);
const utl::OConfigurationNode aModeNode(aModesNode.openNode(rNotebookbarConfigType));
css::uno::Any aUIItemProperties(rUIItemProperties);
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index 946825aa4821..c95acd8bdbdb 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -81,11 +81,6 @@ namespace utl
*/
OConfigurationNode openNode(const OUString& _rPath) const noexcept;
- OConfigurationNode openNode( const char* _pAsciiPath ) const
- {
- return openNode( OUString::createFromAscii( _pAsciiPath ) );
- }
-
/** create a new child node
If the object represents a set node, this method may be used to create a new child. For non-set-nodes, the
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index e4f210c59765..dfa9d0295466 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -254,7 +254,7 @@ namespace sfx2
// go for all the single class entries
OConfigurationNode aFilterClassesNode =
- _rFilterClassification.openNode( "GlobalFilters/Classes" );
+ _rFilterClassification.openNode( u"GlobalFilters/Classes"_ustr );
const Sequence< OUString > aFilterClasses = aFilterClassesNode.getNodeNames();
::std::for_each(
aFilterClasses.begin(),
@@ -298,7 +298,7 @@ namespace sfx2
// the node for the local classes
OConfigurationNode aFilterClassesNode =
- _rFilterClassification.openNode( "LocalFilters/Classes" );
+ _rFilterClassification.openNode( u"LocalFilters/Classes"_ustr );
const Sequence< OUString > aFilterClasses = aFilterClassesNode.getNodeNames();
::std::for_each(
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 3fa8ea694626..4866db50c866 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -354,7 +354,7 @@ bool SfxNotebookBar::IsActive(bool bConsiderSingleToolbar)
if (comphelper::LibreOfficeKit::isActive() && aActive == "notebookbar_online.ui")
return true;
- const utl::OConfigurationNode aModesNode = aAppNode.openNode("Modes");
+ const utl::OConfigurationNode aModesNode = aAppNode.openNode(u"Modes"_ustr);
const Sequence<OUString> aModeNodeNames( aModesNode.getNodeNames() );
for ( const auto& rModeNodeName : aModeNodeNames )
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 291d3f18e844..2f039a85fc67 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -334,7 +334,7 @@ bool UUIInteractionHelper::handleTypedHandlerImplementations( Reference< XIntera
for ( auto const & handlerName : aRegisteredHandlers )
{
const ::utl::OConfigurationNode aHandlerNode( aConfigRoot.openNode( handlerName ) );
- const ::utl::OConfigurationNode aTypesNode( aHandlerNode.openNode( "HandledRequestTypes" ) );
+ const ::utl::OConfigurationNode aTypesNode( aHandlerNode.openNode( u"HandledRequestTypes"_ustr ) );
// loop through all the types which the current handler is registered for
const Sequence< OUString > aHandledTypes( aTypesNode.getNodeNames() );