summaryrefslogtreecommitdiff
path: root/canvas/source
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-12-13 13:39:06 +0000
committerKurt Zenker <kz@openoffice.org>2006-12-13 13:39:06 +0000
commit6fd593199d1cb308754ed97be1caa18062040785 (patch)
tree505d1567881f4bbc913062cca5e30d61586638c1 /canvas/source
parent16a35ca29b152539602069dacb9e52055af82bfd (diff)
INTEGRATION: CWS presfixes09 (1.2.4); FILE MERGED
2006/04/20 15:13:25 thb 1.2.4.1: #i10000# Fixed merge problems
Diffstat (limited to 'canvas/source')
-rw-r--r--canvas/source/cairo/cairo_canvasfont.hxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx
index e91ff37d40b8..d79b6b44eed2 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: cairo_canvasfont.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: kz $ $Date: 2006-02-28 10:34:35 $
+ * last change: $Author: kz $ $Date: 2006-12-13 14:39:06 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -51,7 +51,6 @@
#include <canvas/vclwrapper.hxx>
#include "cairo_spritecanvas.hxx"
-#include "cairo_impltools.hxx"
#include <boost/utility.hpp>