summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-17 15:56:38 +0200
committerNoel Grandin <noel@peralex.com>2013-09-19 10:14:17 +0200
commit6b94f86ff981ca40b8ed65402ed167c4bc97a46a (patch)
treed6b00347b38498fb66f14198dc1097c04582e3b7 /sw
parent7287e9cba139f06a4ff53e10d7b8fdd30acad98c (diff)
convert sw/inc/ndarr.hxx from String to OUString
Change-Id: I21446a34aed1c9fc7e64f085839b1012031ba1e2
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/ndarr.hxx7
-rw-r--r--sw/source/core/graphic/ndgrf.cxx4
-rw-r--r--sw/source/core/ole/ndole.cxx2
3 files changed, 6 insertions, 7 deletions
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 4acccc34125f..2cdea1ba27ee 100644
--- a/sw/inc/ndarr.hxx
+++ b/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
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 6c0b540fe61d..67200ac16cfe 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/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,
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 9eff53940804..d0330598f04d 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/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." );