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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/filter/excel/xlpage.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx index b45a0fc6719a..8ba6b2dc2ff7 100644 --- a/sc/source/filter/excel/xlpage.cxx +++ b/sc/source/filter/excel/xlpage.cxx @@ -38,20 +38,20 @@ struct XclPaperSize long mnHeight; /// Paper height in twips. }; -SAL_CONSTEXPR long in2twips(double n_inch) +constexpr long in2twips(double n_inch) { return static_cast<long>( (n_inch * EXC_TWIPS_PER_INCH) + 0.5); } -SAL_CONSTEXPR long mm2twips(double n_mm) +constexpr long mm2twips(double n_mm) { return static_cast<long>( (n_mm * EXC_TWIPS_PER_INCH / CM_PER_INCH / 10.0) + 0.5); } -SAL_CONSTEXPR long twips2mm(long n_twips) +constexpr long twips2mm(long n_twips) { return static_cast<long>((static_cast<double>(n_twips) - 0.5) / EXC_TWIPS_PER_INCH * CM_PER_INCH * 10.0); } -SAL_CONSTEXPR XclPaperSize pPaperSizeTable[] = +constexpr XclPaperSize pPaperSizeTable[] = { /* 0*/ { PAPER_USER, 0, 0 }, // undefined { PAPER_LETTER, in2twips( 8.5 ), in2twips( 11 ) }, // Letter |