[Libreoffice-commits] core.git: include/sfx2 sc/source sfx2/source sw/source

[Libreoffice Gerrit user]

 include/sfx2/bindings.hxx                      |    5 ++---
 sc/source/ui/condformat/condformatdlgentry.cxx |    2 +-
 sfx2/source/dialog/mgetempl.cxx                |    2 +-
 sfx2/source/dialog/templdlg.cxx                |    2 +-
 sw/source/ui/chrdlg/numpara.cxx                |    2 +-
 sw/source/ui/index/cnttab.cxx                  |    4 ++--
 6 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 9ad04dad665f9bfc054d0db4174f18ce154e20fc
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Dec 4 20:02:56 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Dec 5 08:00:23 2018 +0100

    remove unused SfxCallMode enum value
    
    Change-Id: Ie092724ac22088d607f6250fbed764269b3707ba
    Reviewed-on: https://gerrit.libreoffice.org/64571
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 5d1e7b5e4089..38a41a25bcee 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -55,13 +55,12 @@ enum class SfxCallMode : sal_uInt16
     SYNCHRON  = 0x01,    // synchronously in the same Stackframe
     ASYNCHRON = 0x02,    // asynchronously via AppEvent
     RECORD    = 0x04,    // take into account while recording
-    API       = 0x08,    // API call (silent)
-    MODAL     = 0x10     // despite ModalMode
+    API       = 0x08     // API call (silent)
 };
 
 namespace o3tl {
 
-template<> struct typed_flags<SfxCallMode>: is_typed_flags<SfxCallMode, 0x1F>
+template<> struct typed_flags<SfxCallMode>: is_typed_flags<SfxCallMode, 0x0F>
 {};
 
 }
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index f0683d6b302f..2478dfc6323d 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -495,7 +495,7 @@ void StyleSelect( ListBox& rLbStyle, const ScDocument* pDoc, SvxFontPrevWindow&
         // Execute the "new style" slot, complete with undo and all necessary updates.
         // The return value (SfxUInt16Item) is ignored, look for new styles instead.
         pDisp->ExecuteList(SID_STYLE_NEW,
-            SfxCallMode::SYNCHRON | SfxCallMode::RECORD | SfxCallMode::MODAL,
+            SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
             { &aFamilyItem, &aRefItem });
 
         if (bLocked)
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 73dd20d49cf6..6b80a35e4e23 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -372,7 +372,7 @@ bool SfxManageStyleSheetPage::Execute_Impl(
     pItems[ nCount++ ] = nullptr;
 
     const SfxPoolItem* pItem = rDispatcher.Execute(
-        nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD | SfxCallMode::MODAL,
+        nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
         pItems );
 
     return pItem != nullptr;
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 45959e32e135..4e9ffe77520d 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1556,7 +1556,7 @@ bool SfxCommonTemplateDialog_Impl::Execute_Impl(
     DeletionWatcher aDeleted(*this);
     sal_uInt16 nModi = pModifier ? *pModifier : 0;
     const SfxPoolItem* pItem = rDispatcher.Execute(
-        nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD | SfxCallMode::MODAL,
+        nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
         pItems, nModi );
 
     // Dialog can be destroyed while in Execute() because started
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 0a102586c1e4..5b15c5143c57 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -328,7 +328,7 @@ bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl(
     pItems[ nCount++ ] = nullptr;
 
     const SfxPoolItem* pItem = rDispatcher.Execute(
-        nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD | SfxCallMode::MODAL,
+        nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
         pItems );
 
     return pItem != nullptr;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 94aaf4930544..6dac9f18b8c6 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2239,7 +2239,7 @@ IMPL_LINK_NOARG(SwTOXEntryTabPage, EditStyleHdl, Button*, void)
         SfxUInt16Item aFamily(SID_STYLE_FAMILY, sal_uInt16(SfxStyleFamily::Char));
         static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell().
         GetView().GetViewFrame()->GetDispatcher()->ExecuteList(SID_STYLE_EDIT,
-                SfxCallMode::SYNCHRON|SfxCallMode::MODAL,
+                SfxCallMode::SYNCHRON,
                 { &aStyle, &aFamily });
     }
 }
@@ -3717,7 +3717,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, weld::Button&, void)
         SfxUInt16Item aFamily(SID_STYLE_FAMILY, sal_uInt16(SfxStyleFamily::Para));
         SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell();
         rSh.GetView().GetViewFrame()->GetDispatcher()->ExecuteList(SID_STYLE_EDIT,
-                SfxCallMode::SYNCHRON|SfxCallMode::MODAL,
+                SfxCallMode::SYNCHRON,
                 { &aStyle, &aFamily });
     }
 }