accessibility/source/extended/AccessibleBrowseBox.cxx | 9 -
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 14 -
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 6
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 4
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 6
accessibility/source/extended/AccessibleGridControl.cxx | 8 -
accessibility/source/extended/AccessibleGridControlBase.cxx | 14 -
accessibility/source/extended/AccessibleGridControlHeader.cxx | 3
accessibility/source/extended/AccessibleGridControlTable.cxx | 4
accessibility/source/extended/AccessibleGridControlTableCell.cxx | 6
accessibility/source/extended/AccessibleIconView.cxx | 4
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 12 -
accessibility/source/extended/accessiblelistboxentry.cxx | 22 +--
accessibility/source/extended/accessibletabbar.cxx | 9 -
accessibility/source/extended/accessibletabbarpage.cxx | 4
accessibility/source/extended/accessibletabbarpagelist.cxx | 8 -
accessibility/source/extended/textwindowaccessibility.cxx | 4
accessibility/source/standard/accessiblemenubasecomponent.cxx | 6
accessibility/source/standard/accessiblemenucomponent.cxx | 8 -
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 6
accessibility/source/standard/vclxaccessibleedit.cxx | 4
accessibility/source/standard/vclxaccessibleheaderbaritem.cxx | 4
accessibility/source/standard/vclxaccessiblelist.cxx | 6
accessibility/source/standard/vclxaccessiblelistitem.cxx | 16 +-
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 6
accessibility/source/standard/vclxaccessiblestatusbar.cxx | 4
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 8 -
accessibility/source/standard/vclxaccessibletabpage.cxx | 12 -
accessibility/source/standard/vclxaccessibletabpagewindow.cxx | 4
accessibility/source/standard/vclxaccessibletextcomponent.cxx | 6
accessibility/source/standard/vclxaccessibletoolbox.cxx | 4
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 8 -
basctl/source/accessibility/accessibledialogcontrolshape.cxx | 3
basctl/source/accessibility/accessibledialogwindow.cxx | 9 -
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 27 +--
framework/source/uielement/popuptoolbarcontroller.cxx | 3
include/toolkit/helper/vclunohelper.hxx | 34 ----
include/vcl/unohelp.hxx | 11 +
reportdesign/source/ui/inspection/GeometryHandler.cxx | 9 -
reportdesign/source/ui/misc/UITools.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 3
reportdesign/source/ui/report/ReportSection.cxx | 12 -
reportdesign/source/ui/report/ViewsWindow.cxx | 7
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 14 -
sc/source/ui/Accessibility/AccessibleDocument.cxx | 11 -
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 19 +-
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 8 -
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 4
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 3
sc/source/ui/unoobj/shapeuno.cxx | 9 -
sc/source/ui/unoobj/viewuno.cxx | 5
sfx2/source/statbar/stbitem.cxx | 3
sfx2/source/view/ipclient.cxx | 9 -
sfx2/source/view/sfxbasecontroller.cxx | 5
svtools/source/control/accessibleruler.cxx | 13 -
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 3
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 4
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 3
svx/source/svdraw/svdoole2.cxx | 7
sw/source/uibase/uiview/viewling.cxx | 3
toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 -
toolkit/source/awt/vclxdevice.cxx | 17 +-
toolkit/source/awt/vclxgraphics.cxx | 3
toolkit/source/awt/vclxmenu.cxx | 3
toolkit/source/awt/vclxregion.cxx | 15 +-
toolkit/source/awt/vclxtoolkit.cxx | 3
toolkit/source/awt/vclxwindow.cxx | 21 +-
toolkit/source/awt/vclxwindows.cxx | 71
+++++-----
toolkit/source/controls/tree/treecontrolpeer.cxx | 8 -
toolkit/source/hatchwindow/hatchwindow.cxx | 8 -
toolkit/source/helper/vclunohelper.cxx | 2
vcl/source/app/unohelp.cxx | 31 ++++
72 files changed, 354 insertions(+), 322 deletions(-)
New commits:
commit 3d780e72b93773a25f796feb488b0fd878c490b5
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Dec 4 18:10:11 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Dec 4 20:47:14 2024 +0100
Move helpers for css::awt/VCL point/rect/size to vcl::unohelper
Move helpers to convert between the Rectangle, Point and Size
classes in vcl and in css::awt from VCLUnoHelper (in the toolkit module)
to vcl::unohelper (in the vcl module), for reuse in vcl in upcoming
commits.
Change-Id: I7b11c8a6b8c843a01ce25b1e4c0fb1869ad1e6ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177816
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx
b/accessibility/source/extended/AccessibleBrowseBox.cxx
index b78c6cb65048..c3b48b6b8d86 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -22,8 +22,9 @@
#include <extended/AccessibleBrowseBoxHeaderBar.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <utility>
-#include <vcl/accessibletableprovider.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/accessibletableprovider.hxx>
+#include <vcl/unohelp.hxx>
#include <sal/types.h>
@@ -135,12 +136,12 @@ AccessibleBrowseBox::getAccessibleAtPoint( const
awt::Point& rPoint )
ensureIsAlive();
sal_Int32 nIndex = 0;
- if (mpBrowseBox->ConvertPointToControlIndex(nIndex,
VCLUnoHelper::ConvertToVCLPoint(rPoint)))
+ if (mpBrowseBox->ConvertPointToControlIndex(nIndex,
vcl::unohelper::ConvertToVCLPoint(rPoint)))
return mpBrowseBox->CreateAccessibleControl(nIndex);
// try whether point is in one of the fixed children
// (table, header bars, corner control)
- Point aPoint(VCLUnoHelper::ConvertToVCLPoint(rPoint));
+ Point aPoint(vcl::unohelper::ConvertToVCLPoint(rPoint));
for (nIndex = 0; nIndex < vcl::BBINDEX_FIRSTCONTROL; ++nIndex)
{
css::uno::Reference< css::accessibility::XAccessible >
xCurrChild(implGetFixedChild(nIndex));
@@ -148,7 +149,7 @@ AccessibleBrowseBox::getAccessibleAtPoint( const
awt::Point& rPoint )
xCurrChildComp( xCurrChild, uno::UNO_QUERY );
if (xCurrChildComp.is()
- &&
VCLUnoHelper::ConvertToVCLRect(xCurrChildComp->getBounds()).Contains(aPoint))
+ &&
vcl::unohelper::ConvertToVCLRect(xCurrChildComp->getBounds()).Contains(aPoint))
return xCurrChild;
}
return nullptr;
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 541b5ead7057..6108fa0a1801 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -26,8 +26,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include
<com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
-#include <toolkit/helper/vclunohelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
#include <sal/log.hxx>
@@ -211,27 +211,27 @@ lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale()
sal_Bool SAL_CALL AccessibleBrowseBoxBase::containsPoint( const
css::awt::Point& rPoint )
{
return tools::Rectangle(Point(), getBoundingBox().GetSize())
- .Contains(VCLUnoHelper::ConvertToVCLPoint(rPoint));
+ .Contains(vcl::unohelper::ConvertToVCLPoint(rPoint));
}
awt::Rectangle SAL_CALL AccessibleBrowseBoxBase::getBounds()
{
- return VCLUnoHelper::ConvertToAWTRect(getBoundingBox());
+ return vcl::unohelper::ConvertToAWTRect(getBoundingBox());
}
awt::Point SAL_CALL AccessibleBrowseBoxBase::getLocation()
{
- return VCLUnoHelper::ConvertToAWTPoint(getBoundingBox().TopLeft());
+ return vcl::unohelper::ConvertToAWTPoint(getBoundingBox().TopLeft());
}
awt::Point SAL_CALL AccessibleBrowseBoxBase::getLocationOnScreen()
{
- return VCLUnoHelper::ConvertToAWTPoint(getBoundingBoxOnScreen().TopLeft());
+ return
vcl::unohelper::ConvertToAWTPoint(getBoundingBoxOnScreen().TopLeft());
}
awt::Size SAL_CALL AccessibleBrowseBoxBase::getSize()
{
- return VCLUnoHelper::ConvertToAWTSize(getBoundingBox().GetSize());
+ return vcl::unohelper::ConvertToAWTSize(getBoundingBox().GetSize());
}
void SAL_CALL AccessibleBrowseBoxBase::focusGained( const
css::awt::FocusEvent& )
@@ -351,7 +351,7 @@ bool AccessibleBrowseBoxBase::implIsShowing()
xParentComp( mxParent->getAccessibleContext(), uno::UNO_QUERY );
if( xParentComp.is() )
bShowing = implGetBoundingBox().Overlaps(
- VCLUnoHelper::ConvertToVCLRect(xParentComp->getBounds()));
+ vcl::unohelper::ConvertToVCLRect(xParentComp->getBounds()));
}
return bShowing;
}
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 26704ccb3387..3918c4551308 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -18,8 +18,8 @@
*/
#include <extended/AccessibleBrowseBoxHeaderBar.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibletableprovider.hxx>
+#include <vcl/unohelp.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
using ::com::sun::star::uno::Reference;
@@ -78,9 +78,9 @@ AccessibleBrowseBoxHeaderBar::getAccessibleAtPoint( const
awt::Point& rPoint )
sal_uInt16 nColumnPos = 0;
bool bConverted
= isRowBar()
- ? mpBrowseBox->ConvertPointToRowHeader(nRow,
VCLUnoHelper::ConvertToVCLPoint(rPoint))
+ ? mpBrowseBox->ConvertPointToRowHeader(nRow,
vcl::unohelper::ConvertToVCLPoint(rPoint))
: mpBrowseBox->ConvertPointToColumnHeader(nColumnPos,
-
VCLUnoHelper::ConvertToVCLPoint(rPoint));
+
vcl::unohelper::ConvertToVCLPoint(rPoint));
return bConverted ? implGetChild( nRow, nColumnPos ) : Reference<
XAccessible >();
}
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index 83ab211b18f2..99764f4c1f8a 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -18,8 +18,8 @@
*/
#include <extended/AccessibleBrowseBoxTable.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibletableprovider.hxx>
+#include <vcl/unohelp.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
@@ -78,7 +78,7 @@ AccessibleBrowseBoxTable::getAccessibleAtPoint( const
awt::Point& rPoint )
sal_Int32 nRow = 0;
sal_uInt16 nColumnPos = 0;
if (mpBrowseBox->ConvertPointToCellAddress(nRow, nColumnPos,
-
VCLUnoHelper::ConvertToVCLPoint(rPoint)))
+
vcl::unohelper::ConvertToVCLPoint(rPoint)))
xChild = mpBrowseBox->CreateAccessibleCell( nRow, nColumnPos );
return xChild;
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index bd092a0114b4..dbfce6d4d3a9 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -20,8 +20,8 @@
#include <extended/AccessibleBrowseBoxTableCell.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibletableprovider.hxx>
+#include <vcl/unohelp.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
@@ -118,7 +118,7 @@ namespace accessibility
if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
throw IndexOutOfBoundsException();
- aRect = VCLUnoHelper::ConvertToAWTRect(
+ aRect = vcl::unohelper::ConvertToAWTRect(
mpBrowseBox->GetFieldCharacterBounds(getRowPos(),
getColumnPos(), nIndex));
}
@@ -133,7 +133,7 @@ namespace accessibility
ensureIsAlive();
return mpBrowseBox->GetFieldIndexAtPoint(getRowPos(), getColumnPos(),
-
VCLUnoHelper::ConvertToVCLPoint(_aPoint));
+
vcl::unohelper::ConvertToVCLPoint(_aPoint));
}
/** @return
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index 6dcd09748d79..0f9e352e7c46 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -23,10 +23,10 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <toolkit/helper/vclunohelper.hxx>
#include <utility>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
namespace accessibility
{
@@ -147,13 +147,13 @@ AccessibleGridControl::getAccessibleAtPoint( const
awt::Point& rPoint )
ensureIsAlive();
sal_Int32 nIndex = 0;
- if (m_aTable.ConvertPointToControlIndex(nIndex,
VCLUnoHelper::ConvertToVCLPoint(rPoint)))
+ if (m_aTable.ConvertPointToControlIndex(nIndex,
vcl::unohelper::ConvertToVCLPoint(rPoint)))
return m_aTable.CreateAccessibleControl(nIndex);
else
{
// try whether point is in one of the fixed children
// (table, header bars, corner control)
- Point aPoint(VCLUnoHelper::ConvertToVCLPoint(rPoint));
+ Point aPoint(vcl::unohelper::ConvertToVCLPoint(rPoint));
for (nIndex = 0; nIndex < 3; ++nIndex)
{
css::uno::Reference< css::accessibility::XAccessible > xCurrChild(
implGetFixedChild( nIndex ) );
@@ -161,7 +161,7 @@ AccessibleGridControl::getAccessibleAtPoint( const
awt::Point& rPoint )
xCurrChildComp( xCurrChild, uno::UNO_QUERY );
if (xCurrChildComp.is()
- &&
VCLUnoHelper::ConvertToVCLRect(xCurrChildComp->getBounds()).Contains(aPoint))
+ &&
vcl::unohelper::ConvertToVCLRect(xCurrChildComp->getBounds()).Contains(aPoint))
return xCurrChild;
}
}
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx
b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 950e927fca86..aff3dc66a247 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -18,10 +18,10 @@
*/
#include <extended/AccessibleGridControlBase.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <utility>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/window.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <sal/types.h>
@@ -184,27 +184,27 @@ lang::Locale SAL_CALL
AccessibleGridControlBase::getLocale()
sal_Bool SAL_CALL AccessibleGridControlBase::containsPoint( const awt::Point&
rPoint )
{
return tools::Rectangle(Point(), getBoundingBox().GetSize())
- .Contains(VCLUnoHelper::ConvertToVCLPoint(rPoint));
+ .Contains(vcl::unohelper::ConvertToVCLPoint(rPoint));
}
awt::Rectangle SAL_CALL AccessibleGridControlBase::getBounds()
{
- return VCLUnoHelper::ConvertToAWTRect(getBoundingBox());
+ return vcl::unohelper::ConvertToAWTRect(getBoundingBox());
}
awt::Point SAL_CALL AccessibleGridControlBase::getLocation()
{
- return VCLUnoHelper::ConvertToAWTPoint(getBoundingBox().TopLeft());
+ return vcl::unohelper::ConvertToAWTPoint(getBoundingBox().TopLeft());
}
awt::Point SAL_CALL AccessibleGridControlBase::getLocationOnScreen()
{
- return VCLUnoHelper::ConvertToAWTPoint(getBoundingBoxOnScreen().TopLeft());
+ return
vcl::unohelper::ConvertToAWTPoint(getBoundingBoxOnScreen().TopLeft());
}
awt::Size SAL_CALL AccessibleGridControlBase::getSize()
{
- return VCLUnoHelper::ConvertToAWTSize(getBoundingBox().GetSize());
+ return vcl::unohelper::ConvertToAWTSize(getBoundingBox().GetSize());
}
// css::accessibility::XAccessibleEventBroadcaster
@@ -274,7 +274,7 @@ bool AccessibleGridControlBase::implIsShowing()
xParentComp( m_xParent->getAccessibleContext(), uno::UNO_QUERY );
if( xParentComp.is() )
bShowing = implGetBoundingBox().Overlaps(
- VCLUnoHelper::ConvertToVCLRect(xParentComp->getBounds()));
+ vcl::unohelper::ConvertToVCLRect(xParentComp->getBounds()));
}
return bShowing;
}
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx
b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index b028f6837141..a50b2c434594 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -23,6 +23,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -97,7 +98,7 @@ AccessibleGridControlHeader::getAccessibleAtPoint( const
awt::Point& rPoint )
sal_Int32 nRow = 0;
sal_Int32 nColumnPos = 0;
bool bConverted = m_aTable.ConvertPointToCellAddress(nRow, nColumnPos,
-
VCLUnoHelper::ConvertToVCLPoint(rPoint));
+
vcl::unohelper::ConvertToVCLPoint(rPoint));
return bConverted ? implGetChild( nRow, nColumnPos ) : Reference<
XAccessible >();
}
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx
b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 41308d8d4acf..930d5c9395ce 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -23,9 +23,9 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <extended/AccessibleGridControlTable.hxx>
#include <extended/AccessibleGridControlTableCell.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <tools/debug.hxx>
using ::com::sun::star::uno::Reference;
@@ -96,7 +96,7 @@ AccessibleGridControlTable::getAccessibleAtPoint( const
awt::Point& rPoint )
sal_Int32 nRow = 0;
sal_Int32 nColumnPos = 0;
if (m_aTable.ConvertPointToCellAddress(nRow, nColumnPos,
-
VCLUnoHelper::ConvertToVCLPoint(rPoint)))
+
vcl::unohelper::ConvertToVCLPoint(rPoint)))
xChild = new AccessibleGridControlTableCell(this, m_aTable, nRow,
nColumnPos);
return xChild;
}
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index a24e62d068e3..a1a1af5fe641 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -20,7 +20,7 @@
#include <extended/AccessibleGridControlTableCell.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/unohelp.hxx>
#include <tools/gen.hxx>
#include <tools/debug.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -138,7 +138,7 @@ namespace accessibility
if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
throw IndexOutOfBoundsException();
- return VCLUnoHelper::ConvertToAWTRect(
+ return vcl::unohelper::ConvertToAWTRect(
m_aTable.GetFieldCharacterBounds(getRowPos(), getColumnPos(),
nIndex));
}
@@ -149,7 +149,7 @@ namespace accessibility
ensureIsAlive();
return m_aTable.GetFieldIndexAtPoint(getRowPos(), getColumnPos(),
-
VCLUnoHelper::ConvertToVCLPoint(_aPoint));
+
vcl::unohelper::ConvertToVCLPoint(_aPoint));
}
/** @return
diff --git a/accessibility/source/extended/AccessibleIconView.cxx
b/accessibility/source/extended/AccessibleIconView.cxx
index a1321c7dded6..25b5f39cdafe 100644
--- a/accessibility/source/extended/AccessibleIconView.cxx
+++ b/accessibility/source/extended/AccessibleIconView.cxx
@@ -11,8 +11,8 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/event.hxx>
+#include <vcl/unohelp.hxx>
#include <extended/AccessibleIconView.hxx>
@@ -36,7 +36,7 @@ void AccessibleIconView::ProcessWindowEvent(const
VclWindowEvent& rVclWindowEven
if (MouseEvent* pMouseEvt =
static_cast<MouseEvent*>(rVclWindowEvent.GetData()))
{
if (auto xChild = getAccessibleAtPoint(
-
VCLUnoHelper::ConvertToAWTPoint(pMouseEvt->GetPosPixel())))
+
vcl::unohelper::ConvertToAWTPoint(pMouseEvt->GetPosPixel())))
{
// Allow announcing the element on mouse hover
css::uno::Any aNew(xChild);
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 696f7cbea2c0..991a417e080c 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/unohelp.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <svtools/stringtransfer.hxx>
@@ -129,7 +129,7 @@ namespace accessibility
Reference< XAccessibleComponent > xParentComp( xParentContext,
uno::UNO_QUERY );
if( xParentComp.is() )
bShowing = GetBoundingBox_Impl().Overlaps(
- VCLUnoHelper::ConvertToVCLRect(xParentComp->getBounds()));
+
vcl::unohelper::ConvertToVCLRect(xParentComp->getBounds()));
}
return bShowing;
@@ -152,7 +152,7 @@ namespace accessibility
css::awt::Rectangle AccessibleIconChoiceCtrlEntry::implGetBounds()
{
- return VCLUnoHelper::ConvertToAWTRect(GetBoundingBox_Impl());
+ return vcl::unohelper::ConvertToAWTRect(GetBoundingBox_Impl());
}
OUString AccessibleIconChoiceCtrlEntry::implGetText()
@@ -324,7 +324,7 @@ namespace accessibility
awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocationOnScreen( )
{
- return VCLUnoHelper::ConvertToAWTPoint(
GetBoundingBoxOnScreen().TopLeft() );
+ return vcl::unohelper::ConvertToAWTPoint(
GetBoundingBoxOnScreen().TopLeft() );
}
void SAL_CALL AccessibleIconChoiceCtrlEntry::grabFocus( )
@@ -383,7 +383,7 @@ namespace accessibility
tools::Rectangle aItemRect = GetBoundingBox_Impl();
tools::Rectangle aCharRect = m_pIconCtrl->GetEntryCharacterBounds(
m_nIndex, _nIndex );
aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
- aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
+ aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@@ -400,7 +400,7 @@ namespace accessibility
vcl::ControlLayoutData aLayoutData;
tools::Rectangle aItemRect = GetBoundingBox_Impl();
m_pIconCtrl->RecordLayoutData( &aLayoutData, aItemRect );
- Point aPnt(VCLUnoHelper::ConvertToVCLPoint(aPoint));
+ Point aPnt(vcl::unohelper::ConvertToVCLPoint(aPoint));
aPnt += aItemRect.TopLeft();
nIndex = aLayoutData.GetIndexForPoint( aPnt );
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index 3a2c616cabe4..f88825818257 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -31,7 +31,7 @@
#include <i18nlangtag/languagetag.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/unohelp.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
@@ -177,7 +177,7 @@ namespace accessibility
Reference< XAccessibleComponent > xParentComp( xParentContext,
uno::UNO_QUERY );
if( xParentComp.is() )
bShowing = GetBoundingBox_Impl().Overlaps(
- VCLUnoHelper::ConvertToVCLRect(xParentComp->getBounds()));
+
vcl::unohelper::ConvertToVCLRect(xParentComp->getBounds()));
}
return bShowing;
@@ -522,7 +522,7 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point&
rPoint )
{
return tools::Rectangle(Point(), GetBoundingBox().GetSize())
- .Contains(VCLUnoHelper::ConvertToVCLPoint(rPoint));
+ .Contains(vcl::unohelper::ConvertToVCLPoint(rPoint));
}
Reference< XAccessible > SAL_CALL
AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint )
@@ -532,7 +532,7 @@ namespace accessibility
EnsureIsAlive();
SvTreeListEntry* pEntry
- =
m_pTreeListBox->GetEntry(VCLUnoHelper::ConvertToVCLPoint(_aPoint));
+ =
m_pTreeListBox->GetEntry(vcl::unohelper::ConvertToVCLPoint(_aPoint));
if ( !pEntry )
throw
RuntimeException(u"AccessibleListBoxEntry::getAccessibleAtPoint - pEntry cannot
be empty!"_ustr);
@@ -541,29 +541,29 @@ namespace accessibility
assert(xListBox.is());
auto pAccEntry = xListBox->implGetAccessible(*pEntry);
tools::Rectangle aRect = pAccEntry->GetBoundingBox_Impl();
- if (aRect.Contains(VCLUnoHelper::ConvertToVCLPoint(_aPoint)))
+ if (aRect.Contains(vcl::unohelper::ConvertToVCLPoint(_aPoint)))
xAcc = pAccEntry.get();
return xAcc;
}
awt::Rectangle SAL_CALL AccessibleListBoxEntry::getBounds( )
{
- return VCLUnoHelper::ConvertToAWTRect(GetBoundingBox());
+ return vcl::unohelper::ConvertToAWTRect(GetBoundingBox());
}
awt::Point SAL_CALL AccessibleListBoxEntry::getLocation( )
{
- return VCLUnoHelper::ConvertToAWTPoint(GetBoundingBox().TopLeft());
+ return vcl::unohelper::ConvertToAWTPoint(GetBoundingBox().TopLeft());
}
awt::Point SAL_CALL AccessibleListBoxEntry::getLocationOnScreen( )
{
- return
VCLUnoHelper::ConvertToAWTPoint(GetBoundingBoxOnScreen().TopLeft());
+ return
vcl::unohelper::ConvertToAWTPoint(GetBoundingBoxOnScreen().TopLeft());
}
awt::Size SAL_CALL AccessibleListBoxEntry::getSize( )
{
- return VCLUnoHelper::ConvertToAWTSize(GetBoundingBox().GetSize());
+ return vcl::unohelper::ConvertToAWTSize(GetBoundingBox().GetSize());
}
void SAL_CALL AccessibleListBoxEntry::grabFocus( )
@@ -627,7 +627,7 @@ namespace accessibility
m_pTreeListBox->RecordLayoutData( &aLayoutData, aItemRect );
tools::Rectangle aCharRect = aLayoutData.GetCharacterBounds(
nIndex );
aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
- aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
+ aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@@ -647,7 +647,7 @@ namespace accessibility
vcl::ControlLayoutData aLayoutData;
tools::Rectangle aItemRect = GetBoundingBox();
m_pTreeListBox->RecordLayoutData( &aLayoutData, aItemRect );
- Point aPnt(VCLUnoHelper::ConvertToVCLPoint(aPoint));
+ Point aPnt(vcl::unohelper::ConvertToVCLPoint(aPoint));
aPnt += aItemRect.TopLeft();
nIndex = aLayoutData.GetIndexForPoint( aPnt );
}
diff --git a/accessibility/source/extended/accessibletabbar.cxx
b/accessibility/source/extended/accessibletabbar.cxx
index 58f8ab58539f..ede35977d93a 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -33,8 +33,7 @@
#include <o3tl/safeint.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <toolkit/awt/vclxfont.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/unohelp.hxx>
namespace accessibility
{
@@ -145,7 +144,7 @@ namespace accessibility
{
awt::Rectangle aBounds;
if ( m_pTabBar )
- aBounds = VCLUnoHelper::ConvertToAWTRect(
+ aBounds = vcl::unohelper::ConvertToAWTRect(
tools::Rectangle(m_pTabBar->GetPosPixel(),
m_pTabBar->GetSizePixel()));
return aBounds;
@@ -362,8 +361,8 @@ namespace accessibility
Reference< XAccessibleComponent > xComp(
xAcc->getAccessibleContext(), UNO_QUERY );
if ( xComp.is() )
{
- tools::Rectangle aRect =
VCLUnoHelper::ConvertToVCLRect(xComp->getBounds());
- Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
+ tools::Rectangle aRect =
vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
+ Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
return xAcc;
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx
b/accessibility/source/extended/accessibletabbarpage.cxx
index 4f9249ce9099..f2de152f871f 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -28,7 +28,7 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
@@ -164,7 +164,7 @@ namespace accessibility
if ( m_pTabBar )
{
// get bounding rectangle relative to the AccessibleTabBar
- aBounds =
VCLUnoHelper::ConvertToAWTRect(m_pTabBar->GetPageRect(m_nPageId));
+ aBounds =
vcl::unohelper::ConvertToAWTRect(m_pTabBar->GetPageRect(m_nPageId));
// get position of the AccessibleTabBarPageList relative to the
AccessibleTabBar
Reference< XAccessible > xParent = getAccessibleParent();
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx
b/accessibility/source/extended/accessibletabbarpagelist.cxx
index a1e1f0a6f893..4bde87630738 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -29,7 +29,7 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
@@ -306,7 +306,7 @@ namespace accessibility
{
awt::Rectangle aBounds;
if ( m_pTabBar )
- aBounds = VCLUnoHelper::ConvertToAWTRect(m_pTabBar->GetPageArea());
+ aBounds =
vcl::unohelper::ConvertToAWTRect(m_pTabBar->GetPageArea());
return aBounds;
}
@@ -491,8 +491,8 @@ namespace accessibility
Reference< XAccessibleComponent > xComp(
xAcc->getAccessibleContext(), UNO_QUERY );
if ( xComp.is() )
{
- tools::Rectangle aRect =
VCLUnoHelper::ConvertToVCLRect(xComp->getBounds());
- Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
+ tools::Rectangle aRect =
vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
+ Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
xChild = xAcc;
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx
b/accessibility/source/extended/textwindowaccessibility.cxx
index 8068d118ed9f..04939fee3b3a 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -37,9 +37,9 @@
#include <utility>
#include <vcl/svapp.hxx>
#include <vcl/txtattr.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/window.hxx>
#include <comphelper/diagnose_ex.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/sequence.hxx>
#include <algorithm>
@@ -876,7 +876,7 @@ Document::retrieveCharacterBounds(Paragraph const *
pParagraph,
if ( nIndex == nLength )
{
aBounds
- =
VCLUnoHelper::ConvertToAWTRect(m_rEngine.PaMtoEditCursor(::TextPaM(nNumber,
nIndex)));
+ =
vcl::unohelper::ConvertToAWTRect(m_rEngine.PaMtoEditCursor(::TextPaM(nNumber,
nIndex)));
}
else
{
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx
b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 5c9e1e47b637..dbedd1daff30 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -21,7 +21,6 @@
#include <standard/vclxaccessiblemenu.hxx>
#include <standard/vclxaccessiblemenuitem.hxx>
#include <standard/vclxaccessiblemenuseparator.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -30,6 +29,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <o3tl/safeint.hxx>
#include <vcl/menu.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/vclevent.hxx>
#include <array>
@@ -342,8 +342,8 @@ Reference< XAccessible >
OAccessibleMenuBaseComponent::GetChildAt( const awt::Po
Reference< XAccessibleComponent > xComp(
xAcc->getAccessibleContext(), UNO_QUERY );
if ( xComp.is() )
{
- tools::Rectangle aRect =
VCLUnoHelper::ConvertToVCLRect(xComp->getBounds());
- Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
+ tools::Rectangle aRect =
vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
+ Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
return xAcc;
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx
b/accessibility/source/standard/accessiblemenucomponent.cxx
index 4fbbd394e92f..7fe594721294 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -19,9 +19,6 @@
#include <standard/accessiblemenucomponent.hxx>
-#include <toolkit/awt/vclxfont.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/awt/XDevice.hpp>
@@ -33,6 +30,7 @@
#include <vcl/window.hxx>
#include <vcl/menu.hxx>
#include <vcl/settings.hxx>
+#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
using namespace ::com::sun::star::accessibility;
@@ -98,7 +96,7 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds()
{
// get bounding rectangle of the window in screen coordinates
AbsoluteScreenPixelRectangle aRect =
pWindow->GetWindowExtentsAbsolute();
- aBounds = VCLUnoHelper::ConvertToAWTRect(aRect);
+ aBounds = vcl::unohelper::ConvertToAWTRect(aRect);
// get position of the accessible parent in screen coordinates
Reference< XAccessible > xParent = getAccessibleParent();
@@ -235,7 +233,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen( )
if ( pWindow )
{
AbsoluteScreenPixelRectangle aRect =
pWindow->GetWindowExtentsAbsolute();
- aPos = VCLUnoHelper::ConvertToAWTPoint(aRect.TopLeft());
+ aPos = vcl::unohelper::ConvertToAWTPoint(aRect.TopLeft());
}
}
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 0fa008b11aff..0d171e64ccaa 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -26,8 +26,8 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <comphelper/accessiblecontexthelper.hxx>
#include <comphelper/accessibletexthelper.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/window.hxx>
#include <vcl/menu.hxx>
#include <vcl/mnemonic.hxx>
@@ -239,14 +239,14 @@ awt::Rectangle
OAccessibleMenuItemComponent::implGetBounds()
if ( m_pParent )
{
// get bounding rectangle of the item relative to the containing window
- aBounds =
VCLUnoHelper::ConvertToAWTRect(m_pParent->GetBoundingRectangle(m_nItemPos));
+ aBounds =
vcl::unohelper::ConvertToAWTRect(m_pParent->GetBoundingRectangle(m_nItemPos));
// get position of containing window in screen coordinates
vcl::Window* pWindow = m_pParent->GetWindow();
if ( pWindow )
{
AbsoluteScreenPixelRectangle aRect =
pWindow->GetWindowExtentsAbsolute();
- awt::Point aWindowScreenLoc =
VCLUnoHelper::ConvertToAWTPoint(aRect.TopLeft());
+ awt::Point aWindowScreenLoc =
vcl::unohelper::ConvertToAWTPoint(aRect.TopLeft());
// get position of accessible parent in screen coordinates
Reference< XAccessible > xParent = getAccessibleParent();
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx
b/accessibility/source/standard/vclxaccessibleedit.cxx
index 73298a4ff255..5cb259dddc08 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -20,7 +20,6 @@
#include <standard/vclxaccessibleedit.hxx>
#include <toolkit/awt/vclxwindows.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -38,6 +37,7 @@
#include <vcl/toolkit/vclmedit.hxx>
#include <vcl/textdata.hxx>
#include <vcl/txtattr.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/xtextedt.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
@@ -390,7 +390,7 @@ awt::Rectangle VCLXAccessibleEdit::getCharacterBounds(
sal_Int32 nIndex )
}
else
{
- aBounds =
VCLUnoHelper::ConvertToAWTRect(pControl->GetCharacterBounds(nIndex));
+ aBounds =
vcl::unohelper::ConvertToAWTRect(pControl->GetCharacterBounds(nIndex));
}
}
diff --git a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
index 7e9f03f061d9..7bbc2684524d 100644
--- a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
@@ -29,7 +29,7 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
using namespace ::com::sun::star;
@@ -76,7 +76,7 @@ awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds()
if ( m_pHeadBar )
aBounds
- =
VCLUnoHelper::ConvertToAWTRect(m_pHeadBar->GetItemRect(sal_uInt16(m_nIndexInParent)));
+ =
vcl::unohelper::ConvertToAWTRect(m_pHeadBar->GetItemRect(sal_uInt16(m_nIndexInParent)));
return aBounds;
}
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx
b/accessibility/source/standard/vclxaccessiblelist.cxx
index 335ffffe6624..d84a631687fc 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -30,10 +30,10 @@
#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <o3tl/safeint.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolkit/combobox.hxx>
#include <vcl/toolkit/lstbox.hxx>
+#include <vcl/unohelp.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -877,7 +877,7 @@ awt::Rectangle VCLXAccessibleList::implGetBounds()
&& (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN )
{
if ( m_pListBoxHelper->IsInDropDown() )
- aBounds =
VCLUnoHelper::ConvertToAWTRect(m_pListBoxHelper->GetDropDownPosSizePixel());
+ aBounds =
vcl::unohelper::ConvertToAWTRect(m_pListBoxHelper->GetDropDownPosSizePixel());
}
else
{
@@ -910,7 +910,7 @@ awt::Point VCLXAccessibleList::getLocationOnScreen( )
&& (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN )
{
if ( m_pListBoxHelper->IsInDropDown() )
- aPos = VCLUnoHelper::ConvertToAWTPoint(
+ aPos = vcl::unohelper::ConvertToAWTPoint(
m_pListBoxHelper->GetDropDownPosSizePixel().TopLeft());
}
else
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 7625d05cdf24..0a9d2bee1806 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -18,7 +18,6 @@
*/
#include <standard/vclxaccessiblelistitem.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <helper/IComboListBoxHelper.hxx>
#include <com/sun/star/awt/Rectangle.hpp>
@@ -32,6 +31,7 @@
#include <utility>
#include <vcl/svapp.hxx>
#include <vcl/toolkit/lstbox.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/settings.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
@@ -289,7 +289,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint(
const awt::Point& _aPoi
{
tools::Rectangle
aRect(pListBoxHelper->GetBoundingRectangle(static_cast<sal_uInt16>(m_nIndexInParent)));
aRect.Move(-aRect.Left(), -aRect.Top());
- bInside = aRect.Contains(VCLUnoHelper::ConvertToVCLPoint(_aPoint));
+ bInside = aRect.Contains(vcl::unohelper::ConvertToVCLPoint(_aPoint));
}
return bInside;
}
@@ -307,7 +307,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds(
)
awt::Rectangle aRect;
::accessibility::IComboListBoxHelper* pListBoxHelper = m_xParent.is() ?
m_xParent->getListBoxHelper() : nullptr;
if (pListBoxHelper)
- aRect = VCLUnoHelper::ConvertToAWTRect(
+ aRect = vcl::unohelper::ConvertToAWTRect(
pListBoxHelper->GetBoundingRectangle(static_cast<sal_uInt16>(m_nIndexInParent)));
return aRect;
@@ -325,7 +325,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( )
tools::Rectangle aRect = pListBoxHelper->GetBoundingRectangle(
static_cast<sal_uInt16>(m_nIndexInParent) );
aPoint = aRect.TopLeft();
}
- return VCLUnoHelper::ConvertToAWTPoint(aPoint);
+ return vcl::unohelper::ConvertToAWTPoint(aPoint);
}
awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( )
@@ -341,7 +341,7 @@ awt::Point SAL_CALL
VCLXAccessibleListItem::getLocationOnScreen( )
aPoint = aRect.TopLeft();
aPoint += Point(pListBoxHelper->GetWindowExtentsAbsolute().TopLeft());
}
- return VCLUnoHelper::ConvertToAWTPoint(aPoint);
+ return vcl::unohelper::ConvertToAWTPoint(aPoint);
}
awt::Size SAL_CALL VCLXAccessibleListItem::getSize( )
@@ -354,7 +354,7 @@ awt::Size SAL_CALL VCLXAccessibleListItem::getSize( )
if (pListBoxHelper)
aSize = pListBoxHelper->GetBoundingRectangle(
static_cast<sal_uInt16>(m_nIndexInParent) ).GetSize();
- return VCLUnoHelper::ConvertToAWTSize(aSize);
+ return vcl::unohelper::ConvertToAWTSize(aSize);
}
void SAL_CALL VCLXAccessibleListItem::grabFocus( )
@@ -414,7 +414,7 @@ awt::Rectangle SAL_CALL
VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nI
tools::Rectangle aCharRect = pListBoxHelper->GetEntryCharacterBounds(
m_nIndexInParent, nIndex );
tools::Rectangle aItemRect = pListBoxHelper->GetBoundingRectangle(
static_cast<sal_uInt16>(m_nIndexInParent) );
aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
- aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
+ aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@@ -438,7 +438,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint(
const awt::Point& aP
{
sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
tools::Rectangle aItemRect = pListBoxHelper->GetBoundingRectangle(
static_cast<sal_uInt16>(m_nIndexInParent) );
- Point aPnt(VCLUnoHelper::ConvertToVCLPoint(aPoint));
+ Point aPnt(vcl::unohelper::ConvertToVCLPoint(aPoint));
aPnt += aItemRect.TopLeft();
sal_Int32 nI = pListBoxHelper->GetIndexForPoint( aPnt, nPos );
if ( nI != -1 && m_nIndexInParent == nPos )
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index ef092d25b79a..a1491c99bc4c 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -29,13 +29,13 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <comphelper/sequence.hxx>
#include <i18nlangtag/languagetag.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/accessibility/strings.hxx>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/menu.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/settings.hxx>
@@ -239,7 +239,7 @@ awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds(
sal_Int32 nIndex )
tools::Rectangle aItemRect = m_pParent->GetBoundingRectangle(
m_nItemPos );
tools::Rectangle aCharRect = m_pParent->GetCharacterBounds( nItemId,
nIndex );
aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
- aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
+ aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@@ -263,7 +263,7 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const
awt::Point& aPoint )
{
sal_uInt16 nItemId = 0;
tools::Rectangle aItemRect = m_pParent->GetBoundingRectangle(
m_nItemPos );
- Point aPnt(VCLUnoHelper::ConvertToVCLPoint(aPoint));
+ Point aPnt(vcl::unohelper::ConvertToVCLPoint(aPoint));
aPnt += aItemRect.TopLeft();
sal_Int32 nI = m_pParent->GetIndexForPoint( aPnt, nItemId );
if ( nI != -1 && m_pParent->GetItemId( m_nItemPos ) == nItemId )
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 416c5781b156..877abf27e090 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -19,12 +19,12 @@
#include <standard/vclxaccessiblestatusbar.hxx>
#include <standard/vclxaccessiblestatusbaritem.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <comphelper/accessiblecontexthelper.hxx>
#include <o3tl/safeint.hxx>
#include <vcl/status.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/vclevent.hxx>
@@ -307,7 +307,7 @@ Reference< XAccessible >
VCLXAccessibleStatusBar::getAccessibleAtPoint( const aw
Reference< XAccessible > xChild;
if ( m_pStatusBar )
{
- sal_uInt16 nItemId =
m_pStatusBar->GetItemId(VCLUnoHelper::ConvertToVCLPoint(rPoint));
+ sal_uInt16 nItemId =
m_pStatusBar->GetItemId(vcl::unohelper::ConvertToVCLPoint(rPoint));
sal_Int32 nItemPos = m_pStatusBar->GetItemPos( nItemId );
if ( nItemPos >= 0 && o3tl::make_unsigned(nItemPos) <
m_aAccessibleChildren.size() )
xChild = getAccessibleChild( nItemPos );
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index f47cffd1b148..58eb5f42005c 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -18,7 +18,6 @@
*/
#include <standard/vclxaccessiblestatusbaritem.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -32,6 +31,7 @@
#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/status.hxx>
#include <vcl/settings.hxx>
@@ -148,7 +148,7 @@ awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds()
awt::Rectangle aBounds( 0, 0, 0, 0 );
if ( m_pStatusBar )
- aBounds =
VCLUnoHelper::ConvertToAWTRect(m_pStatusBar->GetItemRect(m_nItemId));
+ aBounds =
vcl::unohelper::ConvertToAWTRect(m_pStatusBar->GetItemRect(m_nItemId));
return aBounds;
}
@@ -482,7 +482,7 @@ awt::Rectangle
VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex
m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect );
tools::Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex );
aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
- aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
+ aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@@ -499,7 +499,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint(
const awt::Point& aPoint
vcl::ControlLayoutData aLayoutData;
tools::Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect );
- Point aPnt(VCLUnoHelper::ConvertToVCLPoint(aPoint));
+ Point aPnt(vcl::unohelper::ConvertToVCLPoint(aPoint));
aPnt += aItemRect.TopLeft();
nIndex = aLayoutData.GetIndexForPoint( aPnt );
}
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx
b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 90cd8807170c..f4a221ec687f 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -18,7 +18,6 @@
*/
#include <standard/vclxaccessibletabpage.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -32,6 +31,7 @@
#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
@@ -191,7 +191,7 @@ awt::Rectangle VCLXAccessibleTabPage::implGetBounds()
awt::Rectangle aBounds( 0, 0, 0, 0 );
if ( m_pTabControl )
- aBounds =
VCLUnoHelper::ConvertToAWTRect(m_pTabControl->GetTabBounds(m_nPageId));
+ aBounds =
vcl::unohelper::ConvertToAWTRect(m_pTabControl->GetTabBounds(m_nPageId));
return aBounds;
}
@@ -407,8 +407,8 @@ Reference< XAccessible >
VCLXAccessibleTabPage::getAccessibleAtPoint( const awt:
Reference< XAccessibleComponent > xComp(
xAcc->getAccessibleContext(), UNO_QUERY );
if ( xComp.is() )
{
- tools::Rectangle aRect =
VCLUnoHelper::ConvertToVCLRect(xComp->getBounds());
- Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
+ tools::Rectangle aRect =
vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
+ Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
return xAcc;
@@ -568,7 +568,7 @@ awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds(
sal_Int32 nIndex )
tools::Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
tools::Rectangle aCharRect; // m_pTabControl->GetCharacterBounds(
m_nPageId, nIndex );
aCharRect.Move( -aPageRect.Left(), -aPageRect.Top() );
- aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
+ aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@@ -584,7 +584,7 @@ sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const
awt::Point& /*aPoint*/ )
// {
// sal_uInt16 nPageId = 0;
// tools::Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId
);
-// Point aPnt( VCLUnoHelper::ConvertToVCLPoint( aPoint ) );
+// Point aPnt( vcl::unohelper::ConvertToVCLPoint( aPoint ) );
// aPnt += aPageRect.TopLeft();
// sal_Int32 nI = m_pTabControl->GetIndexForPoint( aPnt, nPageId );
// if ( nI != -1 && m_nPageId == nPageId )
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 32424e807cec..be41e86b1634 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -19,9 +19,9 @@
#include <standard/vclxaccessibletabpagewindow.hxx>
#include <comphelper/accessiblecontexthelper.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
+#include <vcl/unohelp.hxx>
#include <sal/log.hxx>
using namespace ::com::sun::star;
@@ -72,7 +72,7 @@ awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds()
{
tools::Rectangle aRect( m_pTabPage->GetPosPixel(),
m_pTabPage->GetSizePixel() );
aRect.Move( -aPageRect.Left(), -aPageRect.Top() );
- aBounds = VCLUnoHelper::ConvertToAWTRect(aRect);
+ aBounds = vcl::unohelper::ConvertToAWTRect(aRect);
}
}
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 0c38f6f522c7..ba2324b1bc94 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -18,7 +18,6 @@
*/
#include <standard/vclxaccessibletextcomponent.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
@@ -32,6 +31,7 @@
#include <vcl/unohelp2.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/settings.hxx>
+#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
using namespace ::com::sun::star;
@@ -250,7 +250,7 @@ awt::Rectangle
VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex
awt::Rectangle aRect;
VclPtr< Control > pControl = GetAs< Control >();
if ( pControl )
- aRect =
VCLUnoHelper::ConvertToAWTRect(pControl->GetCharacterBounds(nIndex));
+ aRect =
vcl::unohelper::ConvertToAWTRect(pControl->GetCharacterBounds(nIndex));
return aRect;
}
@@ -271,7 +271,7 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint(
const awt::Point& aPoint
sal_Int32 nIndex = -1;
VclPtr< Control > pControl = GetAs< Control >();
if ( pControl )
- nIndex =
pControl->GetIndexForPoint(VCLUnoHelper::ConvertToVCLPoint(aPoint));
+ nIndex =
pControl->GetIndexForPoint(vcl::unohelper::ConvertToVCLPoint(aPoint));
return nIndex;
}
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 9d4cb3aaf203..d2a1e8d23e27 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -20,13 +20,13 @@
#include <standard/vclxaccessibletoolbox.hxx>
#include <standard/vclxaccessibletoolboxitem.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <o3tl/safeint.hxx>
#include <vcl/toolbox.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/vclevent.hxx>
#include <comphelper/accessiblecontexthelper.hxx>
#include <comphelper/accessiblewrapper.hxx>
@@ -664,7 +664,7 @@ Reference< XAccessible > SAL_CALL
VCLXAccessibleToolBox::getAccessibleAtPoint( c
if ( pToolBox )
{
ToolBox::ImplToolItems::size_type nItemPos
- = pToolBox->GetItemPos(VCLUnoHelper::ConvertToVCLPoint(_rPoint));
+ = pToolBox->GetItemPos(vcl::unohelper::ConvertToVCLPoint(_rPoint));
if ( nItemPos != ToolBox::ITEM_NOTFOUND )
xAccessible = getAccessibleChild( nItemPos );
}
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index ac37733db0ea..754bbad58392 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -18,7 +18,6 @@
*/
#include <standard/vclxaccessibletoolboxitem.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <helper/accresmgr.hxx>
#include <strings.hrc>
#include <com/sun/star/awt/Rectangle.hpp>
@@ -34,6 +33,7 @@
#include <vcl/accessibility/strings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/help.hxx>
#include <vcl/settings.hxx>
@@ -208,7 +208,7 @@ awt::Rectangle VCLXAccessibleToolBoxItem::implGetBounds( )
{
awt::Rectangle aRect;
if ( m_pToolBox )
- aRect =
VCLUnoHelper::ConvertToAWTRect(m_pToolBox->GetItemPosRect(m_nIndexInParent));
+ aRect =
vcl::unohelper::ConvertToAWTRect(m_pToolBox->GetItemPosRect(m_nIndexInParent));
return aRect;
}
@@ -477,7 +477,7 @@ awt::Rectangle SAL_CALL
VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32
tools::Rectangle aCharRect = m_pToolBox->GetCharacterBounds(
m_nItemId, nIndex );
tools::Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId );
aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
- aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
+ aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@@ -492,7 +492,7 @@ sal_Int32 SAL_CALL
VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point&
{
ToolBoxItemId nItemId;
tools::Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId );
- Point aPnt(VCLUnoHelper::ConvertToVCLPoint(aPoint));
+ Point aPnt(vcl::unohelper::ConvertToVCLPoint(aPoint));
aPnt += aItemRect.TopLeft();
sal_Int32 nIdx = m_pToolBox->GetIndexForPoint( aPnt, nItemId );
if ( nIdx != -1 && nItemId == m_nItemId )
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 0d929b144f47..ce65b97f819d 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -35,6 +35,7 @@
#include <comphelper/diagnose_ex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
namespace basctl
@@ -146,7 +147,7 @@ awt::Rectangle AccessibleDialogControlShape::GetBounds()
const
// clip the shape's bounding box with the bounding box of its
parent
tools::Rectangle aParentRect( Point( 0, 0 ),
m_pDialogWindow->GetSizePixel() );
aRect = aRect.GetIntersection( aParentRect );
- aBounds = VCLUnoHelper::ConvertToAWTRect(aRect);
+ aBounds = vcl::unohelper::ConvertToAWTRect(aRect);
}
}
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx
b/basctl/source/accessibility/accessibledialogwindow.cxx
index 9e31a8783cc4..d648340beb69 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -35,10 +35,9 @@
#include <cppuhelper/supportsservice.hxx>
#include <tools/debug.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
-#include <toolkit/awt/vclxfont.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
namespace basctl
@@ -409,7 +408,7 @@ awt::Rectangle AccessibleDialogWindow::implGetBounds()
{
awt::Rectangle aBounds;
if ( m_pDialogWindow )
- aBounds = VCLUnoHelper::ConvertToAWTRect(
+ aBounds = vcl::unohelper::ConvertToAWTRect(
tools::Rectangle(m_pDialogWindow->GetPosPixel(),
m_pDialogWindow->GetSizePixel()));
return aBounds;
@@ -685,8 +684,8 @@ Reference< XAccessible >
AccessibleDialogWindow::getAccessibleAtPoint( const awt
Reference< XAccessibleComponent > xComp(
xAcc->getAccessibleContext(), UNO_QUERY );
if ( xComp.is() )
{
- tools::Rectangle aRect =
VCLUnoHelper::ConvertToVCLRect(xComp->getBounds());
- Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
+ tools::Rectangle aRect =
vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
+ Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
xChild = std::move(xAcc);
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index a4f6a70e651f..01d0b05ac201 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -43,6 +43,7 @@
#include <vcl/dockingarea.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <sal/log.hxx>
#include <tools/gen.hxx>
@@ -1497,7 +1498,7 @@ void ToolbarLayoutManager::implts_setElementData(
UIElement& rElement, const uno
xWindow->setPosSize( aPixelPos.X(), aPixelPos.Y(), 0, 0,
awt::PosSize::POS );
if( bSetSize )
- xWindow->setOutputSize(VCLUnoHelper::ConvertToAWTSize(aSize));
+ xWindow->setOutputSize(vcl::unohelper::ConvertToAWTSize(aSize));
if ( pWindow )
{
@@ -1725,8 +1726,8 @@ awt::Point
ToolbarLayoutManager::implts_findNextCascadeFloatingPos()
SolarMutexGuard aGuard;
VclPtr<vcl::Window> pContainerWindow = VCLUnoHelper::GetWindow(
xContainerWindow );
if ( pContainerWindow )
- aStartPos = VCLUnoHelper::ConvertToAWTPoint(
-
pContainerWindow->OutputToScreenPixel(VCLUnoHelper::ConvertToVCLPoint(aStartPos)));
+ aStartPos = vcl::unohelper::ConvertToAWTPoint(
+
pContainerWindow->OutputToScreenPixel(vcl::unohelper::ConvertToVCLPoint(aStartPos)));
}
// Determine size of top and left docking area
@@ -3394,14 +3395,14 @@ awt::DockingData SAL_CALL
ToolbarLayoutManager::docking( const awt::DockingEvent
if ( aFloatSize.Width > 0 && aFloatSize.Height > 0 )
{
aUIDockingElement.m_aFloatingData.m_aPos
- =
VCLUnoHelper::ConvertToAWTPoint(pContainerWindow->ScreenToOutputPixel(
- VCLUnoHelper::ConvertToVCLPoint(e.MousePos)));
+ =
vcl::unohelper::ConvertToAWTPoint(pContainerWindow->ScreenToOutputPixel(
+ vcl::unohelper::ConvertToVCLPoint(e.MousePos)));
aDockingData.TrackingRectangle.Height = aFloatSize.Height;
aDockingData.TrackingRectangle.Width = aFloatSize.Width;
}
else
{
- aFloatSize =
VCLUnoHelper::ConvertToAWTSize(pToolBox->CalcWindowSizePixel());
+ aFloatSize =
vcl::unohelper::ConvertToAWTSize(pToolBox->CalcWindowSizePixel());
if ( !bIsHorizontal )
{
// Floating toolbars are always horizontal aligned! We
have to swap
@@ -3417,8 +3418,8 @@ awt::DockingData SAL_CALL ToolbarLayoutManager::docking(
const awt::DockingEvent
// For the first time we don't have any data about the
floating size of a toolbar.
// We calculate it and store it for later use.
aUIDockingElement.m_aFloatingData.m_aPos
- =
VCLUnoHelper::ConvertToAWTPoint(pContainerWindow->ScreenToOutputPixel(
- VCLUnoHelper::ConvertToVCLPoint(e.MousePos)));
+ =
vcl::unohelper::ConvertToAWTPoint(pContainerWindow->ScreenToOutputPixel(
+ vcl::unohelper::ConvertToVCLPoint(e.MousePos)));
aUIDockingElement.m_aFloatingData.m_aSize = aFloatSize;
aUIDockingElement.m_aFloatingData.m_nLines =
pToolBox->GetFloatingLines();
aUIDockingElement.m_aFloatingData.m_bIsHorizontal =
isToolboxHorizontalAligned( pToolBox );
@@ -3574,8 +3575,8 @@ sal_Bool SAL_CALL
ToolbarLayoutManager::prepareToggleFloatingMode( const lang::E
{
ToolBox* pToolBox = static_cast< ToolBox *>( pWindow.get() );
aUIDockingElement.m_aFloatingData.m_aPos
- = VCLUnoHelper::ConvertToAWTPoint(pToolBox->GetPosPixel());
- aUIDockingElement.m_aFloatingData.m_aSize =
VCLUnoHelper::ConvertToAWTSize(pToolBox->GetOutputSizePixel());
+ = vcl::unohelper::ConvertToAWTPoint(pToolBox->GetPosPixel());
+ aUIDockingElement.m_aFloatingData.m_aSize =
vcl::unohelper::ConvertToAWTSize(pToolBox->GetOutputSizePixel());
aUIDockingElement.m_aFloatingData.m_nLines =
pToolBox->GetFloatingLines();
aUIDockingElement.m_aFloatingData.m_bIsHorizontal =
isToolboxHorizontalAligned( pToolBox );
}
@@ -3643,9 +3644,9 @@ void SAL_CALL ToolbarLayoutManager::toggleFloatingMode(
const lang::EventObject&
if ( !bSetSize )
{
if ( pToolBox )
- aUIDockingElement.m_aFloatingData.m_aSize =
VCLUnoHelper::ConvertToAWTSize(pToolBox->CalcFloatingWindowSizePixel());
+ aUIDockingElement.m_aFloatingData.m_aSize =
vcl::unohelper::ConvertToAWTSize(pToolBox->CalcFloatingWindowSizePixel());
else if ( pWindow )
- aUIDockingElement.m_aFloatingData.m_aSize =
VCLUnoHelper::ConvertToAWTSize(pWindow->GetOutputSizePixel());
+ aUIDockingElement.m_aFloatingData.m_aSize =
vcl::unohelper::ConvertToAWTSize(pWindow->GetOutputSizePixel());
}
xWindow->setPosSize(
aUIDockingElement.m_aFloatingData.m_aPos.X,
@@ -3682,7 +3683,7 @@ void SAL_CALL ToolbarLayoutManager::toggleFloatingMode(
const lang::EventObject&
::Size aSize = pToolBox->CalcWindowSizePixel( 1 );
awt::Rectangle aRect = xWindow->getPosSize();
xWindow->setPosSize( aRect.X, aRect.Y, 0, 0,
awt::PosSize::POS );
-
xWindow->setOutputSize(VCLUnoHelper::ConvertToAWTSize(aSize));
+
xWindow->setOutputSize(vcl::unohelper::ConvertToAWTSize(aSize));
}
}
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx
b/framework/source/uielement/popuptoolbarcontroller.cxx
index 9c3dabd0067b..4fbbf6839b07 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -34,6 +34,7 @@
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
+#include <vcl/unohelp.hxx>
#include <com/sun/star/awt/PopupMenuDirection.hpp>
#include <com/sun/star/awt/XPopupMenu.hpp>
@@ -207,7 +208,7 @@ PopupMenuToolbarController::createPopupWindow()
css::uno::Reference< css::awt::XPopupMenu > xPopupMenu ( m_xPopupMenu );
sal_uInt16 nId = xPopupMenu->execute(
css::uno::Reference< css::awt::XWindowPeer >( getParent(),
css::uno::UNO_QUERY ),
- VCLUnoHelper::ConvertToAWTRect( pToolBox->GetItemRect( m_nToolBoxId )
),
+ vcl::unohelper::ConvertToAWTRect( pToolBox->GetItemRect( m_nToolBoxId
) ),
( eAlign == WindowAlign::Top || eAlign == WindowAlign::Bottom ) ?
css::awt::PopupMenuDirection::EXECUTE_DOWN :
css::awt::PopupMenuDirection::EXECUTE_RIGHT );
diff --git a/include/toolkit/helper/vclunohelper.hxx
b/include/toolkit/helper/vclunohelper.hxx
index 16616119e1aa..4c364963b36b 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -24,9 +24,7 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/awt/MouseEvent.hpp>
-#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/awt/Size.hpp>
#include <vcl/bitmapex.hxx>
#include <vcl/font.hxx>
@@ -125,38 +123,6 @@ public:
/// @throws css::lang::IllegalArgumentException
static MapUnit /* MapModeUnit */ ConvertToMapModeUnit(sal_Int16 /*
com.sun.star.util.MeasureUnit.* */ _nMeasureUnit);
- static inline ::Size ConvertToVCLSize(const css::awt::Size& rAWTSize)
- {
- return ::Size(rAWTSize.Width, rAWTSize.Height);
- }
-
- static inline css::awt::Size ConvertToAWTSize(const Size& rVCLSize)
- {
- return css::awt::Size(rVCLSize.Width(), rVCLSize.Height());
- }
-
- static inline ::Point ConvertToVCLPoint(const css::awt::Point& rAWTPoint)
- {
- return ::Point(rAWTPoint.X, rAWTPoint.Y);
- }
-
- static inline css::awt::Point ConvertToAWTPoint(const PointTemplateBase&
rVCLPoint)
- {
- return css::awt::Point(rVCLPoint.X(), rVCLPoint.Y());
- }
-
- static inline ::tools::Rectangle ConvertToVCLRect(const
css::awt::Rectangle& rAWTRect)
- {
- return ::tools::Rectangle(::Point(rAWTRect.X, rAWTRect.Y),
- ::Size(rAWTRect.Width, rAWTRect.Height));
- }
-
- static inline css::awt::Rectangle ConvertToAWTRect(const
RectangleTemplateBase& rVCLRect)
- {
- return css::awt::Rectangle(rVCLRect.Left(), rVCLRect.Top(),
rVCLRect.GetWidth(),
- rVCLRect.GetHeight());
- }
-
static css::awt::MouseEvent
createMouseEvent(
const ::MouseEvent& _rVclEvent,
diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx
index c7b9dcc06956..9c6aa3470855 100644
--- a/include/vcl/unohelp.hxx
+++ b/include/vcl/unohelp.hxx
@@ -22,7 +22,11 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/awt/FontSlant.hpp>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/Size.hpp>
#include <tools/fontenum.hxx>
+#include <tools/gen.hxx>
#include <vcl/dllapi.h>
namespace com::sun::star::i18n {
@@ -43,6 +47,13 @@ VCL_DLLPUBLIC float ConvertFontWeight(
FontWeight eWeight );
VCL_DLLPUBLIC FontWeight ConvertFontWeight( float f );
VCL_DLLPUBLIC css::awt::FontSlant ConvertFontSlant( FontItalic eWeight );
VCL_DLLPUBLIC FontItalic ConvertFontSlant( css::awt::FontSlant );
+VCL_DLLPUBLIC Size ConvertToVCLSize(const css::awt::Size& rAWTSize);
+VCL_DLLPUBLIC css::awt::Size ConvertToAWTSize(const Size& rVCLSize);
+VCL_DLLPUBLIC Point ConvertToVCLPoint(const css::awt::Point& rAWTPoint);
+VCL_DLLPUBLIC css::awt::Point ConvertToAWTPoint(const PointTemplateBase&
rVCLPoint);
+VCL_DLLPUBLIC tools::Rectangle ConvertToVCLRect(const css::awt::Rectangle&
rAWTRect);
+VCL_DLLPUBLIC css::awt::Rectangle ConvertToAWTRect(const
RectangleTemplateBase& rVCLRect);
+
} // namespace vcl::unohelper
#endif // INCLUDED_VCL_UNOHELP_HXX
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index eb834838734f..9f56510451ea 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -67,6 +67,7 @@
#include <tools/fldunit.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <vcl/weld.hxx>
#include <core_resource.hxx>
@@ -1598,11 +1599,11 @@ void GeometryHandler::checkPosAndSize( const
awt::Point& _aNewPos,
if ( !xSection.is() || uno::Reference<
report::XShape>(xSourceReportComponent,uno::UNO_QUERY).is() ) // shapes can
overlap.
return;
- ::Point aPos(VCLUnoHelper::ConvertToVCLPoint(_aNewPos));
+ ::Point aPos(vcl::unohelper::ConvertToVCLPoint(_aNewPos));
if ( aPos.X() < 0 || aPos.Y() < 0 ) // TODO: have to check size with pos
aka || (aPos.X() + aAwtSize.Width) > m_xSection->getReportDefinition()->
throw
beans::PropertyVetoException(RptResId(RID_STR_ILLEGAL_POSITION),xSourceReportComponent);
- ::tools::Rectangle aSourceRect(aPos,
VCLUnoHelper::ConvertToVCLSize(_aSize));
+ ::tools::Rectangle aSourceRect(aPos,
vcl::unohelper::ConvertToVCLSize(_aSize));
const sal_Int32 nCount = xSection->getCount();
for (sal_Int32 i = 0; i < nCount ; ++i)
@@ -1611,8 +1612,8 @@ void GeometryHandler::checkPosAndSize( const awt::Point&
_aNewPos,
if ( xReportComponent.is() && xReportComponent !=
xSourceReportComponent )
{
const ::tools::Rectangle aBoundRect(
-
VCLUnoHelper::ConvertToVCLPoint(xReportComponent->getPosition()),
- VCLUnoHelper::ConvertToVCLSize(xReportComponent->getSize()));
+
vcl::unohelper::ConvertToVCLPoint(xReportComponent->getPosition()),
+ vcl::unohelper::ConvertToVCLSize(xReportComponent->getSize()));
const ::tools::Rectangle aRect =
aSourceRect.GetIntersection(aBoundRect);
if ( !aRect.IsEmpty() && (aRect.Left() != aRect.Right() &&
aRect.Top() != aRect.Bottom() ) )
throw beans::PropertyVetoException(RptResId(
RID_STR_OVERLAP_OTHER_CONTROL),xSourceReportComponent);
diff --git a/reportdesign/source/ui/misc/UITools.cxx
b/reportdesign/source/ui/misc/UITools.cxx
index cbaad4ebd14a..ba51cb2ccc6a 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -936,8 +936,8 @@ tools::Rectangle getRectangleFromControl(SdrObject*
_pControl)
uno::Reference< report::XReportComponent > xComponent(
_pControl->getUnoShape(), uno::UNO_QUERY);
if (xComponent.is())
{
- tools::Rectangle
aRect(VCLUnoHelper::ConvertToVCLPoint(xComponent->getPosition()),
-
VCLUnoHelper::ConvertToVCLSize(xComponent->getSize()));
+ tools::Rectangle
aRect(vcl::unohelper::ConvertToVCLPoint(xComponent->getPosition()),
+
vcl::unohelper::ConvertToVCLSize(xComponent->getSize()));
aRect.setHeight(aRect.getOpenHeight() + 1);
aRect.setWidth(aRect.getOpenWidth() + 1);
return aRect;
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index 1fa4beb1466c..42ed5b8f36ce 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -67,6 +67,7 @@
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <i18nutil/paper.hxx>
#include <svx/fmview.hxx>
@@ -2414,7 +2415,7 @@ void OReportController::openPageDialog(const
uno::Reference<report::XSection>& _
else
{
aDescriptor.Put(SvxSizeItem(RPTUI_ID_SIZE,
-
VCLUnoHelper::ConvertToVCLSize(getStyleProperty<awt::Size>(m_xReportDefinition,PROPERTY_PAPERSIZE))));
+
vcl::unohelper::ConvertToVCLSize(getStyleProperty<awt::Size>(m_xReportDefinition,PROPERTY_PAPERSIZE))));
aDescriptor.Put(SvxLRSpaceItem(SvxIndentValue::twips(getStyleProperty<sal_Int32>(
m_xReportDefinition,
PROPERTY_LEFTMARGIN)),
SvxIndentValue::twips(getStyleProperty<sal_Int32>(
diff --git a/reportdesign/source/ui/report/ReportSection.cxx
b/reportdesign/source/ui/report/ReportSection.cxx
index ca9842cef7ab..77ad558e0396 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -43,7 +43,6 @@
#include <com/sun/star/frame/XPopupMenuController.hpp>
#include <comphelper/propertyvalue.hxx>
#include <toolkit/awt/vclxmenu.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/diagnose_ex.hxx>
#include <RptDef.hxx>
#include <SectionWindow.hxx>
@@ -53,6 +52,7 @@
#include <utility>
#include <vcl/commandevent.hxx>
+#include <vcl/unohelp.hxx>
#include <o3tl/safeint.hxx>
#include <svl/itempool.hxx>
@@ -255,8 +255,8 @@ void OReportSection::Paste(const uno::Sequence<
beans::NamedValue >& _aAllreadyC
// Clone to target SdrModel
rtl::Reference<SdrObject>
pNewObj(pObject->CloneSdrObject(*m_pModel));
m_pPage->InsertObject(pNewObj.get(), SAL_MAX_SIZE);
- tools::Rectangle
aRet(VCLUnoHelper::ConvertToVCLPoint(rCopy->getPosition()),
-
VCLUnoHelper::ConvertToVCLSize(rCopy->getSize()));
+ tools::Rectangle
aRet(vcl::unohelper::ConvertToVCLPoint(rCopy->getPosition()),
+
vcl::unohelper::ConvertToVCLSize(rCopy->getSize()));
aRet.setHeight(aRet.getOpenHeight() + 1);
aRet.setWidth(aRet.getOpenWidth() + 1);
bool bOverlapping = true;
@@ -538,8 +538,8 @@ void
OReportSection::impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_I
xReportComponent->setPosition(aPos);
correctOverlapping(pObject,*this,false);
tools::Rectangle aRet(
-
VCLUnoHelper::ConvertToVCLPoint(xReportComponent->getPosition()),
-
VCLUnoHelper::ConvertToVCLSize(xReportComponent->getSize()));
+
vcl::unohelper::ConvertToVCLPoint(xReportComponent->getPosition()),
+
vcl::unohelper::ConvertToVCLSize(xReportComponent->getSize()));
aRet.setHeight(aRet.getOpenHeight() + 1);
aRet.setWidth(aRet.getOpenWidth() + 1);
if ( m_xSection.is() &&
(o3tl::make_unsigned(aRet.getOpenHeight() + aRet.Top()) >
m_xSection->getHeight()) )
@@ -771,7 +771,7 @@ sal_Int8 OReportSection::ExecuteDrop( const
ExecuteDropEvent& _rEvt )
aCurrent.realloc(nLength + 3);
auto pCurrent = aCurrent.getArray();
pCurrent[nLength].Name = PROPERTY_POSITION;
- pCurrent[nLength++].Value <<=
VCLUnoHelper::ConvertToAWTPoint(aDropPos);
+ pCurrent[nLength++].Value <<=
vcl::unohelper::ConvertToAWTPoint(aDropPos);
// give also the DND Action (Shift|Ctrl) Key to really say
what we want
pCurrent[nLength].Name = "DNDAction";
pCurrent[nLength++].Value <<= _rEvt.mnAction;
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx
b/reportdesign/source/ui/report/ViewsWindow.cxx
index 3dfb95ead12f..7ac2a49e14eb 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -37,6 +37,7 @@
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/unohelp.hxx>
#include <core_resource.hxx>
#include <svx/svdundo.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -1238,7 +1239,7 @@ void OViewsWindow::EndDragObj(bool _bControlKeyPressed,
const OSectionView* _pSe
for (; pColIter != pColEnd; ++pColIter)
{
uno::Reference< report::XReportComponent>
xRC(*pColIter);
- aPrevious =
VCLUnoHelper::ConvertToVCLPoint(xRC->getPosition());
+ aPrevious =
vcl::unohelper::ConvertToVCLPoint(xRC->getPosition());
awt::Size aSize = xRC->getSize();
if ( aNewPos.X() < nLeftMargin )
@@ -1259,13 +1260,13 @@ void OViewsWindow::EndDragObj(bool _bControlKeyPressed,
const OSectionView* _pSe
aNewPos.setX( 0 );
xRC->setSize(aSize);
}
-
xRC->setPosition(VCLUnoHelper::ConvertToAWTPoint(aNewPos));
+
xRC->setPosition(vcl::unohelper::ConvertToAWTPoint(aNewPos));
if ( (pColIter+1) != pColEnd )
{
// bring aNewPos to the position of the next object
uno::Reference< report::XReportComponent> xRCNext
= *(pColIter + 1);
Point aNextPosition
- =
VCLUnoHelper::ConvertToVCLPoint(xRCNext->getPosition());
+ =
vcl::unohelper::ConvertToVCLPoint(xRCNext->getPosition());
aNewPos += aNextPosition - aPrevious;
}
}
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 4300cf98cbab..b121893e2f6c 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -159,7 +159,7 @@ sal_Bool SAL_CALL
ScAccessibleContextBase::containsPoint(const awt::Point& rPoin
SolarMutexGuard aGuard;
IsObjectValid();
return tools::Rectangle(Point(), GetBoundingBox().GetSize())
- .Contains(VCLUnoHelper::ConvertToVCLPoint(rPoint));
+ .Contains(vcl::unohelper::ConvertToVCLPoint(rPoint));
}
uno::Reference< XAccessible > SAL_CALL
ScAccessibleContextBase::getAccessibleAtPoint(
@@ -173,28 +173,28 @@ awt::Rectangle SAL_CALL
ScAccessibleContextBase::getBounds( )
{
SolarMutexGuard aGuard;
IsObjectValid();
- return VCLUnoHelper::ConvertToAWTRect(GetBoundingBox());
+ return vcl::unohelper::ConvertToAWTRect(GetBoundingBox());
}
awt::Point SAL_CALL ScAccessibleContextBase::getLocation( )
{
SolarMutexGuard aGuard;
IsObjectValid();
- return VCLUnoHelper::ConvertToAWTPoint(GetBoundingBox().TopLeft());
+ return vcl::unohelper::ConvertToAWTPoint(GetBoundingBox().TopLeft());
}
awt::Point SAL_CALL ScAccessibleContextBase::getLocationOnScreen( )
{
SolarMutexGuard aGuard;
IsObjectValid();
- return VCLUnoHelper::ConvertToAWTPoint(GetBoundingBoxOnScreen().TopLeft());
+ return
vcl::unohelper::ConvertToAWTPoint(GetBoundingBoxOnScreen().TopLeft());
}
awt::Size SAL_CALL ScAccessibleContextBase::getSize( )
{
SolarMutexGuard aGuard;
IsObjectValid();
- return VCLUnoHelper::ConvertToAWTSize(GetBoundingBox().GetSize());
+ return vcl::unohelper::ConvertToAWTSize(GetBoundingBox().GetSize());
}
bool ScAccessibleContextBase::isShowing( )
@@ -208,8 +208,8 @@ bool ScAccessibleContextBase::isShowing( )
if (xParentComponent.is())
{
tools::Rectangle aParentBounds(
- VCLUnoHelper::ConvertToVCLRect(xParentComponent->getBounds()));
- tools::Rectangle
aBounds(VCLUnoHelper::ConvertToVCLRect(getBounds()));
+
vcl::unohelper::ConvertToVCLRect(xParentComponent->getBounds()));
+ tools::Rectangle
aBounds(vcl::unohelper::ConvertToVCLRect(getBounds()));
bShowing = aBounds.Overlaps(aParentBounds);
}
}
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index d4eca4f99487..5658ee2a27a9 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -58,6 +58,7 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <utility>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <svx/AccessibleControlShape.hxx>
#include <svx/SvxShapeTypes.hxx>
@@ -572,10 +573,10 @@ uno::Reference< XAccessible >
ScChildrenShapes::GetAt(const awt::Point& rPoint)
if (pShape->pAccShape.is())
{
- Point aPoint(VCLUnoHelper::ConvertToVCLPoint(rPoint));
+ Point aPoint(vcl::unohelper::ConvertToVCLPoint(rPoint));
aPoint
- -=
VCLUnoHelper::ConvertToVCLRect(pShape->pAccShape->getBounds()).TopLeft();
- if
(pShape->pAccShape->containsPoint(VCLUnoHelper::ConvertToAWTPoint(aPoint)))
+ -=
vcl::unohelper::ConvertToVCLRect(pShape->pAccShape->getBounds()).TopLeft();
+ if
(pShape->pAccShape->containsPoint(vcl::unohelper::ConvertToAWTPoint(aPoint)))
{
xAccessible = pShape->pAccShape.get();
bFound = true;
@@ -1640,8 +1641,8 @@ uno::Reference< XAccessible > SAL_CALL
ScAccessibleDocument::getAccessibleAtPoin
uno::Reference< XAccessibleComponent > xComp(xCont,
uno::UNO_QUERY);
if (xComp.is())
{
- tools::Rectangle
aBound(VCLUnoHelper::ConvertToVCLRect(xComp->getBounds()));
- if
(aBound.Contains(VCLUnoHelper::ConvertToVCLPoint(rPoint)))
+ tools::Rectangle
aBound(vcl::unohelper::ConvertToVCLRect(xComp->getBounds()));
+ if
(aBound.Contains(vcl::unohelper::ConvertToVCLPoint(rPoint)))
xAccessible = mxTempAcc;
}
}
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index fa51d4818983..5ba18208d110 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -50,6 +50,7 @@
#include <svx/ShapeTypeHandler.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <sfx2/docfile.hxx>
#include <vector>
@@ -924,13 +925,13 @@ struct ScShapePointFound
{
Point maPoint;
explicit ScShapePointFound(const awt::Point& rPoint)
- : maPoint(VCLUnoHelper::ConvertToVCLPoint(rPoint))
+ : maPoint(vcl::unohelper::ConvertToVCLPoint(rPoint))
{
}
bool operator() (const ScShapeChild& rShape)
{
bool bResult(false);
- if
(VCLUnoHelper::ConvertToVCLRect(rShape.mpAccShape->getBounds()).Contains(maPoint))
+ if
(vcl::unohelper::ConvertToVCLRect(rShape.mpAccShape->getBounds()).Contains(maPoint))
bResult = true;
return bResult;
}
@@ -1030,8 +1031,8 @@ void ScShapeChildren::FillShapes(const tools::Rectangle&
aPixelPaintRect, const
if (xShape.is())
{
tools::Rectangle aRect(pWin->LogicToPixel(
-
tools::Rectangle(VCLUnoHelper::ConvertToVCLPoint(xShape->getPosition()),
-
VCLUnoHelper::ConvertToVCLSize(xShape->getSize())), aMapMode));
+
tools::Rectangle(vcl::unohelper::ConvertToVCLPoint(xShape->getPosition()),
+
vcl::unohelper::ConvertToVCLSize(xShape->getSize())), aMapMode));
if(!aClippedPixelPaintRect.GetIntersection(aRect).IsEmpty())
{
ScShapeChild aShape;
@@ -1305,8 +1306,8 @@ uno::Reference< XAccessible > SAL_CALL
ScAccessibleDocumentPagePreview::getAcces
mpTable->Init();
}
if (mpTable.is()
- && VCLUnoHelper::ConvertToVCLRect(mpTable->getBounds())
- .Contains(VCLUnoHelper::ConvertToVCLPoint(rPoint)))
+ && vcl::unohelper::ConvertToVCLRect(mpTable->getBounds())
+
.Contains(vcl::unohelper::ConvertToVCLPoint(rPoint)))
xAccessible = mpTable.get();
}
if (!xAccessible.is())
@@ -1328,11 +1329,11 @@ uno::Reference< XAccessible > SAL_CALL
ScAccessibleDocumentPagePreview::getAcces
}
}
- Point aPoint(VCLUnoHelper::ConvertToVCLPoint(rPoint));
+ Point aPoint(vcl::unohelper::ConvertToVCLPoint(rPoint));
- if
(VCLUnoHelper::ConvertToVCLRect(mpHeader->getBounds()).Contains(aPoint))
+ if
(vcl::unohelper::ConvertToVCLRect(mpHeader->getBounds()).Contains(aPoint))
xAccessible = mpHeader.get();
- else if
(VCLUnoHelper::ConvertToVCLRect(mpFooter->getBounds()).Contains(aPoint))
+ else if
(vcl::unohelper::ConvertToVCLRect(mpFooter->getBounds()).Contains(aPoint))
xAccessible = mpFooter.get();
}
if (!xAccessible.is())
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 89ed4343ff35..4881e2a8ce60 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -34,8 +34,8 @@
#include <comphelper/sequence.hxx>
#include <editeng/editobj.hxx>
#include <svx/AccessibleTextHelper.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -234,9 +234,9 @@ AbsoluteScreenPixelRectangle
ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen(
// has the same size and position on screen like the parent
aRect = AbsoluteScreenPixelRectangle(
AbsoluteScreenPixelPoint(
-
VCLUnoHelper::ConvertToVCLPoint(xComp->getLocationOnScreen())),
+
vcl::unohelper::ConvertToVCLPoint(xComp->getLocationOnScreen())),
AbsoluteScreenPixelSize(
-
VCLUnoHelper::ConvertToVCLRect(xComp->getBounds()).GetSize()));
+
vcl::unohelper::ConvertToVCLRect(xComp->getBounds()).GetSize()));
}
}
return aRect;
@@ -253,7 +253,7 @@ tools::Rectangle
ScAccessiblePageHeaderArea::GetBoundingBox() const
{
// has the same size and position on screen like the parent and so
the pos is (0, 0)
tools::Rectangle aNewRect(Point(0, 0),
-
VCLUnoHelper::ConvertToVCLRect(xComp->getBounds()).GetSize());
+
vcl::unohelper::ConvertToVCLRect(xComp->getBounds()).GetSize());
aRect = aNewRect;
}
}
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index 9bcbb14e3b92..c0aefc808cc8 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -31,7 +31,7 @@
#include <editeng/brushitem.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/unohelp.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <comphelper/sequence.hxx>
@@ -221,7 +221,7 @@ tools::Rectangle ScAccessiblePreviewCell::GetBoundingBox()
const
if (xAccParentComp.is())
{
tools::Rectangle aParentRect(
-
VCLUnoHelper::ConvertToVCLRect(xAccParentComp->getBounds()));
+
vcl::unohelper::ConvertToVCLRect(xAccParentComp->getBounds()));
aCellRect.Move(-aParentRect.Left(), -aParentRect.Top());
}
}
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index c16ae0f72c37..670d45ff0cb9 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -34,6 +34,7 @@
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <svl/hint.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -326,7 +327,7 @@ tools::Rectangle
ScAccessiblePreviewHeaderCell::GetBoundingBox() const
if (xAccParentComp.is())
{
tools::Rectangle aParentRect(
-
VCLUnoHelper::ConvertToVCLRect(xAccParentComp->getBounds()));
+
vcl::unohelper::ConvertToVCLRect(xAccParentComp->getBounds()));
aCellRect.Move(-aParentRect.Left(), -aParentRect.Top());
}
}
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 3452718c61e4..4aabcf03ebe0 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -26,6 +26,7 @@
#include <svx/svdobj.hxx>
#include <svx/ImageMapInfo.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <sfx2/event.hxx>
#include <editeng/unofield.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -302,8 +303,8 @@ static ScRange lcl_GetAnchorCell( const uno::Reference<
drawing::XShape >& xShap
rUnoPoint.Y += rCaptionPoint.Y;
}
aReturn
- = pDoc->GetRange(nTab,
tools::Rectangle(VCLUnoHelper::ConvertToVCLPoint(rUnoPoint),
-
VCLUnoHelper::ConvertToVCLPoint(rUnoPoint)));
+ = pDoc->GetRange(nTab,
tools::Rectangle(vcl::unohelper::ConvertToVCLPoint(rUnoPoint),
+
vcl::unohelper::ConvertToVCLPoint(rUnoPoint)));
}
else
{
@@ -315,8 +316,8 @@ static ScRange lcl_GetAnchorCell( const uno::Reference<
drawing::XShape >& xShap
rUnoPoint.Y += rCaptionPoint.Y;
}
aReturn
- = pDoc->GetRange(nTab,
tools::Rectangle(VCLUnoHelper::ConvertToVCLPoint(rUnoPoint),
-
VCLUnoHelper::ConvertToVCLPoint(rUnoPoint)));
+ = pDoc->GetRange(nTab,
tools::Rectangle(vcl::unohelper::ConvertToVCLPoint(rUnoPoint),
+
vcl::unohelper::ConvertToVCLPoint(rUnoPoint)));
}
return aReturn;
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 6003c9f7e0ac..02f66358cb25 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -43,6 +43,7 @@
#include <cppuhelper/queryinterface.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <tools/multisel.hxx>
#include <drawsh.hxx>
@@ -406,7 +407,7 @@ awt::Rectangle ScViewPaneBase::GetVisArea() const
aVisPos.AdjustX( -(aVisSize.Width()) );
}
tools::Rectangle aVisRect( aVisPos, aVisSize );
- aVisArea = VCLUnoHelper::ConvertToAWTRect(aVisRect);
+ aVisArea = vcl::unohelper::ConvertToAWTRect(aVisRect);
}
}
return aVisArea;
@@ -1937,7 +1938,7 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const
OUString& aPropertyName
if ( pActiveWin )
{
AbsoluteScreenPixelRectangle aRect =
pActiveWin->GetWindowExtentsAbsolute();
- aRet <<= VCLUnoHelper::ConvertToAWTRect(aRect);
+ aRet <<= vcl::unohelper::ConvertToAWTRect(aRect);
}
}
}
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index c195af87bb41..049f810a27f3 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -32,6 +32,7 @@
#include <vcl/event.hxx>
#include <vcl/status.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <sfx2/app.hxx>
#include <sfx2/stbitem.hxx>
@@ -330,7 +331,7 @@ void SAL_CALL SfxStatusBarControl::paint(
OutputDevice* pOutDev = VCLUnoHelper::GetOutputDevice( xGraphics );
if ( pOutDev )
{
- ::tools::Rectangle aRect =
VCLUnoHelper::ConvertToVCLRect(rOutputRectangle);
+ ::tools::Rectangle aRect =
vcl::unohelper::ConvertToVCLRect(rOutputRectangle);
UserDrawEvent aUserDrawEvent(pOutDev, aRect, pBar->GetCurItemId());
Paint( aUserDrawEvent );
}
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 6ad66b0c9ed2..2215e17469e1 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -43,6 +43,7 @@
#include <com/sun/star/embed/EmbedMisc.hpp>
#include <svtools/embedhlp.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <sfx2/ipclient.hxx>
#include <sfx2/viewsh.hxx>
@@ -457,7 +458,7 @@ awt::Rectangle SAL_CALL
SfxInPlaceClient_Impl::getPlacement()
aRealObjArea = pEditWin->LogicToPixel(aRealObjArea);
}
- return VCLUnoHelper::ConvertToAWTRect(aRealObjArea);
+ return vcl::unohelper::ConvertToAWTRect(aRealObjArea);
}
@@ -487,7 +488,7 @@ awt::Rectangle SAL_CALL
SfxInPlaceClient_Impl::getClipRectangle()
aRealObjArea = pEditWin->LogicToPixel(aRealObjArea);
}
- return VCLUnoHelper::ConvertToAWTRect(aRealObjArea);
+ return vcl::unohelper::ConvertToAWTRect(aRealObjArea);
}
@@ -515,8 +516,8 @@ void SAL_CALL SfxInPlaceClient_Impl::changedPlacement(
const awt::Rectangle& aPo
// check if the change is at least one pixel in size
awt::Rectangle aOldRect = getPlacement();
- tools::Rectangle aNewPixelRect = VCLUnoHelper::ConvertToVCLRect(aPosRect);
- tools::Rectangle aOldPixelRect = VCLUnoHelper::ConvertToVCLRect(aOldRect);
+ tools::Rectangle aNewPixelRect =
vcl::unohelper::ConvertToVCLRect(aPosRect);
+ tools::Rectangle aOldPixelRect =
vcl::unohelper::ConvertToVCLRect(aOldRect);
if ( aOldPixelRect == aNewPixelRect )
// nothing has changed
return;
diff --git a/sfx2/source/view/sfxbasecontroller.cxx
b/sfx2/source/view/sfxbasecontroller.cxx
index 30718d1d42e7..c4a255e7722f 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -66,6 +66,7 @@
#include <framework/titlehelper.hxx>
#include <comphelper/processfactory.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <tools/svborder.hxx>
#include <sfx2/event.hxx>
@@ -830,9 +831,9 @@ awt::Rectangle SAL_CALL
SfxBaseController::queryBorderedArea( const awt::Rectang
SolarMutexGuard aGuard;
if ( m_pData->m_pViewShell )
{
- tools::Rectangle aTmpRect =
VCLUnoHelper::ConvertToVCLRect(aPreliminaryRectangle);
+ tools::Rectangle aTmpRect =
vcl::unohelper::ConvertToVCLRect(aPreliminaryRectangle);
m_pData->m_pViewShell->QueryObjAreaPixel( aTmpRect );
- return VCLUnoHelper::ConvertToAWTRect(aTmpRect);
+ return vcl::unohelper::ConvertToAWTRect(aTmpRect);
}
return aPreliminaryRectangle;
diff --git a/svtools/source/control/accessibleruler.cxx
b/svtools/source/control/accessibleruler.cxx
index c188895444f3..75df0c84c086 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -24,6 +24,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <utility>
#include <vcl/svapp.hxx>
+#include <vcl/unohelp.hxx>
#include <osl/mutex.hxx>
#include <tools/gen.hxx>
@@ -70,9 +71,9 @@ uno::Reference< XAccessibleContext > SAL_CALL
SvtRulerAccessible::getAccessibleC
sal_Bool SAL_CALL SvtRulerAccessible::containsPoint( const awt::Point& rPoint )
{
// no guard -> done in getBounds()
-// return GetBoundingBox().IsInside( VCLUnoHelper::ConvertToVCLPoint( rPoint
) );
+// return GetBoundingBox().IsInside( vcl::unohelper::ConvertToVCLPoint(
rPoint ) );
return tools::Rectangle(Point(0, 0), GetBoundingBox().GetSize())
- .Contains(VCLUnoHelper::ConvertToVCLPoint(rPoint));
+ .Contains(vcl::unohelper::ConvertToVCLPoint(rPoint));
}
uno::Reference< XAccessible > SAL_CALL
SvtRulerAccessible::getAccessibleAtPoint( const awt::Point& )
@@ -86,25 +87,25 @@ uno::Reference< XAccessible > SAL_CALL
SvtRulerAccessible::getAccessibleAtPoint(
awt::Rectangle SAL_CALL SvtRulerAccessible::getBounds()
{
// no guard -> done in GetBoundingBox()
- return VCLUnoHelper::ConvertToAWTRect(GetBoundingBox());
+ return vcl::unohelper::ConvertToAWTRect(GetBoundingBox());
}
awt::Point SAL_CALL SvtRulerAccessible::getLocation()
{
// no guard -> done in GetBoundingBox()
- return VCLUnoHelper::ConvertToAWTPoint(GetBoundingBox().TopLeft());
+ return vcl::unohelper::ConvertToAWTPoint(GetBoundingBox().TopLeft());
}
awt::Point SAL_CALL SvtRulerAccessible::getLocationOnScreen()
{
// no guard -> done in GetBoundingBoxOnScreen()
- return VCLUnoHelper::ConvertToAWTPoint(GetBoundingBoxOnScreen().TopLeft());
+ return
vcl::unohelper::ConvertToAWTPoint(GetBoundingBoxOnScreen().TopLeft());
}
awt::Size SAL_CALL SvtRulerAccessible::getSize()
{
// no guard -> done in GetBoundingBox()
- return VCLUnoHelper::ConvertToAWTSize(GetBoundingBox().GetSize());
+ return vcl::unohelper::ConvertToAWTSize(GetBoundingBox().GetSize());
}
//===== XAccessibleContext ==================================================
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 667fe8c76849..38a643a2b1f4 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -25,6 +25,7 @@
#include <utility>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/unohelp.hxx>
#include <osl/mutex.hxx>
#include <tools/debug.hxx>
#include <tools/gen.hxx>
@@ -425,7 +426,7 @@ void SAL_CALL SvxPixelCtlAccessibleChild::disposing()
awt::Rectangle SvxPixelCtlAccessibleChild::implGetBounds()
{
// no guard necessary, because no one changes maBoundingBox after creating
it
- return VCLUnoHelper::ConvertToAWTRect(maBoundingBox);
-e
... etc. - the rest is truncated
