commit 01d140e2205306159da57b9ec703e1a54802115c
author Aditya <adityasahu1511@gmail.com> Sun Feb 24 21:17:14 2019 +0530
committer Michael Stahl <Michael.Stahl@cib.de> Fri Mar 01 14:53:39 2019 +0100
tree 56e0340db88c8729fca1582d0ce20002bfabcb05
parent 6360449f8b4a08de114f802f84a15d23103a5f41

tdf#116382 Replace old dialog in header and footer drop-down menu

Remove the Background tabpage in "Border/Background" dialog accessed
from Border and Background menu item in Header/Footer drop-down list
and replace it with the tabpages "Area" and "Transparency" of the dialog
accessed from Page Style > Header > "More.." button.
 The old dialog does not have the tabpages "Area" and "Transparency".
In simpler words, the patch is to match both the dialogs
when accessed in two different ways.

Change-Id: Ib84435854389360eba41aecb8578a9a67a92ca1e
Reviewed-on: https://gerrit.libreoffice.org/67483
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
(cherry picked from commit 55042cb54fea5f7ad777c03af9bf8197127b6736)
Reviewed-on: https://gerrit.libreoffice.org/68546
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

svx/source/dialog/hdft.cxx

diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index d23ad52..6616384 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -88,7 +88,7 @@ namespace svx {
    {
        bool bRes = false;
        SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
        ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg( pParent, *pBBSet, false/*bEnableDrawingLayerFillStyles*/ ));
        ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg( pParent, *pBBSet, true/*bEnableDrawingLayerFillStyles*/ ));
        if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() )
        {
            SfxItemIter aIter( *pDlg->GetOutputItemSet() );

sw/source/uibase/docvw/HeaderFooterWin.cxx

diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index e1c157e..824abf93 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -11,6 +11,8 @@
#include <strings.hrc>
#include <globals.hrc>

#include <doc.hxx>
#include <drawdoc.hxx>
#include <cmdid.h>
#include <DashedLine.hxx>
#include <docsh.hxx>
@@ -414,47 +416,19 @@ void SwHeaderFooterWin::ExecuteCommand(const OString& rIdent)
        SwFrameFormat* pHFFormat = const_cast< SwFrameFormat* >( rMaster.GetFooter().GetFooterFormat() );
        if ( m_bIsHeader )
            pHFFormat = const_cast< SwFrameFormat* >( rMaster.GetHeader().GetHeaderFormat() );
        SfxItemSet aSet( pHFFormat->GetAttrSet() );

        SfxItemPool* pPool = pHFFormat->GetAttrSet().GetPool();
        SfxItemSet aSet(
            *pPool,
            svl::Items<
                RES_BACKGROUND, RES_SHADOW,
                SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{});
        // Items to hand over XPropertyList things like XColorList,
        // XHatchList, XGradientList, and XBitmapList to the Area TabPage:
        aSet.MergeRange( SID_COLOR_TABLE, SID_PATTERN_LIST );
        // create needed items for XPropertyList entries from the DrawModel so that
        // the Area TabPage can access them
        rSh.GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->PutAreaListItems( aSet );

        aSet.Put( pHFFormat->GetAttrSet() );

        // Create a box info item... needed by the dialog
        SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
        const SfxPoolItem *pBoxInfo;
        if ( SfxItemState::SET == pHFFormat->GetAttrSet().GetItemState( SID_ATTR_BORDER_INNER,
                                                true, &pBoxInfo) )
            aBoxInfo = *static_cast<const SvxBoxInfoItem*>(pBoxInfo);

        aBoxInfo.SetTable( false );
        aBoxInfo.SetDist( true);
        aBoxInfo.SetMinDist( false );
        aBoxInfo.SetDefDist( MIN_BORDER_DIST );
        aBoxInfo.SetValid( SvxBoxInfoItemValidFlags::DISABLE );
        aSet.Put( aBoxInfo );

        if ( svx::ShowBorderBackgroundDlg( this, &aSet ) )
        if (svx::ShowBorderBackgroundDlg( this, &aSet ))
        {
            const SfxPoolItem* pItem;
            if ( SfxItemState::SET == aSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) {
                pHFFormat->SetFormatAttr( *pItem );
                rView.GetDocShell()->SetModified();
            }

            if ( SfxItemState::SET == aSet.GetItemState( RES_BOX, false, &pItem ) ) {
                pHFFormat->SetFormatAttr( *pItem );
                rView.GetDocShell()->SetModified();
            }

            if ( SfxItemState::SET == aSet.GetItemState( RES_SHADOW, false, &pItem ) ) {
                pHFFormat->SetFormatAttr( *pItem );
                rView.GetDocShell()->SetModified();
            }
            pHFFormat->SetFormatAttr( aSet );
            rView.GetDocShell()->SetModified();
        }
    }
    else if (rIdent == "delete")