diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-30 16:50:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-11-30 17:44:34 +0100 |
| commit | 47dd2c63f649828a833543e21d4eca5866ec9ebe (patch) | |
| tree | 0b9a64485028cb9c7c0ffc52cad79033b2cb6209 /sw/source/core/layout/laycache.cxx | |
| parent | 6ddefb080b12f54f84a8de44347a9b1816972ad3 (diff) | |
Rewrite uses of boost::optional
...to only use functions that are also available for std::optional (in
preparation for changing from boost::optional to std::optional):
* uses of get are replaced with operator * or operator ->
* uses of is_initialized are replaced with operator bool
* uses of reset with an argument are replace with operator =
(All of the replacements are also available for boost::optional "since forever",
so this change should not break builds against old --with-system-boost. An
alternative replacement for is_initialized would have been has_value, but that
is only available since Boost 1.68.)
Change-Id: I532687b6a5ee37dab28befb8e0eb05c22cbecf0f
Reviewed-on: https://gerrit.libreoffice.org/84124
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/source/core/layout/laycache.cxx')
| -rw-r--r-- | sw/source/core/layout/laycache.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 423d63699fc9..30b32d3a8ccf 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -670,7 +670,7 @@ bool SwLayHelper::CheckInsertPage() } bool bNextPageOdd = !mrpPage->OnRightPage(); bool bInsertEmpty = false; - if( oPgNum && bNextPageOdd != ( ( oPgNum.get() % 2 ) != 0 ) ) + if( oPgNum && bNextPageOdd != ( ( *oPgNum % 2 ) != 0 ) ) { bNextPageOdd = !bNextPageOdd; bInsertEmpty = true; |