diff -urN ooo_DEV300_m6_src.orig/fpicker/source/win32/filepicker/FPentry.cxx ooo_DEV300_m6_src/fpicker/source/win32/filepicker/FPentry.cxx --- ooo_DEV300_m6_src.orig/fpicker/source/win32/filepicker/FPentry.cxx 2008-04-10 12:25:08.000000000 +0200 +++ ooo_DEV300_m6_src/fpicker/source/win32/filepicker/FPentry.cxx 2008-04-10 12:28:52.000000000 +0200 @@ -61,7 +61,8 @@ #endif #pragma warning (disable:4917) -#include "VistaFilePicker.hxx" +// PJ hack: do not include Vista header +// #include "VistaFilePicker.hxx" #include "..\misc\WinImplHelper.hxx" #include @@ -86,6 +87,7 @@ const Reference< XMultiServiceFactory >& rServiceManager ) { Reference< XInterface > xDlg; +/* PJ hack: we do not build Windows Vista dialogs at all... bool bVista = IsWindowsVista(); if (bVista) @@ -97,11 +99,12 @@ } else { +*/ fprintf(stdout, "use normal system file picker ...\n"); xDlg.set( static_cast< XFilePicker2* >( new CFilePicker( rServiceManager ) ) ); - } +// } return xDlg; } diff -urN ooo_DEV300_m6_src.orig/fpicker/source/win32/filepicker/FileOpenDlg.cxx ooo_DEV300_m6_src/fpicker/source/win32/filepicker/FileOpenDlg.cxx --- ooo_DEV300_m6_src.orig/fpicker/source/win32/filepicker/FileOpenDlg.cxx 2008-04-10 12:25:08.000000000 +0200 +++ ooo_DEV300_m6_src/fpicker/source/win32/filepicker/FileOpenDlg.cxx 2008-04-10 12:27:47.000000000 +0200 @@ -129,6 +129,11 @@ m_ofn.lStructSize = _OPENFILENAME_SIZE_VERSION_400; } +// PJ hack: define missing define... +#ifndef OFN_DONTADDTORECENT + #define OFN_DONTADDTORECENT 0x02000000 +#endif + // 0x02000000 for #97681, sfx will make the entry into // the recent document list m_ofn.Flags |= dwFlags | diff -urN ooo_DEV300_m6_src.orig/fpicker/source/win32/filepicker/makefile.mk ooo_DEV300_m6_src/fpicker/source/win32/filepicker/makefile.mk --- ooo_DEV300_m6_src.orig/fpicker/source/win32/filepicker/makefile.mk 2008-04-10 12:25:08.000000000 +0200 +++ ooo_DEV300_m6_src/fpicker/source/win32/filepicker/makefile.mk 2008-04-10 12:27:11.000000000 +0200 @@ -82,10 +82,12 @@ $(SLO)$/customcontrolcontainer.obj\ $(SLO)$/customcontrolfactory.obj\ $(SLO)$/dialogcustomcontrols.obj\ - $(SLO)$/asyncrequests.obj\ - $(SLO)$/VistaFilePickerEventHandler.obj\ - $(SLO)$/VistaFilePickerImpl.obj\ - $(SLO)$/VistaFilePicker.obj + $(SLO)$/asyncrequests.obj + +# PJ hack: do not build Windows Vista dialogs for now... +# $(SLO)$/VistaFilePickerEventHandler.obj\ +# $(SLO)$/VistaFilePickerImpl.obj\ +# $(SLO)$/VistaFilePicker.obj # --- Targets ------------------------------------------------------