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

diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index 4fa3cee5b5..22d05e05c9 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -44,14 +44,14 @@ class SW_DLLPUBLIC SwTextGridItem : public SfxPoolItem
     sal_uInt16 nLines;
     sal_uInt16 nBaseHeight, nRubyHeight;
     SwTextGrid eGridType;
-    BOOL bRubyTextBelow;
-    BOOL bPrintGrid;
-    BOOL bDisplayGrid;
+    sal_Bool bRubyTextBelow;
+    sal_Bool bPrintGrid;
+    sal_Bool bDisplayGrid;
 
     //for textgrid enhancement
     sal_uInt16 nBaseWidth;
-    BOOL bSnapToChars;
-    BOOL bSquaredMode;
+    sal_Bool bSnapToChars;
+    sal_Bool bSquaredMode;
 public:
     SwTextGridItem();
     virtual ~SwTextGridItem();
@@ -64,8 +64,8 @@ public:
                                     SfxMapUnit ePresMetric,
                                     String &rText,
                                     const IntlWrapper*    pIntl = 0 ) 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	bool        	 QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool			 PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     SwTextGridItem&  operator=( const SwTextGridItem& );
 
@@ -84,37 +84,37 @@ public:
     SwTextGrid GetGridType() const { return eGridType; }
     void SetGridType( SwTextGrid eNew ) { eGridType = eNew; }
 
-    BOOL IsRubyTextBelow() const { return bRubyTextBelow; }
-    BOOL GetRubyTextBelow() const { return bRubyTextBelow; }
-    void SetRubyTextBelow( BOOL bNew ) { bRubyTextBelow = bNew; }
+    sal_Bool IsRubyTextBelow() const { return bRubyTextBelow; }
+    sal_Bool GetRubyTextBelow() const { return bRubyTextBelow; }
+    void SetRubyTextBelow( sal_Bool bNew ) { bRubyTextBelow = bNew; }
 
-    BOOL IsPrintGrid() const { return bPrintGrid; }
-    BOOL GetPrintGrid() const { return bPrintGrid; }
-    void SetPrintGrid( BOOL bNew ) { bPrintGrid = bNew; }
+    sal_Bool IsPrintGrid() const { return bPrintGrid; }
+    sal_Bool GetPrintGrid() const { return bPrintGrid; }
+    void SetPrintGrid( sal_Bool bNew ) { bPrintGrid = bNew; }
 
-    BOOL IsDisplayGrid() const { return bDisplayGrid; }
-    BOOL GetDisplayGrid() const { return bDisplayGrid; }
-    void SetDisplayGrid( BOOL bNew ) { bDisplayGrid = bNew; }
+    sal_Bool IsDisplayGrid() const { return bDisplayGrid; }
+    sal_Bool GetDisplayGrid() const { return bDisplayGrid; }
+    void SetDisplayGrid( sal_Bool bNew ) { bDisplayGrid = bNew; }
     
     //for textgrid enhancement
     sal_uInt16 GetBaseWidth() const { return nBaseWidth;}
     void SetBaseWidth( sal_uInt16 nNew ) { nBaseWidth = nNew; }
     
-    BOOL IsSnapToChars() const { return bSnapToChars; }
-    BOOL GetSnapToChars() const { return bSnapToChars; }
-    void SetSnapToChars( BOOL bNew ) { bSnapToChars = bNew; }
+    sal_Bool IsSnapToChars() const { return bSnapToChars; }
+    sal_Bool GetSnapToChars() const { return bSnapToChars; }
+    void SetSnapToChars( sal_Bool bNew ) { bSnapToChars = bNew; }
     
-    BOOL IsSquaredMode() const { return bSquaredMode; }
-    BOOL GetSquaredMode() const { return bSquaredMode; }
-    void SetSquaredMode( BOOL bNew ) { bSquaredMode = bNew; }
-    void SwitchPaperMode(BOOL bNew );
+    sal_Bool IsSquaredMode() const { return bSquaredMode; }
+    sal_Bool GetSquaredMode() const { return bSquaredMode; }
+    void SetSquaredMode( sal_Bool bNew ) { bSquaredMode = bNew; }
+    void SwitchPaperMode(sal_Bool bNew );
     
     void Init();
 };
 
-inline const SwTextGridItem &SwAttrSet::GetTextGrid(BOOL bInP) const
+inline const SwTextGridItem &SwAttrSet::GetTextGrid(sal_Bool bInP) const
     {   return (const SwTextGridItem&)Get( RES_TEXTGRID, bInP ); }
-inline const SwTextGridItem &SwFmt::GetTextGrid(BOOL bInP) const
+inline const SwTextGridItem &SwFmt::GetTextGrid(sal_Bool bInP) const
     {   return (const SwTextGridItem&)aSet.Get( RES_TEXTGRID, bInP ); }
 
 #endif