fdo#78908 Revert "Merge back branch alg_writerframes to trunk"

This reverts commit 6e61ecd09679a66060f932835622821d39e92f01. Better not
to have this on libreoffice-4-3 without
7d9bb549d498d6beed2c4050c402d09643febdfa (Related: #i124638# Second step
of DrawingLayer FillAttributes..., 2014-06-02).

Conflicts:
	cui/source/inc/backgrnd.hxx
	cui/source/inc/cuitabarea.hxx
	cui/source/tabpages/backgrnd.cxx
	cui/source/tabpages/tparea.cxx
	include/basegfx/numeric/ftools.hxx
	include/svx/svxids.hrc
	include/svx/unoshprp.hxx
	sc/source/ui/drawfunc/drawsh.cxx
	sd/source/ui/func/fuarea.cxx
	sfx2/source/dialog/tabdlg.cxx
	sw/inc/fillattributes.hxx
	sw/inc/format.hxx
	sw/inc/frmatr.hxx
	sw/inc/swatrset.hxx
	sw/inc/unobrushitemhelper.hxx
	sw/qa/extras/rtfexport/rtfexport.cxx
	sw/source/core/attr/format.cxx
	sw/source/core/attr/swatrset.cxx
	sw/source/core/doc/docfly.cxx
	sw/source/core/doc/notxtfrm.cxx
	sw/source/core/inc/frame.hxx
	sw/source/core/inc/frmtool.hxx
	sw/source/core/layout/fillattributes.cxx
	sw/source/core/layout/paintfrm.cxx
	sw/source/core/txtnode/fntcache.cxx
	sw/source/core/uibase/shells/frmsh.cxx
	sw/source/core/unocore/unobrushitemhelper.cxx
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/unocore/unostyle.cxx
	xmloff/source/text/txtexppr.cxx
	xmloff/source/text/txtprhdl.cxx

Also:
    Revert "cppcheck: Prefer prefix ++/-- operators for non-primitive types"
    This reverts commit 80ec4885e97b3fcb34b93e71ced52a4aab43ce93.

    Revert "WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'"
    This reverts commit d5d10b03b1f3e4bf784ad35254cb55d719a8c1b3.

    Revert "i#124638 support for DrawingLayre FillStyle for GraphicFrames and ..."
    This reverts commit 4a0b5e569d070c286daefb0fdfe45c0dd15d241c.

    Revert "svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID"
    This reverts commit b66d87086804460c1986df1b832fd6b2ea075a90.

    Revert "SwXStyle::getPropertyValue: don't try to read a float into a sal_Int32"
    This reverts commit 1e3c7b854baac2502bed72ff8e3e1b21b507735b.

    Revert "SwXTextFrame: also restore semi-lost BackColorTransparency property"
    This reverts commit 102bb87ca1a5dee3a09442bf503a54bb703c79ea.

    Revert "SwXTextFrame: restore semi-lost BackColor property"
    This reverts commit 5ce92b73ce06c805c66e53c48aa2c70c722aaf60.

    Revert "DocxAttributeOutput: port to FillAttributes"
    This reverts commit ec221b7339f8fe5520926ef85b450daa94392780.

    Revert "MSWordExportBase::OutputItemSet: handle fill attributes as frame ones"
    This reverts commit 84c40768f8acb0342dcfa223133497f57620fc14.

    Revert "sw: put getSvx* and setSvx* to a namespace, now that these are public"
    This reverts commit ebf960960a69c1edb5da1994c330ddddbecac44d.

    Revert "sw: fix DOC/DOCX/RTF export of TextFrame background color"
    This reverts commit c7837b8caad61b8c0dfd3704a133cdeaffd69b06.

    Revert "sw: still use SvxBrushItem for page style background"
    This reverts commit e826950e9d7736a6e3f9042755ba1b528f58a505.

    Revert "cui: unused code in SvxAreaTabPage::ClickBitmapHdl_Impl"
    This reverts commit 2032e9f5d7683e49b8753d7c7362899c690005b6.

    Revert "cui: unused code in SvxAreaTabPage::ClickGradientHdl_Impl"
    This reverts commit f4fa202b31277276dc4f05046c82152c0830ef21.

    Revert "cui: unused code in SvxAreaTabPage::ClickColorHdl_Impl"
    This reverts commit 1478e89e08a54f02a137c74c0cde6ae75e80d9f3.

    Revert "cui: unused code in SvxAreaTabPage::ClickHatchingHdl_Impl()"
    This reverts commit e9c9f3f793a91525ac4fb74f8791ba74222515e4.

    Revert "svx: fix Writer's insert -> frame crash"
    This reverts commit 831b8751fc9f423fd4e459623e54801c0a020eb3.

    Revert "sw: adapt frame/templatedialog4.ui to FillAttributes"
    This reverts commit 55916fc50a5b2d6273bca8c9ef6253011cf4fdbc.

    Revert "-Werror,-Wunused-variable"
    This reverts commit d0542fe7251d9c6538331b22a4b5e2e294a92e97.

    Revert "loplugin:implicitboolconversion,literaltoboolconversion"
    This reverts commit 47862e75de51a4ac7476acff773b504fdc0d6e76.

    Revert "loplugin:saloverride"
    This reverts commit be89e8b8ac19c0feca8850ccaddd90205c63dbe5.

    Revert "loplugin:literaltoboolconversion"
    This reverts commit 355b31fe347479f63906e41300042ec5cb38837c.

    Revert "-Werror,-Wunused-private-field"
    This reverts commit df9d13dd2e754184a4c6e321b8910ee1bc0cafa1.

    Revert "-Werror,-Wunused-const-variable"
    This reverts commit d757a98001a65baf4066c2eda037a08ab1beda46.

    Revert "unused XFillStyleItem ctor"
    This reverts commit b735fe1d67e6ad7ad448e448f237dcabef1a1c38.

    Revert "unused XGradient::VclGradient"
    This reverts commit 5bbc90be755aae4b87125f9d748828d74efe645d.

    Revert "fix "transparency" of floating tables in docx import (fdo#77723)"
    This reverts commit 313b59d787357ef3da34e2833fefcf1143b09b5e.

Change-Id: If855b090f94288d384f8733f88ef1172e68c50a6
Reviewed-on: https://gerrit.libreoffice.org/10077
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

2 files changed, 23 insertions, 84 deletions

diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 823c376b1f8d..19f78216bae7 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -98,8 +98,6 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
     , m_nOutlineId(0)
     , m_nDropCapsId(0)
     , m_nBackgroundId(0)
-    , m_nAreaId(0)
-    , m_nTransparenceId(0)
     , m_nBorderId(0)
     , m_nConditionId(0)
     , m_nTypeId(0)
@@ -249,16 +247,9 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
                                         SwWrapTabPage::GetRanges);
             OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
             OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
-
-            //UUUU remove?
-            //m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
-            //OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
-            //OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
-
-            //UUUU add Area and Transparence TabPages
-            m_nAreaId = AddTabPage("area", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA ));
-            m_nTransparenceId = AddTabPage("transparence", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_TRANSPARENCE ) );
-
+            m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
+            OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
+            OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
             m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
 
             m_nColumnId = AddTabPage("columns", SwColumnPage::Create,
@@ -467,8 +458,6 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             ((SwColumnPage&)rPage).SetFrmMode(true);
         ((SwColumnPage&)rPage).SetFormatUsed( true );
     }
-    //UUUU do not remove; many other style dialog combinations still use the SfxTabPage
-    // for the SvxBrushItem (see RID_SVXPAGE_BACKGROUND)
     else if (nId == m_nBackgroundId)
     {
         sal_Int32 nFlagType = 0;
@@ -580,29 +569,6 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
         }
         rPage.PageCreated(aSet);
     }
-    //UUUU inits for Area and Transparency TabPages
-    // The selection attribute lists (XPropertyList derivates, e.g. XColorList for
-    // the color table) need to be added as items (e.g. SvxColorTableItem) to make
-    // these pages find the needed attributes for fill style suggestions.
-    // These are added in SwDocStyleSheet::GetItemSet() for the SFX_STYLE_FAMILY_PARA on
-    // demand, but could also be directly added from the DrawModel.
-    else if (nId == m_nAreaId)
-    {
-        SfxItemSet aNew(*aSet.GetPool(),
-                        SID_COLOR_TABLE, SID_BITMAP_LIST,
-                        SID_OFFER_IMPORT, SID_OFFER_IMPORT, 0, 0);
-
-        aNew.Put(GetStyleSheet().GetItemSet());
-
-        // add flag for direct graphic content selection
-        aNew.Put(SfxBoolItem(SID_OFFER_IMPORT, true));
-
-        rPage.PageCreated(aNew);
-    }
-    else if (nId == m_nTransparenceId)
-    {
-        rPage.PageCreated(GetStyleSheet().GetItemSet());
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index c6ee60133c98..40e0c8767989 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -71,9 +71,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame*       pViewFrame,
     , m_nPictureId(0)
     , m_nCropId(0)
     , m_nColumnId(0)
-    //, m_nBackgroundId(0)
-    , m_nAreaId(0)
-    , m_nTransparenceId(0)
+    , m_nBackgroundId(0)
     , m_nMacroId(0)
     , m_nBorderId(0)
 {
@@ -102,14 +100,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame*       pViewFrame,
     }
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "Dialogdiet fail!");
-
-    //UUUU remove?
-    // m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0);
-
-    //UUUU add Area and Transparence TabPages
-    m_nAreaId = AddTabPage("area", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA ));
-    m_nTransparenceId = AddTabPage("transparence", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_TRANSPARENCE ) );
-
+    m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0);
     m_nMacroId = AddTabPage("macro", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0);
     m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0);
 
@@ -125,11 +116,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame*       pViewFrame,
         else if (m_sDlgType == "PictureDialog")
             RemoveTabPage("crop");
         if( m_sDlgType != "FrameDialog" )
-        {
-            //UUUU RemoveTabPage("background");
-            RemoveTabPage("area");
-            RemoveTabPage("transparence");
-        }
+            RemoveTabPage("background");
     }
 
     if (m_bNew)
@@ -183,43 +170,29 @@ void SwFrmDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             rPage.SetFrame( m_pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() );
         rPage.PageCreated(aNewSet);
     }
-    //UUUU
-    //else if (nId == m_nBackgroundId && m_sDlgType == "FrameDialog")
-    //{
-    //    sal_Int32 nFlagType = SVX_SHOW_SELECTOR;
-    //    if (!m_bHTMLMode)
-    //        nFlagType |= SVX_ENABLE_TRANSPARENCY;
-    //    aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType));
-    //
-    //    rPage.PageCreated(aSet);
-    //}
-    else if (nId == m_nBorderId)
+    else if (nId == m_nBackgroundId && m_sDlgType == "FrameDialog")
     {
-        aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_FRAME));
-        rPage.PageCreated(aSet);
-    }
-    //UUUU inits for Area and Transparency TabPages
-    // The selection attribute lists (XPropertyList derivates, e.g. XColorList for
-    // the color table) need to be added as items (e.g. SvxColorListItem) to make
-    // these pages find the needed attributes for fill style suggestions.
-    // These are set in preparation to trigger this dialog (FN_FORMAT_FRAME_DLG and
-    // FN_DRAW_WRAP_DLG), but could also be directly added from the DrawModel.
-    else if (nId == m_nAreaId)
-    {
-        SfxItemSet aNew(*GetInputSetImpl()->GetPool(),
-                        SID_COLOR_TABLE, SID_BITMAP_LIST,
-                        SID_OFFER_IMPORT, SID_OFFER_IMPORT, 0, 0);
+        sal_Int32 nFlagType = SVX_SHOW_SELECTOR;
+        if (!m_bHTMLMode)
+            nFlagType |= SVX_ENABLE_TRANSPARENCY;
+        aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType));
 
-        aNew.Put(m_rSet);
+        SvxGradientListItem aGradientListItem(m_pWrtShell->GetDoc()->GetOrCreateDrawModel()->GetGradientList(), SID_GRADIENT_LIST);
+        aSet.Put(aGradientListItem);
 
-        // add flag for direct graphic content selection
-        aNew.Put(SfxBoolItem(SID_OFFER_IMPORT, true));
+        XFillStyleItem aFillStyleItem(((const XFillStyleItem&)m_rSet.Get(RES_FILL_STYLE)).GetValue(), SID_SW_ATTR_FILL_STYLE);
+        aSet.Put(aFillStyleItem);
 
-        rPage.PageCreated(aNew);
+        const XFillGradientItem& rFillGradientItem = (const XFillGradientItem&)m_rSet.Get(RES_FILL_GRADIENT);
+        XFillGradientItem aFillGradientItem(rFillGradientItem.GetName(), rFillGradientItem.GetGradientValue(), SID_SW_ATTR_FILL_GRADIENT);
+        aSet.Put(aFillGradientItem);
+
+        rPage.PageCreated(aSet);
     }
-    else if (nId == m_nTransparenceId)
+    else if (nId == m_nBorderId)
     {
-        rPage.PageCreated(m_rSet);
+        aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_FRAME));
+        rPage.PageCreated(aSet);
     }
 }