summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow/slideshowimpl.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/slideshow/slideshowimpl.cxx')
-rwxr-xr-xsd/source/ui/slideshow/slideshowimpl.cxx96
1 files changed, 48 insertions, 48 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index ee89da143910..418ada476e37 100755
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -116,7 +116,7 @@ namespace sd
// Slots, welche im Sfx verwaltet werden und in der SlideShow disabled
// werden sollen (muss in Reihenfolge der SIDs geordnet sein)
-static USHORT __READONLY_DATA pAllowed[] =
+static sal_uInt16 __READONLY_DATA pAllowed[] =
{
SID_OPENDOC , // 5501 // damit interne Spruenge klappen
SID_JUMPTOMARK , // 5598
@@ -676,7 +676,7 @@ void SAL_CALL SlideshowImpl::disposing()
mpView->DeleteWindowFromPaintView( mpShowWindow );
if( mpView )
- mpView->SetAnimationPause( FALSE );
+ mpView->SetAnimationPause( sal_False );
if( mpViewShell )
{
@@ -754,7 +754,7 @@ void SAL_CALL SlideshowImpl::disposing()
// restart the custom show dialog if he started us
if( mpViewShell->IsStartShowWithDialog() && getDispatcher() )
{
- mpViewShell->SetStartShowWithDialog( FALSE );
+ mpViewShell->SetStartShowWithDialog( sal_False );
getDispatcher()->Execute( SID_CUSTOMSHOW_DLG, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
}
@@ -838,7 +838,7 @@ bool SlideshowImpl::startPreview(
if( mpView )
{
mpView->AddWindowToPaintView( mpShowWindow );
- mpView->SetAnimationPause( TRUE );
+ mpView->SetAnimationPause( sal_True );
}
// call resize handler
@@ -945,7 +945,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
{
// we are in notes page mode, so get
// the corresponding draw page
- const USHORT nPgNum = ( pStartPage->GetPageNum() - 2 ) >> 1;
+ const sal_uInt16 nPgNum = ( pStartPage->GetPageNum() - 2 ) >> 1;
pStartPage = mpDoc->GetSdPage( nPgNum, PK_STANDARD );
}
}
@@ -987,7 +987,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
sal_Int32 nSlide;
for( nSlide = 0; (nSlide < nSlideCount); nSlide++ )
{
- if( mpDoc->GetSdPage( (USHORT) nSlide, PK_STANDARD )->GetName() == aPresSlide )
+ if( mpDoc->GetSdPage( (sal_uInt16) nSlide, PK_STANDARD )->GetName() == aPresSlide )
break;
}
@@ -1026,7 +1026,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
// these Slots are forbiden in other views for this document
if( mpDocSh )
{
- mpDocSh->SetSlotFilter( TRUE, sizeof( pAllowed ) / sizeof( USHORT ), pAllowed );
+ mpDocSh->SetSlotFilter( sal_True, sizeof( pAllowed ) / sizeof( sal_uInt16 ), pAllowed );
mpDocSh->ApplySlotFilter();
}
@@ -1076,7 +1076,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
if( mpView )
{
mpView->AddWindowToPaintView( mpShowWindow );
- mpView->SetAnimationPause( TRUE );
+ mpView->SetAnimationPause( sal_True );
}
SfxBindings* pBindings = getBindings();
@@ -1238,7 +1238,7 @@ void SlideshowImpl::onFirstPaint()
}
::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
- maUpdateTimer.SetTimeout( (ULONG)100 );
+ maUpdateTimer.SetTimeout( (sal_uLong)100 );
maUpdateTimer.Start();
}
@@ -1641,7 +1641,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::
if( INET_PROT_FILE == aURL.GetProtocol() )
{
SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) );
- SfxBoolItem aBrowsing( SID_BROWSE, TRUE );
+ SfxBoolItem aBrowsing( SID_BROWSE, sal_True );
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if (pViewFrm)
@@ -1704,9 +1704,9 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::
sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark )
{
- BOOL bIsMasterPage;
+ sal_Bool bIsMasterPage;
OUString aBookmark = getUiNameFromPageApiNameImpl( rStrBookmark );
- USHORT nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage );
+ sal_uInt16 nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage );
if( nPgNum == SDRPAGE_NOTFOUND )
{
@@ -1716,7 +1716,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark
if( pObj )
{
nPgNum = pObj->GetPage()->GetPageNum();
- bIsMasterPage = (BOOL)pObj->GetPage()->IsMasterPage();
+ bIsMasterPage = (sal_Bool)pObj->GetPage()->IsMasterPage();
}
}
@@ -1946,13 +1946,13 @@ sal_Int32 SlideshowImpl::updateSlideShow (void)
// Make sure that the maximum frame count has not been set
// too high (only then conversion to milliseconds and long
// integer may lead to zero value.)
- OSL_ASSERT(static_cast<ULONG>(fUpdate * 1000.0) > 0);
+ OSL_ASSERT(static_cast<sal_uLong>(fUpdate * 1000.0) > 0);
Application::EnableNoYieldMode(false);
Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));
// Use a timer for the asynchronous callback.
- maUpdateTimer.SetTimeout(static_cast<ULONG>(fUpdate * 1000.0));
+ maUpdateTimer.SetTimeout(static_cast<sal_uLong>(fUpdate * 1000.0));
maUpdateTimer.Start();
}
}
@@ -2226,13 +2226,13 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
Reference< ::com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() );
if( xFrame.is() )
{
- pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10617") ), FALSE, FALSE ) );
- pMenu->SetItemImage( CM_PREV_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10618") ), FALSE, FALSE ) );
+ pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10617") ), sal_False, sal_False ) );
+ pMenu->SetItemImage( CM_PREV_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10618") ), sal_False, sal_False ) );
if( pPageMenu )
{
- pPageMenu->SetItemImage( CM_FIRST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10616") ), FALSE, FALSE ) );
- pPageMenu->SetItemImage( CM_LAST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10619") ), FALSE, FALSE ) );
+ pPageMenu->SetItemImage( CM_FIRST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10616") ), sal_False, sal_False ) );
+ pPageMenu->SetItemImage( CM_LAST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10619") ), sal_False, sal_False ) );
}
}
}
@@ -2243,7 +2243,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
const sal_Int32 nPageNumberCount = mpSlideController->getSlideNumberCount();
if( nPageNumberCount <= 1 )
{
- pMenu->EnableItem( CM_GOTO, FALSE );
+ pMenu->EnableItem( CM_GOTO, sal_False );
}
else
{
@@ -2260,12 +2260,12 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
{
if( mpSlideController->isVisibleSlideNumber( nPageNumber ) )
{
- SdPage* pPage = mpDoc->GetSdPage((USHORT)nPageNumber, PK_STANDARD);
+ SdPage* pPage = mpDoc->GetSdPage((sal_uInt16)nPageNumber, PK_STANDARD);
if (pPage)
{
- pPageMenu->InsertItem( (USHORT)(CM_SLIDES + nPageNumber), pPage->GetName() );
+ pPageMenu->InsertItem( (sal_uInt16)(CM_SLIDES + nPageNumber), pPage->GetName() );
if( nPageNumber == nCurrentSlideNumber )
- pPageMenu->CheckItem( (USHORT)(CM_SLIDES + nPageNumber) );
+ pPageMenu->CheckItem( (sal_uInt16)(CM_SLIDES + nPageNumber) );
}
}
}
@@ -2289,7 +2289,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
{
if(! maPresSettings.mbMouseAsPen)
{
- pMenu->EnableItem( CM_WIDTH_PEN, FALSE );
+ pMenu->EnableItem( CM_WIDTH_PEN, sal_False );
}
else
{
@@ -2320,9 +2320,9 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
break;
}
- pWidthMenu->EnableItem( (USHORT)(CM_WIDTH_PEN + nIterator), TRUE);
+ pWidthMenu->EnableItem( (sal_uInt16)(CM_WIDTH_PEN + nIterator), sal_True);
if( nWidth == mdUserPaintStrokeWidth)
- pWidthMenu->CheckItem( (USHORT)(CM_WIDTH_PEN + nIterator) );
+ pWidthMenu->CheckItem( (sal_uInt16)(CM_WIDTH_PEN + nIterator) );
}
}
@@ -2336,7 +2336,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
{
if(! maPresSettings.mbMouseAsPen)
{
- pMenu->EnableItem( CM_ERASE_INK_PEN, FALSE );
+ pMenu->EnableItem( CM_ERASE_INK_PEN, sal_False );
}
else
{
@@ -2367,13 +2367,13 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
break;
}
- pEraseWidthMenu->EnableItem( (USHORT)(CM_ERASE_INK_PEN + nEIterator), TRUE);
+ pEraseWidthMenu->EnableItem( (sal_uInt16)(CM_ERASE_INK_PEN + nEIterator), sal_True);
if( nEWidth == mnEraseInkSize)
- pEraseWidthMenu->CheckItem( (USHORT)(CM_ERASE_INK_PEN + nEIterator) );
+ pEraseWidthMenu->CheckItem( (sal_uInt16)(CM_ERASE_INK_PEN + nEIterator) );
if( mbSwitchPenMode )
- pMenu->CheckItem( (USHORT)(CM_PEN_MODE));
+ pMenu->CheckItem( (sal_uInt16)(CM_PEN_MODE));
if( mbSwitchEraserMode )
- pMenu->CheckItem( (USHORT)(CM_ERASE_MODE));
+ pMenu->CheckItem( (sal_uInt16)(CM_ERASE_MODE));
}
}
@@ -2646,16 +2646,16 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
if( rPresSlide.Len() )
{
sal_Int32 nSlide;
- BOOL bTakeNextAvailable = FALSE;
+ sal_Bool bTakeNextAvailable = sal_False;
for( nSlide = 0, nFirstSlide = -1; ( nSlide < nSlideCount ) && ( -1 == nFirstSlide ); nSlide++ )
{
- SdPage* pTestSlide = mpDoc->GetSdPage( (USHORT)nSlide, PK_STANDARD );
+ SdPage* pTestSlide = mpDoc->GetSdPage( (sal_uInt16)nSlide, PK_STANDARD );
if( pTestSlide->GetName() == rPresSlide )
{
if( pTestSlide->IsExcluded() )
- bTakeNextAvailable = TRUE;
+ bTakeNextAvailable = sal_True;
else
nFirstSlide = nSlide;
}
@@ -2670,7 +2670,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
for( sal_Int32 i = 0; i < nSlideCount; i++ )
{
- bool bVisible = ( mpDoc->GetSdPage( (USHORT)i, PK_STANDARD ) )->IsExcluded() ? false : true;
+ bool bVisible = ( mpDoc->GetSdPage( (sal_uInt16)i, PK_STANDARD ) )->IsExcluded() ? false : true;
if( bVisible || (eMode == AnimationSlideController::ALL) )
mpSlideController->insertSlideNumber( i, bVisible );
}
@@ -2683,18 +2683,18 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
{
sal_Int32 nSlide;
for( nSlide = 0; nSlide < nSlideCount; nSlide++ )
- if( rPresSlide == mpDoc->GetSdPage( (USHORT) nSlide, PK_STANDARD )->GetName() )
+ if( rPresSlide == mpDoc->GetSdPage( (sal_uInt16) nSlide, PK_STANDARD )->GetName() )
break;
if( nSlide < nSlideCount )
- mpSlideController->insertSlideNumber( (USHORT) nSlide );
+ mpSlideController->insertSlideNumber( (sal_uInt16) nSlide );
}
void* pCustomSlide;
sal_Int32 nSlideIndex;
for( pCustomSlide = pCustomShow->First(),nSlideIndex=0; pCustomSlide; pCustomSlide = pCustomShow->Next(), nSlideIndex++ )
{
- const USHORT nSdSlide = ( ( (SdPage*) pCustomSlide )->GetPageNum() - 1 ) / 2;
+ const sal_uInt16 nSdSlide = ( ( (SdPage*) pCustomSlide )->GetPageNum() - 1 ) / 2;
if( !( mpDoc->GetSdPage( nSdSlide, PK_STANDARD ) )->IsExcluded())
mpSlideController->insertSlideNumber( nSdSlide );
@@ -2705,7 +2705,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
// ---------------------------------------------------------
-typedef USHORT (*FncGetChildWindowId)();
+typedef sal_uInt16 (*FncGetChildWindowId)();
FncGetChildWindowId aShowChilds[] =
{
@@ -2737,13 +2737,13 @@ void SlideshowImpl::hideChildWindows()
if( pViewFrame->GetChildWindow( SID_NAVIGATOR ) != NULL )
mnChildMask |= NAVIGATOR_CHILD_MASK;
- for( ULONG i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
+ for( sal_uLong i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
{
- const USHORT nId = ( *aShowChilds[ i ] )();
+ const sal_uInt16 nId = ( *aShowChilds[ i ] )();
if( pViewFrame->GetChildWindow( nId ) )
{
- pViewFrame->SetChildWindow( nId, FALSE );
+ pViewFrame->SetChildWindow( nId, sal_False );
mnChildMask |= 1 << i;
}
}
@@ -2762,10 +2762,10 @@ void SlideshowImpl::showChildWindows()
{
pViewFrame->SetChildWindow( SID_NAVIGATOR, ( mnChildMask & NAVIGATOR_CHILD_MASK ) != 0 );
- for( ULONG i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
+ for( sal_uLong i = 0, nCount = sizeof( aShowChilds ) / sizeof( FncGetChildWindowId ); i < nCount; i++ )
{
if( mnChildMask & ( 1 << i ) )
- pViewFrame->SetChildWindow( ( *aShowChilds[ i ] )(), TRUE );
+ pViewFrame->SetChildWindow( ( *aShowChilds[ i ] )(), sal_True );
}
}
}
@@ -2893,11 +2893,11 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException)
if( pDispatcher )
{
// filter all forbiden slots
- pDispatcher->SetSlotFilter( TRUE, sizeof(pAllowed) / sizeof(USHORT), pAllowed );
+ pDispatcher->SetSlotFilter( sal_True, sizeof(pAllowed) / sizeof(sal_uInt16), pAllowed );
}
if( getBindings() )
- getBindings()->InvalidateAll(TRUE);
+ getBindings()->InvalidateAll(sal_True);
mpShowWindow->GrabFocus();
}
@@ -2982,8 +2982,8 @@ void SlideshowImpl::receiveRequest(SfxRequest& rReq)
const String aTarget( ((SfxStringItem&) pArgs->Get(SID_NAVIGATOR_OBJECT)).GetValue() );
// is the bookmark a Slide?
- BOOL bIsMasterPage;
- USHORT nPgNum = mpDoc->GetPageByName( aTarget, bIsMasterPage );
+ sal_Bool bIsMasterPage;
+ sal_uInt16 nPgNum = mpDoc->GetPageByName( aTarget, bIsMasterPage );
SdrObject* pObj = NULL;
if( nPgNum == SDRPAGE_NOTFOUND )
generated by cgit (git 2.34.1) at 2024-07-18 09:28:27 +0000