Commit Graph

225 Commits

Author SHA1 Message Date
Michael Stahl
3c6d38fed0 dbaccess: RowSet.cxx: update m_bIsInsertRow
fixes an STL assertion; this line was accidentally removed in merge commit
bc3bbd2bb4
2011-09-15 14:07:29 +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
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
Thomas Arnhold
f6ccb8354a Move OSL_ENSURE(0,...) to OSL_FAIL(...) 2011-03-12 14:05:07 +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
Guillaume Poussel
bd658dc67a Remove date comments in base. 2011-03-01 20:48:09 +01:00
David Tardon
91697b75c3 fix assertions 2011-02-25 17:47:41 +01:00
Thomas Arnhold
ac0811b10e Move DBG_ERROR -> OSL_ASSERT 2011-02-24 18:26:34 +01:00
Ocke Janssen [oj]
9a2ce2d264 dba34c: #i117043# fix modified state of rowset 2011-02-23 11:36:11 +01:00
Guillaume Poussel
c93d29181a Clean-up bogus comments in base. 2011-02-08 18:45:09 +01:00
Fridrich Štrba
ae83611813 std::bit_vector -> ::std::vector<bool, std::allocator<bool> > 2011-02-08 07:42:48 +01:00
serval
3571121d40 Some cppcheck cleaning 2011-01-15 17:09:39 +00:00
Ocke Janssen [oj]
ac621cb00c dba34b: #109956# notify column value in correct order 2010-11-29 13:15:25 +01:00
Takeshi Abe
7904d8dc62 cppcheck: use ++ as prefix 2010-11-27 20:41:35 +00:00
Ocke.Janssen
f9416a7fd8 dba34b: #i115655# new ui setting for max row scan for text db 2010-11-25 11:23:27 +01:00
Ocke.Janssen
9ad6117703 dba34b: #i111542# fix for max rows 2010-11-24 14:23:06 +01:00
Takeshi Abe
98ab2fdde6 remove dead codes and undesired comments 2010-11-23 07:40:17 +01:00
Wol
9b6062afb3 Spelling mistakes, and deleting unwanted comments and commented code 2010-11-10 08:50:30 +01:00
Norbert Thiebaud
2abe026903 Revert "Smelling pistakes, german comments, and a little commented code in base"
This reverts commit 8d33d95cde5f423aee284bbbcff810cbba1a910a.

I've been told by a german native speaker that the translation was mostly babelish
and quite incomprehensible, so revert for now.
2010-11-08 02:50:53 -06:00
Wols Lists
450ede6604 Smelling pistakes, german comments, and a little commented code in base
I think I've translated most of the german stuff correctly (I speak
german somewhat, and used babelfish to help) .

From f203be2f74f8ea4df960876434f8e55cd7973ab9 Mon Sep 17 00:00:00 2001
From: Wol <anthony@youngman.org.uk>
Date: Sun, 7 Nov 2010 01:52:20 +0000
Subject: [PATCH] Miscellaneous spelling mistakes, german, and commented code
2010-11-06 22:25:03 -05:00
Tor Lillqvist
597a7ece38 Fix build breakage in a dbgutil-enabled build 2010-11-06 21:38:12 +02:00
Gert Faller
895f2b616c Use RTL_CONSTASCII_USTRINGPARAM 2010-10-30 21:44:13 +01:00
Norbert Thiebaud
25ecc1fd1a merge vosremoval-reference.diff 2010-10-25 17:54:56 -05:00
Gil Forcada
1aa44a7761 Removed comments, trailing spaces and death code 2010-10-13 12:18:30 +02:00
Sebastian Spaeth
6450d1a7f5 Add vim/emacs modelines to all source files
Fixes #fdo30794
Based on bin/add-modelines script (originally posted in mail
1286706307.1871.1399280959@webmail.messagingengine.com)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-10-13 10:57:12 +02:00
Rubén Jáñez
910a1f688b Removes some bogus comments found in Base. 2010-10-11 10:39:25 +01:00
Kayo Hamid
d7f4b5a0fc Use SAL_N_ELEMENTS macro 2010-10-09 22:17:25 -05:00
Kohei Yoshida
d530c10e58 Ported calc-perf-import-dbf-dbaccess.diff from ooo-build.
Add mechanism to optionally turn off property change notification,
which is quite expensive.
2010-10-01 22:29:22 -04:00
Ocke Janssen [oj]
d98c5119b4 dba33g: clear warnings when free resource to avoid disposed exception when reloaded 2010-07-07 08:25:19 +02:00
Frank Schoenheit [fs]
b6693080a1 dba33f: merge with m76-branch 2010-04-16 13:55:24 +02:00
Frank Schoenheit [fs]
c73b3e8ea9 autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore. 2010-03-11 11:26:05 +01:00
Ocke Janssen [oj]
4c43716cec dba33f: #i53377# impl join rowse helper resultset which is updateable 2010-02-15 09:53:53 +01:00
Jens-Heiner Rechtien
1708f6091b changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Ivo Hinkelmann
1e1b1d60af CWS-TOOLING: integrate CWS dba33d 2010-01-27 13:51:16 +01:00
Ocke Janssen [oj]
cea09e968c dba33f: #i108548# handle Label property from parse column and rowsetcolumn 2010-01-22 10:31:43 +01:00
Ocke Janssen [oj]
d4d5d883ec dba33f: #i108548# extend SingleSelectQueryComposer appendFilterByColumn with additonal parameter 2010-01-22 08:14:22 +01:00
Ocke Janssen [oj]
cb9cb96ca8 Automated merge with file:///net/so-cwsserv01/export/cws/dba33d/DEV300/ooo 2010-01-21 15:22:59 +01:00
Ocke Janssen [oj]
1ff3ea1c28 dba33e: merge to m70 2010-01-21 11:54:03 +01:00
Ocke Janssen [oj]
6b65460828 dba33d: #i108517# order of checks changed 2010-01-21 08:32:46 +01:00
Ocke Janssen [oj]
b84930a93b dba33b: merge 2010-01-15 09:58:18 +01:00
Ocke Janssen [oj]
890251245c dba33b: merge m69 2010-01-15 09:16:51 +01:00
Ocke Janssen [oj]
3bd5a7908b dba33f: #i104413# make column names unique 2010-01-13 12:37:12 +01:00
Ocke Janssen [oj]
f67abf2e35 dba33f: merge from dba33e 2010-01-08 14:12:39 +01:00
Ocke Janssen [oj]
79958d9c6f enable hierachical queries 2010-01-07 09:06:53 +01:00
Ocke Janssen [oj]
6f4bc5831a dba33e: #i107717# allow the command definition to define the column names which should be shown 2009-12-21 14:42:31 +01:00
Ocke Janssen [oj]
01b25b739d Automated merge with http://hg.services.openoffice.org/cws/dba33e 2009-12-17 17:25:59 +01:00
Ocke Janssen [oj]
6fd6b96682 dba33e: #i107717# impl first entry points for db extensions 2009-12-16 12:46:33 +01:00
Frank Schoenheit [fs]
082823a7e7 dba33d: merge after pulling the latest changes from CWS dba33b 2009-12-11 13:27:24 +01:00
Ocke Janssen [oj]
c7693e1f24 dba33d: merge 2009-12-10 11:35:53 +01:00
Ocke Janssen [oj]
c66201b66d dba33d: merge with DEV300_m67 2009-12-10 07:40:02 +01:00