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

Stephan Bergmann sbergman at redhat.com
Wed Apr 6 10:13:49 UTC 2016


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

New commits:
commit ffd919b2d0ee261b2364726985e804c6f6229655
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 6 12:13:25 2016 +0200

    Avoid reserved identifiers
    
    Change-Id: I4c76a7d3f5a209578b5a7c230fbbcdea2ec47ae0

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 0cd46fa..35f889b 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -688,8 +688,8 @@ void ParaPortion::CorrectValuesBehindLastFormattedLine( sal_Int32 nLastFormatted
 
 namespace {
 
-template<typename _Array, typename _Val>
-sal_Int32 FastGetPos(const _Array& rArray, const _Val* p, sal_Int32& rLastPos)
+template<typename Array, typename Val>
+sal_Int32 FastGetPos(const Array& rArray, const Val* p, sal_Int32& rLastPos)
 {
     sal_Int32 nArrayLen = rArray.size();
 
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 089880d..024c4b4 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -82,10 +82,10 @@ struct ScriptTypePosInfo
     sal_Int32  nStartPos;
     sal_Int32  nEndPos;
 
-    ScriptTypePosInfo( short _Type, sal_Int32 _Start, sal_Int32 _End )
-    : nScriptType(_Type)
-    , nStartPos(_Start)
-    , nEndPos(_End)
+    ScriptTypePosInfo( short Type, sal_Int32 Start, sal_Int32 End )
+    : nScriptType(Type)
+    , nStartPos(Start)
+    , nEndPos(End)
     {
     }
 };
@@ -98,10 +98,10 @@ struct WritingDirectionInfo
     sal_Int32  nStartPos;
     sal_Int32  nEndPos;
 
-    WritingDirectionInfo( sal_uInt8 _Type, sal_Int32 _Start, sal_Int32 _End )
-    : nType(_Type)
-    , nStartPos(_Start)
-    , nEndPos(_End)
+    WritingDirectionInfo( sal_uInt8 Type, sal_Int32 Start, sal_Int32 End )
+    : nType(Type)
+    , nStartPos(Start)
+    , nEndPos(End)
     {
     }
 };


More information about the Libreoffice-commits mailing list