diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:16:06 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:16:06 +0000 |
| commit | 9648c26d1213d319250936db9d39498bd0128c81 (patch) | |
| tree | e29f6d726eecbe06eb4a6d455176228dfc82db72 /svx/source/dialog/iconcdlg.hxx | |
| parent | 06735c39bfa4c7a9718146af77b6a87a649da56d (diff) | |
INTEGRATION: CWS sb59 (1.4.62); FILE MERGED
2006/08/18 12:02:48 sb 1.4.62.2: #i67487# Made code warning-free (wntmsci10).
2006/08/03 13:51:31 cl 1.4.62.1: removed compiler warnings
Diffstat (limited to 'svx/source/dialog/iconcdlg.hxx')
| -rw-r--r-- | svx/source/dialog/iconcdlg.hxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/svx/source/dialog/iconcdlg.hxx b/svx/source/dialog/iconcdlg.hxx index dd9a54f82b9e..beb2978130e9 100644 --- a/svx/source/dialog/iconcdlg.hxx +++ b/svx/source/dialog/iconcdlg.hxx @@ -4,9 +4,9 @@ * * $RCSfile: iconcdlg.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2006-06-19 15:15:32 $ + * last change: $Author: obo $ $Date: 2006-10-12 12:16:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -123,6 +123,9 @@ struct IconChoicePageData class IconChoicePage : public TabPage { + using TabPage::ActivatePage; + using TabPage::DeactivatePage; + private : const SfxItemSet* pSet; String aUserString; @@ -208,7 +211,7 @@ private : SfxItemSet* pExampleSet; USHORT* pRanges; - USHORT nResId; + sal_uInt32 nResId; BOOL bHideResetBtn; BOOL bModal; |