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>

9 files changed, 47 insertions, 61 deletions

diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx
index dab919003daa..8ece2a330543 100644
--- a/slideshow/source/engine/activitiesqueue.cxx
+++ b/slideshow/source/engine/activitiesqueue.cxx
@@ -141,7 +141,7 @@ namespace slideshow
                     // since this will also capture segmentation
                     // violations and the like. In such a case, we
                     // still better let our clients now...
-                    OSL_TRACE( "::presentation::internal::ActivitiesQueue: Activity threw a SlideShowException, removing from ring" );
+                    SAL_WARN("slideshow", "::presentation::internal::ActivitiesQueue: Activity threw a SlideShowException, removing from ring" );
                 }
 
                 if( bReinsert )
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index adfedb51215a..0d04f040e4e5 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -679,9 +679,7 @@ namespace slideshow
                 if( !rAny.hasValue() )
                 {
                     OSL_FAIL( "getDefault(): cannot get requested shape property" );
-                    OSL_TRACE( "getDefault(): cannot get '%s' shape property",
-                               OUStringToOString( rPropertyName,
-                                                         RTL_TEXTENCODING_ASCII_US ).getStr() );
+                    SAL_WARN("slideshow", "getDefault(): cannot get shape property " <<  rPropertyName );
                     return ValueType();
                 }
                 else
@@ -691,9 +689,7 @@ namespace slideshow
                     if( !(rAny >>= aValue) )
                     {
                         OSL_FAIL( "getDefault(): cannot extract requested shape property" );
-                        OSL_TRACE( "getDefault(): cannot extract '%s' shape property",
-                                   OUStringToOString( rPropertyName,
-                                                             RTL_TEXTENCODING_ASCII_US ).getStr() );
+                        SAL_WARN("slideshow", "getDefault(): cannot extract shape property " << rPropertyName);
                         return ValueType();
                     }
 
@@ -710,9 +706,7 @@ namespace slideshow
                 if( !rAny.hasValue() )
                 {
                     OSL_FAIL( "getDefault(): cannot get requested shape color property" );
-                    OSL_TRACE( "getDefault(): cannot get '%s' shape color property",
-                               OUStringToOString( rPropertyName,
-                                                         RTL_TEXTENCODING_ASCII_US ).getStr() );
+                    SAL_WARN("slideshow", "getDefault(): cannot get shape color property " << rPropertyName);
                     return RGBColor();
                 }
                 else
@@ -722,9 +716,7 @@ namespace slideshow
                     if( !(rAny >>= nValue) )
                     {
                         OSL_FAIL( "getDefault(): cannot extract requested shape color property" );
-                        OSL_TRACE( "getDefault(): cannot extract '%s' shape color property",
-                                   OUStringToOString( rPropertyName,
-                                                             RTL_TEXTENCODING_ASCII_US ).getStr() );
+                        SAL_INFO("slideshow", "getDefault(): cannot extract shape color property " << rPropertyName);
                         return RGBColor();
                     }
 
diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
index 0e6140cf722b..9881e636aa9b 100644
--- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx
+++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
@@ -174,7 +174,7 @@ bool implCreateIteratedNodes(
     }
 
     if( ::basegfx::fTools::equalZero( nIntervalTimeout ) )
-        OSL_TRACE( "implCreateIteratedNodes(): "
+        SAL_INFO("slideshow", "implCreateIteratedNodes(): "
                    "iterate interval close to zero, there's "
                    "no point in defining such an effect "
                    "(visually equivalent to whole-shape effect)" );
diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx
index b017d97c335f..200bcdc5e8cf 100644
--- a/slideshow/source/engine/attributemap.cxx
+++ b/slideshow/source/engine/attributemap.cxx
@@ -77,9 +77,7 @@ namespace slideshow
             if( !aMap.lookup( rAttrName,
                               eAttributeType ) )
             {
-                OSL_TRACE( "mapAttributeName(): attribute name %s not found in map.",
-                           OUStringToOString( rAttrName,
-                                                     RTL_TEXTENCODING_ASCII_US ).getStr() );
+                SAL_WARN("slideshow", "mapAttributeName(): attribute name not found in map: " << rAttrName);
                 return ATTRIBUTE_INVALID;
             }
 
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index d83fdc2f2194..431294fa1498 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -257,7 +257,7 @@ namespace slideshow
                         // since this will also capture segmentation
                         // violations and the like. In such a case, we
                         // still better let our clients now...
-                        OSL_TRACE( "::presentation::internal::EventQueue: Event threw a SlideShowException, action might not have been fully performed" );
+                        SAL_WARN("slideshow", "::presentation::internal::EventQueue: Event threw a SlideShowException, action might not have been fully performed" );
                     }
                 }
                 else
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 0db3ea64f91d..98c224401c43 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -424,7 +424,7 @@ namespace slideshow
                                                                  const uno::Sequence< uno::Any >& rVCLDeviceParams,
                                                                  const OUString& rMimeType )
         {
-            OSL_TRACE( "ViewMediaShape::implInitializePlayerWindow" );
+            SAL_INFO("slideshow", "ViewMediaShape::implInitializePlayerWindow" );
             if( !mpMediaWindow.get() && !rBounds.isEmpty() )
             {
                 try
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index b83a2ea4952a..64974d147d9d 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -759,8 +759,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
 
     if( !xPropSet.is() )
     {
-        OSL_TRACE( "createSlideTransition(): "
-                   "Slide has no PropertySet - assuming no transition\n" );
+        SAL_INFO("slideshow", "createSlideTransition(): "
+                   "Slide has no PropertySet - assuming no transition" );
         return ActivitySharedPtr();
     }
 
@@ -769,8 +769,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
                            xPropSet,
                            "TransitionType") )
     {
-        OSL_TRACE( "createSlideTransition(): "
-                   "Could not extract slide transition type from XDrawPage - assuming no transition\n" );
+        SAL_INFO("slideshow", "createSlideTransition(): "
+                   "Could not extract slide transition type from XDrawPage - assuming no transition" );
         return ActivitySharedPtr();
     }
 
@@ -779,8 +779,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
                            xPropSet,
                            "TransitionSubtype") )
     {
-        OSL_TRACE( "createSlideTransition(): "
-                   "Could not extract slide transition subtype from XDrawPage - assuming no transition\n" );
+        SAL_INFO("slideshow", "createSlideTransition(): "
+                   "Could not extract slide transition subtype from XDrawPage - assuming no transition" );
         return ActivitySharedPtr();
     }
 
@@ -789,8 +789,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
                            xPropSet,
                            "TransitionDirection") )
     {
-        OSL_TRACE( "createSlideTransition(): "
-                   "Could not extract slide transition direction from XDrawPage - assuming default direction\n" );
+        SAL_INFO("slideshow", "createSlideTransition(): "
+                   "Could not extract slide transition direction from XDrawPage - assuming default direction" );
     }
 
     sal_Int32 aUnoColor(0);
@@ -798,8 +798,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
                            xPropSet,
                            "TransitionFadeColor") )
     {
-        OSL_TRACE( "createSlideTransition(): "
-                   "Could not extract slide transition fade color from XDrawPage - assuming black\n" );
+        SAL_INFO("slideshow", "createSlideTransition(): "
+                   "Could not extract slide transition fade color from XDrawPage - assuming black" );
     }
 
     const RGBColor aTransitionFadeColor( unoColor2RGBColor( aUnoColor ));
@@ -808,10 +808,10 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
     bool bLoopSound = false;
 
     if( !getPropertyValue( aSound, xPropSet, "Sound") )
-        OSL_TRACE( "createSlideTransition(): Could not determine transition sound effect URL from XDrawPage - using no sound" );
+        SAL_INFO("slideshow", "createSlideTransition(): Could not determine transition sound effect URL from XDrawPage - using no sound" );
 
     if( !getPropertyValue( bLoopSound, xPropSet, "LoopSound" ) )
-        OSL_TRACE( "createSlideTransition(): Could not get slide property 'LoopSound' - using no sound" );
+        SAL_INFO("slideshow", "createSlideTransition(): Could not get slide property 'LoopSound' - using no sound" );
 
     NumberAnimationSharedPtr pTransition(
         TransitionFactory::createSlideTransition(
@@ -838,8 +838,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
                            xPropSet,
                            "TransitionDuration") )
     {
-        OSL_TRACE( "createSlideTransition(): "
-                   "Could not extract slide transition duration from XDrawPage - assuming no transition\n" );
+        SAL_INFO("slideshow", "createSlideTransition(): "
+                   "Could not extract slide transition duration from XDrawPage - assuming no transition" );
         return ActivitySharedPtr();
     }
 
@@ -848,8 +848,8 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
                            xPropSet,
                            "MinimalFrameNumber") )
     {
-        OSL_TRACE( "createSlideTransition(): "
-                   "No minimal number of frames given - assuming 5\n" );
+        SAL_INFO("slideshow", "createSlideTransition(): "
+                   "No minimal number of frames given - assuming 5" );
     }
 
     // prefetch slide transition bitmaps, but postpone it after
@@ -2163,9 +2163,9 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD
                            xPropSet,
                            "Change") )
     {
-        OSL_TRACE(
+        SAL_INFO("slideshow",
             "queryAutomaticSlideTransition(): "
-            "Could not extract slide change mode from XDrawPage - assuming <none>\n" );
+            "Could not extract slide change mode from XDrawPage - assuming <none>" );
     }
 
     bHasAutomaticNextSlide = nChange == 1;
@@ -2175,10 +2175,10 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD
                            xPropSet,
                            "HighResDuration") )
     {
-        OSL_TRACE(
+        SAL_INFO("slideshow",
             "queryAutomaticSlideTransition(): "
             "Could not extract slide transition timeout from "
-            "XDrawPage - assuming 1 sec\n" );
+            "XDrawPage - assuming 1 sec" );
     }
 }
 
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" );