diff options
30 files changed, 56 insertions, 703 deletions
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx index a3e63721b..8a26d612d 100644 --- a/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -462,7 +462,6 @@ public: void SetRelStorageName( const String& rN ) { aRelStorageName = rN; } const String& GetRelStorageName() const { return aRelStorageName; } - void CalcRelStorageName( const String& rMgrStorageName ); StarBASICRef GetLib() const { @@ -656,20 +655,6 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream ) return pInfo; } -void BasicLibInfo::CalcRelStorageName( const String& rMgrStorageName ) -{ - if ( rMgrStorageName.Len() ) - { - INetURLObject aAbsURLObj( rMgrStorageName ); - aAbsURLObj.removeSegment(); - String aPath = aAbsURLObj.GetMainURL( INetURLObject::NO_DECODE ); - UniString aRelURL = INetURLObject::GetRelURL( aPath, GetStorageName() ); - SetRelStorageName( aRelURL ); - } - else - SetRelStorageName( String() ); -} - BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib, String* pLibPath ) { DBG_CTOR( BasicManager, 0 ); @@ -1169,69 +1154,6 @@ BasicLibInfo* BasicManager::CreateLibInfo() return pInf; } -BOOL BasicManager::ImpStoreLibary( StarBASIC* pLib, SotStorage& rStorage ) const -{ - DBG_CHKTHIS( BasicManager, 0 ); - DBG_ASSERT( pLib, "pLib = 0 (ImpStorageLibary)" ); - - SotStorageRef xBasicStorage = rStorage.OpenSotStorage - ( BasicStreamName, STREAM_STD_READWRITE, FALSE ); - - String aStorName( rStorage.GetName() ); - DBG_ASSERT( aStorName.Len(), "No Storage Name!" ); - if ( !xBasicStorage.Is() || xBasicStorage->GetError() ) - { - StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_MGRSAVE, aStorName, ERRCODE_BUTTON_OK ); - ((BasicManager*)this)->pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_OPENLIBSTORAGE, pLib->GetName() ) ); - } - else - { - // In dem Basic-Storage liegt jede Lib in einem Stream... - SotStorageStreamRef xBasicStream = xBasicStorage->OpenSotStream( pLib->GetName(), STREAM_STD_READWRITE ); - if ( !xBasicStream.Is() || xBasicStream->GetError() ) - { - StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBSAVE, pLib->GetName(), ERRCODE_BUTTON_OK ); - ((BasicManager*)this)->pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_OPENLIBSTREAM, pLib->GetName() ) ); - } - else - { - BasicLibInfo* pLibInfo = FindLibInfo( pLib ); - DBG_ASSERT( pLibInfo, "ImpStoreLibary: LibInfo?!" ); - - xBasicStream->SetSize( 0 ); - xBasicStream->SetBufferSize( 1024 ); - - // SBX_DONTSTORE, damit Child-Basics nicht gespeichert werden - SetFlagToAllLibs( SBX_DONTSTORE, TRUE ); - // Aber das hier will ich jetzt speichern: - pLib->ResetFlag( SBX_DONTSTORE ); - if ( pLibInfo->HasPassword() ) - xBasicStream->SetCryptMaskKey(szCryptingKey); - BOOL bDone = pLib->Store( *xBasicStream ); - xBasicStream->SetBufferSize( 0 ); - if ( bDone ) - { - // Diese Informationen immer verschluesseln... - xBasicStream->SetBufferSize( 1024 ); - xBasicStream->SetCryptMaskKey(szCryptingKey); - *xBasicStream << static_cast<sal_uInt32>(PASSWORD_MARKER); - String aTmpPassword = pLibInfo->GetPassword(); - xBasicStream->WriteByteString( aTmpPassword, RTL_TEXTENCODING_MS_1252 ); - xBasicStream->SetBufferSize( 0 ); - } - // Vorsichtshalber alle Dont't Store lassen... - pLib->SetFlag( SBX_DONTSTORE ); - pLib->SetModified( FALSE ); - if( !xBasicStorage->Commit() ) - bDone = FALSE; - xBasicStream->SetCryptMaskKey(rtl::OString()); - DBG_ASSERT( bDone, "Warum geht Basic::Store() nicht ?" ); - return bDone; - } - } - return FALSE; -} - BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly ) const { DBG_CHKTHIS( BasicManager, 0 ); diff --git a/binfilter/bf_forms/source/misc/forms_services.cxx b/binfilter/bf_forms/source/misc/forms_services.cxx index 78cae8125..4369a9012 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_sc/source/core/data/sc_column2.cxx b/binfilter/bf_sc/source/core/data/sc_column2.cxx index 2d1e6333b..ce4a82bc3 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 8c976e314..364e371a3 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 32941a497..edccdc724 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 0fa0a6aad..580d37d07 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_svtools/source/numbers/svt_zformat.cxx b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx index fe73f1ae2..bae404d1e 100644 --- a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx +++ b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx @@ -281,18 +281,6 @@ void ImpSvNumFor::Load(SvStream& rStream, ImpSvNumberformatScan& rSc, pColor = rSc.GetColor(sColorName); } - -BOOL ImpSvNumFor::HasNewCurrency() const -{ - for ( USHORT j=0; j<nAnzStrings; j++ ) - { - if ( aI.nTypeArray[j] == NF_SYMBOLTYPE_CURRENCY ) - return TRUE; - } - return FALSE; -} - - BOOL ImpSvNumFor::GetNewCurrencySymbol( String& rSymbol, String& rExtension ) const { diff --git a/binfilter/bf_svx/source/items/svx_bulitem.cxx b/binfilter/bf_svx/source/items/svx_bulitem.cxx index 54c94d7f4..39a0e42bd 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/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx index 9bfa18016..48bb6f136 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 cbbf818b3..5d9411eea 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 b1917f29e..75b7033bb 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 4617e034c..ad468601d 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/inc/laycache.hxx b/binfilter/bf_sw/source/core/inc/laycache.hxx index d1bbf4d0d..5eaa785f8 100644 --- a/binfilter/bf_sw/source/core/inc/laycache.hxx +++ b/binfilter/bf_sw/source/core/inc/laycache.hxx @@ -54,8 +54,6 @@ public: SwLayoutCache() : pImpl( NULL ), nLockCount( 0 ) {} ~SwLayoutCache(); - void Read( SvStream &rStream ); - void ClearImpl(); sal_Bool IsLocked() const { return nLockCount > 0; } USHORT& GetLockCount() { return nLockCount; } diff --git a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx index 8bc37ec13..dbfc80230 100644 --- a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx @@ -63,30 +63,6 @@ namespace binfilter { /*N*/ SV_IMPL_PTRARR( SwPageFlyCache, SwFlyCachePtr ) -/* - * Reading and writing of the layout cache. - * The layout cache is not necessary, but it improves - * the performance and reduces the text flow during - * the formatting. - * The layout cache contains the index of the paragraphs/tables - * at the top of every page, so it's possible to create - * the right count of pages and to distribute the document content - * to this pages before the formatting starts. - */ - -/*N*/ void SwLayoutCache::Read( SvStream &rStream ) -/*N*/ { -/*N*/ if( !pImpl ) -/*N*/ { -/*N*/ pImpl = new SwLayCacheImpl; -/*N*/ if( !pImpl->Read( rStream ) ) -/*N*/ { -/*?*/ delete pImpl; -/*?*/ pImpl = 0; -/*N*/ } -/*N*/ } -/*N*/ } - //----------------------------------------------------------------------------- /*N*/ void SwLayCacheImpl::Insert( USHORT nType, ULONG nIndex, xub_StrLen nOffset ) diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx index d93ea2be0..7b065f7c9 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 ); @@ -519,8 +517,6 @@ public: void CloseValuePos32( UINT32 ); // UINT32-Wert an Position eintragen ULONG BytesLeft(); // wie viele Bytes hat der Record noch? void CheckIoError( SvStream*); // korrekten E/A-Fehlercode setzen - static ByteString ConvertStringNoDbDelim( const String& rStr, - rtl_TextEncoding eSource ); static String ConvertStringNoDbDelim( const ByteString& rStr, rtl_TextEncoding eSource ); static ByteString ConvertStringNoDelim( const String& rStr, @@ -685,7 +681,6 @@ public: void OutNodeNum( const SwNodeNum& ); // O: Absatz-Numerierung void InEndNoteInfo( SwEndNoteInfo &rENInf ); // I: globale Endnoten-Info - void OutEndNoteInfo( const SwEndNoteInfo &rENInf ); // O: globale Endnoten-Info void InEndNoteInfo(); // I: globale Endnoten-Info void InFtnInfo(); // I: globale Fussnoten-Info void InFtnInfo40(); // I: globale Fussn.-Info 3.1/4.0 @@ -694,7 +689,6 @@ public: // SW3PAGE.CXX void InPageFtnInfo( SwPageFtnInfo& ); // I: Fussnoten-Info - void OutPageFtnInfo( const SwPageFtnInfo& rFtn ); void InPageDescs(); // I: alle Seitenvorlagen SwPageDesc* InPageDesc( USHORT& ); // I: Seitenvorlage void ConnectPageDescAttrs(); // I: PageDesc-Referenzen aufloesen diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx index 69417d8c6..9958ecb44 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; @@ -1644,12 +1633,6 @@ void Sw3StringPool::LoadOld( SvStream& r ) /*N*/ nExpFFVersion = 0; // um ungesetzte Version zu erkennen! /*N*/ } -/*N*/ ByteString Sw3IoImp::ConvertStringNoDbDelim( const String& rStr, -/*N*/ rtl_TextEncoding eSource ) -/*N*/ { -/*N*/ return ConvertStringNoDelim( rStr, DB_DELIM, '\xff', eSource ); -/*N*/ } -/*N*/ /*N*/ String Sw3IoImp::ConvertStringNoDbDelim( const ByteString& rStr, /*N*/ rtl_TextEncoding eSource ) /*N*/ { diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx index 52d459505..0d046ff37 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx @@ -1123,52 +1123,6 @@ void lcl_sw3io__copyNumRule( const SwNumRule& rSrc, SwNumRule& rDst ) /*N*/ rENInf.SetSuffix( sSuffix ); /*N*/ } - -// globale Fussnoten-Info ausgeben - -/*N*/ void Sw3IoImp::OutEndNoteInfo( const SwEndNoteInfo &rENInf ) -/*N*/ { -/*N*/ SwTxtFmtColl* pColl = rENInf.GetFtnTxtColl(); -/*N*/ USHORT nCollIdx = pColl ? aStringPool.Add( pColl->GetName(), -/*N*/ pColl->GetPoolFmtId() ) -/*N*/ : IDX_NO_VALUE; -/*N*/ -/*N*/ const SwPageDesc *pDesc = (const SwPageDesc *)rENInf.GetPageDescDep() -/*N*/ ->GetRegisteredIn(); -/*N*/ USHORT nPageIdx = pDesc ? aStringPool.Find( pDesc->GetName(), -/*N*/ pDesc->GetPoolFmtId() ) -/*N*/ : IDX_NO_VALUE; -/*N*/ -/*N*/ const SwCharFmt *pCharFmt = (const SwCharFmt *)rENInf.GetCharFmtDep() -/*N*/ ->GetRegisteredIn(); -/*N*/ USHORT nChrIdx = pCharFmt ? aStringPool.Find( pCharFmt->GetName(), -/*N*/ pCharFmt->GetPoolFmtId() ) -/*N*/ : IDX_NO_VALUE; -/*N*/ -/*N*/ BYTE nFlags = 0x09; // 9 bytes of data -/*N*/ pCharFmt = (const SwCharFmt *)rENInf.GetAnchorCharFmtDep()->GetRegisteredIn(); -/*N*/ USHORT nAnchorChrIdx = pCharFmt ? aStringPool.Find( pCharFmt->GetName(), -/*N*/ pCharFmt->GetPoolFmtId() ) -/*N*/ : IDX_NO_VALUE; -/*N*/ if( IDX_NO_VALUE != nAnchorChrIdx && nAnchorChrIdx != -/*N*/ ( rENInf.IsEndNoteInfo() ? RES_POOLCHR_FOOTNOTE_ANCHOR -/*N*/ : RES_POOLCHR_ENDNOTE_ANCHOR )) -/*N*/ nFlags += 0x12; -/*N*/ -/*N*/ *pStrm << nFlags -/*N*/ << (BYTE) rENInf.aFmt.GetNumberingType() -/*N*/ << (UINT16) nPageIdx -/*N*/ << (UINT16) nCollIdx -/*N*/ << (UINT16) rENInf.nFtnOffset -/*N*/ << (UINT16) nChrIdx; -/*N*/ -/*N*/ if( 0x10 & nFlags ) -/*N*/ *pStrm << (UINT16) nAnchorChrIdx; -/*N*/ -/*N*/ OutString( *pStrm, rENInf.GetPrefix() ); -/*N*/ OutString( *pStrm, rENInf.GetSuffix() ); -/*N*/ } - /*N*/ void Sw3IoImp::InEndNoteInfo() /*N*/ { /*N*/ OpenRec( SWG_ENDNOTEINFO ); diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx index fbf0da0f1..3cf1d8b76 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx @@ -88,22 +88,6 @@ namespace binfilter { /*N*/ Error(); /*N*/ } -// Fussnoten-Info ausgeben - -/*N*/ void Sw3IoImp::OutPageFtnInfo( const SwPageFtnInfo& rFtn ) -/*N*/ { -/*N*/ OpenRec( SWG_PAGEFOOTINFO ); -/*N*/ *pStrm << (INT32) rFtn.GetHeight() -/*N*/ << (INT32) rFtn.GetTopDist() -/*N*/ << (INT32) rFtn.GetBottomDist() -/*N*/ << (INT16) rFtn.GetAdj() -/*N*/ << (INT32) rFtn.GetWidth().GetNumerator() -/*N*/ << (INT32) rFtn.GetWidth().GetDenominator() -/*N*/ << (INT16) rFtn.GetLineWidth() -/*N*/ << rFtn.GetLineColor(); -/*N*/ CloseRec( SWG_PAGEFOOTINFO ); -/*N*/ } - /*N*/ void Sw3IoImp::InPageDescs() /*N*/ { /*N*/ if( Peek() != SWG_STRINGPOOL ) diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx index f74ea6396..125dd6140 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/bf_sw/source/core/tox/sw_tox.cxx b/binfilter/bf_sw/source/core/tox/sw_tox.cxx index 8d3e3c317..3e67e9afc 100644 --- a/binfilter/bf_sw/source/core/tox/sw_tox.cxx +++ b/binfilter/bf_sw/source/core/tox/sw_tox.cxx @@ -415,19 +415,6 @@ String lcl_GetAuthPattern(USHORT nTypeId) /*N*/ return nRet; /*N*/ } -/*N*/ String lcl_GetPattern( const String& rPattern, const sal_Char* pToken ) -/*N*/ { -/*N*/ String sRet; -/*N*/ String aSearch; aSearch.AssignAscii( pToken ); -/*N*/ aSearch.Erase( aSearch.Len() - 1, 1 ); -/*N*/ -/*N*/ xub_StrLen nEnd, nFound = rPattern.Search( aSearch ); -/*N*/ if( STRING_NOTFOUND != nFound && -/*N*/ STRING_NOTFOUND != ( nEnd = rPattern.Search( '>', nFound )) ) -/*N*/ sRet = rPattern.Copy( nFound, nEnd - nFound + 1 ); -/*N*/ return sRet; -/*N*/ } - void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; } { // the tab stop token looks like: <T ,,1234,0,.> <T> <T ,,1234> diff --git a/binfilter/inc/bf_basic/basmgr.hxx b/binfilter/inc/bf_basic/basmgr.hxx index a3bd2b1b7..cf9b4824a 100644 --- a/binfilter/inc/bf_basic/basmgr.hxx +++ b/binfilter/inc/bf_basic/basmgr.hxx @@ -152,7 +152,6 @@ private: void Init(); protected: - BOOL ImpStoreLibary( StarBASIC* pLib, SotStorage& rStorage ) const; BOOL ImpLoadLibary( BasicLibInfo* pLibInfo ) const; BOOL ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly = FALSE ) const; void ImpCreateStdLib( StarBASIC* pParentFromStdLib ); diff --git a/binfilter/inc/bf_sc/chgtrack.hxx b/binfilter/inc/bf_sc/chgtrack.hxx index a7821a237..fd6f3c324 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 2e16a575c..1288fa97d 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 f10511882..e31b47a80 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; @@ -153,8 +152,6 @@ public: { pColor = pCol; sColorName = rName; } const String& GetColorName() const { return sColorName; } - // new SYMBOLTYPE_CURRENCY in subformat? - BOOL HasNewCurrency() const; BOOL GetNewCurrencySymbol( String& rSymbol, String& rExtension ) const; void SaveNewCurrencyMap( SvStream& rStream ) const; void LoadNewCurrencyMap( SvStream& rStream ); @@ -227,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 9db895f32..81fed541d 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; } diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx index 2cffbe63c..f691a7b00 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 a73e7a19b..097e41358 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 d6fc7238d..aecadc4da 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(); diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index 7f70a4aa8..17c4b1944 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -32,6 +32,7 @@ #include <stdlib.h> #include <ctype.h> #include <stdio.h> +#include <cstring> #include "filterdetect.hxx" #include <osl/diagnose.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -43,7 +44,6 @@ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/xml/XImportFilter.hpp> #include <com/sun/star/xml/XExportFilter.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> @@ -91,11 +91,54 @@ using namespace com::sun::star::container; using namespace com::sun::star::uno; using namespace com::sun::star::beans; +namespace { -Reference< com::sun::star::frame::XModel > xModel; +bool isXMLStream(const ::rtl::OString& aHeaderStrm) +{ + const char* p = aHeaderStrm.getStr(); + size_t n = aHeaderStrm.getLength(); + size_t i = 0; -::rtl::OUString SAL_CALL supportedByType( const ::rtl::OUString clipBoardFormat , const ::rtl::OString resultString, const ::rtl::OUString checkType); + // Skip all preceding blank characters. + for (i = 0; i < n; ++i, ++p) + { + sal_Char c = *p; + if (c == ' ' || c == '\n' || c == '\t') + continue; + break; + } + n -= i; + + // First text must be '<?xml', else it's not a valid XML file stream. + const char* sInitChars = "<?xml"; + const size_t nInitCharLen = std::strlen(sInitChars); + for (i = 0; i < n; ++i, ++p) + { + if (i < nInitCharLen) + { + if (*p != sInitChars[i]) + return false; + } + } + return true; +} + +::rtl::OUString supportedByType( const ::rtl::OUString clipBoardFormat , const ::rtl::OString resultString, const ::rtl::OUString checkType) +{ + ::rtl::OUString sTypeName; + if ( clipBoardFormat.match(OUString(RTL_CONSTASCII_USTRINGPARAM("doctype:"))) ) + { + ::rtl::OString tryStr = ::rtl::OUStringToOString(clipBoardFormat.copy(8),RTL_TEXTENCODING_ASCII_US).getStr(); + if (resultString.indexOf(tryStr) >= 0) + { + sTypeName = checkType; + } + } + return sTypeName; +} + +} ::rtl::OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aArguments ) throw( com::sun::star::uno::RuntimeException ) { @@ -145,6 +188,11 @@ Reference< com::sun::star::frame::XModel > xModel; long bytestRead =xInStream->readBytes (aData, 4000); resultString=::rtl::OString((const sal_Char *)aData.getConstArray(),bytestRead) ; + if (!isXMLStream(resultString)) + // This is not an XML stream. It makes no sense to try to detect + // a non-XML file type here. + return ::rtl::OUString(); + // test typedetect code Reference <XNameAccess> xTypeCont(mxMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ))),UNO_QUERY); Sequence < ::rtl::OUString > myTypes= xTypeCont->getElementNames(); @@ -189,23 +237,6 @@ Reference< com::sun::star::frame::XModel > xModel; return sTypeName; } - - -::rtl::OUString SAL_CALL supportedByType( const ::rtl::OUString clipBoardFormat , const ::rtl::OString resultString, const ::rtl::OUString checkType) -{ - - ::rtl::OUString sTypeName; - if((clipBoardFormat.match(OUString( RTL_CONSTASCII_USTRINGPARAM( "doctype:" ))))) - { - ::rtl::OString tryStr = ::rtl::OUStringToOString(clipBoardFormat.copy(8),RTL_TEXTENCODING_ASCII_US).getStr(); - if (resultString.indexOf(tryStr) >= 0) - { - sTypeName = checkType; - } - } - return sTypeName; -} - // XInitialization void SAL_CALL FilterDetect::initialize( const Sequence< Any >& aArguments ) diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk index 176560d79..ca63541d8 100644 --- a/writerfilter/Library_resourcemodel.mk +++ b/writerfilter/Library_resourcemodel.mk @@ -71,7 +71,11 @@ $(eval $(call gb_Library_add_exception_objects,resourcemodel,\ $(eval $(call gb_Library_add_generated_exception_objects,resourcemodel,\ CustomTarget/writerfilter/source/sprmcodetostr \ +)) + +$(eval $(call gb_Library_add_generated_cxxobjects,resourcemodel,\ CustomTarget/writerfilter/source/qnametostr \ + , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) # vim: set noet sw=4 ts=4: |