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

diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index acfaf900c185..fdfd5208896c 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -162,7 +162,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
             SvxScriptSetItem aSetItem( nSlot, *pPool2 );
 
             // #i78017 establish the same behaviour as in Writer
-            USHORT nScriptTypes = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
+            sal_uInt16 nScriptTypes = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
             if (nSlot == SID_ATTR_CHAR_FONT)
                 nScriptTypes = pOLV->GetSelectedScriptType();
 
@@ -277,7 +277,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
 
                 SwView* pView = &GetView();
                 FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, pView));
-                SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< UINT16 >(eMetric)) );
+                SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) );
                 SfxItemSet aDlgAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END);
 
                 // util::Language gibts an der EditEngine nicht! Daher nicht im Set.
@@ -290,7 +290,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
 
                 SfxAbstractTabDialog* pDlg = pFact->CreateSwCharDlg( pView->GetWindow(), *pView, aDlgAttr, DLG_CHAR,0, sal_True );
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
-                USHORT nRet = pDlg->Execute();
+                sal_uInt16 nRet = pDlg->Execute();
                 if(RET_OK == nRet )
                 {
                     rReq.Done( *( pDlg->GetOutputItemSet() ) );
@@ -349,7 +349,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
             SwDocStat aCurr;
             SwDocStat aDocStat( rSh.getIDocumentStatistics()->GetDocStat() );
             {
-                SwWait aWait( *GetView().GetDocShell(), TRUE );
+                SwWait aWait( *GetView().GetDocShell(), sal_True );
                 rSh.StartAction();
                 rSh.CountWords( aCurr );
                 rSh.UpdateDocStat( aDocStat );
@@ -372,7 +372,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
             {
                 SwView* pView = &GetView();
                 FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, pView));
-                SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< UINT16 >(eMetric)) );
+                SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) );
                 SfxItemSet aDlgAttr(GetPool(),
                                     EE_ITEMS_START, EE_ITEMS_END,
                                     SID_ATTR_PARA_HYPHENZONE, SID_ATTR_PARA_HYPHENZONE,
@@ -394,7 +394,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
 
                 SfxAbstractTabDialog* pDlg = pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr,DLG_STD, DLG_PARA, 0, sal_True );
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
-                USHORT nRet = pDlg->Execute();
+                sal_uInt16 nRet = pDlg->Execute();
                 if(RET_OK == nRet)
                 {
                     rReq.Done( *( pDlg->GetOutputItemSet() ) );
@@ -488,7 +488,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
             sal_Bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT;
 
             const SfxPoolItem* pPoolItem;
-            if( pNewAttrs && SFX_ITEM_SET == pNewAttrs->GetItemState( nSlot, TRUE, &pPoolItem ) )
+            if( pNewAttrs && SFX_ITEM_SET == pNewAttrs->GetItemState( nSlot, sal_True, &pPoolItem ) )
             {
                 if( !( (SfxBoolItem*)pPoolItem)->GetValue() )
                     bLeftToRight = !bLeftToRight;
@@ -498,8 +498,8 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
                         EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR,
                         0 );
 
-            USHORT nAdjust = SVX_ADJUST_LEFT;
-            if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, TRUE, &pPoolItem ) )
+            sal_uInt16 nAdjust = SVX_ADJUST_LEFT;
+            if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, sal_True, &pPoolItem ) )
                 nAdjust = ( (SvxAdjustItem*)pPoolItem)->GetEnumValue();
 
             if( bLeftToRight )
@@ -555,8 +555,8 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
 
     while(nWhich)
     {
-        USHORT nSlotId = GetPool().GetSlotId( nWhich );
-        BOOL bFlag = FALSE;
+        sal_uInt16 nSlotId = GetPool().GetSlotId( nWhich );
+        sal_Bool bFlag = sal_False;
         switch( nSlotId )
         {
             case SID_LANGUAGE_STATUS://20412:
@@ -640,7 +640,7 @@ ASK_ESCAPE:
             // disable "Thesaurus" if the language is not supported
             const SfxPoolItem &rItem = GetShell().GetDoc()->GetDefault(
                             GetWhichOfScript( RES_CHRATR_LANGUAGE,
-                            GetI18NScriptTypeOfLanguage( (USHORT)GetAppLanguage())) );
+                            GetI18NScriptTypeOfLanguage( (sal_uInt16)GetAppLanguage())) );
             LanguageType nLang = ((const SvxLanguageItem &) rItem).GetLanguage();
 
             uno::Reference< linguistic2::XThesaurus >  xThes( ::GetThesaurus() );
@@ -772,11 +772,11 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet)
 
     SfxWhichIter aIter(rSet);
     sal_uInt16 nWhich = aIter.FirstWhich();
-    USHORT nScriptType = pOLV->GetSelectedScriptType();
+    sal_uInt16 nScriptType = pOLV->GetSelectedScriptType();
     while(nWhich)
     {
         sal_uInt16 nEEWhich = 0;
-        USHORT nSlotId = GetPool().GetSlotId( nWhich );
+        sal_uInt16 nSlotId = GetPool().GetSlotId( nWhich );
         switch( nSlotId )
         {
             case SID_ATTR_CHAR_FONT:
@@ -788,7 +788,7 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet)
                 if( !pEditPool )
                     pEditPool = aEditAttr.GetPool();
                 SvxScriptSetItem aSetItem( nSlotId, *pEditPool );
-                aSetItem.GetItemSet().Put( aEditAttr, FALSE );
+                aSetItem.GetItemSet().Put( aEditAttr, sal_False );
                 const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScriptType );
                 if( pI )
                     rSet.Put( *pI, nWhich );