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

diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index d2b49aeefffd..464525ede506 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -56,7 +56,7 @@ class SwIntrnlRefLink : public SwBaseLink
 {
     SwDDEFieldType& rFldType;
 public:
-    SwIntrnlRefLink( SwDDEFieldType& rType, USHORT nUpdateType, USHORT nFmt )
+    SwIntrnlRefLink( SwDDEFieldType& rType, sal_uInt16 nUpdateType, sal_uInt16 nFmt )
         : SwBaseLink( nUpdateType, nFmt ),
         rFldType( rType )
     {}
@@ -66,7 +66,7 @@ public:
                                 const uno::Any & rValue );
 
     virtual const SwNode* GetAnchor() const;
-    virtual BOOL IsInRange( ULONG nSttNd, ULONG nEndNd, xub_StrLen nStt = 0,
+    virtual sal_Bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, xub_StrLen nStt = 0,
                             xub_StrLen nEnd = STRING_NOTFOUND ) const;
 };
 
@@ -93,7 +93,7 @@ void SwIntrnlRefLink::DataChanged( const String& rMimeType,
             if( n && 0x0d == sStr.GetChar( n-1 ) )
                 --n;
 
-            BOOL bDel = n != sStr.Len();
+            sal_Bool bDel = n != sStr.Len();
             if( bDel )
                 sStr.Erase( n );
 
@@ -119,7 +119,7 @@ void SwIntrnlRefLink::DataChanged( const String& rMimeType,
         // dann suchen wir uns mal alle Felder. Wird kein gueltiges
         // gefunden, dann Disconnecten wir uns!
         SwMsgPoolItem aUpdateDDE( RES_UPDATEDDETBL );
-        int bCallModify = FALSE;
+        int bCallModify = sal_False;
         rFldType.LockModify();
 
         SwClientIter aIter( rFldType );
@@ -138,7 +138,7 @@ void SwIntrnlRefLink::DataChanged( const String& rMimeType,
                             pSh->StartAction();
                     }
                     pLast->Modify( 0, &aUpdateDDE );
-                    bCallModify = TRUE;
+                    bCallModify = sal_True;
                 }
             } while( 0 != ( pLast = aIter++ ));
 
@@ -206,7 +206,7 @@ const SwNode* SwIntrnlRefLink::GetAnchor() const
     return pNd;
 }
 
-BOOL SwIntrnlRefLink::IsInRange( ULONG nSttNd, ULONG nEndNd,
+sal_Bool SwIntrnlRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
                                 xub_StrLen nStt, xub_StrLen nEnd ) const
 {
     // hier sollte irgend ein Anchor aus dem normalen Nodes-Array reichen
@@ -225,7 +225,7 @@ BOOL SwIntrnlRefLink::IsInRange( ULONG nSttNd, ULONG nEndNd,
                 if( pTblNd->GetNodes().IsDocNodes() &&
                     nSttNd < pTblNd->EndOfSectionIndex() &&
                     nEndNd > pTblNd->GetIndex() )
-                    return TRUE;
+                    return sal_True;
             }
             else if( ((SwFmtFld*)pLast)->GetTxtFld() )
             {
@@ -233,24 +233,24 @@ BOOL SwIntrnlRefLink::IsInRange( ULONG nSttNd, ULONG nEndNd,
                 const SwTxtNode* pNd = pTFld->GetpTxtNode();
                 if( pNd && pNds == &pNd->GetNodes() )
                 {
-                    ULONG nNdPos = pNd->GetIndex();
+                    sal_uLong nNdPos = pNd->GetIndex();
                     if( nSttNd <= nNdPos && nNdPos <= nEndNd &&
                         ( nNdPos != nSttNd || *pTFld->GetStart() >= nStt ) &&
                         ( nNdPos != nEndNd || *pTFld->GetStart() < nEnd ))
-                        return TRUE;
+                        return sal_True;
                 }
             }
         } while( 0 != ( pLast = aIter++ ));
 
-    return FALSE;
+    return sal_False;
 }
 
 SwDDEFieldType::SwDDEFieldType(const String& rName,
-                                const String& rCmd, USHORT nUpdateType )
+                                const String& rCmd, sal_uInt16 nUpdateType )
     : SwFieldType( RES_DDEFLD ),
     aName( rName ), pDoc( 0 ), nRefCnt( 0 )
 {
-    bCRLFFlag = bDeleted = FALSE;
+    bCRLFFlag = bDeleted = sal_False;
     refLink = new SwIntrnlRefLink( *this, nUpdateType, FORMAT_STRING );
     SetCmd( rCmd );
 }
@@ -327,9 +327,9 @@ void SwDDEFieldType::_RefCntChgd()
     }
 }
 
-bool SwDDEFieldType::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
+bool SwDDEFieldType::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const
 {
-    BYTE nPart = 0;
+    sal_uInt8 nPart = 0;
     switch( nWhichId )
     {
     case FIELD_PROP_PAR2:      nPart = 3; break;
@@ -337,7 +337,7 @@ bool SwDDEFieldType::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
     case FIELD_PROP_SUBTYPE:   nPart = 1; break;
     case FIELD_PROP_BOOL1:
         {
-            sal_Bool bSet = GetType() == sfx2::LINKUPDATE_ALWAYS ? TRUE : FALSE;
+            sal_Bool bSet = GetType() == sfx2::LINKUPDATE_ALWAYS ? sal_True : sal_False;
             rVal.setValue(&bSet, ::getBooleanCppuType());
         }
         break;
@@ -352,16 +352,16 @@ bool SwDDEFieldType::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
     return true;
 }
 
-bool SwDDEFieldType::PutValue( const uno::Any& rVal, USHORT nWhichId )
+bool SwDDEFieldType::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId )
 {
-    BYTE nPart = 0;
+    sal_uInt8 nPart = 0;
     switch( nWhichId )
     {
     case FIELD_PROP_PAR2:      nPart = 3; break;
     case FIELD_PROP_PAR4:      nPart = 2; break;
     case FIELD_PROP_SUBTYPE:   nPart = 1; break;
     case FIELD_PROP_BOOL1:
-        SetType( static_cast<USHORT>(*(sal_Bool*)rVal.getValue() ?
+        SetType( static_cast<sal_uInt16>(*(sal_Bool*)rVal.getValue() ?
                                      sfx2::LINKUPDATE_ALWAYS :
                                      sfx2::LINKUPDATE_ONCALL ) );
         break;