diff options
Diffstat (limited to 'include/sfx2')
25 files changed, 57 insertions, 57 deletions
diff --git a/include/sfx2/StylePreviewRenderer.hxx b/include/sfx2/StylePreviewRenderer.hxx index 419a7ee8097c..6e3cf72b2212 100644 --- a/include/sfx2/StylePreviewRenderer.hxx +++ b/include/sfx2/StylePreviewRenderer.hxx @@ -50,7 +50,7 @@ public: virtual bool recalculate() = 0; virtual Size getRenderSize() = 0; - virtual bool render(const Rectangle& aRectangle, RenderAlign eRenderAlign = RenderAlign::CENTER) = 0; + virtual bool render(const tools::Rectangle& aRectangle, RenderAlign eRenderAlign = RenderAlign::CENTER) = 0; }; } // end namespace sfx2 diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 5798c07d3de2..dbdabc015f77 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -41,7 +41,7 @@ class BasicManager; class DdeService; class PrinterDialog; class Point; -class Rectangle; +namespace tools { class Rectangle; } class AppSettings; struct SfxChildWinContextFactory; class SfxAppData_Impl; diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index d9b3109e4466..62b6231e8bd3 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -40,8 +40,8 @@ bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const css::uno::Reference< class SFX2_DLLPUBLIC SfxDockingWindow : public DockingWindow { private: - Rectangle aInnerRect; - Rectangle aOuterRect; + tools::Rectangle aInnerRect; + tools::Rectangle aOuterRect; SfxBindings* pBindings; Size aFloatSize; SfxChildWindow* pMgr; @@ -51,7 +51,7 @@ private: void operator =(SfxDockingWindow &) = delete; protected: - SfxChildAlignment CalcAlignment(const Point& rPos, Rectangle& rRect ); + SfxChildAlignment CalcAlignment(const Point& rPos, tools::Rectangle& rRect ); virtual Size CalcDockingSize(SfxChildAlignment); virtual SfxChildAlignment CheckAlignment(SfxChildAlignment,SfxChildAlignment); @@ -60,10 +60,10 @@ protected: virtual bool PrepareToggleFloatingMode() override; virtual void ToggleFloatingMode() override; virtual void StartDocking() override; - virtual bool Docking( const Point& rPos, Rectangle& rRect ) override; - virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) override; + virtual bool Docking( const Point& rPos, tools::Rectangle& rRect ) override; + virtual void EndDocking( const tools::Rectangle& rRect, bool bFloatMode ) override; virtual void Resizing( Size& rSize ) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual bool Close() override; virtual void Move() override; @@ -85,10 +85,10 @@ public: virtual void FillInfo(SfxChildWinInfo&) const; virtual void StateChanged( StateChangedType nStateChange ) override; - void SetDockingRects(const Rectangle& rOuter, const Rectangle& rInner) + void SetDockingRects(const tools::Rectangle& rOuter, const tools::Rectangle& rInner) { aInnerRect = rInner; aOuterRect = rOuter; } - const Rectangle& GetInnerRect() const { return aInnerRect; } - const Rectangle& GetOuterRect() const { return aOuterRect; } + const tools::Rectangle& GetInnerRect() const { return aInnerRect; } + const tools::Rectangle& GetOuterRect() const { return aOuterRect; } SfxBindings& GetBindings() const { return *pBindings; } sal_uInt16 GetType() const { return pMgr->GetType(); } SfxChildAlignment GetAlignment() const { return pMgr->GetAlignment(); } diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index b8afc7f9b26d..b14bb6e6f0b5 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -69,7 +69,7 @@ class SfxViewFrame; class SfxFrameDescriptor; class SfxFrameSetDescriptor; class SfxDispatcher; -class Rectangle; +namespace tools { class Rectangle; } class SfxRequest; class SystemWindow; class SfxFrameArr_Impl; @@ -163,7 +163,7 @@ public: SAL_DLLPRIVATE bool OwnsBindings_Impl() const; SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl() const; SAL_DLLPRIVATE void SetToolSpaceBorderPixel_Impl( const SvBorder& ); - SAL_DLLPRIVATE Rectangle GetTopOuterRectPixel_Impl() const; + SAL_DLLPRIVATE tools::Rectangle GetTopOuterRectPixel_Impl() const; SAL_DLLPRIVATE void CreateWorkWindow_Impl(); SAL_DLLPRIVATE void GrabFocusOnComponent_Impl(); diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index d78aed2d61a9..4ad6d8a7ab14 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -64,7 +64,7 @@ class SfxInfoBarWindow : public vcl::Window virtual void dispose() override; const OUString& getId() const { return m_sId; } - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; virtual void Resize( ) override; basegfx::BColor m_aBackgroundColor; basegfx::BColor m_aForegroundColor; diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 1ab9f4df89fd..0bc3d99ebc21 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -50,7 +50,7 @@ friend class SfxInPlaceClient_Impl; SAL_DLLPRIVATE virtual void ObjectAreaChanged(); // an active object was resized by the user and now asks for the new space - SAL_DLLPRIVATE virtual void RequestNewObjectArea( Rectangle& ); + SAL_DLLPRIVATE virtual void RequestNewObjectArea( tools::Rectangle& ); // notify the client that an active object has changed its VisualAreaSize SAL_DLLPRIVATE virtual void ViewChanged(); @@ -70,11 +70,11 @@ public: bool IsObjectUIActive() const; bool IsObjectInPlaceActive() const; void DeactivateObject(); - bool SetObjArea( const Rectangle & ); - const Rectangle& GetObjArea() const; - Rectangle GetScaledObjArea() const; + bool SetObjArea( const tools::Rectangle & ); + const tools::Rectangle& GetObjArea() const; + tools::Rectangle GetScaledObjArea() const; void SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight ); - void SetObjAreaAndScale( const Rectangle&, const Fraction&, const Fraction& ); + void SetObjAreaAndScale( const tools::Rectangle&, const Fraction&, const Fraction& ); const Fraction& GetScaleWidth() const; const Fraction& GetScaleHeight() const; void Invalidate(); diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index cf1ca2a2fe2d..d8a74fcbf307 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -628,9 +628,9 @@ public: virtual Printer * GetDocumentPrinter(); virtual OutputDevice* GetDocumentRefDev(); virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ); - virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const; - virtual void SetVisArea( const Rectangle & rVisArea ); - const Rectangle & GetVisArea() const; + virtual tools::Rectangle GetVisArea( sal_uInt16 nAspect ) const; + virtual void SetVisArea( const tools::Rectangle & rVisArea ); + const tools::Rectangle & GetVisArea() const; void SetVisAreaSize( const Size & rVisSize ); virtual sal_uIntPtr GetMiscStatus() const; diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index 0c2a238092c8..bbf2ac917faa 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -80,7 +80,7 @@ protected: virtual void OnItemDblClicked(ThumbnailViewItem *pItem) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void LoseFocus() override; diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx index 63ff1ef31277..00fdb3e77d23 100644 --- a/include/sfx2/recentdocsviewitem.hxx +++ b/include/sfx2/recentdocsviewitem.hxx @@ -24,7 +24,7 @@ public: Returns rectangle that needs to be invalidated. */ - virtual Rectangle updateHighlight(bool bVisible, const Point& rPoint) override; + virtual tools::Rectangle updateHighlight(bool bVisible, const Point& rPoint) override; /// Text to be used for the tooltip. virtual OUString getHelpText() const override; @@ -39,7 +39,7 @@ public: protected: /// Return area where is the icon to remove document from the recent documents. - Rectangle getRemoveIconArea() const; + tools::Rectangle getRemoveIconArea() const; private: OUString maURL; diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx index fa27ec5c1d4c..044c7edfda8c 100644 --- a/include/sfx2/sidebar/Deck.hxx +++ b/include/sfx2/sidebar/Deck.hxx @@ -47,7 +47,7 @@ public: const OUString& GetId() const { return msId; } VclPtr<DeckTitleBar> GetTitleBar() const; - Rectangle GetContentArea() const; + tools::Rectangle GetContentArea() const; void ResetPanels (const SharedPanelContainer& rPanels); const SharedPanelContainer& GetPanels() const { return maPanels; } @@ -63,7 +63,7 @@ public: void ShowPanel (const Panel& rPanel); virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) override; virtual void DataChanged (const DataChangedEvent& rEvent) override; virtual bool EventNotify(NotifyEvent& rEvent) override; @@ -75,7 +75,7 @@ public: { public: ScrollContainerWindow(vcl::Window* pParentWindow); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) override; void SetSeparators(const ::std::vector<sal_Int32>& rSeparators); private: std::vector<sal_Int32> maSeparators; diff --git a/include/sfx2/sidebar/DeckLayouter.hxx b/include/sfx2/sidebar/DeckLayouter.hxx index 8b3b24810aba..27a94dd7b3e9 100644 --- a/include/sfx2/sidebar/DeckLayouter.hxx +++ b/include/sfx2/sidebar/DeckLayouter.hxx @@ -40,7 +40,7 @@ class Panel; namespace DeckLayouter { void LayoutDeck ( - const Rectangle& rContentArea, + const tools::Rectangle& rContentArea, sal_Int32& rMinimalWidth, SharedPanelContainer& rPanels, vcl::Window& pDeckTitleBar, diff --git a/include/sfx2/sidebar/DeckTitleBar.hxx b/include/sfx2/sidebar/DeckTitleBar.hxx index 9ddba79046a2..3542cd45e0fb 100644 --- a/include/sfx2/sidebar/DeckTitleBar.hxx +++ b/include/sfx2/sidebar/DeckTitleBar.hxx @@ -35,8 +35,8 @@ public: virtual void DataChanged(const DataChangedEvent& rEvent) override; protected: - virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) override; - virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) override; + virtual tools::Rectangle GetTitleArea(const tools::Rectangle& rTitleBarBox) override; + virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const tools::Rectangle& rTitleBarBox) override; virtual sidebar::Paint GetBackgroundPaint() override; virtual void HandleToolBoxItemClick(const sal_uInt16 nItemIndex) override; virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; diff --git a/include/sfx2/sidebar/DrawHelper.hxx b/include/sfx2/sidebar/DrawHelper.hxx index 97bdb0c04530..f80a0ca12775 100644 --- a/include/sfx2/sidebar/DrawHelper.hxx +++ b/include/sfx2/sidebar/DrawHelper.hxx @@ -34,13 +34,13 @@ class Paint; class DrawHelper { public: - static void DrawBorder(vcl::RenderContext& rRenderContext, const Rectangle& rBox, const SvBorder& rBorderSize, + static void DrawBorder(vcl::RenderContext& rRenderContext, const tools::Rectangle& rBox, const SvBorder& rBorderSize, const Paint& rHorizontalPaint, const Paint& rVerticalPaint); static void DrawHorizontalLine(vcl::RenderContext& rRenderContext, const sal_Int32 nLeft, const sal_Int32 nRight, const sal_Int32 nY, const sal_Int32 nHeight, const Paint& rPaint); static void DrawVerticalLine(vcl::RenderContext& rRenderContext, const sal_Int32 nTop, const sal_Int32 nBottom, const sal_Int32 nX, const sal_Int32 nWidth, const Paint& rPaint); - static void DrawRoundedRectangle(vcl::RenderContext& rRenderContext, const Rectangle& rBox, const sal_Int32 nCornerRadius, + static void DrawRoundedRectangle(vcl::RenderContext& rRenderContext, const tools::Rectangle& rBox, const sal_Int32 nCornerRadius, const Color& rBorderColor, const Paint& rFillPaint); }; diff --git a/include/sfx2/sidebar/MenuButton.hxx b/include/sfx2/sidebar/MenuButton.hxx index 72438050a654..e5be89ffd075 100644 --- a/include/sfx2/sidebar/MenuButton.hxx +++ b/include/sfx2/sidebar/MenuButton.hxx @@ -29,7 +29,7 @@ class MenuButton public: MenuButton (vcl::Window* pParentWindow); - virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) override; + virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& rUpdateArea) override; virtual void MouseMove (const MouseEvent& rEvent) override; virtual void MouseButtonDown (const MouseEvent& rMouseEvent) override; virtual void MouseButtonUp (const MouseEvent& rMouseEvent) override; diff --git a/include/sfx2/sidebar/PanelTitleBar.hxx b/include/sfx2/sidebar/PanelTitleBar.hxx index 998a12d68ee6..4a5475a98c93 100644 --- a/include/sfx2/sidebar/PanelTitleBar.hxx +++ b/include/sfx2/sidebar/PanelTitleBar.hxx @@ -44,8 +44,8 @@ public: virtual void MouseButtonUp(const MouseEvent& rMouseEvent) override; protected: - virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) override; - virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) override; + virtual tools::Rectangle GetTitleArea(const tools::Rectangle& rTitleBarBox) override; + virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const tools::Rectangle& rTitleBarBox) override; virtual sidebar::Paint GetBackgroundPaint() override; virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) override; virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index 5832f2124db3..cf46885a4a7b 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -235,7 +235,7 @@ private: const Context& rContext); void ShowPopupMenu ( - const Rectangle& rButtonBox, + const tools::Rectangle& rButtonBox, const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; VclPtr<PopupMenu> CreatePopupMenu ( const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index df4b0c01983e..6ae1edeb93c5 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -63,7 +63,7 @@ public: bool mbIsEnabled; }; typedef ::std::function<void ( - const Rectangle&, + const tools::Rectangle&, const ::std::vector<DeckMenuData>& rMenuData)> PopupMenuProvider; TabBar ( vcl::Window* pParentWindow, @@ -75,7 +75,7 @@ public: virtual ~TabBar() override; virtual void dispose() override; - virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) override; + virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& rUpdateArea) override; virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) override; virtual bool EventNotify (NotifyEvent& rEvent) override; diff --git a/include/sfx2/sidebar/TabItem.hxx b/include/sfx2/sidebar/TabItem.hxx index a5e26ffd7500..ff39fb4e9cd6 100644 --- a/include/sfx2/sidebar/TabItem.hxx +++ b/include/sfx2/sidebar/TabItem.hxx @@ -35,7 +35,7 @@ class TabItem public: TabItem (vcl::Window* pParentWindow); - virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; + virtual void Paint (vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) override; virtual void MouseMove (const MouseEvent& rEvent) override; virtual void MouseButtonDown (const MouseEvent& rMouseEvent) override; virtual void MouseButtonUp (const MouseEvent& rMouseEvent) override; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index 6f0915e1c17a..ba71420b9f92 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -185,7 +185,7 @@ private: std::vector<Paint> maPaints; std::vector<sal_Int32> maIntegers; std::vector<bool> maBooleans; - std::vector<Rectangle> maRectangles; + std::vector<tools::Rectangle> maRectangles; bool mbIsHighContrastMode; bool mbIsHighContrastModeSetManually; diff --git a/include/sfx2/sidebar/TitleBar.hxx b/include/sfx2/sidebar/TitleBar.hxx index 2a554317fb39..35c37fc11424 100644 --- a/include/sfx2/sidebar/TitleBar.hxx +++ b/include/sfx2/sidebar/TitleBar.hxx @@ -41,7 +41,7 @@ public: void SetIcon (const Image& rIcon); virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rUpdateArea) override; virtual void DataChanged (const DataChangedEvent& rEvent) override; virtual void setPosSizePixel (long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) override; @@ -58,9 +58,9 @@ protected: VclPtr<SidebarToolBox> maToolBox; OUString msTitle; - virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) = 0; - virtual void PaintDecoration (vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) = 0; - void PaintFocus(vcl::RenderContext& rRenderContext, const Rectangle& rFocusBox); + virtual tools::Rectangle GetTitleArea (const tools::Rectangle& rTitleBarBox) = 0; + virtual void PaintDecoration (vcl::RenderContext& rRenderContext, const tools::Rectangle& rTitleBarBox) = 0; + void PaintFocus(vcl::RenderContext& rRenderContext, const tools::Rectangle& rFocusBox); virtual sidebar::Paint GetBackgroundPaint() = 0; virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex); virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; @@ -69,7 +69,7 @@ private: Image maIcon; sidebar::Paint maBackgroundPaint; - void PaintTitle(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBox); + void PaintTitle(vcl::RenderContext& rRenderContext, const tools::Rectangle& rTitleBox); DECL_LINK(SelectionHandler, ToolBox*, void); }; diff --git a/include/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx index 098241fcf1af..f16d8393fbf6 100644 --- a/include/sfx2/templateviewitem.hxx +++ b/include/sfx2/templateviewitem.hxx @@ -28,7 +28,7 @@ public: bool IsDefaultTemplate() const { return mbIsDefaultTemplate; } - Rectangle getDefaultIconArea() const; + tools::Rectangle getDefaultIconArea() const; virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, const ThumbnailItemAttributes *pAttrs) override; diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index d5f0a5a91b14..421f2414398d 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -246,7 +246,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void GetFocus() override; diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index b39c1d2d5844..11236f3bdfa2 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -98,7 +98,7 @@ public: Returns rectangle that needs to be invalidated. */ - virtual Rectangle updateHighlight(bool bVisible, const Point& rPoint); + virtual tools::Rectangle updateHighlight(bool bVisible, const Point& rPoint); /// Text to be used for the tooltip. @@ -112,9 +112,9 @@ public: css::uno::Reference< css::accessibility::XAccessible > const & GetAccessible( bool bIsTransientChildrenDisabled ); - void setDrawArea (const Rectangle &area); + void setDrawArea (const tools::Rectangle &area); - const Rectangle& getDrawArea () const { return maDrawArea; } + const tools::Rectangle& getDrawArea () const { return maDrawArea; } virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, const long nPadding, sal_uInt32 nMaxTextLength, @@ -133,7 +133,7 @@ protected: Point maTextPos; Point maPrev1Pos; - Rectangle maDrawArea; + tools::Rectangle maDrawArea; }; #endif // INCLUDED_SFX2_THUMBNAILVIEWITEM_HXX diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index a83de3084d5e..93c5f5527f57 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -57,14 +57,14 @@ namespace sfx2 protected: // Window overridables - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& i_rArea) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& i_rArea) override; virtual void Resize() override; virtual void StateChanged( StateChangedType i_nType ) override; virtual void DataChanged( const DataChangedEvent& i_rDataChangedEvent ) override; virtual void SetText( const OUString& i_rText ) override; // DockingWindow overridables - void EndDocking(const Rectangle& rRect, bool bFloatMode) override; + void EndDocking(const tools::Rectangle& rRect, bool bFloatMode) override; virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; protected: diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 52792c3d2f7b..72fed2785283 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -201,7 +201,7 @@ public: virtual void UIDeactivated( SfxInPlaceClient* pClient ); void JumpToMark( const OUString& rMark ); - void VisAreaChanged(const Rectangle& rRect); + void VisAreaChanged(const tools::Rectangle& rRect); // Misc @@ -249,7 +249,7 @@ public: virtual void ReadUserData( const OUString&, bool bBrowse = false ); virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& ); virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& ); - virtual void QueryObjAreaPixel( Rectangle& rRect ) const; + virtual void QueryObjAreaPixel( tools::Rectangle& rRect ) const; virtual SfxObjectShell* GetObjectShell() override; @@ -315,7 +315,7 @@ public: SAL_DLLPRIVATE void ExecPrint_Impl(SfxRequest &); SAL_DLLPRIVATE void ExecMisc_Impl(SfxRequest &); SAL_DLLPRIVATE void GetState_Impl(SfxItemSet&); - SAL_DLLPRIVATE void CheckIPClient_Impl(SfxInPlaceClient*, const Rectangle&); + SAL_DLLPRIVATE void CheckIPClient_Impl(SfxInPlaceClient*, const tools::Rectangle&); SAL_DLLPRIVATE void PushSubShells_Impl( bool bPush=true ); SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( false ); } SAL_DLLPRIVATE void TakeOwnership_Impl(); |