[Libreoffice-commits] .: 2 commits - binfilter/bf_forms binfilter/bf_sc binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Aug 4 01:37:42 PDT 2011
binfilter/bf_forms/source/misc/forms_services.cxx | 17 ---
binfilter/bf_sc/source/core/data/sc_column2.cxx | 48 ----------
binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx | 37 --------
binfilter/bf_svtools/source/numbers/numhead.hxx | 17 ---
binfilter/bf_svtools/source/numbers/svt_numhead.cxx | 52 -----------
binfilter/bf_svx/source/items/svx_bulitem.cxx | 30 ------
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 41 ---------
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 76 ----------------
binfilter/bf_sw/source/core/fields/sw_dbfld.cxx | 25 -----
binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx | 12 --
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 11 --
binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx | 12 --
binfilter/inc/bf_sc/chgtrack.hxx | 2
binfilter/inc/bf_sc/column.hxx | 1
binfilter/inc/bf_svtools/zformat.hxx | 2
binfilter/inc/bf_svx/bulitem.hxx | 1
binfilter/inc/bf_sw/crsrsh.hxx | 90 --------------------
binfilter/inc/bf_sw/dbfld.hxx | 1
binfilter/inc/bf_sw/doc.hxx | 3
20 files changed, 1 insertion(+), 479 deletions(-)
New commits:
commit bd8dae0313d682349eee7fcc2b9482eca9a90aa8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 4 09:24:26 2011 +0100
callcatcher: remove unused methods
diff --git a/binfilter/bf_sc/source/core/data/sc_column2.cxx b/binfilter/bf_sc/source/core/data/sc_column2.cxx
index 2d1e633..ce4a82b 100644
--- a/binfilter/bf_sc/source/core/data/sc_column2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_column2.cxx
@@ -233,54 +233,6 @@ namespace binfilter {
/*N*/ return nNoteCount;
/*N*/ }
-/*N*/ void ScColumn::SaveNotes( SvStream& rStream ) const
-/*N*/ {
-/*N*/ USHORT nSaveMaxRow = pDocument->GetSrcMaxRow();
-/*N*/ USHORT i;
-/*N*/
-/*N*/ BOOL bRemoveAny = lcl_RemoveAny( pDocument, nCol, nTab );
-/*N*/ USHORT nNoteCount;
-/*N*/ if ( bRemoveAny )
-/*N*/ {
-/*?*/ // vorher zaehlen, wieviele Notizen es werden
-/*?*/
-/*?*/ nNoteCount = 0;
-/*?*/ for (i=0; i<nCount; i++)
-/*?*/ if ( pItems[i].pCell->GetNotePtr() && pItems[i].nRow<=nSaveMaxRow &&
-/*?*/ true )
-/*?*/ ++nNoteCount;
-/*N*/ }
-/*N*/ else
-/*N*/ nNoteCount = NoteCount(nSaveMaxRow);
-/*N*/
-/*N*/ // Speichern
-/*N*/ // Als Positionen muessen die Indizes gespeichert werden, die beim Laden entstehen,
-/*N*/ // also ohne die weggelassenen Zellen mitzuzaehlen.
-/*N*/
-/*N*/ ScWriteHeader aHdr(rStream);
-/*N*/ rStream << nNoteCount;
-/*N*/
-/*N*/ USHORT nDestPos = 0;
-/*N*/ for (i=0; i<nCount && rStream.GetError() == SVSTREAM_OK; i++)
-/*N*/ {
-/*N*/ USHORT nRow = pItems[i].nRow;
-/*N*/ if ( !bRemoveAny || true )
-/*N*/ {
-/*N*/ const ScPostIt* pNote = pItems[i].pCell->GetNotePtr();
-/*N*/ if ( pNote && nRow <= nSaveMaxRow )
-/*N*/ {
-/*N*/ rStream << nDestPos;
-/*N*/ rStream << *pNote;
-/*N*/ }
-/*N*/ ++nDestPos; // nDestPos zaehlt die in SaveData gespeicherten Zellen
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // SetLostData ist schon in SaveData passiert, wenn noetig
-/*N*/ }
-
-// -----------------------------------------------------------------------------------------
-
/*N*/ void ScColumn::CorrectSymbolCells( CharSet eStreamCharSet )
/*N*/ {
/*N*/ // #99139# find and correct string cells that are formatted with a symbol font,
diff --git a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
index 8c976e3..364e371 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
@@ -441,43 +441,6 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ DeleteCellEntries(); // weg mit den generierten
/*N*/ }
-
-// static
-/*N*/ void ScChangeAction::StoreCell( ScBaseCell* pCell, SvStream& rStrm,
-/*N*/ ScMultipleWriteHeader& rHdr )
-/*N*/ {
-/*N*/ if ( pCell )
-/*N*/ {
-/*N*/ CellType eCellType = pCell->GetCellType();
-/*N*/ switch( eCellType )
-/*N*/ {
-/*N*/ case CELLTYPE_VALUE:
-/*N*/ rStrm << (BYTE) eCellType;
-/*N*/ ((ScValueCell*)pCell)->Save( rStrm );
-/*N*/ break;
-/*N*/ case CELLTYPE_STRING:
-/*N*/ rStrm << (BYTE) eCellType;
-/*N*/ ((ScStringCell*)pCell)->Save( rStrm );
-/*N*/ break;
-/*N*/ case CELLTYPE_EDIT:
-/*N*/ rStrm << (BYTE) eCellType;
-/*N*/ ((ScEditCell*)pCell)->Save( rStrm );
-/*N*/ break;
-/*N*/ case CELLTYPE_FORMULA:
-/*N*/ rStrm << (BYTE) eCellType;
-/*N*/ rStrm << ((ScFormulaCell*)pCell)->aPos;
-/*N*/ ((ScFormulaCell*)pCell)->Save( rStrm, rHdr );
-/*N*/ break;
-/*N*/ default:
-/*N*/ OSL_FAIL( "ScChangeAction::StoreCell: unknown CellType" );
-/*N*/ rStrm << (BYTE) CELLTYPE_NONE;
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*N*/ rStrm << (BYTE) CELLTYPE_NONE;
-/*N*/ }
-
-
// static
/*N*/ ScBaseCell* ScChangeAction::LoadCell( SvStream& rStrm,
/*N*/ ScMultipleReadHeader& rHdr, ScDocument* pDoc, USHORT nVer )
diff --git a/binfilter/bf_svtools/source/numbers/numhead.hxx b/binfilter/bf_svtools/source/numbers/numhead.hxx
index 32941a4..edccdc7 100644
--- a/binfilter/bf_svtools/source/numbers/numhead.hxx
+++ b/binfilter/bf_svtools/source/numbers/numhead.hxx
@@ -90,23 +90,6 @@ public:
static void Skip( SvStream& ); // komplett ueberspringen
};
-class ImpSvNumMultipleWriteHeader
-{
-private:
- SvStream& rStream;
- SvMemoryStream aMemStream;
- ULONG nDataPos;
- sal_uInt32 nDataSize;
- ULONG nEntryStart;
-
-public:
- ImpSvNumMultipleWriteHeader(SvStream& rNewStream, ULONG nDefault = 0);
- ~ImpSvNumMultipleWriteHeader();
-
- void StartEntry();
- void EndEntry();
-};
-
}
#endif
diff --git a/binfilter/bf_svtools/source/numbers/svt_numhead.cxx b/binfilter/bf_svtools/source/numbers/svt_numhead.cxx
index 0fa0a6a..580d37d 100644
--- a/binfilter/bf_svtools/source/numbers/svt_numhead.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_numhead.cxx
@@ -197,58 +197,6 @@ ULONG ImpSvNumMultipleReadHeader::BytesLeft() const
return 0;
}
-// -----------------------------------------------------------------------
-
-//#pragma SEG_FUNCDEF(numhead_0a)
-
-ImpSvNumMultipleWriteHeader::ImpSvNumMultipleWriteHeader(SvStream& rNewStream,
- ULONG nDefault) :
- rStream( rNewStream ),
- aMemStream( 4096, 4096 )
-{
- nDataSize = nDefault;
- rStream << nDataSize;
-
- nDataPos = rStream.Tell();
- nEntryStart = nDataPos;
-}
-
-//#pragma SEG_FUNCDEF(numhead_0b)
-
-ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader()
-{
- ULONG nDataEnd = rStream.Tell();
-
- rStream << (USHORT) SV_NUMID_SIZES;
- rStream << static_cast<sal_uInt32>(aMemStream.Tell());
- rStream.Write( aMemStream.GetData(), aMemStream.Tell() );
-
- if ( nDataEnd - nDataPos != nDataSize ) // Default getroffen?
- {
- nDataSize = nDataEnd - nDataPos;
- ULONG nPos = rStream.Tell();
- rStream.Seek(nDataPos-sizeof(sal_uInt32));
- rStream << nDataSize; // Groesse am Anfang eintragen
- rStream.Seek(nPos);
- }
-}
-
-//#pragma SEG_FUNCDEF(numhead_0c)
-
-void ImpSvNumMultipleWriteHeader::EndEntry()
-{
- ULONG nPos = rStream.Tell();
- aMemStream << static_cast<sal_uInt32>(nPos - nEntryStart);
-}
-
-//#pragma SEG_FUNCDEF(numhead_0e)
-
-void ImpSvNumMultipleWriteHeader::StartEntry()
-{
- ULONG nPos = rStream.Tell();
- nEntryStart = nPos;
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/items/svx_bulitem.cxx b/binfilter/bf_svx/source/items/svx_bulitem.cxx
index 54c94d7..39a0e42 100644
--- a/binfilter/bf_svx/source/items/svx_bulitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_bulitem.cxx
@@ -46,36 +46,6 @@ namespace binfilter {
/*N*/ TYPEINIT1(SvxBulletItem,SfxPoolItem);
-// -----------------------------------------------------------------------
-
-/*N*/ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
-/*N*/ {
-/*N*/ USHORT nTemp;
-/*N*/
-/*N*/ rStream << rFont.GetColor();
-/*N*/ nTemp = (USHORT)rFont.GetFamily(); rStream << nTemp;
-/*N*/
-/*N*/ // #90477# nTemp = (USHORT)GetStoreCharSet( rFont.GetCharSet(), rStream.GetVersion() );
-/*N*/ nTemp = (USHORT)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet(), (sal_uInt16)rStream.GetVersion());
-/*N*/ rStream << nTemp;
-/*N*/
-/*N*/ nTemp = (USHORT)rFont.GetPitch(); rStream << nTemp;
-/*N*/ nTemp = (USHORT)rFont.GetAlign(); rStream << nTemp;
-/*N*/ nTemp = (USHORT)rFont.GetWeight(); rStream << nTemp;
-/*N*/ nTemp = (USHORT)rFont.GetUnderline(); rStream << nTemp;
-/*N*/ nTemp = (USHORT)rFont.GetStrikeout(); rStream << nTemp;
-/*N*/ nTemp = (USHORT)rFont.GetItalic(); rStream << nTemp;
-/*N*/
-/*N*/ // UNICODE: rStream << rFont.GetName();
-/*N*/ rStream.WriteByteString(rFont.GetName());
-/*N*/
-/*N*/ rStream << rFont.IsOutline();
-/*N*/ rStream << rFont.IsShadow();
-/*N*/ rStream << rFont.IsTransparent();
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ Font SvxBulletItem::CreateFont( SvStream& rStream, USHORT nVer )
/*N*/ {
/*N*/ Font aFont;
diff --git a/binfilter/inc/bf_sc/chgtrack.hxx b/binfilter/inc/bf_sc/chgtrack.hxx
index a7821a2..fd6f3c3 100644
--- a/binfilter/inc/bf_sc/chgtrack.hxx
+++ b/binfilter/inc/bf_sc/chgtrack.hxx
@@ -278,8 +278,6 @@ protected:
ScMultipleReadHeader&, ScChangeTrack* );
virtual ~ScChangeAction();
/*N*/
-/*N*/ static void StoreCell( ScBaseCell*, SvStream&,
-/*N*/ ScMultipleWriteHeader& );
/*N*/ static ScBaseCell* LoadCell( SvStream&, ScMultipleReadHeader&,
/*N*/ ScDocument*, USHORT nVer );
/*N*/
diff --git a/binfilter/inc/bf_sc/column.hxx b/binfilter/inc/bf_sc/column.hxx
index 2e16a57..1288fa9 100644
--- a/binfilter/inc/bf_sc/column.hxx
+++ b/binfilter/inc/bf_sc/column.hxx
@@ -292,7 +292,6 @@ public:
void LoadData( SvStream& rStream );
void LoadNotes( SvStream& rStream );
- void SaveNotes( SvStream& rStream ) const;
BOOL Load( SvStream& rStream, ScMultipleReadHeader& rHdr );
BOOL Save( SvStream&, ScMultipleWriteHeader& ) const {return false; }
diff --git a/binfilter/inc/bf_svtools/zformat.hxx b/binfilter/inc/bf_svtools/zformat.hxx
index 74759cc..e31b47a 100644
--- a/binfilter/inc/bf_svtools/zformat.hxx
+++ b/binfilter/inc/bf_svtools/zformat.hxx
@@ -57,7 +57,6 @@ namespace binfilter {
class ImpSvNumberformatScan; // format code string scanner
class ImpSvNumberInputScan; // input string scanner
-class ImpSvNumMultipleWriteHeader; // compatible file format
class ImpSvNumMultipleReadHeader; // compatible file format
class SvNumberFormatter;
@@ -225,7 +224,6 @@ public:
NfHackConversion Load( SvStream& rStream, ImpSvNumMultipleReadHeader& rHdr,
SvNumberFormatter* pConverter, ImpSvNumberInputScan& rISc );
- void Save( SvStream&, ImpSvNumMultipleWriteHeader& ) const {};
// Load a string which might contain an Euro symbol,
// in fact that could be any string used in number formats.
diff --git a/binfilter/inc/bf_svx/bulitem.hxx b/binfilter/inc/bf_svx/bulitem.hxx
index 9db895f..81fed54 100644
--- a/binfilter/inc/bf_svx/bulitem.hxx
+++ b/binfilter/inc/bf_svx/bulitem.hxx
@@ -130,7 +130,6 @@ public:
virtual USHORT GetVersion(USHORT nFileVersion) const;
virtual int operator==( const SfxPoolItem& ) const;
- static void StoreFont( SvStream&, const Font& );
static Font CreateFont( SvStream&, USHORT nVer );
USHORT& GetValidMask() { return nValidMask; }
commit 3846455f87478cc391f3c8da424286e5afb33618
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 3 22:24:34 2011 +0100
callcatcher: remove unused methods
diff --git a/binfilter/bf_forms/source/misc/forms_services.cxx b/binfilter/bf_forms/source/misc/forms_services.cxx
index 78cae81..4369a90 100644
--- a/binfilter/bf_forms/source/misc/forms_services.cxx
+++ b/binfilter/bf_forms/source/misc/forms_services.cxx
@@ -440,23 +440,6 @@ void ensureClassInfos()
REGISTER_CLASS1(ImageProducer, SRV_AWT_IMAGEPRODUCER);
}
-//---------------------------------------------------------------------------------------
-void registerServiceProvider(const ::rtl::OUString& _rServiceImplName, const Sequence< ::rtl::OUString >& _rServices, starregistry::XRegistryKey* _pKey)
-{
- ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
- sMainKeyName += _rServiceImplName;
- sMainKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
- Reference<starregistry::XRegistryKey> xNewKey = _pKey->createKey(sMainKeyName);
- OSL_ENSURE(xNewKey.is(), "forms::registerProvider : could not create a registry key !");
- if (!xNewKey.is())
- return;
-
- const ::rtl::OUString* pSupportedServices = _rServices.getConstArray();
- for (sal_Int32 i=0; i<_rServices.getLength(); ++i, ++pSupportedServices)
- xNewKey->createKey(*pSupportedServices);
-}
-
-//=======================================================================================
extern "C"
{
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 9bfa180..48bb6f1 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -774,11 +774,6 @@ using namespace ::com::sun::star::util;
#if defined(DBG_UTIL) || defined(WIN)
-/*N*/ SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTblCrsr ) const
-/*N*/ {
-/*N*/ return (SwCursor*)GetCrsr( bMakeTblCrsr );
-/*N*/ }
-
// gebe den Stack Cursor zurueck
/*N*/ SwPaM * SwCrsrShell::GetStkCrsr() const { return pCrsrStk; }
@@ -794,43 +789,7 @@ using namespace ::com::sun::star::util;
/*N*/ return IsTableMode() || pCurCrsr->HasMark() ||
/*N*/ pCurCrsr->GetNext() != pCurCrsr;
/*N*/ }
-// returns if multiple cursors are available
-/*N*/ bool SwCrsrShell::IsMultiSelection() const
-/*N*/ {
-/*N*/ return pCurCrsr->GetNext() != pCurCrsr;
-/*N*/ }
-
-// pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen
-/*N*/ const SwTableNode* SwCrsrShell::IsCrsrInTbl( BOOL bIsPtInTbl ) const
-/*N*/ {
-/*N*/ return pCurCrsr->GetNode( bIsPtInTbl )->FindTableNode();
-/*N*/ }
-
-
-/*?*/ bool SwCrsrShell::IsCrsrPtAtEnd() const
-/*?*/ {
-/*?*/ return pCurCrsr->End() == pCurCrsr->GetPoint();
-/*?*/ }
-
-/*?*/ void SwCrsrShell::UnSetVisCrsr()
-/*?*/ {
-/*?*/ pVisCrsr->Hide();
-/*?*/ pVisCrsr->SetDragCrsr( FALSE );
-/*?*/ }
-
-
-/*?*/ bool SwCrsrShell::IsSelOnePara() const
-/*?*/ {
-/*?*/ return pCurCrsr == pCurCrsr->GetNext() &&
-/*?*/ pCurCrsr->GetPoint()->nNode ==
-/*?*/ pCurCrsr->GetMark()->nNode;
-/*?*/ }
-
-/*?*/ SwMoveFnCollection* SwCrsrShell::MakeFindRange(USHORT, USHORT, SwPaM*) const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*?*/ }
#endif
/**
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index cbbf818..5d9411e 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -1150,82 +1150,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ sRet += String::CreateFromInt32(rData.nCommandType);
/*N*/ return sRet;
/*N*/ }
-/*N*/ void SwDoc::GetAllUsedDB( SvStringsDtor& rDBNameList,
-/*N*/ const SvStringsDtor* pAllDBNames )
-/*N*/ {
-/*N*/ USHORT n;
-/*N*/ SvStringsDtor aUsedDBNames;
-/*N*/ SvStringsDtor aAllDBNames;
-/*N*/
-/*N*/ if( !pAllDBNames )
-/*N*/ {
-/*N*/ GetAllDBNames( aAllDBNames );
-/*N*/ pAllDBNames = &aAllDBNames;
-/*N*/ }
-/*N*/
-/*N*/ SwSectionFmts& rArr = GetSections();
-/*N*/ for( n = rArr.Count(); n; )
-/*N*/ {
-/*N*/ SwSection* pSect = rArr[ --n ]->GetSection();
-/*N*/
-/*N*/ if( pSect )
-/*N*/ {
-/*N*/ String aCond( pSect->GetCondition() );
-/*N*/ AddUsedDBToList( rDBNameList, FindUsedDBs( *pAllDBNames,
-/*N*/ aCond, aUsedDBNames ) );
-/*N*/ aUsedDBNames.DeleteAndDestroy( 0, aUsedDBNames.Count() );
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ const SfxPoolItem* pItem;
-/*N*/ USHORT nMaxItems = GetAttrPool().GetItemCount( RES_TXTATR_FIELD );
-/*N*/ for( n = 0; n < nMaxItems; ++n )
-/*N*/ {
-/*N*/ if( 0 == (pItem = GetAttrPool().GetItem( RES_TXTATR_FIELD, n ) ))
-/*N*/ continue;
-/*N*/
-/*N*/ const SwFmtFld* pFmtFld = (SwFmtFld*)pItem;
-/*N*/ const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
-/*N*/ if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
-/*N*/ continue;
-/*N*/
-/*N*/ const SwField* pFld = pFmtFld->GetFld();
-/*N*/ switch( pFld->GetTyp()->Which() )
-/*N*/ {
-/*N*/ case RES_DBFLD:
-/*N*/ AddUsedDBToList( rDBNameList,
-/*N*/ lcl_DBDataToString(((SwDBField*)pFld)->GetDBData() ));
-/*N*/ break;
-/*N*/
-/*N*/ case RES_DBSETNUMBERFLD:
-/*N*/ case RES_DBNAMEFLD:
-/*N*/ AddUsedDBToList( rDBNameList,
-/*N*/ lcl_DBDataToString(((SwDBNameInfField*)pFld)->GetRealDBData() ));
-/*N*/ break;
-/*N*/
-/*N*/ case RES_DBNUMSETFLD:
-/*N*/ case RES_DBNEXTSETFLD:
-/*N*/ AddUsedDBToList( rDBNameList,
-/*N*/ lcl_DBDataToString(((SwDBNameInfField*)pFld)->GetRealDBData() ));
-/*N*/ // kein break // JP: ist das so richtig ??
-/*N*/
-/*N*/ case RES_HIDDENTXTFLD:
-/*N*/ case RES_HIDDENPARAFLD:
-/*N*/ AddUsedDBToList(rDBNameList, FindUsedDBs( *pAllDBNames,
-/*N*/ pFld->GetPar1(), aUsedDBNames ));
-/*N*/ aUsedDBNames.DeleteAndDestroy( 0, aUsedDBNames.Count() );
-/*N*/ break;
-/*N*/
-/*N*/ case RES_SETEXPFLD:
-/*N*/ case RES_GETEXPFLD:
-/*N*/ case RES_TABLEFLD:
-/*N*/ AddUsedDBToList(rDBNameList, FindUsedDBs( *pAllDBNames,
-/*N*/ pFld->GetFormula(), aUsedDBNames ));
-/*N*/ aUsedDBNames.DeleteAndDestroy( 0, aUsedDBNames.Count() );
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ }
/*--------------------------------------------------------------------
Beschreibung:
diff --git a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
index b1917f2..75b7033 100644
--- a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
@@ -244,31 +244,6 @@ SwDBFieldType::SwDBFieldType(SwDoc* pDocPtr, const String& rNam, const SwDBData&
/*N*/ SetExpansion( rExpansion );
/*N*/ }
-//------------------------------------------------------------------------------
-
-/*N*/ String SwDBField::GetOldContent()
-/*N*/ {
-/*N*/ String sOldExpand = Expand();
-/*N*/ String sNewExpand = sOldExpand;
-/*N*/ BOOL bOldInit = bInitialized;
-/*N*/
-/*N*/ bInitialized = FALSE;
-/*N*/ InitContent();
-/*N*/ bInitialized = bOldInit;
-/*N*/
-/*N*/ if( ::binfilter::GetAppCmpStrIgnore().isEqual( sNewExpand, Expand() ) )
-/*N*/ {
-/*N*/ sNewExpand = '<';
-/*N*/ sNewExpand += ((SwDBFieldType *)GetTyp())->GetColumnName();
-/*N*/ sNewExpand += '>';
-/*N*/ }
-/*N*/ SetExpansion( sOldExpand );
-/*N*/
-/*N*/ return sNewExpand;
-/*N*/ }
-
-//------------------------------------------------------------------------------
-
/*N*/ String SwDBField::Expand() const
/*N*/ {
/*N*/ String sRet;
diff --git a/binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx b/binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx
index 4617e03..ad46860 100644
--- a/binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx
+++ b/binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx
@@ -54,20 +54,8 @@ namespace binfilter {
//siehe auch swtable.cxx
#define COLFUZZY 20L
-
/*N*/ SwTabCols *pLastCols = 0;
-
-
-/*N*/ inline const SwCursor& GetShellCursor( const SwCrsrShell& rShell )
-/*N*/ {
-/*N*/ const SwShellCrsr *pCrsr = rShell.GetTableCrsr();
-/*N*/ if( !pCrsr )
-/*N*/ pCrsr = (SwShellCrsr*)*rShell.GetSwCrsr( FALSE );
-/*N*/ return *pCrsr;
-/*N*/ }
-
-
/*N*/ void ClearFEShellTabCols()
/*N*/ {
/*N*/ DELETEZ( pLastCols );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index a02f76a..7b065f7 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -260,14 +260,12 @@ class Sw3StringPool
BOOL bFixed;
void Setup( SwDoc& rDoc, const SwFmt& rFmt, USHORT=0 );
- void SetupTxtCollByName( SwDoc& rDoc, const String& rCollName );
void RemoveExtension( SwFmt& );
public:
Sw3StringPool();
USHORT Count() { return aPool.Count(); }
void Clear();
- void SetupRedlines( SwDoc& );
void RemoveExtensions( SwDoc& );
static void RemoveExtension( String& );
USHORT Add( const String&, USHORT nPoolId /*= 0*/, BOOL bDontSearch=FALSE );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index a012b0e..9958ecb 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -1427,17 +1427,6 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ }
/*N*/ }
-/*N*/ void Sw3StringPool::SetupTxtCollByName( SwDoc& rDoc, const String& rName )
-/*N*/ {
-/*N*/ if( !rName.Len() )
-/*N*/ return;
-/*N*/
-/*N*/ const SwTxtFmtColl *pColl = rDoc.FindTxtFmtCollByName( rName );
-/*N*/ sal_uInt16 nPoolId = pColl ? pColl->GetPoolFmtId()
-/*N*/ : SwStyleNameMapper::GetPoolIdFromUIName( rName, GET_POOLID_TXTCOLL );
-/*N*/ Add( rName, nPoolId );
-/*N*/ }
-
/*N*/ sal_uInt16 Sw3StringPool::Add( const String& r, sal_uInt16 n, sal_Bool bDontSearch )
/*N*/ {
/*N*/ sal_uInt16 i = bDontSearch ? aPool.Count() : 0;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
index f74ea63..125dd61 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx
@@ -54,18 +54,6 @@ namespace binfilter {
// lokaler Record in SWG_REDLINE
#define SWG_REDLINEDATA_LCL 'D'
-/*N*/ void Sw3StringPool::SetupRedlines( SwDoc& rDoc )
-/*N*/ {
-/*N*/ const SwRedlineTbl& rRedlines = rDoc.GetRedlineTbl();
-/*N*/ for( USHORT i=0; i<rRedlines.Count(); i++ )
-/*N*/ {
-/*?*/ const SwRedline *pRedline = rRedlines[i];
- for( USHORT j=0; j<pRedline->GetStackCount(); j++ )
- Add( pRedline->GetAuthorString(j), USHRT_MAX );
-/*N*/ }
-/*N*/ }
-
-
// REDLINE:
// BYTE Flags
// 0x10 - visisble Flags
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index 2cffbe6..f691a7b 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -240,11 +240,7 @@ private:
typedef bool (SwCursor:: *FNCrsr)();
-
protected:
-
- CRSR_INLINE SwMoveFnCollection* MakeFindRange( USHORT, USHORT, SwPaM* ) const;
-
/*
* Compare-Methode for the StackCursor and the current Cursor.
* The Methods return -1, 0, 1 for lower, equal, greater. The enum
@@ -277,7 +273,6 @@ public:
// TableCursor in normale Cursor verwandeln, Tablemode aufheben
SwPaM* GetCrsr( bool bMakeTblCrsr = TRUE ) const;
- CRSR_INLINE SwCursor* GetSwCrsr( bool bMakeTblCrsr = TRUE ) const;
// nur den akt. Cursor returnen
SwShellCrsr* _GetCrsr() { return pCurCrsr; }
const SwShellCrsr* _GetCrsr() const { return pCurCrsr; }
@@ -399,12 +394,6 @@ public:
// Abfrage, ob ueberhaupt eine Selektion existiert, sprich der akt. Cursor
// aufgespannt oder nicht der einzigste ist.
CRSR_INLINE bool IsSelection() const;
- // returns if multiple cursors are available
- CRSR_INLINE bool IsMultiSelection() const;
-
- // Abfrage, ob ein kompletter Absatz selektiert wurde
- // Abfrage, ob die Selektion in einem Absatz ist
- CRSR_INLINE bool IsSelOnePara() const;
//Sollte fuer das Clipboard der WaitPtr geschaltet werden.
@@ -424,20 +413,8 @@ public:
// ergibt sich aus seiner aktuellen Position im Layout !!
void UpdateCrsrPos();
- // returne den am akt. Cursor selektierten Text. Dieser wird mit
- // Felder etc. aufgefuellt!!
- // gebe nur den Text ab der akt. Cursor Position zurueck (bis zum NodeEnde)
- // retrurne die Anzahl der selektierten Zeichen.
- // Falls keine Selektion vorliegt entscheided nType was selektiert wird
- // bIntrnlChar besagt ob interne Zeichen erhalten bleiben (TRUE) oder
- // ob sie expandiert werden (z.B Felder/...)
-
- // pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen
- CRSR_INLINE const SwTableNode* IsCrsrInTbl( BOOL bIsPtInTbl = TRUE ) const;
- CRSR_INLINE bool IsCrsrPtAtEnd() const;
-
CRSR_INLINE const SwPaM* GetTblCrs() const;
- CRSR_INLINE SwPaM* GetTblCrs();
+ CRSR_INLINE SwPaM* GetTblCrs();
// select a table row, column or box (based on the current cursor)
@@ -459,32 +436,6 @@ public:
const SwShellTableCrsr* GetTableCrsr() const { return pTblCrsr; }
SwShellTableCrsr* GetTableCrsr() { return pTblCrsr; }
-
- // springe in den Header/Footer des angegebenen oder akt. PageDesc
- // is point of cursor in header/footer. pbInHeader return TRUE if it is
- // in a headerframe otherwise in a footerframe
-
- // springe zum naechsten Verzeichnis [mit dem Namen]
- // springe zum vorherigen Verzeichnis [mit dem Namen]
- // springe zum naechsten (vorherigen) Verzeichniseintrag
- // Zur naechsten/ vorherigen Verzeichnismarke dieses Typs traveln
-
- // springe zum naechsten (vorherigen) Tabellenformel
- // optional auch nur zu kaputten Formeln springen
- // jump to the next / previous hyperlink - inside text and also
- // on graphics
-
- // springe zu dieser Refmark
-
- // hole vom Start/Ende der akt. Selection das nte Zeichen
- // erweiter die akt. Selection am Anfang/Ende um n Zeichen
- // setze nur den sichtbaren Cursor an die angegebene Dokument-Pos.
- // returnt FALSE: wenn der ob der SPoint vom Layout korrigiert wurde.
- // (wird zum Anzeigen von Drag&Drop/Copy-Cursor benoetigt)
- CRSR_INLINE void UnSetVisCrsr();
-
- // Char Travelling - Methoden (in crstrvl1.cxx)
-
// Abfrage vom CrsrTravelling Status
CrsrMoveState GetMoveState() const { return eMvState; }
@@ -569,46 +520,13 @@ public:
#if !defined(DBG_UTIL) && !defined(WIN)
-inline SwMoveFnCollection* SwCrsrShell::MakeFindRange(
- USHORT /*nStt*/, USHORT /*nEnd*/, SwPaM* /*pPam*/ ) const
-{
- DBG_BF_ASSERT(0, "STRIP"); return NULL;
-}
-
-inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTblCrsr ) const
-{
- return (SwCursor*)GetCrsr( bMakeTblCrsr );
-}
-
inline SwPaM* SwCrsrShell::GetStkCrsr() const { return pCrsrStk; }
-
-
/*N*/ inline bool SwCrsrShell::IsSelection() const
/*N*/ {
/*N*/ return IsTableMode() || pCurCrsr->HasMark() ||
/*N*/ pCurCrsr->GetNext() != pCurCrsr;
/*N*/ }
-inline bool SwCrsrShell::IsMultiSelection() const
-{
- return pCurCrsr->GetNext() != pCurCrsr;
-}
-
-inline bool SwCrsrShell::IsSelOnePara() const
-{
- return pCurCrsr == pCurCrsr->GetNext() &&
- pCurCrsr->GetPoint()->nNode == pCurCrsr->GetMark()->nNode;
-}
-
-inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( BOOL bIsPtInTbl ) const
-{
- return pCurCrsr->GetNode( bIsPtInTbl )->FindTableNode();
-}
-
-inline bool SwCrsrShell::IsCrsrPtAtEnd() const
-{
- return pCurCrsr->End() == pCurCrsr->GetPoint();
-}
inline const SwPaM* SwCrsrShell::GetTblCrs() const
{
@@ -620,12 +538,6 @@ inline SwPaM* SwCrsrShell::GetTblCrs()
return pTblCrsr;
}
-inline void SwCrsrShell::UnSetVisCrsr()
-{
- pVisCrsr->Hide();
- pVisCrsr->SetDragCrsr( FALSE );
-}
-
#endif
diff --git a/binfilter/inc/bf_sw/dbfld.hxx b/binfilter/inc/bf_sw/dbfld.hxx
index a73e7a1..097e413 100644
--- a/binfilter/inc/bf_sw/dbfld.hxx
+++ b/binfilter/inc/bf_sw/dbfld.hxx
@@ -104,7 +104,6 @@ public:
void ChangeExpansion( const SwFrm*, const SwTxtFld* );
void InitContent();
void InitContent(const String& rExpansion);
- String GetOldContent();
inline void ChgBodyTxtFlag( BOOL bIsInBody );
inline BOOL IsInBodyTxt() const;
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index d6fc723..aecadc4 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -776,9 +776,6 @@ public:
void SetNewDBMgr( SwNewDBMgr* pNewMgr ) { pNewDBMgr = pNewMgr; }
SwNewDBMgr* GetNewDBMgr() const { return pNewDBMgr; }
void SetInitDBFields(sal_Bool b);
- // Von Feldern verwendete Datenbanken herausfinden
- void GetAllUsedDB( SvStringsDtor& rDBNameList,
- const SvStringsDtor* pAllDBNames = 0 );
void ChgDBData( const SwDBData& rNewData );
SwDBData GetDBData();
More information about the Libreoffice-commits
mailing list