summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/appserv.cxx14
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx6
-rw-r--r--sfx2/source/notebookbar/SfxNotebookBar.cxx10
-rw-r--r--sfx2/source/sidebar/ResourceManager.cxx76
4 files changed, 53 insertions, 53 deletions
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;
generated by cgit (git 2.34.1) at 2025-01-23 23:04:32 +0000