summaryrefslogtreecommitdiff
path: root/oox/source/ppt
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source/ppt')
-rw-r--r--oox/source/ppt/layoutfragmenthandler.cxx2
-rw-r--r--oox/source/ppt/pptgraphicshapecontext.cxx6
-rw-r--r--oox/source/ppt/pptshape.cxx10
-rw-r--r--oox/source/ppt/pptshapecontext.cxx6
-rw-r--r--oox/source/ppt/pptshapegroupcontext.cxx8
-rw-r--r--oox/source/ppt/presPropsfragmenthandler.cxx4
-rw-r--r--oox/source/ppt/slidefragmenthandler.cxx2
7 files changed, 19 insertions, 19 deletions
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 );
}
case PPT_TOKEN( pic ): // CT_Picture
diff --git a/oox/source/ppt/presPropsfragmenthandler.cxx b/oox/source/ppt/presPropsfragmenthandler.cxx
index 4792d07c0d80..611021d4ace6 100644
--- a/oox/source/ppt/presPropsfragmenthandler.cxx
+++ b/oox/source/ppt/presPropsfragmenthandler.cxx
@@ -76,10 +76,10 @@ core::ContextHandlerRef PresPropsFragmentHandler::onCreateContext(sal_Int32 aEle
m_bTiming = rAttribs.getBool(XML_useTimings, true);
return this;
case PPT_TOKEN(custShow):
- m_sId = rAttribs.getString(XML_id).get();
+ m_sId = rAttribs.getString(XML_id).value();
return this;
case PPT_TOKEN(sldRg):
- m_sSt = rAttribs.getString(XML_st).get();
+ m_sSt = rAttribs.getString(XML_st).value();
return this;
}
return this;
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 6553b8a7e2bd..a6447b376d15 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -83,7 +83,7 @@ SlideFragmentHandler::~SlideFragmentHandler()
PropertySet aSlideProp( xSlide );
OptValue<bool> aShowMasterShapes = rAttribs.getBool(XML_showMasterSp);
- if (aShowMasterShapes.has_value() && !aShowMasterShapes.get())
+ if (aShowMasterShapes.has_value() && !aShowMasterShapes.value())
xSet->setPropertyValue("IsBackgroundObjectsVisible", Any(false));
aPropMap.setProperty( PROP_Visible, rAttribs.getBool( XML_show, true ));
generated by cgit (git 2.34.1) at 2025-02-10 16:06:47 +0000