[Libreoffice-commits] core.git: basctl/source chart2/source cppcanvas/source cui/source dbaccess/source desktop/source filter/source framework/source include/comphelper include/vcl oox/source sc/source sd/source sfx2/source slideshow/source svx/source sw/source ucb/source vcl/source vcl/unx writerfilter/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Sat Nov 30 16:45:58 UTC 2019
basctl/source/dlged/dlgedobj.cxx | 2
chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx | 2
chart2/source/view/axes/VAxisBase.cxx | 2
chart2/source/view/axes/VAxisProperties.cxx | 4 -
chart2/source/view/axes/VPolarRadiusAxis.cxx | 2
cppcanvas/source/mtfrenderer/implrenderer.cxx | 34 +++++-----
cppcanvas/source/mtfrenderer/textaction.cxx | 10 +-
cppcanvas/source/tools/canvasgraphichelper.cxx | 2
cppcanvas/source/wrapper/implcanvas.cxx | 2
cui/source/options/tsaurls.cxx | 2
dbaccess/source/core/api/CRowSetDataColumn.cxx | 2
dbaccess/source/core/dataaccess/ContentHelper.cxx | 2
dbaccess/source/core/dataaccess/ModelImpl.cxx | 6 -
desktop/source/app/cmdlineargs.cxx | 2
filter/source/pdf/impdialog.cxx | 2
framework/source/classes/taskcreator.cxx | 2
framework/source/services/substitutepathvars.cxx | 2
include/comphelper/configuration.hxx | 2
include/vcl/threadex.hxx | 2
oox/source/drawingml/shape.cxx | 2
oox/source/drawingml/table/tablecell.cxx | 4 -
oox/source/drawingml/textparagraphproperties.cxx | 2
oox/source/drawingml/textparagraphpropertiescontext.cxx | 2
sc/source/filter/excel/xestyle.cxx | 18 ++---
sc/source/ui/unoobj/docuno.cxx | 2
sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 8 +-
sfx2/source/doc/SfxDocumentMetaData.cxx | 8 +-
sfx2/source/sidebar/SidebarController.cxx | 18 ++---
sfx2/source/view/viewfrm.cxx | 2
slideshow/source/engine/animatedsprite.cxx | 4 -
slideshow/source/engine/shapes/drawshape.cxx | 4 -
svx/source/svdraw/svdobj.cxx | 4 -
sw/source/core/crsr/findattr.cxx | 2
sw/source/core/frmedt/fews.cxx | 2
sw/source/core/inc/swfont.hxx | 8 +-
sw/source/core/layout/atrfrm.cxx | 2
sw/source/core/layout/flowfrm.cxx | 2
sw/source/core/layout/laycache.cxx | 2
sw/source/core/layout/newfrm.cxx | 2
sw/source/core/layout/pagechg.cxx | 2
sw/source/core/layout/trvlfrm.cxx | 4 -
sw/source/core/tox/tox.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 2
sw/source/filter/ww8/docxtablestyleexport.cxx | 4 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 4 -
sw/source/filter/ww8/wrtw8sty.cxx | 2
sw/source/filter/ww8/ww8graf.cxx | 10 +-
sw/source/filter/xml/xmlexpit.cxx | 4 -
sw/source/ui/misc/titlepage.cxx | 4 -
sw/source/ui/table/tabledlg.cxx | 2
sw/source/uibase/shells/textsh1.cxx | 2
sw/source/uibase/utlui/uitool.cxx | 2
ucb/source/ucp/ext/ucpext_content.cxx | 6 -
vcl/source/fontsubset/sft.cxx | 12 +--
vcl/unx/generic/window/screensaverinhibitor.cxx | 14 ++--
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 -
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 2
58 files changed, 133 insertions(+), 133 deletions(-)
New commits:
commit 47dd2c63f649828a833543e21d4eca5866ec9ebe
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Nov 30 16:50:00 2019 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Nov 30 17:44:34 2019 +0100
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 at redhat.com>
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 80bf91698928..f635c0057505 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1667,7 +1667,7 @@ awt::DeviceInfo DlgEdForm::getDeviceInfo() const
if ( xDialogDevice.is() )
aDeviceInfo = xDialogDevice->getInfo();
- mpDeviceInfo.reset( aDeviceInfo );
+ mpDeviceInfo = aDeviceInfo;
return aDeviceInfo;
}
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 4e100bfb9822..f6f8961d21d6 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -81,7 +81,7 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter(
m_xRefSizePropSet( rRefSizePropSet.is() ? rRefSizePropSet : rPropertySet )
{
if (pRefSize)
- m_pRefSize.reset(*pRefSize);
+ m_pRefSize = *pRefSize;
}
CharacterPropertyItemConverter::~CharacterPropertyItemConverter()
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index 861ed4f63b33..16d951bdb5ad 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -118,7 +118,7 @@ sal_Int32 VAxisBase::estimateMaximumAutoMainIncrementCount()
void VAxisBase::setExtraLinePositionAtOtherAxis( double fCrossingAt )
{
- m_aAxisProperties.m_pfExrtaLinePositionAtOtherAxis.reset(fCrossingAt);
+ m_aAxisProperties.m_pfExrtaLinePositionAtOtherAxis = fCrossingAt;
}
sal_Int32 VAxisBase::getDimensionCount() const
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index d660915b4023..d35bc04a0d24 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -218,10 +218,10 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty
if( m_bCrossingAxisIsCategoryAxes )
fValue = ::rtl::math::round(fValue);
- m_pfMainLinePositionAtOtherAxis.reset(fValue);
+ m_pfMainLinePositionAtOtherAxis = fValue;
}
else if( m_eCrossoverType == css::chart::ChartAxisPosition_ZERO )
- m_pfMainLinePositionAtOtherAxis.reset(0.0);
+ m_pfMainLinePositionAtOtherAxis = 0.0;
xAxisProp->getPropertyValue("LabelPosition") >>= m_eLabelPos;
xAxisProp->getPropertyValue("MarkPosition") >>= m_eTickmarkPos;
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx
index 59e05354b78e..6bf0b0f47d3b 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -147,7 +147,7 @@ void VPolarRadiusAxis::createShapes()
}
//xxxxx pTickInfo->updateUnscaledValue( xInverseScaling );
- aAxisProperties.m_pfMainLinePositionAtOtherAxis.reset(pTickInfo->getUnscaledTickValue());
+ aAxisProperties.m_pfMainLinePositionAtOtherAxis = pTickInfo->getUnscaledTickValue();
aAxisProperties.m_bDisplayLabels=false;
VCartesianAxis aAxis(aAxisProperties,m_xNumberFormatsSupplier
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 573ec4882eb3..7c4d91b1a8a2 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -745,7 +745,7 @@ namespace cppcanvas
{
rendering::FontRequest aFontRequest;
- if( rParms.mrParms.maFontName.is_initialized() )
+ if( rParms.mrParms.maFontName )
aFontRequest.FontDescription.FamilyName = *rParms.mrParms.maFontName;
else
aFontRequest.FontDescription.FamilyName = rFont.GetFamilyName();
@@ -757,11 +757,11 @@ namespace cppcanvas
// TODO(F2): improve vclenum->panose conversion
aFontRequest.FontDescription.FontDescription.Weight =
- rParms.mrParms.maFontWeight.is_initialized() ?
+ rParms.mrParms.maFontWeight ?
*rParms.mrParms.maFontWeight :
::canvas::tools::numeric_cast<sal_Int8>( ::basegfx::fround( rFont.GetWeight() ) );
aFontRequest.FontDescription.FontDescription.Letterform =
- rParms.mrParms.maFontLetterForm.is_initialized() ?
+ rParms.mrParms.maFontLetterForm ?
*rParms.mrParms.maFontLetterForm :
(rFont.GetItalic() == ITALIC_NONE) ? 0 : 9;
aFontRequest.FontDescription.FontDescription.Proportion =
@@ -1379,7 +1379,7 @@ namespace cppcanvas
break;
case MetaActionType::LINECOLOR:
- if( !rParms.maLineColor.is_initialized() )
+ if( !rParms.maLineColor )
{
setStateColor( static_cast<MetaLineColorAction*>(pCurrAct),
rStates.getState().isLineColorSet,
@@ -1396,7 +1396,7 @@ namespace cppcanvas
break;
case MetaActionType::FILLCOLOR:
- if( !rParms.maFillColor.is_initialized() )
+ if( !rParms.maFillColor )
{
setStateColor( static_cast<MetaFillColorAction*>(pCurrAct),
rStates.getState().isFillColorSet,
@@ -1414,7 +1414,7 @@ namespace cppcanvas
case MetaActionType::TEXTCOLOR:
{
- if( !rParms.maTextColor.is_initialized() )
+ if( !rParms.maTextColor )
{
// Text color is set unconditionally, thus, no
// use of setStateColor here
@@ -1434,7 +1434,7 @@ namespace cppcanvas
break;
case MetaActionType::TEXTFILLCOLOR:
- if( !rParms.maTextColor.is_initialized() )
+ if( !rParms.maTextColor )
{
setStateColor( static_cast<MetaTextFillColorAction*>(pCurrAct),
rStates.getState().isTextFillColorSet,
@@ -1451,7 +1451,7 @@ namespace cppcanvas
break;
case MetaActionType::TEXTLINECOLOR:
- if( !rParms.maTextColor.is_initialized() )
+ if( !rParms.maTextColor )
{
setStateColor( static_cast<MetaTextLineColorAction*>(pCurrAct),
rStates.getState().isTextLineColorSet,
@@ -1468,7 +1468,7 @@ namespace cppcanvas
break;
case MetaActionType::OVERLINECOLOR:
- if( !rParms.maTextColor.is_initialized() )
+ if( !rParms.maTextColor )
{
setStateColor( static_cast<MetaOverlineColorAction*>(pCurrAct),
rStates.getState().isTextOverlineColorSet,
@@ -1504,7 +1504,7 @@ namespace cppcanvas
// TODO(Q2): define and use appropriate enumeration types
rState.textReliefStyle = rFont.GetRelief();
rState.textOverlineStyle = static_cast<sal_Int8>(rFont.GetOverline());
- rState.textUnderlineStyle = rParms.maFontUnderline.is_initialized() ?
+ rState.textUnderlineStyle = rParms.maFontUnderline ?
(*rParms.maFontUnderline ? sal_Int8(LINESTYLE_SINGLE) : sal_Int8(LINESTYLE_NONE)) :
static_cast<sal_Int8>(rFont.GetUnderline());
rState.textStrikeoutStyle = static_cast<sal_Int8>(rFont.GetStrikeout());
@@ -2916,19 +2916,19 @@ namespace cppcanvas
}
// apply overrides from the Parameters struct
- if( rParams.maFillColor.is_initialized() )
+ if( rParams.maFillColor )
{
::cppcanvas::internal::OutDevState& rState = aStateStack.getState();
rState.isFillColorSet = true;
rState.fillColor = tools::intSRGBAToDoubleSequence( *rParams.maFillColor );
}
- if( rParams.maLineColor.is_initialized() )
+ if( rParams.maLineColor )
{
::cppcanvas::internal::OutDevState& rState = aStateStack.getState();
rState.isLineColorSet = true;
rState.lineColor = tools::intSRGBAToDoubleSequence( *rParams.maLineColor );
}
- if( rParams.maTextColor.is_initialized() )
+ if( rParams.maTextColor )
{
::cppcanvas::internal::OutDevState& rState = aStateStack.getState();
rState.isTextFillColorSet = true;
@@ -2939,10 +2939,10 @@ namespace cppcanvas
rState.textOverlineColor =
rState.textLineColor = tools::intSRGBAToDoubleSequence( *rParams.maTextColor );
}
- if( rParams.maFontName.is_initialized() ||
- rParams.maFontWeight.is_initialized() ||
- rParams.maFontLetterForm.is_initialized() ||
- rParams.maFontUnderline.is_initialized() )
+ if( rParams.maFontName ||
+ rParams.maFontWeight ||
+ rParams.maFontLetterForm ||
+ rParams.maFontUnderline )
{
::cppcanvas::internal::OutDevState& rState = aStateStack.getState();
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 25d899e6e3d9..f2b50e198606 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -2073,7 +2073,7 @@ namespace cppcanvas
rCanvas->getUNOCanvas()->getDevice(),
aResultingPolyPolygon ) );
- if( rParms.maTextTransformation.is_initialized() )
+ if( rParms.maTextTransformation )
{
return std::shared_ptr<Action>(
new OutlineAction(
@@ -2190,7 +2190,7 @@ namespace cppcanvas
rTextFillColor == aEmptyColor )
{
// nope
- if( rParms.maTextTransformation.is_initialized() )
+ if( rParms.maTextTransformation )
{
ret = std::shared_ptr<Action>( new TextAction(
aStartPoint,
@@ -2215,7 +2215,7 @@ namespace cppcanvas
else
{
// at least one of the effects requested
- if( rParms.maTextTransformation.is_initialized() )
+ if( rParms.maTextTransformation )
ret = std::shared_ptr<Action>( new EffectTextAction(
aStartPoint,
aReliefOffset,
@@ -2257,7 +2257,7 @@ namespace cppcanvas
rTextFillColor == aEmptyColor )
{
// nope
- if( rParms.maTextTransformation.is_initialized() )
+ if( rParms.maTextTransformation )
ret = std::shared_ptr<Action>( new TextArrayAction(
aStartPoint,
rText,
@@ -2280,7 +2280,7 @@ namespace cppcanvas
else
{
// at least one of the effects requested
- if( rParms.maTextTransformation.is_initialized() )
+ if( rParms.maTextTransformation )
ret = std::shared_ptr<Action>( new EffectTextArrayAction(
aStartPoint,
aReliefOffset,
diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx
index d5ed22ee8ec9..d67efbe8e7ef 100644
--- a/cppcanvas/source/tools/canvasgraphichelper.cxx
+++ b/cppcanvas/source/tools/canvasgraphichelper.cxx
@@ -55,7 +55,7 @@ namespace cppcanvas
void CanvasGraphicHelper::setClip( const ::basegfx::B2DPolyPolygon& rClipPoly )
{
// TODO(T3): not thread-safe. B2DPolyPolygon employs copy-on-write
- maClipPolyPolygon.reset( rClipPoly );
+ maClipPolyPolygon = rClipPoly;
maRenderState.Clip.clear();
}
diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index 102902b71a14..c16e06375231 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.cxx
@@ -65,7 +65,7 @@ namespace cppcanvas
void ImplCanvas::setClip( const ::basegfx::B2DPolyPolygon& rClipPoly )
{
// TODO(T3): not thread-safe. B2DPolyPolygon employs copy-on-write
- maClipPolyPolygon.reset( rClipPoly );
+ maClipPolyPolygon = rClipPoly;
maViewState.Clip.clear();
}
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index 46cd5e6e526e..a010afcd8c3d 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -38,7 +38,7 @@ TSAURLsDialog::TSAURLsDialog(weld::Window* pParent)
boost::optional<css::uno::Sequence<OUString>> aUserSetTSAURLs(officecfg::Office::Common::Security::Scripting::TSAURLs::get());
if (aUserSetTSAURLs)
{
- const css::uno::Sequence<OUString>& rUserSetTSAURLs = aUserSetTSAURLs.get();
+ const css::uno::Sequence<OUString>& rUserSetTSAURLs = *aUserSetTSAURLs;
for (auto const& userSetTSAURL : rUserSetTSAURLs)
{
AddTSAURL(userSetTSAURL);
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index c11fe639bf25..3cf8c0f0858c 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -136,7 +136,7 @@ void SAL_CALL ORowSetDataColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHan
{
bool bVal = false;
rValue >>= bVal;
- m_isReadOnly.reset(bVal);
+ m_isReadOnly = bVal;
}
break;
default:
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 7737ac0b2825..fcd6629640cd 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -133,7 +133,7 @@ OUString SAL_CALL OContentHelper::getContentType()
if ( !m_pImpl->m_aProps.aContentType )
{ // content type not yet retrieved
- m_pImpl->m_aProps.aContentType.reset( determineContentType() );
+ m_pImpl->m_aProps.aContentType = determineContentType();
}
return *m_pImpl->m_aProps.aContentType;
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 2912c625c465..076a0177e549 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1246,17 +1246,17 @@ ODatabaseModelImpl::EmbeddedMacros ODatabaseModelImpl::determineEmbeddedMacros()
{
if ( ::sfx2::DocumentMacroMode::storageHasMacros( getOrCreateRootStorage() ) )
{
- m_aEmbeddedMacros.reset( eDocumentWideMacros );
+ m_aEmbeddedMacros = eDocumentWideMacros;
}
else if ( lcl_hasObjectsWithMacros_nothrow( *this, E_FORM )
|| lcl_hasObjectsWithMacros_nothrow( *this, E_REPORT )
)
{
- m_aEmbeddedMacros.reset( eSubDocumentMacros );
+ m_aEmbeddedMacros = eSubDocumentMacros;
}
else
{
- m_aEmbeddedMacros.reset( eNoMacros );
+ m_aEmbeddedMacros = eNoMacros;
}
}
return *m_aEmbeddedMacros;
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 381147cd534e..c395e6d68a44 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -81,7 +81,7 @@ public:
{
OUString url;
if (utl::Bootstrap::getProcessWorkingDir(url)) {
- m_cwdUrl.reset(url);
+ m_cwdUrl = url;
}
}
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 1b0e8c327964..4a6fbc0d12a2 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1515,7 +1515,7 @@ IMPL_LINK_NOARG(ImpPDFTabSigningPage, ClickmaPbSignCertSelect, weld::Button&, vo
boost::optional<css::uno::Sequence<OUString>> aTSAURLs(officecfg::Office::Common::Security::Scripting::TSAURLs::get());
if (aTSAURLs)
{
- const css::uno::Sequence<OUString>& rTSAURLs = aTSAURLs.get();
+ const css::uno::Sequence<OUString>& rTSAURLs = *aTSAURLs;
for (auto const& elem : rTSAURLs)
{
mxLBSignTSA->append_text(elem);
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 63547511e5c8..62762c80cce4 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -69,7 +69,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUStrin
{
boost::optional<OUString> x(officecfg::Office::TabBrowse::TaskCreatorService::ImplementationName::get(m_xContext));
- if (x) sCreator = x.get();
+ if (x) sCreator = *x;
}
xCreator.set( m_xContext->getServiceManager()->createInstanceWithContext(sCreator, m_xContext), css::uno::UNO_QUERY_THROW);
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index d23466e1bd64..ad20f5ebbec2 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -265,7 +265,7 @@ OUString SubstitutePathVariables::GetWorkVariableValue() const
aSecurity.getHomeDir( aWorkPath );
}
else
- aWorkPath = x.get();
+ aWorkPath = *x;
return aWorkPath;
}
diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx
index 237ad3e317c9..cb2ad5675660 100644
--- a/include/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
@@ -162,7 +162,7 @@ template< typename T > struct Convert< boost::optional< T > >
{
static css::uno::Any toAny(boost::optional< T > const & value) {
return value
- ? css::uno::makeAny(value.get())
+ ? css::uno::makeAny(*value)
: css::uno::Any();
}
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 01d6170fbbe5..05d0bada3f58 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -71,7 +71,7 @@ private:
virtual void doIt() override
{
try {
- m_result.reset( m_func() );
+ m_result = m_func();
}
catch (...) {
m_exc = std::current_exception();
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 464961ee5a02..816711ba61d1 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -565,7 +565,7 @@ static void lcl_createPresetShape(const uno::Reference<drawing::XShape>& xShape,
{
ParagraphAdjust eAdjust = ParagraphAdjust_LEFT;
if (pParagraph->getProperties().getParaAdjust())
- eAdjust = pParagraph->getProperties().getParaAdjust().get();
+ eAdjust = *pParagraph->getProperties().getParaAdjust();
xSet->setPropertyValue( "ParaAdjust", uno::makeAny( eAdjust ) );
SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( xShape );
assert(pShape);
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index f27117fd2b42..48f73b269e6a 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -195,9 +195,9 @@ static void applyTableStylePart( const ::oox::core::XmlFilterBase& rFilterBase,
aTextCharProps.maFillProperties.maFillColor = rTableStylePart.getTextColor();
aTextCharProps.maFillProperties.moFillType.set(XML_solidFill);
}
- if( rTableStylePart.getTextBoldStyle().is_initialized() )
+ if( rTableStylePart.getTextBoldStyle() )
aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle();
- if( rTableStylePart.getTextItalicStyle().is_initialized() )
+ if( rTableStylePart.getTextItalicStyle() )
aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle();
}
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index f1c966deeaa4..351ead9fb648 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -477,7 +477,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p
if ( moParaAdjust )
{
- aPropSet.setProperty( PROP_ParaAdjust, moParaAdjust.get());
+ aPropSet.setProperty( PROP_ParaAdjust, *moParaAdjust);
}
else
{
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index 8e02a7bdb694..fee3d8c50e02 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -160,7 +160,7 @@ TextParagraphPropertiesContext::~TextParagraphPropertiesContext()
rPropertyMap.setProperty( PROP_NumberingIsNumber, true);
if( mrTextParagraphProperties.getParaAdjust() )
- rPropertyMap.setProperty( PROP_ParaAdjust, mrTextParagraphProperties.getParaAdjust().get());
+ rPropertyMap.setProperty( PROP_ParaAdjust, *mrTextParagraphProperties.getParaAdjust());
}
ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 2ee1648432a8..9d52b28fa795 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1097,39 +1097,39 @@ void XclExpDxfFont::SaveXml(XclExpXmlStream& rStrm)
if (maDxfData.eWeight)
{
rStyleSheet->singleElement(XML_b,
- XML_val, ToPsz10(maDxfData.eWeight.get() != WEIGHT_NORMAL));
+ XML_val, ToPsz10(*maDxfData.eWeight != WEIGHT_NORMAL));
}
if (maDxfData.eItalic)
{
- bool bItalic = (maDxfData.eItalic.get() == ITALIC_OBLIQUE) || (maDxfData.eItalic.get() == ITALIC_NORMAL);
+ bool bItalic = (*maDxfData.eItalic == ITALIC_OBLIQUE) || (*maDxfData.eItalic == ITALIC_NORMAL);
rStyleSheet->singleElement(XML_i, XML_val, ToPsz10(bItalic));
}
if (maDxfData.eStrike)
{
bool bStrikeout =
- (maDxfData.eStrike.get() == STRIKEOUT_SINGLE) || (maDxfData.eStrike.get() == STRIKEOUT_DOUBLE) ||
- (maDxfData.eStrike.get() == STRIKEOUT_BOLD) || (maDxfData.eStrike.get() == STRIKEOUT_SLASH) ||
- (maDxfData.eStrike.get() == STRIKEOUT_X);
+ (*maDxfData.eStrike == STRIKEOUT_SINGLE) || (*maDxfData.eStrike == STRIKEOUT_DOUBLE) ||
+ (*maDxfData.eStrike == STRIKEOUT_BOLD) || (*maDxfData.eStrike == STRIKEOUT_SLASH) ||
+ (*maDxfData.eStrike == STRIKEOUT_X);
rStyleSheet->singleElement(XML_strike, XML_val, ToPsz10(bStrikeout));
}
if (maDxfData.bOutline)
{
- rStyleSheet->singleElement(XML_outline, XML_val, ToPsz10(maDxfData.bOutline.get()));
+ rStyleSheet->singleElement(XML_outline, XML_val, ToPsz10(*maDxfData.bOutline));
}
if (maDxfData.bShadow)
{
- rStyleSheet->singleElement(XML_shadow, XML_val, ToPsz10(maDxfData.bShadow.get()));
+ rStyleSheet->singleElement(XML_shadow, XML_val, ToPsz10(*maDxfData.bShadow));
}
if (maDxfData.aColor)
{
rStyleSheet->singleElement(XML_color,
- XML_rgb, XclXmlUtils::ToOString(maDxfData.aColor.get()));
+ XML_rgb, XclXmlUtils::ToOString(*maDxfData.aColor));
}
if (maDxfData.nFontHeight)
@@ -1140,7 +1140,7 @@ void XclExpDxfFont::SaveXml(XclExpXmlStream& rStrm)
if (maDxfData.eUnder)
{
- const char* pVal = getUnderlineOOXValue(maDxfData.eUnder.get());
+ const char* pVal = getUnderlineOOXValue(*maDxfData.eUnder);
rStyleSheet->singleElement(XML_u, XML_val, pVal);
}
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index b55803ab5104..ccfc91071769 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -3347,7 +3347,7 @@ void ScModelObj::setFormulaCellNumberLimit( sal_Int32 number )
sal_Int32 ScModelObj::getFormulaCellNumberLimit()
{
- return officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::get().get();
+ return *officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::get();
}
ScDrawPagesObj::ScDrawPagesObj(ScDocShell* pDocSh) :
diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
index da8af970cf89..ff16fb0e4dac 100644
--- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
@@ -112,7 +112,7 @@ void VisibleAreaManager::MakeVisible()
if ( ! aNewVisibleTopLeft)
return;
- maRequestedVisibleTopLeft = aNewVisibleTopLeft.get();
+ maRequestedVisibleTopLeft = *aNewVisibleTopLeft;
VisibleAreaScroller aAnimation(
mrSlideSorter,
aCurrentTopLeft,
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 1abf3e3d3d91..b6f1398f13d1 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1591,10 +1591,10 @@ void CustomPropertiesWindow::StoreCustomProperties()
aTmpTime.GetSec(), aTmpTime.GetMin(), aTmpTime.GetHour(),
aTmpDate.GetDay(), aTmpDate.GetMonth(), aTmpDate.GetYear(),
pLine->m_xTimeField->m_isUTC);
- if (pLine->m_xDateField->m_TZ.is_initialized())
+ if (pLine->m_xDateField->m_TZ)
{
m_aCustomProperties[nDataModelPos + i]->m_aValue <<= util::DateTimeWithTimezone(
- aDateTime, pLine->m_xDateField->m_TZ.get());
+ aDateTime, *pLine->m_xDateField->m_TZ);
}
else
{
@@ -1606,10 +1606,10 @@ void CustomPropertiesWindow::StoreCustomProperties()
Date aTmpDate = pLine->m_xDateField->get_date();
util::Date const aDate(aTmpDate.GetDay(), aTmpDate.GetMonth(),
aTmpDate.GetYear());
- if (pLine->m_xDateField->m_TZ.is_initialized())
+ if (pLine->m_xDateField->m_TZ)
{
m_aCustomProperties[nDataModelPos + i]->m_aValue <<= util::DateWithTimezone(
- aDate, pLine->m_xDateField->m_TZ.get());
+ aDate, *pLine->m_xDateField->m_TZ);
}
else
{
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 8e6bf6f29c39..b8f0b04818bc 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -1191,15 +1191,15 @@ void SfxDocumentMetaData::init(
boost::optional<sal_Int16> nTimeZone;
if (textToDateOrDateTime(d, dt, isDateTime, nTimeZone, text)) {
if (isDateTime) {
- if (nTimeZone.is_initialized()) {
+ if (nTimeZone) {
any <<= css::util::DateTimeWithTimezone(dt,
- nTimeZone.get());
+ *nTimeZone);
} else {
any <<= dt;
}
} else {
- if (nTimeZone.is_initialized()) {
- any <<= css::util::DateWithTimezone(d, nTimeZone.get());
+ if (nTimeZone) {
+ any <<= css::util::DateWithTimezone(d, *nTimeZone);
} else {
any <<= d;
}
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 794cfef82b81..9214c651f3a6 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -473,11 +473,11 @@ void SidebarController::ProcessNewWidth (const sal_Int32 nNewWidth)
if ( ! mbIsDeckRequestedOpen)
return;
- if (mbIsDeckRequestedOpen.get())
+ if (*mbIsDeckRequestedOpen)
{
// Deck became large enough to be shown. Show it.
mnSavedSidebarWidth = nNewWidth;
- if (!mbIsDeckOpen.get())
+ if (!*mbIsDeckOpen)
RequestOpenDeck();
}
else
@@ -1237,12 +1237,12 @@ bool SidebarController::IsDeckOpen(const sal_Int32 nIndex)
OUString asDeckId(mpTabBar->GetDeckIdForIndex(nIndex));
return IsDeckVisible(asDeckId);
}
- return mbIsDeckOpen && mbIsDeckOpen.get();
+ return mbIsDeckOpen && *mbIsDeckOpen;
}
bool SidebarController::IsDeckVisible(const OUString& rsDeckId)
{
- return mbIsDeckOpen && mbIsDeckOpen.get() && msCurrentDeckId == rsDeckId;
+ return mbIsDeckOpen && *mbIsDeckOpen && msCurrentDeckId == rsDeckId;
}
void SidebarController::UpdateDeckOpenState()
@@ -1255,10 +1255,10 @@ void SidebarController::UpdateDeckOpenState()
// Update (change) the open state when it either has not yet been initialized
// or when its value differs from the requested state.
- if ( mbIsDeckOpen && mbIsDeckOpen.get() == mbIsDeckRequestedOpen.get() )
+ if ( mbIsDeckOpen && *mbIsDeckOpen == *mbIsDeckRequestedOpen )
return;
- if (mbIsDeckRequestedOpen.get())
+ if (*mbIsDeckRequestedOpen)
{
if (!mpParentWindow->IsFloatingMode())
{
@@ -1336,9 +1336,9 @@ void SidebarController::UpdateDeckOpenState()
mpParentWindow->SetStyle(mpParentWindow->GetStyle() & ~WB_SIZEABLE);
}
- mbIsDeckOpen = mbIsDeckRequestedOpen.get();
- if (mbIsDeckOpen.get() && mpCurrentDeck)
- mpCurrentDeck->Show(mbIsDeckOpen.get());
+ mbIsDeckOpen = *mbIsDeckRequestedOpen;
+ if (*mbIsDeckOpen && mpCurrentDeck)
+ mpCurrentDeck->Show(*mbIsDeckOpen);
NotifyResize();
}
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 80d66831f0bb..9b7c763a8eb2 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2358,7 +2358,7 @@ static bool impl_maxOpenDocCountReached()
// NIL means: count of allowed documents = infinite !
if (!x)
return false;
- sal_Int32 nMaxDocs(x.get());
+ sal_Int32 nMaxDocs(*x);
sal_Int32 nOpenDocs = 0;
css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create(xContext);
diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx
index 3a3279cee306..3ebd7dc5f688 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -156,7 +156,7 @@ namespace slideshow
void AnimatedSprite::movePixel( const ::basegfx::B2DPoint& rNewPos )
{
- maPosPixel.reset( rNewPos );
+ maPosPixel = rNewPos;
mpSprite->movePixel( rNewPos );
}
@@ -168,7 +168,7 @@ namespace slideshow
void AnimatedSprite::clip( const ::basegfx::B2DPolyPolygon& rClip )
{
- maClip.reset( rClip );
+ maClip = rClip;
mpSprite->setClipPixel( rClip );
}
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index fa0b99344cc0..0bad87a71055 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -281,7 +281,7 @@ namespace slideshow
// setup cached values to defaults (might fail to
// retrieve true bounds below)
- maCurrentShapeUnitBounds.reset( aDefaultBounds );
+ maCurrentShapeUnitBounds = aDefaultBounds;
// TODO(P2): the subset of the master shape (that from
// which the subsets are subtracted) changes
@@ -345,7 +345,7 @@ namespace slideshow
::basegfx::B2DRange( 0.0, 0.0,
1.0, 1.0 ));
- maCurrentShapeUnitBounds.reset( aTotalBounds );
+ maCurrentShapeUnitBounds = aTotalBounds;
}
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index eaa5abfa177a..3758426b974a 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -541,7 +541,7 @@ const double* SdrObject::GetRelativeWidth( ) const
if (!mpImpl->mnRelativeWidth)
return nullptr;
- return &mpImpl->mnRelativeWidth.get();
+ return &*mpImpl->mnRelativeWidth;
}
sal_Int16 SdrObject::GetRelativeWidthRelation() const
@@ -554,7 +554,7 @@ const double* SdrObject::GetRelativeHeight( ) const
if (!mpImpl->mnRelativeHeight)
return nullptr;
- return &mpImpl->mnRelativeHeight.get();
+ return &*mpImpl->mnRelativeHeight;
}
sal_Int16 SdrObject::GetRelativeHeightRelation() const
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 51518bccad35..3755a469dcf5 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -75,7 +75,7 @@ static bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
}
else if (oNumOffset1 && oNumOffset2)
{
- bNumOffsetEqual = oNumOffset1.get() == oNumOffset2.get();
+ bNumOffsetEqual = *oNumOffset1 == *oNumOffset2;
}
else
{
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 9adc93bfbdd1..f6b338b78ca9 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -410,7 +410,7 @@ sal_uInt16 SwFEShell::GetPageOffset() const
pFlow = pFlow->FindTabFrame();
::boost::optional<sal_uInt16> oNumOffset = pFlow->GetPageDescItem().GetNumOffset();
if ( oNumOffset )
- return oNumOffset.get();
+ return *oNumOffset;
}
pPage = static_cast<const SwPageFrame*>(pPage->GetPrev());
}
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 3296d93bd226..fbec9f18a1c6 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -865,7 +865,7 @@ inline sal_uInt16 SwFont::GetTopBorderSpace() const
sal_uInt16 nRet = 0;
if( m_aTopBorder )
{
- nRet += m_aTopBorder.get().GetScaledWidth() + m_nTopBorderDist;
+ nRet += m_aTopBorder->GetScaledWidth() + m_nTopBorderDist;
}
if( m_aShadowLocation == SvxShadowLocation::TopLeft ||
m_aShadowLocation == SvxShadowLocation::TopRight )
@@ -880,7 +880,7 @@ inline sal_uInt16 SwFont::GetBottomBorderSpace() const
sal_uInt16 nRet = 0;
if( m_aBottomBorder )
{
- nRet += m_aBottomBorder.get().GetScaledWidth() + m_nBottomBorderDist;
+ nRet += m_aBottomBorder->GetScaledWidth() + m_nBottomBorderDist;
}
if( m_aShadowLocation == SvxShadowLocation::BottomLeft ||
m_aShadowLocation == SvxShadowLocation::BottomRight )
@@ -895,7 +895,7 @@ inline sal_uInt16 SwFont::GetRightBorderSpace() const
sal_uInt16 nRet = 0;
if( m_aRightBorder )
{
- nRet += m_aRightBorder.get().GetScaledWidth() + m_nRightBorderDist;
+ nRet += m_aRightBorder->GetScaledWidth() + m_nRightBorderDist;
}
if( m_aShadowLocation == SvxShadowLocation::TopRight ||
m_aShadowLocation == SvxShadowLocation::BottomRight )
@@ -910,7 +910,7 @@ inline sal_uInt16 SwFont::GetLeftBorderSpace() const
sal_uInt16 nRet = 0;
if( m_aLeftBorder )
{
- nRet += m_aLeftBorder.get().GetScaledWidth() + m_nLeftBorderDist;
+ nRet += m_aLeftBorder->GetScaledWidth() + m_nLeftBorderDist;
}
if( m_aShadowLocation == SvxShadowLocation::TopLeft ||
m_aShadowLocation == SvxShadowLocation::BottomLeft )
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 3f54d259ec2f..25de2a9b90d1 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -703,7 +703,7 @@ bool SwFormatPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
::boost::optional<sal_uInt16> oOffset = GetNumOffset();
if (oOffset)
{
- rVal <<= static_cast<sal_Int16>(oOffset.get());
+ rVal <<= static_cast<sal_Int16>(*oOffset);
}
else
{
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 3226d3b89ed2..8c1bada4012d 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -863,7 +863,7 @@ bool SwFrame::WrongPageDesc( SwPageFrame* pNew )
else if( !pDesc->GetLeftFormat() )
nTmp = 1;
else if( rFormatDesc.GetNumOffset() )
- nTmp = rFormatDesc.GetNumOffset().get();
+ nTmp = *rFormatDesc.GetNumOffset();
}
}
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 423d63699fc9..30b32d3a8ccf 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -670,7 +670,7 @@ bool SwLayHelper::CheckInsertPage()
}
bool bNextPageOdd = !mrpPage->OnRightPage();
bool bInsertEmpty = false;
- if( oPgNum && bNextPageOdd != ( ( oPgNum.get() % 2 ) != 0 ) )
+ if( oPgNum && bNextPageOdd != ( ( *oPgNum % 2 ) != 0 ) )
{
bNextPageOdd = !bNextPageOdd;
bInsertEmpty = true;
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index f53cc95412a6..90bb47890d99 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -487,7 +487,7 @@ void SwRootFrame::Init( SwFrameFormat* pFormat )
if ( !pDesc )
pDesc = &pDoc->GetPageDesc( 0 );
- const bool bOdd = !oPgNum || 0 != ( oPgNum.get() % 2 );
+ const bool bOdd = !oPgNum || 0 != ( *oPgNum % 2 );
const bool bFirst = true;
// Even page numbers are supposed to be printed as left pages. So if a
// page number has been explicitly set for this first page, then we must
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index a2b70fb68e81..6d1df44ddd59 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1304,7 +1304,7 @@ SwPageFrame *SwFrame::InsertPage( SwPageFrame *pPrevPage, bool bFootnote )
if ( rDesc.GetNumOffset() )
{
::boost::optional<sal_uInt16> oNumOffset = rDesc.GetNumOffset();
- bWishedOdd = oNumOffset && (oNumOffset.get() % 2) != 0;
+ bWishedOdd = oNumOffset && (*oNumOffset % 2) != 0;
// use the opportunity to set the flag at root
pRoot->SetVirtPageNum( true );
}
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 369207a36221..7dc15c10e6a5 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1743,7 +1743,7 @@ bool SwFrame::WannaRightPage() const
OSL_ENSURE( pDesc, "No pagedescriptor" );
bool bOdd;
if( oPgNum )
- bOdd = (oPgNum.get() % 2) != 0;
+ bOdd = (*oPgNum % 2) != 0;
else
{
bOdd = pPage->OnRightPage();
@@ -1849,7 +1849,7 @@ sal_uInt16 SwFrame::GetVirtPageNum() const
::boost::optional<sal_uInt16> oNumOffset = pFrame->GetPageDescItem().GetNumOffset();
if (oNumOffset)
{
- return nPhyPage - pFrame->GetPhyPageNum() + oNumOffset.get();
+ return nPhyPage - pFrame->GetPhyPageNum() + *oNumOffset;
}
else
{
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index c3167246fa2c..9d698bf0b8a1 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -912,7 +912,7 @@ SwFormTokensHelper::SwFormTokensHelper(const OUString & rPattern)
boost::optional<SwFormToken> const oToken(
lcl_BuildToken(rPattern, nCurPatternPos));
if (oToken)
- m_Tokens.push_back(oToken.get());
+ m_Tokens.push_back(*oToken);
}
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9e4f6769a6d4..113d26170423 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6328,7 +6328,7 @@ void DocxAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, const ::boo
// boost::none means no restart: then don't output that attribute if it is negative
if ( oPageRestartNumber )
- pAttr->add( FSNS( XML_w, XML_start ), OString::number( oPageRestartNumber.get() ) );
+ pAttr->add( FSNS( XML_w, XML_start ), OString::number( *oPageRestartNumber ) );
// nNumType corresponds to w:fmt. See WW8Export::GetNumId() for more precisions
OString aFormat( impl_NumberingType( nNumType ) );
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx
index b67151ed204b..6ffa14325bf5 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -542,10 +542,10 @@ void DocxTableStyleExport::Impl::tableStyleTablePr(
}
if (oTableStyleRowBandSize)
m_pSerializer->singleElementNS(XML_w, XML_tblStyleRowBandSize, FSNS(XML_w, XML_val),
- OString::number(oTableStyleRowBandSize.get()));
+ OString::number(*oTableStyleRowBandSize));
if (oTableStyleColBandSize)
m_pSerializer->singleElementNS(XML_w, XML_tblStyleColBandSize, FSNS(XML_w, XML_val),
- OString::number(oTableStyleColBandSize.get()));
+ OString::number(*oTableStyleColBandSize));
tableStyleTableInd(aTableInd);
tableStyleTcBorders(aTableBorders, XML_tblBorders);
tableStyleTableCellMar(aTableCellMar);
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)
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 7a9b8e1c3450..ed4f15cde1a6 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1437,7 +1437,7 @@ void WW8AttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, const ::boos
// sprmSPgnStart
SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSPgnStart97 );
- SwWW8Writer::InsUInt16( *m_rWW8Export.pO, oPageRestartNumber.get() );
+ SwWW8Writer::InsUInt16( *m_rWW8Export.pO, *oPageRestartNumber );
}
}
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index b780e3ac6c66..4f46c66e1fed 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1926,7 +1926,7 @@ void SwWW8ImplReader::AdjustLRWrapForWordMargins(
sal_uInt32 nXRelTo = SvxMSDffImportRec::RELTO_DEFAULT;
if ( rRecord.nXRelTo )
{
- nXRelTo = rRecord.nXRelTo.get();
+ nXRelTo = *rRecord.nXRelTo;
}
// Left adjustments - if horizontally aligned to left of
@@ -1964,7 +1964,7 @@ void SwWW8ImplReader::AdjustULWrapForWordMargins(
sal_uInt32 nYRelTo = SvxMSDffImportRec::RELTO_DEFAULT;
if ( rRecord.nYRelTo )
{
- nYRelTo = rRecord.nYRelTo.get();
+ nYRelTo = *rRecord.nYRelTo;
}
// Top adjustment - remove upper wrapping if aligned to page
@@ -2283,7 +2283,7 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
// if X and Y Rel values are on default take it as a hint, that they have not been set
// by <SwMSDffManager::ProcessObj(..)>
- const bool bXYRelHaveDefaultValues = pRecord->nXRelTo.get() == 2 && pRecord->nYRelTo.get() == 2;
+ const bool bXYRelHaveDefaultValues = *pRecord->nXRelTo == 2 && *pRecord->nYRelTo == 2;
if ( bXYRelHaveDefaultValues
&& m_nInTable > 0
&& !bCurSectionVertical )
@@ -2295,8 +2295,8 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
}
}
- sal_uInt32 nXRelTo = (pRecord->nXRelTo && nCntRelTo > pRecord->nXRelTo) ? pRecord->nXRelTo.get() : 1;
- sal_uInt32 nYRelTo = (pRecord->nYRelTo && nCntRelTo > pRecord->nYRelTo) ? pRecord->nYRelTo.get() : 1;
+ sal_uInt32 nXRelTo = (pRecord->nXRelTo && nCntRelTo > pRecord->nXRelTo) ? *pRecord->nXRelTo : 1;
+ sal_uInt32 nYRelTo = (pRecord->nYRelTo && nCntRelTo > pRecord->nYRelTo) ? *pRecord->nYRelTo : 1;
RndStdIds eAnchor = IsInlineEscherHack() ? RndStdIds::FLY_AS_CHAR : RndStdIds::FLY_AT_CHAR; // #i43718#
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 7c1b29df5aa1..ef7ce5bcd668 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -987,10 +987,10 @@ bool SvXMLExportItemMapper::QueryXMLValue(
if( MID_PAGEDESC_PAGENUMOFFSET==nMemberId )
{
::boost::optional<sal_uInt16> oNumOffset = rPageDesc.GetNumOffset();
- if (oNumOffset && oNumOffset.get() > 0)
+ if (oNumOffset && *oNumOffset > 0)
{
// #i114163# positiveInteger only!
- sal_Int32 const number(oNumOffset.get());
+ sal_Int32 const number(*oNumOffset);
aOut.append(number);
}
else
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
{
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 4d126dcdfc81..51ccdfbfe83a 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1459,7 +1459,7 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet )
{
m_xPageNoCB->set_active(true);
m_xPageNoNF->set_sensitive(true);
- m_xPageNoNF->set_value(oNumOffset.get());
+ m_xPageNoNF->set_value(*oNumOffset);
}
else
{
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 1b048c9d16b7..d6857e8156c1 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -656,7 +656,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if (oPageNumber)
{
bIsNumberFilled = true;
- nPageNumber = oPageNumber.get();
+ nPageNumber = *oPageNumber;
}
rReq.AppendItem( SfxInt16Item ( FN_INSERT_BREAK_DLG, nKind ) );
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index cc0385748950..9e8434e82466 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -696,7 +696,7 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet )
if (oNumOffset)
{
- SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset.get() );
+ SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, *oNumOffset );
rCoreSet.Put( aPageNum );
}
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 25e3f8aa312a..07b59b983fc7 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -600,7 +600,7 @@ namespace ucb { namespace ucp { namespace ext
{
DBG_UNHANDLED_EXCEPTION("ucb.ucp.ext");
}
- m_aIsFolder.reset( bIsFolder );
+ m_aIsFolder = bIsFolder;
return *m_aIsFolder;
}
@@ -610,7 +610,7 @@ namespace ucb { namespace ucp { namespace ext
if ( !!m_aContentType )
return;
- m_aContentType.reset( ContentProvider::getArtificialNodeContentType() );
+ m_aContentType = ContentProvider::getArtificialNodeContentType();
if ( m_eExtContentType == E_EXTENSION_CONTENT )
{
try
@@ -618,7 +618,7 @@ namespace ucb { namespace ucp { namespace ext
Sequence< Property > aProps(1);
aProps[0].Name = "ContentType";
Reference< XRow > xRow( getPropertyValues( aProps, nullptr ), UNO_SET_THROW );
- m_aContentType.reset( xRow->getString(1) );
+ m_aContentType = xRow->getString(1);
}
catch( const Exception& )
{
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index d359e48b0f80..c0c0c709e8a2 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2610,16 +2610,16 @@ bool getTTCoverage(
if (nLength >= OS2_Legacy_length)
{
rUnicodeRange = std::bitset<UnicodeCoverage::MAX_UC_ENUM>();
- append(rUnicodeRange.get(), 0, GetUInt32(pTable, OS2_ulUnicodeRange1_offset));
- append(rUnicodeRange.get(), 32, GetUInt32(pTable, OS2_ulUnicodeRange2_offset));
- append(rUnicodeRange.get(), 64, GetUInt32(pTable, OS2_ulUnicodeRange3_offset));
- append(rUnicodeRange.get(), 96, GetUInt32(pTable, OS2_ulUnicodeRange4_offset));
+ append(*rUnicodeRange, 0, GetUInt32(pTable, OS2_ulUnicodeRange1_offset));
+ append(*rUnicodeRange, 32, GetUInt32(pTable, OS2_ulUnicodeRange2_offset));
+ append(*rUnicodeRange, 64, GetUInt32(pTable, OS2_ulUnicodeRange3_offset));
+ append(*rUnicodeRange, 96, GetUInt32(pTable, OS2_ulUnicodeRange4_offset));
bRet = true;
if (nLength >= OS2_V1_length)
{
rCodePageRange = std::bitset<CodePageCoverage::MAX_CP_ENUM>();
- append(rCodePageRange.get(), 0, GetUInt32(pTable, OS2_ulCodePageRange1_offset));
- append(rCodePageRange.get(), 32, GetUInt32(pTable, OS2_ulCodePageRange2_offset));
+ append(*rCodePageRange, 0, GetUInt32(pTable, OS2_ulCodePageRange1_offset));
+ append(*rCodePageRange, 32, GetUInt32(pTable, OS2_ulCodePageRange2_offset));
}
}
return bRet;
diff --git a/vcl/unx/generic/window/screensaverinhibitor.cxx b/vcl/unx/generic/window/screensaverinhibitor.cxx
index cc291c5e725b..b79069d08d12 100644
--- a/vcl/unx/generic/window/screensaverinhibitor.cxx
+++ b/vcl/unx/generic/window/screensaverinhibitor.cxx
@@ -55,15 +55,15 @@ void ScreenSaverInhibitor::inhibit( bool bInhibit, const OUString& sReason,
{
if (pDisplay)
{
- inhibitXScreenSaver( bInhibit, pDisplay.get() );
- inhibitXAutoLock( bInhibit, pDisplay.get() );
- inhibitDPMS( bInhibit, pDisplay.get() );
+ inhibitXScreenSaver( bInhibit, *pDisplay );
+ inhibitXAutoLock( bInhibit, *pDisplay );
+ inhibitDPMS( bInhibit, *pDisplay );
}
if (xid)
{
- inhibitGSM( bInhibit, appname, aReason.getStr(), xid.get() );
- inhibitMSM( bInhibit, appname, aReason.getStr(), xid.get() );
+ inhibitGSM( bInhibit, appname, aReason.getStr(), *xid );
+ inhibitMSM( bInhibit, appname, aReason.getStr(), *xid );
}
}
}
@@ -132,7 +132,7 @@ static void dbusInhibit( bool bInhibit,
}
else
{
- res = fUnInhibit( proxy, rCookie.get(), error );
+ res = fUnInhibit( proxy, *rCookie, error );
rCookie.reset();
if (res != nullptr)
@@ -286,7 +286,7 @@ void ScreenSaverInhibitor::inhibitXScreenSaver( bool bInhibit, Display* pDisplay
}
else if ( !bInhibit && mnXScreenSaverTimeout )
{
- XSetScreenSaver( pDisplay, mnXScreenSaverTimeout.get(),
+ XSetScreenSaver( pDisplay, *mnXScreenSaverTimeout,
nInterval, bPreferBlanking,
bAllowExposures );
mnXScreenSaverTimeout.reset();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8eebe7869dd2..f203399278bf 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -202,11 +202,11 @@ static bool IsFieldNestingAllowed(const FieldContextPtr& pOuter, const FieldCont
return true;
}
- switch (pOuter->GetFieldId().get())
+ switch (*pOuter->GetFieldId())
{
case FIELD_IF:
{
- switch (pInner->GetFieldId().get())
+ switch (*pInner->GetFieldId())
{
case FIELD_MERGEFIELD:
{
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index bf68ffb1dc08..019b961c36ac 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -218,7 +218,7 @@ public:
sal_Int32 getBottom() const { return m_nBottom; }
- void setZ(sal_Int32 nZ) { m_oZ.reset(nZ); }
+ void setZ(sal_Int32 nZ) { m_oZ = nZ; }
bool hasZ() const { return bool(m_oZ); }
More information about the Libreoffice-commits
mailing list