diff options
40 files changed, 423 insertions, 423 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 87b5b1284bdb..ab919b29d04b 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -3056,7 +3056,7 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage pSet->Put( XFillStyleItem( drawing::FillStyle_NONE ) ); } pSet->Put( XLineStyleItem( drawing::LineStyle_NONE ) ); - tools::Rectangle aRect( rPage.GetLftBorder(), rPage.GetUppBorder(), rPage.GetWdt()-rPage.GetRgtBorder(), rPage.GetHgt()-rPage.GetLwrBorder() ); + tools::Rectangle aRect( rPage.GetLeftBorder(), rPage.GetUpperBorder(), rPage.GetWidth()-rPage.GetRightBorder(), rPage.GetHeight()-rPage.GetLowerBorder() ); pRet = new SdrRectObj( aRect ); pRet->SetModel( pSdrModel ); diff --git a/include/svx/sdtditm.hxx b/include/svx/sdtditm.hxx index ed57c860da98..9e363c7627e6 100644 --- a/include/svx/sdtditm.hxx +++ b/include/svx/sdtditm.hxx @@ -22,20 +22,20 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -inline SdrMetricItem makeSdrTextLeftDistItem(long nHgt) { - return SdrMetricItem(SDRATTR_TEXT_LEFTDIST, nHgt); +inline SdrMetricItem makeSdrTextLeftDistItem(long mnHeight) { + return SdrMetricItem(SDRATTR_TEXT_LEFTDIST, mnHeight); } -inline SdrMetricItem makeSdrTextRightDistItem(long nHgt) { - return SdrMetricItem(SDRATTR_TEXT_RIGHTDIST, nHgt); +inline SdrMetricItem makeSdrTextRightDistItem(long mnHeight) { + return SdrMetricItem(SDRATTR_TEXT_RIGHTDIST, mnHeight); } -inline SdrMetricItem makeSdrTextUpperDistItem(long nHgt) { - return SdrMetricItem(SDRATTR_TEXT_UPPERDIST, nHgt); +inline SdrMetricItem makeSdrTextUpperDistItem(long mnHeight) { + return SdrMetricItem(SDRATTR_TEXT_UPPERDIST, mnHeight); } -inline SdrMetricItem makeSdrTextLowerDistItem(long nHgt) { - return SdrMetricItem(SDRATTR_TEXT_LOWERDIST, nHgt); +inline SdrMetricItem makeSdrTextLowerDistItem(long mnHeight) { + return SdrMetricItem(SDRATTR_TEXT_LOWERDIST, mnHeight); } #endif diff --git a/include/svx/sdtmfitm.hxx b/include/svx/sdtmfitm.hxx index a590dde77d7e..838d938c3336 100644 --- a/include/svx/sdtmfitm.hxx +++ b/include/svx/sdtmfitm.hxx @@ -22,20 +22,20 @@ #include <svx/sdmetitm.hxx> #include <svx/svddef.hxx> -inline SdrMetricItem makeSdrTextMinFrameHeightItem(long nHgt) { - return SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT, nHgt); +inline SdrMetricItem makeSdrTextMinFrameHeightItem(long mnHeight) { + return SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT, mnHeight); } -inline SdrMetricItem makeSdrTextMaxFrameHeightItem(long nHgt) { - return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT, nHgt); +inline SdrMetricItem makeSdrTextMaxFrameHeightItem(long mnHeight) { + return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT, mnHeight); } -inline SdrMetricItem makeSdrTextMinFrameWidthItem(long nWdt) { - return SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH, nWdt); +inline SdrMetricItem makeSdrTextMinFrameWidthItem(long mnWidth) { + return SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH, mnWidth); }; -inline SdrMetricItem makeSdrTextMaxFrameWidthItem(long nWdt) { - return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEWIDTH, nWdt); +inline SdrMetricItem makeSdrTextMaxFrameWidthItem(long mnWidth) { + return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEWIDTH, mnWidth); } #endif diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 696205e1ef6e..54b8a6ede4d9 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -385,12 +385,12 @@ public: void ActionChanged(); private: - sal_Int32 nWdt; // Seitengroesse - sal_Int32 nHgt; // Seitengroesse - sal_Int32 nBordLft; // Seitenrand links - sal_Int32 nBordUpp; // Seitenrand oben - sal_Int32 nBordRgt; // Seitenrand rechts - sal_Int32 nBordLwr; // Seitenrand unten + sal_Int32 mnWidth; // Seitengroesse + sal_Int32 mnHeight; // Seitengroesse + sal_Int32 mnBorderLeft; // Seitenrand links + sal_Int32 mnBorderUpper; // Seitenrand oben + sal_Int32 mnBorderRight; // Seitenrand rechts + sal_Int32 mnBorderLower; // Seitenrand unten std::unique_ptr<SdrLayerAdmin> mpLayerAdmin; std::unique_ptr<SdrPageProperties> mpSdrPageProperties; @@ -405,7 +405,7 @@ protected: // new MasterPageDescriptorVector sdr::MasterPageDescriptor* mpMasterPageDescriptor; - SdrLayerIDSet aPrefVisiLayers; + SdrLayerIDSet aPrefVisiLayers; sal_uInt16 nPageNum; bool mbMaster : 1; // flag if this is a MasterPage @@ -450,17 +450,17 @@ public: Size GetSize() const; virtual void SetOrientation(Orientation eOri); virtual Orientation GetOrientation() const; - sal_Int32 GetWdt() const; - sal_Int32 GetHgt() const; + sal_Int32 GetWidth() const; + sal_Int32 GetHeight() const; virtual void SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr); - virtual void SetLftBorder(sal_Int32 nBorder); - virtual void SetUppBorder(sal_Int32 nBorder); - virtual void SetRgtBorder(sal_Int32 nBorder); - virtual void SetLwrBorder(sal_Int32 nBorder); - sal_Int32 GetLftBorder() const; - sal_Int32 GetUppBorder() const; - sal_Int32 GetRgtBorder() const; - sal_Int32 GetLwrBorder() const; + virtual void SetLeftBorder(sal_Int32 nBorder); + virtual void SetUpperBorder(sal_Int32 nBorder); + virtual void SetRightBorder(sal_Int32 nBorder); + virtual void SetLowerBorder(sal_Int32 nBorder); + sal_Int32 GetLeftBorder() const; + sal_Int32 GetUpperBorder() const; + sal_Int32 GetRightBorder() const; + sal_Int32 GetLowerBorder() const; virtual void SetModel(SdrModel* pNewModel) override; diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 229e2506ed98..feeb8eb09903 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -221,11 +221,11 @@ void OReportSection::fill() uno::Reference<report::XReportDefinition> xReportDefinition = m_xSection->getReportDefinition(); const sal_Int32 nLeftMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN); const sal_Int32 nRightMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_RIGHTMARGIN); - m_pPage->SetLftBorder(nLeftMargin); - m_pPage->SetRgtBorder(nRightMargin); + m_pPage->SetLeftBorder(nLeftMargin); + m_pPage->SetRightBorder(nRightMargin); // LLA: TODO -// m_pPage->SetUppBorder(-10000); +// m_pPage->SetUpperBorder(-10000); m_pView->SetDesignMode(); @@ -484,11 +484,11 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) if ( _rEvent.PropertyName == PROPERTY_LEFTMARGIN ) { - m_pPage->SetLftBorder(nLeftMargin); + m_pPage->SetLeftBorder(nLeftMargin); } else if ( _rEvent.PropertyName == PROPERTY_RIGHTMARGIN ) { - m_pPage->SetRgtBorder(nRightMargin); + m_pPage->SetRightBorder(nRightMargin); } const Size aOldPageSize = m_pPage->GetSize(); sal_Int32 nNewHeight = 5*m_xSection->getHeight(); diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 4edb82d0c874..800cb24d7661 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -159,10 +159,10 @@ public: virtual void SetSize(const Size& aSize) override; virtual void SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr) override; - virtual void SetLftBorder(sal_Int32 nBorder) override; - virtual void SetRgtBorder(sal_Int32 nBorder) override; - virtual void SetUppBorder(sal_Int32 nBorder) override; - virtual void SetLwrBorder(sal_Int32 nBorder) override; + virtual void SetLeftBorder(sal_Int32 nBorder) override; + virtual void SetRightBorder(sal_Int32 nBorder) override; + virtual void SetUpperBorder(sal_Int32 nBorder) override; + virtual void SetLowerBorder(sal_Int32 nBorder) override; virtual void SetModel(SdrModel* pNewModel) override; virtual bool IsReadOnly() const override; diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 647443663085..baa04497626c 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -536,7 +536,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument const * pRefDocument /* = if( pRefPage ) { pHandoutPage->SetSize(pRefPage->GetSize()); - pHandoutPage->SetBorder( pRefPage->GetLftBorder(), pRefPage->GetUppBorder(), pRefPage->GetRgtBorder(), pRefPage->GetLwrBorder() ); + pHandoutPage->SetBorder( pRefPage->GetLeftBorder(), pRefPage->GetUpperBorder(), pRefPage->GetRightBorder(), pRefPage->GetLowerBorder() ); } else { @@ -552,10 +552,10 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument const * pRefDocument /* = SdPage* pHandoutMPage = AllocSdPage(true); pHandoutMPage->SetSize( pHandoutPage->GetSize() ); pHandoutMPage->SetPageKind(PageKind::Handout); - pHandoutMPage->SetBorder( pHandoutPage->GetLftBorder(), - pHandoutPage->GetUppBorder(), - pHandoutPage->GetRgtBorder(), - pHandoutPage->GetLwrBorder() ); + pHandoutMPage->SetBorder( pHandoutPage->GetLeftBorder(), + pHandoutPage->GetUpperBorder(), + pHandoutPage->GetRightBorder(), + pHandoutPage->GetLowerBorder() ); InsertMasterPage(pHandoutMPage, 0); pHandoutPage->TRG_SetMasterPage( *pHandoutMPage ); @@ -575,7 +575,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument const * pRefDocument /* = if( pRefPage ) { pPage->SetSize( pRefPage->GetSize() ); - pPage->SetBorder( pRefPage->GetLftBorder(), pRefPage->GetUppBorder(), pRefPage->GetRgtBorder(), pRefPage->GetLwrBorder() ); + pPage->SetBorder( pRefPage->GetLeftBorder(), pRefPage->GetUpperBorder(), pRefPage->GetRightBorder(), pRefPage->GetLowerBorder() ); } else if (meDocType == DocumentType::Draw) { @@ -626,10 +626,10 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument const * pRefDocument /* = // Insert master page, then register this with the page SdPage* pMPage = AllocSdPage(true); pMPage->SetSize( pPage->GetSize() ); - pMPage->SetBorder( pPage->GetLftBorder(), - pPage->GetUppBorder(), - pPage->GetRgtBorder(), - pPage->GetLwrBorder() ); + pMPage->SetBorder( pPage->GetLeftBorder(), + pPage->GetUpperBorder(), + pPage->GetRightBorder(), + pPage->GetLowerBorder() ); InsertMasterPage(pMPage, 1); pPage->TRG_SetMasterPage( *pMPage ); if( bClipboard ) @@ -644,7 +644,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument const * pRefDocument /* = if( pRefPage ) { pNotesPage->SetSize( pRefPage->GetSize() ); - pNotesPage->SetBorder( pRefPage->GetLftBorder(), pRefPage->GetUppBorder(), pRefPage->GetRgtBorder(), pRefPage->GetLwrBorder() ); + pNotesPage->SetBorder( pRefPage->GetLeftBorder(), pRefPage->GetUpperBorder(), pRefPage->GetRightBorder(), pRefPage->GetLowerBorder() ); } else { @@ -669,10 +669,10 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument const * pRefDocument /* = SdPage* pNotesMPage = AllocSdPage(true); pNotesMPage->SetSize( pNotesPage->GetSize() ); pNotesMPage->SetPageKind(PageKind::Notes); - pNotesMPage->SetBorder( pNotesPage->GetLftBorder(), - pNotesPage->GetUppBorder(), - pNotesPage->GetRgtBorder(), - pNotesPage->GetLwrBorder() ); + pNotesMPage->SetBorder( pNotesPage->GetLeftBorder(), + pNotesPage->GetUpperBorder(), + pNotesPage->GetRightBorder(), + pNotesPage->GetLowerBorder() ); InsertMasterPage(pNotesMPage, 2); pNotesPage->TRG_SetMasterPage( *pNotesMPage ); if( bClipboard ) @@ -1216,10 +1216,10 @@ void SdDrawDocument::CheckMasterPages() if( pRefNotesPage ) { pNewNotesPage->SetSize( pRefNotesPage->GetSize() ); - pNewNotesPage->SetBorder( pRefNotesPage->GetLftBorder(), - pRefNotesPage->GetUppBorder(), - pRefNotesPage->GetRgtBorder(), - pRefNotesPage->GetLwrBorder() ); + pNewNotesPage->SetBorder( pRefNotesPage->GetLeftBorder(), + pRefNotesPage->GetUpperBorder(), + pRefNotesPage->GetRightBorder(), + pRefNotesPage->GetLowerBorder() ); } InsertMasterPage(pNewNotesPage, nPage ); pNewNotesPage->SetLayoutName( pPage->GetLayoutName() ); @@ -1287,10 +1287,10 @@ sal_uInt16 SdDrawDocument::CreatePage ( // Set the size here since else the presobj autolayout // will be wrong. pStandardPage->SetSize( pPreviousStandardPage->GetSize() ); - pStandardPage->SetBorder( pPreviousStandardPage->GetLftBorder(), - pPreviousStandardPage->GetUppBorder(), - pPreviousStandardPage->GetRgtBorder(), - pPreviousStandardPage->GetLwrBorder() ); + pStandardPage->SetBorder( pPreviousStandardPage->GetLeftBorder(), + pPreviousStandardPage->GetUpperBorder(), + pPreviousStandardPage->GetRightBorder(), + pPreviousStandardPage->GetLowerBorder() ); // Use master page of current page. pStandardPage->TRG_SetMasterPage(pPreviousStandardPage->TRG_GetMasterPage()); @@ -1476,10 +1476,10 @@ void SdDrawDocument::SetupNewPage ( if (pPreviousPage != nullptr) { pPage->SetSize( pPreviousPage->GetSize() ); - pPage->SetBorder( pPreviousPage->GetLftBorder(), - pPreviousPage->GetUppBorder(), - pPreviousPage->GetRgtBorder(), - pPreviousPage->GetLwrBorder() ); + pPage->SetBorder( pPreviousPage->GetLeftBorder(), + pPreviousPage->GetUpperBorder(), + pPreviousPage->GetRightBorder(), + pPreviousPage->GetLowerBorder() ); } pPage->SetName(sPageName); diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 69b6a83d6ef3..aa69400c3237 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -421,18 +421,18 @@ bool SdDrawDocument::InsertBookmarkAsPage( // Note that the pointers are used later on as general page pointers. SdPage* pRefPage = GetSdPage(0, PageKind::Standard); Size aSize(pRefPage->GetSize()); - sal_Int32 nLeft = pRefPage->GetLftBorder(); - sal_Int32 nRight = pRefPage->GetRgtBorder(); - sal_Int32 nUpper = pRefPage->GetUppBorder(); - sal_Int32 nLower = pRefPage->GetLwrBorder(); + sal_Int32 nLeft = pRefPage->GetLeftBorder(); + sal_Int32 nRight = pRefPage->GetRightBorder(); + sal_Int32 nUpper = pRefPage->GetUpperBorder(); + sal_Int32 nLower = pRefPage->GetLowerBorder(); Orientation eOrient = pRefPage->GetOrientation(); SdPage* pNPage = GetSdPage(0, PageKind::Notes); Size aNSize(pNPage->GetSize()); - sal_Int32 nNLeft = pNPage->GetLftBorder(); - sal_Int32 nNRight = pNPage->GetRgtBorder(); - sal_Int32 nNUpper = pNPage->GetUppBorder(); - sal_Int32 nNLower = pNPage->GetLwrBorder(); + sal_Int32 nNLeft = pNPage->GetLeftBorder(); + sal_Int32 nNRight = pNPage->GetRightBorder(); + sal_Int32 nNUpper = pNPage->GetUpperBorder(); + sal_Int32 nNLower = pNPage->GetLowerBorder(); Orientation eNOrient = pNPage->GetOrientation(); // Adapt page size and margins to those of the later pages? @@ -459,10 +459,10 @@ bool SdDrawDocument::InsertBookmarkAsPage( SdPage* pBMPage = pBookmarkDoc->GetSdPage(0,PageKind::Standard); if (pBMPage->GetSize() != pRefPage->GetSize() || - pBMPage->GetLftBorder() != pRefPage->GetLftBorder() || - pBMPage->GetRgtBorder() != pRefPage->GetRgtBorder() || - pBMPage->GetUppBorder() != pRefPage->GetUppBorder() || - pBMPage->GetLwrBorder() != pRefPage->GetLwrBorder()) + pBMPage->GetLeftBorder() != pRefPage->GetLeftBorder() || + pBMPage->GetRightBorder() != pRefPage->GetRightBorder() || + pBMPage->GetUpperBorder() != pRefPage->GetUpperBorder() || + pBMPage->GetLowerBorder() != pRefPage->GetLowerBorder()) { OUString aStr(SdResId(STR_SCALE_OBJECTS)); sal_uInt16 nBut = ScopedVclPtrInstance<QueryBox>(nullptr, WB_YES_NO_CANCEL, aStr)->Execute(); @@ -1759,30 +1759,30 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, if (pSourceDoc != this) { Size aSize(rOldMaster.GetSize()); - ::tools::Rectangle aBorderRect(rOldMaster.GetLftBorder(), - rOldMaster.GetUppBorder(), - rOldMaster.GetRgtBorder(), - rOldMaster.GetLwrBorder()); + ::tools::Rectangle aBorderRect(rOldMaster.GetLeftBorder(), + rOldMaster.GetUpperBorder(), + rOldMaster.GetRightBorder(), + rOldMaster.GetLowerBorder()); pMaster->ScaleObjects(aSize, aBorderRect, true); pMaster->SetSize(aSize); - pMaster->SetBorder(rOldMaster.GetLftBorder(), - rOldMaster.GetUppBorder(), - rOldMaster.GetRgtBorder(), - rOldMaster.GetLwrBorder()); + pMaster->SetBorder(rOldMaster.GetLeftBorder(), + rOldMaster.GetUpperBorder(), + rOldMaster.GetRightBorder(), + rOldMaster.GetLowerBorder()); pMaster->SetOrientation( rOldMaster.GetOrientation() ); pMaster->SetAutoLayout(pMaster->GetAutoLayout()); aSize = rOldNotesMaster.GetSize(); - ::tools::Rectangle aNotesBorderRect(rOldNotesMaster.GetLftBorder(), - rOldNotesMaster.GetUppBorder(), - rOldNotesMaster.GetRgtBorder(), - rOldNotesMaster.GetLwrBorder()); + ::tools::Rectangle aNotesBorderRect(rOldNotesMaster.GetLeftBorder(), + rOldNotesMaster.GetUpperBorder(), + rOldNotesMaster.GetRightBorder(), + rOldNotesMaster.GetLowerBorder()); pNotesMaster->ScaleObjects(aSize, aNotesBorderRect, true); pNotesMaster->SetSize(aSize); - pNotesMaster->SetBorder(rOldNotesMaster.GetLftBorder(), - rOldNotesMaster.GetUppBorder(), - rOldNotesMaster.GetRgtBorder(), - rOldNotesMaster.GetLwrBorder()); + pNotesMaster->SetBorder(rOldNotesMaster.GetLeftBorder(), + rOldNotesMaster.GetUpperBorder(), + rOldNotesMaster.GetRightBorder(), + rOldNotesMaster.GetLowerBorder()); pNotesMaster->SetOrientation( rOldNotesMaster.GetOrientation() ); pNotesMaster->SetAutoLayout(pNotesMaster->GetAutoLayout()); @@ -1817,10 +1817,10 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, pMaster = AllocSdPage(true); pMaster->SetSize(pSelectedPage->GetSize()); - pMaster->SetBorder(pSelectedPage->GetLftBorder(), - pSelectedPage->GetUppBorder(), - pSelectedPage->GetRgtBorder(), - pSelectedPage->GetLwrBorder() ); + pMaster->SetBorder(pSelectedPage->GetLeftBorder(), + pSelectedPage->GetUpperBorder(), + pSelectedPage->GetRightBorder(), + pSelectedPage->GetLowerBorder() ); pMaster->SetName(aName); pMaster->SetLayoutName(aPageLayoutName); InsertMasterPage(pMaster); @@ -1833,10 +1833,10 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, pNotesMaster = AllocSdPage(true); pNotesMaster->SetPageKind(PageKind::Notes); pNotesMaster->SetSize(pNotes->GetSize()); - pNotesMaster->SetBorder(pNotes->GetLftBorder(), - pNotes->GetUppBorder(), - pNotes->GetRgtBorder(), - pNotes->GetLwrBorder() ); + pNotesMaster->SetBorder(pNotes->GetLeftBorder(), + pNotes->GetUpperBorder(), + pNotes->GetRightBorder(), + pNotes->GetLowerBorder() ); pNotesMaster->SetName(aName); pNotesMaster->SetLayoutName(aPageLayoutName); InsertMasterPage(pNotesMaster); diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index d32fc57375ce..9ef9fee3c543 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -994,14 +994,14 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind) // create footer objects for standard master page if( mePageKind == PageKind::Standard ) { - const long nLftBorder = GetLftBorder(); - const long nUppBorder = GetUppBorder(); + const long nLftBorder = GetLeftBorder(); + const long nUppBorder = GetUpperBorder(); Point aPos ( nLftBorder, nUppBorder ); Size aSize ( GetSize() ); - aSize.Width() -= nLftBorder + GetRgtBorder(); - aSize.Height() -= nUppBorder + GetLwrBorder(); + aSize.Width() -= nLftBorder + GetRightBorder(); + aSize.Height() -= nUppBorder + GetLowerBorder(); getPresObjProp( *this, sObjKind, sPageKind, propvalue); aPos.X() += long( aSize.Width() * propvalue[2] ); @@ -1024,10 +1024,10 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind) { // create header&footer objects for handout and notes master Size aPageSize ( GetSize() ); - aPageSize.Width() -= GetLftBorder() + GetRgtBorder(); - aPageSize.Height() -= GetUppBorder() + GetLwrBorder(); + aPageSize.Width() -= GetLeftBorder() + GetRightBorder(); + aPageSize.Height() -= GetUpperBorder() + GetLowerBorder(); - Point aPosition ( GetLftBorder(), GetUppBorder() ); + Point aPosition ( GetLeftBorder(), GetUpperBorder() ); getPresObjProp( *this, sObjKind, sPageKind, propvalue); int NOTES_HEADER_FOOTER_WIDTH = long(aPageSize.Width() * propvalue[1]); @@ -1090,10 +1090,10 @@ void SdPage::DestroyDefaultPresObj(PresObjKind eObjKind) /****************************************************************** * standard- or note page: title area ******************************************************************/ - Point aTitlePos ( GetLftBorder(), GetUppBorder() ); + Point aTitlePos ( GetLeftBorder(), GetUpperBorder() ); Size aTitleSize ( GetSize() ); - aTitleSize.Width() -= GetLftBorder() + GetRgtBorder(); - aTitleSize.Height() -= GetUppBorder() + GetLwrBorder(); + aTitleSize.Width() -= GetLeftBorder() + GetRightBorder(); + aTitleSize.Height() -= GetUpperBorder() + GetLowerBorder(); const char* sPageKind = PageKindVector[mePageKind]; if (mePageKind == PageKind::Standard) @@ -1134,15 +1134,15 @@ void SdPage::DestroyDefaultPresObj(PresObjKind eObjKind) if ( pRefPage ) { // scale actually page size into handout rectangle - double fH = pRefPage->GetWdt() == 0 - ? 0 : (double) aPartArea.Width() / pRefPage->GetWdt(); - double fV = pRefPage->GetHgt() == 0 - ? 0 : (double) aPartArea.Height() / pRefPage->GetHgt(); + double fH = pRefPage->GetWidth() == 0 + ? 0 : (double) aPartArea.Width() / pRefPage->GetWidth(); + double fV = pRefPage->GetHeight() == 0 + ? 0 : (double) aPartArea.Height() / pRefPage->GetHeight(); if ( fH > fV ) fH = fV; - aSize.Width() = (long) (fH * pRefPage->GetWdt()); - aSize.Height() = (long) (fH * pRefPage->GetHgt()); + aSize.Width() = (long) (fH * pRefPage->GetWidth()); + aSize.Height() = (long) (fH * pRefPage->GetHeight()); aPos.X() += (aPartArea.Width() - aSize.Width()) / 2; aPos.Y() += (aPartArea.Height()- aSize.Height())/ 2; @@ -1173,10 +1173,10 @@ void SdPage::DestroyDefaultPresObj(PresObjKind eObjKind) { double propvalue[] = {0,0,0,0}; - Point aLayoutPos ( GetLftBorder(), GetUppBorder() ); + Point aLayoutPos ( GetLeftBorder(), GetUpperBorder() ); Size aLayoutSize ( GetSize() ); - aLayoutSize.Width() -= GetLftBorder() + GetRgtBorder(); - aLayoutSize.Height() -= GetUppBorder() + GetLwrBorder(); + aLayoutSize.Width() -= GetLeftBorder() + GetRightBorder(); + aLayoutSize.Height() -= GetUpperBorder() + GetLowerBorder(); const char* sPageKind = PageKindVector[mePageKind]; if (mePageKind == PageKind::Standard) @@ -1779,42 +1779,42 @@ void SdPage::SetSize(const Size& aSize) void SdPage::SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 nLwr) { - if (nLft != GetLftBorder() || nUpp != GetUppBorder() || - nRgt != GetRgtBorder() || nLwr != GetLwrBorder() ) + if (nLft != GetLeftBorder() || nUpp != GetUpperBorder() || + nRgt != GetRightBorder() || nLwr != GetLowerBorder() ) { FmFormPage::SetBorder(nLft, nUpp, nRgt, nLwr); } } -void SdPage::SetLftBorder(sal_Int32 nBorder) +void SdPage::SetLeftBorder(sal_Int32 nBorder) { - if (nBorder != GetLftBorder() ) + if (nBorder != GetLeftBorder() ) { - FmFormPage::SetLftBorder(nBorder); + FmFormPage::SetLeftBorder(nBorder); } } -void SdPage::SetRgtBorder(sal_Int32 nBorder) +void SdPage::SetRightBorder(sal_Int32 nBorder) { - if (nBorder != GetRgtBorder() ) + if (nBorder != GetRightBorder() ) { - FmFormPage::SetRgtBorder(nBorder); + FmFormPage::SetRightBorder(nBorder); } } -void SdPage::SetUppBorder(sal_Int32 nBorder) +void SdPage::SetUpperBorder(sal_Int32 nBorder) { - if (nBorder != GetUppBorder() ) + if (nBorder != GetUpperBorder() ) { - FmFormPage::SetUppBorder(nBorder); + FmFormPage::SetUpperBorder(nBorder); } } -void SdPage::SetLwrBorder(sal_Int32 nBorder) +void SdPage::SetLowerBorder(sal_Int32 nBorder) { - if (nBorder != GetLwrBorder() ) + if (nBorder != GetLowerBorder() ) { - FmFormPage::SetLwrBorder(nBorder); + FmFormPage::SetLowerBorder(nBorder); } } @@ -1859,27 +1859,27 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN // -> use up to date values if (aNewPageSize.Width() < 0) { - aNewPageSize.Width() = GetWdt(); + aNewPageSize.Width() = GetWidth(); } if (aNewPageSize.Height() < 0) { - aNewPageSize.Height() = GetHgt(); + aNewPageSize.Height() = GetHeight(); } if (nLeft < 0) { - nLeft = GetLftBorder(); + nLeft = GetLeftBorder(); } if (nRight < 0) { - nRight = GetRgtBorder(); + nRight = GetRightBorder(); } if (nUpper < 0) { - nUpper = GetUppBorder(); + nUpper = GetUpperBorder(); } if (nLower < 0) { - nLower = GetLwrBorder(); + nLower = GetLowerBorder(); } Point aBackgroundPos(nLeft, nUpper); @@ -1894,8 +1894,8 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN aNewPageSize = aBackgroundSize; } - long nOldWidth = GetWdt() - GetLftBorder() - GetRgtBorder(); - long nOldHeight = GetHgt() - GetUppBorder() - GetLwrBorder(); + long nOldWidth = GetWidth() - GetLeftBorder() - GetRightBorder(); + long nOldHeight = GetHeight() - GetUpperBorder() - GetLowerBorder(); Fraction aFractX = Fraction(aNewPageSize.Width(), nOldWidth); Fraction aFractY = Fraction(aNewPageSize.Height(), nOldHeight); @@ -2085,8 +2085,8 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN // corrected scaling; only distances may be scaled // use aTopLeft as original TopLeft - aNewPos.X() = long((aTopLeft.X() - GetLftBorder()) * (double)aFractX) + nLeft; - aNewPos.Y() = long((aTopLeft.Y() - GetUppBorder()) * (double)aFractY) + nUpper; + aNewPos.X() = long((aTopLeft.X() - GetLeftBorder()) * (double)aFractX) + nLeft; + aNewPos.Y() = long((aTopLeft.Y() - GetUpperBorder()) * (double)aFractY) + nUpper; Size aVec(aNewPos.X() - aTopLeft.X(), aNewPos.Y() - aTopLeft.Y()); @@ -2975,10 +2975,10 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, const long nGapW = 1000; // gap is 1cm const long nGapH = 1000; - long nLeftBorder = rHandoutMaster.GetLftBorder(); - long nRightBorder = rHandoutMaster.GetRgtBorder(); - long nTopBorder = rHandoutMaster.GetUppBorder(); - long nBottomBorder = rHandoutMaster.GetLwrBorder(); + long nLeftBorder = rHandoutMaster.GetLeftBorder(); + long nRightBorder = rHandoutMaster.GetRightBorder(); + long nTopBorder = rHandoutMaster.GetUpperBorder(); + long nBottomBorder = rHandoutMaster.GetLowerBorder(); const long nHeaderFooterHeight = static_cast< long >( (aArea.Height() - nTopBorder - nLeftBorder) * 0.05 ); @@ -3070,14 +3070,14 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, if ( pFirstPage ) { // scale actual size into handout rect - double fScale = (double)aPartArea.Width() / (double)pFirstPage->GetWdt(); + double fScale = (double)aPartArea.Width() / (double)pFirstPage->GetWidth(); - aSize.Height() = (long)(fScale * pFirstPage->GetHgt() ); + aSize.Height() = (long)(fScale * pFirstPage->GetHeight() ); if( aSize.Height() > aPartArea.Height() ) { - fScale = (double)aPartArea.Height() / (double)pFirstPage->GetHgt(); + fScale = (double)aPartArea.Height() / (double)pFirstPage->GetHeight(); aSize.Height() = aPartArea.Height(); - aSize.Width() = (long)(fScale * pFirstPage->GetWdt()); + aSize.Width() = (long)(fScale * pFirstPage->GetWidth()); } else { diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 040f70e07b6d..1adf4e5d348d 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -181,8 +181,8 @@ bool SdGRFFilter::Import() Size aGrfSize( OutputDevice::LogicToLogic( aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), MapUnit::Map100thMM ) ); - aPagSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder(); - aPagSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder(); + aPagSize.Width() -= pPage->GetLeftBorder() + pPage->GetRightBorder(); + aPagSize.Height() -= pPage->GetUpperBorder() + pPage->GetLowerBorder(); // scale to fit page if ( ( ( aGrfSize.Height() > aPagSize.Height() ) || ( aGrfSize.Width() > aPagSize.Width() ) ) && @@ -205,8 +205,8 @@ bool SdGRFFilter::Import() } // set output rectangle for graphic - aPos.X() = ( ( aPagSize.Width() - aGrfSize.Width() ) >> 1 ) + pPage->GetLftBorder(); - aPos.Y() = ( ( aPagSize.Height() - aGrfSize.Height() ) >> 1 ) + pPage->GetUppBorder(); + aPos.X() = ( ( aPagSize.Width() - aGrfSize.Width() ) >> 1 ) + pPage->GetLeftBorder(); + aPos.Y() = ( ( aPagSize.Height() - aGrfSize.Height() ) >> 1 ) + pPage->GetUpperBorder(); pPage->InsertObject( new SdrGrafObj( aGraphic, ::tools::Rectangle( aPos, aGrfSize ) ) ); bRet = true; diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index cad6091ffb1b..766bd0d46d15 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1689,12 +1689,12 @@ bool HtmlExport::CreateHtmlForPresPages() Point aLogPos(aRect.TopLeft()); bool bIsSquare = aRect.GetWidth() == aRect.GetHeight(); - sal_uLong nPageWidth = pPage->GetSize().Width() - pPage->GetLftBorder() - - pPage->GetRgtBorder(); + sal_uLong nPageWidth = pPage->GetSize().Width() - pPage->GetLeftBorder() - + pPage->GetRightBorder(); // BoundRect is relative to the physical page origin, not the // origin of ordinates - aRect.Move(-pPage->GetLftBorder(), -pPage->GetUppBorder()); + aRect.Move(-pPage->GetLeftBorder(), -pPage->GetUpperBorder()); double fLogicToPixel = ((double)mnWidthPixel) / nPageWidth; aRect.Left() = (long)(aRect.Left() * fLogicToPixel); @@ -1744,8 +1744,8 @@ bool HtmlExport::CreateHtmlForPresPages() GetRectangle(false)); // conversion into pixel coordinates - aArea.Move(aLogPos.X() - pPage->GetLftBorder(), - aLogPos.Y() - pPage->GetUppBorder()); + aArea.Move(aLogPos.X() - pPage->GetLeftBorder(), + aLogPos.Y() - pPage->GetUpperBorder()); aArea.Left() = (long)(aArea.Left() * fLogicToPixel); aArea.Top() = (long)(aArea.Top() * fLogicToPixel); aArea.Right() = (long)(aArea.Right() * fLogicToPixel); @@ -1759,8 +1759,8 @@ bool HtmlExport::CreateHtmlForPresPages() { Point aCenter(static_cast<IMapCircleObject*>(pArea)-> GetCenter(false)); - aCenter += Point(aLogPos.X() - pPage->GetLftBorder(), - aLogPos.Y() - pPage->GetUppBorder()); + aCenter += Point(aLogPos.X() - pPage->GetLeftBorder(), + aLogPos.Y() - pPage->GetUpperBorder()); aCenter.X() = (long)(aCenter.X() * fLogicToPixel); aCenter.Y() = (long)(aCenter.Y() * fLogicToPixel); @@ -1777,8 +1777,8 @@ bool HtmlExport::CreateHtmlForPresPages() { tools::Polygon aArea(static_cast<IMapPolygonObject*>(pArea)->GetPolygon(false)); aStr.append(CreateHTMLPolygonArea(::basegfx::B2DPolyPolygon(aArea.getB2DPolygon()), - Size(aLogPos.X() - pPage->GetLftBorder(), - aLogPos.Y() - pPage->GetUppBorder()), + Size(aLogPos.X() - pPage->GetLeftBorder(), + aLogPos.Y() - pPage->GetUpperBorder()), fLogicToPixel, aURL)); } break; @@ -1882,7 +1882,7 @@ bool HtmlExport::CreateHtmlForPresPages() pObject->GetObjIdentifier() == OBJ_PLIN || pObject->GetObjIdentifier() == OBJ_POLY)) { - aStr.append(CreateHTMLPolygonArea(static_cast<SdrPathObj*>(pObject)->GetPathPoly(), Size(-pPage->GetLftBorder(), -pPage->GetUppBorder()), fLogicToPixel, aHRef)); + aStr.append(CreateHTMLPolygonArea(static_cast<SdrPathObj*>(pObject)->GetPathPoly(), Size(-pPage->GetLeftBorder(), -pPage->GetUpperBorder()), fLogicToPixel, aHRef)); } // something completely different: use the BoundRect else diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index a6f73a44bb66..032d35188710 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -137,10 +137,10 @@ void FuExpandPage::DoExecute( SfxRequest& ) // page with title & structuring! SdPage* pPage = mpDoc->AllocSdPage(false); pPage->SetSize(pActualPage->GetSize() ); - pPage->SetBorder(pActualPage->GetLftBorder(), - pActualPage->GetUppBorder(), - pActualPage->GetRgtBorder(), - pActualPage->GetLwrBorder() ); + pPage->SetBorder(pActualPage->GetLeftBorder(), + pActualPage->GetUpperBorder(), + pActualPage->GetRightBorder(), + pActualPage->GetLowerBorder() ); pPage->SetName(OUString()); // insert page after current page @@ -159,10 +159,10 @@ void FuExpandPage::DoExecute( SfxRequest& ) // notes-page SdPage* pNotesPage = mpDoc->AllocSdPage(false); pNotesPage->SetSize(pActualNotesPage->GetSize()); - pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(), - pActualNotesPage->GetUppBorder(), - pActualNotesPage->GetRgtBorder(), - pActualNotesPage->GetLwrBorder() ); + pNotesPage->SetBorder(pActualNotesPage->GetLeftBorder(), + pActualNotesPage->GetUpperBorder(), + pActualNotesPage->GetRightBorder(), + pActualNotesPage->GetLowerBorder() ); pNotesPage->SetPageKind(PageKind::Notes); pNotesPage->SetName(OUString()); diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 019af2330fd0..e02551a325e4 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -253,10 +253,10 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent ) SvxPaperBinItem aPaperBinItem( SID_ATTR_PAGE_PAPERBIN, (sal_uInt8)mpPage->GetPaperBin() ); aNewAttr.Put( aPaperBinItem ); - SvxLRSpaceItem aLRSpaceItem( (sal_uInt16)mpPage->GetLftBorder(), (sal_uInt16)mpPage->GetRgtBorder(), 0, 0, mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE)); + SvxLRSpaceItem aLRSpaceItem( (sal_uInt16)mpPage->GetLeftBorder(), (sal_uInt16)mpPage->GetRightBorder(), 0, 0, mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE)); aNewAttr.Put( aLRSpaceItem ); - SvxULSpaceItem aULSpaceItem( (sal_uInt16)mpPage->GetUppBorder(), (sal_uInt16)mpPage->GetLwrBorder(), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE)); + SvxULSpaceItem aULSpaceItem( (sal_uInt16)mpPage->GetUpperBorder(), (sal_uInt16)mpPage->GetLowerBorder(), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE)); aNewAttr.Put( aULSpaceItem ); // Applikation @@ -543,7 +543,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) nLeft = static_cast<const SvxLRSpaceItem*>(pPoolItem)->GetLeft(); nRight = static_cast<const SvxLRSpaceItem*>(pPoolItem)->GetRight(); - if( mpPage->GetLftBorder() != nLeft || mpPage->GetRgtBorder() != nRight ) + if( mpPage->GetLeftBorder() != nLeft || mpPage->GetRightBorder() != nRight ) bSetPageSizeAndBorder = true; } @@ -554,7 +554,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) nUpper = static_cast<const SvxULSpaceItem*>(pPoolItem)->GetUpper(); nLower = static_cast<const SvxULSpaceItem*>(pPoolItem)->GetLower(); - if( mpPage->GetUppBorder() != nUpper || mpPage->GetLwrBorder() != nLower ) + if( mpPage->GetUpperBorder() != nUpper || mpPage->GetLowerBorder() != nLower ) bSetPageSizeAndBorder = true; } @@ -583,14 +583,14 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if (nLeft == -1 && nUpper != -1) { bSetPageSizeAndBorder = true; - nLeft = mpPage->GetLftBorder(); - nRight = mpPage->GetRgtBorder(); + nLeft = mpPage->GetLeftBorder(); + nRight = mpPage->GetRightBorder(); } else if (nLeft != -1 && nUpper == -1) { bSetPageSizeAndBorder = true; - nUpper = mpPage->GetUppBorder(); - nLower = mpPage->GetLwrBorder(); + nUpper = mpPage->GetUpperBorder(); + nLower = mpPage->GetLowerBorder(); } if( bSetPageSizeAndBorder || !mbMasterPage ) diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index bb199e0b5438..c7a3b730f427 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -121,10 +121,10 @@ void FuSummaryPage::DoExecute( SfxRequest& ) // page with title & structuring! pSummaryPage = mpDoc->AllocSdPage(false); pSummaryPage->SetSize(pActualPage->GetSize() ); - pSummaryPage->SetBorder(pActualPage->GetLftBorder(), - pActualPage->GetUppBorder(), - pActualPage->GetRgtBorder(), - pActualPage->GetLwrBorder() ); + pSummaryPage->SetBorder(pActualPage->GetLeftBorder(), + pActualPage->GetUpperBorder(), + pActualPage->GetRightBorder(), + pActualPage->GetLowerBorder() ); // insert page at the back mpDoc->InsertPage(pSummaryPage, nCount * 2 + 1); @@ -141,10 +141,10 @@ void FuSummaryPage::DoExecute( SfxRequest& ) // notes-page SdPage* pNotesPage = mpDoc->AllocSdPage(false); pNotesPage->SetSize(pActualNotesPage->GetSize()); - pNotesPage->SetBorder(pActualNotesPage->GetLftBorder(), - pActualNotesPage->GetUppBorder(), - pActualNotesPage->GetRgtBorder(), - pActualNotesPage->GetLwrBorder() ); + pNotesPage->SetBorder(pActualNotesPage->GetLeftBorder(), + pActualNotesPage->GetUpperBorder(), + pActualNotesPage->GetRightBorder(), + pActualNotesPage->GetLowerBorder() ); pNotesPage->SetPageKind(PageKind::Notes); // insert page at the back diff --git a/sd/source/ui/func/undopage.cxx b/sd/source/ui/func/undopage.cxx index 81eb81f77ce7..f55f65777b2f 100644 --- a/sd/source/ui/func/undopage.cxx +++ b/sd/source/ui/func/undopage.cxx @@ -39,10 +39,10 @@ void SdPageFormatUndoAction::Undo() ::tools::Rectangle aOldBorderRect(mnOldLeft, mnOldUpper, mnOldRight, mnOldLower); mpPage->ScaleObjects(maOldSize, aOldBorderRect, mbNewScale); mpPage->SetSize(maOldSize); - mpPage->SetLftBorder(mnOldLeft); - mpPage->SetRgtBorder(mnOldRight); - mpPage->SetUppBorder(mnOldUpper); - mpPage->SetLwrBorder(mnOldLower); + mpPage->SetLeftBorder(mnOldLeft); + mpPage->SetRightBorder(mnOldRight); + mpPage->SetUpperBorder(mnOldUpper); + mpPage->SetLowerBorder(mnOldLower); mpPage->SetOrientation(meOldOrientation); mpPage->SetPaperBin( mnOldPaperBin ); @@ -57,10 +57,10 @@ void SdPageFormatUndoAction::Redo() ::tools::Rectangle aNewBorderRect(mnNewLeft, mnNewUpper, mnNewRight, mnNewLower); mpPage->ScaleObjects(maNewSize, aNewBorderRect, mbNewScale); mpPage->SetSize(maNewSize); - mpPage->SetLftBorder(mnNewLeft); - mpPage->SetRgtBorder(mnNewRight); - mpPage->SetUppBorder(mnNewUpper); - mpPage->SetLwrBorder(mnNewLower); + mpPage->SetLeftBorder(mnNewLeft); + mpPage->SetRightBorder(mnNewRight); + mpPage->SetUpperBorder(mnNewUpper); + mpPage->SetLowerBorder(mnNewLower); mpPage->SetOrientation(meNewOrientation); mpPage->SetPaperBin( mnNewPaperBin ); @@ -76,14 +76,14 @@ SdPageLRUndoAction::~SdPageLRUndoAction() void SdPageLRUndoAction::Undo() { - mpPage->SetLftBorder(mnOldLeft); - mpPage->SetRgtBorder(mnOldRight); + mpPage->SetLeftBorder(mnOldLeft); + mpPage->SetRightBorder(mnOldRight); } void SdPageLRUndoAction::Redo() { - mpPage->SetLftBorder(mnNewLeft); - mpPage->SetRgtBorder(mnNewRight); + mpPage->SetLeftBorder(mnNewLeft); + mpPage->SetRightBorder(mnNewRight); } SdPageULUndoAction::~SdPageULUndoAction() @@ -92,8 +92,8 @@ SdPageULUndoAction::~SdPageULUndoAction() void SdPageULUndoAction::Undo() { - mpPage->SetUppBorder(mnOldUpper); - mpPage->SetLwrBorder(mnOldLower); + mpPage->SetUpperBorder(mnOldUpper); + mpPage->SetLowerBorder(mnOldLower); } /** @@ -101,8 +101,8 @@ void SdPageULUndoAction::Undo() */ void SdPageULUndoAction::Redo() { - mpPage->SetUppBorder(mnNewUpper); - mpPage->SetLwrBorder(mnNewLower); + mpPage->SetUpperBorder(mnNewUpper); + mpPage->SetLowerBorder(mnNewLower); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx index ff6c0a614022..3838b0f0de52 100644 --- a/sd/source/ui/inc/unopage.hxx +++ b/sd/source/ui/inc/unopage.hxx @@ -79,10 +79,10 @@ protected: OUString getBookmarkURL() const; void setBookmarkURL( OUString const & rURL ); - void SetLftBorder( sal_Int32 nValue ); - void SetRgtBorder( sal_Int32 nValue ); - void SetUppBorder( sal_Int32 nValue ); - void SetLwrBorder( sal_Int32 nValue ); + void SetLeftBorder( sal_Int32 nValue ); + void SetRightBorder( sal_Int32 nValue ); + void SetUpperBorder( sal_Int32 nValue ); + void SetLowerBorder( sal_Int32 nValue ); void SetWidth( sal_Int32 nWidth ); void SetHeight( sal_Int32 nHeight ); diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index 16b664a6754e..2247ecd86150 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -372,10 +372,10 @@ SdPage* DocumentHelper::AddMasterPage ( // the document. Size aNewSize (rTargetDocument.GetSdPage(0, pMasterPage->GetPageKind())->GetSize()); ::tools::Rectangle aBorders ( - pClonedMasterPage->GetLftBorder(), - pClonedMasterPage->GetUppBorder(), - pClonedMasterPage->GetRgtBorder(), - pClonedMasterPage->GetLwrBorder()); + pClonedMasterPage->GetLeftBorder(), + pClonedMasterPage->GetUpperBorder(), + pClonedMasterPage->GetRightBorder(), + pClonedMasterPage->GetLowerBorder()); pClonedMasterPage->ScaleObjects(aNewSize, aBorders, true); pClonedMasterPage->SetSize(aNewSize); pClonedMasterPage->CreateTitleAndLayout(true); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 4ec29d00a94f..26ae2ba7ac39 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -508,10 +508,10 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate ) pStandardPage = mpDoc->AllocSdPage(false); pStandardPage->SetSize( pPreviousStandardPage->GetSize() ); - pStandardPage->SetBorder( pPreviousStandardPage->GetLftBorder(), - pPreviousStandardPage->GetUppBorder(), - pPreviousStandardPage->GetRgtBorder(), - pPreviousStandardPage->GetLwrBorder() ); + pStandardPage->SetBorder( pPreviousStandardPage->GetLeftBorder(), + pPreviousStandardPage->GetUpperBorder(), + pPreviousStandardPage->GetRightBorder(), + pPreviousStandardPage->GetLowerBorder() ); pStandardPage->SetOrientation( pPreviousStandardPage->GetOrientation() ); pStandardPage->SetName(OUString()); @@ -543,10 +543,10 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate ) pNotesPage = mpDoc->AllocSdPage(false); pNotesPage->SetSize( pPreviousNotesPage->GetSize() ); - pNotesPage->SetBorder( pPreviousNotesPage->GetLftBorder(), - pPreviousNotesPage->GetUppBorder(), - pPreviousNotesPage->GetRgtBorder(), - pPreviousNotesPage->GetLwrBorder() ); + pNotesPage->SetBorder( pPreviousNotesPage->GetLeftBorder(), + pPreviousNotesPage->GetUpperBorder(), + pPreviousNotesPage->GetRightBorder(), + pPreviousNotesPage->GetLowerBorder() ); pNotesPage->SetOrientation( pPreviousNotesPage->GetOrientation() ); pNotesPage->SetName(OUString()); pNotesPage->SetPageKind(PageKind::Notes); @@ -3165,10 +3165,10 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn // create and insert new draw masterpage SdPage* pMPage = mpModel->mpDoc->AllocSdPage(true); pMPage->SetSize( pPage->GetSize() ); - pMPage->SetBorder( pPage->GetLftBorder(), - pPage->GetUppBorder(), - pPage->GetRgtBorder(), - pPage->GetLwrBorder() ); + pMPage->SetBorder( pPage->GetLeftBorder(), + pPage->GetUpperBorder(), + pPage->GetRightBorder(), + pPage->GetLowerBorder() ); pMPage->SetLayoutName( aLayoutName ); pDoc->InsertMasterPage(pMPage, (sal_uInt16)nInsertPos); @@ -3183,10 +3183,10 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn SdPage* pMNotesPage = mpModel->mpDoc->AllocSdPage(true); pMNotesPage->SetSize( pRefNotesPage->GetSize() ); pMNotesPage->SetPageKind(PageKind::Notes); - pMNotesPage->SetBorder( pRefNotesPage->GetLftBorder(), - pRefNotesPage->GetUppBorder(), - pRefNotesPage->GetRgtBorder(), - pRefNotesPage->GetLwrBorder() ); + pMNotesPage->SetBorder( pRefNotesPage->GetLeftBorder(), + pRefNotesPage->GetUpperBorder(), + pRefNotesPage->GetRightBorder(), + pRefNotesPage->GetLowerBorder() ); pMNotesPage->SetLayoutName( aLayoutName ); pDoc->InsertMasterPage(pMNotesPage, (sal_uInt16)nInsertPos + 1); pMNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, true, true); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index bcb9b06f4e0b..e1e2c3c00612 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -626,16 +626,16 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName switch( pEntry->nWID ) { case WID_PAGE_LEFT: - SetLftBorder(nValue); + SetLeftBorder(nValue); break; case WID_PAGE_RIGHT: - SetRgtBorder( nValue ); + SetRightBorder( nValue ); break; case WID_PAGE_TOP: - SetUppBorder( nValue ); + SetUpperBorder( nValue ); break; case WID_PAGE_BOTTOM: - SetLwrBorder( nValue ); + SetLowerBorder( nValue ); break; case WID_PAGE_CHANGE: GetPage()->SetPresChange( (PresChange)nValue ); @@ -1022,16 +1022,16 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) aAny = getNavigationOrder(); break; case WID_PAGE_LEFT: - aAny <<= GetPage()->GetLftBorder(); + aAny <<= GetPage()->GetLeftBorder(); break; case WID_PAGE_RIGHT: - aAny <<= GetPage()->GetRgtBorder(); + aAny <<= GetPage()->GetRightBorder(); break; case WID_PAGE_TOP: - aAny <<= GetPage()->GetUppBorder(); + aAny <<= GetPage()->GetUpperBorder(); break; case WID_PAGE_BOTTOM: - aAny <<= GetPage()->GetLwrBorder(); + aAny <<= GetPage()->GetLowerBorder(); break; case WID_PAGE_WIDTH: aAny <<= (sal_Int32)( GetPage()->GetSize().getWidth() ); @@ -1677,9 +1677,9 @@ void SAL_CALL SdGenericDrawPage::unbind( const Reference< drawing::XShape >& xSh GetModel()->SetModified(); } -void SdGenericDrawPage::SetLftBorder( sal_Int32 nValue ) +void SdGenericDrawPage::SetLeftBorder( sal_Int32 nValue ) { - if( nValue != GetPage()->GetLftBorder() ) + if( nValue != GetPage()->GetLeftBorder() ) { SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel()); const PageKind ePageKind = GetPage()->GetPageKind(); @@ -1688,7 +1688,7 @@ void SdGenericDrawPage::SetLftBorder( sal_Int32 nValue ) for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); - pPage->SetLftBorder( nValue ); + pPage->SetLeftBorder( nValue ); } nPageCnt = pDoc->GetSdPageCount(ePageKind); @@ -1696,14 +1696,14 @@ void SdGenericDrawPage::SetLftBorder( sal_Int32 nValue ) for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetSdPage(i, ePageKind); - pPage->SetLftBorder( nValue ); + pPage->SetLeftBorder( nValue ); } } } -void SdGenericDrawPage::SetRgtBorder( sal_Int32 nValue ) +void SdGenericDrawPage::SetRightBorder( sal_Int32 nValue ) { - if( nValue != GetPage()->GetRgtBorder() ) + if( nValue != GetPage()->GetRightBorder() ) { SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel()); const PageKind ePageKind = GetPage()->GetPageKind(); @@ -1712,7 +1712,7 @@ void SdGenericDrawPage::SetRgtBorder( sal_Int32 nValue ) for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); - pPage->SetRgtBorder( nValue ); + pPage->SetRightBorder( nValue ); } nPageCnt = pDoc->GetSdPageCount(ePageKind); @@ -1720,14 +1720,14 @@ void SdGenericDrawPage::SetRgtBorder( sal_Int32 nValue ) for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetSdPage(i, ePageKind); - pPage->SetRgtBorder( nValue ); + pPage->SetRightBorder( nValue ); } } } -void SdGenericDrawPage::SetUppBorder( sal_Int32 nValue ) +void SdGenericDrawPage::SetUpperBorder( sal_Int32 nValue ) { - if( nValue != GetPage()->GetUppBorder() ) + if( nValue != GetPage()->GetUpperBorder() ) { SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel()); const PageKind ePageKind = GetPage()->GetPageKind(); @@ -1736,7 +1736,7 @@ void SdGenericDrawPage::SetUppBorder( sal_Int32 nValue ) for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); - pPage->SetUppBorder( nValue ); + pPage->SetUpperBorder( nValue ); } nPageCnt = pDoc->GetSdPageCount(ePageKind); @@ -1744,14 +1744,14 @@ void SdGenericDrawPage::SetUppBorder( sal_Int32 nValue ) for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetSdPage(i, ePageKind); - pPage->SetUppBorder( nValue ); + pPage->SetUpperBorder( nValue ); } } } -void SdGenericDrawPage::SetLwrBorder( sal_Int32 nValue ) +void SdGenericDrawPage::SetLowerBorder( sal_Int32 nValue ) { - if( nValue != GetPage()->GetLwrBorder() ) + if( nValue != GetPage()->GetLowerBorder() ) { SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel()); const PageKind ePageKind = GetPage()->GetPageKind(); @@ -1760,7 +1760,7 @@ void SdGenericDrawPage::SetLwrBorder( sal_Int32 nValue ) for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind); - pPage->SetLwrBorder( nValue ); + pPage->SetLowerBorder( nValue ); } nPageCnt = pDoc->GetSdPageCount(ePageKind); @@ -1768,7 +1768,7 @@ void SdGenericDrawPage::SetLwrBorder( sal_Int32 nValue ) for (i = 0; i < nPageCnt; i++) { SdPage* pPage = pDoc->GetSdPage(i, ePageKind); - pPage->SetLwrBorder( nValue ); + pPage->SetLowerBorder( nValue ); } } } @@ -2374,8 +2374,8 @@ void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& SdPage* pSdPage = static_cast<SdPage*>(pMasterPage->GetSdrPage()); SvxFmDrawPage::mpPage->TRG_SetMasterPage(*pSdPage); - SvxFmDrawPage::mpPage->SetBorder(pSdPage->GetLftBorder(),pSdPage->GetUppBorder(), - pSdPage->GetRgtBorder(),pSdPage->GetLwrBorder() ); + SvxFmDrawPage::mpPage->SetBorder(pSdPage->GetLeftBorder(),pSdPage->GetUpperBorder(), + pSdPage->GetRightBorder(),pSdPage->GetLowerBorder() ); SvxFmDrawPage::mpPage->SetSize( pSdPage->GetSize() ); SvxFmDrawPage::mpPage->SetOrientation( pSdPage->GetOrientation() ); diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 021ce8e7b689..a43474e6ba6d 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -801,9 +801,9 @@ namespace { const Size aPrintSize (rPrinter.GetOutputSize()); const sal_Int32 nPageWidth (aPageSize.Width() + mnGap - - pPageToPrint->GetLftBorder() - pPageToPrint->GetRgtBorder()); + - pPageToPrint->GetLeftBorder() - pPageToPrint->GetRightBorder()); const sal_Int32 nPageHeight (aPageSize.Height() + mnGap - - pPageToPrint->GetUppBorder() - pPageToPrint->GetLwrBorder()); + - pPageToPrint->GetUpperBorder() - pPageToPrint->GetLowerBorder()); if (nPageWidth<=0 || nPageHeight<=0) return; @@ -1927,8 +1927,8 @@ private: rInfo.msPageString.clear(); rInfo.msPageString += rInfo.msTimeDate; - long aPageWidth = aPageSize.Width() - pPage->GetLftBorder() - pPage->GetRgtBorder(); - long aPageHeight = aPageSize.Height() - pPage->GetUppBorder() - pPage->GetLwrBorder(); + long aPageWidth = aPageSize.Width() - pPage->GetLeftBorder() - pPage->GetRightBorder(); + long aPageHeight = aPageSize.Height() - pPage->GetUpperBorder() - pPage->GetLowerBorder(); // Bugfix for 44530: // if it was implicitly changed (Landscape/Portrait), // this is considered for tiling, respectively for the splitting up @@ -2164,9 +2164,9 @@ private: // keep the page content at its position if it fits, otherwise // move it to the printable area const long nPageWidth ( - rInfo.maPageSize.Width() - rPage.GetLftBorder() - rPage.GetRgtBorder()); + rInfo.maPageSize.Width() - rPage.GetLeftBorder() - rPage.GetRightBorder()); const long nPageHeight ( - rInfo.maPageSize.Height() - rPage.GetUppBorder() - rPage.GetLwrBorder()); + rInfo.maPageSize.Height() - rPage.GetUpperBorder() - rPage.GetLowerBorder()); Point aOrigin ( 0, 0 ); diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 2a2278e2eda0..f4bd00c652bb 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -526,12 +526,12 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) SdPage* pPage = GetDoc()->GetSdPage(i, mePageKind); SdUndoAction* pUndo = new SdPageLRUndoAction(GetDoc(), pPage, - pPage->GetLftBorder(), - pPage->GetRgtBorder(), + pPage->GetLeftBorder(), + pPage->GetRightBorder(), nLeft, nRight); pUndoGroup->AddAction(pUndo); - pPage->SetLftBorder(nLeft); - pPage->SetRgtBorder(nRight); + pPage->SetLeftBorder(nLeft); + pPage->SetRightBorder(nRight); } nPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind); @@ -540,12 +540,12 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) SdPage* pPage = GetDoc()->GetMasterSdPage(i, mePageKind); SdUndoAction* pUndo = new SdPageLRUndoAction(GetDoc(), pPage, - pPage->GetLftBorder(), - pPage->GetRgtBorder(), + pPage->GetLeftBorder(), + pPage->GetRightBorder(), nLeft, nRight); pUndoGroup->AddAction(pUndo); - pPage->SetLftBorder(nLeft); - pPage->SetRgtBorder(nRight); + pPage->SetLeftBorder(nLeft); + pPage->SetRightBorder(nRight); } InvalidateWindows(); } @@ -592,12 +592,12 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) SdPage* pPage = GetDoc()->GetSdPage(i, mePageKind); SdUndoAction* pUndo = new SdPageULUndoAction(GetDoc(), pPage, - pPage->GetUppBorder(), - pPage->GetLwrBorder(), + pPage->GetUpperBorder(), + pPage->GetLowerBorder(), nUpper, nLower); pUndoGroup->AddAction(pUndo); - pPage->SetUppBorder(nUpper); - pPage->SetLwrBorder(nLower); + pPage->SetUpperBorder(nUpper); + pPage->SetLowerBorder(nLower); } nPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind); @@ -606,12 +606,12 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) SdPage* pPage = GetDoc()->GetMasterSdPage(i, mePageKind); SdUndoAction* pUndo = new SdPageULUndoAction(GetDoc(), pPage, - pPage->GetUppBorder(), - pPage->GetLwrBorder(), + pPage->GetUpperBorder(), + pPage->GetLowerBorder(), nUpper, nLower); pUndoGroup->AddAction(pUndo); - pPage->SetUppBorder(nUpper); - pPage->SetLwrBorder(nLower); + pPage->SetUpperBorder(nUpper); + pPage->SetLowerBorder(nLower); } InvalidateWindows(); } @@ -870,11 +870,11 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) rSet.Put( SfxRectangleItem(SID_RULER_LR_MIN_MAX, aRect) ); } - SvxLongLRSpaceItem aLRSpace(aPagePos.X() + mpActualPage->GetLftBorder(), - aRect.Right() + mpActualPage->GetRgtBorder(), + SvxLongLRSpaceItem aLRSpace(aPagePos.X() + mpActualPage->GetLeftBorder(), + aRect.Right() + mpActualPage->GetRightBorder(), GetPool().GetWhich(SID_ATTR_LONG_LRSPACE)); - SvxLongULSpaceItem aULSpace(aPagePos.Y() + mpActualPage->GetUppBorder(), - aRect.Bottom() + mpActualPage->GetLwrBorder(), + SvxLongULSpaceItem aULSpace(aPagePos.Y() + mpActualPage->GetUpperBorder(), + aRect.Bottom() + mpActualPage->GetLowerBorder(), GetPool().GetWhich(SID_ATTR_LONG_ULSPACE)); rSet.Put(SvxPagePosSizeItem(Point(0,0) - aPagePos, aViewSize.Width(), aViewSize.Height())); diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index ee2cd73d432d..a74c0e9ad0a9 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -425,7 +425,7 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) { mpDrawView->BrkAction(); SdPage* pPage = static_cast<SdPage*>( mpDrawView->GetSdrPageView()->GetPage() ); - Point aOrg(pPage->GetLftBorder(), pPage->GetUppBorder()); + Point aOrg(pPage->GetLeftBorder(), pPage->GetUpperBorder()); mpDrawView->GetSdrPageView()->SetPageOrigin(aOrg); GetViewFrame()->GetBindings().Invalidate(SID_RULER_NULL_OFFSET); } diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index ab318a97f436..69e2cddc734a 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -269,8 +269,8 @@ void DrawViewShell::GetMarginProperties( SfxItemSet &rSet ) { // const SvxLRSpaceItem aTmpPageLRSpace ( rDesc.GetMaster().GetLRSpace() ); const SvxLongLRSpaceItem aLongLR( - (long)pPage->GetLftBorder(), - (long)pPage->GetRgtBorder(), + (long)pPage->GetLeftBorder(), + (long)pPage->GetRightBorder(), SID_ATTR_PAGE_LRSPACE ); rSet.Put( aLongLR ); } @@ -280,8 +280,8 @@ void DrawViewShell::GetMarginProperties( SfxItemSet &rSet ) { // const SvxULSpaceItem aUL( rDesc.GetMaster().GetULSpace() ); SvxLongULSpaceItem aLongUL( - (long)pPage->GetUppBorder(), - (long)pPage->GetLwrBorder(), + (long)pPage->GetUpperBorder(), + (long)pPage->GetLowerBorder(), SID_ATTR_PAGE_ULSPACE ); rSet.Put( aLongUL ); } @@ -1853,8 +1853,8 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) nRight = static_cast<const SvxLongLRSpaceItem*>(pPoolItem)->GetRight(); if (nLeft != -1 && nUpper == -1) { - nUpper = pPage->GetUppBorder(); - nLower = pPage->GetLwrBorder(); + nUpper = pPage->GetUpperBorder(); + nLower = pPage->GetLowerBorder(); } SetPageSizeAndBorder(ePageKind, aNewSize, nLeft, nRight, nUpper, nLower, bScaleAll, eOrientation, nPaperBin, bFullSize ); } @@ -1868,8 +1868,8 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) nLower = static_cast<const SvxLongULSpaceItem*>(pPoolItem)->GetLower(); if (nLeft == -1 && nUpper != -1) { - nLeft = pPage->GetLftBorder(); - nRight = pPage->GetRgtBorder(); + nLeft = pPage->GetLeftBorder(); + nRight = pPage->GetRightBorder(); } SetPageSizeAndBorder(ePageKind, aNewSize, nLeft, nRight, nUpper, nLower, bScaleAll, eOrientation, nPaperBin, bFullSize ); } diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index 44ab9f02ce5a..62688c92c949 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -74,8 +74,8 @@ void DrawViewShell::ScannerEvent() else aBmpSize = OutputDevice::LogicToLogic( aBmpSize, aScanBmp.GetPrefMapMode(), aMap100 ); - aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder(); - aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder(); + aPageSize.Width() -= pPage->GetLeftBorder() + pPage->GetRightBorder(); + aPageSize.Height() -= pPage->GetUpperBorder() + pPage->GetLowerBorder(); if( ( ( aBmpSize.Height() > aPageSize.Height() ) || ( aBmpSize.Width() > aPageSize.Width() ) ) && aBmpSize.Height() && aPageSize.Height() ) { @@ -95,7 +95,7 @@ void DrawViewShell::ScannerEvent() } Point aPnt ( ( aPageSize.Width() - aBmpSize.Width() ) >> 1, ( aPageSize.Height() - aBmpSize.Height() ) >> 1 ); - aPnt += Point( pPage->GetLftBorder(), pPage->GetUppBorder() ); + aPnt += Point( pPage->GetLeftBorder(), pPage->GetUpperBorder() ); ::tools::Rectangle aRect( aPnt, aBmpSize ); SdrGrafObj* pGrafObj = nullptr; bool bInsertNewObject = true; diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 8c0944a0d5ee..f1870d57d6b9 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -97,8 +97,8 @@ void DrawViewShell::ExecGallery(SfxRequest const & rReq) // constrain size to page size if necessary SdrPage* pPage = mpDrawView->GetSdrPageView()->GetPage(); Size aPageSize = pPage->GetSize(); - aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder(); - aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder(); + aPageSize.Width() -= pPage->GetLeftBorder() + pPage->GetRightBorder(); + aPageSize.Height() -= pPage->GetUpperBorder() + pPage->GetLowerBorder(); // If the image is too large we make it fit into the page if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width() > aPageSize.Width() ) ) && @@ -125,7 +125,7 @@ void DrawViewShell::ExecGallery(SfxRequest const & rReq) // set output rectangle for graphic Point aPnt ((aPageSize.Width() - aSize.Width()) / 2, (aPageSize.Height() - aSize.Height()) / 2); - aPnt += Point(pPage->GetLftBorder(), pPage->GetUppBorder()); + aPnt += Point(pPage->GetLeftBorder(), pPage->GetUpperBorder()); ::tools::Rectangle aRect (aPnt, aSize); SdrGrafObj* pGrafObj = nullptr; diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 7104afae7928..6973b324ec45 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -438,10 +438,10 @@ void DrawViewShell::SetupPage (Size const &rSize, } if( bMargin ) { - pPage->SetLftBorder(nLeft); - pPage->SetRgtBorder(nRight); - pPage->SetUppBorder(nUpper); - pPage->SetLwrBorder(nLower); + pPage->SetLeftBorder(nLeft); + pPage->SetRightBorder(nRight); + pPage->SetUpperBorder(nUpper); + pPage->SetLowerBorder(nLower); } if ( mePageKind == PageKind::Standard ) @@ -470,10 +470,10 @@ void DrawViewShell::SetupPage (Size const &rSize, } if( bMargin ) { - pPage->SetLftBorder(nLeft); - pPage->SetRgtBorder(nRight); - pPage->SetUppBorder(nUpper); - pPage->SetLwrBorder(nLower); + pPage->SetLeftBorder(nLeft); + pPage->SetRightBorder(nRight); + pPage->SetUpperBorder(nUpper); + pPage->SetLowerBorder(nLower); } if ( mePageKind == PageKind::Standard ) @@ -511,7 +511,7 @@ void DrawViewShell::SetupPage (Size const &rSize, UpdateScrollBars(); - Point aNewOrigin(mpActualPage->GetLftBorder(), mpActualPage->GetUppBorder()); + Point aNewOrigin(mpActualPage->GetLeftBorder(), mpActualPage->GetUpperBorder()); GetView()->GetSdrPageView()->SetPageOrigin(aNewOrigin); GetViewFrame()->GetBindings().Invalidate(SID_RULER_NULL_OFFSET); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 1401cb24448f..931949bcd3e8 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -436,10 +436,10 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) // set page size pPage->SetSize(pExample->GetSize()); - pPage->SetBorder( pExample->GetLftBorder(), - pExample->GetUppBorder(), - pExample->GetRgtBorder(), - pExample->GetLwrBorder() ); + pPage->SetBorder( pExample->GetLeftBorder(), + pExample->GetUpperBorder(), + pExample->GetRightBorder(), + pExample->GetLowerBorder() ); // create new presentation objects (after <Title> or <Title with subtitle> // follows <Title with outline>, otherwise apply the layout of the previous @@ -475,10 +475,10 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) // set page size, there must be already one page available pNotesPage->SetSize(pExample->GetSize()); - pNotesPage->SetBorder( pExample->GetLftBorder(), - pExample->GetUppBorder(), - pExample->GetRgtBorder(), - pExample->GetLwrBorder() ); + pNotesPage->SetBorder( pExample->GetLeftBorder(), + pExample->GetUpperBorder(), + pExample->GetRightBorder(), + pExample->GetLowerBorder() ); // create presentation objects pNotesPage->SetAutoLayout(pExample->GetAutoLayout(), true); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index bf5307449eb5..f5fce44dd92c 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -194,8 +194,8 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, pNewGrafObj = new SdrGrafObj( rGraphic, ::tools::Rectangle( rPos, aSize ) ); SdrPage* pPage = pPV->GetPage(); Size aPageSize( pPage->GetSize() ); - aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder(); - aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder(); + aPageSize.Width() -= pPage->GetLeftBorder() + pPage->GetRightBorder(); + aPageSize.Height() -= pPage->GetUpperBorder() + pPage->GetLowerBorder(); pNewGrafObj->AdjustToMaxRect( ::tools::Rectangle( Point(), aPageSize ), true ); SdrInsertFlags nOptions = SdrInsertFlags::SETDEFLAYER; diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 4e06cd625566..9ec8e5e1d77a 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -490,8 +490,8 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, SdUndoAction* pUndo = new SdPageFormatUndoAction(GetDoc(), pPage, pPage->GetSize(), - pPage->GetLftBorder(), pPage->GetRgtBorder(), - pPage->GetUppBorder(), pPage->GetLwrBorder(), + pPage->GetLeftBorder(), pPage->GetRightBorder(), + pPage->GetUpperBorder(), pPage->GetLowerBorder(), pPage->GetOrientation(), pPage->GetPaperBin(), pPage->IsBackgroundFullSize(), @@ -538,8 +538,8 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, SdUndoAction* pUndo = new SdPageFormatUndoAction(GetDoc(), pPage, pPage->GetSize(), - pPage->GetLftBorder(), pPage->GetRgtBorder(), - pPage->GetUppBorder(), pPage->GetLwrBorder(), + pPage->GetLeftBorder(), pPage->GetRightBorder(), + pPage->GetUpperBorder(), pPage->GetLowerBorder(), pPage->GetOrientation(), pPage->GetPaperBin(), pPage->IsBackgroundFullSize(), @@ -611,7 +611,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, UpdateScrollBars(); - Point aNewOrigin(pPage->GetLftBorder(), pPage->GetUppBorder()); + Point aNewOrigin(pPage->GetLeftBorder(), pPage->GetUpperBorder()); if (pView) { diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx index 679fcc552b3d..5486e7fac5a4 100644 --- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx @@ -63,9 +63,9 @@ namespace sdr // direct model data is the page size, get and use it const SdrPage& rOwnerPage = GetMasterPageDescriptor().GetOwnerPage(); const basegfx::B2DRange aInnerRange( - rOwnerPage.GetLftBorder(), rOwnerPage.GetUppBorder(), - rOwnerPage.GetWdt() - rOwnerPage.GetRgtBorder(), - rOwnerPage.GetHgt() - rOwnerPage.GetLwrBorder()); + rOwnerPage.GetLeftBorder(), rOwnerPage.GetUpperBorder(), + rOwnerPage.GetWidth() - rOwnerPage.GetRightBorder(), + rOwnerPage.GetHeight() - rOwnerPage.GetLowerBorder()); const basegfx::B2DPolygon aInnerPolgon(basegfx::tools::createPolygonFromRect(aInnerRange)); const drawinglayer::primitive2d::Primitive2DReference xReference( drawinglayer::primitive2d::createPolyPolygonFillPrimitive( diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index d40a0f30e544..1b9d6c903b04 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -106,8 +106,8 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageShadow::createV static bool bUseOldPageShadow(false); const SdrPage& rPage = getPage(); basegfx::B2DHomMatrix aPageMatrix; - aPageMatrix.set(0, 0, (double)rPage.GetWdt()); - aPageMatrix.set(1, 1, (double)rPage.GetHgt()); + aPageMatrix.set(0, 0, (double)rPage.GetWidth()); + aPageMatrix.set(1, 1, (double)rPage.GetHeight()); if(bUseOldPageShadow) { @@ -209,8 +209,8 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfMasterPage::createV { // direct model data is the page size, get and use it const basegfx::B2DRange aInnerRange( - rPage.GetLftBorder(), rPage.GetUppBorder(), - rPage.GetWdt() - rPage.GetRgtBorder(), rPage.GetHgt() - rPage.GetLwrBorder()); + rPage.GetLeftBorder(), rPage.GetUpperBorder(), + rPage.GetWidth() - rPage.GetRightBorder(), rPage.GetHeight() - rPage.GetLowerBorder()); const basegfx::B2DPolygon aInnerPolgon(basegfx::tools::createPolygonFromRect(aInnerRange)); const drawinglayer::primitive2d::Primitive2DReference xReference( drawinglayer::primitive2d::createPolyPolygonFillPrimitive( @@ -246,7 +246,7 @@ ViewObjectContact& ViewContactOfPageFill::CreateObjectSpecificViewObjectContact( drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageFill::createViewIndependentPrimitive2DSequence() const { const SdrPage& rPage = getPage(); - const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt()); + const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWidth(), (double)rPage.GetHeight()); const basegfx::B2DPolygon aPageFillPolygon(basegfx::tools::createPolygonFromRect(aPageFillRange)); // We have only the page information, not the view information. Use the @@ -282,7 +282,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfOuterPageBorder::cr { drawinglayer::primitive2d::Primitive2DContainer xRetval; const SdrPage& rPage = getPage(); - const basegfx::B2DRange aPageBorderRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt()); + const basegfx::B2DRange aPageBorderRange(0.0, 0.0, (double)rPage.GetWidth(), (double)rPage.GetHeight()); // Changed to 0x949599 for renaissance, before svtools::FONTCOLOR was used. // Added old case as fallback for HighContrast. @@ -343,8 +343,8 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfInnerPageBorder::cr { const SdrPage& rPage = getPage(); const basegfx::B2DRange aPageBorderRange( - (double)rPage.GetLftBorder(), (double)rPage.GetUppBorder(), - (double)(rPage.GetWdt() - rPage.GetRgtBorder()), (double)(rPage.GetHgt() - rPage.GetLwrBorder())); + (double)rPage.GetLeftBorder(), (double)rPage.GetUpperBorder(), + (double)(rPage.GetWidth() - rPage.GetRightBorder()), (double)(rPage.GetHeight() - rPage.GetLowerBorder())); const basegfx::B2DPolygon aPageBorderPolygon(basegfx::tools::createPolygonFromRect(aPageBorderRange)); // We have only the page information, not the view information. Use the diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx index 78455f4038f8..5433095ad7a6 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx @@ -96,8 +96,8 @@ namespace sdr //polygon chain to cover the length in applyLineDashing if this //line is dashed const SdrPage* pPage = GetPathObj().GetPage(); - sal_Int32 nPageWidth = pPage ? pPage->GetWdt() : 0; - sal_Int32 nPageHeight = pPage ? pPage->GetHgt() : 0; + sal_Int32 nPageWidth = pPage ? pPage->GetWidth() : 0; + sal_Int32 nPageHeight = pPage ? pPage->GetHeight() : 0; //But, see tdf#101187, only do this if our generous clip region //would not over flow into a tiny clip region diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx index 3c9aca92946b..fd19a9d41f36 100644 --- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx @@ -68,8 +68,8 @@ namespace sdr // used range (retval) is fixed here, it's the MasterPage fill range const SdrPage& rOwnerPage = rDescriptor.GetOwnerPage(); const basegfx::B2DRange aPageFillRange( - rOwnerPage.GetLftBorder(), rOwnerPage.GetUppBorder(), - rOwnerPage.GetWdt() - rOwnerPage.GetRgtBorder(), rOwnerPage.GetHgt() - rOwnerPage.GetLwrBorder()); + rOwnerPage.GetLeftBorder(), rOwnerPage.GetUpperBorder(), + rOwnerPage.GetWidth() - rOwnerPage.GetRightBorder(), rOwnerPage.GetHeight() - rOwnerPage.GetLowerBorder()); // Modify DisplayInfo for MasterPageContent collection; remember original layers and // set combined SdrLayerIDSet; set MasterPagePaint flag diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index b54e19145e8e..5bf633790323 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -164,7 +164,7 @@ void PagePrimitiveExtractor::InvalidatePartOfView(const basegfx::B2DRange& rRang if(pStartPage && !rRange.isEmpty()) { - const basegfx::B2DRange aPageRange(0.0, 0.0, (double)pStartPage->GetWdt(), (double)pStartPage->GetHgt()); + const basegfx::B2DRange aPageRange(0.0, 0.0, (double)pStartPage->GetWidth(), (double)pStartPage->GetHeight()); if(rRange.overlaps(aPageRange)) { diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx index 351cffaf3700..83ae5011d5cc 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx @@ -215,7 +215,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageFill::cre { const SdrPage& rPage = getPage(); - const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt()); + const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWidth(), (double)rPage.GetHeight()); const basegfx::B2DPolygon aPageFillPolygon(basegfx::tools::createPolygonFromRect(aPageFillRange)); Color aPageFillColor; @@ -344,7 +344,7 @@ bool ViewObjectContactOfInnerPageBorder::isPrimitiveVisible(const DisplayInfo& r const SdrPage& rPage = getPage(); - if(!rPage.GetLftBorder() && !rPage.GetUppBorder() && !rPage.GetRgtBorder() && !rPage.GetLwrBorder()) + if(!rPage.GetLeftBorder() && !rPage.GetUpperBorder() && !rPage.GetRightBorder() && !rPage.GetLowerBorder()) { return false; } @@ -454,10 +454,10 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageGrid::cre const basegfx::BColor aRGBGridColor(aGridColor.getBColor()); basegfx::B2DHomMatrix aGridMatrix; - aGridMatrix.set(0, 0, (double)(rPage.GetWdt() - (rPage.GetRgtBorder() + rPage.GetLftBorder()))); - aGridMatrix.set(1, 1, (double)(rPage.GetHgt() - (rPage.GetLwrBorder() + rPage.GetUppBorder()))); - aGridMatrix.set(0, 2, (double)rPage.GetLftBorder()); - aGridMatrix.set(1, 2, (double)rPage.GetUppBorder()); + aGridMatrix.set(0, 0, (double)(rPage.GetWidth() - (rPage.GetRightBorder() + rPage.GetLeftBorder()))); + aGridMatrix.set(1, 1, (double)(rPage.GetHeight() - (rPage.GetLowerBorder() + rPage.GetUpperBorder()))); + aGridMatrix.set(0, 2, (double)rPage.GetLeftBorder()); + aGridMatrix.set(1, 2, (double)rPage.GetUpperBorder()); const Size aRaw(rView.GetGridCoarse()); const Size aFine(rView.GetGridFine()); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index d988aad4fc64..e2aefc9b2104 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1810,9 +1810,9 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert) } else { - aBound=tools::Rectangle(pPage->GetLftBorder(),pPage->GetUppBorder(), - pPage->GetWdt()-pPage->GetRgtBorder(), - pPage->GetHgt()-pPage->GetLwrBorder()); + aBound=tools::Rectangle(pPage->GetLeftBorder(),pPage->GetUpperBorder(), + pPage->GetWidth()-pPage->GetRightBorder(), + pPage->GetHeight()-pPage->GetLowerBorder()); } } else diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 9657bf62cf55..cb4fd10a91e3 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1159,12 +1159,12 @@ void SdrPageProperties::SetStyleSheet(SfxStyleSheet* pStyleSheet) SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage) : SdrObjList(&rNewModel, this), mpViewContact(nullptr), - nWdt(10L), - nHgt(10L), - nBordLft(0L), - nBordUpp(0L), - nBordRgt(0L), - nBordLwr(0L), + mnWidth(10L), + mnHeight(10L), + mnBorderLeft(0L), + mnBorderUpper(0L), + mnBorderRight(0L), + mnBorderLower(0L), mpLayerAdmin(new SdrLayerAdmin(&rNewModel.GetLayerAdmin())), mpSdrPageProperties(nullptr), mpMasterPageDescriptor(nullptr), @@ -1184,12 +1184,12 @@ SdrPage::SdrPage(const SdrPage& rSrcPage) : SdrObjList(rSrcPage.pModel, this), tools::WeakBase< SdrPage >(), mpViewContact(nullptr), - nWdt(rSrcPage.nWdt), - nHgt(rSrcPage.nHgt), - nBordLft(rSrcPage.nBordLft), - nBordUpp(rSrcPage.nBordUpp), - nBordRgt(rSrcPage.nBordRgt), - nBordLwr(rSrcPage.nBordLwr), + mnWidth(rSrcPage.mnWidth), + mnHeight(rSrcPage.mnHeight), + mnBorderLeft(rSrcPage.mnBorderLeft), + mnBorderUpper(rSrcPage.mnBorderUpper), + mnBorderRight(rSrcPage.mnBorderRight), + mnBorderLower(rSrcPage.mnBorderLower), mpLayerAdmin(new SdrLayerAdmin(rSrcPage.pModel->GetLayerAdmin())), mpSdrPageProperties(nullptr), mpMasterPageDescriptor(nullptr), @@ -1257,12 +1257,12 @@ void SdrPage::lateInit(const SdrPage& rSrcPage, SdrModel* const pNewModel) mbMaster = rSrcPage.mbMaster; mbPageBorderOnlyLeftRight = rSrcPage.mbPageBorderOnlyLeftRight; aPrefVisiLayers = rSrcPage.aPrefVisiLayers; - nWdt = rSrcPage.nWdt; - nHgt = rSrcPage.nHgt; - nBordLft = rSrcPage.nBordLft; - nBordUpp = rSrcPage.nBordUpp; - nBordRgt = rSrcPage.nBordRgt; - nBordLwr = rSrcPage.nBordLwr; + mnWidth = rSrcPage.mnWidth; + mnHeight = rSrcPage.mnHeight; + mnBorderLeft = rSrcPage.mnBorderLeft; + mnBorderUpper = rSrcPage.mnBorderUpper; + mnBorderRight = rSrcPage.mnBorderRight; + mnBorderLower = rSrcPage.mnBorderLower; nPageNum = rSrcPage.nPageNum; if(rSrcPage.TRG_HasMasterPage()) @@ -1313,15 +1313,15 @@ void SdrPage::SetSize(const Size& aSiz) { bool bChanged(false); - if(aSiz.Width() != nWdt) + if(aSiz.Width() != mnWidth) { - nWdt = aSiz.Width(); + mnWidth = aSiz.Width(); bChanged = true; } - if(aSiz.Height() != nHgt) + if(aSiz.Height() != mnHeight) { - nHgt = aSiz.Height(); + mnHeight = aSiz.Height(); bChanged = true; } @@ -1333,12 +1333,12 @@ void SdrPage::SetSize(const Size& aSiz) Size SdrPage::GetSize() const { - return Size(nWdt,nHgt); + return Size(mnWidth,mnHeight); } -sal_Int32 SdrPage::GetWdt() const +sal_Int32 SdrPage::GetWidth() const { - return nWdt; + return mnWidth; } void SdrPage::SetOrientation(Orientation eOri) @@ -1361,36 +1361,36 @@ Orientation SdrPage::GetOrientation() const return eRet; } -sal_Int32 SdrPage::GetHgt() const +sal_Int32 SdrPage::GetHeight() const { - return nHgt; + return mnHeight; } void SdrPage::SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 nLwr) { bool bChanged(false); - if(nBordLft != nLft) + if(mnBorderLeft != nLft) { - nBordLft = nLft; + mnBorderLeft = nLft; bChanged = true; } - if(nBordUpp != nUpp) + if(mnBorderUpper != nUpp) { - nBordUpp = nUpp; + mnBorderUpper = nUpp; bChanged = true; } - if(nBordRgt != nRgt) + if(mnBorderRight != nRgt) { - nBordRgt = nRgt; + mnBorderRight = nRgt; bChanged = true; } - if(nBordLwr != nLwr) + if(mnBorderLower != nLwr) { - nBordLwr = nLwr; + mnBorderLower = nLwr; bChanged = true; } @@ -1400,60 +1400,60 @@ void SdrPage::SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int } } -void SdrPage::SetLftBorder(sal_Int32 nBorder) +void SdrPage::SetLeftBorder(sal_Int32 nBorder) { - if(nBordLft != nBorder) + if(mnBorderLeft != nBorder) { - nBordLft = nBorder; + mnBorderLeft = nBorder; SetChanged(); } } -void SdrPage::SetUppBorder(sal_Int32 nBorder) +void SdrPage::SetUpperBorder(sal_Int32 nBorder) { - if(nBordUpp != nBorder) + if(mnBorderUpper != nBorder) { - nBordUpp = nBorder; + mnBorderUpper = nBorder; SetChanged(); } } -void SdrPage::SetRgtBorder(sal_Int32 nBorder) +void SdrPage::SetRightBorder(sal_Int32 nBorder) { - if(nBordRgt != nBorder) + if(mnBorderRight != nBorder) { - nBordRgt=nBorder; + mnBorderRight=nBorder; SetChanged(); } } -void SdrPage::SetLwrBorder(sal_Int32 nBorder) +void SdrPage::SetLowerBorder(sal_Int32 nBorder) { - if(nBordLwr != nBorder) + if(mnBorderLower != nBorder) { - nBordLwr=nBorder; + mnBorderLower=nBorder; SetChanged(); } } -sal_Int32 SdrPage::GetLftBorder() const +sal_Int32 SdrPage::GetLeftBorder() const { - return nBordLft; + return mnBorderLeft; } -sal_Int32 SdrPage::GetUppBorder() const +sal_Int32 SdrPage::GetUpperBorder() const { - return nBordUpp; + return mnBorderUpper; } -sal_Int32 SdrPage::GetRgtBorder() const +sal_Int32 SdrPage::GetRightBorder() const { - return nBordRgt; + return mnBorderRight; } -sal_Int32 SdrPage::GetLwrBorder() const +sal_Int32 SdrPage::GetLowerBorder() const { - return nBordLwr; + return mnBorderLower; } void SdrPage::impl_setModelForLayerAdmin(SdrModel* const pNewModel) diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index d23f8f43f380..0291abada558 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -142,8 +142,8 @@ SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView) if(mpPage) { - aPgOrg.X()=mpPage->GetLftBorder(); - aPgOrg.Y()=mpPage->GetUppBorder(); + aPgOrg.X()=mpPage->GetLeftBorder(); + aPgOrg.Y()=mpPage->GetUpperBorder(); } mbHasMarked = false; aLayerVisi.SetAll(); @@ -236,14 +236,14 @@ void SdrPageView::Hide() tools::Rectangle SdrPageView::GetPageRect() const { if (GetPage()==nullptr) return tools::Rectangle(); - return tools::Rectangle(Point(),Size(GetPage()->GetWdt()+1,GetPage()->GetHgt()+1)); + return tools::Rectangle(Point(),Size(GetPage()->GetWidth()+1,GetPage()->GetHeight()+1)); } void SdrPageView::InvalidateAllWin() { if(IsVisible() && GetPage()) { - tools::Rectangle aRect(Point(0,0),Size(GetPage()->GetWdt()+1,GetPage()->GetHgt()+1)); + tools::Rectangle aRect(Point(0,0),Size(GetPage()->GetWidth()+1,GetPage()->GetHeight()+1)); aRect.Union(GetPage()->GetAllObjBoundRect()); GetView().InvalidateAllWin(aRect); } @@ -493,10 +493,10 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& r long nWrX=0; long nWrY=0; Point aOrg(aPgOrg); - long x1=GetPage()->GetLftBorder()+1+nWrX; - long x2=GetPage()->GetWdt()-GetPage()->GetRgtBorder()-1+nWrY; - long y1=GetPage()->GetUppBorder()+1+nWrX; - long y2=GetPage()->GetHgt()-GetPage()->GetLwrBorder()-1+nWrY; + long x1=GetPage()->GetLeftBorder()+1+nWrX; + long x2=GetPage()->GetWidth()-GetPage()->GetRightBorder()-1+nWrY; + long y1=GetPage()->GetUpperBorder()+1+nWrX; + long y2=GetPage()->GetHeight()-GetPage()->GetLowerBorder()-1+nWrY; const SdrPageGridFrameList* pFrames=GetPage()->GetGridFrameList(this,nullptr); sal_uInt16 nGridPaintCnt=1; diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 4923e7de66d3..4fb3affa15bc 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -303,12 +303,12 @@ SdrSnap SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const } if (mbBordVisible && bBordSnap) { SdrPage* pPage=pPV->GetPage(); - long xs=pPage->GetWdt(); - long ys=pPage->GetHgt(); - long lft=pPage->GetLftBorder(); - long rgt=pPage->GetRgtBorder(); - long upp=pPage->GetUppBorder(); - long lwr=pPage->GetLwrBorder(); + long xs=pPage->GetWidth(); + long ys=pPage->GetHeight(); + long lft=pPage->GetLeftBorder(); + long rgt=pPage->GetRightBorder(); + long upp=pPage->GetUpperBorder(); + long lwr=pPage->GetLowerBorder(); long a; a=x- lft ; if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } // left margin a=x-(xs-rgt); if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } // right margin diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index f395f256d704..be8cbf8a3ebf 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -732,9 +732,9 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, // PageBackground (formerly 'wiese'). pView->SetPagePaintingAllowed(false); - const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() ); - aNewSize = Size( aSize.Width() - pPage->GetLftBorder() - pPage->GetRgtBorder(), - aSize.Height() - pPage->GetUppBorder() - pPage->GetLwrBorder() ); + const Point aNewOrg( pPage->GetLeftBorder(), pPage->GetUpperBorder() ); + aNewSize = Size( aSize.Width() - pPage->GetLeftBorder() - pPage->GetRightBorder(), + aSize.Height() - pPage->GetUpperBorder() - pPage->GetLowerBorder() ); const tools::Rectangle aClipRect( aNewOrg, aNewSize ); MapMode aVMap( aMap ); |