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

[Noel Grandin]

 dtrans/source/win32/clipb/WinClipboard.cxx |    2 +-
 dtrans/source/win32/dnd/sourcecontext.cxx  |    4 ++--
 dtrans/source/win32/dnd/target.cxx         |   10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 47b586380ec72a41d7b701a3f3da1f5b053f4762
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Jan 25 10:23:46 2016 +0200

    fix Windows build
    
    by reverting part of commit
    commit 752cd07d085ac0aadc99bd512d49072843139032
    "InterfaceContainer2 with vector instead of Sequence"
    
    Change-Id: I69782899ce21fb48f6e77439bee7c7acdb0b4c41

diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index b8c83e9..3deada7 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -189,7 +189,7 @@ void SAL_CALL CWinClipboard::notifyAllClipboardListener( )
         {
             aGuard.clear( );
 
-            OInterfaceContainerHelper2* pICHelper = rBHelper.aLC.getContainer(
+            OInterfaceContainerHelper* pICHelper = rBHelper.aLC.getContainer(
                 cppu::UnoType<XClipboardListener>::get());
 
             if ( pICHelper )
diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx
index 03ef66a..84e54da 100644
--- a/dtrans/source/win32/dnd/sourcecontext.cxx
+++ b/dtrans/source/win32/dnd/sourcecontext.cxx
@@ -94,7 +94,7 @@ void SourceContext::fire_dragDropEnd( sal_Bool success, sal_Int8 effect)
     e.DragSourceContext= static_cast<XDragSourceContext*>( this);
     e.Source.set( static_cast<XDragSourceContext*>( this), UNO_QUERY);
 
-    OInterfaceContainerHelper2* pContainer= rBHelper.getContainer(
+    OInterfaceContainerHelper* pContainer= rBHelper.getContainer(
         cppu::UnoType<XDragSourceListener>::get());
 
     if( pContainer)
@@ -121,7 +121,7 @@ void SourceContext::fire_dropActionChanged( sal_Int8 dropAction, sal_Int8 userAc
         e.DragSourceContext= static_cast<XDragSourceContext*>( this);
         e.Source.set( static_cast<XDragSourceContext*>( this), UNO_QUERY);
 
-        OInterfaceContainerHelper2* pContainer= rBHelper.getContainer(
+        OInterfaceContainerHelper* pContainer= rBHelper.getContainer(
             cppu::UnoType<XDragSourceListener>::get());
 
         if( pContainer)
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index dccbe88..d7247f9 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -488,7 +488,7 @@ HRESULT DropTarget::Drop( IDataObject  * /*pDataObj*/,
 
 void DropTarget::fire_drop( const DropTargetDropEvent& dte)
 {
-    OInterfaceContainerHelper2* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get());
+    OInterfaceContainerHelper* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get());
     if( pContainer)
     {
         OInterfaceIteratorHelper iter( *pContainer);
@@ -502,7 +502,7 @@ void DropTarget::fire_drop( const DropTargetDropEvent& dte)
 
 void DropTarget::fire_dragEnter( const DropTargetDragEnterEvent& e )
 {
-    OInterfaceContainerHelper2* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get());
+    OInterfaceContainerHelper* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get());
     if( pContainer)
     {
         OInterfaceIteratorHelper iter( *pContainer);
@@ -516,7 +516,7 @@ void DropTarget::fire_dragEnter( const DropTargetDragEnterEvent& e )
 
 void DropTarget::fire_dragExit( const DropTargetEvent& dte )
 {
-    OInterfaceContainerHelper2* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get());
+    OInterfaceContainerHelper* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get());
 
     if( pContainer)
     {
@@ -531,7 +531,7 @@ void DropTarget::fire_dragExit( const DropTargetEvent& dte )
 
 void DropTarget::fire_dragOver( const DropTargetDragEvent& dtde )
 {
-    OInterfaceContainerHelper2* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get());
+    OInterfaceContainerHelper* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get());
     if( pContainer)
     {
         OInterfaceIteratorHelper iter( *pContainer );
@@ -545,7 +545,7 @@ void DropTarget::fire_dragOver( const DropTargetDragEvent& dtde )
 
 void DropTarget::fire_dropActionChanged( const DropTargetDragEvent& dtde )
 {
-    OInterfaceContainerHelper2* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get());
+    OInterfaceContainerHelper* pContainer= rBHelper.getContainer( cppu::UnoType<XDropTargetListener>::get());
     if( pContainer)
     {
         OInterfaceIteratorHelper iter( *pContainer);