Kaydet (Commit) a6f4fde8 authored tarafından Henry Castro's avatar Henry Castro Kaydeden (comit) Miklos Vajna

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
üst 0c87f8bf
......@@ -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)
......
......@@ -3157,15 +3157,6 @@ void SwXTextDocument::initializeForTiledRendering()
SwViewShell* pViewShell = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
pViewShell->setTiledRendering(true);
if ( pViewShell->GetWin() )
{
// Check initial window size and set minimal size (1,1)
Size aSize( pViewShell->GetWin()->GetOutputSizePixel() );
if ( aSize.Width() == 0 || aSize.Height() == 0 )
pViewShell->GetWin()->SetOutputSizePixel(Size( std::max( aSize.Width() , long(1)),
std::max( aSize.Height(), long(1)) ));
}
bool bBookMode = false;
sal_Int16 nColumns = 1;
......
......@@ -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 );
......
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