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/filter/ww8/rtfattributeoutput.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/filter/ww8/rtfattributeoutput.cxx')
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 42a125c099b2..8306c202a311 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1297,7 +1297,7 @@ void RtfAttributeOutput::SectionPageNumbering( if (oPageRestartNumber) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGNSTARTS); - m_aSectionBreaks.append(static_cast<sal_Int32>(oPageRestartNumber.get())); + m_aSectionBreaks.append(static_cast<sal_Int32>(*oPageRestartNumber)); m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGNRESTART); } @@ -3385,7 +3385,7 @@ void RtfAttributeOutput::FormatBackground(const SvxBrushItem& rBrush) void RtfAttributeOutput::FormatFillStyle(const XFillStyleItem& rFillStyle) { - m_oFillStyle.reset(rFillStyle.GetValue()); + m_oFillStyle = rFillStyle.GetValue(); } void RtfAttributeOutput::FormatFillGradient(const XFillGradientItem& rFillGradient) |