[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc

[Caolán McNamara]

 binfilter/bf_svx/source/xoutdev/svx_xattr.cxx |   10 ++--------
 binfilter/inc/bf_svx/xcolit.hxx               |    2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit babed3d40d1733cb3ea4b8a176e4ec0ffb03397d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 16 12:13:38 2012 +0000

    WaE: can't return a temp, pTable is always null, lets just return aColor

diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index 341b16a..e11abf1 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -350,15 +350,9 @@ XubString aNameOrIndexEmptyString;
 |*
 \************************************************************************/
 
-/*N*/ const Color& XColorItem::GetValue(const XColorTable* pTable) const
+/*N*/ const Color& XColorItem::GetValue() const
 /*N*/ {
-/*N*/   if (!IsIndex())
-/*N*/       return aColor;
-/*N*/   else if (pTable)
-/*?*/       return pTable->Get(GetIndex())->GetColor();
-        else
-            return Color(); // whatever
-/*N*/
+/*N*/   return aColor;
 /*N*/ }
 
 /*N*/ bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
diff --git a/binfilter/inc/bf_svx/xcolit.hxx b/binfilter/inc/bf_svx/xcolit.hxx
index fd231cf..1252485 100644
--- a/binfilter/inc/bf_svx/xcolit.hxx
+++ b/binfilter/inc/bf_svx/xcolit.hxx
@@ -58,7 +58,7 @@ public:
     virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
     virtual SvStream&       Store(SvStream& rOut, USHORT) const { return rOut; }
 
-    const Color&    GetValue(const XColorTable* pTable = 0) const;
+    const Color&    GetValue() const;
     void            SetValue(const Color& rNew) { aColor = rNew; Detach(); }
 };