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

[Miklos Vajna]

 sw/qa/core/data/ooxml/pass/liststyle-gridbefore.docx |binary
 sw/source/core/unocore/unoparagraph.cxx              |    2 +-
 writerfilter/source/dmapper/StyleSheetTable.cxx      |    3 ++-
 writerfilter/source/ooxml/modelpreprocess.py         |    4 ----
 4 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 7c02c7b0216f642074b690cce889f1a02a2ef6b0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Aug 22 13:51:54 2014 +0200

    DOCX import: list styles don't support automatic updates
    
    The problem was the following: setPropertyValue("IsAutoUpdate") on the
    style failed -> a number of styles was not imported in
    StyleSheetTable::ApplyStyleSheets() due to the exception, then when we
    tried to use one of the not imported styles, we also got an exception in
    DomainMapper_Impl::finishParagraph(), which resulted in not calling
    DomainMapperTableManager::handle(), so multiple cells of the same table
    wanted the same range for cell contents, and that resulted in a crash.
    
    Regression from cf33af732ed0d3d553bb74636e3b14c55d44c153 (handle
    w:gridBefore by faking cells (fdo#38414), 2014-04-23), but that commit
    just made the previously hidden problem visible.
    
    Change-Id: I788cb6b4a2c7b7efbfa48297c658bb26450bf583

diff --git a/sw/qa/core/data/ooxml/pass/liststyle-gridbefore.docx b/sw/qa/core/data/ooxml/pass/liststyle-gridbefore.docx
new file mode 100644
index 0000000..60dae2a
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/liststyle-gridbefore.docx differ
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 50e9b7e..1c39a8a 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1203,7 +1203,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
                         xPropertySet->setPropertyValue("StyleInteropGrabBag", uno::makeAny(aGrabBag));
                     }
 
-                    if (pEntry->bAutoRedefine)
+                    // List styles don't support automatic update.
+                    if (pEntry->bAutoRedefine && !bListStyle)
                         xPropertySet->setPropertyValue("IsAutoUpdate", uno::makeAny(sal_True));
                 }
                 else if(pEntry->nStyleTypeCode == STYLE_TYPE_TABLE)
commit 2a029e5f4ec7992422a02c575581a8b321c3f578
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Aug 22 10:55:06 2014 +0200

    SwXParagraph::Impl::GetTxtNode: fix indenetation
    
    Change-Id: Iac9e2883067b6cf4fdc259110642002b4ef6e48c

diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index c6c3e20..d83a19a 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -134,7 +134,7 @@ public:
     {
     }
 
-          SwTxtNode * GetTxtNode()       {
+    SwTxtNode* GetTxtNode() {
         return static_cast<SwTxtNode*>(GetRegisteredInNonConst());
     }
 
commit 8e9c34036220d9099386e83adb9a38ae008e1044
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Aug 22 10:11:12 2014 +0200

    writerfilter: unused namespacealias attribute
    
    Change-Id: I12f59c6d06323d3d9ebcd55ee5fe7e43597a11b4

diff --git a/writerfilter/source/ooxml/modelpreprocess.py b/writerfilter/source/ooxml/modelpreprocess.py
index 246fae3..6b2e874 100644
--- a/writerfilter/source/ooxml/modelpreprocess.py
+++ b/writerfilter/source/ooxml/modelpreprocess.py
@@ -71,10 +71,6 @@ def check(model):
 def preprocess(model):
     for i in model.getElementsByTagName("namespace"):
         ns = i.getElementsByTagName("grammar")[0].getAttribute("ns")
-        if ns in list(ooxUrlAliases.keys()):
-            i.setAttribute("namespacealias", ooxUrlAliases[ns])
-        else:
-            i.setAttribute("namespacealias", "")
         if ns.startswith("http://schemas.openxmlformats.org/"):
             i.setAttribute("prefix", ns.replace('http://schemas.openxmlformats.org/', '').replace('/', '_').replace('-', '_'))
         else: