diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-02-08 09:06:10 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-08 14:57:16 +0000 |
| commit | 9e310cc32923ceb4b18d97ce68d54a339b935f01 (patch) | |
| tree | d79b44b80c15f6bdb3116db4c9b6955a9e6cb4c9 /vcl/inc | |
| parent | 9c427991d9658a870ee0eb1bdc4cd3b393c93fd5 (diff) | |
fdo#38838 Some removal/replacement of the String/UniString with OUString
Change-Id: I6daea312198fae3a9717bd8d4fea6371aa4cd275
Reviewed-on: https://gerrit.libreoffice.org/1962
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/salwtype.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/vcl/graph.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/win/saldata.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/window.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index e9cd489ad041..98651c278374 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -192,7 +192,7 @@ struct SalMouseActivateEvent struct SalExtTextInputEvent { sal_uLong mnTime; // Time in ms, when event is created - UniString maText; // Text + OUString maText; // Text const sal_uInt16* mpTextAttr; // Text-Attribute sal_uLong mnCursorPos; // Cursor-Position sal_uLong mnDeltaStart; // Start-Position of last change @@ -228,7 +228,7 @@ struct SalInputContextChangeEvent // SURROUNDINGTEXTREQUEST struct SalSurroundingTextRequestEvent { - UniString maText; // Text + OUString maText; // Text sal_uLong mnStart; // The beginning index of selected range sal_uLong mnEnd; // The end index of selected range }; diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx index b0b1a2be4e16..4f1facae5395 100644 --- a/vcl/inc/vcl/graph.hxx +++ b/vcl/inc/vcl/graph.hxx @@ -142,7 +142,7 @@ public: void Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSize ) const; - static void DrawEx( OutputDevice* pOutDev, const String& rText, + static void DrawEx( OutputDevice* pOutDev, const OUString& rText, Font& rFont, const BitmapEx& rBitmap, const Point& rDestPt, const Size& rDestSize ); diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index f7a3f0075d16..1fef0cdd8396 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -232,7 +232,7 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ); // \WIN\SOURCE\APP\SALDATA.CXX rtl_TextEncoding ImplSalGetSystemEncoding(); -UniString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen = STRING_LEN ); +OUString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen = STRING_LEN ); int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ); // ----------- diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 53c59dcec0fc..e6b669d63b0f 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -116,7 +116,7 @@ long ImplWindowFrameProc( Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, co struct ImplWinData { - UniString* mpExtOldText; + OUString* mpExtOldText; sal_uInt16* mpExtOldAttrAry; Rectangle* mpCursorRect; long mnCursorExtWidth; |