summaryrefslogtreecommitdiff
path: root/vcl/generic
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2011-10-24 09:20:29 +0100
committerMichael Meeks <michael.meeks@suse.com>2011-10-25 13:41:58 +0100
commitdc4c10d72556a84a6e8cc1943fe352194f226b61 (patch)
tree1093e27c9dac675e85c2c28578e1e69ca8b8e40a /vcl/generic
parent28525627b1ca6a24c3dbd3344fce302c6bde0cda (diff)
gtk3: post merge fixups
Diffstat (limited to 'vcl/generic')
-rw-r--r--vcl/generic/fontmanager/fontsubst.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index bd6a0930d224..3bf2d0786719 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -61,7 +61,7 @@ class FcGlyphFallbackSubstititution
{
// TODO: add a cache
public:
- bool FindFontSubstitute( ImplFontSelectData&, OUString& rMissingCodes ) const;
+ bool FindFontSubstitute( ImplFontSelectData&, rtl::OUString& rMissingCodes ) const;
};
int SalGenericInstance::FetchFontSubstitutionFlags()
@@ -117,7 +117,7 @@ void SalGenericInstance::RegisterFontSubstitutors( ImplDevFontList* pList )
// -----------------------------------------------------------------------
-static ImplFontSelectData GetFcSubstitute(const ImplFontSelectData &rFontSelData, OUString& rMissingCodes )
+static ImplFontSelectData GetFcSubstitute(const ImplFontSelectData &rFontSelData, rtl::OUString& rMissingCodes )
{
ImplFontSelectData aRet(rFontSelData);