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

[Caolán McNamara]

 sd/qa/unit/data/odp/pass/ooo72169-1.odp      |binary
 svx/inc/sdr/properties/pageproperties.hxx    |    3 +++
 svx/source/sdr/properties/pageproperties.cxx |    5 +++++
 3 files changed, 8 insertions(+)

New commits:
commit 836cd17fcd62677e3be2ccb1b7e633f8d12c313e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 29 10:01:40 2016 +0000

    crashtesting: sync PageProperties::SetStyleSheet with GetStyleSheet
    
    PageProperties::GetStyleSheet returns 0 so PageProperties::SetStyleSheet
    should do nothing
    
    Change-Id: If627ba3e31b14ff5178f45125f0ce6e4dbf93ec0

diff --git a/sd/qa/unit/data/odp/pass/ooo72169-1.odp b/sd/qa/unit/data/odp/pass/ooo72169-1.odp
new file mode 100644
index 0000000..7a024b8
Binary files /dev/null and b/sd/qa/unit/data/odp/pass/ooo72169-1.odp differ
diff --git a/svx/inc/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx
index c6e9d30..5df093a 100644
--- a/svx/inc/sdr/properties/pageproperties.hxx
+++ b/svx/inc/sdr/properties/pageproperties.hxx
@@ -59,6 +59,9 @@ namespace sdr
             // get the installed StyleSheet
             virtual SfxStyleSheet* GetStyleSheet() const override;
 
+            // set the installed StyleSheet
+            virtual void SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) override;
+
             // clear single item
             virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override;
         };
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index 20758b0..2250aa2 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -79,6 +79,11 @@ namespace sdr
             return nullptr;
         }
 
+        void PageProperties::SetStyleSheet(SfxStyleSheet* /*pStyleSheet*/, bool /*bDontRemoveHardAttr*/)
+        {
+            // override to legally ignore the StyleSheet here
+        }
+
         void PageProperties::PostItemChange(const sal_uInt16 nWhich )
         {
             if( (nWhich == XATTR_FILLSTYLE) && (mpEmptyItemSet != nullptr) )