summaryrefslogtreecommitdiff
path: root/svtools/source/urlobj
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2001-07-03 11:30:11 +0000
committerjp <jp@openoffice.org>2001-07-03 11:30:11 +0000
commit7ee4e61db4b63afe13777f80bea8da7114dd9d5b (patch)
treec4b414d7da8b287e2222d9d5fb8e07fc425f7b85 /svtools/source/urlobj
parente6373ce9389130dcf4043c15148ccf51f4c85aa9 (diff)
TFD taskforce changes
Diffstat (limited to 'svtools/source/urlobj')
-rw-r--r--svtools/source/urlobj/inetimg.cxx15
1 files changed, 12 insertions, 3 deletions
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index e51cf668d47c..e428e527d8e8 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: inetimg.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: jp $ $Date: 2001-03-27 14:11:14 $
+ * last change: $Author: jp $ $Date: 2001-07-03 12:29:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,12 +61,16 @@
#ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
#endif
+
+#ifndef TF_SVDATA
#ifndef _SOT_DTRANS_HXX
#include <sot/dtrans.hxx>
#endif
#ifndef _SOT_EXCHANGE_HXX
#include <sot/exchange.hxx>
#endif
+#endif
+
#ifndef _SOT_FORMATS_HXX
#include <sot/formats.hxx>
#endif
@@ -78,6 +82,10 @@
#include "inetimg.hxx"
+#define TOKEN_SEPARATOR '\001'
+
+#ifndef TF_SVDATA
+
// Die folgende Struktur wurde den Netscape-Sourcen entnommen:
// netscape/source/ns/cmd/winfe/feimages.cpp
struct ImageData_Impl {
@@ -95,7 +103,7 @@ struct ImageData_Impl {
sal_Char pImageURL[1]; // Append all variable-length strings starting here
};
-#define TOKEN_SEPARATOR '\001'
+
//=======================================================================
String INetImage::CopyExchange() const
@@ -235,6 +243,7 @@ BOOL INetImage::CopyFormats( SotDataObject& rObj ) const
// rTypeList.Append( SvDataType( SOT_FORMATSTR_ID_NETSCAPE_IMAGE, MEDIUM_MEMORY ) );
return TRUE;
}
+#endif
sal_Bool INetImage::Write( SvStream& rOStm, ULONG nFormat ) const
{