[Libreoffice-commits] core.git: embeddedobj/source

[Stephan Bergmann]

 embeddedobj/source/msole/oleembed.cxx    |    6 ++++--
 embeddedobj/source/msole/olemisc.cxx     |   22 ++++++++++++++++------
 embeddedobj/source/msole/olepersist.cxx  |    5 ++++-
 embeddedobj/source/msole/oleregister.cxx |    3 +++
 embeddedobj/source/msole/olevisual.cxx   |    6 +++++-
 5 files changed, 32 insertions(+), 10 deletions(-)

New commits:
commit e74a09929d4771972913a3ebcdd6df042f871fca
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 27 12:51:43 2014 +0100

    Exclude WNT-specific includes on other platforms
    
    Change-Id: I7eeae61275269e09092267f2a6ccb27d7bb91ddb

diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 244c543..fe21086 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -50,10 +50,12 @@
 
 #include <targetstatecontrol.hxx>
 
-#include <olecomponent.hxx>
-
 #include "ownview.hxx"
 
+#if defined WNT
+#include <olecomponent.hxx>
+#endif
+
 using namespace ::com::sun::star;
 
 #ifdef WNT
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index ee5b9b7..9215e10 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <cassert>
+
 #include <com/sun/star/embed/EmbedUpdateModes.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -25,10 +29,13 @@
 #include <cppuhelper/interfacecontainer.h>
 
 #include <oleembobj.hxx>
-#include <olecomponent.hxx>
 
 #include "ownview.hxx"
 
+#if defined WNT
+#include <olecomponent.hxx>
+#endif
+
 using namespace ::com::sun::star;
 
 sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory );
@@ -380,14 +387,17 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
-    if ( !m_pOleComponent )
+#if defined WNT
+    if (m_pOleComponent != 0)
     {
-        // TODO/LATER: Is it correct???
-        return uno::Reference< util::XCloseable >();
-        // throw uno::RuntimeException(); // TODO
+        return uno::Reference< util::XCloseable >( static_cast< ::cppu::OWeakObject* >( m_pOleComponent ), uno::UNO_QUERY );
     }
+#endif
 
-    return uno::Reference< util::XCloseable >( static_cast< ::cppu::OWeakObject* >( m_pOleComponent ), uno::UNO_QUERY );
+    assert(m_pOleComponent == 0);
+    // TODO/LATER: Is it correct???
+    return uno::Reference< util::XCloseable >();
+    // throw uno::RuntimeException(); // TODO
 }
 
 
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index e3c17be..915a89a 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -43,9 +43,12 @@
 #include <comphelper/classids.hxx>
 #include <osl/thread.hxx>
 
-#include <olecomponent.hxx>
 #include <closepreventer.hxx>
 
+#if defined WNT
+#include <olecomponent.hxx>
+#endif
+
 using namespace ::com::sun::star;
 using namespace ::comphelper;
 
diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index c9bca29..d983f4b 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -22,7 +22,10 @@
 #include <cppuhelper/factory.hxx>
 
 #include "xolefactory.hxx"
+
+#if defined WNT
 #include "xdialogcreator.hxx"
+#endif
 
 using namespace ::com::sun::star;
 
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 0e56fd1..76ed05d 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -26,10 +26,14 @@
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 
 #include <oleembobj.hxx>
-#include <olecomponent.hxx>
+//#include <olecomponent.hxx>
 #include <comphelper/mimeconfighelper.hxx>
 #include <comphelper/seqstream.hxx>
 
+#if defined WNT
+#include <olecomponent.hxx>
+#endif
+
 using namespace ::com::sun::star;
 using namespace ::comphelper;