dba34b: merged DEV300m96

dbaccess/prj/build.lst

-ba      dbaccess        :       l10n BOOST:boost connectivity svx stoc qadevOOo xmlscript test NULL
+ba      dbaccess        :       l10n BOOST:boost connectivity svx stoc qadevOOo xmlscript LIBXSLT:libxslt test NULL
 ba	dbaccess								usr1	-	all	ba_mkout NULL
 ba	dbaccess\inc							nmake	-	all	ba_inc NULL
 ba	dbaccess\source\ui\inc					nmake	-	all	ba_uiinc ba_inc NULL

reportdesign/prj/build.lst

-rd  reportdesign    :   l10n BOOST:boost comphelper dbaccess formula NULL
+rd  reportdesign    :   l10n BOOST:boost comphelper dbaccess formula LIBXSLT:libxslt NULL
 rd  reportdesign                                                        usr1    -   all rd_mkout NULL
 rd  reportdesign\inc                                                    nmake   -   all rd_inc NULL
 rd  reportdesign\source\core\api                                        nmake   -   all rd_api rd_inc NULL

reportdesign/source/ui/inc/GroupsSorting.hxx

@@ -34,7 +34,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/field.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/toolbox.hxx>
 #include <com/sun/star/report/XGroups.hpp>
 #include <com/sun/star/report/XGroup.hpp>