[Libreoffice-commits] core.git: 2 commits - include/svx libreofficekit/source sd/inc sd/source

[Miklos Vajna]

 include/svx/svdpage.hxx                  |    2 +-
 libreofficekit/source/gtk/lokdocview.cxx |    5 ++++-
 sd/inc/sdpage.hxx                        |    1 +
 sd/source/core/sdpage2.cxx               |   26 ++++++++++++++++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit 2b6338f39eb965d3de22bb57e5c1f72432a06329
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Oct 9 13:46:24 2015 +0200

    sd: add SdPage::dumpAsXml()
    
    Change-Id: Ifef668530d660b0b6330f1e60ed558501a74611e

diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 8a7977c..20a7fce 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -241,7 +241,7 @@ public:
     void SetNavigationOrder (const css::uno::Reference<
                              css::container::XIndexAccess>& rxOrder);
 
-    void dumpAsXml(struct _xmlTextWriter* pWriter) const;
+    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 
 private:
     class WeakSdrObjectContainerType;
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index bd065a5..cf5191d 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -374,6 +374,7 @@ public:
     const sd::AnnotationVector& getAnnotations() const { return maAnnotations; }
     sal_Int32 getHash() const;
     OString stringify() const;
+    virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 
 private:
     bool mbIsPrecious;
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index aded80f..e2e6304 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -19,6 +19,7 @@
 
 #include <vector>
 #include <boost/ptr_container/ptr_vector.hpp>
+#include <libxml/xmlwriter.h>
 
 #include <sfx2/docfile.hxx>
 #include <vcl/svapp.hxx>
@@ -634,4 +635,29 @@ void SdPage::removeAnnotation( const Reference< XAnnotation >& xAnnotation )
     }
 }
 
+void SdPage::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+    xmlTextWriterStartElement(pWriter, BAD_CAST("sdPage"));
+
+    const char* pPageKind = 0;
+    switch (mePageKind)
+    {
+    case PK_STANDARD:
+        pPageKind = "PK_STANDARD";
+    break;
+    case PK_NOTES:
+        pPageKind = "PK_NOTES";
+        break;
+    case PK_HANDOUT:
+        pPageKind = "PK_HANDOUT";
+        break;
+    }
+    if (pPageKind)
+        xmlTextWriterWriteAttribute(pWriter, BAD_CAST("mePageKind"), BAD_CAST(pPageKind));
+
+
+    FmFormPage::dumpAsXml(pWriter);
+    xmlTextWriterEndElement(pWriter);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 2e1503dbd01aa62ae4ad0af4f481797521c1c8d5
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Oct 9 08:27:48 2015 +0200

    lokdocview: log postUnoCommand() arguments
    
    Change-Id: I0febc2b89d95bde59ad9d3a90d404b3932cc3624

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index df78d13..fd6d769 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -698,7 +698,7 @@ static void callbackWorker (int nType, const char* pPayload, void* pData)
     LOKDocView* pDocView = LOK_DOC_VIEW (pData);
 
     CallbackData* pCallback = new CallbackData(nType, pPayload ? pPayload : "(nil)", pDocView);
-    g_info("lok_doc_view_callbackWorker: %s, '%s'", callbackTypeToString(nType), pPayload);
+    g_info("callbackWorker: %s, '%s'", callbackTypeToString(nType), pPayload);
     gdk_threads_add_idle(callback, pCallback);
 }
 
@@ -1365,6 +1365,9 @@ postCommandInThread (gpointer data)
     LOKDocViewPrivate *priv = static_cast<LOKDocViewPrivate*>(lok_doc_view_get_instance_private (pDocView));
 
     priv->m_pDocument->pClass->setView(priv->m_pDocument, priv->m_nViewId);
+    std::stringstream ss;
+    ss << "lok::Document::postUnoCommand(" << pLOEvent->m_pCommand << ", " << pLOEvent->m_pArguments << ")";
+    g_info(ss.str().c_str());
     priv->m_pDocument->pClass->postUnoCommand(priv->m_pDocument, pLOEvent->m_pCommand, pLOEvent->m_pArguments);
 }