[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Aug 28 11:39:07 PDT 2011
binfilter/bf_svx/source/xoutdev/svx_xattr.cxx | 35 +++++++-------
binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx | 55 -----------------------
binfilter/inc/bf_svx/svdmodel.hxx | 1
binfilter/inc/bf_svx/xattr.hxx | 1
binfilter/inc/bf_svx/xit.hxx | 1
binfilter/inc/bf_svx/xlnedit.hxx | 2
binfilter/inc/bf_svx/xlnstit.hxx | 2
binfilter/inc/bf_svx/xtable.hxx | 24 ----------
8 files changed, 20 insertions(+), 101 deletions(-)
New commits:
commit 0b8264ea1daac37a37fd8b66075bf14ba248a5aa
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Aug 28 11:12:32 2011 -0700
Remove class XLineEndTable
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index a32a161..12fc438 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -1064,18 +1064,18 @@ XubString aNameOrIndexEmptyString;
/*************************************************************************
|*
-|* const XPolygon& XLineStartItem::GetValue(const XLineEndTable* pTable)
-|* const
+|* const XPolygon& XLineStartItem::GetValue() const
|*
*************************************************************************/
-/*N*/ const XPolygon& XLineStartItem::GetValue(const XLineEndTable* pTable) const
-/*N*/ {
-/*N*/ if (!IsIndex())
-/*N*/ return aXPolygon;
-/*N*/ else
-/*?*/ return pTable->Get(GetIndex())->GetLineEnd();
-/*N*/ }
+const XPolygon& XLineStartItem::GetValue() const
+{
+ //if (!IsIndex())
+ // return aXPolygon;
+ //else
+ // return pTable->Get(GetIndex())->GetLineEnd();
+ return aXPolygon;
+}
//------------------------------------------------------------------------
@@ -1454,17 +1454,18 @@ XubString aNameOrIndexEmptyString;
/*************************************************************************
|*
-|* const XPolygon& XLineEndItem::GetValue(const XLineEndTable* pTable) const
+|* const XPolygon& XLineEndItem::GetValue() const
|*
*************************************************************************/
-/*N*/ const XPolygon& XLineEndItem::GetValue(const XLineEndTable* pTable) const
-/*N*/ {
-/*N*/ if (!IsIndex())
-/*N*/ return aXPolygon;
-/*N*/ else
-/*?*/ return pTable->Get(GetIndex())->GetLineEnd();
-/*N*/ }
+const XPolygon& XLineEndItem::GetValue() const
+{
+ //if (!IsIndex())
+ // return aXPolygon;
+ //else
+ // return pTable->Get(GetIndex())->GetLineEnd();
+ return aXPolygon;
+}
/** this function searches in both the models pool and the styles pool for XLineStartItem
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
index 729a635..6a995fd 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
@@ -74,61 +74,6 @@ static char const aChckLEnd[] = { 0x04, 0x00, 'S','O','E','L'}; // < 5.2
static char const aChckLEnd0[] = { 0x04, 0x00, 'S','O','E','0'}; // = 5.2
static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
-/************************************************************************/
-
-/*N*/ XLineEndTable::~XLineEndTable()
-/*N*/ {
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XLineEndEntry* XLineEndTable::Replace(long nIndex, XLineEndEntry* pEntry )
-/*N*/ {
-/*N*/ return (XLineEndEntry*) XPropertyTable::Replace(nIndex, pEntry);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XLineEndEntry* XLineEndTable::Remove(long nIndex)
-/*N*/ {
-/*N*/ return (XLineEndEntry*) XPropertyTable::Remove(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XLineEndEntry* XLineEndTable::Get(long nIndex) const
-/*N*/ {
-/*N*/ return (XLineEndEntry*) XPropertyTable::Get(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XLineEndTable::Load()
-/*N*/ {
-/*N*/ return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XLineEndTable::Create()
-/*N*/ {
-/*N*/ return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/ )
-/*N*/ {
-/*N*/ return( NULL );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XLineEndTable::CreateBitmapsForUI()
-/*N*/ {
-/*N*/ return( FALSE );
-/*N*/ }
-
// --------------------
// class XLineEndList
// --------------------
diff --git a/binfilter/inc/bf_svx/svdmodel.hxx b/binfilter/inc/bf_svx/svdmodel.hxx
index 46661aa..802c094 100644
--- a/binfilter/inc/bf_svx/svdmodel.hxx
+++ b/binfilter/inc/bf_svx/svdmodel.hxx
@@ -99,7 +99,6 @@ class XDashTable;
class XGradientList;
class XHatchList;
class XLineEndList;
-class XLineEndTable;
class SvxForbiddenCharactersTable;
class SdrOutlinerCache;
diff --git a/binfilter/inc/bf_svx/xattr.hxx b/binfilter/inc/bf_svx/xattr.hxx
index dc40dca..5fd4d34 100644
--- a/binfilter/inc/bf_svx/xattr.hxx
+++ b/binfilter/inc/bf_svx/xattr.hxx
@@ -33,7 +33,6 @@ namespace binfilter {
class XColorTable;
class XDashTable;
-class XLineEndTable;
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/xit.hxx b/binfilter/inc/bf_svx/xit.hxx
index 5563ad1..fea7b5a 100644
--- a/binfilter/inc/bf_svx/xit.hxx
+++ b/binfilter/inc/bf_svx/xit.hxx
@@ -44,7 +44,6 @@ extern String aNameOrIndexEmptyString;
class XColorTable;
class XDashTable;
-class XLineEndTable;
class NameOrIndex;
class XPropertyList;
diff --git a/binfilter/inc/bf_svx/xlnedit.hxx b/binfilter/inc/bf_svx/xlnedit.hxx
index 1ecb2a3..255b0ca 100644
--- a/binfilter/inc/bf_svx/xlnedit.hxx
+++ b/binfilter/inc/bf_svx/xlnedit.hxx
@@ -59,7 +59,7 @@ public:
virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
- const XPolygon& GetValue(const XLineEndTable* pTable = 0) const;
+ const XPolygon& GetValue() const;
void SetValue(const XPolygon& rXPolygon) { aXPolygon = rXPolygon; Detach(); }
XLineEndItem* checkForUniqueItem( SdrModel* pModel ) const;
diff --git a/binfilter/inc/bf_svx/xlnstit.hxx b/binfilter/inc/bf_svx/xlnstit.hxx
index cc26dd1..3fb13f1 100644
--- a/binfilter/inc/bf_svx/xlnstit.hxx
+++ b/binfilter/inc/bf_svx/xlnstit.hxx
@@ -59,7 +59,7 @@ public:
virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
- const XPolygon& GetValue(const XLineEndTable* pTable = 0) const;
+ const XPolygon& GetValue() const;
void SetValue(const XPolygon& rXPolygon) { aXPolygon = rXPolygon; Detach(); }
XLineStartItem* checkForUniqueItem( SdrModel* pModel ) const;
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index d0056dd..765d614 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -317,30 +317,6 @@ public:
virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
};
-// --------------------
-// class XLineEndTable
-// --------------------
-
-class XLineEndTable : public XPropertyTable
-{
- XLineEndTable( const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- USHORT nInitSize = 16,
- USHORT nReSize = 16 );
-public:
- virtual ~XLineEndTable();
-
- XLineEndEntry* Replace(long nIndex, XLineEndEntry* pEntry );
- XLineEndEntry* Remove(long nIndex);
- XLineEndEntry* Get(long nIndex) const;
-
- virtual BOOL Load();
- virtual BOOL Save() {return false;}
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
-};
-
// -------------------
// class XLineEndList
// -------------------
More information about the Libreoffice-commits
mailing list