Kaydet (Commit) 82289b3a authored tarafından Caolán McNamara's avatar Caolán McNamara

drop newly unused code

Change-Id: Ie907cfb4bed26cade09cf1c365a5e4cbc9aea31b
Reviewed-on: https://gerrit.libreoffice.org/60712Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst d6cee8ad
...@@ -32,104 +32,6 @@ ...@@ -32,104 +32,6 @@
#include <cuigrfflt.hxx> #include <cuigrfflt.hxx>
#include <svx/dialogs.hrc> #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() CuiGraphicPreviewWindow::CuiGraphicPreviewWindow()
: mpOrigGraphic(nullptr) : mpOrigGraphic(nullptr)
, mfScaleX(0.0) , mfScaleX(0.0)
...@@ -223,54 +125,6 @@ void CuiGraphicPreviewWindow::Resize() ...@@ -223,54 +125,6 @@ void CuiGraphicPreviewWindow::Resize()
ScaleImageToFit(); 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, GraphicFilterDialogController::GraphicFilterDialogController(weld::Window* pParent,
const OUString& rUIXMLDescription, const OString& rID, const OUString& rUIXMLDescription, const OString& rID,
const Graphic& rGraphic) const Graphic& rGraphic)
......
...@@ -188,7 +188,6 @@ short AbstractSvxPathSelectDialog_Impl::Execute() ...@@ -188,7 +188,6 @@ short AbstractSvxPathSelectDialog_Impl::Execute()
IMPL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl); IMPL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractGraphicFilterDialog_Impl);
short AbstractGraphicFilterDialogController_Impl::Execute() short AbstractGraphicFilterDialogController_Impl::Execute()
{ {
...@@ -814,11 +813,6 @@ void AbstractFmSearchDialog_Impl::SetActiveField(const OUString& strField) ...@@ -814,11 +813,6 @@ void AbstractFmSearchDialog_Impl::SetActiveField(const OUString& strField)
pDlg->SetActiveField(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) Graphic AbstractGraphicFilterDialogController_Impl::GetFilteredGraphic(const Graphic& rGraphic, double fScaleX, double fScaleY)
{ {
return m_xDlg->GetFilteredGraphic(rGraphic, fScaleX, fScaleY); return m_xDlg->GetFilteredGraphic(rGraphic, fScaleX, fScaleY);
......
...@@ -470,12 +470,6 @@ class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog ...@@ -470,12 +470,6 @@ class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog
virtual void SetActiveField(const OUString& strField) override; 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 class AbstractGraphicFilterDialogController_Impl : public AbstractGraphicFilterDialog
{ {
protected: protected:
......
...@@ -32,38 +32,6 @@ ...@@ -32,38 +32,6 @@
#include <svx/dlgctrl.hxx> #include <svx/dlgctrl.hxx>
#include <svx/rectenum.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 class CuiGraphicPreviewWindow : public weld::CustomWidgetController
{ {
private: private:
...@@ -100,33 +68,6 @@ public: ...@@ -100,33 +68,6 @@ public:
const Size& GetGraphicSizePixel() const { return maOrigGraphicSizePixel; } 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 class GraphicFilterDialogController : public weld::GenericDialogController
{ {
private: private:
......
...@@ -212,9 +212,6 @@ ...@@ -212,9 +212,6 @@
<glade-widget-class title="Number Preview" name="cuilo-SvxNumberPreview" <glade-widget-class title="Number Preview" name="cuilo-SvxNumberPreview"
generic-name="Number Preview Window" parent="GtkDrawingArea" generic-name="Number Preview Window" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/> 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" <glade-widget-class title="Html Attribute Preview" name="sduilo-SdHtmlAttrPreview"
generic-name="Html Attribute Preview" parent="GtkDrawingArea" generic-name="Html Attribute Preview" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/> icon-name="widget-gtk-drawingarea"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment