summaryrefslogtreecommitdiff
path: root/accessibility/inc/helper
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-03-30 20:27:55 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-31 06:27:11 +0000
commita5a571307fb3306b74ab46b085cde6388270a770 (patch)
tree66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /accessibility/inc/helper
parent17d821af6bb9df93569836a92f6bed975587fc6c (diff)
tdf#82580 tools: rename Rectangle to tools::Rectangle
Mostly generated using make check COMPILER_EXTERNAL_TOOL=1 CCACHE_PREFIX=clang-rename-wrapper RENAME_ARGS="-qualified-name=Rectangle -new-name=tools::Rectangle" Except some modules have their own foo::tools namespace, so there have to use ::tools::Rectangle. This commit just moves the class from the global namespace, it does not update pre/postwin.h yet. Change-Id: I42b2de3c6f769fcf28cfe086f98eb31e42a305f2 Reviewed-on: https://gerrit.libreoffice.org/35923 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'accessibility/inc/helper')
-rw-r--r--accessibility/inc/helper/IComboListBoxHelper.hxx10
-rw-r--r--accessibility/inc/helper/listboxhelper.hxx20
2 files changed, 15 insertions, 15 deletions
diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx
index bcb195b4c8a5..8c60bc5b8070 100644
--- a/accessibility/inc/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/helper/IComboListBoxHelper.hxx
@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer { namesp
} } } } }
class Point;
-class Rectangle;
+namespace tools { class Rectangle; }
namespace vcl { class Window; }
namespace accessibility
{
@@ -39,9 +39,9 @@ namespace accessibility
virtual ~IComboListBoxHelper() = 0;
virtual OUString GetEntry( sal_Int32 nPos ) const = 0;
- virtual Rectangle GetDropDownPosSizePixel( ) const = 0;
- virtual Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
- virtual Rectangle GetWindowExtentsRelative() = 0;
+ virtual tools::Rectangle GetDropDownPosSizePixel( ) const = 0;
+ virtual tools::Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
+ virtual tools::Rectangle GetWindowExtentsRelative() = 0;
virtual bool IsEnabled() const = 0;
virtual bool IsEntryVisible( sal_Int32 nPos ) const = 0;
virtual sal_uInt16 GetDisplayLineCount() const = 0;
@@ -57,7 +57,7 @@ namespace accessibility
virtual void SetNoSelection() = 0;
virtual sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex ) const = 0;
virtual bool IsInDropDown() const = 0;
- virtual Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
+ virtual tools::Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
virtual long GetIndexForPoint( const Point& rPoint, sal_Int32 & nPos ) const = 0;
virtual css::uno::Reference< css::datatransfer::clipboard::XClipboard >
GetClipboard() = 0;
diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx
index 570e46ffce03..8bc7e2dae2ef 100644
--- a/accessibility/inc/helper/listboxhelper.hxx
+++ b/accessibility/inc/helper/listboxhelper.hxx
@@ -50,32 +50,32 @@ public:
return m_aComboListBox.GetEntry( nPos );
}
- virtual Rectangle GetDropDownPosSizePixel() const override
+ virtual tools::Rectangle GetDropDownPosSizePixel() const override
{
- Rectangle aTemp = m_aComboListBox.GetWindowExtentsRelative(nullptr);
- Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel();
+ tools::Rectangle aTemp = m_aComboListBox.GetWindowExtentsRelative(nullptr);
+ tools::Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel();
aRet.Move(aTemp.TopLeft().X(),aTemp.TopLeft().Y());
return aRet;
}
- virtual Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const override
+ virtual tools::Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const override
{
- Rectangle aRect;
+ tools::Rectangle aRect;
if ( m_aComboListBox.IsInDropDown() && IsEntryVisible( nItem ) )
{
- Rectangle aTemp = m_aComboListBox.GetDropDownPosSizePixel();
+ tools::Rectangle aTemp = m_aComboListBox.GetDropDownPosSizePixel();
Size aSize = aTemp.GetSize();
aSize.Height() /= m_aComboListBox.GetDisplayLineCount();
Point aTopLeft = aTemp.TopLeft();
aTopLeft.Y() += aSize.Height() * ( nItem - m_aComboListBox.GetTopEntry() );
- aRect = Rectangle( aTopLeft, aSize );
+ aRect = tools::Rectangle( aTopLeft, aSize );
}
else
aRect = m_aComboListBox.GetBoundingRectangle( nItem );
return aRect;
}
- virtual Rectangle GetWindowExtentsRelative() override
+ virtual tools::Rectangle GetWindowExtentsRelative() override
{
return m_aComboListBox.GetWindowExtentsRelative( nullptr );
}
@@ -157,9 +157,9 @@ public:
return m_aComboListBox.IsInDropDown();
}
- virtual Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const override
+ virtual tools::Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const override
{
- Rectangle aRect;
+ tools::Rectangle aRect;
Pair aEntryCharacterRange = m_aComboListBox.GetLineStartEnd( _nEntryPos );
if ( aEntryCharacterRange.A() + _nCharacterIndex <= aEntryCharacterRange.B() )