convert sw/inc/ndarr.hxx from String to OUString

Change-Id: I21446a34aed1c9fc7e64f085839b1012031ba1e2

sw/inc/ndarr.hxx

@@ -34,7 +34,6 @@
 
 class Graphic;
 class GraphicObject;
-class String;
 class SwAttrSet;
 class SfxItemSet;
 class SwCntntNode;
@@ -223,8 +222,8 @@ public:
                             SwAttrSet* pAutoAttr = 0 );
 
     SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere,
-                            const String& rGrfName,
-                            const String& rFltName,
+                            const OUString& rGrfName,
+                            const OUString& rFltName,
                             const Graphic* pGraphic,
                             SwGrfFmtColl *pColl,
                             SwAttrSet* pAutoAttr = 0,
@@ -240,7 +239,7 @@ public:
                             SwGrfFmtColl *pColl,
                             SwAttrSet* pAutoAttr = 0 ); ///< in ndole.cxx
     SwOLENode *MakeOLENode( const SwNodeIndex & rWhere,
-                            const String &rName,
+                            const OUString &rName,
                             sal_Int64 nAspect,
                             SwGrfFmtColl *pColl,
                             SwAttrSet* pAutoAttr ); ///< in ndole.cxx

sw/source/core/graphic/ndgrf.cxx

@@ -411,8 +411,8 @@ SwCntntNode *SwGrfNode::SplitCntntNode( const SwPosition & )
 }
 
 SwGrfNode * SwNodes::MakeGrfNode( const SwNodeIndex & rWhere,
-                                const String& rGrfName,
-                                const String& rFltName,
+                                const OUString& rGrfName,
+                                const OUString& rFltName,
                                 const Graphic* pGraphic,
                                 SwGrfFmtColl* pGrfColl,
                                 SwAttrSet* pAutoAttr,

sw/source/core/ole/ndole.cxx

@@ -410,7 +410,7 @@ SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere,
 
 
 SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere,
-    const String &rName, sal_Int64 nAspect, SwGrfFmtColl* pGrfColl, SwAttrSet* pAutoAttr )
+    const OUString &rName, sal_Int64 nAspect, SwGrfFmtColl* pGrfColl, SwAttrSet* pAutoAttr )
 {
     OSL_ENSURE( pGrfColl,"SwNodes::MakeOLENode: Formatpointer ist 0." );