rebase to DEV300_m100

1 files changed, 57 insertions, 57 deletions

diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 2da5df325dfa..67e34801ca34 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -71,7 +71,7 @@ static const long MINBODY = 56;  // 1mm in twips rounded
 static const long DEF_DIST_WRITER = 500;    // 5mm (Writer)
 static const long DEF_DIST_CALC = 250;      // 2,5mm (Calc)
 
-static USHORT pRanges[] =
+static sal_uInt16 pRanges[] =
 {
     SID_ATTR_BRUSH,          SID_ATTR_BRUSH,
     SID_ATTR_BORDER_OUTER,   SID_ATTR_BORDER_OUTER,
@@ -96,7 +96,7 @@ static USHORT pRanges[] =
 // gibt den Bereich der Which-Werte zurueck
 
 
-USHORT* SvxHeaderPage::GetRanges()
+sal_uInt16* SvxHeaderPage::GetRanges()
 {
     return pRanges;
 }
@@ -110,7 +110,7 @@ SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet& rSet )
 
 //------------------------------------------------------------------------
 
-USHORT* SvxFooterPage::GetRanges()
+sal_uInt16* SvxFooterPage::GetRanges()
 {
     return pRanges;
 }
@@ -142,7 +142,7 @@ SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) :
 
 // -----------------------------------------------------------------------
 
-SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, USHORT nSetId ) :
+SvxHFPage::SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rAttr, sal_uInt16 nSetId ) :
 
     SfxTabPage( pParent, SVX_RES( nResId ), rAttr ),
 
@@ -164,12 +164,12 @@ SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, U
 
     nId                         ( nSetId ),
     pBBSet                      ( NULL ),
-    bDisableQueryBox            ( FALSE ),
-    bEnableBackgroundSelector   ( TRUE )
+    bDisableQueryBox            ( sal_False ),
+    bEnableBackgroundSelector   ( sal_True )
 
 {
     InitHandler();
-    aBspWin.EnableRTL( FALSE );
+    aBspWin.EnableRTL( sal_False );
 
     // diese Page braucht ExchangeSupport
     SetExchangeSupport();
@@ -193,20 +193,20 @@ SvxHFPage::~SvxHFPage()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet )
 {
-    const USHORT        nWSize      = GetWhich( SID_ATTR_PAGE_SIZE );
-    const USHORT        nWLRSpace   = GetWhich( SID_ATTR_LRSPACE );
-    const USHORT        nWULSpace   = GetWhich( SID_ATTR_ULSPACE );
-    const USHORT        nWOn        = GetWhich( SID_ATTR_PAGE_ON );
-    const USHORT        nWDynamic   = GetWhich( SID_ATTR_PAGE_DYNAMIC );
-    const USHORT        nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING );
-    const USHORT        nWShared    = GetWhich( SID_ATTR_PAGE_SHARED );
-    const USHORT        nWBrush     = GetWhich( SID_ATTR_BRUSH );
-    const USHORT        nWBox       = GetWhich( SID_ATTR_BORDER_OUTER );
-    const USHORT        nWBoxInfo   = GetWhich( SID_ATTR_BORDER_INNER );
-    const USHORT        nWShadow    = GetWhich( SID_ATTR_BORDER_SHADOW );
-    const USHORT        aWhichTab[] = { nWSize,     nWSize,
+    const sal_uInt16        nWSize      = GetWhich( SID_ATTR_PAGE_SIZE );
+    const sal_uInt16        nWLRSpace   = GetWhich( SID_ATTR_LRSPACE );
+    const sal_uInt16        nWULSpace   = GetWhich( SID_ATTR_ULSPACE );
+    const sal_uInt16        nWOn        = GetWhich( SID_ATTR_PAGE_ON );
+    const sal_uInt16        nWDynamic   = GetWhich( SID_ATTR_PAGE_DYNAMIC );
+    const sal_uInt16        nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING );
+    const sal_uInt16        nWShared    = GetWhich( SID_ATTR_PAGE_SHARED );
+    const sal_uInt16        nWBrush     = GetWhich( SID_ATTR_BRUSH );
+    const sal_uInt16        nWBox       = GetWhich( SID_ATTR_BORDER_OUTER );
+    const sal_uInt16        nWBoxInfo   = GetWhich( SID_ATTR_BORDER_INNER );
+    const sal_uInt16        nWShadow    = GetWhich( SID_ATTR_BORDER_SHADOW );
+    const sal_uInt16        aWhichTab[] = { nWSize,     nWSize,
                                         nWLRSpace,  nWLRSpace,
                                         nWULSpace,  nWULSpace,
                                         nWOn,       nWOn,
@@ -252,15 +252,15 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
 
     // Raender
     SvxLRSpaceItem aLR( nWLRSpace );
-    aLR.SetLeft( (USHORT)GetCoreValue( aLMEdit, eUnit ) );
-    aLR.SetRight( (USHORT)GetCoreValue( aRMEdit, eUnit ) );
+    aLR.SetLeft( (sal_uInt16)GetCoreValue( aLMEdit, eUnit ) );
+    aLR.SetRight( (sal_uInt16)GetCoreValue( aRMEdit, eUnit ) );
     aSet.Put( aLR );
 
     SvxULSpaceItem aUL( nWULSpace );
     if ( nId == SID_ATTR_PAGE_HEADERSET )
-        aUL.SetLower( (USHORT)nDist );
+        aUL.SetLower( (sal_uInt16)nDist );
     else
-        aUL.SetUpper( (USHORT)nDist );
+        aUL.SetUpper( (sal_uInt16)nDist );
     aSet.Put( aUL );
 
     // Hintergrund und Umrandung?
@@ -272,7 +272,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
         const SfxPoolItem* pItem;
 
         if ( SFX_ITEM_SET ==
-             GetItemSet().GetItemState( GetWhich( nId ), FALSE, &pItem ) )
+             GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) )
         {
             _pSet = &( (SvxSetItem*)pItem )->GetItemSet();
 
@@ -291,7 +291,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
     SvxSetItem aSetItem( GetWhich( nId ), aSet );
     rSet.Put( aSetItem );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -308,7 +308,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
     //
     const SvxSetItem* pSetItem = 0;
 
-    if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), FALSE,
+    if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), sal_False,
                                             (const SfxPoolItem**)&pSetItem ) )
     {
         const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
@@ -372,9 +372,9 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
 
     if ( !pSetItem )
     {
-        aTurnOnBox.Check( FALSE );
-        aHeightDynBtn.Check( TRUE );
-        aCntSharedBox.Check( TRUE );
+        aTurnOnBox.Check( sal_False );
+        aHeightDynBtn.Check( sal_True );
+        aCntSharedBox.Check( sal_True );
     }
 
     TurnOnHdl(0);
@@ -388,10 +388,10 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
     aCntSharedBox.SaveValue();
     RangeHdl( 0 );
 
-    USHORT nHtmlMode = 0;
+    sal_uInt16 nHtmlMode = 0;
     const SfxPoolItem* pItem = 0;
     SfxObjectShell* pShell;
-    if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem) ||
+    if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem) ||
         ( 0 != (pShell = SfxObjectShell::Current()) &&
                     0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
     {
@@ -444,7 +444,7 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
         aRMLbl.Enable();
         aRMEdit.Enable();
 
-        USHORT nUsage = aBspWin.GetUsage();
+        sal_uInt16 nUsage = aBspWin.GetUsage();
 
         if( nUsage == SVX_PAGE_RIGHT || nUsage == SVX_PAGE_LEFT )
             aCntSharedBox.Disable();
@@ -454,16 +454,16 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
     }
     else
     {
-        BOOL bDelete = TRUE;
+        sal_Bool bDelete = sal_True;
 
-        if ( !bDisableQueryBox && pBox && aTurnOnBox.GetSavedValue() == TRUE )
+        if ( !bDisableQueryBox && pBox && aTurnOnBox.GetSavedValue() == sal_True )
             bDelete = ( QueryBox( this, SVX_RES( RID_SVXQBX_DELETE_HEADFOOT ) ).Execute() == RET_YES );
 
         if ( bDelete )
         {
             aDistFT.Disable();
             aDistEdit.Disable();
-            aDynSpacingCB.Enable(FALSE);
+            aDynSpacingCB.Enable(sal_False);
             aHeightFT.Disable();
             aHeightEdit.Disable();
             aHeightDynBtn.Disable();
@@ -522,10 +522,10 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
     if ( !pBBSet )
     {
         // nur die n"otigen Items f"uer Umrandung und Hintergrund benutzen
-        USHORT nBrush = GetWhich( SID_ATTR_BRUSH );
-        USHORT nOuter = GetWhich( SID_ATTR_BORDER_OUTER );
-        USHORT nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
-        USHORT nShadow = GetWhich( SID_ATTR_BORDER_SHADOW );
+        sal_uInt16 nBrush = GetWhich( SID_ATTR_BRUSH );
+        sal_uInt16 nOuter = GetWhich( SID_ATTR_BORDER_OUTER );
+        sal_uInt16 nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
+        sal_uInt16 nShadow = GetWhich( SID_ATTR_BORDER_SHADOW );
 
         // einen leeren Set erzeugenc
         pBBSet = new SfxItemSet( *GetItemSet().GetPool(), nBrush, nBrush,
@@ -534,12 +534,12 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
         const SfxPoolItem* pItem;
 
         if ( SFX_ITEM_SET ==
-             GetItemSet().GetItemState( GetWhich( nId ), FALSE, &pItem ) )
+             GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) )
             // wenn es schon einen gesetzen Set gibt, dann diesen benutzen
             pBBSet->Put( ( (SvxSetItem*)pItem)->GetItemSet() );
 
         if ( SFX_ITEM_SET ==
-             GetItemSet().GetItemState( nInner, FALSE, &pItem ) )
+             GetItemSet().GetItemState( nInner, sal_False, &pItem ) )
             // das gesetze InfoItem wird immer ben"otigt
             pBBSet->Put( *pItem );
     }
@@ -565,7 +565,7 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
 
             //----------------------------------------------------------------
 
-            USHORT nWhich = GetWhich( SID_ATTR_BRUSH );
+            sal_uInt16 nWhich = GetWhich( SID_ATTR_BRUSH );
 
             if ( pBBSet->GetItemState( nWhich ) == SFX_ITEM_SET )
             {
@@ -628,12 +628,12 @@ void SvxHFPage::UpdateExample()
 
 void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
 {
-    USHORT nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET );
+    sal_uInt16 nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET );
 
-    if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET )
+    if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
     {
         const SvxSetItem& rSetItem =
-            (const SvxSetItem&)rSet.Get( nWhich, FALSE );
+            (const SvxSetItem&)rSet.Get( nWhich, sal_False );
         const SfxItemSet& rTmpSet = rSetItem.GetItemSet();
         const SfxBoolItem& rOn =
             (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
@@ -660,10 +660,10 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
 
     nWhich = GetWhich( SID_ATTR_PAGE_FOOTERSET );
 
-    if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET )
+    if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
     {
         const SvxSetItem& rSetItem =
-            (const SvxSetItem&)rSet.Get( nWhich, FALSE );
+            (const SvxSetItem&)rSet.Get( nWhich, sal_False );
         const SfxItemSet& rTmpSet = rSetItem.GetItemSet();
         const SfxBoolItem& rOn =
             (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
@@ -750,7 +750,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
         aBspWin.SetBottom( 0 );
     }
 
-    USHORT nUsage = SVX_PAGE_ALL;
+    sal_uInt16 nUsage = SVX_PAGE_ALL;
     pItem = GetItem( rSet, SID_ATTR_PAGE );
 
     if ( pItem )
@@ -776,7 +776,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
     const SvxSetItem* pSetItem = 0;
 
     if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ),
-                                            FALSE,
+                                            sal_False,
                                             (const SfxPoolItem**)&pSetItem ) )
     {
         const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
@@ -797,7 +797,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
             aBspWin.SetHdDist( nDist );
             aBspWin.SetHdLeft( rLR.GetLeft() );
             aBspWin.SetHdRight( rLR.GetRight() );
-            aBspWin.SetHeader( TRUE );
+            aBspWin.SetHeader( sal_True );
         }
         else
             pSetItem = 0;
@@ -805,7 +805,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 
     if ( !pSetItem )
     {
-        aBspWin.SetHeader( FALSE );
+        aBspWin.SetHeader( sal_False );
 
         if ( SID_ATTR_PAGE_HEADERSET == nId )
             aCntSharedBox.Disable();
@@ -813,7 +813,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
     pSetItem = 0;
 
     if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ),
-                                            FALSE,
+                                            sal_False,
                                             (const SfxPoolItem**)&pSetItem ) )
     {
         const SfxItemSet& rFooterSet = pSetItem->GetItemSet();
@@ -834,7 +834,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
             aBspWin.SetFtDist( nDist );
             aBspWin.SetFtLeft( rLR.GetLeft() );
             aBspWin.SetFtRight( rLR.GetRight() );
-            aBspWin.SetFooter( TRUE );
+            aBspWin.SetFooter( sal_True );
         }
         else
             pSetItem = 0;
@@ -842,7 +842,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 
     if ( !pSetItem )
     {
-        aBspWin.SetFooter( FALSE );
+        aBspWin.SetFooter( sal_False );
 
         if ( SID_ATTR_PAGE_FOOTERSET == nId )
             aCntSharedBox.Disable();
@@ -852,7 +852,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 
     if ( pItem && pItem->ISA(SfxBoolItem) )
     {
-        aBspWin.SetTable( TRUE );
+        aBspWin.SetTable( sal_True );
         aBspWin.SetHorz( ( (SfxBoolItem*)pItem )->GetValue() );
     }
 
@@ -860,7 +860,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 
     if ( pItem && pItem->ISA(SfxBoolItem) )
     {
-        aBspWin.SetTable( TRUE );
+        aBspWin.SetTable( sal_True );
         aBspWin.SetVert( ( (SfxBoolItem*)pItem )->GetValue() );
     }
     ResetBackground_Impl( rSet );