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

Noel Grandin noel at peralex.com
Mon Jan 25 06:02:17 PST 2016


 fpicker/source/win32/filepicker/FilePicker.cxx                  |    2 +-
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx |    2 +-
 fpicker/source/win32/filepicker/asynceventnotifier.cxx          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

    more Windows build fixes
    
    after my OInterfaceContainerHelper2 change
    
    Change-Id: Id63fd81643b030e0570f00d6e0506cb8ea5d3742

diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 2e4af6f..7291429 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -179,7 +179,7 @@ OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
 {
     OUString aHelpText;
 
-    ::comphelper::OInterfaceContainerHelper2* pICHelper =
+    ::cppu::OInterfaceContainerHelper* pICHelper =
         rBHelper.getContainer( cppu::UnoType<XFilePickerListener>::get());
 
     if (pICHelper)
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 228e5fe..dffa6a3 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -302,7 +302,7 @@ void VistaFilePickerEventHandler::impl_sendEvent(  EEventType eEventType,
 {
     static AsyncRequests aNotify(RequestHandlerRef(new AsyncPickerEvents()));
 
-    ::comphelper::OInterfaceContainerHelper2* pContainer = m_lListener.getContainer( cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get());
+    ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer( cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get());
     if ( ! pContainer)
         return;
 
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 1f71602..8ec5462 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -263,7 +263,7 @@ void SAL_CALL CAsyncEventNotifier::run()
                 std::unique_ptr<CEventNotification> EventNotification(getNextEventRecord());
                 removeNextEventRecord();
 
-                ::comphelper::OInterfaceContainerHelper2* pICHelper =
+                ::cppu::OInterfaceContainerHelper* pICHelper =
                     m_rBroadcastHelper.getContainer(cppu::UnoType<XFilePickerListener>::get());
 
                 if (pICHelper)


More information about the Libreoffice-commits mailing list