diff options
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r-- | sc/source/ui/inc/AccessibleCell.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessibleContextBase.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessibleDocument.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessibleDocumentPagePreview.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessibleEditObject.hxx | 8 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessiblePageHeader.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessiblePageHeaderArea.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessiblePreviewCell.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessiblePreviewTable.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessibleSpreadsheet.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/conflictsdlg.hxx | 12 | ||||
-rw-r--r-- | sc/source/ui/inc/inscldlg.hxx | 3 |
13 files changed, 32 insertions, 33 deletions
diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 69764db893b5..0df06614d38f 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -91,10 +91,10 @@ public: protected: /// Return the object's current bounding box relative to the desktop. - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const override; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override; /// Return the object's current bounding box relative to the parent object. - virtual tools::Rectangle GetBoundingBox() const override; + virtual tools::Rectangle GetBoundingBox() override; public: ///===== XAccessibleContext ============================================== diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 526727e4a242..db795a0bc122 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -147,12 +147,12 @@ protected: /// Return the object's current bounding box relative to the desktop. /// /// @throws css::uno::RuntimeException - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const = 0; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() = 0; /// Return the object's current bounding box relative to the parent object. /// /// @throws css::uno::RuntimeException - virtual tools::Rectangle GetBoundingBox() const = 0; + virtual tools::Rectangle GetBoundingBox() = 0; public: /// Calls all listeners to notify them about the change. diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 7ef7882efa79..707724d31cb6 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -217,10 +217,10 @@ protected: createAccessibleName() override; /// Return the object's current bounding box relative to the desktop. - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const override; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override; /// Return the object's current bounding box relative to the parent object. - virtual tools::Rectangle GetBoundingBox() const override; + virtual tools::Rectangle GetBoundingBox() override; private: ScTabViewShell* mpViewShell; @@ -248,7 +248,7 @@ private: OUString GetCurrentCellName() const; static const OUString & GetCurrentCellDescription(); - tools::Rectangle GetVisibleArea_Impl() const; + tools::Rectangle GetVisibleArea_Impl(); public: ScDocument *GetDocument() const ; ScAddress GetCurCellAddress() const; diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index 956825a2dc20..8b5284e52bd7 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -106,11 +106,11 @@ protected: public: // needed in ScShapeChildren /// Return the object's current bounding box relative to the desktop. - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const override; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override; protected: /// Return the object's current bounding box relative to the parent object. - virtual tools::Rectangle GetBoundingBox() const override; + virtual tools::Rectangle GetBoundingBox() override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 159fa2eeb77e..451d28ee71ab 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -94,10 +94,10 @@ public: protected: /// Return the object's current bounding box relative to the desktop. - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const override; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override; /// Return the object's current bounding box relative to the parent object. - virtual tools::Rectangle GetBoundingBox() const override; + virtual tools::Rectangle GetBoundingBox() override; public: ///===== XAccessibleContext ============================================== @@ -198,10 +198,10 @@ private: protected: /// Return the object's current bounding box relative to the desktop. - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const override; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override; /// Return the object's current bounding box relative to the parent object. - virtual tools::Rectangle GetBoundingBox() const override; + virtual tools::Rectangle GetBoundingBox() override; public: ScAccessibleEditControlObject(weld::CustomWidgetController* pController, EditObjectType eObjectType) diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index d08db8dacdb7..ddba68248cb5 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -69,8 +69,8 @@ protected: virtual OUString createAccessibleDescription() override; virtual OUString createAccessibleName() override; - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const override; - virtual tools::Rectangle GetBoundingBox() const override; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override; + virtual tools::Rectangle GetBoundingBox() override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index a1e813ec67e0..75d1b12b46c6 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -97,8 +97,8 @@ protected: virtual OUString createAccessibleDescription() override; virtual OUString createAccessibleName() override; - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const override; - virtual tools::Rectangle GetBoundingBox() const override; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override; + virtual tools::Rectangle GetBoundingBox() override; private: std::unique_ptr<EditTextObject> mpEditObj; diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index b40b65242df3..9c128c844f4b 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -77,8 +77,8 @@ public: getImplementationId() override; protected: - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const override; - virtual tools::Rectangle GetBoundingBox() const override; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override; + virtual tools::Rectangle GetBoundingBox() override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index f3317b41331b..01b1171120cd 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -107,8 +107,8 @@ protected: virtual OUString createAccessibleDescription() override; virtual OUString createAccessibleName() override; - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const override; - virtual tools::Rectangle GetBoundingBox() const override; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override; + virtual tools::Rectangle GetBoundingBox() override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index 34fa7a8d3643..49f9b5183c0a 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -116,8 +116,8 @@ protected: virtual OUString createAccessibleDescription() override; virtual OUString createAccessibleName() override; - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const override; - virtual tools::Rectangle GetBoundingBox() const override; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override; + virtual tools::Rectangle GetBoundingBox() override; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index d1d906dda622..7a966905331d 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -206,10 +206,10 @@ private: virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) override; /// Return the object's current bounding box relative to the desktop. - virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() const override; + virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override; /// Return the object's current bounding box relative to the parent object. - virtual tools::Rectangle GetBoundingBox() const override; + virtual tools::Rectangle GetBoundingBox() override; bool IsDefunc(sal_Int64 nParentStates); bool IsEditable(); diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index f0ab643e0533..2c2c0c6d576b 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -107,11 +107,9 @@ class ScConflictsDlg : public weld::GenericDialogController private: OUString maStrUnknownUser; - ScViewData* const mpViewData; - ScDocument* mpOwnDoc; - ScChangeTrack* mpOwnTrack; - ScDocument* const mpSharedDoc; - ScChangeTrack* mpSharedTrack; + ScViewData& mrViewData; + ScDocument& mrOwnDoc; + ScDocument& mrSharedDoc; ScConflictsList& mrConflictsList; Idle maSelectionIdle; @@ -124,7 +122,7 @@ private: std::unique_ptr<SvxRedlinTable> m_xLbConflicts; OUString GetConflictString( const ScConflictsListEntry& rConflictEntry ); - void SetActionString(const ScChangeAction* pAction, ScDocument* pDoc, const weld::TreeIter& rEntry); + void SetActionString(ScChangeAction& rAction, ScDocument& rDoc, const weld::TreeIter& rEntry); void HandleListBoxSelection(); void SetConflictAction(const weld::TreeIter& rRootEntry, ScConflictAction eConflictAction); @@ -139,7 +137,7 @@ private: DECL_LINK( KeepAllOthersHandle, weld::Button&, void ); public: - ScConflictsDlg(weld::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList); + ScConflictsDlg(weld::Window* pParent, ScViewData& rViewData, ScDocument& rSharedDoc, ScConflictsList& rConflictsList); virtual ~ScConflictsDlg() override; void UpdateView(); diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index c9de99edc2be..c8906ece36bc 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.hxx @@ -22,6 +22,7 @@ #include <vcl/weld.hxx> #include <global.hxx> +#include "viewdata.hxx" class ScInsertCellDlg : public weld::GenericDialogController { @@ -38,7 +39,7 @@ private: static constexpr size_t MAX_INS_COLS = 4000; public: - ScInsertCellDlg(weld::Window* pParent, bool bDisallowCellMove); + ScInsertCellDlg(weld::Window* pParent, ScViewData& rViewData, bool bDisallowCellMove); virtual ~ScInsertCellDlg() override; InsCellCmd GetInsCellCmd() const; |