summaryrefslogtreecommitdiff
path: root/sw/source/ui/misc/titlepage.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-11-30 16:50:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-11-30 17:44:34 +0100
commit47dd2c63f649828a833543e21d4eca5866ec9ebe (patch)
tree0b9a64485028cb9c7c0ffc52cad79033b2cb6209 /sw/source/ui/misc/titlepage.cxx
parent6ddefb080b12f54f84a8de44347a9b1816972ad3 (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/ui/misc/titlepage.cxx')
-rw-r--r--sw/source/ui/misc/titlepage.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 5ae2c30ed62b..b000026ec775 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -39,7 +39,7 @@ namespace
{
::boost::optional<sal_uInt16> oNumOffset = static_cast<const SwFormatPageDesc *>(pItem)->GetNumOffset();
if (oNumOffset)
- rPageNo = oNumOffset.get();
+ rPageNo = *oNumOffset;
if (ppPageFormatDesc)
ppPageFormatDesc->reset(static_cast<const SwFormatPageDesc *>(pItem->Clone()));
bRet = true;
@@ -71,7 +71,7 @@ namespace
::boost::optional<sal_uInt16> oNumOffset = pPageFormatDesc->GetNumOffset();
if (oNumOffset)
{
- nPgNo = oNumOffset.get();
+ nPgNo = *oNumOffset;
}
else
{