summaryrefslogtreecommitdiff
path: root/sw/inc/swserv.hxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-10-22 14:07:32 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-10-22 14:07:32 +0000
commit5a2f386789157cda6768e7cb11e455a61dae42b5 (patch)
treebb40c725e0be89d241102bff385c530e3833444c /sw/inc/swserv.hxx
parent3185537650d9cdc4cef061085a38e9028d2d20ab (diff)
INTEGRATION: CWS swusing (1.6.38); FILE MERGED
2007/10/10 14:14:49 tl 1.6.38.1: #i82476# make newly added 'using' declarations private
Diffstat (limited to 'sw/inc/swserv.hxx')
-rw-r--r--sw/inc/swserv.hxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index 28f7a81ae21d..7c4d0c31457b 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: swserv.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: hr $ $Date: 2007-09-27 08:12:04 $
+ * last change: $Author: vg $ $Date: 2007-10-22 15:07:32 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -48,6 +48,8 @@ class SwPaM;
class SwServerObject : public ::sfx2::SvLinkSource
{
+ using sfx2::SvLinkSource::SendDataChanged;
+
protected:
enum ServerModes { BOOKMARK_SERVER, TABLE_SERVER, SECTION_SERVER, NONE_SERVER } eType;
union {
@@ -83,7 +85,6 @@ public:
BOOL SetData( const String & rMimeType,
const ::com::sun::star::uno::Any& rData );
- using sfx2::SvLinkSource::SendDataChanged;
virtual void SendDataChanged( const SwPosition& rPos );
virtual void SendDataChanged( const SwPaM& rRange );