diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 17:41:26 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 17:41:26 +0000 |
commit | a5913c91f73f49eb12c246af453d9e5cab8df838 (patch) | |
tree | 245995883d72f032f4b1531bd07934069a1ac200 /sd | |
parent | eb91b0b1994aab3776c7ad959dd2d4d0a5427202 (diff) |
INTEGRATION: CWS sdwarningsbegone (1.4.38); FILE MERGED
2006/11/22 12:42:14 cl 1.4.38.1: #i69285# warning free code changes for unxlngi6.pro
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsPageObject.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/EmptyWindow.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsPageObject.cxx b/sd/source/ui/slidesorter/view/SlsPageObject.cxx index 0c615beb8932..a5d1a435f5dd 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObject.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObject.cxx @@ -4,9 +4,9 @@ * * $RCSfile: SlsPageObject.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:10:58 $ + * last change: $Author: kz $ $Date: 2006-12-12 18:38:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,9 +50,9 @@ namespace sd { namespace slidesorter { namespace view { PageObject::PageObject ( const Rectangle& rRectangle, - SdrPage* pPage, + SdrPage* _pPage, PageDescriptor& rDescriptor) - : SdrPageObj (rRectangle, pPage), + : SdrPageObj (rRectangle, _pPage), mrDescriptor (rDescriptor) { } diff --git a/sd/source/ui/toolpanel/EmptyWindow.cxx b/sd/source/ui/toolpanel/EmptyWindow.cxx index 96ffb9ef752c..7c9c44ff6521 100644 --- a/sd/source/ui/toolpanel/EmptyWindow.cxx +++ b/sd/source/ui/toolpanel/EmptyWindow.cxx @@ -4,9 +4,9 @@ * * $RCSfile: EmptyWindow.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:12:46 $ + * last change: $Author: kz $ $Date: 2006-12-12 18:39:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -61,7 +61,7 @@ EmptyWindow::~EmptyWindow (void) -void EmptyWindow::Paint (const Rectangle& rBoundingBox) +void EmptyWindow::Paint (const Rectangle& ) { Size aWindowSize (GetOutputSizePixel()); Point aPosition(aWindowSize.Width()/2,aWindowSize.Height()/2); diff --git a/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx b/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx index 35c3141a736e..6d03038d1a01 100644 --- a/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx +++ b/sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: SimpleLayoutWrapper.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:13:28 $ + * last change: $Author: kz $ $Date: 2006-12-12 18:41:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -72,7 +72,7 @@ Size SimpleLayoutWrapper::GetPreferredSize (void) -int SimpleLayoutWrapper::GetPreferredWidth (int nHeight) +int SimpleLayoutWrapper::GetPreferredWidth (int ) { return mnPreferredWidth; } @@ -80,7 +80,7 @@ int SimpleLayoutWrapper::GetPreferredWidth (int nHeight) -int SimpleLayoutWrapper::GetPreferredHeight (int nWidth) +int SimpleLayoutWrapper::GetPreferredHeight (int ) { return mnPreferredHeight; } |