[Libreoffice-commits] core.git: 2 commits - sd/source sw/inc sw/qa

[Miklos Vajna]

 sd/source/ui/unoidl/unomodel.cxx     |    2 +-
 sw/inc/pagedesc.hxx                  |   18 +++++++++---------
 sw/qa/extras/rtfexport/rtfexport.cxx |    4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 4f55dedce3a618df65aacb536ec9902299e2e6d7
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jan 5 09:45:08 2017 +0100

    sw: indentation fixes
    
    Change-Id: If996c17dbfee2302a1d0f58428b088a953abcc9f

diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index fec4ad5..da74648 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -282,15 +282,15 @@ public:
 };
 
 namespace std {
-   template<>
-   struct less<SwPageDesc*> {
-       bool operator()(const SwPageDesc *pPageDesc, const OUString &rName) const
-           { return pPageDesc->GetName() < rName; }
-       bool operator()(const OUString &rName, const SwPageDesc *pPageDesc) const
-           { return rName < pPageDesc->GetName(); }
-       bool operator()(const SwPageDesc *lhs, const SwPageDesc *rhs) const
-           { return lhs->GetName() < rhs->GetName(); }
-   };
+    template<>
+    struct less<SwPageDesc*> {
+        bool operator()(const SwPageDesc *pPageDesc, const OUString &rName) const
+            { return pPageDesc->GetName() < rName; }
+        bool operator()(const OUString &rName, const SwPageDesc *pPageDesc) const
+            { return rName < pPageDesc->GetName(); }
+        bool operator()(const SwPageDesc *lhs, const SwPageDesc *rhs) const
+            { return lhs->GetName() < rhs->GetName(); }
+    };
 }
 
 inline void SwPageDesc::SetFollow( const SwPageDesc* pNew )
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index 4288d3f..710b7853 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -1146,8 +1146,8 @@ DECLARE_RTFEXPORT_TEST(testTdf104228, "tdf104228.rtf")
 DECLARE_RTFEXPORT_TEST(testTdf104085, "tdf104085.rtf")
 {
     uno::Reference<text::XTextRange> xPara(getParagraph(1));
-    uno::Reference< beans::XPropertySet > properties( xPara, uno::UNO_QUERY);
-    uno::Reference<container::XIndexAccess> xLevels( properties->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
+    uno::Reference<beans::XPropertySet> properties(xPara, uno::UNO_QUERY);
+    uno::Reference<container::XIndexAccess> xLevels(properties->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
     uno::Sequence<beans::PropertyValue> aProps;
     xLevels->getByIndex(0) >>= aProps;
     for (int i = 0; i < aProps.getLength(); ++i)
commit 64d80d22851a38eb3f320f4e2b2bdf875da4d8b4
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jan 4 17:41:07 2017 +0100

    Related: tdf#105093 sd PDF export: handle css.presentation.MediaShape as well
    
    It's exactly the same as css.drawing.MediaShape in this context.
    
    Change-Id: I4be114ef731e85222f0dd1d897f646ad8da3849d

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index d305a29..e4ac5f6 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1653,7 +1653,7 @@ void ImplPDFExportShapeInteraction( const uno::Reference< drawing::XShape >& xSh
             Rectangle   aLinkRect( Point( aShapePos.X, aShapePos.Y ), Size( aShapeSize.Width, aShapeSize.Height ) );
 
             // Handle linked videos.
-            if (xShape->getShapeType() == "com.sun.star.drawing.MediaShape")
+            if (xShape->getShapeType() == "com.sun.star.drawing.MediaShape" || xShape->getShapeType() == "com.sun.star.presentation.MediaShape")
             {
                 OUString aMediaURL;
                 xShapePropSet->getPropertyValue("MediaURL") >>= aMediaURL;