mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crashtesting: sync PageProperties::SetStyleSheet with GetStyleSheet

Browse Source 
PageProperties::GetStyleSheet returns 0 so PageProperties::SetStyleSheet
should do nothing

Change-Id: If627ba3e31b14ff5178f45125f0ce6e4dbf93ec0
This commit is contained in:
Caolán McNamara
2016-02-29 10:01:40 +00:00
parent 85071c6c7b
commit 836cd17fcd
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sd/qa/unit/data/odp/pass/ooo72169-1.odp Normal file
View File

Binary file not shown.

3
svx/inc/sdr/properties/pageproperties.hxx
View File

@@ -59,6 +59,9 @@ namespace sdr
// get the installed StyleSheet // get the installed StyleSheet
virtual SfxStyleSheet* GetStyleSheet() const override; virtual SfxStyleSheet* GetStyleSheet() const override;
// set the installed StyleSheet
virtual void SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) override;
// clear single item // clear single item
virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override; virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override;
}; };

5
svx/source/sdr/properties/pageproperties.cxx
View File

@@ -79,6 +79,11 @@ namespace sdr
return nullptr; return nullptr;
} }
void PageProperties::SetStyleSheet(SfxStyleSheet* /*pStyleSheet*/, bool /*bDontRemoveHardAttr*/)
{
// override to legally ignore the StyleSheet here
}
void PageProperties::PostItemChange(const sal_uInt16 nWhich ) void PageProperties::PostItemChange(const sal_uInt16 nWhich )
{ {
if( (nWhich == XATTR_FILLSTYLE) && (mpEmptyItemSet != nullptr) ) if( (nWhich == XATTR_FILLSTYLE) && (mpEmptyItemSet != nullptr) )