Commit graph

11139 commits

Author SHA1 Message Date
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
Norbert Thiebaud
e35c56815d fix mis-merge: no vso3 and use boost for hash 2011-03-12 20:58:29 -06: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
Thomas Arnhold
7851304cfb Move DBG_TRACE3 to OSL_TRACE 2011-03-11 23:45:24 +01:00
Thomas Arnhold
9bffdc92c2 Move DBG_TRACE2 to OSL_TRACE 2011-03-11 23:45:24 +01:00
Norbert Thiebaud
256f6ca67d Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (76 commits)
  masterfix DEV300: #i10000# usage of L10N build_type
  removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
  hr75: #i116747#: remove obsolete copyright notices
  gnumake3: remove comphelper version; fix including extract.hxx
  removetooltypes01: #i112600# Replace missing tools types replacement
  removetooltypes01: #i112600# remove tooltypes from reportdesign
  removetooltypes01: #i112600# remove tooltypes from dbaccess
  undoapi: don't use deprecated JUnit API, this seems to fail now (but didn't before the rebase)
  undoapi: those two classes do not belong into JAVATESTFILES, but JAVAFILES only
  undoapi: (I|Sfx)UndoManager now working with size_t instead of USHORT
  gridsort: give the UnoControl(Model/Base) classes a ctor taking a service factory, so we have access to the factory which created us, and don't need to resort to the process'es service factory
  dba34b: #109956# notify column value in correct order
  dba34b: #i114309# set default values for bit boolean and reset when we are on the insertrow
  undoapi: assert unknown slots in ImplInvalidateFeature
  dba34b: #i110907# check if design handle event
  dba34b: #i109956# notify column values when row is refreshed
  dba34b: #i115753# add test again
  undoapi: renamed Undo.* to RptUndo.*, to not confuse a certain IDE with different same-named files in the source tree ...
  undoapi: migrated report designer to use an own, model-bound UndoManager, instead of the UndoManager formerly bound to the controller
  undoapi: split OSingleDocumentController into DBSubComponentController (which the report design's controller will be derived from) and the still-so-named OSingleDocumentController. Module reportdesign does not compile with this change, this is yet to come.
  ...

Conflicts:
	dbaccess/inc/IEnvironment.hxx
	dbaccess/inc/dataview.hxx
	dbaccess/qa/complex/dbaccess/RowSet.java
	dbaccess/source/core/api/CacheSet.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/ext/adabas/Acomponentmodule.cxx
	dbaccess/source/ext/adabas/Aservices.cxx
	dbaccess/source/filter/migration/cfgimport.cxx
	dbaccess/source/filter/migration/cfgimport.hxx
	dbaccess/source/filter/migration/cfgservices.cxx
	dbaccess/source/filter/migration/makefile.mk
	dbaccess/source/inc/cfg_reghelper.hxx
	dbaccess/source/sdbtools/misc/sdbt_services.cxx
	dbaccess/source/shared/cfg_reghelper.cxx
	dbaccess/source/shared/cfgstrings.cxx
	dbaccess/source/shared/registrationhelper.cxx
	dbaccess/source/ui/app/AppController.cxx
	dbaccess/source/ui/app/AppDetailPageHelper.cxx
	dbaccess/source/ui/app/AppDetailPageHelper.hxx
	dbaccess/source/ui/app/AppDetailView.cxx
	dbaccess/source/ui/app/AppIconControl.cxx
	dbaccess/source/ui/app/AppSwapWindow.cxx
	dbaccess/source/ui/browser/brwctrlr.cxx
	dbaccess/source/ui/browser/dataview.cxx
	dbaccess/source/ui/browser/unodatbr.cxx
	dbaccess/source/ui/control/dbtreelistbox.cxx
	dbaccess/source/ui/control/opendoccontrols.cxx
	dbaccess/source/ui/control/tabletree.cxx
	dbaccess/source/ui/dlg/ConnectionHelper.cxx
	dbaccess/source/ui/dlg/ConnectionPage.src
	dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
	dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
	dbaccess/source/ui/dlg/ExtensionNotPresent.src
	dbaccess/source/ui/dlg/TablesSingleDlg.cxx
	dbaccess/source/ui/dlg/adodatalinks.hxx
	dbaccess/source/ui/dlg/dbadmin2.src
	dbaccess/source/ui/dlg/dbadminsetup.src
	dbaccess/source/ui/dlg/dlgattr.cxx
	dbaccess/source/ui/dlg/dlgsize.src
	dbaccess/source/ui/dlg/makefile.mk
	dbaccess/source/ui/dlg/sqlmessage.cxx
	dbaccess/source/ui/inc/ExtensionNotPresent.hxx
	dbaccess/source/ui/inc/TokenWriter.hxx
	dbaccess/source/ui/inc/imageprovider.hxx
	dbaccess/source/ui/misc/DExport.cxx
	dbaccess/source/ui/misc/HtmlReader.cxx
	dbaccess/source/ui/misc/RowSetDrop.cxx
	dbaccess/source/ui/misc/RtfReader.cxx
	dbaccess/source/ui/misc/TokenWriter.cxx
	dbaccess/source/ui/misc/imageprovider.cxx
	dbaccess/source/ui/misc/linkeddocuments.cxx
	dbaccess/source/ui/misc/singledoccontroller.cxx
	dbaccess/source/ui/querydesign/ConnectionData.hxx
	dbaccess/source/ui/querydesign/JoinTableView.cxx
	dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
	dbaccess/source/ui/querydesign/TableConnectionData.cxx
	dbaccess/source/ui/querydesign/TableWindowListBox.cxx
	dbaccess/source/ui/relationdesign/RelationController.cxx
	dbaccess/source/ui/relationdesign/RelationTableView.cxx
	dbaccess/source/ui/tabledesign/table.src
	reportdesign/inc/RptPage.hxx
	reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
	reportdesign/source/core/api/ReportDefinition.cxx
	reportdesign/source/core/sdr/ReportUndoFactory.cxx
	reportdesign/source/core/sdr/UndoEnv.cxx
	reportdesign/source/filter/xml/xmlservices.cxx
	reportdesign/source/ui/dlg/GroupsSorting.cxx
	reportdesign/source/ui/dlg/Navigator.cxx
	reportdesign/source/ui/inspection/metadata.cxx
	reportdesign/source/ui/misc/RptUndo.cxx
	reportdesign/source/ui/misc/UITools.cxx
	reportdesign/source/ui/misc/rptuiservices.cxx
	reportdesign/source/ui/report/DesignView.cxx
	reportdesign/source/ui/report/FixedTextColor.cxx
	reportdesign/source/ui/report/ReportController.cxx
	reportdesign/source/ui/report/ReportSection.cxx
	reportdesign/source/ui/report/SectionView.cxx
	reportdesign/source/ui/report/SectionWindow.cxx
	reportdesign/source/ui/report/StartMarker.cxx
	reportdesign/source/ui/report/ViewsWindow.cxx
	reportdesign/source/ui/report/dlgedfunc.cxx
	reportdesign/source/ui/report/report.src
2011-03-09 23:17:51 -06:00
J. Graeme Lingard
f71ad82e60 Remove 'added by' comments 2011-03-05 18:05:38 +00:00
Christina Rossmanith
ddd6d4d0d5 Removed /* ### ACHTUNG: Neuer Text in Resource? - lines from base 2011-03-04 22:17:03 +01:00
Thomas Arnhold
e80b540237 Move DBG_ERROR to OSL_FAIL 2011-03-02 14:54:39 +01:00
Caolán McNamara
438fc9eace resolve ambiguities 2011-03-01 20:34:03 +00:00
Caolán McNamara
e6f6020fe9 Pointless to convert char* to OString and back 2011-03-01 20:34:03 +00:00
Caolán McNamara
2a794186d8 pointless cast 2011-03-01 20:34:03 +00:00
Guillaume Poussel
051070d964 Remove bogus comments. 2011-03-01 20:51:13 +01:00
Guillaume Poussel
bd658dc67a Remove date comments in base. 2011-03-01 20:48:09 +01:00
David Tardon
4cc6566ef8 OSL_ASSERT takes a condition, not a message 2011-02-26 15:16:05 +01:00
Thomas Arnhold
756b7d315a Move bogus OSL_ASSERT(msg) to OSL_FAIL(msg) 2011-02-26 10:45:02 +01:00
David Tardon
91697b75c3 fix assertions 2011-02-25 17:47:41 +01:00
David Tardon
899053f93c fix debug build 2011-02-25 15:47:48 +01:00
Thomas Arnhold
ac0811b10e Move DBG_ERROR -> OSL_ASSERT 2011-02-24 18:26:34 +01:00
Thomas Arnhold
d51e84aa6d Move DBG_ASSERT -> OSL_ENSURE 2011-02-24 18:22:15 +01:00
Ivo Hinkelmann
dee1ea7016 masterfix DEV300: #i10000# usage of L10N build_type 2011-02-22 19:07:34 +01:00
Release Engineering
7c46aeed98 merged DEV300 2011-02-18 11:14:19 +01:00
Ivo Hinkelmann
afc50b5eda CWS-TOOLING: integrate CWS gridsort 2011-02-17 16:53:53 +01:00
Ingrid Halama [iha]
8b35f0adeb chart52: merge with DEV300_m100 2011-02-15 13:28:01 +01:00
Frank Schoenheit [fs]
5ebc543767 gridsort: pulled and merged DEV300_m100 2011-02-14 23:00:48 +01:00
Jens-Heiner Rechtien [hr]
b1708ffb49 CWS-TOOLING: integrate CWS hr75 2011-02-10 14:54:48 +01:00
Thomas Arnhold
7b6f8f33c7 Remove static if-statement 2011-02-09 21:00:39 +01:00
Tor Lillqvist
7e2c45ac8b prewin.h already includes <windows.h> 2011-02-09 01:01:14 +02:00
Luboš Luňák
da194cb73f more std:: -> o3tl:: build fixes 2011-02-08 20:15:33 +01:00
Luboš Luňák
78836f854c more std:: -> o3tl:: build fixes 2011-02-08 19:48:38 +01:00
Luboš Luňák
889a2487d2 std::bit_vector -> std::vector<bool> 2011-02-08 19:48:38 +01:00
Luboš Luňák
15c6c2085a more std:: -> o3tl:: build fixes 2011-02-08 19:48:37 +01:00
Guillaume Poussel
d0b78acb2d Remove useless comments. 2011-02-08 19:07:29 +01:00
Guillaume Poussel
c93d29181a Clean-up bogus comments in base. 2011-02-08 18:45:09 +01:00
Tor Lillqvist
9a9c4c0159 Adapt to move of prewin.h and postwin.h 2011-02-08 13:00:28 +02:00
Mathias Bauer
6783aa1b25 CWS gnumake3: pull in cws removetooltypes01 2011-02-08 11:49:29 +01:00
Carsten Driesner
40b467cbda removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw 2011-02-08 11:05:35 +01:00
Fridrich Štrba
ae83611813 std::bit_vector -> ::std::vector<bool, std::allocator<bool> > 2011-02-08 07:42:48 +01:00
Jan Holesovsky
df1ed38e98 Merge remote branch 'origin/libreoffice-3-3' 2011-02-08 00:02:34 +01:00
Thomas Arnhold
d52676fd81 Remove unused using namespace 2011-02-07 23:05:03 +01:00
Jens-Heiner Rechtien [hr]
bd79682982 hr75: #i116747#: remove obsolete copyright notices 2011-02-07 19:06:51 +01:00
Carsten Driesner
84a2bad767 removetooltypes01: Rebase to DEV300m99 2011-02-07 13:06:08 +01:00
Fridrich Štrba
57e8c3fdd4 move to unordered containers 2011-02-05 18:31:11 +01:00
Mathias Bauer
0dbcc3e078 CWS gnumake3: resync to m99 2011-02-03 15:53:56 +01:00
Caolán McNamara
cde6136f58 mark unimplemented copy ctor and assignment as private, and fix sigs 2011-02-03 14:37:24 +00:00
Joseph Powers
c52af4e32a Remove a #include that wasn't needed.
Plus, some tailing white space.
2011-02-03 05:41:11 -08:00
Ingrid Halama [iha]
f720ab7333 chart52: merge with DEV300_m99 2011-02-03 12:49:56 +01:00