diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 17:43:59 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 17:43:59 +0000 |
| commit | 0f9fdfc4459520c9c874c1bd25cabc81ff04e079 (patch) | |
| tree | 82fff32fda313b24aa6bc84b157a3be762999139 /sd | |
| parent | 30d63512c57c57dab68b8761ce696d24b41b29b5 (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.4.316); FILE MERGED
2006/11/27 13:48:12 cl 1.4.316.1: #i69285# warning free code changes for sd project
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/toolpanel/TestMenu.hxx | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx b/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx index b3ce04d6d16a..d23b40b8c086 100644 --- a/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx +++ b/sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx @@ -4,9 +4,9 @@ * * $RCSfile: SimpleLayoutWrapper.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 06:32:21 $ + * last change: $Author: kz $ $Date: 2006-12-12 18:41:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -64,6 +64,8 @@ public: virtual bool IsResizable (void); virtual ::Window* GetWindow (void); + using sd::toolpanel::ILayoutableWindow::GetPreferredWidth; + using sd::toolpanel::ILayoutableWindow::GetPreferredHeight; private: ::std::auto_ptr< ::Window> mpWindow; int mnPreferredWidth; diff --git a/sd/source/ui/toolpanel/TestMenu.hxx b/sd/source/ui/toolpanel/TestMenu.hxx index 50561c0d11e8..7ad9d56aed8b 100644 --- a/sd/source/ui/toolpanel/TestMenu.hxx +++ b/sd/source/ui/toolpanel/TestMenu.hxx @@ -4,9 +4,9 @@ * * $RCSfile: TestMenu.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 06:34:47 $ + * last change: $Author: kz $ $Date: 2006-12-12 18:43:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,6 +73,8 @@ public: // From ::Window virtual void Resize (void); + using Window::GetWindow; + private: ValueSet maSet; int mnPreferredColumnCount; |