From 5a2f386789157cda6768e7cb11e455a61dae42b5 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Mon, 22 Oct 2007 14:07:32 +0000
Subject: 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

---
 sw/inc/ftninfo.hxx | 7 ++++---
 sw/inc/swserv.hxx  | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'sw')

diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index d81750771125..da0579b9015d 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ftninfo.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: hr $ $Date: 2007-09-27 08:03:59 $
+ *  last change: $Author: vg $ $Date: 2007-10-22 15:05:47 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -105,6 +105,8 @@ enum SwFtnNum
 
 class SW_DLLPUBLIC SwFtnInfo: public SwEndNoteInfo
 {
+    using SwEndNoteInfo::operator ==;
+
 public:
     String    aQuoVadis;
     String    aErgoSum;
@@ -114,7 +116,6 @@ public:
 
     SwFtnInfo& operator=(const SwFtnInfo&);
 
-    using SwEndNoteInfo::operator ==;
     BOOL operator==( const SwFtnInfo &rInf ) const;
 
     SwFtnInfo(SwTxtFmtColl* pTxtColl = 0);
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 );
 
-- 
cgit