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, 77 insertions, 77 deletions

diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 5949df04e4..a3d2566aa8 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -69,25 +69,25 @@ class SwDrawTextInfo
     xub_StrLen nIdx;
     xub_StrLen nLen;
     xub_StrLen nOfst;
-    USHORT nWidth;
-    USHORT nAscent;
-    USHORT nCompress;
+    sal_uInt16 nWidth;
+    sal_uInt16 nAscent;
+    sal_uInt16 nCompress;
     long nSperren;
     long nSpace;
     long nKern;
     xub_StrLen nNumberOfBlanks;
-    BYTE nCursorBidiLevel;
-    BOOL bBullet : 1;
-    BOOL bUpper : 1;		// Fuer Kapitaelchen: Grossbuchstaben-Flag
-    BOOL bDrawSpace : 1;	// Fuer Kapitaelchen: Unter/Durchstreichung
-    BOOL bGreyWave	: 1;	// Graue Wellenlinie beim extended TextInput
-    BOOL bSpaceStop : 1;    // For underlining we need to know, if a portion
+    sal_uInt8 nCursorBidiLevel;
+    sal_Bool bBullet : 1;
+    sal_Bool bUpper : 1;		// Fuer Kapitaelchen: Grossbuchstaben-Flag
+    sal_Bool bDrawSpace : 1;	// Fuer Kapitaelchen: Unter/Durchstreichung
+    sal_Bool bGreyWave	: 1;	// Graue Wellenlinie beim extended TextInput
+    sal_Bool bSpaceStop : 1;    // For underlining we need to know, if a portion
                             // is right in front of a hole portion or a
                             // fix margin portion.
-    BOOL bSnapToGrid : 1;   // Does paragraph snap to grid?
-    BOOL bIgnoreFrmRTL : 1; // Paint text as if text has LTR direction, used for
+    sal_Bool bSnapToGrid : 1;   // Does paragraph snap to grid?
+    sal_Bool bIgnoreFrmRTL : 1; // Paint text as if text has LTR direction, used for
                             // line numbering
-    BOOL bPosMatchesBounds :1;  // GetCrsrOfst should not return the next
+    sal_Bool bPosMatchesBounds :1;  // GetCrsrOfst should not return the next
                                 // position if screen position is inside second
                                 // half of bound rect, used for Accessibility
 
@@ -95,27 +95,27 @@ class SwDrawTextInfo
 public:
 
 #if OSL_DEBUG_LEVEL > 1
-    BOOL bPos   : 1;            // These flags should control, that the appropriate
-    BOOL bWrong : 1;            // Set-function has been called before calling
-    BOOL bGrammarCheck : 1;     //  the Get-function of a member
-    BOOL bSize  : 1;
-    BOOL bFnt   : 1;
-    BOOL bHyph  : 1;
-    BOOL bLeft  : 1;
-    BOOL bRight : 1;
-    BOOL bKana  : 1;
-    BOOL bOfst  : 1;
-    BOOL bAscent: 1;
-    BOOL bSperr : 1;
-    BOOL bSpace : 1;
-    BOOL bNumberOfBlanks : 1;
-    BOOL bUppr  : 1;
-    BOOL bDrawSp: 1;
+    sal_Bool bPos   : 1;            // These flags should control, that the appropriate
+    sal_Bool bWrong : 1;            // Set-function has been called before calling
+    sal_Bool bGrammarCheck : 1;     //  the Get-function of a member
+    sal_Bool bSize  : 1;
+    sal_Bool bFnt   : 1;
+    sal_Bool bHyph  : 1;
+    sal_Bool bLeft  : 1;
+    sal_Bool bRight : 1;
+    sal_Bool bKana  : 1;
+    sal_Bool bOfst  : 1;
+    sal_Bool bAscent: 1;
+    sal_Bool bSperr : 1;
+    sal_Bool bSpace : 1;
+    sal_Bool bNumberOfBlanks : 1;
+    sal_Bool bUppr  : 1;
+    sal_Bool bDrawSp: 1;
 #endif
 
     SwDrawTextInfo( ViewShell *pS, OutputDevice &rO, const SwScriptInfo* pSI,
                     const XubString &rSt, xub_StrLen nI, xub_StrLen nL,
-                    USHORT nW = 0, BOOL bB = FALSE )
+                    sal_uInt16 nW = 0, sal_Bool bB = sal_False )
     {
         pFrm = NULL;
         pSh = pS;
@@ -131,11 +131,11 @@ public:
         nCursorBidiLevel = 0;
         bBullet = bB;
         pUnderFnt = 0;
-        bGreyWave = FALSE;
-        bSpaceStop = FALSE;
-        bSnapToGrid = FALSE;
-        bIgnoreFrmRTL = FALSE;
-        bPosMatchesBounds = FALSE;
+        bGreyWave = sal_False;
+        bSpaceStop = sal_False;
+        bSnapToGrid = sal_False;
+        bIgnoreFrmRTL = sal_False;
+        bPosMatchesBounds = sal_False;
 
         // These values are initialized but, they have to be
         // set explicitly via their Set-function before they may
@@ -154,15 +154,15 @@ public:
         nAscent = 0;
         nSperren = 0;
         nSpace = 0;
-        bUpper = FALSE;
-        bDrawSpace = FALSE;
+        bUpper = sal_False;
+        bDrawSpace = sal_False;
 
 #if OSL_DEBUG_LEVEL > 1
         // these flags control, whether the matching member variables have
         // been set by using the Set-function before they may be accessed
         // by their Get-function:
         bPos = bWrong = bGrammarCheck = bSize = bFnt = bAscent = bSpace = bNumberOfBlanks = bUppr =
-        bDrawSp = bLeft = bRight = bKana = bOfst = bHyph = bSperr = FALSE;
+        bDrawSp = bLeft = bRight = bKana = bOfst = bHyph = bSperr = sal_False;
 #endif
     }
 
@@ -306,12 +306,12 @@ public:
         return nKanaDiff;
     }
 
-    USHORT GetWidth() const
+    sal_uInt16 GetWidth() const
     {
         return nWidth;
     }
 
-    USHORT GetAscent() const
+    sal_uInt16 GetAscent() const
     {
 #if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bAscent, "DrawTextInfo: Undefined Ascent" );
@@ -319,7 +319,7 @@ public:
         return nAscent;
     }
 
-    USHORT GetKanaComp() const
+    sal_uInt16 GetKanaComp() const
     {
         return nCompress;
     }
@@ -353,17 +353,17 @@ public:
         return nNumberOfBlanks;
     }
 
-    BYTE GetCursorBidiLevel() const
+    sal_uInt8 GetCursorBidiLevel() const
     {
         return nCursorBidiLevel;
     }
 
-    BOOL GetBullet() const
+    sal_Bool GetBullet() const
     {
         return bBullet;
     }
 
-    BOOL GetUpper() const
+    sal_Bool GetUpper() const
     {
 #if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bUppr, "DrawTextInfo: Undefined Upperflag" );
@@ -371,7 +371,7 @@ public:
         return bUpper;
     }
 
-    BOOL GetDrawSpace() const
+    sal_Bool GetDrawSpace() const
     {
 #if OSL_DEBUG_LEVEL > 1
         OSL_ENSURE( bDrawSp, "DrawTextInfo: Undefined DrawSpaceflag" );
@@ -379,27 +379,27 @@ public:
         return bDrawSpace;
     }
 
-    BOOL GetGreyWave() const
+    sal_Bool GetGreyWave() const
     {
         return bGreyWave;
     }
 
-    BOOL IsSpaceStop() const
+    sal_Bool IsSpaceStop() const
     {
         return bSpaceStop;
     }
 
-    BOOL SnapToGrid() const
+    sal_Bool SnapToGrid() const
     {
         return bSnapToGrid;
     }
 
-    BOOL IsIgnoreFrmRTL() const
+    sal_Bool IsIgnoreFrmRTL() const
     {
         return bIgnoreFrmRTL;
     }
 
-    BOOL IsPosMatchesBounds() const
+    sal_Bool IsPosMatchesBounds() const
     {
         return bPosMatchesBounds;
     }
@@ -413,7 +413,7 @@ public:
     {
         pPos = &rNew;
 #if OSL_DEBUG_LEVEL > 1
-        bPos = TRUE;
+        bPos = sal_True;
 #endif
     }
 
@@ -421,7 +421,7 @@ public:
     {
         pHyphPos = pNew;
 #if OSL_DEBUG_LEVEL > 1
-        bHyph = TRUE;
+        bHyph = sal_True;
 #endif
     }
 
@@ -434,7 +434,7 @@ public:
     {
         pWrong = pNew;
 #if OSL_DEBUG_LEVEL > 1
-        bWrong = TRUE;
+        bWrong = sal_True;
 #endif
     }
 
@@ -442,7 +442,7 @@ public:
     {
         pGrammarCheck = pNew;
 #if OSL_DEBUG_LEVEL > 1
-        bGrammarCheck = TRUE;
+        bGrammarCheck = sal_True;
 #endif
     }
 
@@ -455,7 +455,7 @@ public:
     {
         pSize = &rNew;
 #if OSL_DEBUG_LEVEL > 1
-        bSize = TRUE;
+        bSize = sal_True;
 #endif
     }
 
@@ -463,7 +463,7 @@ public:
     {
         pFnt = pNew;
 #if OSL_DEBUG_LEVEL > 1
-        bFnt = TRUE;
+        bFnt = sal_True;
 #endif
     }
 
@@ -481,7 +481,7 @@ public:
     {
         nOfst = nNew;
 #if OSL_DEBUG_LEVEL > 1
-        bOfst = TRUE;
+        bOfst = sal_True;
 #endif
     }
 
@@ -489,7 +489,7 @@ public:
     {
         nLeft = nNew;
 #if OSL_DEBUG_LEVEL > 1
-        bLeft = TRUE;
+        bLeft = sal_True;
 #endif
     }
 
@@ -497,7 +497,7 @@ public:
     {
         nRight = nNew;
 #if OSL_DEBUG_LEVEL > 1
-        bRight = TRUE;
+        bRight = sal_True;
 #endif
     }
 
@@ -505,20 +505,20 @@ public:
     {
         nKanaDiff = nNew;
 #if OSL_DEBUG_LEVEL > 1
-        bKana = TRUE;
+        bKana = sal_True;
 #endif
     }
 
-    void SetWidth( USHORT nNew )
+    void SetWidth( sal_uInt16 nNew )
     {
         nWidth = nNew;
     }
 
-    void SetAscent( USHORT nNew )
+    void SetAscent( sal_uInt16 nNew )
     {
         nAscent = nNew;
 #if OSL_DEBUG_LEVEL > 1
-        bAscent = TRUE;
+        bAscent = sal_True;
 #endif
     }
 
@@ -540,20 +540,20 @@ public:
             nSperren = 0;
         }
 #if OSL_DEBUG_LEVEL > 1
-        bSpace = TRUE;
-        bSperr = TRUE;
+        bSpace = sal_True;
+        bSperr = sal_True;
 #endif
     }
 
     void SetNumberOfBlanks( xub_StrLen nNew )
     {
 #if OSL_DEBUG_LEVEL > 1
-        bNumberOfBlanks = TRUE;
+        bNumberOfBlanks = sal_True;
 #endif
         nNumberOfBlanks = nNew;
     }
 
-    void SetCursorBidiLevel( BYTE nNew )
+    void SetCursorBidiLevel( sal_uInt8 nNew )
     {
         nCursorBidiLevel = nNew;
     }
@@ -563,7 +563,7 @@ public:
         nCompress = nNew;
     }
 
-    void SetBullet( BOOL bNew )
+    void SetBullet( sal_Bool bNew )
     {
         bBullet = bNew;
     }
@@ -573,48 +573,48 @@ public:
         pUnderFnt = pULFnt;
     }
 
-    void SetUpper( BOOL bNew )
+    void SetUpper( sal_Bool bNew )
     {
         bUpper = bNew;
 #if OSL_DEBUG_LEVEL > 1
-        bUppr = TRUE;
+        bUppr = sal_True;
 #endif
     }
 
-    void SetDrawSpace( BOOL bNew )
+    void SetDrawSpace( sal_Bool bNew )
     {
         bDrawSpace = bNew;
 #if OSL_DEBUG_LEVEL > 1
-        bDrawSp = TRUE;
+        bDrawSp = sal_True;
 #endif
     }
 
-    void SetGreyWave( BOOL bNew )
+    void SetGreyWave( sal_Bool bNew )
     {
         bGreyWave = bNew;
     }
 
-    void SetSpaceStop( BOOL bNew )
+    void SetSpaceStop( sal_Bool bNew )
     {
         bSpaceStop = bNew;
     }
 
-    void SetSnapToGrid( BOOL bNew )
+    void SetSnapToGrid( sal_Bool bNew )
     {
         bSnapToGrid = bNew;
     }
 
-    void SetIgnoreFrmRTL( BOOL bNew )
+    void SetIgnoreFrmRTL( sal_Bool bNew )
     {
         bIgnoreFrmRTL = bNew;
     }
 
-    void SetPosMatchesBounds( BOOL bNew )
+    void SetPosMatchesBounds( sal_Bool bNew )
     {
         bPosMatchesBounds = bNew;
     }
 
-    void Shift( USHORT nDir );
+    void Shift( sal_uInt16 nDir );
 
     // sets a new color at the output device if necessary
     // if a font is passed as argument, the change if made to the font