diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-10-24 09:20:29 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 13:41:58 +0100 |
| commit | dc4c10d72556a84a6e8cc1943fe352194f226b61 (patch) | |
| tree | 1093e27c9dac675e85c2c28578e1e69ca8b8e40a | |
| parent | 28525627b1ca6a24c3dbd3344fce302c6bde0cda (diff) | |
gtk3: post merge fixups
| -rw-r--r-- | vcl/generic/fontmanager/fontsubst.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 8 |
2 files changed, 6 insertions, 6 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); diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 67b480d9260e..16e702fcfd7d 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -244,10 +244,10 @@ extern "C" { case MotionNotify: case EnterNotify: case LeaveNotify: - nType = INPUT_MOUSE; + nType = VCL_INPUT_MOUSE; break; case XLIB_KeyPress: - nType = INPUT_KEYBOARD; + nType = VCL_INPUT_KEYBOARD; break; case Expose: case GraphicsExpose: @@ -277,11 +277,11 @@ extern "C" { case GDK_ENTER_NOTIFY: case GDK_LEAVE_NOTIFY: case GDK_SCROLL: - nType = INPUT_MOUSE; + nType = VCL_INPUT_MOUSE; break; case GDK_KEY_PRESS: case GDK_KEY_RELEASE: - nType = INPUT_KEYBOARD; + nType = VCL_INPUT_KEYBOARD; break; case GDK_EXPOSE: nType = INPUT_PAINT; |