4 files changed, 6 insertions, 12 deletions
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index fe875b9e5cfc..38e5fbd947cb 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -228,8 +228,7 @@ namespace svxform
 
     void OControlTransferData::buildListFromPath(const weld::TreeView* pTreeBox, const weld::TreeIter* pRoot)
     {
-        ListBoxEntrySet aEmpty;
-        m_aSelectedEntries.swap( aEmpty );
+        ListBoxEntrySet().swap(m_aSelectedEntries);
 
         for (const css::uno::Sequence<sal_uInt32>& rPaths : std::as_const(m_aControlPaths))
         {
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 878f7f60f412..96f10415d48b 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -911,8 +911,7 @@ void FmXFormShell::disposing()
     m_xExtViewTriggerController = nullptr;
     m_xExternalDisplayedForm    = nullptr;
 
-    InterfaceBag aEmpty;
-    m_aCurrentSelection.swap( aEmpty );
+    InterfaceBag().swap(m_aCurrentSelection);
 
     m_aActiveControllerFeatures.dispose();
     m_aNavControllerFeatures.dispose();
@@ -1407,8 +1406,7 @@ void FmXFormShell::ExecuteSearch_Lock()
         return;
 
     // a collection of all (logical) forms
-    FmFormArray aEmpty;
-    m_aSearchForms.swap( aEmpty );
+    FmFormArray().swap(m_aSearchForms);
     ::std::vector< OUString > aContextNames;
     impl_collectFormSearchContexts_nothrow_Lock(
         m_pShell->GetCurPage()->GetForms(), OUString(),
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 0d723fad96bc..d996e3baf970 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -1093,8 +1093,7 @@ namespace svx
             rpObserver->dispose();
         }
 
-        FocusListenerAdapters aEmpty;
-        m_aControlObservers.swap( aEmpty );
+        FocusListenerAdapters().swap(m_aControlObservers);
 
         m_xActiveController.clear();
     }
@@ -1108,8 +1107,7 @@ namespace svx
             rFeature.second->dispose();
         }
 
-        ControlFeatures aEmpty;
-        m_aControlFeatures.swap( aEmpty );
+        ControlFeatures().swap(m_aControlFeatures);
 
         if ( m_aContextMenuObserver )
         {
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 4d6fc09559b8..7f55e21897e8 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1453,8 +1453,7 @@ namespace svxform
                 continue;
             m_xTreeView->set_sensitive(*rEntry, true);
         }
-        ListBoxEntrySet aEmpty;
-        m_aCutEntries.swap( aEmpty );
+        ListBoxEntrySet().swap(m_aCutEntries);
 
         m_bKeyboardCut = false;
     }