summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPranav Kant <pranavk@collabora.co.uk>2017-11-30 23:35:05 +0530
committerJan Holesovsky <kendy@collabora.com>2017-12-04 13:03:06 +0100
commit04f29d8c61111f12410b0526fa07852e49ce8560 (patch)
treeaaf59ac8f155a30534028da8467bf3b3c7a975f8
parent0002dfb6d723dfc7c29b5344240de4a525fa49a2 (diff)
lokdialog: Kill some code; use already existing method to paint
This is not require now in the new approach where the dialog is already created by the time paint request call for dialog happens. Layouting is already complete by that time. Change-Id: I610b050a268e61e8d4036aa7eb5766cf0c8b37e0
-rw-r--r--desktop/source/lib/init.cxx2
-rw-r--r--include/vcl/dialog.hxx3
-rw-r--r--include/vcl/window.hxx1
-rw-r--r--vcl/source/window/dialog.cxx11
-rw-r--r--vcl/source/window/window.cxx9
5 files changed, 1 insertions, 25 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 1ca906185de4..98d3ac7c86a7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3337,7 +3337,7 @@ static void doc_paintWindow(LibreOfficeKitDocument* /*pThis*/, unsigned nLOKWind
pDevice->SetMapMode(aMapMode);
comphelper::LibreOfficeKit::setDialogPainting(true);
- pWindow->paintDialog(*pDevice.get());
+ pWindow->PaintToDevice(pDevice.get(), Point(0, 0), Size());
comphelper::LibreOfficeKit::setDialogPainting(false);
}
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 8f01f32cec3f..83a80eed84e6 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -68,9 +68,6 @@ public:
void InvalidateFloatingWindow(const Point& rPos);
void CloseFloatingWindow();
- /// Paints the current dialog to the given virtual device
- void paintDialog(VirtualDevice& rDevice) override;
-
protected:
explicit Dialog( WindowType nType );
explicit Dialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, WindowType nType, InitFlag eFlag = InitFlag::Default );
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index fa75822c563e..489a200b5cbf 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1216,7 +1216,6 @@ public:
static VclPtr<Window> FindLOKWindow(vcl::LOKWindowId nWindowId);
/// Dialog / window tunneling related methods.
- virtual void paintDialog(VirtualDevice& rDevice);
Size PaintActiveFloatingWindow(VirtualDevice& rDevice) const;
void LogicMouseButtonDown(const MouseEvent& rMouseEvent);
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 8383e29eed4d..976e26751a07 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -883,17 +883,6 @@ bool Dialog::selectPageByUIXMLDescription(const OString& /*rUIXMLDescription*/)
return true;
}
-void Dialog::paintDialog(VirtualDevice& rDevice)
-{
- setDeferredProperties();
- ImplAdjustNWFSizes();
- Show();
- ToTop();
- ensureRepaint();
-
- PaintToDevice(&rDevice, Point(0, 0), Size());
-}
-
void Dialog::InvalidateFloatingWindow(const Point& rPos)
{
if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 3a8444f80c59..be2855057397 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3240,15 +3240,6 @@ vcl::LOKWindowId Window::GetLOKWindowId() const
return mpWindowImpl->mnLOKWindowId;
}
-void Window::paintDialog(VirtualDevice& rDevice)
-{
- // FIXME are these two necessary?
- Show();
- ToTop();
-
- PaintToDevice(&rDevice, Point(0, 0), Size());
-}
-
Size Window::PaintActiveFloatingWindow(VirtualDevice& rDevice) const
{
Size aRet;