Commit graph

81 commits

Author SHA1 Message Date
Xisco Fauli
6c76e4db03 Merge branch 'master' into feature/gsoc2011_wizards
Conflicts:
	automation/source/inc/cmdbasestream.hxx
	automation/source/server/cmdbasestream.cxx
	automation/source/server/retstrm.hxx
	automation/source/testtool/cmdstrm.cxx
	automation/source/testtool/cmdstrm.hxx
	automation/source/testtool/tcommuni.cxx
	basctl/prj/d.lst
	basctl/uiconfig/basicide/toolbar/findbar.xml
	cui/source/dialogs/about.cxx
	cui/source/dialogs/about.src
	cui/source/inc/about.hxx
	extensions/source/abpilot/abpservices.cxx
	extensions/source/dbpilots/dbpservices.cxx
	extensions/source/propctrlr/pcrservices.cxx
	extensions/source/svg/makefile.mk
	forms/Library_frm.mk
	lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
	lingucomponent/source/spellcheck/spell/sspellimp.cxx
	package/prj/d.lst
	package/source/zipapi/XMemoryStream.cxx
	package/source/zipapi/XMemoryStream.hxx
	setup_native/prj/d.lst
	setup_native/source/win32/customactions/relnotes/makefile.mk
	tools/test/export.map
	wizards/com/sun/star/wizards/common/ConfigGroup.py
	wizards/com/sun/star/wizards/common/ConfigNode.py
	wizards/com/sun/star/wizards/common/Configuration.py
	wizards/com/sun/star/wizards/common/Desktop.py
	wizards/com/sun/star/wizards/common/FileAccess.py
	wizards/com/sun/star/wizards/common/Helper.py
	wizards/com/sun/star/wizards/common/SystemDialog.py
	wizards/com/sun/star/wizards/document/OfficeDocument.py
	wizards/com/sun/star/wizards/fax/FaxDocument.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
	wizards/com/sun/star/wizards/letter/LetterDocument.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
	wizards/com/sun/star/wizards/text/TextDocument.py
	wizards/com/sun/star/wizards/text/TextFieldHandler.py
	wizards/com/sun/star/wizards/text/TextSectionHandler.py
	wizards/com/sun/star/wizards/text/ViewHandler.py
	wizards/com/sun/star/wizards/ui/UnoDialog.py
	wizards/com/sun/star/wizards/ui/UnoDialog2.py
	wizards/com/sun/star/wizards/ui/WizardDialog.py
	wizards/com/sun/star/wizards/ui/event/CommonListener.py
	wizards/com/sun/star/wizards/ui/event/DataAware.py
	wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
	wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
	wizards/util/helpids.h
	wizards/util/hidother.src
	xmlsecurity/prj/build.lst
	xmlsecurity/prj/d.lst
	xmlsecurity/qa/certext/SanCertExt.cxx
2011-08-21 21:50:13 +02:00
Bjoern Michaelsen
57272eaaf5 Merge commit 'f9d40c2b591215b57ece4ba6e623b7808a7ae717' into feature/gsoc2011_wizards
Conflicts:
	wizards/com/sun/star/wizards/common/Resource.java

merged resolved as per:
 e52421bc118e9c5f3fce5a32ba9efdcad7627d92
 9e91dbca08056fc31f388f5642fdfa3d2b910990

in the old components repository merging the corresponding commit
3b4fe490441f9f77829bc6c1ae30d79a4d50255b there
2011-08-18 02:27:27 +02:00
Mathias Bauer
2839168cd0 CWS gnumake4: convert wizards to new build system 2011-06-16 10:11:45 +02:00
Ingo Schmidt
782eec2895 native349 #i115652# language independent Wizard bitmaps 2010-11-18 14:44:07 +01:00
Mathias Bauer
0b00bc90e4 CWS changehid: #i111784#: convert wizards module 2010-07-21 17:46:17 +02:00
Jens-Heiner Rechtien
36de66bdf0 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
Oliver Bolte
20cea29aa2 CWS-TOOLING: integrate CWS fwk99
2009-01-20 17:39:31 +0100 pb  r266605 : fix: #i98280# new 'More templates'-URL
2009-01-15 20:17:58 +0100 mst  r266391 : #i95702# convert wizards to DocumentProperties (partially based on patch by cmc)
2009-01-12 07:35:44 +0100 pb  r266131 : fix: #i96851# HID_PASTE_DLG and HID_LINKDLG_TABLB added
2009-01-09 10:40:48 +0100 pb  r266061 : fix: #i97386# Execute_Impl() while sub-dialog is open this could be deleted; #i68415# patch from cmc
2009-01-09 10:35:24 +0100 pb  r266059 : fix: #i97386# struct Deleted added
2009-01-09 10:05:17 +0100 pb  r266057 : fix: #i97365# ModalDialog RID_SVXPAGE_IMPROVEMENT removed
2009-01-09 10:02:39 +0100 pb  r266056 : fix: #i97841# new: set InfoURL and HandleHyperLink()
2009-01-09 09:59:13 +0100 pb  r266053 : fix: #i97391# MinWidth re-calculated; #i97365# SvxImprovementDialog2 removed
2009-01-09 09:55:00 +0100 pb  r266051 : fix: #i97841# new: HandleHyperLink(); #i97365# SvxImprovementDialog2 removed
2009-01-06 14:24:24 +0100 cd  r265921 : #i96831# Fix build problem with gcc 4.3.2 using the return value of link correctly.
2009-01-06 12:18:41 +0100 cd  r265907 : #i96831# Fix build problem with gcc 4.3.2
2009-01-06 12:02:59 +0100 mst  r265905 : fix #i97775#
- xmloff/source/core/nmspmap.cxx:
  + SvXMLNamespaceMap::GetQNameByKey does not handle default namespace
    correctly
2009-02-12 14:03:59 +00:00
Rüdiger Timm
6e846d6df2 INTEGRATION: CWS changefileheader (1.23.58); FILE MERGED
2008/03/31 16:24:06 rt 1.23.58.1: #i87441# Change license header to LPGL v3.
2008-04-11 12:42:02 +00:00
Rüdiger Timm
161e933c47 INTEGRATION: CWS changefileheader (1.6.64); FILE MERGED
2008/03/31 16:24:06 rt 1.6.64.1: #i87441# Change license header to LPGL v3.
2008-04-11 12:41:43 +00:00
Ivo Hinkelmann
f47f5cde3c INTEGRATION: CWS mergede01 (1.22.26); FILE MERGED
2007/03/20 14:50:50 ihi 1.22.26.1: #i72301# Remove German
2007-04-19 16:01:56 +00:00
Vladimir Glazounov
8e4c569106 INTEGRATION: CWS ause074 (1.5.126); FILE MERGED
2007/01/30 12:10:18 hjs 1.5.126.1: #i73801# remove remaining usages of sv[pre].mk
2007-02-06 13:31:27 +00:00
Jens-Heiner Rechtien
aebef8640c INTEGRATION: CWS sdfcreater (1.21.86); FILE MERGED
2006/07/12 14:19:48 ihi 1.21.86.1: #i34408# out comment useless resource
2006-08-14 16:07:07 +00:00
Rüdiger Timm
a0941cff88 INTEGRATION: CWS ooo19126 (1.20.152); FILE MERGED
2005/09/05 15:17:29 rt 1.20.152.1: #i54170# Change license header: remove SISSL
2005-09-09 09:13:09 +00:00
Rüdiger Timm
e42664f210 INTEGRATION: CWS ooo19126 (1.4.356); FILE MERGED
2005/09/05 15:17:29 rt 1.4.356.1: #i54170# Change license header: remove SISSL
2005-09-09 09:12:48 +00:00
Oliver Bolte
34a42348db INTEGRATION: CWS qwizardsbfooo20 (1.5.270); FILE MERGED
2005/06/10 14:39:11 bc 1.5.270.1: #i45586# all Basic modules made readonly
2005-07-05 09:21:42 +00:00
Hans-Joachim Lankenau
0c8609b245 INTEGRATION: CWS mergebuild (1.18.28); FILE MERGED
2004/04/21 01:18:18 hjs 1.18.28.3: RESYNC: (1.18-1.19); FILE MERGED
2003/11/11 19:27:36 ihi 1.18.28.2: en -> en-US
2003/11/10 18:03:03 ihi 1.18.28.1: #111234# Merge during build
2004-06-25 14:22:21 +00:00
Kurt Zenker
18b0a96b52 INTEGRATION: CWS qwizards1 (1.31.58); FILE MERGED
2004/04/28 13:01:00 bc 1.31.58.2: #111602# path to templates for formwizard reset
2004/04/28 09:53:01 bc 1.31.58.1: #111603# Formwizard Template directory now included
2004-05-19 12:27:54 +00:00
Sander Vesik
508e8e8ad4 INTEGRATION: CWS scriptingf5 (1.17.118); FILE MERGED
2004/03/30 07:43:23 toconnor 1.17.118.1: #26874#
Updated bindings for events to use the scripting framework url spec. This change will ensure that the scripting framework is used to execute scripts.
2004-04-19 22:28:17 +00:00
Jens-Heiner Rechtien
af5b7e5432 INTEGRATION: CWS geordi2q16 (1.31.118); FILE MERGED
2004/04/05 13:40:01 hr 1.31.118.1: #111934#: merge CWS ooo111regression4
2004-04-07 09:29:12 +00:00
Vladimir Glazounov
511b00c3e9 INTEGRATION: CWS geordi2q11 (1.18.54); FILE MERGED
2003/12/17 11:35:52 hr 1.18.54.1: #111934#: join CWS ooo111fix1
2003-12-17 16:04:23 +00:00
Jens-Heiner Rechtien
adde3825ea INTEGRATION: CWS mergerc3 (1.17.2); FILE MERGED
2003/07/16 17:04:37 ihi 1.17.2.1: rc-3 merge all languages
2003-07-17 12:53:09 +00:00
Jens-Heiner Rechtien
8ff670b270 INTEGRATION: CWS rc2merge (1.16.6); FILE MERGED
2003/07/03 14:37:33 ihi 1.16.6.1: rc-2 merge all languages
2003-07-03 15:50:55 +00:00
Jens-Heiner Rechtien
f8ad6c3964 INTEGRATION: CWS rcmerge (1.15.14); FILE MERGED
2003/06/12 11:09:23 gh 1.15.14.1: final Merge RC
2003-06-13 13:06:53 +00:00
Jens-Heiner Rechtien
144ef8bff2 INTEGRATION: CWS mergem8 (1.12.2.3.2.2.2.2.6.7.2.2.12); FILE MERGED
2003/04/29 08:34:48 gh 1.12.2.3.2.2.2.2.6.7.2.2.12.2: final merge for Beta2
2003/04/14 15:06:34 gh 1.12.2.3.2.2.2.2.6.7.2.2.12.1: merging all languages
2003-04-29 16:36:21 +00:00
Jens-Heiner Rechtien
6652c8336f MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 16:59:30 +00:00
Behrend Cornelius
8fcfb5d649 #104755# DisposeDocument deleted once form Main Sub 2002-11-13 11:27:11 +00:00
Behrend Cornelius
fefa3b69e6 #104755# Now "DisposeDocument" called instead of "oBasedocument.dispose()" 2002-11-08 12:55:35 +00:00
Behrend Cornelius
22c8cc4ed2 #104710# "GetWizardPaths" added 2002-11-06 14:20:48 +00:00
Behrend Cornelius
b157414e34 #104395# new filter for style templates added 2002-10-22 15:21:37 +00:00
Behrend Cornelius
63a67b9fcd #104114# creation of new document modified 2002-10-16 10:29:49 +00:00
Behrend Cornelius
8507c2c7fa #94944# Added an absolute path to graphic link 2002-08-30 11:09:17 +00:00
Behrend Cornelius
6b52dbe7fb #99687# Textboundaries now no longer set by Autopilot 2002-08-08 08:18:27 +00:00
Behrend Cornelius
f8d27c7d19 #100987# Dialog now created later 2002-07-10 14:38:38 +00:00
Behrend Cornelius
c5f200d375 #95749# ReadOnlyflag set to true 2001-12-12 14:06:35 +00:00
Behrend Cornelius
9573e34faf #94832# Routine 'CopyGraphics' and "EndDialog" modified 2001-11-19 15:30:31 +00:00
Behrend Cornelius
1ea64125c6 #92814# Actionlock now removed when in 'LoadCurrentDocument' 2001-11-15 15:39:14 +00:00
Tom Verbeek
8e7f106806 #86383# changed library structure 2001-11-09 13:05:36 +00:00
Behrend Cornelius
14a06eb6d1 92814# Now whole dialog instead of controls toggled 2001-11-02 10:18:29 +00:00
Behrend Cornelius
b037d1c39c *** empty log message *** 2001-10-29 14:21:06 +00:00
Behrend Cornelius
c8ffa04391 #91427# Controller locking and unlocking reinserted 2001-10-02 09:24:11 +00:00
Behrend Cornelius
28c4b12a54 #91427# Focus now set to Listbox 2001-10-01 14:39:53 +00:00
Behrend Cornelius
fa1592224b #91427# Defaultbutton now on 'GoOn'Button 2001-09-13 13:31:31 +00:00
Behrend Cornelius
d3cea3e3ad #90513# Dialog resaved in new format 2001-08-22 12:54:23 +00:00
Behrend Cornelius
ebb6de00a1 #87859# Charheight set to Standard when inserting new Document 2001-08-15 11:38:50 +00:00
Behrend Cornelius
76429c106a #90363# import of xml writer templates now possible 2001-08-08 14:15:48 +00:00
Tom Verbeek
5cfd2f0c5d #90363# modified way of getting docinfo 2001-08-06 08:55:53 +00:00
Tom Verbeek
705289e628 #90363# typo :-( 2001-08-02 16:16:56 +00:00
Tom Verbeek
4567506976 #90532# fixed change to new file format with the templates 2001-08-02 15:49:30 +00:00
Behrend Cornelius
3cd979df30 #85448# New HelpIDs added 2001-07-16 14:24:23 +00:00
Rüdiger Timm
f8060914d3 Merge SRC638: 14.07.01 - 04:04:58 2001-07-14 01:05:20 +00:00