diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-02 18:24:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 06:47:35 +0000 |
| commit | ba423579255848440318d6c468a604914901779b (patch) | |
| tree | 7c4bc01a2c7210bca3e8a19a012b15312f37b588 /sw | |
| parent | afa675469cd9894f41a6b9eeb2e7acc8245d256c (diff) | |
Remove uses of SAL_CONSTEXPR in LIBO_INTERNAL_ONLY
Change-Id: I9a7dc7c83302b3361f056fcf6636bbba7672f15f
Reviewed-on: https://gerrit.libreoffice.org/34840
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/docary.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/swtypes.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/viewopt.hxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index dec10c8e23d9..015ee47b047b 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -319,7 +319,7 @@ public: typedef o3tl::sorted_vector<SwRangeRedline*, CompareSwRedlineTable, o3tl::find_partialorder_ptrequals> vector_type; typedef vector_type::size_type size_type; - static SAL_CONSTEXPR size_type const npos = USHRT_MAX; + static constexpr size_type npos = USHRT_MAX; //TODO: std::numeric_limits<size_type>::max() private: vector_type maVector; diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 2de88491609a..3c2110ccd955 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -60,7 +60,7 @@ typedef long SwTwips; // Converts Millimeters to Twips (1 mm == 56.905479 twips). template <typename T = SwTwips> -static SAL_CONSTEXPR T MmToTwips(const double mm) { return static_cast<T>(mm / 0.017573); } +constexpr T MmToTwips(const double mm) { return static_cast<T>(mm / 0.017573); } #define MM50 283 // 1/2 cm in TWIPS. diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 39e30fdb0cb8..556e134d1724 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -377,11 +377,11 @@ public: inline void SetDivisionY( short n ){ m_nDivisionY = n; } // Default margin left and above document: 284 twips == 5.0 mm. - static SAL_CONSTEXPR sal_uInt16 GetDefDocumentBorder() { return 284; } + static constexpr sal_uInt16 GetDefDocumentBorder() { return 284; } // Default gap between pages: 284 twips == 5.0 mm. - static SAL_CONSTEXPR sal_uInt16 GetDefGapBetweenPages() { return 284; } + static constexpr sal_uInt16 GetDefGapBetweenPages() { return 284; } // Minimum edge-to-text distance: 22 twips == 0.4 mm. - static SAL_CONSTEXPR sal_uInt16 GetMinGapBetweenPages() { return 22; } + static constexpr sal_uInt16 GetMinGapBetweenPages() { return 22; } inline sal_uInt16 GetDocumentBorder() const { return IsWhitespaceHidden() ? GetMinGapBetweenPages() : GetDefDocumentBorder(); } inline sal_uInt16 GetGapBetweenPages() const { return IsWhitespaceHidden() ? GetMinGapBetweenPages() : GetDefGapBetweenPages(); } |