diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 09:32:45 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 11:19:21 +0200 |
commit | 0b021f89f60208877427eaf004e25db8be3832f6 (patch) | |
tree | 0eec9e17fbdbf1d99ee1ab258cea829c8218f861 /sd/source/ui/unoidl | |
parent | e5d9b5ffc423cbb314cde1f66f7bebf4db30b1e6 (diff) |
rename some unnecessary contractions, Lft-Left, etc.
Change-Id: Idf4ab2d4d2550a02c0c50a981d94c67b111082a9
Reviewed-on: https://gerrit.libreoffice.org/41204
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/unoidl')
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 32 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 52 |
2 files changed, 42 insertions, 42 deletions
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() ); |