re-factor and cleanup load and save code for lists, killing copy & paste

'return' is not a function, GLOBALOVERFLOW is superstition, bin unused &
obsolete static character arrays, prune unused includes, remove bogus
comments.

1 files changed, 9 insertions, 76 deletions

diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index ebd95efbadde..6ffc62260e2d 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -31,14 +31,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <com/sun/star/container/XNameContainer.hpp>
 #include "svx/XPropertyTable.hxx"
-#include <unotools/ucbstreamhelper.hxx>
-
-#include "xmlxtexp.hxx"
-#include "xmlxtimp.hxx"
-
-#include <tools/urlobj.hxx>
 #include <vcl/virdev.hxx>
 
 #include <vcl/svapp.hxx>
@@ -68,22 +61,8 @@
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 
-#define GLOBALOVERFLOW
-
 using namespace com::sun::star;
 
-using ::rtl::OUString;
-
-sal_Unicode const pszExtLineEnd[]   = {'s','o','e'};
-
-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
-
-// --------------------
-// class XLineEndList
-// --------------------
-
 class impXLineEndList
 {
 private:
@@ -160,19 +139,16 @@ void XLineEndList::impCreate()
 
 void XLineEndList::impDestroy()
 {
-    if(mpData)
-    {
-        delete mpData;
-        mpData = 0;
-    }
+    delete mpData;
+    mpData = NULL;
 }
 
 XLineEndList::XLineEndList(
     const String& rPath,
     XOutdevItemPool* _pXPool
 )
-    : XPropertyList( rPath, _pXPool )
-    , mpData(0)
+    : XPropertyList( "soe", rPath, _pXPool )
+    , mpData(NULL)
 {
     pBmpList = new BitmapList_impl();
 }
@@ -197,48 +173,10 @@ XLineEndEntry* XLineEndList::GetLineEnd(long nIndex) const
     return (XLineEndEntry*) XPropertyList::Get(nIndex, 0);
 }
 
-sal_Bool XLineEndList::Load()
-{
-    if( bListDirty )
-    {
-        bListDirty = sal_False;
-
-        INetURLObject aURL( aPath );
-
-        if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
-        {
-            DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return sal_False;
-        }
-
-        aURL.Append( aName );
-
-        if( !aURL.getExtension().getLength() )
-            aURL.setExtension( rtl::OUString( pszExtLineEnd, 3 ) );
-
-        uno::Reference< container::XNameContainer > xTable( SvxUnoXLineEndTable_createInstance( this ), uno::UNO_QUERY );
-        return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
-    }
-    return( sal_False );
-}
-
-sal_Bool XLineEndList::Save()
+uno::Reference< container::XNameContainer > XLineEndList::createInstance()
 {
-    INetURLObject aURL( aPath );
-
-    if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
-    {
-        DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return sal_False;
-    }
-
-    aURL.Append( aName );
-
-    if( !aURL.getExtension().getLength() )
-        aURL.setExtension( rtl::OUString( pszExtLineEnd, 3 ) );
-
-    uno::Reference< container::XNameContainer > xTable( SvxUnoXLineEndTable_createInstance( this ), uno::UNO_QUERY );
-    return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
+    return uno::Reference< container::XNameContainer >(
+        SvxUnoXLineEndTable_createInstance( this ), uno::UNO_QUERY );
 }
 
 sal_Bool XLineEndList::Create()
@@ -261,7 +199,7 @@ sal_Bool XLineEndList::Create()
     basegfx::B2DPolygon aCircle(basegfx::tools::createPolygonFromCircle(basegfx::B2DPoint(0.0, 0.0), 100.0));
     Insert( new XLineEndEntry( basegfx::B2DPolyPolygon(aCircle), SVX_RESSTR( RID_SVXSTR_CIRCLE ) ) );
 
-    return( sal_True );
+    return sal_True;
 }
 
 sal_Bool XLineEndList::CreateBitmapsForUI()
@@ -285,7 +223,7 @@ sal_Bool XLineEndList::CreateBitmapsForUI()
 
     impDestroy();
 
-    return( sal_True );
+    return sal_True;
 }
 
 Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
@@ -310,14 +248,9 @@ Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
     Bitmap* pBitmap = new Bitmap(pVD->GetBitmap(aZero, pVD->GetOutputSize()));
 
     if(bDelete)
-    {
         impDestroy();
-    }
 
     return pBitmap;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */