Commit Graph

140 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
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
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
Thomas Arnhold
ba7e0d7574 Replace suitable equalsAscii calls with equalsAsciiL.
Done with sed -i 's%\(\.equalsAscii\)(\(\s\?"[^"]\+"\)\(\s\?\))%\1L(\3RTL_CONSTASCII_STRINGPARAM(\2\3)\3)%g'.
2011-01-20 10:27:06 +01:00
Takeshi Abe
da474bc40c Replace all occured, occurance etc. 2010-12-05 20:15:19 +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
Frank Schoenheit [fs]
088b7d6202 dba34b: merge after pulling DEV300.m94 2010-11-22 14:30:32 +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
Caolán McNamara
12f6fcc934 fix my own cockup 2010-10-30 21:46:00 +01:00
Gert Faller
895f2b616c Use RTL_CONSTASCII_USTRINGPARAM 2010-10-30 21:44:13 +01:00
Ocke.Janssen
cc4d9f5b12 dba34b: #i115290# use insert row instead of key row 2010-10-28 14:15:54 +02:00
Jan Holesovsky
c0101e8841 Merge commit 'ooo/OOO330_m12' 2010-10-24 15:26:09 +02:00
Ocke.Janssen
d39c01b36b dba33k: #i114026# check if key columns from all tables are involved 2010-10-18 12:38:57 +02:00
Jan Holesovsky
7e021847d5 Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/base 2010-10-13 14:37:08 +02:00
Gil Forcada
1aa44a7761 Removed comments, trailing spaces and death code 2010-10-13 12:18:30 +02:00
Jan Holesovsky
23105b53eb Merge commit 'ooo/OOO330_m10'
Conflicts:
	dbaccess/source/core/api/RowSetCache.cxx
	dbaccess/source/core/misc/DatabaseDataProvider.cxx
2010-10-13 11:26:25 +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
Jan Holesovsky
3c60c87612 Merge commit 'ooo/OOO330_m9' 2010-10-06 12:33:00 +02:00
Petr Mladek
dc8c15ae62 remove include guards using fixguard.py 2010-10-05 17:58:28 +02:00
Frank Schoenheit [fs]
c212d89821 dba33j: i114026: findTableColumnsMatching_throw: take the update-table's name as parameter, to catch the cases where the name is an alias 2010-09-22 11:08:30 +02:00
Frank Schoenheit [fs]
0aff2fc6c6 dba33h: merge 2010-09-01 13:31:14 +02:00
Ocke Janssen [oj]
dfc9073aae dba33h: #i114246# use correct table name 2010-09-01 13:09:46 +02:00
Ocke Janssen [oj]
0999deb988 dba33h: #i114246# use correct table name 2010-09-01 13:09:46 +02:00
Ocke Janssen [oj]
368fcc28b1 dba33i: #i114173# fix name to select from and field name of auto incremtn column 2010-08-31 13:42:47 +02:00
Ocke Janssen [oj]
a23d2db4f0 fs33a: #i113631# use m_sUpdateTableName 2010-08-24 15:36:19 +02:00
Ocke Janssen [oj]
bb76500478 fs33a: #i113744# check length of value 2010-08-24 15:00:36 +02:00
Ocke Janssen [oj]
016832dafb dba33g: #i111205# quote tablename 2010-07-20 10:45:17 +02:00
Ocke Janssen [oj]
42584318cc dba33g: #i111205# handle filter for key and update and insert row 2010-07-08 12:21:55 +02:00
Ocke Janssen [oj]
7afdc1af09 dba33g: #i112520# don't use getBestRowIdent.. 2010-07-06 15:20:20 +02:00
Release Engineering
c4bc203f2f masterfix: #i10000# build issue 2010-06-07 14:10:31 +02:00
Ivo Hinkelmann
9047cf03f4 CWS-TOOLING: integrate CWS dba33f 2010-06-04 14:23:34 +02:00
Ocke Janssen [oj]
1a3fc73ec4 dba321b: #i110942# use default if key columsn are unknown 2010-04-19 11:50:35 +02:00
Jens-Heiner Rechtien
f09e3e9714 DEV300 masterfix: #i10000#: dbaccess: KeySet.[ch]xx: merge/build fixes 2010-04-20 13:33:34 +02:00
Frank Schoenheit [fs]
b6693080a1 dba33f: merge with m76-branch 2010-04-16 13:55:24 +02:00
Ocke Janssen
3e2140dbcb #i109549# cache row values when a filter value which is not part of the key values 2010-03-24 10:16:28 +00:00
Ocke Janssen
b5bd2479cc #i110111# fix access column names problem 2010-03-17 09:11:06 +00:00
Ocke Janssen
e4416c73ca #i109549# use setElementaryQuery 2010-03-01 14:20:21 +00:00
Ocke Janssen [oj]
a4bc14c0d6 Automated merge with http://hg.services.openoffice.org/cws/dba33f 2010-02-15 10:24:00 +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
Ocke Janssen [oj]
55aca7c428 automated merge from dba33e 2010-02-11 07:55:30 +01:00
Ivo Hinkelmann
1e1b1d60af CWS-TOOLING: integrate CWS dba33d 2010-01-27 13:51:16 +01:00
Ocke Janssen
5baf3b6cc7 #i108412# use setQuery and getQuery again 2010-01-22 11:25:43 +00:00
Ocke Janssen [oj]
9589135c0d Automated merge with http://hg.services.openoffice.org/cws/dba33f 2010-01-22 12:23:58 +01:00
Ocke Janssen [oj]
d4d5d883ec dba33f: #i108548# extend SingleSelectQueryComposer appendFilterByColumn with additonal parameter 2010-01-22 08:14:22 +01:00
Ocke Janssen
c4f38545f3 dba321a: #i108390# fix of query which is used 2010-01-21 09:28:19 +00:00