[Libreoffice-commits] .: 2 commits - sd/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Nov 1 14:46:56 PDT 2010
sd/source/core/CustomAnimationEffect.cxx | 2
sd/source/core/CustomAnimationPreset.cxx | 2
sd/source/core/stlsheet.cxx | 2
sd/source/filter/cgm/sdcgmfilter.cxx | 4
sd/source/filter/eppt/epptso.cxx | 4
sd/source/filter/eppt/pptexanimations.cxx | 4
sd/source/filter/grf/sdgrffilter.cxx | 8
sd/source/filter/html/buttonset.cxx | 2
sd/source/filter/ppt/ppt97animations.cxx | 252 +++++-----
sd/source/filter/ppt/pptin.cxx | 6
sd/source/filter/ppt/pptinanimations.cxx | 2
sd/source/filter/sdpptwrp.cxx | 4
sd/source/filter/xml/sdxmlwrp.cxx | 6
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 2
sd/source/ui/accessibility/AccessiblePageShape.cxx | 6
sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx | 4
sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx | 32 -
sd/source/ui/accessibility/AccessiblePresentationShape.cxx | 22
sd/source/ui/accessibility/SdShapeTypes.cxx | 28 -
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 2
22 files changed, 193 insertions(+), 205 deletions(-)
New commits:
commit 11a3e1a8b7210c59f941cef8832deaf6fed7966d
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Mon Nov 1 21:16:15 2010 +0000
Use RTL_CONSTASCII_USTRINGPARAM macro
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 1a157ca..60b99f6 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -281,7 +281,7 @@ Reference<XAccessible> SAL_CALL
return mxAccessibleOLEObject;
throw lang::IndexOutOfBoundsException (
- ::rtl::OUString::createFromAscii ("no child with index ")
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("no child with index ") ))
+ rtl::OUString::valueOf(nIndex),
NULL);
}
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 8d43941..21ab3f8 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -260,7 +260,7 @@ uno::Reference<XAccessible> SAL_CALL
}
else
throw lang::IndexOutOfBoundsException (
- ::rtl::OUString::createFromAscii ("no accessible child with index ")
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no accessible child with index "))
+ rtl::OUString::valueOf(nIndex),
static_cast<uno::XWeak*>(this));
}
diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx
index 574b38e..827f2a2 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -103,7 +103,7 @@ uno::Reference<XAccessible> SAL_CALL
throw (::com::sun::star::uno::RuntimeException)
{
throw lang::IndexOutOfBoundsException (
- ::rtl::OUString::createFromAscii ("page shape has no children"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("page shape has no children") ),
static_cast<uno::XWeak*>(this));
}
@@ -196,7 +196,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void)
if (aSet.is())
{
uno::Any aColor;
- aColor = aSet->getPropertyValue (::rtl::OUString::createFromAscii ("LineColor"));
+ aColor = aSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")));
aColor >>= nColor;
}
}
@@ -247,7 +247,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void)
if (xBGSet.is())
{
uno::Any aColor;
- aColor = xBGSet->getPropertyValue (::rtl::OUString::createFromAscii ("FillColor"));
+ aColor = xBGSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")));
aColor >>= nColor;
}
else
diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
index 910b2c3..9e8cb2a 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
@@ -109,11 +109,11 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void)
switch (nShapeType)
{
case PRESENTATION_GRAPHIC_OBJECT:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationGraphicShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("PresentationGraphicShape"))));
break;
default:
aDG.Initialize (
- ::rtl::OUString::createFromAscii ("Unknown accessible presentation graphic shape"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown accessible presentation graphic shape")));
uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
if (xDescriptor.is())
{
diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
index 59edc6d..0723ecf 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,28 +50,19 @@ AccessiblePresentationOLEShape::AccessiblePresentationOLEShape (
{
}
-
-
-
AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void)
{
}
-
-
-
//===== XServiceInfo ========================================================
-
-::rtl::OUString SAL_CALL
+
+::rtl::OUString SAL_CALL
AccessiblePresentationOLEShape::getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException)
{
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessiblePresentationOLEShape"));
}
-
-
-
/// Set this object's name if it is different to the current name.
::rtl::OUString
AccessiblePresentationOLEShape::CreateAccessibleBaseName (void)
@@ -103,9 +94,6 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void)
return sName;
}
-
-
-
::rtl::OUString
AccessiblePresentationOLEShape::CreateAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException)
@@ -116,25 +104,25 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void)
switch (nShapeType)
{
case PRESENTATION_OLE:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationOLEShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("PresentationOLEShape")));
//SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
- aDG.AddProperty (OUString::createFromAscii ("CLSID"),
+ aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM ("CLSID")),
DescriptionGenerator::STRING);
break;
case PRESENTATION_CHART:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationChartShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationChartShape")));
//SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
- aDG.AddProperty (OUString::createFromAscii ("CLSID"),
+ aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")),
DescriptionGenerator::STRING);
break;
case PRESENTATION_TABLE:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationTableShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationTableShape")));
//SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
- aDG.AddProperty (OUString::createFromAscii ("CLSID"),
+ aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")),
DescriptionGenerator::STRING);
break;
default:
- aDG.Initialize (::rtl::OUString::createFromAscii ("Unknown accessible presentation OLE shape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown accessible presentation OLE shape")));
uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
if (xDescriptor.is())
{
diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
index ee04fc8..36d4f9c 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
@@ -136,37 +136,37 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void)
switch (nShapeType)
{
case PRESENTATION_TITLE:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationTitleShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationTitleShape")));
break;
case PRESENTATION_OUTLINER:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationOutlinerShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationOutlinerShape")));
break;
case PRESENTATION_SUBTITLE:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationSubtitleShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationSubtitleShape")));
break;
case PRESENTATION_PAGE:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationPageShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationPageShape")));
break;
case PRESENTATION_NOTES:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationNotesShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationNotesShape")));
break;
case PRESENTATION_HANDOUT:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationHandoutShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationHandoutShape")));
break;
case PRESENTATION_HEADER:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationHeaderShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationHeaderShape")));
break;
case PRESENTATION_FOOTER:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationFooterShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationFooterShape")));
break;
case PRESENTATION_DATETIME:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationDateAndTimeShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationDateAndTimeShape")));
break;
case PRESENTATION_PAGENUMBER:
- aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationPageNumberShape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationPageNumberShape")));
break;
default:
- aDG.Initialize (::rtl::OUString::createFromAscii ("Unknown accessible presentation shape"));
+ aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown accessible presentation shape")));
uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
if (xDescriptor.is())
{
diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx
index aab0f20..ab54a26 100644
--- a/sd/source/ui/accessibility/SdShapeTypes.cxx
+++ b/sd/source/ui/accessibility/SdShapeTypes.cxx
@@ -76,59 +76,59 @@ AccessibleShape*
ShapeTypeDescriptor aSdShapeTypeList[] = {
ShapeTypeDescriptor (
PRESENTATION_OUTLINER,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.OutlinerShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.OutlinerShape"))),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_SUBTITLE,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.SubtitleShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.SubtitleShape"))),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_GRAPHIC_OBJECT,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.GraphicObjectShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.GraphicObjectShape"))),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_PAGE,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.PageShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.PageShape"))),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_OLE,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.OLE2Shape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.OLE2Shape"))),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_CHART,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.ChartShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.ChartShape"))),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_TABLE,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.TableShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.TableShape"))),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_NOTES,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.NotesShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.NotesShape"))),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_TITLE,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.TitleTextShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.TitleTextShape")),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_HANDOUT,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.HandoutShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.HandoutShape")),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_HEADER,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.HeaderShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.HeaderShape")),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_FOOTER,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.FooterShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.FooterShape")),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_DATETIME,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.DateTimeShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.DateTimeShape")),
CreateSdAccessibleShape ),
ShapeTypeDescriptor (
PRESENTATION_PAGENUMBER,
- ::rtl::OUString::createFromAscii ("com.sun.star.presentation.SlideNumberShape"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.SlideNumberShape")),
CreateSdAccessibleShape )
};
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index d91b936..11b1a5f 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -230,7 +230,7 @@ ImplStlEffectCategorySortHelper::ImplStlEffectCategorySortHelper()
uno::Reference<lang::XMultiServiceFactory> xFac( ::comphelper::getProcessServiceFactory() );
if( xFac.is() )
{
- mxCollator.set( xFac->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.i18n.Collator" ) ), uno::UNO_QUERY );
+ mxCollator.set( xFac->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Collator" )) ), uno::UNO_QUERY );
if( mxCollator.is() )
{
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 64e1046..f67755e 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -182,7 +182,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio
Time aTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.HundredthSeconds );
if(aTime.GetTime() != 0)
- sRet = sRet + rtl::OUString::createFromAscii(" ") + rLocalData.getTime( aTime,false );
+ sRet = sRet + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) + rLocalData.getTime( aTime,false );
}
return sRet;
}
commit b4348892ae95bcf7ab7fd1803d9388c5c07ae174
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Mon Nov 1 21:12:22 2010 +0000
Use RTL_CONSTASCII_USTRINGPARAM macro
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 2ee4567..836b334 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -314,7 +314,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In
{
// TODO/LATER: Optimize this, don't create a break iterator each time
Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() );
- Reference < i18n::XBreakIterator > xBI( xMSF->createInstance( OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ), UNO_QUERY );
+ Reference < i18n::XBreakIterator > xBI( xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" )) ), UNO_QUERY );
DBG_ASSERT( xBI.is(), "sd::CustomAnimationEffect::getNumberOfSubitems(), could not create a 'com.sun.star.i18n.BreakIterator'!" );
if( xBI.is() )
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 9f98367..bbbf4e6 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -275,7 +275,7 @@ Reference< XAnimationNode > implImportEffects( const Reference< XMultiServiceFac
// get parser
Reference< xml::sax::XParser > xParser(
xServiceFactory->createInstance(
- OUString::createFromAscii("com.sun.star.xml.sax.Parser") ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ),
UNO_QUERY );
DBG_ASSERT( xParser.is(), "Can't create parser" );
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index b58ce02..1a669da 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -955,7 +955,7 @@ void SdStyleSheet::notifyModifyListener()
OUString SAL_CALL SdStyleSheet::getImplementationName() throw(RuntimeException)
{
- return OUString::createFromAscii( "SdStyleSheet" );
+ return OUString( RTL_CONSTASCII_USTRINGPARAM( "SdStyleSheet" ) );
}
// --------------------------------------------------------------------
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index 3a303e1..c5bf485 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -95,7 +95,7 @@ sal_Bool SdCGMFilter::Import()
if( pLibrary && mxModel.is() )
{
- ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) ) );
+ ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ImportCGM" ) ) ) );
::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
UINT32 nRetValue;
@@ -139,7 +139,7 @@ sal_Bool SdCGMFilter::Export()
if( pLibrary && mxModel.is() )
{
- ExportCGM FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ExportCGM" ) ) );
+ ExportCGM FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ExportCGM" ) ) ) );
if( FncCGMExport )
{
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 0b42564..d1e1e1a 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -318,12 +318,12 @@ FontCollection::FontCollection() :
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
xMSF = ::comphelper::getProcessServiceFactory();
com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
- xInterface = xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) );
+ xInterface = xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" ) ) );
if ( xInterface.is() )
xPPTBreakIter = com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator >
( xInterface, com::sun::star::uno::UNO_QUERY );
- xInterface = xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.i18n.ScriptTypeDetector" ) );
+ xInterface = xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.ScriptTypeDetector" ) ) );
if ( xInterface.is() )
xScriptTypeDetector = com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector >
( xInterface, com::sun::star::uno::UNO_QUERY );
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index a381f2f..652fde2 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -1708,9 +1708,9 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X
rtl::OUString aAttributeName( xAnimate->getAttributeName() );
if ( nForceAttributeNames )
{
- switch( nForceAttributeNames )
+ if( nForceAttributeNames == 1 )
{
- case 1 : aAttributeName = rtl::OUString::createFromAscii( "r" ); break;
+ aAttributeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "r" ));
}
}
sal_Int32 nIndex = 0;
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index fecf13d..75ccea0 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -276,7 +276,7 @@ sal_Bool SdGRFFilter::Export()
uno::Reference< lang::XMultiServiceFactory >
xSMgr( ::comphelper::getProcessServiceFactory() );
uno::Reference< uno::XInterface > xComponent
- ( xSMgr->createInstance( rtl::OUString::createFromAscii( "com.sun.star.drawing.GraphicExportFilter" ) ),
+ ( xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicExportFilter" ) ) ),
uno::UNO_QUERY );
if ( xComponent.is() )
{
@@ -440,7 +440,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
switch( nGraphicType )
{
case ::com::sun::star::graphic::GraphicType::VECTOR:
- aMimeType = OUString::createFromAscii( "image/x-svm" );
+ aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/x-svm" ) );
break;
case ::com::sun::star::graphic::GraphicType::PIXEL:
@@ -450,14 +450,14 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
if( bAnimated )
{
- aMimeType = OUString::createFromAscii( "image/gif" );
+ aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/gif" ) );
break;
}
}
// Fallthrough!
// case ::com::sun::star::graphic::GraphicType::EMPTY:
default:
- aMimeType = OUString::createFromAscii( "image/png" );
+ aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/png" ) );
break;
}
}
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index cd53194..aed8306 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -103,7 +103,7 @@ bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvi
if( xInputStream.is() && xGraphicProvider.is() ) try
{
Sequence< PropertyValue > aMediaProperties( 1 );
- aMediaProperties[0].Name = ::rtl::OUString::createFromAscii( "InputStream" );
+ aMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" ) );
aMediaProperties[0].Value <<= xInputStream;
Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ) );
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index 0297006..45d3b2f 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -220,17 +220,17 @@ void Ppt97Animation::SetAnimateAssociatedShape( bool bAnimate )
if( !bAnimate )
{
//the appear effect cannot be animated without text
- if( this->GetPresetId().equals( ::rtl::OUString::createFromAscii("ooo-entrance-appear") ) )
+ if( this->GetPresetId().equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-appear")) ) )
return;
//the random effect may be the appear effect and than has the same problem
- if( this->GetPresetId().equals( ::rtl::OUString::createFromAscii("ooo-entrance-random") ) )
+ if( this->GetPresetId().equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random")) ) )
{
//this case is not 100% correct -> feel free to complete
//i consider this case as seldom and not that problematic and a simple correct fix is not in sight
DBG_WARNING("you tried to deselect the animation of the form for random animation-> this has been refused");
return;
}
-
+
}
if(bAnimate)
@@ -290,7 +290,7 @@ void Ppt97Animation::UpdateCacheData() const
return;
ClearCacheData();
-
+
if( !HasEffect() )
{
m_bDirtyCache = false;
@@ -300,26 +300,26 @@ void Ppt97Animation::UpdateCacheData() const
switch( m_aAtom.nFlyMethod )
{
case 0x0:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_APPEAR;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-appear"); // --- appear ---
+ //eRetval = ::com::sun::star::presentation::AnimationEffect_APPEAR;
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-appear")); // --- appear ---
break;
case 0x01:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_RANDOM;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random"); // --- random ---
+ //eRetval = ::com::sun::star::presentation::AnimationEffect_RANDOM;
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random")); // --- random ---
break;
case 0x02: // --- blinds effect ---
{
switch ( m_aAtom.nFlyDirection )
{
case 0x0:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_STRIPES;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-venetian-blinds");
- m_aSubType = ::rtl::OUString::createFromAscii("horizontal"); // horizontal
+ //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_STRIPES;
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-venetian-blinds"));
+ m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal")); // horizontal
break;
case 0x1:
//eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_STRIPES;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-venetian-blinds");
- m_aSubType = ::rtl::OUString::createFromAscii("vertical"); // vertical
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-venetian-blinds"));
+ m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical")); // vertical
break;
}
}
@@ -330,20 +330,20 @@ void Ppt97Animation::UpdateCacheData() const
{
case 0x0:
//eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_CHECKERBOARD;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-checkerboard");
- m_aSubType = ::rtl::OUString::createFromAscii("across"); // vertical ???
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-checkerboard"));
+ m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("across")); // vertical ???
break;
case 0x1:
//eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_CHECKERBOARD;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-checkerboard");
- m_aSubType = ::rtl::OUString::createFromAscii("downward"); // horizontal ???
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-checkerboard"));
+ m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("downward")); // horizontal ???
break;
}
}
break;
case 0x05:
//eRetval = ::com::sun::star::presentation::AnimationEffect_DISSOLVE; // --- dissolve ----
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-dissolve-in");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-dissolve-in"));
break;
case 0x08: // --- (hor/ver) lines ---
{
@@ -351,13 +351,13 @@ void Ppt97Animation::UpdateCacheData() const
{
case 0x0:
//eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_LINES;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random-bars");
- m_aSubType = ::rtl::OUString::createFromAscii("vertical"); // horizontal ???
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random-bars"));
+ m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical")); // horizontal ???
break;
case 0x1:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_LINES;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random-bars");
- m_aSubType = rtl::OUString::createFromAscii("horizontal"); // vertical ???
+ //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_LINES;
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random-bars"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal")); // vertical ???
break;
}
}
@@ -367,24 +367,24 @@ void Ppt97Animation::UpdateCacheData() const
switch ( m_aAtom.nFlyDirection )
{
case 0x4:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERRIGHT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares");
- m_aSubType = rtl::OUString::createFromAscii("left-to-top"); // to left top
+ //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERRIGHT;
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("left-to-top")); // to left top
break;
case 0x5:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERLEFT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares");
- m_aSubType = rtl::OUString::createFromAscii("right-to-top"); // to right top
+ //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERLEFT;
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("right-to-top")); // to right top
break;
case 0x6:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERRIGHT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares");
- m_aSubType = rtl::OUString::createFromAscii("left-to-bottom"); // to left bottom
+ //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERRIGHT;
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("left-to-bottom")); // to left bottom
break;
case 0x7:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERLEFT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares");
- m_aSubType = rtl::OUString::createFromAscii("right-to-bottom"); // to right bottom
+ //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERLEFT;
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("right-to-bottom")); // to right bottom
break;
}
}
@@ -394,24 +394,24 @@ void Ppt97Animation::UpdateCacheData() const
switch ( m_aAtom.nFlyDirection )
{
case 0x0:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_RIGHT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe");
- m_aSubType = rtl::OUString::createFromAscii("from-right"); // from right
+ //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_RIGHT;
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right")); // from right
break;
case 0x1:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_BOTTOM;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe");
- m_aSubType = rtl::OUString::createFromAscii("from-bottom"); // from bottom
+ //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_BOTTOM;
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom")); // from bottom
break;
case 0x2:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LEFT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe");
- m_aSubType = rtl::OUString::createFromAscii("from-left"); // from left
+ //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LEFT;
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left")); // from left
break;
case 0x3:
//eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_TOP;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe");
- m_aSubType = rtl::OUString::createFromAscii("from-top"); // from top
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top")); // from top
break;
}
}
@@ -422,13 +422,13 @@ void Ppt97Animation::UpdateCacheData() const
{
case 0x0:
//eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-box");
- m_aSubType = rtl::OUString::createFromAscii("out"); // from center
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-box"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out")); // from center
break;
case 0x1:
//eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-box");
- m_aSubType = rtl::OUString::createFromAscii("in"); // to center
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-box"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in")); // to center
break;
}
}
@@ -439,160 +439,160 @@ void Ppt97Animation::UpdateCacheData() const
{
case 0x0:
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LEFT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
- m_aSubType = rtl::OUString::createFromAscii("from-left");
-
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));
+
break;
case 0x1:
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_TOP;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
- m_aSubType = rtl::OUString::createFromAscii("from-top");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));
break;
case 0x2:
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_RIGHT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
- m_aSubType = rtl::OUString::createFromAscii("from-right");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));
break;
case 0x3:
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_BOTTOM;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
- m_aSubType = rtl::OUString::createFromAscii("from-bottom");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));
break;
case 0x4:
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_UPPERLEFT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
- m_aSubType = rtl::OUString::createFromAscii("from-top-left");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top-left"));
break;
case 0x5:
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_UPPERRIGHT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
- m_aSubType = rtl::OUString::createFromAscii("from-top-right");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top-right"));
break;
case 0x6:
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LOWERLEFT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
- m_aSubType = rtl::OUString::createFromAscii("from-bottom-left");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom-left"));
break;
case 0x7:
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LOWERRIGHT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
- m_aSubType = rtl::OUString::createFromAscii("from-bottom-right");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom-right"));
break;
case 0x8: // -- short text effects --
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_LEFT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in");
- m_aSubType = rtl::OUString::createFromAscii("from-left");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));
break;
case 0x9:
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_BOTTOM;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in");
- m_aSubType = rtl::OUString::createFromAscii("from-bottom");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));
break;
case 0xa:
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_RIGHT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in");
- m_aSubType = rtl::OUString::createFromAscii("from-right");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));
break;
case 0xb:
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_TOP;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in");
- m_aSubType = rtl::OUString::createFromAscii("from-top");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));
break;
case 0xc: // -- slow text effects --
{
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LEFT;
//rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in-slow");
- m_aSubType = rtl::OUString::createFromAscii("from-left");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));
}
break;
case 0xd:
{
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_TOP;
//rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in-slow");
- m_aSubType = rtl::OUString::createFromAscii("from-top");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));
}
break;
case 0xe:
{
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_RIGHT;
//rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in-slow");
- m_aSubType = rtl::OUString::createFromAscii("from-right");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));
}
break;
case 0xf:
{
//eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_BOTTOM;
//rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in-slow");
- m_aSubType = rtl::OUString::createFromAscii("from-bottom");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));
}
break;
case 0x10: // --- zoom ---
//eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom");
- m_aSubType = rtl::OUString::createFromAscii("in");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in"));
break;
case 0x11:
//eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom");
- m_aSubType = rtl::OUString::createFromAscii("in-slightly");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in-slightly"));
break;
case 0x12:
//eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom");
- m_aSubType = rtl::OUString::createFromAscii("out");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out"));
break;
case 0x13:
//eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom");
- m_aSubType = rtl::OUString::createFromAscii("out-slightly");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out-slightly"));
break;
case 0x14:
//eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom");
- m_aSubType = rtl::OUString::createFromAscii("in-from-screen-center");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in-from-screen-center"));
break;
case 0x15:
//eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom");
- m_aSubType = rtl::OUString::createFromAscii("out-from-screen-center");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out-from-screen-center"));
break;
case 0x16: // --- stretch ---
//eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_STRETCH;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy");
- m_aSubType = rtl::OUString::createFromAscii("across");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("across"));
break;
case 0x17:
//eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_LEFT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy");
- m_aSubType = rtl::OUString::createFromAscii("from-left");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));
break;
case 0x18:
//eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_TOP;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy");
- m_aSubType = rtl::OUString::createFromAscii("from-top");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));
break;
case 0x19:
//eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_RIGHT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy");
- m_aSubType = rtl::OUString::createFromAscii("from-right");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));
break;
case 0x1a:
//eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_BOTTOM;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy");
- m_aSubType = rtl::OUString::createFromAscii("from-bottom");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));
break;
case 0x1b: // --- rotate ---
//eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_ROTATE;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-swivel");
- m_aSubType = rtl::OUString::createFromAscii("vertical");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-swivel"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical"));
break;
case 0x1c: // --- spirale ---
//eRetval = ::com::sun::star::presentation::AnimationEffect_SPIRALOUT_LEFT;
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-spiral-in");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-spiral-in"));
break;
}
}
@@ -603,30 +603,30 @@ void Ppt97Animation::UpdateCacheData() const
{
case 0x0:
//eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_VERTICAL ; // ???
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split");
- m_aSubType = rtl::OUString::createFromAscii("horizontal-out"); //horizontal open
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal-out")); //horizontal open
break;
case 0x1:
//eRetval = ::com::sun::star::presentation::AnimationEffect_CLOSE_VERTICAL; // ???
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split");
- m_aSubType = rtl::OUString::createFromAscii("horizontal-in"); //horizontal close
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal-in")); //horizontal close
break;
case 0x2:
//eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_HORIZONTAL; // ???
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split");
- m_aSubType = rtl::OUString::createFromAscii("vertical-out"); // vertical open
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical-out")); // vertical open
break;
case 0x3:
//eRetval = ::com::sun::star::presentation::AnimationEffect_CLOSE_HORIZONTAL; // ???
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split");
- m_aSubType = rtl::OUString::createFromAscii("vertical-in"); // vertical close
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split"));
+ m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical-in")); // vertical close
break;
}
}
break;
case 0x0e: // --- blink ---
{
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-flash-once");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-flash-once"));
switch ( m_aAtom.nFlyDirection )
{
case 0x0: //fast
@@ -646,7 +646,7 @@ void Ppt97Animation::UpdateCacheData() const
break;
default:
{
- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-appear");
+ m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-appear"));
DBG_ERROR("no effect mapped");
}
break;
@@ -706,7 +706,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj )
// some effects need a different duration than that of the mapped preset effect
double fDurationInSeconds = 1.0;//in secunden
if( this->GetSpecialDuration( fDurationInSeconds ) )
- pEffect->setDuration( fDurationInSeconds );
+ pEffect->setDuration( fDurationInSeconds );
// set after effect
if( this->HasAfterEffect() )
@@ -724,11 +724,11 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj )
// text iteration
pEffect->setIterateType( this->GetTextAnimationType() );
-
+
// some effects need a different delay between text iteration than that of the mapped preset effect
double fTextIterationDelay = 1.0;
if( this->GetSpecialTextIterationDelay( fTextIterationDelay ) )
- pEffect->setIterateInterval( fTextIterationDelay );
+ pEffect->setIterateInterval( fTextIterationDelay );
// is the effect started on click or after the last effect (Another possible value is EffectNodeType::WITH_PREVIOUS )
pEffect->setNodeType( this->GetEffectNodeType() );
@@ -755,16 +755,16 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj )
double fDelaySeconds = this->GetDelayTimeInSeconds();
sal_Bool bAnimateAssociatedShape = this->HasAnimateAssociatedShape();//or only text
sal_Bool bTextReverse = this->HasReverseOrder();
-
+
// now create effects for each paragraph
- ::sd::CustomAnimationTextGroupPtr pGroup = pMainSequence->
+ ::sd::CustomAnimationTextGroupPtr pGroup = pMainSequence->
createTextGroup( pEffect, nParagraphLevel, fDelaySeconds, bAnimateAssociatedShape, bTextReverse );
-
+
if( pGroup )
{
const ::sd::EffectSequence& rEffects = pGroup->getEffects();
::sd::EffectSequence::const_iterator aIter = rEffects.begin();
-
+
::sd::CustomAnimationEffectPtr pLastEffect;
sal_Int32 nIndex = 0;
for( ; aIter != rEffects.end(); aIter++ )
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index b16f445..038c307 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -389,7 +389,7 @@ sal_Bool ImplSdPPTImport::Import()
Dictionary aDict;
if ( pSection->GetDictionary( aDict ) )
{
- UINT32 nPropId = aDict.GetProperty( rtl::OUString::createFromAscii("_PID_HLINKS" ));
+ UINT32 nPropId = aDict.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_PID_HLINKS" )));
if ( nPropId )
{
if ( pSection->GetProperty( nPropId, aPropItem ) )
@@ -773,7 +773,7 @@ sal_Bool ImplSdPPTImport::Import()
if ( SeekToAktPage( &aPageHd ) )
{
if ( mbTracing )
- mpTracer->AddAttribute( rtl::OUString::createFromAscii( "MasterPage" ), rtl::OUString::valueOf( (sal_Int32) (nAktPageNum + 1) ) );
+ mpTracer->AddAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MasterPage" )), rtl::OUString::valueOf( (sal_Int32) (nAktPageNum + 1) ) );
while( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPageHd.GetRecEndFilePos() ) )
{
@@ -851,7 +851,7 @@ sal_Bool ImplSdPPTImport::Import()
aHd.SeekToEndOfRecord( rStCtrl );
}
if ( mbTracing )
- mpTracer->RemoveAttribute( rtl::OUString::createFromAscii( "MasterPage" ) );
+ mpTracer->RemoveAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MasterPage" )) );
}
rStCtrl.Seek( nFPosMerk );
ImportPageEffect( (SdPage*)pMPage, bNewAnimationsUsed );
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 8e13691..7e4ed94 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -1446,7 +1446,7 @@ void AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference<
{
if( pChildAtom->hasChildAtom( DFF_msofbtAnimCommand ) )
{
- const OUString aServiceName( OUString::createFromAscii("com.sun.star.animations.Command") );
+ const OUString aServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.Command")) );
Reference< XAnimationNode > xChildNode( ::comphelper::getProcessServiceFactory()->createInstance(aServiceName), UNO_QUERY );
importAnimationNodeContainer( pChildAtom, xChildNode );
Reference< XTimeContainer > xParentContainer( xNode, UNO_QUERY );
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index a0ae7d2..3f59b9b 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -144,7 +144,7 @@ sal_Bool SdPPTFilter::Export()
if( mxModel.is() )
{
SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), FALSE );
- ExportPPT PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("ExportPPT") ));
+ ExportPPT PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ExportPPT")) ));
/* !!!
if ( pViewShell && pViewShell->GetView() )
@@ -190,7 +190,7 @@ void SdPPTFilter::PreSaveBasic()
::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() );
if( pLibrary )
{
- SaveVBA pSaveVBA= reinterpret_cast<SaveVBA>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("SaveVBA") ));
+ SaveVBA pSaveVBA= reinterpret_cast<SaveVBA>(pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SaveVBA")) ));
if( pSaveVBA )
{
pSaveVBA( (SfxObjectShell&) mrDocShell, pBas );
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index b18b090..b41ef05 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -232,7 +232,7 @@ sal_Int32 ReadThroughComponent(
// get parser
Reference< xml::sax::XParser > xParser(
rFactory->createInstance(
- OUString::createFromAscii("com.sun.star.xml.sax.Parser") ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ),
UNO_QUERY );
DBG_ASSERT( xParser.is(), "Can't create parser" );
if( !xParser.is() )
@@ -518,7 +518,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
};
uno::Reference< beans::XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
- xInfoSet->setPropertyValue( OUString::createFromAscii( "Preview" ), uno::makeAny( mrDocShell.GetDoc()->IsStarDrawPreviewMode() ) );
+ xInfoSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Preview" )), uno::makeAny( mrDocShell.GetDoc()->IsStarDrawPreviewMode() ) );
// ---- get BuildId from parent container if available
@@ -622,7 +622,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
aName = pDocHierarchItem->GetValue();
}
else
- aName = ::rtl::OUString::createFromAscii( "dummyObjectName" );
+ aName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "dummyObjectName" ));
if( aName.getLength() )
{
More information about the Libreoffice-commits
mailing list