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

convert include/editeng/AccessibleStringWrap.hxx from String to OUString

Change-Id: I31c91ee196351abcd884240052359fac8aff6e1d
üst cfb4463d
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
// //
//------------------------------------------------------------------------ //------------------------------------------------------------------------
AccessibleStringWrap::AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText ) : AccessibleStringWrap::AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const OUString& rText ) :
mrDev( rDev ), mrDev( rDev ),
mrFont( rFont ), mrFont( rFont ),
maText( rText ) maText( rText )
...@@ -46,7 +46,7 @@ sal_Bool AccessibleStringWrap::GetCharacterBounds( sal_Int32 nIndex, Rectangle& ...@@ -46,7 +46,7 @@ sal_Bool AccessibleStringWrap::GetCharacterBounds( sal_Int32 nIndex, Rectangle&
mrFont.SetPhysFont( &mrDev ); mrFont.SetPhysFont( &mrDev );
// #108900# Handle virtual position one-past-the end of the string // #108900# Handle virtual position one-past-the end of the string
if( nIndex >= maText.Len() ) if( nIndex >= maText.getLength() )
{ {
// create a caret bounding rect that has the height of the // create a caret bounding rect that has the height of the
// current font and is one pixel wide. // current font and is one pixel wide.
...@@ -78,7 +78,7 @@ sal_Int32 AccessibleStringWrap::GetIndexAtPoint( const Point& rPoint ) ...@@ -78,7 +78,7 @@ sal_Int32 AccessibleStringWrap::GetIndexAtPoint( const Point& rPoint )
{ {
// search for character bounding box containing given point // search for character bounding box containing given point
Rectangle aRect; Rectangle aRect;
sal_Int32 i, nLen = maText.Len(); sal_Int32 i, nLen = maText.getLength();
for( i=0; i<nLen; ++i ) for( i=0; i<nLen; ++i )
{ {
GetCharacterBounds(i, aRect); GetCharacterBounds(i, aRect);
......
...@@ -40,7 +40,7 @@ class AccessibleStringWrap ...@@ -40,7 +40,7 @@ class AccessibleStringWrap
{ {
public: public:
EDITENG_DLLPUBLIC AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText ); EDITENG_DLLPUBLIC AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const OUString& rText );
EDITENG_DLLPUBLIC sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect ); EDITENG_DLLPUBLIC sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect );
EDITENG_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint ); EDITENG_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint );
...@@ -49,7 +49,7 @@ private: ...@@ -49,7 +49,7 @@ private:
OutputDevice& mrDev; OutputDevice& mrDev;
SvxFont& mrFont; SvxFont& mrFont;
String maText; OUString maText;
}; };
#endif /* _ACCESSIBLESTRINGWRAP_HXX */ #endif /* _ACCESSIBLESTRINGWRAP_HXX */
......
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