summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/DomainMapperTableManager.cxx
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-11-09 15:52:14 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-11-10 09:16:53 +0100
commite3560f4770487c8d38463fb4a9a63325abc385f9 (patch)
treecc2ea6d5d18de966e4677ebfd846c1bf5ec5c216 /writerfilter/source/dmapper/DomainMapperTableManager.cxx
parent77e3cb338f576757fd875bc60952ac22530f6a7a (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 'writerfilter/source/dmapper/DomainMapperTableManager.cxx')
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index a8d90962c4cc..b1b08b72c8d2 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -451,7 +451,7 @@ void DomainMapperTableManager::startLevel( )
boost::optional<sal_Int32> oCurrentWidth;
if (m_bPushCurrentWidth && !m_aCellWidths.empty() && !m_aCellWidths.back()->empty())
{
- oCurrentWidth.reset(m_aCellWidths.back()->back());
+ oCurrentWidth = m_aCellWidths.back()->back();
m_aCellWidths.back()->pop_back();
}
@@ -491,7 +491,7 @@ void DomainMapperTableManager::endLevel( )
// Do the same trick as in startLevel(): pop the value that was pushed too early.
boost::optional<sal_Int32> oCurrentWidth;
if (m_bPushCurrentWidth && !m_aCellWidths.empty() && !m_aCellWidths.back()->empty())
- oCurrentWidth.reset(m_aCellWidths.back()->back());
+ oCurrentWidth = m_aCellWidths.back()->back();
m_aCellWidths.pop_back( );
// And push it back to the right level.
if (oCurrentWidth && !m_aCellWidths.empty() && !m_aCellWidths.back()->empty())