[Libreoffice-commits] core.git: connectivity/source cppcanvas/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx |    5 -----
 cppcanvas/source/mtfrenderer/mtftools.cxx                       |   10 +++++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 6e614489dcf70a812e298e1d84864312d9ac9d23
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Dec 7 23:05:55 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Dec 8 09:44:07 2018 +0100

    Clean up obsolete uses of BOOST_FALLTHROUGH
    
    Change-Id: If391c86c9b2c94eed9b95c692f290449a241ed4e
    Reviewed-on: https://gerrit.libreoffice.org/64790
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
index 6397831e80dd..9c04c75a6c06 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
@@ -25,7 +25,6 @@
 
 #include <sal/log.hxx>
 
-#include <boost/config.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <cppuhelper/typeprovider.hxx>
@@ -444,11 +443,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co
                 break;
             }
 
-#if defined __GNUC__ && !defined __clang__
             [[fallthrough]];
-#else
-            BOOST_FALLTHROUGH;
-#endif
         }
 
             // TODO other types
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index 882857959b7b..bd1fac905f3f 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -338,34 +338,34 @@ namespace cppcanvas
                 {
                     case LINESTYLE_BOLDDOTTED:
                         bIsBold = true;
-                        BOOST_FALLTHROUGH;
+                        [[fallthrough]];
                     case LINESTYLE_DOTTED:
                         pArray = aDottedArray;
                     break;
 
                     case LINESTYLE_BOLDDASH:
                         bIsBold = true;
-                        BOOST_FALLTHROUGH;
+                        [[fallthrough]];
                     case LINESTYLE_DASH:
                         pArray = aDashedArray;
                     break;
 
                     case LINESTYLE_BOLDLONGDASH:
                         bIsBold = true;
-                        BOOST_FALLTHROUGH;
+                        [[fallthrough]];
                     case LINESTYLE_LONGDASH:
                         pArray = aLongDashArray;
                     break;
 
                     case LINESTYLE_BOLDDASHDOT:
                         bIsBold = true;
-                        BOOST_FALLTHROUGH;
+                        [[fallthrough]];
                     case LINESTYLE_DASHDOT:
                         pArray = aDotDashArray;
                     break;
                     case LINESTYLE_BOLDDASHDOTDOT:
                         bIsBold = true;
-                        BOOST_FALLTHROUGH;
+                        [[fallthrough]];
                     case LINESTYLE_DASHDOTDOT:
                         pArray = aDashDotDotArray;
                     break;