diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-09 15:52:14 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-10 09:16:53 +0100 |
| commit | e3560f4770487c8d38463fb4a9a63325abc385f9 (patch) | |
| tree | cc2ea6d5d18de966e4677ebfd846c1bf5ec5c216 /sw | |
| parent | 77e3cb338f576757fd875bc60952ac22530f6a7a (diff) | |
Replace deprecated boost::optional::reset(val) with operator =
Change-Id: I7340a561e0df0c781fd834388deb4b9f83800f9b
Reviewed-on: https://gerrit.libreoffice.org/63221
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/txtnode/swfont.cxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/chrdlg/break.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 8683e97e82e0..5e8ea0651c38 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -79,7 +79,7 @@ void SwFont::SetTopBorder( const editeng::SvxBorderLine* pTopBorder ) m_aTopBorder = *pTopBorder; else { - m_aTopBorder = boost::none; + m_aTopBorder.reset(); m_nTopBorderDist = 0; } m_bFontChg = true; @@ -92,7 +92,7 @@ void SwFont::SetBottomBorder( const editeng::SvxBorderLine* pBottomBorder ) m_aBottomBorder = *pBottomBorder; else { - m_aBottomBorder = boost::none; + m_aBottomBorder.reset(); m_nBottomBorderDist = 0; } m_bFontChg = true; @@ -105,7 +105,7 @@ void SwFont::SetRightBorder( const editeng::SvxBorderLine* pRightBorder ) m_aRightBorder = *pRightBorder; else { - m_aRightBorder = boost::none; + m_aRightBorder.reset(); m_nRightBorderDist = 0; } m_bFontChg = true; @@ -118,7 +118,7 @@ void SwFont::SetLeftBorder( const editeng::SvxBorderLine* pLeftBorder ) m_aLeftBorder = *pLeftBorder; else { - m_aLeftBorder = boost::none; + m_aLeftBorder.reset(); m_nLeftBorderDist = 0; } m_bFontChg = true; diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index b691312b5794..6faa43c0a473 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -8279,7 +8279,7 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush ) void DocxAttributeOutput::FormatFillStyle( const XFillStyleItem& rFillStyle ) { if (!m_bIgnoreNextFill) - m_oFillStyle.reset(rFillStyle.GetValue()); + m_oFillStyle = rFillStyle.GetValue(); else m_bIgnoreNextFill = false; diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 29fb4b385d5e..cd4fd16f8534 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1534,7 +1534,7 @@ boost::optional<SvxBrushItem> MSWordExportBase::getBackground() { // The 'color' is set for the first page style - take it and use it as the background color of the entire DOCX if (aBrush.GetColor() != COL_AUTO) - oRet.reset(aBrush); + oRet = aBrush; } return oRet; } diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index c50fecf559fc..6ff2d6d3fa4e 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -52,7 +52,7 @@ short SwBreakDlg::run() if (nPos != 0 && nPos != -1) { m_aTemplate = m_xPageCollBox->get_active_text(); - oPgNum = boost::none; + oPgNum.reset(); if (m_xPageNumBox->get_active()) { oPgNum = static_cast<sal_uInt16>(m_xPageNumEdit->get_value()); |