[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Miklos Vajna]

 vcl/source/window/window.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 884856481774a6e6eb3e350bf76b3900c2e62b0d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Aug 5 11:25:02 2015 +0200

    tdf#92982 vcl rendercontext: fix buffer size with empty user profile
    
    I did not notice this before, as my user profile had a custom window
    size; but with an empty user profile the buffer had a 0,0 size, so the
    buffered result was empty, as no ImplHandleResize() was invoked.
    
    Change-Id: Ie299ad1323944941afc407dc90f2459d72885d42
    (cherry picked from commit 968bc55adebd0158349b32a31ea341be292d8aa1)
    Reviewed-on: https://gerrit.libreoffice.org/17532
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index f24e4bb..e8d2b96 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2481,6 +2481,10 @@ void Window::Show(bool bVisible, sal_uInt16 nFlags)
                 mpWindowImpl->mpFrame->GetClientSize( nOutWidth, nOutHeight );
                 ImplHandleResize( this, nOutWidth, nOutHeight );
             }
+
+            if (mpWindowImpl->mpFrameData->mpBuffer && mpWindowImpl->mpFrameData->mpBuffer->GetOutputSizePixel() != GetOutputSizePixel())
+                // Make sure that the buffer size matches the window size, even if no resize was needed.
+                mpWindowImpl->mpFrameData->mpBuffer->SetOutputSizePixel(GetOutputSizePixel());
         }
 
         if( aDogTag.IsDead() )