Integrated sw-dump-layout-tree.diff in the git repos for dbglevel>1

1 files changed, 0 insertions, 441 deletions

diff --git a/scratch/writer/sw-dump-layout-tree.diff b/scratch/writer/sw-dump-layout-tree.diff
deleted file mode 100644
index 2902fa25f..000000000
--- a/scratch/writer/sw-dump-layout-tree.diff
+++ /dev/null
@@ -1,441 +0,0 @@
-diff --git sw/source/core/inc/bodyfrm.hxx sw/source/core/inc/bodyfrm.hxx
-index 8e44fca..78658d7 100644
---- sw/source/core/inc/bodyfrm.hxx
-+++ sw/source/core/inc/bodyfrm.hxx
-@@ -46,6 +46,8 @@ protected:
- public:
-     SwBodyFrm( SwFrmFmt* );
- 
-+    virtual void Paint( const SwRect& ) const;
-+
-     DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrm)
- };
- 
-diff --git sw/source/core/inc/frame.hxx sw/source/core/inc/frame.hxx
-index 420d970..b285be7 100644
---- sw/source/core/inc/frame.hxx
-+++ sw/source/core/inc/frame.hxx
-@@ -33,6 +33,8 @@
- #include "swtypes.hxx"	// fuer SwTwips
- #include "swrect.hxx"
- #include "calbck.hxx"	// fuer SwClient
-+#include <libxml/encoding.h>
-+#include <libxml/xmlwriter.h>
- 
- class SwLayoutFrm;
- class SwRootFrm;
-@@ -919,6 +921,8 @@ public:
-     void ValidateThisAndAllLowers( const USHORT nStage );
- 
- public:
-+    virtual void dumpAsXml(xmlTextWriterPtr writer);
-+    void dumpChildrenAsXml(xmlTextWriterPtr writer);
-     bool IsCollapse() const;
- };
- 
-diff --git sw/source/core/layout/makefile.mk sw/source/core/layout/makefile.mk
-index e2e8a2c..573874a 100644
---- sw/source/core/layout/makefile.mk
-+++ sw/source/core/layout/makefile.mk
-@@ -103,7 +103,8 @@ SLOFILES =  \
-     $(SLO)$/trvlfrm.obj \
-     $(SLO)$/unusedf.obj \
-     $(SLO)$/virtoutp.obj \
--    $(SLO)$/wsfrm.obj
-+    $(SLO)$/wsfrm.obj \
-+    $(SLO)$/xmldump.obj
- 
- .IF "$(product)"==""
- .IF "$(cap)"==""
-diff --git sw/source/core/layout/pagechg.cxx sw/source/core/layout/pagechg.cxx
-index cf45cba..4f5e446 100644
---- sw/source/core/layout/pagechg.cxx
-+++ sw/source/core/layout/pagechg.cxx
-@@ -2493,3 +2493,17 @@ const SwPageFrm& SwPageFrm::GetFormatPage() const
-     return *pRet;
- }
- 
-+
-+void SwBodyFrm::Paint( const SwRect& rRect) const
-+{
-+    ViewShell *pSh = GetShell();
-+    OutputDevice* pOut =  pSh->GetOut();
-+    pOut->Push();
-+    pOut->SetLineColor(Color(255, 0, 0));
-+    pOut->SetFillColor(COL_TRANSPARENT);
-+//    SwRect aRect(Frm().Left()+5, Frm().Top()+5, Frm().Width()-5, Frm().Height()-5);
-+    SwRect aRect=Frm();
-+    pOut->DrawRect(aRect.SVRect());
-+    pOut->Pop();
-+    SwLayoutFrm::Paint(rRect);
-+}
-diff --git sw/source/core/layout/xmldump.cxx sw/source/core/layout/xmldump.cxx
-new file mode 100644
-index 0000000..4422142
---- /dev/null
-+++ sw/source/core/layout/xmldump.cxx
-@@ -0,0 +1,243 @@
-+#include "precompiled_sw.hxx"
-+
-+#include "frame.hxx"
-+#include "txtfrm.hxx"
-+#include "../text/porlin.hxx"
-+#include "../text/porlay.hxx"
-+#include "../text/portxt.hxx"
-+#include <SwPortionHandler.hxx>
-+
-+
-+
-+class XmlPortionDumper : public SwPortionHandler {
-+private:
-+  xmlTextWriterPtr writer;
-+  USHORT ofs;
-+public:
-+
-+  XmlPortionDumper(xmlTextWriterPtr some_writer) : writer(some_writer), ofs(0) {
-+  }
-+
-+  virtual ~XmlPortionDumper() {
-+  }
-+
-+  virtual void Text(
-+	USHORT nLength,         /// length of this portion in the model string
-+	USHORT nType) {         /// type of this portion  
-+    ofs+=nLength;
-+    xmlTextWriterStartElement(writer, BAD_CAST("Text"));
-+    xmlTextWriterWriteFormatAttribute(writer,
-+				      BAD_CAST("nLength"),
-+				      "%i",
-+				      (int)nLength);
-+    xmlTextWriterWriteFormatAttribute(writer,
-+				      BAD_CAST("nType"),
-+				      "%i",
-+				      (int)nType);
-+    xmlTextWriterEndElement(writer);
-+  }
-+
-+  virtual void Special(
-+        USHORT nLength,         /// length of this portion in the model string
-+	const String& rText,    /// text which is painted on-screen
-+	USHORT nType) {         /// type of this portion
-+    xmlTextWriterStartElement(writer, BAD_CAST("Special"));
-+    xmlTextWriterWriteFormatAttribute(writer,
-+				      BAD_CAST("nLength"),
-+				      "%i",
-+				      (int)nLength);
-+    xmlTextWriterWriteFormatAttribute(writer,
-+				      BAD_CAST("nType"),
-+				      "%i",
-+				      (int)nType);
-+    rtl::OUString sText(rText);
-+    rtl::OString sText8 = ::rtl::OUStringToOString (sText, RTL_TEXTENCODING_UTF8);
-+    xmlTextWriterWriteFormatAttribute(writer,
-+				      BAD_CAST("rText"),
-+				      "%s",
-+				      sText8.getStr());
-+
-+    xmlTextWriterEndElement(writer);
-+    ofs+=nLength;
-+  }
-+
-+  virtual void LineBreak() {
-+    xmlTextWriterStartElement(writer, BAD_CAST("LineBreak"));
-+    xmlTextWriterEndElement(writer);
-+  }
-+
-+  virtual void Skip(USHORT nLength) {   /// number of 'model string' characters to be skipped
-+    xmlTextWriterStartElement(writer, BAD_CAST("Skip"));
-+    xmlTextWriterWriteFormatAttribute(writer,
-+				      BAD_CAST("nLength"),
-+				      "%i",
-+				      (int)nLength);
-+    xmlTextWriterEndElement(writer);
-+    ofs+=nLength;
-+  }
-+
-+  virtual void Finish() {
-+    xmlTextWriterStartElement(writer, BAD_CAST("Finish"));
-+    xmlTextWriterEndElement(writer);
-+  }
-+ 
-+
-+};
-+
-+
-+void SwTxtPortion::dumpPortionAsXml(xub_StrLen ofs, XubString & /*aText*/, xmlTextWriterPtr writer) {
-+  xmlTextWriterStartElement(writer, BAD_CAST("SwTxtPortion"));
-+  xmlTextWriterWriteFormatAttribute(writer,
-+				    BAD_CAST("ofs"),
-+				    "%i",
-+				    ofs);
-+  xmlTextWriterWriteFormatAttribute(writer,
-+				    BAD_CAST("len"),
-+				    "%i",
-+				    (int)this->GetLen());
-+
-+  xmlTextWriterEndElement(writer);
-+}
-+
-+void SwLinePortion::dumpPortionAsXml(xub_StrLen ofs, XubString &/*aText*/, xmlTextWriterPtr writer) {
-+  xmlTextWriterStartElement(writer, BAD_CAST("SwLinePortion"));
-+  xmlTextWriterWriteFormatAttribute(writer,
-+				    BAD_CAST("nWhichPor"),
-+				    "%04X",
-+				    (int)this->GetWhichPor());
-+  xmlTextWriterWriteFormatAttribute(writer,
-+				    BAD_CAST("ofs"),
-+				    "%i",
-+				    ofs);
-+  xmlTextWriterWriteFormatAttribute(writer,
-+				    BAD_CAST("len"),
-+				    "%i",
-+				    (int)this->GetLen());
-+  xmlTextWriterEndElement(writer);
-+}
-+
-+void SwLineLayout::dumpLineAsXml(xmlTextWriterPtr writer, xub_StrLen &ofs, XubString &aText) { // not used any longer...
-+  xmlTextWriterStartElement(writer, BAD_CAST("SwLineLayout"));
-+  SwLinePortion *portion=this;
-+  while(portion!=NULL) {
-+    portion->dumpPortionAsXml(ofs, aText, writer);
-+    ofs+=portion->GetLen();
-+    portion=portion->GetPortion();
-+  }
-+  xmlTextWriterEndElement(writer);
-+}
-+
-+
-+void SwParaPortion::dumpAsXml(xmlTextWriterPtr writer, SwTxtFrm *pTxtFrm) {
-+  xmlTextWriterStartElement(writer, BAD_CAST("SwParaPortion"));
-+  SwParaPortion* pPara = this;
-+  
-+  if( pPara && pTxtFrm ) {
-+    xub_StrLen ofs=0;
-+    XubString &aText=(String&)pTxtFrm->GetTxt();
-+    if ( pTxtFrm->IsFollow() )
-+      ofs+=pTxtFrm->GetOfst();
-+      
-+    SwLineLayout* pLine = pPara;
-+    while ( pLine ) {
-+      xmlTextWriterStartElement(writer, BAD_CAST("line"));
-+      SwLinePortion* pPor = pLine->GetFirstPortion();
-+      while ( pPor ) {
-+	pPor->dumpPortionAsXml(ofs, aText, writer);
-+	ofs+=pPor->GetLen();
-+	pPor = pPor->GetPortion();
-+      }
-+      
-+      xmlTextWriterEndElement(writer); // line
-+      pLine = pLine->GetNext();
-+    }
-+  }
-+  xmlTextWriterEndElement(writer);
-+}
-+
-+
-+void SwFrm::dumpAsXml(xmlTextWriterPtr writer)
-+{
-+    const char *name=NULL;
-+
-+    switch(GetType()) {
-+	case FRM_ROOT:
-+	    name="root";
-+	    break;
-+	case FRM_PAGE:
-+	    name="page";
-+	    break;
-+	case FRM_COLUMN:
-+	    name="column";
-+	    break;
-+	case FRM_HEADER:
-+	    name="header";
-+	    break;
-+	case FRM_FOOTER:
-+	    name="footer";
-+	    break;
-+	case FRM_FTNCONT:
-+	    name="ftncont";
-+	    break;
-+	case FRM_FTN:
-+	    name="ftn";
-+	    break;
-+	case FRM_BODY:
-+	    name="body";
-+	    break;
-+	case FRM_FLY:
-+	    name="fly";
-+	    break;
-+	case FRM_SECTION:
-+	    name="section";
-+	    break;
-+	case FRM_UNUSED:
-+	    name="unused";
-+	    break;
-+	case FRM_TAB:
-+	    name="tab";
-+	    break;
-+	case FRM_ROW:
-+	    name="row";
-+	    break;
-+	case FRM_CELL:
-+	    name="cell";
-+	    break;
-+	case FRM_TXT:
-+	    name="txt";
-+	    break;
-+	case FRM_NOTXT:	   
-+	    name="txt";
-+	    break;
-+    };
-+
-+    if (name!=NULL) {
-+	xmlTextWriterStartElement(writer, (const xmlChar*)name);
-+	if (IsTxtFrm()) {
-+	    SwTxtFrm *pTxtFrm=(SwTxtFrm *)this;
-+	    rtl::OUString aTxt=pTxtFrm->GetTxt();
-+	    for(int i=0;i<32;i++) {
-+		aTxt=aTxt.replace(i, '*');
-+	    }
-+	    rtl::OString aTxt8 = ::rtl::OUStringToOString (aTxt, RTL_TEXTENCODING_UTF8);
-+	    xmlTextWriterWriteString(writer, (const xmlChar*)aTxt8.getStr());
-+	    XmlPortionDumper pdumper(writer);
-+	    pTxtFrm->VisitPortions(pdumper);
-+	    //	    if (pTxtFrm->GetPara()) {
-+	    //pTxtFrm->GetPara()->dumpAsXml(writer, pTxtFrm);
-+	    //}
-+	   
-+	} else {
-+	    dumpChildrenAsXml(writer);
-+	}
-+	xmlTextWriterEndElement(writer);
-+    }
-+}
-+
-+void SwFrm::dumpChildrenAsXml(xmlTextWriterPtr writer)
-+{
-+    SwFrm *pFrm=GetLower();
-+    for(;pFrm!=NULL;pFrm=pFrm->GetNext()) {
-+	pFrm->dumpAsXml(writer);
-+    }
-+}
-diff --git sw/source/core/text/porlay.hxx sw/source/core/text/porlay.hxx
-index 4d757c7..d1ea650 100644
---- sw/source/core/text/porlay.hxx
-+++ sw/source/core/text/porlay.hxx
-@@ -263,6 +263,8 @@ public:
-                         const xub_StrLen nStart ); //$ ostream
- #endif
- 
-+    void dumpLineAsXml(xmlTextWriter* writer, USHORT& ofs, String& aText);
-+
-     OUTPUT_OPERATOR
-     DECL_FIXEDMEMPOOL_NEWDEL(SwLineLayout)
- };
-@@ -370,6 +372,8 @@ public:
- 
-     const SwDropPortion *FindDropPortion() const;
- 
-+    void dumpAsXml( xmlTextWriter* writer, SwTxtFrm* pTxtFrm );
-+
-     OUTPUT_OPERATOR
-     DECL_FIXEDMEMPOOL_NEWDEL(SwParaPortion)
- };
-diff --git sw/source/core/text/porlin.hxx sw/source/core/text/porlin.hxx
-index 9beb401..3679622 100644
---- sw/source/core/text/porlin.hxx
-+++ sw/source/core/text/porlin.hxx
-@@ -31,6 +31,7 @@
- #define _PORLIN_HXX
- 
- #include "possiz.hxx"		// SwPosSize
-+#include <libxml/xmlwriter.h>
- 
- class XubString;
- class SwTxtSizeInfo;
-@@ -198,6 +199,7 @@ public:
-     // Accessibility: pass information about this portion to the PortionHandler
-     virtual void HandlePortion( SwPortionHandler& rPH ) const;
- 
-+    void dumpPortionAsXml(USHORT ofs, String& aText, xmlTextWriter* writer);
-     OUTPUT_OPERATOR
- };
- 
-diff --git sw/source/core/text/portxt.hxx sw/source/core/text/portxt.hxx
-index 240d40a..3f03483 100644
---- sw/source/core/text/portxt.hxx
-+++ sw/source/core/text/portxt.hxx
-@@ -69,6 +69,8 @@ public:
-     // Accessibility: pass information about this portion to the PortionHandler
-     virtual void HandlePortion( SwPortionHandler& rPH ) const;
- 
-+    void dumpPortionAsXml(USHORT ofs, String& aText, xmlTextWriter* writer);
-+
-     OUTPUT_OPERATOR
-     DECL_FIXEDMEMPOOL_NEWDEL(SwTxtPortion)
- };
-diff --git sw/source/ui/docvw/edtwin.cxx sw/source/ui/docvw/edtwin.cxx
-index 6baa2d6..b5c7228 100644
---- sw/source/ui/docvw/edtwin.cxx
-+++ sw/source/ui/docvw/edtwin.cxx
-@@ -128,6 +128,7 @@
- #include <crsskip.hxx>
- #include <breakit.hxx>
- #include <checkit.hxx>
-+#include "../../core/inc/rootfrm.hxx"
- 
- #ifndef _HELPID_H
- #include <helpid.h>
-@@ -1317,6 +1318,19 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
-     BOOL bChkInsBlank = pQuickHlpData->bChkInsBlank;
-     pQuickHlpData->bChkInsBlank = FALSE;
- 
-+    if (rKEvt.GetKeyCode().GetCode()==KEY_F12) {
-+        SwRootFrm* pLayout = GetView().GetDocShell()->GetWrtShell()->GetLayout();
-+        xmlTextWriterPtr writer = xmlNewTextWriterFilename("layout.xml", 0);
-+        if (writer!=NULL) {
-+            printf("dumping layout in \"layout.xml\"\n");
-+            xmlTextWriterStartDocument(writer, NULL, NULL, NULL);
-+            pLayout->dumpAsXml(writer);
-+            xmlTextWriterEndDocument(writer);
-+            xmlFreeTextWriter(writer);
-+        }
-+        return;
-+    }
-+
-     KeyEvent aKeyEvent( rKEvt );
-     // look for vertical mappings
-     if( !bIsDocReadOnly && !rSh.IsSelFrmMode() && !rSh.IsObjSelected() )
-diff --git sw/util/makefile.mk sw/util/makefile.mk
-index d41a67c..14a3991 100644
---- sw/util/makefile.mk
-+++ sw/util/makefile.mk
-@@ -128,7 +128,8 @@ SHL1STDLIBS+= \
-     $(ICUUCLIB) \
-     $(I18NUTILLIB)	\
- 		        $(VBAHELPERLIB) \
--    $(AVMEDIALIB)
-+    $(AVMEDIALIB) \
-+ 	$(LIBXML2LIB)
- 
- .IF "$(GUI)"=="WNT"
- SHL1STDLIBS+= $(ADVAPI32LIB)
-@@ -157,7 +158,8 @@ SHL2STDLIBS= \
-             $(COMPHELPERLIB) \
-             $(CPPUHELPERLIB) \
-             $(CPPULIB) \
--            $(SALLIB)
-+            $(SALLIB) \
-+	    $(LIBXML2LIB)
- 
- SHL2OBJS=   $(SLO)$/swdetect.obj \
-         $(SLO)$/swdet2.obj \
-@@ -196,7 +198,8 @@ SHL3STDLIBS= \
-             $(CPPUHELPERLIB)	\
-             $(CPPULIB) \
-             $(SALLIB) \
--            $(SOTLIB)
-+            $(SOTLIB) \
-+		    $(LIBXML2LIB) 
- 
- SHL3LIBS=   $(SLB)$/swui.lib
- LIB3TARGET = $(SLB)$/swui.lib