From d210c6ccc30466e98240c1409df0550514668d68 Mon Sep 17 00:00:00 2001
From: Xiaofei Zhang <Zhangxiaofei@openoffice.org>
Date: Thu, 29 Jul 2010 10:56:19 +0800
Subject: #i112600#: clean up l10ntools, rsc, sot, svl, tools and unotools

---
 l10ntools/inc/cfgmerge.hxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'l10ntools/inc/cfgmerge.hxx')

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index ae0708f5ff05..e0c2c0cf61f2 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -76,13 +76,13 @@ public:
     CfgStack() : CfgStackList( 10, 10 ) {}
     ~CfgStack();
 
-    ULONG Push( CfgStackData *pStackData );
+    sal_uIntPtr Push( CfgStackData *pStackData );
     CfgStackData *Push( const ByteString &rTag, const ByteString &rId );
     CfgStackData *Pop() { return Remove( Count() - 1 ); }
 
-    CfgStackData *GetStackData( ULONG nPos = LIST_APPEND );
+    CfgStackData *GetStackData( sal_uIntPtr nPos = LIST_APPEND );
 
-    ByteString GetAccessPath( ULONG nPos = LIST_APPEND );
+    ByteString GetAccessPath( sal_uIntPtr nPos = LIST_APPEND );
 };
 
 //
@@ -101,7 +101,7 @@ protected:
     CfgStack aStack;
     CfgStackData *pStackData;
 
-    BOOL bLocalize;
+    sal_Bool bLocalize;
 
     virtual void WorkOnText(
         ByteString &rText,
@@ -121,7 +121,7 @@ private:
         const ByteString &rIsoLang,
         const ByteString &rResTyp );
 
-BOOL IsTokenClosed( const ByteString &rToken );
+sal_Bool IsTokenClosed( const ByteString &rToken );
 
 public:
     CfgParser();
@@ -181,9 +181,9 @@ private:
     std::vector<ByteString> aLanguages;
     ResData *pResData;
 
-    BOOL bGerman;
+    sal_Bool bGerman;
     ByteString sFilename;
-    BOOL bEnglish;
+    sal_Bool bEnglish;
 
 protected:
     void WorkOnText(
-- 
cgit 


From a0602756a7bd259f6ee4e62161afe00298ba1d6c Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Wed, 12 Jan 2011 16:14:41 +0100
Subject: removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with
 sal_uLong in l10ntools

---
 l10ntools/inc/cfgmerge.hxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'l10ntools/inc/cfgmerge.hxx')

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index e0c2c0cf61f2..2f6418e1aa3f 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -76,13 +76,13 @@ public:
     CfgStack() : CfgStackList( 10, 10 ) {}
     ~CfgStack();
 
-    sal_uIntPtr Push( CfgStackData *pStackData );
+    sal_uLong Push( CfgStackData *pStackData );
     CfgStackData *Push( const ByteString &rTag, const ByteString &rId );
     CfgStackData *Pop() { return Remove( Count() - 1 ); }
 
-    CfgStackData *GetStackData( sal_uIntPtr nPos = LIST_APPEND );
+    CfgStackData *GetStackData( sal_uLong nPos = LIST_APPEND );
 
-    ByteString GetAccessPath( sal_uIntPtr nPos = LIST_APPEND );
+    ByteString GetAccessPath( sal_uLong nPos = LIST_APPEND );
 };
 
 //
-- 
cgit