diff options
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/doc/docglos.cxx | 10 | ||||
| -rw-r--r-- | sw/source/filter/basflt/iodetect.cxx | 45 | ||||
| -rw-r--r-- | sw/source/uibase/app/docst.cxx | 2 |
3 files changed, 1 insertions, 56 deletions
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx index 150783227f05..9b61f83c5e99 100644 --- a/sw/source/core/doc/docglos.cxx +++ b/sw/source/core/doc/docglos.cxx @@ -78,16 +78,6 @@ void SwDoc::ReplaceUserDefinedDocumentProperties( } } -void SwDoc::ReplaceUserDefinedDocumentProperties(const SwDoc& rSource) -{ - uno::Reference<document::XDocumentPropertiesSupplier> xSourceDPS( - rSource.GetDocShell()->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference<document::XDocumentProperties> xSourceDocProps( - xSourceDPS->getDocumentProperties() ); - - ReplaceUserDefinedDocumentProperties( xSourceDocProps ); -} - void SwDoc::ReplaceDocumentProperties(const SwDoc& rSource, bool mailMerge) { uno::Reference<document::XDocumentPropertiesSupplier> xSourceDPS( diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index c97cdc0472bb..bd3876f81466 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -48,51 +48,6 @@ SwIoDetect aFilterDetect[] = SwIoDetect( FILTER_TEXT ) }; -OUString SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_) const -{ - // Filter recognition - struct W1_FIB - { - SVBT16 wIdent; // 0x0 int magic number - SVBT16 nFib; // 0x2 FIB version written - SVBT16 nProduct; // 0x4 product version written by - SVBT16 nlocale; // 0x6 language stamp---localized version; - SVBT16 pnNext; // 0x8 - SVBT16 fFlags; - - sal_uInt16 nFibGet() { return SVBT16ToShort(nFib); } - sal_uInt16 wIdentGet() { return SVBT16ToShort(wIdent); } - sal_uInt16 fFlagsGet() { return SVBT16ToShort(fFlags); } - // SVBT16 fComplex :1;// 0004 when 1, file is in complex, fast-saved format. - bool fComplexGet() { return static_cast< bool >((fFlagsGet() >> 2) & 1); } - }; - - bool bRet = false; - if ( sHTML == sName ) - bRet = HTMLParser::IsHTMLFormat( pHeader, true, RTL_TEXTENCODING_DONTKNOW ); - else if ( FILTER_RTF == sName ) - bRet = 0 == strncmp( "{\\rtf", pHeader, 5 ); - else if ( sWW5 == sName ) - { - W1_FIB *pW1Header = (W1_FIB*)pHeader; - if (pW1Header->wIdentGet() == 0xA5DC && pW1Header->nFibGet() == 0x65) - bRet = true; /*WW5*/ - else if (pW1Header->wIdentGet() == 0xA5DB && pW1Header->nFibGet() == 0x2D) - bRet = true; /*WW2*/ - } - else if ( sWW1 == sName ) - { - bRet = (( ((W1_FIB*)pHeader)->wIdentGet() == 0xA59C - && ((W1_FIB*)pHeader)->nFibGet() == 0x21) - && ((W1_FIB*)pHeader)->fComplexGet() == false); - } - else if ( FILTER_TEXT == sName ) - bRet = SwIoSystem::IsDetectableText(pHeader, nLen_); - else if ( FILTER_TEXT_DLG == sName) - bRet = SwIoSystem::IsDetectableText( pHeader, nLen_, 0, 0, 0, true); - return bRet ? sName : OUString(); -} - const OUString SwIoSystem::GetSubStorageName( const SfxFilter& rFltr ) { // for StorageFilters also set the SubStorageName diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index b8413cd0da12..8307399540e2 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -113,7 +113,7 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) SfxUInt16Item* pFamilyItem = dynamic_cast<SfxUInt16Item*>(pItem); if (pFamilyItem) { - nActualFamily = static_cast<sal_uInt16>(SfxTemplateDialog::NIdToSfxFamilyId(pFamilyItem->GetValue())); + nActualFamily = static_cast<sal_uInt16>(SfxTemplate::NIdToSfxFamilyId(pFamilyItem->GetValue())); } delete pItem; } |