Commit graph

9530 commits

Author SHA1 Message Date
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
Ocke Janssen [oj]
3c93ed792e gnumake4: converted dbaccess [hg:8113b354673f] 2011-06-17 14:35:26 +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
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
f9a7dacf5b Wae: resolve dbgutil vs dbglevel 2011-04-19 10:41:51 +01:00
David Tardon
c4bac972b4 use SAL_DLLPUBLIC_EXPORT for consistency 2011-04-19 06:14:23 +02:00
David Tardon
d9d7e94474 gbuildize dbaccess 2011-04-19 06:13:10 +02:00
Caolán McNamara
d8a2cbce69 catch by const reference 2011-04-13 12:04:28 +01:00
Caolán McNamara
f02937ddfb catch by const reference 2011-04-13 09:40:26 +01:00
Caolán McNamara
32a1f5bae6 fix typo 2011-04-05 20:38:28 +01:00
Caolán McNamara
c7938081c5 createFromAscii -> RTL_CONSTASCII_USTRING 2011-04-05 17:03:23 +01:00
Caolán McNamara
a367e9f186 catch exceptions by const reference 2011-03-31 14:57:09 +01:00
Francisco Saito
d2773713d6 drop bogus executable flag from idl/build/src and config files 2011-03-29 21:47:36 +01:00
Francisco Saito
be5ff06d05 drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:38:58 +01:00
Caolán McNamara
9e3d3cd3b5 catch exceptions by const reference 2011-03-28 16:46:25 +01:00
Caolán McNamara
67d1c9384f catch exceptions by const reference 2011-03-28 16:18:12 +01:00
Caolán McNamara
742925d6e5 catch exceptions by reference 2011-03-28 16:08:55 +01:00
Caolán McNamara
8cf1a1f075 use PartialWeakComponentImplHelperX for overloaded-virtual 2011-03-28 14:12:51 +01:00
Fridrich Štrba
e68c3fc22a Wholesale prewin.h/postwin.h removal 2011-03-25 18:43:59 +01:00
Luboš Luňák
08245a19a5 remove virtual from operator=
pointless, nothing overrides it
2011-03-23 11:01:53 +01:00
David Tardon
cfeb82a6d8 solar types are gone--remove this hack 2011-03-19 14:46:54 +01:00
Thomas Arnhold
fbcbfa9d34 Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...) 2011-03-19 14:05:01 +01:00
Ocke Janssen [oj]
8473229179 dba34d: #i66846# check bookmarable before use statis resultset 2011-03-18 09:31:06 +01:00
Jan Holesovsky
41bc9ff8d7 Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
	dbaccess/source/core/misc/services.cxx
	dbaccess/source/filter/migration/cfgimport.cxx
	reportdesign/source/core/api/ReportDefinition.cxx
2011-03-17 16:09:38 +01:00
Ocke Janssen [oj]
ac254e099c dba34d: remove patch for date axises 2011-03-17 14:37:53 +01:00
Ocke Janssen [oj]
1831ee1d1a dba34d: #i86167# fix for 64 bit long value to int32 2011-03-16 12:48:58 +01:00
Ocke Janssen
e76d571936 dba34d: #i116774# set date descriptions 2011-03-14 11:06:22 +01:00
Norbert Thiebaud
1f9060d1e0 fix mis-merge 2011-03-12 19:20:31 -06:00
Thomas Arnhold
f6ccb8354a Move OSL_ENSURE(0,...) to OSL_FAIL(...) 2011-03-12 14:05:07 +01:00
Thomas Arnhold
7a7f390db3 Move OSL_ENSURE(false,...) to OSL_FAIL(...) 2011-03-12 14:05:06 +01:00
Thomas Arnhold
4882ec6c95 Remove exclamation marks from OSL_FAIL statements 2011-03-12 13:57:34 +01:00