Kaydet (Commit) 69656cca authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

INTEGRATION: CWS warnings01 (1.6.134); FILE MERGED

2006/02/22 19:26:17 aw 1.6.134.1: #i55991# Adaptions to warning free code
üst 66908347
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: sdrmasterpagedescriptor.cxx,v $ * $RCSfile: sdrmasterpagedescriptor.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: hr $ $Date: 2005-10-25 11:57:00 $ * last change: $Author: hr $ $Date: 2006-06-19 16:33:39 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -99,7 +99,7 @@ namespace sdr ...@@ -99,7 +99,7 @@ namespace sdr
// this method is called form the destructor of the referenced page. // this method is called form the destructor of the referenced page.
// do all necessary action to forget the page. It is not necessary to call // do all necessary action to forget the page. It is not necessary to call
// RemovePageUser(), that is done form the destructor. // RemovePageUser(), that is done form the destructor.
void MasterPageDescriptor::PageInDestruction(const SdrPage& rPage) void MasterPageDescriptor::PageInDestruction(const SdrPage& /*rPage*/)
{ {
maOwnerPage.TRG_ClearMasterPage(); maOwnerPage.TRG_ClearMasterPage();
} }
...@@ -145,9 +145,11 @@ namespace sdr ...@@ -145,9 +145,11 @@ namespace sdr
// Here i will rely on old knowledge about the 0'st element of a masterpage // Here i will rely on old knowledge about the 0'st element of a masterpage
// being the PageBackgroundObject. This will be removed again when that definition // being the PageBackgroundObject. This will be removed again when that definition
// will be changed. // will be changed.
#ifdef DBG_UTIL
const sal_uInt32 nMasterPageObjectCount(rMasterPage.GetObjCount()); const sal_uInt32 nMasterPageObjectCount(rMasterPage.GetObjCount());
DBG_ASSERT(1 <= nMasterPageObjectCount, DBG_ASSERT(1 <= nMasterPageObjectCount,
"MasterPageDescriptor::GetBackgroundObject(): MasterPageBackgroundObject missing (!)"); "MasterPageDescriptor::GetBackgroundObject(): MasterPageBackgroundObject missing (!)");
#endif
pRetval = rMasterPage.GetObj(0L); pRetval = rMasterPage.GetObj(0L);
// Test if it's really what we need. There are known problems where // Test if it's really what we need. There are known problems where
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment