Commit graph

10036 commits

Author SHA1 Message Date
Bjoern Michaelsen
dae8595066 revert to dbaccess gbuildization from master mostly
* only add JunitTest_dbaccess_complex, which was missing on master
* disable complex.dbaccess.DatabaseDocument in JunitTest_dbaccess_complex for
  now as it fails
2011-07-23 10:13:13 +02:00
Bjoern Michaelsen
53e20b0c77 postmerge fixes for gnumake4 2011-07-22 21:26:31 +02:00
Bjoern Michaelsen
923db2bcda resyncing to master 2011-07-21 18:30:24 +02:00
Caolán McNamara
93e5a0b132 ByteString::CreateFromAscii->rtl::OStringBuffer::valueOf 2011-07-19 21:50:47 +01:00
Caolán McNamara
09ec854d98 callcatcher: remove unused methods 2011-07-14 22:05:39 +01:00
Matúš Kukan
c8d7891600 Add prefixes for component_getFactory methods
Also remove accidentally kept .dxp files from gnumake'd module
2011-07-13 17:56:47 +02:00
Matus Kukan
22d4188f57 Remove component_getImplementationEnvironment 2011-07-12 11:10:12 +02:00
Matus Kukan
0eec34568c Move methods from component_getImplementationEnviron to component_getFactory 2011-07-11 20:34:42 +01:00
David Tardon
15c80d4db0 make this more readable 2011-06-23 06:11:02 +02:00
Bjoern Michaelsen
ed7c0e3aba gnumake4: more fixes in dbaccess 2011-06-21 17:19:20 +02:00
Bjoern Michaelsen
81ca9771b7 gnumake4: postmerge fixes in dbaccess reportdesign 2011-06-21 12:50:12 +02:00
Bjoern Michaelsen
e70b1417d2 Merge branch 'master' into feature/gnumake4
Conflicts:
	dbaccess/AllLangResTarget_adabasui.mk
	dbaccess/AllLangResTarget_dba.mk
	dbaccess/AllLangResTarget_dbmm.mk
	dbaccess/AllLangResTarget_sdbt.mk
	dbaccess/Executable_odbcconfig.mk
	dbaccess/JunitTest_dbaccess_unoapi.mk
	dbaccess/Library_adabasui.mk
	dbaccess/Library_dba.mk
	dbaccess/Library_dbaxml.mk
	dbaccess/Library_dbmm.mk
	dbaccess/Library_sdbt.mk
	dbaccess/Makefile
	dbaccess/Module_dbaccess.mk
	dbaccess/Package_inc.mk
	dbaccess/Package_uiconfig.mk
	dbaccess/prj/build.lst
	dbaccess/qa/unoapi/Test.java
	dbaccess/source/core/api/CacheSet.hxx
	dbaccess/source/core/dataaccess/SharedConnection.hxx
	dbaccess/source/core/dataaccess/connection.cxx
	dbaccess/source/filter/xml/xmlAutoStyle.cxx
	dbaccess/source/filter/xml/xmlColumn.cxx
	dbaccess/source/filter/xml/xmlComponent.cxx
	dbaccess/source/filter/xml/xmlConnectionData.cxx
	dbaccess/source/filter/xml/xmlConnectionResource.cxx
	dbaccess/source/filter/xml/xmlDataSource.cxx
	dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
	dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
	dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
	dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
	dbaccess/source/filter/xml/xmlDocuments.cxx
	dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
	dbaccess/source/filter/xml/xmlHelper.cxx
	dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
	dbaccess/source/filter/xml/xmlLogin.cxx
	dbaccess/source/filter/xml/xmlQuery.cxx
	dbaccess/source/filter/xml/xmlServerDatabase.cxx
	dbaccess/source/filter/xml/xmlTable.cxx
	dbaccess/source/filter/xml/xmlTableFilterList.cxx
	dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
	dbaccess/source/ui/app/AppDetailPageHelper.cxx
	dbaccess/source/ui/app/AppDetailView.cxx
	dbaccess/source/ui/app/AppIconControl.cxx
	dbaccess/source/ui/app/AppSwapWindow.cxx
	dbaccess/source/ui/app/AppTitleWindow.cxx
	dbaccess/source/ui/app/AppView.cxx
	dbaccess/source/ui/browser/AsyncronousLink.cxx
	dbaccess/source/ui/browser/genericcontroller.cxx
	dbaccess/source/ui/control/ColumnControlWindow.cxx
	dbaccess/source/ui/control/RelationControl.cxx
	dbaccess/source/ui/control/SqlNameEdit.cxx
	dbaccess/source/ui/control/TableGrantCtrl.cxx
	dbaccess/source/ui/control/VertSplitView.cxx
	dbaccess/source/ui/control/toolboxcontroller.cxx
	dbaccess/source/ui/dlg/CollectionView.cxx
	dbaccess/source/ui/dlg/ConnectionHelper.cxx
	dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
	dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
	dbaccess/source/ui/dlg/RelationDlg.cxx
	dbaccess/source/ui/dlg/TextConnectionHelper.cxx
	dbaccess/source/ui/dlg/detailpages.cxx
	dbaccess/source/ui/dlg/dlgsize.cxx
	dbaccess/source/ui/dlg/queryorder.cxx
	dbaccess/source/ui/dlg/tablespage.cxx
	dbaccess/source/ui/misc/TableCopyHelper.cxx
	dbaccess/source/ui/misc/ToolBoxHelper.cxx
	dbaccess/source/ui/misc/WExtendPages.cxx
	dbaccess/source/ui/misc/WNameMatch.cxx
	dbaccess/source/ui/misc/WTypeSelect.cxx
	dbaccess/source/ui/querydesign/ConnectionLine.cxx
	dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
	dbaccess/source/ui/querydesign/ConnectionLineData.cxx
	dbaccess/source/ui/querydesign/JAccess.cxx
	dbaccess/source/ui/querydesign/JoinController.cxx
	dbaccess/source/ui/querydesign/JoinDesignView.cxx
	dbaccess/source/ui/querydesign/JoinExchange.cxx
	dbaccess/source/ui/querydesign/JoinTableView.cxx
	dbaccess/source/ui/querydesign/QTableConnection.cxx
	dbaccess/source/ui/querydesign/QTableConnectionData.cxx
	dbaccess/source/ui/querydesign/QTableWindow.cxx
	dbaccess/source/ui/querydesign/QTableWindowData.cxx
	dbaccess/source/ui/querydesign/QueryDesignView.cxx
	dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
	dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
	dbaccess/source/ui/querydesign/QueryTextView.cxx
	dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
	dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
	dbaccess/source/ui/querydesign/TableConnection.cxx
	dbaccess/source/ui/querydesign/TableConnectionData.cxx
	dbaccess/source/ui/querydesign/TableWindow.cxx
	dbaccess/source/ui/querydesign/TableWindowAccess.cxx
	dbaccess/source/ui/querydesign/TableWindowData.cxx
	dbaccess/source/ui/querydesign/TableWindowListBox.cxx
	dbaccess/source/ui/querydesign/TableWindowTitle.cxx
	dbaccess/source/ui/querydesign/querydlg.cxx
	dbaccess/source/ui/querydesign/queryview.cxx
	dbaccess/source/ui/relationdesign/RTableConnection.cxx
	dbaccess/source/ui/relationdesign/RelationDesignView.cxx
	dbaccess/source/ui/relationdesign/RelationTableView.cxx
	dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
	dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
	dbaccess/source/ui/tabledesign/TEditControl.cxx
	dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
	dbaccess/source/ui/tabledesign/TableDesignView.cxx
	dbaccess/source/ui/tabledesign/TableFieldControl.cxx
	dbaccess/source/ui/tabledesign/TableRow.cxx
	dbaccess/source/ui/tabledesign/TableRowExchange.cxx
	dbaccess/source/ui/tabledesign/TableUndo.cxx
	dbaccess/source/ui/uno/ColumnControl.cxx
	dbaccess/source/ui/uno/ColumnPeer.cxx
	reportdesign/AllLangResTarget_rpt.mk
	reportdesign/AllLangResTarget_rptui.mk
	reportdesign/Library_rpt.mk
	reportdesign/Library_rptui.mk
	reportdesign/Library_rptxml.mk
	reportdesign/Module_reportdesign.mk
	reportdesign/Package_uiconfig.mk
	reportdesign/Package_xml.mk
	reportdesign/prj/build.lst
	reportdesign/prj/makefile.mk
2011-06-20 09:52:21 +02:00
Bjoern Michaelsen
c00fe9ce11 fixing rebase errors 2011-06-18 14:12:16 +02:00
Michael Stahl
f4b36d28c4 gnumake4: dbaccess: subsequent tests [hg:ccd0baa1c81a] 2011-06-17 18:30:17 +02:00
Michael Stahl
91834ef6fd gnumake4: dbaccess: linking against for seems unnecessary (and may break) [hg:fc9eecc5fae6] 2011-06-17 18:29:20 +02:00
Michael Stahl
64bcaf648b gnumake4: dbaccess: rename stuff so it builds again... [hg:6a688d53e64f] 2011-06-17 18:28:06 +02:00
Michael Stahl
e787230802 gnumake4: dbaccess: add missing uiconfig xml files [hg:53a113ad0eb0] 2011-06-17 18:26:28 +02:00
Michael Stahl
0e50d4a041 gnumake4: dbaccess: add missing include dir [hg:140bf9b8db24] 2011-06-17 18:03:33 +02:00
Michael Stahl
6c251a457b gnumake4: reportdesign, dbaccess: remove unnecessary package headers [hg:8f3bb53e08ce] 2011-06-17 16:58:34 +02:00
Michael Stahl
50b0d86115 gnumake4: dbaccess: fix non-WNT error [hg:80b1d47ae710] 2011-06-17 16:53:57 +02:00
Michael Stahl
2ac6f1c4f7 gnumake4: reportdesign, dbaccess: remove DOS lineendings [hg:ba7a15028880] 2011-06-17 16:51:32 +02:00
Ocke Janssen [oj]
6a91b70e1f gnumake4: fix to use new add rules [hg:76c825726ff2] 2011-06-17 14:53:14 +02:00
Ocke Janssen [oj]
2fa7e03614 gnumake4: new file added [hg:19da0341df50] 2011-06-17 14:52:31 +02:00
Ocke Janssen [oj]
3c93ed792e gnumake4: converted dbaccess [hg:8113b354673f] 2011-06-17 14:35:26 +02:00
David Tardon
d40a3fdbcb remove all traces of offuh from makefiles 2011-06-17 14:32:44 +02:00
Ocke Janssen [oj]
22a4c2db80 gnumake4: converted reportdesign [hg:e3de7a65caba] 2011-06-17 14:32:44 +02:00
Caolán McNamara
f1ea4ba447 fix tinderboxes 2011-06-14 09:54:19 +01:00
Kohei Yoshida
38c0147475 (Hopefully) fix the ambiguity error that the tinderboxes kept complaining. 2011-06-13 20:46:43 -04:00
Joseph Powers
5324c50280 Change ScTreeEntryList to no longer depend on class List. 2011-06-09 21:24:14 -07:00
Caolán McNamara
eb139d063e use standard template here 2011-06-02 00:06:10 +01:00
Jan Holesovsky
37032dc9dc Merge commit 'libreoffice-3.4.0.2' 2011-05-30 13:12:13 +02:00
Jan Holesovsky
ee6238002e Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/base 2011-05-27 20:49:14 +02:00
Jan Holesovsky
5d178b6a19 Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
	dbaccess/source/ui/app/makefile.mk
2011-05-27 20:39:17 +02:00
Joseph Powers
0f994a061c Revert TreeList to vector<> conversion.
This fixes a bug in Options->Path. I'll need to rework the conversion
later.
2011-05-26 20:16:11 -07:00
Thorsten Behrens
2f76d4b430 Remove hc paramater from aImageProvider.getFolderImage
This fixes the m106 merge.
2011-05-23 18:33:42 +02:00
Joseph Powers
3a2a53da02 class SvTreeEntryList is no longer dependant on class List 2011-05-22 20:27:19 -07:00
Tor Lillqvist
4233db9d50 Drop OS2 2011-05-21 15:41:03 +03:00
Caolán McNamara
5d6f7edfbb adjust for return by ref instead of pointer 2011-05-20 15:21:26 +01:00
Caolán McNamara
49a5cd8537 config leaks: drop dodgy LegacySingleton foo 2011-05-20 15:21:26 +01:00
Joseph Powers
1be46ab5d7 Remove an un-needed #include <svtools/treelist.hxx> 2011-05-20 05:56:35 -07:00
Christian Lohmaier
54b82306e1 WaE (picky) - noel / remove umlaut in comment (translate to english) 2011-05-17 01:31:36 +02:00
Tor Lillqvist
4c505502a8 We always use a Vista or newer SDK 2011-05-16 15:57:17 +03:00
Tor Lillqvist
571fd934a6 Link odbcconfig with user32 on Windows 2011-05-13 13:33:30 +03:00
Andras Timar
3b1f34204d remove double space from en-US messages 2011-04-27 17:07:00 +02:00
Andras Timar
e22b8f4716 remove double space from en-US message 2011-04-26 09:24:07 +02:00
Petr Mladek
bfdee0010a dbaccess-default-varchar-lenght.diff: default VARCHAR length to 100 (i#62664) 2011-04-22 16:08:26 +02:00
Jan Holesovsky
bc3bbd2bb4 Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
	dbaccess/source/core/api/CacheSet.cxx
	dbaccess/source/core/api/KeySet.cxx
	dbaccess/source/core/api/KeySet.hxx
	dbaccess/source/core/api/OptimisticSet.hxx
	dbaccess/source/core/api/RowSet.cxx
	dbaccess/source/core/api/RowSetCache.cxx
	dbaccess/source/core/api/query.cxx
	dbaccess/source/core/dataaccess/SharedConnection.cxx
	dbaccess/source/ui/app/AppController.cxx
	dbaccess/source/ui/app/makefile.mk
	dbaccess/source/ui/control/FieldDescControl.cxx
	dbaccess/source/ui/querydesign/query.src
	dbaccess/source/ui/tabledesign/TEditControl.cxx
	reportdesign/source/ui/report/ReportController.cxx
	reportdesign/source/ui/report/ReportSection.cxx
	reportdesign/source/ui/report/SectionWindow.cxx
	reportdesign/source/ui/report/StartMarker.cxx
	reportdesign/source/ui/report/ViewsWindow.cxx
2011-04-22 15:07:40 +02:00
Julien Nabet
959067af84 Just reformat a line 2011-04-20 14:15:47 +02:00
Caolán McNamara
7365f15396 get a little closer to building dbaccess under windows again 2011-04-19 21:12:52 +01:00
Michael Meeks
b6230195c5 fix sdbt compilation with gnumake 2011-04-19 16:18:54 +01:00