remove oox::OptValue::set

as a step towards converting it to std::optional

Change-Id: I49db0b13338388c92108fc2c27d8e662dcd954d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136214
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 23 insertions, 23 deletions

diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 4bd69f8c779f..e04bfe5f0ae6 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -906,7 +906,7 @@ TextFormatter::TextFormatter( ObjectFormatterData& rData, const AutoTextEntry* p
     ::Color nTextColor = getPhColor( -1 );
     if( sal_Int32(nTextColor) >= 0 ) {
         mxAutoText->maFillProperties.maFillColor.setSrgbClr( nTextColor );
-        mxAutoText->maFillProperties.moFillType.set(XML_solidFill);
+        mxAutoText->maFillProperties.moFillType = XML_solidFill;
     }
     mxAutoText->moHeight = pAutoTextEntry->mnDefFontSize;
     mxAutoText->moBold = pAutoTextEntry->mbBold;
diff --git a/oox/source/drawingml/scene3dcontext.cxx b/oox/source/drawingml/scene3dcontext.cxx
index e17893472bc2..10b4fbff606c 100644
--- a/oox/source/drawingml/scene3dcontext.cxx
+++ b/oox/source/drawingml/scene3dcontext.cxx
@@ -105,9 +105,9 @@ ContextHandlerRef SceneText3DPropertiesContext::onCreateContext( sal_Int32 aElem
             aProps.mnPreset = rAttribs.getToken( XML_prst, XML_none );
 
         if( aElementToken == A_TOKEN( bevelT ) )
-            mr3DProperties.maTopBevelProperties.set( aProps );
+            mr3DProperties.maTopBevelProperties = aProps;
         else
-            mr3DProperties.maBottomBevelProperties.set( aProps );
+            mr3DProperties.maBottomBevelProperties = aProps;
         break;
     }
 
@@ -150,9 +150,9 @@ ContextHandlerRef Shape3DPropertiesContext::onCreateContext( sal_Int32 aElementT
             aProps.mnPreset = rAttribs.getToken( XML_prst, XML_none );
 
         if( aElementToken == A_TOKEN( bevelT ) )
-            mr3DProperties.maTopBevelProperties.set( aProps );
+            mr3DProperties.maTopBevelProperties = aProps;
         else
-            mr3DProperties.maBottomBevelProperties.set( aProps );
+            mr3DProperties.maBottomBevelProperties = aProps;
 
         break;
     }
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 7e61dfb7c9c5..6b6ffbeab607 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1772,7 +1772,7 @@ Reference< XShape > const & Shape::createAndInsert(
                         if ( pFontRef->maPhClr.isUsed() )
                         {
                             aCharStyleProperties.maFillProperties.maFillColor = pFontRef->maPhClr;
-                            aCharStyleProperties.maFillProperties.moFillType.set(XML_solidFill);
+                            aCharStyleProperties.maFillProperties.moFillType = XML_solidFill;
                         }
                     }
                 }
diff --git a/oox/source/drawingml/table/predefined-table-styles.cxx b/oox/source/drawingml/table/predefined-table-styles.cxx
index 68cbb00cf261..7d420038856a 100644
--- a/oox/source/drawingml/table/predefined-table-styles.cxx
+++ b/oox/source/drawingml/table/predefined-table-styles.cxx
@@ -204,7 +204,7 @@ static std::map<OUString, sal_Int32> tokens = { { "", XML_dk1 },
 
 void setBorderLineType(const oox::drawingml::LinePropertiesPtr& pLineProp, sal_Int32 nToken)
 {
-    pLineProp->maLineFill.moFillType.set(nToken);
+    pLineProp->maLineFill.moFillType = nToken;
 }
 
 void insertBorderLine(TableStylePart& aTableStylePart, sal_Int32 nToken,
@@ -381,16 +381,16 @@ std::unique_ptr<TableStyle> CreateTableStyle(const OUString& styleId)
 
     // Start to set fill types.
 
-    pTblBgFillProperties->moFillType.set(XML_solidFill);
-    pWholeTblFillProperties->moFillType.set(XML_solidFill);
-    pFirstRowFillProperties->moFillType.set(XML_solidFill);
-    pFirstColFillProperties->moFillType.set(XML_solidFill);
-    pLastRowFillProperties->moFillType.set(XML_solidFill);
-    pLastColFillProperties->moFillType.set(XML_solidFill);
-    pBand1HFillProperties->moFillType.set(XML_solidFill);
-    pBand1VFillProperties->moFillType.set(XML_solidFill);
-    pBand2HFillProperties->moFillType.set(XML_solidFill);
-    pBand2VFillProperties->moFillType.set(XML_solidFill);
+    pTblBgFillProperties->moFillType = XML_solidFill;
+    pWholeTblFillProperties->moFillType = XML_solidFill;
+    pFirstRowFillProperties->moFillType = XML_solidFill;
+    pFirstColFillProperties->moFillType = XML_solidFill;
+    pLastRowFillProperties->moFillType = XML_solidFill;
+    pLastColFillProperties->moFillType = XML_solidFill;
+    pBand1HFillProperties->moFillType = XML_solidFill;
+    pBand1VFillProperties->moFillType = XML_solidFill;
+    pBand2HFillProperties->moFillType = XML_solidFill;
+    pBand2VFillProperties->moFillType = XML_solidFill;
 
     // End to set fill types.
 
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 1dae5369b271..db117e941ac4 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -213,7 +213,7 @@ static void applyTableStylePart( const ::oox::core::XmlFilterBase& rFilterBase,
     if ( rTableStylePart.getTextColor().isUsed() )
     {
         aTextCharProps.maFillProperties.maFillColor = rTableStylePart.getTextColor();
-        aTextCharProps.maFillProperties.moFillType.set(XML_solidFill);
+        aTextCharProps.maFillProperties.moFillType = XML_solidFill;
     }
     if( rTableStylePart.getTextBoldStyle() )
         aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle();
@@ -534,10 +534,10 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, cons
         ::Color aResult( basegfx::interpolate(nBgColor.getBColor(), nCellColor.getBColor(), 1.0 - fTransparency) );
         aFillProperties.maFillColor.clearTransformations();
         aFillProperties.maFillColor.setSrgbClr(sal_Int32(aResult.GetRGBColor()));
-        aFillProperties.moFillType.set(XML_solidFill);
+        aFillProperties.moFillType = XML_solidFill;
     }
     if (!aFillProperties.moFillType.has_value())
-        aFillProperties.moFillType.set(XML_noFill);
+        aFillProperties.moFillType = XML_noFill;
 
     // TODO: phClr?
     aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper() );
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index c201f9738029..ffee500486ac 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -262,7 +262,7 @@ ContextHandlerRef TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
             if (rAttribs.getInteger(W_TOKEN(val)).has_value())
             {
                 mrTextCharacterProperties.maFillProperties.maFillColor.setSrgbClr(rAttribs.getIntegerHex(W_TOKEN(val)).get());
-                mrTextCharacterProperties.maFillProperties.moFillType.set(XML_solidFill);
+                mrTextCharacterProperties.maFillProperties.moFillType = XML_solidFill;
             }
             break;
         case W_TOKEN(  sz ):
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index 59bb959cb548..2482e9da0461 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -157,9 +157,9 @@ sal_Int32 TextRun::insertAt(
                 if (!maTextCharacterProperties.maHyperlinkPropertyMap.hasProperty(PROP_CharColor))
                     aTextCharacterProps.maFillProperties.maFillColor.setSchemeClr(XML_hlink);
 
-                aTextCharacterProps.maFillProperties.moFillType.set(XML_solidFill);
+                aTextCharacterProps.maFillProperties.moFillType = XML_solidFill;
                 if ( !maTextCharacterProperties.moUnderline.has_value() )
-                    aTextCharacterProps.moUnderline.set( XML_sng );
+                    aTextCharacterProps.moUnderline = XML_sng;
 
                 PropertySet aFieldTextPropSet( xTextFieldCursor );
                 aTextCharacterProps.pushToPropSet( aFieldTextPropSet, rFilterBase );