diff options
Diffstat (limited to 'svx/source/dialog/optgrid.cxx')
| -rw-r--r-- | svx/source/dialog/optgrid.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index f281580b93db..d1774dcb4870 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -214,7 +214,7 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : aFtBezAngle ( this, SVX_RES( FT_BEZ_ANGLE ) ), aMtrFldBezAngle ( this, SVX_RES( MTR_FLD_BEZ_ANGLE ) ), - bAttrModified( FALSE ) + bAttrModified( sal_False ) { // diese Page braucht ExchangeSupport SetExchangeSupport(); @@ -227,11 +227,11 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : long nFirst, nLast, nMin, nMax; lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax); - SetFieldUnit( aMtrFldDrawX, eFUnit, TRUE ); + SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True ); lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax); lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax); - SetFieldUnit( aMtrFldDrawY, eFUnit, TRUE ); + SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True ); lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax); @@ -259,7 +259,7 @@ SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet //------------------------------------------------------------------------ -BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) +sal_Bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) { if ( bAttrModified ) { @@ -274,8 +274,8 @@ BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) long nX =GetCoreValue( aMtrFldDrawX, eUnit ); long nY = GetCoreValue( aMtrFldDrawY, eUnit ); - aGridItem.nFldDrawX = (UINT32) nX; - aGridItem.nFldDrawY = (UINT32) nY; + aGridItem.nFldDrawX = (sal_uInt32) nX; + aGridItem.nFldDrawY = (sal_uInt32) nY; aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue()); aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue()); @@ -290,7 +290,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pAttr = 0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , FALSE, + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False, (const SfxPoolItem**)&pAttr )) { const SvxGridItem* pGridAttr = (SvxGridItem*)pAttr; @@ -303,8 +303,8 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) SetMetricValue( aMtrFldDrawX , pGridAttr->nFldDrawX, eUnit ); SetMetricValue( aMtrFldDrawY , pGridAttr->nFldDrawY, eUnit ); -// UINT32 nFineX = pGridAttr->nFldDivisionX; -// UINT32 nFineY = pGridAttr->nFldDivisionY; +// sal_uInt32 nFineX = pGridAttr->nFldDivisionX; +// sal_uInt32 nFineY = pGridAttr->nFldDivisionY; // aNumFldDivisionX.SetValue( nFineX ? (pGridAttr->nFldDrawX / nFineX - 1) : 0 ); // aNumFldDivisionY.SetValue( nFineY ? (pGridAttr->nFldDrawY / nFineY - 1) : 0 ); aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX ); @@ -312,7 +312,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) } ChangeGridsnapHdl_Impl( &aCbxUseGridsnap ); - bAttrModified = FALSE; + bAttrModified = sal_False; } // ----------------------------------------------------------------------- @@ -320,7 +320,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) { const SfxPoolItem* pAttr = NULL; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , FALSE, + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False, (const SfxPoolItem**)&pAttr )) { const SvxGridItem* pGridAttr = (SvxGridItem*) pAttr; @@ -331,9 +331,9 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) // Metrik ggfs. aendern (da TabPage im Dialog liegt, // wo die Metrik eingestellt werden kann - //USHORT nWhich = GetWhich( SID_ATTR_METRIC ); + //sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC ); //if( rSet.GetItemState( GetWhich( SID_ATTR_METRIC ) ) >= SFX_ITEM_AVAILABLE ) - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , FALSE, + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False, (const SfxPoolItem**)&pAttr )) { const SfxUInt16Item* pItem = (SfxUInt16Item*) pAttr; @@ -347,14 +347,14 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) long nVal = static_cast<long>(aMtrFldDrawX.Denormalize( aMtrFldDrawX.GetValue( FUNIT_TWIP ) )); lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax); - SetFieldUnit( aMtrFldDrawX, eFUnit, TRUE ); + SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True ); lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax); aMtrFldDrawX.SetValue( aMtrFldDrawX.Normalize( nVal ), FUNIT_TWIP ); nVal = static_cast<long>(aMtrFldDrawY.Denormalize( aMtrFldDrawY.GetValue( FUNIT_TWIP ) )); lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax); - SetFieldUnit( aMtrFldDrawY, eFUnit, TRUE ); + SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True ); lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax); aMtrFldDrawY.SetValue( aMtrFldDrawY.Normalize( nVal ), FUNIT_TWIP ); @@ -372,7 +372,7 @@ int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) //------------------------------------------------------------------------ IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField ) { - bAttrModified = TRUE; + bAttrModified = sal_True; if( aCbxSynchronize.IsChecked() ) { if(pField == &aMtrFldDrawX) @@ -398,7 +398,7 @@ IMPL_LINK( SvxGridTabPage, ClickRotateHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField ) { - bAttrModified = TRUE; + bAttrModified = sal_True; if( aCbxSynchronize.IsChecked() ) { if(&aNumFldDivisionX == pField) @@ -412,7 +412,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField ) IMPL_LINK( SvxGridTabPage, ChangeGridsnapHdl_Impl, void *, EMPTYARG ) { - bAttrModified = TRUE; + bAttrModified = sal_True; return 0; } |