diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-16 10:09:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-18 08:54:37 +0200 |
| commit | 60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch) | |
| tree | 17ff5aaa57f4d23e177f1fe423def1691139a4a8 /slideshow/source | |
| parent | 9c818268767d6a1c1bc731ae30c45883bab987e7 (diff) | |
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'slideshow/source')
| -rw-r--r-- | slideshow/source/engine/rehearsetimingsactivity.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx b/slideshow/source/engine/rehearsetimingsactivity.hxx index 63762cb985f8..f35b735e04dd 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.hxx +++ b/slideshow/source/engine/rehearsetimingsactivity.hxx @@ -30,7 +30,7 @@ #include <vector> #include <utility> -class Font; +namespace vcl { class Font; } namespace canvas{ namespace tools{ class ElapsedTime; }} namespace cppcanvas{ class CustomSprite; } namespace basegfx @@ -124,7 +124,7 @@ private: /// screen rect of sprite (in view coordinates!) ::basegfx::B2DRange maSpriteRectangle; - Font maFont; + vcl::Font maFont; boost::shared_ptr<WakeupEvent> mpWakeUpEvent; boost::shared_ptr<MouseHandler> mpMouseHandler; ::basegfx::B2IVector maSpriteSizePixel; |