summaryrefslogtreecommitdiff
path: root/oox/source/ppt
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source/ppt')
-rw-r--r--oox/source/ppt/commontimenodecontext.cxx11
-rw-r--r--oox/source/ppt/dgmimport.cxx4
-rw-r--r--oox/source/ppt/dgmlayout.cxx19
-rw-r--r--oox/source/ppt/pptimport.cxx10
-rw-r--r--oox/source/ppt/presentationfragmenthandler.cxx10
-rw-r--r--oox/source/ppt/soundactioncontext.cxx2
-rw-r--r--oox/source/ppt/timenode.cxx22
-rw-r--r--oox/source/ppt/timenodelistcontext.cxx4
8 files changed, 38 insertions, 44 deletions
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx
index 4c5e15421b28..ddc4c14aeb3a 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -385,7 +385,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
if( attribs.hasAttribute( XML_afterEffect ) )
{
- aUserData[ CREATE_OUSTRING( "after-effect" ) ]
+ aUserData[ "after-effect" ]
= makeAny( attribs.getBool( XML_afterEffect, false ) );
}
aProps[ NP_AUTOREVERSE ] = makeAny( attribs.getBool( XML_autoRev, false ) );
@@ -503,7 +503,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
nEnum = EffectNodeType::DEFAULT;
break;
}
- aUserData[ CREATE_OUSTRING( "node-type" ) ] <<= nEnum;
+ aUserData[ "node-type" ] <<= nEnum;
}
// ST_TLTimeNodePresetClassType
@@ -537,7 +537,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
nEffectPresetClass = 0;
break;
}
- aUserData[ CREATE_OUSTRING( "preset-class" ) ] = makeAny( nEffectPresetClass );
+ aUserData[ "preset-class" ] = makeAny( nEffectPresetClass );
if( attribs.hasAttribute( XML_presetID ) )
{
sal_Int32 nPresetId = attribs.getInteger( XML_presetID, 0 );
@@ -545,13 +545,12 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
while( p->mpStrPresetId && ((p->mnPresetClass != nEffectPresetClass) || (p->mnPresetId != nPresetId )) )
p++;
- aUserData[ CREATE_OUSTRING( "preset-id" ) ]
+ aUserData[ "preset-id" ]
= makeAny( OUString::createFromAscii( p->mpStrPresetId ) );
sal_Int32 nPresetSubType = attribs.getInteger( XML_presetSubtype, 0 );
if( nPresetSubType )
{
- aUserData[ CREATE_OUSTRING( "preset-sub-type" ) ]
- = makeAny( getConvertedSubType( nEffectPresetClass, nPresetId, nPresetSubType ) );
+ aUserData[ "preset-sub-type" ] = makeAny( getConvertedSubType( nEffectPresetClass, nPresetId, nPresetSubType ) );
}
}
}
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
index 10d4e1db944f..0918f82eaa90 100644
--- a/oox/source/ppt/dgmimport.cxx
+++ b/oox/source/ppt/dgmimport.cxx
@@ -33,12 +33,12 @@ namespace oox { namespace ppt {
OUString SAL_CALL QuickDiagrammingImport_getImplementationName() throw()
{
- return CREATE_OUSTRING( "com.sun.star.comp.Impress.oox.QuickDiagrammingImport" );
+ return OUString( "com.sun.star.comp.Impress.oox.QuickDiagrammingImport" );
}
uno::Sequence< OUString > SAL_CALL QuickDiagrammingImport_getSupportedServiceNames() throw()
{
- const OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.ooxpptx.dgm.import" );
+ const OUString aServiceName = "com.sun.star.comp.ooxpptx.dgm.import";
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx
index ace557416c38..3fec83658de9 100644
--- a/oox/source/ppt/dgmlayout.cxx
+++ b/oox/source/ppt/dgmlayout.cxx
@@ -39,12 +39,12 @@ namespace oox { namespace ppt {
OUString SAL_CALL QuickDiagrammingLayout_getImplementationName() throw()
{
- return CREATE_OUSTRING( "com.sun.star.comp.Impress.oox.QuickDiagrammingLayout" );
+ return OUString( "com.sun.star.comp.Impress.oox.QuickDiagrammingLayout" );
}
uno::Sequence< OUString > SAL_CALL QuickDiagrammingLayout_getSupportedServiceNames() throw()
{
- const OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.ooxpptx.dgm.layout" );
+ const OUString aServiceName = "com.sun.star.comp.ooxpptx.dgm.layout";
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
@@ -84,8 +84,7 @@ bool QuickDiagrammingLayout::importDocument() throw()
Reference<beans::XPropertySet> xPropSet2(xMasterPage,
UNO_QUERY_THROW);
Reference<xml::dom::XDocument> xThemeFragment;
- xPropSet2->getPropertyValue(
- CREATE_OUSTRING("PPTTheme")) >>= xThemeFragment;
+ xPropSet2->getPropertyValue("PPTTheme") >>= xThemeFragment;
importFragment(
new ThemeFragmentHandler(
@@ -101,14 +100,10 @@ bool QuickDiagrammingLayout::importDocument() throw()
Reference<xml::dom::XDocument> xQStyleDom;
Reference<xml::dom::XDocument> xColorStyleDom;
- xPropSet->getPropertyValue(
- CREATE_OUSTRING("DiagramData")) >>= xDataModelDom;
- xPropSet->getPropertyValue(
- CREATE_OUSTRING("DiagramLayout")) >>= xLayoutDom;
- xPropSet->getPropertyValue(
- CREATE_OUSTRING("DiagramQStyle")) >>= xQStyleDom;
- xPropSet->getPropertyValue(
- CREATE_OUSTRING("DiagramColorStyle")) >>= xColorStyleDom;
+ xPropSet->getPropertyValue("DiagramData") >>= xDataModelDom;
+ xPropSet->getPropertyValue("DiagramLayout") >>= xLayoutDom;
+ xPropSet->getPropertyValue("DiagramQStyle") >>= xQStyleDom;
+ xPropSet->getPropertyValue("DiagramColorStyle") >>= xColorStyleDom;
oox::drawingml::ShapePtr pShape(
new oox::drawingml::Shape( "com.sun.star.drawing.DiagramShape" ) );
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 06355264069b..a7e992219f8d 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -36,14 +36,14 @@ namespace oox { namespace ppt {
OUString SAL_CALL PowerPointImport_getImplementationName() throw()
{
- return CREATE_OUSTRING( "com.sun.star.comp.oox.ppt.PowerPointImport" );
+ return OUString( "com.sun.star.comp.oox.ppt.PowerPointImport" );
}
uno::Sequence< OUString > SAL_CALL PowerPointImport_getSupportedServiceNames() throw()
{
Sequence< OUString > aSeq( 2 );
- aSeq[ 0 ] = CREATE_OUSTRING( "com.sun.star.document.ImportFilter" );
- aSeq[ 1 ] = CREATE_OUSTRING( "com.sun.star.document.ExportFilter" );
+ aSeq[ 0 ] = "com.sun.star.document.ImportFilter";
+ aSeq[ 1 ] = "com.sun.star.document.ExportFilter";
return aSeq;
}
@@ -140,7 +140,7 @@ sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDe
return true;
if( isExportFilter() ) {
- Reference< XExporter > xExporter( getServiceFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.comp.Impress.oox.PowerPointExport" ) ), UNO_QUERY );
+ Reference< XExporter > xExporter( getServiceFactory()->createInstance( "com.sun.star.comp.Impress.oox.PowerPointExport" ), UNO_QUERY );
if( xExporter.is() ) {
Reference< XComponent > xDocument( getModel(), UNO_QUERY );
@@ -209,7 +209,7 @@ GraphicHelper* PowerPointImport::implCreateGraphicHelper() const
::oox::ole::VbaProject* PowerPointImport::implCreateVbaProject() const
{
- return new ::oox::ole::VbaProject( getComponentContext(), getModel(), CREATE_OUSTRING( "Impress" ) );
+ return new ::oox::ole::VbaProject( getComponentContext(), getModel(), "Impress" );
}
OUString PowerPointImport::implGetImplementationName() const
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index 196a470ea8a7..903337257f4b 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -79,7 +79,7 @@ void ResolveTextFields( XmlFilterBase& rFilter )
oox::core::TextFieldStack::const_iterator aIter( rTextFields.begin() );
while( aIter != rTextFields.end() )
{
- const OUString sURL = CREATE_OUSTRING( "URL" );
+ const OUString sURL = "URL";
Reference< drawing::XDrawPagesSupplier > xDPS( xModel, uno::UNO_QUERY_THROW );
Reference< drawing::XDrawPages > xDrawPages( xDPS->getDrawPages(), uno::UNO_QUERY_THROW );
@@ -91,8 +91,8 @@ void ResolveTextFields( XmlFilterBase& rFilter )
OUString aURL;
if ( xPropSet->getPropertyValue( sURL ) >>= aURL )
{
- const OUString sSlide = CREATE_OUSTRING( "#Slide " );
- const OUString sNotes = CREATE_OUSTRING( "#Notes " );
+ const OUString sSlide = "#Slide ";
+ const OUString sNotes = "#Notes ";
sal_Bool bNotes = sal_False;
sal_Int32 nPageNumber = 0;
if ( aURL.match( sSlide ) )
@@ -114,7 +114,7 @@ void ResolveTextFields( XmlFilterBase& rFilter )
xDrawPage = xPresentationPage->getNotesPage();
}
Reference< container::XNamed > xNamed( xDrawPage, UNO_QUERY_THROW );
- aURL = CREATE_OUSTRING( "#" ).concat( xNamed->getName() );
+ aURL = OUString( "#" ).concat( xNamed->getName() );
xPropSet->setPropertyValue( sURL, Any( aURL ) );
Reference< text::XTextContent > xContent( rTextField.xTextField, UNO_QUERY);
Reference< text::XTextRange > xTextRange( rTextField.xTextCursor, UNO_QUERY );
@@ -338,7 +338,7 @@ bool PresentationFragmentHandler::importSlide( const FragmentHandlerRef& rxSlide
SlidePersistPtr pMasterPersistPtr( pSlidePersistPtr->getMasterPersist() );
if ( pMasterPersistPtr.get() )
{
- const OUString sLayout = CREATE_OUSTRING( "Layout" );
+ const OUString sLayout = "Layout";
uno::Reference< beans::XPropertySet > xSet( xSlide, uno::UNO_QUERY_THROW );
xSet->setPropertyValue( sLayout, Any( pMasterPersistPtr->getLayoutFromValueToken() ) );
}
diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx
index b1f72b56ed86..0a266ba03922 100644
--- a/oox/source/ppt/soundactioncontext.cxx
+++ b/oox/source/ppt/soundactioncontext.cxx
@@ -70,7 +70,7 @@ namespace oox { namespace ppt {
}
// else if( mbStopSound )
// {
-// maSlideProperties[ CREATE_OUSTRING( "" ) ] = Any( sal_True );
+// maSlideProperties[ "" ] = Any( sal_True );
// }
}
}
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index e02d3cf7e0d4..eb0f55b845ac 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -58,34 +58,34 @@ namespace oox { namespace ppt {
switch( nNodeType )
{
case AnimationNodeType::PAR:
- sServiceName = CREATE_OUSTRING("com.sun.star.animations.ParallelTimeContainer");
+ sServiceName = "com.sun.star.animations.ParallelTimeContainer";
break;
case AnimationNodeType::SEQ:
- sServiceName = CREATE_OUSTRING("com.sun.star.animations.SequenceTimeContainer");
+ sServiceName = "com.sun.star.animations.SequenceTimeContainer";
break;
case AnimationNodeType::ANIMATE:
- sServiceName = CREATE_OUSTRING("com.sun.star.animations.Animate");
+ sServiceName = "com.sun.star.animations.Animate";
break;
case AnimationNodeType::ANIMATECOLOR:
- sServiceName = CREATE_OUSTRING("com.sun.star.animations.AnimateColor");
+ sServiceName = "com.sun.star.animations.AnimateColor";
break;
case AnimationNodeType::TRANSITIONFILTER:
- sServiceName = CREATE_OUSTRING("com.sun.star.animations.TransitionFilter");
+ sServiceName = "com.sun.star.animations.TransitionFilter";
break;
case AnimationNodeType::ANIMATEMOTION:
- sServiceName = CREATE_OUSTRING("com.sun.star.animations.AnimateMotion");
+ sServiceName = "com.sun.star.animations.AnimateMotion";
break;
case AnimationNodeType::ANIMATETRANSFORM:
- sServiceName = CREATE_OUSTRING("com.sun.star.animations.AnimateTransform");
+ sServiceName = "com.sun.star.animations.AnimateTransform";
break;
case AnimationNodeType::COMMAND:
- sServiceName = CREATE_OUSTRING("com.sun.star.animations.Command");
+ sServiceName = "com.sun.star.animations.Command";
break;
case AnimationNodeType::SET:
- sServiceName = CREATE_OUSTRING("com.sun.star.animations.AnimateSet");
+ sServiceName = "com.sun.star.animations.AnimateSet";
break;
case AnimationNodeType::AUDIO:
- sServiceName = CREATE_OUSTRING("com.sun.star.animations.Audio");
+ sServiceName = "com.sun.star.animations.Audio";
break;
default:
OSL_TRACE( "OOX: uhandled type %x", nNodeType );
@@ -546,7 +546,7 @@ namespace oox { namespace ppt {
case AnimationNodeType::SEQ:
{
sal_Int16 nEnum = 0;
- if( maUserData[ CREATE_OUSTRING( "node-type" ) ] >>= nEnum )
+ if( maUserData[ "node-type" ] >>= nEnum )
{
if( nEnum == EffectNodeType::MAIN_SEQUENCE )
{
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 51594fe7c22d..3247f15c5d95 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -277,7 +277,7 @@ namespace oox { namespace ppt {
double fMediaTime = ::rtl::math::stringToDouble( aMediaTime, (sal_Unicode)('.'), (sal_Unicode)(','), &eStatus, NULL );
if( eStatus == rtl_math_ConversionStatus_Ok )
{
- aParamValue.Name = CREATE_OUSTRING("MediaTime");
+ aParamValue.Name = "MediaTime";
aParamValue.Value <<= fMediaTime;
}
nCommand = EffectCommands::PLAY;
@@ -296,7 +296,7 @@ namespace oox { namespace ppt {
if( nCommand == EffectCommands::CUSTOM )
{
OSL_TRACE("OOX: CmdTimeNodeContext::endFastElement(), unknown command!");
- aParamValue.Name = CREATE_OUSTRING("UserDefined");
+ aParamValue.Name = "UserDefined";
aParamValue.Value <<= msCommand;
}
if( aParamValue.Value.hasValue() )
generated by cgit (git 2.34.1) at 2025-01-21 13:25:22 +0000