cui/source/dialogs/cuigrfflt.cxx | 146 -------------------------
cui/source/factory/dlgfact.cxx | 6 -
cui/source/factory/dlgfact.hxx | 6 -
cui/source/inc/cuigrfflt.hxx | 59 ----------
extras/source/glade/libreoffice-catalog.xml.in | 3
5 files changed, 220 deletions(-)
New commits:
commit 82289b3a122378133ca6ccf2e8b20c76d5219a8a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Sep 18 14:43:20 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Sep 19 16:52:53 2018 +0200
drop newly unused code
Change-Id: Ie907cfb4bed26cade09cf1c365a5e4cbc9aea31b
Reviewed-on: https://gerrit.libreoffice.org/60712
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index f489112798c4..1299c6a33d87 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -32,104 +32,6 @@
#include <cuigrfflt.hxx>
#include <svx/dialogs.hrc>
-
-GraphicPreviewWindow::GraphicPreviewWindow(vcl::Window* pParent,
- const WinBits nStyle)
- : Control(pParent, nStyle)
- , mpOrigGraphic(nullptr)
- , mfScaleX(0.0)
- , mfScaleY(0.0)
-{
-}
-
-VCL_BUILDER_FACTORY_CONSTRUCTOR(GraphicPreviewWindow, WB_TABSTOP)
-
-Size GraphicPreviewWindow::GetOptimalSize() const
-{
- return LogicToPixel(Size(81, 73), MapMode(MapUnit::MapAppFont));
-}
-
-
-void GraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const
::tools::Rectangle& rRect)
-{
- Control::Paint(rRenderContext, rRect);
-
- const Size aOutputSize(GetOutputSizePixel());
-
- if (maPreview.IsAnimated())
- {
- const Size
aGraphicSize(rRenderContext.LogicToPixel(maPreview.GetPrefSize(),
maPreview.GetPrefMapMode()));
- const Point aGraphicPosition((aOutputSize.Width() -
aGraphicSize.Width() ) >> 1,
- (aOutputSize.Height() -
aGraphicSize.Height() ) >> 1);
- maPreview.StartAnimation(&rRenderContext, aGraphicPosition,
aGraphicSize);
- }
- else
- {
- const Size aGraphicSize(maPreview.GetSizePixel());
- const Point aGraphicPosition((aOutputSize.Width() -
aGraphicSize.Width()) >> 1,
- (aOutputSize.Height() -
aGraphicSize.Height()) >> 1);
- maPreview.Draw(&rRenderContext, aGraphicPosition, aGraphicSize);
- }
-}
-
-
-void GraphicPreviewWindow::SetPreview(const Graphic& rGraphic)
-{
- maPreview = rGraphic;
- Invalidate();
-}
-
-void GraphicPreviewWindow::ScaleImageToFit()
-{
- if (!mpOrigGraphic)
- return;
-
- maScaledOrig = *mpOrigGraphic;
-
- const Size aPreviewSize( GetOutputSizePixel() );
- Size aSizePixel(LogicToPixel(mpOrigGraphic->GetPrefSize(),
- mpOrigGraphic->GetPrefMapMode()));
- Size aGrfSize(aSizePixel);
-
- if( mpOrigGraphic->GetType() == GraphicType::Bitmap &&
- aPreviewSize.Width() && aPreviewSize.Height() &&
- aGrfSize.Width() && aGrfSize.Height() )
- {
- const double fGrfWH = static_cast<double>(aGrfSize.Width()) /
aGrfSize.Height();
- const double fPreWH = static_cast<double>(aPreviewSize.Width()) /
aPreviewSize.Height();
-
- if( fGrfWH < fPreWH )
- {
- aGrfSize.setWidth( static_cast<long>( aPreviewSize.Height() *
fGrfWH ) );
- aGrfSize.setHeight( aPreviewSize.Height() );
- }
- else
- {
- aGrfSize.setWidth( aPreviewSize.Width() );
- aGrfSize.setHeight( static_cast<long>( aPreviewSize.Width() /
fGrfWH ) );
- }
-
- mfScaleX = static_cast<double>(aGrfSize.Width()) / aSizePixel.Width();
- mfScaleY = static_cast<double>(aGrfSize.Height()) /
aSizePixel.Height();
-
- if( !mpOrigGraphic->IsAnimated() )
- {
- BitmapEx aBmpEx( mpOrigGraphic->GetBitmapEx() );
-
- if( aBmpEx.Scale( aGrfSize ) )
- maScaledOrig = aBmpEx;
- }
- }
-
- maModifyHdl.Call(nullptr);
-}
-
-void GraphicPreviewWindow::Resize()
-{
- Control::Resize();
- ScaleImageToFit();
-}
-
CuiGraphicPreviewWindow::CuiGraphicPreviewWindow()
: mpOrigGraphic(nullptr)
, mfScaleX(0.0)
@@ -223,54 +125,6 @@ void CuiGraphicPreviewWindow::Resize()
ScaleImageToFit();
}
-GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent,
- const OUString& rID, const OUString& rUIXMLDescription,
- const Graphic& rGraphic)
- : ModalDialog(pParent, rID, rUIXMLDescription)
- , maModifyHdl(LINK( this, GraphicFilterDialog, ImplModifyHdl))
- , maSizePixel(LogicToPixel(rGraphic.GetPrefSize(),
- rGraphic.GetPrefMapMode()))
-{
- bIsBitmap = rGraphic.GetType() == GraphicType::Bitmap;
-
- maTimer.SetInvokeHandler( LINK( this, GraphicFilterDialog,
ImplPreviewTimeoutHdl ) );
- maTimer.SetTimeout( 5 );
-
- get(mpPreview, "preview");
- mpPreview->init(&rGraphic, maModifyHdl);
-}
-
-
-GraphicFilterDialog::~GraphicFilterDialog()
-{
- disposeOnce();
-}
-
-
-void GraphicFilterDialog::dispose()
-{
- mpPreview.clear();
- ModalDialog::dispose();
-}
-
-
-IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void)
-{
- maTimer.Stop();
- mpPreview->SetPreview(GetFilteredGraphic(mpPreview->GetScaledOriginal(),
- mpPreview->GetScaleX(), mpPreview->GetScaleY()));
-}
-
-
-IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void)
-{
- if (bIsBitmap)
- {
- maTimer.Stop();
- maTimer.Start();
- }
-}
-
GraphicFilterDialogController::GraphicFilterDialogController(weld::Window*
pParent,
const OUString& rUIXMLDescription, const OString& rID,
const Graphic& rGraphic)
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index c6cc366e97a1..fe4363606089 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -188,7 +188,6 @@ short AbstractSvxPathSelectDialog_Impl::Execute()
IMPL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl);
-IMPL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl);
short AbstractGraphicFilterDialogController_Impl::Execute()
{
@@ -814,11 +813,6 @@ void AbstractFmSearchDialog_Impl::SetActiveField(const
OUString& strField)
pDlg->SetActiveField(strField);
}
-Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic( const Graphic&
rGraphic, double fScaleX, double fScaleY )
-{
- return pDlg->GetFilteredGraphic( rGraphic, fScaleX, fScaleY );
-}
-
Graphic AbstractGraphicFilterDialogController_Impl::GetFilteredGraphic(const
Graphic& rGraphic, double fScaleX, double fScaleY)
{
return m_xDlg->GetFilteredGraphic(rGraphic, fScaleX, fScaleY);
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 59b9dd574de8..615f56e52cb1 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -470,12 +470,6 @@ class AbstractFmSearchDialog_Impl :public
AbstractFmSearchDialog
virtual void SetActiveField(const OUString& strField) override;
};
-class AbstractGraphicFilterDialog_Impl :public AbstractGraphicFilterDialog
-{
- DECL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl,GraphicFilterDialog)
- virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double
fScaleX, double fScaleY ) override;
-};
-
class AbstractGraphicFilterDialogController_Impl : public
AbstractGraphicFilterDialog
{
protected:
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 48ee3f3b25de..5e70e23ed2c6 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -32,38 +32,6 @@
#include <svx/dlgctrl.hxx>
#include <svx/rectenum.hxx>
-class GraphicPreviewWindow : public Control
-{
-private:
- const Graphic* mpOrigGraphic;
- Link<LinkParamNone*,void> maModifyHdl;
- Graphic maScaledOrig;
- Graphic maPreview;
- double mfScaleX;
- double mfScaleY;
-
- virtual void Paint(vcl::RenderContext& rRenderContext, const
::tools::Rectangle& rRect) override;
- virtual void Resize() override;
- virtual Size GetOptimalSize() const override;
-
- void ScaleImageToFit();
-
-public:
-
- GraphicPreviewWindow(vcl::Window* pParent, WinBits nStyle);
- void init(const Graphic* pOrigGraphic, const Link<LinkParamNone*,void>&
rLink)
- {
- mpOrigGraphic = pOrigGraphic;
- maModifyHdl = rLink;
- ScaleImageToFit();
- }
-
- void SetPreview(const Graphic& rGraphic);
- const Graphic& GetScaledOriginal() const { return maScaledOrig; }
- double GetScaleX() const { return mfScaleX; }
- double GetScaleY() const { return mfScaleY; }
-};
-
class CuiGraphicPreviewWindow : public weld::CustomWidgetController
{
private:
@@ -100,33 +68,6 @@ public:
const Size& GetGraphicSizePixel() const { return
maOrigGraphicSizePixel; }
};
-class GraphicFilterDialog : public ModalDialog
-{
-private:
-
- Timer maTimer;
- Link<LinkParamNone*,void> maModifyHdl;
- Size maSizePixel;
- bool bIsBitmap;
-
- DECL_LINK( ImplPreviewTimeoutHdl, Timer *, void );
- DECL_LINK( ImplModifyHdl, LinkParamNone*, void);
-
-protected:
- VclPtr<GraphicPreviewWindow> mpPreview;
-
- const Link<LinkParamNone*,void>& GetModifyHdl() const { return
maModifyHdl; }
- const Size& GetGraphicSizePixel() const { return maSizePixel; }
-
-public:
-
- GraphicFilterDialog(vcl::Window* pParent, const OUString& rID, const
OUString& rUIXMLDescription, const Graphic& rGraphic);
- virtual ~GraphicFilterDialog() override;
- virtual void dispose() override;
-
- virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double
fScaleX, double fScaleY ) = 0;
-};
-
class GraphicFilterDialogController : public weld::GenericDialogController
{
private:
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index fb4d816ffc15..3a4be0511258 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -212,9 +212,6 @@
<glade-widget-class title="Number Preview" name="cuilo-SvxNumberPreview"
generic-name="Number Preview Window"
parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
- <glade-widget-class title="Graphic Preview"
name="cuilo-GraphicPreviewWindow"
- generic-name="Graphic Preview Window"
parent="GtkDrawingArea"
- icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Html Attribute Preview"
name="sduilo-SdHtmlAttrPreview"
generic-name="Html Attribute Preview"
parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
