Kaydet (Commit) 135a208b authored tarafından Caolán McNamara's avatar Caolán McNamara

callcatcher: object is never constructed

üst 71b8b491
......@@ -82,7 +82,6 @@ class XBitmapList;
class XBitmapTable;
class XColorTable;
class XDashList;
class XDashTable;
class XGradientList;
class XGradientTable;
class XHatchList;
......
......@@ -29,7 +29,6 @@
#define _XATTR_HXX
class XColorTable;
class XDashTable;
class XLineEndTable;
class XHatchTable;
class XBitmapTable;
......
......@@ -36,7 +36,6 @@
/************************************************************************/
class XColorTable;
class XDashTable;
class XLineEndTable;
class XHatchTable;
class XBitmapTable;
......
......@@ -37,7 +37,6 @@
#include <svl/eitem.hxx>
class XDash;
class XDashTable;
class SvStream;
#include <svx/xdash.hxx>
......
......@@ -68,7 +68,7 @@ public:
virtual bool HasMetrics() const;
virtual bool ScaleMetrics(long nMul, long nDiv);
const XDash& GetDashValue(const XDashTable* pTable = 0) const; // GetValue -> GetDashValue
const XDash& GetDashValue() const;
void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue
static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
......
......@@ -388,35 +388,6 @@ public:
virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
};
// --------------------
// class XDashTable
// --------------------
class XDashTable : public XPropertyTable
{
public:
explicit XDashTable(
const String& rPath,
XOutdevItemPool* pXPool = NULL,
sal_uInt16 nInitSize = 16,
sal_uInt16 nReSize = 16
);
virtual ~XDashTable();
using XPropertyTable::Replace;
XDashEntry* Replace(long nIndex, XDashEntry* pEntry );
using XPropertyTable::Remove;
XDashEntry* Remove(long nIndex);
using XPropertyTable::Get;
XDashEntry* GetDash(long nIndex) const;
virtual sal_Bool Load();
virtual sal_Bool Save();
virtual sal_Bool Create();
virtual sal_Bool CreateBitmapsForUI();
virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
// -------------------
// class XDashList
// -------------------
......
......@@ -960,16 +960,13 @@ SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
/*************************************************************************
|*
|* const XDash& XLineDashItem::GetValue(const XDashTable* pTable) const
|* const XDash& XLineDashItem::GetValue() const
|*
*************************************************************************/
const XDash& XLineDashItem::GetDashValue(const XDashTable* pTable) const // GetValue -> GetDashValue
const XDash& XLineDashItem::GetDashValue() const
{
if (!IsIndex())
return aDash;
else
return pTable->GetDash(GetIndex())->GetDash();
return aDash;
}
//------------------------------------------------------------------------
......
......@@ -69,92 +69,6 @@ using ::rtl::OUString;
#define GLOBALOVERFLOW
sal_Unicode const pszExtDash[] = {'s','o','d'};
char const aChckDash[] = { 0x04, 0x00, 'S','O','D','L'}; // < 5.2
char const aChckDash0[] = { 0x04, 0x00, 'S','O','D','0'}; // = 5.2
char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
// -----------------
// class XDashTable
// -----------------
/*************************************************************************
|*
|* XDashTable::XDashTable()
|*
*************************************************************************/
XDashTable::XDashTable(
const String& rPath,
XOutdevItemPool* pInPool,
sal_uInt16 nInitSize,
sal_uInt16 nReSize
) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize )
{
pBmpTable = new Table( nInitSize, nReSize );
}
/************************************************************************/
XDashTable::~XDashTable()
{
}
/************************************************************************/
XDashEntry* XDashTable::Replace(long nIndex, XDashEntry* pEntry )
{
return (XDashEntry*) XPropertyTable::Replace(nIndex, pEntry);
}
/************************************************************************/
XDashEntry* XDashTable::Remove(long nIndex)
{
return (XDashEntry*) XPropertyTable::Remove(nIndex);
}
/************************************************************************/
XDashEntry* XDashTable::GetDash(long nIndex) const
{
return (XDashEntry*) XPropertyTable::Get(nIndex, 0);
}
/************************************************************************/
sal_Bool XDashTable::Load()
{
return( sal_False );
}
/************************************************************************/
sal_Bool XDashTable::Save()
{
return( sal_False );
}
/************************************************************************/
sal_Bool XDashTable::Create()
{
return( sal_False );
}
/************************************************************************/
sal_Bool XDashTable::CreateBitmapsForUI()
{
return( sal_False );
}
/************************************************************************/
Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
// ----------------
// class XDashList
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment