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

Julien Nabet serval2412 at yahoo.fr
Mon May 18 22:30:12 PDT 2015 

 sw/source/core/SwNumberTree/SwNodeNum.cxx    |    1 -
 sw/source/core/doc/docbm.cxx                 |    1 -
 sw/source/core/layout/dbg_lay.cxx            |    1 -
 sw/source/core/text/inftxt.cxx               |    9 +--------
 sw/source/filter/basflt/fltini.cxx           |    1 -
 sw/source/filter/html/parcss1.cxx            |    1 -
 sw/source/filter/ww8/WW8Sttbf.cxx            |    4 ----
 sw/source/filter/ww8/docxattributeoutput.cxx |    8 +-------
 sw/source/filter/ww8/wrtww8gr.cxx            |    4 ----
 sw/source/filter/ww8/ww8par3.cxx             |    2 --
 sw/source/filter/ww8/ww8scan.cxx             |    2 ++
 sw/source/ui/dialog/docstdlg.cxx             |    1 -
 sw/source/ui/vba/vbaapplication.cxx          |    1 -
 sw/source/uibase/dbui/dbmgr.cxx              |    1 -
 sw/source/uibase/docvw/edtwin2.cxx           |    3 ---
 15 files changed, 4 insertions(+), 36 deletions(-)

New commits:
commit 5f653490a40850886f94c9fd6b381b4bed1de58a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon May 18 22:31:09 2015 +0200

    Remove include stdio (part3)
    
    Change-Id: I0b44a33dc38b76130a7b230962de7ce86bd4574b
    Reviewed-on: https://gerrit.libreoffice.org/15793
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index 51af85f..a8821bb 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -22,7 +22,6 @@
 #include <SwNodeNum.hxx>
 #include <ndtxt.hxx>
 #include <pam.hxx>
-#include <stdio.h>
 #include <IDocumentListItems.hxx>
 #include <doc.hxx>
 
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index fda0757..3975e13 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -53,7 +53,6 @@
 #include <unocrsr.hxx>
 #include <viscrs.hxx>
 #include <edimp.hxx>
-#include <stdio.h>
 #include <tools/datetimeutils.hxx>
 
 using namespace ::boost;
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 6421cda..73da3a1 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -97,7 +97,6 @@
 
 #include "dbg_lay.hxx"
 
-#include <stdio.h>
 #include "flyfrm.hxx"
 #include "txtfrm.hxx"
 #include <fntcache.hxx>
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 75ea6b0..8f2d3f9 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -70,10 +70,6 @@
 
 #include <unomid.h>
 
-#if OSL_DEBUG_LEVEL > 1
-#include <stdio.h>
-#endif
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::linguistic2;
 using namespace ::com::sun::star::uno;
@@ -1126,10 +1122,7 @@ void SwTxtPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
             bool bIsStartMark=(1==GetLen() && CH_TXT_ATR_FIELDSTART==GetTxt()[GetIdx()]);
             if(pFieldmark) {
                 OSL_TRACE("Found Fieldmark");
-#if OSL_DEBUG_LEVEL > 1
-                OUString str = pFieldmark->ToString( );
-                fprintf( stderr, "%s\n", OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr( ) );
-#endif
+                SAL_INFO("sw.core", pFieldmark->ToString() << "\n");
             }
             if(bIsStartMark) OSL_TRACE("Found StartMark");
             if (OnWin() && (pFieldmark!=NULL || bIsStartMark) &&
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 378a79e..e1da5d9 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <string.h>
-#include <stdio.h>
 #include <hintids.hxx>
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index 4c3767a..80e382b 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -19,7 +19,6 @@
 
 #include <ctype.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <limits.h>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx
index 0fa8903..be6de9b 100644
--- a/sw/source/filter/ww8/WW8Sttbf.cxx
+++ b/sw/source/filter/ww8/WW8Sttbf.cxx
@@ -25,10 +25,6 @@
 #include <osl/endian.h>
 #include <rtl/ustrbuf.hxx>
 
-#if OSL_DEBUG_LEVEL > 1
-#include <stdio.h>
-#endif
-
 namespace ww8
 {
     WW8Struct::WW8Struct(SvStream& rSt, sal_uInt32 nPos, sal_uInt32 nSize)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index c7d42c0..dcce02f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -128,10 +128,6 @@
 
 #include <algorithm>
 
-#if OSL_DEBUG_LEVEL > 1
-#include <stdio.h>
-#endif
-
 using ::editeng::SvxBorderLine;
 
 using namespace oox;
@@ -3670,9 +3666,7 @@ void DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_
 
 void DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
 {
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "TODO: DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )\n" );
-#endif
+    OSL_TRACE( "TODO: DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )\n" );
 }
 
 void DocxAttributeOutput::TableRowEnd( sal_uInt32 /*nDepth*/ )
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 853c5c0..cf14ca9 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -67,10 +67,6 @@
 #include <cstdio>
 #include <o3tl/enumrange.hxx>
 
-#if OSL_DEBUG_LEVEL > 1
-#include <stdio.h>
-#endif
-
 using namespace ::com::sun::star;
 using namespace nsFieldFlags;
 
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 63c84f0..8d4251c 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -82,8 +82,6 @@
 #include <rtl/character.hxx>
 #include <xmloff/odffields.hxx>
 
-#include <stdio.h>
-
 using namespace com::sun::star;
 using namespace sw::util;
 using namespace sw::types;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 5064172..0afbef8 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -48,7 +48,9 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
+#ifdef DEBUGSPRMREADER
 #include <stdio.h>
+#endif
 
 #define ASSERT_RET_ON_FAIL( aCon, aError, aRet ) \
     OSL_ENSURE(aCon, aError); \
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index de1d3d6..6e2e045 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdio.h>
 #include <ctype.h>
 #include <swwait.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index ff68247..51fc70b 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <stdio.h>
 #include "vbaapplication.hxx"
 #include "vbadocument.hxx"
 #include <osl/file.hxx>
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index abb06f5b..9b8ae42 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -19,7 +19,6 @@
 
 #include <cstdarg>
 
-#include <stdio.h>
 #include <unotxdoc.hxx>
 #include <com/sun/star/text/NotePrintMode.hpp>
 #include <sfx2/app.hxx>
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 9151379..38bef34 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -21,9 +21,6 @@
 #include <hintids.hxx>
 
 #include <doc.hxx>
-#if OSL_DEBUG_LEVEL > 1
-#include <stdio.h>
-#endif
 #include <osl/thread.h>
 #include <vcl/help.hxx>
 #include <svl/stritem.hxx>

More information about the Libreoffice-commits mailing list