binfilter/bf_sch/source/core/sch_axisid.cxx | 7 - binfilter/bf_sch/source/core/sch_datapoin.cxx | 18 --- binfilter/bf_sch/source/core/sch_datarow.cxx | 11 -- binfilter/bf_sch/source/core/sch_memchrt.cxx | 24 ---- binfilter/bf_sch/source/core/sch_objadj.cxx | 13 -- binfilter/bf_sch/source/core/sch_objfac.cxx | 2 binfilter/bf_sch/source/core/sch_objid.cxx | 18 --- binfilter/bf_sch/source/ui/app/sch_schdll.cxx | 133 -------------------------- binfilter/bf_sch/util/bf_sch.map | 16 --- binfilter/inc/bf_sch/datapoin.hxx | 2 binfilter/inc/bf_sch/datarow.hxx | 2 binfilter/inc/bf_sch/objadj.hxx | 2 binfilter/inc/bf_sch/objid.hxx | 2 binfilter/inc/bf_sch/schdll.hxx | 6 - binfilter/inc/bf_svx/svdobj.hxx | 2 15 files changed, 9 insertions(+), 249 deletions(-)
New commits: commit 4a8c673c912bdb38f2d17325aa1f4d078da47cc0 Author: Joseph Powers <jpower...@cox.net> Date: Tue Oct 4 20:28:09 2011 -0700 The last of the easy DBG_BF_ASSERT from bf_sch diff --git a/binfilter/bf_sch/source/core/sch_axisid.cxx b/binfilter/bf_sch/source/core/sch_axisid.cxx index 2ef3a1e..dc31350 100644 --- a/binfilter/bf_sch/source/core/sch_axisid.cxx +++ b/binfilter/bf_sch/source/core/sch_axisid.cxx @@ -34,13 +34,6 @@ #include "glob.hxx" #include <tools/debug.hxx> namespace binfilter { -/************************************************************************* -|* -|* Objekt-Id ermitteln; -|* Liefert -1, wenn das Objekt keine Id hat -|* -\************************************************************************/ - /************************************************************************* |* diff --git a/binfilter/bf_sch/source/core/sch_datapoin.cxx b/binfilter/bf_sch/source/core/sch_datapoin.cxx index 2ef40b1..dd2bf9b 100644 --- a/binfilter/bf_sch/source/core/sch_datapoin.cxx +++ b/binfilter/bf_sch/source/core/sch_datapoin.cxx @@ -114,24 +114,6 @@ namespace binfilter { /************************************************************************* |* -|* Kopier-Konstruktor -|* -\************************************************************************/ - - -/************************************************************************* -|* -|* Kopie erzeugen -|* -\************************************************************************/ - -/*N*/ SdrObjUserData* SchDataPoint::Clone(SdrObject *) const -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL; -/*N*/ } - -/************************************************************************* -|* |* Daten aus Stream lesen |* \************************************************************************/ diff --git a/binfilter/bf_sch/source/core/sch_datarow.cxx b/binfilter/bf_sch/source/core/sch_datarow.cxx index bc59592..c9fc08e 100644 --- a/binfilter/bf_sch/source/core/sch_datarow.cxx +++ b/binfilter/bf_sch/source/core/sch_datarow.cxx @@ -110,17 +110,6 @@ namespace binfilter { /************************************************************************* |* -|* Kopie erzeugen -|* -\************************************************************************/ - -/*N*/ SdrObjUserData* SchDataRow::Clone(SdrObject *) const -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL; -/*N*/ } - -/************************************************************************* -|* |* Daten aus Stream lesen |* \************************************************************************/ diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx b/binfilter/bf_sch/source/core/sch_memchrt.cxx index bf5e151..2e620b1 100644 --- a/binfilter/bf_sch/source/core/sch_memchrt.cxx +++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx @@ -26,13 +26,6 @@ * ************************************************************************/ -#ifndef _STREAM_HXX -// enable stream operators >>/<< for UniString (8 Bit !) -//#ifndef ENABLE_STRING_STREAM_OPERATORS -//#define ENABLE_STRING_STREAM_OPERATORS -//#endif -#endif - #ifndef _ZFORLIST_HXX //autogen #ifndef _ZFORLIST_DECLARE_TABLE #define _ZFORLIST_DECLARE_TABLE @@ -586,12 +579,6 @@ namespace binfilter { /*N*/ return rIn; /*N*/ } -/************************************************************************* -|* -|* QuickSort ueber Spalten -|* -\************************************************************************/ - /************************************************************************* |* @@ -610,12 +597,6 @@ namespace binfilter { /*N*/ pRowNumFmtId[i]=-1; /*N*/ } -/************************************************************************* -|* -|* QuickSort ueber Spalten -|* -\************************************************************************/ - /************************************************************************* |* @@ -914,10 +895,7 @@ using namespace ::com::sun::star; /*?*/ bool bNeedsQuoting = bNeedsEscaping || ( aIter->msTableName.indexOf( aSpace ) > -1 ); /*?*/ /*?*/ // quote table name if it contains spaces or quotes -/*?*/ if( bNeedsQuoting ) -/*?*/ {DBG_BF_ASSERT(0, "STRIP"); -/*?*/ } -/*?*/ else +/*?*/ if( !bNeedsQuoting ) /*?*/ aBuffer.append( aIter->msTableName ); /*?*/ } /*?*/ getXMLStringForCellAddress( aIter->maUpperLeft, &aBuffer ); diff --git a/binfilter/bf_sch/source/core/sch_objadj.cxx b/binfilter/bf_sch/source/core/sch_objadj.cxx index b19a523..03e28ab 100644 --- a/binfilter/bf_sch/source/core/sch_objadj.cxx +++ b/binfilter/bf_sch/source/core/sch_objadj.cxx @@ -38,8 +38,6 @@ namespace binfilter { - - /************************************************************************* |* |* Objekt-Ausrichting ermitteln @@ -87,17 +85,6 @@ namespace binfilter { /************************************************************************* |* -|* Kopie erzeugen -|* -\************************************************************************/ - -/*N*/ SdrObjUserData* SchObjectAdjust::Clone(SdrObject *) const -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL; -/*N*/ } - -/************************************************************************* -|* |* Daten aus Stream lesen |* \************************************************************************/ diff --git a/binfilter/bf_sch/source/core/sch_objfac.cxx b/binfilter/bf_sch/source/core/sch_objfac.cxx index 52e4b87..346b454 100644 --- a/binfilter/bf_sch/source/core/sch_objfac.cxx +++ b/binfilter/bf_sch/source/core/sch_objfac.cxx @@ -38,6 +38,7 @@ #include "datarow.hxx" #include "datapoin.hxx" #include "glob.hxx" + namespace binfilter { @@ -95,7 +96,6 @@ namespace binfilter { /*N*/ break; /*N*/ /*N*/ case SCH_LIGHTFACTOR_ID: -/*?*/ {DBG_BF_ASSERT(0, "STRIP");} /*?*/ OSL_FAIL("SCH_LIGHTFACTOR_ID no longer available"); /*?*/ break; /*N*/ diff --git a/binfilter/bf_sch/source/core/sch_objid.cxx b/binfilter/bf_sch/source/core/sch_objid.cxx index 82cdd9c..fed3e9a 100644 --- a/binfilter/bf_sch/source/core/sch_objid.cxx +++ b/binfilter/bf_sch/source/core/sch_objid.cxx @@ -36,7 +36,9 @@ #include "defines.hxx" #include <tools/debug.hxx> + namespace binfilter { + /************************************************************************* |* |* Objekt-Id ermitteln; @@ -89,11 +91,6 @@ namespace binfilter { /************************************************************************* |* -|* Alle Objekt mit Id=nObjId Attributieren, -|* -\************************************************************************/ -/************************************************************************* -|* |* Konstruktor |* \************************************************************************/ @@ -118,17 +115,6 @@ namespace binfilter { /************************************************************************* |* -|* Kopie erzeugen -|* -\************************************************************************/ - -/*N*/ SdrObjUserData* SchObjectId::Clone(SdrObject *) const -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL; -/*N*/ } - -/************************************************************************* -|* |* Daten aus Stream lesen |* \************************************************************************/ diff --git a/binfilter/bf_sch/source/ui/app/sch_schdll.cxx b/binfilter/bf_sch/source/ui/app/sch_schdll.cxx index 7ea2183..7775f2c 100644 --- a/binfilter/bf_sch/source/ui/app/sch_schdll.cxx +++ b/binfilter/bf_sch/source/ui/app/sch_schdll.cxx @@ -82,10 +82,6 @@ namespace binfilter { /*N*/ } -/*N*/ extern_c void __LOADONCALLAPI SchSetTransparent( SvInPlaceObjectRef, BOOL ) -/*N*/ {DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } - /************************************************************************* |* |* @@ -135,39 +131,6 @@ namespace binfilter { |* \************************************************************************/ -/*N*/ extern_c void __LOADONCALLAPI SchUpdateAttr( SvInPlaceObjectRef aIPObj, -/*N*/ SchMemChart* pData, -/*N*/ const SfxItemSet& rAttr, -/*N*/ OutputDevice* pOut ) -/*N*/ { -/*N*/ DBG_ASSERT(pData, "Kein Chart-Datenobjekt angegeben!"); -/*N*/ if(!pData)return; -/*N*/ -/*N*/ SchChartDocShellRef aSchChartDocShellRef = &aIPObj; -/*N*/ -/*N*/ if (aSchChartDocShellRef.Is()) -/*N*/ { -/*N*/ -/*N*/ ChartModel& rDoc = aSchChartDocShellRef->GetDoc(); -/*N*/ -/*N*/ rDoc.SetChartData(*new SchMemChart(*pData)); -/*N*/ rDoc.PutAttr(rAttr); -/*N*/ -/*N*/ if( pOut ) -/*N*/ {DBG_BF_ASSERT(0, "STRIP");} -/*N*/ else -/*N*/ rDoc.BuildChart(TRUE); -/*N*/ } -/*N*/ -/*N*/ aIPObj->SendViewChanged(); -/*N*/ } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - /*N*/ extern_c SchMemChart* __LOADONCALLAPI SchGetChartData (SvInPlaceObjectRef aIPObj) /*N*/ { /*N*/ SchChartDocShellRef aSchChartDocShellRef = &aIPObj; @@ -197,107 +160,11 @@ namespace binfilter { |* \************************************************************************/ -/*N*/ extern_c SchMemChart* __LOADONCALLAPI SchNewMemChartNone () -/*N*/ { -/*N*/ DBG_BF_ASSERT(0, "STRIP");return NULL; -/*N*/ } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - /*N*/ extern_c SchMemChart* __LOADONCALLAPI SchNewMemChartXY (short nCols, short nRows) /*N*/ { /*N*/ return new SchMemChart (nCols, nRows); /*N*/ } -/************************************************************************* -|* -|* -|* -\************************************************************************/ - -/*N*/ extern_c SchMemChart* __LOADONCALLAPI SchNewMemChartCopy (const SchMemChart &) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL; -/*N*/ } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - -/*N*/ extern_c ChartModel* __LOADONCALLAPI SchGetModel (SvInPlaceObjectRef) -/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0; -/*N*/ } - -/*N*/ extern_c void __LOADONCALLAPI SchGetDefaultForColumnText( -/*N*/ const SchMemChart& rMemChart, sal_Int32 nCol, String& aResult ) -/*N*/ { -/*N*/ aResult = rMemChart.GetDefaultColumnText( nCol ); -/*N*/ } - -/*N*/ extern_c void __LOADONCALLAPI SchGetDefaultForRowText( -/*N*/ const SchMemChart& rMemChart, sal_Int32 nRow, String& aResult ) -/*N*/ { -/*N*/ aResult = rMemChart.GetDefaultRowText( nRow ); -/*N*/ } - -/*N*/ extern_c void __LOADONCALLAPI SchConvertChartRangeForWriter( -/*N*/ SchMemChart& rMemChart, BOOL bOldToNew ) -/*N*/ { -/*N*/ rMemChart.ConvertChartRangeForWriter( bOldToNew ); -/*N*/ } - -/*N*/ extern_c void __LOADONCALLAPI SchConvertChartRangeForCalc( SchMemChart&, BOOL ) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } - -/*N*/ extern_c void __LOADONCALLAPI SchMemChartResetTranslation( SchMemChart&, long *,long ) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } - -/*N*/ extern_c void __LOADONCALLAPI SchMemChartUpdateTranslation( SchMemChart&, long *, long ) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } - -/*N*/ extern_c void __LOADONCALLAPI SchMemChartInsertCols( SchMemChart& rMemChart, -/*N*/ short nAtCol, short nCount) -/*N*/ { -/*N*/ rMemChart.InsertCols( nAtCol, nCount ); -/*N*/ } - -/*N*/ extern_c void __LOADONCALLAPI SchMemChartRemoveCols( SchMemChart&, short, short) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } - -/*N*/ extern_c void __LOADONCALLAPI SchMemChartInsertRows( SchMemChart& rMemChart, short nAtRow, short nCount) -/*N*/ { -/*N*/ rMemChart.InsertRows( nAtRow, nCount ); -/*N*/ } - -/*N*/ extern_c void __LOADONCALLAPI SchMemChartRemoveRows( SchMemChart&, short, short) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } - -/*N*/ extern_c void __LOADONCALLAPI SchMemChartSwapCols( SchMemChart&, int, int) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } - -/*N*/ extern_c void __LOADONCALLAPI SchMemChartSwapRows( SchMemChart&, int, int ) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/bf_sch/util/bf_sch.map b/binfilter/bf_sch/util/bf_sch.map index 9332bde..97aa5da 100644 --- a/binfilter/bf_sch/util/bf_sch.map +++ b/binfilter/bf_sch/util/bf_sch.map @@ -5,24 +5,8 @@ UDK_3_0_0 { InitSchDll; DeInitSchDll; SchUpdate; - SchUpdateAttr; SchGetChartData; - SchNewMemChartNone; SchNewMemChartXY; - SchNewMemChartCopy; - SchSetTransparent; - SchGetDefaultForColumnText; - SchGetDefaultForRowText; - SchMemChartInsertCols; - SchMemChartRemoveCols; - SchMemChartInsertRows; - SchMemChartRemoveRows; - SchMemChartSwapCols; - SchMemChartSwapRows; - SchConvertChartRangeForWriter; - SchConvertChartRangeForCalc; - SchMemChartResetTranslation; - SchMemChartUpdateTranslation; component_getFactory; local: *; diff --git a/binfilter/inc/bf_sch/datapoin.hxx b/binfilter/inc/bf_sch/datapoin.hxx index a439090..742f0b6 100644 --- a/binfilter/inc/bf_sch/datapoin.hxx +++ b/binfilter/inc/bf_sch/datapoin.hxx @@ -48,7 +48,7 @@ public: SchDataPoint(); SchDataPoint(short nC, short nR); - virtual SdrObjUserData* Clone(SdrObject *pObj) const; + virtual SdrObjUserData* Clone(SdrObject *pObj) const { return NULL; } // DBG_BF_ASSERT virtual void WriteData(SvStream& ) {} virtual void ReadData(SvStream& rIn); diff --git a/binfilter/inc/bf_sch/datarow.hxx b/binfilter/inc/bf_sch/datarow.hxx index b2b25b8..f55d074 100644 --- a/binfilter/inc/bf_sch/datarow.hxx +++ b/binfilter/inc/bf_sch/datarow.hxx @@ -47,7 +47,7 @@ public: SchDataRow(); SchDataRow(short nR); - virtual SdrObjUserData* Clone(SdrObject *pObj) const; + virtual SdrObjUserData* Clone(SdrObject *pObj) const { return NULL; } // DBG_BF_ASSERT virtual void WriteData(SvStream& ) {} virtual void ReadData(SvStream& rIn); diff --git a/binfilter/inc/bf_sch/objadj.hxx b/binfilter/inc/bf_sch/objadj.hxx index c99f80c..2469fee 100644 --- a/binfilter/inc/bf_sch/objadj.hxx +++ b/binfilter/inc/bf_sch/objadj.hxx @@ -52,7 +52,7 @@ public: SchObjectAdjust(); SchObjectAdjust(ChartAdjust eAdj, SvxChartTextOrient eOr); - virtual SdrObjUserData* Clone(SdrObject *pObj) const; + virtual SdrObjUserData* Clone(SdrObject *pObj) const { return NULL; } // DBG_BF_ASSERT virtual void WriteData(SvStream& ) {} virtual void ReadData(SvStream& rIn); diff --git a/binfilter/inc/bf_sch/objid.hxx b/binfilter/inc/bf_sch/objid.hxx index f54091a..6a421e3 100644 --- a/binfilter/inc/bf_sch/objid.hxx +++ b/binfilter/inc/bf_sch/objid.hxx @@ -49,7 +49,7 @@ public: SchObjectId(); SchObjectId(UINT16 nId); - virtual SdrObjUserData* Clone(SdrObject *pObj) const; + virtual SdrObjUserData* Clone(SdrObject *pObj) const { return NULL; } // DBG_BF_ASSERT virtual void WriteData(SvStream& ) {} virtual void ReadData(SvStream& rIn); diff --git a/binfilter/inc/bf_sch/schdll.hxx b/binfilter/inc/bf_sch/schdll.hxx index 30d3592..7e84121 100644 --- a/binfilter/inc/bf_sch/schdll.hxx +++ b/binfilter/inc/bf_sch/schdll.hxx @@ -95,15 +95,9 @@ public: -------------------------------------------------------------------------*/ extern_c void __LOADONCALLAPI SchUpdate( SvInPlaceObjectRef aIPObj, SchMemChart* pData, OutputDevice* pOut = NULL ); -extern_c void __LOADONCALLAPI SchUpdateAttr( SvInPlaceObjectRef aIPObj, SchMemChart* pData, - const SfxItemSet& rAttr, OutputDevice* pOut = NULL ); extern_c SchMemChart* __LOADONCALLAPI SchGetChartData( SvInPlaceObjectRef aIPObj ); -extern_c SchMemChart* __LOADONCALLAPI SchNewMemChartNone(); extern_c SchMemChart* __LOADONCALLAPI SchNewMemChartXY( short nCols, short nRows ); -extern_c SchMemChart* __LOADONCALLAPI SchNewMemChartCopy( const SchMemChart &rMemChart ); extern_c void __LOADONCALLAPI SetTransparentBackground( SvInPlaceObjectRef aIPObj, BOOL bTransp = TRUE ); -extern_c void __LOADONCALLAPI SchGetDefaultForColumnText( const SchMemChart& rMemChart, sal_Int32 nCol, String& aResult ); -extern_c void __LOADONCALLAPI SchGetDefaultForRowText( const SchMemChart& rMemChart, sal_Int32 nRow, String& aResult ); } //namespace binfilter #endif // _SCH_DLL_HXX diff --git a/binfilter/inc/bf_svx/svdobj.hxx b/binfilter/inc/bf_svx/svdobj.hxx index a672ff6..9ffe8a3 100644 --- a/binfilter/inc/bf_svx/svdobj.hxx +++ b/binfilter/inc/bf_svx/svdobj.hxx @@ -224,7 +224,7 @@ public: {} virtual ~SdrObjUserData(); - virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0 + virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; UINT32 GetInventor() const { return nInventor; } UINT16 GetId() const { return nIdentifier; } virtual void WriteData(SvStream& ) {} _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits