3 files changed, 7 insertions, 8 deletions
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 81a4ac0344c5..c339c0a6c4f9 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <toolkit/helper/convert.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -425,7 +425,7 @@ void SAL_CALL SvxPixelCtlAccessibleChild::disposing()
 awt::Rectangle SvxPixelCtlAccessibleChild::implGetBounds()
 {
     // no guard necessary, because no one changes maBoundingBox after creating it
-    return AWTRectangle(maBoundingBox);
+    return VCLUnoHelper::ConvertToAWTRect(maBoundingBox);
 }
 
 OUString SvxPixelCtlAccessibleChild::GetName() const
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 1acd58e6a35d..cd0f879ee0b1 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <toolkit/helper/convert.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
@@ -601,7 +601,7 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::disposing()
 awt::Rectangle SvxRectCtlChildAccessibleContext::implGetBounds(  )
 {
     // no guard necessary, because no one changes maBoundingBox after creating it
-    return AWTRectangle(maBoundingBox);
+    return VCLUnoHelper::ConvertToAWTRect(maBoundingBox);
 }
 
 void SvxRectCtlChildAccessibleContext::setStateChecked( bool bChecked )
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index e53e62142ef9..cb5800567929 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -41,7 +41,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/helper/convert.hxx>
 
 #include <svtools/colorcfg.hxx>
 #include <svtools/embedhlp.hxx>
@@ -454,7 +453,7 @@ awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement()
         aContainerMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xParentVis->getMapUnit( mpObj->GetAspect() ) );
 
     aLogicRect = Application::GetDefaultDevice()->LogicToPixel(aLogicRect, MapMode(aContainerMapUnit));
-    return AWTRectangle( aLogicRect );
+    return VCLUnoHelper::ConvertToAWTRect(aLogicRect);
 }
 
 awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getClipRectangle()
@@ -480,8 +479,8 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl
 
     // check if the change is at least one pixel in size
     awt::Rectangle aOldRect = getPlacement();
-    tools::Rectangle aNewPixelRect = VCLRectangle( aPosRect );
-    tools::Rectangle aOldPixelRect = VCLRectangle( aOldRect );
+    tools::Rectangle aNewPixelRect = VCLUnoHelper::ConvertToVCLRect(aPosRect);
+    tools::Rectangle aOldPixelRect = VCLUnoHelper::ConvertToVCLRect(aOldRect);
     if ( aOldPixelRect == aNewPixelRect )
         // nothing has changed
         return;