commit fb64cf127dc6398f5d18d186a93966837db0bb1e
author Michael Stahl <mstahl@redhat.com> Tue Sep 26 16:56:31 2017 +0200
committer Caolán McNamara <caolanm@redhat.com> Wed Sep 27 11:55:20 2017 +0200
tree ff3ea2cc974a33f638bac7818436be6477dafedb
parent b5d35c7e57a6adb650493cc3a04a2f3c57e0f8a6

tdf#112574 sw: don't insert RES_ANCHOR into style item sets

Styles don't have anchors, only frames have anchors.

When using "New Style from Selection", clear the RES_ANCHOR from
the style item set.

Also, don't insert it in SwFramePage::DeactivatePage().

This was always broken and reportedly crashes since commit
e07feb9457f2ffb373ae69b73dda290140e4005f

Change-Id: I9320dbbcae980dfa0b00459b8cd808553d1a04f4
(cherry picked from commit 17fe1e19e01f8b23bcd23cc7c1789e8f7064d06e)
Reviewed-on: https://gerrit.libreoffice.org/42820
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw/source/ui/frmdlg/frmpage.cxx

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 3a85eff..2de3bbd 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1750,13 +1750,16 @@ DeactivateRC SwFramePage::DeactivatePage(SfxItemSet * _pSet)
    {
        FillItemSet( _pSet );

        //FillItemSet doesn't set the anchor into the set when it matches
        //the original. But for the other pages we need the current anchor.
        SwWrtShell* pSh = m_bFormat ? ::GetActiveWrtShell()
                            : getFrameDlgParentShell();
        RndStdIds eAnchorId = GetAnchor();
        SwFormatAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
        _pSet->Put( aAnc );
        if (!m_bFormat) // tdf#112574 no anchor in styles
        {
            //FillItemSet doesn't set the anchor into the set when it matches
            //the original. But for the other pages we need the current anchor.
            SwWrtShell* pSh = m_bFormat ? ::GetActiveWrtShell()
                                : getFrameDlgParentShell();
            RndStdIds eAnchorId = GetAnchor();
            SwFormatAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
            _pSet->Put( aAnc );
        }
    }

    return DeactivateRC::LeavePage;

sw/source/uibase/app/docst.cxx

diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 147212a..ffb866c 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -1226,6 +1226,7 @@ SfxStyleFamily SwDocShell::MakeByExample( const OUString &rName, SfxStyleFamily 

                SfxItemSet aSet(GetPool(), aFrameFormatSetRange );
                pCurrWrtShell->GetFlyFrameAttr( aSet );
                aSet.ClearItem(RES_ANCHOR); // tdf#112574 no anchor in styles

                SwFrameFormat* pFFormat = pCurrWrtShell->GetSelectedFrameFormat();
                pFrame->SetDerivedFrom( pFFormat );