Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4227
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/4227/1
Sidebar conversion to .ui for CellAppearancePropertyPanel
Change-Id: I90df6ebe428ec201aa204f26447c1728b2120c69
---
M sc/AllLangResTarget_sc.mk
M sc/UIConfig_scalc.mk
M sc/inc/sc.hrc
M sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
M sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
M sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
M sc/source/ui/sidebar/CellAppearancePropertyPanel.src
M sc/source/ui/src/scstring.src
A sc/uiconfig/scalc/ui/sidebarcellappearance.ui
9 files changed, 259 insertions(+), 307 deletions(-)
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index b83e0f9..6c9cfde 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -86,7 +86,6 @@
sc/source/ui/formdlg/formdlgs.src \
sc/source/ui/formdlg/dwfunctr.src \
sc/source/ui/sidebar/AlignmentPropertyPanel.src \
-sc/source/ui/sidebar/CellAppearancePropertyPanel.src \
sc/source/ui/sidebar/NumberFormatPropertyPanel.src \
sc/source/core/src/compiler.src \
))
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 94a8aea..4abee5c 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -84,6 +84,7 @@
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/sheetprintpage \
+ sc/uiconfig/scalc/ui/sidebarcellappearance \
sc/uiconfig/scalc/ui/rightfooterdialog \
sc/uiconfig/scalc/ui/rightheaderdialog \
sc/uiconfig/scalc/ui/selectrange \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 6fbe3f0..5de0877 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -939,6 +939,9 @@
#define SCSTR_FIELDSEP_TAB (STR_START + 412)
#define SCSTR_FIELDSEP_SPACE(STR_START + 413)
+#define SCSTR_FILLCOLOR (STR_START + 414)
+#define SCSTR_NOFILLCOLOR (STR_START + 415)
+#define SCSTR_LINECOLOR (STR_START + 416)
#define STR_END (SCSTR_FIELDSEP_SPACE)
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 2ee40a9..c083906 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_CELLBACKGROUND[] = .uno:CellBackground;
+const char UNO_BORDERTYPE[] = .uno:BorderType;
+const char UNO_BORDERLINESTYLE[] = .uno:BorderLineStyle;
+const char UNO_BORDERLINECOLOR[] = .uno:BorderLineColor;
+const char UNO_GRIDLINESVISIBLE[] = .uno:GridLinesVisible;
+
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
//
@@ -67,13 +73,13 @@
svx::sidebar::PopupControl*
CellAppearancePropertyPanel::CreateFillColorPopupControl(svx::sidebar::PopupContainer*
pParent)
{
-const ScResId aResId(VS_NOFILLCOLOR);
+const ScResId aResId(SCSTR_NOFILLCOLOR);
return new svx::sidebar::ColorControl(
pParent,
mpBindings,
ScResId(RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR),
-ScResId(VS_FILLCOLOR),
+ScResId(SCSTR_FILLCOLOR),
::boost::bind(GetTransparentColor),
::boost::bind(CellAppearancePropertyPanel::SetFillColor, this, _1,
_2),
pParent,
@@ -97,7 +103,7 @@
pParent,
mpBindings,
ScResId(RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR),
-ScResId(VS_LINECOLOR),
+ScResId(SCSTR_LINECOLOR),
::boost::bind(GetTransparentColor),
::boost::bind(CellAppearancePropertyPanel::SetLineColor, this, _1,
_2),
pParent,
@@ -122,7 +128,7 @@
void CellAppearancePropertyPanel::EndCellLineStylePopupMode(void)
{
-if(mpCellLineStylePopup.get())
+if(mpCellLineStylePopup)
{
mpCellLineStylePopup-Hide();
}
@@ -137,7 +143,7 @@
void CellAppearancePropertyPanel::EndCellBorderStylePopupMode(void)
{
-if(mpCellBorderStylePopup.get())
+if(mpCellBorderStylePopup)
{
mpCellBorderStylePopup-Hide();
}
@@ -149,28 +155,7 @@
Window* pParent,
const cssu::Referencecss::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))),
-
