[Libreoffice-commits] .: 2 commits - binfilter/bf_sw binfilter/inc

[Thomas Arnhold]

 binfilter/bf_sw/source/core/text/txtcfg.hxx         |   10 ----------
 binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx |    4 ----
 binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx     |    6 ------
 binfilter/inc/bf_sw/shellio.hxx                     |    1 -
 4 files changed, 21 deletions(-)

New commits:
commit c09b4f2ec35b80e40cb87b76eda82460e80c10b4
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu Jun 21 19:39:37 2012 +0200

    Remove empty Reader::SetNoOutlineNum
    
    Change-Id: Id752931575694f3ce83948326720a25af4fdfb5f

diff --git a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
index d227718..62daa2f 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx
@@ -422,10 +422,6 @@ int Reader::SetStrmStgPtr()
  }
 
 
-void Reader::SetNoOutlineNum( SwDoc& /*rDoc*/ )
-{
-}
-
 /*N*/ SwWriter::SwWriter( SvStream& rStrm, SwPaM& rPam, BOOL bInWriteAll )
 /*N*/ 	: pStrm( &rStrm ),
 /*N*/ 	pOutPam( &rPam ),
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index 879f161..cf32ba8 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -5501,12 +5501,6 @@ ULONG Sw6Reader::Read( SwDoc &rDoc,SwPaM &rPam,const String &rFileName)
 
     if( pStrm )
     {
-        //JP 18.01.96: Alle Ueberschriften sind normalerweise ohne
-        //              Kapitelnummer. Darum hier explizit abschalten
-        //              weil das Default jetzt wieder auf AN ist.
-        if( !bInsertMode )
-            SetNoOutlineNum( rDoc );
-
         SwSw6Parser *pSw6Parser = new SwSw6Parser( &rDoc, rPam, pStrm,
                                         !bInsertMode, &nRet, &rFileName );
         pSw6Parser->CallParser();
diff --git a/binfilter/inc/bf_sw/shellio.hxx b/binfilter/inc/bf_sw/shellio.hxx
index 62e1fc8..55c5532 100644
--- a/binfilter/inc/bf_sw/shellio.hxx
+++ b/binfilter/inc/bf_sw/shellio.hxx
@@ -288,7 +288,6 @@ public:
     SwgReaderOption& GetReaderOpt() { return aOpt; }
 
     virtual void SetFltName( const String& rFltNm );
-    static void SetNoOutlineNum( SwDoc& rDoc );
 
     // Die Filter-Vorlage laden, setzen und wieder freigeben
     SwDoc* GetTemplateDoc();
commit 955029f4c1d7f448bb8fbddd5fb0492b30dbe396
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu Jun 21 19:32:06 2012 +0200

    Remove commented out lines
    
    Change-Id: If3b06fdeb46a115ef3e7f282ef3a858f2510ef42

diff --git a/binfilter/bf_sw/source/core/text/txtcfg.hxx b/binfilter/bf_sw/source/core/text/txtcfg.hxx
index 5e24092..b738da0 100644
--- a/binfilter/bf_sw/source/core/text/txtcfg.hxx
+++ b/binfilter/bf_sw/source/core/text/txtcfg.hxx
@@ -29,16 +29,6 @@
 #ifndef _TXTCFG_HXX
 #define _TXTCFG_HXX
 
-//#if OSL_DEBUG_LEVEL > 1
-//// auto strip #include "dbgloop.hxx"  // DBG_LOOP
-//#else
-//#ifdef DBG_LOOP       //kann per precompiled hereinkommen
-//#undef DBG_LOOP
-//#undef DBG_LOOP_RESET
-//#endif
-//#define DBG_LOOP
-//#define DBG_LOOP_RESET
-//#endif
 namespace binfilter {
 
 // Toleranzwert in der Formatierung und Textausgabe.