diff options
Diffstat (limited to 'svx/source/xoutdev/xattrbmp.cxx')
-rw-r--r-- | svx/source/xoutdev/xattrbmp.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index af4a4034a00b..9b37584b6f05 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -582,12 +582,19 @@ SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) cons |* *************************************************************************/ -const XOBitmap& XFillBitmapItem::GetBitmapValue(const XBitmapTable* pTable) const // GetValue -> GetBitmapValue +const XOBitmap& XFillBitmapItem::GetBitmapValue( +// const XBitmapTable* pTable +) const // GetValue -> GetBitmapValue { - if (!IsIndex()) - return aXOBitmap; - else - return pTable->GetBitmap(GetIndex())->GetXBitmap(); +// Note: we never pass pTable to this method which means that it's NULL. Thus, this code would +// fail if the Item was a list. I'm guessing that it can't be an Index or the caller makes sure +// it's not an Index before calling. Either way, I'm just going to return the Bitmap to keep it +// from failing. This could use some more research. (Joe P. 2011-08-24) +// if (!IsIndex()) +// return aXOBitmap; +// else +// return pTable->GetBitmap(GetIndex())->GetXBitmap(); + return aXOBitmap; } |