sfx2/inc/sfx2/docfile.hxx | 1 - sfx2/source/doc/docfile.cxx | 11 ----------- sfx2/source/doc/objmisc.cxx | 12 ------------ 3 files changed, 24 deletions(-)
New commits: commit 07c1dac0d8844b48290bac4b55c055cc897e61af Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Wed Jul 25 16:41:45 2012 -0400 Likewise, CharSet was set in SfxMedium but never used. Removing. Change-Id: Ie7e6564ab1efa855df0202b88b7ff80ec71b8cb5 diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index abf61a0..b4da325 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -201,7 +201,6 @@ public: ::rtl::OUString SwitchDocumentToTempFile(); sal_Bool SwitchDocumentToFile( ::rtl::OUString aURL ); - void SetCharset( ::rtl::OUString ); ::rtl::OUString GetBaseURL( bool bForSaving=false ); #if _SOLAR__PRIVATE diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index e8534ad..d6a0864 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -254,7 +254,6 @@ public: bool bIsStorage:1; bool bUseInteractionHandler:1; bool bAllowDefaultIntHdl:1; - bool bIsCharsetInitialized:1; bool bDisposeStorage:1; bool bStorageBasedOnInStream:1; bool m_bSalvageMode:1; @@ -305,7 +304,6 @@ public: uno::Reference< io::XStream > m_xLockingStream; sal_uInt32 nLastStorageError; - ::rtl::OUString aCharset; ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > xInteraction; @@ -336,7 +334,6 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) : bIsStorage( false ), bUseInteractionHandler( true ), bAllowDefaultIntHdl( false ), - bIsCharsetInitialized( false ), bStorageBasedOnInStream( false ), m_bSalvageMode( false ), m_bVersionsAlreadyLoaded( false ), @@ -3070,8 +3067,6 @@ SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl() if ( GetContent().is() ) { - pImp->bIsCharsetInitialized = true; - try { Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString("MediaType") ); @@ -3414,12 +3409,6 @@ void SfxMedium::CreateTempFileNoCopy() CloseStorage(); } -void SfxMedium::SetCharset( ::rtl::OUString aChs ) -{ - pImp->bIsCharsetInitialized = true; - pImp->aCharset = aChs; -} - sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::OUString& aODFVersion, sal_Bool bHasValidDocumentSignature ) { bool bChanges = false; diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 5aa85a2..8eada23 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1668,18 +1668,6 @@ void SfxHeaderAttributes_Impl::SetAttribute( const SvKeyValue& rKV ) pDoc->GetMedium()->SetExpired_Impl( Date( 1, 1, 1970 ) ); } } - else if( rKV.GetKey().CompareIgnoreCaseToAscii( "content-type" ) == COMPARE_EQUAL ) - { - String sType, sSubType; - INetContentTypeParameterList aParameters; - - if (INetContentTypes::parse(aValue, sType, sSubType, &aParameters)) - { - const INetContentTypeParameter * pCharset = aParameters.find("charset"); - if (pCharset != 0) - pDoc->GetMedium()->SetCharset( pCharset->m_sValue ); - } - } } void SfxHeaderAttributes_Impl::Append( const SvKeyValue& rKV ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits