diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-07-10 22:38:38 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-11 09:03:55 +0100 |
commit | 2e2624a4d6d9e40a1c70ca4e3c60ba86bbb39db4 (patch) | |
tree | 5c6714c5f9a965747f1a40f1bb8585f5efb2eadd | |
parent | 8cc14f19cb92d2aca58864f045bdfb1fbc29e676 (diff) |
various unused methods
-rw-r--r-- | binfilter/bf_sc/source/core/data/sc_cell.cxx | 12 | ||||
-rw-r--r-- | binfilter/bf_sc/source/core/data/sc_dpobject.cxx | 18 | ||||
-rw-r--r-- | binfilter/bf_sc/source/core/data/sc_pivot.cxx | 13 | ||||
-rw-r--r-- | binfilter/bf_sc/source/core/data/sc_table2.cxx | 51 | ||||
-rw-r--r-- | binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx | 22 | ||||
-rw-r--r-- | binfilter/bf_sw/source/filter/xml/makefile.mk | 3 | ||||
-rw-r--r-- | binfilter/bf_sw/source/filter/xml/sw_swxml.cxx | 125 | ||||
-rw-r--r-- | binfilter/inc/bf_sfx2/docfile.hxx | 4 |
8 files changed, 0 insertions, 248 deletions
diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx b/binfilter/bf_sc/source/core/data/sc_cell.cxx index 9973bc1c7..8bde7e18b 100644 --- a/binfilter/bf_sc/source/core/data/sc_cell.cxx +++ b/binfilter/bf_sc/source/core/data/sc_cell.cxx @@ -800,18 +800,6 @@ static const sal_Char msgDbgInfinity[] = /*N*/ pDoc->SetHasMacroFunc( TRUE ); /*N*/ } -/*N*/ BOOL lcl_IsBeyond( ScTokenArray* pCode, USHORT nMaxRow ) -/*N*/ { -/*N*/ ScToken* t; -/*N*/ pCode->Reset(); -/*N*/ while ( (t = pCode->GetNextReferenceRPN()) ) // RPN -> auch in Namen -/*N*/ if ( t->GetSingleRef().nRow > nMaxRow || -/*N*/ (t->GetType() == svDoubleRef && -/*N*/ t->GetDoubleRef().Ref2.nRow > nMaxRow) ) -/*N*/ return TRUE; -/*N*/ return FALSE; -/*N*/ } - /*N*/ ScBaseCell* ScFormulaCell::Clone( ScDocument* pDoc, const ScAddress& rPos, /*N*/ BOOL bNoListening ) const /*N*/ { diff --git a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx index d464e900d..06852069f 100644 --- a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx +++ b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx @@ -522,24 +522,6 @@ DBG_BF_ASSERT(0, "STRIP"); /*N*/ return nOutCount; /*N*/ } -/*N*/ void lcl_SaveOldFieldArr( SvStream& rStream, -/*N*/ const uno::Reference<sheet::XDimensionsSupplier>& xSource, -/*N*/ USHORT nOrient, USHORT nColAdd, BOOL bAddData ) -/*N*/ { -/*N*/ // PIVOT_MAXFIELD = max. number in old files -/*N*/ PivotField aFields[PIVOT_MAXFIELD]; -/*N*/ USHORT nOutCount = lcl_FillOldFields( aFields, xSource, nOrient, nColAdd, bAddData ); -/*N*/ -/*N*/ rStream << nOutCount; -/*N*/ for (USHORT i=0; i<nOutCount; i++) -/*N*/ { -/*N*/ rStream << (BYTE) 0x00 -/*N*/ << aFields[i].nCol -/*N*/ << aFields[i].nFuncMask -/*N*/ << aFields[i].nFuncCount; -/*N*/ } -/*N*/ } - /*N*/ BOOL ScDPObject::LoadNew(SvStream& rStream, ScMultipleReadHeader& rHdr ) /*N*/ { /*N*/ rHdr.StartEntry(); diff --git a/binfilter/bf_sc/source/core/data/sc_pivot.cxx b/binfilter/bf_sc/source/core/data/sc_pivot.cxx index 99c3a4609..801a64d62 100644 --- a/binfilter/bf_sc/source/core/data/sc_pivot.cxx +++ b/binfilter/bf_sc/source/core/data/sc_pivot.cxx @@ -297,19 +297,6 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] = /*N*/ } /*N*/ } -/*N*/ void lcl_SaveFieldArr( SvStream& rStream, const PivotField* pField, USHORT nCount ) -/*N*/ { -/*N*/ USHORT i; -/*N*/ -/*N*/ for (i=0; i<nCount; i++) -/*N*/ { -/*N*/ rStream << (BYTE) 0x00 -/*N*/ << pField[i].nCol -/*N*/ << pField[i].nFuncMask -/*N*/ << pField[i].nFuncCount; -/*N*/ } -/*N*/ } - // nach Load muessen Daten neu berechnet werden ! /*N*/ BOOL ScPivot::Load( SvStream& rStream, ScMultipleReadHeader& rHdr ) diff --git a/binfilter/bf_sc/source/core/data/sc_table2.cxx b/binfilter/bf_sc/source/core/data/sc_table2.cxx index 64a1de707..0545867ce 100644 --- a/binfilter/bf_sc/source/core/data/sc_table2.cxx +++ b/binfilter/bf_sc/source/core/data/sc_table2.cxx @@ -58,9 +58,6 @@ namespace binfilter { // STATIC DATA ----------------------------------------------------------- void lcl_LoadRange( SvStream& rStream, ScRange** ppRange ); -void lcl_SaveRange( SvStream& rStream, ScRange* pRange ); - - /*N*/ BOOL ScTable::SetOutlineTable( const ScOutlineTable* pNewOutline ) /*N*/ { @@ -1703,41 +1700,6 @@ DBG_BF_ASSERT(0, "STRIP"); /*N*/ return TRUE; /*N*/ } -// Speichern - - -/*N*/ void lcl_SaveValue( SvStream& rStream, USHORT* pValue, USHORT nEnd ) -/*N*/ { -/*N*/ USHORT nPos = 0; -/*N*/ while (nPos<=nEnd) -/*N*/ { -/*N*/ USHORT nVal = pValue[nPos]; -/*N*/ USHORT nNextPos = nPos+1; -/*N*/ while (nNextPos<=nEnd && pValue[nNextPos]==nVal) -/*N*/ ++nNextPos; -/*N*/ rStream << (USHORT)( nNextPos - nPos ); -/*N*/ rStream << nVal; -/*N*/ nPos = nNextPos; -/*N*/ } -/*N*/ } - - -/*N*/ void lcl_SaveFlags( SvStream& rStream, BYTE* pValue, USHORT nEnd ) -/*N*/ { -/*N*/ USHORT nPos = 0; -/*N*/ while (nPos<=nEnd) -/*N*/ { -/*N*/ BYTE nVal = pValue[nPos] & CR_SAVEMASK; -/*N*/ USHORT nNextPos = nPos+1; -/*N*/ while (nNextPos<=nEnd && (pValue[nNextPos] & CR_SAVEMASK)==nVal) -/*N*/ ++nNextPos; -/*N*/ rStream << (USHORT)( nNextPos - nPos ); -/*N*/ rStream << nVal; -/*N*/ nPos = nNextPos; -/*N*/ } -/*N*/ } - - /*N*/ void lcl_LoadRange( SvStream& rStream, ScRange** ppRange ) /*N*/ { /*N*/ BOOL bIsSet = FALSE; @@ -1753,19 +1715,6 @@ DBG_BF_ASSERT(0, "STRIP"); /*N*/ *ppRange = NULL; /*N*/ } - -/*N*/ void lcl_SaveRange( SvStream& rStream, ScRange* pRange ) -/*N*/ { -/*N*/ if ( pRange ) -/*N*/ { -/*N*/ rStream << (BOOL)TRUE; -/*N*/ rStream << *pRange; -/*N*/ } -/*N*/ else -/*N*/ rStream << (BOOL)FALSE; -/*N*/ } - - // Berechnen der Groesse der Tabelle und setzen der Groesse an der DrawPage /*N*/ void ScTable::SetDrawPageSize() diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx index b38e0d444..d81d28673 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx @@ -1431,22 +1431,6 @@ namespace binfilter { /*N*/ } //------------------------------------------------------------------ -/*N*/ void SfxMedium::ReOpen() -/*N*/ { -/*N*/ BOOL bUseInteractionHandler = pImp->bUseInteractionHandler; -/*N*/ pImp->bUseInteractionHandler = FALSE; -/*N*/ DBG_ASSERT( pFilter, "Kein Filter, aber ReOpen!" ); -/*N*/ if( pFilter ) -/*N*/ { -/*N*/ if( pFilter->UsesStorage() ) -/*N*/ GetStorage(); -/*N*/ else -/*N*/ GetInStream(); -/*N*/ } -/*N*/ -/*N*/ pImp->bUseInteractionHandler = bUseInteractionHandler; -/*N*/ } -//------------------------------------------------------------------ /*N*/ SfxMedium::SfxMedium /*N*/ ( /*N*/ const String &rName, StreamMode nOpenMode, sal_Bool bDirectP, @@ -1666,12 +1650,6 @@ namespace binfilter { /*N*/ return pImp->xAttributes; /*N*/ } -//---------------------------------------------------------------- -/*N*/ SvCompatWeakHdl* SfxMedium::GetHdl() -/*N*/ { -/*N*/ return pImp->GetHdl(); -/*N*/ } - /*N*/ sal_Bool SfxMedium::IsDownloadDone_Impl() /*N*/ { /*N*/ return pImp->bDownloadDone; diff --git a/binfilter/bf_sw/source/filter/xml/makefile.mk b/binfilter/bf_sw/source/filter/xml/makefile.mk index a7ead531b..a8f681004 100644 --- a/binfilter/bf_sw/source/filter/xml/makefile.mk +++ b/binfilter/bf_sw/source/filter/xml/makefile.mk @@ -46,7 +46,6 @@ CDEFS=$(CDEFS) -Dmydebug # --- Files -------------------------------------------------------- CXXFILES = \ - sw_swxml.cxx \ sw_xmlimp.cxx \ sw_xmlexp.cxx \ sw_xmltext.cxx \ @@ -70,7 +69,6 @@ CXXFILES = \ sw_xmlexpit.cxx SLOFILES = \ - $(SLO)$/sw_swxml.obj \ $(SLO)$/sw_xmlimp.obj \ $(SLO)$/sw_xmlexp.obj \ $(SLO)$/sw_xmltext.obj \ @@ -95,7 +93,6 @@ SLOFILES = \ $(SLO)$/sw_xmlexpit.obj EXCEPTIONSFILES= \ - $(SLO)$/sw_swxml.obj \ $(SLO)$/sw_xmlimp.obj \ $(SLO)$/sw_xmlexp.obj \ $(SLO)$/sw_xmltext.obj \ diff --git a/binfilter/bf_sw/source/filter/xml/sw_swxml.cxx b/binfilter/bf_sw/source/filter/xml/sw_swxml.cxx deleted file mode 100644 index 60c5d7cb0..000000000 --- a/binfilter/bf_sw/source/filter/xml/sw_swxml.cxx +++ /dev/null @@ -1,125 +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. - * - ************************************************************************/ - - - -#ifdef _MSC_VER -#pragma hdrstop -#endif - - -#define _SVSTDARR_STRINGS - -#include <rsc/rscsfx.hxx> - -#include <comphelper/processfactory.hxx> -#include <com/sun/star/xml/sax/InputSource.hpp> -#include <com/sun/star/xml/sax/XParser.hpp> -#include <com/sun/star/io/XActiveDataControl.hpp> -#include <com/sun/star/text/XTextRange.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/task/XStatusIndicatorFactory.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> -#include <com/sun/star/packages/zip/ZipIOException.hpp> -#include <bf_svtools/svstdarr.hxx> - -#include <bf_sfx2/appuno.hxx> - -#include <bf_sfx2/docfile.hxx> -#include <bf_svtools/sfxecode.hxx> -#include <unotools/streamwrap.hxx> -#include <bf_svx/xmlgrhlp.hxx> -#include <bf_svx/xmleohlp.hxx> -#include <comphelper/genericpropertyset.hxx> -#include <rtl/logfile.hxx> - -#include <swerror.h> -#include <osl/diagnose.h> - -#include "swtypes.hxx" - -#include <fltini.hxx> - -#include <horiornt.hxx> - -#include <doc.hxx> -#include <docsh.hxx> -#include <unoobj.hxx> -#include <swmodule.hxx> -#include <SwXMLSectionList.hxx> -#include <xmlimp.hxx> - -#include <statstr.hrc> -#include <legacysmgr/legacy_binfilters_smgr.hxx> -#define LOGFILE_AUTHOR "mb93740" -namespace binfilter { - - -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::document; -using namespace ::com::sun::star::lang; - -using rtl::OUString; - - -void lcl_EnsureValidPam( SwPaM& rPam ) -{ - if( rPam.GetCntntNode() != NULL ) - { - // set proper point content - if( rPam.GetCntntNode() != rPam.GetPoint()->nContent.GetIdxReg() ) - { - rPam.GetPoint()->nContent.Assign( rPam.GetCntntNode(), 0 ); - } - // else: point was already valid - - // if mark is invalid, we delete it - if( ( rPam.GetCntntNode( FALSE ) == NULL ) || - ( rPam.GetCntntNode( FALSE ) != rPam.GetMark()->nContent.GetIdxReg() ) ) - { - rPam.DeleteMark(); - } - } - else - { - // point is not valid, so move it into the first content - rPam.DeleteMark(); - rPam.GetPoint()->nNode = - *rPam.GetDoc()->GetNodes().GetEndOfContent().StartOfSectionNode(); - ++ rPam.GetPoint()->nNode; - rPam.Move( fnMoveForward, fnGoCntnt ); // go into content - } -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binfilter/inc/bf_sfx2/docfile.hxx b/binfilter/inc/bf_sfx2/docfile.hxx index 723ae6be1..63084df83 100644 --- a/binfilter/inc/bf_sfx2/docfile.hxx +++ b/binfilter/inc/bf_sfx2/docfile.hxx @@ -181,9 +181,6 @@ class SfxMedium : public SvRefBase #endif public: - - SvCompatWeakHdl* GetHdl(); - SfxMedium(); SfxMedium( const String &rName, StreamMode nOpenMode, @@ -209,7 +206,6 @@ public: const String& GetOrigURL() const; SfxItemSet * GetItemSet() const; void Close(); - void ReOpen(); const String& GetName() const {return aLogicName;} const INetURLObject& GetURLObject() const; ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > GetContent() const; |