[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Sep 27 04:34:53 PDT 2011
binfilter/bf_sw/source/core/doc/makefile.mk | 1
binfilter/bf_sw/source/core/doc/sw_docfmt.cxx | 18 ----
binfilter/bf_sw/source/core/doc/sw_docredln.cxx | 7 -
binfilter/bf_sw/source/core/doc/sw_extinput.cxx | 90 --------------------
binfilter/bf_sw/source/core/inc/fntcache.hxx | 1
binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx | 17 ---
binfilter/inc/bf_sw/doc.hxx | 8 -
7 files changed, 142 deletions(-)
New commits:
commit 08f5cda4a6c8ef2b3084156ed60a588bf007cbce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 27 12:33:50 2011 +0100
callcatcher: newly unused code
diff --git a/binfilter/bf_sw/source/core/doc/makefile.mk b/binfilter/bf_sw/source/core/doc/makefile.mk
index fe8a3f0..1ce5b6b 100644
--- a/binfilter/bf_sw/source/core/doc/makefile.mk
+++ b/binfilter/bf_sw/source/core/doc/makefile.mk
@@ -67,7 +67,6 @@ SLOFILES = \
$(SLO)$/sw_docsort.obj \
$(SLO)$/sw_docstat.obj \
$(SLO)$/sw_doctxm.obj \
- $(SLO)$/sw_extinput.obj \
$(SLO)$/sw_fmtcol.obj \
$(SLO)$/sw_ftnidx.obj \
$(SLO)$/sw_gctable.obj \
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index 7d17d5d..d707279 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -867,24 +867,6 @@ void SwDoc::DelCharFmt( SwCharFmt *pFmt )
/*N*/ return pFmt;
/*N*/ }
-
-/*N*/ SwFrmFmt& SwDoc::GetTblFrmFmt(USHORT nFmt, BOOL bUsed ) const
-/*N*/ {
-/*?*/ USHORT nRemoved = 0;
-/*?*/ if(bUsed)
-/*?*/ {
-/*?*/ SwAutoFmtGetDocNode aGetHt( &aNodes );
-/*?*/ for ( USHORT i = 0; i <= nFmt; i++ )
-/*?*/ {
-/*?*/ while ( (*pTblFrmFmtTbl)[ i + nRemoved]->GetInfo( aGetHt ))
-/*?*/ {
-/*?*/ nRemoved++;
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ return *((*pTblFrmFmtTbl)[nRemoved + nFmt]);
-/*N*/}
-
/*N*/ SwTableFmt* SwDoc::MakeTblFrmFmt( const String &rFmtName,
/*N*/ SwFrmFmt *pDerivedFrom )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
index e25f472..453ee51 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
@@ -184,13 +184,6 @@ Verhalten von Delete-Redline:
/*N*/ return DeleteRedline( aTemp, bSaveInUndo, nDelType );
/*N*/ }
-
-/*N*/ USHORT SwDoc::GetRedlinePos( const SwNode& rNd, USHORT /*nType*/ ) const
-/*N*/ {
-/*N*/ rNd.GetIndex();
-/*N*/ return USHRT_MAX;
-/*N*/ }
-
/*N*/ const SwRedline* SwDoc::GetRedline( const SwPosition& /*rPos*/,
/*N*/ USHORT* pFndPos ) const
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_extinput.cxx b/binfilter/bf_sw/source/core/doc/sw_extinput.cxx
deleted file mode 100644
index e1acb86..0000000
--- a/binfilter/bf_sw/source/core/doc/sw_extinput.cxx
+++ /dev/null
@@ -1,90 +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
-
-
-
-#include <osl/diagnose.h>
-#include <horiornt.hxx>
-
-#include <extinput.hxx>
-#include <doc.hxx>
-namespace binfilter {
-
-
-
-
-
-
-
-
-// die Doc Schnittstellen:
-
-
-
-/*N*/ SwExtTextInput* SwDoc::GetExtTextInput( const SwNode& rNd,
-/*N*/ xub_StrLen nCntntPos ) const
-/*N*/ {
-/*N*/ SwExtTextInput* pRet = 0;
-/*N*/ if( pExtInputRing )
-/*N*/ {
-/*?*/ ULONG nNdIdx = rNd.GetIndex();
-/*?*/ SwExtTextInput* pTmp = (SwExtTextInput*)pExtInputRing;
-/*?*/ do {
-/*?*/ ULONG nPt = pTmp->GetPoint()->nNode.GetIndex(),
-/*?*/ nMk = pTmp->GetMark()->nNode.GetIndex();
-/*?*/ xub_StrLen nPtCnt = pTmp->GetPoint()->nContent.GetIndex(),
-/*?*/ nMkCnt = pTmp->GetMark()->nContent.GetIndex();
-/*?*/
-/*?*/ if( nPt < nMk || ( nPt == nMk && nPtCnt < nMkCnt ))
-/*?*/ {
-/*?*/ ULONG nTmp = nMk; nMk = nPt; nPt = nTmp;
-/*?*/ nTmp = nMkCnt; nMkCnt = nPtCnt; nPtCnt = (xub_StrLen)nTmp;
-/*?*/ }
-/*?*/
-/*?*/ if( nMk <= nNdIdx && nNdIdx <= nPt &&
-/*?*/ ( STRING_NOTFOUND == nCntntPos ||
-/*?*/ ( nMkCnt <= nCntntPos && nCntntPos <= nPtCnt )))
-/*?*/ {
-/*?*/ pRet = pTmp;
-/*?*/ break;
-/*?*/ }
-/*?*/ } while( pExtInputRing != (pTmp = (SwExtTextInput*)pExtInputRing ) );
-/*N*/ }
-/*N*/ return pRet;
-/*N*/ }
-
-
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/inc/fntcache.hxx b/binfilter/bf_sw/source/core/inc/fntcache.hxx
index fdc34be..1ea63d9 100644
--- a/binfilter/bf_sw/source/core/inc/fntcache.hxx
+++ b/binfilter/bf_sw/source/core/inc/fntcache.hxx
@@ -66,7 +66,6 @@ public:
inline SwFntObj *First( ) { return (SwFntObj *)SwCache::First(); }
inline SwFntObj *Next( SwFntObj *pFntObj)
{ return (SwFntObj *)SwCache::Next( (SwCacheObj *)pFntObj ); }
- void Flush();
};
// Font-Cache, globale Variable, in txtinit.Cxx angelegt/zerstoert
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
index 141c91f..11edd1e 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
@@ -68,23 +68,6 @@ OutputDevice* SwFntObj::pPixOut = NULL;
extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
-
-/*************************************************************************
-|*
-|* SwFntCache::Flush()
-|*
-|*************************************************************************/
-
-/*N*/ void SwFntCache::Flush( )
-/*N*/ {
-/*N*/ if ( pLastFont )
-/*N*/ {
-/*N*/ pLastFont->Unlock();
-/*N*/ pLastFont = NULL;
-/*N*/ }
-/*N*/ SwCache::Flush( );
-/*N*/ }
-
/*************************************************************************
|*
|* SwFntObj::SwFntObj(), ~SwFntObj()
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index 92c1109..23caa7b 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -910,7 +910,6 @@ public:
const SwFrmFmts* GetTblFrmFmts() const { return pTblFrmFmtTbl; }
SwFrmFmts* GetTblFrmFmts() { return pTblFrmFmtTbl; }
- SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, sal_Bool bUsed ) const;
SwTableFmt* MakeTblFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom);
void DelTblFrmFmt( SwTableFmt* pFmt );
SwTableFmt* FindTblFmtByName( const String& rName, sal_Bool bAll = sal_False ) const;
@@ -1323,7 +1322,6 @@ public:
sal_uInt16 nDelType = USHRT_MAX );
sal_Bool DeleteRedline( const SwStartNode& rSection, sal_Bool bSaveInUndo = sal_True,
sal_uInt16 nDelType = USHRT_MAX );
- sal_uInt16 GetRedlinePos( const SwNode& rNd, sal_uInt16 nType = USHRT_MAX ) const;
const SwRedline* GetRedline( const SwPosition& rPos,
sal_uInt16* pFndPos = 0 ) const;
@@ -1384,12 +1382,6 @@ public:
//
// -------------------- FeShell - Schnittstellen Ende ------------------
-
- // Schnittstelle fuer die TextInputDaten - ( fuer die Texteingabe
- // von japanischen/chinesischen Zeichen)
- SwExtTextInput* GetExtTextInput( const SwNode& rNd,
- xub_StrLen nCntntPos = STRING_NOTFOUND) const;
-
sal_Bool ContainsMSVBasic() const { return bContains_MSVBasic; }
void SetContainsMSVBasic( sal_Bool bFlag ) { bContains_MSVBasic = bFlag; }
More information about the Libreoffice-commits
mailing list