Commit Graph

25 Commits

Author SHA1 Message Date
3679956b23 dbaccess: fix build after AutoControls_tmpl.hrc removal
Change-Id: I8e7e926aae646225234cf9e41fdf048735f40eb0
2014-08-15 13:11:13 +02:00
20d52860f7 res ctor OCommonBehaviourTabPage::OCommonBehaviourTabPage can go now
Change-Id: I0697faa1e66b912e3090c149efdf409c33b31b9c
2014-08-15 10:58:31 +01:00
a5cc3ce566 Convert DLG_COLLECTION_VIEW to .ui
Conflicts:
	include/svtools/fileview.hxx
	svtools/source/contnr/fileview.cxx

Change-Id: I78b590410ec4e55eeecd2da8ab79738f05e403b5
Reviewed-on: https://gerrit.libreoffice.org/9981
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-02 08:47:13 +00:00
3db8d606d5 hrc and src files: squeeze multiple newlines
for i in `find . -name *.src -or -name *.hrc`; do FILE=$(cat -s "$i"); echo "$FILE" > "$i"; done

Change-Id: I2bac5ad3e1eb3c566e5c867ccf45893a19e1561e
2014-05-19 20:04:22 +02:00
2a33953f6e Remove visual noise from dbaccess
Change-Id: I1130439e5883672b4ca462838d72197acd6bc1f2
Reviewed-on: https://gerrit.libreoffice.org/8251
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-27 06:44:14 -06:00
5c72a213c7 convert table filter page to .ui
Change-Id: I7bfb7698e2a5303b492766fba564c7b9033bcc52
2014-01-21 14:55:46 +00:00
91da177229 remove various unused dialogs
Change-Id: If639745db976671a3b6e3405253dfb3bc5783363
2013-08-17 13:09:23 +01: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
614211fadf CWS-TOOLING: integrate CWS dba34a 2010-11-08 16:01:31 +01:00
91ff13dd6a CWS changehid: generate former auto hids into src files 2010-10-11 17:56:12 +02:00
770aabb606 dba34a: removed unused string resources / resource IDs 2010-09-15 11:51:07 +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
0099109a22 INTEGRATION: CWS changefileheader (1.9.12); FILE MERGED
2008/03/31 13:27:15 rt 1.9.12.1: #i87441# Change license header to LPGL v3.
2008-04-10 13:45:22 +00:00
25bb24deca INTEGRATION: CWS textconnectionsettings (1.8.170); FILE MERGED
2008/03/05 12:55:51 fs 1.8.170.1: #i86720# some re-factoring, owed to the fact that we now have a stand-alone dialog for entering text/csv settings, which re-uses existing functionality
2008-03-07 10:22:33 +00:00
4ebc600a0b INTEGRATION: CWS mergede01 (1.7.204); FILE MERGED
2007/03/20 14:45:24 ihi 1.7.204.1: #i72301# Remove German
2007-04-19 13:59:46 +00:00
23dede7bb7 INTEGRATION: CWS kaddrbook (1.4.110); FILE MERGED
2005/12/09 10:06:25 fs 1.4.110.5: removed unused string STR_ADDRESSBOOK_KAB
2005/12/03 00:54:34 ebischoff 1.4.110.4: Oops
2005/12/03 00:52:58 ebischoff 1.4.110.3: Fixing
2005/11/30 00:20:22 kendy 1.4.110.2: RESYNC: (1.4-1.6); FILE MERGED
2005/08/29 08:51:32 ebischoff 1.4.110.1: Changes needed for new KDE address book driver
2005-12-19 16:16:38 +00:00
f77115eb67 INTEGRATION: CWS encup (1.4.42); FILE MERGED
2005/04/29 16:01:25 ihi 1.4.42.1: #i40603# German strings now UTF8 encoded
2005-09-23 13:13:21 +00:00
cfa037f3e3 INTEGRATION: CWS ooo19126 (1.4.114); FILE MERGED
2005/09/05 17:33:42 rt 1.4.114.1: #i54170# Change license header: remove SISSL
2005-09-08 13:55:06 +00:00
64f3606001 INTEGRATION: CWS mozab05 (1.2.66); FILE MERGED
2005/01/31 08:18:14 windly 1.2.66.2: RESYNC: (1.2-1.3); FILE MERGED
2004/12/03 10:26:00 windly 1.2.66.1: #i20088# add ThunderBird address book type to database wizward
2005-02-21 11:43:11 +00:00
89f5b5d935 INTEGRATION: CWS dba22 (1.2.62); FILE MERGED
2005/01/10 09:06:20 oj 1.2.62.4: compile error
2005/01/07 10:31:08 oj 1.2.62.3: merge conflict
2004/12/28 13:30:57 fs 1.2.62.2: #i39602# removed obsolete strings
2004/12/20 15:27:27 fs 1.2.62.1: #i39187# renamed and moved STR_CALCDOC_DOESNOTEXIST
2005-01-21 16:14:18 +00:00
d651e4119c INTEGRATION: CWS insight01 (1.1.2); FILE ADDED
2004/07/09 14:59:04 oj 1.1.2.8: resource changes
2004/07/09 09:17:11 oj 1.1.2.7: resource changes
2004/07/07 11:15:56 oj 1.1.2.6: resource changes
2004/05/28 13:28:37 oj 1.1.2.5: remove some unused things
2004/04/16 12:53:10 oj 1.1.2.4: #116000# insert string review
2004/03/05 07:04:39 oj 1.1.2.3: #111090# change the appearance of the dialogs
2003/08/15 08:50:59 oj 1.1.2.2: #111075# ongoing new dbaapp work
2003/07/29 12:30:51 oj 1.1.2.1: #111075# new classes for the props of ds
2004-08-02 14:44:50 +00:00