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

[Caolán McNamara]

 sw/source/uibase/dbui/dbmgr.cxx |   12 +++++-------
 sw/source/uibase/dbui/dbui.cxx  |    8 ++++----
 sw/source/uibase/inc/dbui.hxx   |    4 ++--
 3 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit b16ad4e2329b1c7886b6559233f11eb3bdb9f1d0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon May 14 09:57:09 2018 +0100

    modal is always false
    
    Change-Id: Id6b5a9ef7820b54342e3a7132040c8d500c2e3f2
    Reviewed-on: https://gerrit.libreoffice.org/54302
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index c4ed68804959..9430342bc158 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1318,13 +1318,11 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
     {
         // construct the process dialog
         pSourceWindow = &pSourceShell->GetView().GetEditWin();
-        vcl::Window* pParent = pSourceWindow;
-        if( !bMT_PRINTER )
-            pProgressDlg = VclPtr<CreateMonitor>::Create(
-                pParent, pParent != pSourceWindow );
-        else {
-            pProgressDlg = VclPtr<PrintMonitor>::Create(
-                pParent, pParent != pSourceWindow);
+        if (!bMT_PRINTER)
+            pProgressDlg = VclPtr<CreateMonitor>::Create(pSourceWindow);
+        else
+        {
+            pProgressDlg = VclPtr<PrintMonitor>::Create(pSourceWindow);
             static_cast<PrintMonitor*>( pProgressDlg.get() )->SetText(
                 pSourceDocSh->GetTitle(22) );
         }
diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx
index 02ebdfdfc043..9ed1334bb8b7 100644
--- a/sw/source/uibase/dbui/dbui.cxx
+++ b/sw/source/uibase/dbui/dbui.cxx
@@ -36,8 +36,8 @@ SaveMonitor::~SaveMonitor()
 {
 }
 
-PrintMonitor::PrintMonitor(vcl::Window *pParent, bool modal)
-    : CancelableDialog(pParent, modal, "PrintMonitorDialog",
+PrintMonitor::PrintMonitor(vcl::Window *pParent)
+    : CancelableDialog(pParent, false, "PrintMonitorDialog",
         "modules/swriter/ui/printmonitordialog.ui")
 {
     get(m_pDocName, "docname");
@@ -62,8 +62,8 @@ void PrintMonitor::dispose()
 }
 
 // Progress Indicator for Creation of personalized Mail Merge documents:
-CreateMonitor::CreateMonitor( vcl::Window *pParent, bool modal )
-    : CancelableDialog(pParent, modal, "MMCreatingDialog",
+CreateMonitor::CreateMonitor(vcl::Window *pParent)
+    : CancelableDialog(pParent, false, "MMCreatingDialog",
         "modules/swriter/ui/mmcreatingdialog.ui")
     , m_sCountingPattern()
     , m_sVariable_Total("%Y")
diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx
index b180b73beb66..b313834d863b 100644
--- a/sw/source/uibase/inc/dbui.hxx
+++ b/sw/source/uibase/inc/dbui.hxx
@@ -53,7 +53,7 @@ public:
     VclPtr<FixedText> m_pPrinter;
     VclPtr<FixedText> m_pPrintInfo;
 
-    PrintMonitor(vcl::Window *pParent, bool modal);
+    PrintMonitor(vcl::Window *pParent);
     virtual ~PrintMonitor() override;
     virtual void dispose() override;
 };
@@ -73,7 +73,7 @@ public:
 class CreateMonitor : public CancelableDialog
 {
 public:
-    CreateMonitor( vcl::Window *pParent, bool modal );
+    CreateMonitor(vcl::Window *pParent);
     virtual ~CreateMonitor() override;
     virtual void dispose() override;