diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-06 14:22:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-06 14:22:48 +0000 |
| commit | 74347b04f5b4c519763b536a094d4332c06a1532 (patch) | |
| tree | c8a03cafadb92307417d8f39a5aa089659f86a65 | |
| parent | INTEGRATION: CWS os112 (1.22.204); FILE MERGED (diff) | |
| download | core-74347b04f5b4c519763b536a094d4332c06a1532.tar.gz core-74347b04f5b4c519763b536a094d4332c06a1532.zip | |
INTEGRATION: CWS lcwarnings2 (1.10.182); FILE MERGED
2008/04/17 12:34:56 tl 1.10.182.2: RESYNC: (1.10-1.11); FILE MERGED
2008/03/03 10:09:51 tl 1.10.182.1: #i83458# warning-free code wntmsci11
| -rw-r--r-- | sw/source/ui/inc/column.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index cb53e25a25ee..491a603d52ab 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: column.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -198,8 +198,8 @@ class SwColumnPage : public SfxTabPage void ResetColWidth(); void SetLabels( USHORT nVis ); - using TabPage::ActivatePage; - using TabPage::DeactivatePage; + using SfxTabPage::ActivatePage; + using SfxTabPage::DeactivatePage; virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); |