diff options
Diffstat (limited to 'sd/source/ui/unoidl/unopage.cxx')
-rwxr-xr-x | sd/source/ui/unoidl/unopage.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index fb356087245a..5902ab86ae4d 100755 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -545,7 +545,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap } else { - pPresObj = GetPage()->CreatePresObj( eObjKind, FALSE, aRect, sal_True ); + pPresObj = GetPage()->CreatePresObj( eObjKind, sal_False, aRect, sal_True ); } if( pPresObj ) @@ -680,7 +680,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -723,7 +723,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName sal_Bool bVisible = sal_False; if( ! ( aValue >>= bVisible ) ) throw lang::IllegalArgumentException(); - GetPage()->SetExcluded( bVisible == FALSE ); + GetPage()->SetExcluded( bVisible == sal_False ); break; } case WID_PAGE_SOUNDFILE : @@ -779,7 +779,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aVisibleLayers.Set(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE), bVisible); + aVisibleLayers.Set(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False), bVisible); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } } @@ -799,7 +799,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aVisibleLayers.Set(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE), bVisible); + aVisibleLayers.Set(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False), bVisible); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } } @@ -1078,7 +1078,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) } case WID_PAGE_LDBITMAP: { - BOOL bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); + sal_Bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); Reference< awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap( BitmapEx( SdResId( bHC ? BMP_PAGE_H : BMP_PAGE ) ) ) ); aAny <<= xBitmap; @@ -1109,7 +1109,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { Point aPoint; Size aSize( GetPage()->GetSize() ); - pMetaFile->AddAction( (MetaAction*) new MetaFillColorAction( COL_WHITE, TRUE ), 0 ); + pMetaFile->AddAction( (MetaAction*) new MetaFillColorAction( COL_WHITE, sal_True ), 0 ); pMetaFile->AddAction( (MetaAction*) new MetaRectAction( Rectangle( aPoint, aSize ) ), 1 ); pMetaFile->SetPrefMapMode( MAP_100TH_MM ); pMetaFile->SetPrefSize( aSize ); @@ -1147,7 +1147,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) aBitmap ) ) { SvMemoryStream aMemStream; - aBitmap.GetBitmap().Write( aMemStream, FALSE, FALSE ); + aBitmap.GetBitmap().Write( aMemStream, sal_False, sal_False ); uno::Sequence<sal_Int8> aSeq( (sal_Int8*)aMemStream.GetData(), aMemStream.Tell() ); aAny <<= aSeq; } @@ -1158,7 +1158,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) case WID_PAGE_VISIBLE : { - sal_Bool bVisible = GetPage()->IsExcluded() == FALSE; + sal_Bool bVisible = GetPage()->IsExcluded() == sal_False; aAny <<= Any( &bVisible, ::getBooleanCppuType() ); break; } @@ -1199,7 +1199,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE)); + aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False)); } else { @@ -1218,7 +1218,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE)); + aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False)); } else { @@ -1686,7 +1686,7 @@ void SdGenericDrawPage::SetLftBorder( sal_Int32 nValue ) SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -1710,7 +1710,7 @@ void SdGenericDrawPage::SetRgtBorder( sal_Int32 nValue ) SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -1734,7 +1734,7 @@ void SdGenericDrawPage::SetUppBorder( sal_Int32 nValue ) SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -1758,7 +1758,7 @@ void SdGenericDrawPage::SetLwrBorder( sal_Int32 nValue ) SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -1796,7 +1796,7 @@ static void refreshpage( SdDrawDocument* pDoc, const PageKind ePageKind ) pDoc->SetMaxObjSize(aViewSize); - pViewSh->InitWindows(aPageOrg, aViewSize, Point(-1, -1), TRUE); + pViewSh->InitWindows(aPageOrg, aViewSize, Point(-1, -1), sal_True); pViewSh->UpdateScrollBars(); } @@ -1813,7 +1813,7 @@ void SdGenericDrawPage::SetWidth( sal_Int32 nWidth ) SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -1842,7 +1842,7 @@ void SdGenericDrawPage::SetHeight( sal_Int32 nHeight ) SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); const PageKind ePageKind = GetPage()->GetPageKind(); - USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); + sal_uInt16 i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind); for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); @@ -2336,7 +2336,7 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName ) GetPage()->SetName( aName ); - USHORT nNotesPageNum = (GetPage()->GetPageNum()-1)>>1; + sal_uInt16 nNotesPageNum = (GetPage()->GetPageNum()-1)>>1; if( GetModel()->GetDoc()->GetSdPageCount( PK_NOTES ) > nNotesPageNum ) { SdPage* pNotesPage = GetModel()->GetDoc()->GetSdPage( nNotesPageNum, PK_NOTES ); @@ -2355,7 +2355,7 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName ) EditMode eMode = pDrawViewSh->GetEditMode(); if( eMode == EM_PAGE ) { - BOOL bLayer = pDrawViewSh->IsLayerModeActive(); + sal_Bool bLayer = pDrawViewSh->IsLayerModeActive(); pDrawViewSh->ChangeEditMode( eMode, !bLayer ); pDrawViewSh->ChangeEditMode( eMode, bLayer ); @@ -3081,7 +3081,7 @@ void SAL_CALL SdMasterPage::setName( const OUString& aName ) EditMode eMode = pDrawViewSh->GetEditMode(); if( eMode == EM_MASTERPAGE ) { - BOOL bLayer = pDrawViewSh->IsLayerModeActive(); + sal_Bool bLayer = pDrawViewSh->IsLayerModeActive(); pDrawViewSh->ChangeEditMode( eMode, !bLayer ); pDrawViewSh->ChangeEditMode( eMode, bLayer ); |