diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-01-25 07:58:34 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-25 15:37:20 +0000 |
commit | 905b84557d8ccbdba07f0a82a89f382db08fc0d9 (patch) | |
tree | faa75a00d10758bc864f0bf20cd5093969f50db1 | |
parent | d6bf32bab10e1bb115aea0c6e5d6ac1753760fe7 (diff) |
refresh unused code list
-rw-r--r-- | autodoc/source/inc/tools/tkpchars.hxx | 26 | ||||
-rw-r--r-- | autodoc/source/parser/inc/tokens/stmstarr.hxx | 87 | ||||
-rw-r--r-- | autodoc/source/parser/tokens/makefile.mk | 1 | ||||
-rw-r--r-- | autodoc/source/parser/tokens/stmstarr.cxx | 101 | ||||
-rw-r--r-- | autodoc/source/tools/tkpchars.cxx | 41 | ||||
-rw-r--r-- | l10ntools/inc/export.hxx | 2 | ||||
-rw-r--r-- | l10ntools/source/merge.cxx | 4 | ||||
-rw-r--r-- | tools/inc/tools/stream.hxx | 2 | ||||
-rw-r--r-- | tools/source/stream/stream.cxx | 12 | ||||
-rw-r--r-- | unusedcode.easy | 5 | ||||
-rw-r--r-- | xml2cmp/source/support/heap.cxx | 6 | ||||
-rw-r--r-- | xml2cmp/source/support/heap.hxx | 1 |
12 files changed, 6 insertions, 282 deletions
diff --git a/autodoc/source/inc/tools/tkpchars.hxx b/autodoc/source/inc/tools/tkpchars.hxx index c5b952fb0f2f..e60769e063c4 100644 --- a/autodoc/source/inc/tools/tkpchars.hxx +++ b/autodoc/source/inc/tools/tkpchars.hxx @@ -96,32 +96,8 @@ class CharacterSource bool IsFinished() const; private: - struct S_SourceState - { - DYN char * dpSource; - intt nSourceSize; - - intt nCurPos; - intt nLastCut; - intt nLastTokenStart; - char cCharAtLastCut; - - S_SourceState( - DYN char * dpSource, - intt nSourceSize, - intt nCurPos, - intt nLastCut, - intt nLastTokenStart, - char cCharAtLastCut ); - }; - void BeginSource(); intt CurPos() const; - char MoveOn_OverStack(); - - // DATA - std::stack< S_SourceState > - aSourcesStack; DYN char * dpSource; intt nSourceSize; @@ -142,8 +118,6 @@ if (DEBUG_ShowText()) } if ( nCurPos < nSourceSize-1 ) return dpSource[++nCurPos]; - else if ( aSourcesStack.size() > 0 ) - return MoveOn_OverStack(); else return dpSource[nCurPos = nSourceSize]; } diff --git a/autodoc/source/parser/inc/tokens/stmstarr.hxx b/autodoc/source/parser/inc/tokens/stmstarr.hxx deleted file mode 100644 index 640177faf363..000000000000 --- a/autodoc/source/parser/inc/tokens/stmstarr.hxx +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef ADC_STMSTARR_HXX -#define ADC_STMSTARR_HXX - -// USED SERVICES - // BASE CLASSES -#include <tokens/stmstate.hxx> - // COMPONENTS - // PARAMETERS -#include <tokens/token.hxx> - - -class StmArrayStatus : public StmStatus -{ - public: - typedef TextToken::F_CRTOK F_CRTOK; - - // LIFECYCLE - StmArrayStatus( - intt i_nStatusSize, - const INT16 * in_aArrayModel, - F_CRTOK i_fTokenCreateFunction, - bool in_bIsDefault ); - ~StmArrayStatus(); - - // INQUIRY - StmStatus::Branch NextBy( - intt in_nFollowersIndex) const; - F_CRTOK TokenCreateFunction() const - { return fTokenCreateFunction; } - virtual bool IsADefault() const; - - // ACCESS - virtual StmArrayStatus * - AsArray(); - bool SetBranch( - intt in_nBranchIx, - StmStatus::Branch in_nBranch ); - void SetTokenCreateFunction( - F_CRTOK i_fTokenCreateFunction ); - private: - StmStatus::Branch * dpBranches; - intt nNrOfBranches; - F_CRTOK fTokenCreateFunction; - bool bIsADefault; -}; - - -// IMPLEMENTATION - -inline void -StmArrayStatus::SetTokenCreateFunction( F_CRTOK i_fTokenCreateFunction ) - { fTokenCreateFunction = i_fTokenCreateFunction; } - - - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/parser/tokens/makefile.mk b/autodoc/source/parser/tokens/makefile.mk index 32bfac814998..76a2b371a9c6 100644 --- a/autodoc/source/parser/tokens/makefile.mk +++ b/autodoc/source/parser/tokens/makefile.mk @@ -45,7 +45,6 @@ PRJINC=$(PRJ)$/source # --- Files -------------------------------------------------------- OBJFILES= \ - $(OBJ)$/stmstarr.obj \ $(OBJ)$/stmstate.obj \ $(OBJ)$/tkp.obj \ $(OBJ)$/tkpcontx.obj \ diff --git a/autodoc/source/parser/tokens/stmstarr.cxx b/autodoc/source/parser/tokens/stmstarr.cxx deleted file mode 100644 index 8070fae3a450..000000000000 --- a/autodoc/source/parser/tokens/stmstarr.cxx +++ /dev/null @@ -1,101 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <precomp.h> -#include <tokens/stmstarr.hxx> - - -// NOT FULLY DECLARED SERVICES -#include <x_parse.hxx> - - - -StmArrayStatus::StmArrayStatus( intt i_nStatusSize, - const INT16 * in_aArrayModel, - F_CRTOK i_fTokenCreateFunction, - bool in_bIsDefault ) - : dpBranches(new StmStatus::Branch[i_nStatusSize]), - nNrOfBranches(i_nStatusSize), - fTokenCreateFunction(i_fTokenCreateFunction), - bIsADefault(in_bIsDefault) -{ - if (in_aArrayModel != 0) - { - intt count = 0; - for (const INT16 * get = in_aArrayModel; count < nNrOfBranches; count++, get++) - dpBranches[count] = *get; - } - else // - { - memset(dpBranches, 0, nNrOfBranches); - } // endif -} - -StmArrayStatus::~StmArrayStatus() -{ - delete [] dpBranches; -} - -bool -StmArrayStatus::SetBranch( intt in_nBranchIx, - StmStatus::Branch in_nBranch ) -{ - if ( csv::in_range(intt(0), in_nBranchIx, intt(nNrOfBranches) ) ) - { - dpBranches[in_nBranchIx] = in_nBranch; - return true; - } - return false; -} - - -StmStatus::Branch -StmArrayStatus::NextBy(intt in_nIndex) const -{ - if (in_nIndex < 0) - throw X_Parser(X_Parser::x_InvalidChar, "", String::Null_(), 0); - - return in_nIndex < nNrOfBranches - ? dpBranches[in_nIndex] - : dpBranches[nNrOfBranches - 1]; -} - - -bool -StmArrayStatus::IsADefault() const -{ - return bIsADefault; -} - -StmArrayStatus * -StmArrayStatus::AsArray() -{ - return this; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/autodoc/source/tools/tkpchars.cxx b/autodoc/source/tools/tkpchars.cxx index 92d91d5e6db1..b4e705795311 100644 --- a/autodoc/source/tools/tkpchars.cxx +++ b/autodoc/source/tools/tkpchars.cxx @@ -95,45 +95,4 @@ CharacterSource::BeginSource() dpSource[nLastCut] = NULCH; } -// KORR_FUTURE: So far, this works only when tokens do not cross inserted text boundaries. -char -CharacterSource::MoveOn_OverStack() -{ - while ( aSourcesStack.size() > 0 AND nCurPos >= nSourceSize-1 ) - { - S_SourceState & aState = aSourcesStack.top(); - delete [] dpSource; - - dpSource = aState.dpSource; - nSourceSize = aState.nSourceSize; - nCurPos = aState.nCurPos; - nLastCut = aState.nLastCut; - nLastTokenStart = aState.nLastTokenStart; - cCharAtLastCut = aState.cCharAtLastCut; - - aSourcesStack.pop(); - } - - if ( nLastCut < nCurPos ) - CutToken(); - - return CurChar(); -} - -CharacterSource:: -S_SourceState::S_SourceState( DYN char * dpSource_, - intt nSourceSize_, - intt nCurPos_, - intt nLastCut_, - intt nLastTokenStart_, - char cCharAtLastCut_ ) - : dpSource(dpSource_), - nSourceSize(nSourceSize_), - nCurPos(nCurPos_), - nLastCut(nLastCut_), - nLastTokenStart(nLastTokenStart_), - cCharAtLastCut(cCharAtLastCut_) -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index 6b749fca29bc..b3fc196b9b11 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -492,7 +492,7 @@ class MergeDataFile sal_Bool bErrorLog; ByteString sErrorLog; SvFileStream aErrLog; - MergeDataHashMap aMap; + MergeDataHashMap aMap; std::set<ByteString> aLanguageSet; MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = false ); diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index f2193155a070..a31ff9491326 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -238,6 +238,8 @@ MergeDataFile::MergeDataFile( MergeDataFile::~MergeDataFile() { + for (MergeDataHashMap::iterator aI = aMap.begin(), aEnd = aMap.end(); aI != aEnd; ++aI) + delete aI->second; } ByteString MergeDataFile::Dump(){ @@ -248,7 +250,7 @@ ByteString MergeDataFile::Dump(){ for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ) { printf("aMap[ %s ] = ",idbg->first.GetBuffer()); - ((MergeData*) (idbg->second))->Dump(); + idbg->second->Dump(); printf("\n"); } printf("\n"); diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index d63b7d3c3059..e0a55099cf6e 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -415,8 +415,6 @@ public: /// Read a line of Unicode if eSrcCharSet==RTL_TEXTENCODING_UNICODE, /// otherwise read a line of Bytecode and convert from eSrcCharSet sal_Bool ReadUniOrByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet ); - /// Write a sequence of Unicode characters - sal_Bool WriteUnicodeText( const String& rStr ); /// Write a sequence of Unicode characters if eDestCharSet==RTL_TEXTENCODING_UNICODE, /// otherwise write a sequence of Bytecodes converted to eDestCharSet sal_Bool WriteUnicodeOrByteText( const String& rStr, rtl_TextEncoding eDestCharSet ); diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index db84400b77f9..fd5a579a8bde 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -885,18 +885,6 @@ sal_Size write_uInt16s_FromOUString(SvStream& rStrm, const rtl::OUString& rStr, return nWritten; } -/************************************************************************* -|* -|* Stream::WriteUnicodeText() -|* -*************************************************************************/ - -sal_Bool SvStream::WriteUnicodeText( const String& rStr ) -{ - write_uInt16s_FromOUString(*this, rStr, rStr.Len()); - return nError == SVSTREAM_OK; -} - sal_Bool SvStream::WriteUnicodeOrByteText( const String& rStr, rtl_TextEncoding eDestCharSet ) { if ( eDestCharSet == RTL_TEXTENCODING_UNICODE ) diff --git a/unusedcode.easy b/unusedcode.easy index bf2c723d2e3a..4a1170d6133b 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -82,7 +82,6 @@ MailDispatcher::removeListener(rtl::Reference<IMailDispatcherListener>) Matrix3d::Inverse() const Matrix3d::Matrix3d() MenuBar::MenuBar(ResId const&) -MergeData::~MergeData() MergeDataFile::Dump() MessBox::MessBox(unsigned short) MetaAction::IsEqual(MetaAction const&) const @@ -382,6 +381,7 @@ SvPersistStream::RemoveObj(SvPersistBase*) SvPersistStream::SvPersistStream(SvClassManager&, SvStream*, SvPersistStream const&) SvPtrarr::Replace(void* const*, unsigned short, unsigned short) SvStream::ReadLine(ByteString&) +SvStringsISortDtor::Insert(String* const*, unsigned short) SvTabListBox::GetTabJustify(unsigned short) const SvUnoAttributeContainer::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>) SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const @@ -677,8 +677,6 @@ TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor co TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() UCBStorage::IsStorageFile(String const&) UCBStream::UCBStream(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>&) -UnoApiTest::UnoApiTest() -UnoApiTest::createFileURL(rtl::OUString const&, rtl::OUString&) UnoComboBoxControl::getActionListeners() UnoComboBoxControl::getItemListeners() UnoControlBase::UnoControlBase() @@ -1568,6 +1566,7 @@ pdfi::DrawXmlEmitter::GetBreakIterator() pdfi::PDFIProcessor::sortDocument(bool) pdfi::PDFIRawAdaptor::odfConvert(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&, com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const&) pdfparse::PDFReader::read(char const*, unsigned int) +pq_sdbc_driver::rollbackNoThrow(com::sun::star::uno::Reference<com::sun::star::sdbc::XConnection> const&) psp::GetCommandLineTokenCount(rtl::OString const&) psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&) psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&) diff --git a/xml2cmp/source/support/heap.cxx b/xml2cmp/source/support/heap.cxx index e814cbe66eef..0a33f30b8d5d 100644 --- a/xml2cmp/source/support/heap.cxx +++ b/xml2cmp/source/support/heap.cxx @@ -182,12 +182,6 @@ HeapItem::operator<( const HeapItem & i_rOther ) const } const Simstr & -HeapItem::Value() const -{ - return sValue; -} - -const Simstr & HeapItem::Key() const { return sKey; diff --git a/xml2cmp/source/support/heap.hxx b/xml2cmp/source/support/heap.hxx index 5d4a9bf0a610..bbf9ed5db7e4 100644 --- a/xml2cmp/source/support/heap.hxx +++ b/xml2cmp/source/support/heap.hxx @@ -70,7 +70,6 @@ class HeapItem bool operator<=( const HeapItem & i_rOther ) const { return ! (i_rOther < *this); } - const Simstr & Value() const; const Simstr & Key() const; HeapItem * Next() const; |