include/oox/helper/helper.hxx | 4 -
oox/source/drawingml/chart/axisconverter.cxx | 20 +++---
oox/source/drawingml/chart/chartspaceconverter.cxx | 2
oox/source/drawingml/chart/objectformatter.cxx | 4 -
oox/source/drawingml/chart/seriesconverter.cxx | 28 ++++-----
oox/source/drawingml/connectorshapecontext.cxx | 12 +--
oox/source/drawingml/customshapegeometry.cxx | 26 ++++----
oox/source/drawingml/customshapeproperties.cxx | 24 +++----
oox/source/drawingml/diagram/datamodelcontext.cxx | 20 +++---
oox/source/drawingml/diagram/diagramdefinitioncontext.cxx | 14 ++--
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 12 +--
oox/source/drawingml/diagram/layoutnodecontext.cxx | 12 +--
oox/source/drawingml/embeddedwavaudiofile.cxx | 4 -
oox/source/drawingml/fillproperties.cxx | 18 ++---
oox/source/drawingml/graphicshapecontext.cxx | 14 ++--
oox/source/drawingml/hyperlinkcontext.cxx | 8 +-
oox/source/drawingml/lineproperties.cxx | 22 +++----
oox/source/drawingml/shape.cxx | 22 +++----
oox/source/drawingml/shapecontext.cxx | 8 +-
oox/source/drawingml/shapegroupcontext.cxx | 6 -
oox/source/drawingml/table/tablecell.cxx | 6 -
oox/source/drawingml/table/tablecellcontext.cxx | 4 -
oox/source/drawingml/table/tablecontext.cxx | 2
oox/source/drawingml/table/tablerowcontext.cxx | 2
oox/source/drawingml/table/tablestylecontext.cxx | 4 -
oox/source/drawingml/table/tablestylelistfragmenthandler.cxx | 2
oox/source/drawingml/textbodypropertiescontext.cxx | 4 -
oox/source/drawingml/textcharacterproperties.cxx | 18 ++---
oox/source/drawingml/textcharacterpropertiescontext.cxx | 8 +-
oox/source/drawingml/texteffectscontext.cxx | 2
oox/source/drawingml/textfield.cxx | 2
oox/source/drawingml/textfieldcontext.cxx | 4 -
oox/source/drawingml/textparagraph.cxx | 2
oox/source/drawingml/textparagraphpropertiescontext.cxx | 30 ++++-----
oox/source/drawingml/textrun.cxx | 2
oox/source/drawingml/textspacingcontext.cxx | 4 -
oox/source/drawingml/texttabstoplistcontext.cxx | 2
oox/source/drawingml/themeelementscontext.cxx | 4 -
oox/source/drawingml/themefragmenthandler.cxx | 2
oox/source/drawingml/transform2dcontext.cxx | 20 +++---
oox/source/helper/attributelist.cxx | 2
oox/source/ppt/layoutfragmenthandler.cxx | 2
oox/source/ppt/pptgraphicshapecontext.cxx | 6 -
oox/source/ppt/pptshape.cxx | 10 +--
oox/source/ppt/pptshapecontext.cxx | 6 -
oox/source/ppt/pptshapegroupcontext.cxx | 8 +-
oox/source/ppt/presPropsfragmenthandler.cxx | 4 -
oox/source/ppt/slidefragmenthandler.cxx | 2
oox/source/shape/LockedCanvasContext.cxx | 4 -
oox/source/shape/WpsContext.cxx | 12 +--
oox/source/vml/vmlformatting.cxx | 34 +++++------
oox/source/vml/vmlshape.cxx | 16 ++---
oox/source/vml/vmlshapecontext.cxx | 26 ++++----
oox/source/vml/vmltextbox.cxx | 22 +++----
oox/source/vml/vmltextboxcontext.cxx | 8 +-
sc/source/filter/oox/SparklineFragment.cxx | 4 -
sc/source/filter/oox/autofilterbuffer.cxx | 2
sc/source/filter/oox/drawingfragment.cxx | 2
58 files changed, 287 insertions(+), 287 deletions(-)
New commits:
commit 0feeb94f97332a8e803e1936d66e0f234bd51973
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Jun 21 13:02:53 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jun 22 11:48:28 2022 +0200
rename oox::OptValue::get to value
as a step in replacing OptValue with std::optional
Change-Id: Ia5d05c28a88beaced11ae1d0414de66106cc9e20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136269
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx
index 0c8aa2e6c358..9d5b7c3e2549 100644
--- a/include/oox/helper/helper.hxx
+++ b/include/oox/helper/helper.hxx
@@ -180,7 +180,7 @@ public:
bool has_value() const { return mbHasValue; }
bool operator!() const { return !mbHasValue; }
- const Type& get() const { return maValue; }
+ const Type& value() const { return maValue; }
const Type& value_or( const Type& rDefValue ) const { return mbHasValue ?
maValue : rDefValue; }
Type& operator*() { assert(mbHasValue); return maValue; }
@@ -201,7 +201,7 @@ template< typename Type >
void assignIfUsed( OptValue<Type>& rDestValue, const OptValue<Type>&
rSourceValue )
{
if( rSourceValue.has_value() )
- rDestValue = rSourceValue.get();
+ rDestValue = rSourceValue.value();
}
diff --git a/oox/source/drawingml/chart/axisconverter.cxx
b/oox/source/drawingml/chart/axisconverter.cxx
index bb6b278af8ac..8d6ba3fab509 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -55,12 +55,12 @@ namespace {
void lclSetValueOrClearAny( Any& orAny, const OptValue< double >& rofValue )
{
- if( rofValue.has_value() ) orAny <<= rofValue.get(); else orAny.clear();
+ if( rofValue.has_value() ) orAny <<= rofValue.value(); else orAny.clear();
}
bool lclIsLogarithmicScale( const AxisModel& rAxisModel )
{
- return rAxisModel.mofLogBase.has_value() && (2.0 <=
rAxisModel.mofLogBase.get()) && (rAxisModel.mofLogBase.get() <= 1000.0);
+ return rAxisModel.mofLogBase.has_value() && (2.0 <=
rAxisModel.mofLogBase.value()) && (rAxisModel.mofLogBase.value() <= 1000.0);
}
sal_Int32 lclGetApiTimeUnit( sal_Int32 nTimeUnit )
@@ -78,8 +78,8 @@ sal_Int32 lclGetApiTimeUnit( sal_Int32 nTimeUnit )
void lclConvertTimeInterval( Any& orInterval, const OptValue< double >&
rofUnit, sal_Int32 nTimeUnit )
{
- if( rofUnit.has_value() && (1.0 <= rofUnit.get()) && (rofUnit.get() <=
SAL_MAX_INT32) )
- orInterval <<= css::chart::TimeInterval( static_cast< sal_Int32 >(
rofUnit.get() ), lclGetApiTimeUnit( nTimeUnit ) );
+ if( rofUnit.has_value() && (1.0 <= rofUnit.value()) && (rofUnit.value() <=
SAL_MAX_INT32) )
+ orInterval <<= css::chart::TimeInterval( static_cast< sal_Int32 >(
rofUnit.value() ), lclGetApiTimeUnit( nTimeUnit ) );
else
orInterval.clear();
}
@@ -265,7 +265,7 @@ void AxisConverter::convertFromModel(const
Reference<XCoordinateSystem>& rxCoord
lclConvertTimeInterval(
aScaleData.TimeIncrement.MinorTimeInterval, mrModel.mofMinorUnit,
mrModel.mnMinorTimeUnit );
// base time unit
if( mrModel.monBaseTimeUnit.has_value() )
- aScaleData.TimeIncrement.TimeResolution <<=
lclGetApiTimeUnit( mrModel.monBaseTimeUnit.get() );
+ aScaleData.TimeIncrement.TimeResolution <<=
lclGetApiTimeUnit( mrModel.monBaseTimeUnit.value() );
else
aScaleData.TimeIncrement.TimeResolution.clear();
}
@@ -276,7 +276,7 @@ void AxisConverter::convertFromModel(const
Reference<XCoordinateSystem>& rxCoord
if (mrModel.mxTextProp.is()
&&
mrModel.mxTextProp->getTextProperties().moRotation.has_value())
bTextOverlap
- =
mrModel.mxTextProp->getTextProperties().moRotation.get() == 0;
+ =
mrModel.mxTextProp->getTextProperties().moRotation.value() == 0;
aAxisProp.setProperty(PROP_TextOverlap, bTextOverlap);
/* do not break text into several lines unless the
rotation is 0 degree,
or the rotation is 90 degree and the inner size of the
chart is not fixed,
@@ -309,7 +309,7 @@ void AxisConverter::convertFromModel(const
Reference<XCoordinateSystem>& rxCoord
// major increment
IncrementData& rIncrementData = aScaleData.IncrementData;
if( mrModel.mofMajorUnit.has_value() &&
aScaleData.Scaling.is() )
- rIncrementData.Distance <<= aScaleData.Scaling->doScaling(
mrModel.mofMajorUnit.get() );
+ rIncrementData.Distance <<= aScaleData.Scaling->doScaling(
mrModel.mofMajorUnit.value() );
else
lclSetValueOrClearAny( rIncrementData.Distance,
mrModel.mofMajorUnit );
// minor increment
@@ -322,9 +322,9 @@ void AxisConverter::convertFromModel(const
Reference<XCoordinateSystem>& rxCoord
if( mrModel.mofMinorUnit.has_value() )
rIntervalCount <<= sal_Int32( 9 );
}
- else if( mrModel.mofMajorUnit.has_value() &&
mrModel.mofMinorUnit.has_value() && (0.0 < mrModel.mofMinorUnit.get()) &&
(mrModel.mofMinorUnit.get() <= mrModel.mofMajorUnit.get()) )
+ else if( mrModel.mofMajorUnit.has_value() &&
mrModel.mofMinorUnit.has_value() && (0.0 < mrModel.mofMinorUnit.value()) &&
(mrModel.mofMinorUnit.value() <= mrModel.mofMajorUnit.value()) )
{
- double fCount = mrModel.mofMajorUnit.get() /
mrModel.mofMinorUnit.get() + 0.5;
+ double fCount = mrModel.mofMajorUnit.value() /
mrModel.mofMinorUnit.value() + 0.5;
if( (1.0 <= fCount) && (fCount < 1001.0) )
rIntervalCount <<= static_cast< sal_Int32 >( fCount );
}
@@ -377,7 +377,7 @@ void AxisConverter::convertFromModel(const
Reference<XCoordinateSystem>& rxCoord
// calculate automatic origin depending on scaling mode of crossing
axis
bool bCrossingLogScale = pCrossingAxis && lclIsLogarithmicScale(
*pCrossingAxis );
- double fCrossingPos = bManualCrossing ? mrModel.mofCrossesAt.get() :
(bCrossingLogScale ? 1.0 : 0.0);
+ double fCrossingPos = bManualCrossing ? mrModel.mofCrossesAt.value() :
(bCrossingLogScale ? 1.0 : 0.0);
aAxisProp.setProperty( PROP_CrossoverValue, fCrossingPos );
// axis title ---------------------------------------------------------
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx
b/oox/source/drawingml/chart/chartspaceconverter.cxx
index 7b9044c47442..c83ed37e9c02 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -212,7 +212,7 @@ void ChartSpaceConverter::convertFromModel( const
Reference< XShapes >& rxExtern
if( mrModel.mxPlotArea.is() && mrModel.mxPlotArea->maAxes.size() > 0 &&
mrModel.mxPlotArea->maAxes[0]->monBaseTimeUnit.has_value() )
{
- bIsMonthBasedTimeUnit =
mrModel.mxPlotArea->maAxes[0]->monBaseTimeUnit.get() == XML_months;
+ bIsMonthBasedTimeUnit =
mrModel.mxPlotArea->maAxes[0]->monBaseTimeUnit.value() == XML_months;
}
if (!bIsMonthBasedTimeUnit) switch( mrModel.mnDispBlanksAs )
diff --git a/oox/source/drawingml/chart/objectformatter.cxx
b/oox/source/drawingml/chart/objectformatter.cxx
index 2ef67ebc683e..f716ece56f2c 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -839,7 +839,7 @@ LineFormatter::LineFormatter( ObjectFormatterData& rData,
const AutoFormatEntry*
}
// change line width according to chart auto style
if( mxAutoLine->moLineWidth.has_value() )
- mxAutoLine->moLineWidth = mxAutoLine->moLineWidth.get() *
pAutoFormatEntry->mnRelLineWidth / 100;
+ mxAutoLine->moLineWidth = mxAutoLine->moLineWidth.value() *
pAutoFormatEntry->mnRelLineWidth / 100;
}
void LineFormatter::convertFormatting( ShapePropertyMap& rPropMap, const
ModelRef< Shape >& rxShapeProp, sal_Int32 nSeriesIdx )
@@ -915,7 +915,7 @@ TextFormatter::TextFormatter( ObjectFormatterData& rData,
const AutoTextEntry* p
{
mxAutoText->assignUsed( *pTextProps );
if( pTextProps->moHeight.has_value() )
- mxAutoText->moHeight = pTextProps->moHeight.get() *
pAutoTextEntry->mnRelFontSize / 100;
+ mxAutoText->moHeight = pTextProps->moHeight.value() *
pAutoTextEntry->mnRelFontSize / 100;
}
}
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx
b/oox/source/drawingml/chart/seriesconverter.cxx
index e618e0695cf7..383e5bd3fa4b 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -197,12 +197,12 @@ void importBorderProperties( PropertySet& rPropSet,
Shape& rShape, const Graphic
{
LineProperties& rLP = rShape.getLineProperties();
// no fill has the same effect as no border so skip it
- if (rLP.maLineFill.moFillType.get() == XML_noFill)
+ if (rLP.maLineFill.moFillType.value() == XML_noFill)
return;
if (rLP.moLineWidth.has_value())
{
- sal_Int32 nWidth = convertEmuToHmm(rLP.moLineWidth.get());
+ sal_Int32 nWidth = convertEmuToHmm(rLP.moLineWidth.value());
rPropSet.setProperty(PROP_LabelBorderWidth, uno::Any(nWidth));
rPropSet.setProperty(PROP_LabelBorderStyle,
uno::Any(drawing::LineStyle_SOLID));
}
@@ -215,7 +215,7 @@ void importFillProperties( PropertySet& rPropSet, Shape&
rShape, const GraphicHe
{
FillProperties& rFP = rShape.getFillProperties();
- if (rFP.moFillType.has_value() && rFP.moFillType.get() == XML_solidFill)
+ if (rFP.moFillType.has_value() && rFP.moFillType.value() == XML_solidFill)
{
rPropSet.setProperty(PROP_LabelFillStyle, drawing::FillStyle_SOLID);
@@ -223,13 +223,13 @@ void importFillProperties( PropertySet& rPropSet, Shape&
rShape, const GraphicHe
::Color nColor = aColor.getColor(rGraphicHelper);
rPropSet.setProperty(PROP_LabelFillColor, uno::Any(nColor));
}
- else if(rFP.moFillType.has_value() && rFP.moFillType.get() == XML_pattFill)
+ else if(rFP.moFillType.has_value() && rFP.moFillType.value() ==
XML_pattFill)
{
rPropSet.setProperty(PROP_LabelFillStyle, drawing::FillStyle_HATCH);
rPropSet.setProperty(PROP_LabelFillBackground, true);
Color aHatchColor( rFP.maPatternProps.maPattFgColor );
- drawing::Hatch aHatch =
createHatch(rFP.maPatternProps.moPattPreset.get(),
aHatchColor.getColor(rGraphicHelper, 0));
+ drawing::Hatch aHatch =
createHatch(rFP.maPatternProps.moPattPreset.value(),
aHatchColor.getColor(rGraphicHelper, 0));
OUString sHatchName = rModelObjHelper.insertFillHatch(aHatch);
rPropSet.setProperty(PROP_LabelFillHatchName, sHatchName);
@@ -360,8 +360,8 @@ void DataLabelConverter::convertFromModel( const Reference<
XDataSeries >& rxDat
if (eType ==
DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CELLRANGE &&
oaCellRange.has_value())
{
- xCustomLabel->setCellRange( oaCellRange.get() );
- xCustomLabel->setString( oaLabelText.get() );
+ xCustomLabel->setCellRange( oaCellRange.value() );
+ xCustomLabel->setString( oaLabelText.value() );
xCustomLabel->setDataLabelsRange( true );
}
else
@@ -671,13 +671,13 @@ void TrendlineConverter::convertFromModel( const
Reference< XDataSeries >& rxDat
bool hasIntercept = mrModel.mfIntercept.has_value();
aPropSet.setProperty( PROP_ForceIntercept, hasIntercept);
if (hasIntercept)
- aPropSet.setProperty( PROP_InterceptValue,
mrModel.mfIntercept.get());
+ aPropSet.setProperty( PROP_InterceptValue,
mrModel.mfIntercept.value());
// Extrapolation
if (mrModel.mfForward.has_value())
- aPropSet.setProperty( PROP_ExtrapolateForward,
mrModel.mfForward.get() );
+ aPropSet.setProperty( PROP_ExtrapolateForward,
mrModel.mfForward.value() );
if (mrModel.mfBackward.has_value())
- aPropSet.setProperty( PROP_ExtrapolateBackward,
mrModel.mfBackward.get() );
+ aPropSet.setProperty( PROP_ExtrapolateBackward,
mrModel.mfBackward.value() );
// trendline formatting
getFormatter().convertFrameFormatting( aPropSet,
mrModel.mxShapeProp, OBJECTTYPE_TRENDLINE );
@@ -725,14 +725,14 @@ void DataPointConverter::convertFromModel( const
Reference< XDataSeries >& rxDat
PropertySet aPropSet( rxDataSeries->getDataPointByIndex(
mrModel.mnIndex ) );
// data point marker
- if( ( mrModel.monMarkerSymbol.has_value() &&
mrModel.monMarkerSymbol.get() != rSeries.mnMarkerSymbol ) ||
- ( mrModel.monMarkerSize.has_value() && mrModel.monMarkerSize.get()
!= rSeries.mnMarkerSize ) )
+ if( ( mrModel.monMarkerSymbol.has_value() &&
mrModel.monMarkerSymbol.value() != rSeries.mnMarkerSymbol ) ||
+ ( mrModel.monMarkerSize.has_value() &&
mrModel.monMarkerSize.value() != rSeries.mnMarkerSize ) )
rTypeGroup.convertMarker( aPropSet,
mrModel.monMarkerSymbol.value_or( rSeries.mnMarkerSymbol ),
mrModel.monMarkerSize.value_or( rSeries.mnMarkerSize ),
mrModel.mxMarkerProp );
// data point pie explosion
- if( mrModel.monExplosion.has_value() && mrModel.monExplosion.get() !=
rSeries.mnExplosion )
- rTypeGroup.convertPieExplosion( aPropSet,
mrModel.monExplosion.get() );
+ if( mrModel.monExplosion.has_value() && mrModel.monExplosion.value()
!= rSeries.mnExplosion )
+ rTypeGroup.convertPieExplosion( aPropSet,
mrModel.monExplosion.value() );
// point formatting
if( mrModel.mxShapeProp.is() )
diff --git a/oox/source/drawingml/connectorshapecontext.cxx
b/oox/source/drawingml/connectorshapecontext.cxx
index b1ea90c357af..ebafb5116f8b 100644
--- a/oox/source/drawingml/connectorshapecontext.cxx
+++ b/oox/source/drawingml/connectorshapecontext.cxx
@@ -70,15 +70,15 @@ ConnectorShapePropertiesContext::onCreateContext(sal_Int32
aElementToken,
switch (getBaseToken(aElementToken))
{
case XML_cNvPr:
- mpConnectorShapePtr->setId(rAttribs.getString(XML_id).get());
- mpConnectorShapePtr->setName(rAttribs.getString(XML_name).get());
+ mpConnectorShapePtr->setId(rAttribs.getString(XML_id).value());
+ mpConnectorShapePtr->setName(rAttribs.getString(XML_name).value());
break;
case XML_stCxn:
{
ConnectorShapeProperties aConnectorShapeProps;
aConnectorShapeProps.mbStartShape = true;
- aConnectorShapeProps.maDestShapeId =
rAttribs.getString(XML_id).get();
- aConnectorShapeProps.mnDestGlueId =
rAttribs.getInteger(XML_idx).get();
+ aConnectorShapeProps.maDestShapeId =
rAttribs.getString(XML_id).value();
+ aConnectorShapeProps.mnDestGlueId =
rAttribs.getInteger(XML_idx).value();
mrConnectorShapePropertiesList.push_back(aConnectorShapeProps);
break;
}
@@ -86,8 +86,8 @@ ConnectorShapePropertiesContext::onCreateContext(sal_Int32
aElementToken,
{
ConnectorShapeProperties aConnectorShapeProps;
aConnectorShapeProps.mbStartShape = false;
- aConnectorShapeProps.maDestShapeId =
rAttribs.getString(XML_id).get();
- aConnectorShapeProps.mnDestGlueId =
rAttribs.getInteger(XML_idx).get();
+ aConnectorShapeProps.maDestShapeId =
rAttribs.getString(XML_id).value();
+ aConnectorShapeProps.mnDestGlueId =
rAttribs.getInteger(XML_idx).value();
mrConnectorShapePropertiesList.push_back(aConnectorShapeProps);
break;
}
diff --git a/oox/source/drawingml/customshapegeometry.cxx
b/oox/source/drawingml/customshapegeometry.cxx
index 2f508382cdc9..de240281833c 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -621,8 +621,8 @@ ContextHandlerRef GeomGuideListContext::onCreateContext(
sal_Int32 aElementToken
if ( aElementToken == A_TOKEN( gd ) ) // CT_GeomGuide
{
CustomShapeGuide aGuide;
- aGuide.maName = rAttribs.getString( XML_name ).get();
- aGuide.maFormula = convertToOOEquation( mrCustomShapeProperties,
rAttribs.getString( XML_fmla ).get() );
+ aGuide.maName = rAttribs.getString( XML_name ).value();
+ aGuide.maFormula = convertToOOEquation( mrCustomShapeProperties,
rAttribs.getString( XML_fmla ).value() );
mrGuideList.push_back( aGuide );
}
return this;
@@ -647,8 +647,8 @@ public:
AdjPoint2DContext::AdjPoint2DContext( ContextHandler2Helper const & rParent,
const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties,
EnhancedCustomShapeParameterPair& rAdjPoint2D )
: ContextHandler2( rParent )
{
- rAdjPoint2D.First = GetAdjCoordinate( rCustomShapeProperties,
rAttribs.getString( XML_x ).get() );
- rAdjPoint2D.Second = GetAdjCoordinate( rCustomShapeProperties,
rAttribs.getString( XML_y ).get() );
+ rAdjPoint2D.First = GetAdjCoordinate( rCustomShapeProperties,
rAttribs.getString( XML_x ).value() );
+ rAdjPoint2D.Second = GetAdjCoordinate( rCustomShapeProperties,
rAttribs.getString( XML_y ).value() );
}
namespace {
@@ -823,7 +823,7 @@ ConnectionSiteContext::ConnectionSiteContext(
ContextHandler2Helper const & rPar
, mrConnectionSite( rConnectionSite )
, mrCustomShapeProperties( rCustomShapeProperties )
{
- mrConnectionSite.ang = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_ang ).get() );
+ mrConnectionSite.ang = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_ang ).value() );
}
ContextHandlerRef ConnectionSiteContext::onCreateContext( sal_Int32
aElementToken, const AttributeList& rAttribs )
@@ -1099,8 +1099,8 @@ ContextHandlerRef Path2DContext::onCreateContext(
sal_Int32 aElementToken,
EnhancedCustomShapeParameterPair aScale;
EnhancedCustomShapeParameterPair aAngles;
- aScale.First = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_wR ).get() );
- aScale.Second = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_hR ).get() );
+ aScale.First = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_wR ).value() );
+ aScale.Second = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_hR ).value() );
CustomShapeGuide aGuide;
sal_Int32 nArcNum = mrCustomShapeProperties.getArcNum();
@@ -1108,7 +1108,7 @@ ContextHandlerRef Path2DContext::onCreateContext(
sal_Int32 aElementToken,
// start angle
aGuide.maName = "arctosa" + OUString::number( nArcNum );
aGuide.maFormula = "("
- + GetFormulaParameter( GetAdjCoordinate(
mrCustomShapeProperties, rAttribs.getString( XML_stAng ).get() ) )
+ + GetFormulaParameter( GetAdjCoordinate(
mrCustomShapeProperties, rAttribs.getString( XML_stAng ).value() ) )
+ ")/60000.0";
aAngles.First.Value <<=
CustomShapeProperties::SetCustomShapeGuideValue(
mrCustomShapeProperties.getGuideList(), aGuide );
aAngles.First.Type = EnhancedCustomShapeParameterType::EQUATION;
@@ -1116,7 +1116,7 @@ ContextHandlerRef Path2DContext::onCreateContext(
sal_Int32 aElementToken,
// swing angle
aGuide.maName = "arctosw" + OUString::number( nArcNum );
aGuide.maFormula = "("
- + GetFormulaParameter( GetAdjCoordinate(
mrCustomShapeProperties, rAttribs.getString( XML_swAng ).get() ) )
+ + GetFormulaParameter( GetAdjCoordinate(
mrCustomShapeProperties, rAttribs.getString( XML_swAng ).value() ) )
+ ")/60000.0";
aAngles.Second.Value <<=
CustomShapeProperties::SetCustomShapeGuideValue(
mrCustomShapeProperties.getGuideList(), aGuide );
aAngles.Second.Type = EnhancedCustomShapeParameterType::EQUATION;
@@ -1234,10 +1234,10 @@ ContextHandlerRef
CustomShapeGeometryContext::onCreateContext( sal_Int32 aElemen
case A_TOKEN( rect ): // CT_GeomRectList geometry rect list
{
GeomRect aGeomRect;
- aGeomRect.l = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_l ).get() );
- aGeomRect.t = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_t ).get() );
- aGeomRect.r = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_r ).get() );
- aGeomRect.b = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_b ).get() );
+ aGeomRect.l = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_l ).value() );
+ aGeomRect.t = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_t ).value() );
+ aGeomRect.r = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_r ).value() );
+ aGeomRect.b = GetAdjCoordinate( mrCustomShapeProperties,
rAttribs.getString( XML_b ).value() );
mrCustomShapeProperties.getTextRect() = aGeomRect;
}
break;
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index ff666b25ab6c..b0b6d34d23fe 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -216,8 +216,8 @@ void CustomShapeProperties::pushToPropSet(
if ( maTextRect.has_value() ) {
Sequence< EnhancedCustomShapeTextFrame > aTextFrames{
- { /* tl */ { maTextRect.get().l, maTextRect.get().t },
- /* br */ { maTextRect.get().r, maTextRect.get().b } }
+ { /* tl */ { maTextRect.value().l, maTextRect.value().t },
+ /* br */ { maTextRect.value().r, maTextRect.value().b } }
};
aPath.setProperty( PROP_TextFrames, aTextFrames);
}
@@ -288,20 +288,20 @@ void CustomShapeProperties::pushToPropSet(
aHandle.setProperty( PROP_Position, maAdjustHandleList[ i
].pos);
if ( maAdjustHandleList[ i ].gdRef1.has_value() )
{
- sal_Int32 nIndex = GetCustomShapeGuideValue(
maAdjustmentGuideList, maAdjustHandleList[ i ].gdRef1.get() );
+ sal_Int32 nIndex = GetCustomShapeGuideValue(
maAdjustmentGuideList, maAdjustHandleList[ i ].gdRef1.value() );
if ( nIndex >= 0 )
aHandle.setProperty( PROP_RefR, nIndex);
}
if ( maAdjustHandleList[ i ].gdRef2.has_value() )
{
- sal_Int32 nIndex = GetCustomShapeGuideValue(
maAdjustmentGuideList, maAdjustHandleList[ i ].gdRef2.get() );
+ sal_Int32 nIndex = GetCustomShapeGuideValue(
maAdjustmentGuideList, maAdjustHandleList[ i ].gdRef2.value() );
if ( nIndex >= 0 )
aHandle.setProperty( PROP_RefAngle, nIndex);
}
if ( maAdjustHandleList[ i ].min1.has_value() )
- aHandle.setProperty( PROP_RadiusRangeMinimum,
maAdjustHandleList[ i ].min1.get());
+ aHandle.setProperty( PROP_RadiusRangeMinimum,
maAdjustHandleList[ i ].min1.value());
if ( maAdjustHandleList[ i ].max1.has_value() )
- aHandle.setProperty( PROP_RadiusRangeMaximum,
maAdjustHandleList[ i ].max1.get());
+ aHandle.setProperty( PROP_RadiusRangeMaximum,
maAdjustHandleList[ i ].max1.value());
/* TODO: AngleMin & AngleMax
if ( maAdjustHandleList[ i ].min2.has() )
@@ -317,24 +317,24 @@ void CustomShapeProperties::pushToPropSet(
{
// TODO: PROP_RefX and PROP_RefY are not yet part of our
file format,
// so the handles will not work after save/reload
- sal_Int32 nIndex = GetCustomShapeGuideValue(
maAdjustmentGuideList, maAdjustHandleList[ i ].gdRef1.get() );
+ sal_Int32 nIndex = GetCustomShapeGuideValue(
maAdjustmentGuideList, maAdjustHandleList[ i ].gdRef1.value() );
if ( nIndex >= 0 )
aHandle.setProperty( PROP_RefX, nIndex);
}
if ( maAdjustHandleList[ i ].gdRef2.has_value() )
{
- sal_Int32 nIndex = GetCustomShapeGuideValue(
maAdjustmentGuideList, maAdjustHandleList[ i ].gdRef2.get() );
+ sal_Int32 nIndex = GetCustomShapeGuideValue(
maAdjustmentGuideList, maAdjustHandleList[ i ].gdRef2.value() );
if ( nIndex >= 0 )
aHandle.setProperty( PROP_RefY, nIndex);
}
if ( maAdjustHandleList[ i ].min1.has_value() )
- aHandle.setProperty( PROP_RangeXMinimum,
maAdjustHandleList[ i ].min1.get());
+ aHandle.setProperty( PROP_RangeXMinimum,
maAdjustHandleList[ i ].min1.value());
if ( maAdjustHandleList[ i ].max1.has_value() )
- aHandle.setProperty( PROP_RangeXMaximum,
maAdjustHandleList[ i ].max1.get());
+ aHandle.setProperty( PROP_RangeXMaximum,
maAdjustHandleList[ i ].max1.value());
if ( maAdjustHandleList[ i ].min2.has_value() )
- aHandle.setProperty( PROP_RangeYMinimum,
maAdjustHandleList[ i ].min2.get());
+ aHandle.setProperty( PROP_RangeYMinimum,
maAdjustHandleList[ i ].min2.value());
if ( maAdjustHandleList[ i ].max2.has_value() )
- aHandle.setProperty( PROP_RangeYMaximum,
maAdjustHandleList[ i ].max2.get());
+ aHandle.setProperty( PROP_RangeYMaximum,
maAdjustHandleList[ i ].max2.value());
}
aHandlesRange[ i ] = aHandle.makePropertyValueSequence();
}
diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx
b/oox/source/drawingml/diagram/datamodelcontext.cxx
index e0ea3c93dc35..86f330467aa2 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.cxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.cxx
@@ -57,12 +57,12 @@ public:
svx::diagram::Connection& rConnection=mrConnection.back();
rConnection.mnXMLType =
static_cast<svx::diagram::TypeConstant>(rAttribs.getToken( XML_type, XML_parOf
));
- rConnection.msModelId = rAttribs.getString( XML_modelId
).get();
- rConnection.msSourceId = rAttribs.getString( XML_srcId
).get();
- rConnection.msDestId = rAttribs.getString( XML_destId
).get();
- rConnection.msPresId = rAttribs.getString( XML_presId
).get();
- rConnection.msSibTransId = rAttribs.getString(
XML_sibTransId ).get();
- rConnection.msParTransId = rAttribs.getString(
XML_parTransId ).get();
+ rConnection.msModelId = rAttribs.getString( XML_modelId
).value();
+ rConnection.msSourceId = rAttribs.getString( XML_srcId
).value();
+ rConnection.msDestId = rAttribs.getString( XML_destId
).value();
+ rConnection.msPresId = rAttribs.getString( XML_presId
).value();
+ rConnection.msSibTransId = rAttribs.getString(
XML_sibTransId ).value();
+ rConnection.msParTransId = rAttribs.getString(
XML_parTransId ).value();
rConnection.mnSourceOrder = rAttribs.getInteger(
XML_srcOrd, 0 );
rConnection.mnDestOrder = rAttribs.getInteger(
XML_destOrd, 0 );
@@ -117,7 +117,7 @@ public:
// need to convert from oox::OptValue to std::optional since
1st is not available in svx
const OptValue< sal_Int32 > aOptVal(rAttribs.getToken( XML_val
));
if(aOptVal.has_value())
- mrPoint.moHierarchyBranch = aOptVal.get();
+ mrPoint.moHierarchyBranch = aOptVal.value();
break;
}
case DGM_TOKEN( orgChart ):
@@ -214,7 +214,7 @@ public:
mrPoint( rPoint ),
mrDiagramData( rDiagramData )
{
- mrPoint.msModelId = rAttribs.getString( XML_modelId ).get();
+ mrPoint.msModelId = rAttribs.getString( XML_modelId ).value();
// the default type is XML_node
const sal_Int32 nType = rAttribs.getToken( XML_type, XML_node );
@@ -222,7 +222,7 @@ public:
// ignore the cxnId unless it is this type. See 5.15.3.1.3 in Primer
if( ( nType == XML_parTrans ) || ( nType == XML_sibTrans ) )
- mrPoint.msCnxId = rAttribs.getString( XML_cxnId ).get();
+ mrPoint.msCnxId = rAttribs.getString( XML_cxnId ).value();
}
virtual ContextHandlerRef
@@ -371,7 +371,7 @@ DataModelContext::onCreateContext( ::sal_Int32 aElement,
case A_TOKEN( ext ):
break;
case DSP_TOKEN( dataModelExt ):
- mpDataModel->getExtDrawings().push_back( rAttribs.getString( XML_relId
).get() );
+ mpDataModel->getExtDrawings().push_back( rAttribs.getString( XML_relId
).value() );
break;
default:
break;
diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
index 02d3777036d4..d569ed6d6dbe 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
@@ -37,14 +37,14 @@ DiagramDefinitionContext::DiagramDefinitionContext(
ContextHandler2Helper const
: ContextHandler2( rParent )
, mpLayout( pLayout )
{
- mpLayout->setDefStyle( rAttributes.getString( XML_defStyle ).get() );
- OUString sValue = rAttributes.getString( XML_minVer ).get();
+ mpLayout->setDefStyle( rAttributes.getString( XML_defStyle ).value() );
+ OUString sValue = rAttributes.getString( XML_minVer ).value();
if( sValue.isEmpty() )
{
sValue = "http://schemas.openxmlformats.org/drawingml/2006/diagram";;
}
mpLayout->setMinVer( sValue );
- mpLayout->setUniqueId( rAttributes.getString( XML_uniqueId ).get() );
+ mpLayout->setUniqueId( rAttributes.getString( XML_uniqueId ).value() );
}
DiagramDefinitionContext::~DiagramDefinitionContext()
@@ -61,18 +61,18 @@ DiagramDefinitionContext::onCreateContext( ::sal_Int32
aElement,
switch( aElement )
{
case DGM_TOKEN( title ):
- mpLayout->setTitle( rAttribs.getString( XML_val ).get() );
+ mpLayout->setTitle( rAttribs.getString( XML_val ).value() );
break;
case DGM_TOKEN( desc ):
- mpLayout->setDesc( rAttribs.getString( XML_val ).get() );
+ mpLayout->setDesc( rAttribs.getString( XML_val ).value() );
break;
case DGM_TOKEN( layoutNode ):
{
LayoutNodePtr pNode =
std::make_shared<LayoutNode>(mpLayout->getDiagram());
mpLayout->getNode() = pNode;
pNode->setChildOrder( rAttribs.getToken( XML_chOrder, XML_b ) );
- pNode->setMoveWith( rAttribs.getString( XML_moveWith ).get() );
- pNode->setStyleLabel( rAttribs.getString( XML_styleLbl ).get() );
+ pNode->setMoveWith( rAttribs.getString( XML_moveWith ).value() );
+ pNode->setStyleLabel( rAttribs.getString( XML_styleLbl ).value() );
return new LayoutNodeContext( *this, rAttribs, pNode );
}
case DGM_TOKEN( clrData ):
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 08e5269b6b6c..3714c239f9ef 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -1516,12 +1516,12 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const
std::vector<Constraint>&
if (nDir == XML_fromL || nDir == XML_fromR)
{
oox::OptValue<sal_Int32> oWidth =
findProperty(aProperties, aCurrShape->getInternalName(), XML_w);
- bScaleDownEmptySpacing =
oWidth.has_value() && oWidth.get() > 0;
+ bScaleDownEmptySpacing =
oWidth.has_value() && oWidth.value() > 0;
}
if (!bScaleDownEmptySpacing && (nDir ==
XML_fromT || nDir == XML_fromB))
{
oox::OptValue<sal_Int32> oHeight =
findProperty(aProperties, aCurrShape->getInternalName(), XML_h);
- bScaleDownEmptySpacing =
oHeight.has_value() && oHeight.get() > 0;
+ bScaleDownEmptySpacing =
oHeight.has_value() && oHeight.value() > 0;
}
if (bScaleDownEmptySpacing &&
aCurrShape->getChildren().empty())
{
@@ -1572,9 +1572,9 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const
std::vector<Constraint>&
oox::OptValue<sal_Int32> oHeight = findProperty(aProperties,
aCurrShape->getInternalName(), XML_h);
awt::Size aSize = aChildSize;
if (oWidth.has_value())
- aSize.Width = oWidth.get();
+ aSize.Width = oWidth.value();
if (oHeight.has_value())
- aSize.Height = oHeight.get();
+ aSize.Height = oHeight.value();
aTotalSize.Width += aSize.Width;
aTotalSize.Height += aSize.Height;
}
@@ -1599,9 +1599,9 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const
std::vector<Constraint>&
awt::Size aSize = aChildSize;
if (oWidth.has_value())
- aSize.Width = oWidth.get();
+ aSize.Width = oWidth.value();
if (oHeight.has_value())
- aSize.Height = oHeight.get();
+ aSize.Height = oHeight.value();
if (aChildrenToShrink.empty()
|| aChildrenToShrink.find(aCurrShape->getInternalName())
!= aChildrenToShrink.end())
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx
b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 93f927531cf6..74ad212b318d 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -102,7 +102,7 @@ public:
: ContextHandler2( rParent )
, mpNode( pNode )
{
- msName = rAttribs.getString( XML_name ).get();
+ msName = rAttribs.getString( XML_name ).value();
}
virtual ContextHandlerRef
@@ -143,7 +143,7 @@ public:
ForEachContext( ContextHandler2Helper const & rParent, const
AttributeList& rAttribs, const ForEachAtomPtr& pAtom )
: LayoutNodeContext( rParent, rAttribs, pAtom )
{
- pAtom->setRef(rAttribs.getString(XML_ref).get());
+ pAtom->setRef(rAttribs.getString(XML_ref).value());
pAtom->iterator().loadFromXAttr( rAttribs.getFastAttributeList() );
LayoutAtomMap& rLayoutAtomMap =
pAtom->getLayoutNode().getDiagram().getLayout()->getLayoutAtomMap();
@@ -164,7 +164,7 @@ public:
virtual ContextHandlerRef onCreateContext( ::sal_Int32 aElement, const
AttributeList& rAttribs ) override
{
- mVariables[ getBaseToken(aElement) ] = rAttribs.getString( XML_val
).get();
+ mVariables[ getBaseToken(aElement) ] = rAttribs.getString( XML_val
).value();
return this;
}
private:
@@ -181,7 +181,7 @@ LayoutNodeContext::LayoutNodeContext( ContextHandler2Helper
const & rParent,
, mpNode( pAtom )
{
assert( pAtom && "Node must NOT be NULL" );
- mpNode->setName( rAttribs.getString( XML_name ).get() );
+ mpNode->setName( rAttribs.getString( XML_name ).value() );
}
LayoutNodeContext::~LayoutNodeContext()
@@ -216,8 +216,8 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement,
}
}
- pNode->setMoveWith( rAttribs.getString( XML_moveWith ).get() );
- pNode->setStyleLabel( rAttribs.getString( XML_styleLbl ).get() );
+ pNode->setMoveWith( rAttribs.getString( XML_moveWith ).value() );
+ pNode->setStyleLabel( rAttribs.getString( XML_styleLbl ).value() );
return new LayoutNodeContext( *this, rAttribs, pNode );
}
case DGM_TOKEN( shape ):
diff --git a/oox/source/drawingml/embeddedwavaudiofile.cxx
b/oox/source/drawingml/embeddedwavaudiofile.cxx
index 613e34ccbbe5..8f88733cfce9 100644
--- a/oox/source/drawingml/embeddedwavaudiofile.cxx
+++ b/oox/source/drawingml/embeddedwavaudiofile.cxx
@@ -28,9 +28,9 @@ namespace oox::drawingml
OUString getEmbeddedWAVAudioFile(const core::Relations& rRelations, const
AttributeList& rAttribs)
{
if (rAttribs.getBool(XML_builtIn, false))
- return rAttribs.getString(XML_name).get();
+ return rAttribs.getString(XML_name).value();
else
- return
rRelations.getFragmentPathFromRelId(rAttribs.getString(R_TOKEN(embed)).get());
+ return
rRelations.getFragmentPathFromRelId(rAttribs.getString(R_TOKEN(embed)).value());
}
}
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index df2f09f03364..11f42457bc8d 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -345,7 +345,7 @@ void FillProperties::assignUsed( const FillProperties&
rSourceProps )
Color FillProperties::getBestSolidColor() const
{
Color aSolidColor;
- if( moFillType.has_value() ) switch( moFillType.get() )
+ if( moFillType.has_value() ) switch( moFillType.value() )
{
case XML_solidFill:
aSolidColor = maFillColor;
@@ -375,8 +375,8 @@ void FillProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
return;
FillStyle eFillStyle = FillStyle_NONE;
- OSL_ASSERT((moFillType.get() & sal_Int32(0xFFFF0000))==0);
- switch( moFillType.get() )
+ OSL_ASSERT((moFillType.value() & sal_Int32(0xFFFF0000))==0);
+ switch( moFillType.value() )
{
case XML_noFill:
{
@@ -444,7 +444,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
aGradient.YOffset = getLimitedValue<sal_Int16, sal_Int32>(
nCenterY / PER_PERCENT, 0, 100);
- if( maGradientProps.moGradientPath.get() == XML_circle )
+ if( maGradientProps.moGradientPath.value() == XML_circle )
{
// Style should be radial at least when the horizontal
center is at 50%.
// Otherwise import as a linear gradient, because it
is the most similar to the MSO radial style.
@@ -785,7 +785,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
}
else if ( eBitmapMode == BitmapMode_STRETCH &&
maBlipProps.moFillRect.has_value() )
{
- geometry::IntegerRectangle2D aFillRect(
maBlipProps.moFillRect.get() );
+ geometry::IntegerRectangle2D aFillRect(
maBlipProps.moFillRect.value() );
awt::Size aOriginalSize(
rGraphicHelper.getOriginalSize( xGraphic ) );
if ( aOriginalSize.Width && aOriginalSize.Height )
{
@@ -814,7 +814,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
}
if (maBlipProps.moAlphaModFix.has_value())
- rPropMap.setProperty(ShapeProperty::FillTransparency,
static_cast<sal_Int16>(100 - (maBlipProps.moAlphaModFix.get() / PER_PERCENT)));
+ rPropMap.setProperty(ShapeProperty::FillTransparency,
static_cast<sal_Int16>(100 - (maBlipProps.moAlphaModFix.value() /
PER_PERCENT)));
}
break;
@@ -826,7 +826,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
if( aColor.isUsed() && maPatternProps.moPattPreset.has_value()
)
{
eFillStyle = FillStyle_HATCH;
- rPropMap.setProperty( ShapeProperty::FillHatch,
createHatch( maPatternProps.moPattPreset.get(), aColor.getColor(
rGraphicHelper, nPhClr ) ) );
+ rPropMap.setProperty( ShapeProperty::FillHatch,
createHatch( maPatternProps.moPattPreset.value(), aColor.getColor(
rGraphicHelper, nPhClr ) ) );
if( aColor.hasTransparency() )
rPropMap.setProperty( ShapeProperty::FillTransparency,
aColor.getTransparency() );
@@ -899,7 +899,7 @@ void GraphicProperties::pushToPropMap( PropertyMap&
rPropMap, const GraphicHelpe
// cropping
if ( maBlipProps.moClipRect.has_value() )
{
- geometry::IntegerRectangle2D oClipRect(
maBlipProps.moClipRect.get() );
+ geometry::IntegerRectangle2D oClipRect(
maBlipProps.moClipRect.value() );
awt::Size aOriginalSize( rGraphicHelper.getOriginalSize( xGraphic
) );
if ( aOriginalSize.Width && aOriginalSize.Height )
{
@@ -955,7 +955,7 @@ void GraphicProperties::pushToPropMap( PropertyMap&
rPropMap, const GraphicHelpe
if ( maBlipProps.moAlphaModFix.has_value() )
{
- rPropMap.setProperty(PROP_Transparency, static_cast<sal_Int16>(100
- (maBlipProps.moAlphaModFix.get() / PER_PERCENT)));
+ rPropMap.setProperty(PROP_Transparency, static_cast<sal_Int16>(100
- (maBlipProps.moAlphaModFix.value() / PER_PERCENT)));
}
}
rPropMap.setProperty(PROP_GraphicColorMode, eColorMode);
diff --git a/oox/source/drawingml/graphicshapecontext.cxx
b/oox/source/drawingml/graphicshapecontext.cxx
index d90980a87824..bab0a7a65d91 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -96,7 +96,7 @@ ContextHandlerRef GraphicShapeContext::onCreateContext(
sal_Int32 aElementToken,
case XML_videoFile:
{
OUString rPath = getRelations().getFragmentPathFromRelId(
- rAttribs.getString(R_TOKEN(link)).get() );
+ rAttribs.getString(R_TOKEN(link)).value() );
if (!rPath.isEmpty())
{
Reference<XInputStream> xMediaStream =
lcl_GetMediaStream(rPath, getFilter());
@@ -110,7 +110,7 @@ ContextHandlerRef GraphicShapeContext::onCreateContext(
sal_Int32 aElementToken,
else
{
rPath = getRelations().getExternalTargetFromRelId(
- rAttribs.getString(R_TOKEN(link)).get());
+ rAttribs.getString(R_TOKEN(link)).value());
if (!rPath.isEmpty()) // linked media file
mpShapePtr->getGraphicProperties().m_sMediaPackageURL
= getFilter().getAbsoluteUrl(rPath);
@@ -154,7 +154,7 @@ ContextHandlerRef
GraphicalObjectFrameContext::onCreateContext( sal_Int32 aEleme
case XML_graphicData : // CT_GraphicalObjectData
{
- OUString sUri( rAttribs.getString( XML_uri ).get() );
+ OUString sUri( rAttribs.getString( XML_uri ).value() );
if ( sUri ==
"http://schemas.openxmlformats.org/presentationml/2006/ole"; ||
sUri == "http://purl.oclc.org/ooxml/presentationml/ole"; )
return new OleObjectGraphicDataContext( *this, mpShapePtr );
@@ -277,10 +277,10 @@ ContextHandlerRef
DiagramGraphicDataContext::onCreateContext( ::sal_Int32 aEleme
{
case DGM_TOKEN( relIds ):
{
- msDm = rAttribs.getString( R_TOKEN( dm ) ).get();
- msLo = rAttribs.getString( R_TOKEN( lo ) ).get();
- msQs = rAttribs.getString( R_TOKEN( qs ) ).get();
- msCs = rAttribs.getString( R_TOKEN( cs ) ).get();
+ msDm = rAttribs.getString( R_TOKEN( dm ) ).value();
+ msLo = rAttribs.getString( R_TOKEN( lo ) ).value();
+ msQs = rAttribs.getString( R_TOKEN( qs ) ).value();
+ msCs = rAttribs.getString( R_TOKEN( cs ) ).value();
loadDiagram(mpShapePtr,
getFilter(),
getFragmentPathFromRelId( msDm ),
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx
b/oox/source/drawingml/hyperlinkcontext.cxx
index 352eb7bf5efa..1193a6c3af95 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -42,7 +42,7 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper
const & rParent,
, maProperties(aProperties)
{
OUString sURL, sHref;
- OUString aRelId = rAttribs.getString( R_TOKEN( id ) ).get();
+ OUString aRelId = rAttribs.getString( R_TOKEN( id ) ).value();
if ( !aRelId.isEmpty() )
{
sHref = getRelations().getExternalTargetFromRelId( aRelId );
@@ -56,13 +56,13 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper
const & rParent,
sURL = getRelations().getInternalTargetFromRelId( aRelId );
}
}
- OUString sTooltip = rAttribs.getString( R_TOKEN( tooltip ) ).get();
+ OUString sTooltip = rAttribs.getString( R_TOKEN( tooltip ) ).value();
if ( !sTooltip.isEmpty() )
maProperties.setProperty(PROP_Representation, sTooltip);
- OUString sFrame = rAttribs.getString( R_TOKEN( tgtFrame ) ).get();
+ OUString sFrame = rAttribs.getString( R_TOKEN( tgtFrame ) ).value();
if( !sFrame.isEmpty() )
maProperties.setProperty(PROP_TargetFrame, sFrame);
- OUString aAction = rAttribs.getString( XML_action ).get();
+ OUString aAction = rAttribs.getString( XML_action ).value();
if ( !aAction.isEmpty() )
{
// reserved values of the unrestricted string aAction:
diff --git a/oox/source/drawingml/lineproperties.cxx
b/oox/source/drawingml/lineproperties.cxx
index 12f74b845ef5..e1cef771c24e 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -314,8 +314,8 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap,
const double fArrowLineHalfWidth = ::std::max< double >( 100.0 *
0.5 * nLineWidth / nMarkerWidth, 1 );
::std::vector< awt::Point > aPoints;
- OSL_ASSERT((rArrowProps.moArrowType.get() &
sal_Int32(0xFFFF0000))==0);
- switch( rArrowProps.moArrowType.get() )
+ OSL_ASSERT((rArrowProps.moArrowType.value() &
sal_Int32(0xFFFF0000))==0);
+ switch( rArrowProps.moArrowType.value() )
{
case XML_triangle:
aPoints.push_back( OOX_ARROW_POINT( 50, 0 ) );
@@ -437,25 +437,25 @@ void LineProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
return;
// line style (our core only supports none and solid)
- drawing::LineStyle eLineStyle = (maLineFill.moFillType.get() ==
XML_noFill) ? drawing::LineStyle_NONE : drawing::LineStyle_SOLID;
+ drawing::LineStyle eLineStyle = (maLineFill.moFillType.value() ==
XML_noFill) ? drawing::LineStyle_NONE : drawing::LineStyle_SOLID;
// line width in 1/100mm
sal_Int32 nLineWidth = getLineWidth(); // includes conversion from EMUs to
1/100mm
rPropMap.setProperty( ShapeProperty::LineWidth, nLineWidth );
// line cap type
- LineCap eLineCap = moLineCap.has_value() ? lclGetLineCap( moLineCap.get()
) : LineCap_BUTT;
+ LineCap eLineCap = moLineCap.has_value() ? lclGetLineCap(
moLineCap.value() ) : LineCap_BUTT;
if( moLineCap.has_value() )
rPropMap.setProperty( ShapeProperty::LineCap, eLineCap );
// create line dash from preset dash token or dash stop vector (not for
invisible line)
if( (eLineStyle != drawing::LineStyle_NONE) &&
- ((moPresetDash.has_value() && moPresetDash.get() != XML_solid) ||
!maCustomDash.empty()) )
+ ((moPresetDash.has_value() && moPresetDash.value() != XML_solid) ||
!maCustomDash.empty()) )
{
LineDash aLineDash;
aLineDash.Style = lclGetDashStyle( moLineCap.value_or( XML_flat ) );
- if(moPresetDash.has_value() && moPresetDash.get() != XML_solid)
+ if(moPresetDash.has_value() && moPresetDash.value() != XML_solid)
lclConvertPresetDash(aLineDash, moPresetDash.value_or(XML_dash));
else // !maCustomDash.empty()
{
@@ -487,7 +487,7 @@ void LineProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
// line joint type
if( moLineJoint.has_value() )
- rPropMap.setProperty( ShapeProperty::LineJoint, lclGetLineJoint(
moLineJoint.get() ) );
+ rPropMap.setProperty( ShapeProperty::LineJoint, lclGetLineJoint(
moLineJoint.value() ) );
// line color and transparence
Color aLineColor = maLineFill.getBestSolidColor();
@@ -506,9 +506,9 @@ void LineProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
drawing::LineStyle LineProperties::getLineStyle() const
{
// rules to calculate the line style inferred from the code in
LineProperties::pushToPropMap
- if (maLineFill.moFillType.get() == XML_noFill)
+ if (maLineFill.moFillType.value() == XML_noFill)
return drawing::LineStyle_NONE;
- if ((moPresetDash.has_value() && moPresetDash.get() != XML_solid) ||
+ if ((moPresetDash.has_value() && moPresetDash.value() != XML_solid) ||
(!moPresetDash && !maCustomDash.empty()))
return drawing::LineStyle_DASH;
return drawing::LineStyle_SOLID;
@@ -517,7 +517,7 @@ drawing::LineStyle LineProperties::getLineStyle() const
drawing::LineCap LineProperties::getLineCap() const
{
if( moLineCap.has_value() )
- return lclGetLineCap( moLineCap.get() );
+ return lclGetLineCap( moLineCap.value() );
return drawing::LineCap_BUTT;
}
@@ -525,7 +525,7 @@ drawing::LineCap LineProperties::getLineCap() const
drawing::LineJoint LineProperties::getLineJoint() const
{
if( moLineJoint.has_value() )
- return lclGetLineJoint( moLineJoint.get() );
+ return lclGetLineJoint( moLineJoint.value() );
return drawing::LineJoint_NONE;
}
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 774ca831e35d..236e0bea3c82 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -643,17 +643,17 @@ static void lcl_createPresetShape(const
uno::Reference<drawing::XShape>& xShape,
std::shared_ptr<TextRun> pRun = pParagraph->getRuns()[0];
TextCharacterProperties& pProperties =
pRun->getTextCharacterProperties();
- if (pProperties.moBold.has_value() && pProperties.moBold.get())
+ if (pProperties.moBold.has_value() && pProperties.moBold.value())
{
xSet->setPropertyValue( UNO_NAME_CHAR_WEIGHT, uno::Any(
css::awt::FontWeight::BOLD ) );
}
- if (pProperties.moItalic.has_value() && pProperties.moItalic.get())
+ if (pProperties.moItalic.has_value() && pProperties.moItalic.value())
{
xSet->setPropertyValue( UNO_NAME_CHAR_POSTURE, uno::Any(
css::awt::FontSlant::FontSlant_ITALIC ) );
}
if (pProperties.moHeight.has_value())
{
- sal_Int32 nHeight = pProperties.moHeight.get() / 100;
+ sal_Int32 nHeight = pProperties.moHeight.value() / 100;
xSet->setPropertyValue( UNO_NAME_CHAR_HEIGHT, uno::Any( nHeight )
);
}
if (pProperties.maFillProperties.maFillColor.isUsed())
@@ -1240,7 +1240,7 @@ Reference< XShape > const & Shape::createAndInsert(
aShapeProps.assignUsed(
mpTextBody->getTextProperties().maPropertyMap );
// Push char properties as well - specifically useful when this is
a placeholder
if( mpMasterTextListStyle &&
mpMasterTextListStyle->getListStyle()[0].getTextCharacterProperties().moHeight.has_value()
)
- aShapeProps.setProperty(PROP_CharHeight, GetFontHeight(
mpMasterTextListStyle->getListStyle()[0].getTextCharacterProperties().moHeight.get()
));
+ aShapeProps.setProperty(PROP_CharHeight, GetFontHeight(
mpMasterTextListStyle->getListStyle()[0].getTextCharacterProperties().moHeight.value()
));
}
// applying properties
@@ -1259,7 +1259,7 @@ Reference< XShape > const & Shape::createAndInsert(
mpTablePropertiesPtr->pushToPropSet( rFilterBase, xSet,
mpMasterTextListStyle );
FillProperties aFillProperties = getActualFillProperties(pTheme,
&rShapeOrParentShapeFillProps);
- if (getFillProperties().moFillType.has_value() &&
getFillProperties().moFillType.get() == XML_grpFill)
+ if (getFillProperties().moFillType.has_value() &&
getFillProperties().moFillType.value() == XML_grpFill)
getFillProperties().assignUsed(aFillProperties);
if(!bIsCroppedGraphic)
aFillProperties.pushToPropMap( aShapeProps, rGraphicHelper,
mnRotation, nFillPhClr, nFillPhClrTheme, mbFlipH, mbFlipV, bIsCustomShape );
@@ -1359,7 +1359,7 @@ Reference< XShape > const & Shape::createAndInsert(
css::table::BorderLine2 aBorderLine =
xPropertySet->getPropertyValue(PropertyMap::getPropertyName(nBorder)).get<css::table::BorderLine2>();
aBorderLine.Color =
aShapeProps.getProperty(PROP_LineColor).get<sal_Int32>();
if (aLineProperties.moLineWidth.has_value())
- aBorderLine.LineWidth =
convertEmuToHmm(aLineProperties.moLineWidth.get());
+ aBorderLine.LineWidth =
convertEmuToHmm(aLineProperties.moLineWidth.value());
aShapeProps.setProperty(nBorder, aBorderLine);
}
aShapeProps.erase(PROP_LineColor);
@@ -1413,7 +1413,7 @@ Reference< XShape > const & Shape::createAndInsert(
if (aEffectProperties.maShadow.moShadowDir.has_value())
{
css::table::ShadowLocation nLocation =
css::table::ShadowLocation_NONE;
- switch (aEffectProperties.maShadow.moShadowDir.get())
+ switch (aEffectProperties.maShadow.moShadowDir.value())
{
case 13500000:
nLocation = css::table::ShadowLocation_TOP_LEFT;
@@ -1685,7 +1685,7 @@ Reference< XShape > const & Shape::createAndInsert(
mpCustomShapePropertiesPtr->setMirroredY( true );
if( getTextBody() )
{
- sal_Int32 nTextCameraZRotation = static_cast< sal_Int32 >(
getTextBody()->get3DProperties().maCameraRotation.mnRevolution.get() );
+ sal_Int32 nTextCameraZRotation = static_cast< sal_Int32 >(
getTextBody()->get3DProperties().maCameraRotation.mnRevolution.value() );
mpCustomShapePropertiesPtr->setTextCameraZRotateAngle(
nTextCameraZRotation / 60000 );
sal_Int32 nTextRotateAngle = static_cast< sal_Int32 >(
getTextBody()->getTextProperties().moRotation.value_or( 0 ) );
@@ -1812,7 +1812,7 @@ Reference< XShape > const & Shape::createAndInsert(
if ( aEffectProperties.maGlow.moGlowRad.has_value() )
{
uno::Reference<beans::XPropertySet> propertySet (mxShape,
uno::UNO_QUERY);
- propertySet->setPropertyValue("GlowEffectRadius",
Any(convertEmuToHmm(aEffectProperties.maGlow.moGlowRad.get())));
+ propertySet->setPropertyValue("GlowEffectRadius",
Any(convertEmuToHmm(aEffectProperties.maGlow.moGlowRad.value())));
propertySet->setPropertyValue("GlowEffectColor",
Any(aEffectProperties.maGlow.moGlowColor.getColor(rGraphicHelper)));
propertySet->setPropertyValue("GlowEffectTransparency",
Any(aEffectProperties.maGlow.moGlowColor.getTransparency()));
}
@@ -1822,7 +1822,7 @@ Reference< XShape > const & Shape::createAndInsert(
{
uno::Reference<beans::XPropertySet> propertySet(mxShape,
uno::UNO_QUERY);
propertySet->setPropertyValue(
- "SoftEdgeRadius",
Any(convertEmuToHmm(aEffectProperties.maSoftEdge.moRad.get())));
+ "SoftEdgeRadius",
Any(convertEmuToHmm(aEffectProperties.maSoftEdge.moRad.value())));
}
}
@@ -2196,7 +2196,7 @@ FillProperties Shape::getActualFillProperties(const
Theme* pTheme, const FillPro
// Parent shape's properties
if ( pParentShapeFillProps != nullptr)
- if( getFillProperties().moFillType.has_value() &&
getFillProperties().moFillType.get() == XML_grpFill )
+ if( getFillProperties().moFillType.has_value() &&
getFillProperties().moFillType.value() == XML_grpFill )
aFillProperties.assignUsed( *pParentShapeFillProps );
return aFillProperties;
diff --git a/oox/source/drawingml/shapecontext.cxx
b/oox/source/drawingml/shapecontext.cxx
index e0cbf9343c1d..5cf910b3c07b 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -67,9 +67,9 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32
aElementToken, const
case XML_cNvPr:
{
mpShapePtr->setHidden( rAttribs.getBool( XML_hidden, false ) );
- mpShapePtr->setId( rAttribs.getString( XML_id ).get() );
- mpShapePtr->setName( rAttribs.getString( XML_name ).get() );
- mpShapePtr->setDescription( rAttribs.getString( XML_descr ).get() );
+ mpShapePtr->setId( rAttribs.getString( XML_id ).value() );
+ mpShapePtr->setName( rAttribs.getString( XML_name ).value() );
+ mpShapePtr->setDescription( rAttribs.getString( XML_descr ).value() );
break;
}
case XML_hlinkMouseOver:
@@ -78,7 +78,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32
aElementToken, const
case XML_ph:
mpShapePtr->setSubType( rAttribs.getToken( XML_type, XML_obj ) );
if( rAttribs.hasAttribute( XML_idx ) )
- mpShapePtr->setSubTypeIndex( rAttribs.getString( XML_idx
).get().toInt32() );
+ mpShapePtr->setSubTypeIndex( rAttribs.getString( XML_idx
).value().toInt32() );
break;
// nvSpPr CT_ShapeNonVisual end
diff --git a/oox/source/drawingml/shapegroupcontext.cxx
b/oox/source/drawingml/shapegroupcontext.cxx
index 1a9cb4113871..d0c53a34ad26 100644
--- a/oox/source/drawingml/shapegroupcontext.cxx
+++ b/oox/source/drawingml/shapegroupcontext.cxx
@@ -60,14 +60,14 @@ ContextHandlerRef ShapeGroupContext::onCreateContext(
sal_Int32 aElementToken, c
case XML_cNvPr:
{
mpGroupShapePtr->setHidden( rAttribs.getBool( XML_hidden, false ) );
- mpGroupShapePtr->setId( rAttribs.getString( XML_id ).get() );
- mpGroupShapePtr->setName( rAttribs.getString( XML_name ).get() );
+ mpGroupShapePtr->setId( rAttribs.getString( XML_id ).value() );
+ mpGroupShapePtr->setName( rAttribs.getString( XML_name ).value() );
break;
}
case XML_ph:
mpGroupShapePtr->setSubType( rAttribs.getToken( XML_type,
FastToken::DONTKNOW ) );
if( rAttribs.hasAttribute( XML_idx ) )
- mpGroupShapePtr->setSubTypeIndex( rAttribs.getString( XML_idx
).get().toInt32() );
+ mpGroupShapePtr->setSubTypeIndex( rAttribs.getString( XML_idx
).value().toInt32() );
break;
// nvSpPr CT_ShapeNonVisual end
diff --git a/oox/source/drawingml/table/tablecell.cxx
b/oox/source/drawingml/table/tablecell.cxx
index f2e8fc336937..8cff610763fc 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -64,7 +64,7 @@ static void applyLineAttributes( const
::oox::core::XmlFilterBase& rFilterBase,
sal_Int32 nPropId )
{
BorderLine2 aBorderLine;
- if ( rLineProperties.maLineFill.moFillType.has_value() &&
rLineProperties.maLineFill.moFillType.get() != XML_noFill )
+ if ( rLineProperties.maLineFill.moFillType.has_value() &&
rLineProperties.maLineFill.moFillType.value() != XML_noFill )
{
Color aColor = rLineProperties.maLineFill.getBestSolidColor();
aBorderLine.Color = sal_Int32(aColor.getColor(
rFilterBase.getGraphicHelper() ));
@@ -84,7 +84,7 @@ static void applyLineAttributes( const
::oox::core::XmlFilterBase& rFilterBase,
if ( rLineProperties.moPresetDash.has_value() )
{
- switch ( rLineProperties.moPresetDash.get() )
+ switch ( rLineProperties.moPresetDash.value() )
{
case XML_dot:
case XML_sysDot:
@@ -502,7 +502,7 @@ void TableCell::pushToXCell( const
::oox::core::XmlFilterBase& rFilterBase, cons
applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesInsideV,
PROP_RightBorder );
}
- if (rProperties.getBgColor().isUsed() &&
!maFillProperties.maFillColor.isUsed() && maFillProperties.moFillType.get() ==
XML_noFill)
+ if (rProperties.getBgColor().isUsed() &&
!maFillProperties.maFillColor.isUsed() && maFillProperties.moFillType.value()
== XML_noFill)
{
maFillProperties.moFillType = XML_solidFill;
maFillProperties.maFillColor = rProperties.getBgColor();
diff --git a/oox/source/drawingml/table/tablecellcontext.cxx
b/oox/source/drawingml/table/tablecellcontext.cxx
index dde824fb72f9..e02889514119 100644
--- a/oox/source/drawingml/table/tablecellcontext.cxx
+++ b/oox/source/drawingml/table/tablecellcontext.cxx
@@ -36,9 +36,9 @@ TableCellContext::TableCellContext( ContextHandler2Helper
const & rParent, const
, mrTableCell( rTableCell )
{
if ( rAttribs.hasAttribute( XML_rowSpan ) )
- mrTableCell.setRowSpan( rAttribs.getString( XML_rowSpan
).get().toInt32() );
+ mrTableCell.setRowSpan( rAttribs.getString( XML_rowSpan
).value().toInt32() );
if ( rAttribs.hasAttribute( XML_gridSpan ) )
- mrTableCell.setGridSpan( rAttribs.getString( XML_gridSpan
).get().toInt32() );
+ mrTableCell.setGridSpan( rAttribs.getString( XML_gridSpan
).value().toInt32() );
mrTableCell.sethMerge( rAttribs.getBool( XML_hMerge, false ) );
mrTableCell.setvMerge( rAttribs.getBool( XML_vMerge, false ) );
diff --git a/oox/source/drawingml/table/tablecontext.cxx
b/oox/source/drawingml/table/tablecontext.cxx
index 84e80dccd710..b57af6d24f55 100644
--- a/oox/source/drawingml/table/tablecontext.cxx
+++ b/oox/source/drawingml/table/tablecontext.cxx
@@ -79,7 +79,7 @@ TableContext::onCreateContext( ::sal_Int32 aElementToken,
const AttributeList& r
case A_TOKEN( gridCol ): // CT_TableCol
{
std::vector< sal_Int32 >& rvTableGrid(
mrTableProperties.getTableGrid() );
- rvTableGrid.push_back( rAttribs.getString( XML_w ).get().toInt32()
);
+ rvTableGrid.push_back( rAttribs.getString( XML_w
).value().toInt32() );
}
break;
case A_TOKEN( tr ): // CT_TableRow
diff --git a/oox/source/drawingml/table/tablerowcontext.cxx
b/oox/source/drawingml/table/tablerowcontext.cxx
index aafd13b00e20..c6a34afa54b4 100644
--- a/oox/source/drawingml/table/tablerowcontext.cxx
+++ b/oox/source/drawingml/table/tablerowcontext.cxx
@@ -34,7 +34,7 @@ TableRowContext::TableRowContext( ContextHandler2Helper const
& rParent, const A
: ContextHandler2( rParent )
, mrTableRow( rTableRow )
{
- rTableRow.setHeight( rAttribs.getString( XML_h ).get().toInt32() );
+ rTableRow.setHeight( rAttribs.getString( XML_h ).value().toInt32() );
}
TableRowContext::~TableRowContext()
diff --git a/oox/source/drawingml/table/tablestylecontext.cxx
b/oox/source/drawingml/table/tablestylecontext.cxx
index 7dc4ce468cf1..242889b63d80 100644
--- a/oox/source/drawingml/table/tablestylecontext.cxx
+++ b/oox/source/drawingml/table/tablestylecontext.cxx
@@ -37,8 +37,8 @@ TableStyleContext::TableStyleContext( ContextHandler2Helper
const & rParent,
: ContextHandler2( rParent )
, mrTableStyle( rTableStyle )
{
- mrTableStyle.getStyleId() = rAttribs.getString( XML_styleId ).get();
- mrTableStyle.getStyleName() = rAttribs.getString( XML_styleName ).get();
+ mrTableStyle.getStyleId() = rAttribs.getString( XML_styleId ).value();
+ mrTableStyle.getStyleName() = rAttribs.getString( XML_styleName ).value();
}
TableStyleContext::~TableStyleContext()
diff --git a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
index 77dc4267757d..20ff3e0dc105 100644
--- a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
+++ b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
@@ -48,7 +48,7 @@ ContextHandlerRef
TableStyleListFragmentHandler::onCreateContext(
switch( aElementToken )
{
case A_TOKEN( tblStyleLst ): // CT_TableStyleList
- mrTableStyleList.getDefaultStyleId() = rAttribs.getString( XML_def
).get();
+ mrTableStyleList.getDefaultStyleId() = rAttribs.getString( XML_def
).value();
break;
case A_TOKEN( tblStyle ): // CT_TableStyle
std::vector< TableStyle >& rTableStyles =
mrTableStyleList.getTableStyles();
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx
b/oox/source/drawingml/textbodypropertiescontext.cxx
index a2a0d365b0c2..7a0a0212ef51 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -68,7 +68,7 @@ TextBodyPropertiesContext::TextBodyPropertiesContext(
ContextHandler2Helper cons
sal_Int32 aIns[] = { XML_lIns, XML_tIns, XML_rIns, XML_bIns };
for( sal_Int32 i = 0; i < sal_Int32(SAL_N_ELEMENTS( aIns )); i++)
{
- sValue = rAttribs.getString( aIns[i] ).get();
+ sValue = rAttribs.getString( aIns[i] ).value();
if( !sValue.isEmpty() )
mrTextBodyProp.moInsets[i] = GetCoordinate( sValue );
}
@@ -151,7 +151,7 @@ ContextHandlerRef
TextBodyPropertiesContext::onCreateContext( sal_Int32 aElement
const OptValue<OUString> sPrst = rAttribs.getString(
XML_prst );
if( sPrst.has_value() )
{
- mrTextBodyProp.msPrst = sPrst.get();
+ mrTextBodyProp.msPrst = sPrst.value();
if( mrTextBodyProp.msPrst != "textNoShape" )
return new PresetTextShapeContext( *this, rAttribs,
*(
mpShapePtr->getCustomShapeProperties() ) );
diff --git a/oox/source/drawingml/textcharacterproperties.cxx
b/oox/source/drawingml/textcharacterproperties.cxx
index b99723e6cd01..c38906308ddd 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -114,16 +114,16 @@ void TextCharacterProperties::pushToPropMap( PropertyMap&
rPropMap, const XmlFil
bool bContoured = false;
// noFill doesn't exist for characters. Map noFill to 99% transparency
- if (maFillProperties.moFillType.get() == XML_noFill)
+ if (maFillProperties.moFillType.value() == XML_noFill)
aColor.addTransformation(XML_alpha, 1000);
// tdf#137438 Emulate text outline color/transparency.
// If the outline color dominates, then use it as the text color.
if (moTextOutlineProperties.has_value()
- && moTextOutlineProperties.get().maLineFill.moFillType.has_value()
- && moTextOutlineProperties.get().maLineFill.moFillType.get() !=
XML_noFill)
+ &&
moTextOutlineProperties.value().maLineFill.moFillType.has_value()
+ && moTextOutlineProperties.value().maLineFill.moFillType.value()
!= XML_noFill)
{
- Color aLineColor =
moTextOutlineProperties.get().maLineFill.getBestSolidColor();
+ Color aLineColor =
moTextOutlineProperties.value().maLineFill.getBestSolidColor();
sal_Int16 nLineTransparency = aLineColor.getTransparency();
// tdf#127696 If the text color is white (and the outline color
doesn't dominate),
@@ -146,9 +146,9 @@ void TextCharacterProperties::pushToPropMap( PropertyMap&
rPropMap, const XmlFil
}
}
- if( moLang.has_value() && !moLang.get().isEmpty() )
+ if( moLang.has_value() && !moLang.value().isEmpty() )
{
- LanguageTag aTag(moLang.get());
+ LanguageTag aTag(moLang.value());
lang::Locale aLocale(aTag.getLocale());
switch(MsLangId::getScriptType(aTag.getLanguageType()))
{
@@ -163,9 +163,9 @@ void TextCharacterProperties::pushToPropMap( PropertyMap&
rPropMap, const XmlFil
if( moHeight.has_value() )
{
- float fHeight = GetFontHeight( moHeight.get() );
+ float fHeight = GetFontHeight( moHeight.value() );
if (moFontScale.has_value())
- fHeight *= (moFontScale.get() / 100000);
+ fHeight *= (moFontScale.value() / 100000);
rPropMap.setProperty( PROP_CharHeight, fHeight);
rPropMap.setProperty( PROP_CharHeightAsian, fHeight);
rPropMap.setProperty( PROP_CharHeightComplex, fHeight);
@@ -234,7 +234,7 @@ void TextCharacterProperties::pushToPropSet( PropertySet&
rPropSet, const XmlFil
float TextCharacterProperties::getCharHeightPoints( float fDefault ) const
{
- return moHeight.has_value() ? GetFontHeight( moHeight.get() ) : fDefault;
+ return moHeight.has_value() ? GetFontHeight( moHeight.value() ) : fDefault;
}
} // namespace oox::drawingml
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index f6aef3c92987..a13803e5319d 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -67,7 +67,7 @@
TextCharacterPropertiesContext::TextCharacterPropertiesContext(
mrTextCharacterProperties.moUnderline = rAttribs.getToken( XML_u );
if ( rAttribs.hasAttribute( XML_strike ) )
mrTextCharacterProperties.moStrikeout = rAttribs.getToken( XML_strike
);
- if ( rAttribs.hasAttribute( XML_baseline ) && rAttribs.getInteger(
XML_baseline ).get() != 0 )
+ if ( rAttribs.hasAttribute( XML_baseline ) && rAttribs.getInteger(
XML_baseline ).value() != 0 )
mrTextCharacterProperties.moBaseline = rAttribs.getInteger(
XML_baseline );
if ( rAttribs.hasAttribute( XML_b ) )
@@ -233,7 +233,7 @@ ContextHandlerRef
TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
if (colorAttrib.has_value())
{
oox::drawingml::Color theColor;
- theColor.setSrgbClr(colorAttrib.get());
+ theColor.setSrgbClr(colorAttrib.value());
mrTextCharacterProperties.maUnderlineColor = theColor;
}
break;
@@ -263,14 +263,14 @@ ContextHandlerRef
TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
case W_TOKEN( color ):
if (rAttribs.getInteger(W_TOKEN(val)).has_value())
{
-
mrTextCharacterProperties.maFillProperties.maFillColor.setSrgbClr(rAttribs.getIntegerHex(W_TOKEN(val)).get());
+
mrTextCharacterProperties.maFillProperties.maFillColor.setSrgbClr(rAttribs.getIntegerHex(W_TOKEN(val)).value());
mrTextCharacterProperties.maFillProperties.moFillType =
XML_solidFill;
}
break;
case W_TOKEN( sz ):
if (rAttribs.getInteger(W_TOKEN(val)).has_value())
{
- sal_Int32 nVal = rAttribs.getInteger(W_TOKEN(val)).get();
+ sal_Int32 nVal = rAttribs.getInteger(W_TOKEN(val)).value();
// wml has half points, dml has hundred points
mrTextCharacterProperties.moHeight = nVal * 50;
}
diff --git a/oox/source/drawingml/texteffectscontext.cxx
b/oox/source/drawingml/texteffectscontext.cxx
index e380b6425413..61529a2c9b9c 100644
--- a/oox/source/drawingml/texteffectscontext.cxx
+++ b/oox/source/drawingml/texteffectscontext.cxx
@@ -119,7 +119,7 @@ void TextEffectsContext::pushAttributeToGrabBag (sal_Int32
aAttributeId, const O
{
if (!rAttribs.hasAttribute(aAttributeId))
return;
- OUString aString = rAttribs.getString(aAttributeId).get();
+ OUString aString = rAttribs.getString(aAttributeId).value();
mpGrabBagStack->addString(rElementName, aString);
}
diff --git a/oox/source/drawingml/textfield.cxx
b/oox/source/drawingml/textfield.cxx
index 76615409901f..ee2f9313b2d8 100644
--- a/oox/source/drawingml/textfield.cxx
+++ b/oox/source/drawingml/textfield.cxx
@@ -170,7 +170,7 @@ sal_Int32 TextField::insertAt(
aTextCharacterProps.assignUsed(
maTextParagraphProperties.getTextCharacterProperties() );
aTextCharacterProps.assignUsed( getTextCharacterProperties() );
if ( aTextCharacterProps.moHeight.has_value() )
- nCharHeight = aTextCharacterProps.moHeight.get();
+ nCharHeight = aTextCharacterProps.moHeight.value();
aTextCharacterProps.pushToPropSet( aPropSet, rFilterBase );
std::vector< Reference< XTextField > > fields;
diff --git a/oox/source/drawingml/textfieldcontext.cxx
b/oox/source/drawingml/textfieldcontext.cxx
index 8cfb17c08b18..2bd53a745528 100644
--- a/oox/source/drawingml/textfieldcontext.cxx
+++ b/oox/source/drawingml/textfieldcontext.cxx
@@ -38,8 +38,8 @@ TextFieldContext::TextFieldContext( ContextHandler2Helper
const & rParent,
, mrTextField( rTextField )
, mbIsInText( false )
{
- mrTextField.setUuid( rAttributes.getString( XML_id ).get() );
- mrTextField.setType( rAttributes.getString( XML_type ).get() );
+ mrTextField.setUuid( rAttributes.getString( XML_id ).value() );
+ mrTextField.setType( rAttributes.getString( XML_type ).value() );
}
void TextFieldContext::onEndElement( )
diff --git a/oox/source/drawingml/textparagraph.cxx
b/oox/source/drawingml/textparagraph.cxx
index 8b333bc4545c..23f051cdd5df 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -109,7 +109,7 @@ void TextParagraph::insertAt(
TextCharacterProperties aTextCharacterProps( aTextCharacterStyle );
aTextCharacterProps.assignUsed( maEndProperties );
if ( aTextCharacterProps.moHeight.has_value() )
- nCharHeight = nCharHeightFirst =
aTextCharacterProps.moHeight.get();
+ nCharHeight = nCharHeightFirst =
aTextCharacterProps.moHeight.value();
aTextCharacterProps.pushToPropSet( aPropSet, rFilterBase );
}
else
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx
b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index a6b8f2c275cc..076361d121df 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -119,7 +119,7 @@
TextParagraphPropertiesContext::TextParagraphPropertiesContext( ContextHandler2H
// ST_Coordinate
if ( rAttribs.hasAttribute( XML_indent ) )
{
- sValue = rAttribs.getString( XML_indent ).get();
+ sValue = rAttribs.getString( XML_indent ).value();
mrTextParagraphProperties.getFirstLineIndentation() = std::optional<
sal_Int32 >( sValue.isEmpty() ? 0 : GetCoordinate( sValue ) );
}
@@ -142,14 +142,14 @@
TextParagraphPropertiesContext::TextParagraphPropertiesContext( ContextHandler2H
// ParaLeftMargin
if ( rAttribs.hasAttribute( XML_marL ) )
{
- sValue = rAttribs.getString( XML_marL ).get();
+ sValue = rAttribs.getString( XML_marL ).value();
mrTextParagraphProperties.getParaLeftMargin() = std::optional<
sal_Int32 >( sValue.isEmpty() ? 0 : GetCoordinate( sValue ) );
}
// ParaRightMargin
if ( rAttribs.hasAttribute( XML_marR ) )
{
- sValue = rAttribs.getString( XML_marR ).get();
+ sValue = rAttribs.getString( XML_marR ).value();
sal_Int32 nMarR = sValue.isEmpty() ? 0 : GetCoordinate( sValue ) ;
rPropertyMap.setProperty( PROP_ParaRightMargin, nMarR);
}
@@ -216,11 +216,11 @@ ContextHandlerRef
TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl
mrBulletList.mbBulletSizeFollowText <<= true;
break;
case A_TOKEN( buSzPct ): // CT_TextBulletSizePercent
- mrBulletList.setBulletSize( std::lround( GetPercent(
rAttribs.getString( XML_val ).get() ) / 1000.f ) );
+ mrBulletList.setBulletSize( std::lround( GetPercent(
rAttribs.getString( XML_val ).value() ) / 1000.f ) );
break;
case A_TOKEN( buSzPts ): // CT_TextBulletSizePoint
mrBulletList.setBulletSize(0);
- mrBulletList.setFontSize( static_cast<sal_Int16>(GetTextSize(
rAttribs.getString( XML_val ).get() ) ) );
+ mrBulletList.setFontSize( static_cast<sal_Int16>(GetTextSize(
rAttribs.getString( XML_val ).value() ) ) );
break;
// EG_TextBulletTypeface
@@ -260,7 +260,7 @@ ContextHandlerRef
TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl
case A_TOKEN( buChar ): // CT_TextCharBullet
try {
- mrBulletList.setBulletChar( rAttribs.getString( XML_char
).get() );
+ mrBulletList.setBulletChar( rAttribs.getString( XML_char
).value() );
mrBulletList.setSuffixNone();
}
catch(SAXException& /* e */)
@@ -280,9 +280,9 @@ ContextHandlerRef
TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl
case W_TOKEN( jc ):
{
OptValue< OUString > oParaAdjust = rAttribs.getString(
W_TOKEN(val) );
- if( oParaAdjust.has_value() && !oParaAdjust.get().isEmpty() )
+ if( oParaAdjust.has_value() && !oParaAdjust.value().isEmpty() )
{
- const OUString& sParaAdjust = oParaAdjust.get();
+ const OUString& sParaAdjust = oParaAdjust.value();
if( sParaAdjust == "left" )
mrTextParagraphProperties.setParaAdjust(ParagraphAdjust_LEFT);
else if ( sParaAdjust == "right" )
@@ -304,7 +304,7 @@ ContextHandlerRef
TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl
{
TextSpacing& rSpacing =
mrTextParagraphProperties.getParaTopMargin();
rSpacing.nUnit = TextSpacing::Unit::Points;
- rSpacing.nValue = convertTwipToMm100(oBefore.get());
+ rSpacing.nValue = convertTwipToMm100(oBefore.value());
rSpacing.bHasValue = true;
}
else
@@ -314,7 +314,7 @@ ContextHandlerRef
TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl
{
TextSpacing& rSpacing =
mrTextParagraphProperties.getParaTopMargin();
rSpacing.nUnit = TextSpacing::Unit::Percent;
- rSpacing.nValue = oBeforeLines.get() * MAX_PERCENT
/ 100;
+ rSpacing.nValue = oBeforeLines.value() *
MAX_PERCENT / 100;
rSpacing.bHasValue = true;
}
}
@@ -328,7 +328,7 @@ ContextHandlerRef
TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl
{
TextSpacing& rSpacing =
mrTextParagraphProperties.getParaBottomMargin();
rSpacing.nUnit = TextSpacing::Unit::Points;
- rSpacing.nValue = convertTwipToMm100(oAfter.get());
+ rSpacing.nValue = convertTwipToMm100(oAfter.value());
rSpacing.bHasValue = true;
}
else
@@ -338,7 +338,7 @@ ContextHandlerRef
TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl
{
TextSpacing& rSpacing =
mrTextParagraphProperties.getParaBottomMargin();
rSpacing.nUnit = TextSpacing::Unit::Percent;
- rSpacing.nValue = oAfterLines.get() * MAX_PERCENT
/ 100;
+ rSpacing.nValue = oAfterLines.value() *
MAX_PERCENT / 100;
rSpacing.bHasValue = true;
}
}
@@ -350,15 +350,15 @@ ContextHandlerRef
TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl
if (oLineSpacing.has_value())
{
TextSpacing& rLineSpacing =
mrTextParagraphProperties.getLineSpacing();
- if( !oLineRule.has_value() || oLineRule.get() == "auto" )
+ if( !oLineRule.has_value() || oLineRule.value() == "auto" )
{
rLineSpacing.nUnit = TextSpacing::Unit::Percent;
- rLineSpacing.nValue = oLineSpacing.get() * MAX_PERCENT
/ 240;
+ rLineSpacing.nValue = oLineSpacing.value() *
MAX_PERCENT / 240;
}
else
{
rLineSpacing.nUnit = TextSpacing::Unit::Points;
- rLineSpacing.nValue =
convertTwipToMm100(oLineSpacing.get());
+ rLineSpacing.nValue =
convertTwipToMm100(oLineSpacing.value());
}
rLineSpacing.bHasValue = true;
}
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index 2482e9da0461..24b94b6e4db2 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -77,7 +77,7 @@ sal_Int32 TextRun::insertAt(
aTextCharacterProps.assignUsed(maTextCharacterProperties);
if ( aTextCharacterProps.moHeight.has_value() )
- nCharHeight = aTextCharacterProps.moHeight.get();
+ nCharHeight = aTextCharacterProps.moHeight.value();
else
// UNO API has the character height as float, DML has it as int,
but in hundreds.
aTextCharacterProps.moHeight =
static_cast<sal_Int32>(nDefaultCharHeight * 100);
diff --git a/oox/source/drawingml/textspacingcontext.cxx
b/oox/source/drawingml/textspacingcontext.cxx
index f96f1a20caac..83adaa806cf9 100644
--- a/oox/source/drawingml/textspacingcontext.cxx
+++ b/oox/source/drawingml/textspacingcontext.cxx
@@ -44,11 +44,11 @@ namespace oox::drawingml {
{
case A_TOKEN( spcPct ):
maSpacing.nUnit = TextSpacing::Unit::Percent;
- maSpacing.nValue = GetPercent( rAttribs.getString( XML_val ).get()
);
+ maSpacing.nValue = GetPercent( rAttribs.getString( XML_val
).value() );
break;
case A_TOKEN( spcPts ):
maSpacing.nUnit = TextSpacing::Unit::Points;
- maSpacing.nValue = GetTextSpacingPoint( rAttribs.getString(
XML_val ).get() );
+ maSpacing.nValue = GetTextSpacingPoint( rAttribs.getString(
XML_val ).value() );
maSpacing.bExactValue = true;
break;
default:
diff --git a/oox/source/drawingml/texttabstoplistcontext.cxx
b/oox/source/drawingml/texttabstoplistcontext.cxx
index 09809a9d891a..5387d3b5365e 100644
--- a/oox/source/drawingml/texttabstoplistcontext.cxx
+++ b/oox/source/drawingml/texttabstoplistcontext.cxx
@@ -50,7 +50,7 @@ namespace oox::drawingml {
{
OUString sValue;
TabStop aTabStop;
- sValue = rAttribs.getString( XML_pos ).get();
+ sValue = rAttribs.getString( XML_pos ).value();
if( !sValue.isEmpty() )
{
aTabStop.Position = GetCoordinate( sValue );
diff --git a/oox/source/drawingml/themeelementscontext.cxx
b/oox/source/drawingml/themeelementscontext.cxx
index 0922c4b61939..57ce15a4c0c5 100644
--- a/oox/source/drawingml/themeelementscontext.cxx
+++ b/oox/source/drawingml/themeelementscontext.cxx
@@ -216,14 +216,14 @@ ContextHandlerRef ThemeElementsContext::onCreateContext(
sal_Int32 nElement, con
case A_TOKEN( clrScheme ): // CT_ColorScheme
if (rAttribs.hasAttribute(XML_name))
{
-
mrTheme.getClrScheme().SetName(rAttribs.getString(XML_name).get());
+
mrTheme.getClrScheme().SetName(rAttribs.getString(XML_name).value());
}
return new clrSchemeContext( *this, mrTheme.getClrScheme() );
case A_TOKEN( fontScheme ): // CT_FontScheme
return new FontSchemeContext( *this, mrTheme.getFontScheme() );
case A_TOKEN( fmtScheme ): // CT_StyleMatrix
- mrTheme.setStyleName( rAttribs.getString( XML_name ).get() );
+ mrTheme.setStyleName( rAttribs.getString( XML_name ).value() );
return this;
case A_TOKEN( fillStyleLst ): // CT_FillStyleList
diff --git a/oox/source/drawingml/themefragmenthandler.cxx
b/oox/source/drawingml/themefragmenthandler.cxx
index 5ab0ee1e6b21..5616dd75a08b 100644
--- a/oox/source/drawingml/themefragmenthandler.cxx
+++ b/oox/source/drawingml/themefragmenthandler.cxx
@@ -48,7 +48,7 @@ ContextHandlerRef ThemeFragmentHandler::onCreateContext(
sal_Int32 nElement, con
{
case A_TOKEN( theme ):
{
- mrTheme.setThemeName(rAttribs.getString(XML_name).get());
+ mrTheme.setThemeName(rAttribs.getString(XML_name).value());
return this;
}
}
diff --git a/oox/source/drawingml/transform2dcontext.cxx
b/oox/source/drawingml/transform2dcontext.cxx
index 19945d23f7af..20c90731ed8d 100644
--- a/oox/source/drawingml/transform2dcontext.cxx
+++ b/oox/source/drawingml/transform2dcontext.cxx
@@ -43,7 +43,7 @@ Transform2DContext::Transform2DContext( ContextHandler2Helper
const & rParent, c
else
{
if( rAttribs.hasAttribute( XML_rot ) )
- mrShape.getTextBody()->getTextProperties().moRotation =
rAttribs.getInteger( XML_rot ).get();
+ mrShape.getTextBody()->getTextProperties().moRotation =
rAttribs.getInteger( XML_rot ).value();
}
}
@@ -59,8 +59,8 @@ ContextHandlerRef Transform2DContext::onCreateContext(
sal_Int32 aElementToken,
{
case A_TOKEN( off ):
{
- const OUString sXValue = rAttribs.getString( XML_x
).get();
- const OUString sYValue = rAttribs.getString( XML_y
).get();
+ const OUString sXValue = rAttribs.getString( XML_x
).value();
+ const OUString sYValue = rAttribs.getString( XML_y
).value();
if( !sXValue.isEmpty() && nType != XML_ellipse )
mrShape.getTextBody()->getTextProperties().moTextOffLeft = GetCoordinate(
sXValue.toInt32() - mrShape.getPosition().X );
@@ -70,8 +70,8 @@ ContextHandlerRef Transform2DContext::onCreateContext(
sal_Int32 aElementToken,
break;
case A_TOKEN( ext ):
{
- const OUString sXValue = rAttribs.getString( XML_cx
).get();
- const OUString sYValue = rAttribs.getString( XML_cy
).get();
+ const OUString sXValue = rAttribs.getString( XML_cx
).value();
+ const OUString sYValue = rAttribs.getString( XML_cy
).value();
if( !sXValue.isEmpty() && nType == XML_rect )
{
@@ -96,22 +96,22 @@ ContextHandlerRef Transform2DContext::onCreateContext(
sal_Int32 aElementToken,
switch( aElementToken )
{
case A_TOKEN( off ): // horz/vert translation
- mrShape.setPosition( awt::Point( rAttribs.getString( XML_x
).get().toInt32(), rAttribs.getString( XML_y ).get().toInt32() ) );
+ mrShape.setPosition( awt::Point( rAttribs.getString( XML_x
).value().toInt32(), rAttribs.getString( XML_y ).value().toInt32() ) );
break;
case A_TOKEN( ext ): // horz/vert size
- mrShape.setSize( awt::Size( rAttribs.getString( XML_cx
).get().toInt32(), rAttribs.getString( XML_cy ).get().toInt32() ) );
+ mrShape.setSize( awt::Size( rAttribs.getString( XML_cx
).value().toInt32(), rAttribs.getString( XML_cy ).value().toInt32() ) );
break;
case A_TOKEN( chOff ): // horz/vert translation of children
- mrShape.setChildPosition( awt::Point( rAttribs.getString( XML_x
).get().toInt32(), rAttribs.getString( XML_y ).get().toInt32() ) );
+ mrShape.setChildPosition( awt::Point( rAttribs.getString( XML_x
).value().toInt32(), rAttribs.getString( XML_y ).value().toInt32() ) );
break;
case A_TOKEN( chExt ): // horz/vert size of children
{
- sal_Int32 nChExtCx = rAttribs.getString(XML_cx).get().toInt32();
+ sal_Int32 nChExtCx = rAttribs.getString(XML_cx).value().toInt32();
if(nChExtCx == 0)
nChExtCx = mrShape.getSize().Width;
- sal_Int32 nChExtCy = rAttribs.getString(XML_cy).get().toInt32();
+ sal_Int32 nChExtCy = rAttribs.getString(XML_cy).value().toInt32();
if(nChExtCy == 0)
nChExtCy = mrShape.getSize().Height;
diff --git a/oox/source/helper/attributelist.cxx
b/oox/source/helper/attributelist.cxx
index 5752af105c72..7e17d5b77171 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -243,7 +243,7 @@ OptValue< bool > AttributeList::getBool( sal_Int32
nAttrToken ) const
case XML_off: return OptValue< bool >( false );
}
OptValue< sal_Int32 > onValue = getInteger( nAttrToken );
- return onValue.has_value() ? OptValue< bool >( onValue.get() != 0 ) :
OptValue< bool >();
+ return onValue.has_value() ? OptValue< bool >( onValue.value() != 0 ) :
OptValue< bool >();
}
OptValue< util::DateTime > AttributeList::getDateTime( sal_Int32 nAttrToken )
const
diff --git a/oox/source/ppt/layoutfragmenthandler.cxx
b/oox/source/ppt/layoutfragmenthandler.cxx
index 3dcc7df15ef8..4b6c19a53145 100644
--- a/oox/source/ppt/layoutfragmenthandler.cxx
+++ b/oox/source/ppt/layoutfragmenthandler.cxx
@@ -54,7 +54,7 @@ ContextHandlerRef LayoutFragmentHandler::onCreateContext(
sal_Int32 aElementToke
mpSlidePersistPtr->setLayoutValueToken( rAttribs.getToken(
XML_type, 0 ) ); // CT_SlideLayoutType
OptValue< bool > aShowMasterShapes = rAttribs.getBool(
XML_showMasterSp );
- if( aShowMasterShapes.has_value() && !aShowMasterShapes.get() ) {
+ if( aShowMasterShapes.has_value() && !aShowMasterShapes.value() ) {
mpSlidePersistPtr->hideShapesAsMasterShapes();
}
break;
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx
b/oox/source/ppt/pptgraphicshapecontext.cxx
index 254f44809c85..a98d38624b5c 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -51,14 +51,14 @@ ContextHandlerRef PPTGraphicShapeContext::onCreateContext(
sal_Int32 aElementTok
// case NMSP_PPT|XML_drElemPr:
// break;
case PPT_TOKEN(cNvPr):
- mpShapePtr->setId( rAttribs.getString( XML_id ).get() );
- mpShapePtr->setName( rAttribs.getString( XML_name ).get() );
+ mpShapePtr->setId( rAttribs.getString( XML_id ).value() );
+ mpShapePtr->setName( rAttribs.getString( XML_name ).value() );
break;
case PPT_TOKEN(ph):
{
sal_Int32 nSubType( rAttribs.getToken( XML_type, XML_obj ) );
mpShapePtr->setSubType( nSubType );
- OUString sIdx( rAttribs.getString( XML_idx ).get() );
+ OUString sIdx( rAttribs.getString( XML_idx ).value() );
bool bHasIdx = !sIdx.isEmpty();
sal_Int32 nIdx = sIdx.toInt32();
if( rAttribs.hasAttribute( XML_idx ) )
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index e730f4f26c6c..cecd2796b734 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -345,7 +345,7 @@ void PPTShape::addShape(
if (mnSubType && getSubTypeIndex().has_value() && meShapeLocation ==
Layout)
{
- oox::drawingml::ShapePtr pPlaceholder =
PPTShape::findPlaceholderByIndex( getSubTypeIndex().get(),
rSlidePersist.getShapes()->getChildren(), true );
+ oox::drawingml::ShapePtr pPlaceholder =
PPTShape::findPlaceholderByIndex( getSubTypeIndex().value(),
rSlidePersist.getShapes()->getChildren(), true );
if (!pPlaceholder)
pPlaceholder = PPTShape::findPlaceholder( mnSubType, 0,
getSubTypeIndex(), rSlidePersist.getShapes()->getChildren(), true );
@@ -372,13 +372,13 @@ void PPTShape::addShape(
// use placeholder index if possible
if (mnSubType && getSubTypeIndex().has_value() &&
rSlidePersist.getMasterPersist())
{
- oox::drawingml::ShapePtr pPlaceholder =
PPTShape::findPlaceholderByIndex(getSubTypeIndex().get(),
rSlidePersist.getMasterPersist()->getShapes()->getChildren());
+ oox::drawingml::ShapePtr pPlaceholder =
PPTShape::findPlaceholderByIndex(getSubTypeIndex().value(),
rSlidePersist.getMasterPersist()->getShapes()->getChildren());
// TODO: Check if this is required for non-notes slides as well...
if (rSlidePersist.isNotesPage() && pPlaceholder &&
pPlaceholder->getSubType() != getSubType())
pPlaceholder.reset();
if (pPlaceholder) {
- SAL_INFO("oox.ppt","found placeholder with index: " <<
getSubTypeIndex().get() << " and type: " << lclDebugSubType( mnSubType ));
+ SAL_INFO("oox.ppt","found placeholder with index: " <<
getSubTypeIndex().value() << " and type: " << lclDebugSubType( mnSubType ));
PPTShape* pPPTPlaceholder = dynamic_cast< PPTShape* >(
pPlaceholder.get() );
TextListStylePtr pNewTextListStyle =
std::make_shared<TextListStyle>();
@@ -398,7 +398,7 @@ void PPTShape::addShape(
// aMasterTextListStyle->dump();
}
if (pPPTPlaceholder && pPPTPlaceholder->mpPlaceholder) {
- SAL_INFO("oox.ppt","placeholder has parent placeholder: "
<< pPPTPlaceholder->mpPlaceholder->getId() << " type: " << lclDebugSubType(
pPPTPlaceholder->mpPlaceholder->getSubType() ) << " index: " <<
pPPTPlaceholder->mpPlaceholder->getSubTypeIndex().get() );
+ SAL_INFO("oox.ppt","placeholder has parent placeholder: "
<< pPPTPlaceholder->mpPlaceholder->getId() << " type: " << lclDebugSubType(
pPPTPlaceholder->mpPlaceholder->getSubType() ) << " index: " <<
pPPTPlaceholder->mpPlaceholder->getSubTypeIndex().value() );
SAL_INFO("oox.ppt","has textbody " <<
(pPPTPlaceholder->mpPlaceholder->getTextBody() != nullptr) );
TextListStylePtr pPlaceholderStyle =
getSubTypeTextListStyle( rSlidePersist,
pPPTPlaceholder->mpPlaceholder->getSubType() );
if (pPPTPlaceholder->mpPlaceholder->getTextBody())
@@ -789,7 +789,7 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholderByIndex(
const sal_Int32 nIdx,
std::vector< oox::drawingml::ShapePtr >::reverse_iterator aRevIter(
rShapes.rbegin() );
while( aRevIter != rShapes.rend() )
{
- if ( (*aRevIter)->getSubTypeIndex().has_value() &&
(*aRevIter)->getSubTypeIndex().get() == nIdx &&
+ if ( (*aRevIter)->getSubTypeIndex().has_value() &&
(*aRevIter)->getSubTypeIndex().value() == nIdx &&
( !bMasterOnly || ShapeLocationIsMaster((*aRevIter).get()) ) )
{
aShapePtr = *aRevIter;
diff --git a/oox/source/ppt/pptshapecontext.cxx
b/oox/source/ppt/pptshapecontext.cxx
index 8aa8ea9dc0e6..1bf7e1f30622 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -59,8 +59,8 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32
aElementToken, con
case PPT_TOKEN( cNvPr ):
{
mpShapePtr->setHidden( rAttribs.getBool( XML_hidden, false ) );
- mpShapePtr->setId( rAttribs.getString( XML_id ).get() );
- mpShapePtr->setName( rAttribs.getString( XML_name ).get() );
+ mpShapePtr->setId( rAttribs.getString( XML_id ).value() );
+ mpShapePtr->setName( rAttribs.getString( XML_name ).value() );
break;
}
case PPT_TOKEN( ph ):
@@ -74,7 +74,7 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32
aElementToken, con
if( rAttribs.hasAttribute( XML_idx ) )
{
- sal_Int32 nSubTypeIndex = rAttribs.getString( XML_idx
).get().toInt32();
+ sal_Int32 nSubTypeIndex = rAttribs.getString( XML_idx
).value().toInt32();
mpShapePtr->setSubTypeIndex( nSubTypeIndex );
if(!oSubType.has_value() && pMasterPersist)
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx
b/oox/source/ppt/pptshapegroupcontext.cxx
index 17d3e6c5815e..6d7d33dbda16 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -69,15 +69,15 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext(
sal_Int32 aElementToken
// don't override SmartArt properties for embedded drawing's spTree
mpGroupShapePtr->setHidden( rAttribs.getBool( XML_hidden, false ) );
if (mpGroupShapePtr->getId().isEmpty())
- mpGroupShapePtr->setId(rAttribs.getString(XML_id).get());
+ mpGroupShapePtr->setId(rAttribs.getString(XML_id).value());
if (mpGroupShapePtr->getName().isEmpty())
- mpGroupShapePtr->setName( rAttribs.getString( XML_name ).get() );
+ mpGroupShapePtr->setName( rAttribs.getString( XML_name ).value() );
break;
}
case PPT_TOKEN( ph ):
mpGroupShapePtr->setSubType( rAttribs.getToken( XML_type,
FastToken::DONTKNOW ) );
if( rAttribs.hasAttribute( XML_idx ) )
- mpGroupShapePtr->setSubTypeIndex( rAttribs.getString( XML_idx
).get().toInt32() );
+ mpGroupShapePtr->setSubTypeIndex( rAttribs.getString( XML_idx
).value().toInt32() );
break;
// nvSpPr CT_ShapeNonVisual end
@@ -106,7 +106,7 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext(
sal_Int32 aElementToken
pShape->getFillProperties().moFillType = XML_noFill;
pShape->getFillProperties().moUseBgFill = true;
}
- pShape->setModelId(rAttribs.getString( XML_modelId ).get());
+ pShape->setModelId(rAttribs.getString( XML_modelId ).value());
return new PPTShapeContext( *this, mpSlidePersistPtr,
mpGroupShapePtr, pShape );
}
... etc. - the rest is truncated
