Commit Graph

60 Commits

Author SHA1 Message Date
dcee245d88 typos
Change-Id: I2e7676ddec446dfdb72018a1039d6271f963376c
2014-05-08 18:29:23 +02:00
dca7bd06ca convert relation dialog to .ui format
Change-Id: I5c3fce06cbcd9ce46e85f66fb06369155d514efe
2014-03-13 16:24:15 +00:00
07579ec100 convert query join dialog to .ui format
Change-Id: I1de2bb1d171e23a42834e20040ade92822901876
2014-03-13 16:24:15 +00:00
a0296296fb fdo#60691 add modelines to *.src and *.hrc files
use solenv/bin/add-modulelines script for the task
and remove all UTF bom from *.src and *.hrc files

svx/source/dialog/hdft.src

Change-Id: I745d4f0fe9b05436a142a03f8512970f91c41bd4
2013-03-08 21:02:26 +00:00
5a7e8389f0 hrc cleanup: Remove include guards from src files
Change-Id: I7d52837f4058bab1bb5a0137788521d12834d519
2012-07-14 05:43:47 +02:00
577cf8ff67 re-base on ALv2 code. 2012-06-14 17:41:07 +01:00
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
0b176013df .bmp to .png, plus formatting issues. 2010-11-23 21:44:31 -08:00
91ff13dd6a CWS changehid: generate former auto hids into src files 2010-10-11 17:56:12 +02:00
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
b7a36d7af2 INTEGRATION: CWS changefileheader (1.49.96); FILE MERGED
2008/03/31 13:27:59 rt 1.49.96.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:29:48 +00:00
63a640b19f INTEGRATION: CWS dba24b (1.48.50); FILE MERGED
2007/08/22 11:41:59 oj 1.48.50.1: #i76374# handle cross join as natural join now in query design
2007-11-01 14:36:14 +00:00
8b3346c7b0 INTEGRATION: CWS mergede01 (1.47.242); FILE MERGED
2007/03/20 14:45:29 ihi 1.47.242.1: #i72301# Remove German
2007-04-19 14:06:58 +00:00
f677965f9a INTEGRATION: CWS encup (1.45.152); FILE MERGED
2005/04/29 16:01:30 ihi 1.45.152.1: #i40603# German strings now UTF8 encoded
2005-09-23 13:18:25 +00:00
e468a650fe INTEGRATION: CWS ooo19126 (1.45.224); FILE MERGED
2005/09/05 17:35:40 rt 1.45.224.1: #i54170# Change license header: remove SISSL
2005-09-08 15:34:31 +00:00
521fce443e INTEGRATION: CWS mergebuild (1.40.26); FILE MERGED
2004/05/18 14:58:16 hjs 1.40.26.5: RESYNC: (1.43-1.44); FILE MERGED
2004/04/21 05:57:36 hjs 1.40.26.4: RESYNC: (1.40-1.43); FILE MERGED
2003/12/16 16:16:39 ihi 1.40.26.3: x-no-translate conversion
2003/11/11 19:16:24 ihi 1.40.26.2: en -> en-US
2003/11/10 16:42:19 ihi 1.40.26.1: #111234# Merge during build
2004-06-26 16:33:50 +00:00
17525828e2 INTEGRATION: CWS cso001 (1.42.14); FILE MERGED
2004/03/23 12:46:03 hjs 1.42.14.1: #116006# merge
2004-04-27 09:43:14 +00:00
b0208743d9 INTEGRATION: CWS formdesign01 (1.40.62); FILE MERGED
2004/01/05 14:28:31 fs 1.40.62.2: RESYNC: (1.40-1.41); FILE MERGED
2003/12/04 14:37:36 fs 1.40.62.1: moved ids of some local resources from the global id list to a local list
2004-03-19 11:13:34 +00:00
59e53c6371 INTEGRATION: CWS oj07 (1.40.20); FILE MERGED
2004/01/28 09:29:46 oj 1.40.20.2: RESYNC: (1.40-1.41); FILE MERGED
2003/10/10 08:16:39 fs 1.40.20.1: #105072# additional info text for join types / consistent german terminology for joins (Verknüpfung vs. Verbindung)
2004-03-02 11:47:37 +00:00
3e0f3df232 INTEGRATION: CWS geordi2q11 (1.40.72); FILE MERGED
2003/12/16 11:05:25 hr 1.40.72.1: #111934#: join CWS ooo111fix1
2003-12-17 14:21:12 +00:00
9fa5a04845 INTEGRATION: CWS mergerc3 (1.39.6); FILE MERGED
2003/07/16 17:11:22 ihi 1.39.6.1: rc-3 merge all languages
2003-07-17 11:19:56 +00:00
28a33fcce4 INTEGRATION: CWS rc2merge (1.38.8); FILE MERGED
2003/07/03 14:44:25 ihi 1.38.8.1: rc-2 merge all languages
2003-07-03 17:03:21 +00:00
57e31f6cb0 INTEGRATION: CWS rcmerge (1.37.24); FILE MERGED
2003/06/12 10:58:06 gh 1.37.24.1: final Merge RC
2003-06-13 11:56:13 +00:00
5650da39b8 INTEGRATION: CWS mergem8 (1.36.8); FILE MERGED
2003/04/29 08:34:10 gh 1.36.8.2: final merge for Beta2
2003/04/14 15:04:46 gh 1.36.8.1: merging all languages
2003-04-29 16:25:51 +00:00
2facbebb88 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-19 16:57:12 +00:00
6d7d12d473 Merge SRX644: 05.12.02 - 11:27:41 2002-12-05 09:31:41 +00:00
04cdf24026 Merge SRX644: 25.11.02 - 16:08:20 2002-11-25 14:12:13 +00:00
857a985209 Merge SRX643: 05.09.02 - 13:29:20 2002-09-05 10:32:44 +00:00
1c744a13fa #99473# change string resource files 2002-08-19 07:01:32 +00:00
bb3f6c09bd Merge SRX642: 10.06.02 - 22:13:44 2002-06-10 19:14:05 +00:00
134fa62149 Merge SRX642: 28.05.02 - 22:15:21 2002-05-28 19:15:50 +00:00
f59aef5f9c Merge SRX642: 23.05.02 - 22:15:42 2002-05-23 19:15:13 +00:00
ddff6cae70 Merge SRX642: 29.04.02 - 22:12:58 2002-04-29 19:13:09 +00:00
fbdf14d9b3 #97666##97667# insert new helpids and unique ids 2002-02-27 09:20:16 +00:00
332420922c #90580# introduce new file for relation control 2002-02-06 06:45:42 +00:00
28d00c585d Merge SRC641: 14.12.01 - 17:40:51 2001-12-14 15:42:41 +00:00
184875c254 Merge SRC641: 11/13/01 - 22:47:16 2001-11-13 21:46:35 +00:00
549639f64d Merge SRC641: 01.11.01 - 22:34:21 2001-11-01 20:34:15 +00:00
fb83a6fa8d Merge SRC641: 19.10.01 - 23:27:14 2001-10-19 20:26:49 +00:00
6396a3018a Merge SRC641: 17.10.01 - 22:59:45 2001-10-17 20:00:49 +00:00
865166838f Merge SRC641: 11.10.01 - 22:54:23 2001-10-11 19:55:20 +00:00
1a8aa3b911 Merge SRC638: 25.09.01 - 22:20:13 2001-09-25 19:20:42 +00:00
655de444e3 Merge SRC638: 24.08.01 - 22:43:47 2001-08-24 19:43:50 +00:00
de3bb3de29 Merge SRC638: 22.08.01 - 00:01:29 2001-08-21 21:02:15 +00:00
279f508675 Merge SRC638: 14.08.01 - 17:07:17 2001-08-14 14:07:54 +00:00
9529ec42a1 Merge SRC638: 10.08.01 - 22:53:34 2001-08-10 19:54:11 +00:00
6845b170d0 Merge SRC638: 08/07/01 - 16:52:00 2001-08-07 13:51:58 +00:00
f586615634 Merge SRC638: 13.07.01 - 22:46:14 2001-07-13 19:47:13 +00:00
dc080f7285 Merge SRC633: 06/29/01 - 04:09:52 2001-06-29 01:09:29 +00:00
5d8437d97c Fix #86988#: Redesign of dialogs 2001-06-21 14:32:06 +00:00