cid#1399305 Uncaught exception
and cid#1399345 Uncaught exception Change-Id: Ibbd255a4aa1ebdc360f94b3030371da7b6a6602f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195068 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
@@ -36,6 +36,7 @@ class SW_DLLPUBLIC SwFormatHeader final : public SfxPoolItem, public sw::FrameFo
|
||||
{
|
||||
bool m_bActive; ///< Only for controlling (creation of content).
|
||||
|
||||
void ImplDestroy();
|
||||
public:
|
||||
DECLARE_ITEM_TYPE_FUNCTION(SwFormatHeader)
|
||||
SwFormatHeader( bool bOn = false );
|
||||
@@ -69,6 +70,7 @@ class SW_DLLPUBLIC SwFormatFooter final : public SfxPoolItem, public sw::FrameFo
|
||||
{
|
||||
bool m_bActive; // Only for controlling (creation of content).
|
||||
|
||||
void ImplDestroy();
|
||||
public:
|
||||
DECLARE_ITEM_TYPE_FUNCTION(SwFormatFooter)
|
||||
SwFormatFooter( bool bOn = false );
|
||||
|
||||
@@ -516,12 +516,17 @@ SwFormatHeader::SwFormatHeader( bool bOn )
|
||||
{
|
||||
}
|
||||
|
||||
SwFormatHeader::~SwFormatHeader()
|
||||
void SwFormatHeader::ImplDestroy()
|
||||
{
|
||||
if ( GetHeaderFormat() )
|
||||
lcl_DelHFFormat( this, GetHeaderFormat() );
|
||||
}
|
||||
|
||||
SwFormatHeader::~SwFormatHeader()
|
||||
{
|
||||
suppress_fun_call_w_exception(ImplDestroy());
|
||||
}
|
||||
|
||||
bool SwFormatHeader::operator==( const SfxPoolItem& rAttr ) const
|
||||
{
|
||||
assert(SfxPoolItem::operator==(rAttr));
|
||||
@@ -575,12 +580,17 @@ SwFormatFooter::SwFormatFooter( bool bOn )
|
||||
{
|
||||
}
|
||||
|
||||
SwFormatFooter::~SwFormatFooter()
|
||||
void SwFormatFooter::ImplDestroy()
|
||||
{
|
||||
if ( GetFooterFormat() )
|
||||
lcl_DelHFFormat( this, GetFooterFormat() );
|
||||
}
|
||||
|
||||
SwFormatFooter::~SwFormatFooter()
|
||||
{
|
||||
suppress_fun_call_w_exception(ImplDestroy());
|
||||
}
|
||||
|
||||
void SwFormatFooter::RegisterToFormat( SwFormat& rFormat )
|
||||
{
|
||||
rFormat.Add(*this);
|
||||
|
||||
Reference in New Issue
Block a user