OSL_TRACE->SAL in sd..sdext

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

28 files changed, 32 insertions, 99 deletions

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index e88be4388a91..c6c0a22ccbe4 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -507,8 +507,6 @@ void PowerPointExport::WriteTransition( const FSHelperPtr& pFS )
     FadeEffect eFadeEffect = FadeEffect_NONE;
     GET( eFadeEffect, Effect );
 
-    OSL_TRACE("fade effect %d", eFadeEffect);
-
     sal_Int16 nTransitionType = 0, nTransitionSubtype = 0;
     sal_Int8 nPPTTransitionType = 0;
     sal_uInt8 nDirection = 0;
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 4f2dc6ec1be6..1f18b700547e 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -88,13 +88,11 @@ AccessibleDrawDocumentView::AccessibleDrawDocumentView (
       mpSdViewSh( pViewShell ),
       mpChildrenManager (nullptr)
 {
-    OSL_TRACE ("AccessibleDrawDocumentView");
     UpdateAccessibleName();
 }
 
 AccessibleDrawDocumentView::~AccessibleDrawDocumentView()
 {
-    OSL_TRACE ("~AccessibleDrawDocumentView");
     DBG_ASSERT (rBHelper.bDisposed || rBHelper.bInDispose,
         "~AccessibleDrawDocumentView: object has not been disposed");
 }
@@ -298,13 +296,10 @@ void SAL_CALL
 
     AccessibleDocumentViewBase::propertyChange (rEventObject);
 
-    OSL_TRACE ("AccessibleDrawDocumentView::propertyChange");
     // add page switch event for slide show mode
     if (rEventObject.PropertyName == "CurrentPage" ||
         rEventObject.PropertyName == "PageChange")
     {
-        OSL_TRACE ("    current page changed");
-
         // Update the accessible name to reflect the current slide.
         UpdateAccessibleName();
 
@@ -327,12 +322,11 @@ void SAL_CALL
             }
         }
         else
-            OSL_TRACE ("View invalid");
+            SAL_WARN("sd", "View invalid");
         CommitChange(AccessibleEventId::PAGE_CHANGED,rEventObject.NewValue,rEventObject.OldValue);
     }
     else if ( rEventObject.PropertyName == "VisibleArea" )
     {
-        OSL_TRACE ("    visible area changed");
         if (mpChildrenManager != nullptr)
             mpChildrenManager->ViewForwarderChanged();
     }
@@ -342,8 +336,6 @@ void SAL_CALL
     }
     else if (rEventObject.PropertyName == "UpdateAcc")
     {
-        OSL_TRACE ("    acc on current page should be updated");
-
         // The current page changed.  Update the children manager accordingly.
         uno::Reference<drawing::XDrawView> xView (mxController, uno::UNO_QUERY);
         if (xView.is() && mpChildrenManager!=nullptr)
@@ -382,9 +374,8 @@ void SAL_CALL
     }
     else
     {
-        OSL_TRACE ("  unhandled");
+        SAL_INFO("sd", "unhandled");
     }
-    OSL_TRACE ("  done");
 }
 
 // XServiceInfo
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index fe40b863098b..a3280ece0c2b 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -92,7 +92,6 @@ AccessibleOutlineView::AccessibleOutlineView (
 
 AccessibleOutlineView::~AccessibleOutlineView()
 {
-    OSL_TRACE ("~AccessibleOutlineView");
 }
 
 void AccessibleOutlineView::Init()
@@ -224,29 +223,23 @@ void SAL_CALL
 
     AccessibleDocumentViewBase::propertyChange (rEventObject);
 
-    OSL_TRACE ("AccessibleOutlineView::propertyChange");
     //add page switch event for slide show mode
     if (rEventObject.PropertyName == "CurrentPage" ||
         rEventObject.PropertyName == "PageChange")
     {
-        OSL_TRACE ("    current page changed");
-
         // The current page changed. Update the children accordingly.
         UpdateChildren();
         CommitChange(AccessibleEventId::PAGE_CHANGED,rEventObject.NewValue, rEventObject.OldValue);
     }
     else if ( rEventObject.PropertyName == "VisibleArea" )
     {
-        OSL_TRACE ("    visible area changed");
-
         // The visible area changed. Update the children accordingly.
         UpdateChildren();
     }
     else
     {
-        OSL_TRACE ("  unhandled");
+        SAL_INFO("sd", "unhandled");
     }
-    OSL_TRACE ("  done");
 }
 
 /// Create a name for this view.
diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx
index e89d965ec954..1ab3529fc997 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -51,7 +51,6 @@ AccessiblePageShape::AccessiblePageShape (
 
 AccessiblePageShape::~AccessiblePageShape()
 {
-    OSL_TRACE ("~AccessiblePageShape");
 }
 
 //=====  XAccessibleContext  ==================================================
@@ -199,12 +198,12 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground()
                 aColor >>= nColor;
             }
             else
-                OSL_TRACE ("no Background property in page");
+                SAL_WARN("sd", "no Background property in page");
         }
     }
     catch (const css::beans::UnknownPropertyException&)
     {
-        OSL_TRACE ("caught exception due to unknown property");
+        SAL_WARN("sd", "caught exception due to unknown property");
         // Ignore exception and return default color.
     }
     return nColor;
@@ -243,8 +242,6 @@ void SAL_CALL
 void AccessiblePageShape::dispose()
     throw (css::uno::RuntimeException, std::exception)
 {
-    OSL_TRACE ("AccessiblePageShape::dispose");
-
     // Unregister listeners.
     Reference<lang::XComponent> xComponent (mxShape, uno::UNO_QUERY);
     if (xComponent.is())
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 297573645fea..04d43dd2f11c 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -433,7 +433,7 @@ void AccessibleSlideSorterObject::ThrowIfDisposed()
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
-        OSL_TRACE ("Calling disposed object. Throwing exception:");
+        SAL_WARN("sd", "Calling disposed object. Throwing exception:");
         throw lang::DisposedException ("object has been already disposed",
             static_cast<uno::XWeak*>(this));
     }
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 3a1a49cf7c0a..de4949ef0403 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -648,7 +648,7 @@ void AccessibleSlideSorterView::ThrowIfDisposed()
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
-        OSL_TRACE ("Calling disposed object. Throwing exception:");
+        SAL_WARN("sd", "Calling disposed object. Throwing exception:");
         throw lang::DisposedException ("object has been already disposed",
             static_cast<uno::XWeak*>(this));
     }
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 8ef22287baa0..b52e1376eb42 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -875,8 +875,6 @@ bool DrawDocShell::IsMarked( SdrObject* pObject )
 // If object is marked return true else return false. Optionally realize multi-selection of objects.
 bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark, bool bRealizeMultiSelectionOfObjects /* = false */)
 {
-    OSL_TRACE("GotoBookmark %s",
-        OUStringToOString(rBookmark, RTL_TEXTENCODING_UTF8).getStr());
     bool bUnMark = false;
     bool bFound = false;
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 32f2143997f9..5c12a3cef62b 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -360,14 +360,12 @@ void ConfigurationUpdater::SetUpdateBeingProcessed (bool bValue)
 
 IMPL_LINK_NOARG(ConfigurationUpdater, TimeoutHandler, Timer *, void)
 {
-    OSL_TRACE("configuration update timer");
     if ( ! mbUpdateBeingProcessed
         && mxCurrentConfiguration.is()
         && mxRequestedConfiguration.is())
     {
         if ( ! AreConfigurationsEquivalent(mxCurrentConfiguration, mxRequestedConfiguration))
         {
-            OSL_TRACE("configurations differ, requesting update");
             RequestUpdate(mxRequestedConfiguration);
         }
     }
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
index d767f6024e62..fa4f94a50a81 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
@@ -73,7 +73,7 @@ void ResourceFactoryManager::AddFactory (
         maFactoryPatternList.push_back(FactoryPatternList::value_type(rsURL, rxFactory));
 
 #if defined VERBOSE && VERBOSE>=1
-        OSL_TRACE("ResourceFactoryManager::AddFactory pattern %s %x\n",
+        SAL_INFO("sd",("ResourceFactoryManager::AddFactory pattern %s %x\n",
             OUStringToOString(rsURL, RTL_TEXTENCODING_UTF8).getStr(),
             rxFactory.get());
 #endif
@@ -83,7 +83,7 @@ void ResourceFactoryManager::AddFactory (
         maFactoryMap[rsURL] = rxFactory;
 
 #if defined VERBOSE && VERBOSE>=1
-        OSL_TRACE("ResourceFactoryManager::AddFactory fixed %s %x\n",
+        SAL_INFO("sd",("ResourceFactoryManager::AddFactory fixed %s %x\n",
             OUStringToOString(rsURL, RTL_TEXTENCODING_UTF8).getStr(),
             rxFactory.get());
 #endif
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index 11354816aa1d..ac5f5be63319 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -61,7 +61,6 @@ ChildWindowPane::ChildWindowPane (
                     // The ViewShellBase has already been activated.  Make
                     // the child window visible as soon as possible.
                     pViewFrame->SetChildWindow(mnChildWindowId, true);
-                    OSL_TRACE("ChildWindowPane:activating now");
                 }
                 else
                 {
@@ -69,12 +68,11 @@ ChildWindowPane::ChildWindowPane (
                     // ConfigurationUpdater to try another update, and with
                     // that another request for this window, in a short
                     // time.
-                    OSL_TRACE("ChildWindowPane:activated asynchronously");
                 }
             }
             else
             {
-                OSL_TRACE("ChildWindowPane:not known");
+                SAL_WARN("sd", "ChildWindowPane:not known");
             }
         }
         else
@@ -83,7 +81,6 @@ ChildWindowPane::ChildWindowPane (
             // window and wait a little before it is made visible.  See
             // comments in the GetWindow() method for an explanation.
             pViewFrame->SetChildWindow(mnChildWindowId, false);
-            OSL_TRACE("ChildWindowPane:base not active");
         }
     }
 }
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 6a01191c6d68..75afcc43d000 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -163,7 +163,7 @@ void ModuleController::InstantiateStartupServices()
     }
     catch (Exception&)
     {
-        OSL_TRACE("ERROR in ModuleController::InstantiateStartupServices");
+        SAL_WARN("sd", "ERROR in ModuleController::InstantiateStartupServices");
     }
 }
 
@@ -195,7 +195,7 @@ void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues)
     }
     catch (Exception&)
     {
-        OSL_TRACE("ERROR in ModuleController::ProcessStartupServices");
+        SAL_WARN("sd", "ERROR in ModuleController::ProcessStartupServices");
     }
 }
 
@@ -223,8 +223,6 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL)
             // Create the factory service.
             Sequence<Any> aArguments(1);
             aArguments[0] <<= mxController;
-            OSL_TRACE("creating resource %s",
-                OUStringToOString(iFactory->second, RTL_TEXTENCODING_ASCII_US).getStr());
             try
             {
                 xFactory = xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
@@ -234,7 +232,7 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL)
             }
             catch (const Exception&)
             {
-                OSL_TRACE("caught exception while creating factory.");
+                SAL_WARN("sd", "caught exception while creating factory.");
             }
 
             // Remember that this factory has been instanced.
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index c853bfe8e68e..1bfdd73d165b 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -235,12 +235,12 @@ SdPage* DocumentHelper::AddMasterPage (
         catch(const ::std::exception&)
         {
             pClonedMasterPage = nullptr;
-            OSL_TRACE ("caught general exception");
+            SAL_WARN("sd", "caught general exception");
         }
         catch(...)
         {
             pClonedMasterPage = nullptr;
-            OSL_TRACE ("caught general exception");
+            SAL_WARN("sd", "caught general exception");
         }
     }
 
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx
index e2a06b42de50..6443223f73b0 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -261,10 +261,6 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
         SdPage* pMasterPage = rDocument.GetMasterSdPage (nIndex, PageKind::Standard);
         if (pMasterPage != nullptr)
             aCurrentMasterPages.insert (pMasterPage->GetName());
-        OSL_TRACE("currently used master page %d is %s",
-            nIndex,
-            ::rtl::OUStringToOString(pMasterPage->GetName(),
-                RTL_TEXTENCODING_UTF8).getStr());
     }
 
     typedef ::std::vector<OUString> StringList;
@@ -277,14 +273,6 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
         StringList::iterator I;
 
         ::std::set<OUString>::iterator J;
-        int i=0;
-        for (J=aOldMasterPagesDescriptor->second.begin();
-             J!=aOldMasterPagesDescriptor->second.end();
-             ++J)
-            OSL_TRACE("old used master page %d is %s",
-            i++,
-            ::rtl::OUStringToOString(*J,
-                RTL_TEXTENCODING_UTF8).getStr());
 
         // Send events about the newly used master pages.
         ::std::set_difference (
@@ -295,10 +283,6 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
             ::std::back_insert_iterator<StringList>(aNewMasterPages));
         for (I=aNewMasterPages.begin(); I!=aNewMasterPages.end(); ++I)
         {
-            OSL_TRACE("    added master page %s",
-                ::rtl::OUStringToOString(*I,
-                    RTL_TEXTENCODING_UTF8).getStr());
-
             MasterPageObserverEvent aEvent (
                 MasterPageObserverEvent::ET_MASTER_PAGE_ADDED,
                 *I);
@@ -314,10 +298,6 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
             ::std::back_insert_iterator<StringList>(aRemovedMasterPages));
         for (I=aRemovedMasterPages.begin(); I!=aRemovedMasterPages.end(); ++I)
         {
-            OSL_TRACE("    removed master page %s",
-                ::rtl::OUStringToOString(*I,
-                    RTL_TEXTENCODING_UTF8).getStr());
-
             MasterPageObserverEvent aEvent (
                 MasterPageObserverEvent::ET_MASTER_PAGE_REMOVED,
                 *I);
diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx
index c96f5fbab376..3a342ef95e1a 100644
--- a/sd/source/ui/sidebar/PanelBase.cxx
+++ b/sd/source/ui/sidebar/PanelBase.cxx
@@ -29,8 +29,6 @@ PanelBase::PanelBase (
       mxSidebar(),
       mrViewShellBase(rViewShellBase)
 {
-    OSL_TRACE("created PanelBase at %p for parent %p", this, pParentWindow);
-
 #ifdef DEBUG
     SetText(OUString("sd:PanelBase"));
 #endif
@@ -69,7 +67,6 @@ bool PanelBase::ProvideWrappedControl()
     if ( ! mpWrappedControl)
     {
         mpWrappedControl.reset(CreateWrappedControl(this, mrViewShellBase));
-        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/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 389551093fc6..6eee98d38096 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -618,7 +618,7 @@ css::uno::Reference<css::accessibility::XAccessible>
     }
     else
     {
-        OSL_TRACE ("::sd::Window::CreateAccessible: no view shell");
+        SAL_WARN("sd", "::sd::Window::CreateAccessible: no view shell");
         return vcl::Window::CreateAccessible ();
     }
 }
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index 37eb13336fd7..0416857d716a 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -295,7 +295,6 @@ void SlideSorterModel::Resync()
     else
     {
         bIsUpToDate = false;
-        OSL_TRACE("models differ");
     }
 
     if ( ! bIsUpToDate)
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 123b4dedc4d7..dbe84982651a 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -596,7 +596,7 @@ void SlideSorterView::CompleteRedraw (
     (void)pRedirector;
 #ifdef DEBUG_TIMING
     const double nStartTime (gaTimer.getElapsedTime());
-    OSL_TRACE("SlideSorterView::CompleteRedraw start at %f, %s",
+    SAL_INFO("sd",("SlideSorterView::CompleteRedraw start at %f, %s",
         nStartTime,
         mnLockRedrawSmph ? "locked" : "");
 #endif
@@ -625,7 +625,7 @@ void SlideSorterView::CompleteRedraw (
 
 #ifdef DEBUG_TIMING
     const double nEndTime (gaTimer.getElapsedTime());
-    OSL_TRACE("SlideSorterView::CompleteRedraw end at %f after %fms", nEndTime, (nEndTime-nStartTime)*1000);
+    SAL_INFO("sd",("SlideSorterView::CompleteRedraw end at %f after %fms", nEndTime, (nEndTime-nStartTime)*1000);
     gFrameTimeSum -= gFrameTimes[gFrameTimeIndex];
     gFrameTimes[gFrameTimeIndex] = nStartTime - gnLastFrameStart;
     gnLastFrameStart = nStartTime;
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index 29c237bf01b8..e813a8e0124e 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -115,9 +115,7 @@ Any ConfigurationAccess::GetConfigurationNode (
     }
     catch (const Exception& rException)
     {
-        OSL_TRACE ("caught exception while getting configuration node %s: %s",
-            OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(),
-            OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN("sd", "caught exception while getting configuration node" << sPathToNode << ": " << rException.Message);
     }
 
     return Any();
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index 2f6d03123bdb..cb21b379a049 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -352,7 +352,7 @@ void EventMultiplexer::Implementation::ConnectToController()
                 }
                 catch (const beans::UnknownPropertyException&)
                 {
-                    OSL_TRACE("EventMultiplexer::ConnectToController: CurrentPage unknown");
+                    SAL_WARN("sd", "EventMultiplexer::ConnectToController: CurrentPage unknown");
                 }
 
                 try
@@ -361,7 +361,7 @@ void EventMultiplexer::Implementation::ConnectToController()
                 }
                 catch (const beans::UnknownPropertyException&)
                 {
-                    OSL_TRACE("EventMultiplexer::ConnectToController: IsMasterPageMode unknown");
+                    SAL_WARN("sd", "EventMultiplexer::ConnectToController: IsMasterPageMode unknown");
                 }
         }
 
@@ -396,7 +396,7 @@ void EventMultiplexer::Implementation::DisconnectFromController()
             }
             catch (const beans::UnknownPropertyException&)
             {
-                OSL_TRACE ("DisconnectFromController: CurrentPage unknown");
+                SAL_WARN("sd", "DisconnectFromController: CurrentPage unknown");
             }
 
             try
@@ -405,7 +405,7 @@ void EventMultiplexer::Implementation::DisconnectFromController()
             }
             catch (const beans::UnknownPropertyException&)
             {
-                OSL_TRACE ("DisconnectFromController: IsMasterPageMode unknown");
+                SAL_WARN("sd", "DisconnectFromController: IsMasterPageMode unknown");
             }
         }
 
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 645a680f24a9..a34d55b15092 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -854,7 +854,7 @@ void DrawController::ThrowIfDisposed() const
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose || mbDisposing)
     {
-        OSL_TRACE ("Calling disposed DrawController object. Throwing exception:");
+        SAL_WARN("sd", "Calling disposed DrawController object. Throwing exception:");
         throw lang::DisposedException (
             "DrawController object has already been disposed",
             const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index bfa63e6d8ff4..0da6543f542e 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1566,9 +1566,6 @@ sal_Int32 ImplPDFGetBookmarkPage( const OUString& rBookmark, SdDrawDocument& rDo
 {
     sal_Int32 nPage = -1;
 
-    OSL_TRACE("GotoBookmark %s",
-        OUStringToOString(rBookmark, RTL_TEXTENCODING_UTF8).getStr());
-
     OUString aBookmark( rBookmark );
 
     if( rBookmark.startsWith("#") )
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 598ec11227c8..d75c47b72d86 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -508,7 +508,7 @@ void ViewShellBase::Rearrange()
     }
     else
     {
-        OSL_TRACE("Rearrange: window missing");
+        SAL_WARN("sd", "Rearrange: window missing");
     }
 
     GetViewFrame()->Resize(true);
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index c5f2cd99b179..0688cefd0286 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -513,8 +513,6 @@ void DrawView::HideSdrPage()
 
 void DrawView::DeleteMarked()
 {
-    OSL_TRACE( "DrawView::DeleteMarked() - enter" );
-
     sd::UndoManager* pUndoManager = mrDoc.GetUndoManager();
     DBG_ASSERT( pUndoManager, "sd::DrawView::DeleteMarked(), ui action without undo manager!?" );
 
@@ -581,8 +579,6 @@ void DrawView::DeleteMarked()
                     pPage->SetObjectOrdNum( pNewObj->GetOrdNum(), pObj->GetOrdNum() );
 
                     bResetLayout = true;
-
-                    OSL_TRACE( "DrawView::InsertAutoLayoutShape() - InsertAutoLayoutShape" );
                 }
             }
         }
@@ -595,8 +591,6 @@ void DrawView::DeleteMarked()
 
     if( pUndoManager )
         pUndoManager->LeaveListAction();
-
-    OSL_TRACE( "DrawView::InsertAutoLayoutShape() - leave" );
 }
 
 } // end of namespace sd
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 7dca113d400e..2e4c17bfdc6a 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -555,7 +555,7 @@ css::uno::Reference<css::accessibility::XAccessible>
                 css::uno::UNO_QUERY);
     }
 
-    OSL_TRACE ("DrawViewShell::CreateAccessibleDocumentView: no controller");
+    SAL_WARN("sd", "DrawViewShell::CreateAccessibleDocumentView: no controller");
     return css::uno::Reference< css::accessibility::XAccessible>();
 }
 
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 9af3432cf119..602adf6f785b 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1790,7 +1790,7 @@ void DrawViewShell::GetState (SfxItemSet& rSet)
                 GetDocSh()->GetState (rSet);
                 break;
             default:
-                OSL_TRACE ("DrawViewShell::GetState(): can not handle which id %d", nWhich);
+                SAL_WARN("sd", "DrawViewShell::GetState(): can not handle which id " << nWhich);
                 break;
         }
         nWhich = aIter.NextWhich();
@@ -1829,7 +1829,7 @@ void DrawViewShell::Execute (SfxRequest& rReq)
         break;
 
         default:
-            OSL_TRACE ("DrawViewShell::Execute(): can not handle slot %d", rReq.GetSlot());
+            SAL_WARN("sd", "DrawViewShell::Execute(): can not handle slot " << rReq.GetSlot());
             break;
     }
 }
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 6794791877b7..b6200179769e 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1201,7 +1201,7 @@ void OutlineViewShell::Execute(SfxRequest& rReq)
         break;
 
         default:
-            OSL_TRACE ("OutlineViewShell::Execute(): can not handle slot %d", rReq.GetSlot());
+            SAL_WARN("sd", "OutlineViewShell::Execute(): can not handle slot " << rReq.GetSlot());
             break;
 
     }
@@ -1853,7 +1853,7 @@ css::uno::Reference<css::accessibility::XAccessible>
                 css::uno::UNO_QUERY);
     }
 
-    OSL_TRACE ("OutlineViewShell::CreateAccessibleDocumentView: no controller");
+    SAL_WARN("sd", "OutlineViewShell::CreateAccessibleDocumentView: no controller");
     return css::uno::Reference< css::accessibility::XAccessible >();
 }
 
@@ -1872,7 +1872,7 @@ void OutlineViewShell::GetState (SfxItemSet& rSet)
                 GetDocSh()->GetState (rSet);
                 break;
             default:
-                OSL_TRACE ("OutlineViewShell::GetState(): can not handle which id %d", nWhich);
+                SAL_WARN("sd", "OutlineViewShell::GetState(): can not handle which id " << nWhich);
                 break;
         }
         nWhich = aIter.NextWhich();
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index e1b4fa5267b3..e882b362e357 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -962,7 +962,7 @@ css::uno::Reference<css::accessibility::XAccessible>
     }
     else
     {
-        OSL_TRACE ("::sd::Window::CreateAccessible: no view shell");
+        SAL_WARN("sd", "::sd::Window::CreateAccessible: no view shell");
         return vcl::Window::CreateAccessible ();
     }
 }
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index b2cf7d6cf527..008705d72357 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -437,8 +437,6 @@ void ViewOverlayManager::UpdateTags()
 
 IMPL_LINK_NOARG(ViewOverlayManager, UpdateTagsHdl, void*, void)
 {
-    OSL_TRACE("ViewOverlayManager::UpdateTagsHdl");
-
     mnUpdateTagsEvent  = nullptr;
     bool bChanges = DisposeTags();
     bChanges |= CreateTags();