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

diff --git a/sw/source/ui/inc/split.hxx b/sw/source/ui/inc/split.hxx
index 661c063abd..ce733500a4 100644
--- a/sw/source/ui/inc/split.hxx
+++ b/sw/source/ui/inc/split.hxx
@@ -34,7 +34,7 @@
 
 #include <vcl/field.hxx>
 
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 
 #include <vcl/button.hxx>
 
@@ -42,13 +42,13 @@ class SwWrtShell;
 
 class SwSplitTableDlg : public SvxStandardDialog
 {
+    FixedLine            aCountFL;
     FixedText 			aCountLbl;
     NumericField 		aCountEdit;
-    FixedLine            aCountFL;
+    FixedLine            aDirFL;
     ImageRadioButton 	aHorzBox;
     ImageRadioButton    aVertBox;
     CheckBox            aPropCB;
-    FixedLine            aDirFL;
     OKButton 			aOKBtn;
     CancelButton 		aCancelBtn;
     HelpButton 			aHelpBtn;
@@ -61,8 +61,8 @@ public:
     SwSplitTableDlg(Window *pParent, SwWrtShell& rShell );
     DECL_LINK( ClickHdl, Button * );
 
-    BOOL                IsHorizontal() const { return aHorzBox.IsChecked(); }
-    BOOL                IsProportional() const { return aPropCB.IsChecked() && aHorzBox.IsChecked(); }
+    sal_Bool                IsHorizontal() const { return aHorzBox.IsChecked(); }
+    sal_Bool                IsProportional() const { return aPropCB.IsChecked() && aHorzBox.IsChecked(); }
     long                GetCount() const { return sal::static_int_cast< long >(aCountEdit.GetValue()); }
 };