embeddedobj/source/commonembedding/persistence.cxx | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
New commits:
commit 06b4b58f52c32af535bc1692e7dbc0e5ee561b9d
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon May 6 10:47:20 2013 +0300
No need for conditionality has been turned on since 2004
Change-Id: I0e1708f1102dab8e0424d12b50da25f726e8a5f6
diff --git a/embeddedobj/source/commonembedding/persistence.cxx
b/embeddedobj/source/commonembedding/persistence.cxx
index ca43e92..8e9cb80 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -56,8 +56,6 @@
#include <tools/diagnose_ex.h>
-#define USE_STORAGEBASED_DOCUMENT
-
using namespace ::com::sun::star;
@@ -259,7 +257,6 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const
uno::Reference< embed::X
m_xParentStorage = xNewParentStorage;
m_aEntryName = aNewName;
-#ifdef USE_STORAGEBASED_DOCUMENT
// the linked document should not be switched
if ( !m_bIsLink )
{
@@ -267,7 +264,6 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const
uno::Reference< embed::X
if ( xDoc.is() )
SwitchDocToStorage_Impl( xDoc, m_xObjectStorage );
}
-#endif
try {
if ( xComponent.is() )
@@ -494,11 +490,7 @@ uno::Reference< util::XCloseable >
OCommonEmbeddedObject::LoadDocumentFromStorag
}
uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY );
- uno::Reference< document::XStorageBasedDocument > xDoc
-#ifdef USE_STORAGEBASED_DOCUMENT
- ( xDocument, uno::UNO_QUERY )
-#endif
- ;
+ uno::Reference< document::XStorageBasedDocument > xDoc( xDocument,
uno::UNO_QUERY );
if ( !xDoc.is() && !xLoadable.is() ) ///BUG: This should be || instead of
&& ?
throw uno::RuntimeException();
@@ -744,7 +736,6 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const
uno::Reference< embed:
if ( !xStorage.is() )
throw uno::RuntimeException(); // TODO:
-#ifdef USE_STORAGEBASED_DOCUMENT
uno::Reference< document::XStorageBasedDocument > xDoc;
{
osl::MutexGuard aGuard( m_aMutex );
@@ -773,7 +764,6 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const
uno::Reference< embed:
SwitchDocToStorage_Impl( xDoc, xStorage );
}
else
-#endif
{
// store document to temporary stream based on temporary file
uno::Reference < io::XInputStream > xTempIn =
StoreDocumentToTempStream_Impl( nStorageFormat, aBaseURL, aHierarchName );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
