diff options
author | Justin Malcolm <malcolm.justin@gmail.com> | 2010-09-28 22:45:09 -0400 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2010-09-28 22:45:09 -0400 |
commit | 4c2fcdee1949996c6f63d1f0645e5cb2edf8e00d (patch) | |
tree | 09149b91a47819d5a0626a600833b7ac819db626 | |
parent | c062dad9b1d937a975354ceee75b7f16b756c2d2 (diff) |
This gets rid of a great number of the comments
There are a great number of places in calc where code is commented out
with lines staring in "//UNUSED". Since 'git' is being used, there is
no reason to keep old code like this in comments.
84 files changed, 2 insertions, 2156 deletions
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 9d784b373465..63af502554c7 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -1838,41 +1838,6 @@ BOOL ScAttrArray::IsEmpty() const } -//UNUSED2008-05 SCROW ScAttrArray::GetFirstEntryPos() const -//UNUSED2008-05 { -//UNUSED2008-05 DBG_ASSERT( nCount, "nCount = 0" ); -//UNUSED2008-05 -//UNUSED2008-05 if ( pData[0].pPattern != pDocument->GetDefPattern() ) -//UNUSED2008-05 return 0; -//UNUSED2008-05 else -//UNUSED2008-05 { -//UNUSED2008-05 if (nCount==1) -//UNUSED2008-05 return 0; // leer -//UNUSED2008-05 else -//UNUSED2008-05 return pData[0].nRow + 1; -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 -//UNUSED2008-05 SCROW ScAttrArray::GetLastEntryPos( BOOL bIncludeBottom ) const -//UNUSED2008-05 { -//UNUSED2008-05 DBG_ASSERT( nCount, "nCount == 0" ); -//UNUSED2008-05 -//UNUSED2008-05 if (bIncludeBottom) -//UNUSED2008-05 bIncludeBottom = ( pData[nCount-1].pPattern != pDocument->GetDefPattern() ); -//UNUSED2008-05 -//UNUSED2008-05 if (bIncludeBottom) -//UNUSED2008-05 return MAXROW; -//UNUSED2008-05 else -//UNUSED2008-05 { -//UNUSED2008-05 if (nCount<=1) -//UNUSED2008-05 return 0; // leer -//UNUSED2008-05 else -//UNUSED2008-05 return pData[nCount-2].nRow; -//UNUSED2008-05 } -//UNUSED2008-05 } - - BOOL ScAttrArray::GetFirstVisibleAttr( SCROW& rFirstRow ) const { DBG_ASSERT( nCount, "nCount == 0" ); @@ -2602,41 +2567,3 @@ void ScAttrArray::Load( SvStream& /* rStream */ ) } #endif - -//UNUSED2008-05 void ScAttrArray::ConvertFontsAfterLoad() -//UNUSED2008-05 { -//UNUSED2008-05 ScFontToSubsFontConverter_AutoPtr xFontConverter; -//UNUSED2008-05 const ULONG nFlags = FONTTOSUBSFONT_IMPORT | FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS; -//UNUSED2008-05 SCSIZE nIndex = 0; -//UNUSED2008-05 SCROW nThisRow = 0; -//UNUSED2008-05 -//UNUSED2008-05 while ( nThisRow <= MAXROW ) -//UNUSED2008-05 { -//UNUSED2008-05 const ScPatternAttr* pOldPattern = pData[nIndex].pPattern; -//UNUSED2008-05 const SfxPoolItem* pItem; -//UNUSED2008-05 if( pOldPattern->GetItemSet().GetItemState( ATTR_FONT, FALSE, &pItem ) == SFX_ITEM_SET ) -//UNUSED2008-05 { -//UNUSED2008-05 const SvxFontItem* pFontItem = (const SvxFontItem*) pItem; -//UNUSED2008-05 const String& rOldName = pFontItem->GetFamilyName(); -//UNUSED2008-05 xFontConverter = CreateFontToSubsFontConverter( rOldName, nFlags ); -//UNUSED2008-05 if ( xFontConverter ) -//UNUSED2008-05 { -//UNUSED2008-05 String aNewName( GetFontToSubsFontName( xFontConverter ) ); -//UNUSED2008-05 if ( aNewName != rOldName ) -//UNUSED2008-05 { -//UNUSED2008-05 SCROW nAttrRow = pData[nIndex].nRow; -//UNUSED2008-05 SvxFontItem aNewItem( pFontItem->GetFamily(), aNewName, -//UNUSED2008-05 pFontItem->GetStyleName(), pFontItem->GetPitch(), -//UNUSED2008-05 RTL_TEXTENCODING_DONTKNOW, ATTR_FONT ); -//UNUSED2008-05 ScPatternAttr aNewPattern( *pOldPattern ); -//UNUSED2008-05 aNewPattern.GetItemSet().Put( aNewItem ); -//UNUSED2008-05 SetPatternArea( nThisRow, nAttrRow, &aNewPattern, TRUE ); -//UNUSED2008-05 Search( nThisRow, nIndex ); //! data changed -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 ++nIndex; -//UNUSED2008-05 nThisRow = pData[nIndex-1].nRow+1; -//UNUSED2008-05 } -//UNUSED2008-05 } - diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 301883197fb8..c149296317c3 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -519,15 +519,6 @@ ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) // ----------------------------------------------------------------------- -//UNUSED2008-05 ScTableListItem::ScTableListItem( const USHORT nWhichP, const List& rList ) -//UNUSED2008-05 : SfxPoolItem ( nWhichP ), -//UNUSED2008-05 nCount ( 0 ), -//UNUSED2008-05 pTabArr ( NULL ) -//UNUSED2008-05 { -//UNUSED2008-05 SetTableList( rList ); -//UNUSED2008-05 } - -// ----------------------------------------------------------------------- ScTableListItem::~ScTableListItem() { @@ -631,35 +622,6 @@ SfxItemPresentation ScTableListItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -// ----------------------------------------------------------------------- - -//UNUSED2009-05 BOOL ScTableListItem::GetTableList( List& aList ) const -//UNUSED2009-05 { -//UNUSED2009-05 for ( USHORT i=0; i<nCount; i++ ) -//UNUSED2009-05 aList.Insert( new SCTAB( pTabArr[i] ) ); -//UNUSED2009-05 -//UNUSED2009-05 return ( nCount > 0 ); -//UNUSED2009-05 } - -// ----------------------------------------------------------------------- - -//UNUSED2009-05 void ScTableListItem::SetTableList( const List& rList ) -//UNUSED2009-05 { -//UNUSED2009-05 nCount = (USHORT)rList.Count(); -//UNUSED2009-05 -//UNUSED2009-05 delete [] pTabArr; -//UNUSED2009-05 -//UNUSED2009-05 if ( nCount > 0 ) -//UNUSED2009-05 { -//UNUSED2009-05 pTabArr = new SCTAB [nCount]; -//UNUSED2009-05 -//UNUSED2009-05 for ( USHORT i=0; i<nCount; i++ ) -//UNUSED2009-05 pTabArr[i] = *( (SCTAB*)rList.GetObject( i ) ); -//UNUSED2009-05 } -//UNUSED2009-05 else -//UNUSED2009-05 pTabArr = NULL; -//UNUSED2009-05 } - // ----------------------------------------------------------------------- // ScPageHFItem - Daten der Kopf-/Fusszeilen @@ -931,63 +893,6 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const //------------------------------------------------------------------------ -//UNUSED2009-05 class ScFieldChangerEditEngine : public ScEditEngineDefaulter -//UNUSED2009-05 { -//UNUSED2009-05 TypeId aExtFileId; -//UNUSED2009-05 USHORT nConvPara; -//UNUSED2009-05 xub_StrLen nConvPos; -//UNUSED2009-05 BOOL bConvert; -//UNUSED2009-05 -//UNUSED2009-05 public: -//UNUSED2009-05 ScFieldChangerEditEngine( SfxItemPool* pEnginePool, BOOL bDeleteEnginePool ); -//UNUSED2009-05 virtual ~ScFieldChangerEditEngine() {} -//UNUSED2009-05 -//UNUSED2009-05 virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, -//UNUSED2009-05 USHORT nPos, Color*& rTxtColor, -//UNUSED2009-05 Color*& rFldColor ); -//UNUSED2009-05 -//UNUSED2009-05 BOOL ConvertFields(); -//UNUSED2009-05 }; -//UNUSED2009-05 -//UNUSED2009-05 ScFieldChangerEditEngine::ScFieldChangerEditEngine( SfxItemPool* pEnginePoolP, -//UNUSED2009-05 BOOL bDeleteEnginePoolP ) : -//UNUSED2009-05 ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP ), -//UNUSED2009-05 aExtFileId( TYPE( SvxExtFileField ) ), -//UNUSED2009-05 nConvPara( 0 ), -//UNUSED2009-05 nConvPos( 0 ), -//UNUSED2009-05 bConvert( FALSE ) -//UNUSED2009-05 { -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 String ScFieldChangerEditEngine::CalcFieldValue( const SvxFieldItem& rField, -//UNUSED2009-05 USHORT nPara, USHORT nPos, Color*& /* rTxtColor */, Color*& /* rFldColor */ ) -//UNUSED2009-05 { -//UNUSED2009-05 const SvxFieldData* pFieldData = rField.GetField(); -//UNUSED2009-05 if ( pFieldData && pFieldData->Type() == aExtFileId ) -//UNUSED2009-05 { -//UNUSED2009-05 bConvert = TRUE; -//UNUSED2009-05 nConvPara = nPara; -//UNUSED2009-05 nConvPos = nPos; -//UNUSED2009-05 } -//UNUSED2009-05 return EMPTY_STRING; -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 BOOL ScFieldChangerEditEngine::ConvertFields() -//UNUSED2009-05 { -//UNUSED2009-05 BOOL bConverted = FALSE; -//UNUSED2009-05 do -//UNUSED2009-05 { -//UNUSED2009-05 bConvert = FALSE; -//UNUSED2009-05 UpdateFields(); -//UNUSED2009-05 if ( bConvert ) -//UNUSED2009-05 { -//UNUSED2009-05 ESelection aSel( nConvPara, nConvPos, nConvPara, nConvPos+1 ); -//UNUSED2009-05 QuickInsertField( SvxFieldItem( SvxFileField(), EE_FEATURE_FIELD), aSel ); -//UNUSED2009-05 bConverted = TRUE; -//UNUSED2009-05 } -//UNUSED2009-05 } while ( bConvert ); -//UNUSED2009-05 return bConverted; -//UNUSED2009-05 } void ScPageHFItem::SetLeftArea( const EditTextObject& rNew ) { diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index e1f01b75aa0b..0383409532a2 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -237,13 +237,6 @@ BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const } -//UNUSED2009-05 BOOL ScColumn::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, -//UNUSED2009-05 BOOL bLeft, BOOL bRight ) const -//UNUSED2009-05 { -//UNUSED2009-05 return pAttrArray->HasLines( nRow1, nRow2, rSizes, bLeft, bRight ); -//UNUSED2009-05 } - - bool ScColumn::HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const { return pAttrArray->HasAttrib( nRow1, nRow2, nMask ); diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index fadd75248a66..5085cb1b99b1 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -93,96 +93,6 @@ inline BOOL IsAmbiguousScript( BYTE nScript ) // ----------------------------------------------------------------------------------------- -//UNUSED2008-05 SCROW ScColumn::NoteCount( SCROW nMaxRow ) const -//UNUSED2008-05 { -//UNUSED2008-05 SCROW nNoteCount = 0; -//UNUSED2008-05 SCSIZE i; -//UNUSED2008-05 -//UNUSED2008-05 for (i=0; i<nCount; i++) -//UNUSED2008-05 if ( pItems[i].pCell->GetNotePtr() && pItems[i].nRow<=nMaxRow ) -//UNUSED2008-05 ++nNoteCount; -//UNUSED2008-05 -//UNUSED2008-05 return nNoteCount; -//UNUSED2008-05 } - -// ----------------------------------------------------------------------------------------- - -//UNUSED2008-05 void ScColumn::CorrectSymbolCells( CharSet eStreamCharSet ) -//UNUSED2008-05 { -//UNUSED2008-05 // #99139# find and correct string cells that are formatted with a symbol font, -//UNUSED2008-05 // but are not in the LoadedSymbolStringCellsList -//UNUSED2008-05 // (because CELLTYPE_SYMBOLS wasn't written in the file) -//UNUSED2008-05 -//UNUSED2008-05 ScFontToSubsFontConverter_AutoPtr xFontConverter; -//UNUSED2008-05 const ULONG nFontConverterFlags = FONTTOSUBSFONT_EXPORT | FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS; -//UNUSED2008-05 -//UNUSED2008-05 BOOL bListInitialized = FALSE; -//UNUSED2008-05 ScSymbolStringCellEntry* pCurrentEntry = NULL; -//UNUSED2008-05 -//UNUSED2008-05 ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW ); -//UNUSED2008-05 SCROW nStt, nEnd; -//UNUSED2008-05 const ScPatternAttr* pAttr = aAttrIter.Next( nStt, nEnd ); -//UNUSED2008-05 while ( pAttr ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( (xFontConverter = pAttr->GetSubsFontConverter( nFontConverterFlags )) || -//UNUSED2008-05 pAttr->IsSymbolFont() ) -//UNUSED2008-05 { -//UNUSED2008-05 ScColumnIterator aCellIter( this, nStt, nEnd ); -//UNUSED2008-05 SCROW nRow; -//UNUSED2008-05 ScBaseCell* pCell; -//UNUSED2008-05 while ( aCellIter.Next( nRow, pCell ) ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( pCell->GetCellType() == CELLTYPE_STRING ) -//UNUSED2008-05 { -//UNUSED2008-05 List& rList = pDocument->GetLoadedSymbolStringCellsList(); -//UNUSED2008-05 if (!bListInitialized) -//UNUSED2008-05 { -//UNUSED2008-05 pCurrentEntry = (ScSymbolStringCellEntry*)rList.First(); -//UNUSED2008-05 bListInitialized = TRUE; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 while ( pCurrentEntry && pCurrentEntry->nRow < nRow ) -//UNUSED2008-05 pCurrentEntry = (ScSymbolStringCellEntry*)rList.Next(); -//UNUSED2008-05 -//UNUSED2008-05 if ( pCurrentEntry && pCurrentEntry->nRow == nRow ) -//UNUSED2008-05 { -//UNUSED2008-05 // found -//UNUSED2008-05 } -//UNUSED2008-05 else -//UNUSED2008-05 { -//UNUSED2008-05 // not in list -> convert and put into list -//UNUSED2008-05 -//UNUSED2008-05 ScStringCell* pStrCell = (ScStringCell*)pCell; -//UNUSED2008-05 String aOldStr; -//UNUSED2008-05 pStrCell->GetString( aOldStr ); -//UNUSED2008-05 -//UNUSED2008-05 // convert back to stream character set (get original data) -//UNUSED2008-05 ByteString aByteStr( aOldStr, eStreamCharSet ); -//UNUSED2008-05 -//UNUSED2008-05 // convert using symbol encoding, as for CELLTYPE_SYMBOLS cells -//UNUSED2008-05 String aNewStr( aByteStr, RTL_TEXTENCODING_SYMBOL ); -//UNUSED2008-05 pStrCell->SetString( aNewStr ); -//UNUSED2008-05 -//UNUSED2008-05 ScSymbolStringCellEntry * pEntry = new ScSymbolStringCellEntry; -//UNUSED2008-05 pEntry->pCell = pStrCell; -//UNUSED2008-05 pEntry->nRow = nRow; -//UNUSED2008-05 -//UNUSED2008-05 if ( pCurrentEntry ) -//UNUSED2008-05 rList.Insert( pEntry ); // before current entry - pCurrentEntry stays valid -//UNUSED2008-05 else -//UNUSED2008-05 rList.Insert( pEntry, LIST_APPEND ); // append if already behind last entry -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 pAttr = aAttrIter.Next( nStt, nEnd ); -//UNUSED2008-05 } -//UNUSED2008-05 } - -// ----------------------------------------------------------------------------------------- - - // GetNeededSize: optimale Hoehe / Breite in Pixeln long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, @@ -1193,23 +1103,6 @@ BOOL ScMarkedDataIter::Next( SCSIZE& rIndex ) return TRUE; } -//UNUSED2009-05 USHORT ScColumn::GetErrorData( SCROW nRow ) const -//UNUSED2009-05 { -//UNUSED2009-05 SCSIZE nIndex; -//UNUSED2009-05 if (Search(nRow, nIndex)) -//UNUSED2009-05 { -//UNUSED2009-05 ScBaseCell* pCell = pItems[nIndex].pCell; -//UNUSED2009-05 switch (pCell->GetCellType()) -//UNUSED2009-05 { -//UNUSED2009-05 case CELLTYPE_FORMULA : -//UNUSED2009-05 return ((ScFormulaCell*)pCell)->GetErrCode(); -//UNUSED2009-05 // break; -//UNUSED2009-05 default: -//UNUSED2009-05 return 0; -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 return 0; -//UNUSED2009-05 } //------------ diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index aa5b011da93b..61e79c7da64e 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -233,47 +233,6 @@ void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr, } } -//UNUSED2008-05 ScValueIterator::ScValueIterator( ScDocument* pDocument, -//UNUSED2008-05 SCCOL nSCol, SCROW nSRow, SCTAB nSTab, -//UNUSED2008-05 SCCOL nECol, SCROW nERow, SCTAB nETab, -//UNUSED2008-05 BOOL bSTotal, BOOL bTextZero ) : -//UNUSED2008-05 pDoc( pDocument ), -//UNUSED2008-05 nNumFmtIndex(0), -//UNUSED2008-05 nStartCol( nSCol), -//UNUSED2008-05 nStartRow( nSRow), -//UNUSED2008-05 nStartTab( nSTab ), -//UNUSED2008-05 nEndCol( nECol ), -//UNUSED2008-05 nEndRow( nERow), -//UNUSED2008-05 nEndTab( nETab ), -//UNUSED2008-05 nNumFmtType( NUMBERFORMAT_UNDEFINED ), -//UNUSED2008-05 bNumValid( FALSE ), -//UNUSED2008-05 bSubTotal(bSTotal), -//UNUSED2008-05 bNextValid( FALSE ), -//UNUSED2008-05 bCalcAsShown( pDocument->GetDocOptions().IsCalcAsShown() ), -//UNUSED2008-05 bTextAsZero( bTextZero ) -//UNUSED2008-05 { -//UNUSED2008-05 PutInOrder( nStartCol, nEndCol); -//UNUSED2008-05 PutInOrder( nStartRow, nEndRow); -//UNUSED2008-05 PutInOrder( nStartTab, nEndTab ); -//UNUSED2008-05 -//UNUSED2008-05 if (!ValidCol(nStartCol)) nStartCol = MAXCOL; -//UNUSED2008-05 if (!ValidCol(nEndCol)) nEndCol = MAXCOL; -//UNUSED2008-05 if (!ValidRow(nStartRow)) nStartRow = MAXROW; -//UNUSED2008-05 if (!ValidRow(nEndRow)) nEndRow = MAXROW; -//UNUSED2008-05 if (!ValidTab(nStartTab)) nStartTab = MAXTAB; -//UNUSED2008-05 if (!ValidTab(nEndTab)) nEndTab = MAXTAB; -//UNUSED2008-05 -//UNUSED2008-05 nCol = nStartCol; -//UNUSED2008-05 nRow = nStartRow; -//UNUSED2008-05 nTab = nStartTab; -//UNUSED2008-05 -//UNUSED2008-05 nColRow = 0; // wird bei GetFirst initialisiert -//UNUSED2008-05 -//UNUSED2008-05 nNumFormat = 0; // werden bei GetNumberFormat initialisiert -//UNUSED2008-05 pAttrArray = 0; -//UNUSED2008-05 nAttrEndRow = 0; -//UNUSED2008-05 } - ScValueIterator::ScValueIterator( ScDocument* pDocument, const ScRange& rRange, BOOL bSTotal, BOOL bTextZero ) : pDoc( pDocument ), diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index d2c99c75a95e..8c695c7ee467 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -553,12 +553,6 @@ ScNoteEditEngine& ScDocument::GetNoteEngine() return *pNoteEngine; } -//UNUSED2009-05 SfxItemPool& ScDocument::GetNoteItemPool() -//UNUSED2009-05 { -//UNUSED2009-05 if ( !pNoteItemPool ) -//UNUSED2009-05 pNoteItemPool = new SfxItemPool(SdrObject::GetGlobalDrawObjectItemPool()); -//UNUSED2009-05 return *pNoteItemPool; -//UNUSED2009-05 } void ScDocument::ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks ) { @@ -628,22 +622,6 @@ void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, } } -//UNUSED2009-05 void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, -//UNUSED2009-05 ULONG nFormatIndex, BOOL bForceTab ) -//UNUSED2009-05 { -//UNUSED2009-05 SCTAB nTab = rPos.Tab(); -//UNUSED2009-05 if ( bForceTab && !pTab[nTab] ) -//UNUSED2009-05 { -//UNUSED2009-05 BOOL bExtras = !bIsUndo; // Spaltenbreiten, Zeilenhoehen, Flags -//UNUSED2009-05 -//UNUSED2009-05 pTab[nTab] = new ScTable(this, nTab, -//UNUSED2009-05 String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("temp")), -//UNUSED2009-05 bExtras, bExtras); -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 if (pTab[nTab]) -//UNUSED2009-05 pTab[nTab]->PutCell( rPos, nFormatIndex, pCell ); -//UNUSED2009-05 } BOOL ScDocument::GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 368ac22c0ebd..9cf345315975 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -105,14 +105,6 @@ void ScDocument::SetRangeName( ScRangeName* pNewRangeName ) pRangeName = pNewRangeName; } -//UNUSED2008-05 ScRangeData* ScDocument::GetRangeAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, -//UNUSED2008-05 BOOL bStartOnly) const -//UNUSED2008-05 { -//UNUSED2008-05 if ( pRangeName ) -//UNUSED2008-05 return pRangeName->GetRangeAtCursor( ScAddress( nCol, nRow, nTab ), bStartOnly ); -//UNUSED2008-05 else -//UNUSED2008-05 return NULL; -//UNUSED2008-05 } ScRangeData* ScDocument::GetRangeAtBlock( const ScRange& rBlock, String* pName ) const { diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index abef7d53c2af..bbd6826d99c6 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -360,57 +360,6 @@ void ScDocument::StartAnimations( SCTAB nTab, Window* pWin ) } } -//UNUSED2008-05 void ScDocument::RefreshNoteFlags() -//UNUSED2008-05 { -//UNUSED2008-05 if (!pDrawLayer) -//UNUSED2008-05 return; -//UNUSED2008-05 -//UNUSED2008-05 BOOL bAnyIntObj = FALSE; -//UNUSED2008-05 SCTAB nTab; -//UNUSED2008-05 ScPostIt aNote(this); -//UNUSED2008-05 for (nTab=0; nTab<=MAXTAB && pTab[nTab]; nTab++) -//UNUSED2008-05 { -//UNUSED2008-05 SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab)); -//UNUSED2008-05 DBG_ASSERT(pPage,"Page ?"); -//UNUSED2008-05 if (pPage) -//UNUSED2008-05 { -//UNUSED2008-05 SdrObjListIter aIter( *pPage, IM_FLAT ); -//UNUSED2008-05 SdrObject* pObject = aIter.Next(); -//UNUSED2008-05 while (pObject) -//UNUSED2008-05 { -//UNUSED2008-05 if ( pObject->GetLayer() == SC_LAYER_INTERN ) -//UNUSED2008-05 { -//UNUSED2008-05 bAnyIntObj = TRUE; // for all internal objects, including detective -//UNUSED2008-05 -//UNUSED2008-05 if ( pObject->ISA( SdrCaptionObj ) ) -//UNUSED2008-05 { -//UNUSED2008-05 ScDrawObjData* pData = ScDrawLayer::GetObjData( pObject ); -//UNUSED2008-05 if ( pData ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( GetNote( pData->aStt.Col(), pData->aStt.Row(), nTab, aNote)) -//UNUSED2008-05 if ( !aNote.IsShown() ) -//UNUSED2008-05 { -//UNUSED2008-05 aNote.SetShown(TRUE); -//UNUSED2008-05 SetNote( pData->aStt.Col(), pData->aStt.Row(), nTab, aNote); -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 pObject = aIter.Next(); -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 if (bAnyIntObj) -//UNUSED2008-05 { -//UNUSED2008-05 // update attributes for all note objects and the colors of detective objects -//UNUSED2008-05 // (we don't know with which settings the file was created) -//UNUSED2008-05 -//UNUSED2008-05 ScDetectiveFunc aFunc( this, 0 ); -//UNUSED2008-05 aFunc.UpdateAllComments(); -//UNUSED2008-05 aFunc.UpdateAllArrowColors(); -//UNUSED2008-05 } -//UNUSED2008-05 } BOOL ScDocument::HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ) { diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index f9e033ef164c..d3630ac451da 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -5195,13 +5195,6 @@ void ScDocument::AddPrintRange( SCTAB nTab, const ScRange& rNew ) } -//UNUSED2009-05 void ScDocument::SetPrintRange( SCTAB nTab, const ScRange& rNew ) -//UNUSED2009-05 { -//UNUSED2009-05 if (ValidTab(nTab) && pTab[nTab]) -//UNUSED2009-05 pTab[nTab]->SetPrintRange( rNew ); -//UNUSED2009-05 } - - void ScDocument::SetPrintEntireSheet( SCTAB nTab ) { if (ValidTab(nTab) && pTab[nTab]) diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index da40e6e230c4..7d8da8c999f8 100755 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1010,16 +1010,6 @@ void ScDPSource::CreateRes_Impl() } } -//UNUSED2009-05 void ScDPSource::DumpState( ScDocument* pDoc, const ScAddress& rPos ) -//UNUSED2009-05 { -//UNUSED2009-05 CreateRes_Impl(); -//UNUSED2009-05 -//UNUSED2009-05 ScAddress aDocPos( rPos ); -//UNUSED2009-05 -//UNUSED2009-05 if (pColResRoot->GetChildDimension()) -//UNUSED2009-05 pColResRoot->GetChildDimension()->DumpState( NULL, pDoc, aDocPos ); -//UNUSED2009-05 pRowResRoot->DumpState( pColResRoot, pDoc, aDocPos ); -//UNUSED2009-05 } void ScDPSource::FillLevelList( USHORT nOrientation, List& rList ) { @@ -1545,14 +1535,6 @@ const ScDPItemData& ScDPDimension::GetSelectedData() return *pSelectedData; } -//UNUSED2009-05 BOOL ScDPDimension::IsValidPage( const ScDPItemData& rData ) -//UNUSED2009-05 { -//UNUSED2009-05 if ( bHasSelectedPage ) -//UNUSED2009-05 return rData.IsCaseInsEqual( GetSelectedData() ); -//UNUSED2009-05 -//UNUSED2009-05 return TRUE; // no selection -> all data -//UNUSED2009-05 } - BOOL ScDPDimension::IsVisible( const ScDPItemData& rData ) { if( ScDPMembers* pMembers = this->GetHierarchiesObject()->getByIndex(0)-> diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index 3234340ae9dd..9aa5851dfca0 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -97,17 +97,6 @@ ScImportParam::~ScImportParam() { } -//UNUSED2009-05 void ScImportParam::Clear() -//UNUSED2009-05 { -//UNUSED2009-05 nCol1 = nCol2 = 0; -//UNUSED2009-05 nRow1 = nRow2 = 0; -//UNUSED2009-05 bImport = FALSE; -//UNUSED2009-05 bNative = FALSE; -//UNUSED2009-05 bSql = TRUE; -//UNUSED2009-05 nType = ScDbTable; -//UNUSED2009-05 aDBName.Erase(); -//UNUSED2009-05 aStatement.Erase(); -//UNUSED2009-05 } ScImportParam& ScImportParam::operator=( const ScImportParam& r ) { @@ -621,16 +610,6 @@ __EXPORT ScPivotParam::~ScPivotParam() //------------------------------------------------------------------------ -//UNUSED2009-05 void __EXPORT ScPivotParam::Clear() -//UNUSED2009-05 { -//UNUSED2009-05 nCol = 0; -//UNUSED2009-05 nRow = 0; -//UNUSED2009-05 nTab = 0; -//UNUSED2009-05 bIgnoreEmptyRows = bDetectCategories = FALSE; -//UNUSED2009-05 bMakeTotalCol = bMakeTotalRow = TRUE; -//UNUSED2009-05 ClearLabelData(); -//UNUSED2009-05 ClearPivotArrays(); -//UNUSED2009-05 } void __EXPORT ScPivotParam::ClearPivotArrays() { diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index aeca394437cd..0550309f4eb1 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -251,11 +251,6 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ) // InfoBox(0, String(nCount) + String(" Eintraege") ).Execute(); } -//UNUSED2009-05 void ScMarkArray::DeleteArea(SCROW nStartRow, SCROW nEndRow) -//UNUSED2009-05 { -//UNUSED2009-05 SetMarkArea(nStartRow, nEndRow, FALSE); -//UNUSED2009-05 } - BOOL ScMarkArray::IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const { SCSIZE nStartIndex; diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index b66aea63dd05..d696962db16d 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -1239,16 +1239,6 @@ BOOL ScPatternAttr::IsSymbolFont() const return FALSE; } -//UNUSED2008-05 FontToSubsFontConverter ScPatternAttr::GetSubsFontConverter( ULONG nFlags ) const -//UNUSED2008-05 { -//UNUSED2008-05 const SfxPoolItem* pItem; -//UNUSED2008-05 if( GetItemSet().GetItemState( ATTR_FONT, TRUE, &pItem ) == SFX_ITEM_SET ) -//UNUSED2008-05 return CreateFontToSubsFontConverter( -//UNUSED2008-05 ((const SvxFontItem*) pItem)->GetFamilyName(), nFlags ); -//UNUSED2008-05 else -//UNUSED2008-05 return 0; -//UNUSED2008-05 } - ULONG ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter ) const { diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index d722856dc80a..ad5275215b16 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -92,13 +92,6 @@ void ScStyleSheetPool::SetDocument( ScDocument* pDocument ) //------------------------------------------------------------------------ -//UNUSED2009-05 void ScStyleSheetPool::SetForceStdName( const String* pSet ) -//UNUSED2009-05 { -//UNUSED2009-05 pForceStdName = pSet; -//UNUSED2009-05 } - -//------------------------------------------------------------------------ - SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName, SfxStyleFamily eFam, USHORT mask, USHORT nPos ) { @@ -509,114 +502,6 @@ void ScStyleSheetPool::CreateStandardStyles() //------------------------------------------------------------------------ -//UNUSED2008-05 void ScStyleSheetPool::UpdateStdNames() -//UNUSED2008-05 { -//UNUSED2008-05 // Standard-Styles den richtigen Namen in der Programm-Sprache geben -//UNUSED2008-05 -//UNUSED2008-05 String aHelpFile; -//UNUSED2008-05 sal_uInt32 nCount = aStyles.size(); -//UNUSED2008-05 for (sal_uInt32 n=0; n<nCount; n++) -//UNUSED2008-05 { -//UNUSED2008-05 SfxStyleSheetBase* pStyle = aStyles[n].get(); -//UNUSED2008-05 if (!pStyle->IsUserDefined()) -//UNUSED2008-05 { -//UNUSED2008-05 String aOldName = pStyle->GetName(); -//UNUSED2008-05 ULONG nHelpId = pStyle->GetHelpId( aHelpFile ); -//UNUSED2008-05 SfxStyleFamily eFam = pStyle->GetFamily(); -//UNUSED2008-05 -//UNUSED2008-05 BOOL bHelpKnown = TRUE; -//UNUSED2008-05 String aNewName; -//UNUSED2008-05 USHORT nNameId = 0; -//UNUSED2008-05 switch( nHelpId ) -//UNUSED2008-05 { -//UNUSED2008-05 case HID_SC_SHEET_CELL_STD: -//UNUSED2008-05 case HID_SC_SHEET_PAGE_STD: nNameId = STR_STYLENAME_STANDARD; break; -//UNUSED2008-05 case HID_SC_SHEET_CELL_ERG: nNameId = STR_STYLENAME_RESULT; break; -//UNUSED2008-05 case HID_SC_SHEET_CELL_ERG1: nNameId = STR_STYLENAME_RESULT1; break; -//UNUSED2008-05 case HID_SC_SHEET_CELL_UEB: nNameId = STR_STYLENAME_HEADLINE; break; -//UNUSED2008-05 case HID_SC_SHEET_CELL_UEB1: nNameId = STR_STYLENAME_HEADLINE1; break; -//UNUSED2008-05 case HID_SC_SHEET_PAGE_REP: nNameId = STR_STYLENAME_REPORT; break; -//UNUSED2008-05 default: -//UNUSED2008-05 // 0 oder falsche (alte) HelpId -//UNUSED2008-05 bHelpKnown = FALSE; -//UNUSED2008-05 } -//UNUSED2008-05 if (bHelpKnown) -//UNUSED2008-05 { -//UNUSED2008-05 if ( nNameId ) -//UNUSED2008-05 aNewName = SCSTR( nNameId ); -//UNUSED2008-05 -//UNUSED2008-05 if ( aNewName.Len() && aNewName != aOldName && !Find( aNewName, eFam ) ) -//UNUSED2008-05 { -//UNUSED2008-05 DBG_TRACE( "Renaming style..." ); -//UNUSED2008-05 -//UNUSED2008-05 pStyle->SetName( aNewName ); // setzt auch Parents um -//UNUSED2008-05 -//UNUSED2008-05 // Styles in Patterns sind schon auf Pointer umgesetzt -//UNUSED2008-05 if (eFam == SFX_STYLE_FAMILY_PAGE) -//UNUSED2008-05 { -//UNUSED2008-05 // Page-Styles umsetzen -//UNUSED2008-05 // TableCount am Doc ist noch nicht initialisiert -//UNUSED2008-05 for (SCTAB nTab=0; nTab<=MAXTAB && pDoc->HasTable(nTab); nTab++) -//UNUSED2008-05 if (pDoc->GetPageStyle(nTab) == aOldName) -//UNUSED2008-05 pDoc->SetPageStyle(nTab, aNewName); -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 else -//UNUSED2008-05 { -//UNUSED2008-05 // wrong or no HelpId -> set new HelpId -//UNUSED2008-05 -//UNUSED2008-05 // no assertion for wrong HelpIds because this happens -//UNUSED2008-05 // with old files (#67218#) or with old files that were -//UNUSED2008-05 // saved again with a new version in a different language -//UNUSED2008-05 // (so SrcVersion doesn't help) -//UNUSED2008-05 -//UNUSED2008-05 USHORT nNewId = 0; -//UNUSED2008-05 if ( eFam == SFX_STYLE_FAMILY_PARA ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( aOldName == SCSTR( STR_STYLENAME_STANDARD ) ) -//UNUSED2008-05 nNewId = HID_SC_SHEET_CELL_STD; -//UNUSED2008-05 else if ( aOldName == SCSTR( STR_STYLENAME_RESULT ) ) -//UNUSED2008-05 nNewId = HID_SC_SHEET_CELL_ERG; -//UNUSED2008-05 else if ( aOldName == SCSTR( STR_STYLENAME_RESULT1 ) ) -//UNUSED2008-05 nNewId = HID_SC_SHEET_CELL_ERG1; -//UNUSED2008-05 else if ( aOldName == SCSTR( STR_STYLENAME_HEADLINE ) ) -//UNUSED2008-05 nNewId = HID_SC_SHEET_CELL_UEB; -//UNUSED2008-05 else if ( aOldName == SCSTR( STR_STYLENAME_HEADLINE1 ) ) -//UNUSED2008-05 nNewId = HID_SC_SHEET_CELL_UEB1; -//UNUSED2008-05 } -//UNUSED2008-05 else // PAGE -//UNUSED2008-05 { -//UNUSED2008-05 if ( aOldName == SCSTR( STR_STYLENAME_STANDARD ) ) -//UNUSED2008-05 nNewId = HID_SC_SHEET_PAGE_STD; -//UNUSED2008-05 else if ( aOldName == SCSTR( STR_STYLENAME_REPORT ) ) -//UNUSED2008-05 nNewId = HID_SC_SHEET_PAGE_REP; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 if ( nNewId ) // new ID found from name -> set ID -//UNUSED2008-05 { -//UNUSED2008-05 pStyle->SetHelpId( aHelpFile, nNewId ); -//UNUSED2008-05 } -//UNUSED2008-05 else if ( nHelpId == 0 ) // no old and no new ID -//UNUSED2008-05 { -//UNUSED2008-05 // #71471# probably user defined style without SFXSTYLEBIT_USERDEF set -//UNUSED2008-05 // (from StarCalc 1.0 import), fixed in src563 and above -//UNUSED2008-05 //! may also be default style from a different language -//UNUSED2008-05 //! test if name was generated from StarCalc 1.0 import? -//UNUSED2008-05 DBG_ASSERT(pDoc->GetSrcVersion() <= SC_SUBTOTAL_BUGFIX, -//UNUSED2008-05 "user defined style without SFXSTYLEBIT_USERDEF"); -//UNUSED2008-05 pStyle->SetMask( pStyle->GetMask() | SFXSTYLEBIT_USERDEF ); -//UNUSED2008-05 } -//UNUSED2008-05 // else: wrong old ID and no new ID found: -//UNUSED2008-05 // probably default style from a different language -//UNUSED2008-05 // -> leave unchanged (HelpId will be set if loaded with matching -//UNUSED2008-05 // language version later) -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } - -//------------------------------------------------------------------------ ScStyleSheet* ScStyleSheetPool::FindCaseIns( const String& rName, SfxStyleFamily eFam ) { diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index b392d2b83d12..949fff851893 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -1305,11 +1305,6 @@ void ScTable::UpdateInsertTab(SCTAB nTable) SetStreamValid(FALSE); } -//UNUSED2008-05 void ScTable::UpdateInsertTabOnlyCells(SCTAB nTable) -//UNUSED2008-05 { -//UNUSED2008-05 for (SCCOL i=0; i <= MAXCOL; i++) aCol[i].UpdateInsertTabOnlyCells(nTable); -//UNUSED2008-05 } - void ScTable::UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScTable* pRefUndo ) { if (nTab > nTable) nTab--; @@ -1579,11 +1574,6 @@ void ScTable::AddPrintRange( const ScRange& rNew ) SetStreamValid(FALSE); } -//UNUSED2009-05 void ScTable::SetPrintRange( const ScRange& rNew ) -//UNUSED2009-05 { -//UNUSED2009-05 ClearPrintRanges(); -//UNUSED2009-05 AddPrintRange( rNew ); -//UNUSED2009-05 } void ScTable::SetPrintEntireSheet() { diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index a1a4a0bb06f9..2d1de44a7318 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1005,15 +1005,6 @@ void ScTable::PutCell( const ScAddress& rPos, ScBaseCell* pCell ) } -//UNUSED2009-05 void ScTable::PutCell( const ScAddress& rPos, ULONG nFormatIndex, ScBaseCell* pCell ) -//UNUSED2009-05 { -//UNUSED2009-05 if (pCell) -//UNUSED2009-05 aCol[rPos.Col()].Insert( rPos.Row(), nFormatIndex, pCell ); -//UNUSED2009-05 else -//UNUSED2009-05 aCol[rPos.Col()].Delete( rPos.Row() ); -//UNUSED2009-05 } - - BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString, ScSetStringParam* pParam ) { @@ -1195,14 +1186,6 @@ BOOL ScTable::HasStringCells( SCCOL nStartCol, SCROW nStartRow, } -//UNUSED2008-05 USHORT ScTable::GetErrCode( SCCOL nCol, SCROW nRow ) const -//UNUSED2008-05 { -//UNUSED2008-05 if (ValidColRow( nCol, nRow )) -//UNUSED2008-05 return aCol[nCol].GetErrCode( nRow ); -//UNUSED2008-05 return 0; -//UNUSED2008-05 } - - void ScTable::SetDirtyVar() { for (SCCOL i=0; i<=MAXCOL; i++) @@ -1368,24 +1351,6 @@ bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USH } -//UNUSED2009-05 BOOL ScTable::HasLines( const ScRange& rRange, Rectangle& rSizes ) const -//UNUSED2009-05 { -//UNUSED2009-05 SCCOL nCol1 = rRange.aStart.Col(); -//UNUSED2009-05 SCROW nRow1 = rRange.aStart.Row(); -//UNUSED2009-05 SCCOL nCol2 = rRange.aEnd.Col(); -//UNUSED2009-05 SCROW nRow2 = rRange.aEnd.Row(); -//UNUSED2009-05 PutInOrder( nCol1, nCol2 ); -//UNUSED2009-05 PutInOrder( nRow1, nRow2 ); -//UNUSED2009-05 -//UNUSED2009-05 BOOL bFound = FALSE; -//UNUSED2009-05 for (SCCOL i=nCol1; i<=nCol2; i++) -//UNUSED2009-05 if (aCol[i].HasLines( nRow1, nRow2, rSizes, (i==nCol1), (i==nCol2) )) -//UNUSED2009-05 bFound = TRUE; -//UNUSED2009-05 -//UNUSED2009-05 return bFound; -//UNUSED2009-05 } - - BOOL ScTable::HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const { BOOL bFound=FALSE; diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index 38534b4bd31e..9cbcb3970196 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -1902,14 +1902,6 @@ void ScTable::UpdateInsertTabAbs(SCTAB nTable) aCol[i].UpdateInsertTabAbs(nTable); } -//UNUSED2008-05 USHORT ScTable::GetErrorData( SCCOL nCol, SCROW nRow ) const -//UNUSED2008-05 { -//UNUSED2008-05 if (ValidColRow(nCol,nRow)) -//UNUSED2008-05 return aCol[nCol].GetErrorData( nRow ); -//UNUSED2008-05 else -//UNUSED2008-05 return 0; -//UNUSED2008-05 } - BOOL ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel, const ScMarkData& rMark) const { diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx index a4de52e27b1b..bb51fb174fc2 100644 --- a/sc/source/core/tool/addinhelpid.cxx +++ b/sc/source/core/tool/addinhelpid.cxx @@ -159,11 +159,6 @@ const ScUnoAddInHelpId pDateFuncHelpIds[] = // ============================================================================ -//UNUSED2008-05 ScUnoAddInHelpIdGenerator::ScUnoAddInHelpIdGenerator() : -//UNUSED2008-05 pCurrHelpIds( NULL ), -//UNUSED2008-05 nArrayCount( 0 ) -//UNUSED2008-05 { -//UNUSED2008-05 } ScUnoAddInHelpIdGenerator::ScUnoAddInHelpIdGenerator( const ::rtl::OUString& rServiceName ) { diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index ccbecd52d9f2..462bcd042c86 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -56,13 +56,6 @@ ScAddress::Details::Details ( const ScDocument* pDoc, { } -//UNUSED2009-05 void ScAddress::Details::SetPos ( const ScDocument* pDoc, -//UNUSED2009-05 const ScAddress & rAddr ) -//UNUSED2009-05 { -//UNUSED2009-05 nRow = rAddr.Row(); -//UNUSED2009-05 nCol = rAddr.Col(); -//UNUSED2009-05 eConv = pDoc->GetAddressConvention(); -//UNUSED2009-05 } //////////////////////////////////////////////////////////////////////////// diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index fc3d9bf51be2..e36786955755 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -611,36 +611,3 @@ ScChartPositionMap::~ScChartPositionMap() } delete [] ppRowHeader; } - - -//UNUSED2009-05 ScRangeListRef ScChartPositionMap::GetColRanges( SCCOL nChartCol ) const -//UNUSED2009-05 { -//UNUSED2009-05 ScRangeListRef xRangeList = new ScRangeList; -//UNUSED2009-05 if ( nChartCol < nColCount ) -//UNUSED2009-05 { -//UNUSED2009-05 ULONG nStop = GetIndex( nChartCol, nRowCount ); -//UNUSED2009-05 for ( ULONG nIndex = GetIndex( nChartCol, 0 ); nIndex < nStop; nIndex++ ) -//UNUSED2009-05 { -//UNUSED2009-05 if ( ppData[ nIndex ] ) -//UNUSED2009-05 xRangeList->Join( *ppData[ nIndex ] ); -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 return xRangeList; -//UNUSED2009-05 } - - -//UNUSED2009-05 ScRangeListRef ScChartPositionMap::GetRowRanges( SCROW nChartRow ) const -//UNUSED2009-05 { -//UNUSED2009-05 ScRangeListRef xRangeList = new ScRangeList; -//UNUSED2009-05 if ( nChartRow < nRowCount ) -//UNUSED2009-05 { -//UNUSED2009-05 ULONG nStop = GetIndex( nColCount, nChartRow ); -//UNUSED2009-05 for ( ULONG nIndex = GetIndex( 0, nChartRow ); nIndex < nStop; -//UNUSED2009-05 nIndex += nRowCount ) -//UNUSED2009-05 { -//UNUSED2009-05 if ( ppData[ nIndex ] ) -//UNUSED2009-05 xRangeList->Join( *ppData[ nIndex ] ); -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 return xRangeList; -//UNUSED2009-05 } diff --git a/sc/source/core/tool/collect.cxx b/sc/source/core/tool/collect.cxx index c7aa72343fbb..d1726d031e7d 100644 --- a/sc/source/core/tool/collect.cxx +++ b/sc/source/core/tool/collect.cxx @@ -334,24 +334,6 @@ ScDataObject* ScStrCollection::Clone() const // TypedScStrCollection //------------------------------------------------------------------------ -//UNUSED2008-05 TypedStrData::TypedStrData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, -//UNUSED2008-05 BOOL bAllStrings ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( pDoc->HasValueData( nCol, nRow, nTab ) ) -//UNUSED2008-05 { -//UNUSED2008-05 pDoc->GetValue( nCol, nRow, nTab, nValue ); -//UNUSED2008-05 if (bAllStrings) -//UNUSED2008-05 pDoc->GetString( nCol, nRow, nTab, aStrValue ); -//UNUSED2008-05 nStrType = 0; -//UNUSED2008-05 } -//UNUSED2008-05 else -//UNUSED2008-05 { -//UNUSED2008-05 pDoc->GetString( nCol, nRow, nTab, aStrValue ); -//UNUSED2008-05 nValue = 0.0; -//UNUSED2008-05 nStrType = 1; //! Typ uebergeben ? -//UNUSED2008-05 } -//UNUSED2008-05 } - ScDataObject* TypedStrData::Clone() const { diff --git a/sc/source/core/tool/dbcolect.cxx b/sc/source/core/tool/dbcolect.cxx index ae7267f1adbe..c9e926252be8 100644 --- a/sc/source/core/tool/dbcolect.cxx +++ b/sc/source/core/tool/dbcolect.cxx @@ -333,12 +333,6 @@ ScDBData::~ScDBData() } } -//UNUSED2008-05 BOOL ScDBData::IsBeyond(SCROW nMaxRow) const -//UNUSED2008-05 { -//UNUSED2008-05 return ( nStartRow > nMaxRow || -//UNUSED2008-05 nEndRow > nMaxRow || -//UNUSED2008-05 nQueryDestRow > nMaxRow ); -//UNUSED2008-05 } String ScDBData::GetSourceString() const { diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index 7490dfec77df..71c6c4ec6dfe 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -202,10 +202,6 @@ const LocaleDataWrapper& ScDocOptions::GetLocaleDataWrapper() const // ScTpCalcItem - Daten fuer die CalcOptions-TabPage //======================================================================== -//UNUSED2008-05 ScTpCalcItem::ScTpCalcItem( USHORT nWhichP ) : SfxPoolItem( nWhichP ) -//UNUSED2008-05 { -//UNUSED2008-05 } - //------------------------------------------------------------------------ ScTpCalcItem::ScTpCalcItem( USHORT nWhichP, const ScDocOptions& rOpt ) diff --git a/sc/source/core/tool/hints.cxx b/sc/source/core/tool/hints.cxx index b2a8266705c7..e9225b39c29f 100644 --- a/sc/source/core/tool/hints.cxx +++ b/sc/source/core/tool/hints.cxx @@ -79,10 +79,6 @@ ScUpdateRefHint::~ScUpdateRefHint() // ScPointerChangedHint - Pointer ist ungueltig geworden // ----------------------------------------------------------------------- -//UNUSED2008-05 ScPointerChangedHint::ScPointerChangedHint( USHORT nF ) : -//UNUSED2008-05 nFlags( nF ) -//UNUSED2008-05 { -//UNUSED2008-05 } ScPointerChangedHint::~ScPointerChangedHint() { diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index c701c558310b..28b9c45d1235 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -87,9 +87,6 @@ int ScPrintOptions::operator!=( const ScPrintOptions& rOpt ) const // ----------------------------------------------------------------------- -//UNUSED2008-05 ScTpPrintItem::ScTpPrintItem( USHORT nWhichP ) : SfxPoolItem( nWhichP ) -//UNUSED2008-05 { -//UNUSED2008-05 } ScTpPrintItem::ScTpPrintItem( USHORT nWhichP, const ScPrintOptions& rOpt ) : SfxPoolItem ( nWhichP ), diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index e81f1f3bd94d..de90239c7123 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -359,19 +359,6 @@ BOOL ScRangeData::operator== (const ScRangeData& rData) const // fuer Undo return TRUE; } -//UNUSED2009-05 BOOL ScRangeData::IsRangeAtCursor( const ScAddress& rPos, BOOL bStartOnly ) const -//UNUSED2009-05 { -//UNUSED2009-05 BOOL bRet = FALSE; -//UNUSED2009-05 ScRange aRange; -//UNUSED2009-05 if ( IsReference(aRange) ) -//UNUSED2009-05 { -//UNUSED2009-05 if ( bStartOnly ) -//UNUSED2009-05 bRet = ( rPos == aRange.aStart ); -//UNUSED2009-05 else -//UNUSED2009-05 bRet = ( aRange.In( rPos ) ); -//UNUSED2009-05 } -//UNUSED2009-05 return bRet; -//UNUSED2009-05 } BOOL ScRangeData::IsRangeAtBlock( const ScRange& rBlock ) const { @@ -791,16 +778,6 @@ ScRangeData* ScRangeName::FindIndex( USHORT nIndex ) return NULL; } -//UNUSED2009-05 ScRangeData* ScRangeName::GetRangeAtCursor( const ScAddress& rPos, BOOL bStartOnly ) const -//UNUSED2009-05 { -//UNUSED2009-05 if ( pItems ) -//UNUSED2009-05 { -//UNUSED2009-05 for ( USHORT i = 0; i < nCount; i++ ) -//UNUSED2009-05 if ( ((ScRangeData*)pItems[i])->IsRangeAtCursor( rPos, bStartOnly ) ) -//UNUSED2009-05 return (ScRangeData*)pItems[i]; -//UNUSED2009-05 } -//UNUSED2009-05 return NULL; -//UNUSED2009-05 } ScRangeData* ScRangeName::GetRangeAtBlock( const ScRange& rBlock ) const { diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx index 47774d348044..c6373426bbd1 100644 --- a/sc/source/core/tool/refdata.cxx +++ b/sc/source/core/tool/refdata.cxx @@ -82,110 +82,6 @@ void ScSingleRefData::CalcAbsIfRel( const ScAddress& rPos ) } } -//UNUSED2008-05 void ScSingleRefData::OldBoolsToNewFlags( const OldSingleRefBools& rBools ) -//UNUSED2008-05 { -//UNUSED2008-05 switch ( rBools.bRelCol ) -//UNUSED2008-05 { -//UNUSED2008-05 case SR_DELETED : -//UNUSED2008-05 Flags.bColRel = TRUE; // der war verlorengegangen -//UNUSED2008-05 Flags.bColDeleted = TRUE; -//UNUSED2008-05 break; -//UNUSED2008-05 case SR_ABSOLUTE : -//UNUSED2008-05 Flags.bColRel = FALSE; -//UNUSED2008-05 Flags.bColDeleted = FALSE; -//UNUSED2008-05 break; -//UNUSED2008-05 case SR_RELABS : -//UNUSED2008-05 case SR_RELATIVE : -//UNUSED2008-05 default: -//UNUSED2008-05 Flags.bColRel = TRUE; -//UNUSED2008-05 Flags.bColDeleted = FALSE; -//UNUSED2008-05 } -//UNUSED2008-05 switch ( rBools.bRelRow ) -//UNUSED2008-05 { -//UNUSED2008-05 case SR_DELETED : -//UNUSED2008-05 Flags.bRowRel = TRUE; // der war verlorengegangen -//UNUSED2008-05 Flags.bRowDeleted = TRUE; -//UNUSED2008-05 break; -//UNUSED2008-05 case SR_ABSOLUTE : -//UNUSED2008-05 Flags.bRowRel = FALSE; -//UNUSED2008-05 Flags.bRowDeleted = FALSE; -//UNUSED2008-05 break; -//UNUSED2008-05 case SR_RELABS : -//UNUSED2008-05 case SR_RELATIVE : -//UNUSED2008-05 default: -//UNUSED2008-05 Flags.bRowRel = TRUE; -//UNUSED2008-05 Flags.bRowDeleted = FALSE; -//UNUSED2008-05 } -//UNUSED2008-05 switch ( rBools.bRelTab ) -//UNUSED2008-05 { -//UNUSED2008-05 case SR_DELETED : -//UNUSED2008-05 Flags.bTabRel = TRUE; // der war verlorengegangen -//UNUSED2008-05 Flags.bTabDeleted = TRUE; -//UNUSED2008-05 break; -//UNUSED2008-05 case SR_ABSOLUTE : -//UNUSED2008-05 Flags.bTabRel = FALSE; -//UNUSED2008-05 Flags.bTabDeleted = FALSE; -//UNUSED2008-05 break; -//UNUSED2008-05 case SR_RELABS : -//UNUSED2008-05 case SR_RELATIVE : -//UNUSED2008-05 default: -//UNUSED2008-05 Flags.bTabRel = TRUE; -//UNUSED2008-05 Flags.bTabDeleted = FALSE; -//UNUSED2008-05 } -//UNUSED2008-05 Flags.bFlag3D = (rBools.bOldFlag3D & SRF_3D ? TRUE : FALSE); -//UNUSED2008-05 Flags.bRelName = (rBools.bOldFlag3D & SRF_RELNAME ? TRUE : FALSE); -//UNUSED2008-05 if ( !Flags.bFlag3D ) -//UNUSED2008-05 Flags.bTabRel = TRUE; // ist bei einigen aelteren Dokumenten nicht gesetzt -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 -//UNUSED2008-05 /* -//UNUSED2008-05 bis Release 3.1 sah Store so aus -//UNUSED2008-05 -//UNUSED2008-05 BYTE n = ( ( r.bOldFlag3D & 0x03 ) << 6 ) // RelName, 3D -//UNUSED2008-05 | ( ( r.bRelTab & 0x03 ) << 4 ) // Relative, RelAbs -//UNUSED2008-05 | ( ( r.bRelRow & 0x03 ) << 2 ) -//UNUSED2008-05 | ( r.bRelCol & 0x03 ); -//UNUSED2008-05 -//UNUSED2008-05 bis Release 3.1 sah Load so aus -//UNUSED2008-05 -//UNUSED2008-05 r.bRelCol = ( n & 0x03 ); -//UNUSED2008-05 r.bRelRow = ( ( n >> 2 ) & 0x03 ); -//UNUSED2008-05 r.bRelTab = ( ( n >> 4 ) & 0x03 ); -//UNUSED2008-05 r.bOldFlag3D = ( ( n >> 6 ) & 0x03 ); -//UNUSED2008-05 -//UNUSED2008-05 bRelCol == SR_DELETED war identisch mit bRelCol == (SR_RELATIVE | SR_RELABS) -//UNUSED2008-05 leider.. -//UNUSED2008-05 3.1 liest Zukunft: Deleted wird nicht unbedingt erkannt, nur wenn auch Relativ. -//UNUSED2008-05 Aber immer noch nCol > MAXCOL und gut sollte sein.. -//UNUSED2008-05 */ -//UNUSED2008-05 -//UNUSED2008-05 BYTE ScSingleRefData::CreateStoreByteFromFlags() const -//UNUSED2008-05 { -//UNUSED2008-05 return (BYTE)( -//UNUSED2008-05 ( (Flags.bRelName & 0x01) << 7 ) -//UNUSED2008-05 | ( (Flags.bFlag3D & 0x01) << 6 ) -//UNUSED2008-05 | ( (Flags.bTabDeleted & 0x01) << 5 ) -//UNUSED2008-05 | ( (Flags.bTabRel & 0x01) << 4 ) -//UNUSED2008-05 | ( (Flags.bRowDeleted & 0x01) << 3 ) -//UNUSED2008-05 | ( (Flags.bRowRel & 0x01) << 2 ) -//UNUSED2008-05 | ( (Flags.bColDeleted & 0x01) << 1 ) -//UNUSED2008-05 | (Flags.bColRel & 0x01) -//UNUSED2008-05 ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 -//UNUSED2008-05 void ScSingleRefData::CreateFlagsFromLoadByte( BYTE n ) -//UNUSED2008-05 { -//UNUSED2008-05 Flags.bColRel = (n & 0x01 ); -//UNUSED2008-05 Flags.bColDeleted = ( (n >> 1) & 0x01 ); -//UNUSED2008-05 Flags.bRowRel = ( (n >> 2) & 0x01 ); -//UNUSED2008-05 Flags.bRowDeleted = ( (n >> 3) & 0x01 ); -//UNUSED2008-05 Flags.bTabRel = ( (n >> 4) & 0x01 ); -//UNUSED2008-05 Flags.bTabDeleted = ( (n >> 5) & 0x01 ); -//UNUSED2008-05 Flags.bFlag3D = ( (n >> 6) & 0x01 ); -//UNUSED2008-05 Flags.bRelName = ( (n >> 7) & 0x01 ); -//UNUSED2008-05 } BOOL ScSingleRefData::operator==( const ScSingleRefData& r ) const diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 2ecc20f53405..67e94823b71c 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -621,49 +621,6 @@ void ScMatrix::MatTrans(ScMatrix& mRes) const } } -//UNUSED2009-05 void ScMatrix::MatCopyUpperLeft(ScMatrix& mRes) const -//UNUSED2009-05 { -//UNUSED2009-05 if (nColCount < mRes.nColCount || nRowCount < mRes.nRowCount) -//UNUSED2009-05 { -//UNUSED2009-05 DBG_ERRORFILE("ScMatrix::MatCopyUpperLeft: dimension error"); -//UNUSED2009-05 } -//UNUSED2009-05 else -//UNUSED2009-05 { -//UNUSED2009-05 if (mnValType) -//UNUSED2009-05 { -//UNUSED2009-05 ScMatValType nType; -//UNUSED2009-05 mRes.ResetIsString(); -//UNUSED2009-05 for ( SCSIZE i = 0; i < mRes.nColCount; i++ ) -//UNUSED2009-05 { -//UNUSED2009-05 SCSIZE nStart = i * nRowCount; -//UNUSED2009-05 for ( SCSIZE j = 0; j < mRes.nRowCount; j++ ) -//UNUSED2009-05 { -//UNUSED2009-05 if ( IsNonValueType( (nType = mnValType[nStart+j]) )) -//UNUSED2009-05 mRes.PutStringEntry( pMat[nStart+j].pS, nType, -//UNUSED2009-05 i*mRes.nRowCount+j ); -//UNUSED2009-05 else -//UNUSED2009-05 { -//UNUSED2009-05 mRes.pMat[i*mRes.nRowCount+j].fVal = pMat[nStart+j].fVal; -//UNUSED2009-05 mRes.mnValType[i*mRes.nRowCount+j] = nType; -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 else -//UNUSED2009-05 { -//UNUSED2009-05 mRes.DeleteIsString(); -//UNUSED2009-05 for ( SCSIZE i = 0; i < mRes.nColCount; i++ ) -//UNUSED2009-05 { -//UNUSED2009-05 SCSIZE nStart = i * nRowCount; -//UNUSED2009-05 for ( SCSIZE j = 0; j < mRes.nRowCount; j++ ) -//UNUSED2009-05 { -//UNUSED2009-05 mRes.pMat[i*mRes.nRowCount+j].fVal = pMat[nStart+j].fVal; -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 } - void ScMatrix::FillDouble( double fVal, SCSIZE nC1, SCSIZE nR1, SCSIZE nC2, SCSIZE nR2 ) { if (ValidColRow( nC1, nR1) && ValidColRow( nC2, nR2)) diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 81862c49fd21..f8706acf759a 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -280,35 +280,7 @@ void ScRawToken::SetExternalName( sal_uInt16 nFileId, const String& rName ) extname.cName[n] = 0; } -//UNUSED2008-05 void ScRawToken::SetInt(int rVal) -//UNUSED2008-05 { -//UNUSED2008-05 eOp = ocPush; -//UNUSED2008-05 eType = svDouble; -//UNUSED2008-05 nValue = (double)rVal; -//UNUSED2008-05 nRefCnt = 0; -//UNUSED2008-05 -//UNUSED2008-05 } -//UNUSED2008-05 void ScRawToken::SetMatrix( ScMatrix* p ) -//UNUSED2008-05 { -//UNUSED2008-05 eOp = ocPush; -//UNUSED2008-05 eType = svMatrix; -//UNUSED2008-05 pMat = p; -//UNUSED2008-05 nRefCnt = 0; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 ScComplexRefData& ScRawToken::GetReference() -//UNUSED2008-05 { -//UNUSED2008-05 DBG_ASSERT( lcl_IsReference( eOp, GetType() ), "GetReference: no Ref" ); -//UNUSED2008-05 return aRef; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void ScRawToken::SetReference( ScComplexRefData& rRef ) -//UNUSED2008-05 { -//UNUSED2008-05 DBG_ASSERT( lcl_IsReference( eOp, GetType() ), "SetReference: no Ref" ); -//UNUSED2008-05 aRef = rRef; -//UNUSED2008-05 if( GetType() == svSingleRef ) -//UNUSED2008-05 aRef.Ref2 = aRef.Ref1; -//UNUSED2008-05 } + void ScRawToken::SetExternal( const sal_Unicode* pStr ) { diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 7dc36bc1b548..3b85e4977510 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -242,10 +242,6 @@ SvxGridItem* ScViewOptions::CreateGridItem( USHORT nId /* = SID_ATTR_GRID_OPTION // ScTpViewItem - Daten fuer die ViewOptions-TabPage //======================================================================== -//UNUSED2008-05 ScTpViewItem::ScTpViewItem( USHORT nWhichP ) : SfxPoolItem( nWhichP ) -//UNUSED2008-05 { -//UNUSED2008-05 } - //------------------------------------------------------------------------ ScTpViewItem::ScTpViewItem( USHORT nWhichP, const ScViewOptions& rOpt ) diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 894e57d3802e..c3caf93b007d 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -735,7 +735,6 @@ private: ::accessibility::AccessibleShape* GetAccShape(const ScShapeChild& rShape) const; ::accessibility::AccessibleShape* GetAccShape(const ScShapeChildVec& rShapes, sal_Int32 nIndex) const; void FillShapes(const Rectangle& aPixelPaintRect, const MapMode& aMapMode, sal_uInt8 nRangeId); -//UNUSED2008-05 sal_Bool FindShape(ScShapeChildVec& rShapes, const uno::Reference <drawing::XShape>& xShape, ScShapeChildVec::iterator& rItr) const; // void AddShape(const uno::Reference<drawing::XShape>& xShape, SdrLayerID aLayerID); // void RemoveShape(const uno::Reference<drawing::XShape>& xShape, SdrLayerID aLayerID); @@ -1201,21 +1200,6 @@ void ScShapeChilds::FillShapes(const Rectangle& aPixelPaintRect, const MapMode& } } -//UNUSED2008-05 sal_Bool ScShapeChilds::FindShape(ScShapeChildVec& rShapes, const uno::Reference <drawing::XShape>& xShape, ScShapeChildVec::iterator& rItr) const -//UNUSED2008-05 { -//UNUSED2008-05 sal_Bool bResult(sal_False); -//UNUSED2008-05 ScShapeChild aShape; -//UNUSED2008-05 aShape.mxShape = xShape; -//UNUSED2008-05 rItr = std::lower_bound(rShapes.begin(), rShapes.end(), aShape, ScShapeChildLess()); -//UNUSED2008-05 if (rItr->mxShape.get() == xShape.get()) -//UNUSED2008-05 bResult = sal_True; // if the shape is found -//UNUSED2008-05 -//UNUSED2008-05 /*#ifdef DBG_UTIL // test whether it finds truly the correct shape (perhaps it is not really sorted) -//UNUSED2008-05 ScShapeChildVec::iterator aDebugItr = std::find(rShapes.begin(), rShapes.end(), aShape); -//UNUSED2008-05 DBG_ASSERT(rItr == aDebugItr, "wrong Shape found"); -//UNUSED2008-05 #endif*/ -//UNUSED2008-05 return bResult; -//UNUSED2008-05 } /*void ScShapeChilds::AddShape(const uno::Reference<drawing::XShape>& xShape, SdrLayerID aLayerID) { @@ -1902,41 +1886,3 @@ ScShapeChilds* ScAccessibleDocumentPagePreview::GetShapeChilds() return mpShapeChilds; } - -//UNUSED2009-05 uno::Reference < XAccessible > ScAccessibleDocumentPagePreview::GetCurrentAccessibleTable() -//UNUSED2009-05 { -//UNUSED2009-05 if (!mpTable) -//UNUSED2009-05 { -//UNUSED2009-05 if ( mpViewShell ) -//UNUSED2009-05 { -//UNUSED2009-05 const ScPreviewLocationData& rData = mpViewShell->GetLocationData(); -//UNUSED2009-05 ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() ); -//UNUSED2009-05 //! order is background shapes, header, table or notes, footer, foreground shapes, controls -//UNUSED2009-05 sal_Int32 nIndex (aCount.nBackShapes + aCount.nHeaders); -//UNUSED2009-05 -//UNUSED2009-05 mpTable = new ScAccessiblePreviewTable( this, mpViewShell, nIndex ); -//UNUSED2009-05 mpTable->acquire(); -//UNUSED2009-05 mpTable->Init(); -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 return mpTable; -//UNUSED2009-05 } - -//UNUSED2009-05 void ScAccessibleDocumentPagePreview::ChildCountChanged() -//UNUSED2009-05 { -//UNUSED2009-05 if (mpViewShell) -//UNUSED2009-05 { -//UNUSED2009-05 const ScPreviewLocationData& rData = mpViewShell->GetLocationData(); -//UNUSED2009-05 ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() ); -//UNUSED2009-05 //! order is background shapes, header, table or notes, footer, foreground shapes, controls -//UNUSED2009-05 if(mpHeader) -//UNUSED2009-05 mpHeader->SetCurrentIndexInParent(aCount.nBackShapes); -//UNUSED2009-05 if (mpTable) -//UNUSED2009-05 mpTable->SetCurrentIndexInParent(aCount.nBackShapes + aCount.nHeaders); -//UNUSED2009-05 if (mpFooter) -//UNUSED2009-05 mpFooter->SetCurrentIndexInParent(aCount.nBackShapes + aCount.nHeaders + aCount.nTables + aCount.nNoteParagraphs); -//UNUSED2009-05 -//UNUSED2009-05 if (mpNotesChilds) -//UNUSED2009-05 mpNotesChilds->SetOffset(aCount.nBackShapes + aCount.nHeaders); -//UNUSED2009-05 } -//UNUSED2009-05 } diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 4073e23f837f..94ea082a862c 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -1407,19 +1407,6 @@ SvxViewForwarder* ScAccessiblePreviewCellTextData::GetViewForwarder() return mpViewForwarder; } -//UNUSED2008-05 IMPL_LINK(ScAccessiblePreviewCellTextData, NotifyHdl, EENotify*, aNotify) -//UNUSED2008-05 { -//UNUSED2008-05 if( aNotify ) -//UNUSED2008-05 { -//UNUSED2008-05 ::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify); -//UNUSED2008-05 -//UNUSED2008-05 if( aHint.get() ) -//UNUSED2008-05 GetBroadcaster().Broadcast( *aHint.get() ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 return 0; -//UNUSED2008-05 } - ScDocShell* ScAccessiblePreviewCellTextData::GetDocShell(ScPreviewShell* pViewShell) { ScDocShell* pDocSh = NULL; @@ -1535,19 +1522,6 @@ SvxViewForwarder* ScAccessiblePreviewHeaderCellTextData::GetViewForwarder() return mpViewForwarder; } -//UNUSED2008-05 IMPL_LINK(ScAccessiblePreviewHeaderCellTextData, NotifyHdl, EENotify*, aNotify) -//UNUSED2008-05 { -//UNUSED2008-05 if( aNotify ) -//UNUSED2008-05 { -//UNUSED2008-05 ::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify); -//UNUSED2008-05 -//UNUSED2008-05 if( aHint.get() ) -//UNUSED2008-05 GetBroadcaster().Broadcast( *aHint.get() ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 return 0; -//UNUSED2008-05 } - ScDocShell* ScAccessiblePreviewHeaderCellTextData::GetDocShell(ScPreviewShell* pViewShell) { ScDocShell* pDocSh = NULL; diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 2cabe7f9f2d6..2f266b944ca0 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -610,21 +610,6 @@ String __EXPORT ScInputWindow::GetText() const return ToolBox::GetText(); } - -//UNUSED2008-05 EditView* ScInputWindow::ActivateEdit( const String& rText, -//UNUSED2008-05 const ESelection& rSel ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( !aTextWindow.IsInputActive() ) -//UNUSED2008-05 { -//UNUSED2008-05 aTextWindow.StartEditEngine(); -//UNUSED2008-05 aTextWindow.GrabFocus(); -//UNUSED2008-05 aTextWindow.SetTextString( rText ); -//UNUSED2008-05 aTextWindow.GetEditView()->SetSelection( rSel ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 return aTextWindow.GetEditView(); -//UNUSED2008-05 } - BOOL ScInputWindow::IsInputActive() { return aTextWindow.IsInputActive(); diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index a1b8f05d2918..91c98ee8fba9 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -130,31 +130,6 @@ //------------------------------------------------------------------ -//UNUSED2008-05 // filter detection can't use ScFilterOptions (in sc-dll), -//UNUSED2008-05 // so access to wk3 flag must be implemented here again -//UNUSED2008-05 -//UNUSED2008-05 class ScLibOptions : public utl::ConfigItem -//UNUSED2008-05 { -//UNUSED2008-05 BOOL bWK3Flag; -//UNUSED2008-05 -//UNUSED2008-05 public: -//UNUSED2008-05 ScLibOptions(); -//UNUSED2008-05 BOOL GetWK3Flag() const { return bWK3Flag; } -//UNUSED2008-05 }; -//UNUSED2008-05 -//UNUSED2008-05 #define CFGPATH_LIBFILTER "Office.Calc/Filter/Import/Lotus123" -//UNUSED2008-05 #define ENTRYSTR_WK3 "WK3" -//UNUSED2008-05 -//UNUSED2008-05 ScLibOptions::ScLibOptions() : -//UNUSED2008-05 ConfigItem( rtl::OUString::createFromAscii( CFGPATH_LIBFILTER ) ), -//UNUSED2008-05 bWK3Flag( FALSE ) -//UNUSED2008-05 { -//UNUSED2008-05 com::sun::star::uno::Sequence<rtl::OUString> aNames(1); -//UNUSED2008-05 aNames[0] = rtl::OUString::createFromAscii( ENTRYSTR_WK3 ); -//UNUSED2008-05 com::sun::star::uno::Sequence<com::sun::star::uno::Any> aValues = GetProperties(aNames); -//UNUSED2008-05 if ( aValues.getLength() == 1 && aValues[0].hasValue() ) -//UNUSED2008-05 bWK3Flag = comphelper::getBOOL( aValues[0] ); -//UNUSED2008-05 } //------------------------------------------------------------------ @@ -367,52 +342,6 @@ void ScDLL::Exit() #define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s)) -//UNUSED2008-05 void ScDLL::FillStatusBar(StatusBar &rStatusBar) -//UNUSED2008-05 { -//UNUSED2008-05 // Dokumentposition (Tabelle x / y) -//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_DOCPOS, -//UNUSED2008-05 TEXT_WIDTH( String().Fill( 10, 'X' ) ), -//UNUSED2008-05 SIB_LEFT|SIB_AUTOSIZE ); -//UNUSED2008-05 -//UNUSED2008-05 // Seitenvorlage -//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_PAGESTYLE, -//UNUSED2008-05 TEXT_WIDTH( String().Fill( 15, 'X' ) ), -//UNUSED2008-05 SIB_LEFT|SIB_AUTOSIZE ); -//UNUSED2008-05 -//UNUSED2008-05 // Ma"sstab -//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_ZOOM, -//UNUSED2008-05 SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar), -//UNUSED2008-05 SIB_CENTER ); -//UNUSED2008-05 -//UNUSED2008-05 // Einfuege-/Ueberschreibmodus -//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_INSERT, -//UNUSED2008-05 SvxInsertStatusBarControl::GetDefItemWidth(rStatusBar), -//UNUSED2008-05 SIB_CENTER ); -//UNUSED2008-05 -//UNUSED2008-05 // Selektionsmodus -//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_SELMODE, -//UNUSED2008-05 SvxSelectionModeControl::GetDefItemWidth(rStatusBar), -//UNUSED2008-05 SIB_CENTER ); -//UNUSED2008-05 -//UNUSED2008-05 // Dokument geaendert -//UNUSED2008-05 rStatusBar.InsertItem( SID_DOC_MODIFIED, -//UNUSED2008-05 SvxModifyControl::GetDefItemWidth(rStatusBar)); -//UNUSED2008-05 -//UNUSED2008-05 // signatures -//UNUSED2008-05 rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); -//UNUSED2008-05 rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); -//UNUSED2008-05 -//UNUSED2008-05 // Mail -//UNUSED2008-05 rStatusBar.InsertItem( SID_MAIL_NOTIFY, -//UNUSED2008-05 TEXT_WIDTH( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Mail")) ), -//UNUSED2008-05 SIB_CENTER ); -//UNUSED2008-05 -//UNUSED2008-05 // den aktuellen Kontext anzeigen Uhrzeit / FramePos / TabellenInfo / Errors -//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_SIZE, -//UNUSED2008-05 SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar), -//UNUSED2008-05 SIB_AUTOSIZE|SIB_LEFT|SIB_USERDRAW); -//UNUSED2008-05 } - #undef TEXT_WIDTH // DetectFilter functionality has moved - please update your bookmarks diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index a63491f0929b..899e3e328cde 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -57,22 +57,6 @@ TYPEINIT1(ScIndexHint, SfxHint); // ScInputStatusItem - Status-Update fuer Eingabezeile // ----------------------------------------------------------------------- -//UNUSED2008-05 ScInputStatusItem::ScInputStatusItem( USHORT nWhichP, -//UNUSED2008-05 SCTAB nTab, -//UNUSED2008-05 SCCOL nCol, SCROW nRow, -//UNUSED2008-05 SCCOL nStartCol, SCROW nStartRow, -//UNUSED2008-05 SCCOL nEndCol, SCROW nEndRow, -//UNUSED2008-05 const String& rString, const EditTextObject* pData ) -//UNUSED2008-05 -//UNUSED2008-05 : SfxPoolItem ( nWhichP ), -//UNUSED2008-05 aCursorPos ( nCol, nRow, nTab ), -//UNUSED2008-05 aStartPos ( nStartCol, nStartRow, nTab ), -//UNUSED2008-05 aEndPos ( nEndCol, nEndRow, nTab ), -//UNUSED2008-05 aString ( rString ), -//UNUSED2008-05 pEditData ( pData ? pData->Clone() : NULL ) -//UNUSED2008-05 { -//UNUSED2008-05 } - ScInputStatusItem::ScInputStatusItem( USHORT nWhichP, const ScAddress& rCurPos, const ScAddress& rStartPos, diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 842f1cc81dea..e6a900845eef 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -39,17 +39,6 @@ // ============================================================================ -//UNUSED2009-05 ScCsvTableBox::ScCsvTableBox( Window* pParent ) : -//UNUSED2009-05 ScCsvControl( pParent, maData, WB_BORDER | WB_TABSTOP | WB_DIALOGCONTROL ), -//UNUSED2009-05 maRuler( *this ), -//UNUSED2009-05 maGrid( *this ), -//UNUSED2009-05 maHScroll( this, WB_HORZ | WB_DRAG ), -//UNUSED2009-05 maVScroll( this, WB_VERT | WB_DRAG ), -//UNUSED2009-05 maScrollBox( this ) -//UNUSED2009-05 { -//UNUSED2009-05 Init(); -//UNUSED2009-05 } - ScCsvTableBox::ScCsvTableBox( Window* pParent, const ResId& rResId ) : ScCsvControl( pParent, maData, rResId ), maRuler( *this ), @@ -222,25 +211,6 @@ void ScCsvTableBox::SetUniStrings( EnableRepaint(); } -//UNUSED2009-05 void ScCsvTableBox::SetByteStrings( -//UNUSED2009-05 const ByteString* pTextLines, CharSet eCharSet, -//UNUSED2009-05 const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ) -//UNUSED2009-05 { -//UNUSED2009-05 // assuming that pTextLines is a string array with size CSV_PREVIEW_LINES -//UNUSED2009-05 // -> will be dynamic sometime -//UNUSED2009-05 DisableRepaint(); -//UNUSED2009-05 sal_Int32 nEndLine = GetFirstVisLine() + CSV_PREVIEW_LINES; -//UNUSED2009-05 const ByteString* pString = pTextLines; -//UNUSED2009-05 for( sal_Int32 nLine = GetFirstVisLine(); nLine < nEndLine; ++nLine, ++pString ) -//UNUSED2009-05 { -//UNUSED2009-05 if( mbFixedMode ) -//UNUSED2009-05 maGrid.ImplSetTextLineFix( nLine, String( *pString, eCharSet ) ); -//UNUSED2009-05 else -//UNUSED2009-05 maGrid.ImplSetTextLineSep( nLine, String( *pString, eCharSet ), rSepChars, cTextSep, bMergeSep ); -//UNUSED2009-05 } -//UNUSED2009-05 EnableRepaint(); -//UNUSED2009-05 } - // column settings ------------------------------------------------------------ diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 425372556678..711d9561f69a 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2977,43 +2977,6 @@ BOOL ScDocFunc::SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL /* bApi */ ) return TRUE; } -//UNUSED2009-05 BOOL ScDocFunc::SetGrammar( formula::FormulaGrammar::Grammar eGrammar ) -//UNUSED2009-05 { -//UNUSED2009-05 ScDocument* pDoc = rDocShell.GetDocument(); -//UNUSED2009-05 -//UNUSED2009-05 if ( pDoc->GetGrammar() == eGrammar ) -//UNUSED2009-05 return TRUE; -//UNUSED2009-05 -//UNUSED2009-05 BOOL bUndo(pDoc->IsUndoEnabled()); -//UNUSED2009-05 ScDocShellModificator aModificator( rDocShell ); -//UNUSED2009-05 -//UNUSED2009-05 pDoc->SetGrammar( eGrammar ); -//UNUSED2009-05 -//UNUSED2009-05 if (bUndo) -//UNUSED2009-05 { -//UNUSED2009-05 rDocShell.GetUndoManager()->AddUndoAction( new ScUndoSetGrammar( &rDocShell, eGrammar ) ); -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 rDocShell.PostPaint( 0,0,0,MAXCOL,MAXROW,MAXTAB, PAINT_ALL ); -//UNUSED2009-05 -//UNUSED2009-05 ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); -//UNUSED2009-05 if (NULL != pViewSh) -//UNUSED2009-05 { -//UNUSED2009-05 pViewSh->UpdateInputHandler( FALSE, FALSE ); -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 aModificator.SetDocumentModified(); -//UNUSED2009-05 -//UNUSED2009-05 SfxBindings* pBindings = rDocShell.GetViewBindings(); -//UNUSED2009-05 if (pBindings) -//UNUSED2009-05 { -//UNUSED2009-05 // erAck: 2006-09-07T22:19+0200 commented out in CWS scr1c1 -//UNUSED2009-05 //pBindings->Invalidate( FID_TAB_USE_R1C1 ); -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 return TRUE; -//UNUSED2009-05 } - BOOL ScDocFunc::RenameTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi ) { ScDocument* pDoc = rDocShell.GetDocument(); diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index 8ce9050c6094..91fe3dc5077f 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -113,11 +113,6 @@ public: ///===== internal ======================================================== -//UNUSED2009-05 com::sun::star::uno::Reference < com::sun::star::accessibility::XAccessible > -//UNUSED2009-05 GetCurrentAccessibleTable(); - -//UNUSED2009-05 void ChildCountChanged(); - protected: /// Return this object's description. virtual ::rtl::OUString SAL_CALL diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 0a61280a574a..6265a1e4c1e5 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -203,7 +203,6 @@ public: virtual SvxViewForwarder* GetViewForwarder(); virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; } -//UNUSED2008-05 DECL_LINK( NotifyHdl, EENotify* ); private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; @@ -233,7 +232,6 @@ public: virtual SvxViewForwarder* GetViewForwarder(); virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; } -//UNUSED2008-05 DECL_LINK( NotifyHdl, EENotify* ); private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index a077129c374c..746122692aa7 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -173,7 +173,6 @@ private: void Init(); void InitFilter(); -//UNUSED2008-05 void SetMyStaticData(); DECL_LINK( FilterHandle, SvxTPFilter* ); DECL_LINK( RefHandle, SvxTPFilter* ); diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index faeecb370c78..6e8d1374570f 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -82,7 +82,6 @@ private: static void Transform_Impl( ScChangeActionList& rActionList, ScChangeActionMergeMap* pMergeMap ); public: -//UNUSED2008-05 static bool HasSharedAction( ScConflictsList& rConflictsList, ULONG nSharedAction ); static bool HasOwnAction( ScConflictsList& rConflictsList, ULONG nOwnAction ); static ScConflictsListEntry* GetSharedActionEntry( ScConflictsList& rConflictsList, ULONG nSharedAction ); @@ -148,11 +147,8 @@ class ScConflictsListBox: public SvxRedlinTable private: public: -//UNUSED2008-05 ScConflictsListBox( Window* pParent, WinBits nBits = WB_BORDER ); ScConflictsListBox( Window* pParent, const ResId& rResId ); ~ScConflictsListBox(); - -//UNUSED2008-05 ULONG GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const; }; //============================================================================= diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index b7d4d292c406..658378387416 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -110,7 +110,6 @@ class ScContentTree : public SvTreeListBox ULONG GetChildIndex( SvLBoxEntry* pEntry ) const; void DoDrag(); -//UNUSED2008-05 void AdjustTitle(); ScDocument* GetSourceDocument(); diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 205e8b50cad1..f30c81f84b33 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -74,7 +74,6 @@ private: // ------------------------------------------------------------------------ public: -//UNUSED2009-05 explicit ScCsvTableBox( Window* pParent ); explicit ScCsvTableBox( Window* pParent, const ResId& rResId ); // common table box handling ---------------------------------------------- @@ -109,10 +108,6 @@ public: void SetUniStrings( const String* pTextLines, const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ); -//UNUSED2009-05 /** Fills all cells of all lines with the passed texts (ByteStrings). */ -//UNUSED2009-05 void SetByteStrings( -//UNUSED2009-05 const ByteString* pLineTexts, CharSet eCharSet, -//UNUSED2009-05 const String& rSepChars, sal_Unicode cTextSep, bool bMergeSep ); // column settings -------------------------------------------------------- public: diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 6a178b62aa6b..3c24a8b11c21 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -52,7 +52,6 @@ private: public: ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); -//UNUSED2008-05 ScDBFunc( Window* pParent, const ScDBFunc& rDBFunc, ScTabViewShell* pViewShell ); virtual ~ScDBFunc(); // nur UISort wiederholt bei Bedarf die Teilergebnisse diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index 85fe9ec264ed..6c61364c5228 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -132,8 +132,6 @@ public: BOOL SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL bApi ); -//UNUSED2009-05 BOOL SetGrammar( formula::FormulaGrammar::Grammar eGrammar ); - SC_DLLPUBLIC BOOL SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, SCTAB nTab, ScSizeMode eMode, USHORT nSizeTwips, BOOL bRecord, BOOL bApi ); diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index fa6b03638551..62a291966fa8 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -111,7 +111,6 @@ public: void SetMarkedOriginalSize(); BOOL SelectObject( const String& rName ); -//UNUSED2008-05 String GetSelectedChartName() const; bool HasMarkedControl() const; bool HasMarkedInternal() const; @@ -140,7 +139,6 @@ public: inline void UnlockInternalLayer() { LockInternalLayer( false ); } SdrEndTextEditKind ScEndTextEdit(); // ruft SetDrawTextUndo(0) -//UNUSED2009-05 void CaptionTextDirection(USHORT nSlot); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable(); }; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 9843878032c0..b079789071a0 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -366,8 +366,6 @@ public: void InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, BOOL bTestMerge = FALSE, BOOL bRepeat = FALSE ); -//UNUSED2008-05 void DrawDragRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); - void CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress); void HideCursor(); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 236d34a8254f..fec3d072adc1 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -170,8 +170,6 @@ public: BOOL IsInputActive(); EditView* GetEditView(); -//UNUSED2008-05 EditView* ActivateEdit( const String& rText, -//UNUSED2008-05 const ESelection& rSel ); void TextGrabFocus(); void TextInvalidate(); diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index fa288c609070..306949ccc053 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -61,7 +61,6 @@ public: ~ScSelEntryDlg(); String GetSelectEntry() const; -//UNUSED2008-05 USHORT GetSelectEntryPos() const; }; diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx index 15b477abad3c..02102fbc3ead 100644 --- a/sc/source/ui/inc/prevloc.hxx +++ b/sc/source/ui/inc/prevloc.hxx @@ -101,7 +101,6 @@ class ScPreviewLocationData SCTAB nPrintTab; List aEntries; -//UNUSED2008-05 ScAddress GetCellFromRange( const Size& rOffsetPixel, const ScRange& rRange ) const; Rectangle GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const; public: diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 5f16bbe009fa..50d04fb6f62a 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -224,7 +224,6 @@ protected: public: ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); -//UNUSED2009-05 ScTabView( Window* pParent, const ScTabView& rScTabView, ScTabViewShell* pViewShell ); ~ScTabView(); void MakeDrawLayer(); @@ -268,7 +267,6 @@ public: void DrawDeselectAll(); void DrawMarkListHasChanged(); void UpdateAnchorHandles(); -//UNUSED2008-05 String GetSelectedChartName() const; ScPageBreakData* GetPageBreakData() { return pPageBreakData; } ScHighlightRanges* GetHighlightRanges() { return pHighlightRanges; } @@ -308,7 +306,6 @@ public: void UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ); void StopRefMode(); -//UNUSED2008-05 void EndSelection(); void StopMarking(); void FakeButtonUp( ScSplitPos eWhich ); @@ -318,12 +315,8 @@ public: ScSplitPos FindWindow( Window* pWindow ) const; void SetActivePointer( const Pointer& rPointer ); -//UNUSED2008-05 void SetActivePointer( const ResId& rId ); void ActiveGrabFocus(); -//UNUSED2008-05 void ActiveCaptureMouse(); -//UNUSED2008-05 void ActiveReleaseMouse(); -//UNUSED2008-05 Point ActivePixelToLogic( const Point& rDevicePoint ); void ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl ); @@ -412,12 +405,6 @@ public: void InvertBlockMark(SCCOL nBlockStartX, SCROW nBlockStartY, SCCOL nBlockEndX, SCROW nBlockEndY); -//UNUSED2008-05 void DrawDragRect( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, -//UNUSED2008-05 ScSplitPos ePos ); -//UNUSED2008-05 void PaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab ); -//UNUSED2008-05 void PaintLeftRow( SCROW nRow ); -//UNUSED2008-05 void PaintTopCol( SCCOL nCol ); - void PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScUpdateMode eMode = SC_UPDATE_ALL ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index b4313c1d7a32..9508148c6228 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -169,7 +169,6 @@ private: SbxObject* pScSbxObject; -//UNUSED2008-05 BOOL bChartDlgIsEdit; // Datenbereich aendern BOOL bChartAreaValid; // wenn Chart aufgezogen wird String aEditChartName; ScRangeListRef aChartSource; @@ -185,7 +184,6 @@ private: private: void Construct( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); -//UNUSED2008-05 void SetMySubShell( SfxShell* pShell ); SfxShell* GetMySubShell() const; void DoReadUserData( const String& rData ); @@ -241,9 +239,6 @@ public: // -> Clone-Methode fuer Factory -//UNUSED2008-05 ScTabViewShell( SfxViewFrame* pViewFrame, -//UNUSED2008-05 const ScTabViewShell& rWin ); - // aus einer allgemeinen Shell konstruieren und // soviel wie moeglich uebernehmen (SliderPos etc.): @@ -268,9 +263,6 @@ public: SvxBorderLine* GetDefaultFrameLine() const { return pCurFrameLine; } void SetDefaultFrameLine(const SvxBorderLine* pLine ); -//UNUSED2008-05 void ExecuteShowNIY( SfxRequest& rReq ); -//UNUSED2008-05 void StateDisabled( SfxItemSet& rSet ); - SC_DLLPUBLIC void Execute( SfxRequest& rReq ); SC_DLLPUBLIC void GetState( SfxItemSet& rSet ); @@ -351,15 +343,10 @@ public: void FillFieldData( ScHeaderFieldData& rData ); -//UNUSED2008-05 void ResetChartArea(); void SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest ); BOOL GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const; -//UNUSED2008-05 BOOL IsChartDlgEdit() const; -//UNUSED2008-05 void SetChartDlgEdit(BOOL bFlag){bChartDlgIsEdit=bFlag;} - void SetEditChartName(const String& aStr){aEditChartName=aStr;} -//UNUSED2008-05 const String& GetEditChartName() const; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 770411b63e1b..13da8b3e4f91 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -54,13 +54,6 @@ class ScInputStatusItem : public SfxPoolItem public: TYPEINFO(); -//UNUSED2008-05 ScInputStatusItem( USHORT nWhich, -//UNUSED2008-05 SCTAB nTab, -//UNUSED2008-05 SCCOL nCol, SCROW nRow, -//UNUSED2008-05 SCCOL nStartCol, SCROW nStartRow, -//UNUSED2008-05 SCCOL nEndCol, SCROW nSEndRow, -//UNUSED2008-05 const String& rString, -//UNUSED2008-05 const EditTextObject* pData ); ScInputStatusItem( USHORT nWhich, const ScAddress& rCurPos, diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index a2fcd392e9b4..76f3d42a8475 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -406,39 +406,6 @@ private: BOOL bQuerySize; }; -//UNUSED2008-05 class ScUndoPivot: public ScSimpleUndo -//UNUSED2008-05 { -//UNUSED2008-05 public: -//UNUSED2008-05 TYPEINFO(); -//UNUSED2008-05 ScUndoPivot( ScDocShell* pNewDocShell, -//UNUSED2008-05 const ScArea& rOld, const ScArea& rNew, -//UNUSED2008-05 ScDocument* pOldDoc, ScDocument* pNewDoc, -//UNUSED2008-05 const ScPivot* pOldPivot, const ScPivot* pNewPivot ); -//UNUSED2008-05 virtual ~ScUndoPivot(); -//UNUSED2008-05 -//UNUSED2008-05 virtual void Undo(); -//UNUSED2008-05 virtual void Redo(); -//UNUSED2008-05 virtual void Repeat(SfxRepeatTarget& rTarget); -//UNUSED2008-05 virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; -//UNUSED2008-05 -//UNUSED2008-05 virtual String GetComment() const; -//UNUSED2008-05 -//UNUSED2008-05 private: -//UNUSED2008-05 ScArea aOldArea; -//UNUSED2008-05 ScArea aNewArea; -//UNUSED2008-05 ScDocument* pOldUndoDoc; -//UNUSED2008-05 ScDocument* pNewUndoDoc; -//UNUSED2008-05 ScPivotParam aOldParam; // fuer Redo -//UNUSED2008-05 ScQueryParam aOldQuery; -//UNUSED2008-05 ScArea aOldSrc; -//UNUSED2008-05 ScPivotParam aNewParam; // fuer Undo in Collection -//UNUSED2008-05 ScQueryParam aNewQuery; -//UNUSED2008-05 ScArea aNewSrc; -//UNUSED2008-05 String aOldName; -//UNUSED2008-05 String aOldTag; -//UNUSED2008-05 String aNewName; -//UNUSED2008-05 String aNewTag; -//UNUSED2008-05 }; class ScUndoDataPilot: public ScSimpleUndo { diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index c8d135070ab1..da130e4c0db8 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -517,27 +517,5 @@ private: void DoChange( BOOL bNew ); }; - -//UNUSED2009-05 class ScUndoSetGrammar : public ScSimpleUndo -//UNUSED2009-05 { -//UNUSED2009-05 public: -//UNUSED2009-05 TYPEINFO(); -//UNUSED2009-05 ScUndoSetGrammar( ScDocShell* pShell, -//UNUSED2009-05 formula::FormulaGrammar::Grammar eGrammar ); -//UNUSED2009-05 virtual ~ScUndoSetGrammar(); -//UNUSED2009-05 -//UNUSED2009-05 virtual void Undo(); -//UNUSED2009-05 virtual void Redo(); -//UNUSED2009-05 virtual void Repeat(SfxRepeatTarget& rTarget); -//UNUSED2009-05 virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; -//UNUSED2009-05 -//UNUSED2009-05 virtual String GetComment() const; -//UNUSED2009-05 -//UNUSED2009-05 private: -//UNUSED2009-05 formula::FormulaGrammar::Grammar meNewGrammar, meOldGrammar; -//UNUSED2009-05 -//UNUSED2009-05 void DoChange( formula::FormulaGrammar::Grammar eGrammar ); -//UNUSED2009-05 }; - #endif diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index ebd2ea85d457..3c5928b3ecc4 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -242,9 +242,6 @@ public: ~ScViewData(); void InitData( ScDocument* pDocument ); -//UNUSED2008-05 void InitFrom( const ScViewData* pRef ); -//UNUSED2008-05 void SetDocShell( ScDocShell* pShell ); - ScDocShell* GetDocShell() const { return pDocShell; } ScDBFunc* GetView() const { return pView; } @@ -461,11 +458,8 @@ public: SCROW VisibleCellsY( ScVSplitPos eWhichY ) const; SCCOL PrevCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der vorgehenden Seite SCROW PrevCellsY( ScVSplitPos eWhichY ) const; -//UNUSED2008-05 SCCOL LastCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der letzten Seite -//UNUSED2008-05 SCROW LastCellsY( ScVSplitPos eWhichY ) const; BOOL IsOle(); -//UNUSED2008-05 void UpdateOle( ScSplitPos eWhich ); void SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); void SetScreen( const Rectangle& rVisArea ); void SetScreenPos( const Point& rVisAreaStart ); diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 7c594506e521..6353ec14de1a 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -83,7 +83,6 @@ private: public: ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); -//UNUSED2008-05 ScViewFunc( Window* pParent, const ScViewFunc& rViewFunc, ScTabViewShell* pViewShell ); ~ScViewFunc(); const ScPatternAttr* GetSelectionPattern (); @@ -307,10 +306,8 @@ public: void ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate ); void DoRefConversion( BOOL bRecord = TRUE ); -//UNUSED2008-05 void DoSpellingChecker( BOOL bRecord = TRUE ); void DoHangulHanjaConversion( BOOL bRecord = TRUE ); void DoThesaurus( BOOL bRecord = TRUE ); -//UNUSED2008-05 DECL_LINK( SpellError, void * ); /** Generic implementation of sheet conversion functions. */ void DoSheetConversion( const ScConversionParam& rParam, BOOL bRecord = TRUE ); @@ -345,8 +342,6 @@ protected: const SvxBorderLine* pSrcLine, BOOL bColor ); -//UNUSED2008-05 void PaintWidthHeight( BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd ); - private: void PasteRTF( SCCOL nCol, SCROW nStartRow, diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 6f59b64c52fc..626f48254f37 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -2037,10 +2037,6 @@ void ScAcceptChgDlg::InitFilter() } } -//UNUSED2008-05 void ScAcceptChgDlg::SetMyStaticData() -//UNUSED2008-05 { -//UNUSED2008-05 } - IMPL_LINK( ScAcceptChgDlg, FilterModified, SvxTPFilter*, EMPTYARG ) { return 0; diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 361f201281dc..213c0b6a16a3 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -76,20 +76,6 @@ bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const // class ScConflictsListHelper //============================================================================= -//UNUSED2008-05 bool ScConflictsListHelper::HasSharedAction( ScConflictsList& rConflictsList, ULONG nSharedAction ) -//UNUSED2008-05 { -//UNUSED2008-05 ScConflictsList::const_iterator aEnd = rConflictsList.end(); -//UNUSED2008-05 for ( ScConflictsList::const_iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( aItr->HasSharedAction( nSharedAction ) ) -//UNUSED2008-05 { -//UNUSED2008-05 return true; -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 return false; -//UNUSED2008-05 } - bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, ULONG nOwnAction ) { ScConflictsList::const_iterator aEnd = rConflictsList.end(); @@ -430,11 +416,6 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA // class ScConflictsListBox //============================================================================= -//UNUSED2008-05 ScConflictsListBox::ScConflictsListBox( Window* pParent, WinBits nBits ) -//UNUSED2008-05 :SvxRedlinTable( pParent, nBits ) -//UNUSED2008-05 { -//UNUSED2008-05 } - ScConflictsListBox::ScConflictsListBox( Window* pParent, const ResId& rResId ) :SvxRedlinTable( pParent, rResId ) { @@ -444,23 +425,6 @@ ScConflictsListBox::~ScConflictsListBox() { } -//UNUSED2008-05 ULONG ScConflictsListBox::GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const -//UNUSED2008-05 { -//UNUSED2008-05 ULONG nPos = 0; -//UNUSED2008-05 SvLBoxEntry* pEntry = GetRootLevelParent( First() ); -//UNUSED2008-05 while ( pEntry ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( pEntry == pRootEntry ) -//UNUSED2008-05 { -//UNUSED2008-05 return nPos; -//UNUSED2008-05 } -//UNUSED2008-05 pEntry = NextSibling( pEntry ); -//UNUSED2008-05 ++nPos; -//UNUSED2008-05 } -//UNUSED2008-05 return 0xffffffff; -//UNUSED2008-05 } - - //============================================================================= // class ScConflictsDlg //============================================================================= diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 79dcfe3b7ad8..afdb2b70da8a 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -84,13 +84,6 @@ String ScSelEntryDlg::GetSelectEntry() const //------------------------------------------------------------------------ -//UNUSED2008-05 USHORT ScSelEntryDlg::GetSelectEntryPos() const -//UNUSED2008-05 { -//UNUSED2008-05 return aLb.GetSelectEntryPos(); -//UNUSED2008-05 } - -//------------------------------------------------------------------------ - IMPL_LINK_INLINE_START( ScSelEntryDlg, DblClkHdl, void *, EMPTYARG ) { EndDialog( RET_OK ); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index a417621bb303..5da1e4c273f7 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -1282,17 +1282,6 @@ IMPL_STATIC_LINK(ScContentTree, ExecDragHdl, void*, EMPTYARG) return 0; } -//UNUSED2008-05 void ScContentTree::AdjustTitle() -//UNUSED2008-05 { -//UNUSED2008-05 String aTitle = pParentWindow->aTitleBase; -//UNUSED2008-05 if (bHiddenDoc) -//UNUSED2008-05 { -//UNUSED2008-05 aTitle.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " - " )); -//UNUSED2008-05 aTitle += aHiddenTitle; -//UNUSED2008-05 } -//UNUSED2008-05 pParentWindow->SetText(aTitle); -//UNUSED2008-05 } - BOOL ScContentTree::LoadFile( const String& rUrl ) { String aDocName = rUrl; diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 0f7834b2a8df..36b192abce24 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -68,7 +68,6 @@ TYPEINIT1(ScUndoAutoFilter, ScDBFuncUndo); TYPEINIT1(ScUndoDBData, ScSimpleUndo); TYPEINIT1(ScUndoImportData, ScSimpleUndo); TYPEINIT1(ScUndoRepeatDB, ScSimpleUndo); -//UNUSED2008-05 TYPEINIT1(ScUndoPivot, ScSimpleUndo); TYPEINIT1(ScUndoDataPilot, ScSimpleUndo); TYPEINIT1(ScUndoConsolidate, ScSimpleUndo); TYPEINIT1(ScUndoChartData, ScSimpleUndo); @@ -1631,164 +1630,6 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const return (rTarget.ISA(ScTabViewTarget)); } -//UNUSED2008-05 // -//UNUSED2008-05 // Pivot-Tabellen -//UNUSED2008-05 // -//UNUSED2008-05 -//UNUSED2008-05 ScUndoPivot::ScUndoPivot( ScDocShell* pNewDocShell, -//UNUSED2008-05 const ScArea& rOld, const ScArea& rNew, -//UNUSED2008-05 ScDocument* pOldDoc, ScDocument* pNewDoc, -//UNUSED2008-05 const ScPivot* pOldPivot, const ScPivot* pNewPivot ) : -//UNUSED2008-05 ScSimpleUndo( pNewDocShell ), -//UNUSED2008-05 aOldArea( rOld ), -//UNUSED2008-05 aNewArea( rNew ), -//UNUSED2008-05 pOldUndoDoc( pOldDoc ), -//UNUSED2008-05 pNewUndoDoc( pNewDoc ) -//UNUSED2008-05 { -//UNUSED2008-05 if (pNewPivot) -//UNUSED2008-05 { -//UNUSED2008-05 pNewPivot->GetParam( aNewParam, aNewQuery, aNewSrc ); -//UNUSED2008-05 aNewName = pNewPivot->GetName(); -//UNUSED2008-05 aNewTag = pNewPivot->GetTag(); -//UNUSED2008-05 } -//UNUSED2008-05 if (pOldPivot) -//UNUSED2008-05 { -//UNUSED2008-05 pOldPivot->GetParam( aOldParam, aOldQuery, aOldSrc ); -//UNUSED2008-05 aOldName = pOldPivot->GetName(); -//UNUSED2008-05 aOldTag = pOldPivot->GetTag(); -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 __EXPORT ScUndoPivot::~ScUndoPivot() -//UNUSED2008-05 { -//UNUSED2008-05 delete pOldUndoDoc; -//UNUSED2008-05 delete pNewUndoDoc; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 String __EXPORT ScUndoPivot::GetComment() const -//UNUSED2008-05 { -//UNUSED2008-05 USHORT nIndex; -//UNUSED2008-05 if ( pOldUndoDoc && pNewUndoDoc ) -//UNUSED2008-05 nIndex = STR_UNDO_PIVOT_MODIFY; -//UNUSED2008-05 else if ( pNewUndoDoc ) -//UNUSED2008-05 nIndex = STR_UNDO_PIVOT_NEW; -//UNUSED2008-05 else -//UNUSED2008-05 nIndex = STR_UNDO_PIVOT_DELETE; -//UNUSED2008-05 -//UNUSED2008-05 return ScGlobal::GetRscString( nIndex ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void __EXPORT ScUndoPivot::Undo() -//UNUSED2008-05 { -//UNUSED2008-05 BeginUndo(); -//UNUSED2008-05 -//UNUSED2008-05 ScDocument* pDoc = pDocShell->GetDocument(); -//UNUSED2008-05 -//UNUSED2008-05 if (pNewUndoDoc) -//UNUSED2008-05 { -//UNUSED2008-05 pDoc->DeleteAreaTab( aNewArea.nColStart,aNewArea.nRowStart, -//UNUSED2008-05 aNewArea.nColEnd,aNewArea.nRowEnd, aNewArea.nTab, IDF_ALL ); -//UNUSED2008-05 pNewUndoDoc->CopyToDocument( aNewArea.nColStart, aNewArea.nRowStart, aNewArea.nTab, -//UNUSED2008-05 aNewArea.nColEnd, aNewArea.nRowEnd, aNewArea.nTab, -//UNUSED2008-05 IDF_ALL, FALSE, pDoc ); -//UNUSED2008-05 } -//UNUSED2008-05 if (pOldUndoDoc) -//UNUSED2008-05 { -//UNUSED2008-05 pDoc->DeleteAreaTab( aOldArea.nColStart,aOldArea.nRowStart, -//UNUSED2008-05 aOldArea.nColEnd,aOldArea.nRowEnd, aOldArea.nTab, IDF_ALL ); -//UNUSED2008-05 pOldUndoDoc->CopyToDocument( aOldArea.nColStart, aOldArea.nRowStart, aOldArea.nTab, -//UNUSED2008-05 aOldArea.nColEnd, aOldArea.nRowEnd, aOldArea.nTab, -//UNUSED2008-05 IDF_ALL, FALSE, pDoc ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 ScPivotCollection* pPivotCollection = pDoc->GetPivotCollection(); -//UNUSED2008-05 if ( pNewUndoDoc ) -//UNUSED2008-05 { -//UNUSED2008-05 ScPivot* pNewPivot = pPivotCollection->GetPivotAtCursor( -//UNUSED2008-05 aNewParam.nCol, aNewParam.nRow, aNewParam.nTab ); -//UNUSED2008-05 if (pNewPivot) -//UNUSED2008-05 pPivotCollection->Free( pNewPivot ); -//UNUSED2008-05 } -//UNUSED2008-05 if ( pOldUndoDoc ) -//UNUSED2008-05 { -//UNUSED2008-05 ScPivot* pOldPivot = new ScPivot( pDoc ); -//UNUSED2008-05 pOldPivot->SetParam( aOldParam, aOldQuery, aOldSrc ); -//UNUSED2008-05 pOldPivot->SetName( aOldName ); -//UNUSED2008-05 pOldPivot->SetTag( aOldTag ); -//UNUSED2008-05 if (pOldPivot->CreateData()) // Felder berechnen -//UNUSED2008-05 pOldPivot->ReleaseData(); -//UNUSED2008-05 pPivotCollection->Insert( pOldPivot ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 // erack! it's broadcasted -//UNUSED2008-05 // pDoc->SetDirty(); -//UNUSED2008-05 if (pNewUndoDoc) -//UNUSED2008-05 pDocShell->PostPaint( aNewArea.nColStart, aNewArea.nRowStart, aNewArea.nTab, -//UNUSED2008-05 aNewArea.nColEnd, aNewArea.nRowEnd, aNewArea.nTab, -//UNUSED2008-05 PAINT_GRID, SC_PF_LINES ); -//UNUSED2008-05 if (pOldUndoDoc) -//UNUSED2008-05 pDocShell->PostPaint( aOldArea.nColStart, aOldArea.nRowStart, aOldArea.nTab, -//UNUSED2008-05 aOldArea.nColEnd, aOldArea.nRowEnd, aOldArea.nTab, -//UNUSED2008-05 PAINT_GRID, SC_PF_LINES ); -//UNUSED2008-05 pDocShell->PostDataChanged(); -//UNUSED2008-05 -//UNUSED2008-05 ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); -//UNUSED2008-05 if (pViewShell) -//UNUSED2008-05 { -//UNUSED2008-05 SCTAB nTab = pViewShell->GetViewData()->GetTabNo(); -//UNUSED2008-05 if ( pOldUndoDoc ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( nTab != aOldArea.nTab ) -//UNUSED2008-05 pViewShell->SetTabNo( aOldArea.nTab ); -//UNUSED2008-05 } -//UNUSED2008-05 else if ( pNewUndoDoc ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( nTab != aNewArea.nTab ) -//UNUSED2008-05 pViewShell->SetTabNo( aNewArea.nTab ); -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 EndUndo(); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void __EXPORT ScUndoPivot::Redo() -//UNUSED2008-05 { -//UNUSED2008-05 BeginRedo(); -//UNUSED2008-05 -//UNUSED2008-05 ScDocument* pDoc = pDocShell->GetDocument(); -//UNUSED2008-05 ScPivotCollection* pPivotCollection = pDoc->GetPivotCollection(); -//UNUSED2008-05 ScPivot* pOldPivot = pPivotCollection->GetPivotAtCursor( -//UNUSED2008-05 aOldParam.nCol, aOldParam.nRow, aOldParam.nTab ); -//UNUSED2008-05 -//UNUSED2008-05 ScPivot* pNewPivot = NULL; -//UNUSED2008-05 if (pNewUndoDoc) -//UNUSED2008-05 { -//UNUSED2008-05 pNewPivot = new ScPivot( pDoc ); -//UNUSED2008-05 pNewPivot->SetParam( aNewParam, aNewQuery, aNewSrc ); -//UNUSED2008-05 pNewPivot->SetName( aNewName ); -//UNUSED2008-05 pNewPivot->SetTag( aNewTag ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 pDocShell->PivotUpdate( pOldPivot, pNewPivot, FALSE ); -//UNUSED2008-05 -//UNUSED2008-05 EndRedo(); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void __EXPORT ScUndoPivot::Repeat(SfxRepeatTarget& rTarget) -//UNUSED2008-05 { -//UNUSED2008-05 // Wiederholen: nur loeschen -//UNUSED2008-05 -//UNUSED2008-05 if ( pOldUndoDoc && !pNewUndoDoc && rTarget.ISA(ScTabViewTarget) ) -//UNUSED2008-05 ((ScTabViewTarget&)rTarget).GetViewShell()->DeletePivotTable(); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 BOOL __EXPORT ScUndoPivot::CanRepeat(SfxRepeatTarget& rTarget) const -//UNUSED2008-05 { -//UNUSED2008-05 // Wiederholen: nur loeschen -//UNUSED2008-05 -//UNUSED2008-05 return ( pOldUndoDoc && !pNewUndoDoc && rTarget.ISA(ScTabViewTarget) ); -//UNUSED2008-05 } - // // data pilot // diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 70845f6c0bc9..8d852ce0cda5 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -78,7 +78,6 @@ TYPEINIT1(ScUndoPrintRange, SfxUndoAction); TYPEINIT1(ScUndoScenarioFlags, SfxUndoAction); TYPEINIT1(ScUndoRenameObject, SfxUndoAction); TYPEINIT1(ScUndoLayoutRTL, SfxUndoAction); -//UNUSED2009-05 TYPEINIT1(ScUndoSetGrammar, SfxUndoAction); TYPEINIT1(ScUndoTabColor, SfxUndoAction); @@ -1665,61 +1664,3 @@ String ScUndoLayoutRTL::GetComment() const return ScGlobal::GetRscString( STR_UNDO_TAB_RTL ); } - - -// ----------------------------------------------------------------------- -// -// Set the grammar used for the sheet -// - -//UNUSED2009-05 ScUndoSetGrammar::ScUndoSetGrammar( ScDocShell* pShell, -//UNUSED2009-05 formula::FormulaGrammar::Grammar eGrammar ) : -//UNUSED2009-05 ScSimpleUndo( pShell ), -//UNUSED2009-05 meNewGrammar( eGrammar ) -//UNUSED2009-05 { -//UNUSED2009-05 meOldGrammar = pDocShell->GetDocument()->GetGrammar(); -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 __EXPORT ScUndoSetGrammar::~ScUndoSetGrammar() -//UNUSED2009-05 { -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 void ScUndoSetGrammar::DoChange( formula::FormulaGrammar::Grammar eGrammar ) -//UNUSED2009-05 { -//UNUSED2009-05 pDocShell->SetInUndo( TRUE ); -//UNUSED2009-05 ScDocument* pDoc = pDocShell->GetDocument(); -//UNUSED2009-05 pDoc->SetGrammar( eGrammar ); -//UNUSED2009-05 pDocShell->SetDocumentModified(); -//UNUSED2009-05 pDocShell->SetInUndo( FALSE ); -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 void __EXPORT ScUndoSetGrammar::Undo() -//UNUSED2009-05 { -//UNUSED2009-05 DoChange( meOldGrammar ); -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 void __EXPORT ScUndoSetGrammar::Redo() -//UNUSED2009-05 { -//UNUSED2009-05 DoChange( meNewGrammar ); -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 void __EXPORT ScUndoSetGrammar::Repeat(SfxRepeatTarget& /* rTarget */) -//UNUSED2009-05 { -//UNUSED2009-05 #if 0 -//UNUSED2009-05 // erAck: 2006-09-07T23:00+0200 commented out in CWS scr1c1 -//UNUSED2009-05 if (rTarget.ISA(ScTabViewTarget)) -//UNUSED2009-05 ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData()->GetDispatcher(). -//UNUSED2009-05 Execute( FID_TAB_USE_R1C1, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); -//UNUSED2009-05 #endif -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 BOOL __EXPORT ScUndoSetGrammar::CanRepeat(SfxRepeatTarget& rTarget) const -//UNUSED2009-05 { -//UNUSED2009-05 return (rTarget.ISA(ScTabViewTarget)); -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 String __EXPORT ScUndoSetGrammar::GetComment() const -//UNUSED2009-05 { -//UNUSED2009-05 return ScGlobal::GetRscString( STR_UNDO_TAB_R1C1 ); -//UNUSED2009-05 } - diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 3d3f0f479601..83c9441d8fc7 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -3354,12 +3354,6 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableRowsObj ) //------------------------------------------------------------------------ -//UNUSED2008-05 ScSpreadsheetSettingsObj::ScSpreadsheetSettingsObj(ScDocShell* pDocSh) : -//UNUSED2008-05 pDocShell( pDocSh ) -//UNUSED2008-05 { -//UNUSED2008-05 pDocShell->GetDocument()->AddUnoObject(*this); -//UNUSED2008-05 } - ScSpreadsheetSettingsObj::~ScSpreadsheetSettingsObj() { if (pDocShell) diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 8e3e39d07ef4..07a4cbda0230 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -432,14 +432,6 @@ void SAL_CALL ScCellFieldsObj::removeRefreshListener( const uno::Reference<util: // Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht -//UNUSED2008-05 ScCellFieldObj::ScCellFieldObj() : -//UNUSED2008-05 OComponentHelper( getMutex() ), -//UNUSED2008-05 aPropSet( lcl_GetURLPropertyMap() ), -//UNUSED2008-05 pDocShell( NULL ) -//UNUSED2008-05 { -//UNUSED2008-05 pEditSource = NULL; -//UNUSED2008-05 } - ScCellFieldObj::ScCellFieldObj(ScDocShell* pDocSh, const ScAddress& rPos, const ESelection& rSel) : OComponentHelper( getMutex() ), @@ -1112,19 +1104,6 @@ sal_Int16 lcl_SvxToUnoFileFormat( SvxFileFormat nSvxValue ) } } - -// Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht -//UNUSED2008-05 ScHeaderFieldObj::ScHeaderFieldObj() : -//UNUSED2008-05 OComponentHelper( getMutex() ), -//UNUSED2008-05 aPropSet( lcl_GetHeaderFieldPropertyMap() ), -//UNUSED2008-05 pContentObj( NULL ), -//UNUSED2008-05 nPart( 0 ), -//UNUSED2008-05 nType( 0 ), -//UNUSED2008-05 nFileFormat( SVXFILEFORMAT_NAME_EXT ) -//UNUSED2008-05 { -//UNUSED2008-05 pEditSource = NULL; -//UNUSED2008-05 } - ScHeaderFieldObj::ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, USHORT nP, USHORT nT, const ESelection& rSel) : OComponentHelper( getMutex() ), diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 392533c7cf93..ee828136cf14 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -520,11 +520,6 @@ ScTableConditionalFormat* ScTableConditionalFormat::getImplementation( //------------------------------------------------------------------------ -//UNUSED2008-05 ScTableConditionalEntry::ScTableConditionalEntry() : -//UNUSED2008-05 pParent( NULL ) -//UNUSED2008-05 { -//UNUSED2008-05 } - ScTableConditionalEntry::ScTableConditionalEntry(ScTableConditionalFormat* pPar, const ScCondFormatEntryItem& aItem) : pParent( pPar ), diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index 4fdac0288796..77232a176598 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -42,11 +42,6 @@ using ::rtl::OUString; //------------------------------------------------------------------------ -//UNUSED2008-05 SC_SIMPLE_SERVICE_INFO( ScEmptyEnumeration, "ScEmptyEnumeration", "stardiv.unknown" ) -//UNUSED2008-05 SC_SIMPLE_SERVICE_INFO( ScEmptyEnumerationAccess, "ScEmptyEnumerationAccess", "stardiv.unknown" ) -//UNUSED2008-05 SC_SIMPLE_SERVICE_INFO( ScIndexEnumeration, "ScIndexEnumeration", "stardiv.unknown" ) -//UNUSED2008-05 SC_SIMPLE_SERVICE_INFO( ScPrintSettingsObj, "ScPrintSettingsObj", "stardiv.unknown" ) - SC_SIMPLE_SERVICE_INFO( ScNameToIndexAccess, "ScNameToIndexAccess", "stardiv.unknown" ) //------------------------------------------------------------------------ @@ -276,59 +271,6 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& Se //------------------------------------------------------------------------ -//UNUSED2008-05 ScEmptyEnumerationAccess::ScEmptyEnumerationAccess() -//UNUSED2008-05 { -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 ScEmptyEnumerationAccess::~ScEmptyEnumerationAccess() -//UNUSED2008-05 { -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 // XEnumerationAccess -//UNUSED2008-05 -//UNUSED2008-05 uno::Reference<container::XEnumeration> SAL_CALL ScEmptyEnumerationAccess::createEnumeration() -//UNUSED2008-05 throw(uno::RuntimeException) -//UNUSED2008-05 { -//UNUSED2008-05 ScUnoGuard aGuard; -//UNUSED2008-05 return new ScEmptyEnumeration; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 uno::Type SAL_CALL ScEmptyEnumerationAccess::getElementType() throw(uno::RuntimeException) -//UNUSED2008-05 { -//UNUSED2008-05 ScUnoGuard aGuard; -//UNUSED2008-05 return getCppuType((uno::Reference<uno::XInterface>*)0); // or what? -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 sal_Bool SAL_CALL ScEmptyEnumerationAccess::hasElements() throw(uno::RuntimeException) -//UNUSED2008-05 { -//UNUSED2008-05 return FALSE; -//UNUSED2008-05 } - -//------------------------------------------------------------------------ - -//UNUSED2008-05 ScEmptyEnumeration::ScEmptyEnumeration() -//UNUSED2008-05 { -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 ScEmptyEnumeration::~ScEmptyEnumeration() -//UNUSED2008-05 { -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 // XEnumeration -//UNUSED2008-05 -//UNUSED2008-05 sal_Bool SAL_CALL ScEmptyEnumeration::hasMoreElements() throw(uno::RuntimeException) -//UNUSED2008-05 { -//UNUSED2008-05 ScUnoGuard aGuard; -//UNUSED2008-05 return FALSE; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 uno::Any SAL_CALL ScEmptyEnumeration::nextElement() throw(container::NoSuchElementException, -//UNUSED2008-05 lang::WrappedTargetException, uno::RuntimeException) -//UNUSED2008-05 { -//UNUSED2008-05 ScUnoGuard aGuard; -//UNUSED2008-05 return uno::Any(); -//UNUSED2008-05 } - //------------------------------------------------------------------------ ScNameToIndexAccess::ScNameToIndexAccess( const com::sun::star::uno::Reference< @@ -382,43 +324,5 @@ sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(::com::sun::star::u //------------------------------------------------------------------------ -//UNUSED2008-05 ScPrintSettingsObj::ScPrintSettingsObj() -//UNUSED2008-05 { -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 ScPrintSettingsObj::~ScPrintSettingsObj() -//UNUSED2008-05 { -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 // XPropertySet -//UNUSED2008-05 -//UNUSED2008-05 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScPrintSettingsObj::getPropertySetInfo() -//UNUSED2008-05 throw(uno::RuntimeException) -//UNUSED2008-05 { -//UNUSED2008-05 return NULL; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void SAL_CALL ScPrintSettingsObj::setPropertyValue( -//UNUSED2008-05 const rtl::OUString& /* aPropertyName */, const uno::Any& /* aValue */ ) -//UNUSED2008-05 throw(beans::UnknownPropertyException, beans::PropertyVetoException, -//UNUSED2008-05 lang::IllegalArgumentException, lang::WrappedTargetException, -//UNUSED2008-05 uno::RuntimeException) -//UNUSED2008-05 { -//UNUSED2008-05 //! later... -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 uno::Any SAL_CALL ScPrintSettingsObj::getPropertyValue( const rtl::OUString& /* aPropertyName */ ) -//UNUSED2008-05 throw(beans::UnknownPropertyException, lang::WrappedTargetException, -//UNUSED2008-05 uno::RuntimeException) -//UNUSED2008-05 { -//UNUSED2008-05 //! later... -//UNUSED2008-05 return uno::Any(); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScPrintSettingsObj ) - - -//------------------------------------------------------------------------ - diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index a173e6d1e051..0cbe98e96b05 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -350,13 +350,6 @@ static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] = // alles static -//UNUSED2008-05 String ScServiceProvider::GetProviderName(sal_uInt16 nObjectType) -//UNUSED2008-05 { -//UNUSED2008-05 String sRet; -//UNUSED2008-05 if (nObjectType < SC_SERVICE_COUNT) -//UNUSED2008-05 sRet = String::CreateFromAscii( aProvNames[nObjectType] ); -//UNUSED2008-05 return sRet; -//UNUSED2008-05 } sal_uInt16 ScServiceProvider::GetProviderType(const String& rServiceName) { diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 50aecbe7f2e3..640fcade2a81 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -1087,13 +1087,6 @@ void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const ::rtl::OUStr // Default-ctor wird fuer die Reflection gebraucht -//UNUSED2008-05 ScStyleObj::ScStyleObj() : -//UNUSED2008-05 aPropSet( lcl_GetCellStyleMap() ), -//UNUSED2008-05 pDocShell( NULL ), -//UNUSED2008-05 eFamily( SFX_STYLE_FAMILY_PARA ) -//UNUSED2008-05 { -//UNUSED2008-05 } - ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName) : pPropSet( (eFam == SFX_STYLE_FAMILY_PARA) ? lcl_GetCellStyleSet() : lcl_GetPageStyleSet() ), pDocShell( pDocSh ), diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index fd1e655b8ffb..86ebf066a52d 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -464,17 +464,6 @@ void SAL_CALL ScViewPaneObj::release() throw() // Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht -//UNUSED2008-05 ScTabViewObj::ScTabViewObj() : -//UNUSED2008-05 ScViewPaneBase( NULL, SC_VIEWPANE_ACTIVE ), -//UNUSED2008-05 SfxBaseController( NULL ), -//UNUSED2008-05 aPropSet( lcl_GetViewOptPropertyMap() ), -//UNUSED2008-05 aMouseClickHandlers( 0 ), -//UNUSED2008-05 aActivationListeners( 0 ), -//UNUSED2008-05 bDrawSelModeSet(sal_False), -//UNUSED2008-05 bFilteredRangeSelection(sal_True) -//UNUSED2008-05 { -//UNUSED2008-05 } - ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) : ScViewPaneBase( pViewSh, SC_VIEWPANE_ACTIVE ), SfxBaseController( pViewSh ), diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 041d4b759dab..b1969fbcdf70 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -57,11 +57,6 @@ ScDBFunc::ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewSh { } -//UNUSED2008-05 ScDBFunc::ScDBFunc( Window* pParent, const ScDBFunc& rDBFunc, ScTabViewShell* pViewShell ) : -//UNUSED2008-05 ScViewFunc( pParent, rDBFunc, pViewShell ) -//UNUSED2008-05 { -//UNUSED2008-05 } - ScDBFunc::~ScDBFunc() { } diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 1d2b797b3a9b..2fd43356720a 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -695,22 +695,6 @@ BOOL ScDrawView::SelectObject( const String& rName ) return ( pFound != NULL ); } -//UNUSED2008-05 String ScDrawView::GetSelectedChartName() const -//UNUSED2008-05 { -//UNUSED2008-05 // used for modifying a chart's data area - PersistName must always be used -//UNUSED2008-05 // (as in ScDocument::FindChartData and UpdateChartArea) -//UNUSED2008-05 -//UNUSED2008-05 const SdrMarkList& rMarkList = GetMarkedObjectList(); -//UNUSED2008-05 if (rMarkList.GetMarkCount() == 1) -//UNUSED2008-05 { -//UNUSED2008-05 SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); -//UNUSED2008-05 if (pObj->GetObjIdentifier() == OBJ_OLE2) -//UNUSED2008-05 if ( pDoc->IsChart(pObj) ) -//UNUSED2008-05 return static_cast<SdrOle2Obj*>(pObj)->GetPersistName(); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 return EMPTY_STRING; // nichts gefunden -//UNUSED2008-05 } FASTBOOL ScDrawView::InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions) { @@ -821,29 +805,3 @@ void ScDrawView::MarkDropObj( SdrObject* pObj ) } } } - -//UNUSED2009-05 void ScDrawView::CaptionTextDirection( USHORT nSlot ) -//UNUSED2009-05 { -//UNUSED2009-05 if(nSlot != SID_TEXTDIRECTION_LEFT_TO_RIGHT && nSlot != SID_TEXTDIRECTION_TOP_TO_BOTTOM) -//UNUSED2009-05 return; -//UNUSED2009-05 -//UNUSED2009-05 SdrObject* pObject = GetTextEditObject(); -//UNUSED2009-05 if ( ScDrawLayer::IsNoteCaption( pObject ) ) -//UNUSED2009-05 { -//UNUSED2009-05 if( SdrCaptionObj* pCaption = dynamic_cast< SdrCaptionObj* >( pObject ) ) -//UNUSED2009-05 { -//UNUSED2009-05 SfxItemSet aAttr(pCaption->GetMergedItemSet()); -//UNUSED2009-05 aAttr.Put( SvxWritingModeItem( -//UNUSED2009-05 nSlot == SID_TEXTDIRECTION_LEFT_TO_RIGHT ? -//UNUSED2009-05 com::sun::star::text::WritingMode_LR_TB : com::sun::star::text::WritingMode_TB_RL, -//UNUSED2009-05 SDRATTR_TEXTDIRECTION ) ); -//UNUSED2009-05 pCaption->SetMergedItemSet(aAttr); -//UNUSED2009-05 FuPoor* pPoor = pViewData->GetView()->GetDrawFuncPtr(); -//UNUSED2009-05 if ( pPoor ) -//UNUSED2009-05 { -//UNUSED2009-05 FuText* pText = static_cast<FuText*>(pPoor); -//UNUSED2009-05 pText->StopEditMode(TRUE); -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 } diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index ae18459d8d97..c8cd6325682d 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1833,72 +1833,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) // ------------------------------------------------------------------------- -//UNUSED2008-05 void ScGridWindow::DrawDragRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( nX2 < pViewData->GetPosX(eHWhich) || nY2 < pViewData->GetPosY(eVWhich) ) -//UNUSED2008-05 return; -//UNUSED2008-05 -//UNUSED2008-05 Update(); // wegen XOR -//UNUSED2008-05 -//UNUSED2008-05 MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); -//UNUSED2008-05 -//UNUSED2008-05 SCTAB nTab = pViewData->GetTabNo(); -//UNUSED2008-05 -//UNUSED2008-05 SCCOL nPosX = pViewData->GetPosX(WhichH(eWhich)); -//UNUSED2008-05 SCROW nPosY = pViewData->GetPosY(WhichV(eWhich)); -//UNUSED2008-05 if (nX1 < nPosX) nX1 = nPosX; -//UNUSED2008-05 if (nX2 < nPosX) nX2 = nPosX; -//UNUSED2008-05 if (nY1 < nPosY) nY1 = nPosY; -//UNUSED2008-05 if (nY2 < nPosY) nY2 = nPosY; -//UNUSED2008-05 -//UNUSED2008-05 Point aScrPos( pViewData->GetScrPos( nX1, nY1, eWhich ) ); -//UNUSED2008-05 -//UNUSED2008-05 long nSizeXPix=0; -//UNUSED2008-05 long nSizeYPix=0; -//UNUSED2008-05 ScDocument* pDoc = pViewData->GetDocument(); -//UNUSED2008-05 double nPPTX = pViewData->GetPPTX(); -//UNUSED2008-05 double nPPTY = pViewData->GetPPTY(); -//UNUSED2008-05 SCCOLROW i; -//UNUSED2008-05 -//UNUSED2008-05 BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); -//UNUSED2008-05 long nLayoutSign = bLayoutRTL ? -1 : 1; -//UNUSED2008-05 -//UNUSED2008-05 if (ValidCol(nX2) && nX2>=nX1) -//UNUSED2008-05 for (i=nX1; i<=nX2; i++) -//UNUSED2008-05 nSizeXPix += ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(i), nTab ), nPPTX ); -//UNUSED2008-05 else -//UNUSED2008-05 { -//UNUSED2008-05 aScrPos.X() -= nLayoutSign; -//UNUSED2008-05 nSizeXPix += 2; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 if (ValidRow(nY2) && nY2>=nY1) -//UNUSED2008-05 for (i=nY1; i<=nY2; i++) -//UNUSED2008-05 nSizeYPix += ScViewData::ToPixel( pDoc->GetRowHeight( i, nTab ), nPPTY ); -//UNUSED2008-05 else -//UNUSED2008-05 { -//UNUSED2008-05 aScrPos.Y() -= 1; -//UNUSED2008-05 nSizeYPix += 2; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 aScrPos.X() -= 2 * nLayoutSign; -//UNUSED2008-05 aScrPos.Y() -= 2; -//UNUSED2008-05 // Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) ); -//UNUSED2008-05 Rectangle aRect( aScrPos.X(), aScrPos.Y(), -//UNUSED2008-05 aScrPos.X() + ( nSizeXPix + 2 ) * nLayoutSign, aScrPos.Y() + nSizeYPix + 2 ); -//UNUSED2008-05 if ( bLayoutRTL ) -//UNUSED2008-05 { -//UNUSED2008-05 aRect.Left() = aRect.Right(); // end position is left -//UNUSED2008-05 aRect.Right() = aScrPos.X(); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() )); -//UNUSED2008-05 Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() )); -//UNUSED2008-05 Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 )); -//UNUSED2008-05 Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() )); -//UNUSED2008-05 -//UNUSED2008-05 SetMapMode(aOld); -//UNUSED2008-05 } + // ------------------------------------------------------------------------- diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index fd36a1b2c1d0..9ddb63a6a6d4 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -294,44 +294,6 @@ ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAdd return NULL; } -//UNUSED2008-05 ScAddress ScPreviewLocationData::GetCellFromRange( const Size& rOffsetPixel, const ScRange& rRange ) const -//UNUSED2008-05 { -//UNUSED2008-05 const double nScaleX = HMM_PER_TWIPS; -//UNUSED2008-05 const double nScaleY = HMM_PER_TWIPS; -//UNUSED2008-05 -//UNUSED2008-05 Size aOffsetLogic = pWindow->PixelToLogic( rOffsetPixel, aCellMapMode ); -//UNUSED2008-05 SCTAB nTab = rRange.aStart.Tab(); -//UNUSED2008-05 -//UNUSED2008-05 long nPosX = 0; -//UNUSED2008-05 SCCOL nCol = rRange.aStart.Col(); -//UNUSED2008-05 SCCOL nEndCol = rRange.aEnd.Col(); -//UNUSED2008-05 while ( nCol <= nEndCol && nPosX < aOffsetLogic.Width() ) -//UNUSED2008-05 { -//UNUSED2008-05 USHORT nDocW = pDoc->GetColWidth( nCol, nTab ); -//UNUSED2008-05 if (nDocW) -//UNUSED2008-05 nPosX += (long) (nDocW * nScaleX); -//UNUSED2008-05 ++nCol; -//UNUSED2008-05 } -//UNUSED2008-05 if ( nCol > rRange.aStart.Col() ) -//UNUSED2008-05 --nCol; -//UNUSED2008-05 -//UNUSED2008-05 long nPosY = 0; -//UNUSED2008-05 ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter( -//UNUSED2008-05 pDoc->GetRowFlagsArray( nTab), rRange.aStart.Row(), -//UNUSED2008-05 rRange.aEnd.Row(), CR_HIDDEN, 0, pDoc->GetRowHeightArray( nTab)); -//UNUSED2008-05 while ( aIter && nPosY < aOffsetLogic.Height() ) -//UNUSED2008-05 { -//UNUSED2008-05 USHORT nDocH = *aIter; -//UNUSED2008-05 if (nDocH) -//UNUSED2008-05 nPosY += (long) (nDocH * nScaleY); -//UNUSED2008-05 ++aIter; -//UNUSED2008-05 } -//UNUSED2008-05 SCROW nRow = aIter.GetPos(); -//UNUSED2008-05 if ( nRow > rRange.aStart.Row() ) -//UNUSED2008-05 --nRow; -//UNUSED2008-05 -//UNUSED2008-05 return ScAddress( nCol, nRow, nTab ); -//UNUSED2008-05 } Rectangle ScPreviewLocationData::GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const { diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index f6c1e9c9d1b5..9fe3800e0ef8 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -397,22 +397,6 @@ ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pView Init(); } -//UNUSED2009-05 ScTabView::ScTabView( Window* pParent, const ScTabView& rScTabView, ScTabViewShell* pViewShell ) : -//UNUSED2009-05 pFrameWin( pParent ), -//UNUSED2009-05 aViewData( rScTabView.aViewData ), -//UNUSED2009-05 TABVIEW_INIT -//UNUSED2009-05 { -//UNUSED2009-05 RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScTabView::ScTabView" ); -//UNUSED2009-05 -//UNUSED2009-05 aViewData.SetViewShell( pViewShell ); -//UNUSED2009-05 Init(); -//UNUSED2009-05 -//UNUSED2009-05 UpdateShow(); -//UNUSED2009-05 if ( aViewData.GetActivePart() != SC_SPLIT_BOTTOMLEFT ) -//UNUSED2009-05 pGridWin[SC_SPLIT_BOTTOMLEFT]->Show(); -//UNUSED2009-05 -//UNUSED2009-05 InvalidateSplit(); -//UNUSED2009-05 } void ScTabView::InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ) { @@ -1085,10 +1069,6 @@ void ScTabView::SetActivePointer( const Pointer& rPointer ) */ } -//UNUSED2008-05 void ScTabView::SetActivePointer( const ResId& ) -//UNUSED2008-05 { -//UNUSED2008-05 DBG_ERRORFILE( "keine Pointer mit ResId!" ); -//UNUSED2008-05 } void ScTabView::ActiveGrabFocus() { @@ -1097,28 +1077,6 @@ void ScTabView::ActiveGrabFocus() pGridWin[ePos]->GrabFocus(); } -//UNUSED2008-05 void ScTabView::ActiveCaptureMouse() -//UNUSED2008-05 { -//UNUSED2008-05 ScSplitPos ePos = aViewData.GetActivePart(); -//UNUSED2008-05 if (pGridWin[ePos]) -//UNUSED2008-05 pGridWin[ePos]->CaptureMouse(); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void ScTabView::ActiveReleaseMouse() -//UNUSED2008-05 { -//UNUSED2008-05 ScSplitPos ePos = aViewData.GetActivePart(); -//UNUSED2008-05 if (pGridWin[ePos]) -//UNUSED2008-05 pGridWin[ePos]->ReleaseMouse(); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 Point ScTabView::ActivePixelToLogic( const Point& rDevicePoint ) -//UNUSED2008-05 { -//UNUSED2008-05 ScSplitPos ePos = aViewData.GetActivePart(); -//UNUSED2008-05 if (pGridWin[ePos]) -//UNUSED2008-05 return pGridWin[ePos]->PixelToLogic(rDevicePoint); -//UNUSED2008-05 else -//UNUSED2008-05 return Point(); -//UNUSED2008-05 } ScSplitPos ScTabView::FindWindow( Window* pWindow ) const { diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 93bf0f8e8f5c..983113760bb9 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -2162,46 +2162,6 @@ void ScTabView::DoChartSelection( } } -// DrawDragRect - Drag&Drop-Rechteck zeichnen (XOR) - -//UNUSED2008-05 void ScTabView::DrawDragRect( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, -//UNUSED2008-05 ScSplitPos ePos ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX || aViewData.GetVSplitMode() == SC_SPLIT_FIX ) -//UNUSED2008-05 { -//UNUSED2008-05 for (USHORT i=0; i<4; i++) -//UNUSED2008-05 if (pGridWin[i]) -//UNUSED2008-05 if (pGridWin[i]->IsVisible()) -//UNUSED2008-05 pGridWin[i]->DrawDragRect( nStartX, nStartY, nEndX, nEndY ); -//UNUSED2008-05 } -//UNUSED2008-05 else -//UNUSED2008-05 pGridWin[ePos]->DrawDragRect( nStartX, nStartY, nEndX, nEndY ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 // PaintCell - einzelne Zelle neu zeichnen -//UNUSED2008-05 -//UNUSED2008-05 void ScTabView::PaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) -//UNUSED2008-05 { -//UNUSED2008-05 if ( aViewData.GetTabNo() == nTab ) -//UNUSED2008-05 { -//UNUSED2008-05 USHORT i; -//UNUSED2008-05 for (i=0; i<4; i++) -//UNUSED2008-05 if (pGridWin[i]) -//UNUSED2008-05 if (pGridWin[i]->IsVisible()) -//UNUSED2008-05 pGridWin[i]->Draw( nCol, nRow, nCol, nRow ); -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void ScTabView::PaintLeftRow( SCROW nRow ) -//UNUSED2008-05 { -//UNUSED2008-05 PaintLeftArea( nRow, nRow ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void ScTabView::PaintTopCol( SCCOL nCol ) -//UNUSED2008-05 { -//UNUSED2008-05 PaintTopArea( nCol, nCol ); -//UNUSED2008-05 } - // PaintGrid - Datenbereiche neu zeichnen void ScTabView::PaintGrid() diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index abbc0224704e..00652e2f76d2 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -333,14 +333,6 @@ void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eT } } -//UNUSED2008-05 void ScTabView::EndSelection() -//UNUSED2008-05 { -//UNUSED2008-05 ScModule* pScMod = SC_MOD(); -//UNUSED2008-05 BOOL bRefMode = pScMod->IsFormulaMode(); -//UNUSED2008-05 if ( bRefMode ) -//UNUSED2008-05 pScMod->EndReference(); -//UNUSED2008-05 } - // static void ScTabView::SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL ) { diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index f0ac3fc42869..c19efabad2f3 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -406,14 +406,6 @@ BOOL ScTabView::IsDrawTextEdit() const return FALSE; } -//UNUSED2008-05 String ScTabView::GetSelectedChartName() const -//UNUSED2008-05 { -//UNUSED2008-05 if (pDrawView) -//UNUSED2008-05 return pDrawView->GetSelectedChartName(); -//UNUSED2008-05 else -//UNUSED2008-05 return EMPTY_STRING; -//UNUSED2008-05 } - SvxZoomType ScTabView::GetZoomType() const { return aViewData.GetZoomType(); diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index ca47535ad2cf..26e040ede0b0 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -318,7 +318,6 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) break; case SID_DRAW_CHART: -//UNUSED2008-05 bChartDlgIsEdit = FALSE; pTabView->SetDrawFuncPtr(new FuMarkRect(this, pWin, pView, pDoc, aNewReq)); break; diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 55f6e9c2f796..ece09c3b12fd 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -646,24 +646,6 @@ void ScTabViewShell::DoReadUserData( const String& rData ) //------------------------------------------------------------------ -//UNUSED2008-05 void ScTabViewShell::ExecuteShowNIY( SfxRequest& /* rReq */ ) -//UNUSED2008-05 { -//UNUSED2008-05 ErrorMessage(STR_BOX_YNI); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 //------------------------------------------------------------------ -//UNUSED2008-05 -//UNUSED2008-05 void ScTabViewShell::StateDisabled( SfxItemSet& rSet ) -//UNUSED2008-05 { -//UNUSED2008-05 SfxWhichIter aIter( rSet ); -//UNUSED2008-05 USHORT nWhich = aIter.FirstWhich(); -//UNUSED2008-05 -//UNUSED2008-05 while ( nWhich ) -//UNUSED2008-05 { -//UNUSED2008-05 rSet.DisableItem( nWhich ); -//UNUSED2008-05 nWhich = aIter.NextWhich(); -//UNUSED2008-05 } -//UNUSED2008-05 } void ScTabViewShell::SetDrawShellOrSub() { @@ -1102,17 +1084,6 @@ SfxShell* ScTabViewShell::GetMySubShell() const return NULL; // keine von meinen dabei } -//UNUSED2008-05 void ScTabViewShell::SetMySubShell( SfxShell* pShell ) -//UNUSED2008-05 { -//UNUSED2008-05 SfxShell* pOld = GetMySubShell(); -//UNUSED2008-05 if ( pOld != pShell ) -//UNUSED2008-05 { -//UNUSED2008-05 if (pOld) -//UNUSED2008-05 RemoveSubShell(pOld); // alte SubShell entfernen -//UNUSED2008-05 if (pShell) -//UNUSED2008-05 AddSubShell(*pShell); // neue setzen -//UNUSED2008-05 } -//UNUSED2008-05 } BOOL ScTabViewShell::IsDrawTextShell() const { @@ -1883,29 +1854,6 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) //------------------------------------------------------------------ -//UNUSED2008-05 ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, -//UNUSED2008-05 const ScTabViewShell& rWin ) : -//UNUSED2008-05 SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), -//UNUSED2008-05 ScDBFunc( &pViewFrame->GetWindow(), rWin, this ), -//UNUSED2008-05 __INIT_ScTabViewShell -//UNUSED2008-05 { -//UNUSED2008-05 RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScTabViewShell::ScTabViewShell" ); -//UNUSED2008-05 -//UNUSED2008-05 Construct(); -//UNUSED2008-05 -//UNUSED2008-05 UpdatePageBreakData(); -//UNUSED2008-05 -//UNUSED2008-05 /*uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame().GetFrameInterface(); -//UNUSED2008-05 if (xFrame.is()) -//UNUSED2008-05 xFrame->setComponent( uno::Reference<awt::XWindow>(), new ScTabViewObj( this ) );*/ -//UNUSED2008-05 // make Controller known to SFX -//UNUSED2008-05 new ScTabViewObj( this ); -//UNUSED2008-05 -//UNUSED2008-05 SetCurSubShell(OST_Cell); -//UNUSED2008-05 SvBorder aBorder; -//UNUSED2008-05 GetBorderSize( aBorder, Size() ); -//UNUSED2008-05 SetBorderPixel( aBorder ); -//UNUSED2008-05 } //------------------------------------------------------------------ @@ -2048,11 +1996,6 @@ void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangl nChartDestTab = GetViewData()->GetTabNo(); } -//UNUSED2008-05 void ScTabViewShell::ResetChartArea() -//UNUSED2008-05 { -//UNUSED2008-05 bChartAreaValid = FALSE; -//UNUSED2008-05 } - BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const { rSource = aChartSource; @@ -2061,16 +2004,6 @@ BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SC return bChartAreaValid; } -//UNUSED2008-05 BOOL ScTabViewShell::IsChartDlgEdit() const -//UNUSED2008-05 { -//UNUSED2008-05 return bChartDlgIsEdit; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 const String& ScTabViewShell::GetEditChartName() const -//UNUSED2008-05 { -//UNUSED2008-05 return aEditChartName; -//UNUSED2008-05 } - ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings() { if( !pNavSettings ) diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index c28af8d05d37..500c0ddecc38 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -430,51 +430,6 @@ void ScViewData::InitData( ScDocument* pDocument ) *pOptions = pDoc->GetViewOptions(); } -//UNUSED2008-05 void ScViewData::InitFrom( const ScViewData* pRef ) -//UNUSED2008-05 { -//UNUSED2008-05 if (pRef==NULL) -//UNUSED2008-05 { -//UNUSED2008-05 DBG_ERROR("ScViewData::InitFrom mit NULL"); -//UNUSED2008-05 return; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 aScrSize = pRef->aScrSize; -//UNUSED2008-05 nTabNo = pRef->nTabNo; -//UNUSED2008-05 eDefZoomType = pRef->eDefZoomType; -//UNUSED2008-05 aDefZoomX = pRef->aDefZoomX; -//UNUSED2008-05 aDefZoomY = pRef->aDefZoomY; -//UNUSED2008-05 aDefPageZoomX = pRef->aDefPageZoomX; -//UNUSED2008-05 aDefPageZoomY = pRef->aDefPageZoomY; -//UNUSED2008-05 bPagebreak = pRef->bPagebreak; -//UNUSED2008-05 aLogicMode = pRef->aLogicMode; -//UNUSED2008-05 -//UNUSED2008-05 SetGridMode ( pRef->IsGridMode() ); -//UNUSED2008-05 SetSyntaxMode ( pRef->IsSyntaxMode() ); -//UNUSED2008-05 SetHeaderMode ( pRef->IsHeaderMode() ); -//UNUSED2008-05 SetTabMode ( pRef->IsTabMode() ); -//UNUSED2008-05 SetVScrollMode ( pRef->IsVScrollMode() ); -//UNUSED2008-05 SetHScrollMode ( pRef->IsHScrollMode() ); -//UNUSED2008-05 SetOutlineMode ( pRef->IsOutlineMode() ); -//UNUSED2008-05 -//UNUSED2008-05 for (SCTAB i=0; i<=MAXTAB; i++) -//UNUSED2008-05 { -//UNUSED2008-05 delete pTabData[i]; -//UNUSED2008-05 if (pRef->pTabData[i]) -//UNUSED2008-05 pTabData[i] = new ScViewDataTable( *pRef->pTabData[i] ); -//UNUSED2008-05 else -//UNUSED2008-05 pTabData[i] = NULL; -//UNUSED2008-05 } -//UNUSED2008-05 pThisTab = pTabData[nTabNo]; -//UNUSED2008-05 CalcPPT(); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void ScViewData::SetDocShell( ScDocShell* pShell ) -//UNUSED2008-05 { -//UNUSED2008-05 pDocShell = pShell; -//UNUSED2008-05 pDoc = pDocShell->GetDocument(); -//UNUSED2008-05 *pOptions = pDoc->GetViewOptions(); -//UNUSED2008-05 CalcPPT(); -//UNUSED2008-05 } ScDocument* ScViewData::GetDocument() const { @@ -593,11 +548,6 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab ) aMarkData.InsertTab( nInsTab ); // ggf. angepasst } -//UNUSED2008-05 void ScViewData::UpdateOle( ScSplitPos /* eWhich */ ) -//UNUSED2008-05 { -//UNUSED2008-05 GetDocShell()->UpdateOle(this); -//UNUSED2008-05 } - void ScViewData::SetViewShell( ScTabViewShell* pViewSh ) { if (pViewSh) @@ -1762,15 +1712,6 @@ SCROW ScViewData::PrevCellsY( ScVSplitPos eWhichY ) const return CellsAtY( GetPosY( eWhichY ), -1, eWhichY, SC_SIZE_NONE ); } -//UNUSED2008-05 SCCOL ScViewData::LastCellsX( ScHSplitPos eWhichX ) const -//UNUSED2008-05 { -//UNUSED2008-05 return CellsAtX( MAXCOL+1, -1, eWhichX, SC_SIZE_NONE ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 SCROW ScViewData::LastCellsY( ScVSplitPos eWhichY ) const -//UNUSED2008-05 { -//UNUSED2008-05 return CellsAtY( MAXROW+1, -1, eWhichY, SC_SIZE_NONE ); -//UNUSED2008-05 } BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ) { diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index d3a83ad6bde5..e2763b7c888e 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -834,40 +834,6 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData //---------------------------------------------------------------------------- - -//UNUSED2008-05 void ScViewFunc::PaintWidthHeight( BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd ) -//UNUSED2008-05 { -//UNUSED2008-05 SCTAB nTab = GetViewData()->GetTabNo(); -//UNUSED2008-05 ScDocument* pDoc = GetViewData()->GetDocument(); -//UNUSED2008-05 -//UNUSED2008-05 USHORT nParts = PAINT_GRID; -//UNUSED2008-05 SCCOL nStartCol = 0; -//UNUSED2008-05 SCROW nStartRow = 0; -//UNUSED2008-05 SCCOL nEndCol = MAXCOL; // fuer Test auf Merge -//UNUSED2008-05 SCROW nEndRow = MAXROW; -//UNUSED2008-05 if ( bColumns ) -//UNUSED2008-05 { -//UNUSED2008-05 nParts |= PAINT_TOP; -//UNUSED2008-05 nStartCol = static_cast<SCCOL>(nStart); -//UNUSED2008-05 nEndCol = static_cast<SCCOL>(nEnd); -//UNUSED2008-05 } -//UNUSED2008-05 else -//UNUSED2008-05 { -//UNUSED2008-05 nParts |= PAINT_LEFT; -//UNUSED2008-05 nStartRow = nStart; -//UNUSED2008-05 nEndRow = nEnd; -//UNUSED2008-05 } -//UNUSED2008-05 if (pDoc->HasAttrib( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab, -//UNUSED2008-05 HASATTR_MERGED | HASATTR_OVERLAPPED )) -//UNUSED2008-05 { -//UNUSED2008-05 nStartCol = 0; -//UNUSED2008-05 nStartRow = 0; -//UNUSED2008-05 } -//UNUSED2008-05 GetViewData()->GetDocShell()->PostPaint( nStartCol,nStartRow,nTab, MAXCOL,MAXROW,nTab, nParts ); -//UNUSED2008-05 } - - -//---------------------------------------------------------------------------- // manueller Seitenumbruch void ScViewFunc::InsertPageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* pPos, diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 123464cd5fda..164075c0afb1 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -458,12 +458,6 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) pDocSh->PostPaintGridAll(); } -//UNUSED2008-05 // Spelling Checker - Undo ok -//UNUSED2008-05 void ScViewFunc::DoSpellingChecker( BOOL bRecord ) -//UNUSED2008-05 { -//UNUSED2008-05 DoSheetConversion( ScConversionParam( SC_CONVERSION_SPELLCHECK ), bRecord ); -//UNUSED2008-05 } - void ScViewFunc::DoHangulHanjaConversion( BOOL bRecord ) { ScConversionParam aConvParam( SC_CONVERSION_HANGULHANJA, LANGUAGE_KOREAN, 0, true ); @@ -608,18 +602,6 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR pDoc->DisableIdle(bOldDis); } - -//UNUSED2008-05 IMPL_LINK_INLINE_START( ScViewFunc, SpellError, void *, nLang ) -//UNUSED2008-05 { -//UNUSED2008-05 SvtLanguageTable aLangTab; -//UNUSED2008-05 String aErr = aLangTab.GetString((LanguageType) (ULONG) nLang); -//UNUSED2008-05 ErrorHandler::HandleError(*new StringErrorInfo( -//UNUSED2008-05 ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr) ); -//UNUSED2008-05 -//UNUSED2008-05 return 0; -//UNUSED2008-05 } -//UNUSED2008-05 IMPL_LINK_INLINE_END( ScViewFunc, SpellError, void *, nLang ) - // Pasten von FORMAT_FILE-Items // wird nicht direkt aus Drop aufgerufen, sondern asynchron -> Dialoge sind erlaubt diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 58ea8ef7e925..1ab062ea32dd 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -98,12 +98,6 @@ ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pVi { } -//UNUSED2008-05 ScViewFunc::ScViewFunc( Window* pParent, const ScViewFunc& rViewFunc, ScTabViewShell* pViewShell ) : -//UNUSED2008-05 ScTabView( pParent, rViewFunc, pViewShell ), -//UNUSED2008-05 bFormatValid( FALSE ) -//UNUSED2008-05 { -//UNUSED2008-05 } - ScViewFunc::~ScViewFunc() { } |