make conversion operator explicit
so less invisible behaviour Change-Id: I497763cb4be554ddbd00831458f162d9d975742e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178115 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins
This commit is contained in:
parent
16a534c617
commit
29c32bf317
2 changed files with 5 additions and 5 deletions
|
@ -395,7 +395,7 @@ public:
|
|||
|
||||
OUString const & GetName() const;
|
||||
|
||||
operator SwPageDesc() const; // #i7983#
|
||||
explicit operator SwPageDesc() const; // #i7983#
|
||||
};
|
||||
|
||||
namespace sw {
|
||||
|
|
|
@ -231,7 +231,7 @@ void SwUndoPageDesc::UndoImpl(::sw::UndoRedoContext &)
|
|||
// Move (header/footer)content node responsibility from new page descriptor to old one again.
|
||||
if( m_bExchange )
|
||||
ExchangeContentNodes( m_aNew.m_PageDesc, m_aOld.m_PageDesc );
|
||||
m_pDoc->ChgPageDesc(m_aOld.GetName(), m_aOld);
|
||||
m_pDoc->ChgPageDesc(m_aOld.GetName(), SwPageDesc(m_aOld));
|
||||
ExitHeaderFooterEdit();
|
||||
}
|
||||
|
||||
|
@ -240,7 +240,7 @@ void SwUndoPageDesc::RedoImpl(::sw::UndoRedoContext &)
|
|||
// Move (header/footer)content node responsibility from old page descriptor to new one again.
|
||||
if( m_bExchange )
|
||||
ExchangeContentNodes( m_aOld.m_PageDesc, m_aNew.m_PageDesc );
|
||||
m_pDoc->ChgPageDesc(m_aNew.GetName(), m_aNew);
|
||||
m_pDoc->ChgPageDesc(m_aNew.GetName(), SwPageDesc(m_aNew));
|
||||
ExitHeaderFooterEdit();
|
||||
}
|
||||
|
||||
|
@ -280,7 +280,7 @@ void SwUndoPageDescCreate::UndoImpl(::sw::UndoRedoContext &)
|
|||
|
||||
void SwUndoPageDescCreate::DoImpl()
|
||||
{
|
||||
SwPageDesc aPageDesc = m_aNew;
|
||||
SwPageDesc aPageDesc(m_aNew);
|
||||
m_pDoc->MakePageDesc(m_aNew.GetName(), &aPageDesc, false);
|
||||
}
|
||||
|
||||
|
@ -320,7 +320,7 @@ SwUndoPageDescDelete::~SwUndoPageDescDelete()
|
|||
|
||||
void SwUndoPageDescDelete::UndoImpl(::sw::UndoRedoContext &)
|
||||
{
|
||||
SwPageDesc aPageDesc = m_aOld;
|
||||
SwPageDesc aPageDesc(m_aOld);
|
||||
m_pDoc->MakePageDesc(m_aOld.GetName(), &aPageDesc, false);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue