summaryrefslogtreecommitdiff
path: root/svx/source/inc
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 /svx/source/inc
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 'svx/source/inc')
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx8
-rw-r--r--svx/source/inc/charmapacc.hxx2
-rw-r--r--svx/source/inc/formcontrolfactory.hxx4
-rw-r--r--svx/source/inc/frmselimpl.hxx4
-rw-r--r--svx/source/inc/gridcell.hxx18
-rw-r--r--svx/source/inc/svxpixelctlaccessiblecontext.hxx8
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx14
7 files changed, 29 insertions, 29 deletions
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 4ccc2221d0ae..3b5e142caaf9 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace awt {
class XFocusListener;
} } } }
-class Rectangle;
+namespace tools { class Rectangle; }
class GraphCtrl;
class SdrObject;
class SdrModel;
@@ -151,7 +151,7 @@ public:
virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
// IAccessibleViewforwarder
- virtual Rectangle GetVisibleArea() const override;
+ virtual tools::Rectangle GetVisibleArea() const override;
virtual Point LogicToPixel (const Point& rPoint) const override;
virtual Size LogicToPixel (const Size& rSize) const override;
@@ -177,12 +177,12 @@ protected:
When the object is already disposed then a
<type>DisposedException</type> is thrown.
*/
- Rectangle GetBoundingBoxOnScreen();
+ tools::Rectangle GetBoundingBoxOnScreen();
/// Return the object's current bounding box relative to the parent object.
///
/// @throws css::uno::RuntimeException
- Rectangle GetBoundingBox();
+ tools::Rectangle GetBoundingBox();
virtual void SAL_CALL disposing() final override;
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index afc9181fec91..6783b5504752 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -100,7 +100,7 @@ namespace svx
SvxShowCharSet& mrParent;
sal_uInt16 mnId;
OUString maText;
- Rectangle maRect;
+ tools::Rectangle maRect;
rtl::Reference<SvxShowCharSetItemAcc> m_xItem;
SvxShowCharSetAcc* m_pParent;
diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx
index 020a457a50c2..0f21051f2da6 100644
--- a/svx/source/inc/formcontrolfactory.hxx
+++ b/svx/source/inc/formcontrolfactory.hxx
@@ -33,7 +33,7 @@
#include <memory>
class SdrUnoObj;
-class Rectangle;
+namespace tools { class Rectangle; }
namespace comphelper {
class ComponentContext;
@@ -66,7 +66,7 @@ namespace svxform
sal_Int16 initializeControlModel(
const DocumentType _eDocType,
const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel,
- const Rectangle& _rControlBoundRect
+ const tools::Rectangle& _rControlBoundRect
);
sal_Int16 initializeControlModel( const DocumentType _eDocType, const SdrUnoObj& _rObject );
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 0bb1e12b17ae..736a81dd2644 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -69,9 +69,9 @@ public:
void MergeFocusToPolyPolygon( tools::PolyPolygon& rPPoly ) const;
void ClearClickArea() { maClickArea.Clear(); }
- void AddClickRect( const Rectangle& rRect );
+ void AddClickRect( const tools::Rectangle& rRect );
bool ContainsClickPoint( const Point& rPos ) const;
- Rectangle GetClickBoundRect() const;
+ tools::Rectangle GetClickBoundRect() const;
void SetKeyboardNeighbors(FrameBorderType eLeft, FrameBorderType eRight,
FrameBorderType eTop, FrameBorderType eBottom);
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 418719bccc7c..69993985f1da 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -140,7 +140,7 @@ public:
// Zeichnen eines Feldes an einer Position, ist ein View gesetzt
// uebernimmt dieser das Zeichnen, z.B. fuer CheckBoxen
void Paint(OutputDevice& rDev,
- const Rectangle& rRect,
+ const tools::Rectangle& rRect,
const DbGridRow* pRow,
const css::uno::Reference< css::util::XNumberFormatter >& xFormatter);
@@ -292,8 +292,8 @@ public:
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) = 0;
// Painten eines Zellinhalts im vorgegeben Rechteck
- virtual void PaintFieldToCell( OutputDevice& rDev, const Rectangle& rRect, const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter);
- virtual void PaintCell( OutputDevice& _rDev, const Rectangle& _rRect );
+ virtual void PaintFieldToCell( OutputDevice& rDev, const tools::Rectangle& rRect, const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter);
+ virtual void PaintCell( OutputDevice& _rDev, const tools::Rectangle& _rRect );
void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat );
@@ -397,7 +397,7 @@ public:
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
- virtual void PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect,
+ virtual void PaintFieldToCell( OutputDevice& _rDev, const tools::Rectangle& _rRect,
const css::uno::Reference< css::sdb::XColumn >& _rxField,
const css::uno::Reference< css::util::XNumberFormatter >& _rxFormatter ) override;
@@ -445,7 +445,7 @@ public:
virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual ::svt::CellControllerRef CreateController() const override;
- virtual void PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect,
+ virtual void PaintFieldToCell(OutputDevice& rDev, const tools::Rectangle& rRect,
const css::uno::Reference< css::sdb::XColumn >& _rxField,
const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
@@ -676,7 +676,7 @@ public:
virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override;
virtual ::svt::CellControllerRef CreateController() const override;
- virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect) override;
+ virtual void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect) override;
virtual void Update() override;
virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override;
virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
@@ -813,7 +813,7 @@ public:
}
virtual void PaintFieldToCell(OutputDevice& rDev,
- const Rectangle& rRect,
+ const tools::Rectangle& rRect,
const css::uno::Reference< css::sdb::XColumn >& xField,
const css::uno::Reference< css::util::XNumberFormatter >& xFormatter);
@@ -848,7 +848,7 @@ public:
FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl );
virtual void PaintFieldToCell(OutputDevice& rDev,
- const Rectangle& rRect,
+ const tools::Rectangle& rRect,
const css::uno::Reference< css::sdb::XColumn >& xField,
const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
@@ -1085,7 +1085,7 @@ public:
static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
// painting the filter text
- void PaintCell(OutputDevice& rDev, const Rectangle& rRect);
+ void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect);
void Update(){m_pCellControl->Update();}
// OComponentHelper
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index 76d626de9d09..827fab99a0b2 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -69,14 +69,14 @@ class SvxPixelCtlAccessibleChild :
SvxPixelCtl& mrParentWindow;
css::uno::Reference< css::accessibility::XAccessible > mxParent;
bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color
- Rectangle* mpBoundingBox;
+ tools::Rectangle* mpBoundingBox;
/// index of child in parent
long mnIndexInParent;
public:
SvxPixelCtlAccessibleChild(
SvxPixelCtl& rWindow,
bool bPixelColorOrBG,
- const Rectangle& rBounds,
+ const tools::Rectangle& rBounds,
const css::uno::Reference< css::accessibility::XAccessible >& xParent,
long nIndexInParent );
virtual ~SvxPixelCtlAccessibleChild() override;
@@ -129,10 +129,10 @@ public:
virtual void SAL_CALL disposing() override;
/// @throws css::uno::RuntimeException
- Rectangle GetBoundingBoxOnScreen();
+ tools::Rectangle GetBoundingBoxOnScreen();
/// @throws css::uno::RuntimeException
- Rectangle const & GetBoundingBox();
+ tools::Rectangle const & GetBoundingBox();
/// @returns true if it's disposed or in disposing
inline bool IsAlive() const;
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 7238478c269d..1a71e781d2ef 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star { namespace awt {
class XFocusListener;
} } } }
-class Rectangle;
+namespace tools { class Rectangle; }
class SvxRectCtl;
class SvxRectCtlChildAccessibleContext;
namespace vcl { class Window; }
@@ -222,12 +222,12 @@ protected:
/// @Return the object's current bounding box relative to the desktop.
///
/// @throws css::uno::RuntimeException
- Rectangle GetBoundingBoxOnScreen();
+ tools::Rectangle GetBoundingBoxOnScreen();
/// @Return the object's current bounding box relative to the parent object.
///
/// @throws css::uno::RuntimeException
- Rectangle GetBoundingBox();
+ tools::Rectangle GetBoundingBox();
virtual void SAL_CALL disposing() override;
@@ -286,7 +286,7 @@ public:
const css::uno::Reference< css::accessibility::XAccessible>& rxParent,
const vcl::Window& rParentWindow,
const OUString& rName, const OUString& rDescription,
- const Rectangle& rBoundingBox,
+ const tools::Rectangle& rBoundingBox,
long nIndexInParent );
protected:
virtual ~SvxRectCtlChildAccessibleContext() override;
@@ -401,10 +401,10 @@ public:
protected:
/// @throws css::uno::RuntimeException
- Rectangle GetBoundingBoxOnScreen();
+ tools::Rectangle GetBoundingBoxOnScreen();
/// @throws css::uno::RuntimeException
- Rectangle const & GetBoundingBox();
+ tools::Rectangle const & GetBoundingBox();
void CommitChange( const css::accessibility::AccessibleEventObject& rEvent );
@@ -437,7 +437,7 @@ private:
mxParent;
/// Bounding box
- Rectangle* mpBoundingBox;
+ tools::Rectangle* mpBoundingBox;
/// window of parent
const vcl::Window& mrParentWindow;