[Libreoffice-commits] core.git: include/vcl vcl/source
Chris Sherlock (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jun 2 08:44:54 UTC 2020
include/vcl/outdev.hxx | 2 ++
include/vcl/window.hxx | 1 +
vcl/source/gdi/gdimtf.cxx | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit e25334e1c1022b4741897a3e659fcbad5cde97c4
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
AuthorDate: Sat May 23 23:49:45 2020 +1000
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue Jun 2 10:44:14 2020 +0200
tdf#74702 vcl: extract GetSyncCount()
Change-Id: Ie624f0d57aea4d72c69f6cd73508d129e53721d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94722
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index e9822fc37049..fb58781479c4 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -455,6 +455,8 @@ public:
std::vector< VCLXGraphics* > *GetUnoGraphicsList() const { return mpUnoGraphicsList; }
std::vector< VCLXGraphics* > *CreateUnoGraphicsList();
+ virtual size_t GetSyncCount() const { return 0xffffffff; }
+
protected:
/** Acquire a graphics device that the output device uses to draw on.
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 5bef729e65f4..30bac38c6d84 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -773,6 +773,7 @@ public:
Color GetBackgroundColor() const override;
+ size_t GetSyncCount() const override { return 0x000000ff; }
virtual void EnableRTL ( bool bEnable = true ) override;
virtual void MouseMove( const MouseEvent& rMEvt );
virtual void MouseButtonDown( const MouseEvent& rMEvt );
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 6b99db3ab3ee..7a4d2343e300 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -349,7 +349,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
{
MetaAction* pAction = GetCurAction();
const size_t nObjCount = m_aList.size();
- size_t nSyncCount = ( pOut->GetOutDevType() == OUTDEV_WINDOW ) ? 0x000000ff : 0xffffffff;
+ size_t nSyncCount = pOut->GetSyncCount();
if( nPos > nObjCount )
nPos = nObjCount;
More information about the Libreoffice-commits
mailing list