diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 12:24:05 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 22:47:49 +0100 |
commit | 66ef8ca217680095d8aaae025d82c2cbcd8ec1d2 (patch) | |
tree | 2a7f4d2b5892c5fea9b89f0f27ccd6f771af5769 /sw/source/filter/xml/xmltbli.cxx | |
parent | 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b (diff) |
HAVE_CPP_INLINE_VARIABLES is always true now
...but for safety, leave the configure.ac check in for some longer.
Also remove now-redundant SAL_INLINE_VARIABLE again (which was
LIBO_INTERNAL_ONLY).
Change-Id: Id049e0cb84b4f97f5859f1b16b867b39b448dec0
Reviewed-on: https://gerrit.libreoffice.org/64772
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/source/filter/xml/xmltbli.cxx')
-rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 2207d929a9c4..1932006ea8ba 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/table/XCellRange.hpp> -#include <config_global.h> #include <o3tl/numeric.hxx> #include <o3tl/make_unique.hxx> #include <o3tl/safeint.hxx> @@ -1227,10 +1226,6 @@ public: } }; -#if !HAVE_CPP_INLINE_VARIABLES -constexpr sal_Int32 SwXMLTableContext::MAX_WIDTH; -#endif - const SwXMLTableCell_Impl *SwXMLTableContext::GetCell( sal_uInt32 nRow, sal_uInt32 nCol ) const { |