summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc/View.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /sd/source/ui/inc/View.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sd/source/ui/inc/View.hxx')
-rw-r--r--sd/source/ui/inc/View.hxx42
1 files changed, 21 insertions, 21 deletions
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 3ef12728cc6f..c7c74024ab4a 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -93,17 +93,17 @@ public:
ViewShell* pViewSh=NULL);
virtual ~View();
- void CompleteRedraw( OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE;
+ void CompleteRedraw( OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) override;
virtual bool GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const;
virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false);
- virtual void MarkListHasChanged() SAL_OVERRIDE;
- virtual void ModelHasChanged() SAL_OVERRIDE;
+ virtual void MarkListHasChanged() override;
+ virtual void ModelHasChanged() override;
void SelectAll();
void DoCut(vcl::Window* pWindow=NULL);
void DoCopy(vcl::Window* pWindow=NULL);
void DoPaste(vcl::Window* pWindow=NULL);
- virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE;
+ virtual void DoConnect(SdrOle2Obj* pOleObj) override;
virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false);
void StartDrag( const Point& rStartPos, vcl::Window* pWindow );
virtual void DragFinished( sal_Int8 nDropAction );
@@ -139,9 +139,9 @@ public:
virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, vcl::Window* pWin = 0L, bool bIsNewObj = false,
SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L,
- bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true) SAL_OVERRIDE;
+ bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true) override;
- virtual SdrEndTextEditKind SdrEndTextEdit(bool bDontDeleteReally = false) SAL_OVERRIDE;
+ virtual SdrEndTextEditKind SdrEndTextEdit(bool bDontDeleteReally = false) override;
bool RestoreDefaultText( SdrTextObj* pTextObj );
@@ -193,32 +193,32 @@ public:
std::vector<OUString> &rBookmarkList,
const sal_uInt16 nType );
- virtual void onAccessibilityOptionsChanged() SAL_OVERRIDE;
+ virtual void onAccessibilityOptionsChanged() override;
- virtual SdrModel* GetMarkedObjModel() const SAL_OVERRIDE;
+ virtual SdrModel* GetMarkedObjModel() const override;
virtual bool Paste(
const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions,
- const OUString& rSrcShellID, const OUString& rDestShellID ) SAL_OVERRIDE;
+ const OUString& rSrcShellID, const OUString& rDestShellID ) override;
using SdrExchangeView::Paste;
/** returns true if we have an undo manager and there is an open list undo action */
bool isRecordingUndo() const;
- virtual void AddCustomHdl() SAL_OVERRIDE;
+ virtual void AddCustomHdl() override;
SmartTagSet& getSmartTags() { return maSmartTags; }
void updateHandles();
- virtual SdrViewContext GetContext() const SAL_OVERRIDE;
- virtual bool HasMarkablePoints() const SAL_OVERRIDE;
- virtual sal_uLong GetMarkablePointCount() const SAL_OVERRIDE;
- virtual bool HasMarkedPoints() const SAL_OVERRIDE;
- virtual sal_uLong GetMarkedPointCount() const SAL_OVERRIDE;
- virtual bool IsPointMarkable(const SdrHdl& rHdl) const SAL_OVERRIDE;
- virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) SAL_OVERRIDE;
- virtual void CheckPossibilities() SAL_OVERRIDE;
- virtual bool MarkPoints(const ::Rectangle* pRect, bool bUnmark) SAL_OVERRIDE;
+ virtual SdrViewContext GetContext() const override;
+ virtual bool HasMarkablePoints() const override;
+ virtual sal_uLong GetMarkablePointCount() const override;
+ virtual bool HasMarkedPoints() const override;
+ virtual sal_uLong GetMarkedPointCount() const override;
+ virtual bool IsPointMarkable(const SdrHdl& rHdl) const override;
+ virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) override;
+ virtual void CheckPossibilities() override;
+ virtual bool MarkPoints(const ::Rectangle* pRect, bool bUnmark) override;
using SdrMarkView::MarkPoints;
bool ShouldToggleOn(
@@ -257,8 +257,8 @@ protected:
DECL_LINK_TYPED( OnParagraphInsertedHdl, ::Outliner *, void );
DECL_LINK_TYPED( OnParagraphRemovingHdl, ::Outliner *, void );
- virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) SAL_OVERRIDE;
- virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) SAL_OVERRIDE;
+ virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) override;
+ virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) override;
SdDrawDocument& mrDoc;
DrawDocShell* mpDocSh;