diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 07:35:26 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 07:35:26 +0000 |
| commit | 4231cec5e26b77609abe64497cbd32ce24c7bf5a (patch) | |
| tree | aabb750c3e3e33758ad94f795cf0d7e8ddcb1fea /sw | |
| parent | 370f37d2676e938bc96b3b7eb5b10ca8d1a5e9fb (diff) | |
INTEGRATION: CWS tune03 (1.5.222); FILE MERGED
2004/07/19 19:10:36 mhu 1.5.222.1: #i29979# Added SW_DLLPUBLIC/PRIVATE (see swdllapi.h) to exported symbols/classes.
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/fmtsrnd.hxx | 9 | ||||
| -rw-r--r-- | sw/inc/fmturl.hxx | 16 |
2 files changed, 17 insertions, 8 deletions
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index a3ed0bae6e6c..e24224a50a22 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtsrnd.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2004-02-02 18:00:07 $ + * last change: $Author: rt $ $Date: 2004-08-23 08:35:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,9 @@ #ifndef _FMTSRND_HXX #define _FMTSRND_HXX +#ifndef INCLUDED_SWDLLAPI_H +#include "swdllapi.h" +#endif #ifndef _HINTIDS_HXX #include <hintids.hxx> #endif @@ -87,7 +90,7 @@ enum SwSurround { SURROUND_END }; -class SwFmtSurround: public SfxEnumItem +class SW_DLLPUBLIC SwFmtSurround: public SfxEnumItem { BOOL bAnchorOnly :1; BOOL bContour :1; diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index c652ce6d6fdd..4f4e0298d870 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmturl.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2004-02-02 18:00:41 $ + * last change: $Author: rt $ $Date: 2004-08-23 08:35:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,10 +61,13 @@ #ifndef _FMTURL_HXX #define _FMTURL_HXX - #ifndef _SFXPOOLITEM_HXX //autogen #include <svtools/poolitem.hxx> #endif + +#ifndef INCLUDED_SWDLLAPI_H +#include "swdllapi.h" +#endif #ifndef _HINTIDS_HXX #include <hintids.hxx> #endif @@ -77,7 +80,7 @@ class IntlWrapper; // URL, ServerMap und ClientMap -class SwFmtURL: public SfxPoolItem +class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem { String sTargetFrameName; // in diesen Frame soll die URL String sURL; //Einfache URL @@ -90,8 +93,11 @@ class SwFmtURL: public SfxPoolItem public: SwFmtURL(); + + // @@@ copy construction allowed, but assigment is not? @@@ SwFmtURL( const SwFmtURL& ); - ~SwFmtURL(); + + virtual ~SwFmtURL(); // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; |