Author: alg
Date: Wed Apr 3 09:57:36 2013
New Revision: 1463901
URL: http://svn.apache.org/r1463901
Log:
i121789 Corrected 'No color' usage in CellAppearancePropertyPanel
Modified:
openoffice/branches/sidebar/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
openoffice/branches/sidebar/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
Modified:
openoffice/branches/sidebar/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx?rev=1463901&r1=1463900&r2=1463901&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
(original)
+++
openoffice/branches/sidebar/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
Wed Apr 3 09:57:36 2013
@@ -52,6 +52,17 @@ using namespace cssu;
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
//////////////////////////////////////////////////////////////////////////////
+// helpers
+
+namespace
+{
+ Color GetTransparentColor(void)
+ {
+ return COL_TRANSPARENT;
+ }
+} // end of anonymous namespace
+
+//////////////////////////////////////////////////////////////////////////////
// namespace open
namespace sc { namespace sidebar {
@@ -67,17 +78,12 @@ svx::sidebar::PopupControl* CellAppearan
mpBindings,
ScResId(RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR),
ScResId(VS_FILLCOLOR),
- ::boost::bind(&CellAppearancePropertyPanel::GetLastFillColor, this),
+ ::boost::bind(GetTransparentColor),
::boost::bind(&CellAppearancePropertyPanel::SetFillColor, this, _1,
_2),
pParent,
&aResId);
}
-Color CellAppearancePropertyPanel::GetLastFillColor(void) const
-{
- return maBackColor;
-}
-
void CellAppearancePropertyPanel::SetFillColor(
const String& /*rsColorName*/,
const Color aColor)
@@ -96,17 +102,12 @@ svx::sidebar::PopupControl* CellAppearan
mpBindings,
ScResId(RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR),
ScResId(VS_LINECOLOR),
- ::boost::bind(&CellAppearancePropertyPanel::GetLastLineColor, this),
+ ::boost::bind(GetTransparentColor),
::boost::bind(&CellAppearancePropertyPanel::SetLineColor, this, _1,
_2),
pParent,
0);
}
-Color CellAppearancePropertyPanel::GetLastLineColor(void) const
-{
- return maLineColor;
-}
-
void CellAppearancePropertyPanel::SetLineColor(
const String& /*rsColorName*/,
const Color aColor)
Modified:
openoffice/branches/sidebar/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx?rev=1463901&r1=1463900&r2=1463901&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
(original)
+++
openoffice/branches/sidebar/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
Wed Apr 3 09:57:36 2013
@@ -182,12 +182,10 @@ private:
// for fill color picker
svx::sidebar::PopupControl*
CreateFillColorPopupControl(svx::sidebar::PopupContainer* pParent);
- Color GetLastFillColor(void) const;
void SetFillColor(const String& rsColorName, const Color aColor);
// for line color picker
svx::sidebar::PopupControl*
CreateLineColorPopupControl(svx::sidebar::PopupContainer* pParent);
- Color GetLastLineColor(void) const;
void SetLineColor(const String& rsColorName, const Color aColor);
// for CellLineStyle popup
