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

Noel Grandin noel at peralex.com
Mon Jan 25 05:26:35 PST 2016


 embeddedobj/source/msole/olecomponent.cxx |    4 ++--
 embeddedobj/source/msole/olemisc.cxx      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c2a8ee9c56effec1476556f4c1a820fb985ef35c
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Jan 25 15:25:25 2016 +0200

    more Windows build fixes
    
    after my OInterfaceContainer2 change
    
    Change-Id: I4adb4a1937c12c1f6cb9183d567afb729d4e78ea

diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index 9149219..6a7b9e4 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -1437,7 +1437,7 @@ void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
 
     if ( m_pInterfaceContainer )
     {
-        ::comphelper::OInterfaceContainerHelper2* pContainer =
+        ::cppu::OInterfaceContainerHelper* pContainer =
             m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != NULL )
         {
@@ -1729,7 +1729,7 @@ void SAL_CALL OleComponent::setModified( sal_Bool bModified )
 
     if ( bModified && m_pInterfaceContainer )
     {
-        ::comphelper::OInterfaceContainerHelper2* pContainer =
+        ::cppu::OInterfaceContainerHelper* pContainer =
             m_pInterfaceContainer->getContainer( cppu::UnoType<util::XModifyListener>::get());
         if ( pContainer != NULL )
         {
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 1abc8f1..9fdeb18 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -190,7 +190,7 @@ void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sa
 {
     if ( m_pInterfaceContainer )
     {
-        ::comphelper::OInterfaceContainerHelper2* pContainer = m_pInterfaceContainer->getContainer(
+        ::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer(
                             cppu::UnoType<embed::XStateChangeListener>::get());
         if ( pContainer != NULL )
         {


More information about the Libreoffice-commits mailing list