diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/sidebar/PanelBase.cxx | 10 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index 0c04e97a0363..b358bd992d5e 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -31,7 +31,7 @@ PanelBase::PanelBase ( mxSidebar(), mrViewShellBase(rViewShellBase) { - OSL_TRACE("created PanelBase at %x for parent %x", this, pParentWindow); + OSL_TRACE("created PanelBase at %p for parent %p", this, pParentWindow); #ifdef DEBUG SetText(OUString("sd:PanelBase")); @@ -43,9 +43,9 @@ PanelBase::PanelBase ( PanelBase::~PanelBase (void) { - OSL_TRACE("deleting wrapped control at %x", mpWrappedControl.get()); + OSL_TRACE("deleting wrapped control at %p", mpWrappedControl.get()); mpWrappedControl.reset(); - OSL_TRACE("deleting PanelBase at %x from parent %x", this, GetParent()); + OSL_TRACE("deleting PanelBase at %p from parent %p", this, GetParent()); } @@ -54,7 +54,7 @@ PanelBase::~PanelBase (void) void PanelBase::Dispose (void) { - OSL_TRACE("PanelBase::DisposeL: deleting wrapped control at %x", mpWrappedControl.get()); + OSL_TRACE("PanelBase::DisposeL: deleting wrapped control at %p", mpWrappedControl.get()); mpWrappedControl.reset(); } @@ -113,7 +113,7 @@ bool PanelBase::ProvideWrappedControl (void) if ( ! mpWrappedControl) { mpWrappedControl.reset(CreateWrappedControl(this, mrViewShellBase)); - OSL_TRACE("created wrapped control at %x for parent PanelBase at %x", mpWrappedControl.get(), this); + OSL_TRACE("created wrapped control at %p for parent PanelBase at %p", mpWrappedControl.get(), this); if (mpWrappedControl) mpWrappedControl->Show(); if (mxSidebar.is()) diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 7c2ea3d79f1c..2ce8c83f4cdf 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -67,7 +67,7 @@ namespace { SharedPageDescriptor pDescriptor (rModel.GetPageDescriptor(nIndex)); if (pDescriptor) { - OSL_TRACE("%d %d %d %d %x", + OSL_TRACE("%d %d %d %d %p", nIndex, pDescriptor->GetPageIndex(), pDescriptor->GetVisualState().mnPageId, @@ -399,7 +399,7 @@ void SlideSorterModel::ClearDescriptorList (void) { if ( ! iDescriptor->unique()) { - OSL_TRACE("SlideSorterModel::ClearDescriptorList: trying to delete page descriptor that is still used with count %d", iDescriptor->use_count()); + OSL_TRACE("SlideSorterModel::ClearDescriptorList: trying to delete page descriptor that is still used with count %zu", iDescriptor->use_count()); // No assertion here because that can hang the office when // opening a dialog from here. } |