You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/03/14 02:49:52 UTC
svn commit: r1734873 [1/5] - in /openoffice/branches/gbuild-reintegration: ./ main/ main/connectivity/source/cpool/ main/dbaccess/ main/dbaccess/inc/pch/ main/dbaccess/prj/ main/dbaccess/qa/unoapi/ main/dbaccess/source/core/api/ main/dbaccess/source/co...

Author: damjan
Date: Mon Mar 14 01:49:48 2016
New Revision: 1734873

URL: http://svn.apache.org/viewvc?rev=1734873&view=rev
Log:
Merge dbaccess and reportdesign patches from branches/gbuild:
* r1409605 : gnumake4: reportdesign: subsequent tests
* r1409604 : gnumake4: dbaccess: subsequent tests
* r1409602 : gnumake4: dbaccess: linking against for seems unnecessary (and
  may break)
* r1409600 : gnumake4: dbaccess: rename stuff so it builds again...
* r1409599 : gnumake4: dbaccess: add missing uiconfig xml files
* r1409598 : gnumake4: postprocess: adapt dbaccess/reportdesign components
* r1409592 : gnumake4: dbaccess: add missing include dir
* r1409579 : gnumake4: reportdesign, dbaccess: remove unnecessary package
  headers
* r1409578 : gnumake4: dbaccess: fix non-WNT error
* r1409577 : gnumake4: reportdesign, dbaccess: remove DOS lineendings
* r1409576 : gnumake4: fix to use new add rules
* r1409575 : gnumake4: added dbaccess and reportdesign
* r1409572 : gnumake4: converted dbaccess
* r1409571 : gnumake4: converted reportdesign
* r1409570 : gnumake4: new defile for subsystem:windows and
  subsystem:console

Also updated some makefiles (tk -> ootk, removed deleted files, etc.)

BUILDS

Build updates by: me


Added:
    openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_adabasui.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_adabasui.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dba.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dba.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dbmm.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dbui.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbui.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_sdbt.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/Executable_odbcconfig.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Executable_odbcconfig.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/JunitTest_dbaccess_complex.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/JunitTest_dbaccess_unoapi.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/Library_adabasui.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dba.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbaxml.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbmm.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbui.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/Library_sdbt.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/Makefile
      - copied unchanged from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Makefile
    openoffice/branches/gbuild-reintegration/main/dbaccess/Module_dbaccess.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/Package_inc.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Package_inc.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/Package_uiconfig.mk
      - copied, changed from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Package_uiconfig.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/Package_xml.mk
      - copied unchanged from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Package_xml.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/inc/pch/precompiled_dbaxml.cxx
      - copied unchanged from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/inc/pch/precompiled_dbaxml.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/inc/pch/precompiled_dbaxml.hxx
      - copied unchanged from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/inc/pch/precompiled_dbaxml.hxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/inc/pch/precompiled_dbmm.cxx
      - copied unchanged from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/inc/pch/precompiled_dbmm.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/inc/pch/precompiled_dbmm.hxx
      - copied unchanged from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/inc/pch/precompiled_dbmm.hxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/inc/pch/precompiled_dbui.cxx
      - copied unchanged from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/inc/pch/precompiled_dbui.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/inc/pch/precompiled_dbui.hxx
      - copied unchanged from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/inc/pch/precompiled_dbui.hxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/prj/makefile.mk
      - copied unchanged from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/prj/makefile.mk
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/AutoControlsDef.hrc
      - copied unchanged from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/source/ui/dlg/AutoControlsDef.hrc
    openoffice/branches/gbuild-reintegration/main/reportdesign/AllLangResTarget_rpt.mk
      - copied, changed from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/AllLangResTarget_rpt.mk
    openoffice/branches/gbuild-reintegration/main/reportdesign/AllLangResTarget_rptui.mk
      - copied unchanged from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/AllLangResTarget_rptui.mk
    openoffice/branches/gbuild-reintegration/main/reportdesign/JunitTest_reportdesign_complex.mk
      - copied, changed from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk
    openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rpt.mk
      - copied, changed from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk
    openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptui.mk
      - copied, changed from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Library_rptui.mk
    openoffice/branches/gbuild-reintegration/main/reportdesign/Library_rptxml.mk
      - copied, changed from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Library_rptxml.mk
    openoffice/branches/gbuild-reintegration/main/reportdesign/Makefile
      - copied unchanged from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Makefile
    openoffice/branches/gbuild-reintegration/main/reportdesign/Module_reportdesign.mk
      - copied, changed from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk
    openoffice/branches/gbuild-reintegration/main/reportdesign/Package_uiconfig.mk
      - copied, changed from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Package_uiconfig.mk
    openoffice/branches/gbuild-reintegration/main/reportdesign/Package_xml.mk
      - copied, changed from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/Package_xml.mk
    openoffice/branches/gbuild-reintegration/main/reportdesign/inc/pch/precompiled_rptui.cxx
      - copied unchanged from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/inc/pch/precompiled_rptui.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/inc/pch/precompiled_rptui.hxx
      - copied unchanged from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/inc/pch/precompiled_rptui.hxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/inc/pch/precompiled_rptxml.cxx
      - copied unchanged from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/inc/pch/precompiled_rptxml.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/inc/pch/precompiled_rptxml.hxx
      - copied unchanged from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/inc/pch/precompiled_rptxml.hxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/prj/makefile.mk
      - copied unchanged from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/prj/makefile.mk
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/rptxml.component
      - copied unchanged from r1409571, incubator/ooo/branches/gbuild/main/reportdesign/source/filter/xml/rptxml.component
Modified:
    openoffice/branches/gbuild-reintegration/   (props changed)
    openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
    openoffice/branches/gbuild-reintegration/main/Repository.mk
    openoffice/branches/gbuild-reintegration/main/connectivity/source/cpool/Zregistration.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/dbaccess/prj/d.lst
    openoffice/branches/gbuild-reintegration/main/dbaccess/qa/unoapi/Test.java
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/api/BookmarkSet.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/api/CacheSet.hxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/dataaccess/SharedConnection.hxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/dataaccess/connection.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/dbmm_module.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/dbmm_services.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/dbmm_types.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/docinteraction.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/macromigrationpages.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/migrationengine.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/migrationlog.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/progresscapture.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/progressmixer.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/dbloader2.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlAutoStyle.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlColumn.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlComponent.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlConnectionData.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlConnectionResource.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlDataSource.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlDatabase.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlDocuments.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlExport.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlHelper.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlLogin.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlQuery.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlServerDatabase.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlStyleImport.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlTable.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlTableFilterList.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlfilter.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/filter/xml/xmlservices.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/sdbtools/misc/sdbt_services.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/shared/dbu_reghelper.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/shared/dbustrings.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/shared/flt_reghelper.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/shared/xmlstrings.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppController.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppControllerDnD.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppControllerGen.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppDetailPageHelper.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppDetailView.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppIconControl.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppSwapWindow.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppTitleWindow.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/AppView.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/app/subcomponentmanager.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/AsyncronousLink.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/brwctrlr.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/brwview.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/dataview.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/dbexchange.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/dbloader.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/dbtreemodel.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/dbtreeview.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/dsbrowserDnD.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/exsrcbrw.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/formadapter.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/genericcontroller.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/sbagrid.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/sbamultiplex.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/browser/unodatbr.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/ColumnControlWindow.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/FieldDescControl.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/RelationControl.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/ScrollHelper.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/SqlNameEdit.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/TableGrantCtrl.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/VertSplitView.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/charsetlistbox.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/curledit.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/dbtreelistbox.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/listviewitems.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/marktree.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/opendoccontrols.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/sqledit.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/tabletree.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/toolboxcontroller.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/control/undosqledit.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/AdabasStat.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/CollectionView.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/ConnectionHelper.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/ConnectionPage.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/DbAdminImpl.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/DriverSettings.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/RelationDlg.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/UserAdmin.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/UserAdminDlg.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/admincontrols.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/adminpages.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/adodatalinks.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/adtabdlg.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/advancedsettings.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/dbadmin.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/dbfindex.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/dbwiz.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/dbwizsetup.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/detailpages.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/directsql.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/dlgattr.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/dlgsave.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/dlgsize.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/dsselect.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/finteraction.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/generalpage.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/indexdialog.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/odbcconfig.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/optionalboolitem.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/paramdialog.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/queryfilter.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/queryorder.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/sqlmessage.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/tablespage.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/dlg/textconnectionsettings.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/DExport.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/HtmlReader.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/RowSetDrop.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/RtfReader.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/TableCopyHelper.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/TokenWriter.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/ToolBoxHelper.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/UITools.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/WCPage.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/WColumnSelect.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/WCopyTable.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/WExtendPages.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/WNameMatch.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/WTypeSelect.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/asyncmodaldialog.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/charsets.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/controllerframe.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/databaseobjectview.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/datasourceconnector.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/dbaundomanager.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/dsmeta.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/imageprovider.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/indexcollection.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/linkeddocuments.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/moduledbu.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/propertysetitem.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/propertystorage.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/singledoccontroller.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/stringlistitem.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/misc/uiservices.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/ConnectionLine.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/JAccess.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/JoinController.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/JoinDesignView.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/JoinExchange.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/JoinTableView.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QTableConnection.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QTableWindow.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QTableWindowData.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QueryDesignView.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QueryTableView.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QueryTextView.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/TableConnection.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/TableConnectionData.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/TableFieldInfo.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/TableWindow.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/TableWindowData.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/querycontroller.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/querydlg.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/querydesign/queryview.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/relationdesign/RTableConnection.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/relationdesign/RelationController.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/relationdesign/RelationTableView.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TEditControl.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableController.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableDesignView.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableRow.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/tabledesign/TableUndo.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnControl.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnModel.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/ColumnPeer.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/TableFilterDlg.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/UserSettingsDlg.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/admindlg.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/composerdialogs.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/copytablewizard.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/dbinteraction.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unoDirectSql.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unoadmin.cxx
    openoffice/branches/gbuild-reintegration/main/dbaccess/source/ui/uno/unosqlmessage.cxx
    openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
    openoffice/branches/gbuild-reintegration/main/reportdesign/inc/pch/precompiled_reportdesign.hxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/prj/build.lst
    openoffice/branches/gbuild-reintegration/main/reportdesign/prj/d.lst
    openoffice/branches/gbuild-reintegration/main/reportdesign/qa/complex/reportdesign/TestDocument.java
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FixedLine.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FixedText.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FormatCondition.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/FormattedField.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Function.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Functions.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Group.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Groups.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ImageControl.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportComponent.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportControlModel.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportDefinition.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportEngineJFree.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/ReportVisitor.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Section.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Shape.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/Tools.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/api/services.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/misc/conditionalexpression.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/misc/conditionupdater.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/resource/core_resource.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ModuleHelper.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/PropertyForward.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ReportDrawPage.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/ReportUndoFactory.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptModel.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptObjectListener.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/RptPage.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/core/sdr/UndoEnv.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/dbloader2.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlAutoStyle.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlCell.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlColumn.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlComponent.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlControlProperty.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlExport.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFixedContent.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFormatCondition.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFormattedField.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlFunction.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlGroup.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlHelper.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlImage.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlMasterFields.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReport.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReportElement.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlReportElementBase.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlRow.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlSection.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlStyleImport.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlSubDocument.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlTable.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlfilter.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/filter/xml/xmlservices.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/shared/uistrings.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/shared/xmlstrings.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/dlg/AddField.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/dlg/CondFormat.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/dlg/Condition.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/dlg/DateTime.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/dlg/Formula.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/dlg/GroupExchange.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/dlg/GroupsSorting.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/dlg/Navigator.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/dlg/PageNumber.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/dlg/dlgpage.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/inspection/DataProviderHandler.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/inspection/DefaultInspection.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/inspection/GeometryHandler.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/inspection/metadata.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/misc/ColorListener.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/misc/FunctionHelper.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/misc/RptUndo.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/misc/UITools.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/misc/rptuiservices.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/misc/statusbarcontroller.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/misc/toolboxcontroller.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/DesignView.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/EndMarker.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/FixedTextColor.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/ReportController.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/ReportControllerObserver.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/ReportRuler.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/ReportSection.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/ReportWindow.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/ScrollHelper.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/SectionView.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/SectionWindow.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/StartMarker.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/ViewsWindow.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/dlgedclip.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/dlgedfac.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/dlgedfunc.cxx
    openoffice/branches/gbuild-reintegration/main/reportdesign/source/ui/report/propbrw.cxx
    openoffice/branches/gbuild-reintegration/main/scp2/source/base/file_base.scp
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Executable.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Library.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
    openoffice/branches/gbuild-reintegration/main/solenv/gbuild/templates/Executable.mk

Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 01:49:48 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409569
+/incubator/ooo/branches/gbuild:1409313-1409579,1409592,1409598-1409600,1409602,1409604-1409605
 /openoffice/branches/AOO400:1503684
 /openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
 /openoffice/branches/alg_writerframes:1556289-1579189

Modified: openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Module_ooo.mk?rev=1734873&r1=1734872&r2=1734873&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Module_ooo.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Module_ooo.mk Mon Mar 14 01:49:48 2016
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_moduledirs,o
 	canvas \
 	comphelper \
 	cppcanvas \
+	dbaccess \
 	drawinglayer \
 	editeng \
 	formula \
@@ -39,6 +40,7 @@ $(eval $(call gb_Module_add_moduledirs,o
 	oovbaapi \
 	oox \
 	padmin \
+	reportdesign \
 	sax \
 	sfx2 \
 	sot \

Modified: openoffice/branches/gbuild-reintegration/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Repository.mk?rev=1734873&r1=1734872&r2=1734873&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Repository.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Repository.mk Mon Mar 14 01:49:48 2016
@@ -41,6 +41,8 @@ $(eval $(call gb_Helper_register_executa
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     AppleRemote \
+	adabas \
+	adabasui \
 	agg \
 	avmedia \
 	basebmp \
@@ -48,10 +50,17 @@ $(eval $(call gb_Helper_register_librari
 	canvastools \
 	cppcanvas \
 	cui \
+	dba \
+	dbaxml \
+	dbmm \
+	dbui \
+	dbpool \
+	dbtools \
     desktop_detector \
 	drawinglayer \
 	svgio \
 	editeng \
+	file \
 	for \
 	forui \
 	fwe \
@@ -63,10 +72,17 @@ $(eval $(call gb_Helper_register_librari
 	lng \
 	msfilter \
 	msword \
+	odbc \
+	odbcbase \
 	oox \
 	qstart_gtk \
+	rpt \
+	rptui \
+	rptxml \
 	sax \
 	sb \
+	sdbc \
+	sdbt \
 	sfx \
 	sm \
 	smd \

Modified: openoffice/branches/gbuild-reintegration/main/connectivity/source/cpool/Zregistration.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/connectivity/source/cpool/Zregistration.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/connectivity/source/cpool/Zregistration.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/connectivity/source/cpool/Zregistration.cxx Mon Mar 14 01:49:48 2016
@@ -40,13 +40,13 @@ extern "C"
 {
 
 //---------------------------------------------------------------------------------------
-	void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/)
+	SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/)
 {
 	*_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
 //---------------------------------------------------------------------------------------
-void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
 {
 	void* pRet = NULL;
 

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_adabasui.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_adabasui.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_adabasui.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_adabasui.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_adabasui.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_adabasui.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_adabasui.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dba.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dba.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dba.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dba.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dba.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dba.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dba.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platdbam office productivity suite

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dbmm.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dbmm.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dbmm.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dbmm.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -25,22 +25,22 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbamm))
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbmm))
 
-$(eval $(call gb_AllLangResTarget_set_reslocation,dbamm,dbaccess))
+$(eval $(call gb_AllLangResTarget_set_reslocation,dbmm,dbaccess))
 
-$(eval $(call gb_AllLangResTarget_add_srs,dbamm,dbaccess/dbamm))
+$(eval $(call gb_AllLangResTarget_add_srs,dbmm,dbaccess/dbmm))
 
-$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbamm))
+$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbmm))
 
-$(eval $(call gb_SrsTarget_set_include,dbaccess/dbamm,\
+$(eval $(call gb_SrsTarget_set_include,dbaccess/dbmm,\
 	$$(INCLUDE) \
 	-I$(OUTDIR)/inc \
 	-I$(SRCDIR)/dbaccess/source/ext/macromigration \
 	-I$(SRCDIR)/dbaccess/inc \
 ))
 
-$(eval $(call gb_SrsTarget_add_files,dbaccess/dbamm,\
+$(eval $(call gb_SrsTarget_add_files,dbaccess/dbmm,\
 	dbaccess/source/ext/macromigration/macromigration.src \
 ))
 

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dbui.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbui.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dbui.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dbui.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbui.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbui.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_dbui.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -38,6 +38,7 @@ $(eval $(call gb_SrsTarget_set_include,d
 	-I$(OUTDIR)/inc \
 	-I$(WORKDIR)/inc/dbaccess \
 	-I$(SRCDIR)/dbaccess/source/ui/inc \
+	-I$(SRCDIR)/dbaccess/source/ui/dlg \
 	-I$(SRCDIR)/dbaccess/inc \
 ))
 
@@ -108,13 +109,13 @@ $(WORKDIR)/inc/dbaccess/AutoControls.hrc
 	echo copying $@
 	-mkdir -p $(WORKDIR)/inc/dbaccess
 	cp $(SRCDIR)/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk 
+	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
 
 $(WORKDIR)/inc/dbaccess/toolbox.hrc : $(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc
 	echo copying $@
 	-mkdir -p $(WORKDIR)/inc/dbaccess
 	cp $(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc $(WORKDIR)/inc/dbaccess/toolbox.hrc
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk 
+	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
 else
 -include $(WORKDIR)/inc/dbaccess/lastrun.mk
 ifneq ($(gb_lastrun_globlmn),MERGED)

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_sdbt.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_sdbt.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_sdbt.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/AllLangResTarget_sdbt.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,dba
 $(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\
 	$$(INCLUDE) \
 	-I$(OUTDIR)/inc \
-	-I$(SRCDIR)/dbaccess\source\sdbtools\inc \
+	-I$(SRCDIR)/dbaccess/source/sdbtools/inc \
 	-I$(SRCDIR)/dbaccess/inc \
 ))
 

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/Executable_odbcconfig.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Executable_odbcconfig.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/Executable_odbcconfig.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/Executable_odbcconfig.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/Executable_odbcconfig.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Executable_odbcconfig.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/Executable_odbcconfig.mk Mon Mar 14 01:49:48 2016
@@ -24,7 +24,6 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-ifeq ($(GUI),WNT)
 
 $(eval $(call gb_Executable_Executable,odbcconfig))
 
@@ -58,5 +57,4 @@ $(eval $(call gb_Executable_add_exceptio
 	dbaccess/win32/source/odbcconfig/odbcconfig \
 ))
 
-endif
 # vim: set noet sw=4 ts=4:

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/JunitTest_dbaccess_complex.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/JunitTest_dbaccess_complex.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/JunitTest_dbaccess_complex.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/JunitTest_dbaccess_complex.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -25,7 +25,12 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex))
+$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex,SRCDIR))
+
+$(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\
+	$$(DEFS) \
+	-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/dbaccess \
+))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_complex,\
 	dbaccess/qa/complex/dbaccess/ApplicationController \
@@ -58,24 +63,20 @@ $(eval $(call gb_JunitTest_add_jars,dbac
 ))
 
 $(eval $(call gb_JunitTest_add_classes,dbaccess_complex,\
-	complex.dbaccess.ApplicationController \
 	complex.dbaccess.Beamer \
-	complex.dbaccess.DataSource \
 	complex.dbaccess.DatabaseDocument \
-	complex.dbaccess.Parser \
 	complex.dbaccess.PropertyBag \
+))
+# deactivated since sb123;
+# apparently most of these fail because OOo does not find JVM?
+#	complex.dbaccess.ApplicationController \
+	complex.dbaccess.DataSource \
+	complex.dbaccess.Parser \
 	complex.dbaccess.Query \
 	complex.dbaccess.QueryInQuery \
 	complex.dbaccess.RowSet \
 	complex.dbaccess.SingleSelectQueryComposer \
 	complex.dbaccess.UISettings \
 	complex.dbaccess.CopyTableWizard \
-	complex.dbaccess.CRMBasedTestCase \
-	complex.dbaccess.CopyTableInterActionHandler \
-	complex.dbaccess.DatabaseApplication \
-	complex.dbaccess.FileHelper \
-	complex.dbaccess.RowSetEventListener \
-	complex.dbaccess.TestCase \
-))
 
-# vim: set noet dbaccess=4 ts=4:
+# vim: set noet sw=4 ts=4:

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/JunitTest_dbaccess_unoapi.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/JunitTest_dbaccess_unoapi.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/JunitTest_dbaccess_unoapi.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/JunitTest_dbaccess_unoapi.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -25,12 +25,13 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\
 	$$(DEFS) \
 	-Dorg.openoffice.test.arg.sce=$(SRCDIR)/dbaccess/qa/unoapi/dbaccess.sce \
 	-Dorg.openoffice.test.arg.xcl=$(SRCDIR)/dbaccess/qa/unoapi/knownissues.xcl \
+	-Dorg.openoffice.test.arg.ini=$(SRCDIR)/dbaccess/qa/unoapi/dbaccess.props \
 	-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/unoapi/testdocuments \
 ))
 
@@ -50,4 +51,4 @@ $(eval $(call gb_JunitTest_add_classes,d
 	org.openoffice.dbaccess.qa.unoapi.Test \
 ))
 
-# vim: set noet dbaccess=4 ts=4:
+# vim: set noet sw=4 ts=4:

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/Library_adabasui.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/Library_adabasui.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/Library_adabasui.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/Library_adabasui.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,ada
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_defs,adabasui,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,adabasui,\
 	-DCOMPMOD_NAMESPACE=adabasui \
 ))
 
@@ -59,7 +58,7 @@ $(eval $(call gb_Library_add_linked_libs
 	sal \
 	stl \
 	sfx \
-	tk \
+	ootk \
 	dbtools \
     $(gb_STDLIBS) \
 ))

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dba.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dba.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dba.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dba.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -44,8 +44,7 @@ $(eval $(call gb_Library_set_include,dba
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_defs,dba,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,dba,\
 	-DOOO_DLLIMPLEMENTATION_DBA \
 ))
 

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbaxml.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbaxml.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbaxml.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbaxml.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -26,7 +26,6 @@
 #*************************************************************************
 
 $(eval $(call gb_Library_Library,dbaxml))
-$(eval $(call gb_Library_add_package_headers,dbaxml,dbaccess_inc))
 $(eval $(call gb_Library_add_precompiled_header,dbaxml,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaxml))
 
 $(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml))
@@ -44,11 +43,6 @@ $(eval $(call gb_Library_set_include,dba
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_defs,dbaxml,\
-	$$(DEFS) \
-))
-
-
 $(eval $(call gb_Library_add_linked_libs,dbaxml,\
 	tl \
 	svl \
@@ -62,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs
 	dbtools \
 	xo \
 	sot \
-	tk \
+	ootk \
 	dba \
 	stl \
     $(gb_STDLIBS) \

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbmm.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbmm.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbmm.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbmm.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -43,10 +43,6 @@ $(eval $(call gb_Library_set_include,dbm
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_defs,dbmm,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,dbmm,\
 	cppu          \
     cppuhelper    \

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbui.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbui.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbui.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/Library_dbui.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -26,7 +26,6 @@
 #*************************************************************************
 
 $(eval $(call gb_Library_Library,dbui))
-$(eval $(call gb_Library_add_package_headers,dbui,dbaccess_inc))
 $(eval $(call gb_Library_add_precompiled_header,dbui,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbui))
 
 $(eval $(call gb_Library_set_componentfile,dbui,dbaccess/util/dbu))
@@ -45,17 +44,14 @@ $(eval $(call gb_Library_set_include,dbu
 ))
 
 ifeq ($(SYSTEM_ODBC_HEADERS),TRUE)
-$(eval $(call gb_Library_set_cflags,dbui,\
-    $$(CFLAGS) \
-    $$(OBJCFLAGS) \
+$(eval $(call gb_Library_add_cflags,dbui,\
 	-DSYSTEM_ODBC_HEADERS \
 ))
 endif
 
 ifneq ($(WINDOWS_VISTA_PSDK),) 
 ifeq ($(PROF_EDITION),)
-$(eval $(call gb_Library_set_defs,dbui,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,dbui,\
 	-DDBACCESS_DLLIMPLEMENTATION\
 	-DWINDOWS_VISTA_PSDK \
 ))
@@ -63,7 +59,7 @@ endif
 endif
 
 ifeq ($(GUI)$(COM),WNTGCC)
-$(eval $(call gb_Library_set_cflags,dbui,\
+$(eval $(call gb_Library_add_cflags,dbui,\
 	-fpermissive \
 ))
 endif
@@ -82,8 +78,7 @@ $(eval $(call gb_Library_add_exception_o
 endif
 endif
 
-$(eval $(call gb_Library_set_defs,dbui,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,dbui,\
 	-DDBACCESS_DLLIMPLEMENTATION\
 ))
 
@@ -101,13 +96,12 @@ $(eval $(call gb_Library_add_linked_libs
 	svt \
 	stl \
 	vcl \
-	for \
 	tl \
 	utl \
 	ucbhelper \
 	svxcore \
 	svx \
-	tk \
+	ootk \
 	sot \
 	dba \
 	vos3 \
@@ -154,7 +148,6 @@ $(eval $(call gb_Library_add_exception_o
 	dbaccess/source/ui/control/dbtreelistbox \
 	dbaccess/source/ui/control/opendoccontrols \
 	dbaccess/source/ui/control/sqledit \
-	dbaccess/source/ui/control/statusbarontroller \
 	dbaccess/source/ui/control/tabletree \
 	dbaccess/source/ui/control/toolboxcontroller \
 	dbaccess/source/ui/dlg/AdabasStat \

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/Library_sdbt.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/Library_sdbt.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/Library_sdbt.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/Library_sdbt.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -44,10 +44,6 @@ $(eval $(call gb_Library_set_include,sdb
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_defs,sdbt,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,sdbt,\
 	tl \
 	cppuhelper \

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/Module_dbaccess.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/Module_dbaccess.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/Module_dbaccess.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/Module_dbaccess.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -39,12 +39,17 @@ $(eval $(call gb_Module_add_targets,dbac
 	Library_dbmm\
 	Library_dbui\
 	Library_sdbt\
-	Executable_odbcconfig \
 	Package_inc \
 	Package_uiconfig \
 	Package_xml \
 ))
 
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Module_add_targets,dbaccess,\
+	Executable_odbcconfig \
+))
+endif
+
 $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
 	JunitTest_dbaccess_complex \
 	JunitTest_dbaccess_unoapi \

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/Package_inc.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Package_inc.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/Package_inc.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/Package_inc.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/Package_inc.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Package_inc.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/Package_inc.mk Mon Mar 14 01:49:48 2016
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite

Copied: openoffice/branches/gbuild-reintegration/main/dbaccess/Package_uiconfig.mk (from r1409572, incubator/ooo/branches/gbuild/main/dbaccess/Package_uiconfig.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/Package_uiconfig.mk?p2=openoffice/branches/gbuild-reintegration/main/dbaccess/Package_uiconfig.mk&p1=incubator/ooo/branches/gbuild/main/dbaccess/Package_uiconfig.mk&r1=1409572&r2=1734873&rev=1734873&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Package_uiconfig.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/Package_uiconfig.mk Mon Mar 14 01:49:48 2016
@@ -32,11 +32,17 @@ $(eval $(call gb_Package_add_file,dbacce
 $(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/menubar/menubar.xml,dbquery/menubar/menubar.xml))
 $(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbrelation/menubar/menubar.xml,dbrelation/menubar/menubar.xml))
 $(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtable/menubar/menubar.xml,dbtable/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/formobjectbar.xml,dbapp/toolbar/formobjectbar.xml))
+$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/queryobjectbar.xml,dbapp/toolbar/queryobjectbar.xml))
+$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/reportobjectbar.xml,dbapp/toolbar/reportobjectbar.xml))
+$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/tableobjectbar.xml,dbapp/toolbar/tableobjectbar.xml))
 $(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/toolbar.xml,dbapp/toolbar/toolbar.xml))
 $(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/statusbar/statusbar.xml,dbapp/statusbar/statusbar.xml))
 $(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbbrowser/menubar/compat.xml,dbbrowser/menubar/compat.xml))
 $(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbbrowser/toolbar/toolbar.xml,dbbrowser/toolbar/toolbar.xml))
 $(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtdata/toolbar/toolbar.xml,dbtdata/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/toolbar/designobjectbar.xml,dbquery/toolbar/designobjectbar.xml))
+$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/toolbar/sqlobjectbar.xml,dbquery/toolbar/sqlobjectbar.xml))
 $(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/toolbar/toolbar.xml,dbquery/toolbar/toolbar.xml))
 $(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbrelation/toolbar/toolbar.xml,dbrelation/toolbar/toolbar.xml))
 $(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtable/toolbar/toolbar.xml,dbtable/toolbar/toolbar.xml))

Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/prj/build.lst?rev=1734873&r1=1734872&r2=1734873&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dbaccess/prj/build.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/prj/build.lst Mon Mar 14 01:49:48 2016
@@ -1,33 +1,2 @@
 ba      dbaccess        :       L10N:l10n BOOST:boost connectivity svx stoc qadevOOo xmlscript LIBXSLT:libxslt 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
-ba	dbaccess\source\core\api				nmake	-	all	ba_capi ba_inc NULL
-ba	dbaccess\source\core\dataaccess			nmake	-	all	ba_cdaccess ba_inc NULL
-ba	dbaccess\source\core\recovery           nmake	-	all	ba_crecovery ba_inc NULL
-ba	dbaccess\source\core\misc				nmake	-	all	ba_cmisc ba_inc NULL
-ba	dbaccess\source\core\resource			nmake	-	all	ba_cres ba_inc NULL
-ba	dbaccess\source\filter\xml				nmake	-	all	ba_ffilter ba_shared ba_util ba_inc NULL
-ba	dbaccess\source\shared					nmake	-	all	ba_shared ba_cres ba_inc NULL
-ba  dbaccess\source\sdbtools\connection     nmake   -   all ba_conntools ba_inc NULL
-ba  dbaccess\source\sdbtools\misc           nmake   -   all ba_misctools ba_inc NULL
-ba  dbaccess\source\sdbtools\resource       nmake   -   all ba_miscres ba_inc NULL
-ba  dbaccess\source\ext\macromigration      nmake   -   all ba_extmm ba_inc NULL
-ba  dbaccess\source\ext\adabas  			nmake   -   all ba_ext_adabasui ba_inc NULL
-ba	dbaccess\source\ui\app					nmake	-	all	ba_uiapp ba_uiinc ba_inc NULL
-ba	dbaccess\source\ui\browser				nmake	-	all	ba_uibrowser ba_uiinc ba_inc NULL
-ba	dbaccess\source\ui\dlg					nmake	-	all	ba_uidlg ba_uiinc ba_inc NULL
-ba	dbaccess\source\ui\control				nmake	-	all	ba_uicontrol ba_uiinc ba_inc NULL
-ba	dbaccess\source\ui\misc					nmake	-	all	ba_uimisc ba_inc NULL
-ba	dbaccess\source\ui\querydesign			nmake	-	all	ba_uiquery ba_uiinc ba_inc NULL
-ba	dbaccess\source\ui\relationdesign		nmake	-	all	ba_uirelationdesign ba_uiinc ba_inc NULL
-ba	dbaccess\source\ui\tabledesign			nmake	-	all	ba_uitabledesign ba_uiinc ba_inc NULL
-ba	dbaccess\source\ui\uno					nmake	-	all	ba_uiuno ba_inc NULL
-ba	dbaccess\source\ui\imagelists			nmake	-	all	ba_uiimglst ba_inc NULL
-ba  dbaccess\util                           nmake   -   all ba_util ba_uiimglst ba_capi ba_cdaccess ba_cmisc ba_crecovery ba_shared ba_uibrowser ba_uiapp ba_uicontrol ba_uidlg ba_uimisc ba_uiquery ba_uitabledesign ba_uirelationdesign ba_uiuno ba_conntools ba_misctools ba_miscres ba_ext_adabasui NULL
-ba  dbaccess\win32\source\odbcconfig        nmake   -   w ba_odbcconfig ba_inc NULL
-ba dbaccess\qa\unoapi nmake - all ba_q_unoapi NULL
-
-# complex tests doesn't work
-# ba dbaccess\qa\complex\dbaccess           nmake   -   all ba_qa_complex NULL
-
+ba	dbaccess\prj nmake - all ba_prj   NULL

Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/prj/d.lst?rev=1734873&r1=1734872&r2=1734873&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dbaccess/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/prj/d.lst Mon Mar 14 01:49:48 2016
@@ -1,60 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbapp
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbbrowser
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtdata
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbquery
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbrelation
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtable
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbapp\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbapp\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbapp\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbbrowser\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbbrowser\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtdata\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtdata\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbquery\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbquery\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbrelation\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbrelation\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtable\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbtable\toolbar
-
-mkdir: %_DEST%\inc%_EXT%\dbaccess
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
-..\%__SRC%\lib\idbu* %_DEST%\lib%_EXT%\idbu*
-..\%__SRC%\lib\db?.lib %_DEST%\lib%_EXT%\db?.lib
-*.xml %_DEST%\xml%_EXT%\*.xml
-
-touch: ..\%__SRC%\misc\dbaccess.hid %_DEST%\bin%_EXT%\dba.hid
-
-..\uiconfig\dbapp\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbapp\menubar\*.xml
-..\uiconfig\dbtdata\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbtdata\menubar\*.xml
-..\uiconfig\dbquery\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbquery\menubar\*.xml
-..\uiconfig\dbrelation\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbrelation\menubar\*.xml
-..\uiconfig\dbtable\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbtable\menubar\*.xml
-..\uiconfig\dbapp\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbapp\toolbar\*.xml
-..\uiconfig\dbapp\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbapp\statusbar\*.xml
-..\uiconfig\dbbrowser\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbbrowser\menubar\*.xml
-..\uiconfig\dbbrowser\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbbrowser\toolbar\*.xml
-..\uiconfig\dbtdata\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbtdata\toolbar\*.xml
-..\uiconfig\dbquery\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbquery\toolbar\*.xml
-..\uiconfig\dbrelation\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbrelation\toolbar\*.xml
-..\uiconfig\dbtable\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbtable\toolbar\*.xml
-..\inc\*.hxx %_DEST%\inc%_EXT%\dbaccess\*.hxx
-..\inc\*.h %_DEST%\inc%_EXT%\dbaccess\*.h
-
-..\%__SRC%\misc\adabasui.component %_DEST%\xml%_EXT%\adabasui.component
-..\%__SRC%\misc\dba.component %_DEST%\xml%_EXT%\dba.component
-..\%__SRC%\misc\dbaxml.component %_DEST%\xml%_EXT%\dbaxml.component
-..\%__SRC%\misc\dbmm.component %_DEST%\xml%_EXT%\dbmm.component
-..\%__SRC%\misc\dbu.component %_DEST%\xml%_EXT%\dbu.component
-..\%__SRC%\misc\sdbt.component %_DEST%\xml%_EXT%\sdbt.component

Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/qa/unoapi/Test.java
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/qa/unoapi/Test.java?rev=1734873&r1=1734872&r2=1734873&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dbaccess/qa/unoapi/Test.java (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/qa/unoapi/Test.java Mon Mar 14 01:49:48 2016
@@ -25,6 +25,7 @@ package org.openoffice.dbaccess.qa.unoap
 
 import org.openoffice.Runner;
 import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
 import static org.junit.Assert.*;
 
 public final class Test {
@@ -41,9 +42,11 @@ public final class Test {
     @org.junit.Test public void test() {
         assertTrue(
             Runner.run(
-                "-sce", "dbaccess.sce", "-xcl", "knownissues.xcl", "-ini",
-                "dbaccess.props", "-tdoc", "testdocuments", "-cs",
-                connection.getDescription()));
+                "-sce", Argument.get("sce"),
+                "-xcl", Argument.get("xcl"),
+                "-ini", Argument.get("ini"),
+                "-tdoc", Argument.get("tdoc"),
+                "-cs", connection.getDescription()));
     }
 
     private final OfficeConnection connection = new OfficeConnection();

Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/api/BookmarkSet.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/api/BookmarkSet.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/api/BookmarkSet.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/api/BookmarkSet.cxx Mon Mar 14 01:49:48 2016
@@ -23,21 +23,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
-#ifndef DBACCESS_CORE_API_BOOKMARKSET_HXX
 #include "BookmarkSet.hxx"
-#endif
-#ifndef _DBA_CORE_RESOURCE_HXX_
 #include "core_resource.hxx"
-#endif
-#ifndef _DBA_CORE_RESOURCE_HRC_
 #include "core_resource.hrc"
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#endif
-#ifndef _DBHELPER_DBEXCEPTION_HXX_
 #include <connectivity/dbexception.hxx>
-#endif
 #include <rtl/logfile.hxx>
 
 #include <limits>

Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/api/CacheSet.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/api/CacheSet.hxx?rev=1734873&r1=1734872&r2=1734873&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/api/CacheSet.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/api/CacheSet.hxx Mon Mar 14 01:49:48 2016
@@ -23,39 +23,18 @@
 #ifndef DBACCESS_CORE_API_CACHESET_HXX
 #define DBACCESS_CORE_API_CACHESET_HXX
 
-#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
 #include <com/sun/star/sdbc/XRow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATA_HPP_
+#include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_
 #include <com/sun/star/sdbc/XConnection.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XDELETEROWS_HPP_
 #include <com/sun/star/sdbcx/XDeleteRows.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_COMPAREBOOKMARK_HPP_
 #include <com/sun/star/sdbcx/CompareBookmark.hpp>
-#endif
-#ifndef DBACCESS_CORE_API_ROWSETROW_HXX
 #include "RowSetRow.hxx"
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
 #include <cppuhelper/implbase1.hxx>
-#endif
 
 #include <list>
 namespace rtl

Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/dataaccess/SharedConnection.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/dataaccess/SharedConnection.hxx?rev=1734873&r1=1734872&r2=1734873&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/dataaccess/SharedConnection.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/dataaccess/SharedConnection.hxx Mon Mar 14 01:49:48 2016
@@ -157,9 +157,6 @@ namespace dbaccess
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 	};
 	
-#ifdef IMPLEMENT_GET_IMPLEMENTATION_ID
-	IMPLEMENT_GET_IMPLEMENTATION_ID( OSharedConnection );
-#endif
 //........................................................................
 }	// namespace dbaccess
 //........................................................................

Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/dataaccess/connection.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/dataaccess/connection.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/dataaccess/connection.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/core/dataaccess/connection.cxx Mon Mar 14 01:49:48 2016
@@ -54,6 +54,7 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/logfile.hxx>
+#include "SharedConnection.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -79,6 +80,9 @@ using ::com::sun::star::sdb::tools::XDat
 namespace dbaccess
 {
 //........................................................................
+#ifdef IMPLEMENT_GET_IMPLEMENTATION_ID
+	IMPLEMENT_GET_IMPLEMENTATION_ID( OSharedConnection );
+#endif
 
 //==========================================================================
 // XServiceInfo

Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/dbmm_module.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/dbmm_module.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/dbmm_module.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/dbmm_module.cxx Mon Mar 14 01:49:48 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "dbmm_module.hxx"
 

Modified: openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/dbmm_services.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/dbmm_services.cxx?rev=1734873&r1=1734872&r2=1734873&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/dbmm_services.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/dbaccess/source/ext/macromigration/dbmm_services.cxx Mon Mar 14 01:49:48 2016
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbmm.hxx"
 
 #include "dbmm_module.hxx"