summaryrefslogtreecommitdiff
path: root/svx/source/form
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/form')
-rw-r--r--svx/source/form/filtnav.cxx2
-rw-r--r--svx/source/form/fmpage.cxx2
-rw-r--r--svx/source/form/fmvwimp.cxx10
-rw-r--r--svx/source/form/formcontrolfactory.cxx4
-rw-r--r--svx/source/form/navigatortree.cxx4
5 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 374324049f97..965b2c0069fe 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -988,7 +988,7 @@ void FmFilterItemsString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::Ren
rRenderContext.Push(PushFlags::LINECOLOR);
rRenderContext.SetLineColor(rRenderContext.GetTextColor());
- Rectangle aRect(rPos, GetSize(&rDev, &rEntry));
+ tools::Rectangle aRect(rPos, GetSize(&rDev, &rEntry));
Point aFirst(rPos.X(), aRect.Bottom() - 6);
Point aSecond(aFirst .X() + 2, aFirst.Y() + 3);
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index ed0da03cfac7..bc700454abd2 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -198,7 +198,7 @@ bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView* pView,
if ( !aHelpText.isEmpty() )
{
// Hilfe anzeigen
- Rectangle aItemRect = pObj->GetCurrentBoundRect();
+ tools::Rectangle aItemRect = pObj->GetCurrentBoundRect();
aItemRect = pWindow->LogicToPixel( aItemRect );
Point aPt = pWindow->OutputToScreenPixel( aItemRect.TopLeft() );
aItemRect.Left() = aPt.X();
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 8d8f7200d6f8..d6da352e106f 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -255,7 +255,7 @@ void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl
if ( xWindow.is() && m_pViewImpl->getView() && m_pWindow )
{
awt::Rectangle aRect = xWindow->getPosSize();
- ::Rectangle aNewRect( aRect.X, aRect.Y, aRect.X + aRect.Width, aRect.Y + aRect.Height );
+ ::tools::Rectangle aNewRect( aRect.X, aRect.Y, aRect.X + aRect.Width, aRect.Y + aRect.Height );
aNewRect = m_pWindow->PixelToLogic( aNewRect );
m_pViewImpl->getView()->MakeVisible( aNewRect, *m_pWindow );
}
@@ -1005,7 +1005,7 @@ IMPL_LINK_NOARG(FmXFormView, OnAutoFocus, void*, void)
if ( pCurrentWindow )
{
awt::Rectangle aRect = xControlWindow->getPosSize();
- ::Rectangle aNonUnoRect( aRect.X, aRect.Y, aRect.X + aRect.Width, aRect.Y + aRect.Height );
+ ::tools::Rectangle aNonUnoRect( aRect.X, aRect.Y, aRect.X + aRect.Width, aRect.Y + aRect.Height );
m_pView->MakeVisible( pCurrentWindow->PixelToLogic( aNonUnoRect ), *const_cast< vcl::Window* >( pCurrentWindow ) );
}
}
@@ -1490,7 +1490,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_
controlSize.Width() = Fraction(controlSize.Width(), 1) * eTargetMode.GetScaleX();
controlSize.Height() = Fraction(controlSize.Height(), 1) * eTargetMode.GetScaleY();
::Point controlPos( OutputDevice::LogicToLogic( ::Point( controlSize.Width(), 0 ), eSourceMode, eTargetMode ) );
- ::Rectangle controlRect( controlPos, OutputDevice::LogicToLogic( controlSize, eSourceMode, eTargetMode ) );
+ ::tools::Rectangle controlRect( controlPos, OutputDevice::LogicToLogic( controlSize, eSourceMode, eTargetMode ) );
pControl->SetLogicRect(controlRect);
// set the button label
@@ -1608,7 +1608,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
xLabelModel->setPropertyValue(FM_PROP_NAME, makeAny(sObjectLabel));
}
- pLabel->SetLogicRect( ::Rectangle(
+ pLabel->SetLogicRect( ::tools::Rectangle(
OutputDevice::LogicToLogic( ::Point( _nXOffsetMM, _nYOffsetMM ), eSourceMode, eTargetMode ),
OutputDevice::LogicToLogic( aRealSize, eSourceMode, eTargetMode )
) );
@@ -1647,7 +1647,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
aControlSize.Width() = long(Fraction(aControlSize.Width(), 1) * eTargetMode.GetScaleX());
aControlSize.Height() = long(Fraction(aControlSize.Height(), 1) * eTargetMode.GetScaleY());
- pControl->SetLogicRect( ::Rectangle(
+ pControl->SetLogicRect( ::tools::Rectangle(
OutputDevice::LogicToLogic( ::Point( aRealSize.Width() + _nXOffsetMM, _nYOffsetMM ), eSourceMode, eTargetMode ),
OutputDevice::LogicToLogic( aControlSize, eSourceMode, eTargetMode )
) );
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index b86d281fc42e..d4aeebd3c530 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -128,7 +128,7 @@ namespace svxform
void FormControlFactory::initializeControlModel( const DocumentType _eDocType, const Reference< XPropertySet >& _rxControlModel )
{
initializeControlModel(
- _eDocType, _rxControlModel, Rectangle()
+ _eDocType, _rxControlModel, tools::Rectangle()
);
}
@@ -381,7 +381,7 @@ namespace svxform
sal_Int16 FormControlFactory::initializeControlModel( const DocumentType _eDocType, const Reference< XPropertySet >& _rxControlModel,
- const Rectangle& _rControlBoundRect )
+ const tools::Rectangle& _rControlBoundRect )
{
sal_Int16 nClassId = FormComponentType::CONTROL;
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 648b1c3d4344..3ff0d2000906 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -2077,7 +2077,7 @@ namespace svxform
}
} // while ( aIter.IsMore() )
// make the mark visible
- ::Rectangle aMarkRect( pFormView->GetAllMarkedRect());
+ ::tools::Rectangle aMarkRect( pFormView->GetAllMarkedRect());
for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i )
{
SdrPaintWindow* pPaintWindow = pFormView->GetPaintWindow( i );
@@ -2145,7 +2145,7 @@ namespace svxform
if ( bPaint )
{
// make the mark visible
- ::Rectangle aMarkRect( pFormView->GetAllMarkedRect());
+ ::tools::Rectangle aMarkRect( pFormView->GetAllMarkedRect());
for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i )
{
SdrPaintWindow* pPaintWindow = pFormView->GetPaintWindow( i );