*** Issue 77577 has been marked as a duplicate of this issue. ***

keyword

Hi,

- please remove fprintf's from generic code (fpicker/source/generic/fpicker.cxx)

- does this

+	else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("macosx") || 
aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("applex11"))
+		return OUString (RTL_CONSTASCII_USTRINGPARAM 
("com.sun.star.ui.dialogs.AquaFolderPicker"));

mean that it is turned on for X11 as well?

- extra whitespace/tabs cleanup please :-)

- is -framework Carbon needed in fpicker/source/aqua/makefile.mk? Can't you use TARGETTYPE=GUI 
insted?

- this

+        <author>Pavel JanĂ­k, Florian Heckl</author>

should read

+        <author>Florian Heckl, Pavel JanĂ­k</author>

because of both merits and alphabet ;-) Maybe there should be something more generic like 
OpenOffice.org...

Florian, where are you with code review ? 

I think it's time to integrate aquafilepicker01, and fix residual bugs in next cws, like aquafilepicker02 ..etc

Hi Pavel,

I think I found most of your places for cleanup.
I also removed the X11 part ( || 
aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("applex11"))) since we will not support X11 version with 
native filepicker right now.

Florian: thanks. I'm reviewing it now again.

You have changed the tabs/spaces indentation in fpicker/source/generic/fpicker.cxx thus the changes 
are hardly readable. When I used -w in my diff scripts, the changes in this file are very simple - can you 
please redo it so the file contains only these two little changes (adding else if cases)?

Please also do not remove this:

--- ooo_SRC680_m211_src.orig/fpicker/source/generic/fpicker.cxx
	2006-09-16 19:49:17.000000000 +0200
+++ ooo_SRC680_m211_src.aquafilepicker01/fpicker/source/generic/fpicker.cxx
	2007-06-15 23:25:50.000000000 +0200
@@ -33,9 +33,6 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_fpicker.hxx"
-

New files in aqua dir don't have proper copyright header - just copy it from some other files.

Florian: can I do the changes myself?

@pjanik:
yes, just go ahead and do the changes. I'll be busy with other stuff today.

Done in aquafilepicker01.

I'll now include this cws into my builds and will verify it on Windows and Linux as well.

I think we can set the cws as RfQA now.

Florian: I have tried it in aquavcl01 and it is not shown at all, because the dialog is Preferences doesn't 
contain the checkbox to enable it and it is disabled by default.

IIRC The patch to svx/source/dialog/optgdlg.cxx was in my patch set - but it is not there now.

How do you test it? You enable it manually?

Eric: what have you included in the build released as alpha?

--- optgdlg.cxx	13 May 2007 10:32:33 +0200	1.41
+++ optgdlg.cxx	16 Jun 2007 18:53:21 +0200	
@@ -301,9 +301,9 @@
 {
 	FreeResource();
 
-    //system fileopen only available in Windows and with gtk vclplug based
+    //system fileopen only available in Windows, Mac OS X Aqua and with gtk vclplug based
     //picker
-#if !defined( WNT ) && !defined( ENABLE_GTK )
+#if !defined( WNT ) && !defined( ENABLE_GTK ) && !(defined(MACOSX) && defined(QUARTZ))
     aFileDlgFL.Hide();
     aFileDlgCB.Hide();
 #else

It seems I haven't checked that change in yet. Good that you saw it. I am currently resyncing to m216 and 
will check it in afterwards.

OK, svx/source/dialog/optgdlg.cxx is now committed to enable the checkbox.

Thanks - works now.

OK, I think we can hand this cws to James for QA (crafted together with aquavcl01).

OK, marking this issue as fixed.

I'll provide the build for QA.

The build for QA was uploaded to

http://ftp.linux.cz/pub/localization/OpenOffice.org/devel/AQUA/SRC680_m214/Build-9/

Intel for now, PowerPC will follow in the evening.

Verified in aquafilepicker01.

Seen native filepicker on SRC680_m221 master build -> Closing.

Thanks Florian for your hard work!