Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx

2 files changed, 42 insertions, 45 deletions

diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst
index 8de5498f122e..4c62f004f0c9 100644
--- a/setup_native/prj/build.lst
+++ b/setup_native/prj/build.lst
@@ -1,4 +1,4 @@
-pk	setup_native	:	TRANSLATIONS:translations l10ntools soltools sal xml2cmp NULL
+pk	setup_native	:	TRANSLATIONS:translations l10ntools soltools sal sfx2 NATIVE:xml2cmp NULL
 pk  setup_native                                          usr1    - all  sn_mkout NULL
 pk  setup_native\scripts\source                           nmake   -  u   sn_source NULL
 pk  setup_native\scripts                                  nmake   -  u   sn_scripts sn_source.u NULL
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index b571e6b79ee7..358fce0f449d 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -8,49 +8,46 @@ mkdir: %_DEST%\bin%_EXT%\userscripts
 ..\%__SRC%\bin\uninstall %_DEST%\bin%_EXT%\userscripts\uninstall
 ..\%__SRC%\bin\noarch\fake-db-1.0-0.noarch.rpm %_DEST%\bin%_EXT%\openoffice.org-userland-1.0-0.noarch.rpm
 
-mkdir: %_DEST%\bin%_EXT%\osolsmf
-..\%__SRC%\bin\ulfconv %_DEST%\bin%_EXT%\ulfconv
-..\%__SRC%\bin\langpackscript.sh %_DEST%\bin%_EXT%\langpackscript.sh
-..\%__SRC%\bin\linuxpatchscript.sh %_DEST%\bin%_EXT%\linuxpatchscript.sh
-..\%__SRC%\bin\downloadscript.sh %_DEST%\bin%_EXT%\downloadscript.sh
-..\%__SRC%\bin\register_extensions %_DEST%\bin%_EXT%\register_extensions
-..\%__SRC%\bin\deregister_extensions %_DEST%\bin%_EXT%\deregister_extensions
-..\%__SRC%\bin\unpack_update.sh %_DEST%\bin%_EXT%\unpack_update
-..\%__SRC%\bin\update.sh %_DEST%\bin%_EXT%\update
-..\%__SRC%\bin\javaloader.sh %_DEST%\bin%_EXT%\javaloader.sh
-..\%__SRC%\misc\mac_ulffiles_dest\*.ulf %_DEST%\bin%_EXT%\*.ulf
-..\source\win32\msi-encodinglist.txt %_DEST%\bin%_EXT%\msi-encodinglist.txt
-..\source\win32\patchlist.txt %_DEST%\bin%_EXT%\patchlist.txt
-..\source\win32\desktophelper.txt %_DEST%\bin%_EXT%\desktophelper.txt
-..\source\win32\get_retval.bat %_DEST%\bin%_EXT%\get_retval.bat
-..\source\win32\nsis\downloadtemplate.nsi %_DEST%\bin%_EXT%\downloadtemplate.nsi
-..\source\win32\nsis\*.ico %_DEST%\bin%_EXT%\*.ico
-..\source\win32\nsis\*.bmp %_DEST%\bin%_EXT%\*.bmp
-..\source\linux\*.dat %_DEST%\bin%_EXT%\*.dat
-..\source\mac\*.icns %_DEST%\bin%_EXT%\*.icns
-..\source\mac\Info.plist.langpack %_DEST%\bin%_EXT%\Info.plist.langpack
-..\source\mac\ooo\osxdndinstall.png %_DEST%\bin%_EXT%\osl\osxdndinstall.png
-..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\osl\osxdndinstall_nologo.png
-..\source\mac\ooo\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store
-..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack
-..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif
-..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat
-..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat
-..\source\opensolaris\bundledextensions\installed %_DEST%\bin%_EXT%\osolsmf\installed
-..\source\opensolaris\bundledextensions\README %_DEST%\bin%_EXT%\osolsmf\README
-..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin%_EXT%\osolsmf\ooo_bundled_extensions.xml
-..\source\opensolaris\bundledextensions\svc-ooo_bundled_extensions %_DEST%\bin%_EXT%\osolsmf\svc-ooo_bundled_extensions
-..\source\packinfo\solariscopyrightfile %_DEST%\bin%_EXT%\solariscopyrightfile
-..\source\packinfo\linuxcopyrightfile %_DEST%\bin%_EXT%\linuxcopyrightfile
-..\source\packinfo\*.txt %_DEST%\bin%_EXT%\*.txt
-..\source\packinfo\*.pcp %_DEST%\bin%_EXT%\*.pcp
-..\scripts\admin.pl %_DEST%\bin%_EXT%\admin.pl
-..\scripts\*.txt %_DEST%\bin%_EXT%\*.txt
-..\scripts\mac_install.script %_DEST%\bin%_EXT%\mac_install.script
-..\scripts\osx_install_languagepack.applescript %_DEST%\bin%_EXT%\osx_install_languagepack.applescript
-..\scripts\osx_install_patch.applescript %_DEST%\bin%_EXT%\osx_install_patch.applescript
-
+mkdir: %_DEST%\bin\osolsmf
+..\%__SRC%\bin\ulfconv %_DEST%\bin\ulfconv
+..\%__SRC%\bin\langpackscript.sh %_DEST%\bin\langpackscript.sh
+..\%__SRC%\bin\linuxpatchscript.sh %_DEST%\bin\linuxpatchscript.sh
+..\%__SRC%\bin\downloadscript.sh %_DEST%\bin\downloadscript.sh
+..\%__SRC%\bin\register_extensions %_DEST%\bin\register_extensions
+..\%__SRC%\bin\deregister_extensions %_DEST%\bin\deregister_extensions
+..\%__SRC%\bin\unpack_update.sh %_DEST%\bin\unpack_update
+..\%__SRC%\bin\update.sh %_DEST%\bin\update
+..\%__SRC%\bin\javaloader.sh %_DEST%\bin\javaloader.sh
+..\%__SRC%\misc\mac_ulffiles_dest\*.ulf %_DEST%\bin\*.ulf
+..\source\win32\msi-encodinglist.txt %_DEST%\bin\msi-encodinglist.txt
+..\source\win32\patchlist.txt %_DEST%\bin\patchlist.txt
+..\source\win32\desktophelper.txt %_DEST%\bin\desktophelper.txt
+..\source\win32\get_retval.bat %_DEST%\bin\get_retval.bat
+..\source\win32\nsis\downloadtemplate.nsi %_DEST%\bin\downloadtemplate.nsi
+..\source\win32\nsis\*.ico %_DEST%\bin\*.ico
+..\source\win32\nsis\*.bmp %_DEST%\bin\*.bmp
+..\source\linux\*.dat %_DEST%\bin\*.dat
+..\source\mac\*.icns %_DEST%\bin\*.icns
+..\source\mac\Info.plist.langpack %_DEST%\bin\Info.plist.langpack
+..\source\mac\ooo\osxdndinstall.png %_DEST%\bin\osl\osxdndinstall.png
+..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin\osl\osxdndinstall_nologo.png
+..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store
+..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack
+..\source\java\javaversion.dat %_DEST%\bin\javaversion.dat
+..\source\java\javaversion2.dat %_DEST%\bin\javaversion2.dat
+..\source\opensolaris\bundledextensions\installed %_DEST%\bin\osolsmf\installed
+..\source\opensolaris\bundledextensions\README %_DEST%\bin\osolsmf\README
+..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin\osolsmf\ooo_bundled_extensions.xml
+..\source\opensolaris\bundledextensions\svc-ooo_bundled_extensions %_DEST%\bin\osolsmf\svc-ooo_bundled_extensions
+..\source\packinfo\solariscopyrightfile %_DEST%\bin\solariscopyrightfile
+..\source\packinfo\linuxcopyrightfile %_DEST%\bin\linuxcopyrightfile
+..\source\packinfo\*.txt %_DEST%\bin\*.txt
+..\source\packinfo\*.pcp %_DEST%\bin\*.pcp
+..\scripts\admin.pl %_DEST%\bin\admin.pl
+..\scripts\*.txt %_DEST%\bin\*.txt
+..\scripts\mac_install.script %_DEST%\bin\mac_install.script
+..\scripts\osx_install_languagepack.applescript %_DEST%\bin\osx_install_languagepack.applescript
+..\scripts\osx_install_patch.applescript %_DEST%\bin\osx_install_patch.applescript
 ..\%__SRC%\lib\getuid.so %_DEST%\bin%_EXT%\getuid.so
 
-..\inc\setup_native\qswin32.h %_DEST%\inc%_EXT%\setup_native\qswin32.h
-
+..\inc\setup_native\qswin32.h %_DEST%\inc\setup_native\qswin32.h