[Libreoffice-commits] .: 2 commits - svx/inc svx/source unusedcode.easy
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Aug 28 11:39:03 PDT 2011
svx/inc/svx/svdmodel.hxx | 1
svx/inc/svx/xattr.hxx | 1
svx/inc/svx/xit.hxx | 1
svx/inc/svx/xlnedit.hxx | 2
svx/inc/svx/xlnstit.hxx | 2
svx/inc/svx/xtable.hxx | 29 -------------
svx/source/xoutdev/xattr.cxx | 35 ++++++----------
svx/source/xoutdev/xtablend.cxx | 83 ----------------------------------------
unusedcode.easy | 5 --
9 files changed, 16 insertions(+), 143 deletions(-)
New commits:
commit c8ca15c1231049143fce09a3456c11cba0a7a31d
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Aug 28 11:13:14 2011 -0700
Remove class XLineEndTable from binfilter
diff --git a/unusedcode.easy b/unusedcode.easy
index fc99f8a..94c3179 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2335,8 +2335,6 @@ binfilter::XDashTable::Remove(long)
binfilter::XDashTable::Replace(long, binfilter::XDashEntry*)
binfilter::XLineEndList::Remove(long)
binfilter::XLineEndList::Replace(binfilter::XLineEndEntry*, long)
-binfilter::XLineEndTable::Remove(long)
-binfilter::XLineEndTable::Replace(long, binfilter::XLineEndEntry*)
binfilter::XMLFamilyDataList_Impl::GetPos(binfilter::XMLFamilyData_Impl const*) const
binfilter::XMLFamilyDataList_Impl::Remove(binfilter::XMLFamilyData_Impl*)
binfilter::XMLFontAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
commit 90fda2dc33b314a4b50af4c4673d5e315ee9ce7f
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Aug 28 10:59:43 2011 -0700
Remove class XLineEndTable
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index 5a2bfc1..d4a30a3 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -84,7 +84,6 @@ class XDashList;
class XGradientList;
class XHatchList;
class XLineEndList;
-class XLineEndTable;
class SvxForbiddenCharactersTable;
class SvNumberFormatter;
class SotStorage;
diff --git a/svx/inc/svx/xattr.hxx b/svx/inc/svx/xattr.hxx
index 6b09d52..97bfff4 100644
--- a/svx/inc/svx/xattr.hxx
+++ b/svx/inc/svx/xattr.hxx
@@ -29,7 +29,6 @@
#define _XATTR_HXX
class XColorTable;
-class XLineEndTable;
#include <svx/xit.hxx>
#include <svx/xcolit.hxx>
diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx
index 72cfac6..8824b90 100644
--- a/svx/inc/svx/xit.hxx
+++ b/svx/inc/svx/xit.hxx
@@ -36,7 +36,6 @@
/************************************************************************/
class XColorTable;
-class XLineEndTable;
class SfxItemPool;
class NameOrIndex;
class XPropertyList;
diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx
index e79cec3..7d7082b 100644
--- a/svx/inc/svx/xlnedit.hxx
+++ b/svx/inc/svx/xlnedit.hxx
@@ -64,7 +64,7 @@ public:
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- basegfx::B2DPolyPolygon GetLineEndValue(const XLineEndTable* pTable = 0) const;
+ basegfx::B2DPolyPolygon GetLineEndValue() const;
void SetLineEndValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); }
XLineEndItem* checkForUniqueItem( SdrModel* pModel ) const;
diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx
index 403629c..ad71ea9 100644
--- a/svx/inc/svx/xlnstit.hxx
+++ b/svx/inc/svx/xlnstit.hxx
@@ -64,7 +64,7 @@ public:
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- basegfx::B2DPolyPolygon GetLineStartValue(const XLineEndTable* pTable = 0) const;
+ basegfx::B2DPolyPolygon GetLineStartValue() const;
void SetLineStartValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); }
XLineStartItem* checkForUniqueItem( SdrModel* pModel ) const;
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index bedbcb6..c1819af 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -325,35 +325,6 @@ public:
static XColorTable& GetStdColorTable();
};
-// --------------------
-// class XLineEndTable
-// --------------------
-
-class XLineEndTable : public XPropertyTable
-{
-public:
- explicit XLineEndTable(
- const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- sal_uInt16 nInitSize = 16,
- sal_uInt16 nReSize = 16
- );
- virtual ~XLineEndTable();
-
- using XPropertyTable::Replace;
- XLineEndEntry* Replace(long nIndex, XLineEndEntry* pEntry );
- using XPropertyTable::Remove;
- XLineEndEntry* Remove(long nIndex);
- using XPropertyTable::Get;
- XLineEndEntry* GetLineEnd(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 XLineEndList
// -------------------
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 3df1140..afe1ecc 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1706,21 +1706,17 @@ SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
/*************************************************************************
|*
-|* const basegfx::B2DPolyPolygon& XLineStartItem::GetValue(const XLineEndTable* pTable)
-|* const
+|* const basegfx::B2DPolyPolygon& XLineStartItem::GetValue() const
|*
*************************************************************************/
-basegfx::B2DPolyPolygon XLineStartItem::GetLineStartValue(const XLineEndTable* pTable) const
+basegfx::B2DPolyPolygon XLineStartItem::GetLineStartValue() const
{
- if (!IsIndex())
- {
- return maPolyPolygon;
- }
- else
- {
- return pTable->GetLineEnd(GetIndex())->GetLineEnd();
- }
+ //if (!IsIndex())
+ // return maPolyPolygon;
+ //else
+ // return pTable->GetLineEnd(GetIndex())->GetLineEnd();
+ return maPolyPolygon;
}
//------------------------------------------------------------------------
@@ -2142,20 +2138,17 @@ SvStream& XLineEndItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
/*************************************************************************
|*
-|* const basegfx::B2DPolyPolygon& XLineEndItem::GetValue(const XLineEndTable* pTable) const
+|* const basegfx::B2DPolyPolygon& XLineEndItem::GetValue() const
|*
*************************************************************************/
-basegfx::B2DPolyPolygon XLineEndItem::GetLineEndValue(const XLineEndTable* pTable) const
+basegfx::B2DPolyPolygon XLineEndItem::GetLineEndValue() const
{
- if (!IsIndex())
- {
- return maPolyPolygon;
- }
- else
- {
- return pTable->GetLineEnd(GetIndex())->GetLineEnd();
- }
+ //if (!IsIndex())
+ // return maPolyPolygon;
+ //else
+ // return pTable->GetLineEnd(GetIndex())->GetLineEnd();
+ return maPolyPolygon;
}
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index dab030c..ebd95ef 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -81,89 +81,6 @@ static char const aChckLEnd0[] = { 0x04, 0x00, 'S','O','E','0'}; // = 5.2
static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
// --------------------
-// class XLineEndTable
-// --------------------
-
-/*************************************************************************
-|*
-|* XLineEndTable::XLineEndTable()
-|*
-*************************************************************************/
-
-XLineEndTable::XLineEndTable(
- const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 nInitSize,
- sal_uInt16 nReSize
-)
- : XPropertyTable( rPath, pInPool, nInitSize, nReSize)
-{
- pBmpTable = new Table( nInitSize, nReSize );
-}
-
-/************************************************************************/
-
-XLineEndTable::~XLineEndTable()
-{
-}
-
-/************************************************************************/
-
-XLineEndEntry* XLineEndTable::Replace(long nIndex, XLineEndEntry* pEntry )
-{
- return (XLineEndEntry*) XPropertyTable::Replace(nIndex, pEntry);
-}
-
-/************************************************************************/
-
-XLineEndEntry* XLineEndTable::Remove(long nIndex)
-{
- return (XLineEndEntry*) XPropertyTable::Remove(nIndex);
-}
-
-/************************************************************************/
-
-XLineEndEntry* XLineEndTable::GetLineEnd(long nIndex) const
-{
- return (XLineEndEntry*) XPropertyTable::Get(nIndex, 0);
-}
-
-/************************************************************************/
-
-sal_Bool XLineEndTable::Load()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XLineEndTable::Save()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XLineEndTable::Create()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
-{
- return( NULL );
-}
-
-/************************************************************************/
-
-sal_Bool XLineEndTable::CreateBitmapsForUI()
-{
- return( sal_False );
-}
-
-// --------------------
// class XLineEndList
// --------------------
diff --git a/unusedcode.easy b/unusedcode.easy
index a6629cb..fc99f8a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1682,9 +1682,6 @@ XLineDashItem::XLineDashItem(SfxItemPool*)
XLineDashItem::XLineDashItem(int, XDash const&)
XLineEndItem::XLineEndItem(SfxItemPool*)
XLineEndList::Replace(XLineEndEntry*, long)
-XLineEndTable::Remove(long)
-XLineEndTable::Replace(long, XLineEndEntry*)
-XLineEndTable::XLineEndTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
XLineStartItem::XLineStartItem(SfxItemPool*)
XMLAutoTextEventExport::XMLAutoTextEventExport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> const&, unsigned short)
XMLElement::Equals(rtl::OUString)
More information about the Libreoffice-commits
mailing list