[Libreoffice-commits] core.git: sfx2/source

[Christian Lohmaier]

 sfx2/source/view/lokcharthelper.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit d1e2205c6ec1b6e4c36192acc2e5b344e2ccc70d
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Nov 29 12:52:41 2017 +0100

    android: hackaround for rendering regression (disable charts)
    
    eba883c8a2ce045fc7bd3848d796ca10b7f4ba51 broke rendering in the Android
    Viewer - only blank pages were the result.
    This hack just makes the offending function a non-op, allowing the
    Viewer to render something to the viewer again.
    
    Change-Id: Iaa206ff92b2e7642cb921c8e2d61ffd930a59463
    Reviewed-on: https://gerrit.libreoffice.org/45493
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/sfx2/source/view/lokcharthelper.cxx b/sfx2/source/view/lokcharthelper.cxx
index 6181920916c0..c8d46b134ad4 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -236,6 +236,10 @@ void LokChartHelper::PaintAllChartsOnTile(VirtualDevice& rDevice,
                                           int nTilePosX, int nTilePosY,
                                           long nTileWidth, long nTileHeight)
 {
+    // TODO: Hack to make Android Viewer render at least *something* again, but of
+    // course it's just a crude hack to just disable this instead of debugging further
+    // and fixing it for Android case
+#if !defined(ANDROID)
     // Resizes the virtual device so to contain the entries context
     rDevice.SetOutputSizePixel(Size(nOutputWidth, nOutputHeight));
 
@@ -259,6 +263,7 @@ void LokChartHelper::PaintAllChartsOnTile(VirtualDevice& rDevice,
         pViewShell = SfxViewShell::GetNext(*pViewShell);
     }
     rDevice.Pop();
+#endif
 }
 
 bool LokChartHelper::postMouseEvent(int nType, int nX, int nY,