Clean up aEmpty

Change-Id: I4c4294b7fb1cb537ba3ae3e6e7e747a3333b7469

3 files changed, 8 insertions, 12 deletions

diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 5618be859e85..ef8b3896df03 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -500,15 +500,13 @@ void loadDiagram( const ShapePtr& pShape,
     DiagramLayoutPtr pLayout( new DiagramLayout() );
     pDiagram->setLayout( pLayout );
 
-    OUString aEmpty;
-
     // data
     if( rXDataModelDom.is() )
         importFragment(rFilter,
                        rXDataModelDom,
                        "OOXData",
                        pDiagram,
-                       new DiagramDataFragmentHandler( rFilter, aEmpty, pData ));
+                       new DiagramDataFragmentHandler( rFilter, "", pData ));
 
     // layout
     if( rXLayoutDom.is() )
@@ -516,7 +514,7 @@ void loadDiagram( const ShapePtr& pShape,
                        rXLayoutDom,
                        "OOXLayout",
                        pDiagram,
-                       new DiagramLayoutFragmentHandler( rFilter, aEmpty, pLayout ));
+                       new DiagramLayoutFragmentHandler( rFilter, "", pLayout ));
 
     // style
     if( rXQStyleDom.is() )
@@ -524,7 +522,7 @@ void loadDiagram( const ShapePtr& pShape,
                        rXQStyleDom,
                        "OOXStyle",
                        pDiagram,
-                       new DiagramQStylesFragmentHandler( rFilter, aEmpty, pDiagram->getStyles() ));
+                       new DiagramQStylesFragmentHandler( rFilter, "", pDiagram->getStyles() ));
 
     // colors
     if( rXColorStyleDom.is() )
@@ -532,7 +530,7 @@ void loadDiagram( const ShapePtr& pShape,
                        rXColorStyleDom,
                        "OOXColor",
                        pDiagram,
-                       new ColorFragmentHandler( rFilter, aEmpty, pDiagram->getColors() ));
+                       new ColorFragmentHandler( rFilter, "", pDiagram->getColors() ));
 
     // diagram loaded. now lump together & attach to shape
     pDiagram->addTo(pShape);
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f4e2e41cb730..ec57a0cf1b65 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -581,8 +581,7 @@ Reference< XShape > Shape::createAndInsert(
             uno::Reference< text::XText > xText( mxShape, uno::UNO_QUERY );
             if ( xText.is() )
             {
-                OUString aEmpty;
-                xText->setString( aEmpty );
+                xText->setString( "" );
             }
         }
 
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
index 4cf8b2b0b62c..1e70c4275d27 100644
--- a/oox/source/ppt/dgmimport.cxx
+++ b/oox/source/ppt/dgmimport.cxx
@@ -62,7 +62,6 @@ bool QuickDiagrammingImport::importDocument() throw (css::uno::RuntimeException,
         file:///<path-to-oox-module>/source/dump/pptxdumper.ini. */
     OOX_DUMP_FILE( ::oox::dump::pptx::Dumper );
 
-    OUString aEmpty;
     OUString aFragmentPath = getFragmentPathFromFirstTypeFromOfficeDoc( "diagramLayout" );
 
     Reference<drawing::XShapes> xParentShape(getParentShape(),
@@ -71,10 +70,10 @@ bool QuickDiagrammingImport::importDocument() throw (css::uno::RuntimeException,
         new oox::drawingml::Shape( "com.sun.star.drawing.DiagramShape" ) );
     drawingml::loadDiagram(pShape,
                            *this,
-                           aEmpty,
+                           "",
                            aFragmentPath,
-                           aEmpty,
-                           aEmpty);
+                           "",
+                           "");
     oox::drawingml::ThemePtr pTheme(
         new oox::drawingml::Theme());
     basegfx::B2DHomMatrix aMatrix;