From 0c3d5fb0ad35ff7fc18917fc86fa58d9312fe3ae Mon Sep 17 00:00:00 2001
From: Zolnai Tamás <tamas.zolnai@collabora.com>
Date: Sun, 21 Dec 2014 15:38:10 +0100
Subject: 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
---
 embeddedobj/source/msole/oleembed.cxx | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'embeddedobj')

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();
-- 
cgit