diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-16 15:54:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-17 09:06:49 +0200 |
| commit | b855e1ee655cbe3a359203c361326c25439e3cb5 (patch) | |
| tree | a73784ee914dd719c479e585afadbc84ccd941a7 /sw | |
| parent | 8e877501dc903f83f420c4d69cf2661efbf14740 (diff) | |
convert sw/source/core/inc/SwPortionHandler.hxx from String to OUString
Change-Id: Ide6562f7807f59fecbe3f8b3427342de3811f411
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/access/accportions.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/access/accportions.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/inc/SwPortionHandler.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/text/xmldump.cxx | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index 2aa55bdc01d2..446050a0b664 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -126,7 +126,7 @@ void SwAccessiblePortionData::Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int } void SwAccessiblePortionData::Special( - sal_uInt16 nLength, const String& rText, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/) + sal_uInt16 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/) { OSL_ENSURE( nModelPosition >= 0, "illegal position" ); OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(), diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx index 5da31863f51d..f85e40dd97c1 100644 --- a/sw/source/core/access/accportions.hxx +++ b/sw/source/core/access/accportions.hxx @@ -97,7 +97,7 @@ public: // SwPortionHandler methods virtual void Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0); - virtual void Special(sal_uInt16 nLength, const String& rText, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0); + virtual void Special(sal_uInt16 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0); virtual void LineBreak(KSHORT nWidth); virtual void Skip(sal_uInt16 nLength); virtual void Finish(); diff --git a/sw/source/core/inc/SwPortionHandler.hxx b/sw/source/core/inc/SwPortionHandler.hxx index 455c21a8cdf7..325deb9ccc03 100644 --- a/sw/source/core/inc/SwPortionHandler.hxx +++ b/sw/source/core/inc/SwPortionHandler.hxx @@ -23,8 +23,6 @@ #include <tools/solar.h> #include <txttypes.hxx> -class String; - /** The SwPortionHandler interface implements a visitor for the layout * engine's text portions. This can be used to gather information of * the on-screen representation of a single paragraph. @@ -68,7 +66,7 @@ public: */ virtual void Special( sal_uInt16 nLength, /// length of this portion in the model string - const String& rText, /// text which is painted on-screen + const OUString& rText, /// text which is painted on-screen sal_uInt16 nType, /// type of this portion sal_Int32 nHeight = 0, /// font height of the painted text sal_Int32 nWidth = 0 /// width of this portion diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index fabdcd867340..1b72333fed13 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -147,7 +147,7 @@ class XmlPortionDumper:public SwPortionHandler font size of the painted text */ virtual void Special( sal_uInt16 nLength, - const String & rText, + const OUString & rText, sal_uInt16 nType, sal_Int32 nHeight, sal_Int32 nWidth ) |