1 files changed, 20 insertions, 47 deletions

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);
     }
 }