[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - include/xmloff sw/source sw/util

2016-06-06 Thread Rosemary Sebastian 
 include/xmloff/xmlimp.hxx   |1 +
 sw/source/filter/xml/swxml.cxx  |7 +++
 sw/source/filter/xml/xmlimp.cxx |   11 +++
 sw/util/sw.component|   10 +++---
 4 files changed, 26 insertions(+), 3 deletions(-)

New commits:
commit cf849897b91af349afbf352bb529acf2b5e9ecfc
Author: Rosemary Sebastian 
Date:   Mon Jun 6 12:06:24 2016 +0530

Import tracked changes from undo.xml

Change-Id: If1003968accbc31acdb4b503940c53c01264e60c

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 2261e47..c2c2474 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -96,6 +96,7 @@ enum class SvXMLImportFlags {
 SETTINGS= 0x0040,
 FONTDECLS   = 0x0080,
 EMBEDDED= 0x0100,
+UNDO= 0x0200,
 ALL = 0x
 };
 namespace o3tl
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 33c976f..95708ad 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -875,6 +875,13 @@ sal_uLong XMLReader::Read( SwDoc , const OUString& 
rBaseURL, SwPaM , c
 : "com.sun.star.comp.Writer.XMLContentImporter"),
aFilterArgs, rName, true );
 
+if( !nRet && !(IsOrganizerMode() || aOpt.IsFormatsOnly()) )
+nRet = ReadThroughComponent(
+   xStorage, xModelComp, "undo.xml", nullptr, xContext,
+(bOASIS ? "com.sun.star.comp.Writer.XMLOasisUndoImporter"
+: "com.sun.star.comp.Writer.XMLUndoImporter"),
+   aEmptyArgs, rName, true );
+
 if( !(IsOrganizerMode() || IsBlockMode() || bInsertMode ||
   aOpt.IsFormatsOnly() ) )
 {
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index e749b3a..f583259 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -95,6 +95,7 @@ enum SwXMLDocTokens
 XML_TOK_DOC_MASTERSTYLES,
 XML_TOK_DOC_META,
 XML_TOK_DOC_BODY,
+XML_TOK_DOC_UNDO,
 XML_TOK_DOC_SCRIPT,
 XML_TOK_DOC_SETTINGS,
 XML_TOK_DOC_XFORMS,
@@ -109,6 +110,7 @@ static SvXMLTokenMapEntry aDocTokenMap[] =
 { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES,   XML_TOK_DOC_MASTERSTYLES   },
 { XML_NAMESPACE_OFFICE, XML_META,   XML_TOK_DOC_META},
 { XML_NAMESPACE_OFFICE, XML_BODY,   XML_TOK_DOC_BODY},
+{ XML_NAMESPACE_OFFICE, XML_UNDO,   XML_TOK_DOC_UNDO},
 { XML_NAMESPACE_OFFICE, XML_SCRIPTS,XML_TOK_DOC_SCRIPT  },
 { XML_NAMESPACE_OFFICE, XML_SETTINGS,   XML_TOK_DOC_SETTINGS},
 { XML_NAMESPACE_XFORMS, XML_MODEL,  XML_TOK_DOC_XFORMS  },
@@ -1596,4 +1598,13 @@ 
com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(css::uno::X
 return cppu::acquire(new SwXMLImport(context, 
OUString("com.sun.star.comp.Writer.XMLOasisSettingsImporter"),
 SvXMLImportFlags::SETTINGS));
 }
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisUndoImporter_get_implementation(css::uno::XComponentContext*
 context,
+css::uno::Sequence const &)
+{
+return cppu::acquire(new SwXMLImport(context, 
OUString("com.sun.star.comp.Writer.XMLOasisUndoImporter"),
+SvXMLImportFlags::UNDO | SvXMLImportFlags::AUTOSTYLES));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/util/sw.component b/sw/util/sw.component
index a76d30a..478e4a2 100644
--- a/sw/util/sw.component
+++ b/sw/util/sw.component
@@ -76,13 +76,17 @@
   
constructor="com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation">
 
   
+  
+
+  
   
 
   
-  
-
+  
+
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - include/xmloff sw/source sw/util

2016-06-06 Thread Rosemary Sebastian 
 include/xmloff/xmlimp.hxx   |1 +
 sw/source/filter/xml/swxml.cxx  |7 +++
 sw/source/filter/xml/xmlimp.cxx |   11 +++
 sw/util/sw.component|   10 +++---
 4 files changed, 26 insertions(+), 3 deletions(-)

New commits:
commit ae525ba046e444a32fc01cbefe4e7ca110521bc7
Author: Rosemary Sebastian 
Date:   Mon Jun 6 12:06:24 2016 +0530

Import tracked changes from undo.xml - Part 1

Change-Id: If1003968accbc31acdb4b503940c53c01264e60c
Reviewed-on: https://gerrit.libreoffice.org/25950
Reviewed-by: Rosemary Sebastian 
Tested-by: Rosemary Sebastian 

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 2261e47..c2c2474 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -96,6 +96,7 @@ enum class SvXMLImportFlags {
 SETTINGS= 0x0040,
 FONTDECLS   = 0x0080,
 EMBEDDED= 0x0100,
+UNDO= 0x0200,
 ALL = 0x
 };
 namespace o3tl
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 33c976f..95708ad 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -875,6 +875,13 @@ sal_uLong XMLReader::Read( SwDoc , const OUString& 
rBaseURL, SwPaM , c
 : "com.sun.star.comp.Writer.XMLContentImporter"),
aFilterArgs, rName, true );
 
+if( !nRet && !(IsOrganizerMode() || aOpt.IsFormatsOnly()) )
+nRet = ReadThroughComponent(
+   xStorage, xModelComp, "undo.xml", nullptr, xContext,
+(bOASIS ? "com.sun.star.comp.Writer.XMLOasisUndoImporter"
+: "com.sun.star.comp.Writer.XMLUndoImporter"),
+   aEmptyArgs, rName, true );
+
 if( !(IsOrganizerMode() || IsBlockMode() || bInsertMode ||
   aOpt.IsFormatsOnly() ) )
 {
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index e749b3a..f583259 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -95,6 +95,7 @@ enum SwXMLDocTokens
 XML_TOK_DOC_MASTERSTYLES,
 XML_TOK_DOC_META,
 XML_TOK_DOC_BODY,
+XML_TOK_DOC_UNDO,
 XML_TOK_DOC_SCRIPT,
 XML_TOK_DOC_SETTINGS,
 XML_TOK_DOC_XFORMS,
@@ -109,6 +110,7 @@ static SvXMLTokenMapEntry aDocTokenMap[] =
 { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES,   XML_TOK_DOC_MASTERSTYLES   },
 { XML_NAMESPACE_OFFICE, XML_META,   XML_TOK_DOC_META},
 { XML_NAMESPACE_OFFICE, XML_BODY,   XML_TOK_DOC_BODY},
+{ XML_NAMESPACE_OFFICE, XML_UNDO,   XML_TOK_DOC_UNDO},
 { XML_NAMESPACE_OFFICE, XML_SCRIPTS,XML_TOK_DOC_SCRIPT  },
 { XML_NAMESPACE_OFFICE, XML_SETTINGS,   XML_TOK_DOC_SETTINGS},
 { XML_NAMESPACE_XFORMS, XML_MODEL,  XML_TOK_DOC_XFORMS  },
@@ -1596,4 +1598,13 @@ 
com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(css::uno::X
 return cppu::acquire(new SwXMLImport(context, 
OUString("com.sun.star.comp.Writer.XMLOasisSettingsImporter"),
 SvXMLImportFlags::SETTINGS));
 }
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_Writer_XMLOasisUndoImporter_get_implementation(css::uno::XComponentContext*
 context,
+css::uno::Sequence const &)
+{
+return cppu::acquire(new SwXMLImport(context, 
OUString("com.sun.star.comp.Writer.XMLOasisUndoImporter"),
+SvXMLImportFlags::UNDO | SvXMLImportFlags::AUTOSTYLES));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/util/sw.component b/sw/util/sw.component
index a76d30a..478e4a2 100644
--- a/sw/util/sw.component
+++ b/sw/util/sw.component
@@ -76,13 +76,17 @@
   
constructor="com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation">
 
   
+  
+
+  
   
 
   
-  
-
+  
+
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/Rosemary/change-tracking' - include/xmloff sw/source sw/util xmloff/source

2016-06-02 Thread Rosemary Sebastian 
 include/xmloff/xmlexp.hxx  |7 +-
 include/xmloff/xmltoken.hxx|2 +
 sw/source/core/inc/SwXMLBlockExport.hxx|2 +
 sw/source/filter/xml/wrtxml.cxx|   13 +++
 sw/source/filter/xml/xmlexp.cxx|   22 
 sw/source/filter/xml/xmlexp.hxx|1 
 sw/source/uibase/config/StoredChapterNumbering.cxx |1 
 sw/util/sw.component   |8 +++
 xmloff/source/core/xmlexp.cxx  |   23 -
 xmloff/source/core/xmltoken.cxx|2 +
 10 files changed, 79 insertions(+), 2 deletions(-)

New commits:
commit 2aa542764ff6816b14d500945666f72a4b3f7881
Author: Rosemary Sebastian 
Date:   Tue May 24 17:52:41 2016 +0530

Create undo.xml for change-tracking

Change-Id: I41a6de97b5c377e9a5c528c920d5c6e0195b7a10
Reviewed-on: https://gerrit.libreoffice.org/25404
Reviewed-by: Rosemary Sebastian 
Tested-by: Rosemary Sebastian 

diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 41e8ddd..c8adc64 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -100,12 +100,13 @@ enum class SvXMLExportFlags {
 NODOCTYPE= 0x0200,
 PRETTY   = 0x0400,
 SAVEBACKWARDCOMPATIBLE   = 0x0800,
+UNDO = 0x1000,
 OASIS= 0x8000,
 ALL  = 0x0fff
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6<
@@ -178,6 +179,7 @@ private:
 SAL_DLLPRIVATE void ImplExportMasterStyles();
 // 
 SAL_DLLPRIVATE void ImplExportContent(); // 
+SAL_DLLPRIVATE void ImplExportUndo(); // 
 virtual void SetBodyAttributes();
 void 
GetViewSettingsAndViews(css::uno::Sequence& rProps);
 
@@ -217,6 +219,9 @@ protected:
 /// Override this method to export the content of .
 virtual void ExportContent_() = 0;
 
+/// Export the content of  in writer.
+virtual void ExportUndo_();
+
 OUString GetSourceShellID() const;
 OUString GetDestinationShellID() const;
 
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index ccbb8cf..4ddc061 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -644,6 +644,7 @@ namespace xmloff { namespace token {
 XML_DOCUMENT_SETTINGS,
 XML_DOCUMENT_STATISTIC,
 XML_DOCUMENT_STYLES,
+XML_DOCUMENT_UNDO,
 XML_DOMAIN,
 XML_DOT,
 XML_DOTS1,
@@ -1922,6 +1923,7 @@ namespace xmloff { namespace token {
 XML_SINGLE,
 XML_SMALL_WAVE,
 XML_WAVE,
+XML_UNDO,
 XML_UNFORMATTED_TEXT,
 XML_UNION,
 XML_UNIT,
diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx 
b/sw/source/core/inc/SwXMLBlockExport.hxx
index cbafb30..36515a0 100644
--- a/sw/source/core/inc/SwXMLBlockExport.hxx
+++ b/sw/source/core/inc/SwXMLBlockExport.hxx
@@ -41,6 +41,7 @@ public:
 void ExportAutoStyles_() override {}
 void ExportMasterStyles_ () override {}
 void ExportContent_() override {}
+void ExportUndo_() override {}
 };
 
 class SwXMLTextBlockExport : public SvXMLExport
@@ -61,6 +62,7 @@ public:
 void ExportAutoStyles_() override {}
 void ExportMasterStyles_ () override {}
 void ExportContent_() override {}
+void ExportUndo_() override {}
 };
 
 #endif
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 2fbdd81..735f973 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -366,6 +366,19 @@ sal_uInt32 SwXMLWriter::Write_( const uno::Reference < 
task::XStatusIndicator >&
 }
 }
 
+if( !bOrganizerMode && !bErr )
+{
+if( !WriteThroughComponent(
+xModelComp, "undo.xml", xContext,
+(bOASIS ? "com.sun.star.comp.Writer.XMLOasisUndoExporter"
+: "com.sun.star.comp.Writer.XMLUndoExporter"),
+aFilterArgs, aProps ) )
+{
+bErr = true;
+sErrFile = "undo.xml";
+}
+}
+
 if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() && 
pDoc->getIDocumentStatistics().GetDocStat().nPage > 1 &&
 !(bOrganizerMode || bBlock || bErr) )
 {
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 5865662..87993a2 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -492,6 +492,12 @@ void SwXMLExport::ExportContent_()
 GetTextParagraphExport()->exportText( xText, bShowProgress );
 }
 
+void SwXMLExport::ExportUndo_()
+{
+