From e3560f4770487c8d38463fb4a9a63325abc385f9 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Fri, 9 Nov 2018 15:52:14 +0300
Subject: 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>
---
svx/source/form/fmmodel.cxx | 6 ++----
svx/source/svdraw/svdobj.cxx | 4 ++--
2 files changed, 4 insertions(+), 6 deletions(-)
(limited to 'svx')
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index 3587b4afbfbb..3791cb7a77d7 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -39,12 +39,10 @@ struct FmFormModelImplData
{
rtl::Reference<FmXUndoEnvironment> mxUndoEnv;
bool bOpenInDesignIsDefaulted;
- ::boost::optional< sal_Bool >
- aControlsUseRefDevice;
+ boost::optional<bool> aControlsUseRefDevice;
FmFormModelImplData()
:bOpenInDesignIsDefaulted( true )
- ,aControlsUseRefDevice()
{
}
};
@@ -161,7 +159,7 @@ bool FmFormModel::ControlsUseRefDevice() const
DocumentType eDocType = eUnknownDocumentType;
if ( m_pObjShell )
eDocType = DocumentClassification::classifyHostDocument( m_pObjShell->GetModel() );
- m_pImpl->aControlsUseRefDevice.reset( ControlLayouter::useDocumentReferenceDevice( eDocType ) );
+ m_pImpl->aControlsUseRefDevice = ControlLayouter::useDocumentReferenceDevice(eDocType);
}
return *m_pImpl->aControlsUseRefDevice;
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index ebd1784361e6..19bbc62fb5d4 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -513,7 +513,7 @@ SdrItemPool& SdrObject::GetGlobalDrawObjectItemPool()
void SdrObject::SetRelativeWidth( double nValue )
{
- mpImpl->mnRelativeWidth.reset( nValue );
+ mpImpl->mnRelativeWidth = nValue;
}
void SdrObject::SetRelativeWidthRelation( sal_Int16 eValue )
@@ -523,7 +523,7 @@ void SdrObject::SetRelativeWidthRelation( sal_Int16 eValue )
void SdrObject::SetRelativeHeight( double nValue )
{
- mpImpl->mnRelativeHeight.reset( nValue );
+ mpImpl->mnRelativeHeight = nValue;
}
void SdrObject::SetRelativeHeightRelation( sal_Int16 eValue )
--
cgit