From c3586b684c58e06cd80dea87d7681354acfec80b Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 12 Dec 2016 16:31:57 +0200
Subject: OSL_TRACE->SAL in chart2..oox

Change-Id: I133a6441824bfbefcfcda130119b5c5d706f86b2
Reviewed-on: https://gerrit.libreoffice.org/31907
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 fpicker/source/aqua/FilterHelper.mm         | 24 ++----------------------
 fpicker/source/win32/filepicker/FPentry.cxx |  2 --
 2 files changed, 2 insertions(+), 24 deletions(-)

(limited to 'fpicker')

diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index 3d04fd5c4ebe..2e06025bc6ce 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -237,7 +237,6 @@ void FilterHelper::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilt
 
         // set the first filter to the current filter
         m_aCurrentFilter = _rInitialCurrentFilter;
-        OSL_TRACE("ensureFilterList filter:%s", OUStringToOString(m_aCurrentFilter, RTL_TEXTENCODING_UTF8).getStr());
     }
 }
 
@@ -250,23 +249,6 @@ void FilterHelper::SetCurFilter( const rtl::OUString& rFilter )
         m_aCurrentFilter = rFilter;
     }
 
-    //only for output purposes
-#if OSL_DEBUG_LEVEL > 0
-    FilterList::iterator aFilter = ::std::find_if(m_pFilterList->begin(), m_pFilterList->end(), FilterTitleMatch(m_aCurrentFilter));
-    if (aFilter != m_pFilterList->end()) {
-        OUStringList suffixes = aFilter->getFilterSuffixList();
-        if (!suffixes.empty()) {
-            SAL_INFO("fpicker.aqua", "Current active suffixes: ");
-            OUStringList::iterator suffIter = suffixes.begin();
-            while(suffIter != suffixes.end()) {
-                SAL_INFO("fpicker.aqua", *suffIter);
-                suffIter++;
-            }
-        }
-    } else {
-        SAL_INFO("fpicker.aqua", "No filter entry was found for that name!");
-    }
-#endif
 }
 
 void FilterHelper::SetFilters()
@@ -274,8 +256,6 @@ void FilterHelper::SetFilters()
     // set the default filter
     if( m_aCurrentFilter.getLength() > 0 )
     {
-        OSL_TRACE( "Setting current filter to %s", OUStringToOString(m_aCurrentFilter, RTL_TEXTENCODING_UTF8).getStr());
-
         SetCurFilter( m_aCurrentFilter );
     }
 }
@@ -343,7 +323,7 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
 bool FilterHelper::filenameMatchesFilter(NSString* sFilename)
 {
     if (m_aCurrentFilter.isEmpty()) {
-        OSL_TRACE("filter name is empty");
+        SAL_WARN("fpicker", "filter name is empty");
         return true;
     }
 
@@ -363,7 +343,7 @@ bool FilterHelper::filenameMatchesFilter(NSString* sFilename)
 
     FilterList::iterator filter = ::std::find_if(m_pFilterList->begin(), m_pFilterList->end(), FilterTitleMatch(m_aCurrentFilter));
     if (filter == m_pFilterList->end()) {
-        OSL_TRACE("filter not found in list");
+        SAL_WARN("fpicker", "filter not found in list");
         return true;
     }
 
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index c21317207003..e543ab8e5fb4 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -51,7 +51,6 @@ static Reference< XInterface > SAL_CALL createInstance(
 
     if (bVistaOrNewer)
     {
-        OSL_TRACE("use special (vista) system file picker ...");
         xDlg.set(
             static_cast< XFilePicker2* >(
                 new ::fpicker::win32::vista::VistaFilePicker( rServiceManager ) ) );
@@ -59,7 +58,6 @@ static Reference< XInterface > SAL_CALL createInstance(
     else
 #endif
     {
-        OSL_TRACE("use normal system file picker ...");
         xDlg.set(
             static_cast< XFilePicker2* >(
                 new CFilePicker( rServiceManager ) ) );
-- 
cgit