diff options
author | Justin Malcolm <malcolm.justin@gmail.com> | 2010-09-29 14:14:15 -0400 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2010-09-29 14:14:15 -0400 |
commit | 31018e35b1984aad1f01a389b1fd3428d52acf6e (patch) | |
tree | 80c65287ee3064cb5208daa0d78f1d97bc37c6ce | |
parent | da4c41c60b8224888486111c1bc01c813ff670c5 (diff) |
I think that this eliminates the remaining //UNUSED comments
There were still some of these comments (actually, a lot of them).
The most recent attachment should get rid of the last of them.
(fd#30442)
69 files changed, 0 insertions, 856 deletions
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index c8bd4c330677..3d52a50dceb9 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -171,9 +171,6 @@ public: BOOL IsEmpty() const; -//UNUSED2008-05 SCROW GetFirstEntryPos() const; -//UNUSED2008-05 SCROW GetLastEntryPos( BOOL bIncludeBottom ) const; - BOOL GetFirstVisibleAttr( SCROW& rFirstRow ) const; BOOL GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const; BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; @@ -192,8 +189,6 @@ public: INT16 nStripFlags = 0 ); void DeleteHardAttr( SCROW nStartRow, SCROW nEndRow ); - -//UNUSED2008-05 void ConvertFontsAfterLoad(); // old binary file format }; diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 96a0529c48a1..67ac37bdc945 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -231,7 +231,6 @@ public: inline ScTableListItem( const USHORT nWhich ); ScTableListItem( const ScTableListItem& rCpy ); -//UNUSED2008-05 ScTableListItem( const USHORT nWhich, const List& rList ); ~ScTableListItem(); ScTableListItem& operator=( const ScTableListItem &rCpy ); @@ -245,9 +244,6 @@ public: const IntlWrapper* pIntl = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; -//UNUSED2009-05 BOOL GetTableList( List& aList ) const; -//UNUSED2009-05 void SetTableList( const List& aList ); - public: USHORT nCount; SCTAB* pTabArr; diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index 84ffd2e877e2..196d2a8eae39 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -97,8 +97,6 @@ public: return ppRowHeader[ nChartRow ]; return NULL; } -//UNUSED2009-05 ScRangeListRef GetColRanges( SCCOL nChartCol ) const; -//UNUSED2009-05 ScRangeListRef GetRowRanges( SCROW nChartRow ) const; }; diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx index 167ab5929c6a..f2305ed9c7cd 100644 --- a/sc/inc/collect.hxx +++ b/sc/inc/collect.hxx @@ -155,9 +155,6 @@ public: nValue(nVal), nStrType(nType) {} -//UNUSED2008-05 TypedStrData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, -//UNUSED2008-05 BOOL bAllStrings ); - TypedStrData( const TypedStrData& rCpy ) : ScDataObject(), aStrValue(rCpy.aStrValue), diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 668d64bb4289..f22654710189 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -141,8 +141,6 @@ public: void SwapRow( SCROW nRow1, SCROW nRow2 ); void SwapCell( SCROW nRow, ScColumn& rCol); -//UNUSED2009-05 BOOL HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, -//UNUSED2009-05 BOOL bLeft, BOOL bRight ) const; bool HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, @@ -254,7 +252,6 @@ public: BOOL HasStringData( SCROW nRow ) const; BOOL HasValueData( SCROW nRow ) const; -//UNUSED2009-05 USHORT GetErrorData( SCROW nRow) const; BOOL HasStringCells( SCROW nStartRow, SCROW nEndRow ) const; /** Returns the pointer to a cell note object at the passed row. */ @@ -377,8 +374,6 @@ public: void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates); BOOL GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); -//UNUSED2008-05 SCROW NoteCount( SCROW nMaxRow = MAXROW ) const; - void UpdateInsertTabAbs(SCTAB nNewPos); BOOL TestTabRefAbs(SCTAB nTable); BOOL GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& rData) const; @@ -403,7 +398,6 @@ public: private: ScBaseCell* CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestDoc, const ScAddress& rDestPos); -//UNUSED2008-05 void CorrectSymbolCells( CharSet eStreamCharSet ); }; diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 7d045db3c2aa..a19f7c5d2c5c 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -186,12 +186,8 @@ public: void SetSingleReference( const ScSingleRefData& rRef ); void SetDoubleReference( const ScComplexRefData& rRef ); void SetDouble( double fVal ); -//UNUSED2008-05 void SetInt( int nVal ); -//UNUSED2008-05 void SetMatrix( ScMatrix* p ); // These methods are ok to use, reference count not cleared. -//UNUSED2008-05 ScComplexRefData& GetReference(); -//UNUSED2008-05 void SetReference( ScComplexRefData& rRef ); void SetName( USHORT n ); void SetExternalSingleRef( sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef ); void SetExternalDoubleRef( sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef ); diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx index 5e61b63500e6..6b57a422c140 100644 --- a/sc/inc/dbcolect.hxx +++ b/sc/inc/dbcolect.hxx @@ -157,8 +157,6 @@ public: BOOL IsStripData() const { return bStripData; } void SetStripData(BOOL bSet) { bStripData = bSet; } -//UNUSED2008-05 BOOL IsBeyond(SCROW nMaxRow) const; - String GetSourceString() const; String GetOperations() const; diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index d995550a2f1d..c36899a41208 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -108,10 +108,6 @@ private: BOOL GetThis(double& rValue, USHORT& rErr); public: -//UNUSED2008-05 ScValueIterator(ScDocument* pDocument, -//UNUSED2008-05 SCCOL nSCol, SCROW nSRow, SCTAB nSTab, -//UNUSED2008-05 SCCOL nECol, SCROW nERow, SCTAB nETab, -//UNUSED2008-05 BOOL bSTotal = FALSE, BOOL bTextAsZero = FALSE); ScValueIterator(ScDocument* pDocument, const ScRange& rRange, BOOL bSTotal = FALSE, diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index c9f06a9e5a35..d9efdf01d0e5 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -207,7 +207,6 @@ class SC_DLLPUBLIC ScTpCalcItem : public SfxPoolItem { public: TYPEINFO(); -//UNUSED2008-05 ScTpCalcItem( USHORT nWhich ); ScTpCalcItem( USHORT nWhich, const ScDocOptions& rOpt ); ScTpCalcItem( const ScTpCalcItem& rItem ); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 42928b56160a..0b66a0c18b9f 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -507,8 +507,6 @@ public: BOOL bStartOnly = FALSE) const; ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; -//UNUSED2008-05 ScRangeData* GetRangeAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, -//UNUSED2008-05 BOOL bStartOnly = FALSE) const; SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& rBlock, String* pName=NULL ) const; SC_DLLPUBLIC ScDPCollection* GetDPCollection(); @@ -765,8 +763,6 @@ public: BOOL HasSubTotalCells( const ScRange& rRange ); SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, BOOL bForceTab = FALSE ); -//UNUSED2009-05 SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, -//UNUSED2009-05 ULONG nFormatIndex, BOOL bForceTab = FALSE); SC_DLLPUBLIC void PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, BOOL bForceTab = FALSE ); SC_DLLPUBLIC void PutCell(SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, @@ -810,8 +806,6 @@ public: SC_DLLPUBLIC void GetCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ) const; SC_DLLPUBLIC ScBaseCell* GetCell( const ScAddress& rPos ) const; -//UNUSED2008-05 void RefreshNoteFlags(); - SC_DLLPUBLIC BOOL HasData( SCCOL nCol, SCROW nRow, SCTAB nTab ); SC_DLLPUBLIC BOOL HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC BOOL HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; @@ -1439,8 +1433,6 @@ public: SC_DLLPUBLIC void ClearPrintRanges( SCTAB nTab ); /** Adds a new print ranges. */ SC_DLLPUBLIC void AddPrintRange( SCTAB nTab, const ScRange& rNew ); -//UNUSED2009-05 /** Removes all old print ranges and sets the passed print ranges. */ -//UNUSED2009-05 void SetPrintRange( SCTAB nTab, const ScRange& rNew ); /** Marks the specified sheet to be printed completely. Deletes old print ranges on the sheet! */ SC_DLLPUBLIC void SetPrintEntireSheet( SCTAB nTab ); SC_DLLPUBLIC void SetRepeatColRange( SCTAB nTab, const ScRange* pNew ); @@ -1779,7 +1771,6 @@ public: SC_DLLPUBLIC SfxItemPool* GetEnginePool() const; SC_DLLPUBLIC ScFieldEditEngine& GetEditEngine(); SC_DLLPUBLIC ScNoteEditEngine& GetNoteEngine(); -//UNUSED2009-05 SfxItemPool& GetNoteItemPool(); ScRefreshTimerControl* GetRefreshTimerControl() const { return pRefreshTimerControl; } diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 14c9515dfacb..c29c551ea3cd 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -680,7 +680,6 @@ private: ScDocShell* pDocShell; public: -//UNUSED2008-05 ScSpreadsheetSettingsObj(ScDocShell* pDocSh); virtual ~ScSpreadsheetSettingsObj(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 18210f38e80e..05252c9f1ef7 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -207,8 +207,6 @@ public: ScDPDimensions* GetDimensionsObject(); -//UNUSED2009-05 void DumpState( ScDocument* pDoc, const ScAddress& rPos ); - // XDimensionsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getDimensions( ) @@ -456,7 +454,6 @@ public: const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const; -//UNUSED2009-05 BOOL IsValidPage( const ScDPItemData& rData ); // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance BOOL IsVisible( const ScDPItemData& rData ); diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 8178eb4a01d2..293dd0af85fe 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -481,7 +481,6 @@ struct ScImportParam ScImportParam& operator= ( const ScImportParam& r ); BOOL operator== ( const ScImportParam& r ) const; -//UNUSED2009-05 void Clear (); }; struct ScStringHashCode diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx index fca3d184a4a2..6a55cc4225bb 100644 --- a/sc/inc/hints.hxx +++ b/sc/inc/hints.hxx @@ -93,7 +93,6 @@ class ScPointerChangedHint : public SfxHint public: TYPEINFO(); -//UNUSED2008-05 ScPointerChangedHint( USHORT nF ); ~ScPointerChangedHint(); USHORT GetFlags() const { return nFlags; } diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx index 78bb2a6bba3d..4fd6a835b61a 100644 --- a/sc/inc/markarr.hxx +++ b/sc/inc/markarr.hxx @@ -62,7 +62,6 @@ public: void CopyMarksTo( ScMarkArray& rDestMarkArray ) const; BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; -//UNUSED2009-05 void DeleteArea(SCROW nStartRow, SCROW nEndRow); /// Including current row, may return -1 if bUp and not found SCsROW GetNextMarked( SCsROW nRow, BOOL bUp ) const; diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index d1958eccceac..eeceae4ee829 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -123,56 +123,6 @@ public: throw(::com::sun::star::uno::RuntimeException); }; -//UNUSED2008-05 class ScEmptyEnumerationAccess : public cppu::WeakImplHelper2< -//UNUSED2008-05 com::sun::star::container::XEnumerationAccess, -//UNUSED2008-05 com::sun::star::lang::XServiceInfo > -//UNUSED2008-05 { -//UNUSED2008-05 public: -//UNUSED2008-05 ScEmptyEnumerationAccess(); -//UNUSED2008-05 virtual ~ScEmptyEnumerationAccess(); -//UNUSED2008-05 -//UNUSED2008-05 // XEnumerationAccess -//UNUSED2008-05 virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL -//UNUSED2008-05 createEnumeration() throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 -//UNUSED2008-05 // XElementAccess -//UNUSED2008-05 virtual ::com::sun::star::uno::Type SAL_CALL getElementType() -//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 -//UNUSED2008-05 // XServiceInfo -//UNUSED2008-05 virtual ::rtl::OUString SAL_CALL getImplementationName( ) -//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) -//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) -//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 }; - -//UNUSED2008-05 class ScEmptyEnumeration : public cppu::WeakImplHelper2< -//UNUSED2008-05 com::sun::star::container::XEnumeration, -//UNUSED2008-05 com::sun::star::lang::XServiceInfo > -//UNUSED2008-05 { -//UNUSED2008-05 public: -//UNUSED2008-05 ScEmptyEnumeration(); -//UNUSED2008-05 virtual ~ScEmptyEnumeration(); -//UNUSED2008-05 -//UNUSED2008-05 // XEnumeration -//UNUSED2008-05 virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual ::com::sun::star::uno::Any SAL_CALL nextElement() -//UNUSED2008-05 throw(::com::sun::star::container::NoSuchElementException, -//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, -//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 -//UNUSED2008-05 // XServiceInfo -//UNUSED2008-05 virtual ::rtl::OUString SAL_CALL getImplementationName( ) -//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) -//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) -//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 }; - // new (uno 3) variant class ScNameToIndexAccess : public cppu::WeakImplHelper2< com::sun::star::container::XIndexAccess, @@ -209,65 +159,6 @@ public: throw(::com::sun::star::uno::RuntimeException); }; -//UNUSED2008-05 class ScPrintSettingsObj : public cppu::WeakImplHelper2< -//UNUSED2008-05 com::sun::star::beans::XPropertySet, -//UNUSED2008-05 com::sun::star::lang::XServiceInfo > -//UNUSED2008-05 { -//UNUSED2008-05 public: -//UNUSED2008-05 ScPrintSettingsObj(); -//UNUSED2008-05 virtual ~ScPrintSettingsObj(); -//UNUSED2008-05 -//UNUSED2008-05 // XPropertySet -//UNUSED2008-05 virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > -//UNUSED2008-05 SAL_CALL getPropertySetInfo() -//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, -//UNUSED2008-05 const ::com::sun::star::uno::Any& aValue ) -//UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, -//UNUSED2008-05 ::com::sun::star::beans::PropertyVetoException, -//UNUSED2008-05 ::com::sun::star::lang::IllegalArgumentException, -//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, -//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( -//UNUSED2008-05 const ::rtl::OUString& PropertyName ) -//UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, -//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, -//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, -//UNUSED2008-05 const ::com::sun::star::uno::Reference< -//UNUSED2008-05 ::com::sun::star::beans::XPropertyChangeListener >& xListener ) -//UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, -//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, -//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, -//UNUSED2008-05 const ::com::sun::star::uno::Reference< -//UNUSED2008-05 ::com::sun::star::beans::XPropertyChangeListener >& aListener ) -//UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, -//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, -//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, -//UNUSED2008-05 const ::com::sun::star::uno::Reference< -//UNUSED2008-05 ::com::sun::star::beans::XVetoableChangeListener >& aListener ) -//UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, -//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, -//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, -//UNUSED2008-05 const ::com::sun::star::uno::Reference< -//UNUSED2008-05 ::com::sun::star::beans::XVetoableChangeListener >& aListener ) -//UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, -//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, -//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 -//UNUSED2008-05 // XServiceInfo -//UNUSED2008-05 virtual ::rtl::OUString SAL_CALL getImplementationName( ) -//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) -//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) -//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); -//UNUSED2008-05 }; - - class SC_DLLPUBLIC ScUnoHelpFunctions { public: diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index b8929a450576..7ebcf066481e 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -133,19 +133,6 @@ public: with text encoding RTL_TEXTENC_SYMBOL */ BOOL IsSymbolFont() const; -//UNUSED2008-05 /** Create a FontToSubsFontConverter if needed for -//UNUSED2008-05 this pattern, else return 0. -//UNUSED2008-05 -//UNUSED2008-05 @param nFlags is the bit mask which shall be -//UNUSED2008-05 used for CreateFontToSubsFontConverter(). -//UNUSED2008-05 -//UNUSED2008-05 The converter must be destroyed by the caller -//UNUSED2008-05 using DestroyFontToSubsFontConverter() which -//UNUSED2008-05 should be accomplished using the -//UNUSED2008-05 ScFontToSubsFontConverter_AutoPtr -//UNUSED2008-05 */ -//UNUSED2008-05 FontToSubsFontConverter GetSubsFontConverter( ULONG nFlags ) const; - ULONG GetNumberFormat( SvNumberFormatter* ) const; ULONG GetNumberFormat( SvNumberFormatter* pFormatter, const SfxItemSet* pCondSet ) const; diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index 915a311411c4..a9951e381acc 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -114,7 +114,6 @@ struct ScPivotParam ScPivotParam& operator= ( const ScPivotParam& r ); BOOL operator== ( const ScPivotParam& r ) const; -//UNUSED2009-05 void Clear (); void ClearPivotArrays(); void SetLabelData (const ::std::vector<ScDPLabelDataRef>& r); void SetPivotArrays ( const PivotField* pPageArr, diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index ec063d2d0e9b..ede04ea809ce 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -63,7 +63,6 @@ class SC_DLLPUBLIC ScTpPrintItem : public SfxPoolItem { public: TYPEINFO(); -//UNUSED2008-05 ScTpPrintItem( USHORT nWhich ); ScTpPrintItem( USHORT nWhich, const ScPrintOptions& rOpt ); ScTpPrintItem( const ScTpPrintItem& rItem ); diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index a9f324b8b737..889efcf164d7 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -143,8 +143,6 @@ public: SC_DLLPUBLIC BOOL IsReference( ScRange& rRef ) const; BOOL IsReference( ScRange& rRef, const ScAddress& rPos ) const; BOOL IsValidReference( ScRange& rRef ) const; - -//UNUSED2009-05 BOOL IsRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; BOOL IsRangeAtBlock( const ScRange& ) const; void UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable); @@ -201,7 +199,6 @@ public: virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; -//UNUSED2009-05 ScRangeData* GetRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& ) const; SC_DLLPUBLIC BOOL SearchName( const String& rName, USHORT& rPos ) const; diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 1d2304c2a0f2..a10c794b9c43 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -67,7 +67,6 @@ public: static void Init(); // called directly after loading the DLL static void Exit(); // called directly befor unloading the DLL -//UNUSED2008-05 static void FillStatusBar(StatusBar &rBar); static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ); }; diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index b788672aa715..da4fa757b171 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -414,12 +414,6 @@ public: void MatTrans( ScMatrix& mRes) const; void MatCopy ( ScMatrix& mRes) const; -//UNUSED2009-05 /** Copy upper left of this matrix to mRes matrix. -//UNUSED2009-05 This matrix's dimensions must be greater or equal to the mRes matrix -//UNUSED2009-05 dimensions. -//UNUSED2009-05 */ -//UNUSED2009-05 void MatCopyUpperLeft( ScMatrix& mRes) const; - // Convert ScInterpreter::CompareMat values (-1,0,1) to boolean values void CompareEqual(); void CompareNotEqual(); diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx index 4f2f1ec40de2..9a404b943313 100644 --- a/sc/inc/servuno.hxx +++ b/sc/inc/servuno.hxx @@ -108,7 +108,6 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > MakeInstance( sal_uInt16 nType, ScDocShell* pDocShell ); static ::com::sun::star::uno::Sequence<rtl::OUString> GetAllServiceNames(); -//UNUSED2008-05 static String GetProviderName(sal_uInt16 nObjectType); static sal_uInt16 GetProviderType(const String& rServiceName); }; diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx index 946a861231d9..e98a33f08065 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -53,14 +53,12 @@ public: void CreateStandardStyles(); void CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ); -//UNUSED2008-05 void UpdateStdNames(); void CopyStyleFrom( ScStyleSheetPool* pSrcPool, const String& rName, SfxStyleFamily eFamily ); ScStyleSheet* FindCaseIns( const String& rName, SfxStyleFamily eFam ); -//UNUSED2009-05 void SetForceStdName( const String* pSet ); const String* GetForceStdName() const { return pForceStdName; } virtual SfxStyleSheetBase& Make( const String&, SfxStyleFamily eFam, diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 32e63834ddc4..757d07a903da 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -296,7 +296,6 @@ public: BOOL IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const; void PutCell( const ScAddress&, ScBaseCell* pCell ); -//UNUSED2009-05 void PutCell( const ScAddress&, ULONG nFormatIndex, ScBaseCell* pCell); void PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell ); void PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell); // TRUE = Zahlformat gesetzt @@ -432,7 +431,6 @@ public: BOOL HasData( SCCOL nCol, SCROW nRow ); BOOL HasStringData( SCCOL nCol, SCROW nRow ); BOOL HasValueData( SCCOL nCol, SCROW nRow ); -//UNUSED2008-05 USHORT GetErrorData(SCCOL nCol, SCROW nRow) const; BOOL HasStringCells( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const; @@ -442,7 +440,6 @@ public: aCol[rPos.Col()].GetErrCode( rPos.Row() ) : 0; } -//UNUSED2008-05 USHORT GetErrCode( SCCOL nCol, SCROW nRow ) const; void ResetChanged( const ScRange& rRange ); @@ -471,7 +468,6 @@ public: void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); void UpdateInsertTab(SCTAB nTable); -//UNUSED2008-05 void UpdateInsertTabOnlyCells(SCTAB nTable); void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScTable* pRefUndo = NULL ); void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo, ScProgress& ); void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); @@ -505,7 +501,6 @@ public: const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, const SvxBorderLine** ppRight, const SvxBorderLine** ppBottom ) const; -//UNUSED2009-05 BOOL HasLines( const ScRange& rRange, Rectangle& rSizes ) const; bool HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nMask ) const; BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, @@ -590,8 +585,6 @@ public: void ClearPrintRanges(); /** Adds a new print ranges. */ void AddPrintRange( const ScRange& rNew ); -//UNUSED2009-05 /** Removes all old print ranges and sets the passed print ranges. */ -//UNUSED2009-05 void SetPrintRange( const ScRange& rNew ); /** Marks the specified sheet to be printed completely. Deletes old print ranges! */ void SetPrintEntireSheet(); diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx index 926b6ef50cd1..3cdd9f61a966 100644 --- a/sc/inc/xmlwrap.hxx +++ b/sc/inc/xmlwrap.hxx @@ -55,8 +55,6 @@ class ScXMLImportWrapper SfxMedium* pMedium; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > xStorage; -//UNUSED2008-05 com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator> GetStatusIndicator( -//UNUSED2008-05 com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel); com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator> GetStatusIndicator(); sal_uInt32 ImportFromComponent(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& xServiceFactory, diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index b550bfa92ef4..eb3ddd541725 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -269,20 +269,6 @@ LotusConverterBase::~LotusConverterBase() { } -//UNUSED2008-05 void LotusConverterBase::Reset( INT32 nLen, const ScAddress& rEingPos ) -//UNUSED2008-05 { -//UNUSED2008-05 ConverterBase::Reset(); -//UNUSED2008-05 nBytesLeft = nLen; -//UNUSED2008-05 aEingPos = rEingPos; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void LotusConverterBase::Reset( INT32 nLen ) -//UNUSED2008-05 { -//UNUSED2008-05 ConverterBase::Reset(); -//UNUSED2008-05 nBytesLeft = nLen; -//UNUSED2008-05 aEingPos.Set( 0, 0, 0 ); -//UNUSED2008-05 } - void LotusConverterBase::Reset( const ScAddress& rEingPos ) { ConverterBase::Reset(); diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index b61a844d02a5..b1f7dfe12db6 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -204,23 +204,6 @@ void TokenPool::GrowDouble( void ) pP_Dbl = pP_DblNew; } - -//UNUSED2009-05 void TokenPool::GrowError( void ) -//UNUSED2009-05 { -//UNUSED2009-05 UINT16 nP_ErrNew = nP_Err * 2; -//UNUSED2009-05 -//UNUSED2009-05 USHORT* pP_ErrNew = new USHORT[ nP_ErrNew ]; -//UNUSED2009-05 -//UNUSED2009-05 for( UINT16 nL = 0 ; nL < nP_Err ; nL++ ) -//UNUSED2009-05 pP_ErrNew[ nL ] = pP_Err[ nL ]; -//UNUSED2009-05 -//UNUSED2009-05 nP_Err = nP_ErrNew; -//UNUSED2009-05 -//UNUSED2009-05 delete[] pP_Err; -//UNUSED2009-05 pP_Err = pP_ErrNew; -//UNUSED2009-05 } - - void TokenPool::GrowTripel( void ) { UINT16 nP_RefTrNew = nP_RefTr * 2; @@ -847,7 +830,6 @@ BOOL TokenPool::IsSingleOp( const TokenId& rId, const DefTokenId eId ) const return FALSE; } - const String* TokenPool::GetExternal( const TokenId& rId ) const { const String* p = NULL; @@ -862,21 +844,6 @@ const String* TokenPool::GetExternal( const TokenId& rId ) const return p; } - -//UNUSED2008-05 const String* TokenPool::GetString( const TokenId& r ) const -//UNUSED2008-05 { -//UNUSED2008-05 const String* p = NULL; -//UNUSED2008-05 UINT16 n = (UINT16) r; -//UNUSED2008-05 if( n && n <= nElementAkt ) -//UNUSED2008-05 { -//UNUSED2008-05 n--; -//UNUSED2008-05 if( pType[ n ] == T_Str ) -//UNUSED2008-05 p = ppP_Str[ pElement[ n ] ]; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 return p; -//UNUSED2008-05 } - ScMatrix* TokenPool::GetMatrix( unsigned int n ) const { if( n < nP_MatrixAkt ) diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index bce037bd05c1..5393e229e5c4 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -255,24 +255,8 @@ bool XclExpAddressConverter::ConvertRange( XclRange& rXclRange, return bValidStart; } -//UNUSED2008-05 XclRange XclExpAddressConverter::CreateValidRange( const ScRange& rScRange, bool bWarn ) -//UNUSED2008-05 { -//UNUSED2008-05 return XclRange( -//UNUSED2008-05 CreateValidAddress( rScRange.aStart, bWarn ), -//UNUSED2008-05 CreateValidAddress( rScRange.aEnd, bWarn ) ); -//UNUSED2008-05 } - // cell range list ------------------------------------------------------------ -//UNUSED2008-05 bool XclExpAddressConverter::CheckRangeList( const ScRangeList& rScRanges, bool bWarn ) -//UNUSED2008-05 { -//UNUSED2008-05 for( ULONG nIdx = 0, nSize = rScRanges.Count(); nIdx < nSize; ++nIdx ) -//UNUSED2008-05 if( const ScRange* pScRange = rScRanges.GetObject( nIdx ) ) -//UNUSED2008-05 if( !CheckRange( *pScRange, bWarn ) ) -//UNUSED2008-05 return false; -//UNUSED2008-05 return true; -//UNUSED2008-05 } - void XclExpAddressConverter::ValidateRangeList( ScRangeList& rScRanges, bool bWarn ) { ULONG nIdx = rScRanges.Count(); diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index fcf738527025..a9112b98c98d 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -798,12 +798,6 @@ SCTAB XclExpTabInfo::GetRealScTab( SCTAB nSortedScTab ) const return (nSortedScTab < mnScCnt) ? maFromSortedVec[ nSortedScTab ] : SCTAB_INVALID; } -//UNUSED2009-05 SCTAB XclExpTabInfo::GetSortedScTab( SCTAB nScTab ) const -//UNUSED2009-05 { -//UNUSED2009-05 DBG_ASSERT( nScTab < mnScCnt, "XclExpTabInfo::GetSortedScTab - sheet out of range" ); -//UNUSED2009-05 return (nScTab < mnScCnt) ? maToSortedVec[ nScTab ] : SCTAB_INVALID; -//UNUSED2009-05 } - bool XclExpTabInfo::GetFlag( SCTAB nScTab, sal_uInt8 nFlags ) const { DBG_ASSERT( nScTab < mnScCnt, "XclExpTabInfo::GetFlag - sheet out of range" ); diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index af275bef7eef..66e79aa4072b 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -721,11 +721,6 @@ sal_uInt16 XclExpNameManager::InsertDBRange( USHORT nScDBRangeIdx ) return mxImpl->InsertDBRange( nScDBRangeIdx ); } -//UNUSED2009-05 sal_uInt16 XclExpNameManager::InsertBuiltInName( sal_Unicode cBuiltIn, XclTokenArrayRef xTokArr, SCTAB nScTab ) -//UNUSED2009-05 { -//UNUSED2009-05 return mxImpl->InsertBuiltInName( cBuiltIn, xTokArr, nScTab ); -//UNUSED2009-05 } - sal_uInt16 XclExpNameManager::InsertBuiltInName( sal_Unicode cBuiltIn, const ScRange& rRange ) { XclTokenArrayRef xTokArr = GetFormulaCompiler().CreateFormula( EXC_FMLATYPE_NAME, rRange ); diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index ddcdb3243167..1f3a263238a2 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -707,11 +707,6 @@ const XclExpPCField* XclExpPivotCache::GetField( sal_uInt16 nFieldIdx ) const return maFieldList.GetRecord( nFieldIdx ).get(); } -//UNUSED2009-05 const XclExpPCField* XclExpPivotCache::GetField( const String& rFieldName ) const -//UNUSED2009-05 { -//UNUSED2009-05 return const_cast< XclExpPivotCache* >( this )->GetFieldAcc( rFieldName ); -//UNUSED2009-05 } - bool XclExpPivotCache::HasAddFields() const { // pivot cache can be shared, if there are no additional cache fields @@ -1025,11 +1020,6 @@ sal_uInt16 XclExpPTField::GetLastDataInfoIndex() const return static_cast< sal_uInt16 >( maDataInfoVec.size() - 1 ); } -//UNUSED2009-05 const XclExpPTItem* XclExpPTField::GetItem( const String& rName ) const -//UNUSED2009-05 { -//UNUSED2009-05 return const_cast< XclExpPTField* >( this )->GetItemAcc( rName ); -//UNUSED2009-05 } - sal_uInt16 XclExpPTField::GetItemIndex( const String& rName, sal_uInt16 nDefaultIdx ) const { for( size_t nPos = 0, nSize = maItemList.GetSize(); nPos < nSize; ++nPos ) diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index f828079c8735..60bde56e827d 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -296,28 +296,6 @@ sal_Size XclExpStream::CopyFromStream( SvStream& rInStrm, sal_Size nBytes ) return nRet; } -//UNUSED2008-05 void XclExpStream::WriteUnicodeBuffer( const sal_uInt16* pBuffer, sal_Size nChars, sal_uInt8 nFlags ) -//UNUSED2008-05 { -//UNUSED2008-05 SetSliceSize( 0 ); -//UNUSED2008-05 if( pBuffer && (nChars > 0) ) -//UNUSED2008-05 { -//UNUSED2008-05 sal_uInt16 nCharLen = (nFlags & EXC_STRF_16BIT) ? 2 : 1; -//UNUSED2008-05 for( sal_Size nIndex = 0; nIndex < nChars; ++nIndex ) -//UNUSED2008-05 { -//UNUSED2008-05 if( mbInRec && (mnCurrSize + nCharLen > mnCurrMaxSize) ) -//UNUSED2008-05 { -//UNUSED2008-05 StartContinue(); -//UNUSED2008-05 // repeat only 16bit flag -//UNUSED2008-05 operator<<( static_cast< sal_uInt8 >( nFlags & EXC_STRF_16BIT ) ); -//UNUSED2008-05 } -//UNUSED2008-05 if( nCharLen == 2 ) -//UNUSED2008-05 operator<<( pBuffer[ nIndex ] ); -//UNUSED2008-05 else -//UNUSED2008-05 operator<<( static_cast< sal_uInt8 >( pBuffer[ nIndex ] ) ); -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } - void XclExpStream::WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nFlags ) { SetSliceSize( 0 ); @@ -339,12 +317,6 @@ void XclExpStream::WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nF } } -//UNUSED2008-05 void XclExpStream::WriteByteStringBuffer( const ByteString& rString, sal_uInt16 nMaxLen ) -//UNUSED2008-05 { -//UNUSED2008-05 SetSliceSize( 0 ); -//UNUSED2008-05 Write( rString.GetBuffer(), ::std::min< sal_Size >( rString.Len(), nMaxLen ) ); -//UNUSED2008-05 } - // ER: #71367# Xcl has an obscure sense of whether starting a new record or not, // and crashes if it encounters the string header at the very end of a record. // Thus we add 1 to give some room, seems like they do it that way but with another count (10?) diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index cd0b083aa208..6279ec4cd0fd 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -125,20 +125,6 @@ XclExpString::XclExpString( const OUString& rString, XclStrFlags nFlags, sal_uIn Assign( rString, nFlags, nMaxLen ); } -//UNUSED2008-05 XclExpString::XclExpString( -//UNUSED2008-05 const String& rString, const XclFormatRunVec& rFormats, -//UNUSED2008-05 XclStrFlags nFlags, sal_uInt16 nMaxLen ) -//UNUSED2008-05 { -//UNUSED2008-05 Assign( rString, rFormats, nFlags, nMaxLen ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 XclExpString::XclExpString( -//UNUSED2008-05 const OUString& rString, const XclFormatRunVec& rFormats, -//UNUSED2008-05 XclStrFlags nFlags, sal_uInt16 nMaxLen ) -//UNUSED2008-05 { -//UNUSED2008-05 Assign( rString, rFormats, nFlags, nMaxLen ); -//UNUSED2008-05 } - // assign --------------------------------------------------------------------- void XclExpString::Assign( const String& rString, XclStrFlags nFlags, sal_uInt16 nMaxLen ) @@ -179,20 +165,6 @@ void XclExpString::AssignByte( Build( aByteStr.GetBuffer(), aByteStr.Len(), nFlags, nMaxLen ); } -//UNUSED2008-05 void XclExpString::AssignByte( sal_Unicode cChar, rtl_TextEncoding eTextEnc, XclStrFlags nFlags, sal_uInt16 nMaxLen ) -//UNUSED2008-05 { -//UNUSED2008-05 if( !cChar ) -//UNUSED2008-05 { -//UNUSED2008-05 sal_Char cByteChar = 0; -//UNUSED2008-05 Build( &cByteChar, 1, nFlags, nMaxLen ); -//UNUSED2008-05 } -//UNUSED2008-05 else -//UNUSED2008-05 { -//UNUSED2008-05 ByteString aByteStr( &cChar, 1, eTextEnc ); // length may be >1 -//UNUSED2008-05 Build( aByteStr.GetBuffer(), aByteStr.Len(), nFlags, nMaxLen ); -//UNUSED2008-05 } -//UNUSED2008-05 } - // append --------------------------------------------------------------------- void XclExpString::Append( const String& rString ) @@ -200,16 +172,6 @@ void XclExpString::Append( const String& rString ) BuildAppend( rString.GetBuffer(), rString.Len() ); } -//UNUSED2008-05 void XclExpString::Append( const ::rtl::OUString& rString ) -//UNUSED2008-05 { -//UNUSED2008-05 BuildAppend( rString.getStr(), rString.getLength() ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void XclExpString::Append( sal_Unicode cChar ) -//UNUSED2008-05 { -//UNUSED2008-05 BuildAppend( &cChar, 1 ); -//UNUSED2008-05 } - void XclExpString::AppendByte( const String& rString, rtl_TextEncoding eTextEnc ) { if( rString.Len() > 0 ) diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index ccebe9a4280f..923f1ff85cf3 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2113,49 +2113,6 @@ XclExpDefaultXF::XclExpDefaultXF( const XclExpRoot& rRoot, bool bCellXF ) : { } -//UNUSED2008-05 void XclExpDefaultXF::SetParent( sal_uInt32 nParentXFId ) -//UNUSED2008-05 { -//UNUSED2008-05 DBG_ASSERT( IsCellXF(), "XclExpDefaultXF::SetParent - not allowed in style XFs" ); -//UNUSED2008-05 if( IsCellXF() ) -//UNUSED2008-05 mnParentXFId = nParentXFId; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void XclExpDefaultXF::SetUsedFlags( -//UNUSED2008-05 bool bProtUsed, bool bFontUsed, bool bFmtUsed, -//UNUSED2008-05 bool bAlignUsed, bool bBorderUsed, bool bAreaUsed ) -//UNUSED2008-05 { -//UNUSED2008-05 mbProtUsed = bProtUsed; -//UNUSED2008-05 mbFontUsed = bFontUsed; -//UNUSED2008-05 mbFmtUsed = bFmtUsed; -//UNUSED2008-05 mbAlignUsed = bAlignUsed; -//UNUSED2008-05 mbBorderUsed = bBorderUsed; -//UNUSED2008-05 mbAreaUsed = bAreaUsed; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void XclExpDefaultXF::SetProtection( const XclExpCellProt& rProtection ) -//UNUSED2008-05 { -//UNUSED2008-05 maProtection = rProtection; -//UNUSED2008-05 mbProtUsed = true; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void XclExpDefaultXF::SetAlignment( const XclExpCellAlign& rAlignment ) -//UNUSED2008-05 { -//UNUSED2008-05 maAlignment = rAlignment; -//UNUSED2008-05 mbAlignUsed = true; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void XclExpDefaultXF::SetBorder( const XclExpCellBorder& rBorder ) -//UNUSED2008-05 { -//UNUSED2008-05 maBorder = rBorder; -//UNUSED2008-05 mbBorderUsed = true; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void XclExpDefaultXF::SetArea( const XclExpCellArea& rArea ) -//UNUSED2008-05 { -//UNUSED2008-05 maArea = rArea; -//UNUSED2008-05 mbAreaUsed = true; -//UNUSED2008-05 } - void XclExpDefaultXF::SetFont( sal_uInt16 nXclFont ) { mnXclFont = nXclFont; diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 452e7bee0fc0..0bfb2d7904b3 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -648,41 +648,6 @@ void XclExpBooleanCell::WriteContents( XclExpStream& rStrm ) rStrm << sal_uInt16( mbValue ? 1 : 0 ) << EXC_BOOLERR_BOOL; } -// ---------------------------------------------------------------------------- - -//UNUSED2009-05 IMPL_FIXEDMEMPOOL_NEWDEL( XclExpErrorCell, 256, 256 ) -//UNUSED2009-05 -//UNUSED2009-05 XclExpErrorCell::XclExpErrorCell( -//UNUSED2009-05 const XclExpRoot rRoot, const XclAddress& rXclPos, -//UNUSED2009-05 const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, sal_uInt8 nErrCode ) : -//UNUSED2009-05 // #i41210# always use latin script for error cells -//UNUSED2009-05 XclExpSingleCellBase( rRoot, EXC_ID3_BOOLERR, 2, rXclPos, pPattern, ApiScriptType::LATIN, nForcedXFId ), -//UNUSED2009-05 mnErrCode( nErrCode ) -//UNUSED2009-05 { -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 void XclExpErrorCell::SaveXml( XclExpXmlStream& rStrm ) -//UNUSED2009-05 { -//UNUSED2009-05 sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); -//UNUSED2009-05 rWorksheet->startElement( XML_c, -//UNUSED2009-05 XML_r, XclXmlUtils::ToOString( GetXclPos() ).getStr(), -//UNUSED2009-05 XML_s, lcl_GetStyleId( rStrm, *this ).getStr(), -//UNUSED2009-05 XML_t, "e", -//UNUSED2009-05 // OOXTODO: XML_cm, XML_vm, XML_ph -//UNUSED2009-05 FSEND ); -//UNUSED2009-05 rWorksheet->startElement( XML_v, FSEND ); -//UNUSED2009-05 rWorksheet->write( (sal_Int32) mnErrCode ); -//UNUSED2009-05 rWorksheet->endElement( XML_v ); -//UNUSED2009-05 rWorksheet->endElement( XML_c ); -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 void XclExpErrorCell::WriteContents( XclExpStream& rStrm ) -//UNUSED2009-05 { -//UNUSED2009-05 rStrm << mnErrCode << EXC_BOOLERR_ERROR; -//UNUSED2009-05 } - -// ---------------------------------------------------------------------------- - IMPL_FIXEDMEMPOOL_NEWDEL( XclExpLabelCell, 256, 256 ) XclExpLabelCell::XclExpLabelCell( diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 8d09cae60941..557f59654f92 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -2975,11 +2975,6 @@ void XclImpPictureObj::ReadPictFmla( XclImpStream& rStrm, sal_uInt16 nLinkSize ) // DFF stream conversion ====================================================== -//UNUSED2009-05 void XclImpSolverContainer::ReadSolverContainer( SvStream& rDffStrm ) -//UNUSED2009-05 { -//UNUSED2009-05 rDffStrm >> *this; -//UNUSED2009-05 } - void XclImpSolverContainer::InsertSdrObjectInfo( SdrObject& rSdrObj, sal_uInt32 nDffShapeId, sal_uInt32 nDffFlags ) { if( nDffShapeId > 0 ) diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index ad04a1f3930c..d8b353179cd6 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -134,24 +134,8 @@ bool XclImpAddressConverter::ConvertRange( ScRange& rScRange, return bValidStart; } -//UNUSED2009-05 ScRange XclImpAddressConverter::CreateValidRange( -//UNUSED2009-05 const XclRange& rXclRange, SCTAB nScTab1, SCTAB nScTab2, bool bWarn ) -//UNUSED2009-05 { -//UNUSED2009-05 return ScRange( -//UNUSED2009-05 CreateValidAddress( rXclRange.maFirst, nScTab1, bWarn ), -//UNUSED2009-05 CreateValidAddress( rXclRange.maLast, nScTab2, bWarn ) ); -//UNUSED2009-05 } - // cell range list ------------------------------------------------------------ -//UNUSED2009-05 bool XclImpAddressConverter::CheckRangeList( const XclRangeList& rXclRanges, bool bWarn ) -//UNUSED2009-05 { -//UNUSED2009-05 for( XclRangeList::const_iterator aIt = rXclRanges.begin(), aEnd = rXclRanges.end(); aIt != aEnd; ++aIt ) -//UNUSED2009-05 if( !CheckRange( *aIt, bWarn ) ) -//UNUSED2009-05 return false; -//UNUSED2009-05 return true; -//UNUSED2009-05 } - void XclImpAddressConverter::ConvertRangeList( ScRangeList& rScRanges, const XclRangeList& rXclRanges, SCTAB nScTab, bool bWarn ) { @@ -251,12 +235,6 @@ EditTextObject* XclImpStringHelper::CreateTextObject( return lclCreateTextObject( rRoot, rString, EXC_FONTITEM_EDITENG, 0 ); } -//UNUSED2009-05 EditTextObject* XclImpStringHelper::CreateNoteObject( -//UNUSED2009-05 const XclImpRoot& rRoot, const XclImpString& rString ) -//UNUSED2009-05 { -//UNUSED2009-05 return lclCreateTextObject( rRoot, rString, EXC_FONTITEM_NOTE, 0 ); -//UNUSED2009-05 } - ScBaseCell* XclImpStringHelper::CreateCell( const XclImpRoot& rRoot, const XclImpString& rString, sal_uInt16 nXFIndex ) { diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index dc2234570ea6..1e1eac022570 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -206,21 +206,9 @@ private: const XclImpXti* GetXti( sal_uInt16 nXtiIndex ) const; /** Returns the specified SUPBOOK (external document). */ const XclImpSupbook* GetSupbook( sal_uInt16 nXtiIndex ) const; -//UNUSED2009-05 /** Returns the SUPBOOK (external workbook) specified by its URL. */ -//UNUSED2009-05 const XclImpSupbook* GetSupbook( const String& rUrl ) const; void LoadCachedValues(); -//UNUSED2009-05 /** Finds the largest range of sheet indexes in a SUPBOOK after a start sheet index. -//UNUSED2009-05 @param rnSBTabFirst (out-param) The first sheet index of the range in SUPBOOK is returned here. -//UNUSED2009-05 @param rnSBTabLast (out-param) The last sheet index of the range in SUPBOOK is returned here (inclusive). -//UNUSED2009-05 @param nSupbook The list index of the SUPBOOK. -//UNUSED2009-05 @param nSBTabStart The first allowed sheet index. Sheet ranges with an earlier start index are ignored. -//UNUSED2009-05 @return true = the return values are valid; false = nothing found. */ -//UNUSED2009-05 bool FindNextTabRange( -//UNUSED2009-05 sal_uInt16& rnSBTabFirst, sal_uInt16& rnSBTabLast, -//UNUSED2009-05 sal_uInt16 nSupbook, sal_uInt16 nSBTabStart ) const; - private: typedef ::std::vector< XclImpXti > XclImpXtiVector; typedef ScfDelList< XclImpSupbook > XclImpSupbookList; @@ -693,14 +681,6 @@ const XclImpSupbook* XclImpLinkManagerImpl::GetSupbook( sal_uInt16 nXtiIndex ) c return pXti ? maSupbookList.GetObject( pXti->mnSupbook ) : 0; } -//UNUSED2009-05 const XclImpSupbook* XclImpLinkManagerImpl::GetSupbook( const String& rUrl ) const -//UNUSED2009-05 { -//UNUSED2009-05 for( const XclImpSupbook* pSupbook = maSupbookList.First(); pSupbook; pSupbook = maSupbookList.Next() ) -//UNUSED2009-05 if( pSupbook->GetXclUrl() == rUrl ) -//UNUSED2009-05 return pSupbook; -//UNUSED2009-05 return 0; -//UNUSED2009-05 } - void XclImpLinkManagerImpl::LoadCachedValues() { // Read all CRN records which can be accessed via XclImpSupbook, and store @@ -714,22 +694,6 @@ void XclImpLinkManagerImpl::LoadCachedValues() } } -//UNUSED2009-05 bool XclImpLinkManagerImpl::FindNextTabRange( -//UNUSED2009-05 sal_uInt16& rnSBTabFirst, sal_uInt16& rnSBTabLast, -//UNUSED2009-05 sal_uInt16 nSupbook, sal_uInt16 nSBTabStart ) const -//UNUSED2009-05 { -//UNUSED2009-05 rnSBTabFirst = rnSBTabLast = EXC_NOTAB; -//UNUSED2009-05 for( const XclImpXti* pXti = maXtiList.First(); pXti; pXti = maXtiList.Next() ) -//UNUSED2009-05 { -//UNUSED2009-05 if( (nSupbook == pXti->mnSupbook) && (nSBTabStart <= pXti->mnSBTabLast) && (pXti->mnSBTabFirst < rnSBTabFirst) ) -//UNUSED2009-05 { -//UNUSED2009-05 rnSBTabFirst = ::std::max( nSBTabStart, pXti->mnSBTabFirst ); -//UNUSED2009-05 rnSBTabLast = pXti->mnSBTabLast; -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 return rnSBTabFirst != EXC_NOTAB; -//UNUSED2009-05 } - // ============================================================================ XclImpLinkManager::XclImpLinkManager( const XclImpRoot& rRoot ) : diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 98db9dcb4471..a7e2af0c52f4 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -474,13 +474,6 @@ void XclImpStream::PopPosition() } } -//UNUSED2008-05 void XclImpStream::RejectPosition() -//UNUSED2008-05 { -//UNUSED2008-05 DBG_ASSERT( !maPosStack.empty(), "XclImpStream::RejectPosition - stack empty" ); -//UNUSED2008-05 if( !maPosStack.empty() ) -//UNUSED2008-05 maPosStack.pop_back(); -//UNUSED2008-05 } - void XclImpStream::StoreGlobalPosition() { StorePosition( maGlobPos ); diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index ed7aadd0a410..ca16b2f525e8 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -293,11 +293,6 @@ bool XclPCField::IsStandardField() const return meFieldType == EXC_PCFIELD_STANDARD; } -//UNUSED2008-05 bool XclPCField::IsCalculatedField() const -//UNUSED2008-05 { -//UNUSED2008-05 return meFieldType == EXC_PCFIELD_CALCED; -//UNUSED2008-05 } - bool XclPCField::IsStdGroupField() const { return meFieldType == EXC_PCFIELD_STDGROUP; diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index 4a48584da7fa..93c651b55e88 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -468,12 +468,6 @@ void XclFontData::SetApiFamily( sal_Int16 nApiFamily ) } } -//UNUSED2009-05 void XclFontData::SetApiFontEncoding( sal_Int16 nApiFontEnc ) -//UNUSED2009-05 { -//UNUSED2009-05 // API constants are equal to rtl_TextEncoding constants -//UNUSED2009-05 SetFontEncoding( static_cast< rtl_TextEncoding >( nApiFontEnc ) ); -//UNUSED2009-05 } - void XclFontData::SetApiPosture( Awt::FontSlant eApiPosture ) { mbItalic = @@ -1492,12 +1486,6 @@ void XclNumFmtBuffer::InitializeImport() maFmtMap.clear(); } -//UNUSED2008-05 const XclNumFmt* XclNumFmtBuffer::GetFormat( sal_uInt16 nXclNumFmt ) const -//UNUSED2008-05 { -//UNUSED2008-05 XclNumFmtMap::const_iterator aIt = maFmtMap.find( nXclNumFmt ); -//UNUSED2008-05 return (aIt != maFmtMap.end()) ? &aIt->second : 0; -//UNUSED2008-05 } - void XclNumFmtBuffer::InsertFormat( sal_uInt16 nXclNumFmt, const String& rFormat ) { XclNumFmt& rNumFmt = maFmtMap[ nXclNumFmt ]; diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index eeef52aed550..bb97119a1338 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -124,12 +124,6 @@ Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs( return xInt; } -//UNUSED2008-05 Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs( -//UNUSED2008-05 SfxObjectShell* pShell, const OUString& rServiceName, const Sequence< Any >& rArgs ) -//UNUSED2008-05 { -//UNUSED2008-05 return CreateInstanceWithArgs( GetServiceFactory( pShell ), rServiceName, rArgs ); -//UNUSED2008-05 } - Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs( const OUString& rServiceName, const Sequence< Any >& rArgs ) { diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx index bcee6f690f48..176ff16ba5db 100644 --- a/sc/source/filter/ftools/fprogressbar.cxx +++ b/sc/source/filter/ftools/fprogressbar.cxx @@ -226,14 +226,6 @@ void ScfSimpleProgressBar::Init( sal_Size nSize ) maProgress.ActivateSegment( nSegment ); } -// ============================================================================ - -//UNUSED2008-05 ScfStreamProgressBar::ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, const String& rText ) : -//UNUSED2008-05 mrStrm( rStrm ) -//UNUSED2008-05 { -//UNUSED2008-05 Init( pDocShell, rText ); -//UNUSED2008-05 } - ScfStreamProgressBar::ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, USHORT nResId ) : mrStrm( rStrm ) { diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 8c204f1cef35..64a190025714 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -95,12 +95,6 @@ public: const ::rtl::OUString& rServiceName, const UnoAnySequence& rArgs ); -//UNUSED2008-05 /** Creates an instance from the passed service name, using the service factory of the passed object. */ -//UNUSED2008-05 static XInterfaceRef CreateInstanceWithArgs( -//UNUSED2008-05 SfxObjectShell* pShell, -//UNUSED2008-05 const ::rtl::OUString& rServiceName, -//UNUSED2008-05 const UnoAnySequence& rArgs ); - /** Creates an instance from the passed service name, using the process service factory. */ static XInterfaceRef CreateInstanceWithArgs( const ::rtl::OUString& rServiceName, diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx index 8ffb3857ec63..133b0e64aff0 100644 --- a/sc/source/filter/inc/formel.hxx +++ b/sc/source/filter/inc/formel.hxx @@ -237,8 +237,6 @@ protected: virtual ~LotusConverterBase(); public: -//UNUSED2008-05 void Reset( INT32 nLen ); -//UNUSED2008-05 void Reset( INT32 nLen, const ScAddress& rEingPos ); void Reset( const ScAddress& rEingPos ); virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest, diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index f399d7ea5064..07f61b463140 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -220,7 +220,6 @@ private: class ScfStreamProgressBar { public: -//UNUSED2008-05 explicit ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, const String& rText ); explicit ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, USHORT nResId = STR_LOAD_DOC ); /** Sets the progress bar to the current stream position. */ diff --git a/sc/source/filter/inc/op.h b/sc/source/filter/inc/op.h index 2548bdfa34c3..9cfd3d1aecc8 100644 --- a/sc/source/filter/inc/op.h +++ b/sc/source/filter/inc/op.h @@ -39,7 +39,6 @@ void OP_EOF( SvStream &aStream, USHORT nLaenge ); void OP_Integer( SvStream &aStream, USHORT nLaenge ); void OP_Number( SvStream &aStream, USHORT nLaenge ); void OP_Label( SvStream &aStream, USHORT nLaenge ); -//UNUSED2009-05 void OP_Text( SvStream &aStream, USHORT nLaenge ); // WK3 void OP_Integer3( SvStream &aStream, USHORT nLaenge ); // WK3 void OP_Number3( SvStream &aStream, USHORT nLaenge ); // WK3 void OP_Formula( SvStream &aStream, USHORT nLaenge ); diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 06a37639be89..fa1be6dcb912 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -176,7 +176,6 @@ class TokenPool void GrowString( void ); void GrowDouble( void ); -//UNUSED2009-05 void GrowError( void ); void GrowTripel( void ); void GrowId( void ); void GrowElement( void ); @@ -195,7 +194,6 @@ class TokenPool inline void operator >>( TokenStack& rStack ); inline const TokenId Store( void ); const TokenId Store( const double& rDouble ); -//UNUSED2008-05 const TokenId StoreError( USHORT nError ); // nur fuer Range-Names const TokenId Store( const UINT16 nIndex ); @@ -218,7 +216,6 @@ class TokenPool inline E_TYPE GetType( const TokenId& nId ) const; BOOL IsSingleOp( const TokenId& nId, const DefTokenId eId ) const; const String* GetExternal( const TokenId& nId ) const; -//UNUSED2008-05 const String* GetString( const TokenId& nId ) const; ScMatrix* GetMatrix( unsigned int n ) const; }; diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index 606ce51c889b..b87c488ecbac 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -139,24 +139,8 @@ public: @return true = Cell range returned in rXclRange is valid (original or cropped). */ bool ConvertRange( XclRange& rXclRange, const ScRange& rScRange, bool bWarn ); -//UNUSED2008-05 /** Returns a valid cell range by moving it into allowed dimensions. -//UNUSED2008-05 @descr The start and/or end position of the range may be modified. -//UNUSED2008-05 @param rScRange The Calc cell range to convert. -//UNUSED2008-05 @param bWarn true = Sets the internal flag that produces a warning box -//UNUSED2008-05 after loading/saving the file, if the cell range contains invalid cells. -//UNUSED2008-05 @return The converted Excel cell range. */ -//UNUSED2008-05 XclRange CreateValidRange( const ScRange& rScRange, bool bWarn ); - // cell range list -------------------------------------------------------- -//UNUSED2008-05 /** Checks if the passed cell range list is valid. -//UNUSED2008-05 @param rScRanges The Calc cell range list to check. -//UNUSED2008-05 @param bWarn true = Sets the internal flag that produces a warning box -//UNUSED2008-05 after loading/saving the file, if the cell range list contains at -//UNUSED2008-05 least one invalid range. -//UNUSED2008-05 @return true = Cell range list in rScRanges is completly valid. */ -//UNUSED2008-05 bool CheckRangeList( const ScRangeList& rScRanges, bool bWarn ); - /** Checks and eventually crops the cell ranges to valid dimensions. @descr The start position of the ranges will not be modified. Cell ranges that fit partly into valid dimensions are cropped diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index c70e496400a4..8fdcfa88193f 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -81,8 +81,6 @@ public: /** Returns the Calc sheet index of the nSortedTab-th entry in the sorted sheet names list. */ SCTAB GetRealScTab( SCTAB nSortedScTab ) const; -//UNUSED2009-05 /** Returns the index of the passed Calc sheet in the sorted sheet names list. */ -//UNUSED2009-05 SCTAB GetSortedScTab( SCTAB nScTab ) const; /** Returns the number of Calc sheets. */ inline SCTAB GetScTabCount() const { return mnScCnt; } diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx index f0740735ea28..a8dd76b7bff3 100644 --- a/sc/source/filter/inc/xename.hxx +++ b/sc/source/filter/inc/xename.hxx @@ -53,8 +53,6 @@ public: /** Inserts the Calc database range with the passed index and returns the Excel NAME index. */ sal_uInt16 InsertDBRange( USHORT nScDBRangeIdx ); -//UNUSED2009-05 /** Inserts a new built-in defined name. */ -//UNUSED2009-05 sal_uInt16 InsertBuiltInName( sal_Unicode cBuiltIn, XclTokenArrayRef xTokArr, SCTAB nScTab ); /** Inserts a new built-in defined name, referring to the passed sheet range. */ sal_uInt16 InsertBuiltInName( sal_Unicode cBuiltIn, const ScRange& rRange ); /** Inserts a new built-in defined name, referring to the passed sheet range list. */ diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 0c730952e69e..17d81bb3fceb 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -195,8 +195,6 @@ public: sal_uInt16 GetFieldCount() const; /** Returns the specified pivot cache field. */ const XclExpPCField* GetField( sal_uInt16 nFieldIdx ) const; -//UNUSED2009-05 /** Returns a pivot cache field by its name. */ -//UNUSED2009-05 const XclExpPCField* GetField( const String& rFieldName ) const; /** Returns true, if this pivot cache contains non-standard fields (e.g. grouping fields). */ bool HasAddFields() const; @@ -298,8 +296,6 @@ public: /** Returns the index of the last inserted data info struct. */ sal_uInt16 GetLastDataInfoIndex() const; -//UNUSED2009-05 /** Returns an item by its name. */ -//UNUSED2009-05 const XclExpPTItem* GetItem( const String& rName ) const; /** Returns the list index of an item by its name. @param nDefaultIdx This value will be returned, if the item could not be found. */ sal_uInt16 GetItemIndex( const String& rName, sal_uInt16 nDefaultIdx ) const; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 3308827441dd..0e80b28eb939 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -133,20 +133,12 @@ public: // *** unicode string export is realized with helper class XclExpString *** // (slice length setting has no effect here -> disabled automatically) -//UNUSED2008-05 /** Writes Unicode buffer as 8/16 bit, repeats nFlags at start of a CONTINUE record. */ -//UNUSED2008-05 void WriteUnicodeBuffer( const sal_uInt16* pBuffer, sal_Size nChars, sal_uInt8 nFlags ); - /** Writes Unicode buffer as 8/16 bit, repeats nFlags at start of a CONTINUE record. */ void WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nFlags ); // *** write 8-bit-strings *** // (slice length setting has no effect here -> disabled automatically) -//UNUSED2008-05 /** Writes ByteString buffer (without string length field). */ -//UNUSED2008-05 void WriteByteStringBuffer( -//UNUSED2008-05 const ByteString& rString, -//UNUSED2008-05 sal_uInt16 nMaxLen = 0x00FF ); - /** Writes string length field and ByteString buffer. */ void WriteByteString( const ByteString& rString, diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index b468696cb3ff..f5c54659ea6e 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -79,25 +79,6 @@ public: const ::rtl::OUString& rString, XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); -//UNUSED2008-05 /** Constructs a formatted BIFF8 Unicode string. -//UNUSED2008-05 @param rFormats The formatting runs. -//UNUSED2008-05 @param nFlags Modifiers for string export. -//UNUSED2008-05 @param nMaxLen The maximum number of characters to store in this string. */ -//UNUSED2008-05 explicit XclExpString( -//UNUSED2008-05 const String& rString, -//UNUSED2008-05 const XclFormatRunVec& rFormats, -//UNUSED2008-05 XclStrFlags nFlags = EXC_STR_DEFAULT, -//UNUSED2008-05 sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); -//UNUSED2008-05 -//UNUSED2008-05 /** Constructs a formatted BIFF8 Unicode string. -//UNUSED2008-05 @param rFormats The formatting runs. -//UNUSED2008-05 @param nFlags Modifiers for string export. -//UNUSED2008-05 @param nMaxLen The maximum number of characters to store in this string. */ -//UNUSED2008-05 explicit XclExpString( -//UNUSED2008-05 const ::rtl::OUString& rString, -//UNUSED2008-05 const XclFormatRunVec& rFormats, -//UNUSED2008-05 XclStrFlags nFlags = EXC_STR_DEFAULT, -//UNUSED2008-05 sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); // assign ----------------------------------------------------------------- @@ -150,28 +131,12 @@ public: XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); -//UNUSED2008-05 /** Assigns a character, converts this object to a BIFF2-BIFF7 byte string. -//UNUSED2008-05 @param nFlags Modifiers for string export. -//UNUSED2008-05 @param nMaxLen The maximum number of characters to store in this string (for appending). */ -//UNUSED2008-05 void AssignByte( -//UNUSED2008-05 sal_Unicode cChar, -//UNUSED2008-05 rtl_TextEncoding eTextEnc, -//UNUSED2008-05 XclStrFlags nFlags = EXC_STR_DEFAULT, -//UNUSED2008-05 sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); - // append ----------------------------------------------------------------- /** Appends a string. Uses the string flags used in constructor or last Assign(). @descr This object must be a BIFF8 Unicode string. */ void Append( const String& rString ); -//UNUSED2008-05 /** Appends a string. Uses the string flags used in constructor or last Assign(). -//UNUSED2008-05 @descr This object must be a BIFF8 Unicode string. */ -//UNUSED2008-05 void Append( const ::rtl::OUString& rString ); -//UNUSED2008-05 /** Appends a character. Uses the string flags used in constructor or last Assign(). -//UNUSED2008-05 @descr This object must be a BIFF8 Unicode string. */ -//UNUSED2008-05 void Append( sal_Unicode cChar ); - /** Appends a string. Uses the string flags used in constructor or last Assign(). @descr This object must be a BIFF2-BIFF7 byte string. */ void AppendByte( const String& rString, rtl_TextEncoding eTextEnc ); diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index fd7303509688..2a17d09a57fc 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -569,23 +569,6 @@ class XclExpDefaultXF : public XclExpXF public: explicit XclExpDefaultXF( const XclExpRoot& rRoot, bool bCellXF ); -//UNUSED2008-05 /** Sets the parent XF ID. Only allowed for cell XFs. */ -//UNUSED2008-05 void SetParent( sal_uInt32 nParentXFId ); -//UNUSED2008-05 -//UNUSED2008-05 /** Sets all "attribute used" flags explicitely. -//UNUSED2008-05 @descr The following Set***() functions set the appropriate flag too. */ -//UNUSED2008-05 void SetUsedFlags( -//UNUSED2008-05 bool bProtUsed, bool bFontUsed, bool bFmtUsed, -//UNUSED2008-05 bool bAlignUsed, bool bBorderUsed, bool bAreaUsed ); -//UNUSED2008-05 /** Sets the cell protection flags. */ -//UNUSED2008-05 void SetProtection( const XclExpCellProt& rProtection ); -//UNUSED2008-05 /** Sets cell alignment attributes. */ -//UNUSED2008-05 void SetAlignment( const XclExpCellAlign& rAlignment ); -//UNUSED2008-05 /** Sets a cell border style. */ -//UNUSED2008-05 void SetBorder( const XclExpCellBorder& rBorder ); -//UNUSED2008-05 /** Sets a cell area style. */ -//UNUSED2008-05 void SetArea( const XclExpCellArea& rArea ); - /** Sets the Excel font index. */ void SetFont( sal_uInt16 nXclFont ); /** Sets the Excel number format index. */ diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 723f9dde09e0..51187a9b0178 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -404,28 +404,6 @@ private: bool mbValue; /// The cell value. }; -// ---------------------------------------------------------------------------- - -//UNUSED2009-05 /** Represents a BOOLERR record that describes a cell with an error code. */ -//UNUSED2009-05 class XclExpErrorCell : public XclExpSingleCellBase -//UNUSED2009-05 { -//UNUSED2009-05 DECL_FIXEDMEMPOOL_NEWDEL( XclExpErrorCell ) -//UNUSED2009-05 -//UNUSED2009-05 public: -//UNUSED2009-05 explicit XclExpErrorCell( const XclExpRoot rRoot, const XclAddress& rXclPos, -//UNUSED2009-05 const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, -//UNUSED2009-05 sal_uInt8 nErrCode ); -//UNUSED2009-05 -//UNUSED2009-05 virtual void SaveXml( XclExpXmlStream& rStrm ); -//UNUSED2009-05 private: -//UNUSED2009-05 virtual void WriteContents( XclExpStream& rStrm ); -//UNUSED2009-05 -//UNUSED2009-05 private: -//UNUSED2009-05 sal_uInt8 mnErrCode; /// The error code. -//UNUSED2009-05 }; - -// ---------------------------------------------------------------------------- - class ScStringCell; class ScEditCell; class XclExpHyperlinkHelper; diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 0167d160f297..5f482909f982 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -922,8 +922,6 @@ private: class XclImpSolverContainer : public SvxMSDffSolverContainer { public: -//UNUSED2009-05 /** Reads the entire solver container. Stream must point to begin of container header. */ -//UNUSED2009-05 void ReadSolverContainer( SvStream& rDffStrm ); /** Inserts information about a new SdrObject. */ void InsertSdrObjectInfo( SdrObject& rSdrObj, sal_uInt32 nDffShapeId, sal_uInt32 nDffFlags ); diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 05412c306c0c..e1e01f2e7ed0 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -86,25 +86,8 @@ public: bool ConvertRange( ScRange& rScRange, const XclRange& rXclRange, SCTAB nScTab1, SCTAB nScTab2, bool bWarn ); -//UNUSED2009-05 /** Returns a valid cell range by moving it into allowed dimensions. -//UNUSED2009-05 @descr The start and/or end position of the range may be modified. -//UNUSED2009-05 @param rXclRange The Excel cell range to convert. -//UNUSED2009-05 @param bWarn true = Sets the internal flag that produces a warning box -//UNUSED2009-05 after loading/saving the file, if the cell range contains invalid cells. -//UNUSED2009-05 @return The converted Calc cell range. */ -//UNUSED2009-05 ScRange CreateValidRange( const XclRange& rXclRange, -//UNUSED2009-05 SCTAB nScTab1, SCTAB nScTab2, bool bWarn ); - // cell range list -------------------------------------------------------- -//UNUSED2009-05 /** Checks if the passed cell range list is valid. -//UNUSED2009-05 @param rXclRanges The Excel cell range list to check. -//UNUSED2009-05 @param bWarn true = Sets the internal flag that produces a warning box -//UNUSED2009-05 after loading/saving the file, if the cell range list contains at -//UNUSED2009-05 least one invalid range. -//UNUSED2009-05 @return true = Cell range list in rScRanges is completly valid. */ -//UNUSED2009-05 bool CheckRangeList( const XclRangeList& rXclRanges, bool bWarn ); - /** Converts the passed Excel cell range list to a Calc cell range list. @descr The start position of the ranges will not be modified. Cell ranges that fit partly into valid dimensions are cropped @@ -136,12 +119,6 @@ public: const XclImpRoot& rRoot, const XclImpString& rString ); -//UNUSED2009-05 /** Returns a new edit engine text object for a cell note. -//UNUSED2009-05 @param nXFIndex Index to XF for first text portion (for escapement). */ -//UNUSED2009-05 static EditTextObject* CreateNoteObject( -//UNUSED2009-05 const XclImpRoot& rRoot, -//UNUSED2009-05 const XclImpString& rString ); - /** Creates a new text cell or edit cell for a Calc document. @param nXFIndex Index to XF for first text portion (for escapement). */ static ScBaseCell* CreateCell( diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 9b27077d78e7..e0de7eae1192 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -304,8 +304,6 @@ public: /** Seeks to last position from user position stack. @descr This position will be removed from the stack. */ void PopPosition(); -//UNUSED2008-05 /** Removes last position from user position stack, but does not seek to it. */ -//UNUSED2008-05 void RejectPosition(); /** Stores current position. This position keeps valid in all records. */ void StoreGlobalPosition(); diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index ad48c05a93f4..0afd920a3546 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -527,9 +527,6 @@ public: /** Returns true, if this is a standard field build directly from source data. */ bool IsStandardField() const; -//UNUSED2008-05 /** Returns true, if the items of the field are calculated from a formula. */ -//UNUSED2008-05 bool IsCalculatedField() const; - /** Returns true, if this field is a grouping field. */ bool IsStdGroupField() const; /** Returns true, if this field is a numeric grouping field. */ diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index 604b53a1f8ff..dbe6063ed4e6 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -377,8 +377,6 @@ struct XclFontData void SetApiHeight( float fPoint ); /** Sets the API font family. */ void SetApiFamily( sal_Int16 nApiFamily ); -//UNUSED2009-05 /** Sets the API font text encoding. */ -//UNUSED2009-05 void SetApiFontEncoding( sal_Int16 nApiFontEnc ); /** Sets the API font posture. */ void SetApiPosture( ::com::sun::star::awt::FontSlant eApiPosture ); /** Sets the API font weight. */ @@ -475,9 +473,6 @@ protected: /** Returns the current number format map. */ inline const XclNumFmtMap& GetFormatMap() const { return maFmtMap; } -//UNUSED2008-05 /** Returns the number format with the specified Excel format index. */ -//UNUSED2008-05 const XclNumFmt* GetFormat( sal_uInt16 nXclNumFmt ) const; - /** Inserts a new number format for the specified Excel format index. */ void InsertFormat( sal_uInt16 nXclNumFmt, const String& rFormat ); diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index 4ab0c8bb3b14..bdfe84104c93 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.cxx @@ -167,23 +167,6 @@ void OP_Label( SvStream& r, UINT16 n ) delete [] pText; } - -//UNUSED2009-05 void OP_Text( SvStream& r, UINT16 n ) // WK3 -//UNUSED2009-05 { -//UNUSED2009-05 UINT16 nRow; -//UNUSED2009-05 BYTE nCol, nTab; -//UNUSED2009-05 sal_Char pText[ 256 ]; -//UNUSED2009-05 -//UNUSED2009-05 r >> nRow >> nTab >> nCol; -//UNUSED2009-05 n -= 4; -//UNUSED2009-05 -//UNUSED2009-05 r.Read( pText, n ); -//UNUSED2009-05 pText[ n ] = 0; // zur Sicherheit Nullterminator anhaengen -//UNUSED2009-05 -//UNUSED2009-05 PutFormString( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), static_cast<SCTAB> (nTab), pText ); -//UNUSED2009-05 } - - void OP_Formula( SvStream& r, UINT16 /*n*/ ) { BYTE nFormat; diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index 4de6246f4f28..bceb030957ee 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -353,13 +353,6 @@ void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUS SvXMLUnitConverter::convertDateTime(sDate, aAPIDateTime); } -//UNUSED2008-05 void ScXMLConverter::ConvertStringToDateTime(const rtl::OUString& sDate, DateTime& aDateTime, SvXMLUnitConverter* /* pUnitConverter */) -//UNUSED2008-05 { -//UNUSED2008-05 com::sun::star::util::DateTime aAPIDateTime; -//UNUSED2008-05 SvXMLUnitConverter::convertDateTime(aAPIDateTime, sDate); -//UNUSED2008-05 ConvertAPIToCoreDateTime(aAPIDateTime, aDateTime); -//UNUSED2008-05 } - void ScXMLConverter::ConvertCoreToAPIDateTime(const DateTime& aDateTime, util::DateTime& rDateTime) { rDateTime.Year = aDateTime.GetYear(); diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index 94766ebe08ff..493ccb720b46 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -108,9 +108,6 @@ public: const sal_Bool bIsFormula = sal_True); // EXPORT: Core Date Time static void ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate); -//UNUSED2008-05 // IMPORT: Core Date Time -//UNUSED2008-05 static void ConvertStringToDateTime(const rtl::OUString& sDate, DateTime& aDateTime, SvXMLUnitConverter* pUnitConverter); - static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime); static void ConvertAPIToCoreDateTime(const com::sun::star::util::DateTime& aDateTime, DateTime& rDateTime); diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index d5db877f7ad3..6a72dfbc60fb 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2768,25 +2768,6 @@ void ScXMLExport::CollectInternalShape( uno::Reference< drawing::XShape > xShape } } -//UNUSED2008-05 sal_Bool ScXMLExport::GetMerge (const uno::Reference <sheet::XSpreadsheet>& xTable, -//UNUSED2008-05 const sal_Int32 nCol, const sal_Int32 nRow, -//UNUSED2008-05 table::CellRangeAddress& aCellAddress) -//UNUSED2008-05 { -//UNUSED2008-05 uno::Reference<sheet::XSheetCellRange> xSheetCellRange(xTable->getCellRangeByPosition(nCol, nRow, nCol, nRow), uno::UNO_QUERY); -//UNUSED2008-05 if (xSheetCellRange.is()) -//UNUSED2008-05 { -//UNUSED2008-05 uno::Reference<sheet::XSheetCellCursor> xCursor(xTable->createCursorByRange(xSheetCellRange)); -//UNUSED2008-05 if (xCursor.is()) -//UNUSED2008-05 { -//UNUSED2008-05 uno::Reference<sheet::XCellRangeAddressable> xCellAddress (xCursor, uno::UNO_QUERY); -//UNUSED2008-05 xCursor->collapseToMergedArea(); -//UNUSED2008-05 aCellAddress = xCellAddress->getRangeAddress(); -//UNUSED2008-05 return sal_True; -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 return sal_False; -//UNUSED2008-05 } - sal_Bool ScXMLExport::GetMerged (const table::CellRangeAddress* pCellAddress, const uno::Reference <sheet::XSpreadsheet>& xTable) { @@ -2832,51 +2813,6 @@ sal_Bool ScXMLExport::GetMerged (const table::CellRangeAddress* pCellAddress, return !bReady; } -//UNUSED2008-05 sal_Bool ScXMLExport::IsMatrix (const uno::Reference <table::XCellRange>& xCellRange, -//UNUSED2008-05 const uno::Reference <sheet::XSpreadsheet>& xTable, -//UNUSED2008-05 const sal_Int32 nCol, const sal_Int32 nRow, -//UNUSED2008-05 table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const -//UNUSED2008-05 { -//UNUSED2008-05 bIsFirst = sal_False; -//UNUSED2008-05 uno::Reference <sheet::XArrayFormulaRange> xArrayFormulaRange (xCellRange->getCellRangeByPosition(nCol,nRow,nCol,nRow), uno::UNO_QUERY); -//UNUSED2008-05 if (xArrayFormulaRange.is()) -//UNUSED2008-05 { -//UNUSED2008-05 rtl::OUString sArrayFormula(xArrayFormulaRange->getArrayFormula()); -//UNUSED2008-05 if (sArrayFormula.getLength()) -//UNUSED2008-05 { -//UNUSED2008-05 uno::Reference<sheet::XSheetCellRange> xMatrixSheetCellRange (xArrayFormulaRange, uno::UNO_QUERY); -//UNUSED2008-05 if (xMatrixSheetCellRange.is()) -//UNUSED2008-05 { -//UNUSED2008-05 uno::Reference<sheet::XSheetCellCursor> xMatrixSheetCursor(xTable->createCursorByRange(xMatrixSheetCellRange)); -//UNUSED2008-05 if (xMatrixSheetCursor.is()) -//UNUSED2008-05 { -//UNUSED2008-05 xMatrixSheetCursor->collapseToCurrentArray(); -//UNUSED2008-05 uno::Reference<sheet::XCellRangeAddressable> xMatrixCellAddress (xMatrixSheetCursor, uno::UNO_QUERY); -//UNUSED2008-05 if (xMatrixCellAddress.is()) -//UNUSED2008-05 { -//UNUSED2008-05 aCellAddress = xMatrixCellAddress->getRangeAddress(); -//UNUSED2008-05 if ((aCellAddress.StartColumn == nCol && aCellAddress.StartRow == nRow) && -//UNUSED2008-05 (aCellAddress.EndColumn > nCol || aCellAddress.EndRow > nRow)) -//UNUSED2008-05 { -//UNUSED2008-05 bIsFirst = sal_True; -//UNUSED2008-05 return sal_True; -//UNUSED2008-05 } -//UNUSED2008-05 else if (aCellAddress.StartColumn != nCol || aCellAddress.StartRow != nRow || -//UNUSED2008-05 aCellAddress.EndColumn != nCol || aCellAddress.EndRow != nRow) -//UNUSED2008-05 return sal_True; -//UNUSED2008-05 else -//UNUSED2008-05 { -//UNUSED2008-05 bIsFirst = sal_True; -//UNUSED2008-05 return sal_True; -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 return sal_False; -//UNUSED2008-05 } - sal_Bool ScXMLExport::IsMatrix (const ScAddress& aCell, table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const { @@ -3566,14 +3502,6 @@ sal_Bool ScXMLExport::IsEditCell(const com::sun::star::table::CellAddress& aAddr return sal_False; } -//UNUSED2008-05 sal_Bool ScXMLExport::IsEditCell(const com::sun::star::uno::Reference <com::sun::star::table::XCell>& xCell) const -//UNUSED2008-05 { -//UNUSED2008-05 uno::Reference<sheet::XCellAddressable> xAddressable (xCell, uno::UNO_QUERY); -//UNUSED2008-05 if ( xAddressable.is() ) -//UNUSED2008-05 return IsEditCell(xAddressable->getCellAddress()); -//UNUSED2008-05 return sal_False; -//UNUSED2008-05 } - sal_Bool ScXMLExport::IsEditCell(ScMyCell& rCell) const { if (rCell.bKnowWhetherIsEditCell) @@ -3610,44 +3538,6 @@ sal_Bool ScXMLExport::IsMultiLineFormulaCell(ScMyCell& rCell) const return static_cast<ScFormulaCell*>(rCell.pBaseCell)->IsMultilineResult(); } -//UNUSED2008-05 sal_Bool ScXMLExport::IsAnnotationEqual(const uno::Reference<table::XCell>& /* xCell1 */, -//UNUSED2008-05 const uno::Reference<table::XCell>& /* xCell2 */) -//UNUSED2008-05 { -//UNUSED2008-05 // no longer compareable, because the position and size and other attributes can also differ -//UNUSED2008-05 -//UNUSED2008-05 /* uno::Reference<sheet::XSheetAnnotationAnchor> xSheetAnnotationAnchor1(xCell1, uno::UNO_QUERY); -//UNUSED2008-05 uno::Reference<sheet::XSheetAnnotationAnchor> xSheetAnnotationAnchor2(xCell2, uno::UNO_QUERY); -//UNUSED2008-05 if (xSheetAnnotationAnchor1.is() && xSheetAnnotationAnchor2.is()) -//UNUSED2008-05 { -//UNUSED2008-05 uno::Reference <sheet::XSheetAnnotation> xSheetAnnotation1(xSheetAnnotationAnchor1->getAnnotation()); -//UNUSED2008-05 uno::Reference <sheet::XSheetAnnotation> xSheetAnnotation2(xSheetAnnotationAnchor2->getAnnotation()); -//UNUSED2008-05 uno::Reference<text::XSimpleText> xSimpleText1(xSheetAnnotation1, uno::UNO_QUERY); -//UNUSED2008-05 uno::Reference<text::XSimpleText> xSimpleText2(xSheetAnnotation2, uno::UNO_QUERY); -//UNUSED2008-05 if (xSheetAnnotation1.is() && xSimpleText1.is() && -//UNUSED2008-05 xSheetAnnotation2.is() && xSimpleText2.is()) -//UNUSED2008-05 { -//UNUSED2008-05 rtl::OUString sText1(xSimpleText1->getString()); -//UNUSED2008-05 rtl::OUString sText2(xSimpleText2->getString()); -//UNUSED2008-05 sal_Int32 nLength1(sText1.getLength()); -//UNUSED2008-05 sal_Int32 nLength2(sText2.getLength()); -//UNUSED2008-05 if (nLength1 && nLength2) -//UNUSED2008-05 if (sText1 == sText2 && -//UNUSED2008-05 xSheetAnnotation1->getAuthor() == xSheetAnnotation2->getAuthor() && -//UNUSED2008-05 xSheetAnnotation1->getDate() == xSheetAnnotation2->getDate() && -//UNUSED2008-05 xSheetAnnotation1->getIsVisible() == xSheetAnnotation2->getIsVisible()) -//UNUSED2008-05 return sal_True; -//UNUSED2008-05 else -//UNUSED2008-05 return sal_False; -//UNUSED2008-05 else -//UNUSED2008-05 if (nLength1 || nLength2) -//UNUSED2008-05 return sal_False; -//UNUSED2008-05 else -//UNUSED2008-05 return sal_True; -//UNUSED2008-05 } -//UNUSED2008-05 }*/ -//UNUSED2008-05 return sal_False; -//UNUSED2008-05 } - sal_Bool ScXMLExport::IsCellEqual (ScMyCell& aCell1, ScMyCell& aCell2) { ScAddress aCellPos1; diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index e024fc6a0de0..ed9ce4d2fe78 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -173,10 +173,6 @@ class ScXMLExport : public SvXMLExport void FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRowGroup* pGroups); void FillColumnRowGroups(); -//UNUSED2008-05 sal_Bool GetMerge (const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet>& xTable, -//UNUSED2008-05 sal_Int32 nCol, sal_Int32 nRow, -//UNUSED2008-05 com::sun::star::table::CellRangeAddress& aCellAddress); - sal_Bool GetMerged (const com::sun::star::table::CellRangeAddress* pCellRange, const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet>& xTable); @@ -193,11 +189,8 @@ class ScXMLExport : public SvXMLExport sal_Bool IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const; sal_Bool IsEditCell(const com::sun::star::table::CellAddress& aAddress, ScMyCell* pMyCell = NULL) const; -//UNUSED2008-05 sal_Bool IsEditCell(const com::sun::star::uno::Reference <com::sun::star::table::XCell>& xCell) const; sal_Bool IsEditCell(ScMyCell& rCell) const; sal_Bool IsMultiLineFormulaCell(ScMyCell& rCell) const; -//UNUSED2008-05 sal_Bool IsAnnotationEqual(const com::sun::star::uno::Reference<com::sun::star::table::XCell>& xCell1, -//UNUSED2008-05 const com::sun::star::uno::Reference<com::sun::star::table::XCell>& xCell2); sal_Bool IsCellEqual (ScMyCell& aCell1, ScMyCell& aCell2); void WriteCalculationSettings(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc); @@ -242,10 +235,6 @@ public: static sal_Int16 GetFieldUnit(); inline ScDocument* GetDocument() { return pDoc; } inline const ScDocument* GetDocument() const { return pDoc; } -//UNUSED2008-05 sal_Bool IsMatrix (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange, -//UNUSED2008-05 const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet>& xTable, -//UNUSED2008-05 const sal_Int32 nCol, const sal_Int32 nRow, -//UNUSED2008-05 com::sun::star::table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const; sal_Bool IsMatrix (const ScAddress& aCell, com::sun::star::table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const; diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index d35c181511a4..e3d9d9378213 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -859,9 +859,6 @@ public: // SvXMLImportContextRef GetStyles() const { return xStyles; } const SvXMLTokenMap& GetDocElemTokenMap(); -//UNUSED2008-05 const SvXMLTokenMap& GetStylesElemTokenMap(); -//UNUSED2008-05 const SvXMLTokenMap& GetStylesAttrTokenMap(); -//UNUSED2008-05 const SvXMLTokenMap& GetStyleElemTokenMap(); const SvXMLTokenMap& GetBodyElemTokenMap(); const SvXMLTokenMap& GetContentValidationsElemTokenMap(); const SvXMLTokenMap& GetContentValidationElemTokenMap(); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index dbe647bc433f..0d7e5bcc7d11 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -97,35 +97,6 @@ ScXMLImportWrapper::ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, const uno: DBG_ASSERT( pMedium || xStorage.is(), "ScXMLImportWrapper: Medium or Storage must be set" ); } -//UNUSED2008-05 uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator( -//UNUSED2008-05 uno::Reference < frame::XModel> & rModel) -//UNUSED2008-05 { -//UNUSED2008-05 DBG_ERROR( "The status indicator from medium must be used!" ); -//UNUSED2008-05 -//UNUSED2008-05 uno::Reference<task::XStatusIndicator> xStatusIndicator; -//UNUSED2008-05 -//UNUSED2008-05 if (rModel.is()) -//UNUSED2008-05 { -//UNUSED2008-05 uno::Reference<frame::XController> xController( rModel->getCurrentController()); -//UNUSED2008-05 if ( xController.is()) -//UNUSED2008-05 { -//UNUSED2008-05 uno::Reference<task::XStatusIndicatorFactory> xFactory( xController->getFrame(), uno::UNO_QUERY ); -//UNUSED2008-05 if ( xFactory.is()) -//UNUSED2008-05 { -//UNUSED2008-05 try -//UNUSED2008-05 { -//UNUSED2008-05 xStatusIndicator.set(xFactory->createStatusIndicator()); -//UNUSED2008-05 } -//UNUSED2008-05 catch ( lang::DisposedException e ) -//UNUSED2008-05 { -//UNUSED2008-05 DBG_ERROR("Exception while trying to get a Status Indicator"); -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 return xStatusIndicator; -//UNUSED2008-05 } - uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator() { uno::Reference<task::XStatusIndicator> xStatusIndicator; |