summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-13 18:20:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-03-13 18:21:36 +0100
commitd1c9e5ee53f8609092ea026639c8f28afec1d36a (patch)
tree192f7722bd0598614a08dd8e5ed13c08da44ca97 /sd
parent8289bc767ecc88cf07da60ab6a8b850f5c2e7eb4 (diff)
tdf#43157: Fix format string violations in OSL_TRACE etc.
...for a 32-bit build, similar to what ee11e221d2108212619e1bbe7f029e7d9afdba32 "tdf#43157: Fix format string violations in OSL_TRACE etc." did for a 64-bit build Change-Id: I05dd79ede3e66cb9ab7a33792319eb34b34c82dd
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slidesorter/model/SlideSorterModel.cxx21
1 files changed, 12 insertions, 9 deletions
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index d90d701371b9..f7b770332ea2 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -56,16 +56,16 @@ namespace {
SharedPageDescriptor pDescriptor (rModel.GetPageDescriptor(nIndex));
if (pDescriptor)
{
- OSL_TRACE("%d %d %d %d %p",
- nIndex,
- pDescriptor->GetPageIndex(),
- pDescriptor->GetVisualState().mnPageId,
- FromCoreIndex(pDescriptor->GetPage()->GetPageNum()),
- pDescriptor->GetPage());
+ SAL_INFO(
+ "sd.sls",
+ nIndex << " " << pDescriptor->GetPageIndex() << " "
+ << pDescriptor->GetVisualState().mnPageId << " "
+ << FromCoreIndex(pDescriptor->GetPage()->GetPageNum())
+ << " " << pDescriptor->GetPage());
}
else
{
- OSL_TRACE("%d", nIndex);
+ SAL_INFO("sd.sls", nIndex);
}
}
@@ -292,7 +292,7 @@ void SlideSorterModel::Resync (void)
&& maPageDescriptors[nIndex]->GetPage()
!= GetPage(nIndex))
{
- OSL_TRACE("page %d differs", nIndex);
+ SAL_INFO("sd.sls", "page " << nIndex << " differs");
bIsUpToDate = false;
break;
}
@@ -332,7 +332,10 @@ void SlideSorterModel::ClearDescriptorList (void)
{
if ( ! iDescriptor->unique())
{
- OSL_TRACE("SlideSorterModel::ClearDescriptorList: trying to delete page descriptor that is still used with count %zu", iDescriptor->use_count());
+ SAL_INFO(
+ "sd.sls",
+ "trying to delete page descriptor that is still used with"
+ " count " << iDescriptor->use_count());
// No assertion here because that can hang the office when
// opening a dialog from here.
}