diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-16 08:45:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-17 09:05:27 +0200 |
| commit | 5579f143039d001d903944e08326f13093494245 (patch) | |
| tree | 4c3c565ea77a613a9b7414708b898765db5db729 /vcl/inc | |
| parent | 6941b7c8e4459e1c3e0213a8ad9e9e5d0d591c22 (diff) | |
convert VCL from String to OUString
Change-Id: Ia87d498f0875caa81d6ae85c505bae2d1da3c51c
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/outfont.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/svdata.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 0da8ca72ab34..e3af7b3f425a 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -371,7 +371,7 @@ private: // TODO: at least the ones which just differ in orientation, stretching or height typedef ::std::pair<sal_UCS4,FontWeight> GFBCacheKey; struct GFBCacheKey_Hash{ size_t operator()( const GFBCacheKey& ) const; }; - typedef ::boost::unordered_map<GFBCacheKey,String,GFBCacheKey_Hash> UnicodeFallbackList; + typedef ::boost::unordered_map<GFBCacheKey,OUString,GFBCacheKey_Hash> UnicodeFallbackList; UnicodeFallbackList* mpUnicodeFallbackList; }; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index f594638d4101..bc4a59b89a02 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -119,7 +119,7 @@ struct ImplSVAppData OUString* mpAppName; // Application name OUString* mpAppFileName; // Abs. Application FileName OUString* mpDisplayName; // Application Display Name - String* mpFontPath; // Additional Fontpath + OUString* mpFontPath; // Additional Fontpath Help* mpHelp; // Application help PopupMenu* mpActivePopupMenu; // Actives Popup-Menu (in Execute) ImplIdleMgr* mpIdleMgr; // Idle-Manager |