INTEGRATION: CWS swusing (1.4.36); FILE MERGED

2007/10/10 14:15:10 tl 1.4.36.1: #i82476# make newly added 'using' declarations private

3 files changed, 19 insertions, 19 deletions

diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 11a14b6d7c3a..9182f738377d 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: envprt.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2007-09-27 11:42:43 $
+ *  last change: $Author: vg $ $Date: 2007-10-22 15:15:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -93,11 +93,11 @@ class SwEnvPrtPage : public SfxTabPage
     using Window::GetParent;
     SwEnvDlg* GetParent() {return (SwEnvDlg*) SfxTabPage::GetParent()->GetParent();}
 
-public:
-
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
+public:
+
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet);
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index e5d217b91c24..6116e3eb1ed7 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: labprt.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2007-09-27 11:44:41 $
+ *  last change: $Author: vg $ $Date: 2007-10-22 15:15:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -82,11 +82,11 @@ class SwLabPrtPage : public SfxTabPage
     using Window::GetParent;
     SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();}
 
-public:
-
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
+public:
+
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet);
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 06113592df64..559433f13bba 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: swuilabimp.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2007-09-27 11:45:06 $
+ *  last change: $Author: vg $ $Date: 2007-10-22 15:15:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -81,10 +81,11 @@ class SwLabPage : public SfxTabPage
     void DisplayFormat  ();
     SwLabRec* GetSelectedEntryPos();
 
-public:
-
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
+    using Window::GetParent;
+
+public:
 
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
 
@@ -94,7 +95,6 @@ public:
     virtual sal_Bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 
-    using Window::GetParent;
     SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();}
 
     void    SetToBusinessCard();
@@ -143,11 +143,11 @@ class SwVisitingCardPage : public SfxTabPage
     SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet);
     ~SwVisitingCardPage();
 
-public:
-
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
+public:
+
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet);
@@ -195,11 +195,11 @@ class SwPrivateDataPage : public SfxTabPage
     SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet);
     ~SwPrivateDataPage();
 
-public:
-
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
+public:
+
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet);
@@ -245,11 +245,11 @@ class SwBusinessDataPage : public SfxTabPage
     SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet);
     ~SwBusinessDataPage();
 
-public:
-
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
+public:
+
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet);