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
Rüdiger Timm
c09c3888e7
INTEGRATION: CWS changefileheader (1.48.58); FILE MERGED
...
2008/03/31 16:24:05 rt 1.48.58.1: #i87441# Change license header to LPGL v3.
2008-04-11 12:39:53 +00:00
Rüdiger Timm
634795e040
INTEGRATION: CWS changefileheader (1.5.64); FILE MERGED
...
2008/03/31 16:24:05 rt 1.5.64.1: #i87441# Change license header to LPGL v3.
2008-04-11 12:39:35 +00:00
Ivo Hinkelmann
8fce0dddb4
INTEGRATION: CWS mergede01 (1.47.116); FILE MERGED
...
2007/03/20 14:50:50 ihi 1.47.116.1: #i72301# Remove German
2007-04-19 16:01:43 +00:00
Vladimir Glazounov
735d0ee1cc
INTEGRATION: CWS ause074 (1.4.126); FILE MERGED
...
2007/01/30 12:10:17 hjs 1.4.126.1: #i73801# remove remaining usages of sv[pre].mk
2007-02-06 13:30:50 +00:00
Jens-Heiner Rechtien
ab3d18da20
INTEGRATION: CWS encup (1.45.100); FILE MERGED
...
2005/04/29 16:06:46 ihi 1.45.100.1: #i40603# German strings now UTF8 encoded
2005-09-23 14:17:05 +00:00
Rüdiger Timm
62e4179412
INTEGRATION: CWS ooo19126 (1.45.152); FILE MERGED
...
2005/09/05 15:17:26 rt 1.45.152.1: #i54170# Change license header: remove SISSL
2005-09-09 09:11:23 +00:00
Rüdiger Timm
33d063ceb0
INTEGRATION: CWS ooo19126 (1.3.356); FILE MERGED
...
2005/09/05 15:17:25 rt 1.3.356.1: #i54170# Change license header: remove SISSL
2005-09-09 09:11:08 +00:00
Jens-Heiner Rechtien
654084da2e
INTEGRATION: CWS dbwizard5 (1.13.62); FILE MERGED
...
2005/03/31 09:41:14 va 1.13.62.1: #i46274# Modified BASIC macro.
2005-04-06 09:19:52 +00:00
Vladimir Glazounov
a95989c256
INTEGRATION: CWS dbwizard3 (1.8.190); FILE MERGED
...
2004/12/09 15:19:26 bc 1.8.190.1: #i37927#handling of the filtercomponent improved
2005-02-21 13:12:22 +00:00
Pascal Junck
c4bd5b2887
INTEGRATION: CWS dbwizard1 (1.12.132); FILE MERGED
...
2004/09/15 19:41:47 bc 1.12.132.1: ##several changes for all database wizards
2004-10-27 12:45:24 +00:00
Hans-Joachim Lankenau
4e4ed3e01d
INTEGRATION: CWS mergebuild (1.42.28); FILE MERGED
...
2004/05/18 13:09:59 hjs 1.42.28.4: RESYNC: (1.43-1.44); FILE MERGED
2004/04/21 01:18:01 hjs 1.42.28.3: RESYNC: (1.42-1.43); FILE MERGED
2003/11/11 19:27:34 ihi 1.42.28.2: en -> en-US
2003/11/10 18:03:01 ihi 1.42.28.1: #111234# Merge during build
2004-06-25 14:21:35 +00:00
Kurt Zenker
1fd1c0dc0e
INTEGRATION: CWS qwizards1 (1.19.58); FILE MERGED
...
2004/03/09 15:14:25 tv 1.19.58.1: compatible with new Letter Wizard
2004-05-19 12:23:48 +00:00
Oliver Bolte
f634dbf145
INTEGRATION: CWS cso001 (1.43.20); FILE MERGED
...
2004/03/23 12:45:48 hjs 1.43.20.1: #116006# merge
2004-04-27 09:40:16 +00:00
Sander Vesik
630f68cd71
INTEGRATION: CWS scriptingf5 (1.6.158); FILE MERGED
...
2004/03/30 07:42:06 toconnor 1.6.158.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:27:47 +00:00
Sander Vesik
9bf5f7b886
INTEGRATION: CWS scriptingf5 (1.6.158); FILE MERGED
...
2004/03/30 07:34:10 toconnor 1.6.158.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:27:32 +00:00
Vladimir Glazounov
3ba2b36434
INTEGRATION: CWS geordi2q11 (1.42.54); FILE MERGED
...
2003/12/17 11:35:50 hr 1.42.54.1: #111934#: join CWS ooo111fix1
2003-12-17 16:03:19 +00:00
Jens-Heiner Rechtien
f839f4b142
INTEGRATION: CWS mergerc3 (1.41.2); FILE MERGED
...
2003/07/16 17:04:35 ihi 1.41.2.1: rc-3 merge all languages
2003-07-17 12:52:46 +00:00
Jens-Heiner Rechtien
969fd347e8
INTEGRATION: CWS rc2merge (1.40.6); FILE MERGED
...
2003/07/03 14:37:31 ihi 1.40.6.1: rc-2 merge all languages
2003-07-03 15:50:31 +00:00
Jens-Heiner Rechtien
84679ab20a
INTEGRATION: CWS rcmerge (1.39.14); FILE MERGED
...
2003/06/12 11:09:19 gh 1.39.14.1: final Merge RC
2003-06-13 13:06:28 +00:00
Jens-Heiner Rechtien
c2bd4bb223
INTEGRATION: CWS mergem8 (1.37.2.2.12); FILE MERGED
...
2003/04/29 08:34:46 gh 1.37.2.2.12.2: final merge for Beta2
2003/04/14 15:06:25 gh 1.37.2.2.12.1: merging all languages
2003-04-29 16:36:02 +00:00
Jens-Heiner Rechtien
6652c8336f
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 16:59:30 +00:00
Kurt Zenker
636b83f0dd
Merge SRX644: 05.12.02 - 11:31:36
2002-12-05 09:35:33 +00:00
Behrend Cornelius
ffb1092210
#104579# reference to Greeting module removed
2002-12-02 09:32:44 +00:00
Kurt Zenker
17a6f73aec
Merge SRX644: 25.11.02 - 15:33:50
2002-11-25 13:36:58 +00:00
Behrend Cornelius
532a29a74f
#104755# Now "DisposeDocument" called instead of "oDocument.dispose()"
2002-11-08 12:58:23 +00:00
Behrend Cornelius
3d6029de78
#104114# "_blank" exchanged against "_default"
2002-10-23 09:06:19 +00:00
Behrend Cornelius
80bca2d204
#99839# German Comments removed
2002-09-17 13:52:00 +00:00
Vladimir Glazounov
1a52943546
Merge SRX643: 17.09.02 - 14:58:27
2002-09-17 12:01:57 +00:00
Kurt Zenker
6cbe957814
Merge SRX643: 09/13/02 - 10:29:18
2002-09-13 07:32:38 +00:00
Behrend Cornelius
dd2369ca2d
#96775# Errorhandler in Autotext macro inserted
2002-09-10 07:52:01 +00:00
Behrend Cornelius
9374b25df2
#96775# Msgbox to Error handler added
2002-09-10 07:26:27 +00:00
Kurt Zenker
f66635829a
Merge SRX643: 09.09.02 - 23:01:37
2002-09-09 20:04:55 +00:00
Kurt Zenker
95f0097af5
Merge SRX643: 05.09.02 - 14:55:05
2002-09-05 11:58:24 +00:00
Behrend Cornelius
17b23e68f3
#96775# Errormessage in macro inserted
2002-09-02 11:06:12 +00:00
Behrend Cornelius
762f3a435b
#96841# Cancel Button of Correspondence macro now of Cancel type
2002-07-15 15:42:25 +00:00
Tom Verbeek
338669e096
#100252# fixed Window handling
2002-06-26 12:41:33 +00:00
Behrend Cornelius
368974c057
#95873# Referencing NumberingStyles improved
2001-12-12 12:48:38 +00:00
Tom Verbeek
5fb4e15c88
#95055# added help ids
2001-11-23 14:02:39 +00:00
Tom Verbeek
3a9635bc4f
#94799# added HIDs
2001-11-16 13:42:32 +00:00
Tom Verbeek
f3c91eaec4
#92952# StarDesktop.ActiveFrame.Controller.Model --> ThisComponent
2001-11-12 14:24:05 +00:00
Tom Verbeek
8e7f106806
#86383# changed library structure
2001-11-09 13:05:36 +00:00
Tom Verbeek
904e6145a2
#94326# removed dispose of dialog in cancel sequence
2001-11-07 13:02:12 +00:00
Tom Verbeek
5766d0ae72
#91978# Dispose of Dialog after execution
2001-10-23 06:44:36 +00:00
Tom Verbeek
ae52725ccf
#92603# fixed problem with japanese fields
2001-10-09 09:37:05 +00:00