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/xmlparse.hxx | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

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

diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 69e74a83ec47..cb72ca532afe 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -87,7 +87,7 @@ public:
     void setValue(const String &rValue){sValue=rValue;}
 
     /// returns true if two attributes are equal and have the same value
-    BOOL IsEqual(
+    sal_Bool IsEqual(
         const XMLAttribute &rAttribute  // the attribute which has to be equal
     )
     {
@@ -107,7 +107,7 @@ protected:
     XMLNode() {}
 
 public:
-    virtual USHORT GetNodeType() = 0;
+    virtual sal_uInt16 GetNodeType() = 0;
     virtual ~XMLNode() {}
 };
 
@@ -126,7 +126,7 @@ protected:
     XMLChildNode( const XMLChildNode& obj);
     XMLChildNode& operator=(const XMLChildNode& obj);
 public:
-    virtual USHORT GetNodeType() = 0;
+    virtual sal_uInt16 GetNodeType() = 0;
 
     /// returns the parent of this node
     XMLParentNode *GetParent() { return pParent; }
@@ -162,7 +162,7 @@ protected:
 
 
 public:
-    virtual USHORT GetNodeType() = 0;
+    virtual sal_uInt16 GetNodeType() = 0;
 
     /// returns child list of this node
     XMLChildNodeList *GetChildList() { return pChildList; }
@@ -201,7 +201,7 @@ typedef std::hash_map<ByteString , LangHashMap* ,
 typedef std::hash_map<ByteString, int, hashByteString,equalByteString>  HashMap;
 
 /// Mapping XML tag names <-> have localizable strings
-typedef std::hash_map<ByteString , BOOL ,
+typedef std::hash_map<ByteString , sal_Bool ,
                       hashByteString,equalByteString>                   TagMap;
 
 /** Holds information of a XML file, is root node of tree
@@ -219,7 +219,7 @@ public:
     ~XMLFile();
 
     ByteString* GetGroupID(std::deque<ByteString> &groupid);
-    void        Print( XMLNode *pCur = NULL, USHORT nLevel = 0 );
+    void        Print( XMLNode *pCur = NULL, sal_uInt16 nLevel = 0 );
     virtual void SearchL10NElements( XMLParentNode *pCur, int pos = 0 );
     void        Extract( XMLFile *pCur = NULL );
     void        View();
@@ -227,14 +227,14 @@ public:
     void        showType(XMLParentNode* node);
 
     XMLHashMap* GetStrings(){return XMLStrings;}
-    BOOL        Write( ByteString &rFilename );
-    BOOL        Write( ofstream &rStream , XMLNode *pCur = NULL );
+    sal_Bool        Write( ByteString &rFilename );
+    sal_Bool        Write( ofstream &rStream , XMLNode *pCur = NULL );
 
     bool        CheckExportStatus( XMLParentNode *pCur = NULL );// , int pos = 0 );
 
     XMLFile&    operator=(const XMLFile& obj);
 
-    virtual USHORT  GetNodeType();
+    virtual sal_uInt16  GetNodeType();
 
     /// returns file name
     const String &GetName() { return sFileName; }
@@ -275,10 +275,10 @@ public:
     static void         UnQuotHTML  ( String &rString );
 
     /// Return the numeric iso language code
-    //USHORT                GetLangByIsoLang( const ByteString &rIsoLang );
+    //sal_uInt16                GetLangByIsoLang( const ByteString &rIsoLang );
 
     /// Return the alpha strings representation
-    ByteString          GetIsoLangByIndex( USHORT nIndex );
+    ByteString          GetIsoLangByIndex( sal_uInt16 nIndex );
 
     static XMLUtil&     Instance();
     ~XMLUtil();
@@ -344,7 +344,7 @@ public:
 
     XMLElement& operator=(const XMLElement& obj);
     /// returns node type XML_NODE_ELEMENT
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     /// returns element name
     const String &GetName() { return sElementName; }
@@ -414,7 +414,7 @@ public:
     XMLData(const XMLData& obj);
 
     XMLData& operator=(const XMLData& obj);
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     /// returns the data
     const String &GetData() { return sData; }
@@ -446,7 +446,7 @@ public:
     )
                 : XMLChildNode( Parent ), sComment( rComment ) {}
 
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     XMLComment( const XMLComment& obj );
 
@@ -478,7 +478,7 @@ public:
     XMLDefault& operator=(const XMLDefault& obj);
 
     /// returns node type XML_NODE_TYPE_COMMENT
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     /// returns the comment
     const String &GetDefault()  { return sDefault; }
@@ -490,8 +490,8 @@ public:
  */
 struct XMLError {
     XML_Error eCode;    // the error code
-    ULONG nLine;        // error line number
-    ULONG nColumn;      // error column number
+    sal_uIntPtr nLine;          // error line number
+    sal_uIntPtr nColumn;        // error column number
     String sMessage;    // readable error message
 };
 
-- 
cgit