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

diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index a48f4bf2c3f8..7633c2bdb3ab 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -551,7 +551,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
 
     //SwNode& rTxtNode = pUnoCrsr->GetPoint()->nNode.GetNode();
     //const SwAttrSet& rAttrSet = ((SwTxtNode&)rTxtNode).GetSwAttrSet();
-    //USHORT nAttrCount = rAttrSet.Count();
+    //sal_uInt16 nAttrCount = rAttrSet.Count();
 
     const sal_Int32 nProps = rPropertyNames.getLength();
     const OUString *pProp = rPropertyNames.getConstArray();
@@ -780,7 +780,7 @@ throw (uno::RuntimeException)
 }
 
 bool ::sw::GetDefaultTextContentValue(
-        uno::Any& rAny, const OUString& rPropertyName, USHORT nWID)
+        uno::Any& rAny, const OUString& rPropertyName, sal_uInt16 nWID)
 {
     if(!nWID)
     {
@@ -791,7 +791,7 @@ bool ::sw::GetDefaultTextContentValue(
         else if(rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_TEXT_WRAP)))
             nWID = FN_UNO_TEXT_WRAP;
         else
-            return FALSE;
+            return sal_False;
     }
 
     switch(nWID)
@@ -806,9 +806,9 @@ bool ::sw::GetDefaultTextContentValue(
         }
         break;
         default:
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 void SAL_CALL
@@ -903,7 +903,7 @@ throw (beans::UnknownPropertyException)
         break;
     lcl_SwXParagraph_getPropertyStateDEFAULT:
     default:
-        if((*ppSet) && SFX_ITEM_SET == (*ppSet)->GetItemState(rEntry.nWID, FALSE))
+        if((*ppSet) && SFX_ITEM_SET == (*ppSet)->GetItemState(rEntry.nWID, sal_False))
             eRet = beans::PropertyState_DIRECT_VALUE;
         break;
     }