[Libreoffice-commits] core.git: 2 commits - sdext/source sw/source

[Stephan Bergmann (via logerrit)]

 sdext/source/presenter/PresenterHelper.cxx |    6 ------
 sdext/source/presenter/PresenterHelper.hxx |    6 ------
 sw/source/filter/xml/xmlimpit.cxx          |    9 +++++++--
 3 files changed, 7 insertions(+), 14 deletions(-)

New commits:
commit ce76618e83d895fcc57bf271e4684e7df77228d2
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Sep 7 22:17:31 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Sep 8 09:07:35 2020 +0200

    Remove some unused const variables
    
    Change-Id: Ida4f482c6477d73728c49302af19a4c9e73a9aae
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102203
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx
index 33c6cda994e8..8b8f57ea3dcc 100644
--- a/sdext/source/presenter/PresenterHelper.cxx
+++ b/sdext/source/presenter/PresenterHelper.cxx
@@ -36,12 +36,6 @@ const OUStringLiteral PresenterHelper::msViewURLPrefix( u"private:resource/view/
 const OUString PresenterHelper::msPresenterScreenURL( msViewURLPrefix + "PresenterScreen");
 const OUString PresenterHelper::msSlideSorterURL( msViewURLPrefix + "SlideSorter");
 
-const OUStringLiteral PresenterHelper::msResourceActivationEvent( u"ResourceActivation");
-const OUStringLiteral PresenterHelper::msResourceDeactivationEvent( u"ResourceDeactivation");
-
-const OUStringLiteral PresenterHelper::msDefaultPaneStyle ( u"DefaultPaneStyle");
-const OUStringLiteral PresenterHelper::msDefaultViewStyle ( u"DefaultViewStyle");
-
 Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowController (
     const Reference<frame::XController>& rxController)
 {
diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx
index 6f8a9721c037..0f84bdfd3555 100644
--- a/sdext/source/presenter/PresenterHelper.hxx
+++ b/sdext/source/presenter/PresenterHelper.hxx
@@ -38,12 +38,6 @@ namespace PresenterHelper
     extern const OUString msPresenterScreenURL;
     extern const OUString msSlideSorterURL;
 
-    extern const OUStringLiteral msResourceActivationEvent;
-    extern const OUStringLiteral msResourceDeactivationEvent;
-
-    extern const OUStringLiteral msDefaultPaneStyle;
-    extern const OUStringLiteral msDefaultViewStyle;
-
     /** Return the slide show controller of a running presentation that has
         the same document as the given framework controller.
         @return
commit 9208eab706bfffec306d3611080b86b7bdd27567
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Sep 7 22:14:55 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Sep 8 09:07:29 2020 +0200

    fix crashtest ooo53770-1.odt
    
    Change-Id: I0a3a63e8c4146c2f8a9ac6593774e6e4d9f5b8ba
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102201
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index be7ffaa95b8f..af8a8b0c2781 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -19,6 +19,7 @@
 
 #include "xmlimpit.hxx"
 
+#include <sal/log.hxx>
 #include <sax/tools/converter.hxx>
 #include <utility>
 #include <xmloff/xmluconv.hxx>
@@ -226,8 +227,12 @@ void SvXMLImportItemMapper::importXMLUnknownAttributes( SfxItemSet& rSet,
                     sPrefix = sName.copy(0, i-1);
                     sName = sName.copy(i+1);
                 }
-                pUnknownItem->AddAttr( sPrefix, rAttribute.NamespaceURL, sName,
-                                       rAttribute.Value );
+                // the sax parser doesn't reject these, strangely
+                if (sName.indexOf(':') == -1)
+                    pUnknownItem->AddAttr( sPrefix, rAttribute.NamespaceURL, sName,
+                                           rAttribute.Value );
+                else
+                    SAL_WARN("sw", "ignoring dodgy attribute: " + rAttribute.Name);
             }
         }
     }