oox: kill no longer needed S() macro

Change-Id: If3f1bb787d6debaa63e3bed3a48e44b5e34c27b7

5 files changed, 66 insertions, 67 deletions

diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx
index a355ac486e71..486d792b08e1 100644
--- a/oox/inc/oox/export/drawingml.hxx
+++ b/oox/inc/oox/export/drawingml.hxx
@@ -76,7 +76,7 @@ protected:
     ::sax_fastparser::FSHelperPtr mpFS;
     ::oox::core::XmlFilterBase* mpFB;
 
-    bool GetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, String aName );
+    bool GetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, OUString aName );
     bool GetPropertyAndState( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
                   ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > rXPropState,
                   String aName, ::com::sun::star::beans::PropertyState& eState );
@@ -104,8 +104,8 @@ public:
     void WriteSolidFill( sal_uInt32 nColor );
     void WriteSolidFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
     void WriteGradientFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
-    void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, String sURLPropName, sal_Int32 nXmlNamespace );
-    void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, String sURLPropName );
+    void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, OUString sURLPropName, sal_Int32 nXmlNamespace );
+    void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, OUString sURLPropName );
     void WriteOutline( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
     void WriteStretch();
     void WriteLinespacing( ::com::sun::star::style::LineSpacing& rLineSpacing );
diff --git a/oox/inc/oox/export/utils.hxx b/oox/inc/oox/export/utils.hxx
index d39d5f782578..f43faca01b3a 100644
--- a/oox/inc/oox/export/utils.hxx
+++ b/oox/inc/oox/export/utils.hxx
@@ -20,7 +20,6 @@
 #ifndef _OOX_EXPORT_UTILS_HXX_
 #define _OOX_EXPORT_UTILS_HXX_
 
-#define S(x) String( RTL_CONSTASCII_USTRINGPARAM( x ) )
 #define US(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x ))
 #define I32S(x) rtl::OString::valueOf( (sal_Int32) x ).getStr()
 #define I64S(x) rtl::OString::valueOf( (sal_Int64) x ).getStr()
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index dcd4be12534c..6b53159cff0b 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -524,7 +524,7 @@ ChartExport& ChartExport::WriteChartObj( const Reference< XShape >& xShape, sal_
     pFS->startElementNS( mnXmlNamespace, XML_nvGraphicFramePr, FSEND );
 
     // TODO: get the correct chart name chart id
-    OUString sName = S("Object 1");
+    OUString sName = "Object 1";
     Reference< XNamed > xNamed( xShape, UNO_QUERY );
     if (xNamed.is())
         sName = xNamed->getName();
@@ -1138,7 +1138,7 @@ void ChartExport::exportBarChart( Reference< chart2::XChartType > xChartType )
     // bar direction
     sal_Bool bVertical = sal_False;
     Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY);
-    if( GetProperty( xPropSet, S( "Vertical" ) ) )
+    if( GetProperty( xPropSet, "Vertical" ) )
         mAny >>= bVertical;
 
     const char* bardir = bVertical? "bar":"col";
@@ -1156,7 +1156,7 @@ void ChartExport::exportBarChart( Reference< chart2::XChartType > xChartType )
         // Shape
         namespace cssc = ::com::sun::star::chart;
         sal_Int32 nGeom3d = cssc::ChartSolidType::RECTANGULAR_SOLID;
-        if( xPropSet.is() && GetProperty( xPropSet, S("SolidType") ) )
+        if( xPropSet.is() && GetProperty( xPropSet, "SolidType") )
             mAny >>= nGeom3d;
         const char* sShapeType = NULL;
         switch( nGeom3d )
@@ -1180,7 +1180,7 @@ void ChartExport::exportBarChart( Reference< chart2::XChartType > xChartType )
     }
 
     //overlap
-    if( xTypeProp.is() && GetProperty( xTypeProp, S("OverlapSequence") ) )
+    if( xTypeProp.is() && GetProperty( xTypeProp, "OverlapSequence") )
     {
         uno::Sequence< sal_Int32 > aBarPositionSequence;
         mAny >>= aBarPositionSequence;
@@ -1193,7 +1193,7 @@ void ChartExport::exportBarChart( Reference< chart2::XChartType > xChartType )
                     FSEND );
         }
     }
-    if( xTypeProp.is() && GetProperty( xTypeProp, S("GapwidthSequence") ) )
+    if( xTypeProp.is() && GetProperty( xTypeProp, "GapwidthSequence") )
     {
         uno::Sequence< sal_Int32 > aBarPositionSequence;
         mAny >>= aBarPositionSequence;
@@ -1262,7 +1262,7 @@ void ChartExport::exportLineChart( Reference< chart2::XChartType > xChartType )
     // show marker?
     sal_Int32 nSymbolType = ::com::sun::star::chart::ChartSymbolType::NONE;
     Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY);
-    if( GetProperty( xPropSet, S( "SymbolType" ) ) )
+    if( GetProperty( xPropSet, "SymbolType" ) )
         mAny >>= nSymbolType;
 
     const char* marker = nSymbolType == ::com::sun::star::chart::ChartSymbolType::NONE? "0":"1";
@@ -1502,7 +1502,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
                         aSeriesSeq[nSeriesIdx], getModel() );
                     if( xPropSet.is() )
                     {
-                        if( GetProperty( xPropSet, S("Axis") ) )
+                        if( GetProperty( xPropSet, "Axis") )
                         {
                             mAny >>= nAttachedAxis;
                             if( nAttachedAxis == ::com::sun::star::chart::ChartAxisAssign::SECONDARY_Y )
@@ -1523,7 +1523,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
                         case chart::TYPEID_PIE:
                         case chart::TYPEID_DOUGHNUT:
                         {
-                            if( xPropSet.is() && GetProperty( xPropSet, S("SegmentOffset") ) )
+                            if( xPropSet.is() && GetProperty( xPropSet, "SegmentOffset") )
                             {
                                 sal_Int32 nOffset = 0;
                                 mAny >>= nOffset;
@@ -2020,7 +2020,7 @@ void ChartExport::_exportAxis(
             FSEND );
     // orientation: minMax, maxMin
     sal_Bool bReverseDirection = sal_False;
-    if(GetProperty( xAxisProp, S( "ReverseDirection" ) ) )
+    if(GetProperty( xAxisProp, "ReverseDirection" ) )
         mAny >>= bReverseDirection;
 
     const char* orientation = bReverseDirection ? "maxMin":"minMax";
@@ -2028,7 +2028,7 @@ void ChartExport::_exportAxis(
             XML_val, orientation,
             FSEND );
     // logBase, min, max
-    if(GetProperty( xAxisProp, S( "Logarithmic" ) ) )
+    if(GetProperty( xAxisProp, "Logarithmic" ) )
     {
         sal_Bool bLogarithmic = sal_False;
         mAny >>= bLogarithmic;
@@ -2042,10 +2042,10 @@ void ChartExport::_exportAxis(
         }
     }
     sal_Bool bAutoMax = sal_False;
-    if(GetProperty( xAxisProp, S( "AutoMax" ) ) )
+    if(GetProperty( xAxisProp, "AutoMax" ) )
         mAny >>= bAutoMax;
 
-    if( !bAutoMax && (GetProperty( xAxisProp, S( "Max" ) ) ))
+    if( !bAutoMax && (GetProperty( xAxisProp, "Max" ) ) )
     {
         double dMax = 0;
         mAny >>= dMax;
@@ -2055,10 +2055,10 @@ void ChartExport::_exportAxis(
     }
 
     sal_Bool bAutoMin = sal_False;
-    if(GetProperty( xAxisProp, S( "AutoMin" ) ) )
+    if(GetProperty( xAxisProp, "AutoMin" ) )
         mAny >>= bAutoMin;
 
-    if( !bAutoMin && (GetProperty( xAxisProp, S( "Min" ) ) ))
+    if( !bAutoMin && (GetProperty( xAxisProp, "Min" ) ) )
     {
         double dMin = 0;
         mAny >>= dMin;
@@ -2112,7 +2112,7 @@ void ChartExport::_exportAxis(
 
     // majorTickMark
     sal_Int32 nValue = 0;
-    if(GetProperty( xAxisProp, S( "Marks" ) ) )
+    if(GetProperty( xAxisProp, "Marks" ) )
     {
         mAny >>= nValue;
         sal_Bool bInner = nValue & ::com::sun::star::chart::ChartAxisMarks::INNER;
@@ -2131,7 +2131,7 @@ void ChartExport::_exportAxis(
             FSEND );
     }
     // minorTickMark
-    if(GetProperty( xAxisProp, S( "HelpMarks" ) ) )
+    if(GetProperty( xAxisProp, "HelpMarks" ) )
     {
         mAny >>= nValue;
         sal_Bool bInner = nValue & ::com::sun::star::chart::ChartAxisMarks::INNER;
@@ -2152,9 +2152,9 @@ void ChartExport::_exportAxis(
     // tickLblPos
     const char* sTickLblPos = NULL;
     sal_Bool bDisplayLabel = sal_True;
-    if(GetProperty( xAxisProp, S( "DisplayLabels" ) ) )
+    if(GetProperty( xAxisProp, "DisplayLabels" ) )
         mAny >>= bDisplayLabel;
-    if( bDisplayLabel && (GetProperty( xAxisProp, S( "LabelPosition" ) ) ))
+    if( bDisplayLabel && (GetProperty( xAxisProp, "LabelPosition" ) ) )
     {
         ::com::sun::star::chart::ChartAxisLabelPosition eLabelPosition = ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS;
         mAny >>= eLabelPosition;
@@ -2190,7 +2190,7 @@ void ChartExport::_exportAxis(
     // crosses & crossesAt
     sal_Bool bCrossesValue = sal_False;
     const char* sCrosses = NULL;
-    if(GetProperty( xAxisProp, S( "CrossoverPosition" ) ) )
+    if(GetProperty( xAxisProp, "CrossoverPosition" ) )
     {
         ::com::sun::star::chart::ChartAxisPosition ePosition( ::com::sun::star::chart::ChartAxisPosition_ZERO );
         mAny >>= ePosition;
@@ -2211,7 +2211,7 @@ void ChartExport::_exportAxis(
         }
     }
 
-    if( bCrossesValue && GetProperty( xAxisProp, S("CrossoverValue" ) ) )
+    if( bCrossesValue && GetProperty( xAxisProp, "CrossoverValue" ) )
     {
         double dValue = 0;
         mAny >>= dValue;
@@ -2252,10 +2252,10 @@ void ChartExport::_exportAxis(
 
     // majorUnit
     sal_Bool bAutoStepMain = sal_False;
-    if(GetProperty( xAxisProp, S( "AutoStepMain" ) ) )
+    if(GetProperty( xAxisProp, "AutoStepMain" ) )
         mAny >>= bAutoStepMain;
 
-    if( !bAutoStepMain && (GetProperty( xAxisProp, S( "StepMain" ) ) ))
+    if( !bAutoStepMain && (GetProperty( xAxisProp, "StepMain" ) ) )
     {
         double dMajorUnit = 0;
         mAny >>= dMajorUnit;
@@ -2265,10 +2265,10 @@ void ChartExport::_exportAxis(
     }
     // minorUnit
     sal_Bool bAutoStepHelp = sal_False;
-    if(GetProperty( xAxisProp, S( "AutoStepHelp" ) ) )
+    if(GetProperty( xAxisProp, "AutoStepHelp" ) )
         mAny >>= bAutoStepHelp;
 
-    if( !bAutoStepHelp && (GetProperty( xAxisProp, S( "StepHelp" ) ) ))
+    if( !bAutoStepHelp && (GetProperty( xAxisProp, "StepHelp" ) ) )
     {
         double dMinorUnit = 0;
         mAny >>= dMinorUnit;
@@ -2385,10 +2385,10 @@ void ChartExport::exportGrouping( sal_Bool isBar )
     Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY);
     // grouping
     sal_Bool bStacked = sal_False;
-    if( GetProperty( xPropSet, S( "Stacked" ) ) )
+    if( GetProperty( xPropSet, "Stacked" ) )
         mAny >>= bStacked;
     sal_Bool bPercentage = sal_False;
-    if( GetProperty( xPropSet, S( "Percent" ) ) )
+    if( GetProperty( xPropSet, "Percent" ) )
         mAny >>= bPercentage;
 
     const char* grouping = NULL;
@@ -2415,7 +2415,7 @@ void ChartExport::exportMarker()
             FSEND );
     Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY );
     sal_Int32 nSymbolType = ::com::sun::star::chart::ChartSymbolType::NONE;
-    if( GetProperty( xPropSet, S( "SymbolType" ) ) )
+    if( GetProperty( xPropSet, "SymbolType" ) )
         mAny >>= nSymbolType;
     // TODO: more properties support for marker
     if( nSymbolType == ::com::sun::star::chart::ChartSymbolType::NONE )
@@ -2432,7 +2432,7 @@ void ChartExport::exportSmooth()
     FSHelperPtr pFS = GetFS();
     Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY );
     sal_Int32 nSplineType = 0;
-    if( GetProperty( xPropSet, S( "SplineType" ) ) )
+    if( GetProperty( xPropSet, "SplineType" ) )
         mAny >>= nSplineType;
     if( nSplineType != 0 )
     {
@@ -2447,7 +2447,7 @@ void ChartExport::exportFirstSliceAng( )
     FSHelperPtr pFS = GetFS();
     sal_Int32 nStartingAngle = 0;
     Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY);
-    if( GetProperty( xPropSet, S( "StartingAngle" ) ) )
+    if( GetProperty( xPropSet, "StartingAngle" ) )
         mAny >>= nStartingAngle;
 
     // convert to ooxml angle
@@ -2466,7 +2466,7 @@ void ChartExport::exportView3D()
     pFS->startElement( FSNS( XML_c, XML_view3D ),
             FSEND );
     // rotX
-    if( GetProperty( xPropSet, S( "RotationHorizontal" ) ) )
+    if( GetProperty( xPropSet, "RotationHorizontal" ) )
     {
         sal_Int32 nRotationX = 0;
         mAny >>= nRotationX;
@@ -2478,7 +2478,7 @@ void ChartExport::exportView3D()
             FSEND );
     }
     // rotY
-    if( GetProperty( xPropSet, S( "RotationVertical" ) ) )
+    if( GetProperty( xPropSet, "RotationVertical" ) )
     {
         sal_Int32 nRotationY = 0;
         mAny >>= nRotationY;
@@ -2490,7 +2490,7 @@ void ChartExport::exportView3D()
             FSEND );
     }
     // perspective
-    if( GetProperty( xPropSet, S( "Perspective" ) ) )
+    if( GetProperty( xPropSet, "Perspective" ) )
     {
         sal_Int32 nPerspective = 0;
         mAny >>= nPerspective;
@@ -2501,7 +2501,7 @@ void ChartExport::exportView3D()
             FSEND );
     }
     // rAngAx
-    if( GetProperty( xPropSet, S( "RightAngledAxes" ) ) )
+    if( GetProperty( xPropSet, "RightAngledAxes" ) )
     {
         sal_Bool bRightAngled = sal_False;
         mAny >>= bRightAngled;
@@ -2519,7 +2519,7 @@ sal_Bool ChartExport::isDeep3dChart()
     if( mbIs3DChart )
     {
         Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY);
-        if( GetProperty( xPropSet, S( "Deep" ) ) )
+        if( GetProperty( xPropSet, "Deep" ) )
             mAny >>= isDeep;
     }
     return isDeep;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2d9bd9f4a117..a3561023c119 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -115,7 +115,7 @@ void DrawingML::ResetCounters()
     mnImageCounter = 1;
 }
 
-bool DrawingML::GetProperty( Reference< XPropertySet > rXPropSet, String aName )
+bool DrawingML::GetProperty( Reference< XPropertySet > rXPropSet, OUString aName )
 {
     bool bRetValue = false;
 
@@ -171,7 +171,7 @@ void DrawingML::WriteSolidFill( sal_uInt32 nColor )
 
 void DrawingML::WriteSolidFill( Reference< XPropertySet > rXPropSet )
 {
-    if ( GetProperty( rXPropSet, S( "FillColor" ) ) )
+    if ( GetProperty( rXPropSet, "FillColor" ) )
         WriteSolidFill( *((sal_uInt32*) mAny.getValue()) & 0xffffff );
 }
 
@@ -552,7 +552,7 @@ OUString DrawingML::WriteBlip( Reference< XPropertySet > rXPropSet, OUString& rU
 void DrawingML::WriteBlipMode( Reference< XPropertySet > rXPropSet )
 {
     BitmapMode eBitmapMode( BitmapMode_NO_REPEAT );
-    if (GetProperty( rXPropSet, S( "FillBitmapMode" ) ) )
+    if (GetProperty( rXPropSet, "FillBitmapMode" ) )
         mAny >>= eBitmapMode;
 
     DBG(printf("fill bitmap mode: %d\n", eBitmapMode));
@@ -571,12 +571,12 @@ void DrawingML::WriteBlipMode( Reference< XPropertySet > rXPropSet )
     }
 }
 
-void DrawingML::WriteBlipFill( Reference< XPropertySet > rXPropSet, String sURLPropName )
+void DrawingML::WriteBlipFill( Reference< XPropertySet > rXPropSet, OUString sURLPropName )
 {
     WriteBlipFill( rXPropSet, sURLPropName, XML_a );
 }
 
-void DrawingML::WriteBlipFill( Reference< XPropertySet > rXPropSet, String sURLPropName, sal_Int32 nXmlNamespace )
+void DrawingML::WriteBlipFill( Reference< XPropertySet > rXPropSet, OUString sURLPropName, sal_Int32 nXmlNamespace )
 {
     if ( GetProperty( rXPropSet, sURLPropName ) ) {
         OUString aURL;
@@ -591,9 +591,9 @@ void DrawingML::WriteBlipFill( Reference< XPropertySet > rXPropSet, String sURLP
 
         WriteBlip( rXPropSet, aURL );
 
-        if( sURLPropName == S( "FillBitmapURL" ) )
+        if( sURLPropName == "FillBitmapURL" )
             WriteBlipMode( rXPropSet );
-        else if( GetProperty( rXPropSet, S( "FillBitmapStretch" ) ) ) {
+        else if( GetProperty( rXPropSet, "FillBitmapStretch" ) ) {
                 bool bStretch = false;
                 mAny >>= bStretch;
 
@@ -856,12 +856,12 @@ const char* DrawingML::GetFieldType( ::com::sun::star::uno::Reference< ::com::su
         bIsField = sal_True;
             rXPropSet.set( rXTextField, UNO_QUERY );
             if( rXPropSet.is() ) {
-                String aFieldKind( rXTextField->getPresentation( sal_True ) );
+                OUString aFieldKind( rXTextField->getPresentation( sal_True ) );
                 DBG(printf ("field kind: %s\n", USS(aFieldKind) ));
-                if( aFieldKind == S( "Page" ) ) {
+                if( aFieldKind == "Page" ) {
                     return "slidenum";
                 }
-        // else if( aFieldKind == S( "URL" ) ) {
+        // else if( aFieldKind == "URL" ) {
         // do not return here
         // and make URL field text run with hyperlink property later
         // }
@@ -917,7 +917,7 @@ void DrawingML::WriteRun( Reference< XTextRange > rRun )
         Reference< XPropertySet > xPropSet( rRun, UNO_QUERY );
 
         try {
-        if( !xPropSet.is() || !( xPropSet->getPropertyValue( S( "PlaceholderText" ) ) >>= sText ) )
+        if( !xPropSet.is() || !( xPropSet->getPropertyValue( "PlaceholderText" ) >>= sText ) )
             return;
         if( sText.isEmpty() )
             return;
@@ -1490,10 +1490,10 @@ sax_fastparser::FSHelperPtr DrawingML::CreateOutputStream (
 
 void DrawingML::WriteFill( Reference< XPropertySet > xPropSet )
 {
-    if ( !GetProperty( xPropSet, S( "FillStyle" ) ) )
+    if ( !GetProperty( xPropSet, "FillStyle" ) )
         return;
     FillStyle aFillStyle( FillStyle_NONE );
-    xPropSet->getPropertyValue( S( "FillStyle" ) ) >>= aFillStyle;
+    xPropSet->getPropertyValue( "FillStyle" ) >>= aFillStyle;
 
     if( aFillStyle == FillStyle_NONE ||
         aFillStyle == FillStyle_HATCH )
@@ -1508,7 +1508,7 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet )
         WriteGradientFill( xPropSet );
         break;
     case ::com::sun::star::drawing::FillStyle_BITMAP :
-        WriteBlipFill( xPropSet, S( "FillBitmapURL" ) );
+        WriteBlipFill( xPropSet, "FillBitmapURL" );
         break;
     default:
         ;
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index df14d1233d39..37cee57ee229 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -597,10 +597,10 @@ sal_Bool ShapeExport::NonEmptyText( Reference< XInterface > xIface )
         Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo();
         if ( xPropSetInfo.is() )
         {
-            if ( xPropSetInfo->hasPropertyByName( S( "IsEmptyPresentationObject" ) ) )
+            if ( xPropSetInfo->hasPropertyByName( "IsEmptyPresentationObject" ) )
             {
                 sal_Bool bIsEmptyPresObj = sal_False;
-                if ( xPropSet->getPropertyValue( S( "IsEmptyPresentationObject" ) ) >>= bIsEmptyPresObj )
+                if ( xPropSet->getPropertyValue( "IsEmptyPresentationObject" ) >>= bIsEmptyPresObj )
                 {
                     DBG(printf("empty presentation object %d, props:\n", bIsEmptyPresObj));
                     if( bIsEmptyPresObj )
@@ -608,10 +608,10 @@ sal_Bool ShapeExport::NonEmptyText( Reference< XInterface > xIface )
                 }
             }
 
-            if ( xPropSetInfo->hasPropertyByName( S( "IsPresentationObject" ) ) )
+            if ( xPropSetInfo->hasPropertyByName( "IsPresentationObject" ) )
             {
                 sal_Bool bIsPresObj = sal_False;
-                if ( xPropSet->getPropertyValue( S( "IsPresentationObject" ) ) >>= bIsPresObj )
+                if ( xPropSet->getPropertyValue( "IsPresentationObject" ) >>= bIsPresObj )
                 {
                     DBG(printf("presentation object %d, props:\n", bIsPresObj));
                     if( bIsPresObj )
@@ -833,7 +833,7 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, const
 
     OUString sGraphicURL;
     Reference< XPropertySet > xShapeProps( xShape, UNO_QUERY );
-    if( !pGraphic && ( !xShapeProps.is() || !( xShapeProps->getPropertyValue( S( "GraphicURL" ) ) >>= sGraphicURL ) ) )
+    if( !pGraphic && ( !xShapeProps.is() || !( xShapeProps->getPropertyValue( "GraphicURL" ) >>= sGraphicURL ) ) )
     {
         DBG(printf("no graphic URL found\n"));
         return;
@@ -848,9 +848,9 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, const
     OUString sName, sDescr;
     bool bHaveName, bHaveDesc;
 
-    if ( ( bHaveName= GetProperty( xShapeProps, S( "Name" ) ) ) )
+    if ( ( bHaveName= GetProperty( xShapeProps, "Name" ) ) )
         mAny >>= sName;
-    if ( ( bHaveDesc = GetProperty( xShapeProps, S( "Description" ) ) ) )
+    if ( ( bHaveDesc = GetProperty( xShapeProps, "Description" ) ) )
         mAny >>= sDescr;
 
     pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
@@ -875,7 +875,7 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, const
     // now we stretch always when we get pGraphic (when changing that
     // behavior, test n#780830 for regression, where the OLE sheet might get tiled
     bool bStretch = false;
-    if( !pGraphic && GetProperty( xShapeProps, S( "FillBitmapStretch" ) ) )
+    if( !pGraphic && GetProperty( xShapeProps, "FillBitmapStretch" ) )
         mAny >>= bStretch;
 
     if ( pGraphic || bStretch )
@@ -1061,7 +1061,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape )
     Reference< XPropertySet > xShapeProps( xShape, UNO_QUERY );
     if( xShapeProps.is() )
     {
-        xShapeProps->getPropertyValue( S( "CornerRadius" ) ) >>= nRadius;
+        xShapeProps->getPropertyValue( "CornerRadius" ) >>= nRadius;
     }
 
     if( nRadius )
@@ -1173,7 +1173,7 @@ void ShapeExport::WriteTable( Reference< XShape > rXShape  )
     mpFS->startElementNS( XML_a, XML_graphic, FSEND );
     mpFS->startElementNS( XML_a, XML_graphicData, XML_uri, "http://schemas.openxmlformats.org/drawingml/2006/table", FSEND );
 
-    if ( xPropSet.is() && ( xPropSet->getPropertyValue( S("Model") ) >>= xTable ) )
+    if ( xPropSet.is() && ( xPropSet->getPropertyValue( "Model" ) >>= xTable ) )
     {
         mpFS->startElementNS( XML_a, XML_tbl, FSEND );
         mpFS->singleElementNS( XML_a, XML_tblPr, FSEND );
@@ -1190,7 +1190,7 @@ void ShapeExport::WriteTable( Reference< XShape > rXShape  )
         {
             Reference< XPropertySet > xColPropSet( xColumns->getByIndex( x ), UNO_QUERY_THROW );
             sal_Int32 nWidth(0);
-            xColPropSet->getPropertyValue( S("Width") ) >>= nWidth;
+            xColPropSet->getPropertyValue( "Width" ) >>= nWidth;
 
             mpFS->singleElementNS( XML_a, XML_gridCol, XML_w, I64S(MM100toEMU(nWidth)), FSEND );
         }
@@ -1203,7 +1203,7 @@ void ShapeExport::WriteTable( Reference< XShape > rXShape  )
             Reference< XPropertySet > xRowPropSet( xRows->getByIndex( nRow ), UNO_QUERY_THROW );
             sal_Int32 nRowHeight(0);
 
-            xRowPropSet->getPropertyValue( S("Height") ) >>= nRowHeight;
+            xRowPropSet->getPropertyValue( "Height" ) >>= nRowHeight;
 
             mpFS->startElementNS( XML_a, XML_tr, XML_h, I64S( MM100toEMU( nRowHeight ) ), FSEND );
 
@@ -1279,7 +1279,7 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape )
     pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
     WriteShapeTransformation( xShape, XML_a,0,0,false);
     WritePresetShape( "rect" );
-    WriteBlipFill( Reference< XPropertySet >(xShape, UNO_QUERY ), S( "GraphicURL" ) );
+    WriteBlipFill( Reference< XPropertySet >(xShape, UNO_QUERY ), "GraphicURL" );
     pFS->endElementNS( mnXmlNamespace, XML_spPr );
 
     WriteTextBox( xShape, mnXmlNamespace );
@@ -1293,7 +1293,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( Reference< XShape > xShape )
 {
     Reference< XPropertySet > xPropSet( xShape, UNO_QUERY );
     if( xPropSet.is() ) {
-        if( GetProperty( xPropSet, S("Model") ) )
+        if( GetProperty( xPropSet, "Model" ) )
         {
             Reference< XChartDocument > xChartDoc;
             mAny >>= xChartDoc;
@@ -1322,7 +1322,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( Reference< XShape > xShape )
                                                                                           .append( (sal_Int32) mnSpreadsheetCounter )
                                                                                           .appendAscii( ".xlsx" )
                                                                                           .makeStringAndClear(),
-                                                                                          S("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") );
+                                                                                          "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" );
                         // export the embedded document
                         Sequence< PropertyValue > rMedia(1);