diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-12-21 15:38:10 +0100 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-12-22 16:36:59 +0100 |
commit | 0c3d5fb0ad35ff7fc18917fc86fa58d9312fe3ae (patch) | |
tree | 76d111797e5a546bd87d0179269f6859c18ae944 /embeddedobj | |
parent | ce6f9cbb5f46921ba6670c0b057463d61d05d46e (diff) |
bnc#822341: PPTX export of embedded text documents
-Make embedded text documents exported by analogy with spreadsheet
embedded documents.
-Convert MS ole objects to LO sepcific objecst to allow
exporting those ole objects too.
Plus use gb_CppunitTest_use_rdb instead of wasting time on
finding out which missing components cause test failing.
Especcially when we have platform dependent components
(e.g. related to embedded object)
Change-Id: Ic76d659b51274777a1669c215344a1169ebcba81
Diffstat (limited to 'embeddedobj')
-rw-r--r-- | embeddedobj/source/msole/oleembed.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index 7bce91d12cb8..ca8b73187b29 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -587,6 +587,17 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState ) } } else +#else + // if it is possible, the object will be converted to OOo format + if ( !m_bTriedConversion ) + { + m_bTriedConversion = true; + if ( TryToConvertToOOo() ) + { + changeState( nNewState ); + return; + } + } #endif { throw embed::UnreachableStateException(); |