[Libreoffice-commits] core.git: 2 commits - cui/source slideshow/source

[Caolán McNamara]

 cui/source/customize/cfg.cxx                                 |    2 +-
 slideshow/source/engine/animationnodes/basecontainernode.cxx |    2 +-
 slideshow/source/engine/animationnodes/basenode.cxx          |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f70d8277941ada544736abdb72548fb16e0d992d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 1 20:35:43 2015 +0100

    ival is the intended source here
    
    Change-Id: I25aa7a3d72a346cbc6b01501cf377984be92b3fa

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 2429961..a8a7496 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -156,7 +156,7 @@ void printPropertySet(
         else if ( ( a >>= ival ) )
         {
             OSL_TRACE("%s: Got property: %s = %d",
-                PRTSTR(prefix), PRTSTR(aPropDetails[i].Name), PRTSTR(tmp));
+                PRTSTR(prefix), PRTSTR(aPropDetails[i].Name), ival);
         }
         else
         {
commit 3257da329760fb58a2a559d9a9891b8cc3176e09
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 1 09:14:10 2015 +0100

    fix higher debug level build
    
    Change-Id: I23324d03f3388642e964c13d8a5c32311f97ef08

diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index 5f565db..cc1eb68 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -186,7 +186,7 @@ void BaseContainerNode::showState() const
         BaseNodeSharedPtr pNode =
             boost::dynamic_pointer_cast<BaseNode>(maChildren[i]);
         VERBOSE_TRACE(
-            "Node connection: n0x%X -> n0x%X",
+            "Node connection: n%p -> n%p",
             (const char*)this+debugGetCurrentOffset(),
             (const char*)pNode.get()+debugGetCurrentOffset() );
         pNode->showState();
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index d9498ad..4940a83 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -683,12 +683,12 @@ void BaseNode::showState() const
     const AnimationNode::NodeState eNodeState( getState() );
 
     if( eNodeState == AnimationNode::INVALID )
-        VERBOSE_TRACE( "Node state: n0x%X [label=\"%s\",style=filled,"
+        VERBOSE_TRACE( "Node state: n%p [label=\"%s\",style=filled,"
                        "fillcolor=\"0.5,0.2,0.5\"]",
                        (const char*)this+debugGetCurrentOffset(),
                        getDescription() );
     else
-        VERBOSE_TRACE( "Node state: n0x%X [label=\"%s\",style=filled,"
+        VERBOSE_TRACE( "Node state: n%p [label=\"%s\",style=filled,"
                        "fillcolor=\"%f,1.0,1.0\"]",
                        (const char*)this+debugGetCurrentOffset(),
                        getDescription(),
@@ -726,7 +726,7 @@ void BaseNode::showState() const
                     OUStringToOString( aName,
                                               RTL_TEXTENCODING_ASCII_US ) );
 
-                VERBOSE_TRACE( "Node info: n0x%X, name \"%s\"",
+                VERBOSE_TRACE( "Node info: n%p, name \"%s\"",
                                (const char*)this+debugGetCurrentOffset(),
                                rAsciiName.getStr() );
             }