summaryrefslogtreecommitdiff
path: root/sw/source/ui/inc/outline.hxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-10-22 14:21:26 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-10-22 14:21:26 +0000
commitb5b9923472583ddcaa39c53f21af9913cc5fed57 (patch)
tree7247d71da43bf295cb8c758a8a67a4c057f54758 /sw/source/ui/inc/outline.hxx
parentf7494a526f80e0ac6d1161593b4db771451d62e9 (diff)
INTEGRATION: CWS swusing (1.8.36); FILE MERGED
2007/10/10 14:15:12 tl 1.8.36.1: #i82476# make newly added 'using' declarations private
Diffstat (limited to 'sw/source/ui/inc/outline.hxx')
-rw-r--r--sw/source/ui/inc/outline.hxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx
index 4dd7e1b4cc7d..6d037de6fd0f 100644
--- a/sw/source/ui/inc/outline.hxx
+++ b/sw/source/ui/inc/outline.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: outline.hxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: hr $ $Date: 2007-09-27 12:06:55 $
+ * last change: $Author: vg $ $Date: 2007-10-22 15:21:26 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -165,15 +165,16 @@ class SwOutlineSettingsTabPage : public SfxTabPage
void SetModified(){aPreviewWIN.Invalidate();}
void CheckForStartValue_Impl(sal_uInt16 nNumberingType);
+ using TabPage::ActivatePage;
+ using TabPage::DeactivatePage;
+
public:
SwOutlineSettingsTabPage(Window* pParent, const SfxItemSet& rSet);
~SwOutlineSettingsTabPage();
void SetWrtShell(SwWrtShell* pShell);
- using TabPage::ActivatePage;
virtual void ActivatePage(const SfxItemSet& rSet);
- using TabPage::DeactivatePage;
virtual int DeactivatePage(SfxItemSet *pSet);
virtual BOOL FillItemSet( SfxItemSet& rSet );