[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/sal svtools/source

[Libreoffice Gerrit user]

 compilerplugins/clang/fragiledestructor.cxx   |    2 +-
 include/sal/types.h                           |   12 ------------
 svtools/source/config/optionsdrawinglayer.cxx |    2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

New commits:
commit 852a6a57f99f8ceacee791329f2e6ca04a28dc58
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Sep 20 11:18:34 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Sep 20 15:53:56 2018 +0200

    [API CHANGE] Remove unused SAL_FINAL
    
    ...which was never meant to be used by !LIBO_INTERNAL_ONLY code, anyway
    
    Change-Id: I90225efa91c9fa047a23e2a9b73cea0b87c20594
    Reviewed-on: https://gerrit.libreoffice.org/60803
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/sal/types.h b/include/sal/types.h
index 08751c33cd53..6bf4de970f71 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -409,18 +409,6 @@ namespace css = ::com::sun::star;
 #define SAL_OVERRIDE
 #endif
 
-/** C++11 "final" feature.
-
-    For LIBO_INTERNAL_ONLY, mark a class as non-derivable or a method as non-overridable.
-
-    @since LibreOffice 4.1
-*/
-#if defined LIBO_INTERNAL_ONLY
-#define SAL_FINAL final
-#else
-#define SAL_FINAL
-#endif
-
 #if defined LIBO_INTERNAL_ONLY
 #if HAVE_CPP_ATTRIBUTE_FALLTHROUGH
 #define SAL_FALLTHROUGH [[fallthrough]]
commit 92d4e9304cbe07115bfc6c6c0146943b7bcb7cf6
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Sep 20 11:17:00 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Sep 20 15:53:50 2018 +0200

    Replace SAL_FINAL with final in internal code
    
    Change-Id: Ib0d3324d7021ba1a8ff9779807d0a900be5e6226
    Reviewed-on: https://gerrit.libreoffice.org/60802
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/clang/fragiledestructor.cxx b/compilerplugins/clang/fragiledestructor.cxx
index 74f32aa165f6..1631cb30c1e9 100644
--- a/compilerplugins/clang/fragiledestructor.cxx
+++ b/compilerplugins/clang/fragiledestructor.cxx
@@ -95,7 +95,7 @@ bool FragileDestructor::VisitCXXMemberCallExpr(const CXXMemberCallExpr* callExpr
         return true;
     report(
         DiagnosticsEngine::Warning,
-        "calling virtual method from destructor, either make the virtual method SAL_FINAL, or make this class SAL_FINAL",
+        "calling virtual method from destructor, either make the virtual method final, or make this class final",
         compat::getBeginLoc(callExpr))
       << callExpr->getSourceRange();
     report(
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index d1e8427eb032..110af11c4ccd 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -206,7 +206,7 @@ public:
 //  private methods
 
 private:
-    virtual void ImplCommit() SAL_FINAL override;
+    virtual void ImplCommit() final override;
 
     static Sequence< OUString > impl_GetPropertyNames();