[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

Jan Holesovsky kendy at collabora.com
Tue Apr 14 12:59:02 PDT 2015


 sw/source/uibase/uiview/view.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5087e4caa4343a1a17ffb42eea4aa0354cab8636
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Jan 28 13:45:32 2015 +0100

    tdf#80960: Attempt to fix the cursor placement after document load.
    
    This is a blind attempt - don't have a 32bit system at hand to really try it.
    
    Change-Id: I4fe8c65b794d01e79aa93cbac440f710b630c7dd
    Reviewed-on: https://gerrit.libreoffice.org/15131
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 358937f..c3d3f2a 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1254,8 +1254,8 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
         const Rectangle &rVis = GetVisArea();
         const SwViewOption* pVOpt = m_pWrtShell->GetViewOptions();
 
-        long nX = rRect.Left(), nY = rRect.Top(), nLeft = rVis.Left(), nTop = rVis.Top();
-        long nRight = bBrowse ? LONG_MIN : rVis.Right(), nBottom = bBrowse ? LONG_MIN : rVis.Bottom();
+        sal_Int64 nX = rRect.Left(), nY = rRect.Top(), nLeft = rVis.Left(), nTop = rVis.Top();
+        sal_Int64 nRight = bBrowse ? LONG_MIN : rVis.Right(), nBottom = bBrowse ? LONG_MIN : rVis.Bottom();
         sal_Int16 nZoomType = static_cast< sal_Int16 >(pVOpt->GetZoomType());
         sal_Int16 nZoomFactor = static_cast < sal_Int16 > (pVOpt->GetZoom());
         bool bViewLayoutBookMode = pVOpt->IsViewLayoutBookMode();


More information about the Libreoffice-commits mailing list