summaryrefslogtreecommitdiff
path: root/svx/source/sdr
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 15:26:11 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 15:26:11 +0000
commit5f504be27179f0a2535cc3a68bf4abec3e1c3d5e (patch)
tree0640953c169c75c355a954f3f21823f04bb4a056 /svx/source/sdr
parentfed8721b0312156e091c528e638417a1ed16b1d9 (diff)
INTEGRATION: CWS warnings01 (1.11.130); FILE MERGED
2006/05/23 18:41:11 sb 1.11.130.2: RESYNC: (1.11-1.12); FILE MERGED 2006/02/21 16:41:11 aw 1.11.130.1: #i55991# Adaptions to warning free code
Diffstat (limited to 'svx/source/sdr')
-rw-r--r--svx/source/sdr/contact/objectcontactofpageview.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index d63190ca3c4a..572da979d2a4 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: objectcontactofpageview.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: rt $ $Date: 2006-05-05 10:10:10 $
+ * last change: $Author: hr $ $Date: 2006-06-19 16:26:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -119,7 +119,7 @@ namespace sdr
// Update Draw Hierarchy data. Take care of everything that is inside
// of rDisplayInfo.GetRedrawArea(), that is the necessary part.
- void ObjectContactOfPageView::EnsureValidDrawHierarchy(DisplayInfo& rDisplayInfo)
+ void ObjectContactOfPageView::EnsureValidDrawHierarchy(DisplayInfo& /*rDisplayInfo*/)
{
// get StartNode
SdrPage* pStartPage = GetSdrPage();
@@ -362,7 +362,7 @@ namespace sdr
// Process the whole displaying
void ObjectContactOfPageView::ProcessDisplay(DisplayInfo& rDisplayInfo)
{
- SdrPage* pStartPage = GetSdrPage();
+ const SdrPage* pStartPage = GetSdrPage();
if(IsDrawHierarchyValid()
&& pStartPage
@@ -371,7 +371,7 @@ namespace sdr
&& maDrawHierarchy.Count())
{
// #i28641# test if ControlLayer is to be painted
- SdrPage* pStartPage = GetSdrPage();
+ //SdrPage* pStartPage = GetSdrPage();
const SdrModel& rModel = *(pStartPage->GetModel());
const SdrLayerAdmin& rLayerAdmin = rModel.GetLayerAdmin();
const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName(), sal_False);
@@ -504,7 +504,7 @@ namespace sdr
pOut->Pop();
pOut->EnableMapMode(bWasEnabled);
}
-#endif DBG_UTIL
+#endif // DBG_UTIL
}
// Decide if to PreRender