fpicker/source/office/fpdialogbase.hxx | 2 +-
include/vcl/dialog.hxx | 2 +-
vcl/qa/cppunit/lifecycle.cxx | 2 +-
vcl/source/window/dialog.cxx | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 54960717cded98c5f73a752271375daf08129a18
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Oct 19 17:05:51 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Oct 19 21:04:38 2019 +0200
strip Dialog ctor down
Change-Id: Ic00f5a5fe562022524c60a23509722f9e2406524
Reviewed-on: https://gerrit.libreoffice.org/81135
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/fpicker/source/office/fpdialogbase.hxx
b/fpicker/source/office/fpdialogbase.hxx
index c49c6d56b638..5b921b9379d0 100644
--- a/fpicker/source/office/fpdialogbase.hxx
+++ b/fpicker/source/office/fpdialogbase.hxx
@@ -66,7 +66,7 @@ class SvtFileDialog_Base : public Dialog, public
::svt::IFilePickerController
{
public:
SvtFileDialog_Base( vcl::Window* pParent, const OUString& rID, const
OUString& rUIXMLDescription )
- : Dialog( pParent, rID, rUIXMLDescription, WindowType::MODALDIALOG,
InitFlag::Default )
+ : Dialog(pParent, rID, rUIXMLDescription)
{
}
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 15827443ba45..275dd6c76b57 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -82,7 +82,7 @@ public:
protected:
explicit Dialog( WindowType nType );
- explicit Dialog( vcl::Window* pParent, const OUString& rID, const
OUString& rUIXMLDescription, WindowType nType, InitFlag eFlag =
InitFlag::Default );
+ explicit Dialog( vcl::Window* pParent, const OUString& rID, const
OUString& rUIXMLDescription);
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size&
rSize, DrawFlags nFlags ) override;
virtual void settingOptimalLayoutSize(Window *pBox) override;
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index ff057eff3bb4..51d90776bb44 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -297,7 +297,7 @@ void LifecycleTest::testLeakage()
aObjects.push_back(LeakTestObject::Create<VclVButtonBox>(xVBox));
}
- aObjects.push_back(LeakTestObject::Create<Dialog>(xParent,
"PrintProgressDialog", "vcl/ui/printprogressdialog.ui",
WindowType::MODALDIALOG));
+ aObjects.push_back(LeakTestObject::Create<Dialog>(xParent,
"PrintProgressDialog", "vcl/ui/printprogressdialog.ui"));
xParent.clear();
for (auto i = aObjects.rbegin(); i != aObjects.rend(); ++i)
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index f0c54aef9b9c..3bba7d2fc787 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -558,9 +558,9 @@ void Dialog::doDeferredInit(WinBits nBits)
mbIsDeferredInit = false;
}
-Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString&
rUIXMLDescription, WindowType nType, InitFlag eFlag)
- : SystemWindow(nType)
- , mnInitFlag(eFlag)
+Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString&
rUIXMLDescription)
+ : SystemWindow(WindowType::DIALOG)
+ , mnInitFlag(InitFlag::Default)
{
ImplLOKNotifier(pParent);
ImplInitDialogData();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
