summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@gmx.com>2012-10-28 23:23:53 +0100
committerMichael Stahl <mstahl@redhat.com>2012-11-20 19:32:43 +0000
commit53ad646f54f8aa33b86c696c04500fd08ea6f3b6 (patch)
tree3eef1a050a5cf7b8b531f56e125d7252f4aab8fe /sd
parent5e5c11c664f67ff9fd1120905b09a32bea3b2f6c (diff)
Enforce use of accessors on gen.hxx structures
Change-Id: Icd1b2937fdeaba6de1877258731f53ddf996002e Reviewed-on: https://gerrit.libreoffice.org/936 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/eppt/pptx-text.cxx4
-rw-r--r--sd/source/filter/html/htmlattr.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx8
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx8
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx8
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx2
-rw-r--r--sd/source/ui/view/frmview.cxx12
8 files changed, 25 insertions, 25 deletions
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index bd8d8d4812c9..76e7202bd93b 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -820,8 +820,8 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
// don't cast awt::Size to Size as on 64-bits they are not the same.
::com::sun::star::awt::Size aSize;
pPropValue[ i ].Value >>= aSize;
- aBuGraSize.nA = aSize.Width;
- aBuGraSize.nB = aSize.Height;
+ aBuGraSize.A() = aSize.Width;
+ aBuGraSize.B() = aSize.Height;
}
}
else if ( aPropName == "StartWith" )
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx
index 1f56f0c00eae..1d29675fdce4 100644
--- a/sd/source/filter/html/htmlattr.cxx
+++ b/sd/source/filter/html/htmlattr.cxx
@@ -54,8 +54,8 @@ void SdHtmlAttrPreview::Paint( const Rectangle& rRect )
DrawRect(rRect);
SetFillColor();
- int nHeight = (aTextRect.nBottom - aTextRect.nTop) >> 2;
- aTextRect.nBottom = nHeight + aTextRect.nTop;
+ int nHeight = (aTextRect.Bottom() - aTextRect.Top()) >> 2;
+ aTextRect.Bottom() = nHeight + aTextRect.Top();
SetTextColor(m_aTextColor);
DrawText( aTextRect, String(SdResId(STR_HTMLATTR_TEXT)),
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 5a7200f39a95..0df976740dbe 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -436,10 +436,10 @@ void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvTreeListBox& r
int nVertBorder = (( aSize.Height() - rDev.GetTextHeight()) >> 1);
int nHorzBorder = rDev.LogicToPixel( Size( 3, 3 ), MAP_APPFONT ).Width();
- aOutRect.nLeft += nHorzBorder;
- aOutRect.nRight -= nHorzBorder;
- aOutRect.nTop += nVertBorder;
- aOutRect.nBottom -= nVertBorder;
+ aOutRect.Left() += nHorzBorder;
+ aOutRect.Right() -= nHorzBorder;
+ aOutRect.Top() += nVertBorder;
+ aOutRect.Bottom() -= nVertBorder;
rDev.DrawText (aOutRect, rDev.GetEllipsisString( maDescription, aOutRect.GetWidth() ) );
rDev.Pop();
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index bae35a7ee1d9..86781160a61e 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -395,10 +395,10 @@ void AnnotationManagerImpl::InsertAnnotation()
for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter )
{
RealPoint2D aPoint( (*iter)->getPosition() );
- aTagRect.nLeft = sal::static_int_cast< long >( aPoint.X * 100.0 );
- aTagRect.nTop = sal::static_int_cast< long >( aPoint.Y * 100.0 );
- aTagRect.nRight = aTagRect.nLeft + width - 1;
- aTagRect.nBottom = aTagRect.nTop + height - 1;
+ aTagRect.Left() = sal::static_int_cast< long >( aPoint.X * 100.0 );
+ aTagRect.Top() = sal::static_int_cast< long >( aPoint.Y * 100.0 );
+ aTagRect.Right() = aTagRect.Left() + width - 1;
+ aTagRect.Bottom() = aTagRect.Top() + height - 1;
if( aNewRect.IsOver( aTagRect ) )
{
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 183f29753717..74da198765ef 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -906,10 +906,10 @@ void PresLayoutPreview::Paint( const Rectangle& )
nWidth = long( (double)(nHeight * maPageSize.Width()) / (double)maPageSize.Height() );
}
- maOutRect.nLeft += (maOutRect.GetWidth() - nWidth) >> 1;
- maOutRect.nRight = maOutRect.nLeft + nWidth - 1;
- maOutRect.nTop += (maOutRect.GetHeight() - nHeight) >> 1;
- maOutRect.nBottom = maOutRect.nTop + nHeight - 1;
+ maOutRect.Left() += (maOutRect.GetWidth() - nWidth) >> 1;
+ maOutRect.Right() = maOutRect.Left() + nWidth - 1;
+ maOutRect.Top() += (maOutRect.GetHeight() - nHeight) >> 1;
+ maOutRect.Bottom() = maOutRect.Top() + nHeight - 1;
// draw decoration frame
DecorationView aDecoView( this );
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index e0d3c9aa17ca..f6c7a14a28f3 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -858,8 +858,8 @@ bool SlideshowImpl::startPreview(
Rectangle aContentRect (mpViewShell->GetViewShellBase().getClientRectangle());
if (Application::GetSettings().GetLayoutRTL())
{
- aContentRect.nLeft = aContentRect.nRight;
- aContentRect.nRight += aContentRect.nRight;
+ aContentRect.Left() = aContentRect.Right();
+ aContentRect.Right() += aContentRect.Right();
}
maPresSize = aContentRect.GetSize();
mpShowWindow->SetPosPixel( aContentRect.TopLeft() );
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 88b43ad7e4c8..a89fe1120fec 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1300,7 +1300,7 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property
break;
const Rectangle& aRect = pEmbeddedObj->GetVisArea();
- awt::Rectangle aVisArea( aRect.nLeft, aRect.nTop, aRect.getWidth(), aRect.getHeight() );
+ awt::Rectangle aVisArea( aRect.Left(), aRect.Top(), aRect.getWidth(), aRect.getHeight() );
aAny <<= aVisArea;
}
break;
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 47f80be9408b..e49d3d3cd77a 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -758,8 +758,8 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
if( pValue->Value >>= nTop )
{
Rectangle aVisArea( GetVisArea() );
- aVisArea.nBottom += nTop - aVisArea.nTop;
- aVisArea.nTop = nTop;
+ aVisArea.Bottom() += nTop - aVisArea.Top();
+ aVisArea.Top() = nTop;
SetVisArea( aVisArea );
}
}
@@ -769,8 +769,8 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
if( pValue->Value >>= nLeft )
{
Rectangle aVisArea( GetVisArea() );
- aVisArea.nRight += nLeft - aVisArea.nLeft;
- aVisArea.nLeft = nLeft;
+ aVisArea.Right() += nLeft - aVisArea.Left();
+ aVisArea.Left() = nLeft;
SetVisArea( aVisArea );
}
}
@@ -780,7 +780,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
if( pValue->Value >>= nWidth )
{
Rectangle aVisArea( GetVisArea() );
- aVisArea.nRight = aVisArea.nLeft + nWidth - 1;
+ aVisArea.Right() = aVisArea.Left() + nWidth - 1;
SetVisArea( aVisArea );
}
}
@@ -790,7 +790,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
if( pValue->Value >>= nHeight )
{
Rectangle aVisArea( GetVisArea() );
- aVisArea.nBottom = nHeight + aVisArea.nTop - 1;
+ aVisArea.Bottom() = nHeight + aVisArea.Top() - 1;
SetVisArea( aVisArea );
}
}