[Libreoffice-commits] core.git: xmloff/source
Chr. Rossmanith
ChrRossmanith at gmx.de
Mon Feb 25 14:27:49 PST 2013
xmloff/source/draw/sdxmlimp.cxx | 2 -
xmloff/source/draw/shapeexport2.cxx | 4 +-
xmloff/source/draw/shapeexport3.cxx | 36 +++++++++----------
xmloff/source/draw/shapeimport.cxx | 22 ++++++------
xmloff/source/draw/ximp3dobject.cxx | 13 +++----
xmloff/source/draw/ximp3dscene.cxx | 66 ++++++++++++++++++------------------
xmloff/source/draw/ximpbody.cxx | 2 -
xmloff/source/draw/ximppage.cxx | 39 ++++++++-------------
xmloff/source/draw/ximpshap.cxx | 8 ++--
xmloff/source/draw/ximpshow.cxx | 28 +++++++--------
10 files changed, 106 insertions(+), 114 deletions(-)
New commits:
commit 1d6376b7586da3f04b3e38347f405537d1e5210c
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Mon Feb 25 23:25:04 2013 +0100
removed RTL_CONSTASCII_(U)STRINGPARAM
Change-Id: I2d2a695b56e99e9df7835a5e4e8844be19c421eb
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 3c86883..741a685 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -1073,7 +1073,7 @@ void SdXMLImport::NotifyEmbeddedFontRead()
uno::Reference< lang::XMultiServiceFactory > xFac( GetModel(), uno::UNO_QUERY );
if( xFac.is() )
{
- uno::Reference< beans::XPropertySet > xProps( xFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.Settings" ) ) ), uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), uno::UNO_QUERY );
if( xProps.is() )
xProps->setPropertyValue("EmbedFonts", uno::makeAny( true ) );
}
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index ed791e5..f3b11f5 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -1114,10 +1114,10 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
if( !bIsEmptyPresObj )
{
OUString aReplacementUrl;
- xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("ReplacementGraphicURL"))) >>= aReplacementUrl;
+ xPropSet->getPropertyValue( OUString("ReplacementGraphicURL")) >>= aReplacementUrl;
// If there is no url, then then graphic is empty
- if(aReplacementUrl.getLength())
+ if(!aReplacementUrl.isEmpty())
{
const OUString aStr = mrExport.AddEmbeddedGraphicObject(aReplacementUrl);
diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx
index c0a8b69..9b5df35 100644
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -106,7 +106,7 @@ void XMLShapeExport::ImpExport3DShape(
OUStringBuffer sStringBuffer;
// transformation (UNO_NAME_3D_TRANSFORM_MATRIX == "D3DTransformMatrix")
- uno::Any aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DTransformMatrix")));
+ uno::Any aAny = xPropSet->getPropertyValue(OUString("D3DTransformMatrix"));
drawing::HomogenMatrix xHomMat;
aAny >>= xHomMat;
SdXMLImExTransform3D aTransform;
@@ -122,13 +122,13 @@ void XMLShapeExport::ImpExport3DShape(
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_CUBE, sal_True, sal_True);
// minEdge
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DPosition")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DPosition"));
drawing::Position3D aPosition3D;
aAny >>= aPosition3D;
::basegfx::B3DVector aPos3D(aPosition3D.PositionX, aPosition3D.PositionY, aPosition3D.PositionZ);
// maxEdge
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSize")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DSize"));
drawing::Direction3D aDirection3D;
aAny >>= aDirection3D;
::basegfx::B3DVector aDir3D(aDirection3D.DirectionX, aDirection3D.DirectionY, aDirection3D.DirectionZ);
@@ -160,13 +160,13 @@ void XMLShapeExport::ImpExport3DShape(
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_SPHERE, sal_True, sal_True);
// Center
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DPosition")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DPosition"));
drawing::Position3D aPosition3D;
aAny >>= aPosition3D;
::basegfx::B3DVector aPos3D(aPosition3D.PositionX, aPosition3D.PositionY, aPosition3D.PositionZ);
// Size
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSize")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DSize"));
drawing::Direction3D aDirection3D;
aAny >>= aDirection3D;
::basegfx::B3DVector aDir3D(aDirection3D.DirectionX, aDirection3D.DirectionY, aDirection3D.DirectionZ);
@@ -193,7 +193,7 @@ void XMLShapeExport::ImpExport3DShape(
case XmlShapeTypeDraw3DExtrudeObject:
{
// write special 3DLathe/3DExtrude attributes
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DPolyPolygon3D")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DPolyPolygon3D"));
drawing::PolyPolygonShape3D xPolyPolygon3D;
aAny >>= xPolyPolygon3D;
@@ -318,7 +318,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen
OUStringBuffer sStringBuffer;
// world transformation (UNO_NAME_3D_TRANSFORM_MATRIX == "D3DTransformMatrix")
- uno::Any aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DTransformMatrix")));
+ uno::Any aAny = xPropSet->getPropertyValue(OUString("D3DTransformMatrix"));
drawing::HomogenMatrix xHomMat;
aAny >>= xHomMat;
SdXMLImExTransform3D aTransform;
@@ -327,7 +327,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_TRANSFORM, aTransform.GetExportString(mrExport.GetMM100UnitConverter()));
// VRP, VPN, VUP
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DCameraGeometry")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DCameraGeometry"));
drawing::CameraGeometry aCamGeo;
aAny >>= aCamGeo;
@@ -356,7 +356,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen
}
// projection "D3DScenePerspective" drawing::ProjectionMode
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DScenePerspective")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DScenePerspective"));
drawing::ProjectionMode xPrjMode;
aAny >>= xPrjMode;
if(xPrjMode == drawing::ProjectionMode_PARALLEL)
@@ -366,7 +366,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_PROJECTION, aStr);
// distance
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneDistance")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DSceneDistance"));
sal_Int32 nDistance = 0;
aAny >>= nDistance;
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
@@ -375,7 +375,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_DISTANCE, aStr);
// focalLength
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneFocalLength")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DSceneFocalLength"));
sal_Int32 nFocalLength = 0;
aAny >>= nFocalLength;
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
@@ -384,7 +384,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_FOCAL_LENGTH, aStr);
// shadowSlant
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneShadowSlant")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DSceneShadowSlant"));
sal_Int16 nShadowSlant = 0;
aAny >>= nShadowSlant;
::sax::Converter::convertNumber(sStringBuffer, (sal_Int32)nShadowSlant);
@@ -392,7 +392,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_SHADOW_SLANT, aStr);
// shadeMode
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneShadeMode")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DSceneShadeMode"));
drawing::ShadeMode xShadeMode;
if(aAny >>= xShadeMode)
{
@@ -413,7 +413,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_SHADE_MODE, aStr);
// ambientColor
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneAmbientColor")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DSceneAmbientColor"));
sal_Int32 nAmbientColor = 0;
aAny >>= nAmbientColor;
::sax::Converter::convertColor(sStringBuffer, nAmbientColor);
@@ -421,7 +421,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen
mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_AMBIENT_COLOR, aStr);
// lightingMode
- aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneTwoSidedLighting")));
+ aAny = xPropSet->getPropertyValue(OUString("D3DSceneTwoSidedLighting"));
sal_Bool bTwoSidedLighting = false;
aAny >>= bTwoSidedLighting;
::sax::Converter::convertBool(sStringBuffer, bTwoSidedLighting);
@@ -436,9 +436,9 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s
OUString aStr;
OUStringBuffer sStringBuffer;
- const OUString aColorPropName(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightColor") );
- const OUString aDirectionPropName(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightDirection") );
- const OUString aLightOnPropName(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightOn") );
+ const OUString aColorPropName("D3DSceneLightColor");
+ const OUString aDirectionPropName("D3DSceneLightDirection");
+ const OUString aLightOnPropName("D3DSceneLightOn");
OUString aPropName;
OUString aIndexStr;
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index a08a2e9..7e21572 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -137,10 +137,10 @@ XMLShapeImportHelper::XMLShapeImportHelper(
mp3DLightAttrTokenMap(0L),
mpPathShapeAttrTokenMap(0L),
mpPolygonShapeAttrTokenMap(0L),
- msStartShape(RTL_CONSTASCII_USTRINGPARAM("StartShape")),
- msEndShape(RTL_CONSTASCII_USTRINGPARAM("EndShape")),
- msStartGluePointIndex(RTL_CONSTASCII_USTRINGPARAM("StartGluePointIndex")),
- msEndGluePointIndex(RTL_CONSTASCII_USTRINGPARAM("EndGluePointIndex")),
+ msStartShape("StartShape"),
+ msEndShape("EndShape"),
+ msStartGluePointIndex("StartGluePointIndex"),
+ msEndGluePointIndex("EndGluePointIndex"),
mrImporter( rImporter )
{
@@ -181,7 +181,7 @@ XMLShapeImportHelper::XMLShapeImportHelper(
}
uno::Reference< lang::XServiceInfo > xInfo( rImporter.GetModel(), uno::UNO_QUERY );
- const OUString aSName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument") );
+ const OUString aSName( "com.sun.star.presentation.PresentationDocument" );
mpImpl->mbIsPresentationShapesSupported = xInfo.is() && xInfo->supportsService( aSName );
}
@@ -793,12 +793,12 @@ void XMLShapeImportHelper::finishShape(
{
if ( mrImporter.IsShapePositionInHoriL2R() &&
xPropSet->getPropertySetInfo()->hasPropertyByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("PositionLayoutDir"))) )
+ OUString("PositionLayoutDir")) )
{
uno::Any aPosLayoutDir;
aPosLayoutDir <<= text::PositionLayoutDir::PositionInHoriL2R;
xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("PositionLayoutDir")),
+ OUString("PositionLayoutDir"),
aPosLayoutDir );
}
}
@@ -831,7 +831,7 @@ public:
ShapeSortContext::ShapeSortContext( uno::Reference< drawing::XShapes >& rShapes, ShapeSortContext* pParentContext )
: mxShapes( rShapes ), mnCurrentZ( 0 ), mpParentContext( pParentContext ),
- msZOrder(RTL_CONSTASCII_USTRINGPARAM("ZOrder"))
+ msZOrder("ZOrder")
{
}
@@ -1022,9 +1022,9 @@ void XMLShapeImportHelper::restoreConnections()
uno::Any aLine1Delta;
uno::Any aLine2Delta;
uno::Any aLine3Delta;
- OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("EdgeLine1Delta"));
- OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("EdgeLine2Delta"));
- OUString aStr3(RTL_CONSTASCII_USTRINGPARAM("EdgeLine3Delta"));
+ OUString aStr1("EdgeLine1Delta");
+ OUString aStr2("EdgeLine2Delta");
+ OUString aStr3("EdgeLine3Delta");
aLine1Delta = xConnector->getPropertyValue(aStr1);
aLine2Delta = xConnector->getPropertyValue(aStr2);
aLine3Delta = xConnector->getPropertyValue(aStr3);
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index 0b0ecbc..2da5687 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -97,7 +97,7 @@ void SdXML3DObjectContext::StartElement(const uno::Reference< xml::sax::XAttribu
{
uno::Any aAny;
aAny <<= mxHomMat;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DTransformMatrix")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DTransformMatrix"), aAny);
}
// call parent
@@ -209,9 +209,9 @@ void SdXML3DCubeObjectShapeContext::StartElement(const uno::Reference< xml::sax:
uno::Any aAny;
aAny <<= aPosition3D;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DPosition")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DPosition"), aAny);
aAny <<= aDirection3D;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSize")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSize"), aAny);
}
}
}
@@ -317,9 +317,9 @@ void SdXML3DSphereObjectShapeContext::StartElement(const uno::Reference< xml::sa
uno::Any aAny;
aAny <<= aPosition3D;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DPosition")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DPosition"), aAny);
aAny <<= aDirection3D;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSize")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSize"), aAny);
}
}
}
@@ -435,8 +435,7 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa
// set poly
uno::Any aAny;
aAny <<= xPolyPolygon3D;
- xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("D3DPolyPolygon3D")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DPolyPolygon3D"), aAny);
}
// call parent
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 1697815..4bfaa55 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -364,32 +364,32 @@ void SdXML3DSceneAttributesHelper::setSceneAttributes( const com::sun::star::uno
if(mbSetTransform)
{
aAny <<= mxHomMat;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DTransformMatrix")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DTransformMatrix"), aAny);
}
// distance
aAny <<= mnDistance;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneDistance")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneDistance"), aAny);
// focalLength
aAny <<= mnFocalLength;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneFocalLength")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneFocalLength"), aAny);
// shadowSlant
aAny <<= (sal_Int16)mnShadowSlant;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneShadowSlant")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneShadowSlant"), aAny);
// shadeMode
aAny <<= mxShadeMode;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneShadeMode")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneShadeMode"), aAny);
// ambientColor
aAny <<= maAmbientColor;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneAmbientColor")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneAmbientColor"), aAny);
// lightingMode
aAny <<= mbLightingMode;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneTwoSidedLighting")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneTwoSidedLighting"), aAny);
if( !maList.empty() )
{
@@ -414,58 +414,58 @@ void SdXML3DSceneAttributesHelper::setSceneAttributes( const com::sun::star::uno
{
case 0:
{
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightColor1")), aAny);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightDirection1")), aAny2);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightOn1")), aAny3);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightColor1"), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightDirection1"), aAny2);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightOn1"), aAny3);
break;
}
case 1:
{
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightColor2")), aAny);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightDirection2")), aAny2);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightOn2")), aAny3);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightColor2"), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightDirection2"), aAny2);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightOn2"), aAny3);
break;
}
case 2:
{
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightColor3")), aAny);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightDirection3")), aAny2);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightOn3")), aAny3);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightColor3"), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightDirection3"), aAny2);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightOn3"), aAny3);
break;
}
case 3:
{
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightColor4")), aAny);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightDirection4")), aAny2);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightOn4")), aAny3);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightColor4"), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightDirection4"), aAny2);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightOn4"), aAny3);
break;
}
case 4:
{
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightColor5")), aAny);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightDirection5")), aAny2);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightOn5")), aAny3);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightColor5"), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightDirection5"), aAny2);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightOn5"), aAny3);
break;
}
case 5:
{
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightColor6")), aAny);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightDirection6")), aAny2);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightOn6")), aAny3);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightColor6"), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightDirection6"), aAny2);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightOn6"), aAny3);
break;
}
case 6:
{
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightColor7")), aAny);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightDirection7")), aAny2);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightOn7")), aAny3);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightColor7"), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightDirection7"), aAny2);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightOn7"), aAny3);
break;
}
case 7:
{
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightColor8")), aAny);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightDirection8")), aAny2);
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneLightOn8")), aAny3);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightColor8"), aAny);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightDirection8"), aAny2);
+ xPropSet->setPropertyValue(OUString("D3DSceneLightOn8"), aAny3);
break;
}
}
@@ -484,12 +484,12 @@ void SdXML3DSceneAttributesHelper::setSceneAttributes( const com::sun::star::uno
aCamGeo.vup.DirectionY = maVUP.getY();
aCamGeo.vup.DirectionZ = maVUP.getZ();
aAny <<= aCamGeo;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DCameraGeometry")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DCameraGeometry"), aAny);
// #91047# set drawing::ProjectionMode AFTER camera geometry is set
// projection "D3DScenePerspective" drawing::ProjectionMode
aAny <<= mxPrjMode;
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DScenePerspective")), aAny);
+ xPropSet->setPropertyValue(OUString("D3DScenePerspective"), aAny);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index b27b9db..dc4f534 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -202,7 +202,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
maHREF += aBookmarkName;
}
- xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "BookmarkURL" ) ), uno::makeAny( maHREF ) );
+ xProps->setPropertyValue( OUString( "BookmarkURL" ), uno::makeAny( maHREF ) );
}
}
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index dbae7c7..576b543 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -300,7 +300,7 @@ void SdXMLGenericPageContext::EndElement()
if( !maUseHeaderDeclName.isEmpty() )
{
- const OUString aStrHeaderTextProp( RTL_CONSTASCII_USTRINGPARAM( "HeaderText" ) );
+ const OUString aStrHeaderTextProp( "HeaderText" );
if( xInfo->hasPropertyByName( aStrHeaderTextProp ) )
xSet->setPropertyValue( aStrHeaderTextProp,
makeAny( GetSdImport().GetHeaderDecl( maUseHeaderDeclName ) ) );
@@ -308,7 +308,7 @@ void SdXMLGenericPageContext::EndElement()
if( !maUseFooterDeclName.isEmpty() )
{
- const OUString aStrFooterTextProp( RTL_CONSTASCII_USTRINGPARAM( "FooterText" ) );
+ const OUString aStrFooterTextProp( "FooterText" );
if( xInfo->hasPropertyByName( aStrFooterTextProp ) )
xSet->setPropertyValue( aStrFooterTextProp,
makeAny( GetSdImport().GetFooterDecl( maUseFooterDeclName ) ) );
@@ -316,14 +316,14 @@ void SdXMLGenericPageContext::EndElement()
if( !maUseDateTimeDeclName.isEmpty() )
{
- const OUString aStrDateTimeTextProp( RTL_CONSTASCII_USTRINGPARAM( "DateTimeText" ) );
+ const OUString aStrDateTimeTextProp( "DateTimeText" );
if( xInfo->hasPropertyByName( aStrDateTimeTextProp ) )
{
sal_Bool bFixed;
OUString aDateTimeFormat;
const OUString aText( GetSdImport().GetDateTimeDecl( maUseDateTimeDeclName, bFixed, aDateTimeFormat ) );
- xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("IsDateTimeFixed") ),
+ xSet->setPropertyValue( OUString( "IsDateTimeFixed" ),
makeAny( bFixed ) );
if( bFixed )
@@ -343,7 +343,7 @@ void SdXMLGenericPageContext::EndElement()
if( pSdNumStyle )
{
- xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("DateTimeFormat") ),
+ xSet->setPropertyValue( OUString( "DateTimeFormat" ),
makeAny( pSdNumStyle->GetDrawKey() ) );
}
}
@@ -387,7 +387,7 @@ void SdXMLGenericPageContext::SetStyle( rtl::OUString& rStyleName )
Reference< beans::XPropertySet > xPropSet( xPropSet1 );
Reference< beans::XPropertySet > xBackgroundSet;
- const OUString aBackground(RTL_CONSTASCII_USTRINGPARAM("Background"));
+ const OUString aBackground("Background");
if( xPropSet1->getPropertySetInfo()->hasPropertyByName( aBackground ) )
{
Reference< beans::XPropertySetInfo > xInfo( xPropSet1->getPropertySetInfo() );
@@ -398,7 +398,7 @@ void SdXMLGenericPageContext::SetStyle( rtl::OUString& rStyleName )
{
xBackgroundSet = Reference< beans::XPropertySet >::query(
xServiceFact->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Background"))));
+ OUString("com.sun.star.drawing.Background")));
}
}
@@ -465,7 +465,7 @@ void SdXMLGenericPageContext::SetLayout()
Reference <beans::XPropertySet> xPropSet(mxShapes, uno::UNO_QUERY);
if(xPropSet.is())
{
- OUString aPropName(RTL_CONSTASCII_USTRINGPARAM("Layout"));
+ OUString aPropName("Layout");
Reference< beans::XPropertySetInfo > xInfo( xPropSet->getPropertySetInfo() );
if( xInfo.is() && xInfo->hasPropertyByName( aPropName ) )
xPropSet->setPropertyValue(aPropName, uno::makeAny( (sal_Int16)nType ) );
@@ -520,32 +520,25 @@ void SdXMLGenericPageContext::SetPageMaster( OUString& rsPageMasterName )
uno::Any aAny;
aAny <<= pPageMasterContext->GetBorderBottom();
- xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("BorderBottom")), aAny);
+ xPropSet->setPropertyValue(OUString("BorderBottom"), aAny);
aAny <<= pPageMasterContext->GetBorderLeft();
- xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("BorderLeft")), aAny);
+ xPropSet->setPropertyValue(OUString("BorderLeft"), aAny);
aAny <<= pPageMasterContext->GetBorderRight();
- xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("BorderRight")), aAny);
+ xPropSet->setPropertyValue(OUString("BorderRight"), aAny);
aAny <<= pPageMasterContext->GetBorderTop();
- xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("BorderTop")), aAny);
+ xPropSet->setPropertyValue(OUString("BorderTop"), aAny);
aAny <<= pPageMasterContext->GetWidth();
- xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Width")), aAny);
+ xPropSet->setPropertyValue(OUString("Width"), aAny);
aAny <<= pPageMasterContext->GetHeight();
- xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Height")), aAny);
+ xPropSet->setPropertyValue(OUString("Height"), aAny);
aAny <<= pPageMasterContext->GetOrientation();
- xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Orientation")), aAny);
+ xPropSet->setPropertyValue(OUString("Orientation"), aAny);
}
}
}
@@ -631,7 +624,7 @@ void SdXMLGenericPageContext::SetNavigationOrder()
}
Reference< XPropertySet > xSet( mxShapes, UNO_QUERY_THROW );
- xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ), Any( Reference< XIndexAccess >( new XoNavigationOrderAccess( aShapes ) ) ) );
+ xSet->setPropertyValue( OUString( "NavigationOrder" ), Any( Reference< XIndexAccess >( new XoNavigationOrderAccess( aShapes ) ) ) );
}
catch(const uno::Exception&)
{
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 08d8decf..4ad63cb 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2709,8 +2709,8 @@ void SdXMLObjectShapeContext::EndElement()
if( xProps.is() )
{
- xProps->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle")), uno::makeAny(drawing::FillStyle_NONE));
- xProps->setPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LineStyle")), uno::makeAny(drawing::LineStyle_NONE));
+ xProps->setPropertyValue(OUString("FillStyle"), uno::makeAny(drawing::FillStyle_NONE));
+ xProps->setPropertyValue(OUString("LineStyle"), uno::makeAny(drawing::LineStyle_NONE));
}
}
@@ -3413,12 +3413,12 @@ rtl::OUString SdXMLFrameShapeContext::getGraphicURLFromImportContext(const SvXML
if(xPropSet.is())
{
- xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicStreamURL"))) >>= aRetval;
+ xPropSet->getPropertyValue(OUString("GraphicStreamURL")) >>= aRetval;
if(!aRetval.getLength())
{
// it maybe a link, try GraphicURL
- xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL"))) >>= aRetval;
+ xPropSet->getPropertyValue(OUString("GraphicURL")) >>= aRetval;
}
}
}
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index ff9439e..fe6ebd9 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -113,7 +113,7 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c
if( IsXMLToken( aLocalName, XML_START_PAGE ) )
{
aAny <<= sValue;
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstPage" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "FirstPage" ), aAny );
bAll = sal_False;
}
else if( IsXMLToken( aLocalName, XML_SHOW ) )
@@ -130,62 +130,62 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c
const sal_Int32 nMS = (aDuration.Hours * 60 +
aDuration.Minutes) * 60 + aDuration.Seconds;
aAny <<= nMS;
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Pause" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "Pause" ), aAny );
}
else if( IsXMLToken( aLocalName, XML_ANIMATIONS ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_ENABLED ) );
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AllowAnimations" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "AllowAnimations" ), aAny );
}
else if( IsXMLToken( aLocalName, XML_STAY_ON_TOP ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAlwaysOnTop" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "IsAlwaysOnTop" ), aAny );
}
else if( IsXMLToken( aLocalName, XML_FORCE_MANUAL ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsAutomatic" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "IsAutomatic" ), aAny );
}
else if( IsXMLToken( aLocalName, XML_ENDLESS ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "IsEndless" ), aAny );
}
else if( IsXMLToken( aLocalName, XML_FULL_SCREEN ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFullScreen" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "IsFullScreen" ), aAny );
}
else if( IsXMLToken( aLocalName, XML_MOUSE_VISIBLE ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsMouseVisible" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "IsMouseVisible" ), aAny );
}
else if( IsXMLToken( aLocalName, XML_START_WITH_NAVIGATOR ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "StartWithNavigator" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "StartWithNavigator" ), aAny );
}
else if( IsXMLToken( aLocalName, XML_MOUSE_AS_PEN ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "UsePen" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "UsePen" ), aAny );
}
else if( IsXMLToken( aLocalName, XML_TRANSITION_ON_CLICK ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_ENABLED ) );
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsTransitionOnClick" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "IsTransitionOnClick" ), aAny );
}
else if( IsXMLToken( aLocalName, XML_SHOW_LOGO ) )
{
aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsShowLogo" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "IsShowLogo" ), aAny );
}
}
}
aAny = bool2any( bAll );
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "IsShowAll" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "IsShowAll" ), aAny );
}
}
@@ -195,7 +195,7 @@ SdXMLShowsContext::~SdXMLShowsContext()
{
uno::Any aAny;
aAny <<= mpImpl->maCustomShowName;
- mpImpl->mxPresProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "CustomShow" ) ), aAny );
+ mpImpl->mxPresProps->setPropertyValue( OUString( "CustomShow" ), aAny );
}
delete mpImpl;
More information about the Libreoffice-commits
mailing list