[Libreoffice-commits] core.git: sfx2/source vcl/source

Miklos Vajna vmiklos at collabora.co.uk
Wed Apr 2 00:43:38 PDT 2014


 sfx2/source/control/dispatch.cxx    |    5 +++--
 vcl/source/filter/graphicfilter.cxx |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e3495f475e5ed2ca5f17a33301f3bf6fdbbf8cf8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Apr 2 09:35:58 2014 +0200

    GraphicFilter::LoadGraphic: SAL_WARN -> SAL_INFO
    
    Only the caller can decide if trying to load a graphic is really a
    problem, e.g. in case no persona is configured, then loading its header
    is OK.
    
    Change-Id: I7286b7d907940fa3a80f6256cd5264cbd5718fb8

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 9ab086f..7964446 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2101,8 +2101,9 @@ bool SfxDispatcher::_FillState
                 if ( !IsInvalidItem(pItem) && !pItem->ISA(SfxVoidItem) )
                 {
                     sal_uInt16 nSlotId = rState.GetPool()->GetSlotId(pItem->Which());
-                    if (!pItem->IsA(pIF->GetSlot(nSlotId)->GetType()->Type()))
-                        SAL_INFO("sfx.control",
+                    SAL_INFO_IF(
+                        !pItem->IsA(pIF->GetSlot(nSlotId)->GetType()->Type()),
+                        "sfx.control",
                         "item-type unequal to IDL (=> no BASIC) with SID: "
                             << nSlotId << " in " << pIF->GetClassName());
                 }
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 77c25e4..48b88ba 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2311,7 +2311,7 @@ int GraphicFilter::LoadGraphic( const OUString &rPath, const OUString &rFilterNa
             break;
     }
 
-    SAL_WARN_IF( nRes, "vcl.filter", "Problem importing graphic " << rPath << ". Reason: " << aReturnString );
+    SAL_INFO_IF( nRes, "vcl.filter", "Problem importing graphic " << rPath << ". Reason: " << aReturnString );
 #endif
 
     return nRes;


More information about the Libreoffice-commits mailing list