Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
chart2/source/controller/main/UndoManager.cxx
chart2/source/tools/RegressionCurveHelper.cxx
sc/inc/address.hxx
sc/inc/attrib.hxx
sc/inc/bigrange.hxx
sc/inc/callform.hxx
sc/inc/cell.hxx
sc/inc/chartarr.hxx
sc/inc/chartlis.hxx
sc/inc/chgtrack.hxx
sc/inc/collect.hxx
sc/inc/compiler.hxx
sc/inc/detdata.hxx
sc/inc/document.hxx
sc/inc/fillinfo.hxx
sc/inc/olinetab.hxx
sc/inc/prnsave.hxx
sc/inc/queryparam.hxx
sc/inc/sc.hrc
sc/inc/scabstdlg.hxx
sc/inc/table.hxx
sc/inc/validat.hxx
sc/inc/zforauto.hxx
sc/source/core/data/documen2.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table1.cxx
sc/source/core/tool/address.cxx
sc/source/core/tool/token.cxx
sc/source/filter/excel/frmbase.cxx
sc/source/filter/excel/impop.cxx
sc/source/filter/excel/xename.cxx
sc/source/filter/inc/formel.hxx
sc/source/filter/inc/xename.hxx
sc/source/filter/xml/xmlexprt.cxx
sc/source/filter/xml/xmlnexpi.cxx
sc/source/filter/xml/xmlnexpi.hxx
sc/source/ui/dbgui/filtdlg.cxx
sc/source/ui/inc/docfunc.hxx
sc/source/ui/inc/namedlg.hxx
sc/source/ui/namedlg/namedlg.cxx
sc/source/ui/src/namedlg.src

1 files changed, 14 insertions, 14 deletions

diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 5b781fa784e0..17d6d77a9a7f 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -91,7 +91,7 @@ public:
     void                    AddListener( SfxListener& rListener );
     void                    RemoveListener( SfxListener& rListener );
 
-    void                    UpdateText( USHORT nPart, EditEngine& rSource );
+    void                    UpdateText( sal_uInt16 nPart, EditEngine& rSource );
 
                             // XHeaderFooterContent
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL
@@ -126,15 +126,15 @@ class ScHeaderFooterTextData : public SfxListener
 {
 private:
     ScHeaderFooterContentObj&   rContentObj;
-    USHORT                      nPart;
+    sal_uInt16                      nPart;
     ScEditEngineDefaulter*      pEditEngine;
     SvxEditEngineForwarder*     pForwarder;
-    BOOL                        bDataValid;
-    BOOL                        bInUpdate;
+    sal_Bool                        bDataValid;
+    sal_Bool                        bInUpdate;
 
 public:
                             ScHeaderFooterTextData( ScHeaderFooterContentObj& rContent,
-                                                    USHORT nP );
+                                                    sal_uInt16 nP );
                             ~ScHeaderFooterTextData();
 
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -144,7 +144,7 @@ public:
     void                    UpdateData();
     ScEditEngineDefaulter*  GetEditEngine() { GetTextForwarder(); return pEditEngine; }
 
-    USHORT                  GetPart() const         { return nPart; }
+    sal_uInt16                  GetPart() const         { return nPart; }
     ScHeaderFooterContentObj& GetContentObj() const { return rContentObj; }
 };
 
@@ -165,7 +165,7 @@ private:
 
 public:
                             ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent,
-                                                    USHORT nP );
+                                                    sal_uInt16 nP );
     virtual                 ~ScHeaderFooterTextObj();
 
     const SvxUnoText&       GetUnoText();
@@ -377,10 +377,10 @@ protected:
     ScFieldEditEngine*      pEditEngine;
     SvxEditEngineForwarder* pForwarder;
     ScSharedCellEditSource* pOriginalSource;
-    BOOL                    bDataValid;
-    BOOL                    bInUpdate;
-    BOOL                    bDirty;
-    BOOL                    bDoUpdate;
+    sal_Bool                    bDataValid;
+    sal_Bool                    bInUpdate;
+    sal_Bool                    bDirty;
+    sal_Bool                    bDoUpdate;
 
 protected:
     virtual void            GetCellText(const ScAddress& rCellPos, String& rText);
@@ -402,9 +402,9 @@ public:
     ScDocShell*             GetDocShell() const     { return pDocShell; }
     const ScAddress&        GetCellPos() const      { return aCellPos; }
 
-    void                    SetDirty(BOOL bValue)   { bDirty = bValue; }
-    BOOL                    IsDirty() const         { return bDirty; }
-    void                    SetDoUpdate(BOOL bValue)    { bDoUpdate = bValue; }
+    void                    SetDirty(sal_Bool bValue)   { bDirty = bValue; }
+    sal_Bool                    IsDirty() const         { return bDirty; }
+    void                    SetDoUpdate(sal_Bool bValue)    { bDoUpdate = bValue; }
 };
 
 class ScCellTextObj : public ScCellTextData, public SvxUnoText