Merge branch 'libreoffice-6-4' into distro/lhm/libreoffice-6-4+backports

Conflicts:
writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx

Change-Id: I2e0b84875a10a1255d88d54a3c5857c3e5832521

12 files changed, 53 insertions, 11 deletions

diff --git a/include/comphelper/xmlsechelper.hxx b/include/comphelper/xmlsechelper.hxx
index ba702fa683c6..5bf3add901f1 100644
--- a/include/comphelper/xmlsechelper.hxx
+++ b/include/comphelper/xmlsechelper.hxx
@@ -36,7 +36,8 @@ COMPHELPER_DLLPUBLIC OUString GetCertificateKind(const css::security::Certificat
 COMPHELPER_DLLPUBLIC std::vector<std::pair<OUString, OUString>> parseDN(const OUString& rRawString);
 COMPHELPER_DLLPUBLIC std::pair<OUString, OUString>
 GetDNForCertDetailsView(const OUString& rRawString);
-COMPHELPER_DLLPUBLIC OUString GetContentPart(const OUString& _rRawString);
+COMPHELPER_DLLPUBLIC OUString GetContentPart(const OUString& _rRawString,
+                                             const css::security::CertificateKind& rKind);
 
 COMPHELPER_DLLPUBLIC OUString GetHexString(const css::uno::Sequence<sal_Int8>& _rSeq,
                                            const char* _pSep, sal_uInt16 _nLineBreak = 0xFFFF);
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 414c0efcc010..1f77ce661020 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -614,6 +614,11 @@ public:
     sal_Int32 GetOverflowingLineNum() const;
     void ClearOverflowingParaNum();
     bool IsPageOverflow();
+
+    // tdf#132288  By default inserting an attribute beside another that is of
+    // the same type expands the original instead of inserting another. But the
+    // spell check dialog doesn't want that behaviour
+    void DisableAttributeExpanding();
 };
 
 #endif // INCLUDED_EDITENG_EDITENG_HXX
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 699f82928069..52cb14858c1f 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -102,6 +102,7 @@ public:
 private:
     OUString            sPrefix;
     OUString            sSuffix;
+    OUString            sListFormat;        // Format string ">%1.%2<" can be used instead of prefix/suffix
 
     SvxAdjust           eNumAdjust;
 
@@ -166,6 +167,8 @@ public:
     const OUString& GetPrefix() const { return sPrefix;}
     void            SetSuffix(const OUString& rSet) { sSuffix = rSet;}
     const OUString& GetSuffix() const { return sSuffix;}
+    void            SetListFormat(const OUString& rSet) { sListFormat = rSet; }
+    const OUString& GetListFormat() const { return sListFormat; }
 
     void                    SetCharFormatName(const OUString& rSet){ sCharStyleName = rSet; }
     virtual OUString        GetCharFormatName()const;
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index ac3194e81acd..f3f5f24d40b0 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -49,6 +49,12 @@ namespace oox { class AttributeList; }
 namespace oox {
 namespace core {
 
+enum class OOXMLVariant {
+    ECMA_Transitional,
+    ISO_Transitional,
+    ISO_Strict
+};
+
 
 /** Document handler specifically designed for detecting OOXML file formats.
 
@@ -79,7 +85,7 @@ public:
 private:
     void                parseRelationship( const AttributeList& rAttribs );
 
-    static OUString     getFilterNameFromContentType( const OUString& rContentType, const OUString& rFileName );
+    OUString            getFilterNameFromContentType( const OUString& rContentType, const OUString& rFileName );
     void                parseContentTypesDefault( const AttributeList& rAttribs );
     void                parseContentTypesOverride( const AttributeList& rAttribs );
 
@@ -90,6 +96,7 @@ private:
     OUString const      maFileName;
     ContextVector       maContextStack;
     OUString            maTargetPath;
+    OOXMLVariant        maOOXMLVariant;
     css::uno::Reference< css::uno::XComponentContext > mxContext;
 };
 
diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index 5e3517b58524..8b513d8c3f61 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -106,6 +106,9 @@ sal_Int32 GetCoordinate( sal_Int32 nValue );
 /** converts an emu string into 1/100th mmm */
 sal_Int32 GetCoordinate( const OUString& sValue );
 
+/** converts 1/100mm to EMU */
+sal_Int32 GetPointFromCoordinate( sal_Int32 nValue );
+
 /** converts a ST_Percentage % string into 1/1000th of % */
 sal_Int32 GetPercent( const OUString& sValue );
 
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index a3da6a3cb442..fb7b7877138c 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -247,6 +247,7 @@ public:
     void WriteParagraphProperties(const css::uno::Reference< css::text::XTextContent >& rParagraph, float fFirstCharHeight);
     void WriteParagraphNumbering(const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, float fFirstCharHeight,
                                   sal_Int16 nLevel );
+    void WriteParagraphTabStops(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet);
     void WriteRun( const css::uno::Reference< css::text::XTextRange >& rRun,
                    bool& rbOverridingCharHeight, sal_Int32& rnCharHeight );
     void WriteRunProperties( const css::uno::Reference< css::beans::XPropertySet >& rRun, bool bIsField, sal_Int32 nElement, bool bCheckDirect,
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 0352f2f1ac2a..2a56ebe88e07 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -679,8 +679,6 @@ public:
     SAL_DLLPRIVATE void BreakMacroSign_Impl( bool bBreakMacroSing );
     SAL_DLLPRIVATE void CheckSecurityOnLoading_Impl();
     SAL_DLLPRIVATE void CheckForBrokenDocSignatures_Impl();
-    SAL_DLLPRIVATE static SignatureState ImplCheckSignaturesInformation(
-                const css::uno::Sequence< css::security::DocumentSignatureInformation >& aInfos );
     SAL_DLLPRIVATE void CheckEncryption_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler );
     SAL_DLLPRIVATE void SetModifyPasswordEntered( bool bEntered = true );
     SAL_DLLPRIVATE bool IsModifyPasswordEntered() const;
diff --git a/include/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx
index 8bdfdfac75d9..e480e56b059e 100644
--- a/include/sfx2/signaturestate.hxx
+++ b/include/sfx2/signaturestate.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_SFX2_SIGNATURESTATE_HXX
 #define INCLUDED_SFX2_SIGNATURESTATE_HXX
 
+#include <sfx2/dllapi.h>
+
+#include <com/sun/star/security/DocumentSignatureInformation.hpp>
+
 enum class SignatureState
 {
     // FIXME: Do these values have to be these, and given at all, or is this just cargo cult?
@@ -38,6 +42,13 @@ enum class SignatureState
     NOTVALIDATED_PARTIAL_OK = 6
 };
 
+namespace DocumentSignatures
+{
+/** Get document signature state */
+SFX2_DLLPUBLIC SignatureState
+getSignatureState(const css::uno::Sequence<css::security::DocumentSignatureInformation>& aInfos);
+}
+
 #endif // INCLUDED_SFX2_SIGNATURESTATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx
index 3d9dace58d0b..d03445c77730 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -54,6 +54,7 @@ private:
     std::unique_ptr<weld::CustomWeld> m_xEditWindowWeld;
 
     DECL_LINK(ButtonClicked, weld::Button&, void);
+    DECL_LINK(OkHdl, weld::Button&, void);
     DECL_LINK(SelectToolboxHdl, weld::ToggleButton&, void);
     DECL_LINK(SelectClassificationHdl, weld::ComboBox&, void);
     DECL_LINK(SelectMarkingHdl, weld::TreeView&, bool);
@@ -77,8 +78,6 @@ public:
     ClassificationDialog(weld::Window* pParent, bool bPerParagraph, const std::function<void()>& rParagraphSignHandler = [](){});
     ~ClassificationDialog() override;
 
-    short run() override;
-
     std::vector<ClassificationResult> getResult();
     void setupValues(std::vector<ClassificationResult> const & rInput);
 };
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 2aaa3b7f7bc7..9df6d7692cdb 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -459,7 +459,7 @@ public:
     //          3.Level Position (x+y)
     void     Sort();
     size_t   GetHdlCount() const { return maList.size(); }
-    SdrHdl*  GetHdl(size_t nNum) const { return maList[nNum].get(); }
+    SdrHdl*  GetHdl(size_t nNum) const { return nNum < maList.size() ? maList[nNum].get() : nullptr; }
     size_t   GetHdlNum(const SdrHdl* pHdl) const;
     void     SetHdlSize(sal_uInt16 nSiz);
     sal_uInt16   GetHdlSize() const                        { return nHdlSize; }
diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx
index 4804a2f2588b..3cb7406f58cd 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -31,13 +31,25 @@
 namespace toolkit
 {
 
-class ScriptEventContainer final : public ::cppu::WeakImplHelper<
+// Hashtable to optimize
+typedef std::unordered_map
+<
+    OUString,
+    sal_Int32,
+    OUStringHash
+>
+NameContainerNameMap;
+
+
+class ScriptEventContainer : public ::cppu::WeakImplHelper<
                                         css::container::XNameContainer,
                                         css::container::XContainer >
 {
-    std::unordered_map< OUString, css::uno::Any>
-                   mHashMap;
-    css::uno::Type const mType;
+    NameContainerNameMap mHashMap;
+    css::uno::Sequence< OUString > mNames;
+    std::vector< css::uno::Any > mValues;
+    sal_Int32 mnElementCount;
+    css::uno::Type mType;
 
     ContainerListenerMultiplexer maContainerListeners;
 
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index db1700cb9e2f..9935176b028c 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -101,6 +101,8 @@ public:
     virtual void FillPropertySet(
             const css::uno::Reference< css::beans::XPropertySet > & rPropSet );
 
+    virtual bool isEmptyDataStyleName() { return false; };
+
     const SvXMLStylesContext *GetStyles() const { return static_cast<const SvXMLStylesContext *>(mxStyles.get()); }
     const ::std::vector< XMLPropertyState > & GetProperties() const { return maProperties; }