1 files changed, 17 insertions, 17 deletions

diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 5a25b3d65959..9f67e7343633 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -86,7 +86,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
     )
     {
@@ -106,7 +106,7 @@ protected:
     XMLNode() {}
 
 public:
-    virtual USHORT GetNodeType() = 0;
+    virtual sal_uInt16 GetNodeType() = 0;
     virtual ~XMLNode() {}
 };
 
@@ -125,7 +125,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; }
@@ -161,7 +161,7 @@ protected:
 
 
 public:
-    virtual USHORT GetNodeType() = 0;
+    virtual sal_uInt16 GetNodeType() = 0;
 
     /// returns child list of this node
     XMLChildNodeList *GetChildList() { return pChildList; }
@@ -198,7 +198,7 @@ typedef boost::unordered_map<ByteString , LangHashMap* ,
 typedef boost::unordered_map<ByteString, int, hashByteString,equalByteString>   HashMap;
 
 /// Mapping XML tag names <-> have localizable strings
-typedef boost::unordered_map<ByteString , BOOL ,
+typedef boost::unordered_map<ByteString , sal_Bool ,
                       hashByteString,equalByteString>                   TagMap;
 
 /** Holds information of a XML file, is root node of tree
@@ -216,7 +216,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();
@@ -224,14 +224,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; }
@@ -272,10 +272,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();
@@ -341,7 +341,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; }
@@ -411,7 +411,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; }
@@ -443,7 +443,7 @@ public:
     )
                 : XMLChildNode( Parent ), sComment( rComment ) {}
 
-    virtual USHORT GetNodeType();
+    virtual sal_uInt16 GetNodeType();
 
     XMLComment( const XMLComment& obj );
 
@@ -475,7 +475,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; }
@@ -487,8 +487,8 @@ public:
  */
 struct XMLError {
     XML_Error eCode;    // the error code
-    ULONG nLine;        // error line number
-    ULONG nColumn;      // error column number
+    sal_uLong nLine;        // error line number
+    sal_uLong nColumn;      // error column number
     String sMessage;    // readable error message
 };