Language

The Free and Open Productivity Suite
Released: Apache OpenOffice 4.1.15

Projects which were changed

(excluding integration and resyncing)
Project
(linked to the project page)
Branch GroupBranch
(linked to the branch changes below)
API (aka api) srx645 canvas01 insight01 jmf1 layoutmanager
src680 api01ea chart2mst3 jl6 mav09 ooo20040225 sab008 sb14
misc HEAD
Database Access (aka dba) srx645 insight01 layoutmanager ooo111merge
src680 mergebuild mozab03 ooo20040225
misc HEAD
External (aka external) src680 geordi2q15 scriptingf5
misc HEAD
Application Framework (aka framework) srx645 insight01 layoutmanager ooo111merge ooo111regression
srx644 binfilter
src680 ab06q api01ea bmpres01 dr14 fwkmerge1 impress4ea1 jl3 mav09 mergebuild ooo20040225 pb1 qadev16 scriptingf5 xslt2
misc HEAD
Graphic Applications (aka graphics) srx645 canvas01 impress2 insight01 layoutmanager ooo111merge tl01
src680 aw006 aw008 bmpres01 chart2mst3 dr14 draw23master frmcontrols03 fwkmerge1 geordi2q15 gluepoint impress3ea1 impress4ea1 interop12 mergebuild ooo20040225 os27 sj05 swmergeborders westportfilterteam26
misc HEAD
Graphic System Layer (aka gsl) srx645 canvas01 cups01 jmf1 nativewidget1 ooo111merge ooo111regression2
src680 bmpres01 cfg04 frmcontrols03 impress3ea1 mergebuild ooo20040225 vcl18 vcl20
misc HEAD
Installation (aka installation) srx645 layoutmanager ooo111merge ooo111regression2 ptbrblank
src680 cfg04 fwkmerge1 geordi2q15 ooo20040225 qwizards1 scp2fix1 xslt2
master srx645
misc HEAD
Localization (aka l10n) src680 geordi2q15 i18n12
Lingucomponent (aka lingucomponent) misc HEAD
Porting (aka porting) srx645 ooo111merge
srx644 port64bit
src680 crashreport01 ooo20040225 qadev16
Spreadsheet (aka sc) srx645 insight01 ooo111merge
src680 aw006 calcuno01 fieldoptions rowlimit sab008
Word Processing (aka sw) srx645 insight01 layoutmanager ooo111merge
src680 aw006 borderingfilterteam28 fmebugs01 ooo20040225 os26 os27 os28 swmergeborders swnum02 swobjpos03 tableintable tl02 tuamfilterteam23 vertcell westportfilterteam26
Build Tools and Environment (aka tools) srx645 canvas01 ooo111regression2
src680 geordi2q15 ooo20040225 scp2fix1
master srx645
misc HEAD
Universal Content Broker (aka ucb) srx644 port64bit
src680 ooo20040225
misc HEAD
UNO Development Kit / Component Technology (aka udk) srx645 layoutmanager
srx644 port64bit
src680 geordi2q15 jl3 jl6 ooo20040225 sb14 sb15
Utilities (aka util) srx645 apoc02 insight01 layoutmanager ooo111merge
src680 cfg04 frmcontrols03 jl6 mergebuild mozab03 ooo20040225 vcl18 westportfilterteam26
misc HEAD tls617
XML File Formats (aka xml) srx645 insight01 layoutmanager
src680 frmcontrols03 sab012 tableintable
misc HEAD

Detailed changes on each branch

cws_src680_vertcell was changed by Frank Meies(fme)
modified : #i16944# Vertical formatting for individual cell frames
sw/sw/source/core/layout/tabfrm.cxx

cws_src680_os28 was changed by Oliver Specht(os)
modified : #i21099# typo in STR_MULT_INTERACT_SPELL_WARN corrected
sw/sw/source/ui/utlui/utlui.src
modified : #i21099# typo in STR_MULT_INTERACT_HYPH_WARN corrected
sw/sw/source/ui/utlui/utlui.src

cws_src680_rowlimit was changed by Eike Rathke(er)
modified : #i1967# type changes
sc/sc/inc/ : chgtrack.hxx, document.hxx ;
modified : #i1967# MAXCOLROWCOUNT = MAXROWCOUNT
sc/sc/inc/address.hxx
modified : #i1967# correct copy&paste error
sc/sc/inc/address.hxx
modified : #i1967# remove address typedefs of master workspace
sc/sc/inc/global.hxx
modified : #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short

cws_srx645_tl01 was changed by Andre Fischer(af)
modified : #112058# Adapted file to changes made in the impress1 CWS.
graphics/sd/source/ui/inc/fuhhconv.hxx
modified : #112058# Incorporated changes made in sdoutl.cxx for Hangul/Hanja conversion.
graphics/sd/source/ui/func/fuhhconv.cxx graphics/sd/inc/Outliner.hxx graphics/sd/source/ui/view/Outliner.cxx

cws_srx645_ooo111regression was changed by Jens-Heiner Rechtien(hr) [ and it was merged ]
modified : #i17727#: rename ambigious type EntryData_Imp -> DocTempl_EntryData_Imp
framework/sfx2/source/doc/doctempl.cxx
modified : #i17727#: rename ambigious type EntryData_Imp -> DocTemplates_EntryData_Imp
framework/sfx2/source/doc/doctemplates.cxx

cws_src680_swobjpos03 was changed by Oliver Düsterhoff(od)
removed : RESYNC:; FILE REMOVED
files from: : wrt_undo.cxx, wrt_undo.hxx, db_atr.cxx, db_xml.cxx, makefile.mk, undo_atr.cxx, wrt_db.cxx, wrt_db.hxx, XListEntryBroadcaster.idl, optctl.cxx, optctl.hrc, optdict.cxx, optdict.hrc, optdll.cxx, optextbr.cxx, optextbr.hrc, optgenrl.cxx, optgenrl.hrc, optinet2.cxx, optinet2.hrc, optjsearch.cxx, optjsearch.hrc, optpath.cxx, optpath.hrc, optsave.cxx, optsave.hrc, optspell.cxx, optspell.hrc, ldapdlg.cxx, ldapdlg.hxx, multifil.cxx, multipat.cxx, multipat.hrc, optaccessibility.cxx, optaccessibility.hrc, optasian.cxx, optasian.hrc, optcolor.cxx, optcolor.hrc, hldocntp.hxx, hldoctp.hxx, hlinettp.hxx, hlmailtp.hxx, hltpbase.hxx, showcols.hxx, srchxtra.hxx, taborder.hxx, galtheme.hxx, galbrws2.hxx, galctrl.hxx, galdlg.cxx, galdlg.hxx, gallery.hrc, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hrc, taborder.cxx, showcols.cxx, bbdlg.hxx, connect.hxx, dlgname.hxx, dstribut.hxx, iconcdlg.hxx, itemdata.hxx, labdlg.hxx, measure.hxx, multifil.hxx, multipat.hxx, optaccessibility.hxx, optasian.hxx, optcolor.hxx, optctl.hxx, optdict.hxx, optextbr.hxx, optinet2.hxx, optjsearch.hxx, optpath.hxx, optsave.hxx, optspell.hxx, textanim.hxx, transfrm.hxx, zoom.hxx, attributeproperties.hxx,
removed : #113049# - file removed, because it's moved to folder /sw/source/core/objectpositioning/
files from: anchoredobjectposition.cxx
modified : #113049# - add new folder /source/core/objectpositioning to build
sw/sw/prj/build.lst
modified : correction due to merge conflicts.
sw/sw/source/core/inc/tocntntanchoredobjectposition.hxx
modified : RESYNC:; FILE MERGED
files from: sw/sw/source/core/frmedt/: fefly1.cxx, feshview.cxx, sw/sw/source/ui/utlui/: attrdesc.cxx, attrdesc.src, graphics/svx/source/unodraw/unoprov.cxx sw/sw/source/core/txtnode/txtedt.cxx sw/sw/source/core/doc/poolfmt.cxx sw/sw/source/core/inc/: frame.hxx, txtfrm.hxx, flyfrm.hxx, sw/sw/source/core/layout/: atrfrm.cxx, frmtool.cxx, tabfrm.cxx, frmtool.cxx, tabfrm.cxx, sw/sw/source/filter/ww8/: ww8par.hxx, ww8par2.hxx, xml/xmloff/source/core/xmltoken.cxx graphics/svx/inc/svxids.hrc sw/sw/source/core/unocore/: unoframe.cxx, unomap.cxx, sw/sw/source/ui/frmdlg/: frmex.cxx, frmui.src, sw/sw/source/ui/app/docshini.cxx sw/sw/inc/: cmdid.h, format.hxx, swatrset.hxx, sw/sw/source/core/text/: txtfly.cxx, txtfrm.cxx,
modified : RESYNC:; FILE MERGED resolve merge conflicts.
files from: sw/sw/source/core/frmedt/fews.cxx sw/sw/source/core/layout/: findfrm.cxx, fly.cxx, flycnt.cxx, flylay.cxx, sw/sw/source/core/bastyp/init.cxx sw/sw/source/filter/ww8/: wrtw8esh.cxx, ww8graf.cxx, ww8par6.cxx, sw/sw/source/ui/docvw/edtwin.cxx sw/sw/source/ui/frmdlg/frmpage.cxx sw/sw/source/core/text/: frmform.cxx, porfly.cxx,
modified : RESYNC:; FILE MERGED resolve merge conflict
files from: sw/sw/inc/fesh.hxx
modified : RESYNC:; FILE MERGED resolve merge conflict.
files from: xml/xmloff/source/text/txtprmap.cxx sw/sw/source/filter/ww8/ww8par.cxx graphics/svx/inc/msdffimp.hxx sw/sw/source/core/unocore/unoprnms.cxx sw/sw/source/ui/frmdlg/frmpage.src xml/xmloff/inc/xmltoken.hxx sw/sw/inc/: hintids.hxx, unoprnms.hxx,
modified : resolve conflict caused by merging changes of cws swobjpos02 into cws swobjpos03 during implementation.
sw/sw/source/ui/utlui/attrdesc.src
modified : adjustments due to changes in the drawing layer
modified : RESYNC:; FILE MERGED adjust constructors of <SvxMSDffImportRec> due to merge conflict in header file.
files from: graphics/svx/source/msfilter/msdffimp.cxx
modified : correction of merge conflict resolution
sw/sw/source/ui/frmdlg/frmpage.cxx

cws_src680_os26 was changed by Oliver Specht(os)
removed : RESYNC:; FILE REMOVED
files from: : ldapdlg.hxx, multipat.cxx, multipat.hrc, optaccessibility.hrc, optasian.hrc, optcolor.hrc, optctl.hrc, optdict.hrc, optextbr.cxx, optextbr.hrc, optgenrl.hrc, optinet2.hrc, optjsearch.hrc, optpath.hrc, optsave.hrc, optspell.hrc, ldapdlg.cxx, multifil.cxx, optasian.cxx, optcolor.cxx, optctl.cxx, optdict.cxx, optdll.cxx, optgenrl.cxx, optinet2.cxx, optjsearch.cxx, optpath.cxx, optsave.cxx, optspell.cxx, hldoctp.hxx, hlinettp.hxx, hldocntp.hxx, hlmailtp.hxx, hltpbase.hxx, showcols.hxx, srchxtra.hxx, taborder.hxx, galdlg.cxx, galdlg.hxx, galtheme.hxx, galbrws2.hxx, galctrl.hxx, gallery.hrc, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hrc, taborder.cxx, showcols.cxx, multipat.hxx, optcolor.hxx, optctl.hxx, optextbr.hxx, optsave.hxx, optspell.hxx, bbdlg.hxx, connect.hxx, dlgname.hxx, dstribut.hxx, iconcdlg.hxx, itemdata.hxx, labdlg.hxx, measure.hxx, multifil.hxx, optaccessibility.hxx, optasian.hxx, optdict.hxx, optinet2.hxx, optjsearch.hxx, optpath.hxx, textanim.hxx, transfrm.hxx, zoom.hxx, install.sh, makefile.mk, config.hxx, exports.map, filehelper.cxx, listinitializer.hxx, makefile.mk, regmimetypes.cxx, filehelper.hxx, regmimetypes.hxx, filearch.cxx, filearch.hxx, agprop.cxx, agprop.hxx, db_atr.cxx, db_xml.cxx, makefile.mk, wrt_db.cxx, wrt_db.hxx, wrt_undo.hxx, undo_atr.cxx, wrt_undo.cxx,
modified : RESYNC:; FILE MERGED
files from: sw/sw/source/core/doc/docnew.cxx sw/sw/sdi/swslots.src sw/sw/source/filter/html/wrthtml.cxx sw/sw/source/core/layout/layact.cxx sw/sw/source/ui/docvw/edtwin.cxx sw/sw/source/ui/uiview/: view2.cxx, viewstat.cxx, sw/sw/source/ui/app/docsh2.cxx sw/sw/source/core/edit/autofmt.cxx sw/sw/inc/: cmdid.h, doc.hxx,
modified : #105372# FN_INSERT_HEADER/FOOTER removed
sw/sw/source/ui/app/app.src

cws_src680_i18n12 was changed by Karl Hong(khong)
modified : #i25558# add checking algorithm existence in loadAlgorithm
l10n/i18npool/source/indexentry/indexentrysupplier.cxx

cws_src680_os27 was changed by Frank Meies(fme)
modified : #i24134# Modify table rows with the ruler - resolve merge conflicts
graphics/svx/inc/svxids.hrc
modified : #i24134# Feature - Modify table rows with the ruler
sw/sw/inc/tabcol.hxx sw/sw/source/core/bastyp/tabcol.cxx sw/sw/source/core/docnode/ndtbl.cxx

cws_srx645_cups01 was changed by Philipp Lohmann(pl)
modified : solved a merge artifact
gsl/psprint/source/printer/printerinfomanager.cxx

cws_src680_as01 was changed by Andreas Schluens(as)
removed : RESYNC:; FILE REMOVED
files from: : misccfg.cxx, misccfg.hxx,
modified : RESYNC:; FILE MERGED
files from: framework/sfx2/source/doc/sfxbasemodel.cxx

cws_src680_jl3 was changed by Joachim Lingner(jl)
modified : #111907#
framework/filter/source/svg/svgimport.cxx
modified : #i22146# clarified documentation
udk/jvmaccess/inc/jvmaccess/virtualmachine.hxx

cws_src680_tuamfilterteam23 was changed by Martin Maher(mmaher)
modified : #i25438# Wrong bullet fix supplied by cmc
sw/sw/source/filter/ww8/ww8par3.cxx
modified : #i25440# Fix for formatting bug supplied by cmc
sw/sw/source/filter/ww8/ww8par5.cxx
modified : #115146# More ww6 dropcap support
sw/sw/source/filter/ww8/ : ww8par6.cxx, ww8par.cxx, wrtw8nds.cxx ;

cws_src680_tuamfilterteam23 was changed by Caolán McNamara(cmc)
modified : #i22537# this is odd, if you use one directional token you have to use the other, otherwise word 2003 sticks strikethrough and/or bold/allcaps/italic onto the text!, strange
sw/sw/source/filter/rtf/rtfatr.cxx
modified : #114412# / #i25438# I despise ms overrides and their numbering in general. Hard to come up with a rationale for this group of bytes :-(, am I missing an alignment or something to indicate invalid entries
sw/sw/source/filter/ww8/ww8par3.cxx

cws_srx645_insight01 was changed by Ocke Janssen(oj)
removed : RESYNC:; FILE REMOVED
files from: : optgenrl.hxx, makefile.mk, files_psprint.scp, dir_psprint.scp, module_grafik.scp, files_grafik.scp, makefile.mk, profile_grafik.scp, module_grafik.lng, system_impress.lng, system_impress.scp, module_impress.lng, module_impress.scp, files_impress.scp, makefile.mk, profile_impress.lng, profile_impress.scp, makefile.mk, crashrep_static.scp, crashrep_dynamic.scp, unxbasic_python.scp, makefile.mk, python.lng, python.scp, winbasic_python.scp, dir.lng, basic.lng, dir.scp, basic.scp, module.lng, makefile.mk, module.scp, config.lng, config.scp, profile.lng, system.lng, profile.scp, system.scp, files.scp, setuphelp.lng, setuphelp.scp, unxbasic.lng, unxbasic.scp, makefile.mk, module_fat_root.lng, module_fat_root.scp, udk_bridges.scp, udk_remote.scp, udk_pure_java.scp, makefile.mk, udk_java.scp, readme.scp, udk_complete.scp, udk_base.scp, setupzip.scp, module_javafilter.scp, basic_javafilter.scp, makefile.mk, profile_javafilter.lng, profile_javafilter.scp, files_javafilter.scp, module_javafilter.lng, response_workstation.txt, files_lingu.scp, makefile.mk, module_lingu.lng, module_lingu.scp, files_gnome.scp, makefile.mk, module_gnome.lng, module_gnome.scp, module_fonts.scp, makefile.mk, files_fonts.scp, module_fonts.lng, files_chart.scp, system_chart.lng, system_chart.scp, makefile.mk, profile_chart.lng, profile_chart.scp, module_chart.lng, module_chart.scp, profile_math.lng, files_math.scp, profile_math.scp, module_math.lng, makefile.mk, module_math.scp, system_math.lng, system_math.scp, system_draw.lng, system_draw.scp, makefile.mk, profile_draw.lng, files_draw.scp, profile_draw.scp, module_draw.lng, module_draw.scp, profile_calc.lng, files_calc.scp, profile_calc.scp, module_calc.lng, module_calc.scp, makefile.mk, system_calc.lng, system_calc.scp, makefile.mk, files_kde.scp, module_kde.lng, module_kde.scp, makefile.mk, files_cde.scp, unxbasic_cde.lng, module_cde.lng, unxbasic_cde.scp, module_cde.scp, makefile.mk, d.lst, build.lst, gid.inc, gcfg.inc, gid_oo.inc, szipmac.inc,
added : #114093# new icons
added : #i20311# file open entries for the db file format
framework/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu
modified : #111075# linux changes
dba/dbaccess/source/ui/app/ : AppController.cxx, AppControllerDnD.cxx ; dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
modified : #i24467# new dialog page for db reg
graphics/svx/source/dialog/makefile.mk
modified : #i25414# extend the datadescriptor for database location and connection resource
sw/sw/source/ui/utlui/condedit.cxx dba/dbaccess/source/ui/browser/ : unodatbr.cxx, dsbrowserDnD.cxx, dbexchange.cxx ; dba/dbaccess/source/core/dataaccess/ : documentdefinition.cxx, datasource.hxx, datasource.cxx, databasecontext.cxx, commanddefinition.hxx, commanddefinition.cxx, commandcontainer.hxx, commandcontainer.cxx, ComponentDefinition.cxx, ComponentDefinition.hxx ; sw/sw/source/ui/dbui/ : dbtree.cxx, dbmgr.cxx ; sw/sw/source/ui/dochdl/swdtflvr.cxx dba/connectivity/source/commontools/dbtools.cxx dba/dbaccess/source/ui/misc/ : linkeddocuments.cxx, UITools.cxx, TokenWriter.cxx ; dba/dbaccess/source/ui/app/ : app.src, AppControllerDnD.cxx, AppController.cxx ; dba/dbaccess/source/ui/inc/dbadmin.hxx graphics/svx/inc/ : dbaobjectex.hxx, dbaexchange.hxx, dataaccessdescriptor.hxx ; sw/sw/source/ui/app/swmodul1.cxx dba/dbaccess/source/core/api/ : datasettings.cxx, TableDeco.cxx, query.cxx, querydescriptor.cxx ; graphics/svx/source/form/ : tabwin.cxx, fmvwimp.cxx, fmview.cxx, dataaccessdescriptor.cxx ; sc/sc/source/ui/unoobj/dispuno.cxx dba/dbaccess/inc/dbaccess_slotid.hrc sw/sw/source/ui/uno/ : unomailmerge.cxx, unodispatch.cxx ; sw/sw/source/ui/shells/textsh2.cxx dba/dbaccess/source/core/inc/ : datasettings.hxx, commandbase.hxx ; sw/sw/source/core/edit/edfld.cxx graphics/svx/source/fmcomp/ : fmgridcl.cxx, dbaobjectex.cxx, dbaexchange.cxx ; sc/sc/source/ui/docshell/dbdocimp.cxx dba/dbaccess/source/filter/xml/xmlExport.cxx dba/dbaccess/source/ui/dlg/ : dbadmin.src, dbadmin.cxx ;
modified : #i25414# new properties for database location
api/offapi/com/sun/star/sdb/ : DataAccessDescriptor.idl, DatabaseContext.idl ;
modified : #i20311# file open entries for the db file format
util/officecfg/registry/schema/org/openoffice/Office/UI.xcs util/officecfg/registry/data/org/openoffice/Office/UI.xcu framework/filter/source/config/fragments/fcfg_base.mk framework/filter/source/config/fragments/types/StarBase.xcu
modified : #111075# ongoing work
dba/dbaccess/source/ui/browser/unodatbr.cxx dba/dbaccess/source/core/dataaccess/ : documentcontainer.cxx, documentdefinition.cxx, documentdefinition.hxx, documentdefinition.cxx, documentcontainer.cxx, definitioncontainer.cxx ; dba/dbaccess/source/ui/misc/linkeddocuments.cxx dba/dbaccess/source/filter/xml/ : xmlservices.cxx, dbloader2.cxx ; util/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs dba/dbaccess/source/ui/app/ : AppControllerDnD.cxx, AppController.hxx ; dba/dbaccess/source/ui/inc/linkeddocuments.hxx dba/dbaccess/source/ui/dlg/ : DbAdminImpl.cxx, dbadmin.cxx ;
modified : #111075# new type detection for starbase
framework/filter/source/config/fragments/types/StarBase.xcu
modified : #111075# fix rfcount problem
dba/connectivity/inc/connectivity/ConnectionWrapper.hxx dba/dbaccess/source/core/dataaccess/ : SharedConnection.cxx, SharedConnection.hxx, connection.cxx, datasource.cxx ; dba/dbaccess/source/ui/app/ : AppView.hxx, AppView.cxx, AppDetailPageHelper.cxx ; dba/connectivity/source/commontools/ConnectionWrapper.cxx dba/dbaccess/source/core/inc/FilteredContainer.hxx dba/connectivity/source/cpool/ZConnectionWrapper.cxx dba/dbaccess/source/core/api/ : FilteredContainer.cxx, tablecontainer.cxx, viewcontainer.cxx ;

cws_src680_jl6 was changed by Joachim Lingner(jl)
added : #115008# java configuration service
udk/stoc/source/javaconfig/ : config.cxx, config.map, config.xml, makefile.mk ;
added : #115008#
api/udkapi/com/sun/star/java/ : XConfiguration.idl, Configuration.idl ;
added : Directory udk/stoc/source/javaconfig using tag `cws_src680_jl6'
modified : #1150008#
api/udkapi/com/sun/star/java/ : InstallationInfo.idl, XInstallationInfoProvider.idl, makefile.mk ; udk/stoc/source/javadetect/ : javainfo.cxx, sunjavadetect.cxx, unknownjavadetect.cxx ; udk/stoc/source/javavm/ : javavm.cxx, javavm.hxx, jen.xml, makefile.mk ;
modified : #115008# removed namespace impl
modified : #115008#
udk/stoc/source/javadetect/ : sunjavadetect.xml, unknownjavadetect.xml, sunjavadetect.cxx, sunjavadetect.xml, sunjavadetect.xml, unknownjavadetect.cxx, unknownjavadetect.xml, javainfo.cxx, javainfo2.cxx, javainfo.cxx ; util/officecfg/registry/schema/org/openoffice/Office/Java.xcs udk/stoc/source/javaconfig/ : config.xml, config.cxx, makefile.mk ; udk/stoc/source/javavm/ : javavm.cxx, jvmargs.cxx, jvmargs.hxx ;
modified : #115008# added group VendorInfo
util/officecfg/registry/schema/org/openoffice/Office/Java.xcs util/officecfg/registry/data/org/openoffice/Office/Java.xcu

cws_srx644_binfilter was changed by Armin Weiss(aw)

cws_src680_crashreport01 was changed by Tino Rachui(tra)
modified : #115441#moved 3 functions from UDK_3.2 section to UDK_3.3 section where they belong
porting/sal/util/sal.map

cws_src680_crashreport01 was changed by Hennes Rohling(hro)
removed : RESYNC:; FILE REMOVED
files from: : file.c, fileimpl.cxx, file.c, fileimpl.hxx, tempfile.c, dirw9x.h, dirw9x.c, dir.c,

cws_src680_frmcontrols03 was changed by Frank Schoenheit(fs)
removed : #i24387# moved to ../inc
files from: FormComponent.hxx cloneable.hxx
removed : RESYNC:; FILE REMOVED
files from: : wrt_db.hxx, db_atr.cxx, db_xml.cxx, makefile.mk, wrt_undo.cxx, wrt_undo.hxx, undo_atr.cxx, wrt_db.cxx, galobj.hxx, galmisc.hxx, galbrws2.hxx, galctrl.hxx, galtheme.hrc, galtheme.hxx, galdlg.cxx, gallery1.hxx, gallery.hrc, galdlg.hxx, optinet2.cxx, optasian.cxx, optspell.cxx, optextbr.hrc, multipat.cxx, optgenrl.cxx, optinet2.hrc, optasian.hrc, ldapdlg.cxx, optsave.cxx, optspell.hrc, multipat.hrc, optgenrl.hrc, optsave.hrc, ldapdlg.hxx, optdll.cxx, optdict.cxx, optjsearch.cxx, multifil.cxx, optpath.cxx, optaccessibility.cxx, optctl.cxx, optdict.hrc, optcolor.cxx, optjsearch.hrc, optpath.hrc, optaccessibility.hrc, optctl.hrc, optcolor.hrc, optextbr.cxx, showcols.cxx, taborder.cxx, srchxtra.hxx, hldocntp.hxx, hldoctp.hxx, hltpbase.hxx, showcols.hxx, hlinettp.hxx, taborder.hxx, hlmailtp.hxx, dstribut.hxx, optextbr.hxx, measure.hxx, optinet2.hxx, optasian.hxx, optspell.hxx, textanim.hxx, connect.hxx, multipat.hxx, optsave.hxx, zoom.hxx, bbdlg.hxx, itemdata.hxx, optdict.hxx, optjsearch.hxx, multifil.hxx, optpath.hxx, optaccessibility.hxx, iconcdlg.hxx, optctl.hxx, labdlg.hxx, dlgname.hxx, transfrm.hxx, optcolor.hxx, officeacceptthread.cxx, officeacceptthread.hxx, access.cxx, system.cxx, oldsv.cxx, vclpch.cxx, stacktrace.hxx, stacktrace.cxx, rmwindow, rc.hxx, rversion.h, resid.hxx, vector2d.hxx, resmgr.hxx, config.hxx, access.hxx, window.imp, gen.hxx, fonttype.hxx, scrbar.imp, outdev.imp, rc.h, system.hxx, color.hxx, gdiobj.hxx, rcid.h, resary.hxx, line.hxx, region.imp, poly.hxx, smartvcl.cxx, makefile.mk, uno_activex.idl, makefile.mk, activex_test.cxx, officeconnection.cxx, intercept.hxx, outputistream.hxx, UNOActiveX.rgs, makefile.mk, example.html, UNOActiveX.h, StdAfx2.cpp, uno_activex.def, uno_activex.rc, resource.h, uno_activex.cpp, StdAfx2.h, initwindowpeer.hxx, intercept.cxx, UNOActiveX.cpp, outputistream.cxx, oleclassw.cxx, api.htm, ScriptParameter.htm, ShortTest.htm, OleClient.dsp, OleClient.dsw,
added : dispatching features to form controls containing text
graphics/svx/source/form/fmtextcontrolfeature.cxx graphics/svx/source/inc/fmtextcontrolfeature.hxx
added : model of a rich text control
gsl/forms/source/richtext/ : richtextmodel.hxx, richtextmodel.cxx ;
added : Directory gsl/forms/source/richtext using tag `cws_src680_frmcontrols03'
added : helper class for handling containers of UNO listeners
util/comphelper/source/misc/listenernotification.cxx util/comphelper/inc/comphelper/listenernotification.hxx
added : helper classes for implementing the UNO text API for a rich text control
gsl/forms/source/richtext/ : richtextunowrapper.hxx, richtextunowrapper.cxx ;
added : dispatching clipboard related functionality to a rich text control
gsl/forms/source/richtext/ : clipboarddispatcher.hxx, clipboarddispatcher.cxx ;
added : viewport for a rich text control
gsl/forms/source/richtext/ : richtextviewport.hxx, richtextviewport.cxx ;
added : dispatching features to a rich text control which correspond with character or paragraph attributes, and require parameters
added : re-introduced, and made it compile
graphics/svx/workben/ : makefile.mk, edittest.cxx ;
added : EditEngine for a rich text control
gsl/forms/source/richtext/ : richtextengine.hxx, richtextengine.cxx ;
added : callbacks for a rich text control
gsl/forms/source/richtext/textattributelistener.hxx
added : callbacks for text form controls
graphics/svx/source/inc/fmslotinvalidator.hxx
added : dedicated 'sub-shell' for handling text attributes of form controls
graphics/svx/source/form/fmtextcontrolshell.cxx graphics/svx/source/inc/fmtextcontrolshell.hxx
added : dispatching special functionality to a rich text control
gsl/forms/source/richtext/ : specialdispatchers.hxx, specialdispatchers.cxx ;
added : copied herein from another CWS (by THB)
util/comphelper/inc/comphelper/implementationreference.hxx
added : introduced this dir for all implementations related to the rich text control
gsl/forms/source/richtext/makefile.mk
added : attributes of a rich text control
gsl/forms/source/richtext/rtattributes.hxx
added : dispatching features to a rich text control which correspond with character or paragraph attributes
gsl/forms/source/richtext/ : attributedispatcher.hxx, attributedispatcher.cxx ;
added : moved herein from ../component
gsl/forms/source/inc/ : FormComponent.hxx, cloneable.hxx ;
added : dispatching attributes to a rich text control
gsl/forms/source/richtext/ : rtattributehandler.cxx, rtattributehandler.hxx ;
added : UNO control/peer for a rich text control
gsl/forms/source/richtext/ : richtextcontrol.cxx, richtextcontrol.hxx ;
added : rich text VCL control
gsl/forms/source/richtext/ : richtextvclcontrol.hxx, richtextvclcontrol.cxx ;
added : impl class for a rich text VCL control
gsl/forms/source/richtext/ : richtextimplcontrol.hxx, richtextimplcontrol.cxx ;
added : form shell related resources
graphics/svx/source/form/formshell.src
added : dialogs for setting text attributes of form controls
graphics/svx/source/form/fmtextcontroldialogs.cxx graphics/svx/source/inc/fmtextcontroldialogs.hxx
added : base class for UNO dispatchers working on a rich text control
gsl/forms/source/richtext/ : featuredispatcher.hxx, featuredispatcher.cxx ;
modified : #i24387# +peerCreated
gsl/toolkit/inc/toolkit/controls/unocontrol.hxx gsl/toolkit/source/controls/unocontrol.cxx
modified : #i24387# dedicated 'sub shell' for handling text attributes of form controls
graphics/svx/source/form/fmshell.cxx
modified : #i24387# +HID_PROP_AUTOLINEBREAK
util/extensions/util/hidother.src util/extensions/inc/extensio.hrc
modified : #i24387# UnoEditControl: fixed getText and insertText
gsl/toolkit/source/controls/unocontrols.cxx
modified : #i24387# export text paragraphs of a rich text control
xml/xmloff/source/forms/elementexport.cxx
modified : added functionality for 'Automatic Line Break' property
modified : #i24387# new directory: source/richtext
gsl/forms/util/makefile.mk gsl/forms/prj/build.lst
modified : #i24387# allow cloning the OControl without cloning the aggregate immediately
gsl/forms/source/component/FormComponent.cxx
modified : #i24387# +SvxUnoText( const SfxItemProperty* _pMap)
graphics/svx/source/unoedit/unotext.cxx graphics/svx/inc/unotext.hxx
modified : #i24387# also be an XModifyListener
graphics/svx/source/form/fmundo.cxx graphics/svx/source/inc/fmundo.hxx
modified : removed obsolete include
gsl/forms/source/component/ImageControl.cxx
modified : #i24986# ImplNotifyKeyMouseEventListeners renamed to ImplHandleKeyMouseEventListeners (approved by SSA)
gsl/vcl/inc/ : window.imp, window.hxx ;
modified : #i24387#
gsl/toolkit/source/awt/vclxwindow.cxx graphics/svx/source/inc/fmresids.hrc graphics/svx/inc/ : dialogs.hrc, helpid.hrc ; gsl/toolkit/source/controls/stdtabcontroller.cxx
modified : #i24387# some more helper defines for usage together with the OPropertyContainerHelper
gsl/forms/source/inc/property.hxx
modified : #i24387# analyze text styles of a rich text control
xml/xmloff/source/forms/layerexport.cxx
modified : #i24387# +ITEM_FORMAT_SET_SUPER/SUB_SCRIPT
graphics/svx/inc/globlmn.hrc
modified : #i24387# prevent a ambiguity with casting
gsl/forms/source/inc/formsmodule.hxx
modified : #i24387# +GetEscapement
graphics/svx/inc/escpitem.hxx
modified : #i24387# rich text control services
gsl/forms/source/misc/services.cxx gsl/forms/source/inc/services.hxx
modified : #100000#
util/comphelper/source/property/propertycontainerhelper.cxx
modified : registry name has changed ... (does anybody really use this except the obsolete workbench program in svx??)
util/comphelper/source/misc/regpathhelper.cxx
modified : +listenernotification
util/comphelper/source/misc/makefile.mk
modified : #i24387# forward form(De)Activated events to text-control-shell
graphics/svx/source/form/fmvwimp.cxx
modified : spelling typo
gsl/forms/source/component/cloneable.cxx
modified : new files
graphics/svx/source/form/makefile.mk
modified : #i24387# +ExecuteTextAttribute/GetTextAttributeState / +IsActiveControl/SetControlActivationHandler
graphics/svx/inc/fmshell.hxx
modified : #i24387# grab some slots which are relevant for text form controls
graphics/svx/sdi/fmslots.sdi
modified : stumbled upon this during #i24387#: corrected a queryInterface call to the aggregate
gsl/forms/source/component/Columns.cxx
modified : #i24387# cleaned up the hacks herein
graphics/svx/source/form/typemap.cxx
modified : #i24387# some more static versions of some methods
graphics/svx/source/items/textitem.cxx graphics/svx/inc/scripttypeitem.hxx
modified : #i24986# ImplNotifyKeyMouseEventListeners renamed to ImplHandleKeyMouseEventListeners / call CommandEventListeners for compound controls (approved by SSA)
gsl/vcl/source/window/ : winproc.cxx, window.cxx ;
modified : RESYNC:; FILE MERGED
files from: graphics/svx/source/form/: makefile.mk, fmshell.cxx, fmshimp.cxx, graphics/svx/source/items/textitem.cxx gsl/vcl/source/window/: window.cxx, winproc.cxx, xml/xmloff/source/text/txtprmap.cxx gsl/toolkit/source/controls/unocontrols.cxx util/comphelper/source/misc/makefile.mk gsl/toolkit/source/awt/vclxwindow.cxx graphics/svx/inc/: dialogs.hrc, fmshell.hxx, helpid.hrc, xml/xmloff/inc/txtprmap.hxx
modified : refined some bits - proper scroll and word break handling now
modified : #i24387# import text paragraphs of a rich text control
xml/xmloff/source/forms/ : elementimport.hxx, elementimport.cxx ;
modified : #i24387# textarea is allowed to have text paragraphs
xml/xmloff/dtd/form.mod
modified : #i24387# +XMLTextPropertySetMapper::getPropertyMapForType
xml/xmloff/source/text/txtprmap.cxx xml/xmloff/inc/txtprmap.hxx
modified : #i24387# dedicated impl-class for handling text attributes of form controls
graphics/svx/source/form/fmshimp.cxx graphics/svx/source/inc/fmshimp.hxx

cws_src680_westportfilterteam26 was changed by Caolán McNamara(cmc)
modified : #i17565# that wasn't such a good idea given how the virtual methods called during this process search the stack itself for entries
sw/sw/source/filter/inc/fltshell.hxx sw/sw/source/filter/ww1/fltshell.cxx
modified : #i18009# relative table widths confusing the poor little word export filter, it was all too complicated for it (what madman retained the previous percentage width of a table in its percentage width value when it has been changed to automatic width)
sw/sw/source/filter/ww8/wrtw8nds.cxx
modified : #i16185# the svx rtf filter needs to know about the underlying stream to be able to read the binary \bin embedded junk
graphics/svx/inc/svxrtf.hxx
modified : #i17565# speed ups, stage 3. Slightly better algorithms, minute 10->1 minute 5
sw/sw/source/filter/inc/fltshell.hxx sw/sw/source/filter/ww1/fltshell.cxx
modified : #115157# setting symbol as the fallback for all symbolish fonts had a bad side effect
sw/sw/source/filter/ww8/ww8scan.cxx
modified : #i25601# default date format is different for different field for some fool MS reason
sw/sw/source/filter/ww8/ : wrtw8esh.cxx, ww8graf.cxx, ww8par.hxx, ww8par5.cxx ;
modified : #i19164# merge much of the fontsubstitution lookup code for ww8 and rtf export
sw/sw/source/filter/ww8/ : writerhelper.cxx, writerhelper.hxx, writerwordglue.cxx, writerwordglue.hxx, wrtw8num.cxx, wrtw8sty.cxx, wrtww8.hxx, ww8par3.cxx ; sw/sw/source/filter/inc/msfilter.hxx sw/sw/source/filter/rtf/wrtrtf.cxx
modified : #i16185# implement reading the binary \bin embedded system for including graphic data
graphics/svx/source/svrtf/ : rtfgrf.cxx, svxrtf.cxx ;
modified : #i24463# wrap exporting document properties (\info) inside \upr \ud unicode safe wrappers if necessary (required by wordpad)
sw/sw/source/filter/rtf/ : wrtrtf.cxx, wrtrtf.hxx ;
modified : #i17565# speed ups, stage 2. Noone wants that return code, and its complicating matters, 1 minute 10->1 minute 10
sw/sw/source/filter/inc/fltshell.hxx sw/sw/source/filter/ww1/fltshell.cxx
modified : #i16185 the \bin keyword is a special case because its data is binary, therefore skipping rtf by counting {} doesn't work if we run into a \bin area because they can exist in the binary dump. So we must handle the \bin token specially when skipping contents (why ms broke a perfectly good idea of the rtf format to dump in binary data I just don't know)
util/svtools/source/svrtf/parrtf.cxx
modified : #i17565# speed ups, stage 1. Simulate old api with stl deque, 1 minute 20->1 minute 10
sw/sw/source/filter/inc/fltshell.hxx sw/sw/source/filter/ww1/fltshell.cxx

cws_src680_sb14 was changed by Stephan Bergmann(sb)
removed : #i21150# Removed dead code (which was not even built).
files from: CDRInputStream.java CDROutputStream.java Marshal.java Unmarshal.java iiop.java makefile.mk
modified : #i21150# Fixed typo.
udk/ridljar/com/sun/star/lib/uno/typeinfo/makefile.mk udk/ridljar/com/sun/star/lib/uno/typedesc/makefile.mk
modified : #i21150# Fixed test (broken by changes introduced in fix for 114000).
udk/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java
modified : #i21150# Missing @since tag.
api/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl
modified : #i21150# Fixed OOo 2.0 version name: increase minor by one for compatible changes.
udk/cppuhelper/source/ : cc5_solaris_sparc.map, gcc3_linux_intel.map, msvc_win32_intel.map ; udk/cppu/util/cppu.map
modified : #i21150# Support for single-interface--based services and interface-based singletons.
modified : #i21150# Support for single-interface--based services and interface-based singletons; always generate output for all services and for interface-based singletons, even if no -C is given.
udk/idlc/source/ : astdump.cxx, options.cxx, parser.y ;
modified : #i21150# No dependency on jurt, as Java types were moved from jurt to ridljar; cleaned up.
udk/unoil/drafts/com/sun/star/script/framework/makefile.pmk udk/unoil/ : makefile.mk, makefile.pmk ; udk/unoil/prj/build.lst
modified : #i21150# Moved Java types from jurt to ridljar, as javamaker now generates code that uses UnoRuntime; cleaned up; deprecated environment/bridge/mapping stuff.
udk/jurt/test/com/sun/star/uno/makefile.mk udk/jurt/com/sun/star/uno/makefile.mk udk/ridljar/prj/build.lst udk/jurt/prj/build.lst udk/jurt/test/com/sun/star/lib/util/makefile.mk udk/ridljar/test/com/sun/star/uno/makefile.mk udk/ridljar/com/sun/star/uno/makefile.mk udk/ridljar/test/makefile.mk udk/jurt/com/sun/star/lib/util/makefile.mk
modified : #i21150# Generate Java classes for single-interface--based services and interface-based singletons.
udk/codemaker/source/javamaker/ : javatype.cxx, javatype.hxx ;
added : Directory udk/ridljar/test/com/sun/star/lib/util using tag `cws_src680_sb14'
added : #i21150# Support for single-interface--based services and interface-based singletons.
api/udkapi/com/sun/star/reflection/ : XServiceTypeDescription2.idl, XSingletonTypeDescription2.idl ;
added : Directory udk/ridljar/com/sun/star/lib/util using tag `cws_src680_sb14'
added : #i21150# Moved Java types from jurt to ridljar, as javamaker now generates code that uses UnoRuntime; cleaned up; deprecated environment/bridge/mapping stuff.
udk/jurt/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java udk/ridljar/com/sun/star/uno/ : IBridge.java, IQueryInterface.java, IMapping.java, UnoRuntime.java, IEnvironment.java ; udk/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java udk/ridljar/com/sun/star/lib/util/ : DisposeListener.java, WeakMap.java, makefile.mk, DisposeNotifier.java ; udk/ridljar/test/com/sun/star/lib/util/ : makefile.mk, WeakMap_Test.java ;

cws_src680_vcl20 was changed by Philipp Lohmann(pl)
modified : #i24629# emit JobPatchFile from PPD
gsl/psprint/source/helper/ppdparser.cxx gsl/psprint/source/printergfx/printerjob.cxx gsl/psprint/inc/psprint/printerjob.hxx
modified : #i20934# search in subdirectories for fonts, too

cws_src680_tableintable was changed by Frank Meies(fme)
modified : #i25679# Feature - Table in table
sw/sw/source/core/frmedt/tblsel.cxx sw/sw/source/core/layout/ : calcmove.cxx, findfrm.cxx, flowfrm.cxx, tabfrm.cxx ; xml/xmloff/source/text/txtimp.cxx sw/sw/source/core/docnode/ : ndcopy.cxx, nodes.cxx ; sw/sw/source/core/doc/swtable.cxx

cws_src680_geordi2q15 was changed by Jens-Heiner Rechtien(hr)
modified : #111934#: merge CWS ooo111regression2
installation/setup2/script/setup.sh
modified : #111934#: merge CWS ooo111fix3
installation/scptools/util/cui/makefile.mk l10n/i18npool/inc/collatorImpl.hxx tools/dmake/startup/unix/linux/Makefile.in tools/dmake/startup/unix/solaris/Makefile.in tools/dmake/unix/ : Makefile.am, Makefile.in ; graphics/sd/source/filter/pptin.cxx tools/dmake/startup/Makefile.in external/addons/dictionaries/diclst/DicOOo.sxw tools/config_office/set_soenv.in udk/pyuno/zipcore/python.sh graphics/svx/source/msfilter/msfiltertracer.cxx tools/dmake/startup/winnt/mingw/Makefile.in graphics/svx/util/defs/wntmsci8 tools/dmake/msdos/ : Makefile.am, Makefile.in ; installation/setup2/source/ui/pages/paddr.cxx tools/dmake/startup/winnt/Makefile.in tools/dmake/startup/winnt/msvc6/Makefile.in tools/dmake/startup/unix/Makefile.in tools/dmake/startup/unix/sysvr4/Makefile.in tools/dmake/ : Makefile.am, Makefile.in, aclocal.m4, config.h.in, configure ; external/addons/dictionaries/en_US/en_US.dic tools/dmake/startup/unix/macosx/Makefile.in tools/dmake/startup/unix/cygwin/Makefile.in tools/dmake/win95/microsft/ : Makefile.am, Makefile.in ; tools/dmake/win95/ : Makefile.am, Makefile.in ; external/regexp/source/reclass.cxx

cws_src680_gluepoint was changed by Jens-Heiner Rechtien(hr)

cws_src680_gluepoint was changed by Armin Weiss(aw)
modified : #112829# Inserted migrated GluePoint reworks from aw006.
graphics/svx/prj/ : build.lst, d.lst ; graphics/svx/util/makefile.mk graphics/svx/inc/ : svdobj.hxx, svdopath.hxx, svdotext.hxx ; graphics/svx/util/defs/wntmsci8 graphics/svx/source/svdraw/ : svdobj.cxx, svdopath.cxx, svdotext.cxx ;

cws_src680_qwizards1 was changed by Tom Verbeek(tv)
modified : fixed loop when clicking on calc cell Issue number: Submitted by: Reviewed by:
installation/wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/ActionFrame.java
modified : changed common.jar -> commonwizards.jar
installation/wizards/com/sun/star/wizards/letter/makefile.mk installation/wizards/com/sun/star/wizards/document/makefile.mk installation/wizards/com/sun/star/wizards/common/makefile.mk installation/wizards/com/sun/star/wizards/query/makefile.mk installation/wizards/com/sun/star/wizards/report/makefile.mk installation/wizards/com/sun/star/wizards/text/makefile.mk installation/wizards/com/sun/star/wizards/ui/event/makefile.mk installation/wizards/com/sun/star/wizards/db/makefile.mk installation/wizards/com/sun/star/wizards/ui/makefile.mk
modified : set mouse speed to automatic (dependent on operating system) Issue number: Submitted by: Reviewed by:
installation/wizards/source/tutorials/Functions.xba
modified : added registration of new wizards and tutorial framework Issue number: Submitted by: Reviewed by:
installation/scp2/source/writer/configurationitem_writer.scp installation/scp2/source/ooo/ : custom_ooo.scp, directory_ooo.scp, file_ooo.scp, starregistryitem_ooo.scp ; installation/scp2/source/draw/registryitem_draw.scp

cws_src680_qwizards1 was changed by Ron Piterman(rpiterman)
added :
installation/wizards/com/sun/star/wizards/web/data/makefile.mk installation/wizards/com/sun/star/wizards/web/export/makefile.mk
added : Adds support for fields for the DataAware model
installation/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java
modified : added some web wizard resources
installation/wizards/source/formwizard/dbwizres.src
modified : added "ok" and "close"
installation/wizards/source/formwizard/dbwizres.src
modified : changes were made to enable Fields in the DataAware model
installation/wizards/com/sun/star/wizards/ui/event/ : DataAware.java, RadioDataAware.java, SimpleDataAware.java, Task.java, TaskEvent.java, UnoDataAware.java, makefile.mk ;

cws_src680_fieldoptions was changed by Niklas Nebel(nn)
modified : #i23447# DoAutoShow: nothing to do if AutoCount >= member count
sc/sc/source/core/data/dptabres.cxx
modified : #i23447# AutoShow (continued)
sc/sc/source/core/data/ : dptabres.cxx, dptabsrc.cxx ; sc/sc/inc/ : dptabres.hxx, dptabsrc.hxx ;

cws_src680_sj05 was changed by Sven Jacobi(sj)
removed : RESYNC:; FILE REMOVED
files from: optgenrl.hxx
modified : ExtrusionBar is now using the right ViewShell
graphics/sd/source/ui/view/drviewsa.cxx
modified : RESYNC:; FILE MERGED
files from: graphics/svx/source/xoutdev/xattr.cxx api/offapi/util/makefile.mk api/offuh/prj/d.lst api/offapi/prj/build.lst
modified : changed include vcl-poly.hxx to tools-poly.hxx
graphics/svx/source/customshapes/EnhancedCustomShape3d.cxx
modified : added missing defines
graphics/svx/inc/galtheme.hrc
modified : changed name of new shape
graphics/svx/source/msfilter/eschesdo.cxx graphics/sd/source/filter/eppt/epptso.cxx
modified : activating extrusion toolbar
graphics/sd/source/ui/view/drviewsa.cxx
modified : fixed gpf if loading ppt documents with header&footer
graphics/sd/source/core/sdpage.cxx

cws_src680_chart2mst3 was changed by Bjoern Mielke(bm)
modified : -$SVLIB == $VCLLIB
graphics/chart2/source/view/makefile.mk graphics/chart2/source/controller/makefile.mk
modified : +addParentParticleID for inserting a parent id into an existing parent-less CID
graphics/chart2/source/inc/chartview/ObjectIdentifier.hxx graphics/chart2/source/view/main/ObjectIdentifier.cxx
modified : RESYNC:; FILE MERGED
files from: graphics/chart2/prj/build.lst
modified : set CID at group shape
graphics/chart2/source/view/legend/StandardViewLegendEntryProvider.cxx
modified : operator lcl_MatchesRole needs const operator()
graphics/chart2/source/tools/DataSeriesHelper.cxx
modified : more dependencies
graphics/chart2/prj/build.lst
modified : assume that symbols contain a CID without parent id, and add the parent id
graphics/chart2/source/view/main/VLegend.cxx
modified : comments adapted
api/offapi/com/sun/star/chart2/XDataProvider.idl

cws_src680_chart2mst3 was changed by Ingrid Halama(iha)
removed : integrate categories at ScaleData
files from: XCategoriesProvider.idl
removed : removed unused file - use ScaleData instead
files from: ScaleModel.idl
modified : handle lifetime of the ChartCindow correct
graphics/chart2/source/controller/main/ChartController.cxx graphics/chart2/source/tools/LifeTime.cxx
modified : use charttools and chartview lib as shared libs - not static - export all symbols
graphics/chart2/source/view/makefile.mk graphics/chart2/source/tools/makefile.mk
modified : dependencies only for windows
graphics/chart2/source/model/makefile.mk
modified : use charttools and chartview lib as shared libs - not static
graphics/chart2/source/view/exports.flt graphics/chart2/util/makefile.pmk graphics/chart2/source/tools/exports.flt
modified : #115596# crash in symbol controls due to pointer to temporary
graphics/svx/source/dialog/ : cuitabline.hxx, tpline.cxx ;
modified : show regression curve also if first points are null
graphics/chart2/source/view/charttypes/BarChart.cxx
modified : regression line was twice transformed to scene coordinates
graphics/chart2/source/view/charttypes/VSeriesPlotter.cxx
modified : integrate categories at scale
graphics/chart2/source/model/inc/DiscreteScaleGroup.hxx graphics/chart2/com/sun/star/chart2/ScaleData.idl graphics/chart2/source/tools/DataSeriesTreeHelper.cxx
modified : add parameter 'ConnectLastToFirstPoint' for net chart
graphics/chart2/source/view/charttypes/ : AreaChart.hxx, AreaChart.cxx, VSeriesPlotter.cxx ;
modified : integrate categories at axis in view
modified : added method DataSequenceToStringSequence for categories at axes
graphics/chart2/source/inc/CommonConverters.hxx graphics/chart2/source/tools/CommonConverters.cxx
modified : add dependency on charttools.lib
graphics/chart2/source/view/makefile.mk
modified : don't change x values to integer anymore as we are working in logical values now
graphics/chart2/source/view/charttypes/Splines.cxx
modified : indicate lib dependencies
graphics/chart2/source/model/makefile.mk
modified : removed unused code
graphics/chart2/source/controller/inc/dlg_ObjectProperties.hxx graphics/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
modified : handle lifetime of the ChartWindow correct
graphics/chart2/source/controller/main/ : ChartController_Window.cxx, ChartWindow.hxx, ChartWindow.cxx ;
modified : renamed global symbol to unique name
graphics/chart2/source/controller/main/_serviceregistration_controller.cxx

cws_src680_fwkmerge1 was changed by Lars Oppermann(lo)
removed : RESYNC:; FILE REMOVED
files from: : misccfg.cxx, misccfg.hxx, makefile.mk, response_workstation.txt, makefile.mk, python.lng, python.scp, winbasic_python.scp, unxbasic_python.scp, dir_psprint.scp, files_psprint.scp, makefile.mk, makefile.mk, module_fat_root.lng, module_fat_root.scp, basic.lng, basic.scp, config.lng, config.scp, dir.scp, files.scp, module.lng, module.scp, profile.lng, setuphelp.lng, setuphelp.scp, system.lng, unxbasic.lng, unxbasic.scp, dir.lng, makefile.mk, profile.scp, system.scp, files_math.scp, makefile.mk, module_math.lng, profile_math.lng, profile_math.scp, system_math.lng, module_math.scp, system_math.scp, files_lingu.scp, makefile.mk, module_lingu.lng, module_lingu.scp, files_kde.scp, makefile.mk, module_kde.lng, module_kde.scp, basic_javafilter.scp, files_javafilter.scp, makefile.mk, module_javafilter.scp, profile_javafilter.lng, profile_javafilter.scp, module_javafilter.lng, files_impress.scp, makefile.mk, module_impress.lng, profile_impress.lng, profile_impress.scp, system_impress.lng, system_impress.scp, module_impress.scp, files_grafik.scp, makefile.mk, module_grafik.lng, module_grafik.scp, profile_grafik.scp, files_gnome.scp, makefile.mk, module_gnome.lng, module_gnome.scp, makefile.mk, readme.scp, setupzip.scp, udk_bridges.scp, udk_complete.scp, udk_pure_java.scp, udk_remote.scp, udk_base.scp, udk_java.scp, files_fonts.scp, makefile.mk, module_fonts.lng, module_fonts.scp, files_draw.scp, makefile.mk, module_draw.lng, profile_draw.lng, profile_draw.scp, system_draw.lng, module_draw.scp, system_draw.scp, crashrep_dynamic.scp, crashrep_static.scp, makefile.mk, files_chart.scp, makefile.mk, module_chart.lng, profile_chart.lng, profile_chart.scp, system_chart.lng, system_chart.scp, module_chart.scp, files_cde.scp, makefile.mk, module_cde.lng, unxbasic_cde.lng, unxbasic_cde.scp, module_cde.scp, files_calc.scp, makefile.mk, module_calc.lng, profile_calc.lng, profile_calc.scp, system_calc.lng, module_calc.scp, system_calc.scp, build.lst, d.lst, gcfg.inc, gid.inc, gid_oo.inc, szipmac.inc, componentloader.cxx, asyncloadthread.cxx, loadeventlistener.cxx, componentloader.hxx, asyncloadthread.hxx, loadeventlistener.hxx, exports.map, wrapper.cxx, wrapper.hxx, makefile.mk,
removed : #i25371# moved
files from: license.cxx license.hxx
modified : #i25371# move license dialog to Desktop::Main()
framework/desktop/util/makefile.mk framework/desktop/source/app/ : app.cxx, makefile.mk, userinstall.cxx, userinstall.hxx ; framework/desktop/source/pkgchk/defs/wntmsci8
modified : #115238# merge up new xsltfilter from srx645
installation/scp2/source/xsltfilter/ : file_xsltfilter.scp, module_xsltfilter.scp, starregistryitem_xsltfilter.scp ; installation/scp2/source/javafilter/file_javafilter.scp installation/scp2/source/draw/registryitem_draw.scp
modified : RESYNC:; FILE MERGED
files from: framework/desktop/source/app/app.cxx framework/sfx2/source/appl/: app.cxx, appinit.cxx, appmain.cxx, appopen.cxx, framework/sfx2/source/view/sfxbasecontroller.cxx
modified : #115238# mergeup new xsltfilter from srx645#
installation/scp2/source/xsltfilter/ : makefile.mk, starregistryitem_xsltfilter.scp ; installation/scp2/util/makefile.mk
modified : #113029# register jaxt helper
installation/scp/source/javafilter/profile_javafilter.scp
modified : #115238# fix build in mergeup for #112924#
framework/desktop/source/app/ : app.cxx, dispatchwatcher.cxx ;
modified : #115238# merge for i9081: emty lines in docbook export
framework/filter/source/docbook/sofftodocbookheadings.xsl
modified : #115315# fix deadlock on premature shutdown
framework/desktop/source/app/ : officeipcthread.cxx, officeipcthread.hxx ;

cws_src680_fwkmerge1 was changed by Mikhail Voitenko(mav)
modified : #115237# integrate fix for 111921
framework/embedserv/source/embed/servprov.cxx
modified : #115237# integrate fix for 114872
graphics/svx/source/svdraw/svdoole2.cxx

cws_src680_vcl18 was changed by Herbert Duerr(hdu)
modified : #i25563# move X11 font size limit down one abstraction layer
gsl/vcl/unx/source/gdi/ : salgdi3.cxx, xfont.cxx, xlfd_extd.cxx, xlfd_extd.hxx ;

cws_src680_vcl18 was changed by Philipp Lohmann(pl)
modified : #110169# finally: flash plugin support
util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx util/extensions/source/plugin/unx/ : mediator.cxx, npnapi.cxx, npwrap.cxx, plugcon.cxx ;
modified : constness
util/extensions/source/plugin/inc/plugin/unx/mediator.hxx
modified : #i12911# mimic other browsers shutdown behaviour
util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx util/extensions/source/plugin/unx/ : npnapi.cxx, nppapi.cxx, npwrap.cxx, plugcon.cxx, sysplug.cxx ;
modified : #110169# cleanup of CreateShell, properly remove destroyed streams from list
util/extensions/source/plugin/unx/ : npnapi.cxx, npwrap.cxx ;

cws_src680_xslt2 was changed by Daniel Rentz(dr)
added : #115567# Excel XSLT
framework/filter/source/msexcelxml/ : MsExcelXMLImport.xsl, makefile.mk ;
modified : #115568# Word XSLT
framework/filter/source/mswordxml/MsWordXMLImport.xsl
modified : #115567# Excel XSLT
framework/filter/source/config/fragments/filters/Microsoft_Excel_2003_XML.xcu installation/scp2/source/xsltfilter/ : file_xsltfilter.scp, module_xsltfilter.scp ; framework/filter/prj/build.lst installation/scp2/source/ooo/directory_ooo.scp

cws_srx645_impress2 was changed by Andre Fischer(af)
removed : RESYNC:; FILE REMOVED
files from: : ldapdlg.hxx, multipat.cxx, multipat.hrc, optaccessibility.hrc, optasian.hrc, optcolor.hrc, optctl.hrc, optdict.hrc, optextbr.cxx, optextbr.hrc, optgenrl.hrc, optinet2.hrc, optjsearch.hrc, optpath.hrc, optsave.hrc, optspell.hrc, ldapdlg.cxx, multifil.cxx, optaccessibility.cxx, optasian.cxx, optcolor.cxx, optctl.cxx, optdict.cxx, optdll.cxx, optgenrl.cxx, optinet2.cxx, optjsearch.cxx, optpath.cxx, optsave.cxx, optspell.cxx, hldoctp.hxx, hlinettp.hxx, hldocntp.hxx, hlmailtp.hxx, hltpbase.hxx, showcols.hxx, srchxtra.hxx, taborder.hxx, galdlg.cxx, galdlg.hxx, galtheme.hxx, galbrws2.hxx, galctrl.hxx, gallery.hrc, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hrc, taborder.cxx, showcols.cxx, multipat.hxx, optcolor.hxx, optctl.hxx, optextbr.hxx, optsave.hxx, optspell.hxx, bbdlg.hxx, connect.hxx, dlgname.hxx, dstribut.hxx, iconcdlg.hxx, itemdata.hxx, labdlg.hxx, measure.hxx, multifil.hxx, optaccessibility.hxx, optasian.hxx, optdict.hxx, optinet2.hxx, optjsearch.hxx, optpath.hxx, textanim.hxx, transfrm.hxx, zoom.hxx, SdOutlinerIterator.cxx, drstdob.cxx, drgrfob.cxx, grstdob.cxx, sdoutl.cxx, drglueob.hxx, drgrfob.hxx, drtxtob.hxx, drviewsh.hxx, efctchld.hxx, grstdob.hxx, grviewsh.hxx, navichld.hxx, outlview.hxx, prevchld.hxx, sdmtf.hxx, sdwindow.hxx, slidchld.hxx, slidvish.hxx, SdOutlinerIteratorImpl.hxx, brkdlg.hxx, clview.hxx, dlgolbul.hxx, docshell.hxx, drbezob.hxx, drstdob.hxx, effect.hxx, frmview.hxx, mover.hxx, grdocsh.hxx, layertab.hxx, outlnvsh.hxx, presvish.hxx, preview.hxx, prvwshll.hxx, sdclient.hxx, sdruler.hxx, sdview.hxx, showwin.hxx, slidview.hxx, tabcontr.hxx, viewshel.hxx, preview.src, preview.cxx, sdoutl.hxx,
modified : #i22705# Added entries for the new panes.
graphics/sd/sdi/_drvwsh.sdi
modified : #i22705# Reformat. Minor method signature changes.
graphics/sd/source/ui/inc/Window.hxx
modified : #i22705# Added SIDs for the new panes.
graphics/sd/inc/app.hrc
modified : #i22705# Minro errors in comments fixed.
graphics/sd/source/ui/inc/DrawController.hxx
modified : #i22705# Added argument to constructors.
modified : #i22705# Adaption to changes in ObjectBarManager.
graphics/sd/source/ui/view/drviews3.cxx
modified : #i22705# Preventing handout pages from being returned by GetPageByName().
graphics/sd/source/core/drawdoc2.cxx
modified : #i22705# Added an interface id for the SlideSorterViewShell.
graphics/sd/inc/glob.hxx
modified : #i22705# Added private data members mbDisposing and maLastVisArea.
graphics/sd/source/ui/inc/SdUnoSlideView.hxx
modified : #i22705# Added SetName() method that calls ActionChanged().
graphics/sd/source/core/sdpage.cxx
modified : #i22705# Added a string id for the SlideSorterViewShell.
graphics/sd/inc/glob.hrc
modified : #i22705# Accessing view through GetView(). Handling maSlideSorterButton.
graphics/sd/source/ui/view/drviews7.cxx
modified : #i22705# Added SlideSorterController.sdi.
graphics/sd/sdi/ : makefile.mk, sdslots.sdi ;
modified : #i22705# Adaption to modified ObjectBarManager. Using new child windows for panes of new GUI.
graphics/sd/source/ui/view/outlnvsh.cxx
modified : #i22705# Removed already commented out import View statement.
graphics/sd/sdi/grviewsh.sdi
modified : #i22705# Adaption to changes in ObjectBarManager. Using GetParent(). Introduction of maSlideSorterButton.
graphics/sd/source/ui/view/drviews5.cxx
modified : #i22705# Changed the design and implementation.
graphics/sd/source/ui/inc/ObjectBarManager.hxx
modified : #i22705# Using new child windows to show panes of new GUI.
graphics/sd/source/ui/view/drvwshrg.cxx
modified : #i22705# Accessing view through GetView(). Adaption to modified ObjectBarManager.
graphics/sd/source/ui/view/drviewsf.cxx
modified : #i22705# Replaced SubShellManager by ViewShellManager. Added ViewClipboard.
graphics/sd/source/ui/view/makefile.mk
modified : #i22705# The view is accessed through GetView().
graphics/sd/source/ui/view/drviews4.cxx
modified : #i22705# Included header renamed.
graphics/sd/source/ui/inc/ClientView.hxx
modified : #i22705# Adaption to changes in ViewShellBase.
graphics/sd/source/core/stlsheet.cxx
modified : #i22705# Added overloaded SetName() method that calls ActionChange when the name changes.
graphics/sd/inc/sdpage.hxx
modified : #i22705# Changed several method signatures.
graphics/sd/source/ui/inc/ : View.hxx, ViewShell.hxx, ViewShellBase.hxx ;
modified : #i22705# Added items for new panes.
graphics/sd/sdi/ : sdraw.sdi, sdslots.src ;
modified : #i22705# Accessing view through GetView().
modified : #i22705# Adaption to modified ObjectBarManager.
graphics/sd/source/ui/view/drviewsb.cxx
modified : #i22705# Added a documentation comment for GetPageByName().
graphics/sd/inc/drawdoc.hxx
modified : #i22705# Adaption to changes in ObjectBarManager. Using GetParentWindow().
graphics/sd/source/ui/view/drviews1.cxx
modified : #i22705# Added argument to contructo. Removed registration of object bars: ObjectBarManager creates them on demand.
graphics/sd/source/ui/view/drviewsa.cxx
modified : #i22705# Introduction of new child windows for the panes of the multi-pane-GUI.
graphics/sd/source/ui/view/drviews6.cxx
modified : #i22705# Added bitmap ids for the task panel.
graphics/sd/source/ui/inc/res_bmp.hrc
added : #i22705# Initial revision.
graphics/sd/source/ui/inc/NotesChildWindow.hrc graphics/sd/source/ui/view/ : ViewShellManager.cxx, ViewClipboard.cxx ;

cws_src680_tabstops was changed by Frank Meies(fme)
removed : RESYNC:; FILE REMOVED
files from: : db_atr.cxx, db_xml.cxx, makefile.mk, wrt_db.cxx, wrt_db.hxx, wrt_undo.cxx, wrt_undo.hxx, undo_atr.cxx, multifil.cxx, multipat.cxx, multipat.hrc, optaccessibility.cxx, optaccessibility.hrc, optasian.hrc, optcolor.cxx, optcolor.hrc, ldapdlg.cxx, optctl.hrc, optdict.cxx, optdll.cxx, optextbr.cxx, optextbr.hrc, optgenrl.cxx, optgenrl.hrc, optinet2.hrc, optjsearch.cxx, optjsearch.hrc, optpath.hrc, optsave.cxx, optspell.hrc, ldapdlg.hxx, optasian.cxx, optctl.cxx, optdict.hrc, optinet2.cxx, optpath.cxx, optsave.hrc, optspell.cxx, hldocntp.hxx, srchxtra.hxx, taborder.hxx, hlinettp.hxx, hlmailtp.hxx, hltpbase.hxx, hldoctp.hxx, showcols.hxx, galctrl.hxx, galdlg.cxx, galdlg.hxx, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hxx, galbrws2.hxx, gallery.hrc, galtheme.hrc, taborder.cxx, showcols.cxx, dlgname.hxx, zoom.hxx, labdlg.hxx, iconcdlg.hxx, multifil.hxx, multipat.hxx, optdict.hxx, optextbr.hxx, optinet2.hxx, optaccessibility.hxx, optasian.hxx, optcolor.hxx, optpath.hxx, optsave.hxx, optspell.hxx, transfrm.hxx, bbdlg.hxx, connect.hxx, dstribut.hxx, itemdata.hxx, measure.hxx, optctl.hxx, optjsearch.hxx, textanim.hxx,
modified : RESYNC:; FILE MERGED
files from: sw/sw/source/filter/ww8/ww8par.cxx sw/sw/source/core/text/: inftxt.cxx, itrform2.cxx,

cws_src680_aw008 was changed by Armin Weiss(aw)
removed : RESYNC:; FILE REMOVED
files from: : db_atr.cxx, db_xml.cxx, makefile.mk, wrt_db.cxx, wrt_db.hxx, wrt_undo.hxx, undo_atr.cxx, wrt_undo.cxx, ldapdlg.hxx, multipat.cxx, multipat.hrc, optaccessibility.hrc, optasian.hrc, optcolor.hrc, optctl.hrc, optdict.hrc, optextbr.cxx, optextbr.hrc, optgenrl.hrc, optinet2.hrc, optjsearch.hrc, optpath.hrc, optsave.hrc, optspell.hrc, ldapdlg.cxx, multifil.cxx, optaccessibility.cxx, optasian.cxx, optcolor.cxx, optctl.cxx, optdict.cxx, optdll.cxx, optgenrl.cxx, optinet2.cxx, optjsearch.cxx, optpath.cxx, optsave.cxx, optspell.cxx, hldoctp.hxx, hlinettp.hxx, hldocntp.hxx, hlmailtp.hxx, hltpbase.hxx, showcols.hxx, srchxtra.hxx, taborder.hxx, galdlg.cxx, galdlg.hxx, galtheme.hxx, galbrws2.hxx, galctrl.hxx, gallery.hrc, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hrc, taborder.cxx, showcols.cxx, multipat.hxx, optcolor.hxx, optctl.hxx, optextbr.hxx, optsave.hxx, optspell.hxx, bbdlg.hxx, connect.hxx, dlgname.hxx, dstribut.hxx, iconcdlg.hxx, itemdata.hxx, labdlg.hxx, measure.hxx, multifil.hxx, optaccessibility.hxx, optasian.hxx, optdict.hxx, optinet2.hxx, optjsearch.hxx, optpath.hxx, textanim.hxx, transfrm.hxx, zoom.hxx,
modified : #114735# Added removal from DrawHierarchy BaseLevel when ViewObjectContact is removed.
graphics/svx/source/sdr/contact/ : objectcontact.cxx, viewobjectcontact.cxx ;
modified : #110988#
graphics/svx/source/svdraw/svdmrkv.cxx graphics/svx/source/engine3d/ : obj3d.cxx, scene3d.cxx ; graphics/svx/inc/ : obj3d.hxx, scene3d.hxx ; graphics/goodies/source/base3d/b3dgeom.cxx graphics/goodies/inc/ : b3dgeom.hxx, vector3d.hxx ;
modified : #110649#
graphics/svx/inc/svdoedge.hxx graphics/svx/source/svdraw/svdoedge.cxx
modified : #115593#
graphics/svx/source/sdr/contact/viewcontactofsdrpage.cxx graphics/svx/source/sdr/properties/emptyproperties.cxx graphics/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx

cws_srx645_ptbrblank was changed by Volker Ahrend(va) [ and it was merged ]
modified : #115579# Corrected Folder Name "Homepage".
installation/scp/source/office/dir.scp

cws_src680_interop12 was changed by Christian Lippka(cl)
modified : fixed compiler warning
graphics/svx/inc/svdhlpln.hxx
modified : fixed header problems
graphics/sd/source/ui/func/undoheaderfooter.cxx graphics/sd/source/filter/grf/sdgrffilter.cxx graphics/sd/source/filter/bin/sdbinfilter.cxx graphics/sd/source/ui/view/drviews3.cxx graphics/sd/source/ui/dlg/headerfooterdlg.cxx
modified : fixed merge problems
graphics/sd/source/ui/inc/ : SlideView.hxx, View.hxx, headerfooterdlg.hxx ; graphics/sd/source/ui/dlg/ : dlgass.cxx, headerfooterdlg.cxx ; graphics/sd/source/core/ : drawdoc.cxx, drawdoc2.cxx, sdpage.cxx ; graphics/sd/inc/drawdoc.hxx graphics/sd/source/ui/view/ : drviews1.cxx, drviews3.cxx, sdview.cxx, slidview.cxx ; graphics/sd/source/ui/app/sdmod2.cxx

cws_src680_aw006 was changed by Armin Weiss(aw)
removed : #112829# Moved Gluepoint stuff to gluepoint CWS
files from: gluepointavailable.hxx gluepointcustom.hxx gluepointdefines.hxx gluepointdescriptor.hxx gluepointextension.hxx gluepointprovider.hxx gluepointsupport.hxx gluepointused.hxx gluepointuser.hxx
removed : #112829# Moved GluePoint stuff to gluepoint CWS
files from: gluepointavailable.cxx gluepointcustom.cxx gluepointdescriptor.cxx gluepointextension.cxx gluepointprovider.cxx gluepointsupport.cxx gluepointused.cxx gluepointuser.cxx makefile.mk
modified : #112829# Removed GluePoint reworks, migrated to gluepoint CWS. Various XOR reworks, too.
graphics/svx/source/form/ : fmctrler.cxx, fmshell.cxx, fmshimp.cxx, fmview.cxx, fmvwimp.cxx, navigatortree.cxx, taborder.cxx ; graphics/svx/source/sdr/contact/ : makefile.mk, objectcontact.cxx, viewcontact.cxx, viewcontactofsdrobj.cxx, viewcontactofsdrpage.cxx, viewobjectcontact.cxx ; graphics/svx/source/unodraw/ : UnoGraphicExporter.cxx, unoshtxt.cxx ; graphics/svx/prj/ : build.lst, d.lst ; graphics/svx/util/defs/wntmsci8 graphics/svx/source/svdraw/ : makefile.mk, svdcrtmt.cxx, svdcrtv.cxx, svddrgm1.hxx, svddrgmt.cxx, svddrgv.cxx, svdedtv.cxx, svdedxv.cxx, svdhdl.cxx, svdibrow.cxx, svdmrkv.cxx, svdmrkv1.cxx, svdobj.cxx, svdoedge.cxx, svdopath.cxx, svdotext.cxx, svdouno.cxx, svdpagv.cxx, svdpntv.cxx, svdsnpv.cxx, svdview.cxx, svdviter.cxx, svdxcgv.cxx ; graphics/svx/source/inc/fmvwimp.hxx graphics/svx/inc/svx/sdr/contact/ : objectcontact.hxx, viewcontact.hxx, viewcontactofsdrobj.hxx, viewcontactofsdrpage.hxx, viewobjectcontact.hxx ; graphics/svx/source/dialog/ : connctrl.cxx, contwnd.cxx, dlgctl3d.cxx, graphctl.cxx ; graphics/svx/source/gallery2/galobj.cxx graphics/svx/source/engine3d/ : dragmt3d.cxx, obj3d.cxx, view3d.cxx ; graphics/svx/inc/ : dragmt3d.hxx, fmview.hxx, svdcrtv.hxx, svddrgmt.hxx, svddrgv.hxx, svdedtv.hxx, svdedxv.hxx, svdglev.hxx, svdhdl.hxx, svdhlpln.hxx, svdmrkv.hxx, svdobj.hxx, svdoedge.hxx, svdopath.hxx, svdotext.hxx, svdpagv.hxx, svdpntv.hxx, svdpoev.hxx, svdsnpv.hxx, svdview.hxx, svdviter.hxx, svdxcgv.hxx, view3d.hxx ; graphics/svx/util/makefile.mk graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx
modified : #114407#
graphics/sch/source/ui/docshell/docshel1.cxx graphics/sd/source/ui/func/ : fader.cxx, fudraw.cxx, fudspord.cxx, fuediglu.cxx, fusel.cxx, fuslsel.cxx, fuslshow.cxx, fuslshw2.cxx, mover.cxx ; sw/sw/source/core/layout/ : layact.cxx, paintfrm.cxx ; sc/sc/source/ui/drawfunc/ : fusel.cxx, futext.cxx ; graphics/sd/source/ui/view/ : clview.cxx, drawview.cxx, drviews3.cxx, drviews5.cxx, frmview.cxx, outlview.cxx, sdview.cxx, sdview2.cxx, sdview4.cxx, showview.cxx, showwin.cxx, slidview.cxx, slidvish.cxx, viewshe3.cxx ; sw/sw/inc/fesh.hxx sw/sw/source/core/frmedt/ : fefly1.cxx, feshview.cxx, fews.cxx ; sc/sc/util/makefile.mk sc/sc/source/ui/inc/ : drawview.hxx, gridwin.hxx ; sc/sc/source/ui/view/ : drawview.cxx, gridwin.cxx, gridwin3.cxx, gridwin4.cxx, output3.cxx, printfun.cxx, tabview5.cxx ; sw/sw/source/core/draw/dview.cxx sw/sw/source/core/inc/viewimp.hxx graphics/sd/source/ui/unoidl/unomodel.cxx graphics/sd/source/ui/docshell/docshel2.cxx sw/sw/source/core/doc/notxtfrm.cxx sw/sw/source/core/view/ : scrrect.cxx, vdraw.cxx, viewimp.cxx, viewsh.cxx ; graphics/sch/source/ui/view/ : schview.cxx, viewshe4.cxx, viewshel.cxx ; graphics/sch/source/ui/func/ : fugrid.cxx, futitle.cxx ; sw/sw/source/ui/ribbar/drawbase.cxx sw/sw/source/filter/ww8/writerhelper.cxx sw/sw/source/ui/inc/edtwin.hxx graphics/sd/source/filter/grf/sdgrffilter.cxx graphics/sd/source/ui/accessibility/ : AccessibleOutlineEditSource.cxx, AccessibleViewForwarder.cxx ; graphics/sd/source/ui/inc/ : clview.hxx, drawview.hxx, fudspord.hxx, outlnvsh.hxx, outlview.hxx, sdview.hxx, showview.hxx, slidvish.hxx, unokywds.hxx ; graphics/sd/source/ui/dlg/ : animobjs.cxx, docprev.cxx, preview.cxx ; graphics/sd/util/makefile.mk sw/sw/source/ui/docvw/ : edtdd.cxx, edtwin.cxx ; graphics/sd/source/ui/app/optsitem.cxx graphics/sch/inc/viewshel.hxx
added : Directory graphics/svx/source/sdr/overlay using tag `cws_src680_aw006'
added : Directory graphics/svx/inc/svx/sdr/overlay using tag `cws_src680_aw006'
added : #114389#
graphics/svx/source/sdr/contact/viewobjectcontactredirector.cxx graphics/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx

cws_srx645_canvas01 was changed by Thorsten Behrens(thb)
removed : #110496# Removed new preseng, now resides in slideshow module
files from: engine.hxx
removed : #110496# Removed due to restructuting, dispersed now across canvas and cppcanvas modules. Canvas module is primarily UNO canvas implementations (plus some tools), cppcanvas is a C++ wrapper around that (thus the name)
files from: dx_bitmapcanvas.cxx dx_bitmapcanvas.hxx dx_canvasbase.cxx dx_canvasbase.hxx dx_canvasbitmap.cxx dx_canvasbitmap.hxx dx_canvascustomsprite.cxx dx_canvascustomsprite.hxx dx_canvasfont.cxx dx_canvasfont.hxx dx_device.cxx dx_device.hxx dx_gdiplususer.cxx dx_gdiplususer.hxx dx_gdisurface.cxx dx_gdisurface.hxx dx_graphicdevice.cxx dx_graphicdevice.hxx dx_graphicsprovider.hxx dx_impltools.cxx dx_impltools.hxx dx_linepolypolygon.cxx dx_linepolypolygon.hxx dx_plainsurface.cxx dx_plainsurface.hxx dx_sprite.hxx dx_spritecanvas.cxx dx_spritecanvas.hxx dx_spritesurface.hxx dx_surface.hxx dx_surfacegraphics.cxx dx_surfacegraphics.hxx dx_surfacemanager.cxx dx_surfacemanager.hxx dx_texture.cxx dx_texture.hxx dx_winstuff.hxx exports.dxp makefile.mk redrawmanagement.hxx BackBuffer.java BezierPolyPolygon.java BitmapCanvas.java BufferedGraphics2D.java CanvasBase.java CanvasBitmap.java CanvasClonedSprite.java CanvasCustomSprite.java CanvasFont.java CanvasGraphicDevice.java CanvasSprite.java CanvasTest.java CanvasUtils.java LinePolyPolygon.java SpriteBase.java SpriteRep.java SpriteRunner.java makefile.mk manifest WindowAdapter.java WindowAdapter.java bitmapcanvas.cxx bitmapcanvas.hxx canvasbase.cxx canvasbase.hxx canvasbitmap.cxx canvasbitmap.hxx canvascustomsprite.cxx canvascustomsprite.hxx canvasfont.cxx canvasfont.hxx exports.dxp graphicdevice.cxx graphicdevice.hxx impltools.cxx impltools.hxx linepolypolygon.cxx linepolypolygon.hxx makefile.mk outdevprovider.hxx redrawmanager.cxx redrawmanager.hxx sprite.hxx spritecanvas.cxx spritecanvas.hxx spritesurface.hxx bitmapimpl.cxx bitmapimpl.hxx canvas.cxx customsprite.cxx makefile.mk polypolygonimpl.cxx polypolygonimpl.hxx spriteclone.cxx textimpl.cxx textimpl.hxx action.hxx bitmapaction.cxx bitmapaction.hxx gdimtfrenderer.cxx lineaction.cxx lineaction.hxx makefile.mk outdevstate.hxx pointaction.cxx pointaction.hxx polypolyaction.cxx polypolyaction.hxx textaction.cxx textaction.hxx tools.cxx tools.hxx canvastools.cxx makefile.mk time.cxx
removed : #110496# Deleted due to restructuring
files from: bitmap.hxx canvas.hxx canvastools.hxx customsprite.hxx gdimtfrenderer.hxx polypolygon.hxx spriteclone.hxx text.hxx time.hxx
removed : Moved new presentation engine to module graphics/slideshow
files from: activitiesqueue.cxx activitiesqueue.hxx activity.hxx andcondition.cxx andcondition.hxx animation.hxx animationactivity.cxx animationactivity.hxx animationstartevent.cxx animationstartevent.hxx booleancondition.cxx booleancondition.hxx clipper.hxx condition.hxx contentpainter.cxx contentpainter.hxx contentproducer.cxx contentproducer.hxx effectclassificator.cxx effectclassificator.hxx effectfactory.cxx effectfactory.hxx engine.cxx event.hxx eventqueue.cxx eventqueue.hxx fader.hxx makefile.mk mover.hxx orcondition.cxx orcondition.hxx shapeanimator.cxx shapeanimator.hxx shapeeffect.hxx shapeimporter.cxx shapeimporter.hxx shaperecord.hxx shaperenderer.cxx shaperenderer.hxx slide.cxx slide.hxx slidechanger.cxx slidechanger.hxx transformer.hxx
removed : RESYNC:; FILE REMOVED
files from: : SdOutlinerIterator.cxx, drstdob.cxx, drgrfob.cxx, grstdob.cxx, sdoutl.cxx, drglueob.hxx, drgrfob.hxx, drtxtob.hxx, drviewsh.hxx, efctchld.hxx, grstdob.hxx, grviewsh.hxx, navichld.hxx, outlview.hxx, prevchld.hxx, sdmtf.hxx, sdwindow.hxx, slidchld.hxx, slidvish.hxx, SdOutlinerIteratorImpl.hxx, brkdlg.hxx, clview.hxx, dlgolbul.hxx, docshell.hxx, drbezob.hxx, drstdob.hxx, effect.hxx, frmview.hxx, mover.hxx, grdocsh.hxx, layertab.hxx, outlnvsh.hxx, presvish.hxx, preview.hxx, prvwshll.hxx, sdclient.hxx, sdruler.hxx, sdview.hxx, showwin.hxx, slidview.hxx, tabcontr.hxx, viewshel.hxx, preview.src, preview.cxx, sdoutl.hxx, STLport-4.0.patch, makefile.mk, excludedclasses.txt, dmake, _dmake, init-static-template-data, jar, java, javac, patch-STLport-4.0, appletviewer, create-libstatic-link, officeacceptthread.hxx, officeacceptthread.cxx, vclpch.cxx, stacktrace.hxx, stacktrace.cxx, access.cxx, oldsv.cxx, system.cxx, rc.h, gen.hxx, rc.hxx, resary.hxx, resid.hxx, resmgr.hxx, rversion.h, access.hxx, color.hxx, config.hxx, fonttype.hxx, gdiobj.hxx, line.hxx, outdev.imp, poly.hxx, rcid.h, region.imp, rmwindow, scrbar.imp, system.hxx, vector2d.hxx, window.imp, ldapdlg.hxx, multipat.cxx, multipat.hrc, optaccessibility.hrc, optasian.hrc, optcolor.hrc, optctl.hrc, optdict.hrc, optextbr.cxx, optextbr.hrc, optgenrl.hrc, optinet2.hrc, optjsearch.hrc, optpath.hrc, optsave.hrc, optspell.hrc, ldapdlg.cxx, multifil.cxx, optaccessibility.cxx, optasian.cxx, optcolor.cxx, optctl.cxx, optdict.cxx, optdll.cxx, optgenrl.cxx, optinet2.cxx, optjsearch.cxx, optpath.cxx, optsave.cxx, optspell.cxx, hldoctp.hxx, hlinettp.hxx, hldocntp.hxx, hlmailtp.hxx, hltpbase.hxx, showcols.hxx, srchxtra.hxx, taborder.hxx, galdlg.cxx, galdlg.hxx, galtheme.hxx, galbrws2.hxx, galctrl.hxx, gallery.hrc, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hrc, taborder.cxx, showcols.cxx, multipat.hxx, optcolor.hxx, optctl.hxx, optextbr.hxx, optsave.hxx, optspell.hxx, bbdlg.hxx, connect.hxx, dlgname.hxx, dstribut.hxx, iconcdlg.hxx, itemdata.hxx, labdlg.hxx, measure.hxx, multifil.hxx, optaccessibility.hxx, optasian.hxx, optdict.hxx, optinet2.hxx, optjsearch.hxx, optpath.hxx, textanim.hxx, transfrm.hxx, zoom.hxx, ScriptStorage.idl, ScriptStorageManager.idl, XScriptInfo.idl, XScriptInfoAccess.idl, XScriptStorageManager.idl, XScriptStorageRefresh.idl, makefile.mk, XScriptStorageExport.idl, XScriptSecurity.idl, makefile.mk, ScriptNameResolver.idl, ScriptRuntime.idl, ScriptRuntimeManager.idl, XScriptInvocation.idl, makefile.mk, XScriptNameResolver.idl, XListEntryBroadcaster.idl, filearch.cxx, filearch.hxx, agprop.cxx, filearc2.hxx, agprop.hxx,
added : Directory gsl/cppcanvas/source using tag `cws_srx645_canvas01'
added : Directory gsl/canvas/source/java/perftest using tag `cws_srx645_canvas01'
added : Directory gsl/canvas/source/tools using tag `cws_srx645_canvas01'
added : Directory gsl/cppcanvas/util using tag `cws_srx645_canvas01'
added : Directory gsl/canvas/source/inc using tag `cws_srx645_canvas01'
added : Directory gsl/canvas/source/java using tag `cws_srx645_canvas01'
added : Directory gsl/cppcanvas/inc using tag `cws_srx645_canvas01'
added : Directory gsl/canvas/source/tools/defs using tag `cws_srx645_canvas01'
added : Directory gsl/canvas/source/java/win using tag `cws_srx645_canvas01'
added : Directory gsl/canvas/source/java/x11 using tag `cws_srx645_canvas01'
added : Directory gsl/cppcanvas/source/inc using tag `cws_srx645_canvas01'
added : Directory gsl/canvas/source/win using tag `cws_srx645_canvas01'
added : Directory gsl/cppcanvas/source/tools using tag `cws_srx645_canvas01'
added : Directory gsl/cppcanvas/source/mtfrenderer using tag `cws_srx645_canvas01'
added : Directory gsl/canvas/source/vcl using tag `cws_srx645_canvas01'
added : Directory gsl/cppcanvas/source/wrapper using tag `cws_srx645_canvas01'
added : Initial revision
gsl/cppcanvas/source/tools/ : canvasgraphichelper.cxx, makefile.mk, tools.cxx ; gsl/canvas/source/java/x11/WindowAdapter.java gsl/cppcanvas/source/mtfrenderer/ : bitmapaction.cxx, bitmapaction.hxx, implrenderer.cxx, lineaction.cxx, lineaction.hxx, makefile.mk, mtftools.cxx, mtftools.hxx, outdevstate.hxx, pointaction.cxx, pointaction.hxx, polypolyaction.cxx, polypolyaction.hxx, textaction.cxx, textaction.hxx ; gsl/vcl/source/helper/canvastools.cxx gsl/cppcanvas/source/inc/ : action.hxx, canvasgraphichelper.hxx, implrenderer.hxx, tools.hxx ; gsl/canvas/source/vcl/ : bitmapcanvas.cxx, bitmapcanvas.hxx, canvasbase.cxx, canvasbase.hxx, canvasbitmap.cxx, canvasbitmap.hxx, canvascustomsprite.cxx, canvascustomsprite.hxx, canvasfont.cxx, canvasfont.hxx, exports.dxp, graphicdevice.cxx, graphicdevice.hxx, impltools.cxx, impltools.hxx, linepolypolygon.cxx, linepolypolygon.hxx, makefile.mk, outdevprovider.hxx, redrawmanager.cxx, redrawmanager.hxx, sprite.hxx, spritecanvas.cxx, spritecanvas.hxx, spritesurface.hxx ; gsl/canvas/source/java/perftest/ : PerfTest.java, WindowAdapter.java, makefile.mk, manifest ; gsl/cppcanvas/util/ : cppcanvas.flt, makefile.mk ; gsl/cppcanvas/inc/cppcanvas/ : bitmap.hxx, bitmapcanvas.hxx, canvas.hxx, canvasgraphic.hxx, color.hxx, customsprite.hxx, font.hxx, polypolygon.hxx, renderer.hxx, sprite.hxx, spritecanvas.hxx, text.hxx, vclfactory.hxx ; gsl/canvas/source/win/ : dx_bitmapcanvas.cxx, dx_bitmapcanvas.hxx, dx_canvasbase.cxx, dx_canvasbase.hxx, dx_canvasbitmap.cxx, dx_canvasbitmap.hxx, dx_canvascustomsprite.cxx, dx_canvascustomsprite.hxx, dx_canvasfont.cxx, dx_canvasfont.hxx, dx_device.cxx, dx_device.hxx, dx_gdiplususer.cxx, dx_gdiplususer.hxx, dx_gdisurface.cxx, dx_gdisurface.hxx, dx_graphicdevice.cxx, dx_graphicdevice.hxx, dx_graphicsprovider.hxx, dx_impltools.cxx, dx_impltools.hxx, dx_linepolypolygon.cxx, dx_linepolypolygon.hxx, dx_plainsurface.cxx, dx_plainsurface.hxx, dx_sprite.hxx, dx_spritecanvas.cxx, dx_spritecanvas.hxx, dx_spritesurface.hxx, dx_surface.hxx, dx_surfacegraphics.cxx, dx_surfacegraphics.hxx, dx_surfacemanager.cxx, dx_surfacemanager.hxx, dx_texture.cxx, dx_texture.hxx, dx_winstuff.hxx, exports.dxp, makefile.mk ; gsl/canvas/inc/canvas/ : canvastools.hxx, elapsedtime.hxx, vclwrapper.hxx, verbosetrace.hxx ; gsl/cppcanvas/prj/ : build.lst, d.lst ; gsl/canvas/source/inc/redrawmanagement.hxx gsl/cppcanvas/source/wrapper/ : implbitmap.cxx, implbitmap.hxx, implbitmapcanvas.cxx, implbitmapcanvas.hxx, implcanvas.cxx, implcanvas.hxx, implcolor.cxx, implcolor.hxx, implcustomsprite.cxx, implcustomsprite.hxx, implfont.cxx, implfont.hxx, implpolypolygon.cxx, implpolypolygon.hxx, implsprite.cxx, implsprite.hxx, implspritecanvas.cxx, implspritecanvas.hxx, impltext.cxx, impltext.hxx, makefile.mk, vclfactory.cxx ; gsl/vcl/inc/canvastools.hxx gsl/canvas/source/java/ : BackBuffer.java, BezierPolyPolygon.java, BitmapCanvas.java, BufferedGraphics2D.java, CanvasBase.java, CanvasBitmap.java, CanvasClonedSprite.java, CanvasCustomSprite.java, CanvasFont.java, CanvasGraphicDevice.java, CanvasSprite.java, CanvasTest_perftest.java, CanvasUtils.java, JavaCanvas.java, LinePolyPolygon.java, SpriteBase.java, SpriteRep.java, SpriteRunner.java, java_Service.java, makefile.mk, manifest ; gsl/canvas/source/java/win/WindowAdapter.java gsl/canvas/source/tools/ : canvastools.cxx, canvastools.flt, elapsedtime.cxx, makefile.mk ;
added : Directory gsl/cppcanvas/inc/cppcanvas using tag `cws_srx645_canvas01'
added : Directory gsl/cppcanvas/prj using tag `cws_srx645_canvas01'
modified : #110496# Corrected canvas helper methods
gsl/vcl/inc/window.hxx
modified : #110496# Adaptions for new slideshow clients
gsl/canvas/inc/canvas/elapsedtime.hxx gsl/canvas/source/java/CanvasUtils.java gsl/canvas/source/vcl/canvasbase.cxx
modified : #110496# Added more docs, XInterface for ColorSpace
api/offapi/drafts/com/sun/star/rendering/ : ColorStuff.idl, XCustomSprite.idl ;
modified : RESYNC:; FILE MERGED
files from: api/offapi/util/makefile.mk graphics/sd/prj/build.lst gsl/vcl/source/window/: makefile.mk, window.cxx, graphics/sd/util/makefile.mk udk/unoil/prj/build.lst util/svtools/inc/graphictools.hxx gsl/vcl/inc/: bmpacc.hxx, outdev.hxx, window.hxx, api/offapi/prj/: build.lst, d.lst, api/offuh/prj/d.lst
modified : #110496# Restructuring module
gsl/canvas/prj/ : build.lst, d.lst ;
modified : #110496# Added canvas helper
tools/solenv/inc/libs.mk
modified : #110496# Removed new preseng from sd, moved to slideshow
graphics/sd/util/makefile.mk
modified : #110496# Added canvastools
gsl/vcl/prj/d.lst gsl/vcl/source/helper/makefile.mk
modified : #110496# Added another canvas helper method
gsl/vcl/source/window/window.cxx
modified : #110496# Added basegfx dependency
gsl/vcl/prj/build.lst

cws_src680_mozab03 was changed by WINDLY?(windly)
modified : #i24592# changes accede to LDAP authentication string review
dba/dbaccess/source/ui/dlg/ : dbadmin.hrc, dbadmin.src, detailpages.cxx, detailpages.hxx ;

cws_src680_mozab03 was changed by Frank Schoenheit(fs)
modified : #103752# on behalf of windly@openoffice.org
util/extensions/source/abpilot/datasourcehandling.cxx

cws_src680_pb1 was changed by Peter Burow(pb)
removed : RESYNC:; FILE REMOVED
files from: : misccfg.cxx, misccfg.hxx,
modified : fix: #92087# new strings from EM
framework/sfx2/source/dialog/ : srchdlg.hrc, srchdlg.src ; framework/sfx2/source/appl/newhelp.src
modified : fix: #92087# toolbar button for search dialog added
framework/sfx2/source/appl/ : newhelp.src, newhelp.cxx ;
modified : fix: #92087# toggle text and handler added
framework/sfx2/inc/srchdlg.hxx
modified : fix: #92087# new mnemonic chars
framework/sfx2/source/dialog/srchdlg.src
modified : fix: #92087# toggle handler added
framework/sfx2/source/dialog/srchdlg.cxx

cws_src680_api01ea was changed by Andreas Schluens(as)
modified : #i25721# document Wait property
api/offapi/com/sun/star/view/PrintOptions.idl
modified : #111850# deprecate XEventBroadcaster
api/offapi/com/sun/star/frame/Desktop.idl
modified : #i24603# return real UNO filters for getAvailableServiceNames() only
framework/filter/source/config/cache/filterfactory.cxx
modified : #112249# remove unused service DocumentProperties
framework/framework/source/unotypes/fwk.xml
modified : #112425# supports interception
framework/framework/inc/services/desktop.hxx framework/framework/source/services/desktop.cxx

cws_src680_scriptingf5 was changed by Tomas O'Connor(toconnor)
removed : RESYNC:; FILE REMOVED
files from: : HighlightText.java, HighlightTextParcel.sxp, HighlightUtil.java, HighlightTextParcel.xml,
modified : #i25271# Modify BeanShell Highlight example to use DialogProvider
framework/scripting/examples/beanshell/Highlight/parcel-descriptor.xml
modified : #i25262# - Execute modified source in editor window if one exists
framework/scripting/java/com/sun/star/script/framework/provider/javascript/ : ScriptEditorForJavaScript.java, ScriptProviderForJavaScript.java ; framework/scripting/java/com/sun/star/script/framework/provider/beanshell/ : ScriptEditorForBeanShell.java, ScriptProviderForBeanShell.java, template.bsh ; framework/scripting/examples/java/selector/ScriptSelector.java
modified : #i25262# - Add public methods to Rhino Debugger to check if the source has been modified and to get the text and url for the current source Issue number: Submitted by: Reviewed by:
external/rhino/Main.java
modified : #i25276# - BeanShell and JavaScript providers should pass parameters
framework/scripting/java/com/sun/star/script/framework/provider/javascript/ : ScriptEditorForJavaScript.java, ScriptProviderForJavaScript.java ; framework/scripting/java/com/sun/star/script/framework/provider/beanshell/ : ScriptProviderForBeanShell.java, ScriptSourceModel.java ;
added : #i25271# Add Highlight example in all languages and accept parameters
framework/scripting/examples/javascript/Highlight/parcel-descriptor.xml
added : Directory framework/scripting/examples/javascript/Highlight using tag `cws_src680_scriptingf5'
added : #i25271# Add Highlight example in JavaScript. This script handles button click events for the Highlight dialog
framework/scripting/examples/javascript/Highlight/ButtonPressHandler.js
added : #i25271# Add Highlight example in all languages. Use DialogProvider to create XDialog and display it.
framework/scripting/examples/javascript/Highlight/ShowDialog.js
added : #i25271# Add BeanShell script to handle button click events in Highlight
framework/scripting/examples/beanshell/Highlight/ButtonPressHandler.bsh
added : #i25271# Modify BeanShell Highlight script to use DialogProvider
framework/scripting/examples/beanshell/Highlight/ShowDialog.bsh

cws_src680_swnum02 was changed by Henning Brinkmann(hbrinkm)
modified : #i23725#, #i23726#, #i24560#
sw/sw/source/ui/docvw/edtwin.cxx
modified : #i23725#
sw/sw/source/ui/inc/wrtsh.hxx
modified : #i23726#
sw/sw/source/ui/uiview/ : view.cxx, viewtab.cxx ; sw/sw/source/ui/docvw/edtwin3.cxx sw/sw/source/ui/inc/ : edtwin.hxx, view.hxx ; sw/sw/inc/ : crsrsh.hxx, crstate.hxx ;
modified : #i24560#, #i23726#
sw/sw/source/core/doc/docnum.cxx
modified : #23726#
sw/sw/source/core/frmedt/fetab.cxx sw/sw/source/core/txtnode/ndtxt.cxx sw/sw/source/core/text/ : itrcrsr.cxx, porlin.hxx ;

cws_src680_cfg04 was changed by Sarah Smith(ssmith)
removed : #114570# changing component name
files from: cfgmgr2.xml
modified : #114070# adding SystemIntegration service
installation/scp/source/office/profile.scp
modified : #114570# changing name to configmgr2 from libcfgmgr2
installation/scp/source/office/files.scp
modified : #114070# updating to deliver *.so files
util/configmgr/prj/d.lst
modified : #114070# bring cfg04update with apoc02
installation/scp/inc/gid.inc installation/scp/source/office/profile.scp
modified : #114070# adding Sysmgr1 component
installation/scp/inc/gid.inc installation/scp/source/office/files.scp
added : #114070# adding sysmgr component
util/configmgr/source/platformbe/sysmgr1.uno.xml
added : #114570# changing component name
util/configmgr/util/configmgr2.uno.xml
added : #114070# adding reference rc file
gsl/shell/source/backends/gconfbe/systemberc
added : #114070# adding README
gsl/shell/source/backends/gconfbe/README

cws_src680_dr14 was changed by Daniel Rentz(dr)
removed : #i23675# diagonal borders step 2: drawing linked diagonal borders
files from: linelink.hxx
added : #i23675# diagonal borders step 2: drawing linked diagonal borders
graphics/svx/inc/ : framelink.hxx, framelinkarray.hxx ;
modified : #100000# merge conflict
graphics/svx/source/dialog/makefile.mk
modified : #100000# avoid redefinition in for loop
graphics/svx/source/dialog/frmsel.cxx
modified : #100000# needless semicolon
framework/sfx2/inc/controlwrapper.hxx
modified : #i23675# diagonal borders step 2: drawing linked diagonal borders
graphics/svx/source/inc/frmselimpl.hxx graphics/svx/source/dialog/ : framelink.cxx, framelinkarray.cxx, border.cxx, borderconn.cxx, frmsel.cxx, makefile.mk ;
modified : #100000# GCC warnings
framework/sfx2/inc/itemconnect.hxx

cws_src680_mav09 was changed by Mikhail Voitenko(mav)
added : #115011# use standalone thread for painting
framework/embeddedobj/test/Container1/PaintThread.java
modified : #115011# correct the comments
api/offapi/com/sun/star/embed/XInplaceClient.idl
modified : #115011# embedded object representation
framework/embeddedobj/test/Container1/ : BitmapPainter.java, EmbedContApp.java, WindowHelper.java, makefile.mk ; framework/embeddedobj/source/general/docholder.cxx framework/embeddedobj/source/commonembedding/persistence.cxx

cws_src680_calcuno01 was changed by Sascha Ballach(sab)
modified : #i22706#; fix problems on merge
sc/sc/source/filter/xml/XMLTableShapeResizer.cxx

cws_srx645_layoutmanager was changed by SG?(sg)
added : #i25017#NEW: initial version of changed menu bar
framework/framework/qa/unoapi/testdocuments/delete.cfg
added : Directory framework/framework/qa/unoapi/testdocuments using tag `cws_srx645_layoutmanager'
modified : #i25017#CHG: added new tests
framework/framework/qa/unoapi/framework.sce
modified : #i25017#CHG: added testdoc path
framework/framework/qa/unoapi/makefile.mk

cws_srx645_layoutmanager was changed by Carsten Driesner(cd)
removed : RESYNC:; FILE REMOVED
files from: : makefile.mk, response_workstation.txt, makefile.mk, python.lng, python.scp, unxbasic_python.scp, winbasic_python.scp, makefile.mk, dir_psprint.scp, files_psprint.scp, makefile.mk, module_fat_root.lng, module_fat_root.scp, basic.scp, config.lng, config.scp, dir.scp, files.scp, module.lng, module.scp, profile.lng, basic.lng, setuphelp.scp, system.scp, unxbasic.lng, dir.lng, makefile.mk, profile.scp, setuphelp.lng, system.lng, unxbasic.scp, makefile.mk, module_math.lng, module_math.scp, files_math.scp, system_math.lng, system_math.scp, profile_math.lng, profile_math.scp, makefile.mk, files_lingu.scp, module_lingu.lng, module_lingu.scp, files_kde.scp, makefile.mk, module_kde.lng, module_kde.scp, basic_javafilter.scp, files_javafilter.scp, makefile.mk, module_javafilter.lng, module_javafilter.scp, profile_javafilter.scp, profile_javafilter.lng, files_impress.scp, makefile.mk, module_impress.lng, module_impress.scp, profile_impress.scp, system_impress.lng, system_impress.scp, profile_impress.lng, files_grafik.scp, makefile.mk, module_grafik.lng, module_grafik.scp, profile_grafik.scp, makefile.mk, files_gnome.scp, module_gnome.lng, module_gnome.scp, readme.scp, udk_complete.scp, udk_bridges.scp, udk_pure_java.scp, udk_remote.scp, makefile.mk, setupzip.scp, udk_base.scp, udk_java.scp, makefile.mk, files_fonts.scp, module_fonts.lng, module_fonts.scp, makefile.mk, module_draw.lng, module_draw.scp, files_draw.scp, system_draw.lng, system_draw.scp, profile_draw.lng, profile_draw.scp, crashrep_dynamic.scp, crashrep_static.scp, makefile.mk, makefile.mk, files_chart.scp, profile_chart.lng, profile_chart.scp, system_chart.lng, system_chart.scp, module_chart.lng, module_chart.scp, files_cde.scp, module_cde.lng, module_cde.scp, makefile.mk, unxbasic_cde.lng, unxbasic_cde.scp, makefile.mk, module_calc.lng, module_calc.scp, files_calc.scp, system_calc.lng, system_calc.scp, profile_calc.lng, profile_calc.scp, build.lst, d.lst, gcfg.inc, gid.inc, gid_oo.inc, szipmac.inc, transform.hxx, transform.cxx, XListEntryBroadcaster.idl, ShortTest.htm, api.htm, ScriptParameter.htm, OleClient.dsp, OleClient.dsw, activex_test.cxx, makefile.mk, makefile.mk, uno_activex.idl, StdAfx2.h, UNOActiveX.rgs, example.html, outputistream.cxx, intercept.cxx, intercept.hxx, makefile.mk, StdAfx2.cpp, outputistream.hxx, resource.h, uno_activex.cpp, uno_activex.def, UNOActiveX.cpp, UNOActiveX.h, initwindowpeer.hxx, officeconnection.cxx, uno_activex.rc, oleclassw.cxx, mutexholder.hxx, exports.map, wrapper.cxx, wrapper.hxx, makefile.mk, ldapdlg.hxx, optasian.cxx, multipat.hrc, optaccessibility.hrc, optasian.hrc, optcolor.hrc, optctl.hrc, optdict.hrc, optextbr.cxx, optextbr.hrc, optgenrl.hrc, optinet2.hrc, optjsearch.hrc, optpath.hrc, optsave.hrc, optspell.hrc, ldapdlg.cxx, multifil.cxx, multipat.cxx, optaccessibility.cxx, optcolor.cxx, optctl.cxx, optdict.cxx, optdll.cxx, optgenrl.cxx, optinet2.cxx, optjsearch.cxx, optpath.cxx, optsave.cxx, optspell.cxx, hldoctp.hxx, hlinettp.hxx, hldocntp.hxx, hlmailtp.hxx, hltpbase.hxx, showcols.hxx, srchxtra.hxx, taborder.hxx, galdlg.cxx, galdlg.hxx, galtheme.hxx, galbrws2.hxx, galctrl.hxx, gallery.hrc, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hrc, taborder.cxx, showcols.cxx, multipat.hxx, optcolor.hxx, optctl.hxx, optextbr.hxx, optsave.hxx, optspell.hxx, bbdlg.hxx, connect.hxx, dlgname.hxx, dstribut.hxx, iconcdlg.hxx, itemdata.hxx, labdlg.hxx, measure.hxx, multifil.hxx, optaccessibility.hxx, optasian.hxx, optdict.hxx, optinet2.hxx, optjsearch.hxx, optpath.hxx, textanim.hxx, transfrm.hxx, zoom.hxx, db_xml.cxx, makefile.mk, wrt_undo.cxx, wrt_db.hxx, db_atr.cxx, undo_atr.cxx, wrt_db.cxx, wrt_undo.hxx, misccfg.cxx, misccfg.hxx, dbbrowse.cxx, dbbrowse.hrc, dbbrowse.hxx, dbbrwcbx.cxx, dbbrwcbx.hxx, fmtools.cxx, gridctrl.cxx, gridctrl.hrc, dbbrowse.src, fmtools.hxx, gridctrl.hxx, hidother.hrc, hidother.src, makefile.pmk, ofapch.cxx, makefile.mk, wntmsci10, wntmsci7, wntmsci8, wntmsci9, intro.hrc, makefile.mk, iso.src, ooo.src, cjk.src, connpoolconfig.hxx, connpoolsettings.hxx, autocdoc.hxx, msgmodel.hxx, optgdlg.hxx, optmemory.hxx, optuno.hxx, sbaexpl.hrc, sbaexpl1.hxx, sbaexpl2.hxx, sigctrl.hxx, treeopt.hrc, connpooloptions.hxx, sbadlgs.hxx, sendctrl.hxx, treeopt.hxx, fontsubs.cxx, autocdlg.hrc, autocdlg.src, makefile.mk, connpooloptions.src, fontsubs.hrc, fontsubs.src, hyprdlg.hxx, hyprlink.cxx, hyprlink.hrc, inetdlg.cxx, inetdlg.src, autocdlg.cxx, internationaloptions.hrc, optfltr.cxx, optfltr.hrc, optfltr.src, optgdlg.cxx, optgdlg.hrc, optgdlg.src, opthtml.cxx, opthtml.src, optmemory.cxx, optmemory.hrc, optmemory.src, treeopt.src, connpooloptions.cxx, connpooloptions.hrc, hyprlink.src, internationaloptions.cxx, internationaloptions.src, opthtml.hrc, treeopt.cxx, dbcoll.cxx, apearcfg.hxx, app.cxx, app3.cxx, appctor.cxx, appstat.cxx, apearcfg.cxx, connpoolsettings.cxx, fltrcfg.cxx, fontsubstconfig.cxx, htmlcfg.cxx, makefile.mk, ofaaccfg.cxx, optuno.cxx, osplcfg.cxx, resid.cxx, sdbcdriverenum.hxx, sdintro.bmp, splnote.hxx, app.src, appimp.cxx, connpoolconfig.cxx, hidgen.hrc, ofaitem.cxx, sdbcdriverenum.cxx, appslots.sdi, makefile.mk, ofa.sdi, ofaslots.sdi, ofaslots.src, sbaslots.hrc, ofaslots.hrc, openabout.bmp, cjkintro.bmp, lc10622.bmp, lc10709.bmp, lc10727.bmp, lch10622.bmp, lch10727.bmp, lch12232.bmp, nu08.bmp, ofaabout.bmp, oo10432.bmp, oo10433.bmp, oo10434.bmp, oo10436.bmp, oo10437.bmp, oo10450.bmp, oo10452.bmp, openintro_sun.bmp, openintro.bmp, sch10622.bmp, sc10629.bmp, sc10709.bmp, sc10727.bmp, cjkabout.bmp, sch10709.bmp, sch10727.bmp, soffice.bmp, tr10416.bmp, tr10432.bmp, tr10434.bmp, tr10435.bmp, tr10437.bmp, tr10439.bmp, tr10447.bmp, tr10452.bmp, tr10921.bmp, trh10432.bmp, trh10433.bmp, trh10434.bmp, trh10436.bmp, trh10437.bmp, trh10447.bmp, trh10450.bmp, trh10452.bmp, lc10629.bmp, lch10709.bmp, nu07.bmp, oo10416.bmp, oo10435.bmp, oo10439.bmp, oo10921.bmp, open_login_image.bmp, sc10622.bmp, sc12232.bmp, sch10629.bmp, sch12232.bmp, tr10433.bmp, tr10436.bmp, tr10450.bmp, trh10416.bmp, trh10435.bmp, trh10439.bmp, trh10921.bmp, build.lst, d.lst, app.hxx, app.hrc, datbenum.hxx, dbcoll.hxx, dbdatdef.hxx, dbexch.hxx, dbfileob.hxx, dbobj.hxx, dbqryobj.hxx, dbtabobj.hxx, fontsubs.hxx, htmlcfg.hxx, hyprlink.hxx, iniwrap.hxx, ofaaccfg.hxx, ofaids.hrc, ofaitem.hxx, ofapch.hxx, offmenu.hrc, ofunodef.hxx, optfltr.hxx, opthtml.hxx, resid.hxx, sbadb.hxx, sbadbit.hxx, sbaenum.hxx, sbaexpl.hxx, sbaexpob.hxx, sbaitems.hrc, sbaitems.hxx, sbasltid.hrc, sqldlg.hxx, appimp.hxx, autocdlg.hxx, dbdefobj.hxx, dbobjenu.hxx, fltrcfg.hxx, inetdlg.hxx, internationaloptions.hxx, offuiks.hxx, osplcfg.hxx, sbadll.hxx, sbahints.hxx, sbaobj.hxx, componentloader.cxx, asyncloadthread.cxx, loadeventlistener.cxx, componentloader.hxx, asyncloadthread.hxx, loadeventlistener.hxx,
modified : #i25017# Check reference before usage
framework/framework/source/helper/popupmenucontrollerbase.cxx
modified : #111899# Code moved from obsolete OfficeWrapper
framework/sfx2/source/appl/app.cxx
modified : #111899# Fixed problem where two commands have the same uno command (InsertTable), now use (InsertSpreadsheet) for draw and impress
graphics/sd/uiconfig/sdraw/menubar/menubar.xml graphics/sd/uiconfig/simpress/menubar/menubar.xml
modified : #111899# Fixed crash when click save on toolbar in the inplace editing scenario
framework/embedserv/source/embed/docholder.cxx
modified : #111899# Fixed merge problem with removed item definition
graphics/svx/sdi/svxitems.sdi
modified : #111899# Menubar resources are obsolete now - replaced by xml based configuration file
dba/dbaccess/source/ui/relationdesign/relation.src dba/dbaccess/source/ui/querydesign/ : query.src, query.src ; graphics/sch/source/ui/app/menu.src dba/dbaccess/source/ui/tabledesign/table.src graphics/sd/source/ui/app/menu.src sw/starmath/source/menu.src
modified : #111899# We need dcss
framework/framework/inc/ : general.h, general.h ;
modified : #111899# Resolved conflict on merge
udk/unoil/prj/build.lst
modified : #111899# Describe the properties of returned sequence
api/offapi/drafts/com/sun/star/ui/ModuleUICommandDescription.idl
modified : #111899# Resolved merge conflict
sw/sw/source/ui/inc/swmn.hrc
modified : #111899# Fixed typo at function declaration
api/offapi/drafts/com/sun/star/ui/XUIElementFactoryRegistration.idl
modified : #i25017# Fixed problem with returned registered factories
framework/framework/source/uifactory/uielementfactorymanager.cxx
modified : #111899# Allow empty popup menus to support window list
framework/framework/source/uielement/menubarmanager.cxx
modified : #111899# Fixed some problems with commands URLs created from automatic tool
dba/dbaccess/uiconfig/dbquery/menubar/menubar.xml dba/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
modified : #111899# Fixed wrong merge
util/svtools/inc/moduleoptions.hxx framework/framework/util/makefile.mk
modified : #111899# Include header to have definition of dcss
framework/framework/source/dispatch/closedispatcher.cxx
modified : #i25017# Correct namespace for the UICommandDescription service
framework/framework/source/unotypes/fwk.xml
modified : #i25017# Fixed typo
framework/framework/source/uifactory/uielementfactorymanager.cxx framework/framework/inc/uifactory/uielementfactorymanager.hxx
modified : #111899# Removed guiapps
framework/framework/prj/build.lst
modified : #i25017# Fixed problem with second intialize call
framework/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
modified : RESYNC:; FILE MERGED
files from: framework/sfx2/source/control/: dispatch.cxx, unoctitm.cxx, graphics/sch/prj/d.lst framework/sfx2/source/appl/: appmain.cxx, appserv.cxx, graphics/sch/source/ui/docshell/docshell.cxx framework/framework/source/register/registerservices.cxx gsl/toolkit/prj/d.lst udk/unoil/prj/build.lst graphics/svx/inc/svxids.hrc util/officecfg/registry/schema/makefile.mk util/svtools/inc/moduleoptions.hxx sw/sw/source/ui/app/: docsh.cxx, docshini.cxx, swmodule.cxx, api/offapi/prj/: build.lst, d.lst, framework/framework/source/dispatch/: dispatchprovider.cxx, menudispatcher.cxx, gsl/toolkit/util/defs/wntmsci8 framework/sfx2/source/view/: sfxbasecontroller.cxx, topfrm.cxx, viewfrm.cxx, viewsh.cxx, graphics/svx/source/form/: fmobjfac.cxx, fmshell.cxx, fmshimp.cxx, tbxform.cxx, sw/sw/source/ui/shells/textsh1.cxx api/offapi/com/sun/star/awt/makefile.mk framework/framework/util/makefile.mk framework/sfx2/inc/: sfxbasemodel.hxx, sfxsids.hrc, sw/sw/source/ui/uno/: unodoc.cxx, unotxdoc.cxx, util/svtools/source/config/moduleoptions.cxx framework/framework/source/classes/: makefile.mk, taskcreator.cxx, graphics/sd/source/ui/unoidl/: unodoc.cxx, unomodel.cxx, framework/sfx2/source/menu/virtmenu.cxx graphics/sch/source/ui/unoidl/ChXChartDocument.cxx sc/sc/sdi/docsh.sdi util/officecfg/registry/data/makefile.mk sw/starmath/prj/d.lst framework/framework/source/helper/makefile.mk sw/sw/source/ui/wrtsh/wrtsh1.cxx sw/sw/source/filter/ww8/: tracer.cxx, tracer.hxx, framework/framework/prj/: build.lst, d.lst, util/officecfg/prj/d.lst sc/sc/prj/d.lst sw/sw/source/ui/inc/swmn.hrc api/offuh/prj/d.lst framework/sfx2/source/doc/: objmisc.cxx, sfxbasemodel.cxx, util/extensions/prj/d.lst api/offapi/util/makefile.mk graphics/svx/source/items/frmitems.cxx dba/dbaccess/prj/d.lst graphics/sd/prj/d.lst sw/sw/prj/d.lst util/sot/source/sdstor/ucbstorage.cxx sc/sc/source/ui/src/menue.src framework/sfx2/sdi/sfx.sdi graphics/sd/source/filter/xml/sdxmlwrp.cxx util/officecfg/registry/schema/org/openoffice/Office/Common.xcs framework/framework/inc/services/frame.hxx framework/framework/source/services/: frame.cxx, makefile.mk, util/extensions/source/bibliography/menu.src sw/sw/source/ui/uiview/view.cxx util/tools/source/fsys/urlobj.cxx framework/desktop/source/app/app.cxx graphics/svx/sdi/: svx.sdi, svxitems.sdi, sw/starmath/source/: document.cxx, unomodel.cxx, view.cxx,
modified : #111899# Added new projects on dependency list
xml/package/prj/build.lst
modified : #111899# Code moved from obsolete scp project
installation/scp2/source/calc/ : configurationitem_calc.scp, file_calc.scp, module_calc.scp ; installation/scp2/source/math/ : configurationitem_math.scp, file_math.scp, module_math.scp ; installation/scp2/source/draw/ : configurationitem_draw.scp, file_draw.scp, module_draw.scp, registryitem_draw.scp ; installation/scp2/source/writer/ : configurationitem_writer.scp, file_writer.scp, module_writer.scp ; installation/scp2/source/ooo/ : configurationitem_ooo.scp, directory_ooo.scp, file_ooo.scp ; installation/scp2/source/impress/ : configurationitem_impress.scp, file_impress.scp, module_impress.scp ;
modified : #i25017# Controller should check reference before usage
framework/framework/source/uielement/controlmenucontroller.cxx
modified : #111899# Adapt module short name to be used in file system
installation/scp2/source/writer/configurationitem_writer.scp
modified : #111899# Fixed problem where two commands have the same uno command (InsertTable)
util/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu graphics/svx/sdi/svx.sdi

cws_srx645_ooo111merge was changed by Hans-Joachim Lankenau(hjs) [ and it was merged ]
modified : #i24723#, #i24803#, #i25310#, #i25321#, #i25328#, #i25330#, #i25308# - OOo 1.1.1 merge
framework/sfx2/source/explorer/explorer.src graphics/svx/source/stbctrls/stbctrls.src sw/sw/source/ui/utlui/ : attrdesc.src, gloslst.src, initui.src, navipi.src, poolfmt.src, unotools.src, utlui.src ; dba/dbaccess/source/ui/querydesign/ : query.src, querydlg.src ; dba/dbaccess/source/ui/misc/ : WizardPages.src, dbumiscres.src ; framework/sfx2/source/bastyp/ : bastyp.src, fltdlg.src, fltfnc.src, newhdl.src ; dba/dbaccess/source/ui/control/ : TableGrantCtrl.src, tabletree.src, undosqledit.src ; sw/sw/source/ui/index/ : cnttab.src, idxmrk.src, multmrk.src ; sc/sc/source/ui/navipi/navipi.src sw/sw/source/ui/app/ : app.src, error.src, mn.src ; sc/sc/source/ui/dbgui/ : asciiopt.src, consdlg.src, dapitype.src, imoptdlg.src, pivot.src, pvfundlg.src, scendlg.src, validate.src ; sw/sw/source/ui/dialog/ : abstract.src, ascfldlg.src, dialog.src, docstdlg.src, regionsw.src ; installation/wizards/source/euro/euro.src framework/framework/source/classes/ : fltdlg.src, resource.src ; gsl/sysui/oounix/office/cde/ : calc.lng, draw.lng, group.lng, impress.lng, math.lng, writer.lng ; installation/setup2/mow/source/system/mowos.src framework/sfx2/source/dialog/ : about.src, cfg.src, dialog.src, dinfdlg.src, dinfedt.src, dlgrun.src, eventdlg.src, filedlghelper.src, macropg.src, mail.src, mailwindow.src, mgetempl.src, newstyle.src, passwd.src, printopt.src, recfloat.src, register.src, templdlg.src, versdlg.src ; graphics/svx/source/outliner/outliner.src sw/sw/source/ui/wizard/ : wizagdlg.src, wizbmp.src, wizfxdlg.src, wizlogo.src, wizltdlg.src, wizmmdlg.src, wizsave.src ; framework/filter/source/xsltdialog/ : xmlfileview.src, xmlfilterdialogstrings.src, xmlfiltersettingsdialog.src, xmlfiltertabdialog.src, xmlfiltertabpagebasic.src, xmlfiltertabpagexslt.src, xmlfiltertestdialog.src ; graphics/svx/source/items/ : svxerr.src, svxitems.src ; graphics/goodies/source/filter.vcl/eos2met/dlgeos2.src graphics/goodies/source/filter.vcl/epict/dlgepct.src installation/wizards/source/webwizard/webwizar.src graphics/svx/source/fmcomp/ : gridctrl.src, showcols.src ; dba/dbaccess/source/ui/tabledesign/table.src graphics/sch/source/core/glob.src installation/scp/source/kde/ : module_kde.lng, unxbasic_kde.lng ; installation/scp/source/calc/ : module_calc.lng, profile_calc.lng, system_calc.lng ; util/officecfg/registry/schema/org/openoffice/ : Inet.xcs, Setup.xcs, UserProfile.xcs, VCL.xcs ; gsl/vcl/source/src/ : btntext.src, helptext.src, menu.src, stdtext.src, units.src ; framework/sfx2/source/toolbox/ : tbxcust.src, tbxopdlg.src, tbxpopup.src, toolbox.src ; gsl/padmin/source/ : padialog.src, rtsetup.src ; util/svtools/source/contnr/ : fileview.src, svcontnr.src, templwin.src ; util/officecfg/registry/schema/org/openoffice/Office/ : Addons.xcs, Calc.xcs, Chart.xcs, Commands.xcs, Common.xcs, DataAccess.xcs, Draw.xcs, Impress.xcs, Java.xcs, Jobs.xcs, Labels.xcs, Linguistic.xcs, Math.xcs, ProtocolHandler.xcs, SFX.xcs, Security.xcs, Substitution.xcs, TypeDetection.xcs, UI.xcs, Views.xcs, Writer.xcs, WriterWeb.xcs ; sw/sw/source/ui/docvw/ : access.src, docvw.src ; graphics/svx/source/tbxctrls/ : colrctrl.src, grafctrl.src, lboxctrl.src, tbcontrl.src, tbxdraw.src ; sw/sw/source/ui/chrdlg/ : ccoll.src, chardlg.src, chrdlg.src, drpcps.src, numpara.src, paradlg.src, swbreak.src ; framework/offmgr/source/offapp/intro/ : cjk.src, db.src, dbi.src, for.src, intro.hrc, iso.src, oem.src, ooo.src ; graphics/goodies/source/filter.vcl/epgm/dlgepgm.src gsl/sysui/desktop/share/ : documents.ulf, launcher_comment.ulf, launcher_name.ulf ; installation/scp/source/office/ : basic.lng, config.lng, dir.lng, module.lng, profile.lng, setuphelp.lng, system.lng, unxbasic.lng ; framework/sfx2/source/accel/accel.src util/svtools/source/filepicker/ : filepicker.src, iodlg.src ; installation/setup2/source/custom/tplsetup/tplsetup.src framework/offmgr/sdi/ofaslots.src sw/sw/sdi/swslots.src installation/scp/source/chart/ : module_chart.lng, profile_chart.lng, system_chart.lng ; graphics/svx/source/accessibility/accessibility.src framework/sfx2/source/view/ : framedlg.src, fsetview.src, view.src ; installation/scp/source/draw/ : module_draw.lng, profile_draw.lng, system_draw.lng ; sw/sw/source/ui/globdoc/globdoc.src installation/scp/source/fonts/module_fonts.lng util/svtools/source/items/cstitem.src sw/sw/source/ui/fldui/ : DropDownFieldDialog.src, changedb.src, flddb.src, flddinf.src, flddok.src, fldfunc.src, fldref.src, fldtdlg.src, fldui.src, fldvar.src, inpdlg.src, javaedit.src ; graphics/svx/source/gallery2/ : gallery.src, galtheme.src ; installation/setup2/source/ui/pages/ : maindlg.src, paddr.src, pasexist.src, pasreins.src, pasremem.src, passrv.src, passtart.src, pasuinst.src, pasuname.src, pasupath.src, pcfgserver.src, pcrc.src, phavefun.src, pimode.src, pipath.src, plang.src, plicense.src, pmigrate.src, pmodules.src, ppatch.src, pprofile.src, preadme.src, preadygo.src, precover.src, preguser.src, preins.src, prepair.src, prspwizard.src, pscript.src, ptoplvl.src, puninst.src, pupdate.src, pusrinst.src, pwaddr.src, pwelcome.src, pwsetup.src, vefun.src ; installation/scp/source/python/python.lng graphics/sch/sdi/schslots.src graphics/svx/source/svxlink/linkmgr.src graphics/sd/sdi/sdslots.src graphics/svx/source/engine3d/ : float3d.src, string3d.src ; graphics/sd/source/ui/accessibility/accessibility.src installation/readlicense/docs/readme/readme.xrm installation/setup2/source/ui/ : app.src, error.src ; framework/sfx2/source/config/config.src sc/sc/sdi/scslots.src installation/scp/source/lingu/module_lingu.lng graphics/sd/source/ui/dlg/ : animobjs.src, brkdlg.src, copydlg.src, custsdlg.src, dlg_char.src, dlgass.src, dlgfield.src, dlgolbul.src, dlgpage.src, dlgsnap.src, effect.src, ins_page.src, ins_paste.src, inspagob.src, morphdlg.src, navigatr.src, new_foil.src, paragr.src, present.src, preview.src, printdlg.src, prltempl.src, prntopts.src, sdobjpal.src, sdpreslt.src, slidechg.src, tabtempl.src, tpaction.src, tpoption.src, vectdlg.src ; util/svtools/source/control/ : calendar.src, ctrlbox.src, ctrltool.src, filectrl.src ; framework/framework/source/services/logindialog.src sw/sw/source/ui/lingu/olmenu.src installation/scp/source/gnome/module_gnome.lng sc/sc/addin/datefunc/dfa.src sw/starmath/source/ : commands.src, menu.src, smres.src, symbol.src ; installation/wizards/source/tools/common.src sc/sc/source/ui/formdlg/ : dwfunctr.src, formdlgs.src, parawin.src ; sw/sw/source/ui/frmdlg/ : column.src, cption.src, frmpage.src, frmui.src, wrap.src ; sc/sc/source/ui/drawfunc/ : drformsh.src, objdraw.src ; dba/dbaccess/source/ui/inc/toolbox.hrc installation/setup2/source/ui/dialog/ : dialog.src, infodlg.src, querydlg.src, strings.src ; graphics/goodies/source/filter.vcl/egif/dlgegif.src dba/dbaccess/source/core/resource/strings.src installation/setup2/source/custom/reg4msdoc/preg4msdoc.src installation/scp/source/javafilter/ : module_javafilter.lng, profile_javafilter.lng ; graphics/svx/source/form/ : filtnav.src, fmexpl.src, fmsearch.src, fmstring.src, taborder.src, tbxform.src ; framework/sfx2/source/appl/ : app.src, minbox.src, newhelp.src, sfx.src ; graphics/svx/source/options/ : multipat.src, optaccessibility.src, optasian.src, optcolor.src, optctl.src, optdict.src, optextbr.src, optgenrl.src, optgrid.src, optinet2.src, optjsearch.src, optlingu.src, optpath.src, optsave.src, optspell.src ; dba/dbaccess/source/ui/uno/dbinteraction.src installation/scp/source/grafikfilter/module_grafik.lng installation/scp/source/office_root/module_fat_root.lng gsl/shell/source/win32/shlxthandler/shlxthdl.lng graphics/sd/source/ui/app/ : menu.src, menuids.src, menuids2.src, menuids3.src, menuids4.src, menuportal.src, popup.src, res_bmp.src, sdstring.src, strings.src, tbx_ww.src, toolbox.src ; dba/dbaccess/source/ui/relationdesign/relation.src graphics/sd/source/filter/html/pubdlg.src sc/sc/source/ui/miscdlgs/ : acredlin.src, highred.src, instbdlg.src, linkarea.src ; sw/sw/source/ui/ribbar/ : inputwin.src, tblctrl.src, tbxanchr.src, workctrl.src ; installation/wizards/source/importwizard/importwi.src installation/setup2/aqua/source/system/aquaos.src graphics/goodies/source/filter.vcl/eppm/dlgeppm.src sc/scaddins/source/analysis/ : analysis.src, analysis_funcnames.src ; framework/sfx2/source/doc/ : doc.src, doctdlg.src, doctempl.src, docvor.src, new.src ; framework/offmgr/source/offapp/dialog/ : autocdlg.src, connpooloptions.src, fontsubs.src, hyprlink.src, inetdlg.src, internationaloptions.src, optfltr.src, optgdlg.src, opthtml.src, optmemory.src, treeopt.src ; graphics/goodies/source/filter.vcl/eps/ : dlgeps.src, epsstr.src ; framework/sfx2/source/statbar/statbar.src sc/sc/source/ui/styleui/ : scstyles.src, styledlg.src ; installation/scp/source/impress/ : module_impress.lng, profile_impress.lng, system_impress.lng ; sc/sc/source/ui/pagedlg/ : hfedtdlg.src, pagedlg.src, tphf.src ; graphics/sch/source/ui/dlg/ : attrib.src, attrib2.src, attrib3.src, attrib4.src, axisgrid.src, datdescr.src, datstat.src, dgrdata.src, diagrtyp.src, dlggraut.src, legend.src, lightdlg.src, title.src, tpappopt.src, tplabel.src, tpscaley.src, viewdlg.src ; graphics/svx/sdi/svxslots.src sw/sw/source/ui/dochdl/ : dochdl.src, selglos.src ; dba/dbaccess/source/ui/browser/ : bcommon.src, sbabrw.src, sbagrid.src ; graphics/svx/source/editeng/editeng.src sc/scaddins/source/datefunc/datefunc.src sw/sw/source/ui/dbui/ : dbinsdlg.src, dbui.src ; sw/sw/source/ui/envelp/ : envelp.src, envfmt.src, envlop.src, envprt.src, label.src, labfmt.src, labprt.src, mailmrge.src ; installation/setup2/source/custom/jvmsetup/jvmdlg.src installation/wizards/source/schedule/schedule.src graphics/svx/source/svdraw/svdstr.src graphics/sd/source/core/glob.src sc/sc/source/ui/docshell/tpstat.src installation/wizards/source/template/template.src graphics/svx/inc/globlmn.hrc sw/sw/source/ui/fmtui/ : fmtui.src, tmpdlg.src ; graphics/sch/source/ui/app/ : app.src, menu.src, menuids.src, res_bmp.src, strings.src ; porting/crashrep/source/all/crashrep.lng util/svtools/source/Accessibility/accessiblelistboxentry.src installation/scp/source/math/ : module_math.lng, profile_math.lng, system_math.lng ; framework/offmgr/source/offapp/app/app.src installation/scp/source/cde/ : module_cde.lng, unxbasic_cde.lng ; sw/starmath/sdi/smslots.src sw/sw/source/ui/shells/shells.src gsl/toolkit/source/awt/accessiblestrings.src util/svtools/source/misc/ : config.src, errtxt.src, imagemgr.src, iniman.src, mediatyp.src, pver.src ; util/svtools/source/uno/unoifac2.src installation/setup2/win/source/loader/loader.lng framework/desktop/source/app/ : desktop.src, ssodlg.src ; sw/sw/source/ui/misc/ : bookmark.src, docfnote.src, glosbib.src, glossary.src, insfnote.src, insrule.src, linenum.src, num.src, numberingtypelistbox.src, outline.src, pgfnote.src, pggrid.src, redlndlg.src, srtdlg.src ; installation/setup2/source/uibase/agentdlg.src framework/sfx2/source/menu/menu.src sw/sw/source/ui/wrtsh/wrtsh.src graphics/svx/source/dialog/ : align.src, backgrnd.src, bbdlg.src, bmpmask.src, border.src, chardlg.src, charmap.src, commonlingui.src, connect.src, contdlg.src, ctredlin.src, dlgname.src, dstribut.src, fontwork.src, frmdirlbox.src, frmsel.src, grfflt.src, grfpage.src, hangulhanjadlg.src, hdft.src, hlmarkwn.src, hyperdlg.src, hyphen.src, hyprlink.src, iconcdlg.src, imapdlg.src, impgrf.src, labdlg.src, langtab.src, language.src, lingu.src, measure.src, numfmt.src, numpages.src, page.src, paragrph.src, passwd.src, postdlg.src, prtqry.src, rubydialog.src, ruler.src, sdstring.src, spldlg.src, srchdlg.src, srchxtra.src, tabarea.src, tabline.src, tabstpge.src, test.src, textanim.src, textattr.src, thesdlg.src, transfrm.src, txenctab.src, zoom.src ; sw/sw/source/ui/web/web.src sc/sc/source/ui/src/ : attrdlg.src, autofmt.src, chartdlg.src, condfrmt.src, crnrdlg.src, dbnamdlg.src, filter.src, globstr.src, hdrcont.src, menue.src, miscdlgs.src, namedlg.src, opredlin.src, optdlg.src, popup.src, sc.src, scerrors.src, scfuncs.src, scstring.src, scwarngs.src, simpref.src, solvrdlg.src, sortdlg.src, subtdlg.src, tabopdlg.src, textdlgs.src, toolbox.src ; util/svtools/source/filter.vcl/filter/ : dlgejpg.src, dlgexpor.src, strings.src ; graphics/goodies/source/filter.vcl/epbm/dlgepbm.src util/officecfg/registry/schema/org/openoffice/ucb/ : Configuration.xcs, Hierarchy.xcs, Store.xcs ; sw/sw/source/ui/inc/ : swmn.hrc, toolbox.hrc ; util/svtools/source/sbx/format.src sw/sw/source/ui/table/ : chartins.src, colwd.src, convert.src, insrc.src, instable.src, mergetbl.src, rowht.src, split.src, splittbl.src, table.src, tabledlg.src, tautofmt.src ; util/officecfg/registry/data/org/openoffice/Office/ : DataAccess.xcu, UI.xcu, Writer.xcu ; installation/wizards/source/formwizard/dbwizres.src gsl/forms/source/resource/strings.src framework/sfx2/sdi/sfxslots.src util/svtools/source/dialogs/ : addresstemplate.src, colrdlg.src, filedlg2.src, logindlg.src, printdlg.src, prnsetup.src, registrationdlg.src, wizardmachine.src ; sc/sc/addin/rot13/rot13.src graphics/goodies/source/filter.vcl/epng/dlgepng.src sc/sc/source/core/src/compiler.src framework/filter/source/flash/impswfdialog.src dba/dbaccess/source/ui/dlg/ : AdabasPage.src, AdabasStat.src, RelationDlg.src, UserAdmin.src, adtabdlg.src, dbadmin.src, dbfindex.src, directsql.src, dlgattr.src, dlgsave.src, dlgsize.src, doclinkdialog.src, dsselect.src, indexdialog.src, missingdocdlg.src, paramdialog.src, queryfilter.src, queryorder.src, sqlmessage.src ; sw/sw/source/ui/uiview/ : pview.src, view.src ; sw/sw/source/ui/config/ : optdlg.src, optload.src, redlopt.src ; framework/filter/source/pdf/ : impdialog.src, pdf.src ;

cws_src680_bmpres01 was changed by Kai Ahrens(ka)
removed : RESYNC:; FILE REMOVED
files from: : componentloader.cxx, asyncloadthread.cxx, loadeventlistener.cxx, componentloader.hxx, asyncloadthread.hxx, loadeventlistener.hxx, misccfg.cxx, misccfg.hxx, ldapdlg.hxx, multipat.cxx, multipat.hrc, optaccessibility.hrc, optasian.hrc, optcolor.hrc, optctl.hrc, optdict.hrc, optextbr.cxx, optextbr.hrc, optgenrl.hrc, optinet2.hrc, optjsearch.hrc, optpath.hrc, optsave.hrc, optspell.hrc, ldapdlg.cxx, multifil.cxx, optaccessibility.cxx, optasian.cxx, optcolor.cxx, optctl.cxx, optdict.cxx, optdll.cxx, optgenrl.cxx, optinet2.cxx, optjsearch.cxx, optpath.cxx, optsave.cxx, optspell.cxx, hldoctp.hxx, hlinettp.hxx, hldocntp.hxx, hlmailtp.hxx, hltpbase.hxx, showcols.hxx, srchxtra.hxx, taborder.hxx, galdlg.cxx, galdlg.hxx, galtheme.hxx, galbrws2.hxx, galctrl.hxx, gallery.hrc, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hrc, taborder.cxx, showcols.cxx, dstribut.hxx, multipat.hxx, optcolor.hxx, optctl.hxx, optextbr.hxx, optsave.hxx, optspell.hxx, bbdlg.hxx, connect.hxx, dlgname.hxx, iconcdlg.hxx, itemdata.hxx, labdlg.hxx, measure.hxx, multifil.hxx, optaccessibility.hxx, optasian.hxx, optdict.hxx, optinet2.hxx, optjsearch.hxx, optpath.hxx, textanim.hxx, transfrm.hxx, zoom.hxx, dbbrowse.cxx, dbbrowse.hrc, dbbrowse.hxx, dbbrwcbx.cxx, dbbrwcbx.hxx, fmtools.hxx, gridctrl.cxx, gridctrl.hrc, dbbrowse.src, fmtools.cxx, gridctrl.hxx, hidother.hrc, makefile.mk, makefile.pmk, ofapch.cxx, hidother.src, wntmsci10, wntmsci7, wntmsci8, wntmsci9, intro.hrc, makefile.mk, iso.src, ooo.src, cjk.src, autocdoc.hxx, connpoolconfig.hxx, connpooloptions.hxx, fontsubstconfig.hxx, msgmodel.hxx, optgdlg.hxx, optmemory.hxx, sbadlgs.hxx, sbaexpl.hrc, sbaexpl2.hxx, sendctrl.hxx, sigctrl.hxx, treeopt.hxx, connpoolsettings.hxx, optuno.hxx, sbaexpl1.hxx, treeopt.hrc, autocdlg.cxx, autocdlg.hrc, autocdlg.src, connpooloptions.hrc, connpooloptions.src, fontsubs.cxx, fontsubs.src, hyprdlg.hxx, hyprlink.cxx, hyprlink.src, inetdlg.cxx, internationaloptions.cxx, internationaloptions.hrc, internationaloptions.src, optfltr.cxx, optfltr.hrc, optgdlg.cxx, optgdlg.hrc, optgdlg.src, opthtml.hrc, opthtml.src, optmemory.cxx, optmemory.src, treeopt.cxx, treeopt.src, connpooloptions.cxx, fontsubs.hrc, hyprlink.hrc, inetdlg.src, makefile.mk, optfltr.src, opthtml.cxx, optmemory.hrc, apearcfg.cxx, apearcfg.hxx, app.cxx, app3.cxx, appctor.cxx, appstat.cxx, connpoolconfig.cxx, dbcoll.cxx, fltrcfg.cxx, fontsubstconfig.cxx, hidgen.hrc, makefile.mk, ofaaccfg.cxx, optuno.cxx, osplcfg.cxx, resid.cxx, sdbcdriverenum.hxx, sdintro.bmp, splnote.hxx, app.src, appimp.cxx, connpoolsettings.cxx, htmlcfg.cxx, ofaitem.cxx, sdbcdriverenum.cxx, appslots.sdi, makefile.mk, ofa.sdi, ofaslots.sdi, ofaslots.src, ofaslots.hrc, sbaslots.hrc, cjkabout.bmp, cjkintro.bmp, lc10622.bmp, lc10709.bmp, lc10727.bmp, lch10709.bmp, lch10727.bmp, lch12232.bmp, nu08.bmp, ofaabout.bmp, oo10432.bmp, oo10433.bmp, oo10435.bmp, oo10436.bmp, oo10437.bmp, oo10447.bmp, oo10450.bmp, oo10921.bmp, open_login_image.bmp, openabout.bmp, openintro.bmp, sc10622.bmp, sc10629.bmp, sc10709.bmp, sc12232.bmp, sch10622.bmp, sch10629.bmp, sch10727.bmp, sch12232.bmp, tr10416.bmp, tr10432.bmp, tr10433.bmp, tr10435.bmp, tr10436.bmp, tr10437.bmp, tr10447.bmp, tr10450.bmp, tr10921.bmp, trh10416.bmp, trh10432.bmp, trh10434.bmp, trh10435.bmp, trh10437.bmp, trh10439.bmp, trh10447.bmp, trh10452.bmp, trh10921.bmp, lc10629.bmp, lch10622.bmp, nu07.bmp, oo10416.bmp, oo10434.bmp, oo10439.bmp, oo10452.bmp, openintro_sun.bmp, sc10727.bmp, sch10709.bmp, soffice.bmp, tr10434.bmp, tr10439.bmp, tr10452.bmp, trh10433.bmp, trh10436.bmp, trh10450.bmp, build.lst, d.lst, app.hxx, app.hrc, datbenum.hxx, dbcoll.hxx, dbdefobj.hxx, dbexch.hxx, dbfileob.hxx, dbobjenu.hxx, dbqryobj.hxx, fltrcfg.hxx, fontsubs.hxx, htmlcfg.hxx, inetdlg.hxx, iniwrap.hxx, ofaaccfg.hxx, ofaids.hrc, ofaitem.hxx, ofapch.hxx, offuiks.hxx, ofunodef.hxx, optfltr.hxx, osplcfg.hxx, resid.hxx, sbadb.hxx, sbadll.hxx, sbaenum.hxx, sbaexpl.hxx, sbahints.hxx, sbaitems.hrc, sbaobj.hxx, sbasltid.hrc, sqldlg.hxx, appimp.hxx, autocdlg.hxx, dbobj.hxx, dbdatdef.hxx, dbtabobj.hxx, hyprlink.hxx, internationaloptions.hxx, offmenu.hrc, opthtml.hxx, sbadbit.hxx, sbaexpob.hxx, sbaitems.hxx, db_atr.cxx, db_xml.cxx, makefile.mk, wrt_db.cxx, wrt_db.hxx, wrt_undo.hxx, undo_atr.cxx, wrt_undo.cxx,
modified : syntax
graphics/svx/source/dialog/hyprlink.cxx framework/framework/source/classes/addonsoptions.cxx
modified : RESYNC:; FILE MERGED
files from: gsl/vcl/prj/d.lst graphics/svx/source/svdraw/svdhdl.cxx sw/sw/source/ui/uno/unotxdoc.cxx framework/framework/source/classes/imagewrapper.cxx framework/sfx2/source/toolbox/tbxcust.cxx
modified : #i22149#: added support for alpha masks
gsl/vcl/inc/ : image.h, image.hxx ; gsl/vcl/source/gdi/ : image.cxx, impimage.cxx ; framework/framework/source/classes/addonsoptions.cxx

cws_src680_qadev16 was changed by Lars Langhans(lla)
removed : RESYNC:; FILE REMOVED
files from: : dirw9x.c, dirw9x.h, dir.c, file.c, fileimpl.cxx, fileimpl.hxx, tempfile.c, file.c, db_xml.cxx, makefile.mk, wrt_undo.cxx, wrt_db.hxx, db_atr.cxx, undo_atr.cxx, wrt_db.cxx, wrt_undo.hxx, ldapdlg.hxx, optasian.cxx, multipat.hrc, optaccessibility.hrc, optasian.hrc, optcolor.hrc, optctl.hrc, optdict.hrc, optextbr.cxx, optextbr.hrc, optgenrl.hrc, optinet2.hrc, optjsearch.hrc, optpath.hrc, optsave.hrc, optspell.hrc, ldapdlg.cxx, multifil.cxx, multipat.cxx, optaccessibility.cxx, optcolor.cxx, optctl.cxx, optdict.cxx, optdll.cxx, optgenrl.cxx, optinet2.cxx, optjsearch.cxx, optpath.cxx, optsave.cxx, optspell.cxx, hldoctp.hxx, hlinettp.hxx, hldocntp.hxx, hlmailtp.hxx, hltpbase.hxx, showcols.hxx, srchxtra.hxx, taborder.hxx, galdlg.cxx, galdlg.hxx, galtheme.hxx, galbrws2.hxx, galctrl.hxx, gallery.hrc, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hrc, taborder.cxx, showcols.cxx, multipat.hxx, optcolor.hxx, optctl.hxx, optextbr.hxx, optsave.hxx, optspell.hxx, bbdlg.hxx, connect.hxx, dlgname.hxx, dstribut.hxx, iconcdlg.hxx, itemdata.hxx, labdlg.hxx, measure.hxx, multifil.hxx, optaccessibility.hxx, optasian.hxx, optdict.hxx, optinet2.hxx, optjsearch.hxx, optpath.hxx, textanim.hxx, transfrm.hxx, zoom.hxx, drstdob.cxx, SdOutlinerIterator.cxx, drgrfob.cxx, grstdob.cxx, sdoutl.cxx, drglueob.hxx, drgrfob.hxx, drtxtob.hxx, drviewsh.hxx, efctchld.hxx, grstdob.hxx, grviewsh.hxx, navichld.hxx, outlview.hxx, prevchld.hxx, sdmtf.hxx, sdwindow.hxx, slidchld.hxx, slidvish.hxx, SdOutlinerIteratorImpl.hxx, brkdlg.hxx, clview.hxx, dlgolbul.hxx, docshell.hxx, drbezob.hxx, drstdob.hxx, effect.hxx, frmview.hxx, grdocsh.hxx, layertab.hxx, mover.hxx, outlnvsh.hxx, presvish.hxx, preview.hxx, prvwshll.hxx, sdclient.hxx, sdruler.hxx, sdview.hxx, showwin.hxx, slidview.hxx, tabcontr.hxx, viewshel.hxx, preview.src, preview.cxx, sdoutl.hxx, STLport-4.0.patch, makefile.mk, excludedclasses.txt, appletviewer, java, create-libstatic-link, _dmake, jar, dmake, patch-STLport-4.0, init-static-template-data, javac,
added : #114786# inverse scenario file
porting/sal/qa/osl/socket/ConnectorSocket.xsce
modified : #114786# additionals
porting/sal/qa/osl/socket/ : Socket2.xsce, SocketOld.xsce ;
modified : RESYNC:; FILE MERGED
files from: porting/sal/qa/osl/file/osl_File.cxx
modified : #114786# remove some hanger
porting/sal/qa/osl/socket/ : Socket.xsce, SocketOld.xsce ;

cws_src680_qadev16 was changed by Christoph Neumann?(cn)
modified : #115589# removed not existent streamFileTypes.csv
framework/filter/qa/complex/filter/detection/typeDetection/makefile.mk

cws_srx644_port64bit was changed by Matthias Huetsch(mhu)
modified : #i14037# Fixed (temporary) sal_(u)Int32 definition for _LP64.
porting/sal/inc/sal/types.h
modified : #108067# Fixed SPARC V9 binding from .local to .global
porting/sal/osl/unx/asm/interlck_sparc.s
modified : #i25765# Adapted osl_diagnose_backtrace_Impl() to SPARC V9 ABI (64 bit).
porting/sal/osl/unx/diagnose.c
modified : #i25582# Fixed types passed to rtl_convertTextToUnicode().
ucb/store/workben/t_base.cxx ucb/store/source/storlckb.cxx
modified : #i8577# Various small fixes to make OOo code 64-bit clean.
porting/sal/osl/unx/file.c porting/sal/rtl/source/memory.c porting/sal/inc/osl/file.hxx udk/idlc/inc/idlc/ : astinterface.hxx, astoperation.hxx, astscope.hxx, fehelper.hxx ; porting/sal/inc/rtl/memory.h porting/sal/workben/makefile.mk udk/idlc/source/ : astarray.cxx, idlccompile.cxx, idlcmain.cxx, idlcproduce.cxx, options.cxx, scanner.ll ;
modified : #i25765# Removed (experimental) 'flushw' in favour of original code.
porting/sal/osl/unx/diagnose.c

cws_src680_draw23master was changed by Andre Fischer(af)
modified : #115426# Incorporated fix for #112211#: Added guard against mpOutlineView missing on the view stack of the edit enginge.
graphics/sd/source/ui/view/sdoutl.cxx
modified : #115426# SdDrawDocument::Get(Master)SdPage() is not called anymore with invalid index to prevent assertion. Has to be merged into OutlinerIterator.cxx
graphics/sd/source/ui/view/SdOutlinerIterator.cxx

cws_src680_borderingfilterteam28 was changed by Martin Maher(mmaher)
modified : #i18128# Word has only one vertical line between cells we have to mimick this
sw/sw/source/filter/ww8/ww8par2.cxx

cws_src680_borderingfilterteam28 was changed by Caolán McNamara(cmc)
modified : #i24880# Word seems to ignore character background for numbering styles for RTF
sw/sw/source/filter/rtf/rtfnum.cxx

cws_src680_sb15 was changed by Stephan Bergmann(sb)
modified : #i25397# Fixed documentation.
udk/cppu/inc/typelib/typedescription.h

cws_src680_sb15 was changed by Kevin B. Hendricks(khendricks)
modified : add in MacOSX flushCode with nce batched flushing just like PPC Linux also fixed build.lst depdendencies so that cpp_shared done first so MacOSX and PPC Linux are good to go
udk/bridges/source/cpp_uno/gcc3_macosx_powerpc/ : cpp2uno.cxx, uno2cpp.cxx ; udk/bridges/prj/build.lst

cws_src680_mergebuild was changed by Ivo Hinkelmann(ihi)
modified : Merge-While-Build update
dba/dbaccess/source/ui/querydesign/query.src dba/dbaccess/source/ui/misc/ : WizardPages.src, dbumiscres.src ; graphics/goodies/source/filter.vcl/egif/egifstr.src framework/offmgr/source/offapp/app/app.src util/extensions/source/dbpilots/ : gridpages.src, groupboxpages.src ; framework/filter/source/flash/impswfdialog.src framework/filter/source/xsltdialog/xmlfilterdialogstrings.src graphics/goodies/source/filter.vcl/eos2met/eos2mstr.src graphics/goodies/source/filter.vcl/epict/epictstr.src graphics/goodies/source/filter.vcl/epbm/epbmstr.src graphics/goodies/source/filter.vcl/eppm/eppmstr.src framework/offmgr/source/offapp/dialog/ : autocdlg.src, inetdlg.src, optgdlg.src, opthtml.src ; util/extensions/source/dbimport/ : dsntypes.src, importdialog.src ; graphics/goodies/source/filter.vcl/eps/dlgeps.src gsl/padmin/source/ : padialog.src, rtsetup.src ; util/extensions/source/propctrlr/formres.src framework/framework/source/services/logindialog.src dba/dbaccess/source/ui/dlg/ : RelationDlg.src, dbadmin.src ; framework/offmgr/source/offapp/intro/ : cjk.src, iso.src, ooo.src ; framework/desktop/source/app/ : desktop.src, langselect.src ; graphics/goodies/source/filter.vcl/epgm/epgmstr.src util/extensions/source/preload/preload.src

cws_src680_hiddentext was changed by Frank Meies(fme)
removed : RESYNC:; FILE REMOVED
files from: : db_xml.cxx, makefile.mk, wrt_db.cxx, wrt_db.hxx, wrt_undo.cxx, wrt_undo.hxx, undo_atr.cxx, XListEntryBroadcaster.idl, multifil.cxx, multipat.cxx, multipat.hrc, optaccessibility.cxx, optaccessibility.hrc, optasian.hrc, optcolor.cxx, optcolor.hrc, ldapdlg.cxx, optctl.hrc, optdict.cxx, optdll.cxx, optextbr.cxx, optextbr.hrc, optgenrl.cxx, optgenrl.hrc, optinet2.hrc, optjsearch.cxx, optjsearch.hrc, optpath.hrc, optsave.cxx, optspell.hrc, ldapdlg.hxx, optasian.cxx, optctl.cxx, optdict.hrc, optinet2.cxx, optpath.cxx, optsave.hrc, optspell.cxx, hldocntp.hxx, srchxtra.hxx, taborder.hxx, hlinettp.hxx, hlmailtp.hxx, hltpbase.hxx, hldoctp.hxx, showcols.hxx, galctrl.hxx, galdlg.cxx, galdlg.hxx, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hxx, galbrws2.hxx, gallery.hrc, galtheme.hrc, taborder.cxx, showcols.cxx, dstribut.hxx, labdlg.hxx, iconcdlg.hxx, multifil.hxx, multipat.hxx, optdict.hxx, optextbr.hxx, optinet2.hxx, optaccessibility.hxx, optasian.hxx, optcolor.hxx, optpath.hxx, optsave.hxx, optspell.hxx, transfrm.hxx, bbdlg.hxx, connect.hxx, dlgname.hxx, zoom.hxx, itemdata.hxx, measure.hxx, optctl.hxx, optjsearch.hxx, textanim.hxx,
modified : RESYNC:; FILE MERGED
files from: sw/sw/source/core/txtnode/: swfont.cxx, txtedt.cxx, sw/sw/source/filter/html/: css1atr.cxx, htmlatr.cxx, swhtml.cxx, sw/sw/source/core/layout/: fly.cxx, flycnt.cxx, flylay.cxx, graphics/svx/inc/: helpid.hrc, svxids.hrc, svxrtf.hxx, sw/sw/source/ui/app/apphdl.cxx sw/sw/inc/: charatr.hxx, doc.hxx, node.hxx, format.hxx, hintids.hxx, ndtxt.hxx, swatrset.hxx, unoprnms.hxx, sw/sw/source/core/bastyp/init.cxx sw/sw/source/core/inc/: flyfrm.hxx, txtfrm.hxx, sw/sw/source/ui/uno/unotxdoc.cxx graphics/svx/source/svrtf/: rtfitem.cxx, svxrtf.cxx, graphics/svx/source/dialog/chardlg.cxx sw/sw/source/core/unocore/: unomap.cxx, unoprnms.cxx, sw/sw/source/core/text/: frmform.cxx, itrform2.cxx, porlay.cxx, txtfly.cxx, txtfrm.cxx, sw/sw/source/filter/rtf/rtfatr.cxx sw/sw/source/core/doc/: docdraw.cxx, doctxm.cxx, graphics/svx/prj/d.lst xml/xmloff/source/text/txtprmap.cxx sw/sw/source/ui/wrtsh/wrtsh1.cxx sw/sw/source/filter/ww8/: wrtw8esh.cxx, ww8atr.cxx, ww8par.cxx, ww8par.hxx, ww8par2.cxx, ww8par2.hxx, ww8par5.cxx, ww8par6.cxx, graphics/svx/source/items/makefile.mk sw/sw/source/filter/w4w/w4watr.cxx sw/sw/source/ui/uiview/: pview.cxx, view.cxx, viewprt.cxx, sw/sw/source/ui/config/: optpage.cxx, usrpref.cxx,

cws_srx645_jmf1 was changed by Kai Ahrens(ka)
removed : RESYNC:; FILE REMOVED
files from: : ldapdlg.hxx, multipat.cxx, multipat.hrc, optaccessibility.hrc, optasian.hrc, optcolor.hrc, optctl.hrc, optdict.hrc, optextbr.cxx, optextbr.hrc, optgenrl.hrc, optinet2.hrc, optjsearch.hrc, optpath.hrc, optsave.hrc, optspell.hrc, ldapdlg.cxx, multifil.cxx, optaccessibility.cxx, optasian.cxx, optcolor.cxx, optctl.cxx, optdict.cxx, optdll.cxx, optgenrl.cxx, optinet2.cxx, optjsearch.cxx, optpath.cxx, optsave.cxx, optspell.cxx, hldoctp.hxx, hlinettp.hxx, hldocntp.hxx, hlmailtp.hxx, hltpbase.hxx, showcols.hxx, srchxtra.hxx, taborder.hxx, galdlg.cxx, galdlg.hxx, galtheme.hxx, galbrws2.hxx, galctrl.hxx, gallery.hrc, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hrc, taborder.cxx, showcols.cxx, multipat.hxx, optcolor.hxx, optctl.hxx, optextbr.hxx, optsave.hxx, optspell.hxx, bbdlg.hxx, connect.hxx, dlgname.hxx, dstribut.hxx, iconcdlg.hxx, itemdata.hxx, labdlg.hxx, measure.hxx, multifil.hxx, optaccessibility.hxx, optasian.hxx, optdict.hxx, optinet2.hxx, optjsearch.hxx, optpath.hxx, textanim.hxx, transfrm.hxx, zoom.hxx, XListEntryBroadcaster.idl,
modified : #i3316#: removed debug output
gsl/vcl/source/app/svapp.cxx
modified : RESYNC:; FILE MERGED
files from: api/offapi/util/makefile.mk gsl/vcl/source/window/winproc.cxx graphics/svx/prj/build.lst udk/unoil/prj/build.lst gsl/vcl/unx/source/window/salobj.cxx graphics/svx/source/gallery2/: makefile.mk, galbrws2.cxx, api/offapi/prj/: d.lst, build.lst, graphics/svx/util/makefile.mk api/offuh/prj/d.lst
modified : #i3316#: added mute methods
api/offapi/drafts/com/sun/star/media/XPlayer.idl

cws_src680_ooo20040225 was changed by Kevin B. Hendricks(khendricks)
modified : MacOSX seems to have duplciate symbol problems with anonymous namespaces using inline to prevent the duplication across compilation modules
framework/scripting/inc/util/util.hxx
modified : adding in fix for Issue 23500 so that more testing can be done with doc files with embedded graphics
sw/sw/source/core/inc/viewimp.hxx
modified : fix to allow both Cygwin and Darwin to build scp in 680 series Thanks to Volker for his patches
tools/solenv/bin/modules/pre2par/globals.pm
modified : no include of malloc.h on MACOSX
gsl/vcl/source/glyphs/gcach_layout.cxx
modified : oslModule is not a void * on MacOSX see sal/inc/osl/module.h for the details
gsl/vcl/unx/source/gdi/salogl.cxx
modified : no include of malloc.h for MACOSX
gsl/vcl/source/gdi/sallayout.cxx
modified : need -lXinerama when linking lib_pure_x as well for MACOSX
gsl/vcl/util/makefile.mk
modified : adding in fix from Issue 23500 so that testing on complicated Doc files can be done without crashing
sw/sw/source/core/view/vdraw.cxx
modified : special MACOSX target seems to be no longer needed
util/svtools/bmpmaker/makefile.mk
modified : fix to allow darwin to build scp, otherwise it gets incorrectly identified as a windows box.
tools/solenv/bin/modules/par2script/globals.pm
modified : libscriptframe.dylib is what is needed on MacOSX Why isn't this using the CONCAT frame work that the other libraries use with the proper share lib ending
installation/scp/source/office/files.scp
modified : no include of malloc.h for MacOSX
gsl/vcl/source/gdi/outdev3.cxx
modified : static libraries must come at the end of the list for MacOSX
graphics/sd/util/makefile.mk
modified : adding in fix from Issue 23500 so that Other functions like DicOOo can be tested without causing segfaults
sw/sw/source/core/draw/dflyobj.cxx
modified : need to deliver .dylib on MacOSX
sw/hwpfilter/prj/d.lst

cws_src680_ooo20040225 was changed by Darragh Sherwin(dsherwin)
modified : #i23204# Remove msvcirt.lib from the linking line for .NET 2003 compiler
tools/xml2cmp/util/ : makefile.mk, makefile.mk ; tools/solenv/inc/ : wnt.mk, wnt.mk ; tools/udm/source/unittest/ : makefile.mk, makefile.mk ; tools/xml2cmp/source/finder/ : makefile.mk, makefile.mk ; tools/cosv/source/unittest/ : makefile.mk, makefile.mk ; sw/sw/source/filter/ww8/dump/ : makefile.mk, makefile.mk ;

cws_src680_ooo20040225 was changed by Dan Williams(fa)
removed : Remove earlier mistaken commits. Correct directory for osxlocale.c should always be sal/systools/macxp_extras/x11osx
files from: makefile.mk osxlocale.c makefile.mk osxlocale.c
added : Directory udk/bridges/source/cpp_uno/gcc3_linux_x86-64 using tag `cws_src680_ooo20040225'
modified : #i9462# mark *LogicRectHack functions static to prevent name collisions with symbols in sch
graphics/svx/source/unodraw/unoshape.cxx
modified : #i8593# Add 64-bit safe types
porting/sal/inc/sal/types.h
modified : #i25564# Add preliminary bridge code for x86-64
udk/bridges/source/cpp_uno/gcc3_linux_x86-64/ : cpp2uno.cxx, except.cxx, makefile.mk, share.hxx, uno2cpp.cxx ; udk/bridges/prj/build.lst
modified : #i25567# Clarify some parameter types
dba/connectivity/source/inc/dbase/dindexnode.hxx
modified : #i25618# preliminary gcj support
tools/config_office/configure.in tools/solenv/inc/settings.mk
modified : #i9462# Prefix *LogicRectHack functions with "sch_" and mark static to prevent name collisions with svx module
graphics/sch/source/ui/unoidl/ChXChartObject.cxx

cws_src680_ooo20040225 was changed by Pavel Janík(pjanik)
modified : #i25582#: x86-64: store type clarification.
ucb/store/source/storlckb.cxx

cws_src680_ooo20040225 was changed by Volker Quetschke(vq)
modified : #23529 Remove code duplication in bootstrap.2, settings.mk creates the ${UPD}minor.mk .
tools/config_office/bootstrap.2
modified : #21385 Remove unused macros MY_DIRCMP and CHECKSCRIPT. Delete unused scripts odk/util/checkdiff.pl and solenv/bin/checkit.pl.
api/sdk_oo/util/ : makefile.pmk, makefile.pmk ; api/odk/util/ : makefile.pmk, makefile.pmk ;
modified : #25499 Teach guw.pl to handle something=<path> parameter and minor cleanup of the used regex.
tools/solenv/bin/guw.pl
modified : #8593 Workaround for the __SIZEOFLONG problem, makes the branch buildable again.
porting/sal/inc/sal/types.h
modified : #22376 Fix constant to long problem.
util/automation/source/app/testbasi.hxx
modified : #25499 2nd part of guw.pl patch.
tools/solenv/bin/guw.pl

cws_src680_ooo20040225 was changed by Sander Vesik(svesik)
modified : Make interlock code work on both x86 (486+) and x86-64 Issue number: 8593 Submitted by: Pavel Janik Reviewed by: Sander Vesik, Dan Williams
porting/sal/osl/unx/interlck.c

cws_src680_ooo20040225 was changed by Jim Watson(sparcmoz)
modified : for linux sparc remove -fpermissive and restore -O1 optimisation
tools/solenv/inc/unxlngs.mk

cws_src680_ooo20040225 was changed by Duncan Foster(dfoster)
modified : #i25666# Issue number: 25666 Submitted by: Reviewed by: Need platform specific file URL prefix.

cws_src680_sab012 was changed by Sascha Ballach(sab)
removed : RESYNC:; FILE REMOVED
files from: mutexholder.hxx
modified : RESYNC:; FILE MERGED
files from: util/sot/source/sdstor/ucbstorage.cxx sc/sc/source/ui/unoobj/cellsuno.cxx sc/sc/source/filter/xml/xmlsubti.cxx sc/sc/source/filter/excel/impop.cxx xml/package/source/zippackage/ZipPackageFolder.cxx

cws_src680_sab012 was changed by Mikhail Voitenko(mav)
modified : #114338# solve conflict
xml/package/source/zippackage/ZipPackageFolder.cxx

cws_srx645_apoc02 was changed by Sarah Smith(ssmith)
modified : #110119# correcting service description
util/configmgr/util/cfgmgr2.xml
modified : #110119# adding new service descriptions
util/configmgr/util/cfgmgr2.xml

cws_src680_impress3ea1 was changed by Thorsten Behrens(thb)
modified : #i25167# Corrected painting of masked BitmapEx to alpha VDev
gsl/vcl/source/gdi/outdev2.cxx

cws_src680_impress3ea1 was changed by Christian Lippka(cl)
removed : RESYNC:; FILE REMOVED
files from: : ldapdlg.hxx, multipat.cxx, multipat.hrc, optaccessibility.hrc, optasian.hrc, optcolor.hrc, optctl.hrc, optdict.hrc, optextbr.cxx, optextbr.hrc, optgenrl.hrc, optinet2.hrc, optjsearch.hrc, optpath.hrc, optsave.hrc, optspell.hrc, ldapdlg.cxx, multifil.cxx, optaccessibility.cxx, optasian.cxx, optcolor.cxx, optctl.cxx, optdict.cxx, optdll.cxx, optgenrl.cxx, optjsearch.cxx, optpath.cxx, optsave.cxx, optspell.cxx, hldoctp.hxx, hlinettp.hxx, hldocntp.hxx, hlmailtp.hxx, hltpbase.hxx, showcols.hxx, srchxtra.hxx, taborder.hxx, galdlg.cxx, galdlg.hxx, galtheme.hxx, galbrws2.hxx, galctrl.hxx, gallery.hrc, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hrc, taborder.cxx, showcols.cxx, multipat.hxx, optcolor.hxx, optctl.hxx, optextbr.hxx, optsave.hxx, optspell.hxx, bbdlg.hxx, connect.hxx, dlgname.hxx, dstribut.hxx, iconcdlg.hxx, itemdata.hxx, labdlg.hxx, measure.hxx, multifil.hxx, optaccessibility.hxx, optasian.hxx, optdict.hxx, optinet2.hxx, optjsearch.hxx, optpath.hxx, textanim.hxx, transfrm.hxx, zoom.hxx,
modified : RESYNC:; FILE MERGED
files from: graphics/sd/source/ui/func/fuslshow.cxx
modified : #114240# removed assertion, false alarm
graphics/sd/source/core/PageListWatcher.cxx
modified : fixed merge problems
graphics/sd/source/ui/func/fuslshow.cxx

cws_src680_ab06q was changed by Andreas Bregas(ab)
removed : RESYNC:; FILE REMOVED
files from: : misccfg.cxx, misccfg.hxx,
modified : #i25537# Ignore non existing libs
framework/sfx2/source/appl/namecont.cxx

cws_src680_fmebugs01 was changed by Frank Meies(fme)
modified : #115438# If a section has lost its follow during MoveBwd, we should call InvalidateSize instead of _InvalidateSize, otherwise the page may not be formatted correctly
sw/sw/source/core/layout/flowfrm.cxx
modified : #i21774# Footnotes and centering the grid does not work together
sw/sw/source/core/layout/ : pagechg.cxx, tabfrm.cxx ;
modified : #115598# #115625# Loop prevention during cellbreak in weird tables
sw/sw/source/core/layout/tabfrm.cxx

cws_src680_impress4ea1 was changed by Sven Jacobi(sj)
modified : I 21122 now reading the CurrentUserStream
graphics/svx/inc/svdfppt.hxx graphics/sd/source/filter/pptin.cxx
modified : I 21122 now reading the CurrentUserStream to determine the correct slide persists
graphics/svx/source/svdraw/svdfppt.cxx
modified : I 21122 ReadZString is now static
graphics/svx/source/msfilter/msdffimp.cxx graphics/svx/inc/msdffimp.hxx

cws_src680_impress4ea1 was changed by Thorsten Behrens(thb)
modified : #i24604# Explicitely added META_TEXTLANGUAGE_ACTION, made action assertion fire only once per metafile
framework/filter/source/pdf/pdfexport.cxx

cws_srx645_mhhxx was changed by Martin Hollmichel(mh)
removed : RESYNC:; FILE REMOVED
files from: : officeacceptthread.cxx, officeacceptthread.hxx, vclpch.cxx, ansi1252.hxx, charnames.cxx, ansi1252.cxx, salmain.cxx, salxutil.cxx, stacktrace.cxx, stacktrace.hxx, salprn.imp, salsound.hxx, salbmp.hxx, salogl.hxx, makefile.unx, gcach_rpeer.cxx, gcach_rpeer.hxx, indbmp.cxx, makefile.mk, rmbitmap.cxx, rmdrgsrc.cxx, rmdrgsrc.hxx, rmdrptgt.cxx, rmoutdev.cxx, rmprint.cxx, rmsound.cxx, rmvirdev.cxx, ooffice.cxx, rmevents.cxx, rmwindow.cxx, xevthdl.cxx, access.cxx, system.cxx, oldsv.cxx, makefile, makefile.mk, salframe.cxx, salobj.cxx, asn.ptr, asne.ptr, asns.ptr, asse.ptr, assw.ptr, asw.ptr, chain.ptr, chainnot.ptr, chart.ptr, ase.ptr, copydlnk.ptr, copyf.ptr, copyf2.ptr, copyflnk.ptr, crop.ptr, cross.ptr, asnswe.ptr, asnw.ptr, dbezier.ptr, dcapt.ptr, dcirccut.ptr, dellipse.ptr, detectiv.ptr, dfree.ptr, dline.ptr, dpolygon.ptr, drect.ptr, dtext.ptr, hand.ptr, help.ptr, hshear.ptr, hsizebar.ptr, linkdata.ptr, linkf.ptr, magnify.ptr, darc.ptr, move.ptr, movebw.ptr, movedata.ptr, movedlnk.ptr, movef2.ptr, moveflnk.ptr, movept.ptr, pen.ptr, pivotcol.ptr, pivotfld.ptr, pivotrow.ptr, rotate.ptr, salsrc.rc, timemove.ptr, timesize.ptr, vshear.ptr, vsizebar.ptr, ass.ptr, aswe.ptr, copydata.ptr, crook.ptr, data.ptr, dconnect.ptr, dpie.ptr, fill.ptr, hsplit.ptr, makefile.mk, mirror.ptr, movef.ptr, nullptr.ptr, refhand.ptr, sd.ico, vsplit.ptr, makefile.mk, salbmp.cxx, salgdi.cxx, salgdi3.cxx, salogl.cxx, salprn.cxx, salgdi2.cxx, salvd.cxx, makefile.mk, salinst.cxx, sallang.cxx, salshl.cxx, salsound.cxx, salsys.cxx, saltimer.cxx, salmain.cxx, salbmp.hxx, saldata.hxx, salframe.h, salgdi.h, salinst.h, salobj.h, salprn.h, salsound.hxx, salvd.h, salids.hrc, salogl.hxx, svsys.h, makefile.mac, makefile.mk, salframe.cxx, Alerts.r, SV_Language.r, sv.r, MyFont.cxx, makefile.mac, makefile.mk, salbmp.cxx, salfont.hxx, salgdi.cxx, salgdi3.cxx, salogl.cxx, salprn.cxx, salfont.cxx, salgdi2.cxx, salvd.cxx, macclip.cxx, macexchg.cxx, NoSharMain.cxx, NoShareApp.cxx, SALSYS.CXX, ShrdMain.cxx, macmain.cxx, macmain2.cxx, macsys.cxx, main.cxx, salinst.cxx, saltimer.cxx, macframe.cxx, makefile.mac, salshl.cxx, SALBMP.HXX, SALIDS.HRC, SALOBJ.H, macsysexchange.hxx, main.h, salinst.h, salsound.hxx, MacUtil.hxx, MacWin.Hxx, MemInit.hxx, svmac.h, MyFont.HXX, SALPRN.H, SALSYS.H, salogl.hxx, svsys.h, descript.plc, log2err.awk, make_cap.plc, make_pro.plc, putall.plc, stampget.plc, stgetree.pld, verget.plc, make.plc, gen.hxx, indbmp.hxx, ooffice.hxx, rcid.h, resmgr.hxx, rmbitmap.hxx, rmevents.hxx, rmoutdev.hxx, rc.h, rmvirdev.hxx, rmwindow, rmwindow.hxx, system.hxx, color.hxx, window.imp, xevthdl.hxx, fonttype.hxx, line.hxx, rmsound.hxx, rvp.hxx, vector2d.hxx, install.sh, makefile.mk, exports.map, makefile.mk, filehelper.cxx, config.hxx, filehelper.hxx, regmimetypes.cxx, regmimetypes.hxx, listinitializer.hxx, copyeas.cxx, makeeas.cxx, makefile.mk, xeajoin.hxx, xeastrip.cxx, xeautil.cxx, xeajoin.cxx, xeautil.hdb, cputype.asm, makefile.mk, os2os.cxx, sysfile.cxx, makefile.mk, pguard.cxx, pguard.h, pguard.ico, pguard.rc, makefile.mk, loader.cxx, loader.h, loader.ico, loader.rc, writer.ico, logo.bmp, macos.cxx, makefile.mk, depcomp.pld, get.plc, l2e_sv.awk, make.plc, make_pro.plc, putall.plc, stamp.plc, stgetree.pld, verget.plc, log2err.awk, stampget.plc, funcord.w16, urlbmk, makefile.mk, segmentc.hxx, filearc2.hxx, filearch.cxx, filearch.hxx, agprop.cxx, items.hxx, items.cxx, calcdoc.ico, chartdoc.ico, def.sed, drawdoc.ico, wps_port.h, wpscalc.c, wpscalc.h, wpscalc.ih, wpschar.c, wpschar.h, wpschar.ih, wpsdraw.csc, wpsdraw.h, wpsdraw.ih, wpsexe.csc, wpsexe.h, makefile.mk, wpsglob.c, wpsglob.csc, wpshtml.c, wpshtml.csc, wpshtml.ih, wpsimpl.c, wpsimpl.h, wpsimpr.csc, wpsimpr.h, wpsmath.c, wpsmath.csc, wpsmath.h, wpswri.c, wpswri.csc, wpswri.h, wpswrt3.def, wpsexe.ico, wpsglob.h, wridoc.ico, mathdoc.ico, wpscalc.csc, wpschar.csc, wpsdraw.c, wpsexe.c, wpsexe.ih, wpsglob.ih, wpshtml.h, wpsimpr.c, wpsimpr.ih, wpsmath.ih, wpswri.ih, wpswrt3.rc, eaimp.cxx, makefile.mk, ddedummy.cxx, makefile.mk, extattr.cxx, makefile.mk, impflt.hxx, agprop.hxx, depcomp.pld, descript.plc, l2e_sv.awk, log2err.awk, make_pro.plc, putall.plc, stamp.plc, stgetree.pld, verget.plc, make.plc, stampget.plc, makefile.unx, supd.cxx, makefile.mk, scalcf.cpp, scalcf.ico, schartf.ico, schartf.idl, sdataf.h, sdesktop.cpp, sdrawf.cpp, sdrawf.ico, sglobalf.cpp, sglobalf.ico, sglobalf.idl, shtmlf.cpp, shtmlf.idl, simpresf.cpp, simpresf.ico, scalcf.idl, smathf.cpp, smathf.ico, smathf.idl, soagent.idl, swriterf.cpp, swriterf.ico, swriterf.idl, schartf.cpp, sdataf.cpp, sdrawf.idl, shtmlf.ico, simpresf.idl, soagent.cpp, wpssrc.rc, cntmenu.cxx, content.cxx, content.hxx, extattr.cxx, extattr.hxx, folder.cxx, itempath.cxx, itempath.hxx, longname.cxx, longname.hxx, shortcut.cxx, wpclient.cxx, wpfolder.cxx, drives.cxx, folder.hxx, makefile.mk, makefile.mk, toolsdll.cxx, svpm.h, wpclient.hxx, dll.hxx, wpsids.hrc, wpdesktp.h, depcomp.pld, descript.plc, l2e_sv.awk, log2err.awk, make_pro.plc, putall.plc, stamp.plc, stgetree.pld, verget.plc, make.plc, stampget.plc, vclrsc.hxx, static.mk, makefile, makefile.mk, test.cxx, wrkdlg.cxx, wrkdlg.hxx, hand.cur, col_pre.bmp, danchor_h.bmp, db_h.bmp, ddcopy.ptr, ddmove.cur, ddmove.ptr, doc_sc.ico, doc_sch.ico, doc_sda.ico, doc_sdd.ico, abt.bmp, doc_sm.ico, doc_sw.ico, dog_h.bmp, drchlauf_h.bmp, rm.bmp, grfspver.bmp, grfspver_h.bmp, hand.ptr, kein.bmp, kein_h.bmp, kondurch.bmp, kondurch_h.bmp, grfsphor.bmp, konkein_h.bmp, konlinks.bmp, konlinks_h.bmp, konopt_h.bmp, konparal.bmp, konparal_h.bmp, konrchts.bmp, links.bmp, links_h.bmp, move.cur, move.ptr, navbook_h.bmp, navchdn.bmp, navchdn_h.bmp, navchlf_h.bmp, navchrg.bmp, navchup.bmp, navchup_h.bmp, navdn.bmp, navdoc.bmp, navdoc_h.bmp, navfoot.bmp, navfram.bmp, navhead.bmp, navhead_h.bmp, rm_h.bmp, navmrk.bmp, navmrk_h.bmp, navnote.bmp, navstmp.bmp, navstmp_h.bmp, navtab.bmp, navtab_h.bmp, navtoc_h.bmp, navup.bmp, navup_h.bmp, optimal_h.bmp, parallel.bmp, parallel_h.bmp, tab.bmp, queries_h.bmp, query_h.bmp, anchor_h.bmp, sch20557.bmp, sch20558.bmp, scnavili.bmp, scnavipi.bmp, scnavire.bmp, shorz.ptr, slleft.cur, slleft.ptr, slright.ptr, prg_sweb.ico, rechts.bmp, tab_h.bmp, table_h.bmp, templ.cur, templ.ptr, wizard.ico, ddcopy.cur, doc_gl.ico, doc_sd.ico, doc_sim.ico, doc_ww.ico, svert.cur, tables.bmp, drchlauf.bmp, grfsphor_h.bmp, konkein.bmp, konopt.bmp, konrchts_h.bmp, navbook.bmp, navchlf.bmp, navchrg_h.bmp, navdn_h.bmp, navfoot_h.bmp, navidx.bmp, navidx_h.bmp, navnote_h.bmp, navtoc.bmp, optimal.bmp, prg_sw10.ico, queries.bmp, rechts_h.bmp, shorz.cur, slright.cur, svert.ptr, tables_h.bmp, x_h.bmp, swcomlib.cxx, swlib.cxx, db_xml.cxx, makefile.mk, db_atr.cxx, undo_atr.cxx, wrt_db.hxx, wrt_undo.cxx, wrt_undo.hxx, wrt_db.cxx, bmpdll.cxx, oemres.src, dynlnk.cxx, iodetect.hxx, purge.hxx, funcord.txt, getall.bat, makeall.bat, makeall2.bat, verinfo.rc, printopt.cxx, sumctl.cxx, sclib.cxx, anchor_h.bmp, calc3.ico, about.bmp, calctor_h.bmp, catpag_h.bmp, chart.ptr, chartcur.r, detectiv.cur, doc.ico, doc_sc.ico, dropblue.bmp, equal_h.bmp, field.cur, dropdown.bmp, ins_fx_h.bmp, insrec_h.bmp, mrgrec_h.bmp, pivotcol.cur, pivotcol.ptr, pivotrow.cur, pivotrow.ptr, prg_sc4.ico, pivotfld.cur, scappwnd.ico, sch6305.bmp, sch6306.bmp, scstlcel_h.bmp, sum_h.bmp, tbxalign.bmp, sc10doc.ico, sc30doc.ico, watercan.cur, watercan.ptr, anchor.bmp, chart.cur, detectiv.ptr, dropdown_h.bmp, ins_fx.bmp, pivotfld.ptr, sc30tpl.ico, scintro.bmp, tbxdraw.bmp, vor_sc.ico, copyenv.bat, copyloc.bat, dumpf.btm, locked.bat, make.bat, postdlv.btm, setver.bat, stree.bat, cleanup.bat, getver.bat, predlv.btm, w95.btm, bigupdat.btm, cleanall.btm, comp.plc, comp_seg.plc, ignite.btm, make.plc, make_pro.plc, make_seg.plc, putall.plc, readme.txt, stampget.plc, stgetree.pld, vd_ver.plc, make_cap.plc, seg.plc, zieh.btm, app.idl, auditsh.idl, docsh.idl, drtxtob.idl, editsh.idl, makefile.mk, pivotsh.idl, prevwsh.idl, scalc.idl, scslots.idl, tabpopsh.idl, tabvwsh.idl, drawsh.idl, newslots.idl, scslots.hrc,
modified : RESYNC:; FILE MERGED
files from: util/sot/inc/stg.hxx installation/setup2/inc/decltor.hxx

cws_src680_swmergeborders was changed by Oliver Düsterhoff(od)
removed : RESYNC:; FILE REMOVED
files from: : wrt_undo.cxx, wrt_undo.hxx, db_atr.cxx, db_xml.cxx, makefile.mk, undo_atr.cxx, wrt_db.cxx, wrt_db.hxx, optasian.hrc, optcolor.cxx, optcolor.hrc, optctl.cxx, optctl.hrc, optdict.cxx, optdict.hrc, optdll.cxx, optextbr.cxx, optextbr.hrc, optgenrl.cxx, optgenrl.hrc, optinet2.cxx, optinet2.hrc, optjsearch.cxx, optjsearch.hrc, optpath.cxx, optpath.hrc, optsave.cxx, optsave.hrc, optspell.cxx, optspell.hrc, ldapdlg.hxx, multifil.cxx, multipat.cxx, multipat.hrc, optaccessibility.cxx, optaccessibility.hrc, optasian.cxx, hldoctp.hxx, hlinettp.hxx, hlmailtp.hxx, hltpbase.hxx, showcols.hxx, srchxtra.hxx, taborder.hxx, galtheme.hrc, galtheme.hxx, galbrws2.hxx, galctrl.hxx, galdlg.cxx, galdlg.hxx, gallery.hrc, gallery1.hxx, galmisc.hxx, galobj.hxx, taborder.cxx, showcols.cxx, bbdlg.hxx, connect.hxx, dlgname.hxx, dstribut.hxx, iconcdlg.hxx, labdlg.hxx, measure.hxx, multifil.hxx, multipat.hxx, optaccessibility.hxx, optasian.hxx, optcolor.hxx, optctl.hxx, optdict.hxx, optextbr.hxx, optinet2.hxx, optjsearch.hxx, optpath.hxx, optsave.hxx, optspell.hxx, textanim.hxx, transfrm.hxx, zoom.hxx,
modified : RESYNC:; FILE MERGED
files from: sw/sw/source/core/layout/frmtool.cxx

cws_src680_swmergeborders was changed by Oliver Specht(os)
modified : #i25027# merge border CheckBox added
graphics/svx/inc/border.hxx graphics/svx/source/dialog/ : border.hrc, border.cxx, border.src ; sw/sw/source/ui/fmtui/tmpdlg.cxx
modified : #i25027# SID_ATTR_BORDER_CONNECT added
graphics/svx/inc/svxids.hrc
modified : #i25027# SlotId added to RES_PARATR_CONNECT_BORDER
sw/sw/source/core/bastyp/init.cxx

cws_srx645_ooo111regression2 was changed by Jens-Heiner Rechtien(hr) [ and it was merged ]
modified : #i25495#: FreeBSD: need . in LD_LIBRARY_PATH for correct installtion
installation/setup2/script/setup.sh
modified : #25496#: flag for thread support has been changed for recent version of FreeBSD
tools/config_office/ : configure.in, configure ;
modified : #i25646#: catch 'unrecognized auth response' from OOo CVS server
tools/solenv/bin/modules/Cvs.pm
modified : #i25230#: System print queues missing in 10.3 Panther
gsl/psprint/source/helper/ : helper.cxx, ppdparser.cxx ; gsl/psprint/source/printer/printerinfomanager.cxx

cws_srx645_nativewidget1 was changed by Dan Williams(fa)
modified : Make GTK combo box buttons sane.
gsl/vcl/unx/source/gdi/salnativewidgets-gtk.cxx
modified : Fix up GTK listbox and combo box sizing. NOTE: combo box sizing not quite finished yet.
gsl/vcl/unx/source/gdi/salnativewidgets-gtk.cxx

cws_srx645_nativewidget1 was changed by Jan Holesovsky(kendy)
modified : Update entire control when the enable/disable state changes and NWF does not paint the button separately.
gsl/vcl/source/control/lstbox.cxx
modified : Honor the CTRL_STATE_ENABLED flag.
gsl/vcl/unx/source/gdi/salnativewidgets-kde.cxx
modified : Fix of arrow size needed for the SGI theme.
gsl/vcl/unx/source/gdi/salnativewidgets-kde.cxx
modified : Implementation of CTRL_TAB_PANE.
gsl/vcl/unx/source/gdi/salnativewidgets-kde.cxx
modified : Mouse-over effect for spin boxes (contributed by Lukas Tinkl).
gsl/vcl/unx/source/gdi/salnativewidgets-kde.cxx

cws_srx645_nativewidget1 was changed by Stephan Schaefer(ssa)
modified : avoid flickering of combobox text during mouse over
gsl/vcl/source/control/button.cxx
modified : assure only one tabitem can be highlighted
gsl/vcl/source/control/tabctrl.cxx
modified : CheckBox/maStateRect was not set correctly
gsl/vcl/source/control/button.cxx
modified : wrap visual styles api and load it dynamically
gsl/vcl/win/source/gdi/salnativewidgets-luna.cxx
modified : repaint background of radio buttons before native drawing, this ensures proper background for transparent themes
gsl/vcl/source/control/button.cxx
modified : Listbox dimensions are queried using PART_SUB_EDIT instead of PART_WINDOW
gsl/vcl/unx/source/gdi/salnativewidgets-gtk.cxx
modified : revert focusrect extension for check/radio buttons, doesn't fit sometimes
gsl/vcl/source/control/button.cxx
modified : adjust checkboxsize for focussed checkboxes that have no text, thus normal checkboxes don't need an internal offset anymore
gsl/vcl/source/control/button.cxx
modified : improve gtk spinfields
gsl/vcl/source/control/spinfld.cxx gsl/vcl/unx/source/gdi/salnativewidgets-gtk.cxx
modified : flat control borders only for new XP look
gsl/vcl/win/source/window/salframe.cxx
modified : assure minimum radio button size required by gtk+
gsl/vcl/unx/source/gdi/salnativewidgets-gtk.cxx
modified : reduce dropdown arrow size and use proper state when drawing it
gsl/vcl/unx/source/gdi/salnativewidgets-gtk.cxx
modified : pass prelighting state to list box separator
gsl/vcl/unx/source/gdi/salnativewidgets-gtk.cxx

cws_src680_sab008 was changed by Sascha Ballach(sab)
modified : #111653#; add forgotten comma
sc/sc/source/ui/unoobj/servuno.cxx
modified : #i20889#; remove merge problem
sc/sc/inc/unowids.hxx
modified : #i20889#; make getRanges work
sc/sc/source/ui/unoobj/cellsuno.cxx
modified : #i20889#; remove inkompatible changes; they are now in tl01
api/offapi/com/sun/star/sheet/Spreadsheet.idl
modified : #115031#; change PropertyName RefreshDelay to RefreshPeriod also on AreaLinks
sc/sc/source/ui/unoobj/linkuno.cxx

cws_src680_sab008 was changed by Stephan Wunderlich(sw)
modified : #111653#
sc/sc/qa/unoapi/sc.sce

cws_src680_scp2fix1 was changed by Ingo Schmidt(is)
modified : #i24630# euroconverter to writer instead of calc Issue number: Submitted by: Reviewed by:
installation/scp2/source/writer/ : configurationitem_writer.scp, configurationitem_writer.lng ; installation/scp2/source/calc/ : configurationitem_calc.scp, configurationitem_calc.lng ;
modified : #i24246# no more share/response directory Issue number: Submitted by: Reviewed by:
installation/scp2/source/ooo/directory_ooo.scp
modified : #i25728# ScriptsJavaScript instead of ScriptsJavascript Issue number: Submitted by: Reviewed by:
installation/scp2/source/ooo/file_ooo.scp
modified : #i25475# matching MSWin instead of win Issue number: Submitted by: Reviewed by:
tools/solenv/bin/modules/pre2par/globals.pm tools/solenv/bin/modules/par2script/globals.pm
modified : #i25425# hiding the user directory Issue number: Submitted by: Reviewed by:
installation/scp2/source/ooo/profileitem_ooo.scp
modified : #i25734# removing share/config/java.ini at deinstall Issue number: Submitted by: Reviewed by:
installation/scp2/source/ooo/file_ooo.scp

cws_src680_tl02 was changed by Thomas Lange(tl)
modified : #i25649# define for slot SID_GRAPHIC changed due to conflict with new define in svx
sw/starmath/inc/starmath.hrc sw/starmath/source/ : document.cxx, view.cxx ; sw/starmath/sdi/ : smath.sdi, smslots.sdi ;
modified : #112405# checking for NULL pointer which should not have occured
sw/sw/source/core/attr/format.cxx

cws_srx645_os12 was changed by Oliver Specht(os)
removed : RESYNC:; FILE REMOVED
files from: : misccfg.cxx, misccfg.hxx, dbbrowse.cxx, dbbrowse.hrc, dbbrowse.hxx, dbbrwcbx.cxx, fmtools.cxx, gridctrl.cxx, gridctrl.hrc, gridctrl.src, makefile.mk, unotest.cxx, dbbrowse.src, fmtools.hxx, gridctrl.hxx, hidother.hrc, hidother.src, makefile.pmk, ofapch.cxx, makefile.mk, wntmsci10, wntmsci7, wntmsci8, wntmsci9, db.src, dbi.src, makefile.mk, oem.src, ooo.src, cjk.src, intro.hrc, iso.src, msgmodel.hxx, calwin.hxx, connpoolsettings.hxx, fontsubstconfig.hxx, autocdoc.hxx, optgdlg.hxx, optmemory.hxx, optuno.hxx, sbadlgs.hxx, sbaexpl.hrc, sbaexpl1.hxx, sbaexpl2.hxx, sigctrl.hxx, treeopt.hrc, connpoolconfig.hxx, connpooloptions.hxx, sendctrl.hxx, treeopt.hxx, fontsubs.cxx, autocdlg.hrc, autocdlg.src, makefile.mk, connpooloptions.src, fontsubs.hrc, fontsubs.src, hyprdlg.hxx, hyprlink.cxx, hyprlink.hrc, autocdlg.cxx, internationaloptions.hrc, optfltr.cxx, optfltr.hrc, optfltr.src, optgdlg.cxx, optgdlg.hrc, optgdlg.src, opthtml.cxx, opthtml.src, optmemory.cxx, optmemory.hrc, optmemory.src, treeopt.src, connpooloptions.cxx, connpooloptions.hrc, hyprlink.src, internationaloptions.cxx, internationaloptions.src, opthtml.hrc, treeopt.cxx, dbcoll.cxx, app.cxx, app.src, appctor.cxx, appimp.cxx, resid.cxx, apearcfg.cxx, connpoolsettings.cxx, fltrcfg.cxx, fontsubstconfig.cxx, htmlcfg.cxx, makefile.mk, ofaaccfg.cxx, optuno.cxx, osplcfg.cxx, sdbcdriverenum.cxx, sdbcdriverenum.hxx, sdintro.bmp, app3.cxx, appstat.cxx, connpoolconfig.cxx, hidgen.hrc, ofaitem.cxx, splnote.hxx, appslots.sdi, makefile.mk, ofa.sdi, ofaslots.sdi, ofaslots.src, sbaslots.hrc, ofaslots.hrc, agent.bmp, btnwin.bmp, so_login_image.bmp, closer-m.bmp, closer-u.bmp, cpytable.bmp, db.ico, deleted.bmp, edit.bmp, editbrw.bmp, for.bmp, insrec.bmp, joins.bmp, lc10622.bmp, lc10629.bmp, lc10727.bmp, lch10622.bmp, lch10709.bmp, lch12232.bmp, lcqrytl.bmp, locked.bmp, mailtext.bmp, mrgrec.bmp, msgview.ico, newedit.bmp, neweditm.bmp, next.bmp, nu08.bmp, nuh07.bmp, nuh08.bmp, oem.bmp, ofaabout.bmp, oo10432.bmp, oo10433.bmp, oo10434.bmp, oo10436.bmp, oo10437.bmp, oo10447.bmp, oo10450.bmp, oo10452.bmp, openabout.bmp, openintro.bmp, pg04.bmp, queries.ico, sc10622.bmp, sc10709.bmp, sc10727.bmp, sc12232.bmp, sch10629.bmp, sch10709.bmp, sch12232.bmp, scqrytl.bmp, soffice_p.bmp, table.ico, btnos2.bmp, tables.ico, target.bmp, tr10416.bmp, tr10432.bmp, tr10433.bmp, tr10434.bmp, tr10436.bmp, tr10437.bmp, tr10439.bmp, tr10447.bmp, tr10450.bmp, tr10921.bmp, trh10416.bmp, trh10432.bmp, trh10434.bmp, trh10435.bmp, trh10437.bmp, trh10439.bmp, trh10440.bmp, trh10450.bmp, cjkabout.bmp, cjkintro.bmp, closer.bmp, dragbtn.bmp, find.bmp, intbeta1.bmp, lc10709.bmp, lch10727.bmp, link.bmp, mark.bmp, newaddr.bmp, nu07.bmp, numfmt.bmp, oo10416.bmp, oo10435.bmp, oo10439.bmp, oo10921.bmp, prev.bmp, sc10629.bmp, sch10622.bmp, sch10727.bmp, soffice.bmp, ssu_login_image.bmp, tr10435.bmp, tr10440.bmp, tr10452.bmp, trh10433.bmp, trh10436.bmp, trh10447.bmp, trh10921.bmp, build.lst, d.lst, app.hxx, app.hrc, datbenum.hxx, dbcoll.hxx, dbdatdef.hxx, dbexch.hxx, dbfileob.hxx, dbobj.hxx, dbqryobj.hxx, dbtabobj.hxx, fontsubs.hxx, htmlcfg.hxx, hyprlink.hxx, ofaaccfg.hxx, ofaids.hrc, ofaitem.hxx, ofapch.hxx, offmenu.hrc, offuiks.hxx, optfltr.hxx, opthtml.hxx, osplcfg.hxx, sbadb.hxx, sbadbit.hxx, sbadll.hxx, sbaexpl.hxx, sbaexpob.hxx, sbaitems.hrc, sbaitems.hxx, sbaobj.hxx, sqldlg.hxx, autocdlg.hxx, dbdefobj.hxx, dbobjenu.hxx, fltrcfg.hxx, iniwrap.hxx, internationaloptions.hxx, ofunodef.hxx, resid.hxx, sbaenum.hxx, sbahints.hxx, sbasltid.hrc, urlbmk, segmentc.hxx, filearch.cxx, filearch.hxx, agprop.cxx, filearc2.hxx, items.hxx, items.cxx, chartdoc.ico, drawdoc.ico, def.sed, makefile.mk, mathdoc.ico, wpscalc.c, wpscalc.csc, wpscalc.h, wpschar.c, wpschar.csc, wpschar.h, wpschar.ih, wpsdraw.csc, wpsdraw.h, wpsdraw.ih, wpsexe.csc, wpsexe.h, wpsexe.ih, wpsglob.c, wpsglob.csc, wpsglob.h, wpshtml.c, wpshtml.csc, wpshtml.h, wpsimpl.c, wpsimpl.h, wpsimpr.c, wpsimpr.csc, wpsimpr.h, wpsmath.c, wpsmath.csc, wpsmath.h, wpswri.c, wpswri.csc, wpswri.h, wpswrt3.def, wpswrt3.rc, calcdoc.ico, wps_port.h, wpscalc.ih, wpsdraw.c, wpsexe.c, wpsexe.ico, wpsglob.ih, wpshtml.ih, wpsimpr.ih, wpsmath.ih, wridoc.ico, eaimp.cxx, makefile.mk, ddedummy.cxx, makefile.mk, extattr.cxx, makefile.mk, impflt.hxx, agprop.hxx, about.bmp, about3.hxx, demfgrad.bmp, demcrok.bmp, demedit.bmp, demtobtm.bmp, demfilg.bmp, demfilr.bmp, demfram.bmp, demlin2.bmp, demlin3.bmp, demling.bmp, demlinr.bmp, demlnpt.bmp, dempoly.bmp, demrect.bmp, demshad.bmp, demshea.bmp, demtext.bmp, demtotop.bmp, demtxtbl.bmp, demtxtgn.bmp, demtxtmi.bmp, demtxtrt.bmp, demtxtsw.bmp, dlgtest.hrc, dlgtest.ico, dlgtest.src, edittest.cxx, edittest.src, intro.bmp, lingtest.cxx, lingtest.hrc, makefile.dlg, makefile.lgt, makefile.lin, makefile.tst, marknext.svd, option.hxx, outltest.cxx, outltest.hrc, sample.cxx, sample.hrc, sample.src, svdbtn.bmp, svdr_min.cxx, test.src, wysiwyg.cxx, about3.cxx, arw1cros.cur, demcirc.bmp, demfilb.bmp, demlin1.bmp, demlinb.bmp, demmirr.bmp, demrota.bmp, demtx2c.bmp, demtxtpl.bmp, dlgtest.cxx, drawdemo.ico, example.cxx, lingtest.src, makefile.mk, option.cxx, outltest.src, sample.hxx, test.hrc, basapp.hrc, basapp.hxx, basapp.src, basapp.cxx, baspch.cxx, baspch.hxx, dummy.bmp, dummy2.bmp, basapp2.src, basappsl.idl, basicide.ico, bmps.txt, svheader.hxx, active.bmp, addbookm.bmp, aliengal.bmp, btnos2.bmp, btnwin.bmp, btnwin.bmp, control.bmp, db02.bmp, db03.bmp, db05.bmp, db06.bmp, db08.bmp, deldict.bmp, dist02.bmp, dist03.bmp, dist05.bmp, dist06.bmp, dist07.bmp, dist09.bmp, dist10.bmp, editdict.bmp, favorit1.bmp, favorit3.bmp, favorit4.bmp, favorit6.bmp, favorit7.bmp, favorit8.bmp, fixed.bmp, focal01.bmp, focal03.bmp, focal04.bmp, focal05.bmp, focal07.bmp, focal08.bmp, focal10.bmp, form.bmp, fr01_h.bmp, im02.bmp, im03.bmp, im30820.bmp, im30821.bmp, im30823.bmp, im30824.bmp, im30825.bmp, im30827.bmp, im30828.bmp, im30839.bmp, im30840.bmp, im30841.bmp, lcmakrod.bmp, li061.bmp, li062.bmp, lightsel.bmp, link.bmp, lm05300.bmp, scarb.bmp, scautoko.bmp, scmakrod.bmp, sgaopen.bmp, sx18029.bmp, sx18030.bmp, sxh18029.bmp, sxh18030.bmp, thmopen.bmp, videofil.bmp, basstep.bmp, bpip.bmp, button.bmp, check.bmp, combobox.bmp, db01.bmp, db04.bmp, db07.bmp, dist01.bmp, dist04.bmp, dist08.bmp, dropdown.bmp, edit.bmp, favorit2.bmp, favorit5.bmp, favorit9.bmp, find.bmp, focal02.bmp, focal06.bmp, focal09.bmp, fr010_h.bmp, fr011_h.bmp, fr012_h.bmp, fr02_h.bmp, fr03_h.bmp, fr04_h.bmp, fr05_h.bmp, fr06_h.bmp, fr08_h.bmp, fr09_h.bmp, group.bmp, im01.bmp, im30819.bmp, im30822.bmp, im30826.bmp, im30838.bmp, lcautoko.bmp, lg10406.bmp, li060.bmp, lightons.bmp, listbox.bmp, locked.bmp, matedit.bmp, matfavor.bmp, newdict.bmp, nu01_h.bmp, nu02_h.bmp, nu03_h.bmp, owngal.bmp, radio.bmp, reloadl.bmp, reloadsl.bmp, sc_form.bmp, sg10406.bmp, soundfil.bmp, sx18028.bmp, sxh18028.bmp, urlbutt.bmp, xfontmac.cxx, xfontmac.hxx, svdedtv3.cxx, optasian.cxx, ldapdlg.hxx, multipat.cxx, multipat.hrc, optaccessibility.hrc, optasian.hrc, optcolor.hrc, optctl.hrc, optdict.hrc, optgenrl.cxx, optgenrl.hrc, optinet2.hrc, optjsearch.hrc, optpath.hrc, optsave.hrc, optspell.hrc, ldapdlg.cxx, multifil.cxx, optaccessibility.cxx, optcolor.cxx, optctl.cxx, optdict.cxx, optdll.cxx, optinet2.cxx, optjsearch.cxx, optpath.cxx, optsave.cxx, optspell.cxx, hldoctp.hxx, hlinettp.hxx, hldocntp.hxx, hlmailtp.hxx, hltpbase.hxx, showcols.hxx, srchxtra.hxx, taborder.hxx, galdlg.cxx, galdlg.hxx, galtheme.hxx, galbrws2.hxx, galctrl.hxx, gallery.hrc, gallery1.hxx, galmisc.hxx, galobj.hxx, galtheme.hrc, taborder.cxx, showcols.cxx, paractrl.hxx, dialogs.cxx, paractrl.cxx, addbookm.bmp, aliengal.bmp, basstep.bmp, bo_sdw.bmp, bpip.bmp, deldict.bmp, find.bmp, frames.bmp, fwbotarc.bmp, fwbuttn1.bmp, fwbuttn2.bmp, fwbuttn4.bmp, fwlftarc.bmp, fwrgtarc.bmp, fwrhcirc.bmp, fwtoparc.bmp, images.bmp, images2.bmp, legtyp2.bmp, legtyp3.bmp, legtyp4.bmp, lm05300.bmp, newdict.bmp, owngal.bmp, sc10147.bmp, sc_lingu.bmp, soundfil.bmp, videofil.bmp, bo_pre.bmp, editdict.bmp, fwbhcirc.bmp, fwbuttn3.bmp, fwlhcirc.bmp, grfload.bmp, legtyp1.bmp, link.bmp, numfmt.bmp, sc10148.bmp, ibrwimp.cxx, makefile.mk, multipat.hxx, optcolor.hxx, optctl.hxx, optsave.hxx, optspell.hxx, bbdlg.hxx, connect.hxx, dlgname.hxx, dstribut.hxx, iconcdlg.hxx, itemdata.hxx, labdlg.hxx, makefile.unx, measure.hxx, multifil.hxx, optaccessibility.hxx, optasian.hxx, optdict.hxx, optinet2.hxx, optjsearch.hxx, optpath.hxx, textanim.hxx, transfrm.hxx, zoom.hxx, attributeproperties.hxx, makefile.mk, test.cxx, wrkdlg.cxx, wrkdlg.hxx, abt.bmp, col_pre.bmp, db_h.bmp, ddcopy.cur, ddcopy.ptr, ddmove.ptr, doc_gl.ico, doc_sch.ico, doc_sd.ico, doc_sda.ico, doc_sim.ico, doc_sm.ico, doc_ww.ico, drchlauf.bmp, drchlauf_h.bmp, grfsphor_h.bmp, grfspver.bmp, hand.cur, hand.ptr, kein.bmp, kondurch.bmp, kondurch_h.bmp, konkein.bmp, konlinks.bmp, konlinks_h.bmp, konopt.bmp, konparal.bmp, konparal_h.bmp, konrchts_h.bmp, links_h.bmp, move.cur, navbook.bmp, navbook_h.bmp, navchdn.bmp, navchlf.bmp, navchlf_h.bmp, navchrg.bmp, navchrg_h.bmp, navchup_h.bmp, navdn.bmp, navdn_h.bmp, navdoc_h.bmp, navfoot.bmp, navfoot_h.bmp, navhead.bmp, navhead_h.bmp, navidx.bmp, navmrk.bmp, navmrk_h.bmp, navnote.bmp, navstmp.bmp, navstmp_h.bmp, navtab.bmp, navtoc.bmp, navtoc_h.bmp, navup.bmp, rm.bmp, optimal_h.bmp, parallel.bmp, prg_sweb.ico, queries_h.bmp, query_h.bmp, rechts.bmp, rm_h.bmp, sch20557.bmp, sch20558.bmp, scnavili.bmp, scnavire.bmp, shorz.cur, shorz.ptr, slleft.cur, slright.cur, slright.ptr, svert.ptr, tab.bmp, tab_h.bmp, tables.bmp, tables_h.bmp, templ.cur, templ.ptr, anchor_h.bmp, danchor_h.bmp, ddmove.cur, doc_sc.ico, doc_sdd.ico, doc_sw.ico, dog_h.bmp, grfsphor.bmp, grfspver_h.bmp, kein_h.bmp, konkein_h.bmp, konopt_h.bmp, konrchts.bmp, links.bmp, move.ptr, navchdn_h.bmp, navchup.bmp, navdoc.bmp, navfram.bmp, navidx_h.bmp, navnote_h.bmp, navtab_h.bmp, navup_h.bmp, optimal.bmp, prg_sw10.ico, queries.bmp, rechts_h.bmp, scnavipi.bmp, slleft.ptr, svert.cur, table_h.bmp, wizard.ico, x_h.bmp, db_xml.cxx, makefile.mk, wrt_undo.cxx, wrt_db.hxx, db_atr.cxx, undo_atr.cxx, wrt_db.cxx, wrt_undo.hxx, bmpdll.cxx, oemres.src, dynlnk.cxx, purge.hxx, ShortTest.htm, api.htm, ScriptParameter.htm, OleClient.dsp, OleClient.dsw, activex_test.cxx, makefile.mk, makefile.mk, uno_activex.idl, StdAfx2.h, UNOActiveX.rgs, example.html, outputistream.cxx, intercept.cxx, intercept.hxx, makefile.mk, StdAfx2.cpp, outputistream.hxx, resource.h, uno_activex.cpp, uno_activex.def, UNOActiveX.cpp, UNOActiveX.h, initwindowpeer.hxx, officeconnection.cxx, uno_activex.rc, protdlgs.hrc, PropertyInfo.cxx, PropertyInfo.hxx, PropertyInfoReg.cxx, exports.dxp, makefile.mk, oleclassw.cxx, cntsupp.hxx, entry.cxx, ie_ol.cxx, inetset.cxx, makefile.mk, misc.cxx, sis-data-struct.sdw, soffice.cxx, cntsupp.cxx, inetset.hxx, netscape.cxx, wntmsci3, wntmsci7, controlloader.cxx, exports.dxp, makefile.mk, acvload.cxx, addrconv.hxx, exports.dxp, makefile.mk, addrconv.cxx, address.hxx, exports.dxp, ldap.cxx, makefile.mk, merging.cxx, parser.cxx, parser.y, propset.hxx, services.cxx, sdb.hxx, services.hxx, stream.cxx, xml.cxx, xml.hxx, address.cxx, ldap.hxx, merging.hxx, propset.cxx, register.cxx, sdb.cxx, stream.hxx, dbsettings.xml, ldap.xml, sdb.xml, Busiaddr.cxx, Busiaddr.hxx, Busiphon.cxx, Phone.bmp, adr.hrc, adr.src, adrbeam.hxx, adrcont.cxx, adrcont.hxx, adrexch.hxx, adrload.cxx, adrmod.hxx, adrprop.hrc, adrresid.hxx, adrsect.hxx, adrview.cxx, basepage.cxx, basepage.hxx, datman.cxx, expander.bmp, exports.dxp, fielddsc.hxx, fieldwin.cxx, fieldwin.hxx, framectr.hxx, frameset.cxx, general.cxx, general.hxx, makefile.mk, modcard.bmp, newcard.bmp, privaddr.cxx, privaddr.hxx, privdata.hxx, registry.cxx, remcard.bmp, sections.hrc, sections.src, toolbar.hrc, toolbar.hxx, viewsect.cxx, viewsect.hxx, Busiphon.hxx, adrbeam.cxx, adrexch.cxx, adrmod.cxx, adrsect.cxx, adrview.hxx, datman.hxx, fielddsc.cxx, framectr.cxx, frameset.hxx, plus.bmp, privdata.cxx, registry.hxx, toolbar.cxx, toolbar.src, adrldap.act, adrmerging.act, adrmerging.xml, adrsdb.act, adrmerge.act, dbsettings.act, propset.hxx, makefile.mk, propset.cxx, address.hxx, exports.dxp, ldap.cxx, makefile.mk, merging.cxx, parser.cxx, parser.y, xml.cxx, sdb.hxx, address.cxx, stream.cxx, stream.hxx, xml.hxx, ldap.hxx, merging.hxx, register.cxx, sdb.cxx, services.cxx, services.hxx, content.cxx, content.hrc, content.hxx, exports.dxp, makefile.mk, content.src, regcnt.cxx, xgdidemo.cxx, xgdidemo.hrc, xgpch.cxx, test.cxx, xgdidemo.src, test.cxx, makefile.mk, sd.cxx, sd.r, split_rc.awk, drstdob.cxx, SdOutlinerIterator.cxx, drgrfob.cxx, grstdob.cxx, sdoutl.cxx, drglueob.hxx, drgrfob.hxx, drtxtob.hxx, drviewsh.hxx, efctchld.hxx, grstdob.hxx, grviewsh.hxx, navichld.hxx, outlview.hxx, prevchld.hxx, sdmtf.hxx, sdwindow.hxx, slidchld.hxx, slidvish.hxx, SdOutlinerIteratorImpl.hxx, brkdlg.hxx, clview.hxx, dlgolbul.hxx, docshell.hxx, drbezob.hxx, drstdob.hxx, effect.hxx, frmview.hxx, grdocsh.hxx, layertab.hxx, mover.hxx, outlnvsh.hxx, presvish.hxx, preview.hxx, prvwshll.hxx, sdclient.hxx, sdruler.hxx, sdview.hxx, showwin.hxx, slidview.hxx, tabcontr.hxx, viewshel.hxx, preview.src, preview.cxx, cursors.r, frmtxt2.bmp, frmtxt3.bmp, fwthcirc_h.bmp, pen_h.bmp, objekt2_h.bmp, text2.bmp, pencil.cur, pencil.ptr, template.cur, text2_h.bmp, about.bmp, chart_h.bmp, cross1.cur, extras_h.bmp, first_h.bmp, foil2_h.bmp, frmtxt1.bmp, frmtxt4.bmp, image_h.bmp, intro.bmp, kopie_h.bmp, last_h.bmp, lc10301.bmp, link_h.bmp, next_h.bmp, object_h.bmp, objekt2.bmp, opadd_h.bmp, opdelete_h.bmp, opmodify_h.bmp, opsmsize_h.bmp, presobjs_h.bmp, sc05502_h.bmp, table_h.bmp, verknpf_h.bmp, waiticon_h.bmp, sdoutl.hxx, printopt.cxx, sumctl.cxx, about.bmp, calc3.ico, chart.cur, chart.ptr, chartcur.r, detectiv.cur, detectiv.ptr, doc_sc.ico, dropblue.bmp, dropdown_h.bmp, ins_fx_h.bmp, pivotcol.ptr, pivotfld.cur, pivotrow.cur, pivotrow.ptr, prg_sc4.ico, sc30doc.ico, sc30tpl.ico, sch6305.bmp, sch6306.bmp, sum_h.bmp, tbxdraw.bmp, watercan.cur, watercan.ptr, anchor.bmp, anchor_h.bmp, calctor_h.bmp, catpag_h.bmp, doc.ico, dropdown.bmp, equal_h.bmp, field.cur, ins_fx.bmp, insrec_h.bmp, mrgrec_h.bmp, pivotcol.cur, pivotfld.ptr, sc10doc.ico, scappwnd.ico, scintro.bmp, scstlcel_h.bmp, tbxalign.bmp, vor_sc.ico,
modified : RESYNC:; FILE MERGED
files from: graphics/svx/source/items/flditem.cxx sc/sc/source/core/tool/chgtrack.cxx sw/sw/source/ui/shells/textfld.cxx sw/sw/source/core/bastyp/calc.cxx sw/sw/source/ui/envelp/labimg.cxx framework/sfx2/inc/sfxsids.hrc graphics/svx/prj/d.lst graphics/svx/source/options/: optpath.src, optsave.src, makefile.mk, optinet2.src, util/svtools/source/config/: pathoptions.cxx, makefile.mk, graphics/svx/inc/: dialogs.hrc, optgenrl.hxx, sc/sc/source/ui/app/scmod.cxx sw/sw/source/ui/fldui/fldedt.cxx sw/sw/source/ui/uiview/view.cxx sw/sw/source/ui/app/: apphdl.cxx, swmodul1.cxx, swmodule.cxx, graphics/svx/sdi/: svxitems.sdi, svx.sdi, graphics/sd/source/ui/app/: sdmod2.cxx, sdpopup.cxx, util/extensions/source/preload/oemwiz.cxx graphics/sd/source/ui/view/: drviewsb.cxx, outlnvs2.cxx, graphics/sd/source/ui/dlg/dlgfield.cxx

mws_srx645 was changed by Gregor Hartmann(gh)
modified : #115485#removing one space
installation/setup2/source/ui/pages/pupdate.src

mws_srx645 was changed by Hans-Joachim Lankenau(hjs)
modified : #115116# do not translate Product Update
installation/setup2/source/ui/pages/ppatch.src

mws_srx645 was changed by Vladimir Glazounov(vg)
integrated : ooo111regression2[ description]
tools/config_office/ : configure, configure.in ; gsl/psprint/source/helper/ : helper.cxx, ppdparser.cxx ; installation/setup2/script/setup.sh gsl/psprint/source/printer/printerinfomanager.cxx tools/solenv/bin/modules/Cvs.pm
integrated : ptbrblank[ description]
installation/scp/source/office/dir.scp
integrated : ooo111merge[ description]
framework/sfx2/source/explorer/explorer.src graphics/svx/source/stbctrls/stbctrls.src sw/sw/source/ui/utlui/ : attrdesc.src, gloslst.src, initui.src, navipi.src, poolfmt.src, unotools.src, utlui.src ; dba/dbaccess/source/ui/querydesign/ : query.src, querydlg.src ; dba/dbaccess/source/ui/misc/ : WizardPages.src, dbumiscres.src ; framework/sfx2/source/bastyp/ : bastyp.src, fltdlg.src, fltfnc.src, newhdl.src ; dba/dbaccess/source/ui/control/ : TableGrantCtrl.src, tabletree.src, undosqledit.src ; sw/sw/source/ui/index/ : cnttab.src, idxmrk.src, multmrk.src ; sc/sc/source/ui/navipi/navipi.src util/extensions/source/abpilot/abspilot.src sc/sc/source/ui/dbgui/ : asciiopt.src, consdlg.src, dapitype.src, imoptdlg.src, pivot.src, pvfundlg.src, scendlg.src, validate.src ; graphics/sch/sdi/schslots.src installation/wizards/source/euro/euro.src installation/wizards/source/template/template.src gsl/sysui/oounix/office/cde/ : calc.lng, draw.lng, group.lng, impress.lng, math.lng, writer.lng ; installation/setup2/mow/source/system/mowos.src framework/sfx2/source/dialog/ : about.src, cfg.src, dialog.src, dinfdlg.src, dinfedt.src, dlgrun.src, eventdlg.src, filedlghelper.src, macropg.src, mail.src, mailwindow.src, mgetempl.src, newstyle.src, passwd.src, printopt.src, recfloat.src, templdlg.src, versdlg.src ; graphics/svx/source/outliner/outliner.src sw/sw/source/ui/wizard/ : wizagdlg.src, wizbmp.src, wizfxdlg.src, wizlogo.src, wizltdlg.src, wizmmdlg.src, wizsave.src ; framework/filter/source/xsltdialog/ : xmlfileview.src, xmlfilterdialogstrings.src, xmlfiltersettingsdialog.src, xmlfiltertabdialog.src, xmlfiltertabpagebasic.src, xmlfiltertabpagexslt.src, xmlfiltertestdialog.src ; installation/setup2/aqua/source/system/aquaos.src graphics/goodies/source/filter.vcl/eos2met/dlgeos2.src graphics/goodies/source/filter.vcl/epict/dlgepct.src installation/wizards/source/webwizard/webwizar.src framework/framework/source/classes/ : fltdlg.src, resource.src ; graphics/svx/source/fmcomp/ : gridctrl.src, showcols.src ; dba/dbaccess/source/ui/tabledesign/table.src graphics/sch/source/core/glob.src installation/scp/source/kde/ : module_kde.lng, unxbasic_kde.lng ; installation/scp/source/calc/ : module_calc.lng, profile_calc.lng, system_calc.lng ; util/officecfg/registry/schema/org/openoffice/ : Inet.xcs, Setup.xcs, UserProfile.xcs, VCL.xcs ; graphics/svx/source/items/ : svxerr.src, svxitems.src ; util/extensions/source/scanner/ : grid.src, sanedlg.src ; util/extensions/source/dbimport/ : dbidialogs.src, dsntypes.src, importdialog.src ; framework/sfx2/source/toolbox/ : tbxcust.src, tbxopdlg.src, tbxpopup.src, toolbox.src ; gsl/padmin/source/ : padialog.src, rtsetup.src ; util/extensions/source/propctrlr/ : formres.src, propres.src ; util/officecfg/registry/schema/org/openoffice/Office/ : Addons.xcs, Calc.xcs, Chart.xcs, Commands.xcs, Common.xcs, DataAccess.xcs, Draw.xcs, Impress.xcs, Java.xcs, Jobs.xcs, Labels.xcs, Linguistic.xcs, Math.xcs, ProtocolHandler.xcs, SFX.xcs, Security.xcs, Substitution.xcs, TypeDetection.xcs, UI.xcs, Views.xcs, Writer.xcs, WriterWeb.xcs ; sw/sw/source/ui/docvw/ : access.src, docvw.src ; graphics/svx/source/tbxctrls/ : colrctrl.src, grafctrl.src, lboxctrl.src, tbcontrl.src, tbxdraw.src ; sw/sw/source/ui/chrdlg/ : ccoll.src, chardlg.src, chrdlg.src, drpcps.src, numpara.src, paradlg.src, swbreak.src ; framework/offmgr/source/offapp/intro/ : cjk.src, db.src, dbi.src, for.src, intro.hrc, iso.src, oem.src, ooo.src ; graphics/svx/source/svxlink/linkmgr.src graphics/goodies/source/filter.vcl/epgm/dlgepgm.src gsl/sysui/desktop/share/ : documents.ulf, launcher_comment.ulf, launcher_name.ulf ; installation/scp/source/office/ : basic.lng, config.lng, dir.lng, module.lng, profile.lng, setuphelp.lng, system.lng, unxbasic.lng ; framework/sfx2/source/accel/accel.src framework/sfx2/source/appl/ : app.src, minbox.src, newhelp.src, sfx.src ; installation/setup2/source/custom/tplsetup/tplsetup.src framework/offmgr/sdi/ofaslots.src sw/sw/sdi/swslots.src sw/sw/source/ui/app/ : app.src, error.src, mn.src ; graphics/svx/source/accessibility/accessibility.src framework/sfx2/source/view/ : framedlg.src, fsetview.src, view.src ; installation/scp/source/draw/ : module_draw.lng, profile_draw.lng, system_draw.lng ; sw/sw/source/ui/globdoc/globdoc.src installation/scp/source/fonts/module_fonts.lng util/svtools/source/items/cstitem.src sw/sw/source/ui/fldui/ : DropDownFieldDialog.src, changedb.src, flddb.src, flddinf.src, flddok.src, fldfunc.src, fldref.src, fldtdlg.src, fldui.src, fldvar.src, inpdlg.src, javaedit.src ; graphics/svx/source/gallery2/ : gallery.src, galtheme.src ; util/extensions/source/dbpilots/ : commonpagesdbp.src, dbpilots.src, gridpages.src, groupboxpages.src ; installation/setup2/source/ui/pages/ : maindlg.src, paddr.src, pasexist.src, pasreins.src, pasremem.src, passrv.src, passtart.src, pasuinst.src, pasuname.src, pasupath.src, pcfgserver.src, pcrc.src, phavefun.src, pimode.src, pipath.src, plang.src, plicense.src, pmigrate.src, pmodules.src, ppatch.src, pprofile.src, preadme.src, preadygo.src, precover.src, preguser.src, preins.src, prepair.src, prspwizard.src, pscript.src, ptoplvl.src, puninst.src, pupdate.src, pusrinst.src, pwaddr.src, pwelcome.src, pwsetup.src, vefun.src ; installation/scp/source/python/python.lng ucb/uui/source/ : cookiedg.src, fltdlg.src, ids.src, logindlg.src, masterpasscrtdlg.src, masterpassworddlg.src, passcrtdlg.src, passworddlg.src, passworderrs.src ; graphics/sd/sdi/sdslots.src graphics/svx/source/engine3d/ : float3d.src, string3d.src ; graphics/sd/source/ui/accessibility/accessibility.src installation/readlicense/docs/readme/readme.xrm installation/setup2/source/ui/ : app.src, error.src ; framework/sfx2/source/config/config.src sc/sc/sdi/scslots.src installation/scp/source/lingu/module_lingu.lng graphics/sd/source/ui/dlg/ : animobjs.src, brkdlg.src, copydlg.src, custsdlg.src, dlg_char.src, dlgass.src, dlgfield.src, dlgolbul.src, dlgpage.src, dlgsnap.src, effect.src, ins_page.src, ins_paste.src, inspagob.src, morphdlg.src, navigatr.src, new_foil.src, paragr.src, present.src, preview.src, printdlg.src, prltempl.src, prntopts.src, sdobjpal.src, sdpreslt.src, slidechg.src, tabtempl.src, tpaction.src, tpoption.src, vectdlg.src ; util/svtools/source/control/ : calendar.src, ctrlbox.src, ctrltool.src, filectrl.src ; framework/framework/source/services/ : documentlist.src, logindialog.src ; sw/sw/source/ui/lingu/olmenu.src installation/scp/source/gnome/module_gnome.lng sc/sc/addin/datefunc/dfa.src sw/starmath/source/ : commands.src, menu.src, smres.src, symbol.src ; installation/wizards/source/tools/common.src sc/sc/source/ui/formdlg/ : dwfunctr.src, formdlgs.src, parawin.src ; sw/sw/source/ui/frmdlg/ : column.src, cption.src, frmpage.src, frmui.src, wrap.src ; installation/setup2/source/custom/jvmsetup/jvmdlg.src sc/sc/source/ui/drawfunc/ : drformsh.src, objdraw.src ; dba/dbaccess/source/ui/inc/toolbox.hrc installation/setup2/source/ui/dialog/ : dialog.src, infodlg.src, querydlg.src, strings.src ; graphics/goodies/source/filter.vcl/egif/dlgegif.src dba/dbaccess/source/core/resource/strings.src installation/setup2/source/custom/reg4msdoc/preg4msdoc.src installation/scp/source/javafilter/ : module_javafilter.lng, profile_javafilter.lng ; sw/sw/source/ui/dbui/ : dbinsdlg.src, dbui.src ; graphics/svx/source/form/ : filtnav.src, fmexpl.src, fmsearch.src, fmstring.src, taborder.src, tbxform.src, tbxform.src ; util/svtools/source/filepicker/ : filepicker.src, iodlg.src ; graphics/svx/source/options/ : multipat.src, optaccessibility.src, optasian.src, optcolor.src, optctl.src, optdict.src, optextbr.src, optgenrl.src, optgrid.src, optinet2.src, optjsearch.src, optlingu.src, optpath.src, optsave.src, optspell.src ; dba/dbaccess/source/ui/uno/dbinteraction.src installation/scp/source/grafikfilter/module_grafik.lng installation/scp/source/office_root/module_fat_root.lng gsl/shell/source/win32/shlxthandler/shlxthdl.lng graphics/sd/source/ui/app/ : menu.src, menuids.src, menuids2.src, menuids3.src, menuids4.src, menuportal.src, popup.src, res_bmp.src, sdstring.src, strings.src, tbx_ww.src, toolbox.src ; dba/dbaccess/source/ui/relationdesign/relation.src graphics/sd/source/filter/html/pubdlg.src sc/sc/source/ui/miscdlgs/ : acredlin.src, highred.src, instbdlg.src, linkarea.src ; gsl/vcl/source/src/ : btntext.src, helptext.src, menu.src, stdtext.src, units.src ; sw/sw/source/ui/ribbar/ : inputwin.src, tblctrl.src, tbxanchr.src, workctrl.src ; installation/wizards/source/formwizard/dbwizres.src graphics/goodies/source/filter.vcl/eppm/dlgeppm.src sw/sw/source/ui/dialog/ : abstract.src, ascfldlg.src, dialog.src, docstdlg.src, regionsw.src ; framework/sfx2/source/doc/ : doc.src, doctdlg.src, doctempl.src, docvor.src, new.src ; framework/offmgr/source/offapp/dialog/ : autocdlg.src, connpooloptions.src, fontsubs.src, hyprlink.src, inetdlg.src, internationaloptions.src, optfltr.src, optgdlg.src, opthtml.src, optmemory.src, treeopt.src ; graphics/goodies/source/filter.vcl/eps/ : dlgeps.src, epsstr.src ; framework/sfx2/source/statbar/statbar.src sc/sc/source/ui/styleui/ : scstyles.src, styledlg.src ; installation/scp/source/impress/ : module_impress.lng, profile_impress.lng, system_impress.lng ; sc/sc/source/ui/pagedlg/ : hfedtdlg.src, pagedlg.src, tphf.src ; util/extensions/source/bibliography/ : bib.src, datman.src, menu.src, sections.src, toolbar.src ; graphics/sch/source/ui/dlg/ : attrib.src, attrib2.src, attrib3.src, attrib4.src, axisgrid.src, datdescr.src, datstat.src, dgrdata.src, diagrtyp.src, dlggraut.src, legend.src, lightdlg.src, title.src, tplabel.src, tpscaley.src, viewdlg.src ; graphics/svx/sdi/svxslots.src sw/sw/source/ui/dochdl/ : dochdl.src, selglos.src ; dba/dbaccess/source/ui/browser/ : bcommon.src, sbabrw.src, sbagrid.src ; graphics/svx/source/editeng/editeng.src sc/scaddins/source/datefunc/datefunc.src util/svtools/source/contnr/ : fileview.src, svcontnr.src, templwin.src ; sw/sw/source/ui/envelp/ : envelp.src, envfmt.src, envlop.src, envprt.src, label.src, labfmt.src, labprt.src ; util/svtools/source/misc/ : config.src, errtxt.src, iniman.src, mediatyp.src, pver.src ; installation/wizards/source/schedule/schedule.src graphics/svx/source/svdraw/svdstr.src graphics/sd/source/core/glob.src sc/sc/source/ui/docshell/tpstat.src graphics/svx/inc/globlmn.hrc sw/sw/source/ui/fmtui/ : fmtui.src, tmpdlg.src ; graphics/sch/source/ui/app/ : app.src, menu.src, menuids.src, res_bmp.src, strings.src ; porting/crashrep/source/all/crashrep.lng util/svtools/source/Accessibility/accessiblelistboxentry.src installation/scp/source/math/ : module_math.lng, profile_math.lng, system_math.lng ; framework/offmgr/source/offapp/app/app.src installation/scp/source/cde/ : module_cde.lng, unxbasic_cde.lng ; sw/starmath/sdi/smslots.src sw/sw/source/ui/shells/shells.src gsl/toolkit/source/awt/accessiblestrings.src sc/scaddins/source/analysis/ : analysis.src, analysis_funcnames.src ; util/svtools/source/uno/unoifac2.src installation/setup2/win/source/loader/loader.lng framework/desktop/source/app/ : desktop.src, ssodlg.src ; sw/sw/source/ui/misc/ : bookmark.src, docfnote.src, glosbib.src, glossary.src, insfnote.src, insrule.src, linenum.src, num.src, numberingtypelistbox.src, outline.src, pgfnote.src, pggrid.src, redlndlg.src, srtdlg.src ; installation/setup2/source/uibase/agentdlg.src framework/sfx2/source/menu/menu.src sw/sw/source/ui/wrtsh/wrtsh.src graphics/svx/source/dialog/ : align.src, backgrnd.src, bbdlg.src, bmpmask.src, border.src, chardlg.src, charmap.src, commonlingui.src, connect.src, contdlg.src, ctredlin.src, dlgname.src, dstribut.src, fontwork.src, frmdirlbox.src, frmsel.src, grfflt.src, grfpage.src, hangulhanjadlg.src, hdft.src, hlmarkwn.src, hyperdlg.src, hyphen.src, hyprlink.src, iconcdlg.src, imapdlg.src, impgrf.src, labdlg.src, langtab.src, language.src, lingu.src, measure.src, numfmt.src, numpages.src, page.src, paragrph.src, passwd.src, postdlg.src, prtqry.src, rubydialog.src, ruler.src, sdstring.src, spldlg.src, srchdlg.src, srchxtra.src, tabarea.src, tabline.src, tabstpge.src, test.src, textanim.src, textattr.src, thesdlg.src, transfrm.src, txenctab.src, zoom.src ; sw/sw/source/ui/web/web.src sc/sc/source/ui/src/ : attrdlg.src, autofmt.src, chartdlg.src, condfrmt.src, crnrdlg.src, dbnamdlg.src, filter.src, globstr.src, hdrcont.src, menue.src, miscdlgs.src, namedlg.src, opredlin.src, optdlg.src, popup.src, sc.src, scerrors.src, scfuncs.src, scstring.src, scwarngs.src, simpref.src, solvrdlg.src, sortdlg.src, subtdlg.src, tabopdlg.src, textdlgs.src, toolbox.src ; util/svtools/source/filter.vcl/filter/ : dlgejpg.src, dlgexpor.src, strings.src ; graphics/goodies/source/filter.vcl/epbm/dlgepbm.src util/officecfg/registry/schema/org/openoffice/ucb/ : Configuration.xcs, Hierarchy.xcs, Store.xcs ; sw/sw/source/ui/inc/ : swmn.hrc, toolbox.hrc ; util/svtools/source/sbx/format.src sw/sw/source/ui/table/ : chartins.src, colwd.src, convert.src, insrc.src, instable.src, mergetbl.src, rowht.src, split.src, splittbl.src, table.src, tabledlg.src, tautofmt.src ; util/officecfg/registry/data/org/openoffice/Office/ : DataAccess.xcu, UI.xcu, Writer.xcu ; util/extensions/source/installation/office/protchk/protdlg.src gsl/forms/source/resource/strings.src framework/sfx2/sdi/sfxslots.src util/svtools/source/dialogs/ : addresstemplate.src, colrdlg.src, filedlg2.src, logindlg.src, printdlg.src, prnsetup.src, registrationdlg.src, wizardmachine.src ; sc/sc/addin/rot13/rot13.src graphics/goodies/source/filter.vcl/epng/dlgepng.src installation/scp/source/chart/ : module_chart.lng, profile_chart.lng, system_chart.lng ; framework/filter/source/flash/impswfdialog.src dba/dbaccess/source/ui/dlg/ : AdabasPage.src, AdabasStat.src, RelationDlg.src, UserAdmin.src, adtabdlg.src, dbadmin.src, dbfindex.src, directsql.src, dlgattr.src, dlgsave.src, dlgsize.src, doclinkdialog.src, dsselect.src, indexdialog.src, missingdocdlg.src, paramdialog.src, queryfilter.src, queryorder.src, sqlmessage.src ; sw/sw/source/ui/uiview/ : pview.src, view.src ; framework/filter/source/pdf/ : impdialog.src, pdf.src ; sw/sw/source/ui/config/ : optdlg.src, optload.src, redlopt.src ; util/extensions/source/preload/preload.src
integrated : sw7pp2e[ description]
sw/sw/source/core/undo/undobj.cxx
integrated : ooo111regression[ description]
framework/sfx2/source/doc/ : doctempl.cxx, doctemplates.cxx ;
modified : SRX645
tools/solenv/inc/ : minor.mk, minor.mk, minor.mk ;

HEAD was changed by Rüdiger Timm(rt)
modified : SRC680
tools/solenv/inc/minor.mk
modified : #i10000# Correct list of needed modules (svtools instead of svtool, no such module sv and tk).
graphics/chart2/prj/build.lst

HEAD was changed by Oliver Bolte(obo)
added : Directory tools/contrib/soldep/inc
added : Initial revision
added : Directory tools/contrib/soldep
added : Directory tools/contrib/soldep/source
integrated : swq03[ description]
sw/sw/source/core/txtnode/atrftn.cxx framework/sfx2/source/appl/ : newhelp.cxx, newhelp.hxx ; sw/sw/source/core/view/vdraw.cxx sw/sw/source/core/draw/dflyobj.cxx sw/sw/source/core/inc/ : flyfrm.hxx, frmtool.hxx, viewimp.hxx ; sw/sw/source/core/layout/ : flowfrm.cxx, frmtool.cxx, ftnfrm.cxx, sectfrm.cxx, tabfrm.cxx ; graphics/svx/source/dialog/chardlg.cxx util/svtools/source/contnr/svtreebx.cxx
integrated : sdki18n[ description]
api/odk/examples/java/ConverterServlet/ : ConverterServlet.html, README ; api/sdk_oo/util/check.pl api/odk/util/check.pl tools/cosv/source/strings/streamstr.cxx api/sdk_oo/pack/copying/ : DevelopersGuide.pdf, DevelopersGuide.zip, idl_chapter_refs.txt ; tools/autodoc/source/display/toolkit/htmlfile.cxx api/odk/docs/examples.html tools/autodoc/source/display/idl/ : hfi_xrefpage.cxx, hi_factory.cxx ;
integrated : vcl17[ description]
installation/scp/source/office/files.scp : gnomeint.hxx, salpdec1.h, salpdecl.h, salpmac1.h, salpmacr.h, gnomeint.cxx, getstyle-gnome-linux-intel, getstyle-gnome-linux-powerpc, getstyle-gnome-solaris-intel, getstyle-gnome-solaris-sparc, getstyle-gnome.c, makefile.mk, makefile.mk, msgbox-gnome-linux-intel, msgbox-gnome-linux-powerpc, msgbox-gnome-solaris-intel, msgbox-gnome-solaris-sparc, msgbox.c, gtk-2.0.9.patch, makefile.mk, gtk+-2.0.9.tar.gz ; framework/framework/inc/threadhelp/lockhelper.hxx gsl/vcl/util/makefile.mk tools/solenv/inc/tg_ext.mk gsl/vcl/win/source/gdi/salgdi3.cxx external/gtk/pango/makefile.mk installation/scp/inc/gid.inc gsl/vcl/unx/inc/plugins/gtk/ : gtkdata.hxx, gtkframe.hxx, gtkinst.hxx, gtkobject.hxx ; gsl/dtrans/source/X11/ : X11_clipboard.cxx, X11_selection.cxx, X11_transferable.hxx ; util/officecfg/registry/data/org/openoffice/VCL.xcu gsl/vcl/unx/gtk/app/ : gtkdata.cxx, gtkinst.cxx, gtksys.cxx, makefile.mk ; gsl/vcl/unx/source/plugadapt/salplug.cxx external/gtk/glib/makefile.mk gsl/vcl/source/control/ : button.cxx, scrbar.cxx, spinfld.cxx, tabctrl.cxx ; gsl/psprint/source/fontmanager/fontmanager.cxx gsl/vcl/unx/source/inc/salcursors.h external/gtk/prj/ : build.lst, d.lst ; sc/sc/source/ui/view/printfun.cxx gsl/vcl/unx/source/app/ : saldata.cxx, saldisp.cxx, salinst.cxx, salsys.cxx, wmadaptor.cxx ; external/gtk/atk/makefile.mk framework/framework/source/threadhelp/lockhelper.cxx external/gtk/ : makefile.pmk, pango-1.2.5.patch ; external/gtk/download/ : atk-1.2.4.tar.gz, glib-2.2.3.tar.gz, gtk+-2.2.4.tar.gz, pango-1.2.5.tar.gz ; gsl/vcl/unx/gtk/window/ : gtkframe.cxx, gtkobject.cxx, makefile.mk ; gsl/vcl/unx/dummy/ : dbmp.cxx, dbmp.hxx, dinst.cxx, makefile.mk ; gsl/vcl/workben/ : makefile.mk, svdem.cxx ; util/tools/source/generic/poly.cxx gsl/vcl/source/glyphs/glyphcache.cxx sw/sw/source/core/view/vprint.cxx gsl/psprint/source/printergfx/bitmap_gfx.cxx gsl/vcl/source/gdi/ : fontcfg.cxx, outdev3.cxx, pdfwriter_impl.cxx, sallayout.cxx ; gsl/vcl/unx/inc/ : dtint.hxx, pspgraphics.h, saldata.hxx, saldisp.hxx, salframe.h, salgdi.h, salinst.h, salprn.h, salsys.h ; gsl/vcl/inc/ : button.hxx, scrbar.hxx, spinfld.hxx, svdata.hxx, tabctrl.hxx, tabpage.hxx, window.h ; gsl/vcl/prj/ : build.lst, d.lst ; external/gtk/gtk/makefile.mk installation/scp/source/global/setupzip.scp gsl/vcl/unx/source/gdi/ : dtint.cxx, makefile.mk, pspgraphics.cxx, salbmp.cxx, salcvt.cxx, salgdi.cxx, salgdi2.cxx, salgdi3.cxx, salprnpsp.cxx, salvd.cxx ; gsl/vcl/source/window/ : tabpage.cxx, window.cxx ; gsl/vcl/unx/source/window/salframe.cxx external/gtk/pkgconfig/ : makefile.mk, pkg-config.pl ;
modified : #100000#, #i22713# reflect changes from integration of CWS vcl17 in scp
installation/scp2/source/ooo/file_library_ooo.scp
modified : SRC680
tools/solenv/inc/minor.mk
modified : #100000# fix for unxsols4 in pango/pangox-fontmap.c
external/gtk/pango-1.2.5.patch
modified : #100000# depends on gtk
gsl/vcl/prj/build.lst

HEAD was changed by Frank Schoenheit(fs)
modified : 0.2
dba/www/specifications/forms/rich_text_control.sxw
modified : new version of the rich text control spec
dba/www/specifications/index.html

HEAD was changed by Vladimir Glazounov(vg)
modified : new version for SRC680
util/svtools/util/defs/wntmsci8

HEAD was changed by Jens-Heiner Rechtien(hr)
modified : #i25646#: catch 'unrecognized auth response' from OOo CVS server
tools/solenv/bin/modules/Cvs.pm

HEAD was changed by Lars Oppermann(lo)
added : Directory framework/unoxml/source/events
modified : #i25594# event fixes
framework/unoxml/source/dom/ : characterdata.hxx, text.cxx, text.hxx ;
modified : event handling

HEAD was changed by Michael Brauer(mib)
modified : - added paragraph, frame and text properties - improved styles
modified : - Integrated decision of 9-Feb con call - Integrated descions of 16-Feb con call - Added frames
modified : Integrated former common chapter
modified : integrated chart chapter
modified : some graphic/style features added
xml/www/oasis/ooo2oasis.xsl

HEAD was changed by Michael Hoennig(mi)
modified : new release with load/store to Stream+ByteArray
api/www/Projects/OOoBean/releases/OOoBean-20040219.tar.gz api/www/Projects/OOoBean/index.html

HEAD was changed by Richard Holt(rholt)
modified : added, belatedly, hyph_ga_IE.
lingucomponent/www/hyph_dic.html
modified : updating id_id and ga_ie
lingucomponent/www/ : hyph_dic.html, spell_dic.html ;

HEAD was changed by Armin Weiss(aw)
modified : Replaced ColorName with ColorData, only used when building with debug
framework/binfilter/bf_sw/source/core/layout/sw_layact.cxx
modified : #110098# Changed SfxFilterContainer::ReadExternalFilters to no longer use TypeDetection.xcu (which does no longer exist), but to get infos about filters from static string arrays.
framework/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx

HEAD was changed by Wind Li(yl146652)
modified : " #i24592 #" String Review Finished
dba/www/specifications/Ldap_authentication.sxw

HEAD was changed by Kurt Zenker(kz)
modified : new version for SRC680
util/svtools/util/defs/wntmsci8 xml/xmloff/util/defs/wntmsci8 gsl/vcl/util/defs/wntmsci8 dba/connectivity/source/dbtools/defs/ : wntmsci8, wntmsci8 ; graphics/svx/util/defs/wntmsci8 gsl/toolkit/util/defs/ : wntmsci8, wntmsci8 ;

HEAD was changed by Kai Sommerfeld(kso)
added : Initial revision
ucb/www/docs/ucp-ref/ : tdoc-ucp.html, tdoc-contents.gif ;
modified : Added TDOC UCP.
ucb/www/docs/ucp-ref.html

HEAD was changed by Thorsten Behrens(thb)
modified : #110496# Made headers gcc-Wall clean, added some Canvas-related tooling
graphics/basegfx/inc/basegfx/range/ : b1drange.hxx, b1irange.hxx, b2drange.hxx, b2drectangle.hxx, b2irange.hxx, b2irectangle.hxx, b3drange.hxx, b3dvolume.hxx, b3irange.hxx, b3ivolume.hxx, basicrange.hxx ; graphics/basegfx/inc/basegfx/point/ : b2dhompoint.hxx, b2dpoint.hxx, b2ipoint.hxx, b3dhompoint.hxx, b3dpoint.hxx, b3ipoint.hxx ; graphics/basegfx/inc/basegfx/curve/ : b2dbeziertools.hxx, b2dcubicbezier.hxx, b2dquadraticbezier.hxx ; graphics/basegfx/inc/basegfx/polygon/ : b2dpolygon.hxx, b2dpolygontools.hxx, b2dpolypolygon.hxx, b2dpolypolygoncutter.hxx, b2dpolypolygontools.hxx, b3dpolygon.hxx, b3dpolygontools.hxx, b3dpolypolygon.hxx, b3dpolypolygontools.hxx ; graphics/basegfx/prj/ : build.lst, d.lst ; graphics/basegfx/inc/basegfx/numeric/ftools.hxx graphics/basegfx/inc/basegfx/matrix/ : b2dhommatrix.hxx, b3dhommatrix.hxx ; graphics/basegfx/inc/basegfx/tuple/ : b2dtuple.hxx, b2i64tuple.hxx, b2ituple.hxx, b3dtuple.hxx, b3i64tuple.hxx, b3ituple.hxx ; graphics/basegfx/source/inc/ : BaseHomMatrix.hxx, ftools.hxx, hommatrixtemplate.hxx ; graphics/basegfx/source/workbench/bezierclip.hxx graphics/basegfx/inc/basegfx/vector/ : b2dsize.hxx, b2dvector.hxx, b2isize.hxx, b2ivector.hxx, b3dsize.hxx, b3dvector.hxx, b3isize.hxx, b3ivector.hxx ;

tls617 was changed by Kurt Zenker(kz)
modified : methods to provide all dependency modes
util/tools/bootstrp/ : prj.cxx, prj.hxx ;

Apache Software Foundation

Copyright & License | Privacy | Contact Us | Donate | Thanks

Apache, OpenOffice, OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation. The Apache feather logo is a trademark of The Apache Software Foundation. Other names appearing on the site may be trademarks of their respective owners.