OSL_TRACE -> SAL in sfx2..svx

Change-Id: I78cf8058a5682baa3d7b00a25feeb2d28fb3e66e
Reviewed-on: https://gerrit.libreoffice.org/31799
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 18 insertions, 22 deletions

diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index ceb420696280..63c0fa6a3211 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -351,11 +351,9 @@ AnimationActivitySharedPtr createShapeTransitionByType(
     {
         // No animation generated, maybe no table entry for given
         // transition?
-        OSL_TRACE(
-            "createShapeTransitionByType(): Unknown type/subtype (%d/%d) "
-            "combination encountered",
-            xTransition->getTransition(),
-            xTransition->getSubtype() );
+        SAL_WARN("slideshow",
+            "createShapeTransitionByType(): Unknown type/subtype combination encountered: "
+            << xTransition->getTransition() << " " << xTransition->getSubtype() );
         OSL_FAIL(
             "createShapeTransitionByType(): Unknown type/subtype "
             "combination encountered" );
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index 2e35f7c8e0ef..339ce818c519 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -195,7 +195,7 @@ public:
     // ViewEventHandler
     virtual void viewAdded( const UnoViewSharedPtr& rView ) override
     {
-        OSL_TRACE("PluginSlideChange viewAdded");
+        SAL_INFO("slideshow", "PluginSlideChange viewAdded");
         SlideChangeBase::viewAdded( rView );
 
         for( const auto& pCurrView : maTransitions )
@@ -204,13 +204,13 @@ public:
                 return;
         }
 
-        OSL_TRACE( "need to be added" );
+        SAL_INFO("slideshow", "need to be added" );
         addTransition( rView );
     }
 
     virtual void viewRemoved( const UnoViewSharedPtr& rView ) override
     {
-        OSL_TRACE("PluginSlideChange viewRemoved");
+        SAL_INFO("slideshow", "PluginSlideChange viewRemoved");
         SlideChangeBase::viewRemoved( rView );
 
         ::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
@@ -220,7 +220,7 @@ public:
         {
             if( ( *aIter )->mpView == rView )
             {
-                OSL_TRACE( "view removed" );
+                SAL_INFO("slideshow", "view removed" );
                 delete ( *aIter );
                 maTransitions.erase( aIter );
                 break;
@@ -230,31 +230,31 @@ public:
 
     virtual void viewChanged( const UnoViewSharedPtr& rView ) override
     {
-        OSL_TRACE("PluginSlideChange viewChanged");
+        SAL_INFO("slideshow", "PluginSlideChange viewChanged");
         SlideChangeBase::viewChanged( rView );
 
         for( const auto& pCurrView : maTransitions )
         {
             if( pCurrView->mpView == rView )
             {
-                OSL_TRACE( "view changed" );
+                SAL_INFO("slideshow", "view changed" );
                 pCurrView->mxTransition->viewChanged( rView->getUnoView(),
                                                       getLeavingBitmap(ViewEntry(rView))->getXBitmap(),
                                                       getEnteringBitmap(ViewEntry(rView))->getXBitmap() );
             }
             else
-                OSL_TRACE( "view did not changed" );
+                SAL_INFO("slideshow", "view did not change" );
         }
     }
 
     virtual void viewsChanged() override
     {
-        OSL_TRACE("PluginSlideChange viewsChanged");
+        SAL_INFO("slideshow", "PluginSlideChange viewsChanged");
         SlideChangeBase::viewsChanged();
 
         for( const auto& pCurrView : maTransitions )
         {
-            OSL_TRACE( "view changed" );
+            SAL_INFO("slideshow", "view changed" );
             UnoViewSharedPtr pView = pCurrView->mpView;
             pCurrView->mxTransition->viewChanged( pView->getUnoView(),
                                                   getLeavingBitmap(ViewEntry(pView))->getXBitmap(),
@@ -961,11 +961,10 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition(
         {
             default:
             case TransitionInfo::TRANSITION_INVALID:
-                OSL_TRACE(
+                SAL_WARN("slideshow",
                     "TransitionFactory::createSlideTransition(): "
-                    "Invalid type/subtype (%d/%d) combination encountered.",
-                    nTransitionType,
-                    nTransitionSubType );
+                    "Invalid type/subtype combination encountered."
+                    << nTransitionType << " " << nTransitionSubType );
                 return NumberAnimationSharedPtr();
 
 
@@ -1124,11 +1123,10 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition(
 
     // No animation generated, maybe no table entry for given
     // transition?
-    OSL_TRACE(
+    SAL_WARN("slideshow",
         "TransitionFactory::createSlideTransition(): "
-        "Unknown type/subtype (%d/%d) combination encountered",
-        nTransitionType,
-        nTransitionSubType );
+        "Unknown type/subtype combination encountered "
+        << nTransitionType << " " << nTransitionSubType );
     OSL_FAIL(
         "TransitionFactory::createSlideTransition(): "
         "Unknown type/subtype combination encountered" );