[Libreoffice-commits] core.git: oox/source

Samuel Mehrbrodt Samuel.Mehrbrodt at cib.de
Thu Nov 23 09:45:19 UTC 2017


 oox/source/export/vmlexport.cxx |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

New commits:
commit a8e83ce1d86892061603159f5c4460803d077fd5
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Tue Nov 21 14:39:44 2017 +0100

    Convert fprintf to SAL_WARN / SAL_INFO
    
    Change-Id: Ibdc67eb7af83c9ffa29531a20f68efce578f3e47
    Reviewed-on: https://gerrit.libreoffice.org/45082
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index b90b18977ec9..29034a9ba07b 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -93,10 +93,7 @@ void VMLExport::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance )
     if ( nEscherContainer == ESCHER_SpContainer )
     {
         // opening a shape container
-#if OSL_DEBUG_LEVEL > 0
-        if ( m_nShapeType != ESCHER_ShpInst_Nil )
-            fprintf( stderr, "Warning!  VMLExport::OpenContainer(): opening shape inside a shape.\n" );
-#endif
+        SAL_WARN_IF(m_nShapeType != ESCHER_ShpInst_Nil, "oox.vml", "opening shape inside of a shape!");
         m_nShapeType = ESCHER_ShpInst_Nil;
         m_pShapeAttrList = FastSerializerHelper::createAttrList();
 
@@ -589,10 +586,8 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle&
                         if ( !aPath.isEmpty() && pathString != "xe" )
                             m_pShapeAttrList->add( XML_path, pathString );
                     }
-#if OSL_DEBUG_LEVEL > 0
                     else
-                        fprintf( stderr, "TODO: unhandled shape path, missing either pVertices or pSegmentInfo.\n" );
-#endif
+                        SAL_WARN("oox.vml", "unhandled shape path, missing either pVertices or pSegmentInfo.");
                 }
                 bAlreadyWritten[ ESCHER_Prop_pVertices ] = true;
                 bAlreadyWritten[ ESCHER_Prop_pSegmentInfo ] = true;
@@ -653,9 +648,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle&
                                 // TODO case ESCHER_FillShadeTitle:  pFillType = ""; break;
                                 // TODO case ESCHER_FillBackground:  pFillType = ""; break;
                                 default:
-    #if OSL_DEBUG_LEVEL > 0
-                                    fprintf( stderr, "TODO: unhandled fill type\n" );
-    #endif
+                                    SAL_INFO("oox.vml", "Uunhandled fill type: " << nValue);
                                     break;
                             }
                             if ( pFillType )


More information about the Libreoffice-commits mailing list