incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1172092 - /incubator/ooo/trunk/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
Date Sat, 17 Sep 2011 22:34:45 GMT
Author: mst
Date: Sat Sep 17 22:34:44 2011
New Revision: 1172092

URL: http://svn.apache.org/viewvc?rev=1172092&view=rev
Log:
mingwport35: i#117796: Modification to fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
needs fix in MinGW

# HG changeset patch
# User tono@openoffice.org
# Date 1302529689 -32400
# Node ID 319be9ae99cb27a1809663dfee2fcd9d808a2196
# Parent  5289cfd4bbf8db759d425b40c8f815b12586bdee

Modified:
    incubator/ooo/trunk/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx

Modified: incubator/ooo/trunk/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx?rev=1172092&r1=1172091&r2=1172092&view=diff
==============================================================================
--- incubator/ooo/trunk/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx (original)
+++ incubator/ooo/trunk/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx Sat Sep
17 22:34:44 2011
@@ -703,7 +703,7 @@ void VistaFilePickerImpl::impl_sta_SetDi
 
     ComPtr< IShellItem > pFolder;
 #ifdef __MINGW32__
-    HRESULT hResult = SHCreateItemFromParsingName ( reinterpret_cast<LPCTSTR>(sDirectory.getStr()),
NULL, IID_IShellItem, (void**)(&pFolder) );
+    HRESULT hResult = SHCreateItemFromParsingName ( reinterpret_cast<LPCTSTR>(sDirectory.getStr()),
NULL, IID_IShellItem, reinterpret_cast<void**>(&pFolder) );
 #else
     HRESULT hResult = SHCreateItemFromParsingName ( sDirectory, NULL, IID_PPV_ARGS(&pFolder)
);
 #endif
@@ -893,7 +893,7 @@ void VistaFilePickerImpl::impl_sta_ShowD
 	{
 		ComPtr< IShellItem > pFolder;
 		#ifdef __MINGW32__
-			HRESULT hResult = SHCreateItemFromParsingName ( reinterpret_cast<LPCTSTR>(m_sDirectory.getStr()),
NULL, IID_IShellItem, (void**)(&pFolder) );
+			HRESULT hResult = SHCreateItemFromParsingName ( reinterpret_cast<LPCTSTR>(m_sDirectory.getStr()),
NULL, IID_IShellItem, reinterpret_cast<void**>(&pFolder) );
 		#else
 			HRESULT hResult = SHCreateItemFromParsingName ( m_sDirectory, NULL, IID_PPV_ARGS(&pFolder)
);
 		#endif
@@ -1214,7 +1214,11 @@ static void impl_refreshFileDialog( TFil
 	     SUCCEEDED(iDialog->SetFileName(L"*.*")) )
 	{
 		IOleWindow* iOleWindow;
+#ifdef __MINGW32__
+		if (SUCCEEDED(iDialog->QueryInterface(IID_IOleWindow, reinterpret_cast<void**>(&iOleWindow))))
+#else
 		if (SUCCEEDED(iDialog->QueryInterface(IID_PPV_ARGS(&iOleWindow))))
+#endif
 		{
 			HWND hwnd;
 			if (SUCCEEDED(iOleWindow->GetWindow(&hwnd)))



Mime
View raw message