[Libreoffice-commits] core.git: xmloff/inc xmloff/source
Chr. Rossmanith
ChrRossmanith at gmx.de
Sun Feb 24 12:06:52 PST 2013
xmloff/inc/xmloff/xmlexp.hxx | 6
xmloff/source/chart/SchXMLCalculationSettingsContext.cxx | 2
xmloff/source/chart/SchXMLLegendContext.cxx | 8
xmloff/source/chart/SchXMLSeriesHelper.cxx | 2
xmloff/source/chart/SchXMLTableContext.cxx | 10 -
xmloff/source/chart/XMLChartStyleContext.cxx | 4
xmloff/source/draw/XMLImageMapContext.cxx | 24 +-
xmloff/source/draw/XMLImageMapExport.cxx | 22 +-
xmloff/source/draw/XMLReplacementImageContext.cxx | 2
xmloff/source/draw/animationexport.cxx | 20 +-
xmloff/source/draw/animationimport.cxx | 22 +-
xmloff/source/draw/animexp.cxx | 28 +-
xmloff/source/draw/animimp.cxx | 26 +-
xmloff/source/draw/descriptionimp.cxx | 4
xmloff/source/draw/eventimp.cxx | 40 +---
xmloff/source/draw/layerexp.cxx | 6
xmloff/source/draw/layerimp.cxx | 6
xmloff/source/draw/propimp0.cxx | 4
xmloff/source/draw/sdpropls.cxx | 6
xmloff/source/draw/sdxmlexp.cxx | 150 +++++++--------
20 files changed, 193 insertions(+), 199 deletions(-)
New commits:
commit d5da6480561b3df99cb1df480b88fcd055bd10aa
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Sun Feb 24 21:02:16 2013 +0100
remove RTL_CONSTASCII_(U)STRINGPARAM in xmloff
Change-Id: I86163e68d0993dcaf6888060ace17f5dba812f1a
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx
index 7ec93bd..cf68b62 100644
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/xmloff/inc/xmloff/xmlexp.hxx
@@ -320,10 +320,8 @@ public:
@returns the actual prefix that the namespace is associated with
*/
- ::rtl::OUString
- EnsureNamespace(::rtl::OUString const & i_rNamespace,
- ::rtl::OUString const & i_rPreferredPrefix
- = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gen")) );
+ OUString EnsureNamespace(OUString const & i_rNamespace,
+ OUString const & i_rPreferredPrefix = OUString("gen") );
// Check if common attribute list is empty.
#ifndef DBG_UTIL
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
index 181c039..72fbcf4 100644
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
@@ -72,7 +72,7 @@ void SchXMLCalculationSettingsContext::EndElement()
if ( m_aNullDate.hasValue() )
{
Reference < XPropertySet > xPropSet ( GetImport().GetModel(), UNO_QUERY );
- ::rtl::OUString sNullDate( RTL_CONSTASCII_USTRINGPARAM ( "NullDate" ) );
+ OUString sNullDate( "NullDate" );
xPropSet->setPropertyValue ( sNullDate, m_aNullDate );
}
}
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx
index 1ce7cc3..3a86f43 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -102,7 +102,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
{
try
{
- xDocProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasLegend" )), uno::makeAny( sal_True ) );
+ xDocProp->setPropertyValue( OUString( "HasLegend" ), uno::makeAny( sal_True ) );
}
catch(const beans::UnknownPropertyException&)
{
@@ -148,7 +148,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
try
{
if( SchXMLEnumConverter::getLegendPositionConverter().importXML( aValue, aAny, GetImport().GetMM100UnitConverter() ) )
- xLegendProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Alignment" )), aAny );
+ xLegendProps->setPropertyValue( OUString( "Alignment" ), aAny );
}
catch(const beans::UnknownPropertyException&)
{
@@ -197,12 +197,12 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
xLegendShape->setPosition( aLegendPos );
if( bHasExpansion && nLegendExpansion!= chart::ChartLegendExpansion_CUSTOM )
- xLegendProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Expansion" )), uno::makeAny(nLegendExpansion) );
+ xLegendProps->setPropertyValue( OUString( "Expansion" ), uno::makeAny(nLegendExpansion) );
else if( bHasHeight && bHasWidth )
xLegendShape->setSize( aLegendSize );
// the fill style has the default "none" in XML, but "solid" in the model.
- xLegendProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" )), uno::makeAny( drawing::FillStyle_NONE ));
+ xLegendProps->setPropertyValue( OUString( "FillStyle" ), uno::makeAny( drawing::FillStyle_NONE ));
// set auto-styles for Legend
const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext();
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index cad1872..d11dddd 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -26,8 +26,6 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-// header for define RTL_CONSTASCII_USTRINGPARAM
-#include <rtl/ustring.h>
// header for define DBG_ERROR1
#include <tools/debug.hxx>
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 07065b6..d2a8043 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -860,8 +860,8 @@ void SchXMLTableHelper::applyTableToInternalDataProvider(
try
{
Reference< beans::XPropertySet > xProps( xChartDoc, uno::UNO_QUERY_THROW );
- xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ), uno::makeAny( sal_True ) );
- xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableComplexChartTypes" ) ), uno::makeAny( sal_True ) );
+ xProps->setPropertyValue( OUString( "DisableDataTableDialog" ), uno::makeAny( sal_True ) );
+ xProps->setPropertyValue( OUString( "DisableComplexChartTypes" ), uno::makeAny( sal_True ) );
}
catch ( uno::Exception& )
{
@@ -934,7 +934,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
Reference< beans::XPropertySet > xOldSequenceProp( aLSeqIt->second->getValues(), uno::UNO_QUERY );
Reference< chart2::data::XDataSequence > xNewSequence(
xDataProv->createDataSequenceByRangeRepresentation(
- OUString(RTL_CONSTASCII_USTRINGPARAM("categories"))));
+ OUString("categories")));
SchXMLTools::copyProperties(
xOldSequenceProp, Reference< beans::XPropertySet >( xNewSequence, uno::UNO_QUERY ));
aLSeqIt->second->setValues( xNewSequence );
@@ -974,7 +974,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
}
else if( ! lcl_tableOfRangeMatches( aRange, rTable.aTableNameOfFile ))
{
- OUString aRep( RTL_CONSTASCII_USTRINGPARAM("label "));
+ OUString aRep("label ");
aRep += OUString::valueOf( aLSeqIt->first.first );
Reference< chart2::data::XDataSequence > xNewSeq(
@@ -993,7 +993,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
if( ! bCategoriesApplied )
{
SchXMLTools::CreateCategories(
- xDataProv, xChartDoc, OUString(RTL_CONSTASCII_USTRINGPARAM("categories")),
+ xDataProv, xChartDoc, OUString("categories"),
0 /* nCooSysIndex */, 0 /* nDimension */ );
}
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index 97668ed..4af474b 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -110,8 +110,8 @@ void XMLChartStyleContext::FillPropertySet(
DBG_ASSERT( false, "unknown property exception -> shape style not completly imported for chart style" );
}
- lcl_NumberFormatStyleToProperty( msDataStyleName, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" )), mrStyles, rPropSet );
- lcl_NumberFormatStyleToProperty( msPercentageDataStyleName, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PercentageNumberFormat" )), mrStyles, rPropSet );
+ lcl_NumberFormatStyleToProperty( msDataStyleName, OUString( "NumberFormat" ), mrStyles, rPropSet );
+ lcl_NumberFormatStyleToProperty( msPercentageDataStyleName, OUString( "PercentageNumberFormat" ), mrStyles, rPropSet );
}
SvXMLImportContext *XMLChartStyleContext::CreateChildContext(
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index 2a9c0bb..5f63f6e 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -170,17 +170,17 @@ XMLImageMapObjectContext::XMLImageMapObjectContext(
Reference<XIndexContainer> xMap,
const sal_Char* pServiceName) :
SvXMLImportContext(rImport, nPrefix, rLocalName),
- sBoundary(RTL_CONSTASCII_USTRINGPARAM("Boundary")),
- sCenter(RTL_CONSTASCII_USTRINGPARAM("Center")),
- sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")),
- sDescription(RTL_CONSTASCII_USTRINGPARAM("Description")),
- sImageMap(RTL_CONSTASCII_USTRINGPARAM("ImageMap")),
- sIsActive(RTL_CONSTASCII_USTRINGPARAM("IsActive")),
- sName(RTL_CONSTASCII_USTRINGPARAM("Name")),
- sPolygon(RTL_CONSTASCII_USTRINGPARAM("Polygon")),
- sRadius(RTL_CONSTASCII_USTRINGPARAM("Radius")),
- sTarget(RTL_CONSTASCII_USTRINGPARAM("Target")),
- sURL(RTL_CONSTASCII_USTRINGPARAM("URL")),
+ sBoundary("Boundary"),
+ sCenter("Center"),
+ sTitle("Title"),
+ sDescription("Description"),
+ sImageMap("ImageMap"),
+ sIsActive("IsActive"),
+ sName("Name"),
+ sPolygon("Polygon"),
+ sRadius("Radius"),
+ sTarget("Target"),
+ sURL("URL"),
xImageMap(xMap),
bIsActive(sal_True),
bValid(sal_False)
@@ -643,7 +643,7 @@ XMLImageMapContext::XMLImageMapContext(
const OUString& rLocalName,
Reference<XPropertySet> & rPropertySet) :
SvXMLImportContext(rImport, nPrefix, rLocalName),
- sImageMap(RTL_CONSTASCII_USTRINGPARAM("ImageMap")),
+ sImageMap("ImageMap"),
xPropertySet(rPropertySet)
{
diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx
index b01a395..7f75765 100644
--- a/xmloff/source/draw/XMLImageMapExport.cxx
+++ b/xmloff/source/draw/XMLImageMapExport.cxx
@@ -62,17 +62,17 @@ const sal_Char sAPI_ImageMapCircleObject[] = "com.sun.star.image.ImageMapCircleO
const sal_Char sAPI_ImageMapPolygonObject[] = "com.sun.star.image.ImageMapPolygonObject";
XMLImageMapExport::XMLImageMapExport(SvXMLExport& rExp) :
- msBoundary(RTL_CONSTASCII_USTRINGPARAM("Boundary")),
- msCenter(RTL_CONSTASCII_USTRINGPARAM("Center")),
- msDescription(RTL_CONSTASCII_USTRINGPARAM("Description")),
- msImageMap(RTL_CONSTASCII_USTRINGPARAM("ImageMap")),
- msIsActive(RTL_CONSTASCII_USTRINGPARAM("IsActive")),
- msName(RTL_CONSTASCII_USTRINGPARAM("Name")),
- msPolygon(RTL_CONSTASCII_USTRINGPARAM("Polygon")),
- msRadius(RTL_CONSTASCII_USTRINGPARAM("Radius")),
- msTarget(RTL_CONSTASCII_USTRINGPARAM("Target")),
- msURL(RTL_CONSTASCII_USTRINGPARAM("URL")),
- msTitle(RTL_CONSTASCII_USTRINGPARAM("Title")),
+ msBoundary("Boundary"),
+ msCenter("Center"),
+ msDescription("Description"),
+ msImageMap("ImageMap"),
+ msIsActive("IsActive"),
+ msName("Name"),
+ msPolygon("Polygon"),
+ msRadius("Radius"),
+ msTarget("Target"),
+ msURL("URL"),
+ msTitle("Title"),
mrExport(rExp),
mbWhiteSpace(sal_True)
{
diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx
index 861c20c..a03e74c 100644
--- a/xmloff/source/draw/XMLReplacementImageContext.cxx
+++ b/xmloff/source/draw/XMLReplacementImageContext.cxx
@@ -41,7 +41,7 @@ XMLReplacementImageContext::XMLReplacementImageContext(
const Reference< XPropertySet > & rPropSet ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
m_xPropSet( rPropSet ),
- m_sGraphicURL(RTL_CONSTASCII_USTRINGPARAM("GraphicURL"))
+ m_sGraphicURL("GraphicURL")
{
UniReference < XMLTextImportHelper > xTxtImport =
GetImport().GetTextImport();
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 0c9ff30..8d6efb6 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -573,9 +573,9 @@ void AnimationsExporterImpl::exportTransitionNode()
if( mbHasTransition && mxPageProps.is() )
{
sal_Int16 nTransition = 0;
- mxPageProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TransitionType" ) ) ) >>= nTransition;
+ mxPageProps->getPropertyValue( OUString( "TransitionType" ) ) >>= nTransition;
- Any aSound( mxPageProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ) ) );
+ Any aSound( mxPageProps->getPropertyValue( OUString( "Sound" ) ) );
OUString sSoundURL;
aSound >>= sSoundURL;
sal_Bool bStopSound = sal_False;
@@ -603,10 +603,10 @@ void AnimationsExporterImpl::exportTransitionNode()
sal_Bool bDirection = sal_False;
sal_Int32 nFadeColor = 0;
double fDuration = 0.0;
- mxPageProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TransitionSubtype" ) ) ) >>= nSubtype;
- mxPageProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TransitionDirection" ) ) ) >>= bDirection;
- mxPageProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TransitionFadeColor" ) ) ) >>= nFadeColor;
- mxPageProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TransitionDuration" ) ) ) >>= fDuration;
+ mxPageProps->getPropertyValue( OUString( "TransitionSubtype" ) ) >>= nSubtype;
+ mxPageProps->getPropertyValue( OUString( "TransitionDirection" ) ) >>= bDirection;
+ mxPageProps->getPropertyValue( OUString( "TransitionFadeColor" ) ) >>= nFadeColor;
+ mxPageProps->getPropertyValue( OUString( "TransitionDuration" ) ) >>= fDuration;
::sax::Converter::convertDouble( sTmp, fDuration );
sTmp.append( sal_Unicode('s'));
@@ -642,7 +642,7 @@ void AnimationsExporterImpl::exportTransitionNode()
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, mrExport.GetRelativeReference( sSoundURL ) );
sal_Bool bLoopSound = sal_False;
- mxPageProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LoopSound" ) ) ) >>= bLoopSound;
+ mxPageProps->getPropertyValue( OUString( "LoopSound" ) ) >>= bLoopSound;
if( bLoopSound )
mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATCOUNT, XML_INDEFINITE );
@@ -657,14 +657,14 @@ void AnimationsExporterImpl::prepareTransitionNode()
if( mxPageProps.is() ) try
{
sal_Int16 nTransition = 0;
- mxPageProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TransitionType" ) ) ) >>= nTransition;
+ mxPageProps->getPropertyValue( OUString( "TransitionType" ) ) >>= nTransition;
sal_Bool bStopSound = sal_False;
OUString sSoundURL;
if( nTransition == 0 )
{
- Any aSound( mxPageProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ) ) );
+ Any aSound( mxPageProps->getPropertyValue( OUString( "Sound" ) ) );
aSound >>= sSoundURL;
if( !(aSound >>= bStopSound) )
@@ -1156,7 +1156,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
}
else
{
- OUString aStr( RTL_CONSTASCII_USTRINGPARAM( "invalid" ) );
+ OUString aStr( "invalid" );
mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ATTRIBUTENAME, aStr );
}
}
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 24a8565..0f237bb 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -133,7 +133,7 @@ AnimationsImportHelperImpl::AnimationsImportHelperImpl( SvXMLImport& rImport )
: mrImport( rImport ),
mpAnimationNodeTokenMap( NULL ),
mpAnimationNodeAttributeTokenMap( NULL ),
- mastrHSL( RTL_CONSTASCII_USTRINGPARAM( "hsl" ) )
+ mastrHSL( "hsl" )
{
}
@@ -1379,14 +1379,14 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const
Reference< XTransitionFilter > xTransFilter( xChildNode, UNO_QUERY_THROW );
- xPageProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TransitionType" ) ), Any( xTransFilter->getTransition() ) );
- xPageProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TransitionSubtype" ) ), Any( xTransFilter->getSubtype() ) );
- xPageProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TransitionDirection" ) ), Any( xTransFilter->getDirection() ) );
- xPageProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TransitionFadeColor" ) ), Any( xTransFilter->getFadeColor() ) );
+ xPageProps->setPropertyValue( OUString( "TransitionType" ), Any( xTransFilter->getTransition() ) );
+ xPageProps->setPropertyValue( OUString( "TransitionSubtype" ), Any( xTransFilter->getSubtype() ) );
+ xPageProps->setPropertyValue( OUString( "TransitionDirection" ), Any( xTransFilter->getDirection() ) );
+ xPageProps->setPropertyValue( OUString( "TransitionFadeColor" ), Any( xTransFilter->getFadeColor() ) );
double fDuration;
if( xTransFilter->getDuration() >>= fDuration )
- xPageProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TransitionDuration" ) ), Any( fDuration ) );
+ xPageProps->setPropertyValue( OUString( "TransitionDuration" ), Any( fDuration ) );
}
break;
@@ -1396,7 +1396,7 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const
Reference< XCommand > xCommand( xChildNode, UNO_QUERY_THROW );
if( xCommand->getCommand() == EffectCommands::STOPAUDIO )
{
- xPageProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ), Any(sal_True) );
+ xPageProps->setPropertyValue( OUString( "Sound" ), Any(sal_True) );
}
}
break;
@@ -1407,11 +1407,11 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const
OUString sSoundURL;
if( (xAudio->getSource() >>= sSoundURL) && !sSoundURL.isEmpty() )
{
- xPageProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ), Any(sSoundURL) );
+ xPageProps->setPropertyValue( OUString( "Sound" ), Any(sSoundURL) );
Timing eTiming;
if( (xAudio->getRepeatCount() >>= eTiming) && (eTiming == Timing_INDEFINITE) )
- xPageProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LoopSound" ) ), Any( sal_True ) );
+ xPageProps->setPropertyValue( OUString( "LoopSound" ), Any( sal_True ) );
}
}
break;
@@ -1435,14 +1435,14 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const
Sequence< OUString > SAL_CALL AnimationsImport_getSupportedServiceNames() throw()
{
- const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Xmloff.AnimationsImport" ) );
+ const OUString aServiceName( "com.sun.star.comp.Xmloff.AnimationsImport" );
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
OUString SAL_CALL AnimationsImport_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "xmloff::AnimationsImport" ) );
+ return OUString( "xmloff::AnimationsImport" );
}
Reference< XInterface > SAL_CALL AnimationsImport_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception )
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index f45b997..e14541f 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -243,18 +243,18 @@ public:
OUString msAnimPath;
AnimExpImpl()
- : msDimColor( RTL_CONSTASCII_USTRINGPARAM( "DimColor" ) ),
- msDimHide( RTL_CONSTASCII_USTRINGPARAM( "DimHide" ) ),
- msDimPrev( RTL_CONSTASCII_USTRINGPARAM( "DimPrevious" ) ),
- msEffect( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) ),
- msPlayFull( RTL_CONSTASCII_USTRINGPARAM( "PlayFull" ) ),
- msPresOrder( RTL_CONSTASCII_USTRINGPARAM( "PresentationOrder" ) ),
- msSound( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ),
- msSoundOn( RTL_CONSTASCII_USTRINGPARAM( "SoundOn" ) ),
- msSpeed( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ),
- msTextEffect( RTL_CONSTASCII_USTRINGPARAM( "TextEffect" ) ),
- msIsAnimation( RTL_CONSTASCII_USTRINGPARAM( "IsAnimation" ) ),
- msAnimPath( RTL_CONSTASCII_USTRINGPARAM( "AnimationPath" ) )
+ : msDimColor( "DimColor" ),
+ msDimHide( "DimHide" ),
+ msDimPrev( "DimPrevious" ),
+ msEffect( "Effect" ),
+ msPlayFull( "PlayFull" ),
+ msPresOrder( "PresentationOrder" ),
+ msSound( "Sound" ),
+ msSoundOn( "SoundOn" ),
+ msSpeed( "Speed" ),
+ msTextEffect( "TextEffect" ),
+ msIsAnimation( "IsAnimation" ),
+ msAnimPath( "AnimationPath" )
{}
};
@@ -277,7 +277,7 @@ void XMLAnimationsExporter::prepare( Reference< XShape > xShape, SvXMLExport& )
// check for presentation shape service
{
Reference< XServiceInfo > xServiceInfo( xShape, UNO_QUERY );
- if( !xServiceInfo.is() || !xServiceInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.Shape" ) ) ) )
+ if( !xServiceInfo.is() || !xServiceInfo->supportsService( OUString( "com.sun.star.presentation.Shape" ) ) )
return;
}
@@ -306,7 +306,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE
// check for presentation shape service
{
Reference< XServiceInfo > xServiceInfo( xShape, UNO_QUERY );
- if( !xServiceInfo.is() || !xServiceInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.Shape" ) ) ) )
+ if( !xServiceInfo.is() || !xServiceInfo->supportsService( OUString( "com.sun.star.presentation.Shape" ) ) )
return;
}
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index c663e17..5326943 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -342,19 +342,19 @@ public:
OUString msIsAnimation;
AnimImpImpl()
- : msDimColor( RTL_CONSTASCII_USTRINGPARAM( "DimColor" ) ),
- msDimHide( RTL_CONSTASCII_USTRINGPARAM( "DimHide" ) ),
- msDimPrev( RTL_CONSTASCII_USTRINGPARAM( "DimPrevious" ) ),
- msEffect( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) ),
- msPlayFull( RTL_CONSTASCII_USTRINGPARAM( "PlayFull" ) ),
- msPresOrder( RTL_CONSTASCII_USTRINGPARAM( "PresentationOrder" ) ),
- msSound( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ),
- msSoundOn( RTL_CONSTASCII_USTRINGPARAM( "SoundOn" ) ),
- msSpeed( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ),
- msTextEffect( RTL_CONSTASCII_USTRINGPARAM( "TextEffect" ) ),
- msPresShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.Shape" ) ),
- msAnimPath( RTL_CONSTASCII_USTRINGPARAM( "AnimationPath" ) ),
- msIsAnimation( RTL_CONSTASCII_USTRINGPARAM( "IsAnimation" ) )
+ : msDimColor( "DimColor" ),
+ msDimHide( "DimHide" ),
+ msDimPrev( "DimPrevious" ),
+ msEffect( "Effect" ),
+ msPlayFull( "PlayFull" ),
+ msPresOrder( "PresentationOrder" ),
+ msSound( "Sound" ),
+ msSoundOn( "SoundOn" ),
+ msSpeed( "Speed" ),
+ msTextEffect( "TextEffect" ),
+ msPresShapeService( "com.sun.star.presentation.Shape" ),
+ msAnimPath( "AnimationPath" ),
+ msIsAnimation( "IsAnimation" )
{}
};
diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx
index e72a349..63081f3 100644
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -61,11 +61,11 @@ void SdXMLDescriptionContext::EndElement()
uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY_THROW);
if(IsXMLToken(GetLocalName(),XML_TITLE))
{
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), Any(msText));
+ xPropSet->setPropertyValue(OUString("Title"), Any(msText));
}
else
{
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Description")), Any(msText));
+ xPropSet->setPropertyValue(OUString("Description"), Any(msText));
}
}
catch( uno::Exception& )
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index a6d5180..3cdd579 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -167,7 +167,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons
meEffect( EK_none ), meDirection( ED_none ), mnStartScale( 100 ),
meSpeed( AnimationSpeed_MEDIUM ), mnVerb(0), mbPlayFull( sal_False )
{
- static const OUString sXMLClickName( RTL_CONSTASCII_USTRINGPARAM( "click" ) );
+ static const OUString sXMLClickName( "click" );
if( nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_EVENT_LISTENER ) )
{
@@ -308,7 +308,7 @@ void SdXMLEventContext::EndElement()
OUString sAPIEventName;
uno::Sequence< beans::PropertyValue > aProperties;
- sAPIEventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) );
+ sAPIEventName = OUString( "OnClick" );
if( mbScript )
meClickAction = ClickAction_MACRO;
@@ -360,7 +360,7 @@ void SdXMLEventContext::EndElement()
msMacroName.copy(0,rApp.getLength()).equalsIgnoreAsciiCase( rApp ) &&
':' == msMacroName[rApp.getLength()] )
{
- sLibrary = OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice"));
+ sLibrary = "StarOffice";
msMacroName = msMacroName.copy( rApp.getLength()+1 );
}
else if( msMacroName.getLength() > rDoc.getLength()+1 &&
@@ -371,19 +371,19 @@ void SdXMLEventContext::EndElement()
msMacroName = msMacroName.copy( rDoc.getLength()+1 );
}
- pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) );
+ pProperties->Name = OUString( "EventType" );
pProperties->Handle = -1;
- pProperties->Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("StarBasic") );
+ pProperties->Value <<= OUString( "StarBasic" );
pProperties->State = beans::PropertyState_DIRECT_VALUE;
pProperties++;
- pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "MacroName" ) );
+ pProperties->Name = OUString( "MacroName" );
pProperties->Handle = -1;
pProperties->Value <<= msMacroName;
pProperties->State = beans::PropertyState_DIRECT_VALUE;
pProperties++;
- pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Library" ) );
+ pProperties->Name = OUString( "Library" );
pProperties->Handle = -1;
pProperties->Value <<= sLibrary;
pProperties->State = beans::PropertyState_DIRECT_VALUE;
@@ -391,15 +391,13 @@ void SdXMLEventContext::EndElement()
else
{
pProperties->Name =
- OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) );
+ OUString( "EventType" );
pProperties->Handle = -1;
- pProperties->Value <<= OUString(
- RTL_CONSTASCII_USTRINGPARAM("Script") );
+ pProperties->Value <<= OUString( "Script" );
pProperties->State = beans::PropertyState_DIRECT_VALUE;
pProperties++;
- pProperties->Name = OUString(
- RTL_CONSTASCII_USTRINGPARAM( "Script" ) );
+ pProperties->Name = OUString( "Script" );
pProperties->Handle = -1;
pProperties->Value <<= msMacroName;
pProperties->State = beans::PropertyState_DIRECT_VALUE;
@@ -407,9 +405,9 @@ void SdXMLEventContext::EndElement()
}
else
{
- pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) );
+ pProperties->Name = OUString( "EventType" );
pProperties->Handle = -1;
- pProperties->Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("Presentation") );
+ pProperties->Value <<= OUString( "Presentation" );
pProperties->State = beans::PropertyState_DIRECT_VALUE;
pProperties++;
@@ -421,7 +419,7 @@ void SdXMLEventContext::EndElement()
meClickAction = ClickAction_DOCUMENT;
}
- pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ClickAction") );
+ pProperties->Name = OUString( "ClickAction" );
pProperties->Handle = -1;
pProperties->Value <<= meClickAction;
pProperties->State = beans::PropertyState_DIRECT_VALUE;
@@ -445,20 +443,20 @@ void SdXMLEventContext::EndElement()
case ClickAction_DOCUMENT:
case ClickAction_PROGRAM:
- pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Bookmark") );
+ pProperties->Name = OUString( "Bookmark" );
pProperties->Handle = -1;
pProperties->Value <<= msBookmark;
pProperties->State = beans::PropertyState_DIRECT_VALUE;
break;
case ClickAction_VANISH:
- pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Effect") );
+ pProperties->Name = OUString( "Effect" );
pProperties->Handle = -1;
pProperties->Value <<= ImplSdXMLgetEffect( meEffect, meDirection, mnStartScale, sal_True );
pProperties->State = beans::PropertyState_DIRECT_VALUE;
pProperties++;
- pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Speed") );
+ pProperties->Name = OUString( "Speed" );
pProperties->Handle = -1;
pProperties->Value <<= meSpeed;
pProperties->State = beans::PropertyState_DIRECT_VALUE;
@@ -467,20 +465,20 @@ void SdXMLEventContext::EndElement()
// NOTE: no break here!!!
case ClickAction_SOUND:
- pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM("SoundURL") );
+ pProperties->Name = OUString( "SoundURL" );
pProperties->Handle = -1;
pProperties->Value <<= msSoundURL;
pProperties->State = beans::PropertyState_DIRECT_VALUE;
pProperties++;
- pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM("PlayFull") );
+ pProperties->Name = OUString( "PlayFull" );
pProperties->Handle = -1;
pProperties->Value = ::cppu::bool2any(mbPlayFull);
pProperties->State = beans::PropertyState_DIRECT_VALUE;
break;
case ClickAction_VERB:
- pProperties->Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Verb") );
+ pProperties->Name = OUString( "Verb" );
pProperties->Handle = -1;
pProperties->Value <<= mnVerb;
pProperties->State = beans::PropertyState_DIRECT_VALUE;
diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx
index 847f62f..e7b0de7 100644
--- a/xmloff/source/draw/layerexp.cxx
+++ b/xmloff/source/draw/layerexp.cxx
@@ -55,9 +55,9 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport )
if( nCount == 0 )
return;
- const OUString strName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) );
- const OUString strTitle( RTL_CONSTASCII_USTRINGPARAM( "Title" ) );
- const OUString strDescription( RTL_CONSTASCII_USTRINGPARAM( "Description" ) );
+ const OUString strName( "Name" );
+ const OUString strTitle( "Title" );
+ const OUString strDescription( "Description" );
OUString sTmp;
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index 00bc05a..8404552 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -127,13 +127,13 @@ void SdXMLLayerContext::EndElement()
DBG_ASSERT( xLayer.is(), "xmloff::SdXMLLayerContext::EndElement(), failed to create new XLayer!" );
if( xLayer.is() )
- xLayer->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), Any( msName ) );
+ xLayer->setPropertyValue( OUString( "Name" ), Any( msName ) );
}
if( xLayer.is() )
{
- xLayer->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ), Any( sTitleBuffer.makeStringAndClear() ) );
- xLayer->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Description") ), Any( sDescriptionBuffer.makeStringAndClear() ) );
+ xLayer->setPropertyValue( OUString( "Title" ), Any( sTitleBuffer.makeStringAndClear() ) );
+ xLayer->setPropertyValue( OUString( "Description" ), Any( sDescriptionBuffer.makeStringAndClear() ) );
}
}
catch( Exception& )
diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx
index 959c42e..75d8b93 100644
--- a/xmloff/source/draw/propimp0.cxx
+++ b/xmloff/source/draw/propimp0.cxx
@@ -181,7 +181,7 @@ sal_Bool XMLTextAnimationStepPropertyHdl::importXML(
sal_Bool bRet = sal_False;
sal_Int32 nValue = 0;
- const OUString aPX( RTL_CONSTASCII_USTRINGPARAM( "px" ) );
+ const OUString aPX( "px" );
sal_Int32 nPos = rStrImpValue.indexOf( aPX );
if( nPos != -1 )
{
@@ -217,7 +217,7 @@ sal_Bool XMLTextAnimationStepPropertyHdl::exportXML(
if( nVal < 0 )
{
- const OUString aPX( RTL_CONSTASCII_USTRINGPARAM( "px" ) );
+ const OUString aPX( "px" );
::sax::Converter::convertNumber( aOut, (sal_Int32)-nVal );
aOut.append( aPX );
}
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 1ca236b..1bf5b27 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -809,7 +809,7 @@ sal_Bool XMLMoveSizeProtectHdl::exportXML( OUString& rStrExpValue, const Any& rV
if( bValue )
{
if( !rStrExpValue.isEmpty() )
- rStrExpValue += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) );
+ rStrExpValue += " ";
rStrExpValue += GetXMLToken( mnType == XML_SD_TYPE_MOVE_PROTECT ? XML_POSITION : XML_SIZE );
}
@@ -1013,7 +1013,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
uno::Reference<ucb::XAnyCompareFactory> xCompareFac( mxModel, uno::UNO_QUERY );
uno::Reference<ucb::XAnyCompare> xCompare;
if( xCompareFac.is() )
- xCompare = xCompareFac->createAnyCompareByName( OUString( RTL_CONSTASCII_USTRINGPARAM( "NumberingRules" ) ) );
+ xCompare = xCompareFac->createAnyCompareByName( OUString( "NumberingRules" ) );
pHdl = new XMLNumRulePropHdl( xCompare );
break;
@@ -1405,7 +1405,7 @@ void XMLShapeExportPropertyMapper::ContextFilter(
{
try
{
- const OUString sVisibleArea( RTL_CONSTASCII_USTRINGPARAM("VisibleArea") );
+ const OUString sVisibleArea( "VisibleArea" );
awt::Rectangle aRect;
if( rPropSet->getPropertyValue( sVisibleArea ) >>= aRect )
{
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 441dbf0..ca33ff0 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -140,33 +140,33 @@ ImpXMLEXPPageMasterInfo::ImpXMLEXPPageMasterInfo(
Any aAny;
Reference< beans::XPropertySetInfo > xPropsInfo( xPropSet->getPropertySetInfo() );
- if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("BorderBottom") )))
+ if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString("BorderBottom" )))
{
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("BorderBottom")));
+ aAny = xPropSet->getPropertyValue(OUString("BorderBottom"));
aAny >>= mnBorderBottom;
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("BorderLeft")));
+ aAny = xPropSet->getPropertyValue(OUString("BorderLeft"));
aAny >>= mnBorderLeft;
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("BorderRight")));
+ aAny = xPropSet->getPropertyValue(OUString("BorderRight"));
aAny >>= mnBorderRight;
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("BorderTop")));
+ aAny = xPropSet->getPropertyValue(OUString("BorderTop"));
aAny >>= mnBorderTop;
}
- if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("Width") )))
+ if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString("Width")))
{
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Width")));
+ aAny = xPropSet->getPropertyValue(OUString("Width"));
aAny >>= mnWidth;
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Height")));
+ aAny = xPropSet->getPropertyValue(OUString("Height"));
aAny >>= mnHeight;
}
- if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("Orientation") )))
+ if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString("Orientation")))
{
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Orientation")));
+ aAny = xPropSet->getPropertyValue(OUString("Orientation"));
aAny >>= meOrientation;
}
}
@@ -417,11 +417,11 @@ SdXMLExport::SdXMLExport(
mbFamilyGraphicUsed(sal_False),
mbFamilyPresentationUsed(sal_False),
msZIndex( GetXMLToken(XML_ZINDEX) ),
- msEmptyPres( RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ),
- msModel( RTL_CONSTASCII_USTRINGPARAM("Model") ),
- msStartShape( RTL_CONSTASCII_USTRINGPARAM("StartShape") ),
- msEndShape( RTL_CONSTASCII_USTRINGPARAM("EndShape") ),
- msPageLayoutNames( RTL_CONSTASCII_USTRINGPARAM("PageLayoutNames") )
+ msEmptyPres( "IsEmptyPresentationObject" ),
+ msModel( "Model" ),
+ msStartShape( "StartShape" ),
+ msEndShape( "EndShape" ),
+ msPageLayoutNames( "PageLayoutNames" )
{
@@ -469,19 +469,19 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
// add family name
GetAutoStylePool()->AddFamily(
XML_STYLE_FAMILY_SD_GRAPHICS_ID,
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)),
+ OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME),
GetPropertySetMapper(),
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX)));
+ OUString(XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX));
GetAutoStylePool()->AddFamily(
XML_STYLE_FAMILY_SD_PRESENTATION_ID,
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_PRESENTATION_NAME)),
+ OUString(XML_STYLE_FAMILY_SD_PRESENTATION_NAME),
GetPropertySetMapper(),
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_PRESENTATION_PREFIX)));
+ OUString(XML_STYLE_FAMILY_SD_PRESENTATION_PREFIX));
GetAutoStylePool()->AddFamily(
XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID,
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_DRAWINGPAGE_NAME)),
+ OUString(XML_STYLE_FAMILY_SD_DRAWINGPAGE_NAME),
GetPresPagePropsMapper(),
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_DRAWINGPAGE_PREFIX)));
+ OUString(XML_STYLE_FAMILY_SD_DRAWINGPAGE_PREFIX));
// prepare access to styles
Reference< style::XStyleFamiliesSupplier > xFamSup( GetModel(), UNO_QUERY );
if(xFamSup.is())
@@ -776,7 +776,7 @@ sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, O
sal_uInt16 nType = sal_uInt16();
Any aAny;
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Layout")));
+ aAny = xPropSet->getPropertyValue(OUString("Layout"));
if(aAny >>= nType)
{
if(ImpXMLAutoLayoutInfo::IsCreateNecessary(nType))
@@ -816,9 +816,9 @@ sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, O
if(!bDidExist)
{
mpAutoLayoutInfoList->push_back( pNew );
- OUString sNewName = OUString(RTL_CONSTASCII_USTRINGPARAM("AL"));
+ OUString sNewName = "AL";
sNewName += OUString::valueOf(sal_Int32( mpAutoLayoutInfoList->size() - 1 ));
- sNewName += OUString(RTL_CONSTASCII_USTRINGPARAM("T"));
+ sNewName += "T";
sNewName += OUString::valueOf(sal_Int32(nType));
pNew->SetLayoutName(sNewName);
}
@@ -1230,20 +1230,20 @@ void SdXMLExport::ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectan
// prepare presentation-placeholder attributes, presentation:object
switch(ePl)
{
- case XmlPlaceholderTitle: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("title")); break;
- case XmlPlaceholderOutline: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("outline")); break;
- case XmlPlaceholderSubtitle: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("subtitle")); break;
- case XmlPlaceholderText: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("text")); break;
- case XmlPlaceholderGraphic: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("graphic")); break;
- case XmlPlaceholderObject: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("object")); break;
- case XmlPlaceholderChart: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("chart")); break;
- case XmlPlaceholderOrgchart: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("orgchart")); break;
- case XmlPlaceholderTable: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("table")); break;
- case XmlPlaceholderPage: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("page")); break;
- case XmlPlaceholderNotes: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("notes")); break;
- case XmlPlaceholderHandout: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("handout")); break;
- case XmlPlaceholderVerticalTitle: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("vertical_title")); break;
- case XmlPlaceholderVerticalOutline: aStr = OUString(RTL_CONSTASCII_USTRINGPARAM("vertical_outline")); break;
+ case XmlPlaceholderTitle: aStr = "title"; break;
+ case XmlPlaceholderOutline: aStr = "outline"; break;
+ case XmlPlaceholderSubtitle: aStr = "subtitle"; break;
+ case XmlPlaceholderText: aStr = "text"; break;
+ case XmlPlaceholderGraphic: aStr = "graphic"; break;
+ case XmlPlaceholderObject: aStr = "object"; break;
+ case XmlPlaceholderChart: aStr = "chart"; break;
+ case XmlPlaceholderOrgchart: aStr = "orgchart"; break;
+ case XmlPlaceholderTable: aStr = "table"; break;
+ case XmlPlaceholderPage: aStr = "page"; break;
+ case XmlPlaceholderNotes: aStr = "notes"; break;
+ case XmlPlaceholderHandout: aStr = "handout"; break;
+ case XmlPlaceholderVerticalTitle: aStr = "vertical_title"; break;
+ case XmlPlaceholderVerticalOutline: aStr = "vertical_outline"; break;
}
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_OBJECT, aStr);
@@ -1357,7 +1357,7 @@ void SdXMLExport::ImpWritePageMasterInfos()
if(pInfo)
{
// create name
- OUString sNewName = OUString(RTL_CONSTASCII_USTRINGPARAM("PM"));
+ OUString sNewName("PM");
sNewName += OUString::valueOf((sal_Int32)nCnt);
pInfo->SetName(sNewName);
@@ -1532,7 +1532,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons
OUString aStrText;
- const OUString aStrHeaderTextProp( RTL_CONSTASCII_USTRINGPARAM( "HeaderText" ) );
+ const OUString aStrHeaderTextProp( "HeaderText" );
if( xInfo->hasPropertyByName( aStrHeaderTextProp ) )
{
xSet->getPropertyValue( aStrHeaderTextProp ) >>= aStrText;
@@ -1540,7 +1540,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons
aSettings.maStrHeaderDeclName = findOrAppendImpl( maHeaderDeclsVector, aStrText, gpStrHeaderTextPrefix );
}
- const OUString aStrFooterTextProp( RTL_CONSTASCII_USTRINGPARAM( "FooterText" ) );
+ const OUString aStrFooterTextProp( "FooterText" );
if( xInfo->hasPropertyByName( aStrFooterTextProp ) )
{
xSet->getPropertyValue( aStrFooterTextProp ) >>= aStrText;
@@ -1548,14 +1548,14 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons
aSettings.maStrFooterDeclName = findOrAppendImpl( maFooterDeclsVector, aStrText, gpStrFooterTextPrefix );
}
- const OUString aStrDateTimeTextProp( RTL_CONSTASCII_USTRINGPARAM( "DateTimeText" ) );
+ const OUString aStrDateTimeTextProp( "DateTimeText" );
if( xInfo->hasPropertyByName( aStrDateTimeTextProp ) )
{
sal_Bool bFixed = false;
sal_Int32 nFormat = 0;
xSet->getPropertyValue( aStrDateTimeTextProp ) >>= aStrText;
- xSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDateTimeFixed" ) ) ) >>= bFixed;
- xSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DateTimeFormat" ) ) ) >>= nFormat;
+ xSet->getPropertyValue( OUString( "IsDateTimeFixed" ) ) >>= bFixed;
+ xSet->getPropertyValue( OUString( "DateTimeFormat" ) ) >>= nFormat;
if( !bFixed || !aStrText.isEmpty() )
{
@@ -1671,7 +1671,7 @@ OUString SdXMLExport::ImpCreatePresPageStyleName( Reference<XDrawPage> xDrawPage
// which itself is a property of the pages property set
// we now merge these two propertysets if possible to simulate
// a single propertyset with all draw page properties
- const OUString aBackground(RTL_CONSTASCII_USTRINGPARAM("Background"));
+ const OUString aBackground("Background");
Reference< beans::XPropertySet > xPropSet2;
Reference< beans::XPropertySetInfo > xInfo( xPropSet1->getPropertySetInfo() );
if( xInfo.is() && xInfo->hasPropertyByName( aBackground ) )
@@ -1762,9 +1762,9 @@ void SdXMLExport::ImpWritePresentationStyles()
OUString aPrefix( xNamed->getName() );
- aPrefix += OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
+ aPrefix += "-";
aStEx.exportStyleFamily(xNamed->getName(),
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_PRESENTATION_NAME)),
+ OUString(XML_STYLE_FAMILY_SD_PRESENTATION_NAME),
aMapperRef, sal_False,
XML_STYLE_FAMILY_SD_PRESENTATION_ID, &aPrefix);
}
@@ -1788,7 +1788,7 @@ void SdXMLExport::SetProgress(sal_Int32 nProg)
void SdXMLExport::_ExportMeta()
{
uno::Sequence<beans::NamedValue> stats(1);
- stats[0] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ObjectCount" )),
+ stats[0] = beans::NamedValue(OUString( "ObjectCount" ),
uno::makeAny(mnObjectCount));
// update document statistics at the model
@@ -1858,7 +1858,7 @@ void SdXMLExport::_ExportContent()
try
{
OUString aBookmarkURL;
- xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "BookmarkURL" ) ) ) >>= aBookmarkURL;
+ xProps->getPropertyValue( OUString( "BookmarkURL" ) ) >>= aBookmarkURL;
if( !aBookmarkURL.isEmpty() )
{
@@ -2010,11 +2010,11 @@ void SdXMLExport::exportPresentationSettings()
sal_Bool bTemp = false;
// export range
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsShowAll" ) ) ) >>= bTemp;
+ xPresProps->getPropertyValue( OUString( "IsShowAll" ) ) >>= bTemp;
if( !bTemp )
{
OUString aFirstPage;
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstPage" ) ) ) >>= aFirstPage;
+ xPresProps->getPropertyValue( OUString( "FirstPage" ) ) >>= aFirstPage;
if( !aFirstPage.isEmpty() )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_START_PAGE, aFirstPage );
@@ -2023,7 +2023,7 @@ void SdXMLExport::exportPresentationSettings()
else
{
OUString aCustomShow;
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "CustomShow" ) ) ) >>= aCustomShow;
+ xPresProps->getPropertyValue( OUString( "CustomShow" ) ) >>= aCustomShow;
if( !aCustomShow.isEmpty() )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_SHOW, aCustomShow );
@@ -2032,14 +2032,14 @@ void SdXMLExport::exportPresentationSettings()
}
}
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ) ) >>= bTemp;
+ xPresProps->getPropertyValue( OUString( "IsEndless" ) ) >>= bTemp;
if( bTemp )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_ENDLESS, XML_TRUE );
bHasAttr = sal_True;
sal_Int32 nPause = 0;
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Pause" ) ) ) >>= nPause;
+ xPresProps->getPropertyValue( OUString( "Pause" ) ) >>= nPause;
util::Duration aDuration;
aDuration.Seconds = static_cast<sal_uInt16>(nPause);
@@ -2049,63 +2049,63 @@ void SdXMLExport::exportPresentationSettings()
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PAUSE, aOut.makeStringAndClear() );
}
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AllowAnimations" ) ) ) >>= bTemp;
+ xPresProps->getPropertyValue( OUString( "AllowAnimations" ) ) >>= bTemp;
if( !bTemp )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_ANIMATIONS, XML_DISABLED );
bHasAttr = sal_True;
}
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAlwaysOnTop" ) ) ) >>= bTemp;
+ xPresProps->getPropertyValue( OUString( "IsAlwaysOnTop" ) ) >>= bTemp;
if( bTemp )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_STAY_ON_TOP, XML_TRUE );
bHasAttr = sal_True;
}
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAutomatic" ) ) ) >>= bTemp;
+ xPresProps->getPropertyValue( OUString( "IsAutomatic" ) ) >>= bTemp;
if( bTemp )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_FORCE_MANUAL, XML_TRUE );
bHasAttr = sal_True;
}
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFullScreen" ) ) ) >>= bTemp;
+ xPresProps->getPropertyValue( OUString( "IsFullScreen" ) ) >>= bTemp;
if( !bTemp )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_FULL_SCREEN, XML_FALSE );
bHasAttr = sal_True;
}
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsMouseVisible" ) ) ) >>= bTemp;
+ xPresProps->getPropertyValue( OUString( "IsMouseVisible" ) ) >>= bTemp;
if( !bTemp )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_MOUSE_VISIBLE, XML_FALSE );
bHasAttr = sal_True;
}
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "StartWithNavigator" ) ) ) >>= bTemp;
+ xPresProps->getPropertyValue( OUString( "StartWithNavigator" ) ) >>= bTemp;
if( bTemp )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_START_WITH_NAVIGATOR, XML_TRUE );
bHasAttr = sal_True;
}
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "UsePen" ) ) ) >>= bTemp;
+ xPresProps->getPropertyValue( OUString( "UsePen" ) ) >>= bTemp;
if( bTemp )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_MOUSE_AS_PEN, XML_TRUE );
bHasAttr = sal_True;
}
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsTransitionOnClick" ) ) ) >>= bTemp;
+ xPresProps->getPropertyValue( OUString( "IsTransitionOnClick" ) ) >>= bTemp;
if( !bTemp )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_TRANSITION_ON_CLICK, XML_DISABLED );
bHasAttr = sal_True;
}
- xPresProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsShowLogo" ) ) ) >>= bTemp;
+ xPresProps->getPropertyValue( OUString( "IsShowLogo" ) ) >>= bTemp;
if( bTemp )
{
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_SHOW_LOGO, XML_TRUE );
@@ -2298,7 +2298,7 @@ void SdXMLExport::_ExportAutoStyles()
}
if(!aMasterPageNamePrefix.isEmpty())
{
- aMasterPageNamePrefix += OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
+ aMasterPageNamePrefix += "-";
}
GetShapeExport()->setPresentationStylePrefix( aMasterPageNamePrefix );
@@ -2363,7 +2363,7 @@ void SdXMLExport::_ExportAutoStyles()
}
if(!aMasterPageNamePrefix.isEmpty())
{
- aMasterPageNamePrefix += OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
+ aMasterPageNamePrefix += "-";
}
GetShapeExport()->setPresentationStylePrefix( aMasterPageNamePrefix );
@@ -2570,16 +2570,16 @@ void SdXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps)
return;
awt::Rectangle aVisArea;
- xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ) ) >>= aVisArea;
+ xPropSet->getPropertyValue( OUString( "VisibleArea" ) ) >>= aVisArea;
sal_uInt16 i = 0;
- pProps[i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaTop"));
+ pProps[i].Name = OUString("VisibleAreaTop");
pProps[i++].Value <<= aVisArea.Y;
- pProps[i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaLeft"));
+ pProps[i].Name = OUString("VisibleAreaLeft");
pProps[i++].Value <<= aVisArea.X;
- pProps[i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaWidth"));
+ pProps[i].Name = OUString("VisibleAreaWidth");
pProps[i++].Value <<= aVisArea.Width;
- pProps[i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaHeight"));
+ pProps[i].Name = OUString("VisibleAreaHeight");
pProps[i++].Value <<= aVisArea.Height;
}
}
@@ -2589,7 +2589,7 @@ void SdXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>&
Reference< lang::XMultiServiceFactory > xFac( GetModel(), UNO_QUERY );
if( xFac.is() )
{
- Reference< beans::XPropertySet > xProps( xFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.Settings" ) ) ), UNO_QUERY );
+ Reference< beans::XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), UNO_QUERY );
if( xProps.is() )
SvXMLUnitConverter::convertPropertySet( rProps, xProps );
DocumentSettingsSerializer *pFilter;
@@ -2665,7 +2665,7 @@ OUString SdXMLExport::getNavigationOrder( const Reference< XDrawPage >& xDrawPag
try
{
Reference< XPropertySet > xSet( xDrawPage, UNO_QUERY_THROW );
- Reference< XIndexAccess > xNavOrder( xSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ) ), UNO_QUERY_THROW );
+ Reference< XIndexAccess > xNavOrder( xSet->getPropertyValue( OUString( "NavigationOrder" ) ), UNO_QUERY_THROW );
Reference< XIndexAccess > xZOrderAccess( xDrawPage, UNO_QUERY );
@@ -2793,13 +2793,13 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage )
#define SERVICE( classname, servicename, implementationname, draw, flags )\
uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw()\
{\
- const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( servicename ) );\
+ const OUString aServiceName( servicename );\
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );\
return aSeq;\
}\
OUString SAL_CALL classname##_getImplementationName() throw()\
{\
- return OUString( RTL_CONSTASCII_USTRINGPARAM( implementationname ) );\
+ return OUString( implementationname );\
}\
uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )\
{\
@@ -2907,7 +2907,7 @@ XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool()
Reference< lang::XMultiServiceFactory > xFac( GetModel(), UNO_QUERY );
if( xFac.is() )
{
- Reference< beans::XPropertySet > xProps( xFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.Settings" ) ) ), UNO_QUERY );
+ Reference< beans::XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), UNO_QUERY );
if( xProps.is() )
xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts;
}
More information about the Libreoffice-commits
mailing list