diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-07 11:45:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-12 11:56:47 +0200 |
| commit | 47aaa1c0b1c1c589c80d9735deebbb784bfd7dd4 (patch) | |
| tree | 76a88270fd6fc3cc7bc02086ffa51be8319954f2 /vcl | |
| parent | ebe636ca7208b8b81b2e51e2d4055c2eaec9ff67 (diff) | |
convert vcl/source/filter/sgvmain.hxx from String to OUString
Change-Id: I9cca6e7d5f2849c8b180aa99021e964ebfc34dd1
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/sgvmain.hxx | 10 | ||||
| -rw-r--r-- | vcl/source/filter/sgvtext.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index 7d7d689cc9f6..1de5de8e0087 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -322,9 +322,9 @@ public: sal_Bool Sans; sal_Bool Serf; sal_Bool Fixd; - FontFamily SVFamil; - CharSet SVChSet; - String SVFName; // z.B. "Times New Roman" = 15 Chars + FontFamily SVFamil; + CharSet SVChSet; + OUString SVFName; // z.B. "Times New Roman" = 15 Chars sal_uInt16 SVWidth; // Durchschnittliche Zeichenbreite in % SgfFontOne(); void ReadOne(const OString& rID, OString& rDsc); @@ -332,7 +332,7 @@ public: class SgfFontLst { public: - String FNam; // vollst�ndiger Filename des Inifiles + OUString FNam; // vollst�ndiger Filename des Inifiles SgfFontOne* pList; // Listenanfang SgfFontOne* Last; // Listenende sal_uInt32 LastID; // f�r schnelleren Zugriff bei Wiederholungen @@ -340,7 +340,7 @@ public: bool Tried; SgfFontLst(); ~SgfFontLst(); - void AssignFN(const String& rFName); + void AssignFN(const OUString& rFName); void ReadList(); void RausList(); SgfFontOne* GetFontDesc(sal_uInt32 ID); diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index d9baff4699fd..9ef64678ccdd 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -519,7 +519,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u Color aColor; sal_uLong Grad; sal_uLong Brei; - String FNam; + OUString FNam; sal_uInt16 StdBrei=50; // Durchschnittliche Zeichenbreite in % von Schriftgrad bool bFit=(FitXMul!=1 || FitXDiv!=1 || FitYMul!=1 || FitYDiv!=1); @@ -1204,7 +1204,7 @@ void SgfFontLst::RausList() LastLn=NULL; } -void SgfFontLst::AssignFN(const String& rFName) +void SgfFontLst::AssignFN(const OUString& rFName) { FNam=rFName; } void SgfFontLst::ReadList() |