sidebar: Conversion to .ui for CellAppearancePropertyPanel

Change-Id: I90df6ebe428ec201aa204f26447c1728b2120c69

7 files changed, 338 insertions, 320 deletions

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 1e3759bc06cc..4c36b575f12d 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
 	sc/uiconfig/scalc/ui/sharedheaderdialog \
 	sc/uiconfig/scalc/ui/sidebaralignment \
 	sc/uiconfig/scalc/ui/sidebarnumberformat \
+	sc/uiconfig/scalc/ui/sidebarcellappearance \
 	sc/uiconfig/scalc/ui/solverdlg \
 	sc/uiconfig/scalc/ui/sortcriteriapage \
 	sc/uiconfig/scalc/ui/sortkey \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0e9f0496b658..85796442e4dc 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -953,6 +953,17 @@
 #define RID_IMG_SELECT_CURRENT   (BMP_START + 8)
 #define RID_IMG_UNSELECT_CURRENT (BMP_START + 9)
 
+#define IMG_CELL_BORDER         (BMP_START + 10)
+#define IMG_LINE_STYLE1         (BMP_START + 11)
+#define IMG_LINE_STYLE2         (BMP_START + 12)
+#define IMG_LINE_STYLE3         (BMP_START + 13)
+#define IMG_LINE_STYLE4         (BMP_START + 14)
+#define IMG_LINE_STYLE5         (BMP_START + 15)
+#define IMG_LINE_STYLE6         (BMP_START + 16)
+#define IMG_LINE_STYLE7         (BMP_START + 17)
+#define IMG_LINE_STYLE8         (BMP_START + 18)
+#define IMG_LINE_STYLE9         (BMP_START + 19)
+
 #define BMP_END                 (BMP_START + 100)
 
 #define SC_DIALOGS_START        (BMP_END)
@@ -1098,14 +1109,12 @@
 #define RID_PROPERTYPANEL_SC_ALIGNMENT  (SC_DIALOGS_START + 161)
 
 // defines for CellAppearancePropertyPanel
-#define RID_PROPERTYPANEL_SC_APPEAR     (SC_DIALOGS_START + 162)
-#define RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR (SC_DIALOGS_START + 163)
-#define RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR (SC_DIALOGS_START + 164)
-#define RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE (SC_DIALOGS_START + 165)
-#define RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE (SC_DIALOGS_START + 166)
-#define RID_PROPERTYPANEL_SC_NUMBERFORMAT (SC_DIALOGS_START + 167)
-
-#define SC_DIALOGS_END                  (RID_PROPERTYPANEL_SC_NUMBERFORMAT+1)
+#define RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR (SC_DIALOGS_START + 162)
+#define RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR (SC_DIALOGS_START + 163)
+#define RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE (SC_DIALOGS_START + 164)
+#define RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE (SC_DIALOGS_START + 165)
+
+#define SC_DIALOGS_END                  (RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE + 1)
 
 #ifndef STD_MASKCOLOR
 #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 2ee40a9dc836..fbb623678e8d 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -45,6 +45,12 @@
 using namespace css;
 using namespace cssu;
 
+const char UNO_BACKGROUNDCOLOR[] = ".uno:BackgroundColor";
+const char UNO_SETBORDERSTYLE[] = ".uno:SetBorderStyle";
+const char UNO_LINESTYLE[] = ".uno:LineStyle";
+const char UNO_FRAMELINECOLOR[] = ".uno:FrameLineColor";
+const char UNO_TOGGLESHEETGRID[] = ".uno:ToggleSheetGrid";
+
 #define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
 
 //////////////////////////////////////////////////////////////////////////////
@@ -149,28 +155,7 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
     Window* pParent,
     const cssu::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
-:   Control(
-        pParent,
-        ScResId(RID_PROPERTYPANEL_SC_APPEAR)),
-
-    mpFTFillColor(new FixedText(this, ScResId(FT_BK_COLOR))),
-    mpTBFillColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
-    mpTBFillColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBFillColorBackground.get(), ScResId(TB_BK_COLOR))),
-    mpFillColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_BRUSH, TBI_BK_COLOR, mpTBFillColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW)),
-
-    mpFTCellBorder(new FixedText(this, ScResId(FT_BORDER))),
-    mpTBCellBorderBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
-    mpTBCellBorder(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBCellBorderBackground.get(), ScResId(TB_APP_BORDER))),
-    mpCellBorderUpdater(new CellBorderUpdater(TBI_BORDER, *mpTBCellBorder)),
-
-    mpTBLineStyleBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
-    mpTBLineStyle(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBLineStyleBackground.get(), ScResId(TB_BORDER_LINE_STYLE))),
-
-    mpTBLineColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
-    mpTBLineColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBLineColorBackground.get(), ScResId(TB_BORDER_LINE_COLOR))),
-    mpLineColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_FRAME_LINECOLOR, TBI_LINE_COLOR, mpTBLineColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW)),
-
-    mpCBXShowGrid(new CheckBox(this, ScResId(CBX_SHOW_GRID))),
+:   PanelLayout(pParent, "CellAppearancePropertyPanel", "modules/scalc/ui/sidebarcellappearance.ui", rxFrame),
 
     maBackColorControl(SID_BACKGROUND_COLOR, *pBindings, *this),
     maLineColorControl(SID_FRAME_LINECOLOR, *pBindings, *this),
@@ -181,9 +166,7 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
     maBorderTLBRControl(SID_ATTR_BORDER_DIAG_TLBR, *pBindings, *this),
     maBorderBLTRControl(SID_ATTR_BORDER_DIAG_BLTR, *pBindings, *this),
 
-    maIMGBKColor(ScResId(IMG_BK_COLOR)),
     maIMGCellBorder(ScResId(IMG_CELL_BORDER)),
-    maIMGLineColor(ScResId(IMG_LINE_COLOR)),
     maIMGLineStyle1(ScResId(IMG_LINE_STYLE1)),
     maIMGLineStyle2(ScResId(IMG_LINE_STYLE2)),
     maIMGLineStyle3(ScResId(IMG_LINE_STYLE3)),
@@ -230,71 +213,57 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
     maContext(),
     mpBindings(pBindings)
 {
+    get(mpTBFillColor,  "cellbackgroundcolor");
+    get(mpTBCellBorder, "cellbordertype");
+    get(mpTBLineStyle,  "borderlinestyle");
+    get(mpTBLineColor,  "borderlinecolor");
+    get(mpCBXShowGrid,  "cellgridlines");
+
+    mpFillColorUpdater.reset( new ::svx::ToolboxButtonColorUpdater(SID_ATTR_BRUSH,
+        mpTBFillColor->GetItemId( UNO_BACKGROUNDCOLOR ),
+        mpTBFillColor, TBX_UPDATER_MODE_CHAR_COLOR_NEW) );
+    mpLineColorUpdater.reset( new ::svx::ToolboxButtonColorUpdater(SID_FRAME_LINECOLOR,
+        mpTBLineColor->GetItemId( UNO_FRAMELINECOLOR ),
+        mpTBLineColor, TBX_UPDATER_MODE_CHAR_COLOR_NEW) );
+    mpCellBorderUpdater.reset( new CellBorderUpdater(
+        mpTBCellBorder->GetItemId( UNO_SETBORDERSTYLE ), *mpTBCellBorder) );
+
     Initialize();
-    FreeResource();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 CellAppearancePropertyPanel::~CellAppearancePropertyPanel()
 {
-    // Destroy the toolboxes, then their background windows.
-    mpTBFillColor.reset();
-    mpTBCellBorder.reset();
-    mpTBLineStyle.reset();
-    mpTBLineColor.reset();
-
-    mpTBFillColorBackground.reset();
-    mpTBCellBorderBackground.reset();
-    mpTBLineStyleBackground.reset();
-    mpTBLineColorBackground.reset();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 void CellAppearancePropertyPanel::Initialize()
 {
-    mpTBFillColor->SetItemImage(TBI_BK_COLOR, maIMGBKColor);
-    mpTBFillColor->SetItemBits( TBI_BK_COLOR, mpTBFillColor->GetItemBits( TBI_BK_COLOR ) | TIB_DROPDOWNONLY );
-    mpTBFillColor->SetQuickHelpText(TBI_BK_COLOR,String(ScResId(STR_QH_BK_COLOR))); //Add
-    Size aTbxSize1( mpTBFillColor->CalcWindowSizePixel() );
-    mpTBFillColor->SetOutputSizePixel( aTbxSize1 );
-    mpTBFillColor->SetBackground(Wallpaper());
-    mpTBFillColor->SetPaintTransparent(true);
+    const sal_uInt16 nIdBkColor = mpTBFillColor->GetItemId( UNO_BACKGROUNDCOLOR );
+    mpTBFillColor->SetItemBits( nIdBkColor, mpTBFillColor->GetItemBits( nIdBkColor ) | TIB_DROPDOWNONLY );
     Link aLink = LINK(this, CellAppearancePropertyPanel, TbxBKColorSelectHdl);
     mpTBFillColor->SetDropdownClickHdl ( aLink );
     mpTBFillColor->SetSelectHdl ( aLink );
 
-    mpTBCellBorder->SetItemImage(TBI_BORDER, maIMGCellBorder);
-    mpTBCellBorder->SetItemBits( TBI_BORDER, mpTBCellBorder->GetItemBits( TBI_BORDER ) | TIB_DROPDOWNONLY );
-    mpTBCellBorder->SetQuickHelpText(TBI_BORDER,String(ScResId(STR_QH_BORDER)));    //Add
-    Size aTbxSize2( mpTBCellBorder->CalcWindowSizePixel() );
-    mpTBCellBorder->SetOutputSizePixel( aTbxSize2 );
-    mpTBCellBorder->SetBackground(Wallpaper());
-    mpTBCellBorder->SetPaintTransparent(true);
+    const sal_uInt16 nIdBorderType  = mpTBCellBorder->GetItemId( UNO_SETBORDERSTYLE );
+    mpTBCellBorder->SetItemImage( nIdBorderType, maIMGCellBorder );
+    mpTBCellBorder->SetItemBits( nIdBorderType, mpTBCellBorder->GetItemBits( nIdBorderType ) | TIB_DROPDOWNONLY );
     aLink = LINK(this, CellAppearancePropertyPanel, TbxCellBorderSelectHdl);
     mpTBCellBorder->SetDropdownClickHdl ( aLink );
     mpTBCellBorder->SetSelectHdl ( aLink );
 
-    mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle1);
-    mpTBLineStyle->SetItemBits( TBI_LINE_STYLE, mpTBLineStyle->GetItemBits( TBI_LINE_STYLE ) | TIB_DROPDOWNONLY );
-    mpTBLineStyle->SetQuickHelpText(TBI_LINE_STYLE,String(ScResId(STR_QH_BORDER_LINE_STYLE)));  //Add
-    Size aTbxSize3( mpTBLineStyle->CalcWindowSizePixel() );
-    mpTBLineStyle->SetOutputSizePixel( aTbxSize3 );
-    mpTBLineStyle->SetBackground(Wallpaper());
-    mpTBLineStyle->SetPaintTransparent(true);
+    const sal_uInt16 nIdBorderLineStyle = mpTBLineStyle->GetItemId( UNO_LINESTYLE );
+    mpTBLineStyle->SetItemImage( nIdBorderLineStyle, maIMGLineStyle1 );
+    mpTBLineStyle->SetItemBits( nIdBorderLineStyle, mpTBLineStyle->GetItemBits( nIdBorderLineStyle ) | TIB_DROPDOWNONLY );
     aLink = LINK(this, CellAppearancePropertyPanel, TbxLineStyleSelectHdl);
     mpTBLineStyle->SetDropdownClickHdl ( aLink );
     mpTBLineStyle->SetSelectHdl ( aLink );
     mpTBLineStyle->Disable();
 
-    mpTBLineColor->SetItemImage(TBI_LINE_COLOR, maIMGLineColor);
-    mpTBLineColor->SetItemBits( TBI_LINE_COLOR, mpTBLineColor->GetItemBits( TBI_LINE_COLOR ) | TIB_DROPDOWNONLY );
-    mpTBLineColor->SetQuickHelpText(TBI_LINE_COLOR,String(ScResId(STR_QH_BORDER_LINE_COLOR)));  //Add
-    Size aTbxSize4( mpTBLineColor->CalcWindowSizePixel() );
-    mpTBLineColor->SetOutputSizePixel( aTbxSize4 );
-    mpTBLineColor->SetBackground(Wallpaper());
-    mpTBLineColor->SetPaintTransparent(true);
+    const sal_uInt16 nIdBorderLinecolor = mpTBLineColor->GetItemId( UNO_FRAMELINECOLOR );
+    mpTBLineColor->SetItemBits( nIdBorderLinecolor, mpTBLineColor->GetItemBits( nIdBorderLinecolor ) | TIB_DROPDOWNONLY );
     aLink = LINK(this, CellAppearancePropertyPanel, TbxLineColorSelectHdl);
     mpTBLineColor->SetDropdownClickHdl ( aLink );
     mpTBLineColor->SetSelectHdl ( aLink );
@@ -303,18 +272,17 @@ void CellAppearancePropertyPanel::Initialize()
     aLink = LINK(this, CellAppearancePropertyPanel, CBOXGridShowClkHdl);
     mpCBXShowGrid->SetClickHdl ( aLink );
 
-    mpTBFillColor->SetAccessibleRelationLabeledBy(mpFTFillColor.get());
-    mpTBLineColor->SetAccessibleRelationLabeledBy(mpTBLineColor.get());
-    mpTBCellBorder->SetAccessibleRelationLabeledBy(mpFTCellBorder.get());
-    mpTBLineStyle->SetAccessibleRelationLabeledBy(mpTBLineStyle.get());
+    mpTBLineColor->SetAccessibleRelationLabeledBy(mpTBLineColor);
+    mpTBLineStyle->SetAccessibleRelationLabeledBy(mpTBLineStyle);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 IMPL_LINK(CellAppearancePropertyPanel, TbxBKColorSelectHdl, ToolBox*, pToolBox)
 {
-    sal_uInt16 nId = pToolBox->GetCurItemId();
-    if(nId == TBI_BK_COLOR)
+    const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
+
+    if(aCommand == UNO_BACKGROUNDCOLOR)
     {
         maFillColorPopup.Show(*pToolBox);
         maFillColorPopup.SetCurrentColor(maBackColor, mbBackColorAvailable);
@@ -326,8 +294,9 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxBKColorSelectHdl, ToolBox*, pToolBox)
 
 IMPL_LINK(CellAppearancePropertyPanel, TbxLineColorSelectHdl, ToolBox*, pToolBox)
 {
-    sal_uInt16 nId = pToolBox->GetCurItemId();
-    if(nId == TBI_LINE_COLOR)
+    const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
+
+    if(aCommand == UNO_FRAMELINECOLOR)
     {
         maLineColorPopup.Show(*pToolBox);
         maLineColorPopup.SetCurrentColor(maLineColor, mbLineColorAvailable);
@@ -339,9 +308,9 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxLineColorSelectHdl, ToolBox*, pToolBox
 
 IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox)
 {
-    sal_uInt16 nId = pToolBox->GetCurItemId();
+    const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
 
-    if(nId == TBI_BORDER)
+    if(aCommand == UNO_SETBORDERSTYLE)
     {
         // create popup on demand
         if(!mpCellBorderStylePopup.get())
@@ -364,8 +333,9 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBo
 
 IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox)
 {
-    sal_uInt16 nId = pToolBox->GetCurItemId();
-    if(nId == TBI_LINE_STYLE)
+    const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
+
+    if(aCommand == UNO_LINESTYLE)
     {
         // create popup on demand
         if(!mpCellLineStylePopup.get())
@@ -732,31 +702,31 @@ SfxBindings* CellAppearancePropertyPanel::GetBindings()
 
 void CellAppearancePropertyPanel::SetStyleIcon()
 {
+    const sal_uInt16 nIdBorderLineStyle = mpTBLineStyle->GetItemId( UNO_LINESTYLE );
+
     //FIXME: update for new line border possibilities
     if(mnOut == DEF_LINE_WIDTH_0 && mnIn == 0 && mnDis == 0)    //1
-        mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle1);
+        mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle1);
     else if(mnOut == DEF_LINE_WIDTH_2 && mnIn == 0 && mnDis == 0) //2
-        mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle2);
+        mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle2);
     else if(mnOut == DEF_LINE_WIDTH_3 && mnIn == 0 && mnDis == 0) //3
-        mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle3);
+        mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle3);
     else if(mnOut == DEF_LINE_WIDTH_4 && mnIn == 0 && mnDis == 0) //4
-        mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle4);
+        mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle4);
     else if(mnOut == DEF_LINE_WIDTH_0 && mnIn == DEF_LINE_WIDTH_0 && mnDis == DEF_LINE_WIDTH_1) //5
-        mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle5);
+        mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle5);
     else if(mnOut == DEF_LINE_WIDTH_0 && mnIn == DEF_LINE_WIDTH_0 && mnDis == DEF_LINE_WIDTH_2) //6
-        mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle6);
+        mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle6);
     else if(mnOut == DEF_LINE_WIDTH_1 && mnIn == DEF_LINE_WIDTH_2 && mnDis == DEF_LINE_WIDTH_1) //7
-        mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle7);
+        mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle7);
     else if(mnOut == DEF_LINE_WIDTH_2 && mnIn == DEF_LINE_WIDTH_0 && mnDis == DEF_LINE_WIDTH_2) //8
-        mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle8);
+        mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle8);
     else if(mnOut == DEF_LINE_WIDTH_2 && mnIn == DEF_LINE_WIDTH_2 && mnDis == DEF_LINE_WIDTH_2) //9
-        mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle9);
+        mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle9);
     else
-        mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle1);
+        mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle1);
 }
 
-//////////////////////////////////////////////////////////////////////////////
-
 void CellAppearancePropertyPanel::UpdateControlState()
 {
     if(mbOuterBorder || mbInnerBorder || mbTLBR || mbBLTR)
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
index a0a3b9e2c16f..f59c3a9e6262 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
@@ -15,43 +15,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#define FT_BK_COLOR     1
-#define TB_BK_COLOR     2
-#define TBI_BK_COLOR    3
-#define FT_BORDER       4
-#define TB_APP_BORDER       5
-#define TBI_BORDER      6
-#define TB_BORDER_LINE_STYLE    7
-#define TBI_LINE_STYLE          8
-#define TB_BORDER_LINE_COLOR    9
-#define TBI_LINE_COLOR          10
-#define CBX_SHOW_GRID           11
-
-#define STR_QH_BK_COLOR         12
-#define STR_QH_BORDER           13
-#define STR_QH_BORDER_LINE_STYLE        14
-#define STR_QH_BORDER_LINE_COLOR        15
-
-#define IMG_BK_COLOR    21
-#define IMG_CELL_BORDER 22
-#define IMG_LINE_COLOR  23
-#define IMG_LINE_STYLE1         25
-#define IMG_LINE_STYLE2         26
-#define IMG_LINE_STYLE3         27
-#define IMG_LINE_STYLE4         28
-#define IMG_LINE_STYLE5         29
-#define IMG_LINE_STYLE6         30
-#define IMG_LINE_STYLE7         31
-#define IMG_LINE_STYLE8         32
-#define IMG_LINE_STYLE9         33
 
 //BACK_COLOR PAGE
-#define VS_BACK_COLOR   1
 #define STR_AUTOMATICE  2
 
-//LINE COLOR PAGE
-#define VS_LINE_COLOR   1
-
 //line style page
 #define VS_STYLE        1
 #define PB_OPTIONS      2
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index 30efdca2cfc2..5791ba7ec7b9 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -20,6 +20,7 @@
 
 #include <sfx2/sidebar/ControllerItem.hxx>
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
+#include <svx/sidebar/PanelLayout.hxx>
 #include <boost/scoped_ptr.hpp>
 #include <svx/sidebar/ColorPopup.hxx>
 
@@ -37,7 +38,7 @@ class CheckBox;
 namespace sc { namespace sidebar {
 
 class CellAppearancePropertyPanel
-:   public Control,
+:   public PanelLayout,
     public ::sfx2::sidebar::IContextChangeReceiver,
     public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
 {
@@ -67,24 +68,15 @@ public:
 
 private:
     //ui controls
-    ::boost::scoped_ptr< FixedText >        mpFTFillColor;
-    ::boost::scoped_ptr< Window >           mpTBFillColorBackground;
-    ::boost::scoped_ptr< ToolBox >          mpTBFillColor;
-    ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpFillColorUpdater;
-
-    ::boost::scoped_ptr< FixedText >        mpFTCellBorder;
-    ::boost::scoped_ptr< Window >           mpTBCellBorderBackground;
-    ::boost::scoped_ptr< ToolBox >          mpTBCellBorder;
-    ::boost::scoped_ptr< CellBorderUpdater > mpCellBorderUpdater;
-
-    ::boost::scoped_ptr< Window >           mpTBLineStyleBackground;
-    ::boost::scoped_ptr< ToolBox >          mpTBLineStyle;
 
-    ::boost::scoped_ptr< Window >           mpTBLineColorBackground;
-    ::boost::scoped_ptr< ToolBox >          mpTBLineColor;
+    ToolBox*                                mpTBFillColor;
+    ToolBox*                                mpTBCellBorder;
+    ToolBox*                                mpTBLineStyle;
+    ToolBox*                                mpTBLineColor;
+    ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpFillColorUpdater;
     ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpLineColorUpdater;
-
-    ::boost::scoped_ptr< CheckBox >         mpCBXShowGrid;
+    ::boost::scoped_ptr< CellBorderUpdater > mpCellBorderUpdater;
+    CheckBox*                               mpCBXShowGrid;
 
     ::sfx2::sidebar::ControllerItem         maBackColorControl;
     ::sfx2::sidebar::ControllerItem         maLineColorControl;
@@ -96,9 +88,7 @@ private:
     ::sfx2::sidebar::ControllerItem         maBorderBLTRControl;
 
     // images
-    Image                                   maIMGBKColor;
     Image                                   maIMGCellBorder;
-    Image                                   maIMGLineColor;
     Image                                   maIMGLineStyle1;
     Image                                   maIMGLineStyle2;
     Image                                   maIMGLineStyle3;
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
index cb870818bfd3..fa8bb4f04607 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
@@ -31,181 +31,47 @@
 #define POPUPPANEL_MARGIN_SMALL_PIXEL   8
 
 //////////////////////////////////////////////////////////////////////////////
-// the basic propertypanel
 
-Control RID_PROPERTYPANEL_SC_APPEAR
+Image IMG_CELL_BORDER
 {
-    OutputSize = TRUE;
-    DialogControl = TRUE;
-    Border = FALSE;
-
-    Size = MAP_APPFONT( PROPERTYPAGE_WIDTH,  SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 +  TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT  + CONTROL_SPACING_VERTICAL * 2 +  TOOLBOX_HEIGHT_2 + CBOX_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT - 2);
-    HelpID = HID_PROPERTYPANEL_SC_CELL_SECTION ;
-    Text [ en-US ] = "Cell Appearance";
-
-    FixedText FT_BK_COLOR
-    {
-        Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP );
-        Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH - SECTIONPAGE_MARGIN_HORIZONTAL * 2 , TEXT_HEIGHT) ;
-        Text [ en-US ] = "~Cell background:";
-    };
-    ToolBox TB_BK_COLOR
-    {
-        SVLook = TRUE ;
-        Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) ;
-        Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
-        TabStop = TRUE ;
-        HelpID = HID_PROPERTYPANEL_SC_TBX_BKCOLOR ;
-        Text [ en-US ] = "Cell Background";
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = TBI_BK_COLOR ;
-                DropDown = TRUE ;
-                Text [ en-US ] = "Cell background" ;
-                HelpID = HID_PROPERTYPANEL_SC_TBI_BKCOLOR;
-            };
-        };
-    };
-    String STR_QH_BK_COLOR
-    {
-        Text [ en-US ] = "Select the background color of the selected cells." ;
-    };
-    FixedText FT_BORDER
-    {
-        Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT +  TEXT_CONTROL_SPACING_VERTICAL + TOOLBOX_HEIGHT  + CONTROL_SPACING_VERTICAL);
-        Size = MAP_APPFONT (  PROPERTYPAGE_WIDTH - SECTIONPAGE_MARGIN_HORIZONTAL * 2 , TEXT_HEIGHT) ;
-        Text [ en-US ] = "Cell ~border:";
-    };
-    ToolBox TB_APP_BORDER
-    {
-        SVLook = TRUE ;
-        Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 +  TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT  + CONTROL_SPACING_VERTICAL) ;
-        Size = MAP_APPFONT (TOOLBOX_WIDTH_2 ,TOOLBOX_HEIGHT_2 ) ;
-        TabStop = TRUE ;
-        HelpID = HID_PROPERTYPANEL_SC_TBX_BORDER ;
-        Text [ en-US ] = "Cell Border";
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = TBI_BORDER ;
-                DropDown = TRUE ;
-                Text [ en-US ] = "Cell border" ;
-                HelpID = HID_PROPERTYPANEL_SC_TBI_BORDER;
-            };
-        };
-    };
-    String STR_QH_BORDER
-    {
-        Text [ en-US ] = "Specify the borders of the selected cells." ;
-    };
-    ToolBox TB_BORDER_LINE_STYLE
-    {
-        SVLook = TRUE ;
-        Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH_2 + 3, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 +  TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT  + CONTROL_SPACING_VERTICAL ) ;
-        Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT) ;
-        TabStop = TRUE ;
-        HelpID = HID_PROPERTYPANEL_SC_TBX_STYLE ;
-        Text [ en-US ] = "Line Style";
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = TBI_LINE_STYLE ;
-                DropDown = TRUE ;
-                Text [ en-US ] = "Line style" ;
-                HelpID = HID_PROPERTYPANEL_SC_TBI_STYLE;
-            };
-        };
-    };
-    String STR_QH_BORDER_LINE_STYLE
-    {
-        Text [ en-US ] = "Select the line style of the borders." ;
-    };
-    ToolBox TB_BORDER_LINE_COLOR
-    {
-        SVLook = TRUE ;
-        Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH_2 + 3, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 +  TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT * 2  + CONTROL_SPACING_VERTICAL + 3) ;
-        Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
-        TabStop = TRUE ;
-        HelpID = HID_PROPERTYPANEL_SC_TBX_LINECOLOR ;
-        Text [ en-US ] = "Line Color";
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = TBI_LINE_COLOR ;
-                DropDown = TRUE ;
-                Text [ en-US ] = "Line color" ;
-                HelpID = HID_PROPERTYPANEL_SC_TBI_LINECOLOR;
-            };
-        };
-    };
-    String STR_QH_BORDER_LINE_COLOR
-    {
-        Text [ en-US ] = "Select the line color of the borders." ;
-    };
-    CheckBox CBX_SHOW_GRID
-    {
-        Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 +  TEXT_CONTROL_SPACING_VERTICAL * 2  +  TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL * 2 +  TOOLBOX_HEIGHT_2 + 2) ;
-        Size = MAP_APPFONT ( 90 , CBOX_HEIGHT ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Show cell ~grid lines" ;
-        QuickHelpText [ en-US ] = "Show the grid lines of the cells in the entire spreadsheet.";
-        HelpID = HID_PROPERTYPANEL_SC_CBOX_SHOWGRID;
-    };
-
-    Image IMG_BK_COLOR
-    {
-        ImageBitmap = Bitmap{File = "sidebar/fill_color.png";};
-    };
-    Image IMG_CELL_BORDER
-    {
-        ImageBitmap = Bitmap{File = "sidebar/CellBorder.png";};
-        //MaskColor = STD_MASKCOLOR ;
-    };
-    Image IMG_LINE_COLOR
-    {
-        ImageBitmap = Bitmap{File = "sidebar/Line_color.png";};
-    };
-    Image IMG_LINE_STYLE1
-    {
-        ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_005.png";};
-    };
-    Image IMG_LINE_STYLE2
-    {
-        ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_250.png";};
-    };
-    Image IMG_LINE_STYLE3
-    {
-        ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_400.png";};
-    };
-    Image IMG_LINE_STYLE4
-    {
-        ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_500.png";};
-    };
-    Image IMG_LINE_STYLE5
-    {
-        ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_110.png";};
-    };
-    Image IMG_LINE_STYLE6
-    {
-        ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_260.png";};
-    };
-    Image IMG_LINE_STYLE7
-    {
-        ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_450.png";};
-    };
-    Image IMG_LINE_STYLE8
-    {
-        ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_505.png";};
-    };
-    Image IMG_LINE_STYLE9
-    {
-        ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_750.png";};
-    };
+    ImageBitmap = Bitmap{File = "sidebar/CellBorder.png";};
+    //MaskColor = STD_MASKCOLOR ;
+};
+Image IMG_LINE_STYLE1
+{
+    ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_005.png";};
+};
+Image IMG_LINE_STYLE2
+{
+    ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_250.png";};
+};
+Image IMG_LINE_STYLE3
+{
+    ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_400.png";};
+};
+Image IMG_LINE_STYLE4
+{
+    ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_500.png";};
+};
+Image IMG_LINE_STYLE5
+{
+    ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_110.png";};
+};
+Image IMG_LINE_STYLE6
+{
+    ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_260.png";};
+};
+Image IMG_LINE_STYLE7
+{
+    ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_450.png";};
+};
+Image IMG_LINE_STYLE8
+{
+    ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_505.png";};
+};
+Image IMG_LINE_STYLE9
+{
+    ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_750.png";};
 };
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
new file mode 100644
index 000000000000..b07286dac95e
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkGrid" id="CellAppearancePropertyPanel">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="row_homogeneous">True</property>
+    <property name="column_homogeneous">True</property>
+    <child>
+      <object class="GtkBox" id="box1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">6</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkBox" id="box2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkLabel" id="cellbackgroundlabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_right">119</property>
+                <property name="label" translatable="yes">_Cell background:</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolbar" id="cellbackgroundcolor">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property>
+                <child>
+                  <object class="GtkMenuToolButton" id="cellbackground">
+                    <property name="width_request">100</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property>
+                    <property name="halign">start</property>
+                    <property name="action_name">.uno:BackgroundColor</property>
+                    <property name="label" translatable="yes">toolbutton1</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="cellborderlabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_right">153</property>
+            <property name="label" translatable="yes">Cell _border:</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="grid2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkToolbar" id="borderlinecolor">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
+                <property name="hexpand">True</property>
+                <child>
+                  <object class="GtkMenuToolButton" id="linecolor">
+                    <property name="width_request">90</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
+                    <property name="halign">end</property>
+                    <property name="hexpand">True</property>
+                    <property name="action_name">.uno:FrameLineColor</property>
+                    <property name="label" translatable="yes">toolbutton1</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolbar" id="borderlinestyle">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <child>
+                  <object class="GtkMenuToolButton" id="linestyle">
+                    <property name="width_request">90</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Select the line style of the borders.</property>
+                    <property name="halign">end</property>
+                    <property name="action_name">.uno:LineStyle</property>
+                    <property name="label" translatable="yes">toolbutton2</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolbar" id="cellbordertype">
+                <property name="width_request">80</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <child>
+                  <object class="GtkMenuToolButton" id="bordertype">
+                    <property name="width_request">90</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">Specify the borders of the selected cells.</property>
+                    <property name="halign">start</property>
+                    <property name="action_name">.uno:SetBorderStyle</property>
+                    <property name="label" translatable="yes">toolbutton1</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="cellgridlines">
+            <property name="label" translatable="yes">Show cell _grid lines</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes">Show the grid lines of the cells in the entire spreadsheet.</property>
+            <property name="action_name">.uno:ToggleSheetGrid</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+  </object>
+</interface>