[GSoC] Remove fill style tabs from area fill dialog

Change-Id: I7409118cbbab1350dda169d5bdfef51b7354de9f
Reviewed-on: https://gerrit.libreoffice.org/27864
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

3 files changed, 21 insertions, 131 deletions

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 7f1decb475d8..2d612b34bf72 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -106,11 +106,6 @@ class SvxAreaTabDialog : public SfxTabDialog
     sal_uInt16            m_nAreaTabPage;
     sal_uInt16            m_nShadowTabPage;
     sal_uInt16            m_nTransparenceTabPage;
-    sal_uInt16            m_nColorTabPage;
-    sal_uInt16            m_nGradientTabPage;
-    sal_uInt16            m_nHatchTabPage;
-    sal_uInt16            m_nBitmapTabPage;
-    sal_uInt16            m_nPatternTabPage;
 
 private:
     SdrModel*           mpDrawModel;
@@ -134,7 +129,9 @@ private:
     ChangeType          mnGradientListState;
     ChangeType          mnHatchingListState;
 
-    sal_Int32           mnPos;
+    sal_Int16           mnPos;
+    PageType            mnPageType;
+    bool                mbAreaTP;
 
     virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override;
 
@@ -255,12 +252,12 @@ private:
     VclPtr<PushButton>         m_pBtnPattern;
     ButtonBox                  maBox;
 
-    SdrModel*           mpDrawModel;
     XColorListRef         m_pColorList;
     XGradientListRef      m_pGradientList;
     XHatchListRef         m_pHatchingList;
     XBitmapListRef        m_pBitmapList;
     XPatternListRef       m_pPatternList;
+    SdrModel*             mpDrawModel;
 
     // Placeholders for pointer-based entries; these will be inited
     // to point to these so that the page is usable without that
@@ -274,7 +271,11 @@ private:
     ChangeType*         m_pnGradientListState;
     ChangeType*         m_pnHatchingListState;
 
+    PageType            m_nPageType;
     sal_Int32           m_nPos;
+    sal_uInt16          m_nDlgType;
+    bool*               m_pbAreaTP;
+
     XFillAttrSetItem    m_aXFillAttr;
     SfxItemSet&         m_rXFSet;
 
@@ -308,13 +309,17 @@ public:
     void    SetBitmapList( XBitmapListRef const & pBmpLst) { m_pBitmapList = pBmpLst; }
     void    SetPatternList( XPatternListRef const &pPtrnLst ) { m_pPatternList = pPtrnLst; }
     void    SetDrawModel( SdrModel* pModel ) { mpDrawModel = pModel; }
-
+    void    SetPageType( PageType nInType ) { m_nPageType = nInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { m_nDlgType = nInType; }
+    void    SetPos( sal_uInt16 nInPos ) { m_nPos = nInPos; }
+    void    SetAreaTP( bool* pIn ) { m_pbAreaTP = pIn; }
     virtual void PageCreated(const SfxAllItemSet& aSet) override;
     void    CreatePage(sal_Int32 nId, SfxTabPage& pTab);
     void    SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
     void    SetGrdChgd( ChangeType* pIn ) { m_pnGradientListState = pIn; }
     void    SetHtchChgd( ChangeType* pIn ) { m_pnHatchingListState = pIn; }
     void    SetBmpChgd( ChangeType* pIn ) { m_pnBitmapListState = pIn; }
+    void    SetPtrnChgd( ChangeType* pIn ) { m_pnPatternListState = pIn; }
 };
 
 
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 06acf58edc62..bc88c7d12b75 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -49,12 +49,6 @@ SvxAreaTabDialog::SvxAreaTabDialog
     , m_nAreaTabPage(0)
     , m_nShadowTabPage(0)
     , m_nTransparenceTabPage(0)
-    , m_nColorTabPage(0)
-    , m_nGradientTabPage(0)
-    , m_nHatchTabPage(0)
-    //, m_nBitmapTabPage(0)
-    , m_nPatternTabPage(0)
-
     , mpDrawModel          ( pModel ),
     mpColorList          ( pModel->GetColorList() ),
     mpNewColorList       ( pModel->GetColorList() ),
@@ -87,11 +81,6 @@ SvxAreaTabDialog::SvxAreaTabDialog
     }
 
     m_nTransparenceTabPage = AddTabPage( "RID_SVXPAGE_TRANSPARENCE", SvxTransparenceTabPage::Create,  nullptr);
-    m_nColorTabPage = AddTabPage( "RID_SVXPAGE_COLOR", SvxColorTabPage::Create, nullptr );
-    m_nGradientTabPage = AddTabPage( "RID_SVXPAGE_GRADIENT", SvxGradientTabPage::Create, nullptr );
-    m_nHatchTabPage = AddTabPage( "RID_SVXPAGE_HATCH", SvxHatchTabPage::Create, nullptr );
-    m_nBitmapTabPage = AddTabPage( "RID_SVXPAGE_BITMAP", SvxBitmapTabPage::Create, SvxBitmapTabPage::GetRanges );
-    m_nPatternTabPage = AddTabPage( "RID_SVXPAGE_PATTERN", SvxPatternTabPage::Create,  nullptr);
 
     SetCurPageId( "RID_SVXPAGE_AREA" );
 
@@ -233,11 +222,9 @@ void SvxAreaTabDialog::SavePalettes()
     }
 }
 
-
 short SvxAreaTabDialog::Ok()
 {
     SavePalettes();
-
     // RET_OK is returned, if at least one
     // TabPage returns sal_True in FillItemSet().
     // This happens by default at the moment.
@@ -248,7 +235,6 @@ short SvxAreaTabDialog::Ok()
 IMPL_LINK_NOARG(SvxAreaTabDialog, CancelHdlImpl, Button*, void)
 {
     SavePalettes();
-
     EndDialog();
 }
 
@@ -262,9 +248,14 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             static_cast<SvxAreaTabPage&>(rPage).SetBitmapList( mpBitmapList );
             static_cast<SvxAreaTabPage&>(rPage).SetPatternList( mpPatternList );
             static_cast<SvxAreaTabPage&>(rPage).SetDrawModel( mpDrawModel );
+            static_cast<SvxAreaTabPage&>(rPage).SetPageType( mnPageType );
+            static_cast<SvxAreaTabPage&>(rPage).SetDlgType( 0 );
+            static_cast<SvxAreaTabPage&>(rPage).SetPos( mnPos );
+            static_cast<SvxAreaTabPage&>(rPage).SetAreaTP( &mbAreaTP );
             static_cast<SvxAreaTabPage&>(rPage).SetGrdChgd( &mnGradientListState );
             static_cast<SvxAreaTabPage&>(rPage).SetHtchChgd( &mnHatchingListState );
             static_cast<SvxAreaTabPage&>(rPage).SetBmpChgd( &mnBitmapListState );
+            static_cast<SvxAreaTabPage&>(rPage).SetPtrnChgd( &mnPatternListState );
             static_cast<SvxAreaTabPage&>(rPage).SetColorChgd( &mnColorListState );
             // ActivatePge() is not called the first time
             static_cast<SvxAreaTabPage&>(rPage).ActivatePage( mrOutAttrs );
@@ -275,46 +266,10 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             static_cast<SvxShadowTabPage&>(rPage).SetColorChgd( &mnColorListState );
             static_cast<SvxShadowTabPage&>(rPage).Construct();
     }
-    else if (nId == m_nGradientTabPage)
-    {
-            static_cast<SvxGradientTabPage&>(rPage).SetColorList( mpColorList );
-            static_cast<SvxGradientTabPage&>(rPage).SetGradientList( mpGradientList );
-            static_cast<SvxGradientTabPage&>(rPage).SetPos( &mnPos );
-            static_cast<SvxGradientTabPage&>(rPage).SetGrdChgd( &mnGradientListState );
-            static_cast<SvxGradientTabPage&>(rPage).SetColorChgd( &mnColorListState );
-            static_cast<SvxGradientTabPage&>(rPage).Construct();
-    }
-    else if (nId == m_nHatchTabPage)
-    {
-            static_cast<SvxHatchTabPage&>(rPage).SetColorList( mpColorList );
-            static_cast<SvxHatchTabPage&>(rPage).SetHatchingList( mpHatchingList );
-            static_cast<SvxHatchTabPage&>(rPage).SetPos( &mnPos );
-            static_cast<SvxHatchTabPage&>(rPage).SetHtchChgd( &mnHatchingListState );
-            static_cast<SvxHatchTabPage&>(rPage).SetColorChgd( &mnColorListState );
-            static_cast<SvxHatchTabPage&>(rPage).Construct();
-    }
-    else if (nId == m_nBitmapTabPage )
-    {
-            static_cast<SvxBitmapTabPage&>(rPage).SetBitmapList( mpBitmapList );
-            static_cast<SvxBitmapTabPage&>(rPage).SetPos( &mnPos );
-            static_cast<SvxBitmapTabPage&>(rPage).SetBmpChgd( &mnBitmapListState );
-            static_cast<SvxBitmapTabPage&>(rPage).Construct();
-    }
-    else if (nId == m_nPatternTabPage)
-    {
-            static_cast<SvxPatternTabPage&>(rPage).SetColorList( mpColorList );
-            static_cast<SvxPatternTabPage&>(rPage).SetPatternList( mpPatternList );
-            static_cast<SvxPatternTabPage&>(rPage).SetPos( &mnPos );
-            static_cast<SvxPatternTabPage&>(rPage).SetPtrnChgd( &mnPatternListState );
-            static_cast<SvxPatternTabPage&>(rPage).SetColorChgd( &mnColorListState );
-            static_cast<SvxPatternTabPage&>(rPage).Construct();
-    }
-    else if (nId == m_nColorTabPage)
+    else if (nId == m_nTransparenceTabPage)
     {
-            static_cast<SvxColorTabPage&>(rPage).SetColorList( mpColorList );
-            static_cast<SvxColorTabPage&>(rPage).SetPos( &mnPos );
-            static_cast<SvxColorTabPage&>(rPage).SetColorChgd( &mnColorListState );
-            static_cast<SvxColorTabPage&>(rPage).Construct();
+            static_cast<SvxTransparenceTabPage&>(rPage).SetPageType( mnPageType );
+            static_cast<SvxTransparenceTabPage&>(rPage).SetDlgType( 0 );
     }
 }
 
diff --git a/cui/uiconfig/ui/areadialog.ui b/cui/uiconfig/ui/areadialog.ui
index b48207216943..e9c557e8bbd4 100644
--- a/cui/uiconfig/ui/areadialog.ui
+++ b/cui/uiconfig/ui/areadialog.ui
@@ -131,76 +131,6 @@
                 <property name="tab_fill">False</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="RID_SVXPAGE_COLOR">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Colors</property>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="RID_SVXPAGE_GRADIENT">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Gradients</property>
-              </object>
-              <packing>
-                <property name="position">4</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="RID_SVXPAGE_HATCH">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Hatching</property>
-              </object>
-              <packing>
-                <property name="position">5</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="RID_SVXPAGE_BITMAP">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Bitmap</property>
-              </object>
-              <packing>
-                <property name="position">6</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="RID_SVXPAGE_PATTERN">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Patterns</property>
-              </object>
-              <packing>
-                <property name="position">7</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>