/unotools/

diff options


context:
space:
mode:

author	Caolán McNamara <caolanm@redhat.com>	2019-10-08 14:31:24 +0100
committer	Caolán McNamara <caolanm@redhat.com>	2019-10-09 13:15:08 +0200
commit	dc78b82db539401cc7e63d96f4727e1e884b86cb (patch)
tree	6421310e52bf4daa2719c6f16d107cfd3823f6d9 /sd
parent	9bb0219e8284a99dd1caf6aa50cd9a5b85e8f7a3 (diff)

Related: tdf#123765 fix up some screenshotting

and add in two special cases for the mentioned cui dialogs Change-Id: Ibd2bf8e9e5bff131f2c009c784652f4500842326 Reviewed-on: https://gerrit.libreoffice.org/80488 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>

Diffstat (limited to 'sd')

-rw-r--r--

sd/source/ui/dlg/sddlgfact.cxx

217

-rw-r--r--

sd/source/ui/dlg/sddlgfact.hxx

2 files changed, 290 insertions, 6 deletions

diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 55ad1c25556d..1a1182a0e026 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx

@@ -43,6 +43,7 @@

#include <masterlayoutdlg.hxx>

#include <headerfooterdlg.hxx>

#include "PhotoAlbumDialog.hxx"

+#include <vcl/virdev.hxx>

short AbstractSvxBulletAndPositionDlg_Impl::Execute()

{

@@ -54,6 +55,18 @@ short SdAbstractGenericDialog_Impl::Execute()

return m_xDlg->run();

}

+BitmapEx SdAbstractGenericDialog_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString SdAbstractGenericDialog_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

const SfxItemSet* AbstractSvxBulletAndPositionDlg_Impl::GetOutputItemSet( SfxItemSet* pSet ) const

{

return m_xDlg->GetOutputItemSet( pSet );

@@ -149,6 +162,18 @@ bool AbstractHeaderFooterDialog_Impl::StartExecuteAsync(AsyncContext &rCtx)

return weld::DialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);

}

+BitmapEx AbstractHeaderFooterDialog_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractHeaderFooterDialog_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

short AbstractBulletDialog_Impl::Execute()

{

return m_xDlg->run();

@@ -169,6 +194,18 @@ short AbstractBreakDlg_Impl::Execute()

return m_xDlg->run();

}

+BitmapEx AbstractBreakDlg_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractBreakDlg_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

AbstractMasterLayoutDialog_Impl::AbstractMasterLayoutDialog_Impl(std::unique_ptr<::sd::MasterLayoutDialog> pDlg)

: m_xDlg(std::move(pDlg))

{

@@ -179,11 +216,35 @@ short AbstractMasterLayoutDialog_Impl::Execute()

return m_xDlg->run();

}

+BitmapEx AbstractMasterLayoutDialog_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractMasterLayoutDialog_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

void AbstractCopyDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )

{

m_xDlg->GetAttr( rOutAttrs );

}

+BitmapEx AbstractCopyDlg_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractCopyDlg_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

bool AbstractSdCustomShowDlg_Impl::IsModified() const

{

return m_xDlg->IsModified();

@@ -194,6 +255,18 @@ bool AbstractSdCustomShowDlg_Impl::IsCustomShow() const

return m_xDlg->IsCustomShow();

}

+BitmapEx AbstractSdCustomShowDlg_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractSdCustomShowDlg_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

short SdAbstractTabController_Impl::Execute()

{

return m_xDlg->run();

@@ -230,6 +303,18 @@ void SdAbstractTabController_Impl::SetText( const OUString& rStr )

m_xDlg->set_title(rStr);

}

+BitmapEx SdAbstractTabController_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString SdAbstractTabController_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

void AbstractBulletDialog_Impl::SetCurPageId( const OString& rName )

{

m_xDlg->SetCurPageId( rName );

@@ -255,6 +340,18 @@ void AbstractBulletDialog_Impl::SetText( const OUString& rStr )

m_xDlg->set_title(rStr);

}

+BitmapEx AbstractBulletDialog_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractBulletDialog_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

void SdPresLayoutTemplateDlg_Impl::SetCurPageId( const OString& rName )

{

m_xDlg->SetCurPageId( rName );

@@ -280,6 +377,18 @@ void SdPresLayoutTemplateDlg_Impl::SetText( const OUString& rStr )

m_xDlg->set_title(rStr);

}

+BitmapEx SdPresLayoutTemplateDlg_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString SdPresLayoutTemplateDlg_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

SvxFieldData* AbstractSdModifyFieldDlg_Impl::GetField()

{

return m_xDlg->GetField();

@@ -290,6 +399,18 @@ SfxItemSet AbstractSdModifyFieldDlg_Impl::GetItemSet()

return m_xDlg->GetItemSet();

}

+BitmapEx AbstractSdModifyFieldDlg_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractSdModifyFieldDlg_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

void AbstractSdSnapLineDlg_Impl::GetAttr(SfxItemSet& rOutAttrs)

{

m_xDlg->GetAttr(rOutAttrs);

@@ -315,6 +436,18 @@ void AbstractSdSnapLineDlg_Impl::SetText( const OUString& rStr )

m_xDlg->set_title(rStr);

}

+BitmapEx AbstractSdSnapLineDlg_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractSdSnapLineDlg_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )

{

m_xDlg->GetAttr(rOutAttrs);

@@ -325,6 +458,18 @@ void AbstractSdInsertLayerDlg_Impl::SetHelpId( const OString& rHelpId )

m_xDlg->set_help_id(rHelpId);

}

+BitmapEx AbstractSdInsertLayerDlg_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractSdInsertLayerDlg_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

std::vector<OUString> AbstractSdInsertPagesObjsDlg_Impl::GetList(const sal_uInt16 nType)

{

return m_xDlg->GetList(nType);

@@ -340,6 +485,18 @@ bool AbstractSdInsertPagesObjsDlg_Impl::IsRemoveUnnessesaryMasterPages() const

return m_xDlg->IsRemoveUnnessesaryMasterPages();

}

+BitmapEx AbstractSdInsertPagesObjsDlg_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractSdInsertPagesObjsDlg_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

void AbstractMorphDlg_Impl::SaveSettings() const

{

m_xDlg->SaveSettings();

@@ -360,16 +517,52 @@ bool AbstractMorphDlg_Impl::IsOrientationFade() const

return m_xDlg->IsOrientationFade();

}

+BitmapEx AbstractMorphDlg_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractMorphDlg_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

void AbstractSdStartPresDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )

{

m_xDlg->GetAttr(rOutAttrs);

}

+BitmapEx AbstractSdStartPresDlg_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractSdStartPresDlg_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

void AbstractSdPresLayoutDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )

{

m_xDlg->GetAttr(rOutAttrs);

}

+BitmapEx AbstractSdPresLayoutDlg_Impl::createScreenshot() const

+ VclPtr<VirtualDevice> xDialogSurface(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));

+ m_xDlg->getDialog()->draw(*xDialogSurface);

+ return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());

+OString AbstractSdPresLayoutDlg_Impl::GetScreenshotId() const

+ return m_xDlg->get_help_id();

const SfxItemSet* SdAbstractSfxDialog_Impl::GetOutputItemSet() const

{

return m_xDlg->GetOutputItemSet();

@@ -385,11 +578,35 @@ const GDIMetaFile& AbstractSdVectorizeDlg_Impl::GetGDIMetaFile() const

return m_xDlg->GetGDIMetaFile();

}

+BitmapEx AbstractSdVectorizeDlg_Impl::createScreenshot() const

+ VclPtr<VirtualDevice>