chart52: merge with DEV300_m100

27 files changed, 76 insertions, 76 deletions

diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index ff01097288b6..219b1d1d6870 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -66,12 +66,12 @@ public:
 
     /** default constructor: create new DOM tree */
     DomBuilderContext( SvXMLImport& rImport,
-                       USHORT nPrefix,
+                       sal_uInt16 nPrefix,
                        const ::rtl::OUString& rLocalName );
 
     /** constructor: create DOM subtree under the given node */
     DomBuilderContext( SvXMLImport& rImport,
-                       USHORT nPrefix,
+                       sal_uInt16 nPrefix,
                        const ::rtl::OUString& rLocalName,
                        com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode>& );
 
@@ -94,7 +94,7 @@ public:
     //
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
index 505d4105fe10..c7858a96938e 100644
--- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
@@ -52,14 +52,14 @@ public:
     // #100592#
     const ::rtl::OUString& GetFilterCLSID() const { return sCLSID; }
 
-    XMLEmbeddedObjectImportContext( SvXMLImport& rImport, USHORT nPrfx,
+    XMLEmbeddedObjectImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     virtual ~XMLEmbeddedObjectImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index d8d6d873d034..3a919dca7c31 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -92,7 +92,7 @@ public:
 
     /// for footnotes, also parse begin and end notices
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList );
diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index 562b78eb9710..fbb9a2a65099 100644
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -65,7 +65,7 @@ public:
     virtual ~XMLImageMapContext();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index bd946ca336c0..60c0ab0dda2d 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -69,7 +69,7 @@ public:
 
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     sal_Int32 GetDrawKey() const { return mnKey; }
diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx
index a70035f56385..84d11060cd27 100644
--- a/xmloff/inc/XMLShapePropertySetContext.hxx
+++ b/xmloff/inc/XMLShapePropertySetContext.hxx
@@ -52,7 +52,7 @@ public:
     virtual void EndElement();
 
     using SvXMLPropertySetContext::CreateChildContext;
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx
index c21c4316674d..6a43702f4e7e 100644
--- a/xmloff/inc/XMLStringBufferImportContext.hxx
+++ b/xmloff/inc/XMLStringBufferImportContext.hxx
@@ -57,7 +57,7 @@ public:
     virtual ~XMLStringBufferImportContext();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index 9b4732e719b1..de7e4cfcc1fd 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -60,7 +60,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     static void postProcessRootNode( SvXMLImport& rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPageProps );
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index dd250407c84d..7e795e6021f8 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -49,7 +49,7 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual ~XMLAnimationsContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index b1eac43e0c81..22519c378f59 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -1383,7 +1383,7 @@ protected:
         ::com::sun::star::beans::XPropertySet> & xPropertySet);
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
                 ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -1479,7 +1479,7 @@ public:
                                     const ::rtl::OUString& sLocalName);
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/inc/xmloff/DocumentSettingsContext.hxx b/xmloff/inc/xmloff/DocumentSettingsContext.hxx
index 249d5c39ba36..62eaedb0e89f 100644
--- a/xmloff/inc/xmloff/DocumentSettingsContext.hxx
+++ b/xmloff/inc/xmloff/DocumentSettingsContext.hxx
@@ -43,12 +43,12 @@ class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext : public SvXMLImportContext
     ::std::auto_ptr< XMLDocumentSettingsContext_Data >  m_pData;
 
 public:
-    XMLDocumentSettingsContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual ~XMLDocumentSettingsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
index e544d27d8af8..afc637aead74 100644
--- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
@@ -130,9 +130,9 @@ public:
 
     static sal_uInt16 GetChartFamilyID() { return XML_STYLE_FAMILY_SCH_CHART_ID; }
 
-    /** @param bPushLastChartType If </FALSE>, in case a new chart type has to
+    /** @param bPushLastChartType If </sal_False>, in case a new chart type has to
                be added (because it does not exist yet), it is appended at the
-               end of the chart-type container.  When </TRUE>, a new chart type
+               end of the chart-type container.  When </sal_True>, a new chart type
                is added at one position before the last one, i.e. the formerly
                last chart type is pushed back, so that it remains the last one.
 
diff --git a/xmloff/inc/xmloff/VisAreaContext.hxx b/xmloff/inc/xmloff/VisAreaContext.hxx
index 3aa7cabd4a22..80a0e8c75659 100644
--- a/xmloff/inc/xmloff/VisAreaContext.hxx
+++ b/xmloff/inc/xmloff/VisAreaContext.hxx
@@ -41,19 +41,19 @@ class XMLVisAreaContext : public SvXMLImportContext
 {
 public:
     // read all attributes and set the values in rRect
-    XMLVisAreaContext( SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLVisAreaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       Rectangle& rRect, const MapUnit aMapUnit);
 
-    XMLVisAreaContext( SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLVisAreaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ::com::sun::star::awt::Rectangle& rRect, const sal_Int16 nMeasureUnit);
 
     virtual ~XMLVisAreaContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
index b2e5a4d1913b..e938edcebea8 100644
--- a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
+++ b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
@@ -45,7 +45,7 @@ class XMLOFF_DLLPUBLIC XMLBase64ImportContext : public SvXMLImportContext
 public:
     TYPEINFO();
 
-    XMLBase64ImportContext( SvXMLImport& rImport, USHORT nPrfx,
+    XMLBase64ImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                             const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
diff --git a/xmloff/inc/xmloff/formsimp.hxx b/xmloff/inc/xmloff/formsimp.hxx
index 86e62015294f..c2bbdc97a98f 100644
--- a/xmloff/inc/xmloff/formsimp.hxx
+++ b/xmloff/inc/xmloff/formsimp.hxx
@@ -41,7 +41,7 @@ public:
     XMLFormsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName);
     virtual ~XMLFormsContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/inc/xmloff/i18nmap.hxx b/xmloff/inc/xmloff/i18nmap.hxx
index 643b1d3a88f6..331c8bc5a758 100644
--- a/xmloff/inc/xmloff/i18nmap.hxx
+++ b/xmloff/inc/xmloff/i18nmap.hxx
@@ -46,7 +46,7 @@ class XMLOFF_DLLPUBLIC SvI18NMap
 {
     SvI18NMap_Impl      *pImpl;
 
-    SAL_DLLPRIVATE SvI18NMapEntry_Impl *_Find( USHORT nKind,
+    SAL_DLLPRIVATE SvI18NMapEntry_Impl *_Find( sal_uInt16 nKind,
                                 const ::rtl::OUString& rName ) const;
 
 public:
@@ -55,12 +55,12 @@ public:
     ~SvI18NMap();
 
     // Add a name mapping
-    void Add( USHORT nKind, const ::rtl::OUString& rName,
+    void Add( sal_uInt16 nKind, const ::rtl::OUString& rName,
               const ::rtl::OUString& rNewName );
 
     // Return a mapped name. If the name could not be found, return the
     // original name.
-    const ::rtl::OUString& Get( USHORT nKind,
+    const ::rtl::OUString& Get( sal_uInt16 nKind,
                                 const ::rtl::OUString& rName ) const;
 };
 
diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/xmloff/inc/xmloff/shapeimport.hxx
index f51f46a95e4d..4e97c24e720f 100644
--- a/xmloff/inc/xmloff/shapeimport.hxx
+++ b/xmloff/inc/xmloff/shapeimport.hxx
@@ -189,8 +189,8 @@ class SdXML3DLightContext: public SvXMLImportContext
     // local parameters which need to be read
     Color                       maDiffuseColor;
     ::basegfx::B3DVector        maDirection;
-    BOOL                        mbEnabled;
-    BOOL                        mbSpecular;
+    sal_Bool                        mbEnabled;
+    sal_Bool                        mbSpecular;
 
 public:
     SdXML3DLightContext(
@@ -202,8 +202,8 @@ public:
 
     const Color& GetDiffuseColor() { return maDiffuseColor; }
     const ::basegfx::B3DVector& GetDirection() { return maDirection; }
-    BOOL GetEnabled() { return mbEnabled; }
-    BOOL GetSpecular() { return mbSpecular; }
+    sal_Bool GetEnabled() { return mbEnabled; }
+    sal_Bool GetSpecular() { return mbSpecular; }
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -220,7 +220,7 @@ protected:
 
     // local parameters which need to be read
     com::sun::star::drawing::HomogenMatrix mxHomMat;
-    BOOL                        mbSetTransform;
+    sal_Bool                        mbSetTransform;
 
     com::sun::star::drawing::ProjectionMode mxPrjMode;
     sal_Int32                   mnDistance;
@@ -228,14 +228,14 @@ protected:
     sal_Int32                   mnShadowSlant;
     com::sun::star::drawing::ShadeMode mxShadeMode;
     Color                       maAmbientColor;
-    BOOL                        mbLightingMode;
+    sal_Bool                        mbLightingMode;
 
     ::basegfx::B3DVector        maVRP;
     ::basegfx::B3DVector        maVPN;
     ::basegfx::B3DVector        maVUP;
-    BOOL                        mbVRPUsed;
-    BOOL                        mbVPNUsed;
-    BOOL                        mbVUPUsed;
+    sal_Bool                        mbVRPUsed;
+    sal_Bool                        mbVPNUsed;
+    sal_Bool                        mbVUPUsed;
 
 public:
     SdXML3DSceneAttributesHelper( SvXMLImport& rImporter );
@@ -261,7 +261,7 @@ protected:
     rtl::OUString                                                       msHyperlink;
 
 public:
-    SvXMLShapeContext( SvXMLImport& rImp, USHORT nPrfx,
+    SvXMLShapeContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
         const ::rtl::OUString& rLName, sal_Bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {}
 
     TYPEINFO();
@@ -336,7 +336,7 @@ public:
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xFrameAttrList);
     SvXMLImportContext* CreateFrameChildContext(
-        SvXMLImportContext *pThisContext, USHORT nPrefix, const rtl::OUString& rLocalName,
+        SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     SvXMLShapeContext* Create3DSceneChildContext(
diff --git a/xmloff/inc/xmloff/table/XMLTableImport.hxx b/xmloff/inc/xmloff/table/XMLTableImport.hxx
index 412bfd05e848..42d3cb52b479 100644
--- a/xmloff/inc/xmloff/table/XMLTableImport.hxx
+++ b/xmloff/inc/xmloff/table/XMLTableImport.hxx
@@ -54,10 +54,10 @@ public:
     XMLTableImport( SvXMLImport& rImport, const rtl::Reference< XMLPropertySetMapper >& xCellPropertySetMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef );
     virtual ~XMLTableImport();
 
-    SvXMLImportContext* CreateTableContext( USHORT nPrfx, const ::rtl::OUString& rLName,
+    SvXMLImportContext* CreateTableContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                             ::com::sun::star::uno::Reference< ::com::sun::star::table::XColumnRowRange >& xColumnRowRange );
 
-    SvXMLStyleContext* CreateTableTemplateContext( USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+    SvXMLStyleContext* CreateTableTemplateContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     rtl::Reference< SvXMLImportPropertyMapper > GetCellImportPropertySetMapper() const { return mxCellImportPropertySetMapper; }
     rtl::Reference< SvXMLImportPropertyMapper > GetRowImportPropertySetMapper() const { return mxRowImportPropertySetMapper; }
diff --git a/xmloff/inc/xmloff/xformsimport.hxx b/xmloff/inc/xmloff/xformsimport.hxx
index 8784ea55b58e..2626c07927d5 100644
--- a/xmloff/inc/xmloff/xformsimport.hxx
+++ b/xmloff/inc/xmloff/xformsimport.hxx
@@ -30,7 +30,7 @@
 #include "sal/config.h"
 #include "xmloff/dllapi.h"
 
-#include <tools/solar.h> // for USHORT
+#include <tools/solar.h> // for sal_uInt16
 #include <com/sun/star/uno/Reference.hxx>
 
 class SvXMLImport;
@@ -51,7 +51,7 @@ namespace com { namespace sun { namespace star {
 /** create import context for xforms:model element. */
 XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext(
     SvXMLImport& rImport,
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName );
 
 /** perform the actual binding of an XForms-binding with the suitable control
diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/xmloff/inc/xmloff/xmlcnimp.hxx
index b3c27581690e..51d3cf3c8ff4 100644
--- a/xmloff/inc/xmloff/xmlcnimp.hxx
+++ b/xmloff/inc/xmloff/xmlcnimp.hxx
@@ -58,10 +58,10 @@ public:
 
     int  operator ==( const SvXMLAttrContainerData& rCmp ) const;
 
-    BOOL AddAttr( const ::rtl::OUString& rLName, const rtl::OUString& rValue );
-    BOOL AddAttr( const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace,
+    sal_Bool AddAttr( const ::rtl::OUString& rLName, const rtl::OUString& rValue );
+    sal_Bool AddAttr( const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace,
                     const ::rtl::OUString& rLName, const rtl::OUString& rValue );
-    BOOL AddAttr( const ::rtl::OUString& rPrefix,
+    sal_Bool AddAttr( const ::rtl::OUString& rPrefix,
                   const ::rtl::OUString& rLName,
                   const ::rtl::OUString& rValue );
 
@@ -76,12 +76,12 @@ public:
     inline const ::rtl::OUString& GetNamespace( sal_uInt16 i ) const;
     inline const ::rtl::OUString& GetPrefix( sal_uInt16 i ) const;
 
-    BOOL SetAt( sal_uInt16 i,
+    sal_Bool SetAt( sal_uInt16 i,
                 const ::rtl::OUString& rLName, const rtl::OUString& rValue );
-    BOOL SetAt( sal_uInt16 i,
+    sal_Bool SetAt( sal_uInt16 i,
                 const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace,
                 const ::rtl::OUString& rLName, const rtl::OUString& rValue );
-    BOOL SetAt( sal_uInt16 i,
+    sal_Bool SetAt( sal_uInt16 i,
                 const ::rtl::OUString& rPrefix,
                 const ::rtl::OUString& rLName,
                 const ::rtl::OUString& rValue );
diff --git a/xmloff/inc/xmloff/xmlcnitm.hxx b/xmloff/inc/xmloff/xmlcnitm.hxx
index 772ba1dd0fc4..9c0010d5df5b 100644
--- a/xmloff/inc/xmloff/xmlcnitm.hxx
+++ b/xmloff/inc/xmloff/xmlcnitm.hxx
@@ -61,8 +61,8 @@ public:
 
     virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-    virtual BOOL             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual BOOL             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxPoolItem *Clone( SfxItemPool * = 0) const
     { return new SvXMLAttrContainerItem( *this ); }
diff --git a/xmloff/inc/xmloff/xmlictxt.hxx b/xmloff/inc/xmloff/xmlictxt.hxx
index bb8d58cf791c..9288645a0ad1 100644
--- a/xmloff/inc/xmloff/xmlictxt.hxx
+++ b/xmloff/inc/xmloff/xmlictxt.hxx
@@ -46,7 +46,7 @@ class XMLOFF_DLLPUBLIC SvXMLImportContext : public SvRefBase
 
     SvXMLImport& mrImport;
 
-    USHORT       mnPrefix;
+    sal_uInt16       mnPrefix;
     ::rtl::OUString maLocalName;
 
     SvXMLNamespaceMap   *mpRewindMap;
@@ -63,14 +63,14 @@ protected:
 public:
     TYPEINFO();
 
-    USHORT GetPrefix() const { return mnPrefix; }
+    sal_uInt16 GetPrefix() const { return mnPrefix; }
     const ::rtl::OUString& GetLocalName() const { return maLocalName; }
 
     // A contexts constructor does anything that is required if an element
     // starts. Namespace processing has been done already.
     // Note that virtual methods cannot be used inside constructors. Use
     // StartElement instead if this is required.
-    SvXMLImportContext( SvXMLImport& rImport, USHORT nPrfx,
+    SvXMLImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName );
 
     // A contexts destructor does anything that is required if an element
@@ -81,7 +81,7 @@ public:
 
     // Create a childs element context. By default, the import's
     // CreateContext method is called to create a new default context.
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/inc/xmloff/xmlmetai.hxx b/xmloff/inc/xmloff/xmlmetai.hxx
index 6343c4ee37dc..efdd1d3f024f 100644
--- a/xmloff/inc/xmloff/xmlmetai.hxx
+++ b/xmloff/inc/xmloff/xmlmetai.hxx
@@ -50,7 +50,7 @@ private:
         ::com::sun::star::xml::sax::XDocumentHandler> mxDocBuilder;
 
 public:
-    SvXMLMetaDocumentContext(SvXMLImport& rImport, USHORT nPrfx,
+    SvXMLMetaDocumentContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
         const rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::document::XDocumentProperties>& xDocProps,
@@ -59,7 +59,7 @@ public:
 
     virtual ~SvXMLMetaDocumentContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/xmloff/inc/xmloff/xmlnumfi.hxx
index 8463037fa6d3..537e789cfea2 100644
--- a/xmloff/inc/xmloff/xmlnumfi.hxx
+++ b/xmloff/inc/xmloff/xmlnumfi.hxx
@@ -99,7 +99,7 @@ public:
     ~SvXMLNumFmtHelper();
 
     SvXMLStyleContext*  CreateChildContext( SvXMLImport& rImport,
-                USHORT nPrefix, const rtl::OUString& rLocalName,
+                sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
                 const ::com::sun::star::uno::Reference<
                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                     SvXMLStylesContext& rStyles);
@@ -116,12 +116,12 @@ public:
 class SvXMLNumFmtDefaults
 {
 public:
-    static sal_Bool IsSystemLongDay( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemLongMonth( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemTextualMonth( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemLongYear( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemLongEra( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemLongDayOfWeek( const SvtSysLocale& rSysLoc, BOOL bLong );
+    static sal_Bool IsSystemLongDay( const SvtSysLocale& rSysLoc, sal_Bool bLong );
+    static sal_Bool IsSystemLongMonth( const SvtSysLocale& rSysLoc, sal_Bool bLong );
+    static sal_Bool IsSystemTextualMonth( const SvtSysLocale& rSysLoc, sal_Bool bLong );
+    static sal_Bool IsSystemLongYear( const SvtSysLocale& rSysLoc, sal_Bool bLong );
+    static sal_Bool IsSystemLongEra( const SvtSysLocale& rSysLoc, sal_Bool bLong );
+    static sal_Bool IsSystemLongDayOfWeek( const SvtSysLocale& rSysLoc, sal_Bool bLong );
 
     // return value is NfIndexTableOffset
     static sal_uInt16 GetDefaultDateFormat( SvXMLDateElementAttributes eDOW,
@@ -177,13 +177,13 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext
     SAL_DLLPRIVATE sal_Int32 PrivateGetKey();
 
 public:
-                SvXMLNumFormatContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     SvXMLNumImpData* pNewData, sal_uInt16 nNewType,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                     SvXMLStylesContext& rStyles );
-                SvXMLNumFormatContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -191,7 +191,7 @@ public:
                                     SvXMLStylesContext& rStyles );
     virtual     ~SvXMLNumFormatContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                     const rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/inc/xmloff/xmlprcon.hxx b/xmloff/inc/xmloff/xmlprcon.hxx
index 33ae4986e4d2..04da34bd4254 100644
--- a/xmloff/inc/xmloff/xmlprcon.hxx
+++ b/xmloff/inc/xmloff/xmlprcon.hxx
@@ -49,7 +49,7 @@ protected:
 public:
 
     SvXMLPropertySetContext(
-            SvXMLImport& rImport, USHORT nPrfx,
+            SvXMLImport& rImport, sal_uInt16 nPrfx,
             const ::rtl::OUString& rLName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
             sal_uInt32 nFamily,
@@ -59,14 +59,14 @@ public:
 
     virtual ~SvXMLPropertySetContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     // This method is called from this instance implementation of
     // CreateChildContext if the element matches an entry in the
     // SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT_ITEM_IMPORT
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/xmloff/inc/xmloff/xmlstyle.hxx
index c26912c72870..9361e11eb8b4 100644
--- a/xmloff/inc/xmloff/xmlstyle.hxx
+++ b/xmloff/inc/xmloff/xmlstyle.hxx
@@ -127,10 +127,10 @@ public:
 
     sal_uInt16 GetFamily() const { return mnFamily; }
 
-    BOOL IsValid() const { return mbValid; }
+    sal_Bool IsValid() const { return mbValid; }
     void SetValid( sal_Bool b ) { mbValid = b; }
 
-    BOOL IsNew() const { return mbNew; }
+    sal_Bool IsNew() const { return mbNew; }
     void SetNew( sal_Bool b ) { mbNew = b; }
 
     // This method is called for every default style
@@ -158,7 +158,7 @@ public:
         and Finish() will not be called.
         The default return value is false
     */
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
@@ -243,7 +243,7 @@ public:
     const SvXMLStyleContext *FindStyleChildContext(
                                       sal_uInt16 nFamily,
                                       const ::rtl::OUString& rName,
-                                      BOOL bCreateIndex=sal_False ) const;
+                                      sal_Bool bCreateIndex=sal_False ) const;
     virtual sal_uInt16 GetFamily( const ::rtl::OUString& rFamily ) const;
     virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
                         sal_uInt16 nFamily ) const;
diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx
index 580a20b76a5c..ea8200d83a27 100644
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/xmloff/inc/xmloff/xmluconv.hxx
@@ -223,7 +223,7 @@ public:
         this method will either use the given default or return
         false if not default is set */
     static sal_Bool convertEnum( ::rtl::OUStringBuffer& rBuffer,
-                                 USHORT nValue,
+                                 sal_uInt16 nValue,
                                  const SvXMLEnumStringMapEntry *pMap,
                                  sal_Char* pDefault = NULL );
 
@@ -258,18 +258,18 @@ public:
     /** convert double number to string (using ::rtl::math) and DO
         convert to export MapUnit */
     void convertDouble(::rtl::OUStringBuffer& rBuffer,
-        double fNumber, BOOL bWriteUnits) const;
+        double fNumber, sal_Bool bWriteUnits) const;
 
     /** convert double number to string (using ::rtl::math) and
         DO convert from eSrcUnit to export MapUnit */
     static void convertDouble( ::rtl::OUStringBuffer& rBuffer,
-        double fNumber, BOOL bWriteUnits, MapUnit eCoreUnit, MapUnit eDstUnit);
+        double fNumber, sal_Bool bWriteUnits, MapUnit eCoreUnit, MapUnit eDstUnit);
 
     /** convert double number to string (using ::rtl::math) without unit conversion */
     static void convertDouble( ::rtl::OUStringBuffer& rBuffer, double fNumber);
 
     /** convert string to double number (using ::rtl::math) and DO convert. */
-    sal_Bool convertDouble(double& rValue, const ::rtl::OUString& rString, BOOL bLookForUnits) const;
+    sal_Bool convertDouble(double& rValue, const ::rtl::OUString& rString, sal_Bool bLookForUnits) const;
 
     /** convert string to double number (using ::rtl::math) and DO convert from
         SrcUnit to DstUnit. */