canvas/source/vcl/textlayout.cxx | 2 +-
include/svtools/brwbox.hxx | 2 +-
include/vcl/accessibletableprovider.hxx | 2 +-
include/vcl/ctrl.hxx | 2 +-
include/vcl/outdev.hxx | 12 +++++-------
include/vcl/toolkit/svtabbx.hxx | 2 +-
svtools/source/brwbox/brwbox3.cxx | 2 +-
vcl/inc/textlayout.hxx | 6 +++---
vcl/source/control/ctrl.cxx | 2 +-
vcl/source/control/imp_listbox.cxx | 2 +-
vcl/source/gdi/textlayout.cxx | 14 +++++++-------
vcl/source/outdev/font.cxx | 2 +-
vcl/source/outdev/text.cxx | 14 +++++++-------
vcl/source/toolkit/group.cxx | 2 +-
vcl/source/treelist/svtabbx.cxx | 4 ++--
vcl/source/window/menu.cxx | 2 +-
16 files changed, 35 insertions(+), 37 deletions(-)
New commits:
commit d19dbcc139d18771e5e20e82a694f1512476e41c
Author: Chris Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Sun May 2 03:50:05 2021 +1000
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon May 3 15:13:58 2021 +0200
vcl: remove MetricVector
Change-Id: Ib700887ca79f423c65dfb75eea36bbfd808fa172
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114976
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 4bdda37d9613..b3eaee7f8fa9 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -169,7 +169,7 @@ namespace vclcanvas
std::unique_ptr< ::tools::Long []> aOffsets(new
::tools::Long[maLogicalAdvancements.getLength()]);
setupTextOffsets(aOffsets.get(), maLogicalAdvancements, aViewState,
aRenderState);
- MetricVector aMetricVector;
+ std::vector< ::tools::Rectangle > aMetricVector;
uno::Sequence<geometry::RealRectangle2D> aBoundingBoxes;
if (pVDev->GetGlyphBoundRects(
Point(0,0),
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 948650015e19..8a016ac5eb26 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -826,7 +826,7 @@ public:
virtual void GetAllSelectedColumns( css::uno::Sequence<
sal_Int32 >& _rColumns ) const override;
virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16
_nColumn ) const override;
virtual OUString GetAccessibleCellText(sal_Int32 _nRow,
sal_uInt16 _nColPos) const override;
- virtual bool GetGlyphBoundRects( const Point& rOrigin,
const OUString& rStr, int nIndex, int nLen, MetricVector& rVector ) override;
+ virtual bool GetGlyphBoundRects( const Point& rOrigin,
const OUString& rStr, int nIndex, int nLen, std::vector< tools::Rectangle >&
rVector ) override;
virtual tools::Rectangle GetWindowExtentsRelative(const vcl::Window
*pRelativeWindow) const override;
virtual void GrabFocus() override;
virtual css::uno::Reference< css::accessibility::XAccessible >
GetAccessible() override;
diff --git a/include/vcl/accessibletableprovider.hxx
b/include/vcl/accessibletableprovider.hxx
index 253f850da5f8..b40d16c442a6 100644
--- a/include/vcl/accessibletableprovider.hxx
+++ b/include/vcl/accessibletableprovider.hxx
@@ -111,7 +111,7 @@ public:
virtual void GrabTableFocus() = 0;
// OutputDevice
- virtual bool GetGlyphBoundRects( const Point& rOrigin,
const OUString& rStr, int nIndex, int nLen, MetricVector& rVector ) = 0;
+ virtual bool GetGlyphBoundRects( const Point& rOrigin,
const OUString& rStr, int nIndex, int nLen, std::vector< tools::Rectangle >&
rVector ) = 0;
// Window
virtual tools::Rectangle GetWindowExtentsRelative(const vcl::Window
*pRelativeWindow) const = 0;
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 87a15572d6c9..90fd8b7684b8 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -86,7 +86,7 @@ protected:
*/
tools::Rectangle DrawControlText( OutputDevice& _rTargetDevice, const
tools::Rectangle& _rRect,
const OUString& _rStr, DrawTextFlags _nStyle,
- MetricVector* _pVector, OUString* _pDisplayText,
+ std::vector< tools::Rectangle >* _pVector,
OUString* _pDisplayText,
const Size* i_pDeviceSize = nullptr ) const;
tools::Rectangle GetControlTextRect( OutputDevice& _rTargetDevice, const
tools::Rectangle & rRect,
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 54c39d2bf6cf..4d0ab6b7a378 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -116,8 +116,6 @@ namespace com::sun::star::awt {
#define GLYPH_FONT_HEIGHT 256
#endif
-typedef std::vector< tools::Rectangle > MetricVector;
-
// OutputDevice-Types
// Flags for DrawText()
@@ -976,17 +974,17 @@ public:
void DrawText( const Point& rStartPt, const
OUString& rStr,
sal_Int32 nIndex = 0, sal_Int32 nLen
= -1,
- MetricVector* pVector = nullptr,
OUString* pDisplayText = nullptr,
+ std::vector< tools::Rectangle >*
pVector = nullptr, OUString* pDisplayText = nullptr,
const SalLayoutGlyphs* pLayoutCache
= nullptr );
void DrawText( const tools::Rectangle& rRect,
const OUString& rStr, DrawTextFlags
nStyle = DrawTextFlags::NONE,
- MetricVector* pVector = nullptr,
OUString* pDisplayText = nullptr,
+ std::vector< tools::Rectangle >*
pVector = nullptr, OUString* pDisplayText = nullptr,
vcl::ITextLayout* _pTextLayout =
nullptr );
static void ImplDrawText( OutputDevice& rTargetDevice,
const tools::Rectangle& rRect,
const OUString& rOrigStr,
DrawTextFlags nStyle,
- MetricVector* pVector, OUString*
pDisplayText, vcl::ITextLayout& _rLayout );
+ std::vector< tools::Rectangle >*
pVector, OUString* pDisplayText, vcl::ITextLayout& _rLayout );
void ImplDrawText( SalLayout& );
@@ -994,7 +992,7 @@ public:
void DrawCtrlText( const Point& rPos, const
OUString& rStr,
sal_Int32 nIndex = 0, sal_Int32
nLen = -1,
- DrawTextFlags nStyle =
DrawTextFlags::Mnemonic, MetricVector* pVector = nullptr, OUString*
pDisplayText = nullptr,
+ DrawTextFlags nStyle =
DrawTextFlags::Mnemonic, std::vector< tools::Rectangle >* pVector = nullptr,
OUString* pDisplayText = nullptr,
const SalLayoutGlyphs* pGlyphs =
nullptr);
void DrawTextLine( const Point& rPos, tools::Long
nWidth,
@@ -1235,7 +1233,7 @@ public:
ImplGetEmphasisMarkStyle( const vcl::Font&
rFont );
bool GetGlyphBoundRects( const Point& rOrigin,
const OUString& rStr, int nIndex,
- int nLen, MetricVector&
rVector );
+ int nLen, std::vector<
tools::Rectangle >& rVector );
sal_Int32 HasGlyphs( const vcl::Font& rFont, const
OUString& rStr,
sal_Int32 nIndex = 0, sal_Int32
nLen = -1 ) const;
diff --git a/include/vcl/toolkit/svtabbx.hxx b/include/vcl/toolkit/svtabbx.hxx
index 1e9fdee29600..ebb87a7eb79a 100644
--- a/include/vcl/toolkit/svtabbx.hxx
+++ b/include/vcl/toolkit/svtabbx.hxx
@@ -202,7 +202,7 @@ public:
virtual void GrabTableFocus() override;
// OutputDevice
- virtual bool GetGlyphBoundRects( const Point& rOrigin,
const OUString& rStr, int nIndex, int nLen, MetricVector& rVector ) override;
+ virtual bool GetGlyphBoundRects( const Point& rOrigin,
const OUString& rStr, int nIndex, int nLen, std::vector< tools::Rectangle >&
rVector ) override;
// Window
virtual tools::Rectangle GetWindowExtentsRelative(const vcl::Window
*pRelativeWindow) const override;
diff --git a/svtools/source/brwbox/brwbox3.cxx
b/svtools/source/brwbox/brwbox3.cxx
index 46f2d4f8d97c..9e7f77a2cb6a 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -526,7 +526,7 @@ OUString BrowseBox::GetAccessibleCellText(sal_Int32 _nRow,
sal_uInt16 _nColPos)
}
-bool BrowseBox::GetGlyphBoundRects( const Point& rOrigin, const OUString&
rStr, int nIndex, int nLen, MetricVector& rVector )
+bool BrowseBox::GetGlyphBoundRects( const Point& rOrigin, const OUString&
rStr, int nIndex, int nLen, std::vector< tools::Rectangle >& rVector )
{
return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, rVector );
}
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index a2bd795b470e..6d23b1827155 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -31,7 +31,7 @@ namespace vcl
public:
virtual tools::Long GetTextWidth( const OUString& _rText,
sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0;
virtual void DrawText( const Point& _rStartPoint, const
OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength,
- MetricVector* _pVector, OUString*
_pDisplayText ) = 0;
+ std::vector< tools::Rectangle >* _pVector,
OUString* _pDisplayText ) = 0;
virtual void GetCaretPositions( const OUString& _rText,
tools::Long* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const
= 0;
virtual sal_Int32 GetTextBreak( const OUString& _rText, tools::Long
_nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0;
virtual bool DecomposeTextRectAction() const = 0;
@@ -61,7 +61,7 @@ namespace vcl
const OUString& _rText,
sal_Int32 _nStartIndex,
sal_Int32 _nLength,
- MetricVector* _pVector,
+ std::vector< tools::Rectangle >*
_pVector,
OUString* _pDisplayText ) override;
virtual void GetCaretPositions( const OUString& _rText,
@@ -92,7 +92,7 @@ namespace vcl
tools::Rectangle DrawText( const tools::Rectangle& _rRect,
const OUString& _rText, DrawTextFlags _nStyle,
- MetricVector* _pVector, OUString* _pDisplayText,
const Size* i_pDeviceSize );
+ std::vector< tools::Rectangle >* _pVector,
OUString* _pDisplayText, const Size* i_pDeviceSize );
tools::Rectangle GetTextRect( const tools::Rectangle& _rRect,
const OUString& _rText, DrawTextFlags
_nStyle, Size* o_pDeviceSize );
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 1e34777cf93b..4f89e19b66ef 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -431,7 +431,7 @@ void Control::ImplInitSettings()
}
tools::Rectangle Control::DrawControlText( OutputDevice& _rTargetDevice, const
tools::Rectangle& rRect, const OUString& _rStr,
- DrawTextFlags _nStyle, MetricVector* _pVector, OUString* _pDisplayText,
const Size* i_pDeviceSize ) const
+ DrawTextFlags _nStyle, std::vector< tools::Rectangle >* _pVector,
OUString* _pDisplayText, const Size* i_pDeviceSize ) const
{
OUString rPStr = _rStr;
DrawTextFlags nPStyle = _nStyle;
diff --git a/vcl/source/control/imp_listbox.cxx
b/vcl/source/control/imp_listbox.cxx
index 25b42371e1c5..97363aa2e2c3 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2710,7 +2710,7 @@ void ImplWin::DrawEntry(vcl::RenderContext&
rRenderContext, bool bLayout)
aTextRect.AdjustLeft(maImage.GetSizePixel().Width() +
IMG_TXT_DISTANCE );
}
- MetricVector* pVector = bLayout ?
&mpControlData->mpLayoutData->m_aUnicodeBoundRects : nullptr;
+ std::vector< tools::Rectangle >* pVector = bLayout ?
&mpControlData->mpLayoutData->m_aUnicodeBoundRects : nullptr;
OUString* pDisplayText = bLayout ?
&mpControlData->mpLayoutData->m_aDisplayText : nullptr;
rRenderContext.DrawText( aTextRect, maString, nTextStyle, pVector,
pDisplayText );
}
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 0c8953e92f8d..e3cad7aeadf7 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -46,7 +46,7 @@ namespace vcl
}
void DefaultTextLayout::DrawText( const Point& _rStartPoint, const
OUString& _rText, sal_Int32 _nStartIndex,
- sal_Int32 _nLength, MetricVector* _pVector, OUString* _pDisplayText )
+ sal_Int32 _nLength, std::vector< tools::Rectangle >* _pVector,
OUString* _pDisplayText )
{
m_rTargetDevice.DrawText( _rStartPoint, _rText, _nStartIndex,
_nLength, _pVector, _pDisplayText );
}
@@ -75,14 +75,14 @@ namespace vcl
// ITextLayout
virtual tools::Long GetTextWidth( const OUString& rStr,
sal_Int32 nIndex, sal_Int32 nLen ) const override;
- virtual void DrawText( const Point& _rStartPoint, const
OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, MetricVector*
_pVector, OUString* _pDisplayText ) override;
+ virtual void DrawText( const Point& _rStartPoint, const
OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, std::vector<
tools::Rectangle >* _pVector, OUString* _pDisplayText ) override;
virtual void GetCaretPositions( const OUString& _rText,
tools::Long* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const
override;
virtual sal_Int32 GetTextBreak(const OUString& _rText, tools::Long
_nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength) const override;
virtual bool DecomposeTextRectAction() const override;
public:
// equivalents to the respective OutputDevice methods, which take the
reference device into account
- tools::Rectangle DrawText( const tools::Rectangle& _rRect, const
OUString& _rText, DrawTextFlags _nStyle, MetricVector* _pVector, OUString*
_pDisplayText, const Size* i_pDeviceSize );
+ tools::Rectangle DrawText( const tools::Rectangle& _rRect, const
OUString& _rText, DrawTextFlags _nStyle, std::vector< tools::Rectangle >*
_pVector, OUString* _pDisplayText, const Size* i_pDeviceSize );
tools::Rectangle GetTextRect( const tools::Rectangle& _rRect, const
OUString& _rText, DrawTextFlags _nStyle, Size* o_pDeviceSize );
private:
@@ -193,14 +193,14 @@ namespace vcl
return GetTextArray( _rText, nullptr, _nStartIndex, _nLength );
}
- void ReferenceDeviceTextLayout::DrawText( const Point& _rStartPoint, const
OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, MetricVector*
_pVector, OUString* _pDisplayText )
+ void ReferenceDeviceTextLayout::DrawText( const Point& _rStartPoint, const
OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, std::vector<
tools::Rectangle >* _pVector, OUString* _pDisplayText )
{
if ( !lcl_normalizeLength( _rText, _nStartIndex, _nLength ) )
return;
if ( _pVector && _pDisplayText )
{
- MetricVector aGlyphBounds;
+ std::vector< tools::Rectangle > aGlyphBounds;
m_rReferenceDevice.GetGlyphBoundRects( _rStartPoint, _rText,
_nStartIndex, _nLength, aGlyphBounds );
_pVector->insert( _pVector->end(), aGlyphBounds.begin(),
aGlyphBounds.end() );
*_pDisplayText += _rText.subView( _nStartIndex, _nLength );
@@ -239,7 +239,7 @@ namespace vcl
}
tools::Rectangle ReferenceDeviceTextLayout::DrawText( const
tools::Rectangle& _rRect, const OUString& _rText, DrawTextFlags _nStyle,
- MetricVector* _pVector,
OUString* _pDisplayText, const Size* i_pDeviceSize )
+ std::vector<
tools::Rectangle >* _pVector, OUString* _pDisplayText, const Size*
i_pDeviceSize )
{
if ( _rText.isEmpty() )
return tools::Rectangle();
@@ -334,7 +334,7 @@ namespace vcl
}
tools::Rectangle ControlTextRenderer::DrawText( const tools::Rectangle&
_rRect, const OUString& _rText, DrawTextFlags _nStyle,
- MetricVector* _pVector, OUString* _pDisplayText, const Size*
i_pDeviceSize )
+ std::vector< tools::Rectangle >* _pVector, OUString* _pDisplayText,
const Size* i_pDeviceSize )
{
return m_pImpl->DrawText( _rRect, _rText, _nStyle, _pVector,
_pDisplayText, i_pDeviceSize );
}
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 45a4e514e04f..a7047fa8d93a 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1363,7 +1363,7 @@ sal_Int32 OutputDevice::ValidateKashidas ( const
OUString& rTxt,
}
bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const OUString&
rStr,
- int nIndex, int nLen, MetricVector&
rVector )
+ int nIndex, int nLen, std::vector<
tools::Rectangle >& rVector )
{
rVector.clear();
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 9a37ab2dced9..9de93b342c53 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -790,7 +790,7 @@ const SalLayoutFlags eDefaultLayout =
SalLayoutFlags::BiDiStrong;
void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr,
sal_Int32 nIndex, sal_Int32 nLen,
- MetricVector* pVector, OUString* pDisplayText,
+ std::vector< tools::Rectangle >* pVector,
OUString* pDisplayText,
const SalLayoutGlyphs* pLayoutCache
)
{
@@ -824,11 +824,11 @@ void OutputDevice::DrawText( const Point& rStartPt, const
OUString& rStr,
}
if( ! aClip.IsNull() )
{
- MetricVector aTmp;
+ std::vector< tools::Rectangle > aTmp;
GetGlyphBoundRects( rStartPt, rStr, nIndex, nLen, aTmp );
bool bInserted = false;
- for( MetricVector::const_iterator it = aTmp.begin(); it !=
aTmp.end(); ++it, nIndex++ )
+ for( std::vector< tools::Rectangle >::const_iterator it =
aTmp.begin(); it != aTmp.end(); ++it, nIndex++ )
{
bool bAppend = false;
@@ -836,7 +836,7 @@ void OutputDevice::DrawText( const Point& rStartPt, const
OUString& rStr,
bAppend = true;
else if( rStr[ nIndex ] == ' ' && bInserted )
{
- MetricVector::const_iterator next = it;
+ std::vector< tools::Rectangle >::const_iterator next = it;
++next;
if( next != aTmp.end() && aClip.IsOver( *next ) )
bAppend = true;
@@ -1460,7 +1460,7 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString&
rStr, tools::Long nTextWid
void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const
tools::Rectangle& rRect,
const OUString& rOrigStr, DrawTextFlags
nStyle,
- MetricVector* pVector, OUString* pDisplayText,
+ std::vector< tools::Rectangle >* pVector,
OUString* pDisplayText,
vcl::ITextLayout& _rLayout )
{
@@ -1751,7 +1751,7 @@ void OutputDevice::AddTextRectActions( const
tools::Rectangle& rRect,
}
void OutputDevice::DrawText( const tools::Rectangle& rRect, const OUString&
rOrigStr, DrawTextFlags nStyle,
- MetricVector* pVector, OUString* pDisplayText,
+ std::vector< tools::Rectangle >* pVector,
OUString* pDisplayText,
vcl::ITextLayout* _pTextLayout )
{
assert(!is_double_buffered_window());
@@ -2059,7 +2059,7 @@ OUString OutputDevice::ImplGetEllipsisString( const
OutputDevice& rTargetDevice,
void OutputDevice::DrawCtrlText( const Point& rPos, const OUString& rStr,
sal_Int32 nIndex, sal_Int32 nLen,
- DrawTextFlags nStyle, MetricVector* pVector,
OUString* pDisplayText,
+ DrawTextFlags nStyle, std::vector<
tools::Rectangle >* pVector, OUString* pDisplayText,
const SalLayoutGlyphs* pGlyphs )
{
assert(!is_double_buffered_window());
diff --git a/vcl/source/toolkit/group.cxx b/vcl/source/toolkit/group.cxx
index 391ea0a97687..29d11b8eadc1 100644
--- a/vcl/source/toolkit/group.cxx
+++ b/vcl/source/toolkit/group.cxx
@@ -162,7 +162,7 @@ void GroupBox::ImplDraw( OutputDevice* pDev, DrawFlags
nDrawFlags,
}
}
- MetricVector* pVector = bLayout ?
&mpControlData->mpLayoutData->m_aUnicodeBoundRects : nullptr;
+ std::vector< tools::Rectangle >* pVector = bLayout ?
&mpControlData->mpLayoutData->m_aUnicodeBoundRects : nullptr;
OUString* pDisplayText = bLayout ?
&mpControlData->mpLayoutData->m_aDisplayText : nullptr;
DrawControlText( *pDev, aRect, aText, nTextStyle, pVector, pDisplayText );
}
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index c5d8119c0d98..e653edf73b04 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -1051,7 +1051,7 @@ void SvHeaderTabListBox::GrabTableFocus()
GrabFocus();
}
-bool SvHeaderTabListBox::GetGlyphBoundRects( const Point& rOrigin, const
OUString& rStr, int nIndex, int nLen, MetricVector& rVector )
+bool SvHeaderTabListBox::GetGlyphBoundRects( const Point& rOrigin, const
OUString& rStr, int nIndex, int nLen, std::vector< tools::Rectangle >& rVector )
{
return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, rVector );
}
@@ -1110,7 +1110,7 @@ tools::Rectangle
SvHeaderTabListBox::GetFieldCharacterBounds(sal_Int32,sal_Int32
sal_Int32 SvHeaderTabListBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32
_nColumnPos,const Point& _rPoint)
{
OUString sText = GetAccessibleCellText( _nRow, static_cast< sal_uInt16 >(
_nColumnPos ) );
- MetricVector aRects;
+ std::vector< tools::Rectangle > aRects;
if ( GetGlyphBoundRects(Point(0,0), sText, 0, sText.getLength(), aRects) )
{
sal_Int32 nPos = 0;
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index a1d39df63bf0..128bc4bbcbd1 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1962,7 +1962,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
Size const & rSize,
if (pData->bIsTemporary)
nStyle |= DrawTextFlags::Disable;
- MetricVector* pVector = bLayout ?
&mpLayoutData->m_aUnicodeBoundRects : nullptr;
+ std::vector< tools::Rectangle >* pVector = bLayout ?
&mpLayoutData->m_aUnicodeBoundRects : nullptr;
OUString* pDisplayText = bLayout ?
&mpLayoutData->m_aDisplayText : nullptr;
if (bLayout)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
