Kaydet (Commit) b855e1ee authored tarafından Noel Grandin's avatar Noel Grandin

convert sw/source/core/inc/SwPortionHandler.hxx from String to OUString

Change-Id: Ide6562f7807f59fecbe3f8b3427342de3811f411
üst 8e877501
...@@ -126,7 +126,7 @@ void SwAccessiblePortionData::Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int ...@@ -126,7 +126,7 @@ void SwAccessiblePortionData::Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int
} }
void SwAccessiblePortionData::Special( 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 >= 0, "illegal position" );
OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(), OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(),
......
...@@ -97,7 +97,7 @@ public: ...@@ -97,7 +97,7 @@ public:
// SwPortionHandler methods // SwPortionHandler methods
virtual void Text(sal_uInt16 nLength, sal_uInt16 nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0); 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 LineBreak(KSHORT nWidth);
virtual void Skip(sal_uInt16 nLength); virtual void Skip(sal_uInt16 nLength);
virtual void Finish(); virtual void Finish();
......
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include <tools/solar.h> #include <tools/solar.h>
#include <txttypes.hxx> #include <txttypes.hxx>
class String;
/** The SwPortionHandler interface implements a visitor for the layout /** The SwPortionHandler interface implements a visitor for the layout
* engine's text portions. This can be used to gather information of * engine's text portions. This can be used to gather information of
* the on-screen representation of a single paragraph. * the on-screen representation of a single paragraph.
...@@ -68,7 +66,7 @@ public: ...@@ -68,7 +66,7 @@ public:
*/ */
virtual void Special( virtual void Special(
sal_uInt16 nLength, /// length of this portion in the model string 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_uInt16 nType, /// type of this portion
sal_Int32 nHeight = 0, /// font height of the painted text sal_Int32 nHeight = 0, /// font height of the painted text
sal_Int32 nWidth = 0 /// width of this portion sal_Int32 nWidth = 0 /// width of this portion
......
...@@ -147,7 +147,7 @@ class XmlPortionDumper:public SwPortionHandler ...@@ -147,7 +147,7 @@ class XmlPortionDumper:public SwPortionHandler
font size of the painted text font size of the painted text
*/ */
virtual void Special( sal_uInt16 nLength, virtual void Special( sal_uInt16 nLength,
const String & rText, const OUString & rText,
sal_uInt16 nType, sal_uInt16 nType,
sal_Int32 nHeight, sal_Int32 nHeight,
sal_Int32 nWidth ) sal_Int32 nWidth )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment