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

diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 1fcc1056dea0..8732d0dbe84b 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -78,12 +78,12 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
     SwWrtShell &rSh = GetShell();
     const SfxItemSet  *pArgs   = rReq.GetArgs();
           int          eState = STATE_TOGGLE;
-    USHORT nWhich = rReq.GetSlot();
+    sal_uInt16 nWhich = rReq.GetSlot();
 
     if(pArgs )
     {
         const SfxPoolItem* pItem;
-        pArgs->GetItemState(nWhich, FALSE, &pItem);
+        pArgs->GetItemState(nWhich, sal_False, &pItem);
         eState =  ((const SfxBoolItem &) pArgs->
                                 Get( nWhich )).GetValue() ? STATE_ON : STATE_OFF;
     }
@@ -115,10 +115,10 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
                 SfxBindings& rBind = GetView().GetViewFrame()->GetBindings();
                 if( nWhich == FN_SET_SUB_SCRIPT )
                     rBind.SetState( SfxBoolItem( FN_SET_SUPER_SCRIPT,
-                                                                    FALSE ) );
+                                                                    sal_False ) );
                 else
                     rBind.SetState( SfxBoolItem( FN_SET_SUB_SCRIPT,
-                                                                    FALSE ) );
+                                                                    sal_False ) );
 
             }
             break;
@@ -188,10 +188,10 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
 
 void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
 {
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     const SfxItemSet* pArgs = rReq.GetArgs();
-    BOOL bArgs = pArgs != 0 && pArgs->Count() > 0;
-    int bGrow = FALSE;
+    sal_Bool bArgs = pArgs != 0 && pArgs->Count() > 0;
+    int bGrow = sal_False;
     SwWrtShell& rWrtSh = GetShell();
     SwTxtFmtColl* pColl = 0;
 
@@ -203,7 +203,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
             pColl = 0;
     }
     SfxItemPool& rPool = GetPool();
-    USHORT nWhich = rPool.GetWhich(nSlot);
+    sal_uInt16 nWhich = rPool.GetWhich(nSlot);
     switch ( nSlot )
     {
         case FN_TXTATR_INET:
@@ -232,7 +232,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
         break;
 
         case FN_GROW_FONT_SIZE:
-            bGrow = TRUE;
+            bGrow = sal_True;
             // kein break !!
         case FN_SHRINK_FONT_SIZE:
         {
@@ -241,10 +241,10 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
             SfxItemSet aAttrSet( rPool, aSetItem.GetItemSet().GetRanges() );
 
             const SfxPoolItem* pI;
-            static const USHORT aScrTypes[] = {
+            static const sal_uInt16 aScrTypes[] = {
                 SCRIPTTYPE_LATIN, SCRIPTTYPE_ASIAN, SCRIPTTYPE_COMPLEX, 0 };
-            USHORT nScriptType = rWrtSh.GetScriptType();
-            for( const USHORT* pScrpTyp = aScrTypes; *pScrpTyp; ++pScrpTyp )
+            sal_uInt16 nScriptType = rWrtSh.GetScriptType();
+            for( const sal_uInt16* pScrpTyp = aScrTypes; *pScrpTyp; ++pScrpTyp )
                 if( ( nScriptType & *pScrpTyp ) &&
                     0 != ( pI = aSetItem.GetItemOfScript( *pScrpTyp )))
                 {
@@ -288,7 +288,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
 void SwTextShell::ExecParaAttr(SfxRequest &rReq)
 {
     SvxAdjust eAdjst;
-    BYTE ePropL;
+    sal_uInt8 ePropL;
     const SfxItemSet* pArgs = rReq.GetArgs();
 
     // gleich beide Attribute holen, ist nicht teuerer !!
@@ -297,7 +297,7 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq)
         RES_FRAMEDIR, RES_FRAMEDIR,
         0 );
 
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     switch (nSlot)
     {
         case SID_ATTR_PARA_ADJUST:
@@ -323,7 +323,7 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq)
 SET_ADJUST:
         {
             aSet.Put(SvxAdjustItem(eAdjst,RES_PARATR_ADJUST));
-            rReq.AppendItem( SfxBoolItem( GetPool().GetWhich(nSlot), TRUE ) );
+            rReq.AppendItem( SfxBoolItem( GetPool().GetWhich(nSlot), sal_True ) );
         }
         break;
 
@@ -358,8 +358,8 @@ SET_LINESPACE:
             SfxItemSet aAdjustSet( GetPool(),
                     RES_PARATR_ADJUST, RES_PARATR_ADJUST );
             GetShell().GetCurAttr(aAdjustSet);
-            BOOL bChgAdjust = FALSE;
-            SfxItemState eAdjustState = aAdjustSet.GetItemState(RES_PARATR_ADJUST, FALSE);
+            sal_Bool bChgAdjust = sal_False;
+            SfxItemState eAdjustState = aAdjustSet.GetItemState(RES_PARATR_ADJUST, sal_False);
             if(eAdjustState  >= SFX_ITEM_DEFAULT)
             {
                 int eAdjust = (int)(( const SvxAdjustItem& )
@@ -368,7 +368,7 @@ SET_LINESPACE:
                              (SVX_ADJUST_RIGHT == eAdjust  &&  SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot);
             }
             else
-                bChgAdjust = TRUE;
+                bChgAdjust = sal_True;
 
             SvxFrameDirection eFrmDirection =
                     (SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot) ?
@@ -389,7 +389,7 @@ SET_LINESPACE:
                 {
                     SvxNumRule aRule = pCurRule->MakeSvxNumRule();
 
-                    for(USHORT i = 0; i < aRule.GetLevelCount(); i++)
+                    for(sal_uInt16 i = 0; i < aRule.GetLevelCount(); i++)
                     {
                         SvxNumberFormat aFmt(aRule.GetLevel(i));
                         if(SVX_ADJUST_LEFT == aFmt.GetNumAdjust())
@@ -403,7 +403,7 @@ SET_LINESPACE:
                     SwNumRule aSetRule( pCurRule->GetName(),
                                         pCurRule->Get( 0 ).GetPositionAndSpaceMode() );
                     aSetRule.SetSvxRule( aRule, GetShell().GetDoc());
-                    aSetRule.SetAutoRule( TRUE );
+                    aSetRule.SetAutoRule( sal_True );
                     // no start or continuation of a list - list style is only changed
                     GetShell().SetCurNumRule( aSetRule, false );
                 }
@@ -432,9 +432,9 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
     const SfxItemSet *pArgs = rReq.GetArgs();
     const SfxPoolItem *pItem = 0;
 
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     if(pArgs)
-        pArgs->GetItemState(GetPool().GetWhich(nSlot), FALSE, &pItem);
+        pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem);
     switch ( nSlot )
     {
         case FN_DROP_CHAR_STYLE_NAME:
@@ -474,7 +474,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
                 {
                     rSh.StartAction();
                     rSh.StartUndo( UNDO_START );
-                    if ( SFX_ITEM_SET == aSet.GetItemState(HINT_END,FALSE,&pItem) )
+                    if ( SFX_ITEM_SET == aSet.GetItemState(HINT_END,sal_False,&pItem) )
                     {
                         if ( ((SfxStringItem*)pItem)->GetValue().Len() )
                             rSh.ReplaceDropTxt(((SfxStringItem*)pItem)->GetValue());
@@ -526,12 +526,12 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
     rSh.GetCurAttr(aCoreSet); // *alle* Textattribute von der Core erfragen
 
     SfxWhichIter aIter(rSet);
-    USHORT nSlot = aIter.FirstWhich();
+    sal_uInt16 nSlot = aIter.FirstWhich();
     sal_Bool bFlag = sal_False;
     SfxBoolItem aFlagItem;
     const SfxPoolItem* pItem = 0;
     int eAdjust = -1;   // Illegaler Wert, um DONTCARE zu erkennen
-    SfxItemState eState = aCoreSet.GetItemState(RES_PARATR_ADJUST, FALSE, &pItem);
+    SfxItemState eState = aCoreSet.GetItemState(RES_PARATR_ADJUST, sal_False, &pItem);
 
     if( SFX_ITEM_DEFAULT == eState )
         pItem = &rPool.GetDefaultItem(RES_PARATR_ADJUST);
@@ -539,14 +539,14 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
         eAdjust = (int)(( SvxAdjustItem* ) pItem)->GetAdjust();
 
     short nEsc = 0;
-    eState =  aCoreSet.GetItemState(RES_CHRATR_ESCAPEMENT, FALSE, &pItem);
+    eState =  aCoreSet.GetItemState(RES_CHRATR_ESCAPEMENT, sal_False, &pItem);
     if( SFX_ITEM_DEFAULT == eState )
         pItem = &rPool.GetDefaultItem(RES_CHRATR_ESCAPEMENT);
     if( eState >= SFX_ITEM_DEFAULT )
         nEsc = ((SvxEscapementItem* )pItem)->GetEsc();
 
-    USHORT nLineSpace = 0;
-    eState =  aCoreSet.GetItemState(RES_PARATR_LINESPACING, FALSE, &pItem);
+    sal_uInt16 nLineSpace = 0;
+    eState =  aCoreSet.GetItemState(RES_PARATR_LINESPACING, sal_False, &pItem);
     if( SFX_ITEM_DEFAULT == eState )
         pItem = &rPool.GetDefaultItem(RES_PARATR_LINESPACING);
     if( SFX_ITEM_DEFAULT <= eState &&
@@ -606,7 +606,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
                 else
                 {
                     bFlag = SVX_ADJUST_BLOCK == eAdjust;
-                    USHORT nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell());
+                    sal_uInt16 nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell());
                     if((nHtmlMode & HTMLMODE_ON) && !(nHtmlMode & (HTMLMODE_FULL_STYLES|HTMLMODE_FIRSTLINE) ))
                     {
                         rSet.DisableItem( nSlot );
@@ -629,7 +629,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
             {
                 SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONTHEIGHT,
                                             *rSet.GetPool() );
-                aSetItem.GetItemSet().Put( aCoreSet, FALSE );
+                aSetItem.GetItemSet().Put( aCoreSet, sal_False );
                 if( !aSetItem.GetItemOfScript( rSh.GetScriptType() ))
                     rSet.DisableItem( nSlot );
                 nSlot = 0;
@@ -668,9 +668,9 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
                 else
                 {
                     // is the item set?
-                    USHORT nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell());
+                    sal_uInt16 nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell());
                     if((!(nHtmlMode & HTMLMODE_ON) || (0 != (nHtmlMode & HTMLMODE_SOME_STYLES))) &&
-                    aCoreSet.GetItemState( RES_FRAMEDIR, FALSE ) >= SFX_ITEM_DEFAULT)
+                    aCoreSet.GetItemState( RES_FRAMEDIR, sal_False ) >= SFX_ITEM_DEFAULT)
                     {
                         SvxFrameDirection eFrmDir = (SvxFrameDirection)
                                 ((const SvxFrameDirectionItem& )aCoreSet.Get(RES_FRAMEDIR)).GetValue();
@@ -698,10 +698,10 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
             case RES_PARATR_DROP:
             {
 #if OSL_DEBUG_LEVEL > 1
-                const SfxPoolItem& rItem = aCoreSet.Get(GetPool().GetWhich(nSlot), TRUE);
+                const SfxPoolItem& rItem = aCoreSet.Get(GetPool().GetWhich(nSlot), sal_True);
                 rSet.Put(rItem);
 #else
-                rSet.Put(aCoreSet.Get( GetPool().GetWhich(nSlot), TRUE));
+                rSet.Put(aCoreSet.Get( GetPool().GetWhich(nSlot), sal_True));
 #endif
                 nSlot = 0;
             }
@@ -723,10 +723,10 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
                 SfxItemSet aSet(GetPool(), RES_TXTATR_INETFMT, RES_TXTATR_INETFMT);
                 rSh.GetCurAttr(aSet);
 #if OSL_DEBUG_LEVEL > 1
-                const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, TRUE);
+                const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, sal_True);
                 rSet.Put(rItem);
 #else
-                rSet.Put(aSet.Get( RES_TXTATR_INETFMT, TRUE));
+                rSet.Put(aSet.Get( RES_TXTATR_INETFMT, sal_True));
 #endif
                 nSlot = 0;
             }
@@ -747,7 +747,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
         nSlot = aIter.NextWhich();
     }
 
-    rSet.Put(aCoreSet,FALSE);
+    rSet.Put(aCoreSet,sal_False);
 }