diff options
Diffstat (limited to 'sd/source/ui/dlg')
-rw-r--r-- | sd/source/ui/dlg/PhotoAlbumDialog.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/dlg/animobjs.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/dlg/custsdlg.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/dlg/docprev.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/headerfooterdlg.cxx | 42 | ||||
-rw-r--r-- | sd/source/ui/dlg/masterlayoutdlg.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/dlg/sdpreslt.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 14 |
8 files changed, 45 insertions, 45 deletions
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index ee8784320fd4..545668387990 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -684,7 +684,7 @@ Reference< drawing::XDrawPage > SdPhotoAlbumDialog::appendNewSlide(AutoLayout aL Reference< drawing::XDrawPage > xSlide; // Create the slide Reference< container::XIndexAccess > xIndexAccess( xDrawPages, uno::UNO_QUERY ); xSlide = xDrawPages->insertNewByIndex( xIndexAccess->getCount() ); - SdPage* pSlide = pDoc->GetSdPage( pDoc->GetSdPageCount(PK_STANDARD)-1, PK_STANDARD); + SdPage* pSlide = pDoc->GetSdPage( pDoc->GetSdPageCount(PageKind::Standard)-1, PageKind::Standard); pSlide->SetAutoLayout(aLayout, true); // Set the layout here return xSlide; } @@ -759,7 +759,7 @@ void SdPhotoAlbumDialog::createCaption(const awt::Size& aPageSize ) CapSize.Height() = aPageSize.Height/6; CapPos.X() = 0; CapPos.Y() = aPageSize.Height - CapSize.Height(); - SdPage* pSlide = pDoc->GetSdPage( pDoc->GetSdPageCount(PK_STANDARD)-1, PK_STANDARD ); + SdPage* pSlide = pDoc->GetSdPage( pDoc->GetSdPageCount(PageKind::Standard)-1, PageKind::Standard ); // try to get existing PresObj const Rectangle rRect(CapPos,CapSize); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 57e34169b980..b023d0a2c23a 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -414,7 +414,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, Button*, pBtn, void ) IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void ) { - SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); + SdPage* pPage = pMyDoc->GetSdPage(0, PageKind::Standard); SdrObject* pObject; // tdf#95298 check m_nCurrentFrame for EMPTY_FRAMELIST to avoid out-of-bound array access @@ -525,7 +525,7 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls) { BitmapEx aBmp(*m_FrameList[m_nCurrentFrame].first); - SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); + SdPage* pPage = pMyDoc->GetSdPage(0, PageKind::Standard); SdrObject *const pObject = pPage->GetObj(m_nCurrentFrame); if( pObject ) { @@ -708,7 +708,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) // clone object(s) and insert the clone(s) into the list const SdrMarkList& rMarkList = rView.GetMarkedObjectList(); const size_t nMarkCount = rMarkList.GetMarkCount(); - SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); + SdPage* pPage = pMyDoc->GetSdPage(0, PageKind::Standard); const size_t nCloneCount = pPage->GetObjCount(); if (nMarkCount > 0) @@ -1013,7 +1013,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) // calculate offset for the specified direction Size aOffset; SdrObject * pClone = nullptr; - SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); + SdPage* pPage = pMyDoc->GetSdPage(0, PageKind::Standard); for (size_t i = 0; i < nCount; ++i) { diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 3e3c5d5c4811..1fce442ae152 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -314,10 +314,10 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow, // fill Listbox with page names of Docs for( long nPage = 0L; - nPage < rDoc.GetSdPageCount( PK_STANDARD ); + nPage < rDoc.GetSdPageCount( PageKind::Standard ); nPage++ ) { - SdPage* pPage = rDoc.GetSdPage( (sal_uInt16) nPage, PK_STANDARD ); + SdPage* pPage = rDoc.GetSdPage( (sal_uInt16) nPage, PageKind::Standard ); OUString aStr( pPage->GetName() ); m_pLbPages->InsertEntry( aStr ); } @@ -419,7 +419,7 @@ void SdDefineCustomShowDlg::ClickButtonHdl2(void* p) m_pLbCustomPages->Select( pEntry ); SdPage* pPage = rDoc.GetSdPage( (sal_uInt16) m_pLbPages-> - GetSelectEntryPos( i ), PK_STANDARD ); + GetSelectEntryPos( i ), PageKind::Standard ); pEntry->SetUserData( pPage ); if( nPosCP != TREELIST_APPEND ) diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 3158d48f47b5..32297a464562 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -201,7 +201,7 @@ void SdDocPreviewWin::updateViewSettings() if(pDoc) { - SdPage * pPage = pDoc->GetSdPage( mnShowPage, PK_STANDARD ); + SdPage * pPage = pDoc->GetSdPage( mnShowPage, PageKind::Standard ); if( pPage ) { SdrOutliner& rOutl = pDoc->GetDrawOutliner(); diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index f369a613986d..14c1966b3626 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -175,12 +175,12 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pPar SdPage* pSlide; SdPage* pNotes; - if( pCurrentPage->GetPageKind() == PK_STANDARD ) + if( pCurrentPage->GetPageKind() == PageKind::Standard ) { pSlide = pCurrentPage; pNotes = static_cast<SdPage*>(pDoc->GetPage( pCurrentPage->GetPageNum() + 1 )); } - else if( pCurrentPage->GetPageKind() == PK_NOTES ) + else if( pCurrentPage->GetPageKind() == PageKind::Notes ) { pNotes = pCurrentPage; pSlide = static_cast<SdPage*>(pDoc->GetPage( pCurrentPage->GetPageNum() -1 )); @@ -189,8 +189,8 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pPar else { // handout - pSlide = pDoc->GetSdPage( 0, PK_STANDARD ); - pNotes = pDoc->GetSdPage( 0, PK_NOTES ); + pSlide = pDoc->GetSdPage( 0, PageKind::Standard ); + pNotes = pDoc->GetSdPage( 0, PageKind::Notes ); mpCurrentPage = nullptr; } @@ -228,7 +228,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pPar maSlideSettings = pSlide->getHeaderFooterSettings(); - const HeaderFooterSettings& rTitleSettings = mpDoc->GetSdPage(0, PK_STANDARD)->getHeaderFooterSettings(); + const HeaderFooterSettings& rTitleSettings = mpDoc->GetSdPage(0, PageKind::Standard)->getHeaderFooterSettings(); bool bNotOnTitle = !rTitleSettings.mbFooterVisible && !rTitleSettings.mbSlideNumberVisible && !rTitleSettings.mbDateTimeVisible; mpSlideTabPage->init( maSlideSettings, bNotOnTitle ); @@ -324,19 +324,19 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) // apply to all slides if( bToAll ) { - int nPageCount = mpDoc->GetSdPageCount( PK_STANDARD ); + int nPageCount = mpDoc->GetSdPageCount( PageKind::Standard ); int nPage; for( nPage = 0; nPage < nPageCount; nPage++ ) { - SdPage* pPage = mpDoc->GetSdPage( (sal_uInt16)nPage, PK_STANDARD ); + SdPage* pPage = mpDoc->GetSdPage( (sal_uInt16)nPage, PageKind::Standard ); change( pUndoGroup, pPage, aNewSettings ); } } else { // apply only to the current slide - DBG_ASSERT( mpCurrentPage && mpCurrentPage->GetPageKind() == PK_STANDARD, "no current page to apply to!" ); - if( mpCurrentPage && (mpCurrentPage->GetPageKind() == PK_STANDARD) ) + DBG_ASSERT( mpCurrentPage && mpCurrentPage->GetPageKind() == PageKind::Standard, "no current page to apply to!" ); + if( mpCurrentPage && (mpCurrentPage->GetPageKind() == PageKind::Standard) ) { change( pUndoGroup, mpCurrentPage, aNewSettings ); } @@ -347,13 +347,13 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) if( bNewNotOnTitle ) { // just hide them, plain simple UI feature - HeaderFooterSettings aTempSettings = mpDoc->GetSdPage( 0, PK_STANDARD )->getHeaderFooterSettings(); + HeaderFooterSettings aTempSettings = mpDoc->GetSdPage( 0, PageKind::Standard )->getHeaderFooterSettings(); aTempSettings.mbFooterVisible = false; aTempSettings.mbSlideNumberVisible = false; aTempSettings.mbDateTimeVisible = false; - change( pUndoGroup, mpDoc->GetSdPage( 0, PK_STANDARD ), aTempSettings ); + change( pUndoGroup, mpDoc->GetSdPage( 0, PageKind::Standard ), aTempSettings ); } // now notes settings @@ -365,17 +365,17 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) if( !bForceSlides || !(aNewSettings == maNotesHandoutSettings) ) { // first set to all notes pages - int nPageCount = mpDoc->GetSdPageCount( PK_NOTES ); + int nPageCount = mpDoc->GetSdPageCount( PageKind::Notes ); int nPage; for( nPage = 0; nPage < nPageCount; nPage++ ) { - SdPage* pPage = mpDoc->GetSdPage( (sal_uInt16)nPage, PK_NOTES ); + SdPage* pPage = mpDoc->GetSdPage( (sal_uInt16)nPage, PageKind::Notes ); change( pUndoGroup, pPage, aNewSettings ); } // and last but not least to the handout page - change( pUndoGroup, mpDoc->GetMasterSdPage( 0, PK_HANDOUT ), aNewSettings ); + change( pUndoGroup, mpDoc->GetMasterSdPage( 0, PageKind::Handout ), aNewSettings ); } // give the undo group to the undo manager @@ -416,7 +416,7 @@ HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* pWindow, SdDrawDocument* get(mpCTPreview, "preview"); mpCTPreview->init( pActualPage ? (pActualPage->IsMasterPage() ? pActualPage : static_cast<SdPage*>(&(pActualPage->TRG_GetMasterPage()))) : - (pDoc->GetMasterSdPage( 0, bHandoutMode ? PK_NOTES : PK_STANDARD )) ); + (pDoc->GetMasterSdPage( 0, bHandoutMode ? PageKind::Notes : PageKind::Standard )) ); if( mbHandoutMode ) { @@ -591,26 +591,26 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo // if set, set it on all notes master pages if( bSet ) { - sal_uInt16 nPageCount = mpDoc->GetMasterSdPageCount( PK_NOTES ); + sal_uInt16 nPageCount = mpDoc->GetMasterSdPageCount( PageKind::Notes ); sal_uInt16 nPage; for( nPage = 0; nPage < nPageCount; nPage++ ) { - GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( nPage, PK_NOTES ) ); + GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( nPage, PageKind::Notes ) ); } } // #i119985# and set it, or just get it from the notes master page - GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( 0, PK_NOTES ) ); + GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( 0, PageKind::Notes ) ); } else { // get the language from the first master page // or set it to all master pages - sal_uInt16 nPageCount = bSet ? mpDoc->GetMasterSdPageCount( PK_NOTES ) : 1; + sal_uInt16 nPageCount = bSet ? mpDoc->GetMasterSdPageCount( PageKind::Notes ) : 1; sal_uInt16 nPage; for( nPage = 0; nPage < nPageCount; nPage++ ) { - GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( nPage, PK_STANDARD ) ); + GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( nPage, PageKind::Standard ) ); } } } @@ -799,7 +799,7 @@ void PresLayoutPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangl if (nullptr != mpMaster) { SdrTextObj* pMasterTitle = static_cast<SdrTextObj*>(mpMaster->GetPresObj(PRESOBJ_TITLE)); - SdrTextObj* pMasterOutline = static_cast<SdrTextObj*>(mpMaster->GetPresObj(mpMaster->GetPageKind() == PK_NOTES ? PRESOBJ_NOTES : PRESOBJ_OUTLINE)); + SdrTextObj* pMasterOutline = static_cast<SdrTextObj*>(mpMaster->GetPresObj(mpMaster->GetPageKind() == PageKind::Notes ? PRESOBJ_NOTES : PRESOBJ_OUTLINE)); SdrTextObj* pHeader = static_cast<SdrTextObj*>(mpMaster->GetPresObj(PRESOBJ_HEADER)); SdrTextObj* pFooter = static_cast<SdrTextObj*>(mpMaster->GetPresObj(PRESOBJ_FOOTER)); SdrTextObj* pDate = static_cast<SdrTextObj*>(mpMaster->GetPresObj(PRESOBJ_DATETIME)); diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx index 820be4a64eaf..62f8a1578f60 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.cxx +++ b/sd/source/ui/dlg/masterlayoutdlg.cxx @@ -45,21 +45,21 @@ MasterLayoutDialog::MasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pD if( mpCurrentPage == nullptr ) { - mpCurrentPage = pDoc->GetMasterSdPage( 0, PK_STANDARD ); + mpCurrentPage = pDoc->GetMasterSdPage( 0, PageKind::Standard ); OSL_FAIL( "MasterLayoutDialog::MasterLayoutDialog() - no current page?" ); } switch( mpCurrentPage->GetPageKind() ) { - case PK_STANDARD: + case PageKind::Standard: { mpCBHeader->Enable(false); mpCBPageNumber->SetText(mpCBSlideNumber->GetText()); break; } - case PK_NOTES: + case PageKind::Notes: break; - case PK_HANDOUT: + case PageKind::Handout: break; } @@ -100,7 +100,7 @@ void MasterLayoutDialog::applyChanges() { mpDoc->BegUndo(GetText()); - if( (mpCurrentPage->GetPageKind() != PK_STANDARD) && (mbOldHeader != (bool) mpCBHeader->IsChecked() ) ) + if( (mpCurrentPage->GetPageKind() != PageKind::Standard) && (mbOldHeader != (bool) mpCBHeader->IsChecked() ) ) { if( mbOldHeader ) remove( PRESOBJ_HEADER ); diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 8b9fba0396ad..6ee9b9a24b20 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -151,7 +151,7 @@ void SdPresLayoutDlg::FillValueSet() for (sal_uInt16 nLayout = 0; nLayout < nCount; nLayout++) { SdPage* pMaster = static_cast<SdPage*>(pDoc->GetMasterPage(nLayout)); - if (pMaster->GetPageKind() == PK_STANDARD) + if (pMaster->GetPageKind() == PageKind::Standard) { OUString aLayoutName(pMaster->GetLayoutName()); aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)); @@ -249,7 +249,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void) for (sal_uInt16 nLayout = 0; nLayout < nCount; nLayout++) { SdPage* pMaster = static_cast<SdPage*>( pTemplDoc->GetMasterPage(nLayout) ); - if (pMaster->GetPageKind() == PK_STANDARD) + if (pMaster->GetPageKind() == PageKind::Standard) { OUString aLayoutName(pMaster->GetLayoutName()); aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 56419250aff8..0b5c6c44e889 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -283,7 +283,7 @@ OUString SdPageObjsTLB::getAltLongDescText(SvTreeListEntry* pEntry , bool isAltT for( pageNo = 0; pageNo < maxPages; pageNo++ ) { const SdPage* pPage = static_cast<const SdPage*>( mpDoc->GetPage( pageNo ) ); - if( pPage->GetPageKind() != PK_STANDARD ) continue; + if( pPage->GetPageKind() != PageKind::Standard ) continue; if( pPage->GetName() != ParentName ) continue; SdrObjListIter aIter( *pPage, SdrIterMode::Flat ); while( aIter.IsMore() ) @@ -515,8 +515,8 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, bool bAllPages, while( nPage < nMaxPages ) { const SdPage* pPage = static_cast<const SdPage*>( mpDoc->GetPage( nPage ) ); - if( (mbShowAllPages || pPage->GetPageKind() == PK_STANDARD) - && !(pPage->GetPageKind()==PK_HANDOUT) ) //#94954# never list the normal handout page ( handout-masterpage is used instead ) + if( (mbShowAllPages || pPage->GetPageKind() == PageKind::Standard) + && !(pPage->GetPageKind()==PageKind::Handout) ) //#94954# never list the normal handout page ( handout-masterpage is used instead ) { bool bPageExluded = pPage->IsExcluded(); @@ -800,7 +800,7 @@ void SdPageObjsTLB::SetShowAllShapes ( } /** - * Checks if the pages (PK_STANDARD) of a doc and the objects on the pages + * Checks if the pages (PageKind::Standard) of a doc and the objects on the pages * are identical to the TreeLB. * If a doc is provided, this will be the used doc (important by more than * one document). @@ -824,7 +824,7 @@ bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) while( nPage < nMaxPages ) { const SdPage* pPage = static_cast<const SdPage*>( mpDoc->GetPage( nPage ) ); - if( pPage->GetPageKind() == PK_STANDARD ) + if( pPage->GetPageKind() == PageKind::Standard ) { if( !pEntry ) return false; @@ -918,7 +918,7 @@ void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry ) while( nPage < nMaxPages ) { SdPage* pPage = static_cast<SdPage*>( mpBookmarkDoc->GetPage( nPage ) ); - if( pPage->GetPageKind() == PK_STANDARD ) + if( pPage->GetPageKind() == PageKind::Standard ) { pPageEntry = InsertEntry( pPage->GetName(), aImgPage, @@ -1194,7 +1194,7 @@ void SdPageObjsTLB::DoDrag() if( eDragType == NAVIGATOR_DRAGTYPE_LINK ) nDNDActions = DND_ACTION_LINK; // Either COPY *or* LINK, never both! - else if (mpDoc->GetSdPageCount(PK_STANDARD) == 1) + else if (mpDoc->GetSdPageCount(PageKind::Standard) == 1) { // Can not move away the last slide in a document. nDNDActions = DND_ACTION_COPY; |