INTEGRATION: CWS presfixes01 (1.3.6); FILE MERGED

2005/02/20 00:38:25 thb 1.3.6.2: RESYNC: (1.3-1.4); FILE MERGED
2005/02/16 11:14:30 fs 1.3.6.1: #i42558# drafts.com.sun.star.drawing/rendering/geometry moved to com.sun.star.*
This commit is contained in:
Vladimir Glazounov
2005-03-10 12:26:35 +00:00
parent 893bfed878
commit 0a1aa30446

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: textaction.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: rt $ $Date: 2005-01-28 15:30:41 $
* last change: $Author: vg $ $Date: 2005-03-10 13:26:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -66,8 +66,8 @@
#include <rtl/logfile.hxx>
#endif
#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XCANVAS_HPP_
#include <drafts/com/sun/star/rendering/XCanvas.hpp>
#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP_
#include <com/sun/star/rendering/XCanvas.hpp>
#endif
#ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
@@ -100,7 +100,6 @@
#include <mtftools.hxx>
using namespace ::drafts::com::sun::star;
using namespace ::com::sun::star;
namespace cppcanvas