mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need for conditionality has been turned on since 2004

Browse Source 
Change-Id: I0e1708f1102dab8e0424d12b50da25f726e8a5f6
This commit is contained in:
Tor Lillqvist
2013-05-06 10:47:20 +03:00
parent 3155a8e60f
commit 06b4b58f52
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
embeddedobj/source/commonembedding/persistence.cxx
View File

@@ -56,8 +56,6 @@
#include <tools/diagnose_ex.h> #include <tools/diagnose_ex.h>
#define USE_STORAGEBASED_DOCUMENT
using namespace ::com::sun::star; using namespace ::com::sun::star;
@@ -259,7 +257,6 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X
m_xParentStorage = xNewParentStorage; m_xParentStorage = xNewParentStorage;
m_aEntryName = aNewName; m_aEntryName = aNewName;
#ifdef USE_STORAGEBASED_DOCUMENT
// the linked document should not be switched // the linked document should not be switched
if ( !m_bIsLink ) if ( !m_bIsLink )
{ {
@@ -267,7 +264,6 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X
if ( xDoc.is() ) if ( xDoc.is() )
SwitchDocToStorage_Impl( xDoc, m_xObjectStorage ); SwitchDocToStorage_Impl( xDoc, m_xObjectStorage );
} }
#endif
try { try {
if ( xComponent.is() ) if ( xComponent.is() )
@@ -494,11 +490,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag
} }
uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY ); uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY );
uno::Reference< document::XStorageBasedDocument > xDoc uno::Reference< document::XStorageBasedDocument > xDoc( xDocument, uno::UNO_QUERY );
#ifdef USE_STORAGEBASED_DOCUMENT
( xDocument, uno::UNO_QUERY )
#endif
;
if ( !xDoc.is() && !xLoadable.is() ) ///BUG: This should be || instead of && ? if ( !xDoc.is() && !xLoadable.is() ) ///BUG: This should be || instead of && ?
throw uno::RuntimeException(); throw uno::RuntimeException();
@@ -744,7 +736,6 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed:
if ( !xStorage.is() ) if ( !xStorage.is() )
throw uno::RuntimeException(); // TODO: throw uno::RuntimeException(); // TODO:
#ifdef USE_STORAGEBASED_DOCUMENT
uno::Reference< document::XStorageBasedDocument > xDoc; uno::Reference< document::XStorageBasedDocument > xDoc;
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
@@ -773,7 +764,6 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed:
SwitchDocToStorage_Impl( xDoc, xStorage ); SwitchDocToStorage_Impl( xDoc, xStorage );
} }
else else
#endif
{ {
// store document to temporary stream based on temporary file // store document to temporary stream based on temporary file
uno::Reference < io::XInputStream > xTempIn = StoreDocumentToTempStream_Impl( nStorageFormat, aBaseURL, aHierarchName ); uno::Reference < io::XInputStream > xTempIn = StoreDocumentToTempStream_Impl( nStorageFormat, aBaseURL, aHierarchName );