From 5579f143039d001d903944e08326f13093494245 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 16 Sep 2013 08:45:30 +0200 Subject: convert VCL from String to OUString Change-Id: Ia87d498f0875caa81d6ae85c505bae2d1da3c51c --- vcl/inc/outfont.hxx | 2 +- vcl/inc/svdata.hxx | 2 +- vcl/source/filter/sgvmain.hxx | 22 +++++++++++----------- vcl/source/filter/wmf/winmtf.cxx | 2 +- vcl/source/filter/wmf/winmtf.hxx | 2 +- vcl/source/filter/wmf/wmfwr.cxx | 4 ++-- vcl/source/gdi/cvtsvm.cxx | 2 +- vcl/source/gdi/font.cxx | 2 +- vcl/source/gdi/pdfwriter_impl.hxx | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) (limited to 'vcl') 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 GFBCacheKey; struct GFBCacheKey_Hash{ size_t operator()( const GFBCacheKey& ) const; }; - typedef ::boost::unordered_map UnicodeFallbackList; + typedef ::boost::unordered_map 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 diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index a42795e05bb7..ea4a897aa266 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -298,17 +298,17 @@ sal_uInt16 MulDiv(sal_uInt16 a, sal_uInt16 Mul, sal_uInt16 Div); class SgfFontOne { public: - SgfFontOne* Next; // Zeiger f"ur Listenverkettung - sal_uInt32 IFID; - sal_Bool Bold; - sal_Bool Ital; - sal_Bool Sans; - sal_Bool Serf; - sal_Bool Fixd; - FontFamily SVFamil; - CharSet SVChSet; - OUString SVFName; // z.B. "Times New Roman" = 15 Chars - sal_uInt16 SVWidth; // Durchschnittliche Zeichenbreite in % + SgfFontOne* Next; // Zeiger f"ur Listenverkettung + sal_uInt32 IFID; + sal_Bool Bold; + sal_Bool Ital; + sal_Bool Sans; + sal_Bool Serf; + sal_Bool Fixd; + FontFamily SVFamil; + rtl_TextEncoding SVChSet; + OUString SVFName; // z.B. "Times New Roman" = 15 Chars + sal_uInt16 SVWidth; // Durchschnittliche Zeichenbreite in % SgfFontOne(); void ReadOne(const OString& rID, OString& rDsc); }; diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index e189e0c5866d..9986da940437 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -140,7 +140,7 @@ void WinMtfPathObj::ClosePath() WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont ) { - CharSet eCharSet; + rtl_TextEncoding eCharSet; if ( ( rFont.lfCharSet == OEM_CHARSET ) || ( rFont.lfCharSet == DEFAULT_CHARSET ) ) eCharSet = RTL_TEXTENCODING_MS_1252; else diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 3d3ee97525a1..cd7f84186e64 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -701,7 +701,7 @@ public: void CreateObject( sal_Int32 nIndex, GDIObjectType, void* pStyle = NULL ); void DeleteObject( sal_Int32 nIndex ); void SelectObject( sal_Int32 nIndex ); - CharSet GetCharSet(){ return maFont.GetCharSet(); }; + rtl_TextEncoding GetCharSet(){ return maFont.GetCharSet(); }; WinMtfFillStyle& GetFillStyle () { return maFillStyle; } const Font& GetFont() const; void SetTextLayoutMode( const sal_uInt32 nLayoutMode ); diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index abd218c4b073..d69bd8fc5207 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -310,8 +310,8 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont) if (rFont.GetUnderline()==UNDERLINE_NONE) *pWMF << (sal_uInt8)0; else *pWMF << (sal_uInt8)1; if (rFont.GetStrikeout()==STRIKEOUT_NONE) *pWMF << (sal_uInt8)0; else *pWMF << (sal_uInt8)1; - CharSet eFontNameEncoding = rFont.GetCharSet(); - sal_uInt8 nCharSet = rtl_getBestWindowsCharsetFromTextEncoding( eFontNameEncoding ); + rtl_TextEncoding eFontNameEncoding = rFont.GetCharSet(); + sal_uInt8 nCharSet = rtl_getBestWindowsCharsetFromTextEncoding( eFontNameEncoding ); if ( eFontNameEncoding == RTL_TEXTENCODING_SYMBOL ) eFontNameEncoding = RTL_TEXTENCODING_MS_1252; if ( nCharSet == 1 ) diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 60fef66fbb12..a58b7194ed5c 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -793,7 +793,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> bItalic >> bOutline >> bShadow >> bTransparent; aFont.SetSize( Size( nWidth, nHeight ) ); - aFont.SetCharSet( (CharSet) nCharSet ); + aFont.SetCharSet( (rtl_TextEncoding) nCharSet ); aFont.SetFamily( (FontFamily) nFamily ); aFont.SetPitch( (FontPitch) nPitch ); aFont.SetAlign( (FontAlign) nAlign ); diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 3baff68a789c..5bbab2a32c42 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -373,7 +373,7 @@ void Font::SetFamily( FontFamily eFamily ) } } -void Font::SetCharSet( CharSet eCharSet ) +void Font::SetCharSet( rtl_TextEncoding eCharSet ) { DBG_CHKTHIS( Font, NULL ); diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index b8ab2136667e..6296497ee84f 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -83,7 +83,7 @@ public: int m_nAscent; int m_nDescent; FontFamily m_eFamily; // Family - CharSet m_eCharSet; // CharSet + rtl_TextEncoding m_eCharSet; // CharSet FontPitch m_ePitch; // Pitch FontWidth m_eWidthType; // WidthType FontWeight m_eWeight; // Weight -- cgit