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

Matteo Casalin matteo.casalin at yahoo.com
Sun Jan 26 09:57:52 PST 2014


 editeng/source/editeng/editdoc.cxx |    4 ++--
 editeng/source/editeng/editdoc.hxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b7ad3991628b0dee40bb1f823ca90b5c71b49939
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Mon Dec 30 15:03:16 2013 +0100

    long to sal_Int32
    
    Change-Id: I03c3d93c03239ae39bb3078ffabe71276ec37d25
    Reviewed-on: https://gerrit.libreoffice.org/7658
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 7e02703..1f9f35d 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1768,7 +1768,7 @@ ContentAttribs::~ContentAttribs()
 {
 }
 
-SvxTabStop ContentAttribs::FindTabStop( long nCurPos, sal_uInt16 nDefTab )
+SvxTabStop ContentAttribs::FindTabStop( sal_Int32 nCurPos, sal_uInt16 nDefTab )
 {
     const SvxTabStopItem& rTabs = (const SvxTabStopItem&) GetItem( EE_PARA_TABS );
     for ( sal_uInt16 i = 0; i < rTabs.Count(); i++ )
@@ -1780,7 +1780,7 @@ SvxTabStop ContentAttribs::FindTabStop( long nCurPos, sal_uInt16 nDefTab )
 
     // Determine DefTab ...
     SvxTabStop aTabStop;
-    long x = nCurPos / nDefTab + 1;
+    const sal_Int32 x = nCurPos / nDefTab + 1;
     aTabStop.GetTabPos() = nDefTab * x;
     return aTabStop;
 }
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index f7100ef..1c8bdf2 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -182,7 +182,7 @@ public:
                     ContentAttribs( const ContentAttribs& );
                     ~ContentAttribs();  // only for larger Tabs
 
-    SvxTabStop      FindTabStop( long nCurPos, sal_uInt16 nDefTab );
+    SvxTabStop      FindTabStop( sal_Int32 nCurPos, sal_uInt16 nDefTab );
     SfxItemSet&     GetItems()                          { return aAttribSet; }
     const SfxItemSet& GetItems() const { return aAttribSet; }
     const SfxStyleSheet*  GetStyleSheet() const { return pStyle; }


More information about the Libreoffice-commits mailing list