[Libreoffice-commits] core.git: Branch 'feature/SOSAW080' - include/svx reportdesign/inc sc/inc sd/source sw/inc

[Armin Le Grand (CIB)]

 include/svx/unomodel.hxx              |    2 +-
 reportdesign/inc/ReportDefinition.hxx |    5 ++++-
 sc/inc/docuno.hxx                     |    2 +-
 sd/source/ui/inc/unomodel.hxx         |    2 +-
 sw/inc/unotxdoc.hxx                   |    2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 31733e8e7e4ef4a59f11d9b7bcba06be9455606d
Author: Armin Le Grand <Armin.Le.Grand at cib.de (CIB)>
Date:   Sun Mar 18 11:20:36 2018 +0100

    SOSAW080: getSdrModelFromUnoModel added override marks
    
    Change-Id: I22de9a1c8af7c25be5c108671ddc548ba323ed47

diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx
index 7f8a27a20f2b..e637e4486d2a 100644
--- a/include/svx/unomodel.hxx
+++ b/include/svx/unomodel.hxx
@@ -56,7 +56,7 @@ private:
 
 protected:
     // SvxUnoDrawMSFactory
-    virtual SdrModel* getSdrModelFromUnoModel() const;
+    virtual SdrModel* getSdrModelFromUnoModel() const override;
 
 public:
     SvxUnoDrawingModel( SdrModel* pDoc ) throw();
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 6d877a08ae24..79c58c998600 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -186,11 +186,14 @@ namespace reportdesign
 
         css::uno::Reference< css::uno::XComponentContext > getContext();
 
+    protected:
         /** abstract SdrModel provider */
-        virtual SdrModel* getSdrModelFromUnoModel() const;
+        virtual SdrModel* getSdrModelFromUnoModel() const override;
 
+    public:
         //TTTT Needed? Or same as above?
         static std::shared_ptr<rptui::OReportModel> getSdrModel(const css::uno::Reference< css::report::XReportDefinition >& _xReportDefinition);
+
     private:
         DECLARE_XINTERFACE( )
         DECLARE_XTYPEPROVIDER( )
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 59f8aa0e944c..370fafde938f 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -125,7 +125,7 @@ protected:
     const SfxItemPropertySet&   GetPropertySet() const { return aPropSet; }
 
     /** abstract SdrModel provider */
-    virtual SdrModel* getSdrModelFromUnoModel() const;
+    virtual SdrModel* getSdrModelFromUnoModel() const override;
 
 public:
                             ScModelObj(ScDocShell* pDocSh);
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index 3df8e955fb25..381b22be955f 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -130,7 +130,7 @@ private:
 
 protected:
     /** abstract SdrModel provider */
-    virtual SdrModel* getSdrModelFromUnoModel() const;
+    virtual SdrModel* getSdrModelFromUnoModel() const override;
 
 public:
     SdXImpressDocument(::sd::DrawDocShell* pShell, bool bClipBoard);
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 5ddd11e581fe..e306129526dd 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -207,7 +207,7 @@ private:
 
 protected:
     /** abstract SdrModel provider */
-    virtual SdrModel* getSdrModelFromUnoModel() const;
+    virtual SdrModel* getSdrModelFromUnoModel() const override;
 
     virtual ~SwXTextDocument() override;
 public: