summaryrefslogtreecommitdiff
path: root/reportdesign/source/ui/inc/ViewsWindow.hxx
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 /reportdesign/source/ui/inc/ViewsWindow.hxx
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 'reportdesign/source/ui/inc/ViewsWindow.hxx')
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index 6e8be8df0b80..e05f1cd123cd 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -44,13 +44,13 @@ namespace rptui
class OSectionView;
- struct RectangleLess : public ::std::binary_function< Rectangle, Rectangle, bool>
+ struct RectangleLess : public ::std::binary_function< tools::Rectangle, tools::Rectangle, bool>
{
enum CompareMode { POS_LEFT,POS_RIGHT,POS_UPPER,POS_DOWN,POS_CENTER_HORIZONTAL,POS_CENTER_VERTICAL };
CompareMode m_eCompareMode;
Point m_aRefPoint;
RectangleLess(CompareMode _eCompareMode,const Point& _rRefPoint ) : m_eCompareMode(_eCompareMode),m_aRefPoint(_rRefPoint){}
- bool operator() (const Rectangle& lhs, const Rectangle& rhs) const
+ bool operator() (const tools::Rectangle& lhs, const tools::Rectangle& rhs) const
{
switch(m_eCompareMode)
{
@@ -75,7 +75,7 @@ namespace rptui
, public utl::ConfigurationListener
, public IMarkedSection
{
- typedef ::std::multimap<Rectangle,::std::pair<SdrObject*,OSectionView*>,RectangleLess> TRectangleMap;
+ typedef ::std::multimap<tools::Rectangle,::std::pair<SdrObject*,OSectionView*>,RectangleLess> TRectangleMap;
public:
typedef ::std::vector< VclPtr<OSectionWindow> > TSectionsMap;
@@ -91,7 +91,7 @@ namespace rptui
*/
TSectionsMap::iterator getIteratorAtPos(sal_uInt16 _nPos);
void collectRectangles(TRectangleMap& _rMap);
- static void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,Rectangle& _rBound,Rectangle& _rResize);
+ static void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,tools::Rectangle& _rBound,tools::Rectangle& _rResize);
void impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet);
OViewsWindow(OViewsWindow&) = delete;
@@ -102,7 +102,7 @@ namespace rptui
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
- virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override;
+ virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& rRect ) override;
virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, ConfigurationHints ) override;
public:
OViewsWindow(
@@ -241,7 +241,7 @@ namespace rptui
void BegMarkObj(const Point& _aPnt,const OSectionView* _pSection);
private:
- void BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _aRect, const OSectionView& _rSection);
+ void BegDragObj_createInvisibleObjectAtPosition(const tools::Rectangle& _aRect, const OSectionView& _rSection);
void EndDragObj_removeInvisibleObjects();
Point m_aDragDelta;
::std::vector<SdrObject*> m_aBegDragTempList;