summaryrefslogtreecommitdiffstats
path: root/vcl
diff options
context:
space:
mode:
authorHenry Castro <hcastro@collabora.com>2015-06-10 18:08:48 -0400
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-06-11 10:37:26 +0200
commita6f4fde8baf3eeb36820d18ffad84192e995145f (patch)
tree87ece0b64ed291b07605ef5b794dfbae02b9c3a8 /vcl
parentCleanup crossplatform cairo (diff)
downloadcore-a6f4fde8baf3eeb36820d18ffad84192e995145f.tar.gz
core-a6f4fde8baf3eeb36820d18ffad84192e995145f.zip
sw tiled rendering: Ignore window size check.
In the tiled rendering case it does not need to check if the window size is (0,0). But it still has to trigger LOKit LOK_CALLBACK_INVALIDATE_TILES Change-Id: I4c458edfd6e44599b8c8148e0f8543fb0563e627
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/paint.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 1dcf72a1a3b9..ae29766694c1 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -31,6 +31,7 @@
#include <salgdi.hxx>
#include <salframe.hxx>
#include <svdata.hxx>
+#include <comphelper/lok.hxx>
#define IMPL_PAINT_PAINT ((sal_uInt16)0x0001)
#define IMPL_PAINT_PAINTALL ((sal_uInt16)0x0002)
@@ -1132,7 +1133,7 @@ vcl::Region Window::GetPaintRegion() const
void Window::Invalidate( InvalidateFlags nFlags )
{
- if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight )
+ if ( !comphelper::LibreOfficeKit::isActive() && (!IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight) )
return;
ImplInvalidate( NULL, nFlags );
@@ -1141,7 +1142,7 @@ void Window::Invalidate( InvalidateFlags nFlags )
void Window::Invalidate( const Rectangle& rRect, InvalidateFlags nFlags )
{
- if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight )
+ if ( !comphelper::LibreOfficeKit::isActive() && (!IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight) )
return;
OutputDevice *pOutDev = GetOutDev();
@@ -1157,7 +1158,7 @@ void Window::Invalidate( const Rectangle& rRect, InvalidateFlags nFlags )
void Window::Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags )
{
- if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight )
+ if ( !comphelper::LibreOfficeKit::isActive() && (!IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight) )
return;
if ( rRegion.IsNull() )
@@ -1180,7 +1181,7 @@ void Window::Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags )
void Window::Validate( ValidateFlags nFlags )
{
- if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight )
+ if ( !comphelper::LibreOfficeKit::isActive() && (!IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight) )
return;
ImplValidate( NULL, nFlags );