use more OUString in sfx slots

Change-Id: I900d9f1d35bc1e620822eedd5722a502704d6de0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166959
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 11 insertions, 11 deletions

diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index f07287ee631c..a56174b96d94 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1513,7 +1513,7 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, std::unique_ptr<SfxPoolI
     if ( xDisp.is() || !pCache )
     {
         const SfxSlot* pSlot = SfxSlotPool::GetSlotPool( pDispatcher->GetFrame() ).GetSlot( nSlot );
-        if ( !pSlot || pSlot->pUnoName.isEmpty() )
+        if ( !pSlot || pSlot->aUnoName.isEmpty() )
             return SfxItemState::DISABLED;
 
         css::util::URL aURL;
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index c15c46c86f66..9df69d00c5d4 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -45,10 +45,10 @@ sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const
 
 OUString SfxSlot::GetCommand() const
 {
-    if("FocusToFindbar" == pUnoName)
-        return "vnd.sun.star.findbar:" + pUnoName;
+    if("FocusToFindbar" == aUnoName)
+        return "vnd.sun.star.findbar:" + aUnoName;
     else
-        return ".uno:" + pUnoName;
+        return ".uno:" + aUnoName;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index e58475c325f1..edb17a3f8bb3 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -576,10 +576,10 @@ void SfxRequest::Done_Impl
 
     // recordable?
     // new Recording uses UnoName!
-    SAL_WARN_IF( pImpl->pSlot->pUnoName.isEmpty(), "sfx", "Recording not exported slot: "
+    SAL_WARN_IF( pImpl->pSlot->aUnoName.isEmpty(), "sfx", "Recording not exported slot: "
                     << pImpl->pSlot->GetSlotId() );
 
-    if ( pImpl->pSlot->pUnoName.isEmpty() ) // playing it safe
+    if ( pImpl->pSlot->aUnoName.isEmpty() ) // playing it safe
         return;
 
     // often required values
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 3511d33ff69d..f368d3d2824d 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -562,7 +562,7 @@ void SfxShell::SetVerbs(const css::uno::Sequence < css::embed::VerbDescriptor >&
         if (nSlotId > SID_VERB_END)
             break;
 
-        SfxSlot* pNewSlot = new SfxSlot(
+        SfxSlot* pNewSlot = new SfxSlot{
             nSlotId, SfxGroupId::NONE,
             // Verb slots must be executed asynchronously, so that they can be
             // destroyed while executing.
@@ -570,7 +570,7 @@ void SfxShell::SetVerbs(const css::uno::Sequence < css::embed::VerbDescriptor >&
             0, 0,
             SFX_STUB_PTR(SfxShell, VerbExec), SFX_STUB_PTR(SfxShell, VerbState),
             nullptr, // HACK(SFX_TYPE(SfxVoidItem)) ???
-            nullptr, nullptr, 0, SfxDisableFlags::NONE, "");
+            nullptr, nullptr, 0, SfxDisableFlags::NONE, u""_ustr};
 
         if (!pImpl->aSlotArr.empty())
         {
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 7ce4f11e3ff2..daf1f37a56c3 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -245,7 +245,7 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons
                 // get the slot - even if it is disabled on the dispatcher
                 pSlot = SfxSlotPool::GetSlotPool( rDispat.GetFrame() ).GetSlot( nId );
 
-            if ( !pSlot || pSlot->pUnoName.isEmpty() )
+            if ( !pSlot || pSlot->aUnoName.isEmpty() )
             {
                 bSlotDirty = false;
                 bCtrlDirty = true;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index c6250e27d170..7d518f435d81 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -335,7 +335,7 @@ SfxDispatchController_Impl::SfxDispatchController_Impl(
     , bMasterSlave( false )
     , bVisible( true )
 {
-    if ( aDispatchURL.Protocol == "slot:" && !pSlot->pUnoName.isEmpty() )
+    if ( aDispatchURL.Protocol == "slot:" && !pSlot->aUnoName.isEmpty() )
     {
         aDispatchURL.Complete = pSlot->GetCommand();
         Reference< XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
@@ -658,7 +658,7 @@ void SfxDispatchController_Impl::dispatch( const css::util::URL& aURL,
                         sal_Int32 nIndex = lNewArgs.getLength();
                         lNewArgs.realloc( nIndex+1 );
                         auto plNewArgs = lNewArgs.getArray();
-                        plNewArgs[nIndex].Name   = pSlot->pUnoName;
+                        plNewArgs[nIndex].Name   = pSlot->aUnoName;
                         plNewArgs[nIndex].Value  <<= SfxDispatchController_Impl::getSlaveCommand( aDispatchURL );
                     }