diff options
| author | Henry Castro <hcastro@collabora.com> | 2015-06-09 23:19:40 -0400 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-11 11:45:02 +0200 |
| commit | ae8176d72bd86107ef2c93d9b0f1c91f60cf8823 (patch) | |
| tree | 3cb49b9ac196f78e429be1b09aafda5723d27ed2 | |
| parent | b75bda81c1eafeb9ff7e3dc5cfa4830c5da017c9 (diff) | |
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
(cherry picked from commit 2281a4922f2209511f79b961ca2140c112bc41eb)
(cherry picked from commit a6f4fde8baf3eeb36820d18ffad84192e995145f)
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/paint.cxx | 9 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 773b141a7458..d89de19b86ab 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -6203,7 +6203,9 @@ void SwEditWin::LogicInvalidate(const Rectangle* pRectangle) sRectangle = "EMPTY"; else sRectangle = pRectangle->toString(); - m_rView.GetWrtShell().libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, sRectangle.getStr()); + + if ( m_rView.GetWrtShellPtr() ) + m_rView.GetWrtShell().libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, sRectangle.getStr()); } void SwEditWin::LogicMouseButtonDown(const MouseEvent& rMouseEvent) diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index a066c6fd74b1..b2cdfac4262e 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3165,6 +3165,7 @@ void SwXTextDocument::initializeForTiledRendering() SwView* pView = pDocShell->GetView(); if (!pView) return; + pView->SetViewLayout(nColumns, bBookMode, true); // Tiled rendering defaults. diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 743b3b80de35..0adb3eedae92 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( sal_uInt16 nFlags ) { - if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight ) + if ( !comphelper::LibreOfficeKit::isActive() && (!IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight) ) return; ImplInvalidate( NULL, nFlags ); @@ -1141,7 +1142,7 @@ void Window::Invalidate( sal_uInt16 nFlags ) void Window::Invalidate( const Rectangle& rRect, sal_uInt16 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, sal_uInt16 nFlags ) void Window::Invalidate( const vcl::Region& rRegion, sal_uInt16 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, sal_uInt16 nFlags ) void Window::Validate( sal_uInt16 nFlags ) { - if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight ) + if ( !comphelper::LibreOfficeKit::isActive() && (!IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight) ) return; ImplValidate( NULL, nFlags ); |