INTEGRATION: CWS ooo20040704 (1.2.10); FILE MERGED

2004/06/28 12:12:37 cmc 1.2.10.1: #i30801 no need to prepend external before boost

5 files changed, 15 insertions, 15 deletions

diff --git a/cppcanvas/inc/cppcanvas/canvas.hxx b/cppcanvas/inc/cppcanvas/canvas.hxx
index bc82b296cb35..103092b4facc 100644
--- a/cppcanvas/inc/cppcanvas/canvas.hxx
+++ b/cppcanvas/inc/cppcanvas/canvas.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: canvas.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: thb $ $Date: 2004-03-18 10:40:58 $
+ *  last change: $Author: rt $ $Date: 2004-09-08 16:56:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,7 +67,7 @@
 #endif
 
 #ifndef BOOST_SHARED_PTR_HPP_INCLUDED
-#include <external/boost/shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 #endif
 
 #ifndef _CPPCANVAS_FONT_HXX
diff --git a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx b/cppcanvas/inc/cppcanvas/canvasgraphic.hxx
index b986cfd4536f..eefa60f496fa 100644
--- a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx
+++ b/cppcanvas/inc/cppcanvas/canvasgraphic.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: canvasgraphic.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: thb $ $Date: 2004-03-18 10:40:58 $
+ *  last change: $Author: rt $ $Date: 2004-09-08 16:57:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,7 +67,7 @@
 #endif
 
 #ifndef BOOST_SHARED_PTR_HPP_INCLUDED
-#include <external/boost/shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 #endif
 
 #ifndef _CPPCANVAS_COLOR_HXX
diff --git a/cppcanvas/inc/cppcanvas/color.hxx b/cppcanvas/inc/cppcanvas/color.hxx
index 2adf71b30683..9e7a9b6dd22f 100644
--- a/cppcanvas/inc/cppcanvas/color.hxx
+++ b/cppcanvas/inc/cppcanvas/color.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: color.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: thb $ $Date: 2004-03-18 10:40:58 $
+ *  last change: $Author: rt $ $Date: 2004-09-08 16:57:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,7 +67,7 @@
 #endif
 
 #ifndef BOOST_SHARED_PTR_HPP_INCLUDED
-#include <external/boost/shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 #endif
 
 
diff --git a/cppcanvas/inc/cppcanvas/customsprite.hxx b/cppcanvas/inc/cppcanvas/customsprite.hxx
index 2990133c9783..6c3519090753 100644
--- a/cppcanvas/inc/cppcanvas/customsprite.hxx
+++ b/cppcanvas/inc/cppcanvas/customsprite.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: customsprite.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: thb $ $Date: 2004-03-18 10:40:58 $
+ *  last change: $Author: rt $ $Date: 2004-09-08 16:57:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,7 +67,7 @@
 #endif
 
 #ifndef BOOST_SHARED_PTR_HPP_INCLUDED
-#include <external/boost/shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 #endif
 
 #ifndef _CPPCANVAS_SPRITE_HXX
diff --git a/cppcanvas/inc/cppcanvas/font.hxx b/cppcanvas/inc/cppcanvas/font.hxx
index 6439fb8cf3d2..84f6be8aa2c0 100644
--- a/cppcanvas/inc/cppcanvas/font.hxx
+++ b/cppcanvas/inc/cppcanvas/font.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: font.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: thb $ $Date: 2004-03-18 10:40:59 $
+ *  last change: $Author: rt $ $Date: 2004-09-08 16:57:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,7 +67,7 @@
 #endif
 
 #ifndef BOOST_SHARED_PTR_HPP_INCLUDED
-#include <external/boost/shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 #endif
 
 namespace rtl