diff options
Diffstat (limited to 'sd/source/core/sdpage.cxx')
-rw-r--r-- | sd/source/core/sdpage.cxx | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index fa77599320b5..2f616755c120 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -54,6 +54,7 @@ #include <com/sun/star/xml/dom/XNamedNodeMap.hpp> #include <rtl/ustring.hxx> #include <basegfx/tools/tools.hxx> +#include <o3tl/enumarray.hxx> #include "Outliner.hxx" #include "app.hrc" @@ -93,7 +94,7 @@ using ::com::sun::star::uno::Reference; SdPage::SdPage(SdDrawDocument& rNewDoc, bool bMasterPage) : FmFormPage(rNewDoc, bMasterPage) , SdrObjUserCall() -, mePageKind(PK_STANDARD) +, mePageKind(PageKind::Standard) , meAutoLayout(AUTOLAYOUT_NONE) , mbSelected(false) , mePresChange(PRESCHANGE_MANUAL) @@ -357,7 +358,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const Rec case PRESOBJ_HANDOUT: { // Save the first standard page at SdrPageObj - // #i105146# We want no content to be displayed for PK_HANDOUT, + // #i105146# We want no content to be displayed for PageKind::Handout, // so just never set a page as content pSdrObj = new SdrPageObj(nullptr); } @@ -437,11 +438,11 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const Rec // check if we need another vertical adjustment than the default SdrTextVertAdjust eV = SDRTEXTVERTADJUST_TOP; - if( (eObjKind == PRESOBJ_FOOTER) && (mePageKind != PK_STANDARD) ) + if( (eObjKind == PRESOBJ_FOOTER) && (mePageKind != PageKind::Standard) ) { eV = SDRTEXTVERTADJUST_BOTTOM; } - else if( (eObjKind == PRESOBJ_SLIDENUMBER) && (mePageKind != PK_STANDARD) ) + else if( (eObjKind == PRESOBJ_SLIDENUMBER) && (mePageKind != PageKind::Standard) ) { eV = SDRTEXTVERTADJUST_BOTTOM; } @@ -479,11 +480,11 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const Rec SvxAdjust eH = SVX_ADJUST_LEFT; - if( (eObjKind == PRESOBJ_DATETIME) && (mePageKind != PK_STANDARD ) ) + if( (eObjKind == PRESOBJ_DATETIME) && (mePageKind != PageKind::Standard ) ) { eH = SVX_ADJUST_RIGHT; } - else if( (eObjKind == PRESOBJ_FOOTER) && (mePageKind == PK_STANDARD ) ) + else if( (eObjKind == PRESOBJ_FOOTER) && (mePageKind == PageKind::Standard ) ) { eH = SVX_ADJUST_CENTER; } @@ -509,7 +510,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const Rec // Subscribe object at the style sheet // Set style only when one was found (as in 5.2) - if( mePageKind != PK_HANDOUT ) + if( mePageKind != PageKind::Handout ) { SfxStyleSheet* pSheetForPresObj = GetStyleSheetForPresObj(eObjKind); if(pSheetForPresObj) @@ -772,14 +773,14 @@ void SdPage::CreateTitleAndLayout(bool bInit, bool bCreate ) /************************************************************************** * create background, title- and layout area **************************************************************************/ - if( mePageKind == PK_STANDARD ) + if( mePageKind == PageKind::Standard ) { pMasterPage->EnsureMasterPageDefaultBackground(); } if (GetModel() && static_cast<SdDrawDocument*>(GetModel())->GetDocumentType() == DocumentType::Impress) { - if( mePageKind == PK_HANDOUT && bInit ) + if( mePageKind == PageKind::Handout && bInit ) { // handout template @@ -808,7 +809,7 @@ void SdPage::CreateTitleAndLayout(bool bInit, bool bCreate ) while( iter != aAreas.end() ) { SdrPageObj* pPageObj = static_cast<SdrPageObj*>(pMasterPage->CreatePresObj(PRESOBJ_HANDOUT, false, (*iter++), true) ); - // #i105146# We want no content to be displayed for PK_HANDOUT, + // #i105146# We want no content to be displayed for PageKind::Handout, // so just never set a page as content pPageObj->SetReferencedPage(nullptr); @@ -817,22 +818,22 @@ void SdPage::CreateTitleAndLayout(bool bInit, bool bCreate ) } } - if( mePageKind != PK_HANDOUT ) + if( mePageKind != PageKind::Handout ) { SdrObject* pMasterTitle = pMasterPage->GetPresObj( PRESOBJ_TITLE ); if( pMasterTitle == nullptr ) pMasterPage->CreateDefaultPresObj(PRESOBJ_TITLE); - SdrObject* pMasterOutline = pMasterPage->GetPresObj( mePageKind==PK_NOTES ? PRESOBJ_NOTES : PRESOBJ_OUTLINE ); + SdrObject* pMasterOutline = pMasterPage->GetPresObj( mePageKind==PageKind::Notes ? PRESOBJ_NOTES : PRESOBJ_OUTLINE ); if( pMasterOutline == nullptr ) - pMasterPage->CreateDefaultPresObj( mePageKind == PK_STANDARD ? PRESOBJ_OUTLINE : PRESOBJ_NOTES ); + pMasterPage->CreateDefaultPresObj( mePageKind == PageKind::Standard ? PRESOBJ_OUTLINE : PRESOBJ_NOTES ); } // create header&footer objects if( bCreate ) { - if( mePageKind != PK_STANDARD ) + if( mePageKind != PageKind::Standard ) { SdrObject* pHeader = pMasterPage->GetPresObj( PRESOBJ_HEADER ); if( pHeader == nullptr ) @@ -856,8 +857,8 @@ void SdPage::CreateTitleAndLayout(bool bInit, bool bCreate ) namespace { -const char* const PageKindVector[] = { - "PK_STANDARD", "PK_NOTES", "PK_HANDOUT" +static const o3tl::enumarray<PageKind, char const *> PageKindVector = { + "PageKind::Standard", "PageKind::Notes", "PageKind::Handout" }; const char* const PresObjKindVector[] = { @@ -957,7 +958,7 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind) const char* sObjKind = PresObjKindVector[eObjKind]; const char* sPageKind = PageKindVector[mePageKind]; // create footer objects for standard master page - if( mePageKind == PK_STANDARD ) + if( mePageKind == PageKind::Standard ) { const long nLftBorder = GetLftBorder(); const long nUppBorder = GetUppBorder(); @@ -1048,7 +1049,7 @@ Rectangle SdPage::GetTitleRect() const { Rectangle aTitleRect; - if (mePageKind != PK_HANDOUT) + if (mePageKind != PageKind::Handout) { double propvalue[] = {0,0,0,0}; @@ -1061,7 +1062,7 @@ Rectangle SdPage::GetTitleRect() const aTitleSize.Height() -= GetUppBorder() + GetLwrBorder(); const char* sPageKind = PageKindVector[mePageKind]; - if (mePageKind == PK_STANDARD) + if (mePageKind == PageKind::Standard) { getPresObjProp( *this , "PRESOBJ_TITLE" ,sPageKind, propvalue); aTitlePos.X() += long( aTitleSize.Width() * propvalue[2] ); @@ -1069,7 +1070,7 @@ Rectangle SdPage::GetTitleRect() const aTitleSize.Width() = long( aTitleSize.Width() * propvalue[1] ); aTitleSize.Height() = long( aTitleSize.Height() * propvalue[0] ); } - else if (mePageKind == PK_NOTES) + else if (mePageKind == PageKind::Notes) { Point aPos = aTitlePos; getPresObjProp( *this, "PRESOBJ_TITLE" ,sPageKind, propvalue); @@ -1134,7 +1135,7 @@ Rectangle SdPage::GetLayoutRect() const { Rectangle aLayoutRect; - if (mePageKind != PK_HANDOUT) + if (mePageKind != PageKind::Handout) { double propvalue[] = {0,0,0,0}; @@ -1144,7 +1145,7 @@ Rectangle SdPage::GetLayoutRect() const aLayoutSize.Height() -= GetUppBorder() + GetLwrBorder(); const char* sPageKind = PageKindVector[mePageKind]; - if (mePageKind == PK_STANDARD) + if (mePageKind == PageKind::Standard) { getPresObjProp( *this ,"PRESOBJ_OUTLINE", sPageKind, propvalue); aLayoutPos.X() += long( aLayoutSize.Width() * propvalue[2] ); @@ -1154,7 +1155,7 @@ Rectangle SdPage::GetLayoutRect() const aLayoutRect.SetPos(aLayoutPos); aLayoutRect.SetSize(aLayoutSize); } - else if (mePageKind == PK_NOTES) + else if (mePageKind == PageKind::Notes) { getPresObjProp( *this, "PRESOBJ_NOTES", sPageKind, propvalue); aLayoutPos.X() += long( aLayoutSize.Width() * propvalue[2] ); @@ -1310,12 +1311,12 @@ static void CalcAutoLayoutRectangles( SdPage& rPage,Rectangle* rRectangle ,const Rectangle aTitleRect; Rectangle aLayoutRect; - if( rPage.GetPageKind() != PK_HANDOUT ) + if( rPage.GetPageKind() != PageKind::Handout ) { SdPage& rMasterPage = static_cast<SdPage&>(rPage.TRG_GetMasterPage()); SdrObject* pMasterTitle = rMasterPage.GetPresObj( PRESOBJ_TITLE ); SdrObject* pMasterSubTitle = rMasterPage.GetPresObj( PRESOBJ_TEXT ); - SdrObject* pMasterOutline = rMasterPage.GetPresObj( rPage.GetPageKind()==PK_NOTES ? PRESOBJ_NOTES : PRESOBJ_OUTLINE ); + SdrObject* pMasterOutline = rMasterPage.GetPresObj( rPage.GetPageKind()==PageKind::Notes ? PRESOBJ_NOTES : PRESOBJ_OUTLINE ); if( pMasterTitle ) aTitleRect = pMasterTitle->GetLogicRect(); @@ -2538,7 +2539,7 @@ const OUString& SdPage::GetName() const OUString aCreatedPageName( maCreatedPageName ); if (GetRealName().isEmpty()) { - if ((mePageKind == PK_STANDARD || mePageKind == PK_NOTES) && !mbMaster) + if ((mePageKind == PageKind::Standard || mePageKind == PageKind::Notes) && !mbMaster) { // default name for handout pages sal_uInt16 nNum = (GetPageNum() + 1) / 2; @@ -2570,12 +2571,12 @@ const OUString& SdPage::GetName() const aCreatedPageName = GetRealName(); } - if (mePageKind == PK_NOTES) + if (mePageKind == PageKind::Notes) { aCreatedPageName += " "; aCreatedPageName += SD_RESSTR(STR_NOTES); } - else if (mePageKind == PK_HANDOUT && mbMaster) + else if (mePageKind == PageKind::Handout && mbMaster) { aCreatedPageName += " ("; aCreatedPageName += SD_RESSTR(STR_HANDOUT); @@ -2610,7 +2611,7 @@ OUString SdPage::GetPresObjText(PresObjKind eObjKind) const { if (mbMaster) { - if (mePageKind != PK_NOTES) + if (mePageKind != PageKind::Notes) { aString = SD_RESSTR( STR_PRESOBJ_MPTITLE ); } @@ -2715,7 +2716,7 @@ void SdPage::SetName (const OUString& rName) const HeaderFooterSettings& SdPage::getHeaderFooterSettings() const { - if( mePageKind == PK_HANDOUT && !mbMaster ) + if( mePageKind == PageKind::Handout && !mbMaster ) { return static_cast<SdPage&>(TRG_GetMasterPage()).maHeaderFooterSettings; } @@ -2727,7 +2728,7 @@ const HeaderFooterSettings& SdPage::getHeaderFooterSettings() const void SdPage::setHeaderFooterSettings( const sd::HeaderFooterSettings& rNewSettings ) { - if( mePageKind == PK_HANDOUT && !mbMaster ) + if( mePageKind == PageKind::Handout && !mbMaster ) { static_cast<SdPage&>(TRG_GetMasterPage()).maHeaderFooterSettings = rNewSettings; } @@ -2826,7 +2827,7 @@ bool SdPage::checkVisibility( { const bool bSubContentProcessing(rDisplayInfo.GetSubContentActive()); - if( bSubContentProcessing || ( pCheckPage->GetPageKind() == PK_HANDOUT && bIsPrinting ) ) + if( bSubContentProcessing || ( pCheckPage->GetPageKind() == PageKind::Handout && bIsPrinting ) ) { // use the page that is currently processed const SdPage* pVisualizedSdPage = dynamic_cast< const SdPage* >(pVisualizedPage); @@ -2924,7 +2925,7 @@ bool SdPage::RestoreDefaultText( SdrObject* pObj ) void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, bool bHorizontal, std::vector< Rectangle >& rAreas ) { - SdPage& rHandoutMaster = *rModel.GetMasterSdPage( 0, PK_HANDOUT ); + SdPage& rHandoutMaster = *rModel.GetMasterSdPage( 0, PageKind::Handout ); if( eLayout == AUTOLAYOUT_NONE ) { @@ -3035,7 +3036,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, aPartArea.Width() = ((aArea.Width() - ((nColCnt-1) * nGapW) ) / nColCnt); aPartArea.Height() = ((aArea.Height() - ((nRowCnt-1) * nGapH) ) / nRowCnt); - SdrPage* pFirstPage = rModel.GetMasterSdPage(0, PK_STANDARD); + SdrPage* pFirstPage = rModel.GetMasterSdPage(0, PageKind::Standard); if ( pFirstPage ) { // scale actual size into handout rect |