summaryrefslogtreecommitdiff
path: root/oox/source/vml/vmlshapecontext.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-06-21 13:02:53 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-06-22 11:48:28 +0200
commit0feeb94f97332a8e803e1936d66e0f234bd51973 (patch)
tree9fa7eca333fda4cde233f9db7ea3840e81b7bcb8 /oox/source/vml/vmlshapecontext.cxx
parent813939f8e392feff0b6eeeee1bae023bc9c98849 (diff)
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.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source/vml/vmlshapecontext.cxx')
-rw-r--r--oox/source/vml/vmlshapecontext.cxx26
1 files changed, 13 insertions, 13 deletions
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 0b0939c6ba38..63ece16c7046 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -52,7 +52,7 @@ namespace {
OptValue< bool > lclDecodeBool( const AttributeList& rAttribs, sal_Int32 nToken )
{
OptValue< OUString > oValue = rAttribs.getString( nToken );
- if( oValue.has_value() ) return OptValue< bool >( ConversionHelper::decodeBool( oValue.get() ) );
+ if( oValue.has_value() ) return OptValue< bool >( ConversionHelper::decodeBool( oValue.value() ) );
return OptValue< bool >();
}
@@ -62,7 +62,7 @@ OptValue< bool > lclDecodeBool( const AttributeList& rAttribs, sal_Int32 nToken
OptValue< double > lclDecodePercent( const AttributeList& rAttribs, sal_Int32 nToken, double fDefValue )
{
OptValue< OUString > oValue = rAttribs.getString( nToken );
- if( oValue.has_value() ) return OptValue< double >( ConversionHelper::decodePercent( oValue.get(), fDefValue ) );
+ if( oValue.has_value() ) return OptValue< double >( ConversionHelper::decodePercent( oValue.value(), fDefValue ) );
return OptValue< double >();
}
@@ -76,7 +76,7 @@ OptValue< double > lclDecodeOpacity( const AttributeList& rAttribs, sal_Int32 nT
if( oValue.has_value() )
{
- const OUString& aString(oValue.get());
+ const OUString& aString(oValue.value());
const sal_Int32 nLength(aString.getLength());
if(nLength > 0)
@@ -104,7 +104,7 @@ OptValue< Int32Pair > lclDecodeInt32Pair( const AttributeList& rAttribs, sal_Int
if( oValue.has_value() )
{
std::u16string_view aValue1, aValue2;
- ConversionHelper::separatePair( aValue1, aValue2, oValue.get(), ',' );
+ ConversionHelper::separatePair( aValue1, aValue2, oValue.value(), ',' );
oRetValue = Int32Pair( o3tl::toInt32(aValue1), o3tl::toInt32(aValue2) );
}
return oRetValue;
@@ -119,7 +119,7 @@ OptValue< DoublePair > lclDecodePercentPair( const AttributeList& rAttribs, sal_
if( oValue.has_value() )
{
std::u16string_view aValue1, aValue2;
- ConversionHelper::separatePair( aValue1, aValue2, oValue.get(), ',' );
+ ConversionHelper::separatePair( aValue1, aValue2, oValue.value(), ',' );
oRetValue = DoublePair(
ConversionHelper::decodePercent( aValue1, 0.0 ),
ConversionHelper::decodePercent( aValue2, 0.0 ) );
@@ -400,9 +400,9 @@ ContextHandlerRef ShapeTypeContext::onCreateContext( sal_Int32 nElement, const A
// Gain / contrast.
OptValue<OUString> oGain = rAttribs.getString(XML_gain);
sal_Int32 nGain = 0x10000;
- if (oGain.has_value() && oGain.get().endsWith("f"))
+ if (oGain.has_value() && oGain.value().endsWith("f"))
{
- nGain = oGain.get().toInt32();
+ nGain = oGain.value().toInt32();
}
if (nGain < 0x10000)
{
@@ -415,9 +415,9 @@ ContextHandlerRef ShapeTypeContext::onCreateContext( sal_Int32 nElement, const A
// Blacklevel / brightness.
OptValue<OUString> oBlacklevel = rAttribs.getString(XML_blacklevel);
sal_Int16 nBlacklevel = 0;
- if (oBlacklevel.has_value() && oBlacklevel.get().endsWith("f"))
+ if (oBlacklevel.has_value() && oBlacklevel.value().endsWith("f"))
{
- nBlacklevel = oBlacklevel.get().toInt32();
+ nBlacklevel = oBlacklevel.value().toInt32();
}
if (nBlacklevel != 0)
{
@@ -455,7 +455,7 @@ OptValue< OUString > ShapeTypeContext::decodeFragmentPath( const AttributeList&
OptValue< OUString > oFragmentPath;
OptValue< OUString > oRelId = rAttribs.getString( nToken );
if( oRelId.has_value() )
- oFragmentPath = getFragmentPathFromRelId( oRelId.get() );
+ oFragmentPath = getFragmentPathFromRelId( oRelId.value() );
return oFragmentPath;
}
@@ -536,7 +536,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 nElement, const Attri
}
if (const ShapeType* pShapeType = pShapeContainer->getShapeTypeById(aType))
{
- nShapeType = pShapeType->getTypeModel().moShapeType.get();
+ nShapeType = pShapeType->getTypeModel().moShapeType.value();
}
}
mrShapeModel.mbInGroup = (getParentElement() == VML_TOKEN(group));
@@ -613,9 +613,9 @@ void ShapeContext::setPoints(std::u16string_view rPoints)
if (mrShape.getTypeModel().moCoordSize.has_value())
{
- double fWidth = mrShape.getTypeModel().moCoordSize.get().first;
+ double fWidth = mrShape.getTypeModel().moCoordSize.value().first;
fWidth = o3tl::convert(fWidth, o3tl::Length::twip, o3tl::Length::pt);
- double fHeight = mrShape.getTypeModel().moCoordSize.get().second;
+ double fHeight = mrShape.getTypeModel().moCoordSize.value().second;
fHeight = o3tl::convert(fHeight, o3tl::Length::twip, o3tl::Length::pt);
mrShape.getTypeModel().maWidth = OUString::number(fWidth) + "pt";
mrShape.getTypeModel().maHeight = OUString::number(fHeight) + "pt";