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

Conflicts:
starmath/source/symbol.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/draw/dview.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/layout/calcmove.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/rtf/rtftbl.cxx
sw/source/ui/config/modcfg.cxx
sw/source/ui/dialog/docstdlg.cxx
sw/source/ui/dialog/docstdlg.src
sw/source/ui/fldui/flddb.cxx
sw/source/ui/fldui/flddinf.cxx
sw/source/ui/fldui/flddok.cxx
sw/source/ui/fldui/fldfunc.cxx
sw/source/ui/fldui/fldmgr.cxx
sw/source/ui/fldui/fldpage.hxx
sw/source/ui/fldui/fldref.cxx
sw/source/ui/fldui/fldvar.cxx
sw/source/ui/fldui/fldvar.hxx
sw/source/ui/fldui/fldwrap.cxx
sw/source/ui/fldui/xfldui.cxx
sw/source/ui/inc/docstdlg.hxx
sw/source/ui/shells/langhelper.cxx
sw/source/ui/shells/txtattr.cxx
sw/source/ui/shells/txtcrsr.cxx
sw/source/ui/table/tabledlg.cxx

1 files changed, 14 insertions, 14 deletions

diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index a98f2875638e..0de1142165aa 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -41,8 +41,8 @@ struct SwTabColsEntry
     long    nPos;
     long    nMin;
     long    nMax;
-    BOOL    bHidden;    //Fuer jeden Eintrag ein Flag, Hidden oder nicht.
-                        //Wenn das Flag Hidden TRUE ist liegt der Spalten-
+    sal_Bool    bHidden;    //Fuer jeden Eintrag ein Flag, Hidden oder nicht.
+                        //Wenn das Flag Hidden sal_True ist liegt der Spalten-
                         //trenner nicht in der aktuellen Zeile; er muss
                         //mit gepflegt werden, darf aber nicht angezeigt
                         //werden.
@@ -69,23 +69,23 @@ class SW_DLLPUBLIC SwTabCols
     const SwTabColsEntries& GetData() const { return aData; }
 
 public:
-    SwTabCols( USHORT nSize = 0 );
+    SwTabCols( sal_uInt16 nSize = 0 );
     SwTabCols( const SwTabCols& );
     SwTabCols &operator=( const SwTabCols& );
-    BOOL operator==( const SwTabCols& rCmp ) const;
-    long& operator[]( USHORT nPos ) { return aData[nPos].nPos; }
-    long operator[]( USHORT nPos ) const { return aData[nPos].nPos; }
-    USHORT Count() const { return sal::static_int_cast< USHORT >(aData.size()); }
+    sal_Bool operator==( const SwTabCols& rCmp ) const;
+    long& operator[]( sal_uInt16 nPos ) { return aData[nPos].nPos; }
+    long operator[]( sal_uInt16 nPos ) const { return aData[nPos].nPos; }
+    sal_uInt16 Count() const { return sal::static_int_cast< sal_uInt16 >(aData.size()); }
 
-    BOOL IsHidden( USHORT nPos ) const         { return aData[nPos].bHidden; }
-    void SetHidden( USHORT nPos, BOOL bValue ) { aData[nPos].bHidden = bValue; }
+    sal_Bool IsHidden( sal_uInt16 nPos ) const         { return aData[nPos].bHidden; }
+    void SetHidden( sal_uInt16 nPos, sal_Bool bValue ) { aData[nPos].bHidden = bValue; }
 
-    void Insert( long nValue, BOOL bValue, USHORT nPos );
-    void Insert( long nValue, long nMin, long nMax, BOOL bValue, USHORT nPos );
-    void Remove( USHORT nPos, USHORT nAnz = 1 );
+    void Insert( long nValue, sal_Bool bValue, sal_uInt16 nPos );
+    void Insert( long nValue, long nMin, long nMax, sal_Bool bValue, sal_uInt16 nPos );
+    void Remove( sal_uInt16 nPos, sal_uInt16 nAnz = 1 );
 
-    const SwTabColsEntry& GetEntry( USHORT nPos ) const { return aData[nPos]; }
-          SwTabColsEntry& GetEntry( USHORT nPos )  { return aData[nPos]; }
+    const SwTabColsEntry& GetEntry( sal_uInt16 nPos ) const { return aData[nPos]; }
+          SwTabColsEntry& GetEntry( sal_uInt16 nPos )  { return aData[nPos]; }
 
     long GetLeftMin() const { return nLeftMin; }
     long GetLeft()  const { return nLeft;    }