extras/source/glade/libreoffice-catalog.xml.in | 3 ---
sw/source/ui/misc/outline.cxx | 24 ------------------------
sw/source/uibase/inc/numprevw.hxx | 16 ----------------
3 files changed, 43 deletions(-)
New commits:
commit d311c57f8a439d1b6f127ff1b0a852089dfc3033
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jun 14 13:25:34 2018 +0100
swuilo-NumberingPreview is now unused
Change-Id: Ieba56962ae1986686ae649ac15ba721a3fbfae5e
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 37e57b1c4c83..6fa17e231fec 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -269,9 +269,6 @@
<glade-widget-class title="Document Preview Window"
name="sdlo-SdDocPreviewWin"
generic-name="Document Preview Window"
parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
- <glade-widget-class title="Writer Number Preview"
name="swuilo-NumberingPreview"
- generic-name="Writer Number Preview Window"
parent="GtkDrawingArea"
- icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Background Preview"
name="cuilo-BackgroundPreview"
generic-name="Background Preview Window"
parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index f5ea3b36cee0..e1d428e23ef8 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -851,25 +851,6 @@ static long lcl_DrawGraphic(vcl::RenderContext* pVDev,
const SwNumFormat &rForma
return nRet;
}
-VCL_BUILDER_FACTORY(NumberingPreview)
-
-// paint numbering's preview
-void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& /*rRect*/)
-{
- const Size aSize(rRenderContext.PixelToLogic(GetOutputSizePixel()));
-
- ScopedVclPtrInstance<VirtualDevice> pVDev(rRenderContext);
- pVDev->SetMapMode(rRenderContext.GetMapMode());
- pVDev->SetOutputSize(aSize);
-
- // #101524# OJ
-
pVDev->SetFillColor(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor());
-
pVDev->SetLineColor(rRenderContext.GetSettings().GetStyleSettings().GetButtonTextColor());
- pVDev->DrawRect(tools::Rectangle(Point(0,0), aSize));
-
- rRenderContext.DrawOutDev(Point(0,0), aSize, Point(0,0), aSize, *pVDev);
-}
-
void SwNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&)
{
const Size aSize(rRenderContext.PixelToLogic(GetOutputSizePixel()));
@@ -1074,9 +1055,4 @@ void SwNumberingPreview::Paint(vcl::RenderContext&
rRenderContext, const tools::
rRenderContext.DrawOutDev(Point(0,0), aSize, Point(0,0), aSize, *pVDev);
}
-
-NumberingPreview::~NumberingPreview()
-{
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/numprevw.hxx
b/sw/source/uibase/inc/numprevw.hxx
index 8b28e2646d9e..cb8cc0b4dedd 100644
--- a/sw/source/uibase/inc/numprevw.hxx
+++ b/sw/source/uibase/inc/numprevw.hxx
@@ -26,22 +26,6 @@
class SwNumRule;
namespace rtl { class OUString; }
-class NumberingPreview : public vcl::Window
-{
- vcl::Font aStdFont;
-
- protected:
- virtual void Paint( vcl::RenderContext& /*rRenderContext*/,
const tools::Rectangle& rRect ) override;
-
- public:
- NumberingPreview(vcl::Window* pParent)
- : Window(pParent)
- {
- }
-
- virtual ~NumberingPreview() override;
-};
-
class SwNumberingPreview : public weld::CustomWidgetController
{
const SwNumRule* pActNum;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
