diff options
Diffstat (limited to 'oox/source/ppt')
-rw-r--r-- | oox/source/ppt/comments.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/commontimenodecontext.cxx | 10 | ||||
-rw-r--r-- | oox/source/ppt/pptimport.cxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/pptshape.cxx | 18 | ||||
-rw-r--r-- | oox/source/ppt/presPropsfragmenthandler.cxx | 8 | ||||
-rw-r--r-- | oox/source/ppt/presentationfragmenthandler.cxx | 42 | ||||
-rw-r--r-- | oox/source/ppt/slidefragmenthandler.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/slidepersist.cxx | 34 | ||||
-rw-r--r-- | oox/source/ppt/timenode.cxx | 2 |
9 files changed, 61 insertions, 61 deletions
diff --git a/oox/source/ppt/comments.cxx b/oox/source/ppt/comments.cxx index c38397fcad69..b85d95b4a692 100644 --- a/oox/source/ppt/comments.cxx +++ b/oox/source/ppt/comments.cxx @@ -74,7 +74,7 @@ OUString Comment::getAuthor(const CommentAuthorList& list) if (author.id.toInt32() == nId) return author.name; } - return "Anonymous"; + return u"Anonymous"_ustr; } const Comment& CommentList::getCommentAtIndex(int index) diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx index e7d1cf1dce44..aa897a286362 100644 --- a/oox/source/ppt/commontimenodecontext.cxx +++ b/oox/source/ppt/commontimenodecontext.cxx @@ -367,7 +367,7 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I if( attribs.hasAttribute( XML_afterEffect ) ) { - aUserData[ "after-effect" ] + aUserData[ u"after-effect"_ustr ] <<= attribs.getBool( XML_afterEffect, false ); } aProps[ NP_AUTOREVERSE ] <<= attribs.getBool( XML_autoRev, false ); @@ -485,7 +485,7 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I nEnum = EffectNodeType::DEFAULT; break; } - aUserData[ "node-type" ] <<= nEnum; + aUserData[ u"node-type"_ustr ] <<= nEnum; } // ST_TLTimeNodePresetClassType @@ -519,7 +519,7 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I nEffectPresetClass = 0; break; } - aUserData[ "preset-class" ] <<= nEffectPresetClass; + aUserData[ u"preset-class"_ustr ] <<= nEffectPresetClass; if( attribs.hasAttribute( XML_presetID ) ) { sal_Int32 nPresetId = attribs.getInteger( XML_presetID, 0 ); @@ -527,12 +527,12 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I while( p->mpStrPresetId && ((p->mnPresetClass != nEffectPresetClass) || (p->mnPresetId != nPresetId )) ) p++; - aUserData[ "preset-id" ] + aUserData[ u"preset-id"_ustr ] <<= OUString::createFromAscii( p->mpStrPresetId ); sal_Int32 nPresetSubType = attribs.getInteger( XML_presetSubtype, 0 ); if( nPresetSubType ) { - aUserData[ "preset-sub-type" ] <<= getConvertedSubType( nEffectPresetClass, nPresetId, nPresetSubType ); + aUserData[ u"preset-sub-type"_ustr ] <<= getConvertedSubType( nEffectPresetClass, nPresetId, nPresetSubType ); } } } diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index 55e094db652f..0767dc00118b 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -201,7 +201,7 @@ sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDe })); Reference<css::lang::XMultiServiceFactory> aFactory(getComponentContext()->getServiceManager(), UNO_QUERY_THROW); - Reference< XExporter > xExporter(aFactory->createInstanceWithArguments("com.sun.star.comp.Impress.oox.PowerPointExport", aArguments), UNO_QUERY); + Reference< XExporter > xExporter(aFactory->createInstanceWithArguments(u"com.sun.star.comp.Impress.oox.PowerPointExport"_ustr, aArguments), UNO_QUERY); if (Reference<XFilter> xFilter{ xExporter, UNO_QUERY }) { @@ -294,7 +294,7 @@ GraphicHelper* PowerPointImport::implCreateGraphicHelper() const OUString PowerPointImport::getImplementationName() { - return "com.sun.star.comp.oox.ppt.PowerPointImport"; + return u"com.sun.star.comp.oox.ppt.PowerPointImport"_ustr; } } diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 5d0152f2d6a8..c443e3bd5e52 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -245,9 +245,9 @@ void PPTShape::addShape( // and looks for time format in the 4 bits after that sal_Int32 nDateTimeFormat = static_cast<sal_Int32>(eDateFormat) | static_cast<sal_Int32>(eTimeFormat) << 4; - xPropertySet->setPropertyValue( "IsDateTimeVisible", Any(true) ); - xPropertySet->setPropertyValue( "IsDateTimeFixed", Any(false) ); - xPropertySet->setPropertyValue( "DateTimeFormat", Any(nDateTimeFormat) ); + xPropertySet->setPropertyValue( u"IsDateTimeVisible"_ustr, Any(true) ); + xPropertySet->setPropertyValue( u"IsDateTimeFixed"_ustr, Any(false) ); + xPropertySet->setPropertyValue( u"DateTimeFormat"_ustr, Any(nDateTimeFormat) ); return; } } @@ -270,8 +270,8 @@ void PPTShape::addShape( // if it is possible to get the footer as a property the LO way, // get it and discard the shape Reference< XPropertySet > xPropertySet( rSlidePersist.getPage(), UNO_QUERY ); - xPropertySet->setPropertyValue( "IsFooterVisible", Any( true ) ); - xPropertySet->setPropertyValue( "FooterText", Any(rFooterText) ); + xPropertySet->setPropertyValue( u"IsFooterVisible"_ustr, Any( true ) ); + xPropertySet->setPropertyValue( u"FooterText"_ustr, Any(rFooterText) ); return; } } @@ -291,7 +291,7 @@ void PPTShape::addShape( // do that and discard the shape Reference<XPropertySet> xPropertySet(rSlidePersist.getPage(), UNO_QUERY); - xPropertySet->setPropertyValue("IsPageNumberVisible", Any(true)); + xPropertySet->setPropertyValue(u"IsPageNumberVisible"_ustr, Any(true)); return; } } @@ -414,7 +414,7 @@ void PPTShape::addShape( } else if (!mpPlaceholder) { aMasterTextListStyle.reset(); } - SAL_INFO("oox.ppt","placeholder id: " << (pPlaceholder ? pPlaceholder->getId() : "not found")); + SAL_INFO("oox.ppt","placeholder id: " << (pPlaceholder ? pPlaceholder->getId() : u"not found"_ustr)); } if (!sServiceName.isEmpty()) @@ -489,7 +489,7 @@ void PPTShape::addShape( Reference < XText > xText(mxShape, UNO_QUERY); if(xText.is()) { - xText->setString(""); + xText->setString(u""_ustr); Reference < XTextCursor > xTextCursor = xText->createTextCursor(); xText->insertTextContent( xTextCursor, xField, false); } @@ -590,7 +590,7 @@ void PPTShape::addShape( pProperties->Name = "EventType"; pProperties->Handle = -1; - pProperties->Value <<= OUString("Presentation"); + pProperties->Value <<= u"Presentation"_ustr; pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; diff --git a/oox/source/ppt/presPropsfragmenthandler.cxx b/oox/source/ppt/presPropsfragmenthandler.cxx index 2cd9d82950d0..e82fd6f3d7dc 100644 --- a/oox/source/ppt/presPropsfragmenthandler.cxx +++ b/oox/source/ppt/presPropsfragmenthandler.cxx @@ -39,8 +39,8 @@ void PresPropsFragmentHandler::finalizeImport() getFilter().getModel(), css::uno::UNO_QUERY_THROW); css::uno::Reference<css::beans::XPropertySet> xPresentationProps( xPresentationSupplier->getPresentation(), css::uno::UNO_QUERY_THROW); - xPresentationProps->setPropertyValue("IsEndless", css::uno::Any(m_bLoop)); - xPresentationProps->setPropertyValue("IsAutomatic", css::uno::Any(!m_bTiming)); + xPresentationProps->setPropertyValue(u"IsEndless"_ustr, css::uno::Any(m_bLoop)); + xPresentationProps->setPropertyValue(u"IsAutomatic"_ustr, css::uno::Any(!m_bTiming)); if (!m_sId.isEmpty()) { @@ -49,7 +49,7 @@ void PresPropsFragmentHandler::finalizeImport() css::uno::Reference<css::container::XNameContainer> mxCustShows; mxCustShows = XCustPresentationSupplier->getCustomPresentations(); const css::uno::Sequence<OUString> aNameSeq(mxCustShows->getElementNames()); - xPresentationProps->setPropertyValue("CustomShow", + xPresentationProps->setPropertyValue(u"CustomShow"_ustr, css::uno::Any(aNameSeq[m_sId.toInt32()])); } @@ -60,7 +60,7 @@ void PresPropsFragmentHandler::finalizeImport() Reference<drawing::XDrawPage> xDrawPage; xDrawPages->getByIndex(m_sSt.toInt32() - 1) >>= xDrawPage; Reference<container::XNamed> xNamed(xDrawPage, uno::UNO_QUERY_THROW); - xPresentationProps->setPropertyValue("FirstPage", uno::Any(xNamed->getName())); + xPresentationProps->setPropertyValue(u"FirstPage"_ustr, uno::Any(xNamed->getName())); } } diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 955f4e246de1..fc2f42f6a011 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -166,7 +166,7 @@ void PresentationFragmentHandler::importSlideNames(XmlFilterBase& rFilter, const Reference<container::XNamed> xName(rSlidePersist[nPage]->getPage(), UNO_QUERY_THROW); xName->setName( aTitleText - + (nCount == 1 ? OUString("") : " (" + OUString::number(nCount) + ")")); + + (nCount == 1 ? u""_ustr : " (" + OUString::number(nCount) + ")")); } } } @@ -288,7 +288,7 @@ void PresentationFragmentHandler::importMasterSlide(const Reference<frame::XMode pMasterPersistPtr->createXShapes( rFilter ); uno::Reference< beans::XPropertySet > xSet(pMasterPersistPtr->getPage(), uno::UNO_QUERY_THROW); - xSet->setPropertyValue("SlideLayout", Any(pMasterPersistPtr->getLayoutFromValueToken())); + xSet->setPropertyValue(u"SlideLayout"_ustr, Any(pMasterPersistPtr->getLayoutFromValueToken())); oox::drawingml::ThemePtr pTheme = pMasterPersistPtr->getTheme(); if (pTheme) @@ -346,7 +346,7 @@ void PresentationFragmentHandler::saveThemeToGrabBag(const oox::drawingml::Theme comphelper::makePropertyValue( "ppt/theme/theme" + OUString::number(nThemeIdx) + ".xml", aCurrentTheme), // store DOM fragment for SmartArt re-generation - comphelper::makePropertyValue("OOXTheme", pThemePtr->getFragment()) + comphelper::makePropertyValue(u"OOXTheme"_ustr, pThemePtr->getFragment()) }; aThemesHashMap << aTheme; @@ -483,7 +483,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, bool bFirstPage mpTextListStyle ); FragmentHandlerRef xCommentAuthorsFragmentHandler( new SlideFragmentHandler( getFilter(), - "ppt/commentAuthors.xml", + u"ppt/commentAuthors.xml"_ustr, pCommentAuthorsPersistPtr, Slide ) ); @@ -520,7 +520,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, bool bFirstPage // crash (back() on empty vector is undefined) and losing other // comment data that might be there (author, position, timestamp etc.) pCommentsPersistPtr->getCommentsList().cmLst.back().setText( - comment_handler->getCharVector().empty() ? "" : + comment_handler->getCharVector().empty() ? u""_ustr : comment_handler->getCharVector().back() ); } pCommentsPersistPtr->getCommentAuthors().setValues(maAuthorList); @@ -564,9 +564,9 @@ void PresentationFragmentHandler::finalizeImport() // writing back the original PageCount of this document, it can be accessed from the XModel // via getArgs after the import. - rFilterData["OriginalPageCount"] <<= nPageCount; - bool bImportNotesPages = rFilterData.getUnpackedValueOrDefault("ImportNotesPages", true); - OUString aPageRange = rFilterData.getUnpackedValueOrDefault("PageRange", OUString()); + rFilterData[u"OriginalPageCount"_ustr] <<= nPageCount; + bool bImportNotesPages = rFilterData.getUnpackedValueOrDefault(u"ImportNotesPages"_ustr, true); + OUString aPageRange = rFilterData.getUnpackedValueOrDefault(u"PageRange"_ustr, OUString()); if( !aPageRange.getLength() ) { @@ -699,18 +699,18 @@ void PresentationFragmentHandler::finalizeImport() if (!sAlgorithmName.isEmpty()) { uno::Sequence<beans::PropertyValue> aResult{ - comphelper::makePropertyValue("algorithm-name", sAlgorithmName), - comphelper::makePropertyValue("salt", sSalt), - comphelper::makePropertyValue("iteration-count", nSpinCount), - comphelper::makePropertyValue("hash", sHash) + comphelper::makePropertyValue(u"algorithm-name"_ustr, sAlgorithmName), + comphelper::makePropertyValue(u"salt"_ustr, sSalt), + comphelper::makePropertyValue(u"iteration-count"_ustr, nSpinCount), + comphelper::makePropertyValue(u"hash"_ustr, sHash) }; try { uno::Reference<beans::XPropertySet> xDocSettings( getFilter().getModelFactory()->createInstance( - "com.sun.star.document.Settings"), + u"com.sun.star.document.Settings"_ustr), uno::UNO_QUERY); - xDocSettings->setPropertyValue("ModifyPasswordInfo", uno::Any(aResult)); + xDocSettings->setPropertyValue(u"ModifyPasswordInfo"_ustr, uno::Any(aResult)); } catch (const uno::Exception&) { @@ -734,7 +734,7 @@ void PresentationFragmentHandler::importSlide( const FragmentHandlerRef& rxSlide const int nCount = xMasterSlide->getCount(); uno::Reference< beans::XPropertySet > xSet( xSlide, uno::UNO_QUERY_THROW ); - xSet->setPropertyValue( "Layout", Any( pMasterPersistPtr->getLayoutFromValueToken() ) ); + xSet->setPropertyValue( u"Layout"_ustr, Any( pMasterPersistPtr->getLayoutFromValueToken() ) ); while( nCount < xMasterSlide->getCount()) { @@ -754,8 +754,8 @@ void PresentationFragmentHandler::importSlide( const FragmentHandlerRef& rxSlide if ( xPropertySet.is() ) { awt::Size& rPageSize( rSlidePersistPtr->isNotesPage() ? maNotesSize : maSlideSize ); - xPropertySet->setPropertyValue( "Width", Any( rPageSize.Width ) ); - xPropertySet->setPropertyValue( "Height", Any( rPageSize.Height ) ); + xPropertySet->setPropertyValue( u"Width"_ustr, Any( rPageSize.Width ) ); + xPropertySet->setPropertyValue( u"Height"_ustr, Any( rPageSize.Height ) ); oox::ppt::HeaderFooter aHeaderFooter( rSlidePersistPtr->getHeaderFooter() ); if ( !rSlidePersistPtr->isMasterPage() ) @@ -763,10 +763,10 @@ void PresentationFragmentHandler::importSlide( const FragmentHandlerRef& rxSlide try { if ( rSlidePersistPtr->isNotesPage() ) - xPropertySet->setPropertyValue( "IsHeaderVisible", Any( aHeaderFooter.mbHeader ) ); - xPropertySet->setPropertyValue( "IsFooterVisible", Any( aHeaderFooter.mbFooter ) ); - xPropertySet->setPropertyValue( "IsDateTimeVisible", Any( aHeaderFooter.mbDateTime ) ); - xPropertySet->setPropertyValue( "IsPageNumberVisible", Any( aHeaderFooter.mbSlideNumber ) ); + xPropertySet->setPropertyValue( u"IsHeaderVisible"_ustr, Any( aHeaderFooter.mbHeader ) ); + xPropertySet->setPropertyValue( u"IsFooterVisible"_ustr, Any( aHeaderFooter.mbFooter ) ); + xPropertySet->setPropertyValue( u"IsDateTimeVisible"_ustr, Any( aHeaderFooter.mbDateTime ) ); + xPropertySet->setPropertyValue( u"IsPageNumberVisible"_ustr, Any( aHeaderFooter.mbSlideNumber ) ); } catch( uno::Exception& ) { diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 491b7c90ed64..64577409c0b1 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -84,7 +84,7 @@ SlideFragmentHandler::~SlideFragmentHandler() std::optional<bool> aShowMasterShapes = rAttribs.getBool(XML_showMasterSp); if (aShowMasterShapes.has_value() && !aShowMasterShapes.value()) - xSet->setPropertyValue("IsBackgroundObjectsVisible", Any(false)); + xSet->setPropertyValue(u"IsBackgroundObjectsVisible"_ustr, Any(false)); aPropMap.setProperty( PROP_Visible, rAttribs.getBool( XML_show, true )); aSlideProp.setProperties( aPropMap ); diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index a4225f95cd43..bc7fc3514a68 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -195,8 +195,8 @@ void SlidePersist::createBackground( const XmlFilterBase& rFilterBase ) css::awt::Size aSize; Reference< css::beans::XPropertySet > xSet(mxPage, UNO_QUERY); - xSet->getPropertyValue("Width") >>= aSize.Width; - xSet->getPropertyValue("Height") >>= aSize.Height; + xSet->getPropertyValue(u"Width"_ustr) >>= aSize.Width; + xSet->getPropertyValue(u"Height"_ustr) >>= aSize.Height; oox::drawingml::ShapePropertyIds aPropertyIds = oox::drawingml::ShapePropertyInfo::DEFAULT.mrPropertyIds; aPropertyIds[oox::drawingml::ShapeProperty::FillGradient] = PROP_FillGradientName; @@ -394,14 +394,14 @@ static void lcl_SetEdgeLineValue(uno::Reference<drawing::XShape>& rXConnector, tools::Rectangle aS, aE; // Start, End rectangle uno::Reference<drawing::XShape> xStartSp, xEndSp; uno::Reference<beans::XPropertySet> xPropSet(rXConnector, uno::UNO_QUERY); - xPropSet->getPropertyValue("EdgeStartPoint") >>= aStartPt; - xPropSet->getPropertyValue("EdgeEndPoint") >>= aEndPt; - xPropSet->getPropertyValue("StartShape") >>= xStartSp; - xPropSet->getPropertyValue("EndShape") >>= xEndSp; - xPropSet->setPropertyValue("EdgeNode1HorzDist", Any(sal_Int32(0))); - xPropSet->setPropertyValue("EdgeNode1VertDist", Any(sal_Int32(0))); - xPropSet->setPropertyValue("EdgeNode2HorzDist", Any(sal_Int32(0))); - xPropSet->setPropertyValue("EdgeNode2VertDist", Any(sal_Int32(0))); + xPropSet->getPropertyValue(u"EdgeStartPoint"_ustr) >>= aStartPt; + xPropSet->getPropertyValue(u"EdgeEndPoint"_ustr) >>= aEndPt; + xPropSet->getPropertyValue(u"StartShape"_ustr) >>= xStartSp; + xPropSet->getPropertyValue(u"EndShape"_ustr) >>= xEndSp; + xPropSet->setPropertyValue(u"EdgeNode1HorzDist"_ustr, Any(sal_Int32(0))); + xPropSet->setPropertyValue(u"EdgeNode1VertDist"_ustr, Any(sal_Int32(0))); + xPropSet->setPropertyValue(u"EdgeNode2HorzDist"_ustr, Any(sal_Int32(0))); + xPropSet->setPropertyValue(u"EdgeNode2VertDist"_ustr, Any(sal_Int32(0))); SdrObject* pStartObj = xStartSp.is() ? SdrObject::getSdrObjectFromXShape(xStartSp) : nullptr; SdrObject* pEndObj = xEndSp.is() ? SdrObject::getSdrObjectFromXShape(xEndSp) : nullptr; @@ -616,7 +616,7 @@ static void lcl_SetEdgeLineValue(uno::Reference<drawing::XShape>& rXConnector, nEdge += aConnSize.Height; } } - xPropSet->setPropertyValue("EdgeLine1Delta", Any(nEdge / 2)); + xPropSet->setPropertyValue(u"EdgeLine1Delta"_ustr, Any(nEdge / 2)); } } } @@ -674,21 +674,21 @@ void SlidePersist::createConnectorShapeConnection() bool bStart = aConnectorShapeProperties[j].mbStartShape; if (bStart) { - xPropertySet->setPropertyValue("StartShape", uno::Any(xShape)); - xPropertySet->setPropertyValue("StartGluePointIndex", uno::Any(nGlueId)); + xPropertySet->setPropertyValue(u"StartShape"_ustr, uno::Any(xShape)); + xPropertySet->setPropertyValue(u"StartGluePointIndex"_ustr, uno::Any(nGlueId)); } else { - xPropertySet->setPropertyValue("EndShape", uno::Any(xShape)); - xPropertySet->setPropertyValue("EndGluePointIndex", uno::Any(nGlueId)); + xPropertySet->setPropertyValue(u"EndShape"_ustr, uno::Any(xShape)); + xPropertySet->setPropertyValue(u"EndGluePointIndex"_ustr, uno::Any(nGlueId)); } } } uno::Reference<beans::XPropertySetInfo> xPropInfo = xPropertySet->getPropertySetInfo(); - if (xPropInfo->hasPropertyByName("EdgeKind")) + if (xPropInfo->hasPropertyByName(u"EdgeKind"_ustr)) { ConnectorType aConnectorType; - xPropertySet->getPropertyValue("EdgeKind") >>= aConnectorType; + xPropertySet->getPropertyValue(u"EdgeKind"_ustr) >>= aConnectorType; if (aConnectorType == ConnectorType_STANDARD) lcl_SetEdgeLineValue(xConnector, pIt->second); } diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx index e8732e8858a6..1e0aa84ce036 100644 --- a/oox/source/ppt/timenode.cxx +++ b/oox/source/ppt/timenode.cxx @@ -599,7 +599,7 @@ namespace oox::ppt { case AnimationNodeType::SEQ: { sal_Int16 nEnum = 0; - if( maUserData[ "node-type" ] >>= nEnum ) + if( maUserData[ u"node-type"_ustr ] >>= nEnum ) { if( nEnum == EffectNodeType::MAIN_SEQUENCE ) { |