From e2af7b42e99aef5c9c0ffd2488950700a80249ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Wed, 30 Mar 2005 07:34:32 +0000
Subject: [PATCH] INTEGRATION: CWS presfixes02 (1.4.2); FILE MERGED 2005/03/14
 16:04:57 thb 1.4.2.1: #i35136# #i36914# #i41113# #i44100# #i40115# #i41839#
 #i44404# Merge from presfixes01 patches

---
 cppcanvas/source/wrapper/implcanvas.cxx       | 5 ++---
 cppcanvas/source/wrapper/implcolor.cxx        | 5 ++---
 cppcanvas/source/wrapper/implcustomsprite.cxx | 5 ++---
 cppcanvas/source/wrapper/implfont.cxx         | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index e14fa1b7fd7f..1c6fbb821911 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implcanvas.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: vg $ $Date: 2005-03-10 13:29:08 $
+ *  last change: $Author: rt $ $Date: 2005-03-30 08:33:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,7 +82,6 @@
 #include <implcolor.hxx>
 
 
-using namespace ::com::sun::star;
 using namespace ::com::sun::star;
 
 namespace cppcanvas
diff --git a/cppcanvas/source/wrapper/implcolor.cxx b/cppcanvas/source/wrapper/implcolor.cxx
index 39aefc2c22e8..61e75ada3be2 100644
--- a/cppcanvas/source/wrapper/implcolor.cxx
+++ b/cppcanvas/source/wrapper/implcolor.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implcolor.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: vg $ $Date: 2005-03-10 13:29:41 $
+ *  last change: $Author: rt $ $Date: 2005-03-30 08:33:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,6 @@
 #include <implcolor.hxx>
 #include <tools.hxx>
 
-using namespace ::com::sun::star;
 using namespace ::com::sun::star;
 
 namespace cppcanvas
diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx
index 0719d4d919f6..27762347ce44 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.cxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implcustomsprite.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: vg $ $Date: 2005-03-10 13:30:10 $
+ *  last change: $Author: rt $ $Date: 2005-03-30 08:34:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,6 @@
 #include <implcustomsprite.hxx>
 #include <implcanvas.hxx>
 
-using namespace ::com::sun::star;
 using namespace ::com::sun::star;
 
 namespace cppcanvas
diff --git a/cppcanvas/source/wrapper/implfont.cxx b/cppcanvas/source/wrapper/implfont.cxx
index da8310d9177e..524a5d63537c 100644
--- a/cppcanvas/source/wrapper/implfont.cxx
+++ b/cppcanvas/source/wrapper/implfont.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implfont.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: vg $ $Date: 2005-03-10 13:30:36 $
+ *  last change: $Author: rt $ $Date: 2005-03-30 08:34:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,7 +63,6 @@
 #include <canvas/canvastools.hxx>
 
 
-using namespace ::com::sun::star;
 using namespace ::com::sun::star;
 
 /* Definition of Font class */