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

Stephan Bergmann sbergman at redhat.com
Wed Apr 6 10:31:42 UTC 2016


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

New commits:
commit 81284624d8ec661139123015319d0683bfe07537
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 6 12:31:15 2016 +0200

    Avoid reserved identifier
    
    Change-Id: I87a6afeffaf7c87c6037a416783f1f22015b2fbf

diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index b316098..cbf3e0c 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -656,7 +656,7 @@ LongDqPtr TextRanger::GetTextRanges( const Range& rRange )
     return &(mRangeCache.back().results);
 }
 
-const Rectangle& TextRanger::_GetBoundRect()
+const Rectangle& TextRanger::GetBoundRect_()
 {
     DBG_ASSERT( nullptr == pBound, "Don't call twice." );
     pBound = new Rectangle( mpPolyPolygon->GetBoundRect() );
diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx
index 09897e0..43a4a4d 100644
--- a/include/editeng/txtrange.hxx
+++ b/include/editeng/txtrange.hxx
@@ -58,7 +58,7 @@ class EDITENG_DLLPUBLIC TextRanger
     bool       bVertical :1;// for vertical writing mode
 
     TextRanger( const TextRanger& ) = delete;
-    const Rectangle& _GetBoundRect();
+    const Rectangle& GetBoundRect_();
 public:
     TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon,
                 const basegfx::B2DPolyPolygon* pLinePolyPolygon,
@@ -76,7 +76,7 @@ public:
     bool IsVertical() const { return bVertical; }
     const tools::PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; }
     const Rectangle& GetBoundRect()
-        { return pBound ? static_cast< const Rectangle& >(*pBound) : _GetBoundRect(); }
+        { return pBound ? static_cast< const Rectangle& >(*pBound) : GetBoundRect_(); }
     void SetUpper( sal_uInt16 nNew ){ nUpper = nNew; }
     void SetLower( sal_uInt16 nNew ){ nLower = nNew; }
     void SetVertical( bool bNew );


More information about the Libreoffice-commits mailing list