[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Michael Stahl]

 sw/source/core/unocore/unoflatpara.cxx |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 421adf500c0723126a293b7fbd51f22e1471f3cf
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon May 18 18:17:58 2015 +0200

    tdf#89794: sw: implement SwXFlatParagraph::getPropertySetInfo()
    
    (regression from d477ff4a81ecba8a77ead5ff1a33d3e3ceed622e)
    
    Change-Id: Ic49d2c14a27d2fb188a1ba5f9a7d8c0180b8de13
    (cherry picked from commit a4c121aa4a2f68d36f1ce41e94e8275230ec0866)
    Reviewed-on: https://gerrit.libreoffice.org/15792
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index b6a7c5f..dde4e92 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -26,6 +26,7 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/text/TextMarkupType.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <unotextmarkup.hxx>
 #include <ndtxt.hxx>
 #include <doc.hxx>
@@ -45,6 +46,7 @@
 #include <IGrammarContact.hxx>
 #include <viewopt.hxx>
 #include <comphelper/servicehelper.hxx>
+#include <comphelper/propertysetinfo.hxx>
 
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
@@ -78,8 +80,12 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
 SwXFlatParagraph::getPropertySetInfo()
 throw (uno::RuntimeException, std::exception)
 {
-    throw uno::RuntimeException("SwXFlatParagraph::getPropertySetInfo(): "
-            "not implemented", static_cast< ::cppu::OWeakObject*>(this));
+    static comphelper::PropertyMapEntry s_Entries[] = {
+        { OUString("FieldPositions"), -1, ::cppu::UnoType<uno::Sequence<sal_Int32>>::get(), beans::PropertyAttribute::READONLY, 0 },
+        { OUString("FootnotePositions"), -1, ::cppu::UnoType<uno::Sequence<sal_Int32>>::get(), beans::PropertyAttribute::READONLY, 0 },
+        { OUString(), -1, css::uno::Type(), 0, 0 }
+    };
+    return new comphelper::PropertySetInfo(s_Entries);
 }
 
 void SAL_CALL