[Libreoffice-commits] core.git: Branch 'distro/collabora/viewer2' - sw/source

Jan Holesovsky kendy at collabora.com
Fri Apr 24 09:17:26 PDT 2015


 sw/source/core/layout/pagechg.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ca25cce3b3de967c51ff1fd82733c67e5b8a1104
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Apr 24 18:12:15 2015 +0200

    sw tiled rendering: It is important not to center from the very beginning.
    
    Otherwise the value is used for some time, and causes misrenderings.
    
    Change-Id: I55f003d5ca353c526f4ad17519795cf6f645d674

diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index e4a55ac..0ae65ca 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <comphelper/lok.hxx>
 #include <ndole.hxx>
 #include <svl/itemiter.hxx>
 #include <fmtfsize.hxx>
@@ -2036,7 +2037,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
 
             // center page if possible
             long nSizeDiff = 0;
-            if (nVisWidth > nCurrentRowWidth && !(GetCurrShell() && GetCurrShell()->isTiledRendering()))
+            if (nVisWidth > nCurrentRowWidth && !comphelper::LibreOfficeKit::isActive())
                 nSizeDiff = ( nVisWidth - nCurrentRowWidth ) / 2;
 
             // adjust positions of pages in current row


More information about the Libreoffice-commits mailing list