Bump for 3.6-20 'mode'>-rw-r--r--sc/addin/datefunc/makefile.mk6 -rw-r--r--sc/addin/inc/addin.h5 -rw-r--r--sc/addin/inc/dfa.hrc5 -rw-r--r--sc/addin/inc/rot13.hrc5 -rw-r--r--sc/addin/makefile.mk6 -rw-r--r--sc/addin/rot13/makefile.mk6 -rw-r--r--sc/addin/rot13/rot13.cl5 -rw-r--r--sc/addin/rot13/rot13.src5 -rw-r--r--sc/addin/util/cl2c.pl6 -rw-r--r--sc/addin/util/makefile.mk6 -rw-r--r--sc/inc/AccessibleFilterMenu.hxx5 -rw-r--r--sc/inc/AccessibleFilterMenuItem.hxx5 -rw-r--r--sc/inc/AccessibleFilterTopWindow.hxx5 -rw-r--r--sc/inc/AccessibleGlobal.hxx5 -rw-r--r--sc/inc/ViewSettingsSequenceDefines.hxx5 -rw-r--r--sc/inc/addincfg.hxx5 -rw-r--r--sc/inc/addincol.hxx5 -rw-r--r--sc/inc/address.hxx5 -rw-r--r--sc/inc/addruno.hxx5 -rw-r--r--sc/inc/afmtuno.hxx5 -rw-r--r--sc/inc/appluno.hxx5 -rw-r--r--sc/inc/appoptio.hxx5 -rw-r--r--sc/inc/arealink.hxx5 -rw-r--r--sc/inc/attarray.hxx5 -rw-r--r--sc/inc/attrib.hxx5 -rw-r--r--sc/inc/autoform.hxx31 -rw-r--r--sc/inc/autonamecache.hxx5 -rw-r--r--sc/inc/bigrange.hxx5 -rw-r--r--sc/inc/brdcst.hxx5 -rw-r--r--sc/inc/callform.hxx5 -rw-r--r--sc/inc/cell.hxx5 -rw-r--r--sc/inc/cellform.hxx5 -rw-r--r--sc/inc/cellsuno.hxx5 -rw-r--r--sc/inc/cfgids.hxx5 -rw-r--r--sc/inc/chart2uno.hxx13 -rw-r--r--sc/inc/chartarr.hxx5 -rw-r--r--sc/inc/charthelper.hxx5 -rw-r--r--sc/inc/chartlis.hxx9 -rw-r--r--sc/inc/chartlock.hxx5 -rw-r--r--sc/inc/chartpos.hxx5 -rw-r--r--sc/inc/chartuno.hxx5 -rw-r--r--sc/inc/chgtrack.hxx5 -rw-r--r--sc/inc/chgviset.hxx5 -rw-r--r--sc/inc/clipparam.hxx5 -rw-r--r--sc/inc/collect.hxx5 -rw-r--r--sc/inc/column.hxx7 -rw-r--r--sc/inc/compiler.hxx5 -rw-r--r--sc/inc/compressedarray.hxx5 -rw-r--r--sc/inc/conditio.hxx5 -rw-r--r--sc/inc/confuno.hxx5 -rw-r--r--sc/inc/consoli.hxx5 -rw-r--r--sc/inc/convuno.hxx5 -rw-r--r--sc/inc/cursuno.hxx5 -rw-r--r--sc/inc/dapiuno.hxx5 -rw-r--r--sc/inc/datauno.hxx11 -rw-r--r--sc/inc/dbcolect.hxx5 -rw-r--r--sc/inc/dbdocutl.hxx5 -rw-r--r--sc/inc/dbtoken.hxx5 -rw-r--r--sc/inc/defltuno.hxx5 -rw-r--r--sc/inc/detdata.hxx5 -rw-r--r--sc/inc/detfunc.hxx5 -rw-r--r--sc/inc/dispuno.hxx5 -rw-r--r--sc/inc/dociter.hxx111 -rw-r--r--sc/inc/docoptio.hxx5 -rw-r--r--sc/inc/docpool.hxx5 -rw-r--r--sc/inc/document.hxx21 -rw-r--r--sc/inc/docuno.hxx5 -rw-r--r--sc/inc/dpcachetable.hxx7 -rw-r--r--sc/inc/dpdimsave.hxx5 -rw-r--r--sc/inc/dpgroup.hxx5 -rw-r--r--sc/inc/dpobject.hxx5 -rw-r--r--sc/inc/dpoutput.hxx5 -rw-r--r--sc/inc/dpoutputgeometry.hxx5 -rw-r--r--sc/inc/dpsave.hxx5 -rw-r--r--sc/inc/dpsdbtab.hxx5 -rw-r--r--sc/inc/dpshttab.hxx6 -rw-r--r--sc/inc/dptabdat.hxx5 -rw-r--r--sc/inc/dptabres.hxx5 -rw-r--r--sc/inc/dptabsrc.hxx5 -rw-r--r--sc/inc/drawattr.hxx7 -rw-r--r--sc/inc/drawpage.hxx5 -rw-r--r--sc/inc/drdefuno.hxx5 -rw-r--r--sc/inc/drwlayer.hxx5 -rw-r--r--sc/inc/editsrc.hxx7 -rw-r--r--sc/inc/editutil.hxx7 -rw-r--r--sc/inc/eetext.hxx5 -rw-r--r--sc/inc/externalrefmgr.hxx5 -rw-r--r--sc/inc/fielduno.hxx7 -rw-r--r--sc/inc/fillinfo.hxx5 -rw-r--r--sc/inc/filter.hxx5 -rw-r--r--sc/inc/filtopt.hxx5 -rw-r--r--sc/inc/filtuno.hxx5 -rw-r--r--sc/inc/fmtuno.hxx5 -rw-r--r--sc/inc/forbiuno.hxx7 -rw-r--r--sc/inc/formulaparserpool.hxx5 -rw-r--r--sc/inc/formularesult.hxx5 -rw-r--r--sc/inc/funcdesc.hxx5 -rw-r--r--sc/inc/funcuno.hxx5 -rw-r--r--sc/inc/global.hxx46 -rw-r--r--sc/inc/globstr.hrc5 -rw-r--r--sc/inc/hints.hxx5 -rw-r--r--sc/inc/inputopt.hxx5 -rw-r--r--sc/inc/linkuno.hxx5 -rw-r--r--sc/inc/listenercalls.hxx5 -rw-r--r--sc/inc/lookupcache.hxx5 -rw-r--r--sc/inc/makefile.mk6 -rw-r--r--sc/inc/markarr.hxx5 -rw-r--r--sc/inc/markdata.hxx5 -rw-r--r--sc/inc/miscuno.hxx5 -rw-r--r--sc/inc/mutexhlp.hxx5 -rw-r--r--sc/inc/nameuno.hxx5 -rw-r--r--sc/inc/navicfg.hxx5 -rw-r--r--sc/inc/notesuno.hxx5 -rw-r--r--sc/inc/olinetab.hxx5 -rw-r--r--sc/inc/optuno.hxx5 -rw-r--r--sc/inc/optutil.hxx5 -rw-r--r--sc/inc/pagepar.hxx5 -rw-r--r--sc/inc/pageuno.hxx5 -rw-r--r--sc/inc/paramisc.hxx5 -rw-r--r--sc/inc/patattr.hxx7 -rwxr-xr-xsc/inc/pch/precompiled_sc.cxx5 -rw-r--r--sc/inc/pch/precompiled_sc.hxx11 -rw-r--r--sc/inc/pivot.hxx5 -rw-r--r--sc/inc/postit.hxx5 -rw-r--r--sc/inc/printopt.hxx5 -rw-r--r--sc/inc/prnsave.hxx5 -rw-r--r--sc/inc/progress.hxx5 -rw-r--r--sc/inc/queryparam.hxx142 -rw-r--r--sc/inc/rangelst.hxx5 -rw-r--r--sc/inc/rangenam.hxx5 -rw-r--r--sc/inc/rangeseq.hxx5 -rw-r--r--sc/inc/rangeutl.hxx5 -rw-r--r--sc/inc/rechead.hxx5 -rw-r--r--sc/inc/recursionhelper.hxx5 -rw-r--r--sc/inc/refdata.hxx5 -rw-r--r--sc/inc/reffind.hxx5 -rw-r--r--sc/inc/refreshtimer.hxx5 -rw-r--r--sc/inc/reftokenhelper.hxx13 -rw-r--r--sc/inc/sc.hrc5 -rw-r--r--sc/inc/scabstdlg.hxx5 -rw-r--r--sc/inc/scdll.hxx5 -rw-r--r--sc/inc/scerrors.hxx5 -rw-r--r--sc/inc/scextopt.hxx7 -rw-r--r--sc/inc/scfuncs.hrc5 -rw-r--r--sc/inc/scimpexpmsg.hxx5 -rw-r--r--sc/inc/scitems.hxx5 -rw-r--r--sc/inc/scmatrix.hxx5 -rw-r--r--sc/inc/scmod.hxx5 -rw-r--r--sc/inc/scresid.hxx5 -rw-r--r--sc/inc/scwarngs.hxx5 -rw-r--r--sc/inc/segdefs.hxx5 -rw-r--r--sc/inc/segdefs_.hxx5 -rw-r--r--sc/inc/servuno.hxx8 -rw-r--r--sc/inc/shapeuno.hxx5 -rw-r--r--sc/inc/sheetdata.hxx7 -rw-r--r--sc/inc/shellids.hxx5 -rw-r--r--sc/inc/sortparam.hxx5 -rw-r--r--sc/inc/srchuno.hxx5 -rw-r--r--sc/inc/stlpool.hxx5 -rw-r--r--sc/inc/stlsheet.hxx5 -rw-r--r--sc/inc/strload.hxx5 -rw-r--r--sc/inc/styleuno.hxx5 -rw-r--r--sc/inc/subtotal.hxx5 -rw-r--r--sc/inc/table.hxx12 -rw-r--r--sc/inc/tablink.hxx5 -rw-r--r--sc/inc/tabopparams.hxx5 -rw-r--r--sc/inc/tabprotection.hxx5 -rw-r--r--sc/inc/targuno.hxx5 -rw-r--r--sc/inc/textuno.hxx7 -rw-r--r--sc/inc/token.hxx5 -rw-r--r--sc/inc/tokenarray.hxx5 -rw-r--r--sc/inc/tokenuno.hxx5 -rw-r--r--sc/inc/unitconv.hxx5 -rw-r--r--sc/inc/unoguard.hxx5 -rw-r--r--sc/inc/unonames.hxx5 -rw-r--r--sc/inc/unoreflist.hxx5 -rw-r--r--sc/inc/unowids.hxx5 -rw-r--r--sc/inc/userdat.hxx5 -rw-r--r--sc/inc/userlist.hxx5 -rw-r--r--sc/inc/validat.hxx5 -rw-r--r--sc/inc/viewopti.hxx5 -rw-r--r--sc/inc/viewuno.hxx5 -rw-r--r--sc/inc/waitoff.hxx5 -rw-r--r--sc/inc/warnpassword.hxx5 -rw-r--r--sc/inc/xmlwrap.hxx5 -rw-r--r--sc/inc/zforauto.hxx5 -rwxr-xr-xsc/qa/complex/calcPreview/ViewForwarder.java5 -rwxr-xr-xsc/qa/complex/calcPreview/makefile.mk6 -rwxr-xr-xsc/qa/complex/cellRanges/CheckXCellRangesQuery.java5 -rwxr-xr-xsc/qa/complex/cellRanges/makefile.mk6 -rw-r--r--sc/qa/complex/dataPilot/CheckDataPilot.java5 -rw-r--r--sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java5 -rw-r--r--sc/qa/complex/dataPilot/interfaceTests/beans/makefile.mk6 -rw-r--r--sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java5 -rw-r--r--sc/qa/complex/dataPilot/interfaceTests/container/makefile.mk6 -rw-r--r--sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java5 -rw-r--r--sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java5 -rw-r--r--sc/qa/complex/dataPilot/interfaceTests/sheet/makefile.mk6 -rw-r--r--sc/qa/complex/dataPilot/makefile.mk6 -rw-r--r--sc/qa/complex/sc/CalcRTL.java5 -rw-r--r--sc/qa/complex/sc/makefile.mk6 -rw-r--r--sc/sdi/app.sdi5 -rw-r--r--sc/sdi/auditsh.sdi5 -rw-r--r--sc/sdi/cellsh.sdi5 -rw-r--r--sc/sdi/chartsh.sdi5 -rw-r--r--sc/sdi/docsh.sdi5 -rw-r--r--sc/sdi/drawsh.sdi5 -rw-r--r--sc/sdi/drformsh.sdi5 -rw-r--r--sc/sdi/drtxtob.sdi5 -rw-r--r--sc/sdi/editsh.sdi5 -rw-r--r--sc/sdi/formatsh.sdi5 -rw-r--r--sc/sdi/graphsh.sdi5 -rw-r--r--sc/sdi/makefile.mk8 -rw-r--r--sc/sdi/mediash.sdi5 -rw-r--r--sc/sdi/oleobjsh.sdi5 -rw-r--r--sc/sdi/pgbrksh.sdi5 -rw-r--r--sc/sdi/pivotsh.sdi5 -rw-r--r--sc/sdi/prevwsh.sdi5 -rw-r--r--sc/sdi/scalc.sdi5 -rw-r--r--sc/sdi/scslots.hrc7 -rw-r--r--sc/sdi/scslots.sdi5 -rw-r--r--sc/sdi/tabpopsh.sdi5 -rw-r--r--sc/sdi/tabvwsh.sdi5 -rw-r--r--sc/source/core/data/attarray.cxx15 -rw-r--r--sc/source/core/data/attrib.cxx17 -rw-r--r--sc/source/core/data/autonamecache.cxx6 -rw-r--r--sc/source/core/data/bcaslot.cxx5 -rw-r--r--sc/source/core/data/cell.cxx9 -rw-r--r--sc/source/core/data/cell2.cxx9 -rw-r--r--sc/source/core/data/clipparam.cxx5 -rw-r--r--sc/source/core/data/column.cxx7 -rw-r--r--sc/source/core/data/column2.cxx21 -rw-r--r--sc/source/core/data/column3.cxx5 -rw-r--r--sc/source/core/data/compressedarray.cxx5 -rw-r--r--sc/source/core/data/conditio.cxx5 -rw-r--r--sc/source/core/data/dbdocutl.cxx5 -rwxr-xr-x[-rw-r--r--]sc/source/core/data/dociter.cxx472 -rw-r--r--sc/source/core/data/docpool.cxx59 -rw-r--r--sc/source/core/data/documen2.cxx19 -rw-r--r--sc/source/core/data/documen3.cxx11 -rw-r--r--sc/source/core/data/documen4.cxx5 -rw-r--r--sc/source/core/data/documen5.cxx5 -rw-r--r--sc/source/core/data/documen6.cxx7 -rw-r--r--sc/source/core/data/documen7.cxx5 -rw-r--r--sc/source/core/data/documen8.cxx25 -rw-r--r--sc/source/core/data/documen9.cxx15 -rw-r--r--sc/source/core/data/document.cxx53 -rw-r--r--sc/source/core/data/dpcachetable.cxx37 -rw-r--r--sc/source/core/data/dpdimsave.cxx5 -rw-r--r--sc/source/core/data/dpgroup.cxx5 -rw-r--r--sc/source/core/data/dpobject.cxx5 -rw-r--r--sc/source/core/data/dpoutput.cxx11 -rw-r--r--sc/source/core/data/dpoutputgeometry.cxx5 -rw-r--r--sc/source/core/data/dpsave.cxx5 -rw-r--r--sc/source/core/data/dpsdbtab.cxx5 -rw-r--r--sc/source/core/data/dpshttab.cxx5 -rw-r--r--sc/source/core/data/dptabdat.cxx5 -rw-r--r--sc/source/core/data/dptabres.cxx5 -rw-r--r--sc/source/core/data/dptabsrc.cxx5 -rw-r--r--sc/source/core/data/drawpage.cxx5 -rw-r--r--sc/source/core/data/drwlayer.cxx15 -rw-r--r--sc/source/core/data/fillinfo.cxx13 -rw-r--r--sc/source/core/data/global.cxx15 -rw-r--r--sc/source/core/data/global2.cxx237 -rw-r--r--sc/source/core/data/globalx.cxx5 -rw-r--r--sc/source/core/data/makefile.mk8 -rw-r--r--sc/source/core/data/markarr.cxx5 -rw-r--r--sc/source/core/data/markdata.cxx5 -rw-r--r--sc/source/core/data/olinetab.cxx5 -rw-r--r--sc/source/core/data/pagepar.cxx5 -rw-r--r--sc/source/core/data/patattr.cxx49 -rw-r--r--sc/source/core/data/pivot.cxx5 -rw-r--r--sc/source/core/data/pivot2.cxx9 -rw-r--r--sc/source/core/data/poolhelp.cxx7 -rw-r--r--sc/source/core/data/postit.cxx9 -rw-r--r--sc/source/core/data/scimpexpmsg.cxx5 -rw-r--r--sc/source/core/data/sortparam.cxx6 -rw-r--r--sc/source/core/data/stlpool.cxx29 -rw-r--r--sc/source/core/data/stlsheet.cxx19 -rw-r--r--sc/source/core/data/table1.cxx6 -rw-r--r--sc/source/core/data/table2.cxx7 -rw-r--r--sc/source/core/data/table3.cxx11 -rw-r--r--sc/source/core/data/table4.cxx37 -rw-r--r--sc/source/core/data/table5.cxx5 -rw-r--r--sc/source/core/data/table6.cxx9 -rw-r--r--sc/source/core/data/tabprotection.cxx5 -rw-r--r--sc/source/core/data/userdat.cxx5 -rw-r--r--sc/source/core/data/validat.cxx5 -rw-r--r--sc/source/core/inc/addinhelpid.hxx5 -rw-r--r--sc/source/core/inc/addinlis.hxx5 -rw-r--r--sc/source/core/inc/adiasync.hxx5 -rw-r--r--sc/source/core/inc/bcaslot.hxx5 -rw-r--r--sc/source/core/inc/cellkeytranslator.hxx5 -rw-r--r--sc/source/core/inc/core_pch.hxx33 -rw-r--r--sc/source/core/inc/ddelink.hxx5 -rw-r--r--sc/source/core/inc/doubleref.hxx194 -rw-r--r--sc/source/core/inc/interpre.hxx11 -rw-r--r--sc/source/core/inc/jumpmatrix.hxx5 -rw-r--r--sc/source/core/inc/makefile.mk6 -rw-r--r--sc/source/core/inc/parclass.hxx5 -rw-r--r--sc/source/core/inc/poolhelp.hxx5 -rw-r--r--sc/source/core/inc/refupdat.hxx5 -rw-r--r--sc/source/core/inc/scrdata.hxx5 -rw-r--r--sc/source/core/inc/sctictac.hxx5 -rw-r--r--sc/source/core/src/compiler.src5 -rw-r--r--sc/source/core/src/makefile.mk6 -rw-r--r--sc/source/core/tool/addincfg.cxx5 -rw-r--r--sc/source/core/tool/addincol.cxx5 -rw-r--r--sc/source/core/tool/addinhelpid.cxx5 -rw-r--r--sc/source/core/tool/addinlis.cxx5 -rw-r--r--sc/source/core/tool/address.cxx5 -rw-r--r--sc/source/core/tool/adiasync.cxx5 -rw-r--r--sc/source/core/tool/appoptio.cxx5 -rw-r--r--sc/source/core/tool/autoform.cxx7 -rw-r--r--sc/source/core/tool/callform.cxx5 -rw-r--r--sc/source/core/tool/cellform.cxx5 -rw-r--r--sc/source/core/tool/cellkeytranslator.cxx5 -rw-r--r--sc/source/core/tool/chartarr.cxx5 -rw-r--r--sc/source/core/tool/charthelper.cxx5 -rw-r--r--sc/source/core/tool/chartlis.cxx5 -rw-r--r--sc/source/core/tool/chartlock.cxx5 -rw-r--r--sc/source/core/tool/chartpos.cxx5 -rw-r--r--sc/source/core/tool/chgtrack.cxx5 -rw-r--r--sc/source/core/tool/chgviset.cxx5 -rw-r--r--sc/source/core/tool/collect.cxx5 -rw-r--r--sc/source/core/tool/compiler.cxx5 -rw-r--r--sc/source/core/tool/consoli.cxx5 -rw-r--r--sc/source/core/tool/dbcolect.cxx6 -rw-r--r--sc/source/core/tool/ddelink.cxx9 -rw-r--r--sc/source/core/tool/detdata.cxx5 -rw-r--r--sc/source/core/tool/detfunc.cxx15 -rw-r--r--sc/source/core/tool/docoptio.cxx5 -rw-r--r--sc/source/core/tool/doubleref.cxx568 -rw-r--r--sc/source/core/tool/editutil.cxx17 -rw-r--r--sc/source/core/tool/filtopt.cxx5 -rw-r--r--sc/source/core/tool/formulaparserpool.cxx7 -rw-r--r--sc/source/core/tool/hints.cxx5 -rw-r--r--sc/source/core/tool/inputopt.cxx5 -rw-r--r--sc/source/core/tool/interpr1.cxx241 -rw-r--r--sc/source/core/tool/interpr2.cxx11 -rw-r--r--sc/source/core/tool/interpr3.cxx5 -rwxr-xr-x[-rw-r--r--]sc/source/core/tool/interpr4.cxx154 -rw-r--r--sc/source/core/tool/interpr5.cxx5 -rw-r--r--sc/source/core/tool/interpr6.cxx5 -rw-r--r--sc/source/core/tool/lookupcache.cxx5 -rw-r--r--sc/source/core/tool/makefile.mk12 -rw-r--r--sc/source/core/tool/navicfg.cxx5 -rw-r--r--sc/source/core/tool/odffmap.cxx5 -rw-r--r--sc/source/core/tool/optutil.cxx5 -rw-r--r--sc/source/core/tool/parclass.cxx5 -rw-r--r--sc/source/core/tool/printopt.cxx5 -rw-r--r--sc/source/core/tool/prnsave.cxx5 -rw-r--r--sc/source/core/tool/progress.cxx5 -rw-r--r--sc/source/core/tool/queryparam.cxx365 -rw-r--r--sc/source/core/tool/rangelst.cxx5 -rw-r--r--sc/source/core/tool/rangenam.cxx5 -rw-r--r--sc/source/core/tool/rangeseq.cxx5 -rw-r--r--sc/source/core/tool/rangeutl.cxx5 -rw-r--r--sc/source/core/tool/rechead.cxx5 -rw-r--r--sc/source/core/tool/refdata.cxx5 -rw-r--r--sc/source/core/tool/reffind.cxx5 -rw-r--r--sc/source/core/tool/refreshtimer.cxx5 -rw-r--r--sc/source/core/tool/reftokenhelper.cxx5 -rw-r--r--sc/source/core/tool/refupdat.cxx5 -rw-r--r--sc/source/core/tool/scmatrix.cxx5 -rw-r--r--sc/source/core/tool/sctictac.cxx5 -rw-r--r--sc/source/core/tool/subtotal.cxx5 -rw-r--r--sc/source/core/tool/token.cxx5 -rw-r--r--sc/source/core/tool/unitconv.cxx5 -rw-r--r--sc/source/core/tool/userlist.cxx5 -rw-r--r--sc/source/core/tool/viewopti.cxx5 -rw-r--r--sc/source/core/tool/zforauto.cxx5 -rw-r--r--sc/source/filter/dif/difexp.cxx5 -rw-r--r--sc/source/filter/dif/difimp.cxx5 -rw-r--r--sc/source/filter/dif/makefile.mk6 -rw-r--r--sc/source/filter/excel/colrowst.cxx6 -rw-r--r--sc/source/filter/excel/excdoc.cxx11 -rw-r--r--sc/source/filter/excel/excel.cxx5 -rw-r--r--sc/source/filter/excel/excform.cxx5 -rw-r--r--sc/source/filter/excel/excform8.cxx5 -rw-r--r--sc/source/filter/excel/excimp8.cxx37 -rw-r--r--sc/source/filter/excel/excrecds.cxx33 -rw-r--r--sc/source/filter/excel/exctools.cxx15 -rw-r--r--sc/source/filter/excel/expop2.cxx5 -rw-r--r--sc/source/filter/excel/fontbuff.cxx21 -rw-r--r--sc/source/filter/excel/frmbase.cxx5 -rw-r--r--sc/source/filter/excel/impop.cxx19 -rw-r--r--sc/source/filter/excel/makefile.mk8 -rw-r--r--sc/source/filter/excel/namebuff.cxx5 -rw-r--r--sc/source/filter/excel/read.cxx5 -rw-r--r--sc/source/filter/excel/tokstack.cxx5 -rw-r--r--sc/source/filter/excel/xechart.cxx5 -rw-r--r--sc/source/filter/excel/xecontent.cxx15 -rw-r--r--sc/source/filter/excel/xeescher.cxx9 -rw-r--r--sc/source/filter/excel/xeformula.cxx5 -rw-r--r--sc/source/filter/excel/xehelper.cxx21 -rw-r--r--sc/source/filter/excel/xelink.cxx5 -rw-r--r--sc/source/filter/excel/xename.cxx5 -rw-r--r--sc/source/filter/excel/xepage.cxx13 -rw-r--r--sc/source/filter/excel/xepivot.cxx5 -rw-r--r--sc/source/filter/excel/xerecord.cxx5 -rw-r--r--sc/source/filter/excel/xeroot.cxx5 -rw-r--r--sc/source/filter/excel/xestream.cxx16 -rw-r--r--sc/source/filter/excel/xestring.cxx5 -rw-r--r--sc/source/filter/excel/xestyle.cxx19 -rw-r--r--sc/source/filter/excel/xetable.cxx5 -rw-r--r--sc/source/filter/excel/xeview.cxx5 -rw-r--r--sc/source/filter/excel/xichart.cxx66 -rw-r--r--sc/source/filter/excel/xicontent.cxx27 -rw-r--r--sc/source/filter/excel/xiescher.cxx25 -rw-r--r--sc/source/filter/excel/xiformula.cxx5 -rw-r--r--sc/source/filter/excel/xihelper.cxx11 -rw-r--r--sc/source/filter/excel/xilink.cxx5 -rw-r--r--sc/source/filter/excel/xiname.cxx5 -rw-r--r--sc/source/filter/excel/xipage.cxx13 -rw-r--r--sc/source/filter/excel/xipivot.cxx5 -rw-r--r--sc/source/filter/excel/xiroot.cxx5 -rw-r--r--sc/source/filter/excel/xistream.cxx21 -rw-r--r--sc/source/filter/excel/xistring.cxx5 -rw-r--r--sc/source/filter/excel/xistyle.cxx39 -rw-r--r--sc/source/filter/excel/xiview.cxx5 -rw-r--r--sc/source/filter/excel/xladdress.cxx5 -rw-r--r--sc/source/filter/excel/xlchart.cxx7 -rw-r--r--sc/source/filter/excel/xlescher.cxx5 -rw-r--r--sc/source/filter/excel/xlformula.cxx5 -rw-r--r--sc/source/filter/excel/xlpage.cxx11 -rw-r--r--sc/source/filter/excel/xlpivot.cxx5 -rw-r--r--sc/source/filter/excel/xlroot.cxx9 -rw-r--r--sc/source/filter/excel/xlstyle.cxx7 -rw-r--r--sc/source/filter/excel/xltools.cxx7 -rw-r--r--sc/source/filter/excel/xltracer.cxx5 -rw-r--r--sc/source/filter/excel/xlview.cxx5 -rw-r--r--sc/source/filter/ftools/fapihelper.cxx5 -rw-r--r--sc/source/filter/ftools/fprogressbar.cxx5 -rw-r--r--sc/source/filter/ftools/ftools.cxx5 -rw-r--r--sc/source/filter/ftools/makefile.mk8 -rw-r--r--sc/source/filter/html/htmlexp.cxx31 -rw-r--r--sc/source/filter/html/htmlexp2.cxx5 -rw-r--r--sc/source/filter/html/htmlimp.cxx17 -rw-r--r--sc/source/filter/html/htmlpars.cxx32 -rw-r--r--sc/source/filter/html/makefile.mk6 -rw-r--r--sc/source/filter/inc/XclExpChangeTrack.hxx5 -rw-r--r--sc/source/filter/inc/XclImpChangeTrack.hxx5 -rw-r--r--sc/source/filter/inc/biff.hxx5 -rw-r--r--sc/source/filter/inc/colrowst.hxx5 -rw-r--r--sc/source/filter/inc/decl.h5 -rw-r--r--sc/source/filter/inc/dif.hxx5 -rw-r--r--sc/source/filter/inc/eeimport.hxx5 -rw-r--r--sc/source/filter/inc/eeparser.hxx7 -rw-r--r--sc/source/filter/inc/excdefs.hxx5 -rw-r--r--sc/source/filter/inc/excdoc.hxx5 -rw-r--r--sc/source/filter/inc/excform.hxx5 -rw-r--r--sc/source/filter/inc/excimp8.hxx7 -rw-r--r--sc/source/filter/inc/excrecds.hxx5 -rw-r--r--sc/source/filter/inc/excscen.hxx5 -rw-r--r--sc/source/filter/inc/exp_op.hxx5 -rw-r--r--sc/source/filter/inc/expbase.hxx5 -rw-r--r--sc/source/filter/inc/fapihelper.hxx5 -rw-r--r--sc/source/filter/inc/filt_pch.hxx19 -rw-r--r--sc/source/filter/inc/fkttab.h5 -rw-r--r--sc/source/filter/inc/flttypes.hxx5 -rw-r--r--sc/source/filter/inc/formel.hxx5 -rw-r--r--sc/source/filter/inc/fprogressbar.hxx5 -rw-r--r--sc/source/filter/inc/ftools.hxx5 -rw-r--r--sc/source/filter/inc/funktion.h5 -rw-r--r--sc/source/filter/inc/htmlexp.hxx5 -rw-r--r--sc/source/filter/inc/htmlimp.hxx5 -rw-r--r--sc/source/filter/inc/htmlpars.hxx5 -rw-r--r--sc/source/filter/inc/imp_op.hxx5 -rw-r--r--sc/source/filter/inc/lotattr.hxx5 -rw-r--r--sc/source/filter/inc/lotfntbf.hxx11 -rw-r--r--sc/source/filter/inc/lotform.hxx5 -rw-r--r--sc/source/filter/inc/lotimpop.hxx5 -rw-r--r--sc/source/filter/inc/lotrange.hxx5 -rw-r--r--sc/source/filter/inc/makefile.mk6 -rw-r--r--sc/source/filter/inc/namebuff.hxx5 -rw-r--r--sc/source/filter/inc/op.h5 -rw-r--r--sc/source/filter/inc/optab.h5 -rw-r--r--sc/source/filter/inc/otlnbuff.hxx5 -rw-r--r--sc/source/filter/inc/qpro.hxx5 -rw-r--r--sc/source/filter/inc/qproform.hxx5 -rw-r--r--sc/source/filter/inc/qprostyle.hxx5 -rw-r--r--sc/source/filter/inc/root.hxx5 -rw-r--r--sc/source/filter/inc/rtfexp.hxx5 -rw-r--r--sc/source/filter/inc/rtfimp.hxx5 -rw-r--r--sc/source/filter/inc/rtfparse.hxx5 -rw-r--r--sc/source/filter/inc/scflt.hxx5 -rw-r--r--sc/source/filter/inc/scfobj.hxx5 -rw-r--r--sc/source/filter/inc/scmem.h5 -rw-r--r--sc/source/filter/inc/tokstack.hxx5 -rw-r--r--sc/source/filter/inc/tool.h5 -rw-r--r--sc/source/filter/inc/xcl97dum.hxx5 -rw-r--r--sc/source/filter/inc/xcl97esc.hxx5 -rw-r--r--sc/source/filter/inc/xcl97rec.hxx18 -rw-r--r--sc/source/filter/inc/xechart.hxx5 -rw-r--r--sc/source/filter/inc/xecontent.hxx5 -rw-r--r--sc/source/filter/inc/xeescher.hxx5 -rw-r--r--sc/source/filter/inc/xeformula.hxx5 -rw-r--r--sc/source/filter/inc/xehelper.hxx5 -rw-r--r--sc/source/filter/inc/xelink.hxx5 -rw-r--r--sc/source/filter/inc/xename.hxx5 -rw-r--r--sc/source/filter/inc/xepage.hxx5 -rw-r--r--sc/source/filter/inc/xepivot.hxx5 -rw-r--r--sc/source/filter/inc/xerecord.hxx5 -rw-r--r--sc/source/filter/inc/xeroot.hxx5 -rw-r--r--sc/source/filter/inc/xestream.hxx8 -rw-r--r--sc/source/filter/inc/xestring.hxx5 -rw-r--r--sc/source/filter/inc/xestyle.hxx7 -rw-r--r--sc/source/filter/inc/xetable.hxx5 -rw-r--r--sc/source/filter/inc/xeview.hxx5 -rw-r--r--sc/source/filter/inc/xichart.hxx14 -rw-r--r--sc/source/filter/inc/xicontent.hxx5 -rw-r--r--sc/source/filter/inc/xiescher.hxx5 -rw-r--r--sc/source/filter/inc/xiformula.hxx5 -rw-r--r--sc/source/filter/inc/xihelper.hxx7 -rw-r--r--sc/source/filter/inc/xilink.hxx5 -rw-r--r--sc/source/filter/inc/xiname.hxx5 -rw-r--r--sc/source/filter/inc/xipage.hxx5 -rw-r--r--sc/source/filter/inc/xipivot.hxx5 -rw-r--r--sc/source/filter/inc/xiroot.hxx5 -rw-r--r--sc/source/filter/inc/xistream.hxx5 -rw-r--r--sc/source/filter/inc/xistring.hxx5 -rw-r--r--sc/source/filter/inc/xistyle.hxx5 -rw-r--r--sc/source/filter/inc/xiview.hxx5 -rw-r--r--sc/source/filter/inc/xladdress.hxx5 -rw-r--r--sc/source/filter/inc/xlchart.hxx5 -rw-r--r--sc/source/filter/inc/xlconst.hxx5 -rw-r--r--sc/source/filter/inc/xlcontent.hxx5 -rw-r--r--sc/source/filter/inc/xlescher.hxx5 -rw-r--r--sc/source/filter/inc/xlformula.hxx5 -rw-r--r--sc/source/filter/inc/xllink.hxx5 -rw-r--r--sc/source/filter/inc/xlname.hxx5 -rw-r--r--sc/source/filter/inc/xlpage.hxx5 -rw-r--r--sc/source/filter/inc/xlpivot.hxx5 -rw-r--r--sc/source/filter/inc/xlroot.hxx5 -rw-r--r--sc/source/filter/inc/xlstream.hxx5 -rw-r--r--sc/source/filter/inc/xlstring.hxx5 -rw-r--r--sc/source/filter/inc/xlstyle.hxx9 -rw-r--r--sc/source/filter/inc/xltable.hxx5 -rw-r--r--sc/source/filter/inc/xltools.hxx5 -rw-r--r--sc/source/filter/inc/xltracer.hxx5 -rw-r--r--sc/source/filter/inc/xlview.hxx5 -rw-r--r--sc/source/filter/lotus/expop.cxx5 -rw-r--r--sc/source/filter/lotus/export.cxx5 -rw-r--r--sc/source/filter/lotus/filter.cxx5 -rw-r--r--sc/source/filter/lotus/lotattr.cxx9 -rw-r--r--sc/source/filter/lotus/lotform.cxx5 -rw-r--r--sc/source/filter/lotus/lotimpop.cxx5 -rw-r--r--sc/source/filter/lotus/lotread.cxx5 -rw-r--r--sc/source/filter/lotus/lotus.cxx5 -rw-r--r--sc/source/filter/lotus/makefile.mk6 -rw-r--r--sc/source/filter/lotus/memory.cxx5 -rw-r--r--sc/source/filter/lotus/op.cxx11 -rw-r--r--sc/source/filter/lotus/optab.cxx5 -rw-r--r--sc/source/filter/lotus/tool.cxx5 -rw-r--r--sc/source/filter/qpro/biff.cxx5 -rw-r--r--sc/source/filter/qpro/makefile.mk6 -rw-r--r--sc/source/filter/qpro/qpro.cxx5 -rw-r--r--sc/source/filter/qpro/qproform.cxx5 -rw-r--r--sc/source/filter/qpro/qprostyle.cxx17 -rw-r--r--sc/source/filter/rtf/eeimpars.cxx21 -rw-r--r--sc/source/filter/rtf/expbase.cxx5 -rw-r--r--sc/source/filter/rtf/makefile.mk6 -rw-r--r--sc/source/filter/rtf/rtfexp.cxx17 -rw-r--r--sc/source/filter/rtf/rtfimp.cxx5 -rw-r--r--sc/source/filter/rtf/rtfparse.cxx13 -rw-r--r--sc/source/filter/starcalc/makefile.mk6 -rw-r--r--sc/source/filter/starcalc/scflt.cxx37 -rw-r--r--sc/source/filter/starcalc/scfobj.cxx5 -rw-r--r--sc/source/filter/xcl97/XclExpChangeTrack.cxx5 -rw-r--r--sc/source/filter/xcl97/XclImpChangeTrack.cxx5 -rw-r--r--sc/source/filter/xcl97/makefile.mk8 -rw-r--r--sc/source/filter/xcl97/xcl97dum.cxx5 -rw-r--r--sc/source/filter/xcl97/xcl97esc.cxx7 -rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx32 -rw-r--r--sc/source/filter/xml/XMLCalculationSettingsContext.cxx5 -rw-r--r--sc/source/filter/xml/XMLCalculationSettingsContext.hxx5 -rw-r--r--sc/source/filter/xml/XMLCellRangeSourceContext.cxx5 -rw-r--r--sc/source/filter/xml/XMLCellRangeSourceContext.hxx5 -rw-r--r--sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx5 -rw-r--r--sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx5 -rw-r--r--sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx5 -rw-r--r--sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx5 -rw-r--r--sc/source/filter/xml/XMLColumnRowGroupExport.cxx5 -rw-r--r--sc/source/filter/xml/XMLColumnRowGroupExport.hxx5 -rw-r--r--sc/source/filter/xml/XMLConsolidationContext.cxx5 -rw-r--r--sc/source/filter/xml/XMLConsolidationContext.hxx5 -rw-r--r--sc/source/filter/xml/XMLConverter.cxx5 -rw-r--r--sc/source/filter/xml/XMLConverter.hxx5 -rw-r--r--sc/source/filter/xml/XMLDDELinksContext.cxx5 -rw-r--r--sc/source/filter/xml/XMLDDELinksContext.hxx5 -rw-r--r--sc/source/filter/xml/XMLDetectiveContext.cxx5 -rw-r--r--sc/source/filter/xml/XMLDetectiveContext.hxx5 -rw-r--r--sc/source/filter/xml/XMLEmptyContext.cxx5 -rw-r--r--sc/source/filter/xml/XMLEmptyContext.hxx5 -rw-r--r--sc/source/filter/xml/XMLExportDDELinks.cxx5 -rw-r--r--sc/source/filter/xml/XMLExportDDELinks.hxx5 -rw-r--r--sc/source/filter/xml/XMLExportDataPilot.cxx5 -rw-r--r--sc/source/filter/xml/XMLExportDataPilot.hxx6 -rw-r--r--sc/source/filter/xml/XMLExportDatabaseRanges.cxx5 -rw-r--r--sc/source/filter/xml/XMLExportDatabaseRanges.hxx5 -rw-r--r--sc/source/filter/xml/XMLExportIterator.cxx5 -rw-r--r--sc/source/filter/xml/XMLExportIterator.hxx5 -rw-r--r--sc/source/filter/xml/XMLExportSharedData.cxx5 -rw-r--r--sc/source/filter/xml/XMLExportSharedData.hxx5 -rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.cxx5 -rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.hxx5 -rw-r--r--sc/source/filter/xml/XMLStylesImportHelper.cxx5 -rw-r--r--sc/source/filter/xml/XMLStylesImportHelper.hxx5 -rw-r--r--sc/source/filter/xml/XMLTableHeaderFooterContext.cxx5 -rw-r--r--sc/source/filter/xml/XMLTableHeaderFooterContext.hxx5 -rw-r--r--sc/source/filter/xml/XMLTableMasterPageExport.cxx5 -rw-r--r--sc/source/filter/xml/XMLTableMasterPageExport.hxx5 -rw-r--r--sc/source/filter/xml/XMLTableShapeImportHelper.cxx5 -rw-r--r--sc/source/filter/xml/XMLTableShapeImportHelper.hxx5 -rw-r--r--sc/source/filter/xml/XMLTableShapeResizer.cxx5 -rw-r--r--sc/source/filter/xml/XMLTableShapeResizer.hxx5 -rw-r--r--sc/source/filter/xml/XMLTableShapesContext.cxx5 -rw-r--r--sc/source/filter/xml/XMLTableShapesContext.hxx5 -rw-r--r--sc/source/filter/xml/XMLTableSourceContext.cxx5 -rw-r--r--sc/source/filter/xml/XMLTableSourceContext.hxx5 -rw-r--r--sc/source/filter/xml/XMLTextPContext.cxx5 -rw-r--r--sc/source/filter/xml/XMLTextPContext.hxx5 -rw-r--r--sc/source/filter/xml/XMLTrackedChangesContext.cxx5 -rw-r--r--sc/source/filter/xml/XMLTrackedChangesContext.hxx5 -rw-r--r--sc/source/filter/xml/makefile.mk6 -rw-r--r--sc/source/filter/xml/sheetdata.cxx5 -rw-r--r--sc/source/filter/xml/xmlannoi.cxx5 -rw-r--r--sc/source/filter/xml/xmlannoi.hxx7 -rw-r--r--sc/source/filter/xml/xmlbodyi.cxx5 -rw-r--r--sc/source/filter/xml/xmlbodyi.hxx5 -rw-r--r--sc/source/filter/xml/xmlcelli.cxx13 -rw-r--r--sc/source/filter/xml/xmlcelli.hxx5 -rw-r--r--sc/source/filter/xml/xmlcoli.cxx5 -rw-r--r--sc/source/filter/xml/xmlcoli.hxx5 -rw-r--r--sc/source/filter/xml/xmlconti.cxx5 -rw-r--r--sc/source/filter/xml/xmlconti.hxx5 -rw-r--r--sc/source/filter/xml/xmlcvali.cxx5 -rw-r--r--sc/source/filter/xml/xmlcvali.hxx5 -rw-r--r--sc/source/filter/xml/xmldpimp.cxx5 -rw-r--r--sc/source/filter/xml/xmldpimp.hxx6 -rw-r--r--sc/source/filter/xml/xmldrani.cxx5 -rw-r--r--sc/source/filter/xml/xmldrani.hxx5 -rw-r--r--sc/source/filter/xml/xmlexprt.cxx11 -rw-r--r--sc/source/filter/xml/xmlexprt.hxx5 -rw-r--r--sc/source/filter/xml/xmlexternaltabi.cxx5 -rw-r--r--sc/source/filter/xml/xmlexternaltabi.hxx5 -rw-r--r--sc/source/filter/xml/xmlfilti.cxx5 -rw-r--r--sc/source/filter/xml/xmlfilti.hxx5 -rw-r--r--sc/source/filter/xml/xmlfonte.cxx13 -rw-r--r--sc/source/filter/xml/xmlimprt.cxx49 -rw-r--r--sc/source/filter/xml/xmlimprt.hxx5 -rw-r--r--sc/source/filter/xml/xmllabri.cxx5 -rw-r--r--sc/source/filter/xml/xmllabri.hxx5 -rw-r--r--sc/source/filter/xml/xmlnexpi.cxx5 -rw-r--r--sc/source/filter/xml/xmlnexpi.hxx5 -rw-r--r--sc/source/filter/xml/xmlrowi.cxx5 -rw-r--r--sc/source/filter/xml/xmlrowi.hxx5 -rw-r--r--sc/source/filter/xml/xmlsceni.cxx5 -rw-r--r--sc/source/filter/xml/xmlsceni.hxx5 -rw-r--r--sc/source/filter/xml/xmlsorti.cxx5 -rw-r--r--sc/source/filter/xml/xmlsorti.hxx5 -rw-r--r--sc/source/filter/xml/xmlstyle.cxx5 -rw-r--r--sc/source/filter/xml/xmlstyle.hxx5 -rw-r--r--sc/source/filter/xml/xmlstyli.cxx5 -rw-r--r--sc/source/filter/xml/xmlstyli.hxx5 -rw-r--r--sc/source/filter/xml/xmlsubti.cxx5 -rw-r--r--sc/source/filter/xml/xmlsubti.hxx5 -rw-r--r--sc/source/filter/xml/xmltabi.cxx5 -rw-r--r--sc/source/filter/xml/xmltabi.hxx5 -rw-r--r--sc/source/filter/xml/xmlwrap.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessibilityHints.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessibleCell.cxx9 -rw-r--r--sc/source/ui/Accessibility/AccessibleCellBase.cxx7 -rw-r--r--sc/source/ui/Accessibility/AccessibleContextBase.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessibleCsvControl.cxx11 -rw-r--r--sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentBase.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessibleEditObject.cxx11 -rw-r--r--sc/source/ui/Accessibility/AccessibleFilterMenu.cxx11 -rw-r--r--sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessibleGlobal.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeader.cxx7 -rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx7 -rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewCell.cxx9 -rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx7 -rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewTable.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessibleTableBase.cxx5 -rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx17 -rw-r--r--sc/source/ui/Accessibility/DrawModelBroadcaster.cxx5 -rw-r--r--sc/source/ui/Accessibility/makefile.mk6 -rw-r--r--sc/source/ui/app/client.cxx5 -rw-r--r--sc/source/ui/app/drwtrans.cxx9 -rw-r--r--sc/source/ui/app/inputhdl.cxx33 -rw-r--r--sc/source/ui/app/inputwin.cxx23 -rw-r--r--sc/source/ui/app/lnktrans.cxx5 -rw-r--r--sc/source/ui/app/makefile.mk6 -rw-r--r--sc/source/ui/app/msgpool.cxx5 -rw-r--r--sc/source/ui/app/rfindlst.cxx5 -rw-r--r--sc/source/ui/app/scdll.cxx9 -rw-r--r--sc/source/ui/app/scmod.cxx13 -rw-r--r--sc/source/ui/app/scmod2.cxx7 -rw-r--r--sc/source/ui/app/seltrans.cxx5 -rw-r--r--sc/source/ui/app/template.cxx5 -rw-r--r--sc/source/ui/app/transobj.cxx11 -rw-r--r--sc/source/ui/app/typemap.cxx43 -rw-r--r--sc/source/ui/app/uiitems.cxx7 -rw-r--r--sc/source/ui/app/wtcdummy.cxx5 -rw-r--r--sc/source/ui/attrdlg/attrdlg.cxx7 -rw-r--r--sc/source/ui/attrdlg/condfrmt.cxx5 -rw-r--r--sc/source/ui/attrdlg/makefile.mk6 -rw-r--r--sc/source/ui/attrdlg/scabstdlg.cxx5 -rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx5 -rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx5 -rw-r--r--sc/source/ui/attrdlg/scuiexp.cxx5 -rw-r--r--sc/source/ui/attrdlg/tabpages.cxx5 -rw-r--r--sc/source/ui/cctrl/cbuttonw.cxx5 -rw-r--r--sc/source/ui/cctrl/dpcontrol.cxx5 -rw-r--r--sc/source/ui/cctrl/dpcontrol.src5 -rw-r--r--sc/source/ui/cctrl/editfield.cxx5 -rw-r--r--sc/source/ui/cctrl/makefile.mk6 -rw-r--r--sc/source/ui/cctrl/popmenu.cxx5 -rw-r--r--sc/source/ui/cctrl/tbinsert.cxx5 -rw-r--r--sc/source/ui/cctrl/tbzoomsliderctrl.cxx54 -rw-r--r--sc/source/ui/dbgui/asciiopt.cxx5 -rw-r--r--sc/source/ui/dbgui/asciiopt.hrc5 -rw-r--r--sc/source/ui/dbgui/asciiopt.src5 -rw-r--r--sc/source/ui/dbgui/consdlg.cxx5 -rw-r--r--sc/source/ui/dbgui/consdlg.hrc5 -rw-r--r--sc/source/ui/dbgui/consdlg.src5 -rw-r--r--sc/source/ui/dbgui/csvcontrol.cxx5 -rw-r--r--sc/source/ui/dbgui/csvgrid.cxx13 -rw-r--r--sc/source/ui/dbgui/csvruler.cxx5 -rw-r--r--sc/source/ui/dbgui/csvsplits.cxx5 -rw-r--r--sc/source/ui/dbgui/csvtablebox.cxx5 -rw-r--r--sc/source/ui/dbgui/dapidata.cxx5 -rw-r--r--sc/source/ui/dbgui/dapitype.cxx5 -rw-r--r--sc/source/ui/dbgui/dapitype.hrc5 -rw-r--r--sc/source/ui/dbgui/dapitype.src5 -rw-r--r--sc/source/ui/dbgui/dbnamdlg.cxx5 -rw-r--r--sc/source/ui/dbgui/dpgroupdlg.cxx5 -rw-r--r--sc/source/ui/dbgui/dpgroupdlg.hrc5 -rw-r--r--sc/source/ui/dbgui/dpgroupdlg.src5 -rw-r--r--sc/source/ui/dbgui/expftext.cxx5 -rw-r--r--sc/source/ui/dbgui/fieldwnd.cxx5 -rw-r--r--sc/source/ui/dbgui/filtdlg.cxx5 -rw-r--r--sc/source/ui/dbgui/foptmgr.cxx6 -rw-r--r--sc/source/ui/dbgui/imoptdlg.cxx5 -rw-r--r--sc/source/ui/dbgui/imoptdlg.hrc5 -rw-r--r--sc/source/ui/dbgui/imoptdlg.src5 -rw-r--r--sc/source/ui/dbgui/makefile.mk6 -rw-r--r--sc/source/ui/dbgui/outline.src5 -rw-r--r--sc/source/ui/dbgui/pfiltdlg.cxx5 -rw-r--r--sc/source/ui/dbgui/pivot.hrc5 -rw-r--r--sc/source/ui/dbgui/pivot.src5 -rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx5 -rw-r--r--sc/source/ui/dbgui/pvfundlg.hrc5 -rw-r--r--sc/source/ui/dbgui/pvfundlg.src5 -rw-r--r--sc/source/ui/dbgui/pvglob.hxx5 -rw-r--r--sc/source/ui/dbgui/pvlaydlg.cxx5 -rw-r--r--sc/source/ui/dbgui/scendlg.cxx5 -rw-r--r--sc/source/ui/dbgui/scendlg.hrc5 -rw-r--r--sc/source/ui/dbgui/scendlg.src5 -rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx5 -rw-r--r--sc/source/ui/dbgui/scuiimoptdlg.cxx5 -rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx5 -rw-r--r--sc/source/ui/dbgui/sortdlg.cxx5 -rw-r--r--sc/source/ui/dbgui/subtdlg.cxx5 -rw-r--r--sc/source/ui/dbgui/tpsort.cxx5 -rw-r--r--sc/source/ui/dbgui/tpsubt.cxx5 -rw-r--r--sc/source/ui/dbgui/validate.cxx5 -rw-r--r--sc/source/ui/dbgui/validate.src5 -rw-r--r--sc/source/ui/docshell/arealink.cxx9 -rw-r--r--sc/source/ui/docshell/autostyl.cxx5 -rw-r--r--sc/source/ui/docshell/dbdocfun.cxx5 -rw-r--r--sc/source/ui/docshell/dbdocimp.cxx5 -rw-r--r--sc/source/ui/docshell/docfunc.cxx13 -rw-r--r--sc/source/ui/docshell/docsh.cxx11 -rw-r--r--sc/source/ui/docshell/docsh2.cxx13 -rw-r--r--sc/source/ui/docshell/docsh3.cxx11 -rw-r--r--sc/source/ui/docshell/docsh4.cxx7 -rw-r--r--sc/source/ui/docshell/docsh5.cxx5 -rw-r--r--sc/source/ui/docshell/docsh6.cxx11 -rw-r--r--sc/source/ui/docshell/docsh7.cxx5 -rw-r--r--sc/source/ui/docshell/docsh8.cxx5 -rw-r--r--sc/source/ui/docshell/docshimp.hxx5 -rw-r--r--sc/source/ui/docshell/editable.cxx5 -rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx12 -rw-r--r--sc/source/ui/docshell/hiranges.cxx5 -rw-r--r--sc/source/ui/docshell/impex.cxx5 -rw-r--r--sc/source/ui/docshell/makefile.mk6 -rw-r--r--sc/source/ui/docshell/olinefun.cxx5 -rw-r--r--sc/source/ui/docshell/pagedata.cxx5 -rw-r--r--sc/source/ui/docshell/pntlock.cxx5 -rw-r--r--sc/source/ui/docshell/servobj.cxx7 -rw-r--r--sc/source/ui/docshell/sizedev.cxx5 -rw-r--r--sc/source/ui/docshell/tablink.cxx9 -rw-r--r--sc/source/ui/docshell/tpstat.cxx5 -rw-r--r--sc/source/ui/docshell/tpstat.hrc5 -rw-r--r--sc/source/ui/docshell/tpstat.src5 -rw-r--r--sc/source/ui/drawfunc/chartsh.cxx9 -rw-r--r--sc/source/ui/drawfunc/drawsh.cxx9 -rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx9 -rw-r--r--sc/source/ui/drawfunc/drawsh4.cxx5 -rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx7 -rw-r--r--sc/source/ui/drawfunc/drformsh.cxx9 -rw-r--r--sc/source/ui/drawfunc/drformsh.src5 -rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx39 -rw-r--r--sc/source/ui/drawfunc/drtxtob1.cxx19 -rw-r--r--sc/source/ui/drawfunc/drtxtob2.cxx13 -rw-r--r--sc/source/ui/drawfunc/fuconarc.cxx5 -rw-r--r--sc/source/ui/drawfunc/fuconcustomshape.cxx11 -rw-r--r--sc/source/ui/drawfunc/fuconpol.cxx5 -rw-r--r--sc/source/ui/drawfunc/fuconrec.cxx7 -rw-r--r--sc/source/ui/drawfunc/fuconstr.cxx9 -rw-r--r--sc/source/ui/drawfunc/fuconuno.cxx5 -rw-r--r--sc/source/ui/drawfunc/fudraw.cxx9 -rw-r--r--sc/source/ui/drawfunc/fuins1.cxx10 -rw-r--r--sc/source/ui/drawfunc/fuins2.cxx5 -rw-r--r--sc/source/ui/drawfunc/fumark.cxx5 -rw-r--r--sc/source/ui/drawfunc/fupoor.cxx7 -rw-r--r--sc/source/ui/drawfunc/fusel.cxx11 -rw-r--r--sc/source/ui/drawfunc/fusel2.cxx7 -rw-r--r--sc/source/ui/drawfunc/futext.cxx11 -rw-r--r--sc/source/ui/drawfunc/futext2.cxx5 -rw-r--r--sc/source/ui/drawfunc/futext3.cxx13 -rw-r--r--sc/source/ui/drawfunc/graphsh.cxx5 -rw-r--r--sc/source/ui/drawfunc/makefile.mk6 -rw-r--r--sc/source/ui/drawfunc/mediash.cxx5 -rw-r--r--sc/source/ui/drawfunc/objdraw.src5 -rw-r--r--sc/source/ui/drawfunc/oleobjsh.cxx9 -rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx7 -rw-r--r--sc/source/ui/formdlg/dwfunctr.hrc5 -rw-r--r--sc/source/ui/formdlg/dwfunctr.src5 -rw-r--r--sc/source/ui/formdlg/formdata.cxx5 -rw-r--r--sc/source/ui/formdlg/formdlgs.src5 -rw-r--r--sc/source/ui/formdlg/formula.cxx5 -rw-r--r--sc/source/ui/formdlg/makefile.mk6 -rw-r--r--sc/source/ui/formdlg/privsplt.cxx5 -rw-r--r--sc/source/ui/inc/AccessibilityHints.hxx5 -rw-r--r--sc/source/ui/inc/AccessibleCell.hxx7 -rw-r--r--sc/source/ui/inc/AccessibleCellBase.hxx5 -rw-r--r--sc/source/ui/inc/AccessibleContextBase.hxx5 -rw-r--r--sc/source/ui/inc/AccessibleCsvControl.hxx7 -rw-r--r--sc/source/ui/inc/AccessibleDataPilotControl.hxx5 -rw-r--r--sc/source/ui/inc/AccessibleDocument.hxx5 -rw-r--r--sc/source/ui/inc/AccessibleDocumentBase.hxx5 -rw-r--r--sc/source/ui/inc/AccessibleDocumentPagePreview.hxx5 -rw-r--r--sc/source/ui/inc/AccessibleEditObject.hxx5 -rw-r--r--sc/source/ui/inc/AccessiblePageHeader.hxx7 -rw-r--r--sc/source/ui/inc/AccessiblePageHeaderArea.hxx7 -rw-r--r--sc/source/ui/inc/AccessiblePreviewCell.hxx5 -rw-r--r--sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx5 -rw-r--r--sc/source/ui/inc/AccessiblePreviewTable.hxx5 -rw-r--r--sc/source/ui/inc/AccessibleSpreadsheet.hxx5 -rw-r--r--sc/source/ui/inc/AccessibleTableBase.hxx5 -rw-r--r--sc/source/ui/inc/AccessibleText.hxx7 -rw-r--r--sc/source/ui/inc/ChartRangeSelectionListener.hxx5 -rw-r--r--sc/source/ui/inc/DrawModelBroadcaster.hxx5 -rw-r--r--sc/source/ui/inc/IAnyRefDialog.hxx5 -rw-r--r--sc/source/ui/inc/ScDevChart.hxx5 -rw-r--r--sc/source/ui/inc/acredlin.hrc5 -rw-r--r--sc/source/ui/inc/acredlin.hxx5 -rw-r--r--sc/source/ui/inc/anyrefdg.hxx5 -rw-r--r--sc/source/ui/inc/areasave.hxx5 -rw-r--r--sc/source/ui/inc/areasdlg.hxx5 -rw-r--r--sc/source/ui/inc/asciiopt.hxx5 -rw-r--r--sc/source/ui/inc/attrdlg.hrc5 -rw-r--r--sc/source/ui/inc/attrdlg.hxx5 -rw-r--r--sc/source/ui/inc/auditsh.hxx5 -rw-r--r--sc/source/ui/inc/autofmt.hxx5 -rw-r--r--sc/source/ui/inc/autostyl.hxx5 -rw-r--r--sc/source/ui/inc/cbutton.hxx5 -rw-r--r--sc/source/ui/inc/cellsh.hxx5 -rw-r--r--sc/source/ui/inc/chartsh.hxx5 -rw-r--r--sc/source/ui/inc/client.hxx5 -rw-r--r--sc/source/ui/inc/colrowba.hxx5 -rw-r--r--sc/source/ui/inc/condfrmt.hrc5 -rw-r--r--sc/source/ui/inc/condfrmt.hxx5 -rw-r--r--sc/source/ui/inc/conflictsdlg.hrc5 -rw-r--r--sc/source/ui/inc/conflictsdlg.hxx5 -rw-r--r--sc/source/ui/inc/consdlg.hxx5 -rw-r--r--sc/source/ui/inc/content.hxx5 -rw-r--r--sc/source/ui/inc/corodlg.hxx5 -rw-r--r--sc/source/ui/inc/crdlg.hxx5 -rw-r--r--sc/source/ui/inc/crnrdlg.hrc5 -rw-r--r--sc/source/ui/inc/crnrdlg.hxx5 -rw-r--r--sc/source/ui/inc/csvcontrol.hxx5 -rw-r--r--sc/source/ui/inc/csvgrid.hxx5 -rw-r--r--sc/source/ui/inc/csvruler.hxx5 -rw-r--r--sc/source/ui/inc/csvsplits.hxx5 -rw-r--r--sc/source/ui/inc/csvtablebox.hxx5 -rw-r--r--sc/source/ui/inc/dapidata.hxx5 -rw-r--r--sc/source/ui/inc/dapitype.hxx5 -rw-r--r--sc/source/ui/inc/dbdocfun.hxx5 -rw-r--r--sc/source/ui/inc/dbfunc.hxx5 -rw-r--r--sc/source/ui/inc/dbnamdlg.hrc5 -rw-r--r--sc/source/ui/inc/dbnamdlg.hxx5 -rw-r--r--sc/source/ui/inc/delcldlg.hxx5 -rw-r--r--sc/source/ui/inc/delcodlg.hxx5 -rw-r--r--sc/source/ui/inc/docfunc.hxx5 -rw-r--r--sc/source/ui/inc/docsh.hxx5 -rw-r--r--sc/source/ui/inc/dpcontrol.hrc5 -rw-r--r--sc/source/ui/inc/dpcontrol.hxx5 -rw-r--r--sc/source/ui/inc/dpgroupdlg.hxx5 -rw-r--r--sc/source/ui/inc/drawsh.hxx5 -rw-r--r--sc/source/ui/inc/drawutil.hxx5 -rw-r--r--sc/source/ui/inc/drawview.hxx5 -rw-r--r--sc/source/ui/inc/drformsh.hxx5 -rw-r--r--sc/source/ui/inc/drtxtob.hxx5 -rw-r--r--sc/source/ui/inc/drwtrans.hxx6 -rw-r--r--sc/source/ui/inc/dwfunctr.hxx5 -rw-r--r--sc/source/ui/inc/editable.hxx5 -rw-r--r--sc/source/ui/inc/editfield.hxx5 -rw-r--r--sc/source/ui/inc/editsh.hxx7 -rw-r--r--sc/source/ui/inc/expftext.hxx5 -rw-r--r--sc/source/ui/inc/fieldwnd.hxx5 -rw-r--r--sc/source/ui/inc/filldlg.hxx5 -rw-r--r--sc/source/ui/inc/filtdlg.hxx5 -rw-r--r--sc/source/ui/inc/filter.hrc5 -rw-r--r--sc/source/ui/inc/foptmgr.hxx5 -rw-r--r--sc/source/ui/inc/formatsh.hxx5 -rw-r--r--sc/source/ui/inc/formdata.hxx5 -rw-r--r--sc/source/ui/inc/formula.hxx5 -rw-r--r--sc/source/ui/inc/fuconarc.hxx5 -rw-r--r--sc/source/ui/inc/fuconcustomshape.hxx5 -rw-r--r--sc/source/ui/inc/fuconpol.hxx5 -rw-r--r--sc/source/ui/inc/fuconrec.hxx5 -rw-r--r--sc/source/ui/inc/fuconstr.hxx5 -rw-r--r--sc/source/ui/inc/fuconuno.hxx5 -rw-r--r--sc/source/ui/inc/fudraw.hxx5 -rw-r--r--sc/source/ui/inc/fuedipo.hxx5 -rw-r--r--sc/source/ui/inc/fuinsert.hxx5 -rw-r--r--sc/source/ui/inc/fumark.hxx5 -rw-r--r--sc/source/ui/inc/funcpage.hxx5 -rw-r--r--sc/source/ui/inc/funcutl.hxx5 -rw-r--r--sc/source/ui/inc/fupoor.hxx5 -rw-r--r--sc/source/ui/inc/fusel.hxx5 -rw-r--r--sc/source/ui/inc/futext.hxx5 -rw-r--r--sc/source/ui/inc/graphsh.hxx5 -rw-r--r--sc/source/ui/inc/gridmerg.hxx5 -rw-r--r--sc/source/ui/inc/gridwin.hxx5 -rw-r--r--sc/source/ui/inc/groupdlg.hxx5 -rw-r--r--sc/source/ui/inc/hdrcont.hxx5 -rw-r--r--sc/source/ui/inc/hfedtdlg.hxx5 -rw-r--r--sc/source/ui/inc/highred.hrc5 -rw-r--r--sc/source/ui/inc/highred.hxx5 -rw-r--r--sc/source/ui/inc/hintwin.hxx5 -rw-r--r--sc/source/ui/inc/hiranges.hxx5 -rw-r--r--sc/source/ui/inc/imoptdlg.hxx5 -rw-r--r--sc/source/ui/inc/impex.hxx5 -rw-r--r--sc/source/ui/inc/inputhdl.hxx7 -rw-r--r--sc/source/ui/inc/inputwin.hxx5 -rw-r--r--sc/source/ui/inc/inscldlg.hxx5 -rw-r--r--sc/source/ui/inc/inscodlg.hxx5 -rw-r--r--sc/source/ui/inc/instbdlg.hrc5 -rw-r--r--sc/source/ui/inc/instbdlg.hxx5 -rw-r--r--sc/source/ui/inc/invmerge.hxx5 -rw-r--r--sc/source/ui/inc/lbseldlg.hxx5 -rw-r--r--sc/source/ui/inc/linkarea.hrc5 -rw-r--r--sc/source/ui/inc/linkarea.hxx5 -rw-r--r--sc/source/ui/inc/lnktrans.hxx5 -rw-r--r--sc/source/ui/inc/makefile.mk6 -rw-r--r--sc/source/ui/inc/mediash.hxx5 -rw-r--r--sc/source/ui/inc/miscdlgs.hrc5 -rw-r--r--sc/source/ui/inc/msgpool.hxx7 -rw-r--r--sc/source/ui/inc/mtrindlg.hxx5 -rw-r--r--sc/source/ui/inc/mvtabdlg.hxx5 -rw-r--r--sc/source/ui/inc/namecrea.hxx5 -rw-r--r--sc/source/ui/inc/namedlg.hrc5 -rw-r--r--sc/source/ui/inc/namedlg.hxx5 -rw-r--r--sc/source/ui/inc/namepast.hxx5 -rw-r--r--sc/source/ui/inc/navcitem.hxx5 -rw-r--r--sc/source/ui/inc/navipi.hxx5 -rw-r--r--sc/source/ui/inc/navsett.hxx5 -rw-r--r--sc/source/ui/inc/notemark.hxx5 -rw-r--r--sc/source/ui/inc/oleobjsh.hxx5 -rw-r--r--sc/source/ui/inc/olinefun.hxx5 -rw-r--r--sc/source/ui/inc/olinewin.hxx5 -rw-r--r--sc/source/ui/inc/opredlin.hrc5 -rw-r--r--sc/source/ui/inc/opredlin.hxx5 -rw-r--r--sc/source/ui/inc/optdlg.hrc5 -rw-r--r--sc/source/ui/inc/optload.hrc5 -rw-r--r--sc/source/ui/inc/optload.hxx5 -rw-r--r--sc/source/ui/inc/optsolver.hrc5 -rw-r--r--sc/source/ui/inc/optsolver.hxx5 -rw-r--r--sc/source/ui/inc/output.hxx5 -rw-r--r--sc/source/ui/inc/pagedata.hxx5 -rw-r--r--sc/source/ui/inc/parawin.hxx5 -rw-r--r--sc/source/ui/inc/pfiltdlg.hxx7 -rw-r--r--sc/source/ui/inc/pfuncache.hxx5 -rw-r--r--sc/source/ui/inc/pgbrksh.hxx5 -rw-r--r--sc/source/ui/inc/pivotsh.hxx5 -rw-r--r--sc/source/ui/inc/pntlock.hxx5 -rw-r--r--sc/source/ui/inc/popmenu.hxx5 -rw-r--r--sc/source/ui/inc/preview.hxx5 -rw-r--r--sc/source/ui/inc/prevloc.hxx5 -rw-r--r--sc/source/ui/inc/prevwsh.hxx5 -rw-r--r--sc/source/ui/inc/printfun.hxx5 -rw-r--r--sc/source/ui/inc/privsplt.hxx5 -rw-r--r--sc/source/ui/inc/protectiondlg.hrc5 -rw-r--r--sc/source/ui/inc/protectiondlg.hxx5 -rw-r--r--sc/source/ui/inc/pvfundlg.hxx5 -rw-r--r--sc/source/ui/inc/pvlaydlg.hxx5 -rw-r--r--sc/source/ui/inc/redcom.hxx5 -rw-r--r--sc/source/ui/inc/reffact.hxx5 -rw-r--r--sc/source/ui/inc/refundo.hxx5 -rw-r--r--sc/source/ui/inc/retypepassdlg.hrc5 -rw-r--r--sc/source/ui/inc/retypepassdlg.hxx5 -rw-r--r--sc/source/ui/inc/rfindlst.hxx5 -rw-r--r--sc/source/ui/inc/scendlg.hxx5 -rw-r--r--sc/source/ui/inc/scui_def.hxx5 -rw-r--r--sc/source/ui/inc/scuiasciiopt.hxx5 -rw-r--r--sc/source/ui/inc/scuiautofmt.hxx5 -rw-r--r--sc/source/ui/inc/scuiimoptdlg.hxx5 -rw-r--r--sc/source/ui/inc/scuitphfedit.hxx5 -rw-r--r--sc/source/ui/inc/select.hxx5 -rw-r--r--sc/source/ui/inc/selectionstate.hxx7 -rw-r--r--sc/source/ui/inc/seltrans.hxx5 -rw-r--r--sc/source/ui/inc/servobj.hxx5 -rw-r--r--sc/source/ui/inc/sharedocdlg.hrc5 -rw-r--r--sc/source/ui/inc/sharedocdlg.hxx5 -rw-r--r--sc/source/ui/inc/shtabdlg.hxx5 -rw-r--r--sc/source/ui/inc/simpref.hrc5 -rw-r--r--sc/source/ui/inc/simpref.hxx5 -rw-r--r--sc/source/ui/inc/sizedev.hxx5 -rw-r--r--sc/source/ui/inc/solveroptions.hrc5 -rw-r--r--sc/source/ui/inc/solveroptions.hxx5 -rw-r--r--sc/source/ui/inc/solverutil.hxx5 -rw-r--r--sc/source/ui/inc/solvrdlg.hrc5 -rw-r--r--sc/source/ui/inc/solvrdlg.hxx5 -rw-r--r--sc/source/ui/inc/sortdlg.hrc5 -rw-r--r--sc/source/ui/inc/sortdlg.hxx5 -rw-r--r--sc/source/ui/inc/spelldialog.hxx5 -rw-r--r--sc/source/ui/inc/spelleng.hxx5 -rw-r--r--sc/source/ui/inc/spellparam.hxx5 -rw-r--r--sc/source/ui/inc/strindlg.hxx5 -rw-r--r--sc/source/ui/inc/styledlg.hrc5 -rw-r--r--sc/source/ui/inc/styledlg.hxx5 -rw-r--r--sc/source/ui/inc/submenu.hrc5 -rw-r--r--sc/source/ui/inc/subtdlg.hrc5 -rw-r--r--sc/source/ui/inc/subtdlg.hxx5 -rw-r--r--sc/source/ui/inc/tabcont.hxx5 -rw-r--r--sc/source/ui/inc/tabopdlg.hrc5 -rw-r--r--sc/source/ui/inc/tabopdlg.hxx5 -rw-r--r--sc/source/ui/inc/tabpages.hxx5 -rw-r--r--sc/source/ui/inc/tabpopsh.hxx5 -rw-r--r--sc/source/ui/inc/tabsplit.hxx5 -rw-r--r--sc/source/ui/inc/tabview.hxx5 -rw-r--r--sc/source/ui/inc/tabvwsh.hxx10 -rw-r--r--sc/source/ui/inc/target.hxx5 -rw-r--r--sc/source/ui/inc/tbinsert.hrc5 -rw-r--r--sc/source/ui/inc/tbinsert.hxx5 -rw-r--r--sc/source/ui/inc/tbzoomsliderctrl.hxx54 -rw-r--r--sc/source/ui/inc/teamdlg.hxx5 -rw-r--r--sc/source/ui/inc/textdlgs.hxx5 -rw-r--r--sc/source/ui/inc/tpcalc.hxx5 -rw-r--r--sc/source/ui/inc/tphf.hxx5 -rw-r--r--sc/source/ui/inc/tphfedit.hxx5 -rw-r--r--sc/source/ui/inc/tpprint.hxx5 -rw-r--r--sc/source/ui/inc/tpsort.hxx5 -rw-r--r--sc/source/ui/inc/tpstat.hxx5 -rw-r--r--sc/source/ui/inc/tpsubt.hxx5 -rw-r--r--sc/source/ui/inc/tptable.hxx5 -rw-r--r--sc/source/ui/inc/tpusrlst.hxx5 -rw-r--r--sc/source/ui/inc/tpview.hxx5 -rw-r--r--sc/source/ui/inc/transobj.hxx5 -rw-r--r--sc/source/ui/inc/ui_pch.hxx16 -rw-r--r--sc/source/ui/inc/uiitems.hxx6 -rw-r--r--sc/source/ui/inc/undobase.hxx5 -rw-r--r--sc/source/ui/inc/undoblk.hxx5 -rw-r--r--sc/source/ui/inc/undocell.hxx5 -rw-r--r--sc/source/ui/inc/undodat.hxx6 -rw-r--r--sc/source/ui/inc/undodraw.hxx5 -rw-r--r--sc/source/ui/inc/undoolk.hxx5 -rw-r--r--sc/source/ui/inc/undostyl.hxx5 -rw-r--r--sc/source/ui/inc/undotab.hxx5 -rw-r--r--sc/source/ui/inc/undoutil.hxx5 -rw-r--r--sc/source/ui/inc/validate.hrc5 -rw-r--r--sc/source/ui/inc/validate.hxx5 -rw-r--r--sc/source/ui/inc/viewdata.hxx5 -rw-r--r--sc/source/ui/inc/viewfunc.hxx5 -rw-r--r--sc/source/ui/inc/viewutil.hxx5 -rw-r--r--sc/source/ui/inc/warnbox.hxx5 -rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx5 -rw-r--r--sc/source/ui/miscdlgs/acredlin.src5 -rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/autofmt.cxx25 -rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.src5 -rw-r--r--sc/source/ui/miscdlgs/crdlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/delcldlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/delcodlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/filldlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/groupdlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/highred.cxx5 -rw-r--r--sc/source/ui/miscdlgs/highred.src5 -rw-r--r--sc/source/ui/miscdlgs/inscldlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/inscodlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/instbdlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/instbdlg.src5 -rw-r--r--sc/source/ui/miscdlgs/lbseldlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/linkarea.cxx5 -rw-r--r--sc/source/ui/miscdlgs/linkarea.src5 -rw-r--r--sc/source/ui/miscdlgs/makefile.mk6 -rw-r--r--sc/source/ui/miscdlgs/mtrindlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/mvtabdlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/namecrea.cxx5 -rw-r--r--sc/source/ui/miscdlgs/namepast.cxx5 -rw-r--r--sc/source/ui/miscdlgs/optsolver.cxx5 -rw-r--r--sc/source/ui/miscdlgs/protectiondlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/protectiondlg.src5 -rw-r--r--sc/source/ui/miscdlgs/redcom.cxx5 -rw-r--r--sc/source/ui/miscdlgs/retypepassdlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/retypepassdlg.src5 -rw-r--r--sc/source/ui/miscdlgs/scuiautofmt.cxx25 -rw-r--r--sc/source/ui/miscdlgs/sharedocdlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/sharedocdlg.src5 -rw-r--r--sc/source/ui/miscdlgs/shtabdlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/simpref.cxx5 -rw-r--r--sc/source/ui/miscdlgs/solveroptions.cxx5 -rw-r--r--sc/source/ui/miscdlgs/solverutil.cxx5 -rw-r--r--sc/source/ui/miscdlgs/solvrdlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/strindlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/tabopdlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/teamdlg.cxx5 -rw-r--r--sc/source/ui/miscdlgs/textdlgs.cxx7 -rw-r--r--sc/source/ui/miscdlgs/warnbox.cxx5 -rw-r--r--sc/source/ui/namedlg/makefile.mk6 -rw-r--r--sc/source/ui/namedlg/namedlg.cxx5 -rw-r--r--sc/source/ui/navipi/content.cxx11 -rw-r--r--sc/source/ui/navipi/makefile.mk8 -rw-r--r--sc/source/ui/navipi/navcitem.cxx5 -rw-r--r--sc/source/ui/navipi/navipi.cxx5 -rw-r--r--sc/source/ui/navipi/navipi.hrc5 -rw-r--r--sc/source/ui/navipi/navipi.src5 -rw-r--r--sc/source/ui/navipi/scenwnd.cxx5 -rw-r--r--sc/source/ui/optdlg/makefile.mk6 -rw-r--r--sc/source/ui/optdlg/opredlin.cxx5 -rw-r--r--sc/source/ui/optdlg/tpcalc.cxx5 -rw-r--r--sc/source/ui/optdlg/tpprint.cxx5 -rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx5 -rw-r--r--sc/source/ui/optdlg/tpview.cxx5 -rw-r--r--sc/source/ui/pagedlg/areasdlg.cxx5 -rw-r--r--sc/source/ui/pagedlg/hfedtdlg.cxx5 -rw-r--r--sc/source/ui/pagedlg/hfedtdlg.hrc5 -rw-r--r--sc/source/ui/pagedlg/hfedtdlg.src5 -rw-r--r--sc/source/ui/pagedlg/makefile.mk6 -rw-r--r--sc/source/ui/pagedlg/pagedlg.hrc5 -rw-r--r--sc/source/ui/pagedlg/pagedlg.src5 -rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx15 -rw-r--r--sc/source/ui/pagedlg/tphf.cxx5 -rw-r--r--sc/source/ui/pagedlg/tphf.src5 -rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx17 -rw-r--r--sc/source/ui/pagedlg/tptable.cxx5 -rw-r--r--sc/source/ui/src/attrdlg.src5 -rw-r--r--sc/source/ui/src/autofmt.src5 -rw-r--r--sc/source/ui/src/condfrmt.src5 -rw-r--r--sc/source/ui/src/crnrdlg.src5 -rw-r--r--sc/source/ui/src/dbnamdlg.src5 -rw-r--r--sc/source/ui/src/filter.src5 -rw-r--r--sc/source/ui/src/globstr.src5 -rw-r--r--sc/source/ui/src/hdrcont.src5 -rw-r--r--sc/source/ui/src/makefile.mk6 -rw-r--r--sc/source/ui/src/miscdlgs.src5 -rw-r--r--sc/source/ui/src/namedlg.src5 -rw-r--r--sc/source/ui/src/opredlin.src5 -rw-r--r--sc/source/ui/src/optdlg.src5 -rw-r--r--sc/source/ui/src/optsolver.src5 -rw-r--r--sc/source/ui/src/popup.src5 -rw-r--r--sc/source/ui/src/pseudo.src5 -rw-r--r--sc/source/ui/src/sc.src5 -rw-r--r--sc/source/ui/src/scerrors.src5 -rw-r--r--sc/source/ui/src/scfuncs.src5 -rw-r--r--sc/source/ui/src/scstring.src5 -rw-r--r--sc/source/ui/src/scwarngs.src5 -rw-r--r--sc/source/ui/src/simpref.src5 -rw-r--r--sc/source/ui/src/solveroptions.src5 -rw-r--r--sc/source/ui/src/solvrdlg.src5 -rw-r--r--sc/source/ui/src/sortdlg.src5 -rw-r--r--sc/source/ui/src/subtdlg.src5 -rw-r--r--sc/source/ui/src/tabopdlg.src5 -rw-r--r--sc/source/ui/src/textdlgs.src5 -rw-r--r--sc/source/ui/src/toolbox.src5 -rw-r--r--sc/source/ui/styleui/makefile.mk6 -rw-r--r--sc/source/ui/styleui/scstyles.src5 -rw-r--r--sc/source/ui/styleui/styledlg.cxx7 -rw-r--r--sc/source/ui/styleui/styledlg.src5 -rw-r--r--sc/source/ui/undo/areasave.cxx15 -rw-r--r--sc/source/ui/undo/makefile.mk6 -rw-r--r--sc/source/ui/undo/refundo.cxx5 -rw-r--r--sc/source/ui/undo/target.cxx5 -rw-r--r--sc/source/ui/undo/undobase.cxx6 -rw-r--r--sc/source/ui/undo/undoblk.cxx7 -rw-r--r--sc/source/ui/undo/undoblk2.cxx5 -rw-r--r--sc/source/ui/undo/undoblk3.cxx25 -rw-r--r--sc/source/ui/undo/undocell.cxx9 -rw-r--r--sc/source/ui/undo/undodat.cxx5 -rw-r--r--sc/source/ui/undo/undodraw.cxx5 -rw-r--r--sc/source/ui/undo/undoolk.cxx5 -rw-r--r--sc/source/ui/undo/undostyl.cxx5 -rw-r--r--sc/source/ui/undo/undotab.cxx5 -rw-r--r--sc/source/ui/undo/undoutil.cxx5 -rw-r--r--sc/source/ui/unoobj/ChartRangeSelectionListener.cxx5 -rw-r--r--sc/source/ui/unoobj/addruno.cxx5 -rw-r--r--sc/source/ui/unoobj/afmtuno.cxx6 -rw-r--r--sc/source/ui/unoobj/appluno.cxx5 -rw-r--r--sc/source/ui/unoobj/celllistsource.cxx5 -rw-r--r--sc/source/ui/unoobj/celllistsource.hxx5 -rw-r--r--sc/source/ui/unoobj/cellsuno.cxx33 -rw-r--r--sc/source/ui/unoobj/cellvaluebinding.cxx5 -rw-r--r--sc/source/ui/unoobj/cellvaluebinding.hxx5 -rw-r--r--sc/source/ui/unoobj/chart2uno.cxx36 -rw-r--r--sc/source/ui/unoobj/chartuno.cxx5 -rw-r--r--sc/source/ui/unoobj/confuno.cxx5 -rw-r--r--sc/source/ui/unoobj/convuno.cxx5 -rw-r--r--sc/source/ui/unoobj/cursuno.cxx5 -rw-r--r--sc/source/ui/unoobj/dapiuno.cxx5 -rw-r--r--sc/source/ui/unoobj/datauno.cxx5 -rw-r--r--sc/source/ui/unoobj/defltuno.cxx7 -rw-r--r--sc/source/ui/unoobj/detreg.cxx5 -rw-r--r--sc/source/ui/unoobj/dispuno.cxx5 -rw-r--r--sc/source/ui/unoobj/docuno.cxx5 -rw-r--r--sc/source/ui/unoobj/drdefuno.cxx5 -rw-r--r--sc/source/ui/unoobj/editsrc.cxx15 -rw-r--r--sc/source/ui/unoobj/fielduno.cxx13 -rw-r--r--sc/source/ui/unoobj/filtuno.cxx5 -rw-r--r--sc/source/ui/unoobj/fmtuno.cxx5 -rw-r--r--sc/source/ui/unoobj/forbiuno.cxx7 -rw-r--r--sc/source/ui/unoobj/funcuno.cxx7 -rw-r--r--sc/source/ui/unoobj/linkuno.cxx19 -rw-r--r--sc/source/ui/unoobj/listenercalls.cxx5 -rw-r--r--sc/source/ui/unoobj/makefile.mk6 -rw-r--r--sc/source/ui/unoobj/miscuno.cxx5 -rw-r--r--sc/source/ui/unoobj/nameuno.cxx5 -rw-r--r--sc/source/ui/unoobj/notesuno.cxx14 -rw-r--r--sc/source/ui/unoobj/optuno.cxx5 -rw-r--r--sc/source/ui/unoobj/pageuno.cxx5 -rw-r--r--sc/source/ui/unoobj/scdetect.cxx5 -rw-r--r--sc/source/ui/unoobj/scdetect.hxx5 -rw-r--r--sc/source/ui/unoobj/servuno.cxx83 -rw-r--r--sc/source/ui/unoobj/shapeuno.cxx11 -rw-r--r--sc/source/ui/unoobj/srchuno.cxx7 -rw-r--r--sc/source/ui/unoobj/styleuno.cxx16 -rw-r--r--sc/source/ui/unoobj/targuno.cxx5 -rw-r--r--sc/source/ui/unoobj/textuno.cxx25 -rw-r--r--sc/source/ui/unoobj/tokenuno.cxx5 -rw-r--r--sc/source/ui/unoobj/unodoc.cxx5 -rw-r--r--sc/source/ui/unoobj/unoguard.cxx5 -rw-r--r--sc/source/ui/unoobj/unoreflist.cxx5 -rw-r--r--sc/source/ui/unoobj/viewuno.cxx7 -rw-r--r--sc/source/ui/unoobj/warnpassword.cxx5 -rw-r--r--sc/source/ui/vba/excelvbahelper.cxx5 -rw-r--r--sc/source/ui/vba/excelvbahelper.hxx5 -rw-r--r--sc/source/ui/vba/helperdecl.hxx5 -rw-r--r--sc/source/ui/vba/makefile.mk6 -rw-r--r--sc/source/ui/vba/service.cxx5 -rw-r--r--sc/source/ui/vba/testvba/launchTest.pl6 -rw-r--r--sc/source/ui/vba/testvba/makefile.mk6 -rw-r--r--sc/source/ui/vba/vbaapplication.cxx5 -rw-r--r--sc/source/ui/vba/vbaapplication.hxx5 -rw-r--r--sc/source/ui/vba/vbaassistant.cxx40 -rw-r--r--sc/source/ui/vba/vbaassistant.hxx40 -rw-r--r--sc/source/ui/vba/vbaaxes.cxx5 -rw-r--r--sc/source/ui/vba/vbaaxes.hxx5 -rw-r--r--sc/source/ui/vba/vbaaxis.cxx5 -rw-r--r--sc/source/ui/vba/vbaaxis.hxx5 -rw-r--r--sc/source/ui/vba/vbaaxistitle.cxx5 -rw-r--r--sc/source/ui/vba/vbaaxistitle.hxx5 -rw-r--r--sc/source/ui/vba/vbaborders.cxx5 -rw-r--r--sc/source/ui/vba/vbaborders.hxx5 -rw-r--r--sc/source/ui/vba/vbacharacters.cxx5 -rw-r--r--sc/source/ui/vba/vbacharacters.hxx5 -rw-r--r--sc/source/ui/vba/vbachart.cxx5 -rw-r--r--sc/source/ui/vba/vbachart.hxx5 -rw-r--r--sc/source/ui/vba/vbachartobject.cxx5 -rw-r--r--sc/source/ui/vba/vbachartobject.hxx5 -rw-r--r--sc/source/ui/vba/vbachartobjects.cxx5 -rw-r--r--sc/source/ui/vba/vbachartobjects.hxx5 -rw-r--r--sc/source/ui/vba/vbacharts.cxx5 -rw-r--r--sc/source/ui/vba/vbacharts.hxx5 -rw-r--r--sc/source/ui/vba/vbacharttitle.cxx5 -rw-r--r--sc/source/ui/vba/vbacharttitle.hxx5 -rw-r--r--sc/source/ui/vba/vbacomment.cxx5 -rw-r--r--sc/source/ui/vba/vbacomment.hxx5 -rw-r--r--sc/source/ui/vba/vbacomments.cxx5 -rw-r--r--sc/source/ui/vba/vbacomments.hxx5 -rw-r--r--sc/source/ui/vba/vbacondition.cxx5 -rw-r--r--sc/source/ui/vba/vbacondition.hxx5 -rw-r--r--sc/source/ui/vba/vbacontrol.cxx0 -rw-r--r--sc/source/ui/vba/vbadialog.cxx5 -rw-r--r--sc/source/ui/vba/vbadialog.hxx5 -rw-r--r--sc/source/ui/vba/vbadialogs.cxx5 -rw-r--r--sc/source/ui/vba/vbadialogs.hxx5 -rw-r--r--sc/source/ui/vba/vbafont.cxx5 -rw-r--r--sc/source/ui/vba/vbafont.hxx5 -rw-r--r--sc/source/ui/vba/vbaformat.cxx5 -rw-r--r--sc/source/ui/vba/vbaformat.hxx5 -rw-r--r--sc/source/ui/vba/vbaformatcondition.cxx5 -rw-r--r--sc/source/ui/vba/vbaformatcondition.hxx5 -rw-r--r--sc/source/ui/vba/vbaformatconditions.cxx5 -rw-r--r--sc/source/ui/vba/vbaformatconditions.hxx5 -rw-r--r--sc/source/ui/vba/vbaglobals.cxx5 -rw-r--r--sc/source/ui/vba/vbaglobals.hxx5 -rw-r--r--sc/source/ui/vba/vbahelper.cxx5 -rw-r--r--sc/source/ui/vba/vbahyperlink.cxx40 -rw-r--r--sc/source/ui/vba/vbahyperlink.hxx40 -rw-r--r--sc/source/ui/vba/vbainterior.cxx5 -rw-r--r--sc/source/ui/vba/vbainterior.hxx5 -rw-r--r--sc/source/ui/vba/vbaname.cxx5 -rw-r--r--sc/source/ui/vba/vbaname.hxx5 -rw-r--r--sc/source/ui/vba/vbanames.cxx5 -rw-r--r--sc/source/ui/vba/vbanames.hxx5 -rw-r--r--sc/source/ui/vba/vbaoleobject.cxx5 -rw-r--r--sc/source/ui/vba/vbaoleobject.hxx5 -rw-r--r--sc/source/ui/vba/vbaoleobjects.cxx5 -rw-r--r--sc/source/ui/vba/vbaoleobjects.hxx5 -rw-r--r--sc/source/ui/vba/vbaoutline.cxx5 -rw-r--r--sc/source/ui/vba/vbaoutline.hxx5 -rw-r--r--sc/source/ui/vba/vbapagebreak.cxx5 -rw-r--r--sc/source/ui/vba/vbapagebreak.hxx5 -rw-r--r--sc/source/ui/vba/vbapagebreaks.cxx5 -rw-r--r--sc/source/ui/vba/vbapagebreaks.hxx5 -rw-r--r--sc/source/ui/vba/vbapagesetup.cxx5 -rw-r--r--sc/source/ui/vba/vbapagesetup.hxx5 -rw-r--r--sc/source/ui/vba/vbapalette.cxx5 -rw-r--r--sc/source/ui/vba/vbapalette.hxx5 -rw-r--r--sc/source/ui/vba/vbapane.cxx5 -rw-r--r--sc/source/ui/vba/vbapane.hxx5 -rw-r--r--sc/source/ui/vba/vbapivotcache.cxx5 -rw-r--r--sc/source/ui/vba/vbapivotcache.hxx5 -rw-r--r--sc/source/ui/vba/vbapivottable.cxx5 -rw-r--r--sc/source/ui/vba/vbapivottable.hxx5 -rw-r--r--sc/source/ui/vba/vbapivottables.cxx5 -rw-r--r--sc/source/ui/vba/vbapivottables.hxx5 -rw-r--r--sc/source/ui/vba/vbapropvalue.cxx5 -rw-r--r--sc/source/ui/vba/vbapropvalue.hxx5 -rw-r--r--sc/source/ui/vba/vbarange.cxx7 -rw-r--r--sc/source/ui/vba/vbarange.hxx5 -rw-r--r--sc/source/ui/vba/vbaseriescollection.cxx5 -rw-r--r--sc/source/ui/vba/vbaseriescollection.hxx5 -rw-r--r--sc/source/ui/vba/vbastyle.cxx5 -rw-r--r--sc/source/ui/vba/vbastyle.hxx5 -rw-r--r--sc/source/ui/vba/vbastyles.cxx5 -rw-r--r--sc/source/ui/vba/vbastyles.hxx5 -rw-r--r--sc/source/ui/vba/vbatextboxshape.cxx40 -rw-r--r--sc/source/ui/vba/vbatextboxshape.hxx40 -rw-r--r--sc/source/ui/vba/vbatextframe.cxx5 -rw-r--r--sc/source/ui/vba/vbatextframe.hxx5 -rw-r--r--sc/source/ui/vba/vbatitle.hxx5 -rw-r--r--sc/source/ui/vba/vbavalidation.cxx5 -rw-r--r--sc/source/ui/vba/vbavalidation.hxx5 -rw-r--r--sc/source/ui/vba/vbawindow.cxx5 -rw-r--r--sc/source/ui/vba/vbawindow.hxx5 -rw-r--r--sc/source/ui/vba/vbawindows.cxx5 -rw-r--r--sc/source/ui/vba/vbawindows.hxx5 -rw-r--r--sc/source/ui/vba/vbaworkbook.cxx5 -rw-r--r--sc/source/ui/vba/vbaworkbook.hxx5 -rw-r--r--sc/source/ui/vba/vbaworkbooks.cxx5 -rw-r--r--sc/source/ui/vba/vbaworkbooks.hxx5 -rw-r--r--sc/source/ui/vba/vbaworksheet.cxx5 -rw-r--r--sc/source/ui/vba/vbaworksheet.hxx5 -rw-r--r--sc/source/ui/vba/vbaworksheets.cxx5 -rw-r--r--sc/source/ui/vba/vbaworksheets.hxx5 -rw-r--r--sc/source/ui/vba/vbawsfunction.cxx5 -rw-r--r--sc/source/ui/vba/vbawsfunction.hxx5 -rw-r--r--sc/source/ui/view/auditsh.cxx7 -rw-r--r--sc/source/ui/view/cellsh.cxx7 -rw-r--r--sc/source/ui/view/cellsh1.cxx7 -rw-r--r--sc/source/ui/view/cellsh2.cxx5 -rw-r--r--sc/source/ui/view/cellsh3.cxx5 -rw-r--r--sc/source/ui/view/cellsh4.cxx5 -rw-r--r--sc/source/ui/view/colrowba.cxx5 -rw-r--r--sc/source/ui/view/dbfunc.cxx5 -rw-r--r--sc/source/ui/view/dbfunc2.cxx5 -rw-r--r--sc/source/ui/view/dbfunc3.cxx5 -rw-r--r--sc/source/ui/view/dbfunc4.cxx5 -rw-r--r--sc/source/ui/view/drawattr.cxx5 -rw-r--r--sc/source/ui/view/drawutil.cxx5 -rw-r--r--sc/source/ui/view/drawvie2.cxx5 -rw-r--r--sc/source/ui/view/drawvie3.cxx5 -rw-r--r--sc/source/ui/view/drawvie4.cxx5 -rw-r--r--sc/source/ui/view/drawview.cxx9 -rw-r--r--sc/source/ui/view/editsh.cxx33 -rw-r--r--sc/source/ui/view/formatsh.cxx31 -rw-r--r--sc/source/ui/view/galwrap.cxx5 -rw-r--r--sc/source/ui/view/gridmerg.cxx5 -rw-r--r--sc/source/ui/view/gridwin.cxx17 -rw-r--r--sc/source/ui/view/gridwin2.cxx5 -rw-r--r--[-rwxr-xr-x]sc/source/ui/view/gridwin3.cxx9 -rw-r--r--sc/source/ui/view/gridwin4.cxx16 -rw-r--r--sc/source/ui/view/gridwin5.cxx11 -rw-r--r--sc/source/ui/view/hdrcont.cxx5 -rw-r--r--sc/source/ui/view/hintwin.cxx5 -rw-r--r--sc/source/ui/view/imapwrap.cxx5 -rw-r--r--sc/source/ui/view/invmerge.cxx5 -rw-r--r--sc/source/ui/view/makefile.mk6 -rw-r--r--sc/source/ui/view/notemark.cxx5 -rw-r--r--sc/source/ui/view/olinewin.cxx5 -rw-r--r--sc/source/ui/view/olkact.cxx5 -rw-r--r--sc/source/ui/view/output.cxx15 -rw-r--r--sc/source/ui/view/output2.cxx31 -rw-r--r--[-rwxr-xr-x]sc/source/ui/view/output3.cxx7 -rw-r--r--sc/source/ui/view/pfuncache.cxx5 -rw-r--r--sc/source/ui/view/pgbrksh.cxx7 -rw-r--r--sc/source/ui/view/pivotsh.cxx7 -rw-r--r--sc/source/ui/view/preview.cxx15 -rw-r--r--sc/source/ui/view/prevloc.cxx5 -rw-r--r--sc/source/ui/view/prevwsh.cxx11 -rw-r--r--sc/source/ui/view/prevwsh2.cxx5 -rw-r--r--[-rwxr-xr-x]sc/source/ui/view/printfun.cxx29 -rw-r--r--sc/source/ui/view/reffact.cxx5 -rw-r--r--sc/source/ui/view/scextopt.cxx5 -rw-r--r--sc/source/ui/view/select.cxx5 -rw-r--r--sc/source/ui/view/selectionstate.cxx7 -rw-r--r--sc/source/ui/view/spelldialog.cxx11 -rw-r--r--sc/source/ui/view/spelleng.cxx13 -rw-r--r--sc/source/ui/view/tabcont.cxx5 -rw-r--r--sc/source/ui/view/tabpopsh.cxx5 -rw-r--r--sc/source/ui/view/tabsplit.cxx5 -rw-r--r--sc/source/ui/view/tabview.cxx5 -rw-r--r--sc/source/ui/view/tabview2.cxx7 -rw-r--r--sc/source/ui/view/tabview3.cxx11 -rw-r--r--sc/source/ui/view/tabview4.cxx5 -rw-r--r--sc/source/ui/view/tabview5.cxx7 -rw-r--r--sc/source/ui/view/tabvwsh.cxx16 -rw-r--r--sc/source/ui/view/tabvwsh2.cxx5 -rw-r--r--sc/source/ui/view/tabvwsh3.cxx7 -rw-r--r--sc/source/ui/view/tabvwsh4.cxx13 -rw-r--r--sc/source/ui/view/tabvwsh5.cxx5 -rw-r--r--sc/source/ui/view/tabvwsh8.cxx7 -rw-r--r--sc/source/ui/view/tabvwsh9.cxx5 -rw-r--r--sc/source/ui/view/tabvwsha.cxx9 -rw-r--r--sc/source/ui/view/tabvwshb.cxx7 -rw-r--r--sc/source/ui/view/tabvwshc.cxx5 -rw-r--r--sc/source/ui/view/tabvwshd.cxx5 -rw-r--r--sc/source/ui/view/tabvwshe.cxx13 -rw-r--r--sc/source/ui/view/tabvwshf.cxx5 -rw-r--r--sc/source/ui/view/tabvwshg.cxx5 -rw-r--r--sc/source/ui/view/tabvwshh.cxx5 -rw-r--r--sc/source/ui/view/viewdata.cxx19 -rw-r--r--sc/source/ui/view/viewfun2.cxx19 -rw-r--r--sc/source/ui/view/viewfun3.cxx5 -rw-r--r--sc/source/ui/view/viewfun4.cxx22 -rw-r--r--sc/source/ui/view/viewfun5.cxx5 -rw-r--r--sc/source/ui/view/viewfun6.cxx5 -rw-r--r--sc/source/ui/view/viewfun7.cxx5 -rw-r--r--sc/source/ui/view/viewfunc.cxx17 -rw-r--r--sc/source/ui/view/viewutil.cxx12 -rw-r--r--sc/source/ui/view/waitoff.cxx5 -rw-r--r--sc/uiconfig/layout/makefile.mk42 -rw-r--r--sc/util/createExtPackage.pl6 -rw-r--r--sc/util/hidother.src5 -rw-r--r--sc/util/makefile.mk11 -rw-r--r--sc/util/makefile.pmk6 -rw-r--r--sc/workben/addin.cxx5 -rw-r--r--sc/workben/addin.hxx5 -rwxr-xr-xsc/workben/celltrans/parse.py6 -rw-r--r--sc/workben/makefile.mk6 -rw-r--r--sc/workben/map.idl5 -rw-r--r--sc/workben/result.cxx5 -rw-r--r--sc/workben/result.hxx5 -rw-r--r--sc/workben/test.cxx5 -rw-r--r--sc/workben/testadd.idl5 1471 files changed, 4862 insertions, 7670 deletionsdiff --git a/sc/addin/datefunc/dfa.cl b/sc/addin/datefunc/dfa.clindex 2a2c0142222b..d45a1b548a0d 100644--- a/sc/addin/datefunc/dfa.cl+++ b/sc/addin/datefunc/dfa.cl@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dfa.cl,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/addin/datefunc/dfa.src b/sc/addin/datefunc/dfa.srcindex 8fcd05375d02..6a38f3068cc5 100644--- a/sc/addin/datefunc/dfa.src+++ b/sc/addin/datefunc/dfa.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dfa.src,v $- * $Revision: 1.34 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/addin/datefunc/makefile.mk b/sc/addin/datefunc/makefile.mkindex f01e8b978e73..f781b3835833 100644--- a/sc/addin/datefunc/makefile.mk+++ b/sc/addin/datefunc/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.15 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/addin/inc/addin.h b/sc/addin/inc/addin.hindex 8ff2f035280c..419d0e3a59db 100644--- a/sc/addin/inc/addin.h+++ b/sc/addin/inc/addin.h@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: addin.h,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/addin/inc/dfa.hrc b/sc/addin/inc/dfa.hrcindex fc26564ac479..0d2af4f4bffd 100644--- a/sc/addin/inc/dfa.hrc+++ b/sc/addin/inc/dfa.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dfa.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/addin/inc/rot13.hrc b/sc/addin/inc/rot13.hrcindex 4ed09cfec6d8..a610c9cc6663 100644--- a/sc/addin/inc/rot13.hrc+++ b/sc/addin/inc/rot13.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rot13.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/addin/makefile.mk b/sc/addin/makefile.mkindex 5efbd7f333c4..e716a8d8477a 100644--- a/sc/addin/makefile.mk+++ b/sc/addin/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.3 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/addin/rot13/makefile.mk b/sc/addin/rot13/makefile.mkindex 95a6962e4dd3..a33c50d2a725 100644--- a/sc/addin/rot13/makefile.mk+++ b/sc/addin/rot13/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.14 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/addin/rot13/rot13.cl b/sc/addin/rot13/rot13.clindex 3454dafa00f5..5c7e92ae3d3f 100644--- a/sc/addin/rot13/rot13.cl+++ b/sc/addin/rot13/rot13.cl@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rot13.cl,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/addin/rot13/rot13.src b/sc/addin/rot13/rot13.srcindex 6c1f19cba7f3..5518ae0aa31f 100644--- a/sc/addin/rot13/rot13.src+++ b/sc/addin/rot13/rot13.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rot13.src,v $- * $Revision: 1.23 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/addin/util/cl2c.pl b/sc/addin/util/cl2c.plindex 32a3a6cda312..6f5d3ee7e0d8 100644--- a/sc/addin/util/cl2c.pl+++ b/sc/addin/util/cl2c.pl@@ -4,14 +4,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. #-# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: cl2c.pl,v $-#-# $Revision: 1.3 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/addin/util/makefile.mk b/sc/addin/util/makefile.mkindex 7ce911de650e..2bd75148f80a 100644--- a/sc/addin/util/makefile.mk+++ b/sc/addin/util/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.7 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxxindex 76344a65ceda..df72fec64f57 100644--- a/sc/inc/AccessibleFilterMenu.hxx+++ b/sc/inc/AccessibleFilterMenu.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDataPilotControl.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxxindex f5ad0fd5d74b..ecf5bdc5ad87 100644--- a/sc/inc/AccessibleFilterMenuItem.hxx+++ b/sc/inc/AccessibleFilterMenuItem.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDataPilotControl.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxxindex e901949286a1..7d01317c6b8d 100644--- a/sc/inc/AccessibleFilterTopWindow.hxx+++ b/sc/inc/AccessibleFilterTopWindow.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDataPilotControl.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxxindex 9f17c2eaacae..a30ebf7ee18c 100644--- a/sc/inc/AccessibleGlobal.hxx+++ b/sc/inc/AccessibleGlobal.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDataPilotControl.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxxindex 38443e69fc07..9e787ea590fe 100644--- a/sc/inc/ViewSettingsSequenceDefines.hxx+++ b/sc/inc/ViewSettingsSequenceDefines.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: ViewSettingsSequenceDefines.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/addincfg.hxx b/sc/inc/addincfg.hxxindex 431766393ab8..193da4095977 100644--- a/sc/inc/addincfg.hxx+++ b/sc/inc/addincfg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: addincfg.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxxindex 1eb9c3051a14..fbc1444cc6de 100644--- a/sc/inc/addincol.hxx+++ b/sc/inc/addincol.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: addincol.hxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/address.hxx b/sc/inc/address.hxxindex 728f011c3cbc..3eef919e2f1b 100644--- a/sc/inc/address.hxx+++ b/sc/inc/address.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: address.hxx,v $- * $Revision: 1.17.30.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxxindex c9089ba48d2e..d6df571a29aa 100644--- a/sc/inc/addruno.hxx+++ b/sc/inc/addruno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: addruno.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxxindex 843fa673543f..9cb402a03764 100644--- a/sc/inc/afmtuno.hxx+++ b/sc/inc/afmtuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: afmtuno.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxxindex 05de5a22cc90..050611eeeb9e 100644--- a/sc/inc/appluno.hxx+++ b/sc/inc/appluno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: appluno.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxxindex 219036728869..91fc43fc249a 100644--- a/sc/inc/appoptio.hxx+++ b/sc/inc/appoptio.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: appoptio.hxx,v $- * $Revision: 1.10.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxxindex ad74f27f651b..46ce98709df1 100644--- a/sc/inc/arealink.hxx+++ b/sc/inc/arealink.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: arealink.hxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxxindex 5cbe1bafd290..6d7b7f48c2d7 100644--- a/sc/inc/attarray.hxx+++ b/sc/inc/attarray.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: attarray.hxx,v $- * $Revision: 1.9.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxxindex 9db8b4001690..96a0529c48a1 100644--- a/sc/inc/attrib.hxx+++ b/sc/inc/attrib.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: attrib.hxx,v $- * $Revision: 1.10.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxxindex 8ec139ffa2d5..094f618fbc7c 100644--- a/sc/inc/autoform.hxx+++ b/sc/inc/autoform.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: autoform.hxx,v $- * $Revision: 1.8.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -50,22 +47,22 @@ JP 20.07.95: **************************************************************************/ #include "scitems.hxx"-#include <svx/adjitem.hxx>+#include <editeng/adjitem.hxx> #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/cntritem.hxx>-#include <svx/colritem.hxx>-#include <svx/crsditem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/fontitem.hxx>-#include <svx/postitem.hxx>-#include <svx/shdditem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/cntritem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/shdditem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx> #include <svx/rotmodit.hxx> #include <svl/intitem.hxx>-#include <svx/bolnitem.hxx>+#include <editeng/bolnitem.hxx> #include "scdllapi.h" #include "collect.hxx" #include "global.hxx"diff --git a/sc/inc/autonamecache.hxx b/sc/inc/autonamecache.hxxindex fd5c46f1c2a5..0eb1b51efe29 100644--- a/sc/inc/autonamecache.hxx+++ b/sc/inc/autonamecache.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: autonamecache.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxxindex 8675de7cbf39..d5a066d522cc 100644--- a/sc/inc/bigrange.hxx+++ b/sc/inc/bigrange.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: bigrange.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxxindex e7418c8dedfe..cdba4e3a78bb 100644--- a/sc/inc/brdcst.hxx+++ b/sc/inc/brdcst.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: brdcst.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxxindex aee15caab79c..58962ea18c03 100644--- a/sc/inc/callform.hxx+++ b/sc/inc/callform.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: callform.hxx,v $- * $Revision: 1.3.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxxindex 9355176e3a62..ad9ed02a0415 100644--- a/sc/inc/cell.hxx+++ b/sc/inc/cell.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cell.hxx,v $- * $Revision: 1.30.38.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxxindex 246f1deb30cd..b0b445a5993d 100644--- a/sc/inc/cellform.hxx+++ b/sc/inc/cellform.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellform.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxxindex 7d0cc1411263..13469b110455 100644--- a/sc/inc/cellsuno.hxx+++ b/sc/inc/cellsuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellsuno.hxx,v $- * $Revision: 1.33 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/cfgids.hxx b/sc/inc/cfgids.hxxindex cd2537d29eab..4b07ddd0682f 100644--- a/sc/inc/cfgids.hxx+++ b/sc/inc/cfgids.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cfgids.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxxindex 32dc3a777086..d63e47d642b9 100644--- a/sc/inc/chart2uno.hxx+++ b/sc/inc/chart2uno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chart2uno.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -533,6 +530,14 @@ private: }; ::std::list<Item> m_aDataArray;++ /**+ * Cached data for getData. We may also need to cache data for the+ * numerical and textural data series if they turn out to be bottlenecks+ * under certain scenarios.+ */+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aMixedDataCache;+ ::com::sun::star::uno::Sequence<sal_Int32> m_aHiddenValues; // propertiesdiff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxxindex b04c70eb01b3..62f30a17c62e 100644--- a/sc/inc/chartarr.hxx+++ b/sc/inc/chartarr.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartarr.hxx,v $- * $Revision: 1.7.32.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxxindex fb4aeccb7c61..b4c677d7c3c6 100644--- a/sc/inc/charthelper.hxx+++ b/sc/inc/charthelper.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: charthelper.hxx,v $- * $Revision: 1.1.2.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxxindex 0ebc84268f74..26831970d5b7 100644--- a/sc/inc/chartlis.hxx+++ b/sc/inc/chartlis.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartlis.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -49,7 +46,7 @@ class ScChartUnoData; #include <com/sun/star/chart/XChartData.hpp> #include <com/sun/star/chart/XChartDataChangeEventListener.hpp> -class ScChartListener : public StrData, public SvtListener+class SC_DLLPUBLIC ScChartListener : public StrData, public SvtListener { public: class ExternalRefListener : public ScExternalRefManager::LinkListener@@ -186,7 +183,7 @@ public: const com::sun::star::uno::Reference< com::sun::star::chart::XChartData >& rSource ); void StartTimer(); void UpdateDirtyCharts();- void SetDirty();+ void SC_DLLPUBLIC SetDirty(); void SetDiffDirty( const ScChartListenerCollection&, BOOL bSetChartRangeLists = FALSE ); diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxxindex 9a6d65a88074..16f0fdd2cf4c 100644--- a/sc/inc/chartlock.hxx+++ b/sc/inc/chartlock.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartlock.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxxindex cd0bd47f2a32..84ffd2e877e2 100644--- a/sc/inc/chartpos.hxx+++ b/sc/inc/chartpos.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartpos.hxx,v $- * $Revision: 1.3.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxxindex 7c82b4874fca..795d655f3d06 100644--- a/sc/inc/chartuno.hxx+++ b/sc/inc/chartuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartuno.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxxindex 0018f8b2ac3c..ffe248bb3f65 100644--- a/sc/inc/chgtrack.hxx+++ b/sc/inc/chgtrack.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chgtrack.hxx,v $- * $Revision: 1.31.32.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxxindex dda49c8624b1..ddc0dcc14243 100644--- a/sc/inc/chgviset.hxx+++ b/sc/inc/chgviset.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chgviset.hxx,v $- * $Revision: 1.6.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxxindex 896117bdef69..78b5474229d1 100644--- a/sc/inc/clipparam.hxx+++ b/sc/inc/clipparam.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: document.hxx,v $- * $Revision: 1.115.36.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxxindex dc7778d12da3..e8b9bed60865 100644--- a/sc/inc/collect.hxx+++ b/sc/inc/collect.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: collect.hxx,v $- * $Revision: 1.6.32.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/column.hxx b/sc/inc/column.hxxindex b69fcb384e04..08f3d1f7b1e3 100644--- a/sc/inc/column.hxx+++ b/sc/inc/column.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: column.hxx,v $- * $Revision: 1.21.128.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -114,7 +111,7 @@ private: friend class ScDocument; // fuer FillInfo friend class ScDocumentIterator; friend class ScValueIterator;-friend class ScQueryValueIterator;+friend class ScDBQueryDataIterator; friend class ScColumnIterator; friend class ScQueryCellIterator; friend class ScMarkedDataIter;diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxxindex c981af2dad18..7d045db3c2aa 100644--- a/sc/inc/compiler.hxx+++ b/sc/inc/compiler.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: compiler.hxx,v $- * $Revision: 1.36.30.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxxindex ce7144008e2b..3b6f35366976 100644--- a/sc/inc/compressedarray.hxx+++ b/sc/inc/compressedarray.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: compressedarray.hxx,v $- * $Revision: 1.7.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxxindex f659c52d0892..75758841af7a 100644--- a/sc/inc/conditio.hxx+++ b/sc/inc/conditio.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: conditio.hxx,v $- * $Revision: 1.13.32.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxxindex a82e4fad1a09..bd74406eb37a 100644--- a/sc/inc/confuno.hxx+++ b/sc/inc/confuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: confuno.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxxindex 0fbaa1230e4b..4eb30b12c432 100644--- a/sc/inc/consoli.hxx+++ b/sc/inc/consoli.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: consoli.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxxindex d1223b5ae29f..135ac055b2fe 100644--- a/sc/inc/convuno.hxx+++ b/sc/inc/convuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: convuno.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/cursuno.hxx b/sc/inc/cursuno.hxxindex 156bd49c0a7e..470f4e3c6f5c 100644--- a/sc/inc/cursuno.hxx+++ b/sc/inc/cursuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cursuno.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxxindex 86f395f525ca..ba695d8784bc 100644--- a/sc/inc/dapiuno.hxx+++ b/sc/inc/dapiuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dapiuno.hxx,v $- * $Revision: 1.10.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxxindex 6cd2d1555bdf..79902b367ac7 100644--- a/sc/inc/datauno.hxx+++ b/sc/inc/datauno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: datauno.hxx,v $- * $Revision: 1.8.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,8 +29,8 @@ #define SC_DATAUNO_HXX #include "global.hxx"-#include <svl/itemprop.hxx>-#include <svl/lstner.hxx>+#include "queryparam.hxx"+ #include <com/sun/star/sheet/TableFilterField.hpp> #include <com/sun/star/sheet/GeneralFunction.hpp> #include <com/sun/star/sheet/XCellRangeReferrer.hpp>@@ -56,6 +53,8 @@ #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase5.hxx> #include <cppuhelper/implbase6.hxx>+#include "svl/itemprop.hxx"+#include "svl/lstner.hxx" class ScDBData; class ScDocShell;diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxxindex 3d9d357b512b..488263bebf53 100644--- a/sc/inc/dbcolect.hxx+++ b/sc/inc/dbcolect.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbcolect.hxx,v $- * $Revision: 1.13.32.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxxindex fc7306747caf..3071b542f4b6 100644--- a/sc/inc/dbdocutl.hxx+++ b/sc/inc/dbdocutl.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbdocutl.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dbtoken.hxx b/sc/inc/dbtoken.hxxindex ffb8b8db6a34..1cdacfd97323 100644--- a/sc/inc/dbtoken.hxx+++ b/sc/inc/dbtoken.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbtoken.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxxindex b93c386a77f0..5ef4f501061a 100644--- a/sc/inc/defltuno.hxx+++ b/sc/inc/defltuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: defltuno.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxxindex b16b5a05778c..31055c270fbf 100644--- a/sc/inc/detdata.hxx+++ b/sc/inc/detdata.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: detdata.hxx,v $- * $Revision: 1.7.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxxindex 98922c1776b8..5c57d32af898 100644--- a/sc/inc/detfunc.hxx+++ b/sc/inc/detfunc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: detfunc.hxx,v $- * $Revision: 1.11.128.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxxindex b09a064ee797..9526ed8ae3db 100644--- a/sc/inc/dispuno.hxx+++ b/sc/inc/dispuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dispuno.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxxindex 3f9e77a82378..dd1d18e49a51 100644--- a/sc/inc/dociter.hxx+++ b/sc/inc/dociter.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dociter.hxx,v $- * $Revision: 1.9.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,6 +32,9 @@ #include <tools/solar.h> #include "global.hxx" #include "scdllapi.h"+#include "queryparam.hxx"++#include <memory> class ScDocument; class ScBaseCell;@@ -127,34 +127,97 @@ public: } }; -class ScQueryValueIterator // alle Zahlenwerte in einem Bereich durchgehen+// ============================================================================++class ScDBQueryDataIterator {+public:+ struct Value+ {+ ::rtl::OUString maString;+ double mfValue;+ sal_uInt16 mnError;+ bool mbIsNumber;++ Value();+ };+ private:- ScQueryParam aParam;- ScDocument* pDoc;- const ScAttrArray* pAttrArray;- ULONG nNumFormat; // fuer CalcAsShown- ULONG nNumFmtIndex;- SCCOL nCol;- SCROW nRow;- SCSIZE nColRow;- SCROW nAttrEndRow;- SCTAB nTab;- short nNumFmtType;- BOOL bCalcAsShown;+ static SCROW GetRowByColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCCOL nCol, SCSIZE nColRow);+ static ScBaseCell* GetCellByColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCCOL nCol, SCSIZE nColRow);+ static ScAttrArray* GetAttrArrayByCol(ScDocument& rDoc, SCTAB nTab, SCCOL nCol);+ static bool IsQueryValid(ScDocument& rDoc, const ScQueryParam& rParam, SCTAB nTab, SCROW nRow, ScBaseCell* pCell);+ static SCSIZE SearchColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCROW nRow, SCCOL nCol);++ class DataAccess+ {+ public:+ DataAccess(const ScDBQueryDataIterator* pParent);+ virtual ~DataAccess() = 0;+ virtual bool getCurrent(Value& rValue) = 0;+ virtual bool getFirst(Value& rValue) = 0;+ virtual bool getNext(Value& rValue) = 0;+ protected:+ const ScDBQueryDataIterator* mpParent;+ };++ class DataAccessInternal : public DataAccess+ {+ public:+ DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc);+ virtual ~DataAccessInternal();+ virtual bool getCurrent(Value& rValue);+ virtual bool getFirst(Value& rValue);+ virtual bool getNext(Value& rValue);++ private:+ ScDBQueryParamInternal* mpParam;+ ScDocument* mpDoc;+ const ScAttrArray* pAttrArray;+ ULONG nNumFormat; // for CalcAsShown+ ULONG nNumFmtIndex;+ SCCOL nCol;+ SCROW nRow;+ SCSIZE nColRow;+ SCROW nAttrEndRow;+ SCTAB nTab;+ short nNumFmtType;+ bool bCalcAsShown;+ };++ class DataAccessMatrix : public DataAccess+ {+ public:+ DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam);+ virtual ~DataAccessMatrix();+ virtual bool getCurrent(Value& rValue);+ virtual bool getFirst(Value& rValue);+ virtual bool getNext(Value& rValue);++ private:+ bool isValidQuery(SCROW mnRow, const ScMatrix& rMat) const;++ ScDBQueryParamMatrix* mpParam;+ SCROW mnCurRow;+ SCROW mnRows;+ SCCOL mnCols;+ };++ ::std::auto_ptr<ScDBQueryParamBase> mpParam;+ ::std::auto_ptr<DataAccess> mpData;++ bool GetThis(Value& rValue); - BOOL GetThis(double& rValue, USHORT& rErr); public:- ScQueryValueIterator(ScDocument* pDocument, SCTAB nTable,- const ScQueryParam& aParam);+ ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam); /// Does NOT reset rValue if no value found!- BOOL GetFirst(double& rValue, USHORT& rErr);+ bool GetFirst(Value& rValue); /// Does NOT reset rValue if no value found!- BOOL GetNext(double& rValue, USHORT& rErr);- void GetCurNumFmtInfo( short& nType, ULONG& nIndex )- { nType = nNumFmtType; nIndex = nNumFmtIndex; }+ bool GetNext(Value& rValue); }; +// ============================================================================+ class ScCellIterator // alle Zellen in einem Bereich durchgehen { // bei SubTotal aber keine ausgeblendeten und private: // SubTotalZeilendiff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxxindex f102b5ea966d..9dd1057db67f 100644--- a/sc/inc/docoptio.hxx+++ b/sc/inc/docoptio.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docoptio.hxx,v $- * $Revision: 1.7.32.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxxindex 52cf1a968163..d366ef1ec25a 100644--- a/sc/inc/docpool.hxx+++ b/sc/inc/docpool.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docpool.hxx,v $- * $Revision: 1.10.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/document.hxx b/sc/inc/document.hxxindex cc575b529d73..44bda96f8322 100644--- a/sc/inc/document.hxx+++ b/sc/inc/document.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: document.hxx,v $- * $Revision: 1.115.36.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -69,7 +66,9 @@ class SvxBoxInfoItem; class SvxBoxItem; class SvxBrushItem; class SvxForbiddenCharactersTable;-class SvxLinkManager;+namespace sfx2 {+ class LinkManager;+ } class SvxSearchItem; class SvxShadowItem; class Window;@@ -227,7 +226,7 @@ class ScDocument { friend class ScDocumentIterator; friend class ScValueIterator;-friend class ScQueryValueIterator;+friend class ScDBQueryDataIterator; friend class ScCellIterator; friend class ScQueryCellIterator; friend class ScHorizontalCellIterator;@@ -260,7 +259,7 @@ private: ScChartCollection* pChartCollection; std::auto_ptr< ScTemporaryChartLock > apTemporaryChartLock; ScPatternAttr* pSelectionAttr; // Attribute eines Blocks- mutable SvxLinkManager* pLinkManager;+ mutable sfx2::LinkManager* pLinkManager; ScFormulaCell* pFormulaTree; // Berechnungsbaum Start ScFormulaCell* pEOFormulaTree; // Berechnungsbaum Ende, letzte Zelle ScFormulaCell* pFormulaTrack; // BroadcastTrack Start@@ -291,6 +290,7 @@ private: mxFormulaParserPool; /// Pool for all external formula parsers used by this document. String aDocName; // opt: Dokumentname+ String aDocCodeName; // opt: Dokumentname ScRangePairListRef xColNameRanges; ScRangePairListRef xRowNameRanges; @@ -420,6 +420,7 @@ private: public: SC_DLLPUBLIC ULONG GetCellCount() const; // alle Zellen+ SCSIZE GetCellCount(SCTAB nTab, SCCOL nCol) const; ULONG GetWeightedCount() const; // Formeln und Edit staerker gewichtet ULONG GetCodeCount() const; // RPN-Code in Formeln DECL_LINK( GetUserDefinedColor, USHORT * );@@ -435,13 +436,15 @@ public: SC_DLLPUBLIC const String& GetName() const { return aDocName; } void SetName( const String& r ) { aDocName = r; }+ const String& GetCodeName() const { return aDocCodeName; }+ void SetCodeName( const String& r ) { aDocCodeName = r; } void GetDocStat( ScDocStat& rDocStat ); SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = NULL ); XColorTable* GetColorTable(); - SC_DLLPUBLIC SvxLinkManager* GetLinkManager() const;+ SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager() const; SC_DLLPUBLIC const ScDocOptions& GetDocOptions() const; SC_DLLPUBLIC void SetDocOptions( const ScDocOptions& rOpt );@@ -520,6 +523,8 @@ public: SC_DLLPUBLIC BOOL HasTable( SCTAB nTab ) const; SC_DLLPUBLIC BOOL GetName( SCTAB nTab, String& rName ) const;+ SC_DLLPUBLIC BOOL GetCodeName( SCTAB nTab, String& rName ) const;+ SC_DLLPUBLIC BOOL SetCodeName( SCTAB nTab, String& rName ); SC_DLLPUBLIC BOOL GetTable( const String& rName, SCTAB& rTab ) const; SC_DLLPUBLIC inline SCTAB GetTableCount() const { return nMaxTableNumber; } SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; }diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxxindex 95d9ebc35a7c..15a0c5e72359 100644--- a/sc/inc/docuno.hxx+++ b/sc/inc/docuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docuno.hxx,v $- * $Revision: 1.27.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxxindex 2115eab7cc42..60dba0bc27db 100644--- a/sc/inc/dpcachetable.hxx+++ b/sc/inc/dpcachetable.hxx@@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpcachetable.hxx,v $- *- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -60,6 +56,7 @@ class ScDPDimension; class ScDPCollection; struct ScDPCacheCell; struct ScDPItemData;+struct ScQueryParam; class Date; // ----------------------------------------------------------------------------diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxxindex 4c711eb67eb7..f887ed91ea32 100644--- a/sc/inc/dpdimsave.hxx+++ b/sc/inc/dpdimsave.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpdimsave.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxxindex cb933f4d2a98..39770d2adffd 100644--- a/sc/inc/dpgroup.hxx+++ b/sc/inc/dpgroup.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpgroup.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxxindex ef7a2c491c50..917d62f38bfe 100644--- a/sc/inc/dpobject.hxx+++ b/sc/inc/dpobject.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpobject.hxx,v $- * $Revision: 1.15 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxxindex e3ab86423d4b..e97a56a9ecf2 100644--- a/sc/inc/dpoutput.hxx+++ b/sc/inc/dpoutput.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpoutput.hxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dpoutputgeometry.hxx b/sc/inc/dpoutputgeometry.hxxindex b665c9cc88b4..7069787e803d 100644--- a/sc/inc/dpoutputgeometry.hxx+++ b/sc/inc/dpoutputgeometry.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmldpimp.cxx,v $- * $Revision: 1.27.134.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxxindex 86093ac8614b..587e23d8109b 100644--- a/sc/inc/dpsave.hxx+++ b/sc/inc/dpsave.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpsave.hxx,v $- * $Revision: 1.11.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxxindex b837b5811aad..1f980bdec3bf 100644--- a/sc/inc/dpsdbtab.hxx+++ b/sc/inc/dpsdbtab.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpsdbtab.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxxindex 0bcdbeee517e..a0e67371eff1 100644--- a/sc/inc/dpshttab.hxx+++ b/sc/inc/dpshttab.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpshttab.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,6 +32,7 @@ #include "global.hxx" #include "address.hxx" #include "scdllapi.h"+#include "queryparam.hxx" #include <vector> diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxxindex 46c26b3f0bbe..43c719e9ee16 100644--- a/sc/inc/dptabdat.hxx+++ b/sc/inc/dptabdat.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dptabdat.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxxindex a2574820da4a..d4e8807d4a3b 100644--- a/sc/inc/dptabres.hxx+++ b/sc/inc/dptabres.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dptabres.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxxindex 94229f5b1d35..d2884281e1b8 100644--- a/sc/inc/dptabsrc.hxx+++ b/sc/inc/dptabsrc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dptabsrc.hxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxxindex ad0ce37e35c3..ee4f48ad9cf5 100644--- a/sc/inc/drawattr.hxx+++ b/sc/inc/drawattr.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawattr.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -31,7 +28,7 @@ #define _IDLITEMS_HXX #include <svl/eitem.hxx>-#include <svx/svxenum.hxx>+#include <editeng/svxenum.hxx> class SvxDrawToolItem : public SfxEnumItemdiff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxxindex ff2f32a1d7ac..9c39fc71e5af 100644--- a/sc/inc/drawpage.hxx+++ b/sc/inc/drawpage.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawpage.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/drdefuno.hxx b/sc/inc/drdefuno.hxxindex 4b0a534dc655..09fd3368271e 100644--- a/sc/inc/drdefuno.hxx+++ b/sc/inc/drdefuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drdefuno.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxxindex a0492d82a2f3..563cf768b5ae 100644--- a/sc/inc/drwlayer.hxx+++ b/sc/inc/drwlayer.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drwlayer.hxx,v $- * $Revision: 1.21.128.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxxindex 3dd928384fe8..ed4423d629a8 100644--- a/sc/inc/editsrc.hxx+++ b/sc/inc/editsrc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: editsrc.hxx,v $- * $Revision: 1.17.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,7 +29,7 @@ #define SC_EDITSRC_HXX #include "address.hxx"-#include <svx/unoedsrc.hxx>+#include <editeng/unoedsrc.hxx> #include <svl/lstner.hxx> #include <memory>diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxxindex b61bdf72ef7b..aefa789d2587 100644--- a/sc/inc/editutil.hxx+++ b/sc/inc/editutil.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: editutil.hxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,7 +30,7 @@ #include "scdllapi.h" #include "address.hxx"-#include <svx/editeng.hxx>+#include <editeng/editeng.hxx> #include <svx/pageitem.hxx> #include <tools/date.hxx> #include <tools/time.hxx>diff --git a/sc/inc/eetext.hxx b/sc/inc/eetext.hxxindex 3e6300aaf2bb..28ee0d5f09b2 100644--- a/sc/inc/eetext.hxx+++ b/sc/inc/eetext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: eetext.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxxindex 90adedd6d346..ae37b710a074 100644--- a/sc/inc/externalrefmgr.hxx+++ b/sc/inc/externalrefmgr.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: externalrefmgr.hxx,v $- * $Revision: 1.1.2.23 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxxindex 6d777b38424a..584d62451cc6 100644--- a/sc/inc/fielduno.hxx+++ b/sc/inc/fielduno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fielduno.hxx,v $- * $Revision: 1.8.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ #include <svl/lstner.hxx> #include <svl/itemprop.hxx>-#include <svx/editdata.hxx>+#include <editeng/editdata.hxx> #include <com/sun/star/text/XTextField.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XContainer.hpp>diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxxindex d0be5b0cb897..8dead5b4fb05 100644--- a/sc/inc/fillinfo.hxx+++ b/sc/inc/fillinfo.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fillinfo.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxxindex 157795db2a42..8e3e540c9038 100644--- a/sc/inc/filter.hxx+++ b/sc/inc/filter.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filter.hxx,v $- * $Revision: 1.8.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxxindex 9170cca94c57..0efdfeeb5a30 100644--- a/sc/inc/filtopt.hxx+++ b/sc/inc/filtopt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filtopt.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxxindex eedfa0ffcf70..2bddb7fdd02c 100644--- a/sc/inc/filtuno.hxx+++ b/sc/inc/filtuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filtuno.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxxindex ccd93d982bdf..eebd808c30a4 100644--- a/sc/inc/fmtuno.hxx+++ b/sc/inc/fmtuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fmtuno.hxx,v $- * $Revision: 1.10.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/forbiuno.hxx b/sc/inc/forbiuno.hxxindex 305d818a299d..05e23cf96506 100644--- a/sc/inc/forbiuno.hxx+++ b/sc/inc/forbiuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: forbiuno.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -31,7 +28,7 @@ #ifndef SC_FORBIUNO_HXX #define SC_FORBIUNO_HXX -#include <svx/UnoForbiddenCharsTable.hxx>+#include <editeng/UnoForbiddenCharsTable.hxx> #include <svl/lstner.hxx> class ScDocShell;diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxxindex af6b0ed3ebf1..c65f7f9428ce 100644--- a/sc/inc/formulaparserpool.hxx+++ b/sc/inc/formulaparserpool.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formulaparserpool.hxx,v $- * $Revision: 1.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxxindex c8f50a92cd0b..bd99cca8f5d9 100644--- a/sc/inc/formularesult.hxx+++ b/sc/inc/formularesult.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formularesult.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxxindex fa07e663063f..a8f495440554 100644--- a/sc/inc/funcdesc.hxx+++ b/sc/inc/funcdesc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: funcdesc.hxx,v $- * $Revision: 1.3.30.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxxindex 4c45cdb627bc..3eef9082e26d 100644--- a/sc/inc/funcuno.hxx+++ b/sc/inc/funcuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: funcuno.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/global.hxx b/sc/inc/global.hxxindex c938968ddfef..8bcbd50b0f3c 100644--- a/sc/inc/global.hxx+++ b/sc/inc/global.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: global.hxx,v $- * $Revision: 1.53.128.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -817,47 +814,6 @@ struct ScQueryEntry BOOL operator==( const ScQueryEntry& r ) const; }; -struct SC_DLLPUBLIC ScQueryParam-{- SCCOL nCol1;- SCROW nRow1;- SCCOL nCol2;- SCROW nRow2;- SCTAB nTab;- BOOL bHasHeader;- BOOL bByRow;- BOOL bInplace;- BOOL bCaseSens;- BOOL bRegExp;- BOOL bMixedComparison; // whether numbers are smaller than strings- BOOL bDuplicate;- BOOL bDestPers; // nicht gespeichert- SCTAB nDestTab;- SCCOL nDestCol;- SCROW nDestRow;--private:- SCSIZE nEntryCount;- ScQueryEntry* pEntries;--public:- ScQueryParam();- ScQueryParam( const ScQueryParam& r );- ~ScQueryParam();-- SCSIZE GetEntryCount() const { return nEntryCount; }- ScQueryEntry& GetEntry(SCSIZE n) const { return pEntries[n]; }- void Resize(SCSIZE nNew);-- ScQueryParam& operator= ( const ScQueryParam& r );- BOOL operator== ( const ScQueryParam& rOther ) const;- void Clear ();- void DeleteQuery( SCSIZE nPos );-- void MoveToDest();- void FillInExcelSyntax(String& aCellStr, SCSIZE nIndex);-};- // ----------------------------------------------------------------------- struct SC_DLLPUBLIC ScSubTotalParamdiff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrcindex 97d77dc06fc5..c635877e2ea2 100644--- a/sc/inc/globstr.hrc+++ b/sc/inc/globstr.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: globstr.hrc,v $- * $Revision: 1.22.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxxindex 889dc302fcf6..00791921527d 100644--- a/sc/inc/hints.hxx+++ b/sc/inc/hints.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hints.hxx,v $- * $Revision: 1.5.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxxindex 4d56f70b4d33..62e258b76500 100644--- a/sc/inc/inputopt.hxx+++ b/sc/inc/inputopt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: inputopt.hxx,v $- * $Revision: 1.5.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxxindex 1a9479dff278..50b33c692752 100644--- a/sc/inc/linkuno.hxx+++ b/sc/inc/linkuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: linkuno.hxx,v $- * $Revision: 1.7.134.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/listenercalls.hxx b/sc/inc/listenercalls.hxxindex e84692c37e85..988cd2a24dd7 100644--- a/sc/inc/listenercalls.hxx+++ b/sc/inc/listenercalls.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: listenercalls.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxxindex 9261a6db0395..431f995d27c2 100644--- a/sc/inc/lookupcache.hxx+++ b/sc/inc/lookupcache.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lookupcache.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/makefile.mk b/sc/inc/makefile.mkindex 64c363b0e2c4..a3bcf29670a1 100644--- a/sc/inc/makefile.mk+++ b/sc/inc/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.3 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxxindex 84d7a9d88a1a..78bb2a6bba3d 100644--- a/sc/inc/markarr.hxx+++ b/sc/inc/markarr.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: markarr.hxx,v $- * $Revision: 1.6.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxxindex 4405684f93f4..a982c8db47dd 100644--- a/sc/inc/markdata.hxx+++ b/sc/inc/markdata.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: markdata.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxxindex df60b2822cb8..d1958eccceac 100644--- a/sc/inc/miscuno.hxx+++ b/sc/inc/miscuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: miscuno.hxx,v $- * $Revision: 1.9.32.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/mutexhlp.hxx b/sc/inc/mutexhlp.hxxindex 5d05e5982b58..bd45332b9817 100644--- a/sc/inc/mutexhlp.hxx+++ b/sc/inc/mutexhlp.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: mutexhlp.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxxindex 240cead3be83..b8cb1ad91754 100644--- a/sc/inc/nameuno.hxx+++ b/sc/inc/nameuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: nameuno.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/navicfg.hxx b/sc/inc/navicfg.hxxindex c960cef1ec06..23cd38e1f10a 100644--- a/sc/inc/navicfg.hxx+++ b/sc/inc/navicfg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: navicfg.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxxindex 4cf8148eff17..a1648132f8e1 100644--- a/sc/inc/notesuno.hxx+++ b/sc/inc/notesuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: notesuno.hxx,v $- * $Revision: 1.5.128.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxxindex 4d42accdf729..3ffc03f4a249 100644--- a/sc/inc/olinetab.hxx+++ b/sc/inc/olinetab.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: olinetab.hxx,v $- * $Revision: 1.6.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxxindex 648fc182a6a2..094ff1cfea32 100644--- a/sc/inc/optuno.hxx+++ b/sc/inc/optuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optuno.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxxindex a00b3495d766..c197076ee642 100644--- a/sc/inc/optutil.hxx+++ b/sc/inc/optutil.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optutil.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/pagepar.hxx b/sc/inc/pagepar.hxxindex 0ed0ca1be7ea..935046e81a48 100644--- a/sc/inc/pagepar.hxx+++ b/sc/inc/pagepar.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pagepar.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxxindex 74ae1ca1e7df..4b897748db1e 100644--- a/sc/inc/pageuno.hxx+++ b/sc/inc/pageuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pageuno.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/paramisc.hxx b/sc/inc/paramisc.hxxindex d71d6650a66a..896fec2e88d9 100644--- a/sc/inc/paramisc.hxx+++ b/sc/inc/paramisc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: paramisc.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxxindex 65d350455ddd..b8929a450576 100644--- a/sc/inc/patattr.hxx+++ b/sc/inc/patattr.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: patattr.hxx,v $- * $Revision: 1.14.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,7 +31,7 @@ #include <svl/poolitem.hxx> #include <svl/itemset.hxx> #include <unotools/fontcvt.hxx>-#include <svx/svxenum.hxx>+#include <editeng/svxenum.hxx> #include "scdllapi.h" class Font;diff --git a/sc/inc/pch/precompiled_sc.cxx b/sc/inc/pch/precompiled_sc.cxxindex 5b5f7ead4070..6d7b708ffd69 100755--- a/sc/inc/pch/precompiled_sc.cxx+++ b/sc/inc/pch/precompiled_sc.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: precompiled_sc.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxxindex dbb86fdf7484..048d7b638d57 100644--- a/sc/inc/pch/precompiled_sc.hxx+++ b/sc/inc/pch/precompiled_sc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: precompiled_sc.hxx,v $- * $Revision: 1.8.160.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -162,10 +159,10 @@ #include <unotools/pathoptions.hxx> #include <svl/solar.hrc> #include <unotools/useroptions.hxx>-#include <svx/editobj.hxx>-#include <svx/eeitem.hxx>+#include <editeng/editobj.hxx>+#include <editeng/eeitem.hxx> #include <svx/fmglob.hxx>-#include <svx/outlobj.hxx>+#include <editeng/outlobj.hxx> #include <svx/sdangitm.hxx> #include <svx/sderitm.hxx> #include <svx/sdmetitm.hxx>diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxxindex 100463cb5542..2a1f17846afd 100644--- a/sc/inc/pivot.hxx+++ b/sc/inc/pivot.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pivot.hxx,v $- * $Revision: 1.8.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxxindex ee90a71375b4..a4363e3adfbc 100644--- a/sc/inc/postit.hxx+++ b/sc/inc/postit.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: postit.hxx,v $- * $Revision: 1.7.128.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxxindex 0c90ba4497fc..ec063d2d0e9b 100644--- a/sc/inc/printopt.hxx+++ b/sc/inc/printopt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: printopt.hxx,v $- * $Revision: 1.5.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/prnsave.hxx b/sc/inc/prnsave.hxxindex 2db0e03d618c..b28d04cf48bf 100644--- a/sc/inc/prnsave.hxx+++ b/sc/inc/prnsave.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: prnsave.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxxindex c7706c2bc26b..a9cd3d2544bd 100644--- a/sc/inc/progress.hxx+++ b/sc/inc/progress.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: progress.hxx,v $- * $Revision: 1.3.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxxnew file mode 100644index 000000000000..8e84f1e53e36--- /dev/null+++ b/sc/inc/queryparam.hxx@@ -0,0 +1,142 @@+/*************************************************************************+ *+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.+ *+ * Copyright 2008 by Sun Microsystems, Inc.+ *+ * OpenOffice.org - a multi-platform office productivity suite+ *+ * $RCSfile: interpre.hxx,v $+ * $Revision: 1.35.44.2 $+ *+ * This file is part of OpenOffice.org.+ *+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation.+ *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code).+ *+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License.+ *+ ************************************************************************/++#ifndef SC_QUERYPARAM_HXX+#define SC_QUERYPARAM_HXX++#include "global.hxx"+#include "scmatrix.hxx"++#include <vector>++struct ScDBQueryParamInternal;++struct ScQueryParamBase+{+ bool bHasHeader;+ bool bByRow;+ bool bInplace;+ bool bCaseSens;+ bool bRegExp;+ bool bDuplicate;+ bool bMixedComparison; // whether numbers are smaller than strings++ virtual ~ScQueryParamBase();++ SC_DLLPUBLIC SCSIZE GetEntryCount() const;+ SC_DLLPUBLIC ScQueryEntry& GetEntry(SCSIZE n) const;+ void Resize(SCSIZE nNew);+ SC_DLLPUBLIC void DeleteQuery( SCSIZE nPos );+ void FillInExcelSyntax(String& aCellStr, SCSIZE nIndex);++protected:+ ScQueryParamBase();+ ScQueryParamBase(const ScQueryParamBase& r);++ mutable ::std::vector<ScQueryEntry> maEntries;+};++// ============================================================================++struct ScQueryParamTable+{+ SCCOL nCol1;+ SCROW nRow1;+ SCCOL nCol2;+ SCROW nRow2;+ SCTAB nTab;++ ScQueryParamTable();+ ScQueryParamTable(const ScQueryParamTable& r);+ virtual ~ScQueryParamTable();+};++// ============================================================================++struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamTable+{+ BOOL bDestPers; // nicht gespeichert+ SCTAB nDestTab;+ SCCOL nDestCol;+ SCROW nDestRow;++ ScQueryParam();+ ScQueryParam( const ScQueryParam& r );+ ScQueryParam( const ScDBQueryParamInternal& r );+ virtual ~ScQueryParam();++ ScQueryParam& operator= ( const ScQueryParam& r );+ BOOL operator== ( const ScQueryParam& rOther ) const;+ void Clear();+ void ClearDestParams();+ void MoveToDest();+};++// ============================================================================++struct ScDBQueryParamBase : public ScQueryParamBase+{+ enum DataType { INTERNAL, MATRIX };++ SCCOL mnField; /// the field in which the values are processed during iteration.+ bool mbSkipString;++ DataType GetType() const;++ virtual ~ScDBQueryParamBase();++protected:+ ScDBQueryParamBase(DataType eType);++private:+ ScDBQueryParamBase();++ DataType meType;+};++// ============================================================================++struct ScDBQueryParamInternal : public ScDBQueryParamBase, public ScQueryParamTable+{+ ScDBQueryParamInternal();+ virtual ~ScDBQueryParamInternal();+};++// ============================================================================++struct ScDBQueryParamMatrix : public ScDBQueryParamBase+{+ ScMatrixRef mpMatrix;++ ScDBQueryParamMatrix();+ virtual ~ScDBQueryParamMatrix();+};++#endifdiff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxxindex e2ceba32b2f1..2350cea085f0 100644--- a/sc/inc/rangelst.hxx+++ b/sc/inc/rangelst.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rangelst.hxx,v $- * $Revision: 1.9.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxxindex 9963cf65c895..a9f324b8b737 100644--- a/sc/inc/rangenam.hxx+++ b/sc/inc/rangenam.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rangenam.hxx,v $- * $Revision: 1.16.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxxindex 895a337f2197..6238ea5f8050 100644--- a/sc/inc/rangeseq.hxx+++ b/sc/inc/rangeseq.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rangeseq.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxxindex 5e07064cb3fd..ea5d2a901b54 100644--- a/sc/inc/rangeutl.hxx+++ b/sc/inc/rangeutl.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rangeutl.hxx,v $- * $Revision: 1.10.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxxindex a9e8a5cacd53..348159c12ce1 100644--- a/sc/inc/rechead.hxx+++ b/sc/inc/rechead.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rechead.hxx,v $- * $Revision: 1.4.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxxindex 64a8bf97659e..7b24e1a409b4 100644--- a/sc/inc/recursionhelper.hxx+++ b/sc/inc/recursionhelper.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: recursionhelper.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxxindex 12f29943fce0..f42f930084be 100644--- a/sc/inc/refdata.hxx+++ b/sc/inc/refdata.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: refdata.hxx,v $- * $Revision: 1.7.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxxindex 0752e8685b74..775571adeab7 100644--- a/sc/inc/reffind.hxx+++ b/sc/inc/reffind.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: reffind.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxxindex e8e213484f96..2a8512848ef0 100644--- a/sc/inc/refreshtimer.hxx+++ b/sc/inc/refreshtimer.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: refreshtimer.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxxindex 5b06450ea56f..86fd36f691fa 100644--- a/sc/inc/reftokenhelper.hxx+++ b/sc/inc/reftokenhelper.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: token.hxx,v $- * $Revision: 1.15.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -70,12 +67,12 @@ public: static void getTokensFromRangeList(::std::vector<ScSharedTokenRef>& pTokens, const ScRangeList& rRanges); - static bool isRef(const ScSharedTokenRef& pToken);- static bool isExternalRef(const ScSharedTokenRef& pToken);+ static bool SC_DLLPUBLIC isRef(const ScSharedTokenRef& pToken);+ static bool SC_DLLPUBLIC isExternalRef(const ScSharedTokenRef& pToken); - static bool intersects(const ::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);+ static bool SC_DLLPUBLIC intersects(const ::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken); - static void join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);+ static void SC_DLLPUBLIC join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken); static bool getDoubleRefDataFromToken(ScComplexRefData& rData, const ScSharedTokenRef& pToken); };diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrcindex 62114c892ec3..d9bce97f1bc8 100644--- a/sc/inc/sc.hrc+++ b/sc/inc/sc.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sc.hrc,v $- * $Revision: 1.63 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxxindex ba62b9a5de06..f33077b3e090 100644--- a/sc/inc/scabstdlg.hxx+++ b/sc/inc/scabstdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scabstdlg.hxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxxindex 64b568076d28..1d2304c2a0f2 100644--- a/sc/inc/scdll.hxx+++ b/sc/inc/scdll.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scdll.hxx,v $- * $Revision: 1.5.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxxindex 3b05a876163a..4f128ed57604 100644--- a/sc/inc/scerrors.hxx+++ b/sc/inc/scerrors.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scerrors.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxxindex fdf05430cc69..b02df9816ef4 100644--- a/sc/inc/scextopt.hxx+++ b/sc/inc/scextopt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scextopt.hxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -124,6 +121,8 @@ public: const String& GetCodeName( size_t nIdx ) const; /** Appends a codename for a sheet. */ void AppendCodeName( const String& rCodeName );+ void SetCodeName( const String& rCodeName, size_t nIdx );+ void DeleteCodeName( size_t nIdx ); private: ::std::auto_ptr< ScExtDocOptionsImpl > mxImpl;diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrcindex 678ad0ffb251..8188deca5f40 100644--- a/sc/inc/scfuncs.hrc+++ b/sc/inc/scfuncs.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scfuncs.hrc,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/scimpexpmsg.hxx b/sc/inc/scimpexpmsg.hxxindex d74a7f0f1ee2..5574edd12083 100644--- a/sc/inc/scimpexpmsg.hxx+++ b/sc/inc/scimpexpmsg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scimpexpmsg.hxx,v $- * $Revision: 1.4.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxxindex 51e5ccd457ba..6788c906cb8d 100644--- a/sc/inc/scitems.hxx+++ b/sc/inc/scitems.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scitems.hxx,v $- * $Revision: 1.12.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxxindex 7f3b5443d9d9..494ab86b0c74 100644--- a/sc/inc/scmatrix.hxx+++ b/sc/inc/scmatrix.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scmatrix.hxx,v $- * $Revision: 1.11.148.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxxindex bf7f8810fec3..ee2c956e7742 100644--- a/sc/inc/scmod.hxx+++ b/sc/inc/scmod.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scmod.hxx,v $- * $Revision: 1.24.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxxindex 348ef05d3d1d..067e5f03e307 100644--- a/sc/inc/scresid.hxx+++ b/sc/inc/scresid.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scresid.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/scwarngs.hxx b/sc/inc/scwarngs.hxxindex 3b695208ead7..e823a66f7a80 100644--- a/sc/inc/scwarngs.hxx+++ b/sc/inc/scwarngs.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scwarngs.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/segdefs.hxx b/sc/inc/segdefs.hxxindex 77351a4847fe..6e2153ddb6a5 100644--- a/sc/inc/segdefs.hxx+++ b/sc/inc/segdefs.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: segdefs.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/segdefs_.hxx b/sc/inc/segdefs_.hxxindex f7f629a45bec..10e020d9da60 100644--- a/sc/inc/segdefs_.hxx+++ b/sc/inc/segdefs_.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: segdefs_.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxxindex ace44dc5be4d..785e5e4049d0 100644--- a/sc/inc/servuno.hxx+++ b/sc/inc/servuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: servuno.hxx,v $- * $Revision: 1.14.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -93,8 +90,9 @@ class ScDocShell; #define SC_SERVICE_FORMULAPARS 38 #define SC_SERVICE_OPCODEMAPPER 39+#define SC_SERVICE_VBACODENAMEPROVIDER 40 -#define SC_SERVICE_COUNT 40+#define SC_SERVICE_COUNT 41 #define SC_SERVICE_INVALID USHRT_MAX diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxxindex fe8912b87257..ddbbf3108daf 100644--- a/sc/inc/shapeuno.hxx+++ b/sc/inc/shapeuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: shapeuno.hxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxxindex 63853f6bc675..e23402c5fff0 100644--- a/sc/inc/sheetdata.hxx+++ b/sc/inc/sheetdata.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sheetdata.hxx,v $- * $Revision: 1.16.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,7 +29,7 @@ #define SC_SHEETDATA_HXX #include <xmloff/maptype.hxx>-#include <svx/editdata.hxx>+#include <editeng/editdata.hxx> #include <vector> #include <hash_set> diff --git a/sc/inc/shellids.hxx b/sc/inc/shellids.hxxindex 4e5388cb7533..7f4ccb60259f 100644--- a/sc/inc/shellids.hxx+++ b/sc/inc/shellids.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: shellids.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxxindex bf21e495e021..650293893678 100644--- a/sc/inc/sortparam.hxx+++ b/sc/inc/sortparam.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sortparam.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxxindex ffa54cf29d70..f8f82ed25aff 100644--- a/sc/inc/srchuno.hxx+++ b/sc/inc/srchuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: srchuno.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxxindex ce1d643cd27f..946a861231d9 100644--- a/sc/inc/stlpool.hxx+++ b/sc/inc/stlpool.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: stlpool.hxx,v $- * $Revision: 1.6.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxxindex ddbbc41b4f80..4e42be6e2563 100644--- a/sc/inc/stlsheet.hxx+++ b/sc/inc/stlsheet.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: stlsheet.hxx,v $- * $Revision: 1.5.46.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/strload.hxx b/sc/inc/strload.hxxindex 1af3d953c6e0..6b44d8e4e3ef 100644--- a/sc/inc/strload.hxx+++ b/sc/inc/strload.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: strload.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxxindex 34d1b8d3302c..a1dee10fd75d 100644--- a/sc/inc/styleuno.hxx+++ b/sc/inc/styleuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: styleuno.hxx,v $- * $Revision: 1.6.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxxindex 92e03e140288..4349c2759ae9 100644--- a/sc/inc/subtotal.hxx+++ b/sc/inc/subtotal.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: subtotal.hxx,v $- * $Revision: 1.5.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/table.hxx b/sc/inc/table.hxxindex f400054d00b7..55d31d30430e 100644--- a/sc/inc/table.hxx+++ b/sc/inc/table.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: table.hxx,v $- * $Revision: 1.35.126.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -89,6 +86,7 @@ private: ScColumn aCol[MAXCOLCOUNT]; String aName;+ String aCodeName; String aComment; BOOL bScenario; BOOL bLayoutRTL;@@ -161,7 +159,7 @@ private: friend class ScDocument; // fuer FillInfo friend class ScDocumentIterator; friend class ScValueIterator;-friend class ScQueryValueIterator;+friend class ScDBQueryDataIterator; friend class ScCellIterator; friend class ScQueryCellIterator; friend class ScHorizontalCellIterator;@@ -177,6 +175,7 @@ public: ScOutlineTable* GetOutlineTable() { return pOutlineTable; } + SCSIZE GetCellCount(SCCOL nCol) const; ULONG GetCellCount() const; ULONG GetWeightedCount() const; ULONG GetCodeCount() const; // RPN-Code in Formeln@@ -229,6 +228,9 @@ public: void GetName( String& rName ) const; void SetName( const String& rNewName ); + void GetCodeName( String& rName ) const { rName = aCodeName; }+ void SetCodeName( const String& rNewName ) { aCodeName = rNewName; }+ const String& GetUpperName() const; const String& GetPageStyle() const { return aPageStyle; }diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxxindex b52c8efa6528..72b4de611c2e 100644--- a/sc/inc/tablink.hxx+++ b/sc/inc/tablink.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tablink.hxx,v $- * $Revision: 1.19 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/tabopparams.hxx b/sc/inc/tabopparams.hxxindex 6c273be1f176..7baa461061fd 100644--- a/sc/inc/tabopparams.hxx+++ b/sc/inc/tabopparams.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabopparams.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxxindex a11355833e4c..d8dbd45d27fa 100644--- a/sc/inc/tabprotection.hxx+++ b/sc/inc/tabprotection.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabprotection.hxx,v $- * $Revision: 1.1.4.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxxindex db8670521c25..857f4c0c25e2 100644--- a/sc/inc/targuno.hxx+++ b/sc/inc/targuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: targuno.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxxindex 64eb2aaba696..e8ff73bf7d85 100644--- a/sc/inc/textuno.hxx+++ b/sc/inc/textuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: textuno.hxx,v $- * $Revision: 1.15.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,7 +30,7 @@ #include "global.hxx" // ScRange, ScAddress #include "address.hxx"-#include <svx/unotext.hxx>+#include <editeng/unotext.hxx> #include <svl/brdcst.hxx> #include <svl/lstner.hxx> #include <com/sun/star/text/XTextFieldsSupplier.hpp>diff --git a/sc/inc/token.hxx b/sc/inc/token.hxxindex 8aabb0fe725f..e4659921e7be 100644--- a/sc/inc/token.hxx+++ b/sc/inc/token.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: token.hxx,v $- * $Revision: 1.15.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxxindex 59602b2f549d..5ded8f4410d3 100644--- a/sc/inc/tokenarray.hxx+++ b/sc/inc/tokenarray.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tokenarray.hxx,v $- * $Revision: 1.12.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxxindex 0c573c6961c1..c727063281e6 100644--- a/sc/inc/tokenuno.hxx+++ b/sc/inc/tokenuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tokenuno.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxxindex 0310bf884d42..e21140699e4c 100644--- a/sc/inc/unitconv.hxx+++ b/sc/inc/unitconv.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: unitconv.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/unoguard.hxx b/sc/inc/unoguard.hxxindex d6568e2ad442..0768eada24d7 100644--- a/sc/inc/unoguard.hxx+++ b/sc/inc/unoguard.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: unoguard.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxxindex 18829290eb93..84e5c4b11cb1 100644--- a/sc/inc/unonames.hxx+++ b/sc/inc/unonames.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: unonames.hxx,v $- * $Revision: 1.82.104.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxxindex 08223d546c57..3947f28cfb12 100644--- a/sc/inc/unoreflist.hxx+++ b/sc/inc/unoreflist.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: unoreflist.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/unowids.hxx b/sc/inc/unowids.hxxindex aa75f9cc8404..1765b9d06361 100644--- a/sc/inc/unowids.hxx+++ b/sc/inc/unowids.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: unowids.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxxindex f49dd2d7fea0..88dea98ec22a 100644--- a/sc/inc/userdat.hxx+++ b/sc/inc/userdat.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: userdat.hxx,v $- * $Revision: 1.8.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxxindex 6d0e3720345b..7190cd189156 100644--- a/sc/inc/userlist.hxx+++ b/sc/inc/userlist.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: userlist.hxx,v $- * $Revision: 1.5.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxxindex e41d81990378..1bff57055f82 100644--- a/sc/inc/validat.hxx+++ b/sc/inc/validat.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: validat.hxx,v $- * $Revision: 1.15.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxxindex bf6c59117b0f..44625ad2aeb5 100644--- a/sc/inc/viewopti.hxx+++ b/sc/inc/viewopti.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: viewopti.hxx,v $- * $Revision: 1.8.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxxindex 045ca7aac598..988602b2056f 100644--- a/sc/inc/viewuno.hxx+++ b/sc/inc/viewuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: viewuno.hxx,v $- * $Revision: 1.12.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/waitoff.hxx b/sc/inc/waitoff.hxxindex 2e5ed4453af3..b17435f23d7f 100644--- a/sc/inc/waitoff.hxx+++ b/sc/inc/waitoff.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: waitoff.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/warnpassword.hxx b/sc/inc/warnpassword.hxxindex 50f29b58a9ba..15d35a70d8a2 100644--- a/sc/inc/warnpassword.hxx+++ b/sc/inc/warnpassword.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: warnpassword.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxxindex 7245ee4f45b3..926b6ef50cd1 100644--- a/sc/inc/xmlwrap.hxx+++ b/sc/inc/xmlwrap.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlwrap.hxx,v $- * $Revision: 1.16.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxxindex 7c39c26179a5..7c5e9a2f07cb 100644--- a/sc/inc/zforauto.hxx+++ b/sc/inc/zforauto.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: zforauto.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/calcPreview/ViewForwarder.java b/sc/qa/complex/calcPreview/ViewForwarder.javaindex 36430b7b210a..160dc1ebd20a 100755--- a/sc/qa/complex/calcPreview/ViewForwarder.java+++ b/sc/qa/complex/calcPreview/ViewForwarder.java@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: ViewForwarder.java,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/calcPreview/makefile.mk b/sc/qa/complex/calcPreview/makefile.mkindex d346f6ea9213..14f9428678e7 100755--- a/sc/qa/complex/calcPreview/makefile.mk+++ b/sc/qa/complex/calcPreview/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.4.138.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java b/sc/qa/complex/cellRanges/CheckXCellRangesQuery.javaindex 8006c31fa917..b23abe2d6a57 100755--- a/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java+++ b/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: CheckXCellRangesQuery.java,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/cellRanges/makefile.mk b/sc/qa/complex/cellRanges/makefile.mkindex 5ed6a3f083ff..fc296fe4f605 100755--- a/sc/qa/complex/cellRanges/makefile.mk+++ b/sc/qa/complex/cellRanges/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.4.138.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/dataPilot/CheckDataPilot.java b/sc/qa/complex/dataPilot/CheckDataPilot.javaindex cda58ecc6c58..d013daa24e1f 100644--- a/sc/qa/complex/dataPilot/CheckDataPilot.java+++ b/sc/qa/complex/dataPilot/CheckDataPilot.java@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: CheckDataPilot.java,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java b/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.javaindex d19758c01af7..57d6474f51b8 100644--- a/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java+++ b/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: _XPropertySet.java,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/dataPilot/interfaceTests/beans/makefile.mk b/sc/qa/complex/dataPilot/interfaceTests/beans/makefile.mkindex 307a56d77e14..6ef9f7456cbb 100644--- a/sc/qa/complex/dataPilot/interfaceTests/beans/makefile.mk+++ b/sc/qa/complex/dataPilot/interfaceTests/beans/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.6.138.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java b/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.javaindex b27485bf6923..97763be2b199 100644--- a/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java+++ b/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: _XNamed.java,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/dataPilot/interfaceTests/container/makefile.mk b/sc/qa/complex/dataPilot/interfaceTests/container/makefile.mkindex 1ebab5149b93..675fe7be9a1c 100644--- a/sc/qa/complex/dataPilot/interfaceTests/container/makefile.mk+++ b/sc/qa/complex/dataPilot/interfaceTests/container/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.6.138.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java b/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.javaindex bb82002c710c..8358e5bb6106 100644--- a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java+++ b/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: _XDataPilotDescriptor.java,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java b/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.javaindex 4ce9a80a7272..d7f6e81b91e5 100644--- a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java+++ b/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: _XDataPilotTable.java,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/dataPilot/interfaceTests/sheet/makefile.mk b/sc/qa/complex/dataPilot/interfaceTests/sheet/makefile.mkindex e7979bb863d3..350e3fcb8f19 100644--- a/sc/qa/complex/dataPilot/interfaceTests/sheet/makefile.mk+++ b/sc/qa/complex/dataPilot/interfaceTests/sheet/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.6.138.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/dataPilot/makefile.mk b/sc/qa/complex/dataPilot/makefile.mkindex bc20caca2e6f..a0bf1df34d0e 100644--- a/sc/qa/complex/dataPilot/makefile.mk+++ b/sc/qa/complex/dataPilot/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.7.138.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/sc/CalcRTL.java b/sc/qa/complex/sc/CalcRTL.javaindex 6257b83db3ef..9528c34b9267 100644--- a/sc/qa/complex/sc/CalcRTL.java+++ b/sc/qa/complex/sc/CalcRTL.java@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: CalcRTL.java,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/qa/complex/sc/makefile.mk b/sc/qa/complex/sc/makefile.mkindex d25e004eb55b..097e6d0c5500 100644--- a/sc/qa/complex/sc/makefile.mk+++ b/sc/qa/complex/sc/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.7.138.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/app.sdi b/sc/sdi/app.sdiindex 31323927fa52..5c7e22a62dec 100644--- a/sc/sdi/app.sdi+++ b/sc/sdi/app.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: app.sdi,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/auditsh.sdi b/sc/sdi/auditsh.sdiindex 90dac92f5def..4504f6af735c 100644--- a/sc/sdi/auditsh.sdi+++ b/sc/sdi/auditsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: auditsh.sdi,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdiindex bdabc363738f..ed6dc17fb2a0 100644--- a/sc/sdi/cellsh.sdi+++ b/sc/sdi/cellsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellsh.sdi,v $- * $Revision: 1.24 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/chartsh.sdi b/sc/sdi/chartsh.sdiindex abe3cc15ce13..e40c457b0e5e 100644--- a/sc/sdi/chartsh.sdi+++ b/sc/sdi/chartsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartsh.sdi,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdiindex 5c6f9577cb08..80a330f51890 100644--- a/sc/sdi/docsh.sdi+++ b/sc/sdi/docsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docsh.sdi,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdiindex ccf168db2376..98c7bf3a009d 100644--- a/sc/sdi/drawsh.sdi+++ b/sc/sdi/drawsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawsh.sdi,v $- * $Revision: 1.21 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/drformsh.sdi b/sc/sdi/drformsh.sdiindex 2e571ef9d8b0..f41842286992 100644--- a/sc/sdi/drformsh.sdi+++ b/sc/sdi/drformsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drformsh.sdi,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdiindex 34d850bed6c2..cde7d77753a9 100644--- a/sc/sdi/drtxtob.sdi+++ b/sc/sdi/drtxtob.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drtxtob.sdi,v $- * $Revision: 1.17.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/editsh.sdi b/sc/sdi/editsh.sdiindex da5ca92c0f1a..ae71120c883e 100644--- a/sc/sdi/editsh.sdi+++ b/sc/sdi/editsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: editsh.sdi,v $- * $Revision: 1.11.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdiindex ded414f0f6d6..31ccf5c8af84 100644--- a/sc/sdi/formatsh.sdi+++ b/sc/sdi/formatsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formatsh.sdi,v $- * $Revision: 1.14.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/graphsh.sdi b/sc/sdi/graphsh.sdiindex 1ae42f3559d0..4dac1dca12c1 100644--- a/sc/sdi/graphsh.sdi+++ b/sc/sdi/graphsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: graphsh.sdi,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/makefile.mk b/sc/sdi/makefile.mkindex 0ab1b486cd43..dc91cab89397 100644--- a/sc/sdi/makefile.mk+++ b/sc/sdi/makefile.mk@@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.-#-# Copyright 2008 by Sun Microsystems, Inc.+# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.11 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/mediash.sdi b/sc/sdi/mediash.sdiindex 69f1326f0e88..0f0b5297db1c 100644--- a/sc/sdi/mediash.sdi+++ b/sc/sdi/mediash.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: mediash.sdi,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/oleobjsh.sdi b/sc/sdi/oleobjsh.sdiindex f88cffd7dce1..e77d219fd694 100644--- a/sc/sdi/oleobjsh.sdi+++ b/sc/sdi/oleobjsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: oleobjsh.sdi,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/pgbrksh.sdi b/sc/sdi/pgbrksh.sdiindex 6cc28b9eaf1b..c776c98b9d59 100644--- a/sc/sdi/pgbrksh.sdi+++ b/sc/sdi/pgbrksh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pgbrksh.sdi,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/pivotsh.sdi b/sc/sdi/pivotsh.sdiindex 5e781b35ea38..d763aa8c995a 100644--- a/sc/sdi/pivotsh.sdi+++ b/sc/sdi/pivotsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pivotsh.sdi,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdiindex 92add2aa2fd1..2af8e07a117b 100644--- a/sc/sdi/prevwsh.sdi+++ b/sc/sdi/prevwsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: prevwsh.sdi,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdiindex de3e3fff56bd..904ee22d3d8c 100644--- a/sc/sdi/scalc.sdi+++ b/sc/sdi/scalc.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scalc.sdi,v $- * $Revision: 1.40 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/scslots.hrc b/sc/sdi/scslots.hrcindex fdb7cbe35a4b..6a7d3a3f7459 100644--- a/sc/sdi/scslots.hrc+++ b/sc/sdi/scslots.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scslots.hrc,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -31,4 +28,6 @@ #include <svx/dialogs.hrc> #include <sfx2/sfxsids.hrc> #include <svx/svxids.hrc>+#include <editeng/editids.hrc>+#include <editeng/memberids.hrc> #include <sc.hrc>diff --git a/sc/sdi/scslots.sdi b/sc/sdi/scslots.sdiindex e50d282ab60d..3b3f1ad57295 100644--- a/sc/sdi/scslots.sdi+++ b/sc/sdi/scslots.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scslots.sdi,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/tabpopsh.sdi b/sc/sdi/tabpopsh.sdiindex 2f5ae872ae2e..cdf7d108bbe7 100644--- a/sc/sdi/tabpopsh.sdi+++ b/sc/sdi/tabpopsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabpopsh.sdi,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdiindex 8e075ee8166c..4129aaef7d85 100644--- a/sc/sdi/tabvwsh.sdi+++ b/sc/sdi/tabvwsh.sdi@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabvwsh.sdi,v $- * $Revision: 1.22 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxxindex a4875ba4d1e3..67be752fd8c8 100644--- a/sc/source/core/data/attarray.cxx+++ b/sc/source/core/data/attarray.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: attarray.cxx,v $- * $Revision: 1.25.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,12 +34,12 @@ #include "scitems.hxx" #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/bolnitem.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/shaditem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/bolnitem.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/shaditem.hxx> #include <svl/poolcach.hxx>-#include <svx/fontitem.hxx>+#include <editeng/fontitem.hxx> #include <unotools/fontcvt.hxx> #include "attarray.hxx"diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxxindex dcc6418445fa..301883197fb8 100644--- a/sc/source/core/data/attrib.cxx+++ b/sc/source/core/data/attrib.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: attrib.cxx,v $- * $Revision: 1.19.32.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -42,13 +39,13 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/boxitem.hxx>-#include <svx/editdata.hxx>-#include <svx/editeng.hxx>-#include <svx/editobj.hxx>-#include <svx/flditem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/editdata.hxx>+#include <editeng/editeng.hxx>+#include <editeng/editobj.hxx>+#include <editeng/flditem.hxx> #include "attrib.hxx" #include "global.hxx"diff --git a/sc/source/core/data/autonamecache.cxx b/sc/source/core/data/autonamecache.cxxindex 2daa10fa29d4..c9abd4aa90b8 100644--- a/sc/source/core/data/autonamecache.cxx+++ b/sc/source/core/data/autonamecache.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: autonamecache.cxx,v $- * $Revision: 1.4.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,6 +37,7 @@ #include "autonamecache.hxx" #include "dociter.hxx" #include "cell.hxx"+#include "queryparam.hxx" // ----------------------------------------------------------------------- diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxxindex 2d8688ce5b3b..48a0e8597e1c 100644--- a/sc/source/core/data/bcaslot.cxx+++ b/sc/source/core/data/bcaslot.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: bcaslot.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxxindex e7c74d34a95e..56be361f6d38 100644--- a/sc/source/core/data/cell.cxx+++ b/sc/source/core/data/cell.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cell.cxx,v $- * $Revision: 1.44.38.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -54,9 +51,9 @@ #include "recursionhelper.hxx" #include "postit.hxx" #include "externalrefmgr.hxx"-#include <svx/editobj.hxx>+#include <editeng/editobj.hxx> #include <svl/intitem.hxx>-#include <svx/flditem.hxx>+#include <editeng/flditem.hxx> #include <svl/broadcast.hxx> using namespace formula;diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxxindex 4caaa1cb3267..9a3670d2a9e0 100644--- a/sc/source/core/data/cell2.cxx+++ b/sc/source/core/data/cell2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cell2.cxx,v $- * $Revision: 1.34.102.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,8 +37,8 @@ #include <boost/bind.hpp> #include <vcl/mapmod.hxx>-#include <svx/editobj.hxx>-#include <svx/editstat.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editstat.hxx> #include "cell.hxx" #include "compiler.hxx"diff --git a/sc/source/core/data/clipparam.cxx b/sc/source/core/data/clipparam.cxxindex b2ec555a0d5c..9ab5995ca26c 100644--- a/sc/source/core/data/clipparam.cxx+++ b/sc/source/core/data/clipparam.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: document.cxx,v $- * $Revision: 1.90.36.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxxindex b5dc01a8b059..49ae4a98b1c6 100644--- a/sc/source/core/data/column.cxx+++ b/sc/source/core/data/column.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: column.cxx,v $- * $Revision: 1.31.128.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -39,7 +36,7 @@ #include <svl/poolcach.hxx> #include <svl/zforlist.hxx>-#include <svx/scripttypeitem.hxx>+#include <editeng/scripttypeitem.hxx> #include <string.h> #include "scitems.hxx"diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxxindex 3da3d3810f0b..9e3ed1c7ef5e 100644--- a/sc/source/core/data/column2.cxx+++ b/sc/source/core/data/column2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: column2.cxx,v $- * $Revision: 1.32.126.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,17 +33,17 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/algitem.hxx>-#include <svx/editobj.hxx>-#include <svx/editstat.hxx>-#include <svx/emphitem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/forbiddencharacterstable.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editstat.hxx>+#include <editeng/emphitem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/forbiddencharacterstable.hxx> #include <svx/rotmodit.hxx>-#include <svx/scripttypeitem.hxx>-#include <svx/unolingu.hxx>+#include <editeng/scripttypeitem.hxx>+#include <editeng/unolingu.hxx> #include <svl/zforlist.hxx> #include <svl/broadcast.hxx> #include <svl/listeneriter.hxx>diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxxindex e94cfca12ab7..30081a6bf402 100644--- a/sc/source/core/data/column3.cxx+++ b/sc/source/core/data/column3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: column3.cxx,v $- * $Revision: 1.27.128.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxxindex 71edac0cd0c8..95da04fef0e0 100644--- a/sc/source/core/data/compressedarray.cxx+++ b/sc/source/core/data/compressedarray.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: compressedarray.cxx,v $- * $Revision: 1.10.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxxindex 857c149476b7..b08838198477 100644--- a/sc/source/core/data/conditio.cxx+++ b/sc/source/core/data/conditio.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: conditio.cxx,v $- * $Revision: 1.25.30.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxxindex 215f2d34aab1..39675704fb70 100644--- a/sc/source/core/data/dbdocutl.cxx+++ b/sc/source/core/data/dbdocutl.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbdocutl.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxxindex 4548f1f7a1b5..b68ad36364f3 100644..100755--- a/sc/source/core/data/dociter.cxx+++ b/sc/source/core/data/dociter.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dociter.cxx,v $- * $Revision: 1.22.88.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -47,9 +44,23 @@ #include "docoptio.hxx" #include "cellform.hxx" +#include <vector>++using ::rtl::math::approxEqual;+using ::std::vector;+using ::rtl::OUString; // STATIC DATA ----------------------------------------------------------- +namespace {++void lcl_toUpper(OUString& rStr)+{+ rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, static_cast<USHORT>(rStr.getLength()));+}++}+ ScDocumentIterator::ScDocumentIterator( ScDocument* pDocument, SCTAB nStartTable, SCTAB nEndTable ) : pDoc( pDocument ),@@ -482,83 +493,121 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr) } */ -//-------------------------------------------------------------------------//------------------------------------------------------------------------+// ============================================================================ -ScQueryValueIterator::ScQueryValueIterator(ScDocument* pDocument, SCTAB nTable, const ScQueryParam& rParam) :- aParam (rParam),- pDoc( pDocument ),- nNumFmtIndex(0),- nTab( nTable),- nNumFmtType( NUMBERFORMAT_UNDEFINED ),- bCalcAsShown( pDocument->GetDocOptions().IsCalcAsShown() )+ScDBQueryDataIterator::DataAccess::DataAccess(const ScDBQueryDataIterator* pParent) :+ mpParent(pParent) {- nCol = aParam.nCol1;- nRow = aParam.nRow1;+}++ScDBQueryDataIterator::DataAccess::~DataAccess()+{+}++SCROW ScDBQueryDataIterator::GetRowByColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCCOL nCol, SCSIZE nColRow)+{+ ScColumn* pCol = &rDoc.pTab[nTab]->aCol[nCol];+ return pCol->pItems[nColRow].nRow;+}++ScBaseCell* ScDBQueryDataIterator::GetCellByColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCCOL nCol, SCSIZE nColRow)+{+ ScColumn* pCol = &rDoc.pTab[nTab]->aCol[nCol];+ return pCol->pItems[nColRow].pCell;+}++ScAttrArray* ScDBQueryDataIterator::GetAttrArrayByCol(ScDocument& rDoc, SCTAB nTab, SCCOL nCol)+{+ ScColumn* pCol = &rDoc.pTab[nTab]->aCol[nCol];+ return pCol->pAttrArray;+}++bool ScDBQueryDataIterator::IsQueryValid(ScDocument& rDoc, const ScQueryParam& rParam, SCTAB nTab, SCROW nRow, ScBaseCell* pCell)+{+ return rDoc.pTab[nTab]->ValidQuery(nRow, rParam, NULL, pCell);+}++SCSIZE ScDBQueryDataIterator::SearchColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCROW nRow, SCCOL nCol)+{+ ScColumn* pCol = &rDoc.pTab[nTab]->aCol[nCol];+ SCSIZE nColRow;+ pCol->Search(nRow, nColRow);+ return nColRow;+}++// ----------------------------------------------------------------------------++ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc) :+ DataAccess(pParent),+ mpParam(pParam),+ mpDoc(pDoc)+{+ nCol = mpParam->mnField;+ nRow = mpParam->nRow1;+ nTab = mpParam->nTab;+ nColRow = 0; // wird bei GetFirst initialisiert SCSIZE i;- SCSIZE nCount = aParam.GetEntryCount();- for (i=0; (i<nCount) && (aParam.GetEntry(i).bDoQuery); i++)+ SCSIZE nCount = mpParam->GetEntryCount();+ for (i=0; (i<nCount) && (mpParam->GetEntry(i).bDoQuery); i++) {- ScQueryEntry& rEntry = aParam.GetEntry(i);+ ScQueryEntry& rEntry = mpParam->GetEntry(i); sal_uInt32 nIndex = 0; rEntry.bQueryByString =- !(pDoc->GetFormatTable()->IsNumberFormat(*rEntry.pStr, nIndex, rEntry.nVal));+ !(mpDoc->GetFormatTable()->IsNumberFormat(*rEntry.pStr, nIndex, rEntry.nVal)); } nNumFormat = 0; // werden bei GetNumberFormat initialisiert pAttrArray = 0; nAttrEndRow = 0; } -BOOL ScQueryValueIterator::GetThis(double& rValue, USHORT& rErr)+ScDBQueryDataIterator::DataAccessInternal::~DataAccessInternal() {- ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol];- SCCOLROW nFirstQueryField = aParam.GetEntry(0).nField;+}++bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue)+{+ SCCOLROW nFirstQueryField = mpParam->GetEntry(0).nField; for ( ;; ) {- if ( nRow > aParam.nRow2 )+ if (nRow > mpParam->nRow2) {- nRow = aParam.nRow1;- if (aParam.bHasHeader)- nRow++;- do- {- nCol++;- if ( nCol > aParam.nCol2 )- {- // rValue = 0.0; // do not change caller's value!- rErr = 0;- return FALSE; // Ende und Aus- }- pCol = &(pDoc->pTab[nTab])->aCol[nCol];- } while ( pCol->nCount == 0 );- pCol->Search( nRow, nColRow );+ // Bottom of the range reached. Bail out.+ rValue.mnError = 0;+ return false; } - while ( (nColRow < pCol->nCount) && (pCol->pItems[nColRow].nRow < nRow) )- nColRow++;+ SCSIZE nCellCount = mpDoc->GetCellCount(nTab, nCol);+ SCROW nThisRow = ScDBQueryDataIterator::GetRowByColEntryIndex(*mpDoc, nTab, nCol, nColRow);+ while ( (nColRow < nCellCount) && (nThisRow < nRow) )+ nThisRow = ScDBQueryDataIterator::GetRowByColEntryIndex(*mpDoc, nTab, nCol, ++nColRow); - if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= aParam.nRow2 )+ if ( nColRow < nCellCount && nThisRow <= mpParam->nRow2 ) {- nRow = pCol->pItems[nColRow].nRow;- ScBaseCell* pCell = pCol->pItems[nColRow].pCell;- if ( (pDoc->pTab[nTab])->ValidQuery( nRow, aParam, NULL,- (nCol == static_cast<SCCOL>(nFirstQueryField) ? pCell : NULL) ) )+ nRow = nThisRow;+ ScBaseCell* pCell = NULL;+ if (nCol == static_cast<SCCOL>(nFirstQueryField))+ pCell = ScDBQueryDataIterator::GetCellByColEntryIndex(*mpDoc, nTab, nCol, nColRow);++ if (ScDBQueryDataIterator::IsQueryValid(*mpDoc, *mpParam, nTab, nRow, pCell)) { switch (pCell->GetCellType()) { case CELLTYPE_VALUE: {- rValue = ((ScValueCell*)pCell)->GetValue();+ rValue.mfValue = ((ScValueCell*)pCell)->GetValue();+ rValue.mbIsNumber = true; if ( bCalcAsShown ) {+ const ScAttrArray* pNewAttrArray =+ ScDBQueryDataIterator::GetAttrArrayByCol(*mpDoc, nTab, nCol); lcl_IterGetNumberFormat( nNumFormat, pAttrArray,- nAttrEndRow, pCol->pAttrArray, nRow, pDoc );- rValue = pDoc->RoundValueAsShown( rValue, nNumFormat );+ nAttrEndRow, pNewAttrArray, nRow, mpDoc );+ rValue.mfValue = mpDoc->RoundValueAsShown( rValue.mfValue, nNumFormat ); } nNumFmtType = NUMBERFORMAT_NUMBER; nNumFmtIndex = 0;- rErr = 0;+ rValue.mnError = 0; return TRUE; // gefunden } // break;@@ -566,17 +615,31 @@ BOOL ScQueryValueIterator::GetThis(double& rValue, USHORT& rErr) { if (((ScFormulaCell*)pCell)->IsValue()) {- rValue = ((ScFormulaCell*)pCell)->GetValue();- pDoc->GetNumberFormatInfo( nNumFmtType,+ rValue.mfValue = ((ScFormulaCell*)pCell)->GetValue();+ rValue.mbIsNumber = true;+ mpDoc->GetNumberFormatInfo( nNumFmtType, nNumFmtIndex, ScAddress( nCol, nRow, nTab ), pCell );- rErr = ((ScFormulaCell*)pCell)->GetErrCode();+ rValue.mnError = ((ScFormulaCell*)pCell)->GetErrCode(); return TRUE; // gefunden } else nRow++; } break;+ case CELLTYPE_STRING:+ case CELLTYPE_EDIT:+ if (mpParam->mbSkipString)+ ++nRow;+ else+ {+ rValue.maString = pCell->GetStringData();+ rValue.mfValue = 0.0;+ rValue.mnError = 0;+ rValue.mbIsNumber = false;+ return true;+ }+ break; default: nRow++; break;@@ -586,30 +649,309 @@ BOOL ScQueryValueIterator::GetThis(double& rValue, USHORT& rErr) nRow++; } else- nRow = aParam.nRow2 + 1; // Naechste Spalte+ nRow = mpParam->nRow2 + 1; // Naechste Spalte }-// return FALSE;+// statement unreachable+// return false; } -BOOL ScQueryValueIterator::GetFirst(double& rValue, USHORT& rErr)+bool ScDBQueryDataIterator::DataAccessInternal::getFirst(Value& rValue) {- nCol = aParam.nCol1;- nRow = aParam.nRow1;- if (aParam.bHasHeader)+ if (mpParam->bHasHeader) nRow++;-// nColRow = 0;- ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol];- pCol->Search( nRow, nColRow );- return GetThis(rValue, rErr);++ nColRow = ScDBQueryDataIterator::SearchColEntryIndex(*mpDoc, nTab, nRow, nCol);+ return getCurrent(rValue); } -BOOL ScQueryValueIterator::GetNext(double& rValue, USHORT& rErr)+bool ScDBQueryDataIterator::DataAccessInternal::getNext(Value& rValue) { ++nRow;- return GetThis(rValue, rErr);+ return getCurrent(rValue); } -//-------------------------------------------------------------------------------+// ----------------------------------------------------------------------------++ScDBQueryDataIterator::DataAccessMatrix::DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam) :+ DataAccess(pParent),+ mpParam(pParam)+{+ SCSIZE nC, nR;+ mpParam->mpMatrix->GetDimensions(nC, nR);+ mnRows = static_cast<SCROW>(nR);+ mnCols = static_cast<SCCOL>(nC);+}++ScDBQueryDataIterator::DataAccessMatrix::~DataAccessMatrix()+{+}++bool ScDBQueryDataIterator::DataAccessMatrix::getCurrent(Value& rValue)+{+ // Starting from row == mnCurRow, get the first row that satisfies all the+ // query parameters.+ for ( ;mnCurRow < mnRows; ++mnCurRow)+ {+ const ScMatrix& rMat = *mpParam->mpMatrix;+ if (rMat.IsEmpty(mpParam->mnField, mnCurRow))+ // Don't take empty values into account.+ continue;++ bool bIsStrVal = rMat.IsString(mpParam->mnField, mnCurRow);+ if (bIsStrVal && mpParam->mbSkipString)+ continue;++ if (isValidQuery(mnCurRow, rMat))+ {+ rValue.maString = rMat.GetString(mpParam->mnField, mnCurRow);+ rValue.mfValue = rMat.GetDouble(mpParam->mnField, mnCurRow);+ rValue.mbIsNumber = !bIsStrVal;+ rValue.mnError = 0;+ return true;+ }+ }+ return false;+}++bool ScDBQueryDataIterator::DataAccessMatrix::getFirst(Value& rValue)+{+ mnCurRow = mpParam->bHasHeader ? 1 : 0;+ return getCurrent(rValue);+}++bool ScDBQueryDataIterator::DataAccessMatrix::getNext(Value& rValue)+{+ ++mnCurRow;+ return getCurrent(rValue);+}++namespace {++bool lcl_isQueryByValue(const ScQueryEntry& rEntry, const ScMatrix& rMat, SCSIZE nCol, SCSIZE nRow)+{+ if (rEntry.bQueryByString)+ return false;++ if (!rMat.IsValueOrEmpty(nCol, nRow))+ return false;++ return true;+}++bool lcl_isQueryByString(const ScQueryEntry& rEntry, const ScMatrix& rMat, SCSIZE nCol, SCSIZE nRow)+{+ switch (rEntry.eOp)+ {+ case SC_EQUAL:+ case SC_NOT_EQUAL:+ case SC_CONTAINS:+ case SC_DOES_NOT_CONTAIN:+ case SC_BEGINS_WITH:+ case SC_ENDS_WITH:+ case SC_DOES_NOT_BEGIN_WITH:+ case SC_DOES_NOT_END_WITH:+ return true;+ default:+ ;+ }++ if (rEntry.bQueryByString && rMat.IsString(nCol, nRow))+ return true;++ return false;+}++}++bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScMatrix& rMat) const+{+ SCSIZE nEntryCount = mpParam->GetEntryCount();+ vector<bool> aResults;+ aResults.reserve(nEntryCount);++ const CollatorWrapper& rCollator =+ mpParam->bCaseSens ? *ScGlobal::GetCaseCollator() : *ScGlobal::GetCollator();++ for (SCSIZE i = 0; i < nEntryCount; ++i)+ {+ const ScQueryEntry& rEntry = mpParam->GetEntry(i);+ if (!rEntry.bDoQuery)+ continue;++ switch (rEntry.eOp)+ {+ case SC_EQUAL:+ case SC_LESS:+ case SC_GREATER:+ case SC_LESS_EQUAL:+ case SC_GREATER_EQUAL:+ case SC_NOT_EQUAL:+ break;+ default:+ // Only the above operators are supported.+ continue;+ }++ bool bValid = false;++ SCSIZE nField = static_cast<SCSIZE>(rEntry.nField);+ if (lcl_isQueryByValue(rEntry, rMat, nField, nRow))+ {+ // By value+ double fMatVal = rMat.GetDouble(nField, nRow);+ bool bEqual = approxEqual(fMatVal, rEntry.nVal);+ switch (rEntry.eOp)+ {+ case SC_EQUAL:+ bValid = bEqual;+ break;+ case SC_LESS:+ bValid = (fMatVal < rEntry.nVal) && !bEqual;+ break;+ case SC_GREATER:+ bValid = (fMatVal > rEntry.nVal) && !bEqual;+ break;+ case SC_LESS_EQUAL:+ bValid = (fMatVal < rEntry.nVal) || bEqual;+ break;+ case SC_GREATER_EQUAL:+ bValid = (fMatVal > rEntry.nVal) || bEqual;+ break;+ case SC_NOT_EQUAL:+ bValid = !bEqual;+ break;+ default:+ ;+ }+ }+ else if (lcl_isQueryByString(rEntry, rMat, nField, nRow))+ {+ // By string+ do+ {+ if (!rEntry.pStr)+ break;++ // Equality check first.++ OUString aMatStr = rMat.GetString(nField, nRow);+ lcl_toUpper(aMatStr);+ OUString aQueryStr = *rEntry.pStr;+ lcl_toUpper(aQueryStr);+ bool bDone = false;+ switch (rEntry.eOp)+ {+ case SC_EQUAL:+ bValid = aMatStr.equals(aQueryStr);+ bDone = true;+ break;+ case SC_NOT_EQUAL:+ bValid = !aMatStr.equals(aQueryStr);+ bDone = true;+ break;+ default:+ ;+ }++ if (bDone)+ break;++ // Unequality check using collator.++ sal_Int32 nCompare = rCollator.compareString(aMatStr, aQueryStr);+ switch (rEntry.eOp)+ {+ case SC_LESS :+ bValid = (nCompare < 0);+ break;+ case SC_GREATER :+ bValid = (nCompare > 0);+ break;+ case SC_LESS_EQUAL :+ bValid = (nCompare <= 0);+ break;+ case SC_GREATER_EQUAL :+ bValid = (nCompare >= 0);+ break;+ default:+ ;+ }+ }+ while (false);+ }+ else if (mpParam->bMixedComparison)+ {+ // Not used at the moment.+ }++ if (aResults.empty())+ // First query entry.+ aResults.push_back(bValid);+ else if (rEntry.eConnect == SC_AND)+ {+ // For AND op, tuck the result into the last result value.+ size_t n = aResults.size();+ aResults[n-1] = aResults[n-1] && bValid;+ }+ else+ // For OR op, store its own result.+ aResults.push_back(bValid);+ }++ // Row is valid as long as there is at least one result being true.+ vector<bool>::const_iterator itr = aResults.begin(), itrEnd = aResults.end();+ for (; itr != itrEnd; ++itr)+ if (*itr)+ return true;++ return false;+}++// ----------------------------------------------------------------------------++ScDBQueryDataIterator::Value::Value() :+ mnError(0), mbIsNumber(true)+{+ ::rtl::math::setNan(&mfValue);+}++// ----------------------------------------------------------------------------++ScDBQueryDataIterator::ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam) :+ mpParam (pParam)+{+ switch (mpParam->GetType())+ {+ case ScDBQueryParamBase::INTERNAL:+ {+ ScDBQueryParamInternal* p = static_cast<ScDBQueryParamInternal*>(pParam);+ mpData.reset(new DataAccessInternal(this, p, pDocument));+ }+ break;+ case ScDBQueryParamBase::MATRIX:+ {+ ScDBQueryParamMatrix* p = static_cast<ScDBQueryParamMatrix*>(pParam);+ mpData.reset(new DataAccessMatrix(this, p));+ }+ }+}++bool ScDBQueryDataIterator::GetThis(Value& rValue)+{+ return mpData->getCurrent(rValue);+}++bool ScDBQueryDataIterator::GetFirst(Value& rValue)+{+ return mpData->getFirst(rValue);+}++bool ScDBQueryDataIterator::GetNext(Value& rValue)+{+ return mpData->getNext(rValue);+}++// ============================================================================ ScCellIterator::ScCellIterator( ScDocument* pDocument, SCCOL nSCol, SCROW nSRow, SCTAB nSTab,diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxxindex 662e524b2bfc..d6aa91efcca6 100644--- a/sc/source/core/data/docpool.cxx+++ b/sc/source/core/data/docpool.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docpool.cxx,v $- * $Revision: 1.25.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -39,37 +36,37 @@ #include <svl/aeitem.hxx> #include <svl/itemiter.hxx> #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/bolnitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/charreliefitem.hxx>-#include <svx/cntritem.hxx>-#include <svx/colritem.hxx>-#include <svx/crsditem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/bolnitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/charreliefitem.hxx>+#include <editeng/cntritem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/crsditem.hxx> #include <svx/dialmgr.hxx>-#include <svx/emphitem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/fontitem.hxx>-#include <svx/forbiddenruleitem.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/hngpnctitem.hxx>-#include <svx/itemtype.hxx>-#include <svx/langitem.hxx>-#include <svx/lrspitem.hxx>+#include <editeng/emphitem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/forbiddenruleitem.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/hngpnctitem.hxx>+#include <editeng/itemtype.hxx>+#include <editeng/langitem.hxx>+#include <editeng/lrspitem.hxx> #include <svx/pageitem.hxx>-#include <svx/pbinitem.hxx>-#include <svx/postitem.hxx>+#include <editeng/pbinitem.hxx>+#include <editeng/postitem.hxx> #include <svx/rotmodit.hxx>-#include <svx/scriptspaceitem.hxx>-#include <svx/shaditem.hxx>-#include <svx/shdditem.hxx>-#include <svx/sizeitem.hxx>+#include <editeng/scriptspaceitem.hxx>+#include <editeng/shaditem.hxx>+#include <editeng/shdditem.hxx>+#include <editeng/sizeitem.hxx> #include <svx/svxitems.hrc>-#include <svx/udlnitem.hxx>-#include <svx/ulspitem.hxx>-#include <svx/wghtitem.hxx>-#include <svx/wrlmitem.hxx>-#include <svx/xmlcnitm.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/ulspitem.hxx>+#include <editeng/wghtitem.hxx>+#include <editeng/wrlmitem.hxx>+#include <editeng/xmlcnitm.hxx> #include "docpool.hxx" #include "global.hxx"diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxxindex 09477e5a7eb4..c08fb7a10228 100644--- a/sc/source/core/data/documen2.cxx+++ b/sc/source/core/data/documen2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: documen2.cxx,v $- * $Revision: 1.75.18.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,11 +32,11 @@ #define _ZFORLIST_DECLARE_TABLE #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/editeng.hxx>-#include <svx/forbiddencharacterstable.hxx>-#include <svx/linkmgr.hxx>+#include <editeng/editeng.hxx>+#include <editeng/forbiddencharacterstable.hxx>+#include <sfx2/linkmgr.hxx> #include <svx/svdpool.hxx> #include <svx/svdobj.hxx> #include <sfx2/bindings.hxx>@@ -228,7 +225,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, if ( eMode == SCDOCMODE_DOCUMENT ) { if ( pDocShell )- pLinkManager = new SvxLinkManager( pDocShell );+ pLinkManager = new sfx2::LinkManager( pDocShell ); xPoolHelper = new ScPoolHelper( this ); @@ -263,11 +260,11 @@ ScDocument::ScDocument( ScDocumentMode eMode, aTrackTimer.SetTimeout( 100 ); } -SvxLinkManager* ScDocument::GetLinkManager() const+sfx2::LinkManager* ScDocument::GetLinkManager() const { if ( bAutoCalc && !pLinkManager && pShell) {- pLinkManager = new SvxLinkManager( pShell );+ pLinkManager = new sfx2::LinkManager( pShell ); } return pLinkManager; }diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxxindex 2529d0ad7f1d..cc06d7ac6b32 100644--- a/sc/source/core/data/documen3.cxx+++ b/sc/source/core/data/documen3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: documen3.cxx,v $- * $Revision: 1.42.100.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,9 +31,9 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/langitem.hxx>-#include <svx/srchitem.hxx>-#include <svx/linkmgr.hxx>+#include <editeng/langitem.hxx>+#include <svl/srchitem.hxx>+#include <sfx2/linkmgr.hxx> #include <sfx2/bindings.hxx> #include <sfx2/objsh.hxx> #include <svl/zforlist.hxx>diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxxindex ae79fae7e8d3..bb6b4cd295ce 100644--- a/sc/source/core/data/documen4.cxx+++ b/sc/source/core/data/documen4.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: documen4.cxx,v $- * $Revision: 1.23.102.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxxindex 0be1e6717891..14a88abd32ca 100644--- a/sc/source/core/data/documen5.cxx+++ b/sc/source/core/data/documen5.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: documen5.cxx,v $- * $Revision: 1.34 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxxindex 68c5655bb6c4..8706c49320d1 100644--- a/sc/source/core/data/documen6.cxx+++ b/sc/source/core/data/documen6.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: documen6.cxx,v $- * $Revision: 1.15 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,7 +31,7 @@ #include "scitems.hxx"-#include <svx/scripttypeitem.hxx>+#include <editeng/scripttypeitem.hxx> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/ScriptType.hpp>diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxxindex 9527089ebde3..ad2ec90379df 100644--- a/sc/source/core/data/documen7.cxx+++ b/sc/source/core/data/documen7.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: documen7.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxxindex 18370d2f5a0f..e3c9d251fab7 100644--- a/sc/source/core/data/documen8.cxx+++ b/sc/source/core/data/documen8.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: documen8.cxx,v $- * $Revision: 1.52.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,16 +31,16 @@ #define _ZFORLIST_DECLARE_TABLE #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <tools/string.hxx>-#include <svx/editobj.hxx>-#include <svx/editstat.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/langitem.hxx>-#include <svx/linkmgr.hxx>-#include <svx/scripttypeitem.hxx>-#include <svx/unolingu.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editstat.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/langitem.hxx>+#include <sfx2/linkmgr.hxx>+#include <editeng/scripttypeitem.hxx>+#include <editeng/unolingu.hxx> #include <sfx2/bindings.hxx> #include <sfx2/objsh.hxx> #include <sfx2/printer.hxx>@@ -1191,7 +1188,7 @@ namespace { (does not include other links from link manager). @return The DDE link, if it exists, otherwise 0. */ ScDdeLink* lclGetDdeLink(- const SvxLinkManager* pLinkManager,+ const sfx2::LinkManager* pLinkManager, const String& rAppl, const String& rTopic, const String& rItem, BYTE nMode, USHORT* pnDdePos = NULL ) {@@ -1220,7 +1217,7 @@ ScDdeLink* lclGetDdeLink( /** Returns a pointer to the specified DDE link. @param nDdePos Index of the DDE link (does not include other links from link manager). @return The DDE link, if it exists, otherwise 0. */-ScDdeLink* lclGetDdeLink( const SvxLinkManager* pLinkManager, USHORT nDdePos )+ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, USHORT nDdePos ) { if( pLinkManager ) {diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxxindex 772ed496d2e1..b9abe0839279 100644--- a/sc/source/core/data/documen9.cxx+++ b/sc/source/core/data/documen9.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: documen9.cxx,v $- * $Revision: 1.43.52.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -38,13 +35,13 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <sot/exchange.hxx>-#include <svx/akrnitem.hxx>-#include <svx/fontitem.hxx>-#include <svx/forbiddencharacterstable.hxx>-#include <svx/langitem.hxx>+#include <editeng/akrnitem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/forbiddencharacterstable.hxx>+#include <editeng/langitem.hxx> #include <svx/svdetc.hxx> #include <svx/svditer.hxx> #include <svx/svdocapt.hxx>diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxxindex f8fa2bc46c9b..fa4fb296d9a7 100644--- a/sc/source/core/data/document.cxx+++ b/sc/source/core/data/document.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: document.cxx,v $- * $Revision: 1.90.36.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,12 +32,12 @@ #define _ZFORLIST_DECLARE_TABLE #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/boxitem.hxx>-#include <svx/frmdiritem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/frmdiritem.hxx> #include <svx/pageitem.hxx>-#include <svx/editeng.hxx>+#include <editeng/editeng.hxx> #include <svx/svditer.hxx> #include <svx/svdpage.hxx> #include <svx/svdocapt.hxx>@@ -154,6 +151,32 @@ BOOL ScDocument::GetName( SCTAB nTab, String& rName ) const return FALSE; } +BOOL ScDocument::SetCodeName( SCTAB nTab, String& rName )+{+ if (VALIDTAB(nTab))+ {+ if (pTab[nTab])+ {+ pTab[nTab]->SetCodeName( rName );+ return TRUE;+ }+ }+ OSL_TRACE( "**** can't set code name %s", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr() );+ return FALSE;+}++BOOL ScDocument::GetCodeName( SCTAB nTab, String& rName ) const+{+ if (VALIDTAB(nTab))+ if (pTab[nTab])+ {+ pTab[nTab]->GetCodeName( rName );+ return TRUE;+ }+ rName.Erase();+ return FALSE;+}+ BOOL ScDocument::GetTable( const String& rName, SCTAB& rTab ) const {@@ -293,6 +316,7 @@ BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName, if (nPos == SC_TAB_APPEND || nPos == nTabCount) { pTab[nTabCount] = new ScTable(this, nTabCount, rName);+ pTab[nTabCount]->SetCodeName( rName ); ++nMaxTableNumber; if ( bExternalDocument ) pTab[nTabCount]->SetVisible( FALSE );@@ -320,10 +344,16 @@ BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName, for (i = 0; i <= MAXTAB; i++) if (pTab[i]) pTab[i]->UpdateInsertTab(nPos);+ for (i = nTabCount; i > nPos; i--)+ { pTab[i] = pTab[i - 1];+ }+ pTab[nPos] = new ScTable(this, nPos, rName);+ pTab[nPos]->SetCodeName( rName ); ++nMaxTableNumber;+ // UpdateBroadcastAreas must be called between UpdateInsertTab, // which ends listening, and StartAllListeners, to not modify // areas that are to be inserted by starting listeners.@@ -4670,6 +4700,13 @@ ULONG ScDocument::GetCellCount() const return nCellCount; } +SCSIZE ScDocument::GetCellCount(SCTAB nTab, SCCOL nCol) const+{+ if (!ValidTab(nTab) || !pTab[nTab])+ return 0;++ return pTab[nTab]->GetCellCount(nCol);+} ULONG ScDocument::GetCodeCount() const {diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxxindex dc9b6450ac75..237d7ffd16db 100644--- a/sc/source/core/data/dpcachetable.cxx+++ b/sc/source/core/data/dpcachetable.cxx@@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpcachetable.cxx,v $- *- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -38,6 +34,7 @@ #include "dptabdat.hxx" #include "dptabsrc.hxx" #include "dpobject.hxx"+#include "queryparam.hxx" #include <com/sun/star/i18n/LocaleDataItem.hpp> #include <com/sun/star/sdbc/DataType.hpp>@@ -209,9 +206,39 @@ sal_Int32 ScDPCacheTable::getColSize() const return maTable.empty() ? 0 : maTable[0].size(); } +namespace {++/**+ * While the macro interpret level is incremented, the formula cells are+ * (semi-)guaranteed to be interpreted.+ */+class MacroInterpretIncrementer+{+public:+ MacroInterpretIncrementer(ScDocument* pDoc) :+ mpDoc(pDoc)+ {+ mpDoc->IncMacroInterpretLevel();+ }+ ~MacroInterpretIncrementer()+ {+ mpDoc->DecMacroInterpretLevel();+ }+private:+ ScDocument* mpDoc;+};++}+ void ScDPCacheTable::fillTable(ScDocument* pDoc, const ScRange& rRange, const ScQueryParam& rQuery, BOOL* pSpecial, bool bIgnoreEmptyRows) {+ // Make sure the formula cells within the data range are interpreted+ // during this call, for this method may be called from the interpretation+ // of GETPIVOTDATA, which disables nested formula interpretation without+ // increasing the macro level.+ MacroInterpretIncrementer aMacroInc(pDoc);+ SCTAB nTab = rRange.aStart.Tab(); SCCOL nStartCol = rRange.aStart.Col(); SCROW nStartRow = rRange.aStart.Row();diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxxindex 49e2c5b09c94..21669eb7a435 100644--- a/sc/source/core/data/dpdimsave.cxx+++ b/sc/source/core/data/dpdimsave.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpdimsave.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxxindex 29284b20e4bb..1bc888100a9f 100644--- a/sc/source/core/data/dpgroup.cxx+++ b/sc/source/core/data/dpgroup.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpgroup.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxxindex 295ed78159b3..66ac3a4bedbb 100644--- a/sc/source/core/data/dpobject.cxx+++ b/sc/source/core/data/dpobject.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpobject.cxx,v $- * $Revision: 1.23.30.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxxindex 10dcbfa8238e..7ecdc3d34702 100644--- a/sc/source/core/data/dpoutput.cxx+++ b/sc/source/core/data/dpoutput.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpoutput.cxx,v $- * $Revision: 1.17.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,9 +34,9 @@ #include "scitems.hxx" #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/wghtitem.hxx> #include <unotools/transliterationwrapper.hxx> #include "dpoutput.hxx"diff --git a/sc/source/core/data/dpoutputgeometry.cxx b/sc/source/core/data/dpoutputgeometry.cxxindex 9eace100c137..fd9bee0ed572 100644--- a/sc/source/core/data/dpoutputgeometry.cxx+++ b/sc/source/core/data/dpoutputgeometry.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmldpimp.cxx,v $- * $Revision: 1.27.134.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxxindex e66bd8dfe705..58a9e112ab7d 100644--- a/sc/source/core/data/dpsave.cxx+++ b/sc/source/core/data/dpsave.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpsave.cxx,v $- * $Revision: 1.13.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxxindex 01f63f0cbaa9..be8eca58ce95 100644--- a/sc/source/core/data/dpsdbtab.cxx+++ b/sc/source/core/data/dpsdbtab.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpsdbtab.cxx,v $- * $Revision: 1.15 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxxindex 29fe2dc7b6e5..c7e75f438ce1 100644--- a/sc/source/core/data/dpshttab.cxx+++ b/sc/source/core/data/dpshttab.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpshttab.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxxindex 41e44f84b647..530f1c44123f 100644--- a/sc/source/core/data/dptabdat.cxx+++ b/sc/source/core/data/dptabdat.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dptabdat.cxx,v $- * $Revision: 1.18 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxxindex e548db56d7ff..63f5da3290d7 100644--- a/sc/source/core/data/dptabres.cxx+++ b/sc/source/core/data/dptabres.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dptabres.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxxindex 2a091c8b45b5..205c14021444 100644--- a/sc/source/core/data/dptabsrc.cxx+++ b/sc/source/core/data/dptabsrc.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dptabsrc.cxx,v $- * $Revision: 1.27 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxxindex 909d1e6111a9..715b99f362a1 100644--- a/sc/source/core/data/drawpage.cxx+++ b/sc/source/core/data/drawpage.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawpage.cxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxxindex cb82ede30dca..4e9de6179809 100644--- a/sc/source/core/data/drwlayer.cxx+++ b/sc/source/core/data/drwlayer.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drwlayer.cxx,v $- * $Revision: 1.55.128.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -43,8 +40,8 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>-#include <svx/frmdiritem.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/frmdiritem.hxx> #include <sot/exchange.hxx> #include <svx/objfac3d.hxx> #include <svx/xtable.hxx>@@ -56,10 +53,10 @@ #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <svx/svdundo.hxx>-#include <svx/unolingu.hxx>+#include <editeng/unolingu.hxx> #include <svx/drawitem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/scriptspaceitem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/scriptspaceitem.hxx> #include <svx/shapepropertynotifier.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/docfile.hxx>diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxxindex ac4cb9908a3f..05e0d98c9719 100644--- a/sc/source/core/data/fillinfo.cxx+++ b/sc/source/core/data/fillinfo.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fillinfo.cxx,v $- * $Revision: 1.15 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,10 +33,10 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/boxitem.hxx>-#include <svx/bolnitem.hxx>-#include <svx/editdata.hxx> // can be removed if table has a bLayoutRTL flag-#include <svx/shaditem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/bolnitem.hxx>+#include <editeng/editdata.hxx> // can be removed if table has a bLayoutRTL flag+#include <editeng/shaditem.hxx> #include "fillinfo.hxx" #include "document.hxx"diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxxindex d49e8e1aa139..2081181b7537 100644--- a/sc/source/core/data/global.cxx+++ b/sc/source/core/data/global.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: global.cxx,v $- * $Revision: 1.56.102.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,11 +34,11 @@ #include <vcl/svapp.hxx> #include "scitems.hxx" #include <svx/algitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/editobj.hxx>-#include <svx/scripttypeitem.hxx>-#include <svx/srchitem.hxx>-#include <svx/langitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/editobj.hxx>+#include <editeng/scripttypeitem.hxx>+#include <svl/srchitem.hxx>+#include <editeng/langitem.hxx> #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx>diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxxindex ffeb6cc0684c..21c09688aeee 100644--- a/sc/source/core/data/global2.cxx+++ b/sc/source/core/data/global2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: global2.cxx,v $- * $Revision: 1.23.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -243,238 +240,6 @@ utl::TextSearch* ScQueryEntry::GetSearchTextPtr( BOOL bCaseSens ) } //--------------------------------------------------------------------------ScQueryParam::ScQueryParam()-{- nEntryCount = 0;- Clear();-}--//--------------------------------------------------------------------------ScQueryParam::ScQueryParam( const ScQueryParam& r ) :- nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nTab(r.nTab),- bHasHeader(r.bHasHeader), bByRow(r.bByRow), bInplace(r.bInplace), bCaseSens(r.bCaseSens),- bRegExp(r.bRegExp), bMixedComparison(r.bMixedComparison),- bDuplicate(r.bDuplicate), bDestPers(r.bDestPers),- nDestTab(r.nDestTab), nDestCol(r.nDestCol), nDestRow(r.nDestRow)-{- nEntryCount = 0;-- Resize( r.nEntryCount );- for (USHORT i=0; i<nEntryCount; i++)- pEntries[i] = r.pEntries[i];-}--//--------------------------------------------------------------------------ScQueryParam::~ScQueryParam()-{- delete[] pEntries;-}--//--------------------------------------------------------------------------void ScQueryParam::Clear()-{- nCol1=nCol2=nDestCol = 0;- nRow1=nRow2=nDestRow = 0;- nDestTab = 0;- nTab = SCTAB_MAX;- bHasHeader = bCaseSens = bRegExp = bMixedComparison = FALSE;- bInplace = bByRow = bDuplicate = bDestPers = TRUE;-- Resize( MAXQUERY );- for (USHORT i=0; i<MAXQUERY; i++)- pEntries[i].Clear();-}--//--------------------------------------------------------------------------ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )-{- nCol1 = r.nCol1;- nRow1 = r.nRow1;- nCol2 = r.nCol2;- nRow2 = r.nRow2;- nTab = r.nTab;- nDestTab = r.nDestTab;- nDestCol = r.nDestCol;- nDestRow = r.nDestRow;- bHasHeader = r.bHasHeader;- bInplace = r.bInplace;- bCaseSens = r.bCaseSens;- bRegExp = r.bRegExp;- bMixedComparison = r.bMixedComparison;- bDuplicate = r.bDuplicate;- bByRow = r.bByRow;- bDestPers = r.bDestPers;-- Resize( r.nEntryCount );- for (USHORT i=0; i<nEntryCount; i++)- pEntries[i] = r.pEntries[i];-- return *this;-}--//--------------------------------------------------------------------------BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const-{- BOOL bEqual = FALSE;-- // Anzahl der Queries gleich?- USHORT nUsed = 0;- USHORT nOtherUsed = 0;- while ( nUsed<nEntryCount && pEntries[nUsed].bDoQuery ) ++nUsed;- while ( nOtherUsed<rOther.nEntryCount && rOther.pEntries[nOtherUsed].bDoQuery )- ++nOtherUsed;-- if ( (nUsed == nOtherUsed)- && (nCol1 == rOther.nCol1)- && (nRow1 == rOther.nRow1)- && (nCol2 == rOther.nCol2)- && (nRow2 == rOther.nRow2)- && (nTab == rOther.nTab)- && (bHasHeader == rOther.bHasHeader)- && (bByRow == rOther.bByRow)- && (bInplace == rOther.bInplace)- && (bCaseSens == rOther.bCaseSens)- && (bRegExp == rOther.bRegExp)- && (bMixedComparison == rOther.bMixedComparison)- && (bDuplicate == rOther.bDuplicate)- && (bDestPers == rOther.bDestPers)- && (nDestTab == rOther.nDestTab)- && (nDestCol == rOther.nDestCol)- && (nDestRow == rOther.nDestRow) )- {- bEqual = TRUE;- for ( USHORT i=0; i<nUsed && bEqual; i++ )- bEqual = pEntries[i] == rOther.pEntries[i];- }- return bEqual;-}--//--------------------------------------------------------------------------void ScQueryParam::DeleteQuery( SCSIZE nPos )-{- if (nPos<nEntryCount)- {- for (SCSIZE i=nPos; i+1<nEntryCount; i++)- pEntries[i] = pEntries[i+1];-- pEntries[nEntryCount-1].Clear();- }- else- {- DBG_ERROR("Falscher Parameter bei ScQueryParam::DeleteQuery");- }-}--//--------------------------------------------------------------------------void ScQueryParam::Resize(SCSIZE nNew)-{- if ( nNew < MAXQUERY )- nNew = MAXQUERY; // nie weniger als MAXQUERY-- ScQueryEntry* pNewEntries = NULL;- if ( nNew )- pNewEntries = new ScQueryEntry[nNew];-- SCSIZE nCopy = Min( nEntryCount, nNew );- for (SCSIZE i=0; i<nCopy; i++)- pNewEntries[i] = pEntries[i];-- if ( nEntryCount )- delete[] pEntries;- nEntryCount = nNew;- pEntries = pNewEntries;-}--//--------------------------------------------------------------------------void ScQueryParam::MoveToDest()-{- if (!bInplace)- {- SCsCOL nDifX = ((SCsCOL) nDestCol) - ((SCsCOL) nCol1);- SCsROW nDifY = ((SCsROW) nDestRow) - ((SCsROW) nRow1);- SCsTAB nDifZ = ((SCsTAB) nDestTab) - ((SCsTAB) nTab);-- nCol1 = sal::static_int_cast<SCCOL>( nCol1 + nDifX );- nRow1 = sal::static_int_cast<SCROW>( nRow1 + nDifY );- nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );- nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );- nTab = sal::static_int_cast<SCTAB>( nTab + nDifZ );- for (USHORT i=0; i<nEntryCount; i++)- pEntries[i].nField += nDifX;-- bInplace = TRUE;- }- else- {- DBG_ERROR("MoveToDest, bInplace == TRUE");- }-}--//--------------------------------------------------------------------------void ScQueryParam::FillInExcelSyntax(String& aCellStr, SCSIZE nIndex)-{- if (aCellStr.Len() > 0)- {- if ( nIndex >= nEntryCount )- Resize( nIndex+1 );-- ScQueryEntry& rEntry = pEntries[nIndex];-- rEntry.bDoQuery = TRUE;- // Operatoren herausfiltern- if (aCellStr.GetChar(0) == '<')- {- if (aCellStr.GetChar(1) == '>')- {- *rEntry.pStr = aCellStr.Copy(2);- rEntry.eOp = SC_NOT_EQUAL;- }- else if (aCellStr.GetChar(1) == '=')- {- *rEntry.pStr = aCellStr.Copy(2);- rEntry.eOp = SC_LESS_EQUAL;- }- else- {- *rEntry.pStr = aCellStr.Copy(1);- rEntry.eOp = SC_LESS;- }- }- else if (aCellStr.GetChar(0) == '>')- {- if (aCellStr.GetChar(1) == '=')- {- *rEntry.pStr = aCellStr.Copy(2);- rEntry.eOp = SC_GREATER_EQUAL;- }- else- {- *rEntry.pStr = aCellStr.Copy(1);- rEntry.eOp = SC_GREATER;- }- }- else- {- if (aCellStr.GetChar(0) == '=')- *rEntry.pStr = aCellStr.Copy(1);- else- *rEntry.pStr = aCellStr;- rEntry.eOp = SC_EQUAL;- }- }-}--//------------------------------------------------------------------------ // struct ScSubTotalParam: ScSubTotalParam::ScSubTotalParam()diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxxindex a5b14a3cc8c5..2accdadeb781 100644--- a/sc/source/core/data/globalx.cxx+++ b/sc/source/core/data/globalx.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: globalx.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/makefile.mk b/sc/source/core/data/makefile.mkindex ecd3aad07c0b..1dd60f75176e 100644--- a/sc/source/core/data/makefile.mk+++ b/sc/source/core/data/makefile.mk@@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.-#-# Copyright 2008 by Sun Microsystems, Inc.+# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.26.100.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxxindex 362c7e769b7a..aeca394437cd 100644--- a/sc/source/core/data/markarr.cxx+++ b/sc/source/core/data/markarr.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: markarr.cxx,v $- * $Revision: 1.11.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxxindex 015a33928b7e..baf3f4cf3f95 100644--- a/sc/source/core/data/markdata.cxx+++ b/sc/source/core/data/markdata.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: markdata.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxxindex 11112e5774ac..55f7ba46b898 100644--- a/sc/source/core/data/olinetab.cxx+++ b/sc/source/core/data/olinetab.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: olinetab.cxx,v $- * $Revision: 1.10.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxxindex 444f10a5df8e..318f5c19501b 100644--- a/sc/source/core/data/pagepar.cxx+++ b/sc/source/core/data/pagepar.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pagepar.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxxindex dbc5bbf50c63..b66aea63dd05 100644--- a/sc/source/core/data/patattr.cxx+++ b/sc/source/core/data/patattr.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: patattr.cxx,v $- * $Revision: 1.34.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,31 +32,31 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/adjitem.hxx>+#include <editeng/adjitem.hxx> #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/bolnitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/charreliefitem.hxx>-#include <svx/cntritem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/bolnitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/charreliefitem.hxx>+#include <editeng/cntritem.hxx> #include <svtools/colorcfg.hxx>-#include <svx/colritem.hxx>-#include <svx/crsditem.hxx>-#include <svx/emphitem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/fontitem.hxx>-#include <svx/forbiddenruleitem.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/langitem.hxx>-#include <svx/postitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/emphitem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/forbiddenruleitem.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/langitem.hxx>+#include <editeng/postitem.hxx> #include <svx/rotmodit.hxx>-#include <svx/scriptspaceitem.hxx>-#include <svx/scripttypeitem.hxx>-#include <svx/shaditem.hxx>-#include <svx/shdditem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>-#include <svx/wrlmitem.hxx>+#include <editeng/scriptspaceitem.hxx>+#include <editeng/scripttypeitem.hxx>+#include <editeng/shaditem.hxx>+#include <editeng/shdditem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx>+#include <editeng/wrlmitem.hxx> #include <svl/intitem.hxx> #include <svl/zforlist.hxx> #include <vcl/outdev.hxx>diff --git a/sc/source/core/data/pivot.cxx b/sc/source/core/data/pivot.cxxindex 00cdf2a84eac..e63b228de703 100644--- a/sc/source/core/data/pivot.cxx+++ b/sc/source/core/data/pivot.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pivot.cxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxxindex 951a656d841d..5a6174bc0129 100644--- a/sc/source/core/data/pivot2.cxx+++ b/sc/source/core/data/pivot2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pivot2.cxx,v $- * $Revision: 1.14.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,8 +37,8 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/boxitem.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/wghtitem.hxx> #include <svx/algitem.hxx> #include <unotools/transliterationwrapper.hxx> diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxxindex 2bd7cc9c1ea9..010cc502798b 100644--- a/sc/source/core/data/poolhelp.cxx+++ b/sc/source/core/data/poolhelp.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: poolhelp.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ // INCLUDE --------------------------------------------------------------- #include <svl/zforlist.hxx>-#include <svx/editeng.hxx>+#include <editeng/editeng.hxx> #include "poolhelp.hxx" #include "document.hxx"diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxxindex 6489b4f21a6a..a4bc9a473768 100644--- a/sc/source/core/data/postit.cxx+++ b/sc/source/core/data/postit.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: postit.cxx,v $- * $Revision: 1.12.54.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,8 +34,8 @@ #include <unotools/useroptions.hxx> #include <svx/svdpage.hxx> #include <svx/svdocapt.hxx>-#include <svx/outlobj.hxx>-#include <svx/editobj.hxx>+#include <editeng/outlobj.hxx>+#include <editeng/editobj.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include "scitems.hxx"diff --git a/sc/source/core/data/scimpexpmsg.cxx b/sc/source/core/data/scimpexpmsg.cxxindex 00dde7d9fa2a..0d883fe5535a 100644--- a/sc/source/core/data/scimpexpmsg.cxx+++ b/sc/source/core/data/scimpexpmsg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scimpexpmsg.cxx,v $- * $Revision: 1.5.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxxindex 15691a642d7e..9e8d355e74fa 100644--- a/sc/source/core/data/sortparam.cxx+++ b/sc/source/core/data/sortparam.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sortparam.cxx,v $- * $Revision: 1.8.146.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,6 +33,7 @@ #include "sortparam.hxx" #include "global.hxx" #include "address.hxx"+#include "queryparam.hxx" #include <tools/debug.hxx> diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxxindex e47f3899bfeb..d722856dc80a 100644--- a/sc/source/core/data/stlpool.cxx+++ b/sc/source/core/data/stlpool.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: stlpool.cxx,v $- * $Revision: 1.18.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,20 +32,20 @@ //------------------------------------------------------------------------ #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/editdata.hxx>-#include <svx/editeng.hxx>-#include <svx/editobj.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/flditem.hxx>-#include <svx/fontitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/editdata.hxx>+#include <editeng/editeng.hxx>+#include <editeng/editobj.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/flditem.hxx>+#include <editeng/fontitem.hxx> #include <svx/pageitem.hxx>-#include <svx/postitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx> #include <svl/itemset.hxx> #include <svl/zforlist.hxx> #include <unotools/charclass.hxx>diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxxindex 277a7ce9f326..4a4210a7925c 100644--- a/sc/source/core/data/stlsheet.cxx+++ b/sc/source/core/data/stlsheet.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: stlsheet.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -39,14 +36,14 @@ #include "stlpool.hxx" #include "scitems.hxx"-#include <svx/boxitem.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/lrspitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/lrspitem.hxx> #include <svx/pageitem.hxx>-#include <svx/paperinf.hxx>-#include <svx/pbinitem.hxx>-#include <svx/sizeitem.hxx>-#include <svx/ulspitem.hxx>+#include <editeng/paperinf.hxx>+#include <editeng/pbinitem.hxx>+#include <editeng/sizeitem.hxx>+#include <editeng/ulspitem.hxx> #include <sfx2/printer.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx>diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxxindex 403377342661..76656accdf46 100644--- a/sc/source/core/data/table1.cxx+++ b/sc/source/core/data/table1.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: table1.cxx,v $- * $Revision: 1.25.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -125,6 +122,7 @@ extern BOOL bIsOlk, bOderSo; ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName, BOOL bColInfo, BOOL bRowInfo ) : aName( rNewName ),+ aCodeName( rNewName ), bScenario( FALSE ), bLayoutRTL( FALSE ), bLoadingRTL( FALSE ),diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxxindex 4d0eaf76a976..5b3f6078d489 100644--- a/sc/source/core/data/table2.cxx+++ b/sc/source/core/data/table2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: table2.cxx,v $- * $Revision: 1.40.124.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,7 +31,7 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/boxitem.hxx>+#include <editeng/boxitem.hxx> #include <tools/urlobj.hxx> #include <svl/poolcach.hxx> #include <unotools/charclass.hxx>diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxxindex b85b910795a5..09a9f41929b5 100644--- a/sc/source/core/data/table3.cxx+++ b/sc/source/core/data/table3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: table3.cxx,v $- * $Revision: 1.30.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -60,6 +57,7 @@ #include "progress.hxx" #include "cellform.hxx" #include "postit.hxx"+#include "queryparam.hxx" #include <vector> @@ -1818,6 +1816,11 @@ BOOL ScTable::GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStri return aCol[nCol].GetDataEntries( nRow, rStrings, bLimit ); } +SCSIZE ScTable::GetCellCount(SCCOL nCol) const+{+ return aCol[nCol].GetCellCount();+}+ ULONG ScTable::GetCellCount() const { ULONG nCellCount = 0;diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxxindex b10741f46c3f..4a736e8c11b7 100644--- a/sc/source/core/data/table4.cxx+++ b/sc/source/core/data/table4.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: table4.cxx,v $- * $Revision: 1.23.126.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -44,23 +41,23 @@ #include "scitems.hxx" #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/cntritem.hxx>-#include <svx/colritem.hxx>-#include <svx/crsditem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/fontitem.hxx>-#include <svx/langitem.hxx>-#include <svx/postitem.hxx>-#include <svx/shdditem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/cntritem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/langitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/shdditem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx> #include <svx/rotmodit.hxx>-#include <svx/editobj.hxx>-#include <svx/editeng.hxx>-#include <svx/eeitem.hxx>-#include <svx/escpitem.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editeng.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/escpitem.hxx> #include <svl/zforlist.hxx> #include <vcl/keycodes.hxx> #include <rtl/math.hxx>diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxxindex 4a0cd9e135d5..3a7117dfcd10 100644--- a/sc/source/core/data/table5.cxx+++ b/sc/source/core/data/table5.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: table5.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxxindex 09362b9996ed..500ac1bb3614 100644--- a/sc/source/core/data/table6.cxx+++ b/sc/source/core/data/table6.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: table6.cxx,v $- * $Revision: 1.18.128.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,8 +33,8 @@ #include <com/sun/star/i18n/TransliterationModules.hpp> #include <unotools/textsearch.hxx>-#include <svx/srchitem.hxx>-#include <svx/editobj.hxx>+#include <svl/srchitem.hxx>+#include <editeng/editobj.hxx> #include "table.hxx" #include "collect.hxx"diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxxindex c19cd8cf6b21..5b87fef3151a 100644--- a/sc/source/core/data/tabprotection.cxx+++ b/sc/source/core/data/tabprotection.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabprotection.cxx,v $- * $Revision: 1.1.4.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxxindex 66397700676c..466e83b15fad 100644--- a/sc/source/core/data/userdat.cxx+++ b/sc/source/core/data/userdat.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: userdat.cxx,v $- * $Revision: 1.12.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxxindex 9b0970611254..2239b1d0f773 100644--- a/sc/source/core/data/validat.cxx+++ b/sc/source/core/data/validat.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: validat.cxx,v $- * $Revision: 1.24.110.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxxindex 9f6efb6299d2..b2f085ed64e5 100644--- a/sc/source/core/inc/addinhelpid.hxx+++ b/sc/source/core/inc/addinhelpid.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: addinhelpid.hxx,v $- * $Revision: 1.4.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxxindex 367ee96f79ea..6c0f98386920 100644--- a/sc/source/core/inc/addinlis.hxx+++ b/sc/source/core/inc/addinlis.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: addinlis.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxxindex cc696499d025..4d0997fce63d 100644--- a/sc/source/core/inc/adiasync.hxx+++ b/sc/source/core/inc/adiasync.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: adiasync.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxxindex a198861092d6..1ecbefe4a9b1 100644--- a/sc/source/core/inc/bcaslot.hxx+++ b/sc/source/core/inc/bcaslot.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: bcaslot.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxxindex 6bf9b9210af3..536e521a78da 100644--- a/sc/source/core/inc/cellkeytranslator.hxx+++ b/sc/source/core/inc/cellkeytranslator.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellkeytranslator.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxxindex 19d0463e7871..3e637550cd64 100644--- a/sc/source/core/inc/core_pch.hxx+++ b/sc/source/core/inc/core_pch.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: core_pch.hxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -174,10 +171,10 @@ #include <vcl/combobox.hxx> #include <vcl/combobox.h> #include <refupdat.hxx>-#include <svx/boxitem.hxx>+#include <editeng/boxitem.hxx> #include <conditio.hxx> #include <brdcst.hxx>-#include <svx/svxenum.hxx>+#include <editeng/svxenum.hxx> #include <dociter.hxx> #include <scdll.hxx> #include <stdio.h>@@ -208,35 +205,35 @@ #include <svx/pageitem.hxx> #include <dbcolect.hxx> #include <userlist.hxx>-#include <svx/editdata.hxx>+#include <editeng/editdata.hxx> #include <basic/sbxvar.hxx> #include <basic/sbxcore.hxx> #include <svx/svdobj.hxx> #include <svx/svdsob.hxx> #include <svx/svdglue.hxx>-#include <svx/langitem.hxx>-#include <svx/eeitem.hxx>+#include <editeng/langitem.hxx>+#include <editeng/eeitem.hxx> #include <callform.hxx> #include <validat.hxx>-#include <svx/brshitem.hxx>+#include <editeng/brshitem.hxx> #include <sot/exchange.hxx>-#include <svx/editeng.hxx>+#include <editeng/editeng.hxx> #include <vcl/fonttype.hxx>-#include <svx/editobj.hxx>-#include <svx/wghtitem.hxx>-#include <svx/fhgtitem.hxx>+#include <editeng/editobj.hxx>+#include <editeng/wghtitem.hxx>+#include <editeng/fhgtitem.hxx> #include <svl/stritem.hxx> #include <pivot.hxx> #include <vcl/gdimtf.hxx> #include <svx/svdpage.hxx> #include <svx/svdlayer.hxx>-#include <svx/linkmgr.hxx>+#include <sfx2/linkmgr.hxx> #include <ctype.h> #include <vcl/font.hxx>-#include <svx/fontitem.hxx>-#include <svx/postitem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/postitem.hxx> #include <svx/svditer.hxx>-#include <svx/udlnitem.hxx>+#include <editeng/udlnitem.hxx> #include <adiasync.hxx> #include <sfx2/bindings.hxx> #include <ddelink.hxx>diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxxindex 465c58afb823..4f0652753e65 100644--- a/sc/source/core/inc/ddelink.hxx+++ b/sc/source/core/inc/ddelink.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: ddelink.hxx,v $- * $Revision: 1.11.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxxnew file mode 100644index 000000000000..e7bd2dfa6ae1--- /dev/null+++ b/sc/source/core/inc/doubleref.hxx@@ -0,0 +1,194 @@+/*************************************************************************+ *+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.+ *+ * Copyright 2008 by Sun Microsystems, Inc.+ *+ * OpenOffice.org - a multi-platform office productivity suite+ *+ * $RCSfile: interpre.hxx,v $+ * $Revision: 1.35.44.2 $+ *+ * This file is part of OpenOffice.org.+ *+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation.+ *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code).+ *+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License.+ *+ ************************************************************************/++#ifndef SC_DOUBLEREF_HXX+#define SC_DOUBLEREF_HXX++#include "address.hxx"+#include "scmatrix.hxx"++class ScDocument;+class ScBaseCell;+struct ScDBQueryParamBase;+struct ScQueryParamBase;++// ============================================================================++/**+ * Base class for abstracting range data backends for database functions.+ */+class ScDBRangeBase+{+public:+ enum RefType { INTERNAL, EXTERNAL };++ virtual ~ScDBRangeBase() = 0;++ RefType getType() const;+ bool fillQueryEntries(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef) const;++ virtual SCCOL getColSize() const = 0;+ virtual SCROW getRowSize() const = 0;+ virtual SCSIZE getVisibleDataCellCount() const = 0;++ /**+ * Get a string value of a specified cell position. Note that the+ * position of the upper left cell of the range is always (0, 0) even if+ * the reference type is of internal range.+ *+ * @param nCol column position (0 to column size-1)+ * @param nRow row position (0 to row size-1)+ */+ virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const = 0;++ virtual SCCOL getFirstFieldColumn() const = 0;++ /**+ * Get a <i>0-based</i> column index that corresponds with the passed field+ * index. Note that the field index passed as the 1st parameter is+ * <i>1-based.</i>+ *+ * @param nIndex 1-based field index.+ *+ * @return 0-based column index+ */+ virtual SCCOL findFieldColumn(SCCOL nIndex) const = 0;+ virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const = 0;+ virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const = 0;+ virtual bool isRangeEqual(const ScRange& rRange) const = 0;++protected:+ ScDBRangeBase(ScDocument* pDoc, RefType eType);+ ScDocument* getDoc() const;++ /**+ * Populate query options that are always the same for all database+ * queries.+ */+ static void fillQueryOptions(ScQueryParamBase* pParam);++private:+ ScDBRangeBase(); // disabled++ ScDocument* mpDoc;+ RefType meType;+};++// ============================================================================++class ScDBInternalRange : public ScDBRangeBase+{+public:+ explicit ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange);+ virtual ~ScDBInternalRange();++ const ScRange& getRange() const;++ virtual SCCOL getColSize() const;+ virtual SCROW getRowSize() const;+ virtual SCSIZE getVisibleDataCellCount() const;++ /**+ * Get a string value of a specified cell position. Note that the+ * position of the upper left cell of the range is always (0, 0) even if+ * the reference type is of internal range.+ *+ * @param nCol column position (0 to column size-1)+ * @param nRow row position (0 to row size-1)+ */+ virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const;++ virtual SCCOL getFirstFieldColumn() const;+ /**+ * Get a <i>0-based</i> column index that corresponds with the passed field+ * index. Note that the field index passed as the 1st parameter is+ * <i>1-based.</i>+ *+ * @param nIndex 1-based field index.+ *+ * @return 0-based column index+ */+ virtual SCCOL findFieldColumn(SCCOL nIndex) const;+ virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const;+ virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const;+ virtual bool isRangeEqual(const ScRange& rRange) const;++private:+ sal_uInt16 getCellString(::rtl::OUString& rStr, ScBaseCell* pCell) const;++private:+ ScRange maRange;+};++// ============================================================================++class ScDBExternalRange : public ScDBRangeBase+{+public:+ explicit ScDBExternalRange(ScDocument* pDoc, const ScMatrixRef& pMat);+ virtual ~ScDBExternalRange();++ virtual SCCOL getColSize() const;+ virtual SCROW getRowSize() const;+ virtual SCSIZE getVisibleDataCellCount() const;++ /**+ * Get a string value of a specified cell position. Note that the+ * position of the upper left cell of the range is always (0, 0) even if+ * the reference type is of internal range.+ *+ * @param nCol column position (0 to column size-1)+ * @param nRow row position (0 to row size-1)+ */+ virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const;++ virtual SCCOL getFirstFieldColumn() const;++ /**+ * Get a <i>0-based</i> column index that corresponds with the passed field+ * index. Note that the field index passed as the 1st parameter is+ * <i>1-based.</i>+ *+ * @param nIndex 1-based field index.+ *+ * @return 0-based column index+ */+ virtual SCCOL findFieldColumn(SCCOL nIndex) const;+ virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const;+ virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const;+ virtual bool isRangeEqual(const ScRange& rRange) const;++private:+ const ScMatrixRef mpMatrix;+ SCCOL mnCols;+ SCROW mnRows;+};++#endifdiff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxxindex 659884dfd5de..2394bfb56799 100644--- a/sc/source/core/inc/interpre.hxx+++ b/sc/source/core/inc/interpre.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: interpre.hxx,v $- * $Revision: 1.35.44.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -53,7 +50,10 @@ class SbxVariable; class ScBaseCell; class ScFormulaCell; class SvNumberFormatter;+class ScDBRangeBase; struct MatrixDoubleOp;+struct ScQueryParam;+struct ScDBQueryParamBase; struct ScCompare {@@ -302,6 +302,7 @@ void DoubleRefToVars( const ScToken* p, SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2, BOOL bDontCheckForTableOp = FALSE );+ScDBRangeBase* PopDoubleRef(); void PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2, BOOL bDontCheckForTableOp = FALSE );@@ -491,7 +492,7 @@ void ScSubTotal(); // compatibility). If this was the case then rMissingField is set to TRUE upon // return. If rMissingField==FALSE upon call all "missing cases" are considered // to be an error.-BOOL GetDBParams( SCTAB& rTab, ScQueryParam& rParam, BOOL& rMissingField );+ScDBQueryParamBase* GetDBParams( BOOL& rMissingField ); void DBIterator( ScIterFunc ); void ScDBSum();diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxxindex 56b7273f3ace..8089d6653730 100644--- a/sc/source/core/inc/jumpmatrix.hxx+++ b/sc/source/core/inc/jumpmatrix.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: jumpmatrix.hxx,v $- * $Revision: 1.6.148.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/makefile.mk b/sc/source/core/inc/makefile.mkindex 3c33d006edf9..1b35ca49549d 100644--- a/sc/source/core/inc/makefile.mk+++ b/sc/source/core/inc/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.3 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/parclass.hxx b/sc/source/core/inc/parclass.hxxindex c72bcece7f19..39844de7ae22 100644--- a/sc/source/core/inc/parclass.hxx+++ b/sc/source/core/inc/parclass.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: parclass.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxxindex 00474d63c080..f98963513c59 100644--- a/sc/source/core/inc/poolhelp.hxx+++ b/sc/source/core/inc/poolhelp.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: poolhelp.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/refupdat.hxx b/sc/source/core/inc/refupdat.hxxindex 6ecc67259463..17da3bf5e635 100644--- a/sc/source/core/inc/refupdat.hxx+++ b/sc/source/core/inc/refupdat.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: refupdat.hxx,v $- * $Revision: 1.5.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/scrdata.hxx b/sc/source/core/inc/scrdata.hxxindex 697a848e7ff3..b569bddddd6b 100644--- a/sc/source/core/inc/scrdata.hxx+++ b/sc/source/core/inc/scrdata.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scrdata.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/inc/sctictac.hxx b/sc/source/core/inc/sctictac.hxxindex 90afbdcb720d..1c8242150369 100644--- a/sc/source/core/inc/sctictac.hxx+++ b/sc/source/core/inc/sctictac.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sctictac.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/src/compiler.src b/sc/source/core/src/compiler.srcindex ced403a2baef..a45c2b6aa458 100644--- a/sc/source/core/src/compiler.src+++ b/sc/source/core/src/compiler.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: compiler.src,v $- * $Revision: 1.59 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/src/makefile.mk b/sc/source/core/src/makefile.mkindex e699880ae69b..13d0c2127c6d 100644--- a/sc/source/core/src/makefile.mk+++ b/sc/source/core/src/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.5 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxxindex 82ed4f31b859..c76b60eae077 100644--- a/sc/source/core/tool/addincfg.cxx+++ b/sc/source/core/tool/addincfg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: addincfg.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxxindex 31f7fcd74ce6..c0ae60f13841 100644--- a/sc/source/core/tool/addincol.cxx+++ b/sc/source/core/tool/addincol.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: addincol.cxx,v $- * $Revision: 1.27 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxxindex e22ef4ec0bf5..a4de52e27b1b 100644--- a/sc/source/core/tool/addinhelpid.cxx+++ b/sc/source/core/tool/addinhelpid.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: addinhelpid.cxx,v $- * $Revision: 1.5.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxxindex 00acd7f52438..ad6b60073ccb 100644--- a/sc/source/core/tool/addinlis.cxx+++ b/sc/source/core/tool/addinlis.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: addinlis.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxxindex 4cf317073b56..509a9fe293fb 100644--- a/sc/source/core/tool/address.cxx+++ b/sc/source/core/tool/address.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: address.cxx,v $- * $Revision: 1.11.30.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxxindex ae94eeefc300..4f19a043a34d 100644--- a/sc/source/core/tool/adiasync.cxx+++ b/sc/source/core/tool/adiasync.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: adiasync.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxxindex 3ba9ffb49abb..857efd972886 100644--- a/sc/source/core/tool/appoptio.cxx+++ b/sc/source/core/tool/appoptio.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: appoptio.cxx,v $- * $Revision: 1.12.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxxindex f9a9f0bd51a0..5a7f117e75d9 100644--- a/sc/source/core/tool/autoform.cxx+++ b/sc/source/core/tool/autoform.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: autoform.cxx,v $- * $Revision: 1.22.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -46,7 +43,7 @@ #include <vcl/outdev.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc>-#include <svx/langitem.hxx>+#include <editeng/langitem.hxx> #include <tools/urlobj.hxx> #include <unotools/transliterationwrapper.hxx> #include <tools/tenccvt.hxx>diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxxindex b98525e45968..e8e2b28f3f8e 100644--- a/sc/source/core/tool/callform.cxx+++ b/sc/source/core/tool/callform.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: callform.cxx,v $- * $Revision: 1.12.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxxindex 5305db490f8d..45d2c4a890bb 100644--- a/sc/source/core/tool/cellform.cxx+++ b/sc/source/core/tool/cellform.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellform.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxxindex 3751dcb8e2c1..4db8c22d19d8 100644--- a/sc/source/core/tool/cellkeytranslator.cxx+++ b/sc/source/core/tool/cellkeytranslator.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellkeytranslator.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxxindex e4def00c10b0..9e4e77b7c1d4 100644--- a/sc/source/core/tool/chartarr.cxx+++ b/sc/source/core/tool/chartarr.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartarr.cxx,v $- * $Revision: 1.24.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxxindex 6f2e130da847..756493cc86e9 100644--- a/sc/source/core/tool/charthelper.cxx+++ b/sc/source/core/tool/charthelper.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: charthelper.cxx,v $- * $Revision: 1.1.2.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxxindex d66cdae50f4c..b729ce0b30b5 100644--- a/sc/source/core/tool/chartlis.cxx+++ b/sc/source/core/tool/chartlis.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartlis.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxxindex c861720dadee..54a49fb4b4aa 100644--- a/sc/source/core/tool/chartlock.cxx+++ b/sc/source/core/tool/chartlock.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartlock.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxxindex 9873ea42ff13..fc3d9bf51be2 100644--- a/sc/source/core/tool/chartpos.cxx+++ b/sc/source/core/tool/chartpos.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartpos.cxx,v $- * $Revision: 1.4.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxxindex 7dfd75206a9f..ba3f3e47bfb7 100644--- a/sc/source/core/tool/chgtrack.cxx+++ b/sc/source/core/tool/chgtrack.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chgtrack.cxx,v $- * $Revision: 1.32.100.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxxindex 8e5ad0f09ca0..ac587db2bd12 100644--- a/sc/source/core/tool/chgviset.cxx+++ b/sc/source/core/tool/chgviset.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chgviset.cxx,v $- * $Revision: 1.8.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/collect.cxx b/sc/source/core/tool/collect.cxxindex e66c14ee0317..13df9307bc11 100644--- a/sc/source/core/tool/collect.cxx+++ b/sc/source/core/tool/collect.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: collect.cxx,v $- * $Revision: 1.14.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxxindex 4eab9aa85c9e..d2b1963c544d 100644--- a/sc/source/core/tool/compiler.cxx+++ b/sc/source/core/tool/compiler.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: compiler.cxx,v $- * $Revision: 1.82.18.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxxindex b464c78e1c8f..addd92082cfd 100644--- a/sc/source/core/tool/consoli.cxx+++ b/sc/source/core/tool/consoli.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: consoli.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/dbcolect.cxx b/sc/source/core/tool/dbcolect.cxxindex 61ca8ee00195..4eea4db97a0a 100644--- a/sc/source/core/tool/dbcolect.cxx+++ b/sc/source/core/tool/dbcolect.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbcolect.cxx,v $- * $Revision: 1.17.32.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,6 +37,7 @@ #include "refupdat.hxx" #include "rechead.hxx" #include "document.hxx"+#include "queryparam.hxx" #include "globstr.hrc" diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxxindex 446f892452fc..977161760eb0 100644--- a/sc/source/core/tool/ddelink.cxx+++ b/sc/source/core/tool/ddelink.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: ddelink.cxx,v $- * $Revision: 1.16.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,7 +32,7 @@ // INCLUDE --------------------------------------------------------------- #include <tools/list.hxx>-#include <svx/linkmgr.hxx>+#include <sfx2/linkmgr.hxx> #include <sfx2/bindings.hxx> #include <svl/zforlist.hxx> @@ -250,7 +247,7 @@ void __EXPORT ScDdeLink::ListenersGone() ScDocument* pStackDoc = pDoc; // member pDoc can't be used after removing the link - SvxLinkManager* pLinkMgr = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkMgr = pDoc->GetLinkManager(); pLinkMgr->Remove( this); // deletes this if ( !pLinkMgr->GetLinks().Count() ) // letzten geloescht ?diff --git a/sc/source/core/tool/detdata.cxx b/sc/source/core/tool/detdata.cxxindex 6f0d0239f02c..a1add9ca6939 100644--- a/sc/source/core/tool/detdata.cxx+++ b/sc/source/core/tool/detdata.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: detdata.cxx,v $- * $Revision: 1.8.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxxindex fed4a3b0ae40..1f257512ae50 100644--- a/sc/source/core/tool/detfunc.cxx+++ b/sc/source/core/tool/detfunc.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: detfunc.cxx,v $- * $Revision: 1.30.20.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,8 +32,8 @@ #include "scitems.hxx" #include <svtools/colorcfg.hxx>-#include <svx/eeitem.hxx>-#include <svx/outlobj.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/outlobj.hxx> #include <svx/sdshitm.hxx> #include <svx/sdsxyitm.hxx> #include <svx/sdtditm.hxx>@@ -58,11 +55,11 @@ #include <svx/xlnstwit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xtable.hxx>-#include <svx/outliner.hxx>-#include <svx/editobj.hxx>+#include <editeng/outliner.hxx>+#include <editeng/editobj.hxx> #include <svx/sxcecitm.hxx> #include <svl/whiter.hxx>-#include <svx/writingmodeitem.hxx>+#include <editeng/writingmodeitem.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygontools.hxx>diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxxindex 37e6c68fbf03..a99b3c01dd1f 100644--- a/sc/source/core/tool/docoptio.cxx+++ b/sc/source/core/tool/docoptio.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docoptio.cxx,v $- * $Revision: 1.9.32.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxxnew file mode 100644index 000000000000..28fae20ddb62--- /dev/null+++ b/sc/source/core/tool/doubleref.cxx@@ -0,0 +1,568 @@+/*************************************************************************+ *+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.+ *+ * Copyright 2008 by Sun Microsystems, Inc.+ *+ * OpenOffice.org - a multi-platform office productivity suite+ *+ * $RCSfile: interpre.hxx,v $+ * $Revision: 1.35.44.2 $+ *+ * This file is part of OpenOffice.org.+ *+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation.+ *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code).+ *+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License.+ *+ ************************************************************************/++// MARKER(update_precomp.py): autogen include statement, do not remove+#include "precompiled_sc.hxx"++// INCLUDE ---------------------------------------------------------------++#include "doubleref.hxx"+#include "cell.hxx"+#include "global.hxx"+#include "document.hxx"+#include "queryparam.hxx"+#include "globstr.hrc"++#include <memory>+#include <vector>++using ::rtl::OUString;+using ::std::auto_ptr;+using ::std::vector;++namespace {++void lcl_toUpper(OUString& rStr)+{+ rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, static_cast<xub_StrLen>(rStr.getLength()));+}++bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)+{+ // A valid StarQuery must be at least 4 columns wide. To be precise it+ // should be exactly 4 columns ...+ // Additionally, if this wasn't checked, a formula pointing to a valid 1-3+ // column Excel style query range immediately left to itself would result+ // in a circular reference when the field name or operator or value (first+ // to third query range column) is obtained (#i58354#). Furthermore, if the+ // range wasn't sufficiently specified data changes wouldn't flag formula+ // cells for recalculation.++ if (pQueryRef->getColSize() < 4)+ return false;++ BOOL bValid;+ BOOL bFound;+ OUString aCellStr;+ SCSIZE nIndex = 0;+ SCROW nRow = 0;+ SCROW nRows = pDBRef->getRowSize();+ SCSIZE nNewEntries = static_cast<SCSIZE>(nRows);+ pParam->Resize(nNewEntries);++ do+ {+ ScQueryEntry& rEntry = pParam->GetEntry(nIndex);++ bValid = FALSE;++ if (nIndex > 0)+ {+ // For all entries after the first one, check the and/or connector in the first column.+ aCellStr = pQueryRef->getString(0, nRow);+ lcl_toUpper(aCellStr);+ if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_UND)) )+ {+ rEntry.eConnect = SC_AND;+ bValid = TRUE;+ }+ else if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_ODER)) )+ {+ rEntry.eConnect = SC_OR;+ bValid = TRUE;+ }+ }++ if ((nIndex < 1) || bValid)+ {+ // field name in the 2nd column.+ bFound = FALSE;+ aCellStr = pQueryRef->getString(1, nRow);+ SCCOL nField = pDBRef->findFieldColumn(aCellStr); // TODO: must be case insensitive comparison.+ if (ValidCol(nField))+ {+ rEntry.nField = nField;+ bValid = true;+ }+ else+ bValid = false;+ }++ if (bValid)+ {+ // equality, non-equality operator in the 3rd column.+ bFound = FALSE;+ aCellStr = pQueryRef->getString(2, nRow);+ lcl_toUpper(aCellStr);+ const sal_Unicode* p = aCellStr.getStr();+ if (p[0] == sal_Unicode('<'))+ {+ if (p[1] == sal_Unicode('>'))+ rEntry.eOp = SC_NOT_EQUAL;+ else if (p[1] == sal_Unicode('='))+ rEntry.eOp = SC_LESS_EQUAL;+ else+ rEntry.eOp = SC_LESS;+ }+ else if (p[0] == sal_Unicode('>'))+ {+ if (p[1] == sal_Unicode('='))+ rEntry.eOp = SC_GREATER_EQUAL;+ else+ rEntry.eOp = SC_GREATER;+ }+ else if (p[0] == sal_Unicode('='))+ rEntry.eOp = SC_EQUAL;++ }++ if (bValid)+ {+ // Finally, the right-hand-side value in the 4th column.+ *rEntry.pStr = pQueryRef->getString(3, nRow);+ rEntry.bDoQuery = TRUE;+ }+ nIndex++;+ nRow++;+ }+ while (bValid && (nRow < nRows) /* && (nIndex < MAXQUERY) */ );+ return bValid;+}++bool lcl_createExcelQuery(+ ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)+{+ bool bValid = true;+ SCCOL nCols = pQueryRef->getColSize();+ SCROW nRows = pQueryRef->getRowSize();+ vector<SCCOL> aFields(nCols);+ SCCOL nCol = 0;+ while (bValid && (nCol < nCols))+ {+ OUString aQueryStr = pQueryRef->getString(nCol, 0);+ SCCOL nField = pDBRef->findFieldColumn(aQueryStr);+ if (ValidCol(nField))+ aFields[nCol] = nField;+ else+ bValid = false;+ ++nCol;+ }++ if (bValid)+ {+// ULONG nVisible = 0;+// for ( nCol=nCol1; nCol<=nCol2; nCol++ )+// nVisible += aCol[nCol].VisibleCount( nRow1+1, nRow2 );++ // Count the number of visible cells (excluding the header row). Each+ // visible cell corresponds with a single query.+ SCSIZE nVisible = pQueryRef->getVisibleDataCellCount();+ if ( nVisible > SCSIZE_MAX / sizeof(void*) )+ {+ DBG_ERROR("zu viele Filterkritierien");+ nVisible = 0;+ }++ SCSIZE nNewEntries = nVisible;+ pParam->Resize( nNewEntries );++ SCSIZE nIndex = 0;+ SCROW nRow = 1;+ String aCellStr;+ while (nRow < nRows)+ {+ nCol = 0;+ while (nCol < nCols)+ {+ aCellStr = pQueryRef->getString(nCol, nRow);+ ScGlobal::pCharClass->toUpper( aCellStr );+ if (aCellStr.Len() > 0)+ {+ if (nIndex < nNewEntries)+ {+ pParam->GetEntry(nIndex).nField = aFields[nCol];+ pParam->FillInExcelSyntax(aCellStr, nIndex);+ nIndex++;+ if (nIndex < nNewEntries)+ pParam->GetEntry(nIndex).eConnect = SC_AND;+ }+ else+ bValid = FALSE;+ }+ nCol++;+ }+ nRow++;+ if (nIndex < nNewEntries)+ pParam->GetEntry(nIndex).eConnect = SC_OR;+ }+ }+ return bValid;+}++bool lcl_fillQueryEntries(+ ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)+{+ SCSIZE nCount = pParam->GetEntryCount();+ for (SCSIZE i = 0; i < nCount; ++i)+ pParam->GetEntry(i).Clear();++ // Standard QueryTabelle+ bool bValid = lcl_createStarQuery(pParam, pDBRef, pQueryRef);+ // Excel QueryTabelle+ if (!bValid)+ bValid = lcl_createExcelQuery(pParam, pDBRef, pQueryRef);++ nCount = pParam->GetEntryCount();+ if (bValid)+ {+ // bQueryByString muss gesetzt sein+ for (SCSIZE i = 0; i < nCount; ++i)+ pParam->GetEntry(i).bQueryByString = true;+ }+ else+ {+ // nix+ for (SCSIZE i = 0; i < nCount; ++i)+ pParam->GetEntry(i).Clear();+ }+ return bValid;+}++}++// ============================================================================++ScDBRangeBase::ScDBRangeBase(ScDocument* pDoc, RefType eType) :+ mpDoc(pDoc), meType(eType)+{+}++ScDBRangeBase::~ScDBRangeBase()+{+}++ScDBRangeBase::RefType ScDBRangeBase::getType() const+{+ return meType;+}++bool ScDBRangeBase::fillQueryEntries(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef) const+{+ if (!pDBRef)+ return false;++ return lcl_fillQueryEntries(pParam, pDBRef, this);+}++void ScDBRangeBase::fillQueryOptions(ScQueryParamBase* pParam)+{+ pParam->bHasHeader = true;+ pParam->bByRow = true;+ pParam->bInplace = true;+ pParam->bCaseSens = false;+ pParam->bRegExp = false;+ pParam->bDuplicate = true;+ pParam->bMixedComparison = false;+}++ScDocument* ScDBRangeBase::getDoc() const+{+ return mpDoc;+}++// ============================================================================++ScDBInternalRange::ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange) :+ ScDBRangeBase(pDoc, INTERNAL), maRange(rRange)+{+}++ScDBInternalRange::~ScDBInternalRange()+{+}++const ScRange& ScDBInternalRange::getRange() const+{+ return maRange;+}++SCCOL ScDBInternalRange::getColSize() const+{+ return maRange.aEnd.Col() - maRange.aStart.Col() + 1;+}++SCROW ScDBInternalRange::getRowSize() const+{+ return maRange.aEnd.Row() - maRange.aStart.Row() + 1;+}++SCSIZE ScDBInternalRange::getVisibleDataCellCount() const+{+ SCCOL nCols = getColSize();+ SCROW nRows = getRowSize();+ if (nRows <= 1)+ return 0;++ return (nRows-1)*nCols;+}++OUString ScDBInternalRange::getString(SCCOL nCol, SCROW nRow) const+{+ String aStr;+ const ScAddress& s = maRange.aStart;+ getDoc()->GetString(s.Col() + nCol, s.Row() + nRow, maRange.aStart.Tab(), aStr);+ return aStr;+}++SCCOL ScDBInternalRange::getFirstFieldColumn() const+{+ return getRange().aStart.Col();+}++SCCOL ScDBInternalRange::findFieldColumn(SCCOL nIndex) const+{+ const ScRange& rRange = getRange();+ const ScAddress& s = rRange.aStart;+ const ScAddress& e = rRange.aEnd;++ SCCOL nDBCol1 = s.Col();+ SCCOL nDBCol2 = e.Col();++ if ( nIndex <= 0 || nIndex > (nDBCol2 - nDBCol1 + 1) )+ return nDBCol1;++ return Min(nDBCol2, static_cast<SCCOL>(nDBCol1 + nIndex - 1));+}++sal_uInt16 ScDBInternalRange::getCellString(OUString& rStr, ScBaseCell* pCell) const+{+ sal_uInt16 nErr = 0;+ String aStr;+ if (pCell)+ {+ SvNumberFormatter* pFormatter = getDoc()->GetFormatTable();+ switch (pCell->GetCellType())+ {+ case CELLTYPE_STRING:+ ((ScStringCell*) pCell)->GetString(aStr);+ break;+ case CELLTYPE_EDIT:+ ((ScEditCell*) pCell)->GetString(aStr);+ break;+ case CELLTYPE_FORMULA:+ {+ ScFormulaCell* pFCell = (ScFormulaCell*) pCell;+ nErr = pFCell->GetErrCode();+ if (pFCell->IsValue())+ {+ double fVal = pFCell->GetValue();+ ULONG nIndex = pFormatter->GetStandardFormat(+ NUMBERFORMAT_NUMBER,+ ScGlobal::eLnge);+ pFormatter->GetInputLineString(fVal, nIndex, aStr);+ }+ else+ pFCell->GetString(aStr);+ }+ break;+ case CELLTYPE_VALUE:+ {+ double fVal = ((ScValueCell*) pCell)->GetValue();+ ULONG nIndex = pFormatter->GetStandardFormat(+ NUMBERFORMAT_NUMBER,+ ScGlobal::eLnge);+ pFormatter->GetInputLineString(fVal, nIndex, aStr);+ }+ break;+ default:+ ;+ }+ }+ rStr = aStr;+ return nErr;+}++SCCOL ScDBInternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr) const+{+ const ScAddress& s = maRange.aStart;+ const ScAddress& e = maRange.aEnd;+ OUString aUpper = rStr;+ lcl_toUpper(aUpper);++ SCCOL nDBCol1 = s.Col();+ SCROW nDBRow1 = s.Row();+ SCTAB nDBTab1 = s.Tab();+ SCCOL nDBCol2 = e.Col();++ SCCOL nField = nDBCol1;+ BOOL bFound = TRUE;++ bFound = FALSE;+ OUString aCellStr;+ ScAddress aLook( nDBCol1, nDBRow1, nDBTab1 );+ while (!bFound && (aLook.Col() <= nDBCol2))+ {+ ScBaseCell* pCell = getDoc()->GetCell( aLook );+ sal_uInt16 nErr = getCellString( aCellStr, pCell );+ if (pErr)+ *pErr = nErr;+ lcl_toUpper(aCellStr);+ bFound = ScGlobal::GetpTransliteration()->isEqual(aCellStr, aUpper);+ if (!bFound)+ aLook.IncCol();+ }+ nField = aLook.Col();++ return bFound ? nField : -1;+}++ScDBQueryParamBase* ScDBInternalRange::createQueryParam(const ScDBRangeBase* pQueryRef) const+{+ auto_ptr<ScDBQueryParamInternal> pParam(new ScDBQueryParamInternal);++ // Set the database range first.+ const ScAddress& s = maRange.aStart;+ const ScAddress& e = maRange.aEnd;+ pParam->nCol1 = s.Col();+ pParam->nRow1 = s.Row();+ pParam->nCol2 = e.Col();+ pParam->nRow2 = e.Row();+ pParam->nTab = s.Tab();++ fillQueryOptions(pParam.get());++ // Now construct the query entries from the query range.+ if (!pQueryRef->fillQueryEntries(pParam.get(), this))+ return NULL;++ return pParam.release();+}++bool ScDBInternalRange::isRangeEqual(const ScRange& rRange) const+{+ return maRange == rRange;+}++// ============================================================================++ScDBExternalRange::ScDBExternalRange(ScDocument* pDoc, const ScMatrixRef& pMat) :+ ScDBRangeBase(pDoc, EXTERNAL), mpMatrix(pMat)+{+ SCSIZE nC, nR;+ mpMatrix->GetDimensions(nC, nR);+ mnCols = static_cast<SCCOL>(nC);+ mnRows = static_cast<SCROW>(nR);+}++ScDBExternalRange::~ScDBExternalRange()+{+}++SCCOL ScDBExternalRange::getColSize() const+{+ return mnCols;+}++SCROW ScDBExternalRange::getRowSize() const+{+ return mnRows;+}++SCSIZE ScDBExternalRange::getVisibleDataCellCount() const+{+ SCCOL nCols = getColSize();+ SCROW nRows = getRowSize();+ if (nRows <= 1)+ return 0;++ return (nRows-1)*nCols;+}++OUString ScDBExternalRange::getString(SCCOL nCol, SCROW nRow) const+{+ if (nCol >= mnCols || nRow >= mnRows)+ return OUString();++ return mpMatrix->GetString(nCol, nRow);+}++SCCOL ScDBExternalRange::getFirstFieldColumn() const+{+ return 0;+}++SCCOL ScDBExternalRange::findFieldColumn(SCCOL nIndex) const+{+ if (nIndex < 1)+ // 1st field+ return 0;++ if (nIndex > mnCols)+ // last field+ return mnCols - 1;++ return nIndex - 1;+}++SCCOL ScDBExternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr) const+{+ if (pErr)+ pErr = 0;++ OUString aUpper = rStr;+ lcl_toUpper(aUpper);+ for (SCCOL i = 0; i < mnCols; ++i)+ {+ OUString aUpperVal = mpMatrix->GetString(i, 0);+ lcl_toUpper(aUpperVal);+ if (aUpper.equals(aUpperVal))+ return i;+ }+ return -1;+}++ScDBQueryParamBase* ScDBExternalRange::createQueryParam(const ScDBRangeBase* pQueryRef) const+{+ auto_ptr<ScDBQueryParamMatrix> pParam(new ScDBQueryParamMatrix);+ pParam->mpMatrix = mpMatrix;+ fillQueryOptions(pParam.get());++ // Now construct the query entries from the query range.+ if (!pQueryRef->fillQueryEntries(pParam.get(), this))+ return NULL;++ return pParam.release();+}++bool ScDBExternalRange::isRangeEqual(const ScRange& /*rRange*/) const+{+ return false;+}+diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxxindex e4f2c07a3c57..483f0cea6b57 100644--- a/sc/source/core/tool/editutil.cxx+++ b/sc/source/core/tool/editutil.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: editutil.cxx,v $- * $Revision: 1.33 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -38,15 +35,15 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/algitem.hxx> #include <svtools/colorcfg.hxx>-#include <svx/editview.hxx>-#include <svx/editstat.hxx>-#include <svx/escpitem.hxx>-#include <svx/flditem.hxx>-#include <svx/numitem.hxx>+#include <editeng/editview.hxx>+#include <editeng/editstat.hxx>+#include <editeng/escpitem.hxx>+#include <editeng/flditem.hxx>+#include <editeng/numitem.hxx> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> #include <svl/inethist.hxx>diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxxindex 6da2bc989e6f..7ac3d710b420 100644--- a/sc/source/core/tool/filtopt.cxx+++ b/sc/source/core/tool/filtopt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filtopt.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxxindex 94259a56d6e2..75d1c874eba8 100644--- a/sc/source/core/tool/formulaparserpool.cxx+++ b/sc/source/core/tool/formulaparserpool.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formulaparserpool.cxx,v $- * $Revision: 1.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -161,7 +158,7 @@ Reference< XFormulaParser > ScFormulaParserPool::getFormulaParser( const OUStrin ScParserFactoryMap& rFactoryMap = ScParserFactorySingleton::get(); rxParser = rFactoryMap.createFormulaParser( xComponent, rNamespace ); }- catch( Exception& ) + catch( Exception& ) { } return rxParser;diff --git a/sc/source/core/tool/hints.cxx b/sc/source/core/tool/hints.cxxindex 531eddff57d8..e2bcb11fc573 100644--- a/sc/source/core/tool/hints.cxx+++ b/sc/source/core/tool/hints.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hints.cxx,v $- * $Revision: 1.6.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxxindex ce878a17fb78..ed5a74582348 100644--- a/sc/source/core/tool/inputopt.cxx+++ b/sc/source/core/tool/inputopt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: inputopt.cxx,v $- * $Revision: 1.10.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxxindex f92703064d3d..166261b98ffd 100644--- a/sc/source/core/tool/interpr1.cxx+++ b/sc/source/core/tool/interpr1.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: interpr1.cxx,v $- * $Revision: 1.61 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,7 +31,7 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/langitem.hxx>+#include <editeng/langitem.hxx> #include <svx/algitem.hxx> #include <unotools/textsearch.hxx> #include <svl/zforlist.hxx>@@ -68,11 +65,14 @@ #include <string.h> #include <math.h> #include <vector>+#include <memory> #include "cellkeytranslator.hxx" #include "lookupcache.hxx" #include "rangenam.hxx" #include "compiler.hxx" #include "externalrefmgr.hxx"+#include "doubleref.hxx"+#include "queryparam.hxx" #define SC_DOUBLE_MAXVALUE 1.7e307 @@ -83,6 +83,8 @@ ScTokenStack* ScInterpreter::pGlobalStack = NULL; BOOL ScInterpreter::bGlobalStackInUse = FALSE; using namespace formula;+using ::std::auto_ptr;+ //----------------------------------------------------------------------------- // Funktionen //-----------------------------------------------------------------------------@@ -5828,11 +5830,9 @@ void ScInterpreter::ScSubTotal() #endif -BOOL ScInterpreter::GetDBParams(SCTAB& rTab, ScQueryParam& rParam,- BOOL& rMissingField )+ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetDBParams" );- BOOL bRet = FALSE; BOOL bAllowMissingField = FALSE; if ( rMissingField ) {@@ -5841,14 +5841,10 @@ BOOL ScInterpreter::GetDBParams(SCTAB& rTab, ScQueryParam& rParam, } if ( GetByte() == 3 ) {-- SCCOL nQCol1;- SCROW nQRow1;- SCTAB nQTab1;- SCCOL nQCol2;- SCROW nQRow2;- SCTAB nQTab2;- PopDoubleRef(nQCol1, nQRow1, nQTab1, nQCol2, nQRow2, nQTab2);+ // First, get the query criteria range.+ ::std::auto_ptr<ScDBRangeBase> pQueryRef( PopDoubleRef() );+ if (!pQueryRef.get())+ return NULL; BOOL bByVal = TRUE; double nVal = 0.0;@@ -5904,116 +5900,85 @@ BOOL ScInterpreter::GetDBParams(SCTAB& rTab, ScQueryParam& rParam, SetError( errIllegalParameter ); } - SCCOL nDBCol1;- SCROW nDBRow1;- SCTAB nDBTab1;- SCCOL nDBCol2;- SCROW nDBRow2;- SCTAB nDBTab2;- PopDoubleRef(nDBCol1, nDBRow1, nDBTab1, nDBCol2, nDBRow2, nDBTab2);+ auto_ptr<ScDBRangeBase> pDBRef( PopDoubleRef() );++ if (nGlobalError || !pDBRef.get())+ return NULL; - if ( nGlobalError == 0 && bRangeFake )+ if ( bRangeFake ) { // range parameter must match entire database range- if ( aMissingRange == ScRange( nDBCol1, nDBRow1, nDBTab1, nDBCol2,- nDBRow2, nDBTab2) )+ if (pDBRef->isRangeEqual(aMissingRange)) rMissingField = TRUE; else SetError( errIllegalParameter ); } - if (nGlobalError == 0)+ if (nGlobalError)+ return NULL;++ SCCOL nField = pDBRef->getFirstFieldColumn();+ if (rMissingField)+ ; // special case+ else if (bByVal)+ nField = pDBRef->findFieldColumn(static_cast<SCCOL>(nVal));+ else+ {+ sal_uInt16 nErr = 0;+ nField = pDBRef->findFieldColumn(aStr, &nErr);+ SetError(nErr);+ }++ if (!ValidCol(nField))+ return NULL;++ auto_ptr<ScDBQueryParamBase> pParam( pDBRef->createQueryParam(pQueryRef.get()) );++ if (pParam.get()) {- SCCOL nField = nDBCol1;- BOOL bFound = TRUE;+ // An allowed missing field parameter sets the result field+ // to any of the query fields, just to be able to return+ // some cell from the iterator. if ( rMissingField )- ; // special case- else if ( bByVal )- {- if ( nVal <= 0 || nVal > (nDBCol2 - nDBCol1 + 1) )- bFound = FALSE;- else- nField = Min(nDBCol2, (SCCOL)(nDBCol1 + (SCCOL)nVal - 1));- }- else+ nField = static_cast<SCCOL>(pParam->GetEntry(0).nField);+ pParam->mnField = nField;++ SCSIZE nCount = pParam->GetEntryCount();+ for ( SCSIZE i=0; i < nCount; i++ ) {- bFound = FALSE;- String aCellStr;- ScAddress aLook( nDBCol1, nDBRow1, nDBTab1 );- while (!bFound && (aLook.Col() <= nDBCol2))- {- ScBaseCell* pCell = GetCell( aLook );- GetCellString( aCellStr, pCell );- bFound = ScGlobal::GetpTransliteration()->isEqual( aCellStr, aStr );- if (!bFound)- aLook.IncCol();- }- nField = aLook.Col();- }- if (bFound)- {- rParam.nCol1 = nDBCol1;- rParam.nRow1 = nDBRow1;- rParam.nCol2 = nDBCol2;- rParam.nRow2 = nDBRow2;- rParam.nTab = nDBTab1;- rParam.bHasHeader = TRUE;- rParam.bByRow = TRUE;- rParam.bInplace = TRUE;- rParam.bCaseSens = FALSE;- rParam.bRegExp = FALSE;- rParam.bDuplicate = TRUE;- if (pDok->CreateQueryParam(nQCol1, nQRow1, nQCol2, nQRow2, nQTab1, rParam))- {- // An allowed missing field parameter sets the result field- // to any of the query fields, just to be able to return- // some cell from the iterator.- if ( rMissingField )- nField = static_cast<SCCOL>(rParam.GetEntry(0).nField);-- rParam.nCol1 = nField;- rParam.nCol2 = nField;- rTab = nDBTab1;- bRet = TRUE;- SCSIZE nCount = rParam.GetEntryCount();- for ( SCSIZE i=0; i < nCount; i++ )- {- ScQueryEntry& rEntry = rParam.GetEntry(i);- if ( rEntry.bDoQuery )- {- sal_uInt32 nIndex = 0;- rEntry.bQueryByString = !pFormatter->IsNumberFormat(- *rEntry.pStr, nIndex, rEntry.nVal );- if ( rEntry.bQueryByString && !rParam.bRegExp )- rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );- }- else- break; // for- }+ ScQueryEntry& rEntry = pParam->GetEntry(i);+ if ( rEntry.bDoQuery )+ {+ sal_uInt32 nIndex = 0;+ rEntry.bQueryByString = !pFormatter->IsNumberFormat(+ *rEntry.pStr, nIndex, rEntry.nVal );+ if ( rEntry.bQueryByString && !pParam->bRegExp )+ pParam->bRegExp = MayBeRegExp( *rEntry.pStr, pDok ); }+ else+ break; // for }+ return pParam.release(); } }- return bRet;+ return false; } void ScInterpreter::DBIterator( ScIterFunc eFunc ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::DBIterator" );- SCTAB nTab1; double nErg = 0.0; double fMem = 0.0; BOOL bNull = TRUE; ULONG nCount = 0;- ScQueryParam aQueryParam; BOOL bMissingField = FALSE;- if ( GetDBParams( nTab1, aQueryParam, bMissingField) )+ auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );+ if (pQueryParam.get()) {- double nVal;- USHORT nErr;- ScQueryValueIterator aValIter(pDok, nTab1, aQueryParam);- if ( aValIter.GetFirst(nVal, nErr) && !nErr )+ ScDBQueryDataIterator aValIter(pDok, pQueryParam.release());+ ScDBQueryDataIterator::Value aValue;+ if ( aValIter.GetFirst(aValue) && !aValue.mnError ) { switch( eFunc ) {@@ -6029,24 +5994,24 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc ) { case ifAVERAGE: case ifSUM:- if ( bNull && nVal != 0.0 )+ if ( bNull && aValue.mfValue != 0.0 ) { bNull = FALSE;- fMem = nVal;+ fMem = aValue.mfValue; } else- nErg += nVal;+ nErg += aValue.mfValue; break;- case ifSUMSQ: nErg += nVal * nVal; break;- case ifPRODUCT: nErg *= nVal; break;- case ifMAX: if( nVal > nErg ) nErg = nVal; break;- case ifMIN: if( nVal < nErg ) nErg = nVal; break;+ case ifSUMSQ: nErg += aValue.mfValue * aValue.mfValue; break;+ case ifPRODUCT: nErg *= aValue.mfValue; break;+ case ifMAX: if( aValue.mfValue > nErg ) nErg = aValue.mfValue; break;+ case ifMIN: if( aValue.mfValue < nErg ) nErg = aValue.mfValue; break; default: ; // nothing } }- while ( aValIter.GetNext(nVal, nErr) && !nErr );+ while ( aValIter.GetNext(aValue) && !aValue.mnError ); }- SetError(nErr);+ SetError(aValue.mnError); } else SetError( errIllegalParameter);@@ -6071,13 +6036,12 @@ void ScInterpreter::ScDBSum() void ScInterpreter::ScDBCount() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBCount" );- SCTAB nTab;- ScQueryParam aQueryParam; BOOL bMissingField = TRUE;- if ( GetDBParams( nTab, aQueryParam, bMissingField) )+ auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );+ if (pQueryParam.get()) { ULONG nCount = 0;- if ( bMissingField )+ if ( bMissingField && pQueryParam->GetType() == ScDBQueryParamBase::INTERNAL ) { // count all matching records // TODO: currently the QueryIterators only return cell pointers of // existing cells, so if a query matches an empty cell there's@@ -6087,7 +6051,9 @@ void ScInterpreter::ScDBCount() // have to live with it until we reimplement the iterators to also // return empty cells, which would mean to adapt all callers of // iterators.- ScQueryCellIterator aCellIter( pDok, nTab, aQueryParam);+ ScDBQueryParamInternal* p = static_cast<ScDBQueryParamInternal*>(pQueryParam.get());+ SCTAB nTab = p->nTab;+ ScQueryCellIterator aCellIter( pDok, nTab, *p); if ( aCellIter.GetFirst() ) { do@@ -6098,17 +6064,17 @@ void ScInterpreter::ScDBCount() } else { // count only matching records with a value in the "result" field- double nVal;- USHORT nErr = 0;- ScQueryValueIterator aValIter( pDok, nTab, aQueryParam);- if ( aValIter.GetFirst( nVal, nErr) && !nErr )+ ScDBQueryDataIterator aValIter( pDok, pQueryParam.release());+ ScDBQueryDataIterator::Value aValue;+ if ( aValIter.GetFirst(aValue) && !aValue.mnError ) { do { nCount++;- } while ( aValIter.GetNext( nVal, nErr) && !nErr );+ }+ while ( aValIter.GetNext(aValue) && !aValue.mnError ); }- SetError( nErr );+ SetError(aValue.mnError); } PushDouble( nCount ); }@@ -6120,21 +6086,24 @@ void ScInterpreter::ScDBCount() void ScInterpreter::ScDBCount2() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBCount2" );- SCTAB nTab;- ScQueryParam aQueryParam; BOOL bMissingField = TRUE;- if (GetDBParams( nTab, aQueryParam, bMissingField))+ auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );+ if (pQueryParam.get()) { ULONG nCount = 0;- ScQueryCellIterator aCellIter(pDok, nTab, aQueryParam);- if ( aCellIter.GetFirst() )+ pQueryParam->mbSkipString = false;+ ScDBQueryDataIterator aValIter( pDok, pQueryParam.release());+ ScDBQueryDataIterator::Value aValue;+ if ( aValIter.GetFirst(aValue) && !aValue.mnError ) { do { nCount++;- } while ( aCellIter.GetNext() );+ }+ while ( aValIter.GetNext(aValue) && !aValue.mnError ); }- PushDouble(nCount);+ SetError(aValue.mnError);+ PushDouble( nCount ); } else PushIllegalParameter();@@ -6178,25 +6147,23 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount ) rValCount = 0.0; double fSum = 0.0;- SCTAB nTab;- ScQueryParam aQueryParam; BOOL bMissingField = FALSE;- if (GetDBParams( nTab, aQueryParam, bMissingField))+ auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );+ if (pQueryParam.get()) {- double fVal;- USHORT nErr;- ScQueryValueIterator aValIter(pDok, nTab, aQueryParam);- if (aValIter.GetFirst(fVal, nErr) && !nErr)+ ScDBQueryDataIterator aValIter(pDok, pQueryParam.release());+ ScDBQueryDataIterator::Value aValue;+ if (aValIter.GetFirst(aValue) && !aValue.mnError) { do { rValCount++;- values.push_back(fVal);- fSum += fVal;+ values.push_back(aValue.mfValue);+ fSum += aValue.mfValue; }- while ((nErr == 0) && aValIter.GetNext(fVal, nErr));+ while ((aValue.mnError == 0) && aValIter.GetNext(aValue)); }- SetError(nErr);+ SetError(aValue.mnError); } else SetError( errIllegalParameter);diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxxindex cb418476e9d9..dac5f0c99ac5 100644--- a/sc/source/core/tool/interpr2.cxx+++ b/sc/source/core/tool/interpr2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: interpr2.cxx,v $- * $Revision: 1.37.88.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,7 +30,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svx/linkmgr.hxx>+#include <sfx2/linkmgr.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> #include <svl/stritem.hxx>@@ -2102,7 +2099,7 @@ void ScInterpreter::ScStyle() PushIllegalParameter(); } -ScDdeLink* lcl_GetDdeLink( SvxLinkManager* pLinkMgr,+ScDdeLink* lcl_GetDdeLink( sfx2::LinkManager* pLinkMgr, const String& rA, const String& rT, const String& rI, BYTE nM ) { USHORT nCount = pLinkMgr->GetLinks().Count();@@ -2145,7 +2142,7 @@ void ScInterpreter::ScDde() // temporary documents (ScFunctionAccess) have no DocShell // and no LinkManager -> abort - SvxLinkManager* pLinkMgr = pDok->GetLinkManager();+ sfx2::LinkManager* pLinkMgr = pDok->GetLinkManager(); if (!pLinkMgr) { PushNoValue();diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxxindex 4d4a59509fca..bcea57703d78 100644--- a/sc/source/core/tool/interpr3.cxx+++ b/sc/source/core/tool/interpr3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: interpr3.cxx,v $- * $Revision: 1.25 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxxindex 2880d7708b10..8a6c0df0db16 100644..100755--- a/sc/source/core/tool/interpr4.cxx+++ b/sc/source/core/tool/interpr4.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: interpr4.cxx,v $- * $Revision: 1.57.92.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -68,15 +65,18 @@ #include "jumpmatrix.hxx" #include "parclass.hxx" #include "externalrefmgr.hxx"+#include "doubleref.hxx" #include <math.h> #include <float.h> #include <map> #include <algorithm> #include <functional>+#include <memory> using namespace com::sun::star; using namespace formula;+using ::std::auto_ptr; #define ADDIN_MAXSTRLEN 256 @@ -1222,6 +1222,42 @@ void ScInterpreter::DoubleRefToVars( const ScToken* p, } } +ScDBRangeBase* ScInterpreter::PopDoubleRef()+{+ if (!sp)+ {+ SetError(errUnknownStackVariable);+ return NULL;+ }++ --sp;+ FormulaToken* p = pStack[sp];+ switch (p->GetType())+ {+ case svError:+ nGlobalError = p->GetError();+ break;+ case svDoubleRef:+ {+ SCCOL nCol1, nCol2;+ SCROW nRow1, nRow2;+ SCTAB nTab1, nTab2;+ DoubleRefToVars(static_cast<ScToken*>(p),+ nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, false);++ return new ScDBInternalRange(pDok,+ ScRange(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2));+ }+ case svMatrix:+ {+ ScMatrixRef pMat = static_cast<ScToken*>(p)->GetMatrix();+ return new ScDBExternalRange(pDok, pMat);+ }+ default:+ SetError( errIllegalParameter);+ }+ return NULL;+} void ScInterpreter::PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,@@ -2055,78 +2091,37 @@ ScMatValType ScInterpreter::GetDoubleOrStringFromMatrix( double& rDouble, void ScInterpreter::ScDBGet() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBGet" );- SCTAB nTab;- ScQueryParam aQueryParam; BOOL bMissingField = FALSE;- if (GetDBParams( nTab, aQueryParam, bMissingField))+ auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );+ if (!pQueryParam.get()) {- ScBaseCell* pCell;- ScQueryCellIterator aCellIter(pDok, nTab, aQueryParam);- if ( (pCell = aCellIter.GetFirst()) != NULL )- {- if (aCellIter.GetNext())- PushIllegalArgument();- else- {- switch (pCell->GetCellType())- {- case CELLTYPE_VALUE:- {- double rValue = ((ScValueCell*)pCell)->GetValue();- if ( bCalcAsShown )- {- ULONG nFormat;- nFormat = aCellIter.GetNumberFormat();- rValue = pDok->RoundValueAsShown( rValue, nFormat );- }- PushDouble(rValue);- }- break;- case CELLTYPE_STRING:- {- String rString;- ((ScStringCell*)pCell)->GetString(rString);- PushString(rString);- }- break;- case CELLTYPE_EDIT:- {- String rString;- ((ScEditCell*)pCell)->GetString(rString);- PushString(rString);- }- break;- case CELLTYPE_FORMULA:- {- USHORT rErr = ((ScFormulaCell*)pCell)->GetErrCode();- if (rErr)- PushError(rErr);- else if (((ScFormulaCell*)pCell)->IsValue())- {- double rValue = ((ScFormulaCell*)pCell)->GetValue();- PushDouble(rValue);- }- else- {- String rString;- ((ScFormulaCell*)pCell)->GetString(rString);- PushString(rString);- }- }- break;- case CELLTYPE_NONE:- case CELLTYPE_NOTE:- default:- PushIllegalArgument();- break;- }- }- }- else- PushNoValue();+ // Failed to create query param.+ PushIllegalParameter();+ return; }++ pQueryParam->mbSkipString = false;+ ScDBQueryDataIterator aValIter(pDok, pQueryParam.release());+ ScDBQueryDataIterator::Value aValue;+ if (!aValIter.GetFirst(aValue) || aValue.mnError)+ {+ // No match found.+ PushNoValue();+ return;+ }++ ScDBQueryDataIterator::Value aValNext;+ if (aValIter.GetNext(aValNext) && !aValNext.mnError)+ {+ // There should be only one unique match.+ PushIllegalArgument();+ return;+ }++ if (aValue.mbIsNumber)+ PushDouble(aValue.mfValue); else- PushIllegalParameter();+ PushString(aValue.maString); } @@ -3336,7 +3331,7 @@ void ScInterpreter::ScSpewFunc() #include "sctictac.hxx" #include "scmod.hxx" -extern "C" { static void SAL_CALL thisModule() {} }+//extern "C" { static void SAL_CALL thisModule() {} } void ScInterpreter::ScGame() {@@ -3491,19 +3486,6 @@ int main() SetError( errIllegalParameter ); } break;- case SC_GAME_STARWARS :- {- oslModule m_tfu = osl_loadModuleRelative(&thisModule, rtl::OUString::createFromAscii( SVLIBRARY( "tfu" ) ).pData, SAL_LOADMODULE_NOW);- typedef void StartInvader_Type (Window*, ResMgr*);-- StartInvader_Type *StartInvader = (StartInvader_Type *) osl_getFunctionSymbol( m_tfu, rtl::OUString::createFromAscii("StartInvader").pData );- if ( StartInvader )- StartInvader( Application::GetDefDialogParent(), ResMgr::CreateResMgr( "tfu" ));- }- break;- case SC_GAME_FROGGER :- //Game();- break; default: { // added to avoid warningsdiff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxxindex 482748cbb547..ba4322a3281a 100644--- a/sc/source/core/tool/interpr5.cxx+++ b/sc/source/core/tool/interpr5.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: interpr5.cxx,v $- * $Revision: 1.33.36.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxxindex e8b69a4e6eda..1e3a9a292f16 100644--- a/sc/source/core/tool/interpr6.cxx+++ b/sc/source/core/tool/interpr6.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: interpr6.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/lookupcache.cxx b/sc/source/core/tool/lookupcache.cxxindex 192fc2e9e8a0..3ba66011d0e4 100644--- a/sc/source/core/tool/lookupcache.cxx+++ b/sc/source/core/tool/lookupcache.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lookupcache.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/makefile.mk b/sc/source/core/tool/makefile.mkindex 52d9bad7c18c..0bc433a7b187 100644--- a/sc/source/core/tool/makefile.mk+++ b/sc/source/core/tool/makefile.mk@@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.-#-# Copyright 2008 by Sun Microsystems, Inc.+# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.30.168.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify@@ -76,6 +72,7 @@ SLOFILES = \ $(SLO)$/detdata.obj \ $(SLO)$/detfunc.obj \ $(SLO)$/docoptio.obj \+ $(SLO)$/doubleref.obj \ $(SLO)$/editutil.obj \ $(SLO)$/filtopt.obj \ $(SLO)$/formulaparserpool.obj \@@ -95,6 +92,7 @@ SLOFILES = \ $(SLO)$/printopt.obj \ $(SLO)$/prnsave.obj \ $(SLO)$/progress.obj \+ $(SLO)$/queryparam.obj \ $(SLO)$/rangelst.obj \ $(SLO)$/rangenam.obj \ $(SLO)$/rangeseq.obj \@@ -122,6 +120,7 @@ EXCEPTIONSFILES= \ $(SLO)$/chartlock.obj \ $(SLO)$/chgtrack.obj \ $(SLO)$/compiler.obj \+ $(SLO)$/doubleref.obj \ $(SLO)$/formulaparserpool.obj \ $(SLO)$/interpr1.obj \ $(SLO)$/interpr2.obj \@@ -130,6 +129,7 @@ EXCEPTIONSFILES= \ $(SLO)$/interpr5.obj \ $(SLO)$/lookupcache.obj \ $(SLO)$/prnsave.obj \+ $(SLO)$/queryparam.obj \ $(SLO)$/reftokenhelper.obj \ $(SLO)$/token.obj diff --git a/sc/source/core/tool/navicfg.cxx b/sc/source/core/tool/navicfg.cxxindex 400da97b25ea..0991071774ed 100644--- a/sc/source/core/tool/navicfg.cxx+++ b/sc/source/core/tool/navicfg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: navicfg.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxxindex c89880a4c39f..0ffaa4aae025 100644--- a/sc/source/core/tool/odffmap.cxx+++ b/sc/source/core/tool/odffmap.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: odffmap.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxxindex 36fea8a5e899..4de458f698da 100644--- a/sc/source/core/tool/optutil.cxx+++ b/sc/source/core/tool/optutil.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optutil.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxxindex 5f2094d2f0f7..a863bc0a68c2 100644--- a/sc/source/core/tool/parclass.cxx+++ b/sc/source/core/tool/parclass.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: parclass.cxx,v $- * $Revision: 1.12.148.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxxindex 87a64874f651..c701c558310b 100644--- a/sc/source/core/tool/printopt.cxx+++ b/sc/source/core/tool/printopt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: printopt.cxx,v $- * $Revision: 1.7.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxxindex 7640913ae568..b432f585e854 100644--- a/sc/source/core/tool/prnsave.cxx+++ b/sc/source/core/tool/prnsave.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: prnsave.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxxindex a24c33cf6255..a2fa45764bcc 100644--- a/sc/source/core/tool/progress.cxx+++ b/sc/source/core/tool/progress.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: progress.cxx,v $- * $Revision: 1.7.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxxnew file mode 100644index 000000000000..47418ec85f4d--- /dev/null+++ b/sc/source/core/tool/queryparam.cxx@@ -0,0 +1,365 @@+/*************************************************************************+ *+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.+ *+ * Copyright 2008 by Sun Microsystems, Inc.+ *+ * OpenOffice.org - a multi-platform office productivity suite+ *+ * $RCSfile: interpr4.cxx,v $+ * $Revision: 1.57.92.5 $+ *+ * This file is part of OpenOffice.org.+ *+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation.+ *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code).+ *+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License.+ *+ ************************************************************************/++// MARKER(update_precomp.py): autogen include statement, do not remove+#include "precompiled_sc.hxx"++// INCLUDE ---------------------------------------------------------------++#include "queryparam.hxx"++using ::std::vector;++// ============================================================================++ScQueryParamBase::ScQueryParamBase()+{+ Resize( MAXQUERY );+ for (USHORT i=0; i<MAXQUERY; i++)+ maEntries[i].Clear();+}++ScQueryParamBase::ScQueryParamBase(const ScQueryParamBase& r) :+ bHasHeader(r.bHasHeader), bByRow(r.bByRow), bInplace(r.bInplace), bCaseSens(r.bCaseSens),+ bRegExp(r.bRegExp), bDuplicate(r.bDuplicate), bMixedComparison(r.bMixedComparison),+ maEntries(r.maEntries)+{+}++ScQueryParamBase::~ScQueryParamBase()+{+}++SCSIZE ScQueryParamBase::GetEntryCount() const+{+ return maEntries.size();+}++ScQueryEntry& ScQueryParamBase::GetEntry(SCSIZE n) const+{+ return maEntries[n];+}++void ScQueryParamBase::Resize(SCSIZE nNew)+{+ if ( nNew < MAXQUERY )+ nNew = MAXQUERY; // nie weniger als MAXQUERY++ vector<ScQueryEntry> aNewEntries(nNew);+ SCSIZE nCopy = ::std::min(maEntries.size(), nNew);+ for (SCSIZE i=0; i<nCopy; i++)+ aNewEntries[i] = maEntries[i];++ maEntries.swap(aNewEntries);+}++void ScQueryParamBase::DeleteQuery( SCSIZE nPos )+{+ if (nPos >= maEntries.size())+ return;++ size_t n = maEntries.size();+ vector<ScQueryEntry> aNewEntries;+ aNewEntries.reserve(n);+ for (size_t i = 0; i < n; ++i)+ if (i != nPos)+ aNewEntries.push_back(maEntries[i]);++ // Don't forget to append an empty entry to make up for the removed one.+ // The size of the entries is not supposed to change.+ aNewEntries.push_back(ScQueryEntry());++ maEntries.swap(aNewEntries);+}++void ScQueryParamBase::FillInExcelSyntax(String& aCellStr, SCSIZE nIndex)+{+ if (aCellStr.Len() > 0)+ {+ if ( nIndex >= maEntries.size() )+ Resize( nIndex+1 );++ ScQueryEntry& rEntry = GetEntry(nIndex);++ rEntry.bDoQuery = TRUE;+ // Operatoren herausfiltern+ if (aCellStr.GetChar(0) == '<')+ {+ if (aCellStr.GetChar(1) == '>')+ {+ *rEntry.pStr = aCellStr.Copy(2);+ rEntry.eOp = SC_NOT_EQUAL;+ }+ else if (aCellStr.GetChar(1) == '=')+ {+ *rEntry.pStr = aCellStr.Copy(2);+ rEntry.eOp = SC_LESS_EQUAL;+ }+ else+ {+ *rEntry.pStr = aCellStr.Copy(1);+ rEntry.eOp = SC_LESS;+ }+ }+ else if (aCellStr.GetChar(0) == '>')+ {+ if (aCellStr.GetChar(1) == '=')+ {+ *rEntry.pStr = aCellStr.Copy(2);+ rEntry.eOp = SC_GREATER_EQUAL;+ }+ else+ {+ *rEntry.pStr = aCellStr.Copy(1);+ rEntry.eOp = SC_GREATER;+ }+ }+ else+ {+ if (aCellStr.GetChar(0) == '=')+ *rEntry.pStr = aCellStr.Copy(1);+ else+ *rEntry.pStr = aCellStr;+ rEntry.eOp = SC_EQUAL;+ }+ }+}++// ============================================================================++ScQueryParamTable::ScQueryParamTable()+{+}++ScQueryParamTable::ScQueryParamTable(const ScQueryParamTable& r) :+ nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nTab(r.nTab)+{+}++ScQueryParamTable::~ScQueryParamTable()+{+}++// ============================================================================++ScQueryParam::ScQueryParam() :+ ScQueryParamBase(),+ ScQueryParamTable()+{+ Clear();+}++//------------------------------------------------------------------------++ScQueryParam::ScQueryParam( const ScQueryParam& r ) :+ ScQueryParamBase(r),+ ScQueryParamTable(r),+ bDestPers(r.bDestPers), nDestTab(r.nDestTab), nDestCol(r.nDestCol), nDestRow(r.nDestRow)+{+}++ScQueryParam::ScQueryParam( const ScDBQueryParamInternal& r ) :+ ScQueryParamBase(r),+ ScQueryParamTable(r),+ bDestPers(true),+ nDestTab(0),+ nDestCol(0),+ nDestRow(0)+{+}+++//------------------------------------------------------------------------++ScQueryParam::~ScQueryParam()+{+}++//------------------------------------------------------------------------++void ScQueryParam::Clear()+{+ nCol1=nCol2 = 0;+ nRow1=nRow2 = 0;+ nTab = SCTAB_MAX;+ bHasHeader = bCaseSens = bRegExp = bMixedComparison = FALSE;+ bInplace = bByRow = bDuplicate = TRUE;++ Resize( MAXQUERY );+ for (USHORT i=0; i<MAXQUERY; i++)+ maEntries[i].Clear();++ ClearDestParams();+}++void ScQueryParam::ClearDestParams()+{+ bDestPers = true;+ nDestTab = 0;+ nDestCol = 0;+ nDestRow = 0;+}++//------------------------------------------------------------------------++ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )+{+ nCol1 = r.nCol1;+ nRow1 = r.nRow1;+ nCol2 = r.nCol2;+ nRow2 = r.nRow2;+ nTab = r.nTab;+ nDestTab = r.nDestTab;+ nDestCol = r.nDestCol;+ nDestRow = r.nDestRow;+ bHasHeader = r.bHasHeader;+ bInplace = r.bInplace;+ bCaseSens = r.bCaseSens;+ bRegExp = r.bRegExp;+ bMixedComparison = r.bMixedComparison;+ bDuplicate = r.bDuplicate;+ bByRow = r.bByRow;+ bDestPers = r.bDestPers;++ maEntries = r.maEntries;++ return *this;+}++//------------------------------------------------------------------------++BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const+{+ BOOL bEqual = FALSE;++ // Anzahl der Queries gleich?+ SCSIZE nUsed = 0;+ SCSIZE nOtherUsed = 0;+ SCSIZE nEntryCount = GetEntryCount();+ SCSIZE nOtherEntryCount = rOther.GetEntryCount();++ while ( nUsed<nEntryCount && maEntries[nUsed].bDoQuery ) ++nUsed;+ while ( nOtherUsed<nOtherEntryCount && rOther.maEntries[nOtherUsed].bDoQuery )+ ++nOtherUsed;++ if ( (nUsed == nOtherUsed)+ && (nCol1 == rOther.nCol1)+ && (nRow1 == rOther.nRow1)+ && (nCol2 == rOther.nCol2)+ && (nRow2 == rOther.nRow2)+ && (nTab == rOther.nTab)+ && (bHasHeader == rOther.bHasHeader)+ && (bByRow == rOther.bByRow)+ && (bInplace == rOther.bInplace)+ && (bCaseSens == rOther.bCaseSens)+ && (bRegExp == rOther.bRegExp)+ && (bMixedComparison == rOther.bMixedComparison)+ && (bDuplicate == rOther.bDuplicate)+ && (bDestPers == rOther.bDestPers)+ && (nDestTab == rOther.nDestTab)+ && (nDestCol == rOther.nDestCol)+ && (nDestRow == rOther.nDestRow) )+ {+ bEqual = TRUE;+ for ( SCSIZE i=0; i<nUsed && bEqual; i++ )+ bEqual = maEntries[i] == rOther.maEntries[i];+ }+ return bEqual;+}++//------------------------------------------------------------------------++void ScQueryParam::MoveToDest()+{+ if (!bInplace)+ {+ SCsCOL nDifX = ((SCsCOL) nDestCol) - ((SCsCOL) nCol1);+ SCsROW nDifY = ((SCsROW) nDestRow) - ((SCsROW) nRow1);+ SCsTAB nDifZ = ((SCsTAB) nDestTab) - ((SCsTAB) nTab);++ nCol1 = sal::static_int_cast<SCCOL>( nCol1 + nDifX );+ nRow1 = sal::static_int_cast<SCROW>( nRow1 + nDifY );+ nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );+ nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );+ nTab = sal::static_int_cast<SCTAB>( nTab + nDifZ );+ size_t n = maEntries.size();+ for (size_t i=0; i<n; i++)+ maEntries[i].nField += nDifX;++ bInplace = TRUE;+ }+ else+ {+ DBG_ERROR("MoveToDest, bInplace == TRUE");+ }+}++// ============================================================================++ScDBQueryParamBase::ScDBQueryParamBase(DataType eType) :+ ScQueryParamBase(),+ mnField(-1),+ mbSkipString(true),+ meType(eType)+{+}++ScDBQueryParamBase::~ScDBQueryParamBase()+{+}++ScDBQueryParamBase::DataType ScDBQueryParamBase::GetType() const+{+ return meType;+}++// ============================================================================++ScDBQueryParamInternal::ScDBQueryParamInternal() :+ ScDBQueryParamBase(ScDBQueryParamBase::INTERNAL),+ ScQueryParamTable()+{+}++ScDBQueryParamInternal::~ScDBQueryParamInternal()+{+}++// ============================================================================++ScDBQueryParamMatrix::ScDBQueryParamMatrix() :+ ScDBQueryParamBase(ScDBQueryParamBase::MATRIX)+{+}++ScDBQueryParamMatrix::~ScDBQueryParamMatrix()+{+}+diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxxindex 775b0207be59..d0dd8ec9c163 100644--- a/sc/source/core/tool/rangelst.cxx+++ b/sc/source/core/tool/rangelst.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rangelst.cxx,v $- * $Revision: 1.11.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxxindex 7795256dce3c..e81f1f3bd94d 100644--- a/sc/source/core/tool/rangenam.cxx+++ b/sc/source/core/tool/rangenam.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rangenam.cxx,v $- * $Revision: 1.28.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxxindex 078f9a774c09..5584fb1c37e2 100644--- a/sc/source/core/tool/rangeseq.cxx+++ b/sc/source/core/tool/rangeseq.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rangeseq.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxxindex 4a26a5004799..9f6526a54cf6 100644--- a/sc/source/core/tool/rangeutl.cxx+++ b/sc/source/core/tool/rangeutl.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rangeutl.cxx,v $- * $Revision: 1.12.30.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxxindex ce1d91c28744..6da946463697 100644--- a/sc/source/core/tool/rechead.cxx+++ b/sc/source/core/tool/rechead.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rechead.cxx,v $- * $Revision: 1.6.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxxindex c96ce2763cd3..47774d348044 100644--- a/sc/source/core/tool/refdata.cxx+++ b/sc/source/core/tool/refdata.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: refdata.cxx,v $- * $Revision: 1.7.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxxindex e98a8a8165cb..cdb5962b2b9c 100644--- a/sc/source/core/tool/reffind.cxx+++ b/sc/source/core/tool/reffind.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: reffind.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxxindex 45ccbc187b4e..5520aac6d6eb 100644--- a/sc/source/core/tool/refreshtimer.cxx+++ b/sc/source/core/tool/refreshtimer.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: refreshtimer.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxxindex 53a87667e8c6..f4976a914c39 100644--- a/sc/source/core/tool/reftokenhelper.cxx+++ b/sc/source/core/tool/reftokenhelper.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: token.hxx,v $- * $Revision: 1.15.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxxindex 1f70ef80963c..ad11190be75d 100644--- a/sc/source/core/tool/refupdat.cxx+++ b/sc/source/core/tool/refupdat.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: refupdat.cxx,v $- * $Revision: 1.8.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxxindex 6195164e34fa..326fda49eb30 100644--- a/sc/source/core/tool/scmatrix.cxx+++ b/sc/source/core/tool/scmatrix.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scmatrix.cxx,v $- * $Revision: 1.17.136.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/sctictac.cxx b/sc/source/core/tool/sctictac.cxxindex e3e882de956a..d784f45deb87 100644--- a/sc/source/core/tool/sctictac.cxx+++ b/sc/source/core/tool/sctictac.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sctictac.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxxindex c8061441abfc..077b5a9d9751 100644--- a/sc/source/core/tool/subtotal.cxx+++ b/sc/source/core/tool/subtotal.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: subtotal.cxx,v $- * $Revision: 1.7.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxxindex e4a97d96d2e4..81862c49fd21 100644--- a/sc/source/core/tool/token.cxx+++ b/sc/source/core/tool/token.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: token.cxx,v $- * $Revision: 1.33.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxxindex 477316b4c0fb..21f80cb1c628 100644--- a/sc/source/core/tool/unitconv.cxx+++ b/sc/source/core/tool/unitconv.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: unitconv.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxxindex 24dd852c6a5f..08609eeff940 100644--- a/sc/source/core/tool/userlist.cxx+++ b/sc/source/core/tool/userlist.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: userlist.cxx,v $- * $Revision: 1.11.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxxindex de32467d561b..7dc36bc1b548 100644--- a/sc/source/core/tool/viewopti.cxx+++ b/sc/source/core/tool/viewopti.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: viewopti.cxx,v $- * $Revision: 1.9.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxxindex 62a6b48c4da0..b505e5a5051c 100644--- a/sc/source/core/tool/zforauto.cxx+++ b/sc/source/core/tool/zforauto.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: zforauto.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxxindex fc891c864a79..69421879983e 100644--- a/sc/source/filter/dif/difexp.cxx+++ b/sc/source/filter/dif/difexp.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: difexp.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxxindex 77803d338788..2088cc84a791 100644--- a/sc/source/filter/dif/difimp.cxx+++ b/sc/source/filter/dif/difimp.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: difimp.cxx,v $- * $Revision: 1.15 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/dif/makefile.mk b/sc/source/filter/dif/makefile.mkindex 9d571c71fa9d..c24de4cb4164 100644--- a/sc/source/filter/dif/makefile.mk+++ b/sc/source/filter/dif/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.4 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxxindex b1ec8752de7b..3a48aa6b96ba 100644--- a/sc/source/filter/excel/colrowst.cxx+++ b/sc/source/filter/excel/colrowst.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: colrowst.cxx,v $- * $Revision: 1.34.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -43,6 +40,7 @@ #include "xltable.hxx" #include "xistream.hxx" #include "xistyle.hxx"+#include "queryparam.hxx" // for filter manager #include "excimp8.hxx"diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxxindex 998208541157..b5e0f25f516c 100644--- a/sc/source/filter/excel/excdoc.cxx+++ b/sc/source/filter/excel/excdoc.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: excdoc.cxx,v $- * $Revision: 1.69.60.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,8 +37,8 @@ #include <svx/svdobj.hxx> #include <svx/svditer.hxx> #include <svx/svdpage.hxx>-#include <svx/lrspitem.hxx>-#include <svx/ulspitem.hxx>+#include <editeng/lrspitem.hxx>+#include <editeng/ulspitem.hxx> #include <svl/intitem.hxx> #include <svl/zformat.hxx> #include <sot/storage.hxx>@@ -235,7 +232,7 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) Add( new XclExpFilePass( GetRoot() ) ); Add( new XclExpInterfaceHdr( nCodePage ) ); Add( new XclExpUInt16Record( EXC_ID_MMS, 0 ) );- Add( new XclExpEmptyRecord( EXC_ID_INTERFACEEND ) );+ Add( new XclExpInterfaceEnd ); Add( new XclExpWriteAccess ); } diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxxindex 41529b66346f..3a43a23cd624 100644--- a/sc/source/filter/excel/excel.cxx+++ b/sc/source/filter/excel/excel.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: excel.cxx,v $- * $Revision: 1.26.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxxindex 6d83f263d47b..5642c098027e 100644--- a/sc/source/filter/excel/excform.cxx+++ b/sc/source/filter/excel/excform.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: excform.cxx,v $- * $Revision: 1.52.4.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxxindex 10fc15c633b6..608d65dfc801 100644--- a/sc/source/filter/excel/excform8.cxx+++ b/sc/source/filter/excel/excform8.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: excform8.cxx,v $- * $Revision: 1.47.134.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxxindex a172bd63e69b..e424ad2d95fe 100644--- a/sc/source/filter/excel/excimp8.cxx+++ b/sc/source/filter/excel/excimp8.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: excimp8.cxx,v $- * $Revision: 1.127.4.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,21 +37,21 @@ #include <svtools/wmf.hxx> -#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <sfx2/docfile.hxx> #include <sfx2/objsh.hxx>-#include <svx/brshitem.hxx>-#include <svx/editdata.hxx>-#include <svx/editeng.hxx>-#include <svx/editobj.hxx>-#include <svx/editstat.hxx>-#include <svx/colritem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>-#include <svx/postitem.hxx>-#include <svx/crsditem.hxx>-#include <svx/flditem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/editdata.hxx>+#include <editeng/editeng.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editstat.hxx>+#include <editeng/colritem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/flditem.hxx> #include <svx/xflclit.hxx> #include <filter/msfilter/svxmsbas.hxx> @@ -117,7 +114,7 @@ using namespace com::sun::star; ImportExcel8::ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ) :- ImportExcel( rImpData, rStrm )+ ImportExcel( rImpData, rStrm ), mnTab(0) { delete pFormConv; @@ -240,9 +237,15 @@ void ImportExcel8::Codename( BOOL bWorkbookGlobals ) if( aName.Len() ) { if( bWorkbookGlobals )+ { GetExtDocOptions().GetDocSettings().maGlobCodeName = aName;+ GetDoc().SetCodeName( aName );+ } else+ { GetExtDocOptions().AppendCodeName( aName );+ GetDoc().SetCodeName( mnTab++, aName );+ } } } }diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxxindex ce824fa70e44..d49c04624cdf 100644--- a/sc/source/filter/excel/excrecds.cxx+++ b/sc/source/filter/excel/excrecds.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: excrecds.cxx,v $- * $Revision: 1.88 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -41,27 +38,27 @@ #include <filter/msfilter/countryid.hxx> #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <sfx2/objsh.hxx> -#include <svx/editdata.hxx>-#include <svx/editeng.hxx>-#include <svx/editobj.hxx>-#include <svx/editstat.hxx>+#include <editeng/editdata.hxx>+#include <editeng/editeng.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editstat.hxx> -#include <svx/flditem.hxx>-#include <svx/flstitem.hxx>+#include <editeng/flditem.hxx>+#include <editeng/flstitem.hxx> #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx> #include <svx/pageitem.hxx>-#include <svx/paperinf.hxx>-#include <svx/sizeitem.hxx>-#include <svx/ulspitem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/escpitem.hxx>+#include <editeng/paperinf.hxx>+#include <editeng/sizeitem.hxx>+#include <editeng/ulspitem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/escpitem.hxx> #include <svl/intitem.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx>diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxxindex d698278d9d3c..ba4a8339c829 100644--- a/sc/source/filter/excel/exctools.cxx+++ b/sc/source/filter/excel/exctools.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: exctools.cxx,v $- * $Revision: 1.61.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,12 +33,12 @@ //------------------------------------------------------------------------ #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/editdata.hxx>-#include <svx/editeng.hxx>-#include <svx/editobj.hxx>-#include <svx/editstat.hxx>+#include <editeng/editdata.hxx>+#include <editeng/editeng.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editstat.hxx> #include "document.hxx" #include "patattr.hxx"diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxxindex 1a79aef3f0ec..d28fa2063c91 100644--- a/sc/source/filter/excel/expop2.cxx+++ b/sc/source/filter/excel/expop2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: expop2.cxx,v $- * $Revision: 1.35.14.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxxindex f1e2c920a731..dca6723181ae 100644--- a/sc/source/filter/excel/fontbuff.cxx+++ b/sc/source/filter/excel/fontbuff.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fontbuff.cxx,v $- * $Revision: 1.16 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,14 +31,14 @@ #include "lotfntbf.hxx" #include "scitems.hxx"-#include <svx/cntritem.hxx>-#include <svx/crsditem.hxx>-#include <svx/eeitem.hxx>-#include <svx/postitem.hxx>-#include <svx/shdditem.hxx>-#include <svx/escpitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/cntritem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/shdditem.hxx>+#include <editeng/escpitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx> #include <sfx2/printer.hxx> #include "attrib.hxx"diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxxindex db50598d30b6..78883b4a5c76 100644--- a/sc/source/filter/excel/frmbase.cxx+++ b/sc/source/filter/excel/frmbase.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: frmbase.cxx,v $- * $Revision: 1.10.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxxindex 7003cc683688..dfb3a69c219a 100644--- a/sc/source/filter/excel/impop.cxx+++ b/sc/source/filter/excel/impop.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: impop.cxx,v $- * $Revision: 1.95.36.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,15 +33,15 @@ #include <filter/msfilter/countryid.hxx> #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/editdata.hxx>-#include <svx/editeng.hxx>-#include <svx/editobj.hxx>-#include <svx/editstat.hxx>-#include <svx/flditem.hxx>+#include <editeng/editdata.hxx>+#include <editeng/editeng.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editstat.hxx>+#include <editeng/flditem.hxx> #include <svx/pageitem.hxx>-#include <svx/colritem.hxx>+#include <editeng/colritem.hxx> #include <sfx2/printer.hxx> #include <sfx2/docfile.hxx> #include <svl/zforlist.hxx>diff --git a/sc/source/filter/excel/makefile.mk b/sc/source/filter/excel/makefile.mkindex 4c94b0712d89..33a5babda815 100644--- a/sc/source/filter/excel/makefile.mk+++ b/sc/source/filter/excel/makefile.mk@@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.-#-# Copyright 2008 by Sun Microsystems, Inc.+# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.42.90.3 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxxindex b01f5a728263..7db7d17ed307 100644--- a/sc/source/filter/excel/namebuff.cxx+++ b/sc/source/filter/excel/namebuff.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: namebuff.cxx,v $- * $Revision: 1.26.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxxindex 6f0f214d3938..91b749030dd7 100644--- a/sc/source/filter/excel/read.cxx+++ b/sc/source/filter/excel/read.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: read.cxx,v $- * $Revision: 1.70.88.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxxindex 34c2b9284fed..8685f404543a 100644--- a/sc/source/filter/excel/tokstack.cxx+++ b/sc/source/filter/excel/tokstack.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tokstack.cxx,v $- * $Revision: 1.14.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxxindex 261bf8c42e30..637aacd4e722 100644--- a/sc/source/filter/excel/xechart.cxx+++ b/sc/source/filter/excel/xechart.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xechart.cxx,v $- * $Revision: 1.10.62.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxxindex ad51304b3e3e..7bfd57be7290 100644--- a/sc/source/filter/excel/xecontent.cxx+++ b/sc/source/filter/excel/xecontent.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xecontent.cxx,v $- * $Revision: 1.23 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -43,8 +40,8 @@ #include <svl/itemset.hxx> #include <formula/grammar.hxx> #include "scitems.hxx"-#include <svx/eeitem.hxx>-#include <svx/flditem.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/flditem.hxx> #include "document.hxx" #include "validat.hxx" #include "unonames.hxx"@@ -748,19 +745,19 @@ void XclExpCFImpl::WriteBody( XclExpStream& rStrm ) // font used flag for underline -> 0 = used, 1 = default sal_uInt32 nFontFlags3 = mbUnderlUsed ? 0 : EXC_CF_FONT_UNDERL; - rStrm.WriteZeroBytes( 64 );+ rStrm.WriteZeroBytesToRecord( 64 ); rStrm << nHeight << nStyle << maFontData.mnWeight << EXC_FONTESC_NONE << maFontData.mnUnderline;- rStrm.WriteZeroBytes( 3 );+ rStrm.WriteZeroBytesToRecord( 3 ); rStrm << nColor << sal_uInt32( 0 ) << nFontFlags1 << EXC_CF_FONT_ESCAPEM // escapement never used -> set the flag << nFontFlags3;- rStrm.WriteZeroBytes( 16 );+ rStrm.WriteZeroBytesToRecord( 16 ); rStrm << sal_uInt16( 1 ); // must be 1 } diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxxindex af1a90291b99..1f46bdb66178 100644--- a/sc/source/filter/excel/xeescher.cxx+++ b/sc/source/filter/excel/xeescher.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xeescher.cxx,v $- * $Revision: 1.24.128.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -52,8 +49,8 @@ #include <vcl/bmpacc.hxx> #include <svx/svdoole2.hxx> #include <svx/svdocapt.hxx>-#include <svx/outlobj.hxx>-#include <svx/editobj.hxx>+#include <editeng/outlobj.hxx>+#include <editeng/editobj.hxx> #include "editutil.hxx" #include "unonames.hxx"diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxxindex 849ac080bb1d..34e48671a3bc 100644--- a/sc/source/filter/excel/xeformula.cxx+++ b/sc/source/filter/excel/xeformula.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xeformula.cxx,v $- * $Revision: 1.25.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxxindex 30b30639f7c7..bce037bd05c1 100644--- a/sc/source/filter/excel/xehelper.cxx+++ b/sc/source/filter/excel/xehelper.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xehelper.cxx,v $- * $Revision: 1.31.148.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -38,15 +35,15 @@ #include <svl/itemset.hxx> #include <svtools/ctrltool.hxx> #include <svx/svdotext.hxx>-#include <svx/outlobj.hxx>+#include <editeng/outlobj.hxx> #include "scitems.hxx"-#include <svx/fhgtitem.hxx>-#include <svx/flstitem.hxx>-#include <svx/colritem.hxx>-#include <svx/eeitem.hxx>-#include <svx/flditem.hxx>-#include <svx/escpitem.hxx>-#include <svx/svxfont.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/flstitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/flditem.hxx>+#include <editeng/escpitem.hxx>+#include <editeng/svxfont.hxx> #define _SVSTDARR_USHORTS #include <svl/svstdarr.hxx>diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxxindex 46fcd166ecf1..421a15b6da95 100644--- a/sc/source/filter/excel/xelink.cxx+++ b/sc/source/filter/excel/xelink.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xelink.cxx,v $- * $Revision: 1.21.134.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxxindex 004fbfa2932c..af275bef7eef 100644--- a/sc/source/filter/excel/xename.cxx+++ b/sc/source/filter/excel/xename.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xename.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxxindex 47414c07bec8..753d43e8d584 100644--- a/sc/source/filter/excel/xepage.cxx+++ b/sc/source/filter/excel/xepage.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xepage.cxx,v $- * $Revision: 1.15.90.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,10 +34,10 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <svx/pageitem.hxx>-#include <svx/sizeitem.hxx>-#include <svx/lrspitem.hxx>-#include <svx/ulspitem.hxx>-#include <svx/brshitem.hxx>+#include <editeng/sizeitem.hxx>+#include <editeng/lrspitem.hxx>+#include <editeng/ulspitem.hxx>+#include <editeng/brshitem.hxx> #include "document.hxx" #include "stlpool.hxx" #include "stlsheet.hxx"diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxxindex 8680623dc29b..cb248f0eaf76 100644--- a/sc/source/filter/excel/xepivot.cxx+++ b/sc/source/filter/excel/xepivot.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xepivot.cxx,v $- * $Revision: 1.22 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxxindex b422781db143..853a0e52bc8b 100644--- a/sc/source/filter/excel/xerecord.cxx+++ b/sc/source/filter/excel/xerecord.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xerecord.cxx,v $- * $Revision: 1.10.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxxindex 45f90732b070..922adceb061b 100644--- a/sc/source/filter/excel/xeroot.cxx+++ b/sc/source/filter/excel/xeroot.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xeroot.cxx,v $- * $Revision: 1.23 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxxindex 1dd1bbc747f7..f828079c8735 100644--- a/sc/source/filter/excel/xestream.cxx+++ b/sc/source/filter/excel/xestream.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xestream.cxx,v $- * $Revision: 1.11.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -259,6 +256,17 @@ void XclExpStream::WriteZeroBytes( sal_Size nBytes ) WriteRawZeroBytes( nBytes ); } +void XclExpStream::WriteZeroBytesToRecord( sal_Size nBytes )+{+ if (!mbInRec)+ // not in record.+ return;++ sal_uInt8 nZero = 0;+ for (sal_Size i = 0; i < nBytes; ++i)+ *this << nZero;+}+ sal_Size XclExpStream::CopyFromStream( SvStream& rInStrm, sal_Size nBytes ) { sal_Size nStrmPos = rInStrm.Tell();diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxxindex b657e3b1f1d0..cd0b083aa208 100644--- a/sc/source/filter/excel/xestring.cxx+++ b/sc/source/filter/excel/xestring.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xestring.cxx,v $- * $Revision: 1.13.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxxindex f70452461682..315282098cec 100644--- a/sc/source/filter/excel/xestyle.cxx+++ b/sc/source/filter/excel/xestyle.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xestyle.cxx,v $- * $Revision: 1.33.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -42,14 +39,14 @@ #include <sfx2/printer.hxx> #include "scitems.hxx" #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/bolnitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/bolnitem.hxx> #include <svx/rotmodit.hxx>-#include <svx/colritem.hxx>-#include <svx/brshitem.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/eeitem.hxx>-#include <svx/escpitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/escpitem.hxx> #include "document.hxx" #include "stlpool.hxx" #include "stlsheet.hxx"diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxxindex 1583828706cc..e9aaa70bceba 100644--- a/sc/source/filter/excel/xetable.cxx+++ b/sc/source/filter/excel/xetable.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xetable.cxx,v $- * $Revision: 1.18.126.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxxindex 649bc0de32e6..c342b5a40ea1 100644--- a/sc/source/filter/excel/xeview.cxx+++ b/sc/source/filter/excel/xeview.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xeview.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxxindex dc542a1c1eeb..4470bf789412 100644--- a/sc/source/filter/excel/xichart.cxx+++ b/sc/source/filter/excel/xichart.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xichart.cxx,v $- * $Revision: 1.20.62.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,6 +31,7 @@ #include "xichart.hxx" #include <algorithm>+#include <memory> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/drawing/Direction3D.hpp>@@ -72,6 +70,8 @@ #include "tokenarray.hxx" #include "token.hxx" #include "compiler.hxx"+#include "reftokenhelper.hxx"+#include "chartlis.hxx" #include "fprogressbar.hxx" #include "xltracer.hxx" #include "xistream.hxx"@@ -123,6 +123,8 @@ using ::com::sun::star::chart2::data::XDataSequence; using ::formula::FormulaToken; using ::formula::StackVar; +using ::std::vector;+ // Helpers ==================================================================== namespace {@@ -791,6 +793,22 @@ Sequence< Reference< XFormattedString > > XclImpChSourceLink::CreateStringSequen return ScfApiHelper::VectorToSequence( aStringVec ); } +void XclImpChSourceLink::FillSourceLink(vector<ScSharedTokenRef>& rTokens) const+{+ if (!mxTokenArray.is())+ // no links to fill.+ return;++ mxTokenArray->Reset();+ for (FormulaToken* p = mxTokenArray->First(); p; p = mxTokenArray->Next())+ {+ ScSharedTokenRef pToken(static_cast<ScToken*>(p->Clone()));+ if (ScRefTokenHelper::isRef(pToken))+ // This is a reference token. Store it.+ ScRefTokenHelper::join(rTokens, pToken);+ }+}+ // Text ======================================================================= XclImpChFontBase::~XclImpChFontBase()@@ -1837,6 +1855,18 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const return xDataSeries; } +void XclImpChSeries::FillAllSourceLinks(vector<ScSharedTokenRef>& rTokens) const+{+ if (mxValueLink.is())+ mxValueLink->FillSourceLink(rTokens);+ if (mxCategLink.is())+ mxCategLink->FillSourceLink(rTokens);+ if (mxTitleLink.is())+ mxTitleLink->FillSourceLink(rTokens);+ if (mxBubbleLink.is())+ mxBubbleLink->FillSourceLink(rTokens);+}+ void XclImpChSeries::ReadChSourceLink( XclImpStream& rStrm ) { XclImpChSourceLinkRef xSrcLink( new XclImpChSourceLink( GetChRoot() ) );@@ -3483,7 +3513,7 @@ XclImpChTextRef XclImpChChart::GetDefaultText( XclChTextType eTextType ) const return maDefTexts.get( nDefTextId ); } -void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressBar& rProgress ) const+void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressBar& rProgress, const OUString& rObjName ) const { // initialize conversion (locks the model to suppress any internal updates) InitConversion( xChartDoc );@@ -3526,6 +3556,28 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressB // unlock the model FinishConversion( rProgress );++ ScDocument* pDoc = &GetRoot().GetDoc();+ ScChartListenerCollection* pChartCollection = pDoc->GetChartListenerCollection();+ if (pChartCollection)+ {+ // Now, start listening to this chart.+ ::std::auto_ptr< vector<ScSharedTokenRef> > pRefTokens(new vector<ScSharedTokenRef>);+ for (XclImpChSeriesVec::const_iterator itr = maSeries.begin(), itrEnd = maSeries.end(); itr != itrEnd; ++itr)+ {+ const XclImpChSeriesRef& rSeries = *itr;+ rSeries->FillAllSourceLinks(*pRefTokens);+ }+ if (!pRefTokens->empty())+ {+ ::std::auto_ptr<ScChartListener> pListener(+ new ScChartListener(rObjName, pDoc, pRefTokens.release()));+ pListener->SetUsed(true);+ pListener->StartListeningTo();+ pChartCollection->Insert(pListener.release());++ }+ } } void XclImpChChart::ReadChSeries( XclImpStream& rStrm )@@ -3751,11 +3803,11 @@ sal_Size XclImpChart::GetProgressSize() const return mxChartData.is() ? mxChartData->GetProgressSize() : 0; } -void XclImpChart::Convert( Reference< XModel > xModel, ScfProgressBar& rProgress ) const+void XclImpChart::Convert( Reference< XModel > xModel, ScfProgressBar& rProgress, const OUString& rObjName ) const { Reference< XChartDocument > xChartDoc( xModel, UNO_QUERY ); if( mxChartData.is() && xChartDoc.is() )- mxChartData->Convert( xChartDoc, rProgress );+ mxChartData->Convert( xChartDoc, rProgress, rObjName ); } void XclImpChart::ReadChChart( XclImpStream& rStrm )diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxxindex 444cf4c848d1..9c130d2ebb78 100644--- a/sc/source/filter/excel/xicontent.cxx+++ b/sc/source/filter/excel/xicontent.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xicontent.cxx,v $- * $Revision: 1.31.88.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,21 +31,21 @@ #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> #include <tools/urlobj.hxx>-#include <svx/editeng.hxx>-#include <svx/editobj.hxx>-#include <svx/linkmgr.hxx>+#include <editeng/editeng.hxx>+#include <editeng/editobj.hxx>+#include <sfx2/linkmgr.hxx> #include <svl/itemset.hxx> #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx>-#include <svx/flditem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/wghtitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/postitem.hxx>-#include <svx/colritem.hxx>-#include <svx/crsditem.hxx>+#include <editeng/flditem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/wghtitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/crsditem.hxx> #include "document.hxx" #include "editutil.hxx" #include "cell.hxx"diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxxindex dece34280d8b..e963495a3f4b 100644--- a/sc/source/filter/excel/xiescher.cxx+++ b/sc/source/filter/excel/xiescher.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xiescher.cxx,v $- * $Revision: 1.57.52.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -79,18 +76,18 @@ #include <svx/svdocapt.hxx> #include <svx/svdouno.hxx> #include <svx/svdpage.hxx>-#include <svx/editobj.hxx>-#include <svx/outliner.hxx>-#include <svx/outlobj.hxx>+#include <editeng/editobj.hxx>+#include <editeng/outliner.hxx>+#include <editeng/outlobj.hxx> #include <svx/unoapi.hxx> #include <svx/svditer.hxx>-#include <svx/writingmodeitem.hxx>+#include <editeng/writingmodeitem.hxx> #include "scitems.hxx"-#include <svx/eeitem.hxx>-#include <svx/colritem.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/colritem.hxx> #include <svx/xflclit.hxx>-#include <svx/adjitem.hxx>+#include <editeng/adjitem.hxx> #include <svx/xlineit.hxx> #include <svx/xlinjoit.hxx> #include <svx/xlntrit.hxx>@@ -105,6 +102,7 @@ #include "convuno.hxx" #include "postit.hxx" #include "globstr.hrc"+#include "chartlis.hxx" #include "fprogressbar.hxx" #include "xltracer.hxx"@@ -1662,7 +1660,7 @@ SdrObject* XclImpChartObj::DoCreateSdrObj( const Rectangle& rAnchorRect, ScfProg if( svt::EmbeddedObjectRef::TryRunningState( xEmbObj ) ) { Reference< XModel > xModel( xEmbObj->getComponent(), UNO_QUERY );- mxChart->Convert( xModel, rProgress );+ mxChart->Convert( xModel, rProgress, aEmbObjName ); Reference< XEmbedPersist > xPers( xEmbObj, UNO_QUERY ); if( xPers.is() )@@ -3838,6 +3836,9 @@ void XclImpObjectManager::ConvertObjects() rDffManager.ProcessDrawing( maDffStrm, *aPIt ); } }+ ScChartListenerCollection* pChartListeners = GetDoc().GetChartListenerCollection();+ if (pChartListeners && pChartListeners->GetCount())+ pChartListeners->SetDirty(); } String XclImpObjectManager::GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) constdiff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxxindex f6b030aa8250..40c6ef9be374 100644--- a/sc/source/filter/excel/xiformula.cxx+++ b/sc/source/filter/excel/xiformula.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xiformula.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxxindex 99dd5632443b..1afcba154c4a 100644--- a/sc/source/filter/excel/xihelper.cxx+++ b/sc/source/filter/excel/xihelper.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xihelper.cxx,v $- * $Revision: 1.29 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,11 +29,11 @@ #include "precompiled_sc.hxx" #include "xihelper.hxx" #include <svl/itemset.hxx>-#include <svx/editobj.hxx>+#include <editeng/editobj.hxx> #include <tools/urlobj.hxx> #include "scitems.hxx"-#include <svx/eeitem.hxx>-#include <svx/flditem.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/flditem.hxx> #include "document.hxx" #include "cell.hxx" #include "rangelst.hxx"diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxxindex 00268215a5dc..1183b077b626 100644--- a/sc/source/filter/excel/xilink.cxx+++ b/sc/source/filter/excel/xilink.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xilink.cxx,v $- * $Revision: 1.25.46.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxxindex 502e643b6c76..70ff46a0d741 100644--- a/sc/source/filter/excel/xiname.cxx+++ b/sc/source/filter/excel/xiname.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xiname.cxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxxindex 4d5b5c1ce56b..75ec91626cf6 100644--- a/sc/source/filter/excel/xipage.cxx+++ b/sc/source/filter/excel/xipage.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xipage.cxx,v $- * $Revision: 1.18.90.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,10 +34,10 @@ #include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <svx/pageitem.hxx>-#include <svx/sizeitem.hxx>-#include <svx/lrspitem.hxx>-#include <svx/ulspitem.hxx>-#include <svx/brshitem.hxx>+#include <editeng/sizeitem.hxx>+#include <editeng/lrspitem.hxx>+#include <editeng/ulspitem.hxx>+#include <editeng/brshitem.hxx> #include "document.hxx" #include "stlsheet.hxx" #include "attrib.hxx"diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxxindex 687dfb9333fe..ac184224c611 100644--- a/sc/source/filter/excel/xipivot.cxx+++ b/sc/source/filter/excel/xipivot.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xipivot.cxx,v $- * $Revision: 1.20.4.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxxindex 30cab47f57f5..7b03d56408c9 100644--- a/sc/source/filter/excel/xiroot.cxx+++ b/sc/source/filter/excel/xiroot.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xiroot.cxx,v $- * $Revision: 1.24.88.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxxindex a040f21b1c4f..98db9dcb4471 100644--- a/sc/source/filter/excel/xistream.cxx+++ b/sc/source/filter/excel/xistream.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xistream.cxx,v $- * $Revision: 1.22.30.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -678,56 +675,56 @@ XclImpStream& XclImpStream::operator>>( double& rfValue ) sal_Int8 XclImpStream::ReadInt8() {- sal_Int8 nValue;+ sal_Int8 nValue(0); operator>>( nValue ); return nValue; } sal_uInt8 XclImpStream::ReaduInt8() {- sal_uInt8 nValue;+ sal_uInt8 nValue(0); operator>>( nValue ); return nValue; } sal_Int16 XclImpStream::ReadInt16() {- sal_Int16 nValue;+ sal_Int16 nValue(0); operator>>( nValue ); return nValue; } sal_uInt16 XclImpStream::ReaduInt16() {- sal_uInt16 nValue;+ sal_uInt16 nValue(0); operator>>( nValue ); return nValue; } sal_Int32 XclImpStream::ReadInt32() {- sal_Int32 nValue;+ sal_Int32 nValue(0); operator>>( nValue ); return nValue; } sal_uInt32 XclImpStream::ReaduInt32() {- sal_uInt32 nValue;+ sal_uInt32 nValue(0); operator>>( nValue ); return nValue; } float XclImpStream::ReadFloat() {- float fValue;+ float fValue(0.0); operator>>( fValue ); return fValue; } double XclImpStream::ReadDouble() {- double fValue;+ double fValue(0.0); operator>>( fValue ); return fValue; }diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxxindex d6e0b3182d41..cb2645bec538 100644--- a/sc/source/filter/excel/xistring.cxx+++ b/sc/source/filter/excel/xistring.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xistring.cxx,v $- * $Revision: 1.5.90.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxxindex 07368f6db680..4e0ff5079471 100644--- a/sc/source/filter/excel/xistyle.cxx+++ b/sc/source/filter/excel/xistyle.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xistyle.cxx,v $- * $Revision: 1.38.14.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,26 +31,26 @@ #include <sfx2/printer.hxx> #include <sfx2/objsh.hxx> #include <svtools/ctrltool.hxx>-#include <svx/editobj.hxx>+#include <editeng/editobj.hxx> #include "scitems.hxx"-#include <svx/fontitem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/wghtitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/postitem.hxx>-#include <svx/crsditem.hxx>-#include <svx/cntritem.hxx>-#include <svx/shdditem.hxx>-#include <svx/escpitem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/wghtitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/cntritem.hxx>+#include <editeng/shdditem.hxx>+#include <editeng/escpitem.hxx> #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/bolnitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/bolnitem.hxx> #include <svx/rotmodit.hxx>-#include <svx/colritem.hxx>-#include <svx/brshitem.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/eeitem.hxx>-#include <svx/flstitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/flstitem.hxx> #include "document.hxx" #include "docpool.hxx" #include "attrib.hxx"diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxxindex a871bdd0c1d7..6eeee8e04839 100644--- a/sc/source/filter/excel/xiview.cxx+++ b/sc/source/filter/excel/xiview.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xiview.cxx,v $- * $Revision: 1.9.90.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxxindex 9f2bde6672f1..d0c1a925f8ab 100644--- a/sc/source/filter/excel/xladdress.cxx+++ b/sc/source/filter/excel/xladdress.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xladdress.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxxindex 5e7f1665c0e0..2391eb7ef92e 100644--- a/sc/source/filter/excel/xlchart.cxx+++ b/sc/source/filter/excel/xlchart.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlchart.cxx,v $- * $Revision: 1.11.62.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -56,7 +53,7 @@ #include <svx/xbtmpit.hxx> #include <svx/unomid.hxx> #include <filter/msfilter/escherex.hxx>-+#include <editeng/memberids.hrc> #include "global.hxx" #include "xlconst.hxx" #include "xlstyle.hxx"diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxxindex bea2ed17ddd1..5d74346608fd 100644--- a/sc/source/filter/excel/xlescher.cxx+++ b/sc/source/filter/excel/xlescher.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlescher.cxx,v $- * $Revision: 1.14.90.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxxindex b8c18eb3e7c0..c46df189ab74 100644--- a/sc/source/filter/excel/xlformula.cxx+++ b/sc/source/filter/excel/xlformula.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlformula.cxx,v $- * $Revision: 1.27 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxxindex d1bea1addcec..a59c6f761667 100644--- a/sc/source/filter/excel/xlpage.cxx+++ b/sc/source/filter/excel/xlpage.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlpage.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,11 +29,11 @@ #include "precompiled_sc.hxx" #include "xlpage.hxx" #include <sfx2/printer.hxx>-#include <svx/svxenum.hxx>-#include <svx/paperinf.hxx>+#include <editeng/svxenum.hxx>+#include <editeng/paperinf.hxx> #include <vcl/svapp.hxx> #include "scitems.hxx"-#include <svx/brshitem.hxx>+#include <editeng/brshitem.hxx> #include "global.hxx" #include "xlconst.hxx" diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxxindex 8f5d026379d9..ed7aadd0a410 100644--- a/sc/source/filter/excel/xlpivot.cxx+++ b/sc/source/filter/excel/xlpivot.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlpivot.cxx,v $- * $Revision: 1.12.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxxindex 9706279307d1..8a22b05828b9 100644--- a/sc/source/filter/excel/xlroot.cxx+++ b/sc/source/filter/excel/xlroot.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlroot.cxx,v $- * $Revision: 1.32.88.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -39,9 +36,9 @@ #include <sfx2/printer.hxx> #include <sfx2/docfile.hxx> #include <vcl/font.hxx>-#include <svx/editstat.hxx>+#include <editeng/editstat.hxx> #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include "document.hxx" #include "docpool.hxx" #include "docuno.hxx"diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxxindex 401f135b381a..4a48584da7fa 100644--- a/sc/source/filter/excel/xlstyle.cxx+++ b/sc/source/filter/excel/xlstyle.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlstyle.cxx,v $- * $Revision: 1.27.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,7 +37,7 @@ #include <vcl/font.hxx> #include <rtl/tencinfo.h> #include <toolkit/unohlp.hxx>-#include <svx/svxfont.hxx>+#include <editeng/svxfont.hxx> #include "global.hxx" #include "xlroot.hxx" diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxxindex 4aa46c2ebed9..926eb3e54fdc 100644--- a/sc/source/filter/excel/xltools.cxx+++ b/sc/source/filter/excel/xltools.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xltools.cxx,v $- * $Revision: 1.31.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ #include <sal/mathconf.h> #include <unotools/fontcvt.hxx> #include <sfx2/objsh.hxx>-#include <svx/editstat.hxx>+#include <editeng/editstat.hxx> #include "xestream.hxx" #include "document.hxx" #include "docuno.hxx"diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxxindex fa7c0a17c5c1..7dadbde8198a 100644--- a/sc/source/filter/excel/xltracer.cxx+++ b/sc/source/filter/excel/xltracer.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xltracer.cxx,v $- * $Revision: 1.10.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxxindex e3290e844bd5..d9cbbbb4b7c0 100644--- a/sc/source/filter/excel/xlview.cxx+++ b/sc/source/filter/excel/xlview.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlview.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxxindex 299708d2e11c..eeef52aed550 100644--- a/sc/source/filter/ftools/fapihelper.cxx+++ b/sc/source/filter/ftools/fapihelper.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fapihelper.cxx,v $- * $Revision: 1.10.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxxindex 9471a1d1a2bf..bcee6f690f48 100644--- a/sc/source/filter/ftools/fprogressbar.cxx+++ b/sc/source/filter/ftools/fprogressbar.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fprogressbar.cxx,v $- * $Revision: 1.10.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxxindex 917cba6c34ce..72e5f115fed0 100644--- a/sc/source/filter/ftools/ftools.cxx+++ b/sc/source/filter/ftools/ftools.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: ftools.cxx,v $- * $Revision: 1.20.4.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/ftools/makefile.mk b/sc/source/filter/ftools/makefile.mkindex 138bf44a0c8b..27a960efc6b0 100644--- a/sc/source/filter/ftools/makefile.mk+++ b/sc/source/filter/ftools/makefile.mk@@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.-#-# Copyright 2008 by Sun Microsystems, Inc.+# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.8.90.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxxindex 8d6486fca38d..e8c71d20af11 100644--- a/sc/source/filter/html/htmlexp.cxx+++ b/sc/source/filter/html/htmlexp.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: htmlexp.cxx,v $- * $Revision: 1.38.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,24 +33,24 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #define _SVSTDARR_STRINGSSORTDTOR #include <rtl/tencinfo.h> #include <vcl/svapp.hxx> #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/colritem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/fontitem.hxx>-#include <svx/postitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx> #include <svx/xoutbmp.hxx>-#include <svx/editeng.hxx>-#include <svx/htmlcfg.hxx>+#include <editeng/editeng.hxx>+#include <svtools/htmlcfg.hxx> #include <sfx2/docfile.hxx> #include <sfx2/frmhtmlw.hxx> #include <sfx2/objsh.hxx>@@ -86,8 +83,8 @@ #include "ftools.hxx" -#include <svx/flditem.hxx>-#include <svx/borderline.hxx>+#include <editeng/flditem.hxx>+#include <editeng/borderline.hxx> #include <unotools/syslocale.hxx> diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxxindex 6793cb879751..341f9afbc739 100644--- a/sc/source/filter/html/htmlexp2.cxx+++ b/sc/source/filter/html/htmlexp2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: htmlexp2.cxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxxindex 5591e8ec993e..ad3a5e041151 100644--- a/sc/source/filter/html/htmlimp.cxx+++ b/sc/source/filter/html/htmlimp.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: htmlimp.cxx,v $- * $Revision: 1.18 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,13 +33,13 @@ //------------------------------------------------------------------------ #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/lrspitem.hxx>-#include <svx/paperinf.hxx>-#include <svx/sizeitem.hxx>-#include <svx/ulspitem.hxx>-#include <svx/boxitem.hxx>+#include <editeng/lrspitem.hxx>+#include <editeng/paperinf.hxx>+#include <editeng/sizeitem.hxx>+#include <editeng/ulspitem.hxx>+#include <editeng/boxitem.hxx> #include <vcl/svapp.hxx> #include "htmlimp.hxx"diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxxindex 99b5150621ef..2716dc216ed1 100644--- a/sc/source/filter/html/htmlpars.cxx+++ b/sc/source/filter/html/htmlpars.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: htmlpars.cxx,v $- * $Revision: 1.34.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,20 +32,19 @@ #define SC_HTMLPARS_CXX #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/htmlcfg.hxx>+#include <svtools/htmlcfg.hxx> #include <svx/algitem.hxx>-#include <svx/colritem.hxx>-#include <svx/brshitem.hxx>-#include <svx/editeng.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/fontitem.hxx>-#include <svx/impgrf.hxx>-#include <svx/postitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>-#include <svx/boxitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/editeng.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx>+#include <editeng/boxitem.hxx> #include <sfx2/objsh.hxx> #include <svl/eitem.hxx> #include <svtools/filter.hxx>@@ -1375,8 +1371,8 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) USHORT nFormat; Graphic* pGraphic = new Graphic;- GraphicFilter* pFilter = ::GetGrfFilter();- if ( GRFILTER_OK != ::LoadGraphic( pImage->aURL, pImage->aFilterName,+ GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter();+ if ( GRFILTER_OK != GraphicFilter::LoadGraphic( pImage->aURL, pImage->aFilterName, *pGraphic, pFilter, &nFormat ) ) { delete pGraphic;diff --git a/sc/source/filter/html/makefile.mk b/sc/source/filter/html/makefile.mkindex 3f2338da4a1c..93e992c67e31 100644--- a/sc/source/filter/html/makefile.mk+++ b/sc/source/filter/html/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.6 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxxindex 2dd2570353be..01eb076f6b3d 100644--- a/sc/source/filter/inc/XclExpChangeTrack.hxx+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XclExpChangeTrack.hxx,v $- * $Revision: 1.20 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxxindex 65f981fef973..c850d6681235 100644--- a/sc/source/filter/inc/XclImpChangeTrack.hxx+++ b/sc/source/filter/inc/XclImpChangeTrack.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XclImpChangeTrack.hxx,v $- * $Revision: 1.21.134.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxxindex fa0a83cb4f2a..479dc0f577f5 100644--- a/sc/source/filter/inc/biff.hxx+++ b/sc/source/filter/inc/biff.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: biff.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxxindex 19b696ec3a07..325d380cc19c 100644--- a/sc/source/filter/inc/colrowst.hxx+++ b/sc/source/filter/inc/colrowst.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: colrowst.hxx,v $- * $Revision: 1.23.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/decl.h b/sc/source/filter/inc/decl.hindex f9d3ca4e81c7..e888b7dca5fe 100644--- a/sc/source/filter/inc/decl.h+++ b/sc/source/filter/inc/decl.h@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: decl.h,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxxindex 9fc63f72f72b..20b2400cf5a2 100644--- a/sc/source/filter/inc/dif.hxx+++ b/sc/source/filter/inc/dif.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dif.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxxindex a601c7a20cbf..59225a5a7138 100644--- a/sc/source/filter/inc/eeimport.hxx+++ b/sc/source/filter/inc/eeimport.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: eeimport.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxxindex a5398fb8fa84..afc8c959392b 100644--- a/sc/source/filter/inc/eeparser.hxx+++ b/sc/source/filter/inc/eeparser.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: eeparser.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ #include <vcl/graph.hxx> #include <tools/table.hxx> #include <svl/itemset.hxx>-#include <svx/editdata.hxx>+#include <editeng/editdata.hxx> #include <address.hxx> const sal_Char nHorizontal = 1;diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxxindex 63fa4386d8fb..2d489af7e427 100644--- a/sc/source/filter/inc/excdefs.hxx+++ b/sc/source/filter/inc/excdefs.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: excdefs.hxx,v $- * $Revision: 1.49 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxxindex cb98096c458f..f00e8d091590 100644--- a/sc/source/filter/inc/excdoc.hxx+++ b/sc/source/filter/inc/excdoc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: excdoc.hxx,v $- * $Revision: 1.19 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxxindex 54cde7ab8a8b..ed771637b704 100644--- a/sc/source/filter/inc/excform.hxx+++ b/sc/source/filter/inc/excform.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: excform.hxx,v $- * $Revision: 1.22.62.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxxindex 9bd633eae879..1340f7c6f8be 100644--- a/sc/source/filter/inc/excimp8.hxx+++ b/sc/source/filter/inc/excimp8.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: excimp8.hxx,v $- * $Revision: 1.71.14.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,6 +34,7 @@ #include "excscen.hxx" #include "excdefs.hxx" #include "ftools.hxx"+#include "queryparam.hxx" class SotStorage; @@ -52,6 +50,7 @@ class XclImpStream; class ImportExcel8 : public ImportExcel {+ SCTAB mnTab; protected: ExcScenarioList aScenList; diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxxindex b1571637828a..bc960f05b3a5 100644--- a/sc/source/filter/inc/excrecds.hxx+++ b/sc/source/filter/inc/excrecds.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: excrecds.hxx,v $- * $Revision: 1.51 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxxindex 4c43e59bf332..125f74e9fa54 100644--- a/sc/source/filter/inc/excscen.hxx+++ b/sc/source/filter/inc/excscen.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: excscen.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxxindex 4afe6eff534d..79fff8675d84 100644--- a/sc/source/filter/inc/exp_op.hxx+++ b/sc/source/filter/inc/exp_op.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: exp_op.hxx,v $- * $Revision: 1.13.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxxindex 94420c740621..3744bf497927 100644--- a/sc/source/filter/inc/expbase.hxx+++ b/sc/source/filter/inc/expbase.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: expbase.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxxindex f3cdc782ee9c..8c204f1cef35 100644--- a/sc/source/filter/inc/fapihelper.hxx+++ b/sc/source/filter/inc/fapihelper.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fapihelper.hxx,v $- * $Revision: 1.11.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxxindex 606cc2c98482..7ab2aadf1511 100644--- a/sc/source/filter/inc/filt_pch.hxx+++ b/sc/source/filter/inc/filt_pch.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filt_pch.hxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -161,7 +158,7 @@ #include <namebuff.hxx> #include <tools/shl.hxx> #include <tools/pstm.hxx>-#include <svx/fhgtitem.hxx>+#include <editeng/fhgtitem.hxx> #include <vos/types.hxx> #include <vos/object.hxx> #include <vos/macros.hxx>@@ -171,7 +168,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <attrib.hxx> #include <svl/zforlist.hxx>-#include <svx/fontitem.hxx>+#include <editeng/fontitem.hxx> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XEventListener.hdl> #include <com/sun/star/lang/EventObject.hdl>@@ -231,20 +228,20 @@ #include <vos/runnable.hxx> #include <vos/refernce.hxx> #include <vcl/apptypes.hxx>-#include <svx/editdata.hxx>-#include <svx/editeng.hxx>+#include <editeng/editdata.hxx>+#include <editeng/editeng.hxx> #include <com/sun/star/lang/WrappedTargetException.hdl> #include <com/sun/star/lang/WrappedTargetException.hpp> #include <sfx2/shell.hxx> #include <tools/stack.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hdl>-#include <svx/svxenum.hxx>+#include <editeng/svxenum.hxx> #include <formel.hxx> #include <com/sun/star/container/XElementAccess.hdl> #include <com/sun/star/container/XElementAccess.hpp> #include <svl/itempool.hxx>-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <rangenam.hxx> #include <vcl/syswin.hxx> #include <svl/smplhint.hxx>@@ -302,7 +299,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hdl> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <tools/urlobj.hxx>-#include <svx/colritem.hxx>+#include <editeng/colritem.hxx> #include <vcl/wrkwin.hxx> #include <excimp8.hxx> #include <excscen.hxx>diff --git a/sc/source/filter/inc/fkttab.h b/sc/source/filter/inc/fkttab.hindex 8895a9fe21cb..3d834c5cf04d 100644--- a/sc/source/filter/inc/fkttab.h+++ b/sc/source/filter/inc/fkttab.h@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fkttab.h,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/flttypes.hxx b/sc/source/filter/inc/flttypes.hxxindex e1f8bf951462..0a78889feb8c 100644--- a/sc/source/filter/inc/flttypes.hxx+++ b/sc/source/filter/inc/flttypes.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: flttypes.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxxindex 0961533731cb..6c7d4288c372 100644--- a/sc/source/filter/inc/formel.hxx+++ b/sc/source/filter/inc/formel.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formel.hxx,v $- * $Revision: 1.11.32.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxxindex ade7ba7b6bec..f399d7ea5064 100644--- a/sc/source/filter/inc/fprogressbar.hxx+++ b/sc/source/filter/inc/fprogressbar.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fprogressbar.hxx,v $- * $Revision: 1.8.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxxindex 5fd338a73bb5..bdb17178d75c 100644--- a/sc/source/filter/inc/ftools.hxx+++ b/sc/source/filter/inc/ftools.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: ftools.hxx,v $- * $Revision: 1.24.4.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/funktion.h b/sc/source/filter/inc/funktion.hindex 57391283b3e4..ef8ecabc256a 100644--- a/sc/source/filter/inc/funktion.h+++ b/sc/source/filter/inc/funktion.h@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: funktion.h,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxxindex d284eedcc120..4cdf71b8610d 100644--- a/sc/source/filter/inc/htmlexp.hxx+++ b/sc/source/filter/inc/htmlexp.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: htmlexp.hxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxxindex d50998ba295c..8a1d1c41b4fd 100644--- a/sc/source/filter/inc/htmlimp.hxx+++ b/sc/source/filter/inc/htmlimp.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: htmlimp.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxxindex e3f53a5ddc5b..f053a1088ff1 100644--- a/sc/source/filter/inc/htmlpars.hxx+++ b/sc/source/filter/inc/htmlpars.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: htmlpars.hxx,v $- * $Revision: 1.16.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxxindex fa0e6b7f5074..065678d5c792 100644--- a/sc/source/filter/inc/imp_op.hxx+++ b/sc/source/filter/inc/imp_op.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: imp_op.hxx,v $- * $Revision: 1.43.14.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxxindex 07b8804b7380..7015136f1be1 100644--- a/sc/source/filter/inc/lotattr.hxx+++ b/sc/source/filter/inc/lotattr.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lotattr.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxxindex f994e1243564..5c8771814206 100644--- a/sc/source/filter/inc/lotfntbf.hxx+++ b/sc/source/filter/inc/lotfntbf.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lotfntbf.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,9 +31,9 @@ #include <tools/solar.h> #include "scitems.hxx"-#include <svx/fontitem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/colritem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/colritem.hxx> // ---------------------------------------------------- class LotusFontBuffer - diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxxindex 0461df8d48c6..0a341e29ae51 100644--- a/sc/source/filter/inc/lotform.hxx+++ b/sc/source/filter/inc/lotform.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lotform.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxxindex bae6b7f8e3c6..15c0a2931dc4 100644--- a/sc/source/filter/inc/lotimpop.hxx+++ b/sc/source/filter/inc/lotimpop.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lotimpop.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxxindex e544e953bab3..ab9acf9f476e 100644--- a/sc/source/filter/inc/lotrange.hxx+++ b/sc/source/filter/inc/lotrange.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lotrange.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/makefile.mk b/sc/source/filter/inc/makefile.mkindex 3c33d006edf9..1b35ca49549d 100644--- a/sc/source/filter/inc/makefile.mk+++ b/sc/source/filter/inc/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.3 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxxindex e19252a795a8..c8182e8c0c17 100644--- a/sc/source/filter/inc/namebuff.hxx+++ b/sc/source/filter/inc/namebuff.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: namebuff.hxx,v $- * $Revision: 1.15.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/op.h b/sc/source/filter/inc/op.hindex 2bfbedde0aed..2548bdfa34c3 100644--- a/sc/source/filter/inc/op.h+++ b/sc/source/filter/inc/op.h@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: op.h,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/optab.h b/sc/source/filter/inc/optab.hindex bf12bf9f19cd..d70eb1f29bb0 100644--- a/sc/source/filter/inc/optab.h+++ b/sc/source/filter/inc/optab.h@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optab.h,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/otlnbuff.hxx b/sc/source/filter/inc/otlnbuff.hxxindex 883705afc6d7..6ccca361345b 100644--- a/sc/source/filter/inc/otlnbuff.hxx+++ b/sc/source/filter/inc/otlnbuff.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: otlnbuff.hxx,v $- * $Revision: 1.5.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/qpro.hxx b/sc/source/filter/inc/qpro.hxxindex a9b1c61955c5..f631da120373 100644--- a/sc/source/filter/inc/qpro.hxx+++ b/sc/source/filter/inc/qpro.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: qpro.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxxindex 7118db9f2f5f..18327cd141df 100644--- a/sc/source/filter/inc/qproform.hxx+++ b/sc/source/filter/inc/qproform.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: qproform.hxx,v $- * $Revision: 1.3.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/qprostyle.hxx b/sc/source/filter/inc/qprostyle.hxxindex e7195704c04f..ffce2630b310 100644--- a/sc/source/filter/inc/qprostyle.hxx+++ b/sc/source/filter/inc/qprostyle.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: qprostyle.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxxindex ffff5dd9ff94..fcac4da4be62 100644--- a/sc/source/filter/inc/root.hxx+++ b/sc/source/filter/inc/root.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: root.hxx,v $- * $Revision: 1.44.14.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxxindex a8903c96eedf..4733d243d1a5 100644--- a/sc/source/filter/inc/rtfexp.hxx+++ b/sc/source/filter/inc/rtfexp.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rtfexp.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/rtfimp.hxx b/sc/source/filter/inc/rtfimp.hxxindex 7b05e617f6da..13ade86b7cd5 100644--- a/sc/source/filter/inc/rtfimp.hxx+++ b/sc/source/filter/inc/rtfimp.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rtfimp.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxxindex efc404a5dfa8..135e11e572ae 100644--- a/sc/source/filter/inc/rtfparse.hxx+++ b/sc/source/filter/inc/rtfparse.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rtfparse.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxxindex 0c43f9b0824a..995de274b28b 100644--- a/sc/source/filter/inc/scflt.hxx+++ b/sc/source/filter/inc/scflt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scflt.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/scfobj.hxx b/sc/source/filter/inc/scfobj.hxxindex a0c9e85247a3..4ed1784f4354 100644--- a/sc/source/filter/inc/scfobj.hxx+++ b/sc/source/filter/inc/scfobj.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scfobj.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/scmem.h b/sc/source/filter/inc/scmem.hindex fa5c0ee9c2cf..03e30c1e9fc6 100644--- a/sc/source/filter/inc/scmem.h+++ b/sc/source/filter/inc/scmem.h@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scmem.h,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxxindex 3a60b709d5bf..80c94c729270 100644--- a/sc/source/filter/inc/tokstack.hxx+++ b/sc/source/filter/inc/tokstack.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tokstack.hxx,v $- * $Revision: 1.14.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.hindex 24de125426b8..93cc074d89f6 100644--- a/sc/source/filter/inc/tool.h+++ b/sc/source/filter/inc/tool.h@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tool.h,v $- * $Revision: 1.5.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xcl97dum.hxx b/sc/source/filter/inc/xcl97dum.hxxindex 3dadb6ff3ed0..a76a93321557 100644--- a/sc/source/filter/inc/xcl97dum.hxx+++ b/sc/source/filter/inc/xcl97dum.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xcl97dum.hxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxxindex 50583debc17f..2aa7c824af99 100644--- a/sc/source/filter/inc/xcl97esc.hxx+++ b/sc/source/filter/inc/xcl97esc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xcl97esc.hxx,v $- * $Revision: 1.13.14.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxxindex ef97a60a8a8e..2c6ae2f9ab0c 100644--- a/sc/source/filter/inc/xcl97rec.hxx+++ b/sc/source/filter/inc/xcl97rec.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xcl97rec.hxx,v $- * $Revision: 1.48.30.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -570,6 +567,19 @@ private: // ============================================================================ +/** End of User Interface Records */+class XclExpInterfaceEnd : public XclExpRecord+{+public:+ explicit XclExpInterfaceEnd();+ virtual ~XclExpInterfaceEnd();++private:+ virtual void WriteBody( XclExpStream& rStrm );+};++// ============================================================================+ /** Write Access User Name - This record contains the user name, which is the name you type when you install Excel. */ class XclExpWriteAccess : public XclExpRecorddiff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxxindex 8a724aab1457..eb6026a82e9a 100644--- a/sc/source/filter/inc/xechart.hxx+++ b/sc/source/filter/inc/xechart.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xechart.hxx,v $- * $Revision: 1.7.62.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxxindex 92e80eceb2af..50c9466d2801 100644--- a/sc/source/filter/inc/xecontent.hxx+++ b/sc/source/filter/inc/xecontent.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xecontent.hxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxxindex 1acb7ac08892..6448ccb4853e 100644--- a/sc/source/filter/inc/xeescher.hxx+++ b/sc/source/filter/inc/xeescher.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xeescher.hxx,v $- * $Revision: 1.10.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxxindex 32eae4ed0158..258070f0791e 100644--- a/sc/source/filter/inc/xeformula.hxx+++ b/sc/source/filter/inc/xeformula.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xeformula.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxxindex cb9170396ead..606ce51c889b 100644--- a/sc/source/filter/inc/xehelper.hxx+++ b/sc/source/filter/inc/xehelper.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xehelper.hxx,v $- * $Revision: 1.20.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxxindex 1b49bf7bac02..c70e496400a4 100644--- a/sc/source/filter/inc/xelink.hxx+++ b/sc/source/filter/inc/xelink.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xelink.hxx,v $- * $Revision: 1.13.134.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxxindex 32c48e779cad..f0740735ea28 100644--- a/sc/source/filter/inc/xename.hxx+++ b/sc/source/filter/inc/xename.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xename.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxxindex 3e119d3e4c1a..b9454a3cdb3c 100644--- a/sc/source/filter/inc/xepage.hxx+++ b/sc/source/filter/inc/xepage.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xepage.hxx,v $- * $Revision: 1.6.90.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxxindex 716f0bf7a515..0c730952e69e 100644--- a/sc/source/filter/inc/xepivot.hxx+++ b/sc/source/filter/inc/xepivot.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xepivot.hxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxxindex 8abd4d0c3eae..fa3810c0e92b 100644--- a/sc/source/filter/inc/xerecord.hxx+++ b/sc/source/filter/inc/xerecord.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xerecord.hxx,v $- * $Revision: 1.14.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxxindex 178bb19763f8..ce32a46cbc66 100644--- a/sc/source/filter/inc/xeroot.hxx+++ b/sc/source/filter/inc/xeroot.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xeroot.hxx,v $- * $Revision: 1.21 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxxindex 95d172baf9c2..3308827441dd 100644--- a/sc/source/filter/inc/xestream.hxx+++ b/sc/source/filter/inc/xestream.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xestream.hxx,v $- * $Revision: 1.8.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -126,6 +123,9 @@ public: sal_Size Write( const void* pData, sal_Size nBytes ); /** Writes a sequence of nBytes zero bytes (respects slice setting). */ void WriteZeroBytes( sal_Size nBytes );++ void WriteZeroBytesToRecord( sal_Size nBytes );+ /** Copies nBytes bytes from current position of the stream rInStrm. @descr Omitting the second parameter means: read to end of stream. */ sal_Size CopyFromStream( SvStream& rInStrm, sal_Size nBytes = STREAM_SEEK_TO_END );diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxxindex 5fe5e4fb813f..b468696cb3ff 100644--- a/sc/source/filter/inc/xestring.hxx+++ b/sc/source/filter/inc/xestring.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xestring.hxx,v $- * $Revision: 1.11.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxxindex d26739b868ae..cb12e03b21ad 100644--- a/sc/source/filter/inc/xestyle.hxx+++ b/sc/source/filter/inc/xestyle.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xestyle.hxx,v $- * $Revision: 1.20.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ #include <tools/string.hxx> #include <svl/zforlist.hxx> #include <svl/nfkeytab.hxx>-#include <svx/svxfont.hxx>+#include <editeng/svxfont.hxx> #include "xerecord.hxx" #include "xlstyle.hxx" #include "xeroot.hxx"diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxxindex 6680aa1719ca..723f9dde09e0 100644--- a/sc/source/filter/inc/xetable.hxx+++ b/sc/source/filter/inc/xetable.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xetable.hxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxxindex 149cdad4d85b..ca94e6eae3f9 100644--- a/sc/source/filter/inc/xeview.hxx+++ b/sc/source/filter/inc/xeview.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xeview.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxxindex e09530083965..25e52f3f0168 100644--- a/sc/source/filter/inc/xichart.hxx+++ b/sc/source/filter/inc/xichart.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xichart.hxx,v $- * $Revision: 1.13.62.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -39,6 +36,7 @@ #include <svl/itemset.hxx> #include "rangelst.hxx"+#include "token.hxx" #include "xlchart.hxx" #include "xlstyle.hxx" #include "xistring.hxx"@@ -403,6 +401,8 @@ public: XFormattedStringSeq CreateStringSequence( const XclImpChRoot& rRoot, sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const; + void FillSourceLink(::std::vector<ScSharedTokenRef>& rTokens) const;+ private: XclChSourceLink maData; /// Contents of the CHSOURCELINK record. XclImpStringRef mxString; /// Text data (CHSTRING record).@@ -811,6 +811,8 @@ public: /** Creates a data series object with initialized source links. */ XDataSeriesRef CreateDataSeries() const; + void FillAllSourceLinks(::std::vector<ScSharedTokenRef>& rTokens) const;+ private: /** Reads a CHSOURCELINK record. */ void ReadChSourceLink( XclImpStream& rStrm );@@ -1353,7 +1355,7 @@ public: inline sal_Size GetProgressSize() const { return 2 * EXC_CHART_PROGRESS_SIZE; } /** Converts and writes all properties to the passed chart. */- void Convert( XChartDocRef xChartDoc, ScfProgressBar& rProgress ) const;+ void Convert( XChartDocRef xChartDoc, ScfProgressBar& rProgress, const ::rtl::OUString& rObjName ) const; private: /** Reads a CHSERIES group (data series source and formatting). */@@ -1421,7 +1423,7 @@ public: inline bool IsPivotChart() const { return mbIsPivotChart; } /** Creates the chart object in the passed component. */- void Convert( XModelRef xModel, ScfProgressBar& rProgress ) const;+ void Convert( XModelRef xModel, ScfProgressBar& rProgress, const ::rtl::OUString& rObjName ) const; private: /** Reads the CHCHART group (entire chart data). */diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxxindex 53ed10583249..810c435d34bf 100644--- a/sc/source/filter/inc/xicontent.hxx+++ b/sc/source/filter/inc/xicontent.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xicontent.hxx,v $- * $Revision: 1.16 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxxindex f551b90e10f7..258720e89584 100644--- a/sc/source/filter/inc/xiescher.hxx+++ b/sc/source/filter/inc/xiescher.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xiescher.hxx,v $- * $Revision: 1.28.90.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xiformula.hxx b/sc/source/filter/inc/xiformula.hxxindex 4b169276f5e2..6151222746cd 100644--- a/sc/source/filter/inc/xiformula.hxx+++ b/sc/source/filter/inc/xiformula.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xiformula.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxxindex a46d473f02a9..9a836c8844db 100644--- a/sc/source/filter/inc/xihelper.hxx+++ b/sc/source/filter/inc/xihelper.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xihelper.hxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -31,7 +28,7 @@ #ifndef SC_XIHELPER_HXX #define SC_XIHELPER_HXX -#include <svx/editdata.hxx>+#include <editeng/editdata.hxx> #include "scmatrix.hxx" #include "xladdress.hxx" #include "xiroot.hxx"diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxxindex bb64a84a900e..dbbb4606114e 100644--- a/sc/source/filter/inc/xilink.hxx+++ b/sc/source/filter/inc/xilink.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xilink.hxx,v $- * $Revision: 1.14.134.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxxindex a93c652a0136..ccf1b88af947 100644--- a/sc/source/filter/inc/xiname.hxx+++ b/sc/source/filter/inc/xiname.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xiname.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xipage.hxx b/sc/source/filter/inc/xipage.hxxindex 3b052418b945..0571e10e7046 100644--- a/sc/source/filter/inc/xipage.hxx+++ b/sc/source/filter/inc/xipage.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xipage.hxx,v $- * $Revision: 1.7.90.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxxindex 9e0e577b1756..edac8a0fd99f 100644--- a/sc/source/filter/inc/xipivot.hxx+++ b/sc/source/filter/inc/xipivot.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xipivot.hxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxxindex f331683988ab..3881adaaf911 100644--- a/sc/source/filter/inc/xiroot.hxx+++ b/sc/source/filter/inc/xiroot.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xiroot.hxx,v $- * $Revision: 1.22.88.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxxindex 8ff3c26e9abe..9b27077d78e7 100644--- a/sc/source/filter/inc/xistream.hxx+++ b/sc/source/filter/inc/xistream.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xistream.hxx,v $- * $Revision: 1.13.30.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxxindex 66bc88515d8c..a6f00d26d2e2 100644--- a/sc/source/filter/inc/xistring.hxx+++ b/sc/source/filter/inc/xistring.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xistring.hxx,v $- * $Revision: 1.4.90.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxxindex a67458366057..4a347062905c 100644--- a/sc/source/filter/inc/xistyle.hxx+++ b/sc/source/filter/inc/xistyle.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xistyle.hxx,v $- * $Revision: 1.23.90.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xiview.hxx b/sc/source/filter/inc/xiview.hxxindex 432bd394b70c..5f6d11c3439d 100644--- a/sc/source/filter/inc/xiview.hxx+++ b/sc/source/filter/inc/xiview.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xiview.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxxindex c4aff693a964..0ac5ca3031a4 100644--- a/sc/source/filter/inc/xladdress.hxx+++ b/sc/source/filter/inc/xladdress.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xladdress.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxxindex 7e3873b1f1cf..7e5f90fda4a7 100644--- a/sc/source/filter/inc/xlchart.hxx+++ b/sc/source/filter/inc/xlchart.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlchart.hxx,v $- * $Revision: 1.14.62.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxxindex eeb3fb3982b9..0ffdcc3f1a6d 100644--- a/sc/source/filter/inc/xlconst.hxx+++ b/sc/source/filter/inc/xlconst.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlconst.hxx,v $- * $Revision: 1.29 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlcontent.hxx b/sc/source/filter/inc/xlcontent.hxxindex 6c86e0be68b7..41e916472e70 100644--- a/sc/source/filter/inc/xlcontent.hxx+++ b/sc/source/filter/inc/xlcontent.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlcontent.hxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxxindex 97fb5674bb2d..f60d6d3a5ee5 100644--- a/sc/source/filter/inc/xlescher.hxx+++ b/sc/source/filter/inc/xlescher.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlescher.hxx,v $- * $Revision: 1.22.90.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxxindex aed77452b311..83bab2acd24a 100644--- a/sc/source/filter/inc/xlformula.hxx+++ b/sc/source/filter/inc/xlformula.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlformula.hxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xllink.hxx b/sc/source/filter/inc/xllink.hxxindex a291abb52d78..3e41fb350acb 100644--- a/sc/source/filter/inc/xllink.hxx+++ b/sc/source/filter/inc/xllink.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xllink.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlname.hxx b/sc/source/filter/inc/xlname.hxxindex 03ff84579f5f..5bfcf9164892 100644--- a/sc/source/filter/inc/xlname.hxx+++ b/sc/source/filter/inc/xlname.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlname.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxxindex 59339970fd56..f6860595cd20 100644--- a/sc/source/filter/inc/xlpage.hxx+++ b/sc/source/filter/inc/xlpage.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlpage.hxx,v $- * $Revision: 1.8.90.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxxindex 3ea464e7b919..ad48c05a93f4 100644--- a/sc/source/filter/inc/xlpivot.hxx+++ b/sc/source/filter/inc/xlpivot.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlpivot.hxx,v $- * $Revision: 1.12.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxxindex 8b0873b25475..f3b0f78a948c 100644--- a/sc/source/filter/inc/xlroot.hxx+++ b/sc/source/filter/inc/xlroot.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlroot.hxx,v $- * $Revision: 1.31 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxxindex 603a4cfab3fc..0a9074371c33 100644--- a/sc/source/filter/inc/xlstream.hxx+++ b/sc/source/filter/inc/xlstream.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlstream.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxxindex 32ee23f83d85..5ee505e25024 100644--- a/sc/source/filter/inc/xlstring.hxx+++ b/sc/source/filter/inc/xlstring.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlstring.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxxindex f8cca7199f24..604b53a1f8ff 100644--- a/sc/source/filter/inc/xlstyle.hxx+++ b/sc/source/filter/inc/xlstyle.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlstyle.hxx,v $- * $Revision: 1.23.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,8 +34,8 @@ #include <com/sun/star/awt/FontStrikeout.hpp> #include <tools/color.hxx> #include <vcl/vclenum.hxx>-#include <svx/svxenum.hxx>-#include <svx/frmdir.hxx>+#include <editeng/svxenum.hxx>+#include <editeng/frmdir.hxx> #include <svl/zforlist.hxx> #include "fapihelper.hxx" diff --git a/sc/source/filter/inc/xltable.hxx b/sc/source/filter/inc/xltable.hxxindex 67fbfdcc0a45..6b8f650568a9 100644--- a/sc/source/filter/inc/xltable.hxx+++ b/sc/source/filter/inc/xltable.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xltable.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxxindex 392b0a2ae1fc..b2519a51d156 100644--- a/sc/source/filter/inc/xltools.hxx+++ b/sc/source/filter/inc/xltools.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xltools.hxx,v $- * $Revision: 1.27.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxxindex 38dd444b93ac..73ed3d0502c3 100644--- a/sc/source/filter/inc/xltracer.hxx+++ b/sc/source/filter/inc/xltracer.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xltracer.hxx,v $- * $Revision: 1.9.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxxindex 91b4866cccf9..1a116c84c08e 100644--- a/sc/source/filter/inc/xlview.hxx+++ b/sc/source/filter/inc/xlview.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xlview.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/lotus/expop.cxx b/sc/source/filter/lotus/expop.cxxindex 8aabf12099a4..7ecc9127b49d 100644--- a/sc/source/filter/lotus/expop.cxx+++ b/sc/source/filter/lotus/expop.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: expop.cxx,v $- * $Revision: 1.7.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/lotus/export.cxx b/sc/source/filter/lotus/export.cxxindex ab5554591c15..a9be45e24f23 100644--- a/sc/source/filter/lotus/export.cxx+++ b/sc/source/filter/lotus/export.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: export.cxx,v $- * $Revision: 1.5.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxxindex cd4a7cd9fbca..3a6e39b7d818 100644--- a/sc/source/filter/lotus/filter.cxx+++ b/sc/source/filter/lotus/filter.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filter.cxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxxindex 0df6ccb39bb3..6a05585cf326 100644--- a/sc/source/filter/lotus/lotattr.cxx+++ b/sc/source/filter/lotus/lotattr.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lotattr.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,8 +34,8 @@ #include "scitems.hxx" #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx> #include "document.hxx" #include "patattr.hxx"diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxxindex 42b55943026e..e39891568e33 100644--- a/sc/source/filter/lotus/lotform.cxx+++ b/sc/source/filter/lotus/lotform.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lotform.cxx,v $- * $Revision: 1.16 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxxindex d289f3f888e5..5173d5303321 100644--- a/sc/source/filter/lotus/lotimpop.cxx+++ b/sc/source/filter/lotus/lotimpop.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lotimpop.cxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxxindex ba0fc9a0b9dc..917337fa91d5 100644--- a/sc/source/filter/lotus/lotread.cxx+++ b/sc/source/filter/lotus/lotread.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lotread.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxxindex 5d6b4045e007..a1a428c5dbeb 100644--- a/sc/source/filter/lotus/lotus.cxx+++ b/sc/source/filter/lotus/lotus.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lotus.cxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/lotus/makefile.mk b/sc/source/filter/lotus/makefile.mkindex 3ad32c8bc295..8fb2360ea2ca 100644--- a/sc/source/filter/lotus/makefile.mk+++ b/sc/source/filter/lotus/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.4 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxxindex 7c5577e26f24..1ac1fa5c470f 100644--- a/sc/source/filter/lotus/memory.cxx+++ b/sc/source/filter/lotus/memory.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: memory.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxxindex 8759d21297f3..0306bdc6315b 100644--- a/sc/source/filter/lotus/op.cxx+++ b/sc/source/filter/lotus/op.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: op.cxx,v $- * $Revision: 1.18.126.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -48,9 +45,9 @@ #include "patattr.hxx" #include "docpool.hxx" #include <svx/algitem.hxx>-#include <svx/postitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx> #include "cell.hxx" #include "rangenam.hxx"diff --git a/sc/source/filter/lotus/optab.cxx b/sc/source/filter/lotus/optab.cxxindex 2d9090d87607..503d271a5b74 100644--- a/sc/source/filter/lotus/optab.cxx+++ b/sc/source/filter/lotus/optab.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optab.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxxindex a0c9a25d58d9..0e99b1140c2a 100644--- a/sc/source/filter/lotus/tool.cxx+++ b/sc/source/filter/lotus/tool.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tool.cxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/qpro/biff.cxx b/sc/source/filter/qpro/biff.cxxindex 0d0beaa5ddb1..1d490358d315 100644--- a/sc/source/filter/qpro/biff.cxx+++ b/sc/source/filter/qpro/biff.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: biff.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/qpro/makefile.mk b/sc/source/filter/qpro/makefile.mkindex f3ea4c7232cd..fa8b018f23b7 100644--- a/sc/source/filter/qpro/makefile.mk+++ b/sc/source/filter/qpro/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.4 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxxindex 5ea9efae2b3e..084aab135f70 100644--- a/sc/source/filter/qpro/qpro.cxx+++ b/sc/source/filter/qpro/qpro.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: qpro.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxxindex 9d30ae1f8adb..9cb4a2d7b245 100644--- a/sc/source/filter/qpro/qproform.cxx+++ b/sc/source/filter/qpro/qproform.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: qproform.cxx,v $- * $Revision: 1.9.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/qpro/qprostyle.cxx b/sc/source/filter/qpro/qprostyle.cxxindex 2496347e8479..6213cbb4ebf2 100644--- a/sc/source/filter/qpro/qprostyle.cxx+++ b/sc/source/filter/qpro/qprostyle.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: qprostyle.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -43,12 +40,12 @@ #include <tools/color.hxx> #include <scitems.hxx> #include <svx/algitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>-#include <svx/postitem.hxx>-#include <svx/crsditem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/fontitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/fontitem.hxx> #include <map> #include "global.hxx"diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxxindex c3650e882973..756b384b7f11 100644--- a/sc/source/filter/rtf/eeimpars.cxx+++ b/sc/source/filter/rtf/eeimpars.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: eeimpars.cxx,v $- * $Revision: 1.19 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,18 +33,18 @@ //------------------------------------------------------------------------ #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/adjitem.hxx>-#include <svx/editobj.hxx>-#include <svx/editview.hxx>-#include <svx/escpitem.hxx>-#include <svx/langitem.hxx>+#include <editeng/adjitem.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editview.hxx>+#include <editeng/escpitem.hxx>+#include <editeng/langitem.hxx> #include <svx/svdograf.hxx> #include <svx/svdpage.hxx>-#include <svx/scripttypeitem.hxx>-#include <svx/htmlcfg.hxx>+#include <editeng/scripttypeitem.hxx>+#include <svtools/htmlcfg.hxx> #include <sfx2/sfxhtml.hxx> #include <svtools/parhtml.hxx> #include <svl/zforlist.hxx>diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxxindex 7b83bc19eb61..3188b4f920e7 100644--- a/sc/source/filter/rtf/expbase.cxx+++ b/sc/source/filter/rtf/expbase.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: expbase.cxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/rtf/makefile.mk b/sc/source/filter/rtf/makefile.mkindex 5240252abe85..a680751de620 100644--- a/sc/source/filter/rtf/makefile.mk+++ b/sc/source/filter/rtf/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.4 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxxindex 88611ca72283..c817fc2844eb 100644--- a/sc/source/filter/rtf/rtfexp.cxx+++ b/sc/source/filter/rtf/rtfexp.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rtfexp.cxx,v $- * $Revision: 1.10.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,15 +31,15 @@ #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/algitem.hxx>-#include <svx/wghtitem.hxx>-#include <svx/postitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/fontitem.hxx>-#include <svx/fhgtitem.hxx>+#include <editeng/wghtitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/fhgtitem.hxx> #include <svl/style.hxx> #include <svtools/rtfout.hxx> #include <svtools/rtfkeywd.hxx>diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxxindex 742954d4a519..83b48b1fa2b1 100644--- a/sc/source/filter/rtf/rtfimp.cxx+++ b/sc/source/filter/rtf/rtfimp.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rtfimp.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxxindex 8af3659da66d..b3373bbf4596 100644--- a/sc/source/filter/rtf/rtfparse.cxx+++ b/sc/source/filter/rtf/rtfparse.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rtfparse.cxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,12 +33,12 @@ //------------------------------------------------------------------------ #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/editeng.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/svxrtf.hxx>+#include <editeng/editeng.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/svxrtf.hxx> #include <vcl/outdev.hxx> #include <svtools/rtftoken.h> diff --git a/sc/source/filter/starcalc/makefile.mk b/sc/source/filter/starcalc/makefile.mkindex 529d3772562a..836f6b0d3621 100644--- a/sc/source/filter/starcalc/makefile.mk+++ b/sc/source/filter/starcalc/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.4 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxxindex b54e3bb97fab..104d0d7fe192 100644--- a/sc/source/filter/starcalc/scflt.cxx+++ b/sc/source/filter/starcalc/scflt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scflt.cxx,v $- * $Revision: 1.25.124.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,25 +33,25 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/colritem.hxx>-#include <svx/crsditem.hxx>-#include <svx/editdata.hxx>-#include <svx/editeng.hxx>-#include <svx/editobj.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/fontitem.hxx>-#include <svx/lrspitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/editdata.hxx>+#include <editeng/editeng.hxx>+#include <editeng/editobj.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/lrspitem.hxx> #include <svx/pageitem.hxx>-#include <svx/postitem.hxx>-#include <svx/sizeitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/ulspitem.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/sizeitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/ulspitem.hxx>+#include <editeng/wghtitem.hxx> #include <svl/zforlist.hxx> #include <svl/PasswordHelper.hxx> #include <stdio.h>diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxxindex d15cb3c5a227..c0f575313459 100644--- a/sc/source/filter/starcalc/scfobj.cxx+++ b/sc/source/filter/starcalc/scfobj.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scfobj.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxxindex a38b023d4f55..42cb37250c5c 100644--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XclExpChangeTrack.cxx,v $- * $Revision: 1.26 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxxindex 1a8480a5e758..96a301e1bef5 100644--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XclImpChangeTrack.cxx,v $- * $Revision: 1.34.48.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xcl97/makefile.mk b/sc/source/filter/xcl97/makefile.mkindex 58e2b8cb3074..3ce71ba142df 100644--- a/sc/source/filter/xcl97/makefile.mk+++ b/sc/source/filter/xcl97/makefile.mk@@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.-#-# Copyright 2008 by Sun Microsystems, Inc.+# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.16.88.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xcl97/xcl97dum.cxx b/sc/source/filter/xcl97/xcl97dum.cxxindex d189d6ae69de..1550fa97ed40 100644--- a/sc/source/filter/xcl97/xcl97dum.cxx+++ b/sc/source/filter/xcl97/xcl97dum.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xcl97dum.cxx,v $- * $Revision: 1.21 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxxindex db8b085f7629..2c5a30f085d3 100644--- a/sc/source/filter/xcl97/xcl97esc.cxx+++ b/sc/source/filter/xcl97/xcl97esc.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xcl97esc.cxx,v $- * $Revision: 1.26.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -38,7 +35,7 @@ #include <com/sun/star/script/XEventAttacherManager.hpp> #include <svx/svdpage.hxx>-#include <svx/outlobj.hxx>+#include <editeng/outlobj.hxx> #include <svx/svdotext.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx>diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxxindex 45c64cca1e4f..e4c4443ea56e 100644--- a/sc/source/filter/xcl97/xcl97rec.cxx+++ b/sc/source/filter/xcl97/xcl97rec.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xcl97rec.cxx,v $- * $Revision: 1.87.30.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,14 +31,14 @@ #include <svx/svdpool.hxx> #include <svx/sdtaitm.hxx> #include <svx/svdotext.hxx>-#include <svx/editobj.hxx>+#include <editeng/editobj.hxx> #include <svx/svdoole2.hxx> #include <sot/storage.hxx> #include <svl/itemset.hxx> #include <svx/svdpage.hxx> #include <svx/svdocapt.hxx> #include <svx/unoapi.hxx>-#include <svx/writingmodeitem.hxx>+#include <editeng/writingmodeitem.hxx> #include <vcl/svapp.hxx> #include <rtl/math.hxx> #include <svl/zformat.hxx>@@ -58,11 +55,11 @@ #include "scitems.hxx" #include <unotools/fltrcfg.hxx>-#include <svx/brshitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/adjitem.hxx>-#include <svx/eeitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/adjitem.hxx>+#include <editeng/eeitem.hxx> #include <filter/msfilter/msoleexp.hxx> #include <unotools/localedatawrapper.hxx>@@ -1459,6 +1456,19 @@ void XclExpInterfaceHdr::WriteBody( XclExpStream& rStrm ) // ============================================================================ +XclExpInterfaceEnd::XclExpInterfaceEnd() :+ XclExpRecord(0x00E2, 0) {}++XclExpInterfaceEnd::~XclExpInterfaceEnd() {}++void XclExpInterfaceEnd::WriteBody( XclExpStream& rStrm )+{+ // Don't forget to re-enable encryption.+ rStrm.EnableEncryption();+}++// ============================================================================+ XclExpWriteAccess::XclExpWriteAccess() : XclExpRecord(0x005C, 112) {diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxxindex 303dc837b157..b124e77ac745 100644--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLCalculationSettingsContext.cxx,v $- * $Revision: 1.16 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxxindex 3c2b1eeee8db..8fe5a7f1db1c 100644--- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLCalculationSettingsContext.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxxindex f2564e738549..9826e8385075 100644--- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLCellRangeSourceContext.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxxindex 5b5c3e38ecd8..fde1b5534134 100644--- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLCellRangeSourceContext.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxxindex da3c6c29bc30..5cd97e0714a9 100644--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLChangeTrackingExportHelper.cxx,v $- * $Revision: 1.33.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxxindex e7775eb58a4f..f07f0ed905a0 100644--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLChangeTrackingExportHelper.hxx,v $- * $Revision: 1.17.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxxindex 33a77df4f4dd..d928444dd8ce 100644--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLChangeTrackingImportHelper.cxx,v $- * $Revision: 1.30.52.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxxindex c675a9f7df59..9857683b13ac 100644--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLChangeTrackingImportHelper.hxx,v $- * $Revision: 1.18.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx b/sc/source/filter/xml/XMLColumnRowGroupExport.cxxindex a88071b04d23..4c2929de02e3 100644--- a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLColumnRowGroupExport.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx b/sc/source/filter/xml/XMLColumnRowGroupExport.hxxindex c992486f738b..51a93445ccfb 100644--- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLColumnRowGroupExport.hxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxxindex 5e3bf2280a96..0ca5fc360533 100644--- a/sc/source/filter/xml/XMLConsolidationContext.cxx+++ b/sc/source/filter/xml/XMLConsolidationContext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLConsolidationContext.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxxindex 86b90ece5d68..52061c715ae7 100644--- a/sc/source/filter/xml/XMLConsolidationContext.hxx+++ b/sc/source/filter/xml/XMLConsolidationContext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLConsolidationContext.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxxindex 84fdba343630..4de6246f4f28 100644--- a/sc/source/filter/xml/XMLConverter.cxx+++ b/sc/source/filter/xml/XMLConverter.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLConverter.cxx,v $- * $Revision: 1.29.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxxindex 090a3553aa91..94766ebe08ff 100644--- a/sc/source/filter/xml/XMLConverter.hxx+++ b/sc/source/filter/xml/XMLConverter.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLConverter.hxx,v $- * $Revision: 1.15.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxxindex ce77178500bb..d7fafe1d9423 100644--- a/sc/source/filter/xml/XMLDDELinksContext.cxx+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLDDELinksContext.cxx,v $- * $Revision: 1.18.134.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxxindex 3337b0fc521b..e9c1db58548f 100644--- a/sc/source/filter/xml/XMLDDELinksContext.hxx+++ b/sc/source/filter/xml/XMLDDELinksContext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLDDELinksContext.hxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxxindex c77ecf72309f..c127ca518266 100644--- a/sc/source/filter/xml/XMLDetectiveContext.cxx+++ b/sc/source/filter/xml/XMLDetectiveContext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLDetectiveContext.cxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxxindex 3dc7deae095a..30a8bc600bb0 100644--- a/sc/source/filter/xml/XMLDetectiveContext.hxx+++ b/sc/source/filter/xml/XMLDetectiveContext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLDetectiveContext.hxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxxindex 0560130aa00a..dbba2732ecee 100644--- a/sc/source/filter/xml/XMLEmptyContext.cxx+++ b/sc/source/filter/xml/XMLEmptyContext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLEmptyContext.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxxindex 071a8525102a..ab8b69ad8403 100644--- a/sc/source/filter/xml/XMLEmptyContext.hxx+++ b/sc/source/filter/xml/XMLEmptyContext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLEmptyContext.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxxindex ceb2391c0f94..a29394bf850b 100644--- a/sc/source/filter/xml/XMLExportDDELinks.cxx+++ b/sc/source/filter/xml/XMLExportDDELinks.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLExportDDELinks.cxx,v $- * $Revision: 1.18.148.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxxindex 94d8896ce81e..245a95934449 100644--- a/sc/source/filter/xml/XMLExportDDELinks.hxx+++ b/sc/source/filter/xml/XMLExportDDELinks.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLExportDDELinks.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxxindex 97926ee7113f..a37617e0b8b9 100644--- a/sc/source/filter/xml/XMLExportDataPilot.cxx+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLExportDataPilot.cxx,v $- * $Revision: 1.28 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxxindex 8bf884ab2fd6..600d96aa1d73 100644--- a/sc/source/filter/xml/XMLExportDataPilot.hxx+++ b/sc/source/filter/xml/XMLExportDataPilot.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLExportDataPilot.hxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -44,6 +41,7 @@ class ScDPDimensionSaveData; class ScDPSaveGroupDimension; class ScDPSaveNumGroupDimension; struct ScDPNumGroupInfo;+struct ScQueryParam; class ScXMLExportDataPilot {diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxxindex 6a182dcdc737..3c7ee76c41e8 100644--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLExportDatabaseRanges.cxx,v $- * $Revision: 1.24 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx b/sc/source/filter/xml/XMLExportDatabaseRanges.hxxindex 81d1399e16b3..a581eb1271f1 100644--- a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLExportDatabaseRanges.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxxindex c0b50a06b45a..154fdebed95e 100644--- a/sc/source/filter/xml/XMLExportIterator.cxx+++ b/sc/source/filter/xml/XMLExportIterator.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLExportIterator.cxx,v $- * $Revision: 1.46 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxxindex 92c61ca060e9..dfd3a4d59ac1 100644--- a/sc/source/filter/xml/XMLExportIterator.hxx+++ b/sc/source/filter/xml/XMLExportIterator.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLExportIterator.hxx,v $- * $Revision: 1.34 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxxindex 1a4b3f8277ae..eede3aa73499 100644--- a/sc/source/filter/xml/XMLExportSharedData.cxx+++ b/sc/source/filter/xml/XMLExportSharedData.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLExportSharedData.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxxindex ff75cae497a0..e808101805fd 100644--- a/sc/source/filter/xml/XMLExportSharedData.hxx+++ b/sc/source/filter/xml/XMLExportSharedData.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLExportSharedData.hxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxxindex 98100f4b3646..f8bafa32f205 100644--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLStylesExportHelper.cxx,v $- * $Revision: 1.52 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxxindex a9e42afcd585..34672aeef96e 100644--- a/sc/source/filter/xml/XMLStylesExportHelper.hxx+++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLStylesExportHelper.hxx,v $- * $Revision: 1.30 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxxindex b28d11ac6d6f..492c7a63ee30 100644--- a/sc/source/filter/xml/XMLStylesImportHelper.cxx+++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLStylesImportHelper.cxx,v $- * $Revision: 1.22.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxxindex 17f23f9dbfd1..3a15dbeff52a 100644--- a/sc/source/filter/xml/XMLStylesImportHelper.hxx+++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLStylesImportHelper.hxx,v $- * $Revision: 1.10.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxxindex 0f3abae9f453..fb0b1235007e 100644--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTableHeaderFooterContext.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxxindex 06226bbfb810..a3ce9c4c970d 100644--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTableHeaderFooterContext.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxxindex 069d8e237432..91f27ab646a7 100644--- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx+++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTableMasterPageExport.cxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxxindex b992f248cbb1..0a277bec0bb9 100644--- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx+++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTableMasterPageExport.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxxindex f498faf93e5b..cc425e0f4d65 100644--- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTableShapeImportHelper.cxx,v $- * $Revision: 1.29.134.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxxindex 06d49dc4beed..94a64312c8ed 100644--- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTableShapeImportHelper.hxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxxindex ca6d23a6459a..415057c219f2 100644--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTableShapeResizer.cxx,v $- * $Revision: 1.31 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTableShapeResizer.hxx b/sc/source/filter/xml/XMLTableShapeResizer.hxxindex 543577089af2..9ece92995101 100644--- a/sc/source/filter/xml/XMLTableShapeResizer.hxx+++ b/sc/source/filter/xml/XMLTableShapeResizer.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTableShapeResizer.hxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxxindex 379e026b1785..d841e1c4c748 100644--- a/sc/source/filter/xml/XMLTableShapesContext.cxx+++ b/sc/source/filter/xml/XMLTableShapesContext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTableShapesContext.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxxindex 33a76354f117..f12cb56d30da 100644--- a/sc/source/filter/xml/XMLTableShapesContext.hxx+++ b/sc/source/filter/xml/XMLTableShapesContext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTableShapesContext.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxxindex 1b496b1ba934..00f5c9184a53 100644--- a/sc/source/filter/xml/XMLTableSourceContext.cxx+++ b/sc/source/filter/xml/XMLTableSourceContext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTableSourceContext.cxx,v $- * $Revision: 1.16 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxxindex 653ad8938cd9..2d72a4a3364c 100644--- a/sc/source/filter/xml/XMLTableSourceContext.hxx+++ b/sc/source/filter/xml/XMLTableSourceContext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTableSourceContext.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTextPContext.cxx b/sc/source/filter/xml/XMLTextPContext.cxxindex 21e59d2636e5..d6d02567b9bd 100644--- a/sc/source/filter/xml/XMLTextPContext.cxx+++ b/sc/source/filter/xml/XMLTextPContext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTextPContext.cxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTextPContext.hxx b/sc/source/filter/xml/XMLTextPContext.hxxindex b2e16217c0a5..a920e13f84a3 100644--- a/sc/source/filter/xml/XMLTextPContext.hxx+++ b/sc/source/filter/xml/XMLTextPContext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTextPContext.hxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxxindex 74b0518a6c62..cf415142213a 100644--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTrackedChangesContext.cxx,v $- * $Revision: 1.32 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxxindex 925489f21f94..ec66fe7f22e7 100644--- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx+++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: XMLTrackedChangesContext.hxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/makefile.mk b/sc/source/filter/xml/makefile.mkindex c1e7e215e199..360148d38244 100644--- a/sc/source/filter/xml/makefile.mk+++ b/sc/source/filter/xml/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.33.134.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxxindex a8b96eb6d768..66b1c2579dd4 100644--- a/sc/source/filter/xml/sheetdata.cxx+++ b/sc/source/filter/xml/sheetdata.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sheetdata.cxx,v $- * $Revision: 1.69.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxxindex 294a335033c1..14fc34954564 100644--- a/sc/source/filter/xml/xmlannoi.cxx+++ b/sc/source/filter/xml/xmlannoi.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlannoi.cxx,v $- * $Revision: 1.16 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxxindex 41b206bd4380..ad2eed21b23a 100644--- a/sc/source/filter/xml/xmlannoi.hxx+++ b/sc/source/filter/xml/xmlannoi.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlannoi.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,7 +31,7 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <rtl/ustrbuf.hxx>-#include <svx/editdata.hxx>+#include <editeng/editdata.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XShapes.hpp> diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxxindex a301ddbf27e6..00c87cd661d7 100644--- a/sc/source/filter/xml/xmlbodyi.cxx+++ b/sc/source/filter/xml/xmlbodyi.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlbodyi.cxx,v $- * $Revision: 1.32 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxxindex 2c489418bfff..e61e413ff79b 100644--- a/sc/source/filter/xml/xmlbodyi.hxx+++ b/sc/source/filter/xml/xmlbodyi.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlbodyi.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxxindex 2f3f847c6c58..8e78f64b2090 100644--- a/sc/source/filter/xml/xmlcelli.cxx+++ b/sc/source/filter/xml/xmlcelli.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlcelli.cxx,v $- * $Revision: 1.96.128.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -51,7 +48,7 @@ #include "XMLStylesImportHelper.hxx" #include "arealink.hxx"-#include <svx/linkmgr.hxx>+#include <sfx2/linkmgr.hxx> #include "convuno.hxx" #include "XMLConverter.hxx" #include "scerrors.hxx"@@ -67,8 +64,8 @@ #include <xmloff/xmlnmspe.hxx> #include <svl/zforlist.hxx> #include <svx/svdocapt.hxx>-#include <svx/outlobj.hxx>-#include <svx/editobj.hxx>+#include <editeng/outlobj.hxx>+#include <editeng/editobj.hxx> #include <svx/unoapi.hxx> #include <svl/languageoptions.hxx> @@ -739,7 +736,7 @@ void ScXMLTableRowCellContext::SetCellRangeSource( const table::CellAddress& rPo String sSourceStr( pCellRangeSource->sSourceStr ); ScAreaLink* pLink = new ScAreaLink( pDoc->GetDocumentShell(), pCellRangeSource->sURL, sFilterName, pCellRangeSource->sFilterOptions, sSourceStr, aDestRange, pCellRangeSource->nRefresh );- SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, pCellRangeSource->sURL, &sFilterName, &sSourceStr ); } }diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxxindex fe2bfd116348..6a63e785f959 100644--- a/sc/source/filter/xml/xmlcelli.hxx+++ b/sc/source/filter/xml/xmlcelli.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlcelli.hxx,v $- * $Revision: 1.26.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxxindex 73c06f23a7bf..6ea5b0192ab2 100644--- a/sc/source/filter/xml/xmlcoli.cxx+++ b/sc/source/filter/xml/xmlcoli.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlcoli.cxx,v $- * $Revision: 1.23 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxxindex fbb36baf5d97..2edb496b4b28 100644--- a/sc/source/filter/xml/xmlcoli.hxx+++ b/sc/source/filter/xml/xmlcoli.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlcoli.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxxindex da4191a470fc..3a0f5ef3126e 100644--- a/sc/source/filter/xml/xmlconti.cxx+++ b/sc/source/filter/xml/xmlconti.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlconti.cxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxxindex cca4cf0dcab8..83151a934d48 100644--- a/sc/source/filter/xml/xmlconti.hxx+++ b/sc/source/filter/xml/xmlconti.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlconti.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxxindex aeff28f3eed6..451b085afe9e 100644--- a/sc/source/filter/xml/xmlcvali.cxx+++ b/sc/source/filter/xml/xmlcvali.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlcvali.cxx,v $- * $Revision: 1.27 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxxindex b8502375abdb..226d2e2d91b5 100644--- a/sc/source/filter/xml/xmlcvali.hxx+++ b/sc/source/filter/xml/xmlcvali.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlcvali.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxxindex 08e8633978b1..580dd2ee0791 100644--- a/sc/source/filter/xml/xmldpimp.cxx+++ b/sc/source/filter/xml/xmldpimp.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmldpimp.cxx,v $- * $Revision: 1.27.134.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxxindex 50dc7e6d9c0d..32300138bc3b 100644--- a/sc/source/filter/xml/xmldpimp.hxx+++ b/sc/source/filter/xml/xmldpimp.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmldpimp.hxx,v $- * $Revision: 1.19 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,6 +37,7 @@ #include "global.hxx" #include "dpobject.hxx" #include "dpsave.hxx"+#include "queryparam.hxx" #include <hash_set> diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxxindex 55a1859211d0..c5731dfc28fb 100644--- a/sc/source/filter/xml/xmldrani.cxx+++ b/sc/source/filter/xml/xmldrani.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmldrani.cxx,v $- * $Revision: 1.31 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxxindex be55e5b143cc..e170c9eb84c0 100644--- a/sc/source/filter/xml/xmldrani.hxx+++ b/sc/source/filter/xml/xmldrani.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmldrani.hxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxxindex c2fd53acb736..d53f26a5e887 100644--- a/sc/source/filter/xml/xmlexprt.cxx+++ b/sc/source/filter/xml/xmlexprt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlexprt.cxx,v $- * $Revision: 1.213.94.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,7 +30,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include "xmlexprt.hxx" #include "XMLConverter.hxx"@@ -91,11 +88,11 @@ #include <svl/zforlist.hxx> #include <svx/unoshape.hxx> #include <comphelper/extract.hxx>-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <toolkit/helper/convert.hxx> #include <svx/svdobj.hxx> #include <svx/svdocapt.hxx>-#include <svx/outlobj.hxx>+#include <editeng/outlobj.hxx> #include <svx/svditer.hxx> #include <svx/svdpage.hxx> diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxxindex b71886c1871e..e024fc6a0de0 100644--- a/sc/source/filter/xml/xmlexprt.hxx+++ b/sc/source/filter/xml/xmlexprt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlexprt.hxx,v $- * $Revision: 1.84.52.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxxindex b53431843a57..ce1f58f5d912 100644--- a/sc/source/filter/xml/xmlexternaltabi.cxx+++ b/sc/source/filter/xml/xmlexternaltabi.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlexternaltabi.cxx,v $- * $Revision: 1.1.2.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxxindex 567df13f1643..0007a8b29702 100644--- a/sc/source/filter/xml/xmlexternaltabi.hxx+++ b/sc/source/filter/xml/xmlexternaltabi.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlexternaltabi.hxx,v $- * $Revision: 1.1.2.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxxindex 87bdc748906c..55670d97637d 100644--- a/sc/source/filter/xml/xmlfilti.cxx+++ b/sc/source/filter/xml/xmlfilti.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlfilti.cxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxxindex b2b45175c138..df222eeb23c2 100644--- a/sc/source/filter/xml/xmlfilti.hxx+++ b/sc/source/filter/xml/xmlfilti.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlfilti.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxxindex 6209387448ed..5cbb2604581f 100644--- a/sc/source/filter/xml/xmlfonte.cxx+++ b/sc/source/filter/xml/xmlfonte.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlfonte.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,13 +34,13 @@ #include "scitems.hxx" -#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <xmloff/XMLFontAutoStylePool.hxx>-#include <svx/fontitem.hxx>-#include <svx/eeitem.hxx>-#include <svx/editeng.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/editeng.hxx> #include "document.hxx" #include "docpool.hxx" #include "xmlexprt.hxx"diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxxindex f2fe367a2c64..d1ef48bfa9ed 100644--- a/sc/source/filter/xml/xmlimprt.cxx+++ b/sc/source/filter/xml/xmlimprt.cxx@@ -1,31 +1,28 @@ /************************************************************************* *-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.-*-* Copyright 2008 by Sun Microsystems, Inc.-*-* OpenOffice.org - a multi-platform office productivity suite-*-* $RCSfile: xmlimprt.cxx,v $-* $Revision: 1.132.30.4 $-*-* This file is part of OpenOffice.org.-*-* OpenOffice.org is free software: you can redistribute it and/or modify-* it under the terms of the GNU Lesser General Public License version 3-* only, as published by the Free Software Foundation.-*-* OpenOffice.org is distributed in the hope that it will be useful,-* but WITHOUT ANY WARRANTY; without even the implied warranty of-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-* GNU Lesser General Public License version 3 for more details-* (a copy is included in the LICENSE file that accompanied this code).-*-* You should have received a copy of the GNU Lesser General Public License-* version 3 along with OpenOffice.org. If not, see-* <http://www.openoffice.org/license.html>-* for a copy of the LGPLv3 License.-*+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.+ *+ * Copyright 2000, 2010 Oracle and/or its affiliates.+ *+ * OpenOffice.org - a multi-platform office productivity suite+ *+ * This file is part of OpenOffice.org.+ *+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation.+ *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code).+ *+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License.+ * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not removediff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxxindex c110c70f72e2..e2cea5ae9609 100644--- a/sc/source/filter/xml/xmlimprt.hxx+++ b/sc/source/filter/xml/xmlimprt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlimprt.hxx,v $- * $Revision: 1.97.52.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxxindex adc3093b9c88..70ec803cc46f 100644--- a/sc/source/filter/xml/xmllabri.cxx+++ b/sc/source/filter/xml/xmllabri.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmllabri.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxxindex b7a0a52eefdb..c3cbd6532c90 100644--- a/sc/source/filter/xml/xmllabri.hxx+++ b/sc/source/filter/xml/xmllabri.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmllabri.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxxindex 9a2a49f0b021..3ef17c321f23 100644--- a/sc/source/filter/xml/xmlnexpi.cxx+++ b/sc/source/filter/xml/xmlnexpi.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlnexpi.cxx,v $- * $Revision: 1.18 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxxindex cb74294bbcff..94d0b2738d52 100644--- a/sc/source/filter/xml/xmlnexpi.hxx+++ b/sc/source/filter/xml/xmlnexpi.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlnexpi.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxxindex f62208cdd2ff..341445431cc8 100644--- a/sc/source/filter/xml/xmlrowi.cxx+++ b/sc/source/filter/xml/xmlrowi.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlrowi.cxx,v $- * $Revision: 1.29 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxxindex a0b83e7d8fda..558555b233e3 100644--- a/sc/source/filter/xml/xmlrowi.hxx+++ b/sc/source/filter/xml/xmlrowi.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlrowi.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxxindex e1ce4af9b47c..652dd0a1dd43 100644--- a/sc/source/filter/xml/xmlsceni.cxx+++ b/sc/source/filter/xml/xmlsceni.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlsceni.cxx,v $- * $Revision: 1.15.134.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxxindex ffffa031bd89..f3a5a75fa563 100644--- a/sc/source/filter/xml/xmlsceni.hxx+++ b/sc/source/filter/xml/xmlsceni.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlsceni.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxxindex 535108a094f4..ff007240b12b 100644--- a/sc/source/filter/xml/xmlsorti.cxx+++ b/sc/source/filter/xml/xmlsorti.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlsorti.cxx,v $- * $Revision: 1.18 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxxindex d68d9ea47df1..30ac31e0dd22 100644--- a/sc/source/filter/xml/xmlsorti.hxx+++ b/sc/source/filter/xml/xmlsorti.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlsorti.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxxindex 365d57a53571..f9f0d063a843 100644--- a/sc/source/filter/xml/xmlstyle.cxx+++ b/sc/source/filter/xml/xmlstyle.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlstyle.cxx,v $- * $Revision: 1.70.62.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxxindex da1dc8ab4849..07e7138afc71 100644--- a/sc/source/filter/xml/xmlstyle.hxx+++ b/sc/source/filter/xml/xmlstyle.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlstyle.hxx,v $- * $Revision: 1.32.62.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxxindex 20158d1f13db..9a04e284bf45 100644--- a/sc/source/filter/xml/xmlstyli.cxx+++ b/sc/source/filter/xml/xmlstyli.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlstyli.cxx,v $- * $Revision: 1.63 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxxindex c80ea8b5c92d..b2a8589f5524 100644--- a/sc/source/filter/xml/xmlstyli.hxx+++ b/sc/source/filter/xml/xmlstyli.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlstyli.hxx,v $- * $Revision: 1.29 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxxindex 0f980c4a9608..89077eb4bee9 100644--- a/sc/source/filter/xml/xmlsubti.cxx+++ b/sc/source/filter/xml/xmlsubti.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlsubti.cxx,v $- * $Revision: 1.50.30.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxxindex c5a16e2c3ef4..6e39844b5b8f 100644--- a/sc/source/filter/xml/xmlsubti.hxx+++ b/sc/source/filter/xml/xmlsubti.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlsubti.hxx,v $- * $Revision: 1.32.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxxindex 8ea9701ecd32..9afc08308feb 100644--- a/sc/source/filter/xml/xmltabi.cxx+++ b/sc/source/filter/xml/xmltabi.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmltabi.cxx,v $- * $Revision: 1.40.134.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxxindex 1a4438b28955..c066b8bf3a9e 100644--- a/sc/source/filter/xml/xmltabi.hxx+++ b/sc/source/filter/xml/xmltabi.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmltabi.hxx,v $- * $Revision: 1.11.134.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxxindex e5a9f4b251a8..fde7f00bb05a 100644--- a/sc/source/filter/xml/xmlwrap.cxx+++ b/sc/source/filter/xml/xmlwrap.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: xmlwrap.cxx,v $- * $Revision: 1.69.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessibilityHints.cxx b/sc/source/ui/Accessibility/AccessibilityHints.cxxindex c14953abe95d..6c276b806e88 100644--- a/sc/source/ui/Accessibility/AccessibilityHints.cxx+++ b/sc/source/ui/Accessibility/AccessibilityHints.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibilityHints.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxxindex 4dbc47524276..434ea2dea40c 100644--- a/sc/source/ui/Accessibility/AccessibleCell.cxx+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleCell.cxx,v $- * $Revision: 1.34 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,7 +31,7 @@ #include "AccessibleCell.hxx" #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include "AccessibleText.hxx"@@ -61,7 +58,7 @@ #include <com/sun/star/accessibility/XAccessibleTable.hpp> #include <rtl/uuid.h> #include <tools/debug.hxx>-#include <svx/brshitem.hxx>+#include <editeng/brshitem.hxx> #include <comphelper/sequence.hxx> #include <float.h> diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxxindex 19cbc028bee0..92ff551f2724 100644--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleCellBase.cxx,v $- * $Revision: 1.22 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -55,7 +52,7 @@ #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> #include <tools/debug.hxx>-#include <svx/brshitem.hxx>+#include <editeng/brshitem.hxx> #include <rtl/uuid.h> #include <comphelper/sequence.hxx> #include <sfx2/objsh.hxx>diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxxindex c6c08e8a9c65..e438224ecfb6 100644--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleContextBase.cxx,v $- * $Revision: 1.33.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxxindex 8d141f0fe753..e99bd1971e4c 100644--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleCsvControl.cxx,v $- * $Revision: 1.22.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -53,9 +50,9 @@ #endif #include <comphelper/sequence.hxx> #include "scitems.hxx"-#include <svx/fontitem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/langitem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/langitem.hxx> #include "csvcontrol.hxx" #include "csvruler.hxx" #include "csvgrid.hxx"diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxxindex 076f6e15870f..1848c7bfefc0 100644--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDataPilotControl.cxx,v $- * $Revision: 1.15 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxxindex 2e6d9a256d75..1c1126e07640 100644--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDocument.cxx,v $- * $Revision: 1.76.40.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxxindex 9200bc701c7f..76be8e67aa07 100644--- a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx+++ b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDocumentBase.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxxindex 9801c9eeb972..894e57d3802e 100644--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDocumentPagePreview.cxx,v $- * $Revision: 1.38.128.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxxindex 6228fd8a041b..fd7cbaf454c1 100644--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleEditObject.cxx,v $- * $Revision: 1.18 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,7 +29,7 @@ #include "precompiled_sc.hxx" #include "AccessibleEditObject.hxx" #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include "unoguard.hxx" #include "AccessibleText.hxx" #include "editsrc.hxx"@@ -51,8 +48,8 @@ #include <rtl/uuid.h> #include <tools/debug.hxx> #include <svx/AccessibleTextHelper.hxx>-#include <svx/editview.hxx>-#include <svx/editeng.hxx>+#include <editeng/editview.hxx>+#include <editeng/editeng.hxx> #include <svx/svdmodel.hxx> using namespace ::com::sun::star;diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxxindex 0c663af87fd1..02fb5c12463e 100644--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDataPilotControl.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,9 +37,9 @@ #include "docpool.hxx" #include "tools/gen.hxx"-#include "svx/unoedsrc.hxx"-#include "svx/editdata.hxx"-#include "svx/outliner.hxx"+#include "editeng/unoedsrc.hxx"+#include "editeng/editdata.hxx"+#include "editeng/outliner.hxx" #include "vcl/unohelp.hxx" #include "dpcontrol.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxxindex 9f5524dcb8ce..0da1e6858a75 100644--- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx+++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDataPilotControl.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxxindex 832cb37dd096..f536b8b9a8f7 100644--- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx+++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDataPilotControl.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessibleGlobal.cxx b/sc/source/ui/Accessibility/AccessibleGlobal.cxxindex 6ac7190a132b..ac2562fa9bd5 100644--- a/sc/source/ui/Accessibility/AccessibleGlobal.cxx+++ b/sc/source/ui/Accessibility/AccessibleGlobal.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDataPilotControl.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxxindex 960e58760512..6c28d22b0236 100644--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessiblePageHeader.cxx,v $- * $Revision: 1.22 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -56,7 +53,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <svl/style.hxx> #include <svl/itempool.hxx>-#include <svx/editobj.hxx>+#include <editeng/editobj.hxx> #include <toolkit/helper/convert.hxx> #include <algorithm>diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxxindex 0cb20b22ffb8..10c6a9eff13f 100644--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessiblePageHeaderArea.cxx,v $- * $Revision: 1.19 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -50,7 +47,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #endif #include <com/sun/star/accessibility/AccessibleEventId.hpp>-#include <svx/editobj.hxx>+#include <editeng/editobj.hxx> #include <svx/AccessibleTextHelper.hxx> #include <rtl/uuid.h> #include <unotools/accessiblestatesethelper.hxx>diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxxindex 692472fe635a..c07eb0844b7f 100644--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessiblePreviewCell.cxx,v $- * $Revision: 1.21.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -31,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <tools/gen.hxx> #include "AccessibleText.hxx" #include "editsrc.hxx"@@ -43,7 +40,7 @@ #include "document.hxx" #include <svx/AccessibleTextHelper.hxx> #include <unotools/accessiblestatesethelper.hxx>-#include <svx/brshitem.hxx>+#include <editeng/brshitem.hxx> #include <vcl/window.hxx> #include <toolkit/helper/convert.hxx> diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxxindex fabd1fc932cc..3bb66ae01d4f 100644--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessiblePreviewHeaderCell.cxx,v $- * $Revision: 1.26 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -31,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <tools/gen.hxx> #include "AccessibleText.hxx" #include "editsrc.hxx"diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxxindex 0746495ca099..e3fe26f47b4d 100644--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessiblePreviewTable.cxx,v $- * $Revision: 1.28 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxxindex e9420dd89a58..f85fb22531aa 100644--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleSpreadsheet.cxx,v $- * $Revision: 1.51 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxxindex abace2a08ff8..2d46d3eb776b 100644--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleTableBase.cxx,v $- * $Revision: 1.34 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxxindex fd01269729db..4073e23f837f 100644--- a/sc/source/ui/Accessibility/AccessibleText.cxx+++ b/sc/source/ui/Accessibility/AccessibleText.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleText.cxx,v $- * $Revision: 1.42.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,7 +29,7 @@ #include "precompiled_sc.hxx" #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <memory>@@ -48,12 +45,12 @@ #include "unoguard.hxx" #include "patattr.hxx" #include "inputwin.hxx"-#include <svx/unofored.hxx>-#include <svx/editview.hxx>-#include <svx/unoedhlp.hxx>+#include <editeng/unofored.hxx>+#include <editeng/editview.hxx>+#include <editeng/unoedhlp.hxx> #include <vcl/virdev.hxx>-#include <svx/editobj.hxx>-#include <svx/adjitem.hxx>+#include <editeng/editobj.hxx>+#include <editeng/adjitem.hxx> #include <svx/svdmodel.hxx> #include <svx/algitem.hxx> diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxxindex 4adc839e055f..31bf438772d0 100644--- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx+++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: DrawModelBroadcaster.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/Accessibility/makefile.mk b/sc/source/ui/Accessibility/makefile.mkindex 1ef6db37e0c1..32df95750f85 100644--- a/sc/source/ui/Accessibility/makefile.mk+++ b/sc/source/ui/Accessibility/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.18 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxxindex 1cdd8bf750de..b1cb325ceb69 100644--- a/sc/source/ui/app/client.cxx+++ b/sc/source/ui/app/client.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: client.cxx,v $- * $Revision: 1.20 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxxindex 88b3d42996f6..b256233d7394 100644--- a/sc/source/ui/app/drwtrans.cxx+++ b/sc/source/ui/app/drwtrans.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drwtrans.cxx,v $- * $Revision: 1.38 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -76,10 +73,10 @@ #include "scitems.hxx" // #108584#-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> // #108584#-#include <svx/fhgtitem.hxx>+#include <editeng/fhgtitem.hxx> #include <vcl/svapp.hxx> using namespace com::sun::star;diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxxindex c6901707d2c3..485ea4b88589 100644--- a/sc/source/ui/app/inputhdl.cxx+++ b/sc/source/ui/app/inputhdl.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: inputhdl.cxx,v $- * $Revision: 1.77.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,24 +31,24 @@ //------------------------------------------------------------------ #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <sfx2/app.hxx>-#include <svx/acorrcfg.hxx>+#include <editeng/acorrcfg.hxx> #include <svx/algitem.hxx>-#include <svx/adjitem.hxx>-#include <svx/brshitem.hxx>+#include <editeng/adjitem.hxx>+#include <editeng/brshitem.hxx> #include <svtools/colorcfg.hxx>-#include <svx/colritem.hxx>-#include <svx/editobj.hxx>-#include <svx/editstat.hxx>-#include <svx/editview.hxx>-#include <svx/escpitem.hxx>-#include <svx/forbiddencharacterstable.hxx>-#include <svx/langitem.hxx>-#include <svx/svxacorr.hxx>-#include <svx/unolingu.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editstat.hxx>+#include <editeng/editview.hxx>+#include <editeng/escpitem.hxx>+#include <editeng/forbiddencharacterstable.hxx>+#include <editeng/langitem.hxx>+#include <editeng/svxacorr.hxx>+#include <editeng/unolingu.hxx>+#include <editeng/wghtitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx>diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxxindex fc92ab261ab9..f6fc2cb27b71 100644--- a/sc/source/ui/app/inputwin.cxx+++ b/sc/source/ui/app/inputwin.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: inputwin.cxx,v $- * $Revision: 1.57.22.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,22 +31,22 @@ #include <algorithm> #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <sfx2/app.hxx>-#include <svx/adjitem.hxx>-#include <svx/editview.hxx>-#include <svx/editstat.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/lspcitem.hxx>+#include <editeng/adjitem.hxx>+#include <editeng/editview.hxx>+#include <editeng/editstat.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/lspcitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/event.hxx> #include <sfx2/imgmgr.hxx> #include <stdlib.h> // qsort-#include <svx/scriptspaceitem.hxx>-#include <svx/scripttypeitem.hxx>+#include <editeng/scriptspaceitem.hxx>+#include <editeng/scripttypeitem.hxx> #include <vcl/cursor.hxx> #include <vcl/help.hxx> #include <svl/stritem.hxx>@@ -73,7 +70,7 @@ #include "rangeutl.hxx" #include "docfunc.hxx" #include "funcdesc.hxx"-#include <svx/fontitem.hxx>+#include <editeng/fontitem.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include "AccessibleEditObject.hxx" #include "AccessibleText.hxx"diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxxindex 89a51cd2b2b0..2e0f5d276a97 100644--- a/sc/source/ui/app/lnktrans.cxx+++ b/sc/source/ui/app/lnktrans.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lnktrans.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/app/makefile.mk b/sc/source/ui/app/makefile.mkindex 1dbac01e6a44..a5e4fe8cc024 100644--- a/sc/source/ui/app/makefile.mk+++ b/sc/source/ui/app/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.17 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxxindex bb558c3a42ec..78cb70fa64f0 100644--- a/sc/source/ui/app/msgpool.cxx+++ b/sc/source/ui/app/msgpool.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: msgpool.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxxindex ee9dc001db27..3d62c0396b51 100644--- a/sc/source/ui/app/rfindlst.cxx+++ b/sc/source/ui/app/rfindlst.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rfindlst.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxxindex 2be737d9a717..11e33a8892e8 100644--- a/sc/source/ui/app/scdll.cxx+++ b/sc/source/ui/app/scdll.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scdll.cxx,v $- * $Revision: 1.44.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,7 +30,7 @@ -#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #ifndef _FM_FMOBJFAC_HXX@@ -96,7 +93,7 @@ #include <svx/selctrl.hxx> #include <svx/insctrl.hxx> #include <svx/zoomctrl.hxx>-#include <svx/flditem.hxx>+#include <editeng/flditem.hxx> #include <svx/modctrl.hxx> #include <svx/pszctrl.hxx> #include <svx/fntctl.hxx>diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxxindex b9d8682c412b..dc5d1010dfc8 100644--- a/sc/source/ui/app/scmod.cxx+++ b/sc/source/ui/app/scmod.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scmod.cxx,v $- * $Revision: 1.58.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -41,10 +38,10 @@ #include "scitems.hxx" #include <sfx2/app.hxx>-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/flditem.hxx>-#include <svx/outliner.hxx>+#include <editeng/flditem.hxx>+#include <editeng/outliner.hxx> #include <basic/sbstar.hxx> #include <sfx2/sfxdlg.hxx>@@ -63,7 +60,7 @@ #include <sfx2/request.hxx> #include <sfx2/macrconf.hxx> #include <sfx2/printer.hxx>-#include <svx/langitem.hxx>+#include <editeng/langitem.hxx> #include <svtools/colorcfg.hxx> #include <svl/whiter.hxx>diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxxindex 7e0b43bdd156..c92f0bf5d206 100644--- a/sc/source/ui/app/scmod2.cxx+++ b/sc/source/ui/app/scmod2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scmod2.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,7 +32,7 @@ //------------------------------------------------------------------ -#include <svx/unolingu.hxx>+#include <editeng/unolingu.hxx> #include <unotools/lingucfg.hxx> #include <i18npool/mslangid.hxx> #include <com/sun/star/i18n/ScriptType.hpp>diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxxindex 59b9b8810723..0b213709863d 100644--- a/sc/source/ui/app/seltrans.cxx+++ b/sc/source/ui/app/seltrans.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: seltrans.cxx,v $- * $Revision: 1.15 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/app/template.cxx b/sc/source/ui/app/template.cxxindex ede408ac8030..80dc667c5de6 100644--- a/sc/source/ui/app/template.cxx+++ b/sc/source/ui/app/template.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: template.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxxindex c37fced30109..a5b286e8a9ea 100644--- a/sc/source/ui/app/transobj.cxx+++ b/sc/source/ui/app/transobj.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: transobj.cxx,v $- * $Revision: 1.34 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <com/sun/star/uno/Sequence.hxx>@@ -63,8 +60,8 @@ #include "scmod.hxx" // for InitDocShell-#include <svx/paperinf.hxx>-#include <svx/sizeitem.hxx>+#include <editeng/paperinf.hxx>+#include <editeng/sizeitem.hxx> #include <svx/algitem.hxx> #include <svl/intitem.hxx> #include <svl/zforlist.hxx>diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxxindex 1a36b8ca5125..4450c00db807 100644--- a/sc/source/ui/app/typemap.cxx+++ b/sc/source/ui/app/typemap.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: typemap.cxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,7 +32,7 @@ #include <svx/svxids.hrc> #include "sc.hrc" #include "scitems.hxx"-+#include <editeng/memberids.hrc> #define ITEMID_DBTYPE 0@@ -67,24 +64,24 @@ #include <svl/stritem.hxx> #include <svl/slstitm.hxx> #include <sfx2/objitem.hxx>-#include <svx/fontitem.hxx>+#include <editeng/fontitem.hxx> #include <svx/hlnkitem.hxx>-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <svx/postattr.hxx>-#include <svx/postitem.hxx>+#include <editeng/postitem.hxx> #include <sfx2/tplpitem.hxx> #include <svx/zoomitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/wghtitem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/colritem.hxx>-#include <svx/boxitem.hxx>-#include <svx/bolnitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/wghtitem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/bolnitem.hxx> #include <svl/ptitem.hxx>-#include <svx/sizeitem.hxx>+#include <editeng/sizeitem.hxx> #include <svx/algitem.hxx> #include <svx/clipfmtitem.hxx>-#include <svx/udlnitem.hxx>+#include <editeng/udlnitem.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnedit.hxx> #include <svx/xfillit0.hxx>@@ -107,14 +104,14 @@ #include <svx/xftshcit.hxx> #include <svx/xftshxy.hxx> #include <svx/xftsfit.hxx>-#include <svx/langitem.hxx>+#include <editeng/langitem.hxx> #include <svx/grafctrl.hxx>-#include <svx/shdditem.hxx>-#include <svx/shaditem.hxx>-#include <svx/cntritem.hxx>-#include <svx/crsditem.hxx>-#include <svx/brkitem.hxx>-#include <svx/charreliefitem.hxx>+#include <editeng/shdditem.hxx>+#include <editeng/shaditem.hxx>+#include <editeng/cntritem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/brkitem.hxx>+#include <editeng/charreliefitem.hxx> #include <svx/rotmodit.hxx> #include <svx/drawitem.hxx> #include <svl/ilstitem.hxx>diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxxindex 4ae240edb222..a63491f0929b 100644--- a/sc/source/ui/app/uiitems.cxx+++ b/sc/source/ui/app/uiitems.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: uiitems.cxx,v $- * $Revision: 1.9.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,7 +30,7 @@ -#include <svx/editobj.hxx>+#include <editeng/editobj.hxx> #include "userlist.hxx" #include "uiitems.hxx"diff --git a/sc/source/ui/app/wtcdummy.cxx b/sc/source/ui/app/wtcdummy.cxxindex d545730c8d84..a755830cbd71 100644--- a/sc/source/ui/app/wtcdummy.cxx+++ b/sc/source/ui/app/wtcdummy.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: wtcdummy.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxxindex 05bcf624a1b3..ca62ebb887a5 100644--- a/sc/source/ui/attrdlg/attrdlg.cxx+++ b/sc/source/ui/attrdlg/attrdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: attrdlg.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -54,7 +51,7 @@ #include <svx/svxdlg.hxx> //CHINA001 #include <svx/dialogs.hrc> //CHINA001 #include <svx/flagsdef.hxx> //CHINA001-#include <svx/flstitem.hxx> //CHINA001+#include <editeng/flstitem.hxx> //CHINA001 #include <sfx2/app.hxx> //CHINA001 #if !LAYOUT_SFX_TABDIALOG_BROKENdiff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxxindex c08f8fa2dcea..5e3b23af8afa 100644--- a/sc/source/ui/attrdlg/condfrmt.cxx+++ b/sc/source/ui/attrdlg/condfrmt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: condfrmt.cxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/attrdlg/makefile.mk b/sc/source/ui/attrdlg/makefile.mkindex aed07601fd26..378fd1052ff7 100644--- a/sc/source/ui/attrdlg/makefile.mk+++ b/sc/source/ui/attrdlg/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.6 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxxindex 9a57e73d51d0..b50435041409 100644--- a/sc/source/ui/attrdlg/scabstdlg.cxx+++ b/sc/source/ui/attrdlg/scabstdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scabstdlg.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxxindex 8d5e0e1e6791..ff42e379be13 100644--- a/sc/source/ui/attrdlg/scdlgfact.cxx+++ b/sc/source/ui/attrdlg/scdlgfact.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scdlgfact.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxxindex 530220858f35..7a9b03217655 100644--- a/sc/source/ui/attrdlg/scdlgfact.hxx+++ b/sc/source/ui/attrdlg/scdlgfact.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scdlgfact.hxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxxindex e86269399c4a..35a0a3a1fb35 100644--- a/sc/source/ui/attrdlg/scuiexp.cxx+++ b/sc/source/ui/attrdlg/scuiexp.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scuiexp.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxxindex fbc6659a34ae..21c769cf0603 100644--- a/sc/source/ui/attrdlg/tabpages.cxx+++ b/sc/source/ui/attrdlg/tabpages.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabpages.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxxindex efa93cce014d..6004fdfcfc51 100644--- a/sc/source/ui/cctrl/cbuttonw.cxx+++ b/sc/source/ui/cctrl/cbuttonw.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cbuttonw.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxxindex a938948e1b26..fa14a5497826 100644--- a/sc/source/ui/cctrl/dpcontrol.cxx+++ b/sc/source/ui/cctrl/dpcontrol.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: document.hxx,v $- * $Revision: 1.115.36.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/cctrl/dpcontrol.src b/sc/source/ui/cctrl/dpcontrol.srcindex 31cbb62085e5..b38548369be5 100644--- a/sc/source/ui/cctrl/dpcontrol.src+++ b/sc/source/ui/cctrl/dpcontrol.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: globstr.src,v $- * $Revision: 1.74.96.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxxindex 0bc6478fe89b..4358694f6b04 100644--- a/sc/source/ui/cctrl/editfield.cxx+++ b/sc/source/ui/cctrl/editfield.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: editfield.cxx,v $- * $Revision: 1.6.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/cctrl/makefile.mk b/sc/source/ui/cctrl/makefile.mkindex 541a90cc4347..17fd9b40cb95 100644--- a/sc/source/ui/cctrl/makefile.mk+++ b/sc/source/ui/cctrl/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.7 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/cctrl/popmenu.cxx b/sc/source/ui/cctrl/popmenu.cxxindex 9ceb734bd2ea..6510fff87ead 100644--- a/sc/source/ui/cctrl/popmenu.cxx+++ b/sc/source/ui/cctrl/popmenu.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: popmenu.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxxindex 618c7f97a881..e27baecec115 100644--- a/sc/source/ui/cctrl/tbinsert.cxx+++ b/sc/source/ui/cctrl/tbinsert.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tbinsert.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxxindex 8e1f839c39e4..7d43b31e0b30 100644--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx@@ -1,36 +1,28 @@ /************************************************************************* *-* OpenOffice.org - a multi-platform office productivity suite-*-* $RCSfile: tbzoomsliderctrl.cxx,v $-*-* $Revision: 1.1 $-*-* last change: $Author: maoyg $ $Date: 2008/04/25 10:08:08 $-*-* The Contents of this file are made available subject to-* the terms of GNU Lesser General Public License Version 2.1.-*-*-* GNU Lesser General Public License Version 2.1-* =============================================-* Copyright 2005 by Sun Microsystems, Inc.-* 901 San Antonio Road, Palo Alto, CA 94303, USA-*-* This library is free software; you can redistribute it and/or-* modify it under the terms of the GNU Lesser General Public-* License version 2.1, as published by the Free Software Foundation.-*-* This library is distributed in the hope that it will be useful,-* but WITHOUT ANY WARRANTY; without even the implied warranty of-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU-* Lesser General Public License for more details.-*-* You should have received a copy of the GNU Lesser General Public-* License along with this library; if not, write to the Free Software-* Foundation, Inc., 59 Temple Place, Suite 330, Boston,-* MA 02111-1307 USA-*+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.+ *+ * Copyright 2000, 2010 Oracle and/or its affiliates.+ *+ * OpenOffice.org - a multi-platform office productivity suite+ *+ * This file is part of OpenOffice.org.+ *+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation.+ *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code).+ *+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License.+ * ************************************************************************/ #include "precompiled_sc.hxx" #ifndef _SC_ZOOMSLIDERTBCONTRL_HXXdiff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxxindex a2a20a047a3e..a40a5fb994ea 100644--- a/sc/source/ui/dbgui/asciiopt.cxx+++ b/sc/source/ui/dbgui/asciiopt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: asciiopt.cxx,v $- * $Revision: 1.25 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrcindex 29dca4596441..275de80f5972 100644--- a/sc/source/ui/dbgui/asciiopt.hrc+++ b/sc/source/ui/dbgui/asciiopt.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: asciiopt.hrc,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.srcindex b9854c175344..b527719cb6de 100644--- a/sc/source/ui/dbgui/asciiopt.src+++ b/sc/source/ui/dbgui/asciiopt.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: asciiopt.src,v $- * $Revision: 1.36 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxxindex e4f53c5129fd..e094149ab99b 100644--- a/sc/source/ui/dbgui/consdlg.cxx+++ b/sc/source/ui/dbgui/consdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: consdlg.cxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/consdlg.hrc b/sc/source/ui/dbgui/consdlg.hrcindex 31233e2ab0fe..6f9f6708c388 100644--- a/sc/source/ui/dbgui/consdlg.hrc+++ b/sc/source/ui/dbgui/consdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: consdlg.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/consdlg.src b/sc/source/ui/dbgui/consdlg.srcindex fb6d65818299..5226c22629c6 100644--- a/sc/source/ui/dbgui/consdlg.src+++ b/sc/source/ui/dbgui/consdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: consdlg.src,v $- * $Revision: 1.39 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxxindex f2f77e8b0608..0dbc4e7dab39 100644--- a/sc/source/ui/dbgui/csvcontrol.cxx+++ b/sc/source/ui/dbgui/csvcontrol.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: csvcontrol.cxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxxindex e33ecde514a4..2ec05af2f72e 100644--- a/sc/source/ui/dbgui/csvgrid.cxx+++ b/sc/source/ui/dbgui/csvgrid.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: csvgrid.cxx,v $- * $Revision: 1.29 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -46,12 +43,12 @@ // *** edit engine *** #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/colritem.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/fontitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/fontitem.hxx> #include <svl/itemset.hxx> #include "editutil.hxx" // *** edit engine ***diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxxindex 6f97ecd4c9d9..d84c938bfd14 100644--- a/sc/source/ui/dbgui/csvruler.cxx+++ b/sc/source/ui/dbgui/csvruler.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: csvruler.cxx,v $- * $Revision: 1.16.146.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxxindex ad9a51534541..b93bb09b5151 100644--- a/sc/source/ui/dbgui/csvsplits.cxx+++ b/sc/source/ui/dbgui/csvsplits.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: csvsplits.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxxindex c3cfb97cd52c..842f1cc81dea 100644--- a/sc/source/ui/dbgui/csvtablebox.cxx+++ b/sc/source/ui/dbgui/csvtablebox.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: csvtablebox.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxxindex 1b44ef86c7d4..87de71767a17 100644--- a/sc/source/ui/dbgui/dapidata.cxx+++ b/sc/source/ui/dbgui/dapidata.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dapidata.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxxindex 9a5076f4b3ce..31aafbcb13da 100644--- a/sc/source/ui/dbgui/dapitype.cxx+++ b/sc/source/ui/dbgui/dapitype.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dapitype.cxx,v $- * $Revision: 1.7.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/dapitype.hrc b/sc/source/ui/dbgui/dapitype.hrcindex 224054412e4c..efbabe64fa04 100644--- a/sc/source/ui/dbgui/dapitype.hrc+++ b/sc/source/ui/dbgui/dapitype.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dapitype.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.srcindex ee046df035f9..5cf1dacad819 100644--- a/sc/source/ui/dbgui/dapitype.src+++ b/sc/source/ui/dbgui/dapitype.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dapitype.src,v $- * $Revision: 1.38 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxxindex 6fae453a9f52..a2f4d61af537 100644--- a/sc/source/ui/dbgui/dbnamdlg.cxx+++ b/sc/source/ui/dbgui/dbnamdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbnamdlg.cxx,v $- * $Revision: 1.9.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxxindex 70f7c9a03b10..4ac3fb8d68ad 100644--- a/sc/source/ui/dbgui/dpgroupdlg.cxx+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpgroupdlg.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/dpgroupdlg.hrc b/sc/source/ui/dbgui/dpgroupdlg.hrcindex 4e0391ab3ec2..5a4797489ddf 100644--- a/sc/source/ui/dbgui/dpgroupdlg.hrc+++ b/sc/source/ui/dbgui/dpgroupdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpgroupdlg.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/dpgroupdlg.src b/sc/source/ui/dbgui/dpgroupdlg.srcindex b13369e38f7c..f9a5ac589af5 100644--- a/sc/source/ui/dbgui/dpgroupdlg.src+++ b/sc/source/ui/dbgui/dpgroupdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpgroupdlg.src,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/expftext.cxx b/sc/source/ui/dbgui/expftext.cxxindex 053433743185..405a18fcc004 100644--- a/sc/source/ui/dbgui/expftext.cxx+++ b/sc/source/ui/dbgui/expftext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: expftext.cxx,v $- * $Revision: 1.4.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxxindex 4d3c478d9068..d4b477cd4b33 100644--- a/sc/source/ui/dbgui/fieldwnd.cxx+++ b/sc/source/ui/dbgui/fieldwnd.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fieldwnd.cxx,v $- * $Revision: 1.20 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxxindex a7a80165566f..56878f623828 100644--- a/sc/source/ui/dbgui/filtdlg.cxx+++ b/sc/source/ui/dbgui/filtdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filtdlg.cxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxxindex 603a9a3a5eea..1e274690c31c 100644--- a/sc/source/ui/dbgui/foptmgr.cxx+++ b/sc/source/ui/dbgui/foptmgr.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: foptmgr.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -45,6 +42,7 @@ #include "dbcolect.hxx" #include "viewdata.hxx" #include "document.hxx"+#include "queryparam.hxx" #define _FOPTMGR_CXX #include "foptmgr.hxx"diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxxindex 14f278fc5575..bd18008afd47 100644--- a/sc/source/ui/dbgui/imoptdlg.cxx+++ b/sc/source/ui/dbgui/imoptdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: imoptdlg.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/imoptdlg.hrc b/sc/source/ui/dbgui/imoptdlg.hrcindex 3c09a5e0e225..5fd9256e8009 100644--- a/sc/source/ui/dbgui/imoptdlg.hrc+++ b/sc/source/ui/dbgui/imoptdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: imoptdlg.hrc,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/imoptdlg.src b/sc/source/ui/dbgui/imoptdlg.srcindex 55903711dbae..914f2d1fb027 100644--- a/sc/source/ui/dbgui/imoptdlg.src+++ b/sc/source/ui/dbgui/imoptdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: imoptdlg.src,v $- * $Revision: 1.35 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/makefile.mk b/sc/source/ui/dbgui/makefile.mkindex 9ff21b6c4d08..ee855d22aef1 100644--- a/sc/source/ui/dbgui/makefile.mk+++ b/sc/source/ui/dbgui/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.11 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.srcindex 2cd94becb48c..cd59bf3b099d 100644--- a/sc/source/ui/dbgui/outline.src+++ b/sc/source/ui/dbgui/outline.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: outline.src,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxxindex 8a44d512cbe6..cde18fcc3b52 100644--- a/sc/source/ui/dbgui/pfiltdlg.cxx+++ b/sc/source/ui/dbgui/pfiltdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pfiltdlg.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/pivot.hrc b/sc/source/ui/dbgui/pivot.hrcindex b7aefcfd996a..1a97d4c75b52 100644--- a/sc/source/ui/dbgui/pivot.hrc+++ b/sc/source/ui/dbgui/pivot.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pivot.hrc,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/pivot.src b/sc/source/ui/dbgui/pivot.srcindex a4694e756edb..359c8a92d8e5 100644--- a/sc/source/ui/dbgui/pivot.src+++ b/sc/source/ui/dbgui/pivot.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pivot.src,v $- * $Revision: 1.60 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxxindex 30ee1a44d384..8609bfcbfb0a 100644--- a/sc/source/ui/dbgui/pvfundlg.cxx+++ b/sc/source/ui/dbgui/pvfundlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pvfundlg.cxx,v $- * $Revision: 1.12.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/pvfundlg.hrc b/sc/source/ui/dbgui/pvfundlg.hrcindex 141a41494198..c9b6f562a9e1 100644--- a/sc/source/ui/dbgui/pvfundlg.hrc+++ b/sc/source/ui/dbgui/pvfundlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pvfundlg.hrc,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.srcindex 5aa547ff951e..70bce3ed30e9 100644--- a/sc/source/ui/dbgui/pvfundlg.src+++ b/sc/source/ui/dbgui/pvfundlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pvfundlg.src,v $- * $Revision: 1.39 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/pvglob.hxx b/sc/source/ui/dbgui/pvglob.hxxindex 76001b340146..6b6526266035 100644--- a/sc/source/ui/dbgui/pvglob.hxx+++ b/sc/source/ui/dbgui/pvglob.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pvglob.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxxindex 6a9bb63e3ae3..1eca44a787ed 100644--- a/sc/source/ui/dbgui/pvlaydlg.cxx+++ b/sc/source/ui/dbgui/pvlaydlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pvlaydlg.cxx,v $- * $Revision: 1.29 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxxindex 0065af288783..96c9f120f5b1 100644--- a/sc/source/ui/dbgui/scendlg.cxx+++ b/sc/source/ui/dbgui/scendlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scendlg.cxx,v $- * $Revision: 1.16.296.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/scendlg.hrc b/sc/source/ui/dbgui/scendlg.hrcindex 3d1e0e8e246f..83818773bf5a 100644--- a/sc/source/ui/dbgui/scendlg.hrc+++ b/sc/source/ui/dbgui/scendlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scendlg.hrc,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/scendlg.src b/sc/source/ui/dbgui/scendlg.srcindex 2c2913103f9c..40cfeb01b8ff 100644--- a/sc/source/ui/dbgui/scendlg.src+++ b/sc/source/ui/dbgui/scendlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scendlg.src,v $- * $Revision: 1.44 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxxindex 773862088155..e4e568e00882 100644--- a/sc/source/ui/dbgui/scuiasciiopt.cxx+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scuiasciiopt.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxxindex 76934e12c8df..5440f515c86a 100644--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scuiimoptdlg.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxxindex 86f344c11c55..f70fbb094c92 100644--- a/sc/source/ui/dbgui/sfiltdlg.cxx+++ b/sc/source/ui/dbgui/sfiltdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sfiltdlg.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxxindex 7d1462f62f27..f2a733af3aa8 100644--- a/sc/source/ui/dbgui/sortdlg.cxx+++ b/sc/source/ui/dbgui/sortdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sortdlg.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxxindex 0c23c205114b..2c9cba31cd13 100644--- a/sc/source/ui/dbgui/subtdlg.cxx+++ b/sc/source/ui/dbgui/subtdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: subtdlg.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxxindex 1e6c2b3f8fa7..18c1eb25664a 100644--- a/sc/source/ui/dbgui/tpsort.cxx+++ b/sc/source/ui/dbgui/tpsort.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpsort.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxxindex 8bbc561c9e43..fbada165b55d 100644--- a/sc/source/ui/dbgui/tpsubt.cxx+++ b/sc/source/ui/dbgui/tpsubt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpsubt.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxxindex 81e8ff35195d..5fdf386323d9 100644--- a/sc/source/ui/dbgui/validate.cxx+++ b/sc/source/ui/dbgui/validate.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: validate.cxx,v $- * $Revision: 1.18 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.srcindex 1f8e4b48deac..c861fbc200cb 100644--- a/sc/source/ui/dbgui/validate.src+++ b/sc/source/ui/dbgui/validate.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: validate.src,v $- * $Revision: 1.46 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxxindex fc745318b105..d819785c843b 100644--- a/sc/source/ui/docshell/arealink.cxx+++ b/sc/source/ui/docshell/arealink.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: arealink.cxx,v $- * $Revision: 1.29 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -39,7 +36,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/sfxsids.hrc>-#include <svx/linkmgr.hxx>+#include <sfx2/linkmgr.hxx> #include <svl/stritem.hxx> #include <vcl/msgbox.hxx> @@ -130,7 +127,7 @@ void __EXPORT ScAreaLink::DataChanged( const String&, if (bInCreate) return; - SvxLinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();+ sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager(); if (pLinkManager!=NULL) { String aFile;diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxxindex 3759d3359a7d..61683e169f02 100644--- a/sc/source/ui/docshell/autostyl.cxx+++ b/sc/source/ui/docshell/autostyl.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: autostyl.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxxindex 4042154b9a52..1633af000b51 100644--- a/sc/source/ui/docshell/dbdocfun.cxx+++ b/sc/source/ui/docshell/dbdocfun.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbdocfun.cxx,v $- * $Revision: 1.20.128.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxxindex 09e4dd7aa4af..17b07099a491 100644--- a/sc/source/ui/docshell/dbdocimp.cxx+++ b/sc/source/ui/docshell/dbdocimp.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbdocimp.cxx,v $- * $Revision: 1.24 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxxindex e292187c80c9..cd28daa99401 100644--- a/sc/source/ui/docshell/docfunc.cxx+++ b/sc/source/ui/docshell/docfunc.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docfunc.cxx,v $- * $Revision: 1.70.100.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,11 +33,11 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <sfx2/app.hxx>-#include <svx/editobj.hxx>-#include <svx/linkmgr.hxx>+#include <editeng/editobj.hxx>+#include <sfx2/linkmgr.hxx> #include <svx/svdundo.hxx> #include <sfx2/bindings.hxx> #include <sfx2/printer.hxx>@@ -4551,7 +4548,7 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter, ScDocument* pDoc = rDocShell.GetDocument(); BOOL bUndo (pDoc->IsUndoEnabled()); - SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); // #i52120# if other area links exist at the same start position, // remove them first (file format specifies only one link definitiondiff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxxindex 17cb07ca0a49..1b4f9b677f81 100644--- a/sc/source/ui/docshell/docsh.cxx+++ b/sc/source/ui/docshell/docsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docsh.cxx,v $- * $Revision: 1.103.36.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,8 +32,8 @@ #include "scitems.hxx"-#include <svx/eeitem.hxx>-#include <svx/svxenum.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/svxenum.hxx> #include <svx/algitem.hxx> @@ -62,7 +59,7 @@ #include <sfx2/sfx.hrc> #include <sfx2/topfrm.hxx> #include <sfx2/objface.hxx>-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <unotools/fltrcfg.hxx> #include <svl/documentlockfile.hxx> #include <svl/sharecontrolfile.hxx>diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxxindex 386ac8528cec..4b76c18edbe6 100644--- a/sc/source/ui/docshell/docsh2.cxx+++ b/sc/source/ui/docshell/docsh2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docsh2.cxx,v $- * $Revision: 1.25.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,7 +37,7 @@ #include "scitems.hxx" #include <tools/gen.hxx> #include <svtools/ctrltool.hxx>-#include <svx/flstitem.hxx>+#include <editeng/flstitem.hxx> #include <svx/drawitem.hxx> #include <sfx2/printer.hxx> #include <svl/smplhint.hxx>@@ -48,9 +45,9 @@ #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> #include <vcl/svapp.hxx>-#include <svx/asiancfg.hxx>-#include <svx/forbiddencharacterstable.hxx>-#include <svx/unolingu.hxx>+#include <svl/asiancfg.hxx>+#include <editeng/forbiddencharacterstable.hxx>+#include <editeng/unolingu.hxx> #include <rtl/logfile.hxx> #include <comphelper/processfactory.hxx>diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxxindex 1416c57f1165..7ff714c2cbdd 100644--- a/sc/source/ui/docshell/docsh3.cxx+++ b/sc/source/ui/docshell/docsh3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docsh3.cxx,v $- * $Revision: 1.38.52.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,11 +37,11 @@ #include "scitems.hxx" #include "rangelst.hxx"-#include <svx/flstitem.hxx>+#include <editeng/flstitem.hxx> #include <svx/pageitem.hxx>-#include <svx/paperinf.hxx>+#include <editeng/paperinf.hxx> #include <svx/postattr.hxx>-#include <svx/sizeitem.hxx>+#include <editeng/sizeitem.hxx> #include <unotools/misccfg.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx>diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxxindex 3ab36ce131ad..97403008915d 100644--- a/sc/source/ui/docshell/docsh4.cxx+++ b/sc/source/ui/docshell/docsh4.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docsh4.cxx,v $- * $Revision: 1.61.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -45,7 +42,7 @@ using namespace ::com::sun::star; #include "scitems.hxx" #include <sfx2/fcontnr.hxx>-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx>diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxxindex b4b5f4721900..6fa6a5ac7863 100644--- a/sc/source/ui/docshell/docsh5.cxx+++ b/sc/source/ui/docshell/docsh5.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docsh5.cxx,v $- * $Revision: 1.20.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxxindex e3f1f6904af4..fbb6dc8ead35 100644--- a/sc/source/ui/docshell/docsh6.cxx+++ b/sc/source/ui/docshell/docsh6.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docsh6.cxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,7 +37,7 @@ #include <svx/pageitem.hxx> #include <vcl/virdev.hxx>-#include <svx/linkmgr.hxx>+#include <sfx2/linkmgr.hxx> #endif // INCLUDE ---------------------------------------------------------------@@ -367,7 +364,7 @@ BOOL __EXPORT ScDocShell::Insert( SfxObjectShell &rSource, void ScDocShell::UpdateLinks() {- SvxLinkManager* pLinkManager = aDocument.GetLinkManager();+ sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager(); ScStrCollection aNames; // nicht mehr benutzte Links raus@@ -438,7 +435,7 @@ void ScDocShell::UpdateLinks() BOOL ScDocShell::ReloadTabLinks() {- SvxLinkManager* pLinkManager = aDocument.GetLinkManager();+ sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager(); BOOL bAny = FALSE; USHORT nCount = pLinkManager->GetLinks().Count();diff --git a/sc/source/ui/docshell/docsh7.cxx b/sc/source/ui/docshell/docsh7.cxxindex ea930bb12f53..89f082672b29 100644--- a/sc/source/ui/docshell/docsh7.cxx+++ b/sc/source/ui/docshell/docsh7.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docsh7.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxxindex 174207bbf673..b761dd75d9df 100644--- a/sc/source/ui/docshell/docsh8.cxx+++ b/sc/source/ui/docshell/docsh8.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docsh8.cxx,v $- * $Revision: 1.27.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/docshimp.hxx b/sc/source/ui/docshell/docshimp.hxxindex e230b6f42fda..6532c46d0835 100644--- a/sc/source/ui/docshell/docshimp.hxx+++ b/sc/source/ui/docshell/docshimp.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docshimp.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxxindex c25df4dd0035..d381ff067a99 100644--- a/sc/source/ui/docshell/editable.cxx+++ b/sc/source/ui/docshell/editable.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: editable.cxx,v $- * $Revision: 1.5.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxxindex e18ef20d96b9..836d6cdf98e6 100644--- a/sc/source/ui/docshell/externalrefmgr.cxx+++ b/sc/source/ui/docshell/externalrefmgr.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: externalrefmgr.cxx,v $- * $Revision: 1.1.2.33 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -61,7 +58,7 @@ #include "svl/stritem.hxx" #include "svl/urihelper.hxx" #include "svl/zformat.hxx"-#include "svx/linkmgr.hxx"+#include "sfx2/linkmgr.hxx" #include "tools/urlobj.hxx" #include "unotools/ucbhelper.hxx" @@ -1061,8 +1058,11 @@ void ScExternalRefLink::DataChanged(const String& /*rMimeType*/, const Any& /*rV else { // The source document has changed.+ ScDocShell* pDocShell = ScDocShell::GetViewData()->GetDocShell();+ ScDocShellModificator aMod(*pDocShell); pMgr->switchSrcFile(mnFileId, aFile, aFilter); maFilterName = aFilter;+ aMod.SetDocumentModified(); } } @@ -1994,7 +1994,7 @@ void ScExternalRefManager::maybeLinkExternalFile(sal_uInt16 nFileId) String aFilter, aOptions; ScDocumentLoader::GetFilterName(*pFileName, aFilter, aOptions, true, false);- SvxLinkManager* pLinkMgr = mpDoc->GetLinkManager();+ sfx2::LinkManager* pLinkMgr = mpDoc->GetLinkManager(); ScExternalRefLink* pLink = new ScExternalRefLink(mpDoc, nFileId, aFilter); DBG_ASSERT(pFileName, "ScExternalRefManager::insertExternalFileLink: file name pointer is NULL"); pLinkMgr->InsertFileLink(*pLink, OBJECT_CLIENT_FILE, *pFileName, &aFilter);diff --git a/sc/source/ui/docshell/hiranges.cxx b/sc/source/ui/docshell/hiranges.cxxindex 32af772bfd72..af1226216a06 100644--- a/sc/source/ui/docshell/hiranges.cxx+++ b/sc/source/ui/docshell/hiranges.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hiranges.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxxindex 25a1c867b0e3..8fc49696ba59 100644--- a/sc/source/ui/docshell/impex.cxx+++ b/sc/source/ui/docshell/impex.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: impex.cxx,v $- * $Revision: 1.43 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/makefile.mk b/sc/source/ui/docshell/makefile.mkindex f3179c440b67..99a7495b6b49 100644--- a/sc/source/ui/docshell/makefile.mk+++ b/sc/source/ui/docshell/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.13.134.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxxindex 20ffb63f43fd..2f42c77ed5f4 100644--- a/sc/source/ui/docshell/olinefun.cxx+++ b/sc/source/ui/docshell/olinefun.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: olinefun.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxxindex d9205b1f9a2a..db55c2364305 100644--- a/sc/source/ui/docshell/pagedata.cxx+++ b/sc/source/ui/docshell/pagedata.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pagedata.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxxindex 803eb0fbb90f..764d431f3af0 100644--- a/sc/source/ui/docshell/pntlock.cxx+++ b/sc/source/ui/docshell/pntlock.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pntlock.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxxindex aeb4b6604e67..dabe38fb8c1d 100644--- a/sc/source/ui/docshell/servobj.cxx+++ b/sc/source/ui/docshell/servobj.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: servobj.cxx,v $- * $Revision: 1.11.10.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ #include <sot/formats.hxx> #include <sfx2/app.hxx>-#include <svx/linkmgr.hxx>+#include <sfx2/linkmgr.hxx> #include "servobj.hxx" #include "docsh.hxx" #include "impex.hxx"diff --git a/sc/source/ui/docshell/sizedev.cxx b/sc/source/ui/docshell/sizedev.cxxindex 1abebc5ad8e0..d89009540156 100644--- a/sc/source/ui/docshell/sizedev.cxx+++ b/sc/source/ui/docshell/sizedev.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sizedev.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxxindex c86c7591cd36..4d18f9f18c37 100644--- a/sc/source/ui/docshell/tablink.cxx+++ b/sc/source/ui/docshell/tablink.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tablink.cxx,v $- * $Revision: 1.31.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -47,7 +44,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx>-#include <svx/linkmgr.hxx>+#include <sfx2/linkmgr.hxx> #include <tools/urlobj.hxx> #include <unotools/transliterationwrapper.hxx> @@ -146,7 +143,7 @@ void __EXPORT ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl ) void __EXPORT ScTableLink::DataChanged( const String&, const ::com::sun::star::uno::Any& ) {- SvxLinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();+ sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager(); if (pLinkManager!=NULL) { String aFile;diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxxindex 3aa9b873ea67..1072af30c7a1 100644--- a/sc/source/ui/docshell/tpstat.cxx+++ b/sc/source/ui/docshell/tpstat.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpstat.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/tpstat.hrc b/sc/source/ui/docshell/tpstat.hrcindex 7f08f543cbcd..2b57d20f1a26 100644--- a/sc/source/ui/docshell/tpstat.hrc+++ b/sc/source/ui/docshell/tpstat.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpstat.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/docshell/tpstat.src b/sc/source/ui/docshell/tpstat.srcindex a1bf65f53986..7226da4642c3 100644--- a/sc/source/ui/docshell/tpstat.src+++ b/sc/source/ui/docshell/tpstat.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpstat.src,v $- * $Revision: 1.29 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxxindex e4d39e21d7be..605611f2e309 100644--- a/sc/source/ui/drawfunc/chartsh.cxx+++ b/sc/source/ui/drawfunc/chartsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartsh.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,10 +31,10 @@ //-------------------------------------------------------------------#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/fontwork.hxx> //CHINA001 #include <svx/labdlg.hxx>-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <svx/tabarea.hxx> #include <svx/tabline.hxx> //CHINA001 #include <svx/transfrm.hxx>diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxxindex e53fea436d12..b44c396f4e0c 100644--- a/sc/source/ui/drawfunc/drawsh.cxx+++ b/sc/source/ui/drawfunc/drawsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawsh.cxx,v $- * $Revision: 1.15.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,10 +33,10 @@ #include "scitems.hxx" -#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/fontwork.hxx> //#include <svx/labdlg.hxx> CHINA001-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <svx/tabarea.hxx> #include <svx/tabline.hxx> //CHINA001 #include <svx/transfrm.hxx>diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxxindex ad36ad72e796..7da571fc05a7 100644--- a/sc/source/ui/drawfunc/drawsh2.cxx+++ b/sc/source/ui/drawfunc/drawsh2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawsh2.cxx,v $- * $Revision: 1.26.128.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,8 +32,8 @@ #include <com/sun/star/embed/EmbedMisc.hpp> #include "scitems.hxx"-#include <svx/eeitem.hxx>-#include <svx/sizeitem.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/sizeitem.hxx> #include <svx/svdpagv.hxx> #include <svx/xdef.hxx> #include <sfx2/app.hxx>diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxxindex 8de1416852d1..45b26584f29a 100644--- a/sc/source/ui/drawfunc/drawsh4.cxx+++ b/sc/source/ui/drawfunc/drawsh4.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawsh4.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxxindex 5d8e4cb1ca33..e79097ef8874 100644--- a/sc/source/ui/drawfunc/drawsh5.cxx+++ b/sc/source/ui/drawfunc/drawsh5.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawsh5.cxx,v $- * $Revision: 1.37.128.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,7 +32,7 @@ //------------------------------------------------------------------ -#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/request.hxx>diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxxindex 8987c9194cb2..44b88738430a 100644--- a/sc/source/ui/drawfunc/drformsh.cxx+++ b/sc/source/ui/drawfunc/drformsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drformsh.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,10 +32,10 @@ //------------------------------------------------------------------ -#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/fontwork.hxx> //CHINA001 #include <svx/labdlg.hxx>-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <svx/tabarea.hxx> #include <svx/tabline.hxx> //CHINA001 #include <svx/transfrm.hxx>diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.srcindex f94d70a782ff..b20ceb9841a5 100644--- a/sc/source/ui/drawfunc/drformsh.src+++ b/sc/source/ui/drawfunc/drformsh.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drformsh.src,v $- * $Revision: 1.30 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxxindex 908eba68cee5..ece7c4ad6c3a 100644--- a/sc/source/ui/drawfunc/drtxtob.cxx+++ b/sc/source/ui/drawfunc/drtxtob.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drtxtob.cxx,v $- * $Revision: 1.34.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,26 +34,26 @@ #include "scitems.hxx" -#include <svx/adjitem.hxx>+#include <editeng/adjitem.hxx> #include <svx/clipfmtitem.hxx>-#include <svx/cntritem.hxx>-#include <svx/crsditem.hxx>-#include <svx/editeng.hxx>-#include <svx/escpitem.hxx>-#include <svx/flditem.hxx>-#include <svx/fontitem.hxx>-#include <svx/frmdiritem.hxx>+#include <editeng/cntritem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/editeng.hxx>+#include <editeng/escpitem.hxx>+#include <editeng/flditem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/frmdiritem.hxx> #include <svx/hlnkitem.hxx>-#include <svx/lspcitem.hxx>+#include <editeng/lspcitem.hxx> #include <svx/svdoutl.hxx>-#include <svx/outlobj.hxx>-#include <svx/postitem.hxx>-#include <svx/scripttypeitem.hxx>-#include <svx/shdditem.hxx>-#include <svx/srchitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>-#include <svx/writingmodeitem.hxx>+#include <editeng/outlobj.hxx>+#include <editeng/postitem.hxx>+#include <editeng/scripttypeitem.hxx>+#include <editeng/shdditem.hxx>+#include <svl/srchitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx>+#include <editeng/writingmodeitem.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objface.hxx>diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxxindex a1d85b1dc13a..61fbf3d0f96e 100644--- a/sc/source/ui/drawfunc/drtxtob1.cxx+++ b/sc/source/ui/drawfunc/drtxtob1.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drtxtob1.cxx,v $- * $Revision: 1.16 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,15 +33,15 @@ //------------------------------------------------------------------------ #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/svxdlg.hxx>-#include <svx/brkitem.hxx>-#include <svx/hyznitem.hxx>-#include <svx/orphitem.hxx>-#include <svx/outliner.hxx>-#include <svx/spltitem.hxx>-#include <svx/widwitem.hxx>+#include <editeng/brkitem.hxx>+#include <editeng/hyznitem.hxx>+#include <editeng/orphitem.hxx>+#include <editeng/outliner.hxx>+#include <editeng/spltitem.hxx>+#include <editeng/widwitem.hxx> #include <sot/exchange.hxx> #include <vcl/msgbox.hxx> #include <svtools/transfer.hxx>diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxxindex 3389c362901b..27f1a3dbb77f 100644--- a/sc/source/ui/drawfunc/drtxtob2.cxx+++ b/sc/source/ui/drawfunc/drtxtob2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drtxtob2.cxx,v $- * $Revision: 1.19.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,14 +29,14 @@ #include "precompiled_sc.hxx" #include "scitems.hxx"-#include <svx/adjitem.hxx>+#include <editeng/adjitem.hxx> #include <svx/drawitem.hxx> #include <svx/fontwork.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/outlobj.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/outlobj.hxx> #include <svx/svdocapt.hxx> #include <svx/xtextit.hxx>-#include <svx/writingmodeitem.hxx>+#include <editeng/writingmodeitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx>diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxxindex 57d84879df52..20daacffac0e 100644--- a/sc/source/ui/drawfunc/fuconarc.cxx+++ b/sc/source/ui/drawfunc/fuconarc.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuconarc.cxx,v $- * $Revision: 1.9.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxxindex 0398d5a63b43..69a47f0584d0 100644--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuconcustomshape.cxx,v $- * $Revision: 1.13.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,20 +29,20 @@ #include "precompiled_sc.hxx" #include "fuconcustomshape.hxx"-#include <svx/svxenum.hxx>+#include <editeng/svxenum.hxx> #include <svx/gallery.hxx> #include <sfx2/request.hxx> #include <svx/fmmodel.hxx> #include <svl/itempool.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx>-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/sdtagitm.hxx> #include "fuconuno.hxx" #include "tabvwsh.hxx" #include "sc.hrc" #include "drawview.hxx"-#include <svx/adjitem.hxx>+#include <editeng/adjitem.hxx> #include <math.h> diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxxindex b46fb5082c55..440f49f41326 100644--- a/sc/source/ui/drawfunc/fuconpol.cxx+++ b/sc/source/ui/drawfunc/fuconpol.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuconpol.cxx,v $- * $Revision: 1.9.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxxindex a62890f7a51c..733c6fe08b45 100644--- a/sc/source/ui/drawfunc/fuconrec.cxx+++ b/sc/source/ui/drawfunc/fuconrec.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuconrec.cxx,v $- * $Revision: 1.14.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ #include "sc.hrc" #include "drawview.hxx" -#include <svx/outlobj.hxx>+#include <editeng/outlobj.hxx> // #98185# Create default drawing objects via keyboard #include <svx/svdopath.hxx> #include <svx/svdocapt.hxx>diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxxindex aea0c7a1b804..bb918e9005ae 100644--- a/sc/source/ui/drawfunc/fuconstr.cxx+++ b/sc/source/ui/drawfunc/fuconstr.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuconstr.cxx,v $- * $Revision: 1.11.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -31,8 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svx/outliner.hxx>-#include <svx/outlobj.hxx>+#include <editeng/outliner.hxx>+#include <editeng/outlobj.hxx> #include <svx/svdotext.hxx> #include <svx/svdouno.hxx> #include <sfx2/dispatch.hxx>diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxxindex 8022d101ddba..c1212d4d9699 100644--- a/sc/source/ui/drawfunc/fuconuno.cxx+++ b/sc/source/ui/drawfunc/fuconuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuconuno.cxx,v $- * $Revision: 1.10.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxxindex fadb8270b6a6..3a3fc833a515 100644--- a/sc/source/ui/drawfunc/fudraw.cxx+++ b/sc/source/ui/drawfunc/fudraw.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fudraw.cxx,v $- * $Revision: 1.25.128.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,8 +30,8 @@ //------------------------------------------------------------------------ -#include <svx/editeng.hxx> // EditEngine::IsSimpleCharInput-#include <svx/outlobj.hxx>+#include <editeng/editeng.hxx> // EditEngine::IsSimpleCharInput+#include <editeng/outlobj.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> #include <svx/svdouno.hxx>diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxxindex 35d46f234182..53a44f058dda 100644--- a/sc/source/ui/drawfunc/fuins1.cxx+++ b/sc/source/ui/drawfunc/fuins1.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuins1.cxx,v $- * $Revision: 1.12.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -31,8 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svx/impgrf.hxx>-#include <svx/opengrf.hxx>+#include <sfx2/opengrf.hxx> #include <svx/svdograf.hxx> #include <svx/svdomedia.hxx> #include <svx/svdpage.hxx>@@ -273,7 +269,7 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh, bAsLink = ((const SfxBoolItem*)pItem)->GetValue(); Graphic aGraphic;- int nError = ::LoadGraphic( aFileName, aFilterName, aGraphic, ::GetGrfFilter() );+ int nError = GraphicFilter::LoadGraphic( aFileName, aFilterName, aGraphic, GraphicFilter::GetGraphicFilter() ); if ( nError == GRFILTER_OK ) { lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, TRUE, pViewSh, pWindow, pView );diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxxindex 1f7534a7fcb4..e0721fc47f50 100644--- a/sc/source/ui/drawfunc/fuins2.cxx+++ b/sc/source/ui/drawfunc/fuins2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuins2.cxx,v $- * $Revision: 1.31.20.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxxindex 6cc1c70ff5cf..02554c495729 100644--- a/sc/source/ui/drawfunc/fumark.cxx+++ b/sc/source/ui/drawfunc/fumark.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fumark.cxx,v $- * $Revision: 1.9.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxxindex 23aefe17c71b..0bffdfe7ef84 100644--- a/sc/source/ui/drawfunc/fupoor.cxx+++ b/sc/source/ui/drawfunc/fupoor.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fupoor.cxx,v $- * $Revision: 1.13.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -31,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svx/outliner.hxx>+#include <editeng/outliner.hxx> #include <svx/svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdpagv.hxx>diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxxindex 79c466f9f2c3..213169b8b9fd 100644--- a/sc/source/ui/drawfunc/fusel.cxx+++ b/sc/source/ui/drawfunc/fusel.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fusel.cxx,v $- * $Revision: 1.23.128.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,8 +32,8 @@ #include <com/sun/star/embed/EmbedStates.hpp> -#include <svx/eeitem.hxx>-#include <svx/flditem.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/flditem.hxx> #include <svx/svdoole2.hxx> #include <svx/svdotext.hxx> #include <sfx2/dispatch.hxx>@@ -44,7 +41,7 @@ #include <svx/svdouno.hxx> #include <svx/svdomedia.hxx> #include <svx/svdpagv.hxx>-#include <svx/outlobj.hxx>+#include <editeng/outlobj.hxx> #include <svx/svdocapt.hxx> #include <sfx2/app.hxx> diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxxindex 7c096fd51d71..402143ac0a8c 100644--- a/sc/source/ui/drawfunc/fusel2.cxx+++ b/sc/source/ui/drawfunc/fusel2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fusel2.cxx,v $- * $Revision: 1.12.128.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -39,7 +36,7 @@ #include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx> #include <sfx2/dispatch.hxx>-#include <svx/outliner.hxx>+#include <editeng/outliner.hxx> #include "fusel.hxx" #include "tabvwsh.hxx"diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxxindex a96ce6c18980..a13cfc61d1c6 100644--- a/sc/source/ui/drawfunc/futext.cxx+++ b/sc/source/ui/drawfunc/futext.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: futext.cxx,v $- * $Revision: 1.28.128.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,17 +30,17 @@ #include <svx/svddef.hxx> #include <svx/svdoutl.hxx>-#include <svx/outlobj.hxx>+#include <editeng/outlobj.hxx> #include <svx/sdtaaitm.hxx> #include <svx/sdtacitm.hxx> #include <svx/svdotext.hxx>-#include <svx/unolingu.hxx>+#include <editeng/unolingu.hxx> #include <svx/svdocapt.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <svx/svxids.hrc>-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svl/itemset.hxx> #include "futext.hxx"diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxxindex 9570836e53fe..340e71faa71c 100644--- a/sc/source/ui/drawfunc/futext2.cxx+++ b/sc/source/ui/drawfunc/futext2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: futext2.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxxindex 2152abfd4f8b..534e68705fa8 100644--- a/sc/source/ui/drawfunc/futext3.cxx+++ b/sc/source/ui/drawfunc/futext3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: futext3.cxx,v $- * $Revision: 1.15.128.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -31,16 +28,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svx/editeng.hxx>-#include <svx/outlobj.hxx>+#include <editeng/editeng.hxx>+#include <editeng/outlobj.hxx> #include <svx/svdocapt.hxx> #include <svx/svdpage.hxx> #include <svx/svdundo.hxx> #include <svx/svdview.hxx>-#include <svx/editobj.hxx>+#include <editeng/editobj.hxx> #include <vcl/cursor.hxx> #include <sfx2/objsh.hxx>-#include <svx/writingmodeitem.hxx>+#include <editeng/writingmodeitem.hxx> #include "global.hxx" #include "drwlayer.hxx"diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxxindex 34c32fb8bc08..25cda28aaa9d 100644--- a/sc/source/ui/drawfunc/graphsh.cxx+++ b/sc/source/ui/drawfunc/graphsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: graphsh.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/makefile.mk b/sc/source/ui/drawfunc/makefile.mkindex 0e381849ab80..52f54b56edce 100644--- a/sc/source/ui/drawfunc/makefile.mk+++ b/sc/source/ui/drawfunc/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.10 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxxindex 9469cd43c96e..78948550aea6 100644--- a/sc/source/ui/drawfunc/mediash.cxx+++ b/sc/source/ui/drawfunc/mediash.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: mediash.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.srcindex 1f3a374fc34a..0cd8fdd54e4b 100644--- a/sc/source/ui/drawfunc/objdraw.src+++ b/sc/source/ui/drawfunc/objdraw.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: objdraw.src,v $- * $Revision: 1.72.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxxindex c9da807019c9..f9346dd8da88 100644--- a/sc/source/ui/drawfunc/oleobjsh.cxx+++ b/sc/source/ui/drawfunc/oleobjsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: oleobjsh.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,10 +32,10 @@ //------------------------------------------------------------------ -#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/fontwork.hxx> //CHINA001 #include <svx/labdlg.hxx>-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <svx/tabarea.hxx> #include <svx/tabline.hxx> //CHINA001 #include <svx/transfrm.hxx>diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxxindex feda9d1657f1..1d522fb3211e 100644--- a/sc/source/ui/formdlg/dwfunctr.cxx+++ b/sc/source/ui/formdlg/dwfunctr.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dwfunctr.cxx,v $- * $Revision: 1.15 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,7 +32,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svx/editview.hxx>+#include <editeng/editview.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx>diff --git a/sc/source/ui/formdlg/dwfunctr.hrc b/sc/source/ui/formdlg/dwfunctr.hrcindex 6f706ad7771d..388fea28b7ca 100644--- a/sc/source/ui/formdlg/dwfunctr.hrc+++ b/sc/source/ui/formdlg/dwfunctr.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dwfunctr.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/formdlg/dwfunctr.src b/sc/source/ui/formdlg/dwfunctr.srcindex ca06d8189ba5..6f8a054dd6ff 100644--- a/sc/source/ui/formdlg/dwfunctr.src+++ b/sc/source/ui/formdlg/dwfunctr.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dwfunctr.src,v $- * $Revision: 1.35 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxxindex e9d4a293888d..e493e3f7b00f 100644--- a/sc/source/ui/formdlg/formdata.cxx+++ b/sc/source/ui/formdlg/formdata.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formdata.cxx,v $- * $Revision: 1.6.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/formdlg/formdlgs.src b/sc/source/ui/formdlg/formdlgs.srcindex bc7a2fd573d3..e3550030c74e 100644--- a/sc/source/ui/formdlg/formdlgs.src+++ b/sc/source/ui/formdlg/formdlgs.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formdlgs.src,v $- * $Revision: 1.49 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxxindex f9146b96c04c..d9add14952a4 100644--- a/sc/source/ui/formdlg/formula.cxx+++ b/sc/source/ui/formdlg/formula.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formula.cxx,v $- * $Revision: 1.18.30.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/formdlg/makefile.mk b/sc/source/ui/formdlg/makefile.mkindex dd705c8085ff..339e8fa4d581 100644--- a/sc/source/ui/formdlg/makefile.mk+++ b/sc/source/ui/formdlg/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.6 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxxindex c6eedbc5f06e..a3b27ba21b1d 100644--- a/sc/source/ui/formdlg/privsplt.cxx+++ b/sc/source/ui/formdlg/privsplt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: privsplt.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxxindex e89069ade49a..8d966a78fa7f 100644--- a/sc/source/ui/inc/AccessibilityHints.hxx+++ b/sc/source/ui/inc/AccessibilityHints.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibilityHints.hxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxxindex ed57d453ef7b..38dfdc483886 100644--- a/sc/source/ui/inc/AccessibleCell.hxx+++ b/sc/source/ui/inc/AccessibleCell.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleCell.hxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,7 +34,7 @@ #include "viewdata.hxx" #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <unotools/accessiblerelationsethelper.hxx>-#include <svx/AccessibleStaticTextBase.hxx>+#include <editeng/AccessibleStaticTextBase.hxx> #include <comphelper/uno3.hxx> class ScTabViewShell;diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxxindex a246cf68e074..2bcef463480d 100644--- a/sc/source/ui/inc/AccessibleCellBase.hxx+++ b/sc/source/ui/inc/AccessibleCellBase.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleCellBase.hxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxxindex 4c79c4388e44..191f56c22d3d 100644--- a/sc/source/ui/inc/AccessibleContextBase.hxx+++ b/sc/source/ui/inc/AccessibleContextBase.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleContextBase.hxx,v $- * $Revision: 1.23.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxxindex d7fc64c75562..14f48b51efc1 100644--- a/sc/source/ui/inc/AccessibleCsvControl.hxx+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleCsvControl.hxx,v $- * $Revision: 1.15.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -41,7 +38,7 @@ #include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx>-#include <svx/AccessibleStaticTextBase.hxx>+#include <editeng/AccessibleStaticTextBase.hxx> #include <comphelper/uno3.hxx> #include "AccessibleContextBase.hxx" diff --git a/sc/source/ui/inc/AccessibleDataPilotControl.hxx b/sc/source/ui/inc/AccessibleDataPilotControl.hxxindex 526768799907..c86d598b6e9c 100644--- a/sc/source/ui/inc/AccessibleDataPilotControl.hxx+++ b/sc/source/ui/inc/AccessibleDataPilotControl.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDataPilotControl.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxxindex 41a7b7de4270..2ec612e0865b 100644--- a/sc/source/ui/inc/AccessibleDocument.hxx+++ b/sc/source/ui/inc/AccessibleDocument.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDocument.hxx,v $- * $Revision: 1.28 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxxindex 831c56e78df2..fc76a8d771cf 100644--- a/sc/source/ui/inc/AccessibleDocumentBase.hxx+++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDocumentBase.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxxindex af871def7b65..8ce9050c6094 100644--- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx+++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleDocumentPagePreview.hxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxxindex 633c4595efae..55bb92f13424 100644--- a/sc/source/ui/inc/AccessibleEditObject.hxx+++ b/sc/source/ui/inc/AccessibleEditObject.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleEditObject.hxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxxindex 1335541087ea..1e28670419a4 100644--- a/sc/source/ui/inc/AccessiblePageHeader.hxx+++ b/sc/source/ui/inc/AccessiblePageHeader.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessiblePageHeader.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,7 +30,7 @@ #define _SC_ACCESSIBLEPAGEHEADER_HXX #include "AccessibleContextBase.hxx"-#include <svx/svxenum.hxx>+#include <editeng/svxenum.hxx> class ScPreviewShell; class EditTextObject;diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxxindex 15a3c23c64b8..dbf7c126b617 100644--- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx+++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessiblePageHeaderArea.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,7 +32,7 @@ #ifndef _SC_ACCESSIBLE_CONTEXT_BASE_HXX #include "AccessibleContextBase.hxx" #endif-#include <svx/svxenum.hxx>+#include <editeng/svxenum.hxx> class EditTextObject; namespace accessibilitydiff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxxindex 1920d75f3671..47a2be3b6713 100644--- a/sc/source/ui/inc/AccessiblePreviewCell.hxx+++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessiblePreviewCell.hxx,v $- * $Revision: 1.11.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxxindex 5f275693e209..520abe7c53c3 100644--- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx+++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessiblePreviewHeaderCell.hxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxxindex a29db7ce00a2..6d9ae3c3025f 100644--- a/sc/source/ui/inc/AccessiblePreviewTable.hxx+++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessiblePreviewTable.hxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxxindex 0955e56f982f..87447285dea2 100644--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleSpreadsheet.hxx,v $- * $Revision: 1.30 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxxindex 4cb54dd02e3d..017ef4dfca3f 100644--- a/sc/source/ui/inc/AccessibleTableBase.hxx+++ b/sc/source/ui/inc/AccessibleTableBase.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleTableBase.hxx,v $- * $Revision: 1.24 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxxindex a1138e869d3b..0a61280a574a 100644--- a/sc/source/ui/inc/AccessibleText.hxx+++ b/sc/source/ui/inc/AccessibleText.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: AccessibleText.hxx,v $- * $Revision: 1.19.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,7 +31,7 @@ #include "textuno.hxx" #include "global.hxx" #include "viewdata.hxx"-#include <svx/svxenum.hxx>+#include <editeng/svxenum.hxx> #include <memory> diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxxindex aeae7c7cd85b..65c725da5675 100644--- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx+++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: ChartRangeSelectionListener.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxxindex fac00ea550e4..045e9bc86f41 100644--- a/sc/source/ui/inc/DrawModelBroadcaster.hxx+++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: DrawModelBroadcaster.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/IAnyRefDialog.hxx b/sc/source/ui/inc/IAnyRefDialog.hxxindex bd115b2ad1c0..70731ac8a1f7 100644--- a/sc/source/ui/inc/IAnyRefDialog.hxx+++ b/sc/source/ui/inc/IAnyRefDialog.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formula.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/ScDevChart.hxx b/sc/source/ui/inc/ScDevChart.hxxindex 08b528f790f5..a08a89da0570 100644--- a/sc/source/ui/inc/ScDevChart.hxx+++ b/sc/source/ui/inc/ScDevChart.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: ScDevChart.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/acredlin.hrc b/sc/source/ui/inc/acredlin.hrcindex ca6f6031b47a..b21676ee6ae9 100644--- a/sc/source/ui/inc/acredlin.hrc+++ b/sc/source/ui/inc/acredlin.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: acredlin.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxxindex cdde064fc588..a077129c374c 100644--- a/sc/source/ui/inc/acredlin.hxx+++ b/sc/source/ui/inc/acredlin.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: acredlin.hxx,v $- * $Revision: 1.8.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxxindex 18125076d5cf..0e7560fe0c50 100644--- a/sc/source/ui/inc/anyrefdg.hxx+++ b/sc/source/ui/inc/anyrefdg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: anyrefdg.hxx,v $- * $Revision: 1.11.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxxindex e00fa9905216..608f95a3bb51 100644--- a/sc/source/ui/inc/areasave.hxx+++ b/sc/source/ui/inc/areasave.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: areasave.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxxindex 9b7e7234123e..08c6e3cf0a91 100644--- a/sc/source/ui/inc/areasdlg.hxx+++ b/sc/source/ui/inc/areasdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: areasdlg.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxxindex a26929dc92ea..aee63d682a26 100644--- a/sc/source/ui/inc/asciiopt.hxx+++ b/sc/source/ui/inc/asciiopt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: asciiopt.hxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/attrdlg.hrc b/sc/source/ui/inc/attrdlg.hrcindex 9f85196a030b..f43c1cb30b86 100644--- a/sc/source/ui/inc/attrdlg.hrc+++ b/sc/source/ui/inc/attrdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: attrdlg.hrc,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxxindex fe881f988813..752ee01ddd62 100644--- a/sc/source/ui/inc/attrdlg.hxx+++ b/sc/source/ui/inc/attrdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: attrdlg.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxxindex b03c2d205782..75059f4f88cc 100644--- a/sc/source/ui/inc/auditsh.hxx+++ b/sc/source/ui/inc/auditsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: auditsh.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxxindex 7e5f95cfa090..52a033c202b2 100644--- a/sc/source/ui/inc/autofmt.hxx+++ b/sc/source/ui/inc/autofmt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: autofmt.hxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxxindex a37277e11bf2..5540ecf87aac 100644--- a/sc/source/ui/inc/autostyl.hxx+++ b/sc/source/ui/inc/autostyl.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: autostyl.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxxindex ba88647d952e..8de5dafe7768 100644--- a/sc/source/ui/inc/cbutton.hxx+++ b/sc/source/ui/inc/cbutton.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cbutton.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxxindex 90adbe40d2d2..563e18d96656 100644--- a/sc/source/ui/inc/cellsh.hxx+++ b/sc/source/ui/inc/cellsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellsh.hxx,v $- * $Revision: 1.9.90.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxxindex c039b9722002..95efd03f3b76 100644--- a/sc/source/ui/inc/chartsh.hxx+++ b/sc/source/ui/inc/chartsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartsh.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxxindex 21fb8582d13d..1b13ee224d77 100644--- a/sc/source/ui/inc/client.hxx+++ b/sc/source/ui/inc/client.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: client.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxxindex 3b825ad1908d..587412defea2 100644--- a/sc/source/ui/inc/colrowba.hxx+++ b/sc/source/ui/inc/colrowba.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: colrowba.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/condfrmt.hrc b/sc/source/ui/inc/condfrmt.hrcindex 943e41219e7b..099d82b2fa85 100644--- a/sc/source/ui/inc/condfrmt.hrc+++ b/sc/source/ui/inc/condfrmt.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: condfrmt.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/condfrmt.hxx b/sc/source/ui/inc/condfrmt.hxxindex db36fef2066a..ecd4c529d57a 100644--- a/sc/source/ui/inc/condfrmt.hxx+++ b/sc/source/ui/inc/condfrmt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: condfrmt.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/conflictsdlg.hrc b/sc/source/ui/inc/conflictsdlg.hrcindex 5caea216c396..7935a6ee21d7 100644--- a/sc/source/ui/inc/conflictsdlg.hrc+++ b/sc/source/ui/inc/conflictsdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: conflictsdlg.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxxindex 98a622097781..faeecb370c78 100644--- a/sc/source/ui/inc/conflictsdlg.hxx+++ b/sc/source/ui/inc/conflictsdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: conflictsdlg.hxx,v $- * $Revision: 1.4.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxxindex a4db4575f64d..e82e2619cce0 100644--- a/sc/source/ui/inc/consdlg.hxx+++ b/sc/source/ui/inc/consdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: consdlg.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxxindex 0553cee15d29..b7d4d292c406 100644--- a/sc/source/ui/inc/content.hxx+++ b/sc/source/ui/inc/content.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: content.hxx,v $- * $Revision: 1.13.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxxindex 185ba543e4f6..424326565619 100644--- a/sc/source/ui/inc/corodlg.hxx+++ b/sc/source/ui/inc/corodlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: corodlg.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxxindex d1357a5218ce..20dd79f359ad 100644--- a/sc/source/ui/inc/crdlg.hxx+++ b/sc/source/ui/inc/crdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: crdlg.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/crnrdlg.hrc b/sc/source/ui/inc/crnrdlg.hrcindex 1c11a040b3c3..1d27531f9bc1 100644--- a/sc/source/ui/inc/crnrdlg.hrc+++ b/sc/source/ui/inc/crnrdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: crnrdlg.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxxindex 5ae033947b2f..e45ff4403633 100644--- a/sc/source/ui/inc/crnrdlg.hxx+++ b/sc/source/ui/inc/crnrdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: crnrdlg.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxxindex 005a3e70dd7c..c38abfb83598 100644--- a/sc/source/ui/inc/csvcontrol.hxx+++ b/sc/source/ui/inc/csvcontrol.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: csvcontrol.hxx,v $- * $Revision: 1.15 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxxindex 583c4fd2c414..fb6d687533e6 100644--- a/sc/source/ui/inc/csvgrid.hxx+++ b/sc/source/ui/inc/csvgrid.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: csvgrid.hxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxxindex cb79644f3aed..5ddeb1f1ceba 100644--- a/sc/source/ui/inc/csvruler.hxx+++ b/sc/source/ui/inc/csvruler.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: csvruler.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/csvsplits.hxx b/sc/source/ui/inc/csvsplits.hxxindex aff9e75b72cc..4685269936d5 100644--- a/sc/source/ui/inc/csvsplits.hxx+++ b/sc/source/ui/inc/csvsplits.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: csvsplits.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxxindex 6e9c6b379ca9..205e8b50cad1 100644--- a/sc/source/ui/inc/csvtablebox.hxx+++ b/sc/source/ui/inc/csvtablebox.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: csvtablebox.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxxindex 9728180206c8..13d7e91bdceb 100644--- a/sc/source/ui/inc/dapidata.hxx+++ b/sc/source/ui/inc/dapidata.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dapidata.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxxindex 577a78158a60..07659b1dbc59 100644--- a/sc/source/ui/inc/dapitype.hxx+++ b/sc/source/ui/inc/dapitype.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dapitype.hxx,v $- * $Revision: 1.4.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxxindex 1eaf2200de10..efdd29b44738 100644--- a/sc/source/ui/inc/dbdocfun.hxx+++ b/sc/source/ui/inc/dbdocfun.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbdocfun.hxx,v $- * $Revision: 1.10.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxxindex 875576a22889..87df03b8ecd9 100644--- a/sc/source/ui/inc/dbfunc.hxx+++ b/sc/source/ui/inc/dbfunc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbfunc.hxx,v $- * $Revision: 1.12.100.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/dbnamdlg.hrc b/sc/source/ui/inc/dbnamdlg.hrcindex 8fe17ccfc373..fd0205e3bbed 100644--- a/sc/source/ui/inc/dbnamdlg.hrc+++ b/sc/source/ui/inc/dbnamdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbnamdlg.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxxindex d8d6e34a0885..cd878c651d6c 100644--- a/sc/source/ui/inc/dbnamdlg.hxx+++ b/sc/source/ui/inc/dbnamdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbnamdlg.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxxindex e373fe3dade5..e1a816e78c0f 100644--- a/sc/source/ui/inc/delcldlg.hxx+++ b/sc/source/ui/inc/delcldlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: delcldlg.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxxindex 73266bbac0ee..8773b9c78f3a 100644--- a/sc/source/ui/inc/delcodlg.hxx+++ b/sc/source/ui/inc/delcodlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: delcodlg.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxxindex 3e9ff5258682..df4ff685816f 100644--- a/sc/source/ui/inc/docfunc.hxx+++ b/sc/source/ui/inc/docfunc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docfunc.hxx,v $- * $Revision: 1.19.100.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxxindex 548125bffd9a..da5e5e7ffbff 100644--- a/sc/source/ui/inc/docsh.hxx+++ b/sc/source/ui/inc/docsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docsh.hxx,v $- * $Revision: 1.50.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/dpcontrol.hrc b/sc/source/ui/inc/dpcontrol.hrcindex 2275b601c17a..687f999970ad 100644--- a/sc/source/ui/inc/dpcontrol.hrc+++ b/sc/source/ui/inc/dpcontrol.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: protectiondlg.hrc,v $- * $Revision: 1.1.2.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxxindex 1b99f6a38842..40e6167aee48 100644--- a/sc/source/ui/inc/dpcontrol.hxx+++ b/sc/source/ui/inc/dpcontrol.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: document.hxx,v $- * $Revision: 1.115.36.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxxindex a1444a358031..52f2e7c8f592 100644--- a/sc/source/ui/inc/dpgroupdlg.hxx+++ b/sc/source/ui/inc/dpgroupdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dpgroupdlg.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxxindex 8b3f0705324c..d417d1427dda 100644--- a/sc/source/ui/inc/drawsh.hxx+++ b/sc/source/ui/inc/drawsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawsh.hxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/drawutil.hxx b/sc/source/ui/inc/drawutil.hxxindex 6789c3d25b56..67e1c0ba836f 100644--- a/sc/source/ui/inc/drawutil.hxx+++ b/sc/source/ui/inc/drawutil.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawutil.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxxindex 1890bb1247c4..fa6b03638551 100644--- a/sc/source/ui/inc/drawview.hxx+++ b/sc/source/ui/inc/drawview.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawview.hxx,v $- * $Revision: 1.12.126.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxxindex 4c29ca20a9ad..7f7473eb7519 100644--- a/sc/source/ui/inc/drformsh.hxx+++ b/sc/source/ui/inc/drformsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drformsh.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxxindex 423b80d9ea01..5c493df2f769 100644--- a/sc/source/ui/inc/drtxtob.hxx+++ b/sc/source/ui/inc/drtxtob.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drtxtob.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxxindex b7a20cb8b113..9a1175d3310d 100644--- a/sc/source/ui/inc/drwtrans.hxx+++ b/sc/source/ui/inc/drwtrans.hxx@@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drwtrans.hxx,v $- *- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxxindex 6a468a415b44..800696970fbd 100644--- a/sc/source/ui/inc/dwfunctr.hxx+++ b/sc/source/ui/inc/dwfunctr.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dwfunctr.hxx,v $- * $Revision: 1.7.46.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxxindex d1bb36b786bf..4b6e8d0596bc 100644--- a/sc/source/ui/inc/editable.hxx+++ b/sc/source/ui/inc/editable.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: editable.hxx,v $- * $Revision: 1.4.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxxindex 2dbbdec9b012..9836e94aa215 100644--- a/sc/source/ui/inc/editfield.hxx+++ b/sc/source/ui/inc/editfield.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: editfield.hxx,v $- * $Revision: 1.4.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxxindex a0903a59abaa..ebada82a32fb 100644--- a/sc/source/ui/inc/editsh.hxx+++ b/sc/source/ui/inc/editsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: editsh.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ #include <tools/link.hxx> #include "shellids.hxx"-#include <svx/editview.hxx>+#include <editeng/editview.hxx> class EditView; class ScViewData;diff --git a/sc/source/ui/inc/expftext.hxx b/sc/source/ui/inc/expftext.hxxindex e8456ff4ed60..170deba5b403 100644--- a/sc/source/ui/inc/expftext.hxx+++ b/sc/source/ui/inc/expftext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: expftext.hxx,v $- * $Revision: 1.4.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxxindex ae2dbf1ffb52..45a573e72157 100644--- a/sc/source/ui/inc/fieldwnd.hxx+++ b/sc/source/ui/inc/fieldwnd.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fieldwnd.hxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxxindex e7f8eafa7f17..7f2fb046093c 100644--- a/sc/source/ui/inc/filldlg.hxx+++ b/sc/source/ui/inc/filldlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filldlg.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxxindex 7e9ed68706ef..068a48b8d689 100644--- a/sc/source/ui/inc/filtdlg.hxx+++ b/sc/source/ui/inc/filtdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filtdlg.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrcindex 65e965b6bea3..508c5af9aab5 100644--- a/sc/source/ui/inc/filter.hrc+++ b/sc/source/ui/inc/filter.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filter.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxxindex 424493b2506a..92e3833dff7d 100644--- a/sc/source/ui/inc/foptmgr.hxx+++ b/sc/source/ui/inc/foptmgr.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: foptmgr.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxxindex 06e819a031ef..e45fb99c54ef 100644--- a/sc/source/ui/inc/formatsh.hxx+++ b/sc/source/ui/inc/formatsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formatsh.hxx,v $- * $Revision: 1.6.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxxindex c36a625543c5..72c7862a007b 100644--- a/sc/source/ui/inc/formdata.hxx+++ b/sc/source/ui/inc/formdata.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formdata.hxx,v $- * $Revision: 1.3.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxxindex d490e37b93ca..f863662f7cd0 100644--- a/sc/source/ui/inc/formula.hxx+++ b/sc/source/ui/inc/formula.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formula.hxx,v $- * $Revision: 1.5.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxxindex cfd21532cc6e..686f2a00ae5b 100644--- a/sc/source/ui/inc/fuconarc.hxx+++ b/sc/source/ui/inc/fuconarc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuconarc.hxx,v $- * $Revision: 1.4.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxxindex 085cad8d7815..e6ecbfb2e2c3 100644--- a/sc/source/ui/inc/fuconcustomshape.hxx+++ b/sc/source/ui/inc/fuconcustomshape.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuconcustomshape.hxx,v $- * $Revision: 1.5.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxxindex bcfb20aa6896..3a27ffcc2f69 100644--- a/sc/source/ui/inc/fuconpol.hxx+++ b/sc/source/ui/inc/fuconpol.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuconpol.hxx,v $- * $Revision: 1.4.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxxindex ddd7579782a7..fb609e4a7681 100644--- a/sc/source/ui/inc/fuconrec.hxx+++ b/sc/source/ui/inc/fuconrec.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuconrec.hxx,v $- * $Revision: 1.4.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxxindex daae26dd84ed..28b20c7a94df 100644--- a/sc/source/ui/inc/fuconstr.hxx+++ b/sc/source/ui/inc/fuconstr.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuconstr.hxx,v $- * $Revision: 1.3.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxxindex b5ff2bcce5e0..ffe2c1e9722b 100644--- a/sc/source/ui/inc/fuconuno.hxx+++ b/sc/source/ui/inc/fuconuno.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuconuno.hxx,v $- * $Revision: 1.4.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxxindex 24355c3a8560..2344ca629c2f 100644--- a/sc/source/ui/inc/fudraw.hxx+++ b/sc/source/ui/inc/fudraw.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fudraw.hxx,v $- * $Revision: 1.6.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fuedipo.hxx b/sc/source/ui/inc/fuedipo.hxxindex e2cdedef73fc..5138a134cc2e 100644--- a/sc/source/ui/inc/fuedipo.hxx+++ b/sc/source/ui/inc/fuedipo.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuedipo.hxx,v $- * $Revision: 1.3.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxxindex bef04f585794..4dda7cb2b5ba 100644--- a/sc/source/ui/inc/fuinsert.hxx+++ b/sc/source/ui/inc/fuinsert.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fuinsert.hxx,v $- * $Revision: 1.4.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxxindex 8983154562a0..fcadc54768e8 100644--- a/sc/source/ui/inc/fumark.hxx+++ b/sc/source/ui/inc/fumark.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fumark.hxx,v $- * $Revision: 1.3.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxxindex fc8f1813be56..d8b5c7796971 100644--- a/sc/source/ui/inc/funcpage.hxx+++ b/sc/source/ui/inc/funcpage.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: funcpage.hxx,v $- * $Revision: 1.4.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/funcutl.hxx b/sc/source/ui/inc/funcutl.hxxindex b511c105e8ca..715c9d36a101 100644--- a/sc/source/ui/inc/funcutl.hxx+++ b/sc/source/ui/inc/funcutl.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: funcutl.hxx,v $- * $Revision: 1.5.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxxindex 8411b1a3fbfc..6d9b7ae2af5a 100644--- a/sc/source/ui/inc/fupoor.hxx+++ b/sc/source/ui/inc/fupoor.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fupoor.hxx,v $- * $Revision: 1.7.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxxindex c0366292a2c0..c12b5739d61c 100644--- a/sc/source/ui/inc/fusel.hxx+++ b/sc/source/ui/inc/fusel.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fusel.hxx,v $- * $Revision: 1.4.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxxindex 488b1ecf2508..41a41b054554 100644--- a/sc/source/ui/inc/futext.hxx+++ b/sc/source/ui/inc/futext.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: futext.hxx,v $- * $Revision: 1.7.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxxindex 1b05796b397a..db9d04096142 100644--- a/sc/source/ui/inc/graphsh.hxx+++ b/sc/source/ui/inc/graphsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: graphsh.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/gridmerg.hxx b/sc/source/ui/inc/gridmerg.hxxindex 5d1c431bc371..dd656b948a6b 100644--- a/sc/source/ui/inc/gridmerg.hxx+++ b/sc/source/ui/inc/gridmerg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: gridmerg.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxxindex 68f7ece9a249..0f8e479f6e54 100644--- a/sc/source/ui/inc/gridwin.hxx+++ b/sc/source/ui/inc/gridwin.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: gridwin.hxx,v $- * $Revision: 1.30 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxxindex ec721bb117c4..38b96f21e90e 100644--- a/sc/source/ui/inc/groupdlg.hxx+++ b/sc/source/ui/inc/groupdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: groupdlg.hxx,v $- * $Revision: 1.4.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxxindex 561dc28e6fc0..02a4df09afd2 100644--- a/sc/source/ui/inc/hdrcont.hxx+++ b/sc/source/ui/inc/hdrcont.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hdrcont.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxxindex 188b141a00f2..1f1ea7242b17 100644--- a/sc/source/ui/inc/hfedtdlg.hxx+++ b/sc/source/ui/inc/hfedtdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hfedtdlg.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/highred.hrc b/sc/source/ui/inc/highred.hrcindex de814a43e7f4..426c9ba29ee2 100644--- a/sc/source/ui/inc/highred.hrc+++ b/sc/source/ui/inc/highred.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: highred.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxxindex 0250c2bafe1b..b500473b2071 100644--- a/sc/source/ui/inc/highred.hxx+++ b/sc/source/ui/inc/highred.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: highred.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxxindex 51e193ffd45c..2fd9e7897ab6 100644--- a/sc/source/ui/inc/hintwin.hxx+++ b/sc/source/ui/inc/hintwin.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hintwin.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxxindex 9c38a54a3c05..6182d30dc96e 100644--- a/sc/source/ui/inc/hiranges.hxx+++ b/sc/source/ui/inc/hiranges.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hiranges.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxxindex 57606d2eb37a..01e10f9a3983 100644--- a/sc/source/ui/inc/imoptdlg.hxx+++ b/sc/source/ui/inc/imoptdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: imoptdlg.hxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxxindex fb4dcaa83958..fe4177df7cae 100644--- a/sc/source/ui/inc/impex.hxx+++ b/sc/source/ui/inc/impex.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: impex.hxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxxindex 2ed7b6d7c807..bcc5ba0dd396 100644--- a/sc/source/ui/inc/inputhdl.hxx+++ b/sc/source/ui/inc/inputhdl.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: inputhdl.hxx,v $- * $Revision: 1.15.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,7 +32,7 @@ #include "address.hxx" #include <tools/fract.hxx> #include <tools/gen.hxx>-#include <svx/svxenum.hxx>+#include <editeng/svxenum.hxx> class ScDocument; class ScTabView;diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxxindex a5b7c4d94e5f..236d34a8254f 100644--- a/sc/source/ui/inc/inputwin.hxx+++ b/sc/source/ui/inc/inputwin.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: inputwin.hxx,v $- * $Revision: 1.17.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxxindex ae63a1bfe282..fd8c090cfd33 100644--- a/sc/source/ui/inc/inscldlg.hxx+++ b/sc/source/ui/inc/inscldlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: inscldlg.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxxindex 5549dc8ba795..ffdccaba6a10 100644--- a/sc/source/ui/inc/inscodlg.hxx+++ b/sc/source/ui/inc/inscodlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: inscodlg.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/instbdlg.hrc b/sc/source/ui/inc/instbdlg.hrcindex 77970963b637..08bff85388dd 100644--- a/sc/source/ui/inc/instbdlg.hrc+++ b/sc/source/ui/inc/instbdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: instbdlg.hrc,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxxindex 419a3beb2cfc..660d16b62cca 100644--- a/sc/source/ui/inc/instbdlg.hxx+++ b/sc/source/ui/inc/instbdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: instbdlg.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/invmerge.hxx b/sc/source/ui/inc/invmerge.hxxindex c8609da90343..49dfbc730fee 100644--- a/sc/source/ui/inc/invmerge.hxx+++ b/sc/source/ui/inc/invmerge.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: invmerge.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxxindex 786d51a6e720..fa288c609070 100644--- a/sc/source/ui/inc/lbseldlg.hxx+++ b/sc/source/ui/inc/lbseldlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lbseldlg.hxx,v $- * $Revision: 1.4.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/linkarea.hrc b/sc/source/ui/inc/linkarea.hrcindex 041deac29a2b..bc906fdb14ad 100644--- a/sc/source/ui/inc/linkarea.hrc+++ b/sc/source/ui/inc/linkarea.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: linkarea.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxxindex 947a893b8f93..c90e1ea47e94 100644--- a/sc/source/ui/inc/linkarea.hxx+++ b/sc/source/ui/inc/linkarea.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: linkarea.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxxindex 9581ec80213a..7e37c6cce554 100644--- a/sc/source/ui/inc/lnktrans.hxx+++ b/sc/source/ui/inc/lnktrans.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lnktrans.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/makefile.mk b/sc/source/ui/inc/makefile.mkindex 3c33d006edf9..1b35ca49549d 100644--- a/sc/source/ui/inc/makefile.mk+++ b/sc/source/ui/inc/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.3 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxxindex d8e2e6def16a..e297dc11777a 100644--- a/sc/source/ui/inc/mediash.hxx+++ b/sc/source/ui/inc/mediash.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: mediash.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrcindex fc04f2b5ed1f..908a6bd2221c 100644--- a/sc/source/ui/inc/miscdlgs.hrc+++ b/sc/source/ui/inc/miscdlgs.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: miscdlgs.hrc,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxxindex 44514766601d..7bc33b3af96b 100644--- a/sc/source/ui/inc/msgpool.hxx+++ b/sc/source/ui/inc/msgpool.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: msgpool.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,7 +29,7 @@ #define SC_MSGPOOL_HXX #include "scitems.hxx"-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <svl/itempool.hxx>diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxxindex 57244f33a83a..f88f57a74e58 100644--- a/sc/source/ui/inc/mtrindlg.hxx+++ b/sc/source/ui/inc/mtrindlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: mtrindlg.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxxindex b48fa7fdffa2..d5ce7726243f 100644--- a/sc/source/ui/inc/mvtabdlg.hxx+++ b/sc/source/ui/inc/mvtabdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: mvtabdlg.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxxindex d8ff95106f62..e4e053fe0bcf 100644--- a/sc/source/ui/inc/namecrea.hxx+++ b/sc/source/ui/inc/namecrea.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: namecrea.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrcindex b1e32952504d..b2eec6879ec3 100644--- a/sc/source/ui/inc/namedlg.hrc+++ b/sc/source/ui/inc/namedlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: namedlg.hrc,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxxindex 5afa0d244987..b122c57a19fd 100644--- a/sc/source/ui/inc/namedlg.hxx+++ b/sc/source/ui/inc/namedlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: namedlg.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxxindex 81ae6d9254d0..3286af7b81bc 100644--- a/sc/source/ui/inc/namepast.hxx+++ b/sc/source/ui/inc/namepast.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: namepast.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxxindex 76b3d0debacf..b464bd6cc9ad 100644--- a/sc/source/ui/inc/navcitem.hxx+++ b/sc/source/ui/inc/navcitem.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: navcitem.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxxindex b14e668fabd0..8d53742b6f1e 100644--- a/sc/source/ui/inc/navipi.hxx+++ b/sc/source/ui/inc/navipi.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: navipi.hxx,v $- * $Revision: 1.13.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/navsett.hxx b/sc/source/ui/inc/navsett.hxxindex 24762c4c90d7..896c64606646 100644--- a/sc/source/ui/inc/navsett.hxx+++ b/sc/source/ui/inc/navsett.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: navsett.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxxindex ccc173d299f5..65e36565ceb8 100644--- a/sc/source/ui/inc/notemark.hxx+++ b/sc/source/ui/inc/notemark.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: notemark.hxx,v $- * $Revision: 1.5.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxxindex 16db6ea92db9..fa4f71729c97 100644--- a/sc/source/ui/inc/oleobjsh.hxx+++ b/sc/source/ui/inc/oleobjsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: oleobjsh.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxxindex 33a6e854b9d9..444774ed2068 100644--- a/sc/source/ui/inc/olinefun.hxx+++ b/sc/source/ui/inc/olinefun.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: olinefun.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxxindex d69d945b12e5..104f9e8f11da 100644--- a/sc/source/ui/inc/olinewin.hxx+++ b/sc/source/ui/inc/olinewin.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: olinewin.hxx,v $- * $Revision: 1.11.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/opredlin.hrc b/sc/source/ui/inc/opredlin.hrcindex bdd723964d7d..2b52d8b46118 100644--- a/sc/source/ui/inc/opredlin.hrc+++ b/sc/source/ui/inc/opredlin.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: opredlin.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxxindex 144ad93726e7..0573ecb86f1e 100644--- a/sc/source/ui/inc/opredlin.hxx+++ b/sc/source/ui/inc/opredlin.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: opredlin.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrcindex e55323937889..00cfdb2c6d5a 100644--- a/sc/source/ui/inc/optdlg.hrc+++ b/sc/source/ui/inc/optdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optdlg.hrc,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/optload.hrc b/sc/source/ui/inc/optload.hrcindex b972f7c3bc3c..992bb8c737e4 100644--- a/sc/source/ui/inc/optload.hrc+++ b/sc/source/ui/inc/optload.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optload.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/optload.hxx b/sc/source/ui/inc/optload.hxxindex c6c1fc11ff0f..93d5fefa8358 100644--- a/sc/source/ui/inc/optload.hxx+++ b/sc/source/ui/inc/optload.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optload.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/optsolver.hrc b/sc/source/ui/inc/optsolver.hrcindex 013237737448..9df8eea1d7f4 100644--- a/sc/source/ui/inc/optsolver.hrc+++ b/sc/source/ui/inc/optsolver.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optsolver.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxxindex 3fc71d5d9b75..bbd98f1d1818 100644--- a/sc/source/ui/inc/optsolver.hxx+++ b/sc/source/ui/inc/optsolver.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optsolver.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxxindex 80da3d20982e..8d512898afd3 100644--- a/sc/source/ui/inc/output.hxx+++ b/sc/source/ui/inc/output.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: output.hxx,v $- * $Revision: 1.21 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/pagedata.hxx b/sc/source/ui/inc/pagedata.hxxindex 5a5819d88deb..bcd85c8f5a96 100644--- a/sc/source/ui/inc/pagedata.hxx+++ b/sc/source/ui/inc/pagedata.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pagedata.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxxindex 087c8937de9d..ae02fdb38114 100644--- a/sc/source/ui/inc/parawin.hxx+++ b/sc/source/ui/inc/parawin.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: parawin.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxxindex 4009f06417dc..426f95399b33 100644--- a/sc/source/ui/inc/pfiltdlg.hxx+++ b/sc/source/ui/inc/pfiltdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pfiltdlg.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -53,8 +50,8 @@ #ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> #endif-#include "global.hxx" // -> ScQueryParam #include "address.hxx"+#include "queryparam.hxx" //------------------------------------------------------------------ diff --git a/sc/source/ui/inc/pfuncache.hxx b/sc/source/ui/inc/pfuncache.hxxindex a35084d453d6..365df0acc38b 100644--- a/sc/source/ui/inc/pfuncache.hxx+++ b/sc/source/ui/inc/pfuncache.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pfuncache.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxxindex a56858c6679a..f367b4cc4f1f 100644--- a/sc/source/ui/inc/pgbrksh.hxx+++ b/sc/source/ui/inc/pgbrksh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pgbrksh.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxxindex c03a5259b42f..2d3a21fa9756 100644--- a/sc/source/ui/inc/pivotsh.hxx+++ b/sc/source/ui/inc/pivotsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pivotsh.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/pntlock.hxx b/sc/source/ui/inc/pntlock.hxxindex 73f01a7f3254..60a7502c9734 100644--- a/sc/source/ui/inc/pntlock.hxx+++ b/sc/source/ui/inc/pntlock.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pntlock.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxxindex a207c5f44697..8ac0fba4e80d 100644--- a/sc/source/ui/inc/popmenu.hxx+++ b/sc/source/ui/inc/popmenu.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: popmenu.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxxindex 413d37da2925..87d15dcdaf86 100644--- a/sc/source/ui/inc/preview.hxx+++ b/sc/source/ui/inc/preview.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: preview.hxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxxindex 0d2e4411c9b4..15b477abad3c 100644--- a/sc/source/ui/inc/prevloc.hxx+++ b/sc/source/ui/inc/prevloc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: prevloc.hxx,v $- * $Revision: 1.12.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxxindex 6b98d2c51754..7ff97f8d0152 100644--- a/sc/source/ui/inc/prevwsh.hxx+++ b/sc/source/ui/inc/prevwsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: prevwsh.hxx,v $- * $Revision: 1.13.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxxindex fd607975ff47..e3966bdc3d37 100644--- a/sc/source/ui/inc/printfun.hxx+++ b/sc/source/ui/inc/printfun.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: printfun.hxx,v $- * $Revision: 1.16 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxxindex 901fa6c87eb9..6194a4342849 100644--- a/sc/source/ui/inc/privsplt.hxx+++ b/sc/source/ui/inc/privsplt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: privsplt.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/protectiondlg.hrc b/sc/source/ui/inc/protectiondlg.hrcindex 79285d3ce125..52e57040922c 100644--- a/sc/source/ui/inc/protectiondlg.hrc+++ b/sc/source/ui/inc/protectiondlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: protectiondlg.hrc,v $- * $Revision: 1.1.2.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxxindex 36330498c941..d7d555ff5ac5 100644--- a/sc/source/ui/inc/protectiondlg.hxx+++ b/sc/source/ui/inc/protectiondlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: protectiondlg.hxx,v $- * $Revision: 1.1.2.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxxindex 6b9aa62c37a3..ef245ebf26cf 100644--- a/sc/source/ui/inc/pvfundlg.hxx+++ b/sc/source/ui/inc/pvfundlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pvfundlg.hxx,v $- * $Revision: 1.7.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxxindex c77364d3761f..c74b9e028d2f 100644--- a/sc/source/ui/inc/pvlaydlg.hxx+++ b/sc/source/ui/inc/pvlaydlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pvlaydlg.hxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxxindex 52495109a499..e7e064359349 100644--- a/sc/source/ui/inc/redcom.hxx+++ b/sc/source/ui/inc/redcom.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: redcom.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxxindex bc43aedf918f..617d7c0a669a 100644--- a/sc/source/ui/inc/reffact.hxx+++ b/sc/source/ui/inc/reffact.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: reffact.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/refundo.hxx b/sc/source/ui/inc/refundo.hxxindex f3250e708b4c..87b5330e0f96 100644--- a/sc/source/ui/inc/refundo.hxx+++ b/sc/source/ui/inc/refundo.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: refundo.hxx,v $- * $Revision: 1.5.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/retypepassdlg.hrc b/sc/source/ui/inc/retypepassdlg.hrcindex fe0f7e8a760a..f027b6bc7ded 100644--- a/sc/source/ui/inc/retypepassdlg.hrc+++ b/sc/source/ui/inc/retypepassdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: retypepassdlg.hrc,v $- * $Revision: 1.1.2.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxxindex 657773d112f7..59753d8d386b 100644--- a/sc/source/ui/inc/retypepassdlg.hxx+++ b/sc/source/ui/inc/retypepassdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: retypepassdlg.hxx,v $- * $Revision: 1.1.2.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxxindex f9916cbbde68..225fd01451df 100644--- a/sc/source/ui/inc/rfindlst.hxx+++ b/sc/source/ui/inc/rfindlst.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: rfindlst.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxxindex f3dbf950a296..6281bb58b02c 100644--- a/sc/source/ui/inc/scendlg.hxx+++ b/sc/source/ui/inc/scendlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scendlg.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/scui_def.hxx b/sc/source/ui/inc/scui_def.hxxindex e2a11bb3204c..ca34ab0775b2 100644--- a/sc/source/ui/inc/scui_def.hxx+++ b/sc/source/ui/inc/scui_def.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scui_def.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxxindex 89b7ff9f8a0a..a1f73458c3a0 100644--- a/sc/source/ui/inc/scuiasciiopt.hxx+++ b/sc/source/ui/inc/scuiasciiopt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scuiasciiopt.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxxindex 3722a237ef9f..84a408267b20 100644--- a/sc/source/ui/inc/scuiautofmt.hxx+++ b/sc/source/ui/inc/scuiautofmt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scuiautofmt.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxxindex 6e229fb6a451..957d174a3deb 100644--- a/sc/source/ui/inc/scuiimoptdlg.hxx+++ b/sc/source/ui/inc/scuiimoptdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scuiimoptdlg.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxxindex 9c9ad413a00b..99bd6c2a805a 100644--- a/sc/source/ui/inc/scuitphfedit.hxx+++ b/sc/source/ui/inc/scuitphfedit.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scuitphfedit.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxxindex 08057bed4fd0..ad12d9c743ad 100644--- a/sc/source/ui/inc/select.hxx+++ b/sc/source/ui/inc/select.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: select.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxxindex def589536317..cbdc6b1faff7 100644--- a/sc/source/ui/inc/selectionstate.hxx+++ b/sc/source/ui/inc/selectionstate.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: selectionstate.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -31,7 +28,7 @@ #ifndef SC_SELECTIONSTATE_HXX #define SC_SELECTIONSTATE_HXX -#include <svx/editdata.hxx>+#include <editeng/editdata.hxx> #include "rangelst.hxx" // ============================================================================diff --git a/sc/source/ui/inc/seltrans.hxx b/sc/source/ui/inc/seltrans.hxxindex a8d44ae4c936..c695c918dad0 100644--- a/sc/source/ui/inc/seltrans.hxx+++ b/sc/source/ui/inc/seltrans.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: seltrans.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxxindex 7cd6c04bc91e..68e807461cad 100644--- a/sc/source/ui/inc/servobj.hxx+++ b/sc/source/ui/inc/servobj.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: servobj.hxx,v $- * $Revision: 1.6.46.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/sharedocdlg.hrc b/sc/source/ui/inc/sharedocdlg.hrcindex 2c693be939d1..cc38e81bbddb 100644--- a/sc/source/ui/inc/sharedocdlg.hrc+++ b/sc/source/ui/inc/sharedocdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sharedocdlg.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxxindex 92fdde653466..52c2f393b19a 100644--- a/sc/source/ui/inc/sharedocdlg.hxx+++ b/sc/source/ui/inc/sharedocdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sharedocdlg.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxxindex ec8140734f8c..6c89c43b3a51 100644--- a/sc/source/ui/inc/shtabdlg.hxx+++ b/sc/source/ui/inc/shtabdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: shtabdlg.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/simpref.hrc b/sc/source/ui/inc/simpref.hrcindex 20c7cd0eb083..d6fb6d4412eb 100644--- a/sc/source/ui/inc/simpref.hrc+++ b/sc/source/ui/inc/simpref.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: simpref.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxxindex 127e3ac2bc56..ba5b8ca287c3 100644--- a/sc/source/ui/inc/simpref.hxx+++ b/sc/source/ui/inc/simpref.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: simpref.hxx,v $- * $Revision: 1.6.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/sizedev.hxx b/sc/source/ui/inc/sizedev.hxxindex 5df41629ba01..615755be0240 100644--- a/sc/source/ui/inc/sizedev.hxx+++ b/sc/source/ui/inc/sizedev.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sizedev.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/solveroptions.hrc b/sc/source/ui/inc/solveroptions.hrcindex e56ad8a71213..e3be150ccd1b 100644--- a/sc/source/ui/inc/solveroptions.hrc+++ b/sc/source/ui/inc/solveroptions.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: solveroptions.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxxindex 0ceb3f12f02b..fc0714558be4 100644--- a/sc/source/ui/inc/solveroptions.hxx+++ b/sc/source/ui/inc/solveroptions.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: solveroptions.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxxindex 5a832bab35b8..89997e03c1a3 100644--- a/sc/source/ui/inc/solverutil.hxx+++ b/sc/source/ui/inc/solverutil.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: solverutil.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/solvrdlg.hrc b/sc/source/ui/inc/solvrdlg.hrcindex d54e7bc0f82e..7139abd2a5f6 100644--- a/sc/source/ui/inc/solvrdlg.hrc+++ b/sc/source/ui/inc/solvrdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: solvrdlg.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxxindex 21e36fd92366..fa1b9eb6341c 100644--- a/sc/source/ui/inc/solvrdlg.hxx+++ b/sc/source/ui/inc/solvrdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: solvrdlg.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/sortdlg.hrc b/sc/source/ui/inc/sortdlg.hrcindex 8f2f641e7574..387690531cfd 100644--- a/sc/source/ui/inc/sortdlg.hrc+++ b/sc/source/ui/inc/sortdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sortdlg.hrc,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxxindex d1ffb8aac0ed..e6f9ab1bf0c8 100644--- a/sc/source/ui/inc/sortdlg.hxx+++ b/sc/source/ui/inc/sortdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sortdlg.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxxindex b69a02361456..af97519a2b43 100644--- a/sc/source/ui/inc/spelldialog.hxx+++ b/sc/source/ui/inc/spelldialog.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: spelldialog.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxxindex cc99328a38cc..f44d4a8f7094 100644--- a/sc/source/ui/inc/spelleng.hxx+++ b/sc/source/ui/inc/spelleng.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: spelleng.hxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxxindex 2528b1de4df9..ecc66d7ccdcb 100644--- a/sc/source/ui/inc/spellparam.hxx+++ b/sc/source/ui/inc/spellparam.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: spellparam.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxxindex 3c812cc7b5c2..f84d8e4e2b51 100644--- a/sc/source/ui/inc/strindlg.hxx+++ b/sc/source/ui/inc/strindlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: strindlg.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/styledlg.hrc b/sc/source/ui/inc/styledlg.hrcindex d04078b66314..4a954bb3afc1 100644--- a/sc/source/ui/inc/styledlg.hrc+++ b/sc/source/ui/inc/styledlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: styledlg.hrc,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxxindex 3c5fc896b455..63e37becf188 100644--- a/sc/source/ui/inc/styledlg.hxx+++ b/sc/source/ui/inc/styledlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: styledlg.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/submenu.hrc b/sc/source/ui/inc/submenu.hrcindex 5c5bc1c7b8b2..4e5ad6d28d9e 100644--- a/sc/source/ui/inc/submenu.hrc+++ b/sc/source/ui/inc/submenu.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: submenu.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/subtdlg.hrc b/sc/source/ui/inc/subtdlg.hrcindex fff0feecd264..66c63df48953 100644--- a/sc/source/ui/inc/subtdlg.hrc+++ b/sc/source/ui/inc/subtdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: subtdlg.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxxindex 725261e8fecf..ec68d0e1fba1 100644--- a/sc/source/ui/inc/subtdlg.hxx+++ b/sc/source/ui/inc/subtdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: subtdlg.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxxindex 79a640f1c19c..d77ee812fdb3 100644--- a/sc/source/ui/inc/tabcont.hxx+++ b/sc/source/ui/inc/tabcont.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabcont.hxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tabopdlg.hrc b/sc/source/ui/inc/tabopdlg.hrcindex 842a5a2163c2..5ae127b63e73 100644--- a/sc/source/ui/inc/tabopdlg.hrc+++ b/sc/source/ui/inc/tabopdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabopdlg.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxxindex fd1e880c8901..e9286ca5ee96 100644--- a/sc/source/ui/inc/tabopdlg.hxx+++ b/sc/source/ui/inc/tabopdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabopdlg.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxxindex b7c501cc14db..71d62f964fef 100644--- a/sc/source/ui/inc/tabpages.hxx+++ b/sc/source/ui/inc/tabpages.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabpages.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tabpopsh.hxx b/sc/source/ui/inc/tabpopsh.hxxindex dedc106a9c61..177e3d75136f 100644--- a/sc/source/ui/inc/tabpopsh.hxx+++ b/sc/source/ui/inc/tabpopsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabpopsh.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxxindex 8ad6525dc66e..a06664c7c4ee 100644--- a/sc/source/ui/inc/tabsplit.hxx+++ b/sc/source/ui/inc/tabsplit.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabsplit.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxxindex dab44cdf33df..a6e99613f2ea 100644--- a/sc/source/ui/inc/tabview.hxx+++ b/sc/source/ui/inc/tabview.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabview.hxx,v $- * $Revision: 1.28.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxxindex eede290aa8db..b4313c1d7a32 100644--- a/sc/source/ui/inc/tabvwsh.hxx+++ b/sc/source/ui/inc/tabvwsh.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabvwsh.hxx,v $- * $Revision: 1.30.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -31,9 +28,10 @@ #ifndef SC_TABVWSH_HXX #define SC_TABVWSH_HXX +#include <svtools/htmlcfg.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfac.hxx>-#include <svx/svxenum.hxx>+#include <editeng/svxenum.hxx> #include "scdllapi.h" #include "dbfunc.hxx" // -> tabview #include "target.hxx"@@ -106,6 +104,7 @@ private: static USHORT nInsCellsCtrlState; static USHORT nInsObjCtrlState; + SvxHtmlOptions aHTMLOpt; ObjectSelectionType eCurOST; USHORT nDrawSfxId; USHORT nCtrlSfxId;@@ -198,6 +197,7 @@ private: DECL_LINK( SimpleRefAborted, String* ); DECL_LINK( SimpleRefChange, String* ); DECL_LINK( FormControlActivated, FmFormShell* );+ DECL_LINK( HtmlOptionsHdl, void * ); protected: virtual void Activate(BOOL bMDI);diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxxindex 1e65821915f3..6fc62ffaa8cf 100644--- a/sc/source/ui/inc/target.hxx+++ b/sc/source/ui/inc/target.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: target.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tbinsert.hrc b/sc/source/ui/inc/tbinsert.hrcindex 6d3f954c6948..44c0d295cfc6 100644--- a/sc/source/ui/inc/tbinsert.hrc+++ b/sc/source/ui/inc/tbinsert.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tbinsert.hrc,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxxindex 34bcf9d3e104..a056da0a982c 100644--- a/sc/source/ui/inc/tbinsert.hxx+++ b/sc/source/ui/inc/tbinsert.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tbinsert.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxxindex ba1370b1960f..6ea4f6e169ed 100644--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx@@ -1,36 +1,28 @@ /************************************************************************* *-* OpenOffice.org - a multi-platform office productivity suite-*-* $RCSfile: tbzoomsliderctrl.hxx,v $-*-* $Revision: 1.1 $-*-* last change: $Author: maoyg $ $Date: 2008/04/25 10:08:08 $-*-* The Contents of this file are made available subject to-* the terms of GNU Lesser General Public License Version 2.1.-*-*-* GNU Lesser General Public License Version 2.1-* =============================================-* Copyright 2005 by Sun Microsystems, Inc.-* 901 San Antonio Road, Palo Alto, CA 94303, USA-*-* This library is free software; you can redistribute it and/or-* modify it under the terms of the GNU Lesser General Public-* License version 2.1, as published by the Free Software Foundation.-*-* This library is distributed in the hope that it will be useful,-* but WITHOUT ANY WARRANTY; without even the implied warranty of-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU-* Lesser General Public License for more details.-*-* You should have received a copy of the GNU Lesser General Public-* License along with this library; if not, write to the Free Software-* Foundation, Inc., 59 Temple Place, Suite 330, Boston,-* MA 02111-1307 USA-*+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.+ *+ * Copyright 2000, 2010 Oracle and/or its affiliates.+ *+ * OpenOffice.org - a multi-platform office productivity suite+ *+ * This file is part of OpenOffice.org.+ *+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation.+ *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code).+ *+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License.+ * ************************************************************************/ #ifndef _SC_ZOOMSLIDERTBCONTRL_HXX #define _SC_ZOOMSLIDERTBCONTRL_HXXdiff --git a/sc/source/ui/inc/teamdlg.hxx b/sc/source/ui/inc/teamdlg.hxxindex b684848fada5..9f44f06c4b12 100644--- a/sc/source/ui/inc/teamdlg.hxx+++ b/sc/source/ui/inc/teamdlg.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: teamdlg.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxxindex 9928488c8c9d..302b5de5ffd2 100644--- a/sc/source/ui/inc/textdlgs.hxx+++ b/sc/source/ui/inc/textdlgs.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: textdlgs.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxxindex ffdc8d5f06d3..ea9e53a23ee4 100644--- a/sc/source/ui/inc/tpcalc.hxx+++ b/sc/source/ui/inc/tpcalc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpcalc.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxxindex db889a546c8a..dcf730712a40 100644--- a/sc/source/ui/inc/tphf.hxx+++ b/sc/source/ui/inc/tphf.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tphf.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxxindex 07d8f7967d90..d9d26d2111cd 100644--- a/sc/source/ui/inc/tphfedit.hxx+++ b/sc/source/ui/inc/tphfedit.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tphfedit.hxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxxindex 66cbc5987ac3..358c29f83d97 100644--- a/sc/source/ui/inc/tpprint.hxx+++ b/sc/source/ui/inc/tpprint.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpprint.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxxindex dfa8c9cb8cf3..d1ba772a8ca2 100644--- a/sc/source/ui/inc/tpsort.hxx+++ b/sc/source/ui/inc/tpsort.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpsort.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxxindex 5a3ee8c9dd31..1c928ff2ef13 100644--- a/sc/source/ui/inc/tpstat.hxx+++ b/sc/source/ui/inc/tpstat.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpstat.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxxindex bfe67c857259..6dd640e7925e 100644--- a/sc/source/ui/inc/tpsubt.hxx+++ b/sc/source/ui/inc/tpsubt.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpsubt.hxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxxindex a8580ccf487e..980a574dc61d 100644--- a/sc/source/ui/inc/tptable.hxx+++ b/sc/source/ui/inc/tptable.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tptable.hxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxxindex a3a31339fb08..f26e48889f1d 100644--- a/sc/source/ui/inc/tpusrlst.hxx+++ b/sc/source/ui/inc/tpusrlst.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpusrlst.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxxindex 945a9e9e9259..81760eb66c67 100644--- a/sc/source/ui/inc/tpview.hxx+++ b/sc/source/ui/inc/tpview.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpview.hxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxxindex 31d2d03167c5..e2dbad485812 100644--- a/sc/source/ui/inc/transobj.hxx+++ b/sc/source/ui/inc/transobj.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: transobj.hxx,v $- * $Revision: 1.19 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxxindex d9b21fd2f0d4..ba0cd9dbd3ce 100644--- a/sc/source/ui/inc/ui_pch.hxx+++ b/sc/source/ui/inc/ui_pch.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: ui_pch.hxx,v $- * $Revision: 1.16 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -239,7 +236,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/animate.hxx> #include <vcl/graph.h>-#include <svx/editdata.hxx>+#include <editeng/editdata.hxx> #include <svtools/stdctrl.hxx> #include <sfx2/basedlgs.hxx> #include <conditio.hxx>@@ -248,7 +245,7 @@ #include <uiitems.hxx> #include <svx/svdmodel.hxx> #include <vcl/gdiobj.hxx>-#include <svx/editeng.hxx>+#include <editeng/editeng.hxx> #include <svx/pageitem.hxx> #include <anyrefdg.hxx> #include <basic/sbxcore.hxx>@@ -304,10 +301,9 @@ #include <drawview.hxx> #include <svx/view3d.hxx> #include <svx/def3d.hxx>-#include <goodies/vector3d.hxx> #include <vcl/floatwin.hxx> #include <basic/sbxobj.hxx>-#include <svx/svxenum.hxx>+#include <editeng/svxenum.hxx> #include <svx/xtextit0.hxx> #include <svx/svdtrans.hxx> #include <svl/style.hxx>@@ -324,11 +320,11 @@ #include <fupoor.hxx> #include <docpool.hxx> #include <vcl/button.hxx>-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <svx/svdorect.hxx> #include <svl/whiter.hxx> #include <stlpool.hxx>-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <inputhdl.hxx> #include <svx/svdpage.hxx> diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxxindex bfa1603adb80..770411b63e1b 100644--- a/sc/source/ui/inc/uiitems.hxx+++ b/sc/source/ui/inc/uiitems.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: uiitems.hxx,v $- * $Revision: 1.7.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,6 +31,7 @@ #include "scdllapi.h" #include "conditio.hxx" #include "sortparam.hxx"+#include "queryparam.hxx" #include "paramisc.hxx" #include <svl/poolitem.hxx> diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxxindex 8398b030ed68..6f2bb3572832 100644--- a/sc/source/ui/inc/undobase.hxx+++ b/sc/source/ui/inc/undobase.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undobase.hxx,v $- * $Revision: 1.6.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxxindex 281f44f4fe82..574926ecbf52 100644--- a/sc/source/ui/inc/undoblk.hxx+++ b/sc/source/ui/inc/undoblk.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undoblk.hxx,v $- * $Revision: 1.15.128.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxxindex f6b218fdfb44..53f129166d10 100644--- a/sc/source/ui/inc/undocell.hxx+++ b/sc/source/ui/inc/undocell.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undocell.hxx,v $- * $Revision: 1.5.128.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxxindex 3e92fc5fd5fa..a2fcd392e9b4 100644--- a/sc/source/ui/inc/undodat.hxx+++ b/sc/source/ui/inc/undodat.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undodat.hxx,v $- * $Revision: 1.8.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,6 +33,7 @@ #include "rangelst.hxx" // ScRangeListRef #include "markdata.hxx" #include "sortparam.hxx"+#include "queryparam.hxx" #include "pivot.hxx" class ScDocShell;diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxxindex 5ded731d5105..a2647985af9f 100644--- a/sc/source/ui/inc/undodraw.hxx+++ b/sc/source/ui/inc/undodraw.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undodraw.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/undoolk.hxx b/sc/source/ui/inc/undoolk.hxxindex 4678f1963962..527c973b6705 100644--- a/sc/source/ui/inc/undoolk.hxx+++ b/sc/source/ui/inc/undoolk.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undoolk.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxxindex d029be13918f..5e7b86449722 100644--- a/sc/source/ui/inc/undostyl.hxx+++ b/sc/source/ui/inc/undostyl.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undostyl.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxxindex 40177a31e68e..276ea3d7e204 100644--- a/sc/source/ui/inc/undotab.hxx+++ b/sc/source/ui/inc/undotab.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undotab.hxx,v $- * $Revision: 1.10.28.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/undoutil.hxx b/sc/source/ui/inc/undoutil.hxxindex de2343968e62..38302096b1fa 100644--- a/sc/source/ui/inc/undoutil.hxx+++ b/sc/source/ui/inc/undoutil.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undoutil.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/validate.hrc b/sc/source/ui/inc/validate.hrcindex 4d46d42263b2..45e5dda39c2d 100644--- a/sc/source/ui/inc/validate.hrc+++ b/sc/source/ui/inc/validate.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: validate.hrc,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxxindex 0ac51e75b5d5..f7cb9af23b63 100644--- a/sc/source/ui/inc/validate.hxx+++ b/sc/source/ui/inc/validate.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: validate.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxxindex dc2fe4522ecd..106d196a8175 100644--- a/sc/source/ui/inc/viewdata.hxx+++ b/sc/source/ui/inc/viewdata.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: viewdata.hxx,v $- * $Revision: 1.24.24.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxxindex 82ddc0bad026..21feb272c339 100644--- a/sc/source/ui/inc/viewfunc.hxx+++ b/sc/source/ui/inc/viewfunc.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: viewfunc.hxx,v $- * $Revision: 1.34.128.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxxindex e7e4e27f233c..8b103d3761d8 100644--- a/sc/source/ui/inc/viewutil.hxx+++ b/sc/source/ui/inc/viewutil.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: viewutil.hxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxxindex e36e15214d26..3b06c98c9e3e 100644--- a/sc/source/ui/inc/warnbox.hxx+++ b/sc/source/ui/inc/warnbox.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: warnbox.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxxindex ab2cdaba3b69..6f59b64c52fc 100644--- a/sc/source/ui/miscdlgs/acredlin.cxx+++ b/sc/source/ui/miscdlgs/acredlin.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: acredlin.cxx,v $- * $Revision: 1.25.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.srcindex 58db7355c81f..cad4747acb63 100644--- a/sc/source/ui/miscdlgs/acredlin.src+++ b/sc/source/ui/miscdlgs/acredlin.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: acredlin.src,v $- * $Revision: 1.35 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxxindex 0d93eb0c7a93..30e34def4620 100644--- a/sc/source/ui/miscdlgs/anyrefdg.cxx+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: anyrefdg.cxx,v $- * $Revision: 1.21.30.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxxindex fb29b6d673ca..78e5ea066c7d 100644--- a/sc/source/ui/miscdlgs/autofmt.cxx+++ b/sc/source/ui/miscdlgs/autofmt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: autofmt.cxx,v $- * $Revision: 1.19.122.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,16 +34,16 @@ #include "scitems.hxx" #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/cntritem.hxx>-#include <svx/colritem.hxx>-#include <svx/crsditem.hxx>-#include <svx/fontitem.hxx>-#include <svx/postitem.hxx>-#include <svx/shdditem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/cntritem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/shdditem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx> #include <sfx2/topfrm.hxx> #include <vcl/svapp.hxx> #include <svl/zforlist.hxx>diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxxindex c0576c44e78b..361f201281dc 100644--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: conflictsdlg.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.srcindex 84365449646e..1facf85da95b 100644--- a/sc/source/ui/miscdlgs/conflictsdlg.src+++ b/sc/source/ui/miscdlgs/conflictsdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: conflictsdlg.src,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxxindex 621fb55e778e..074d54a5c912 100644--- a/sc/source/ui/miscdlgs/crdlg.cxx+++ b/sc/source/ui/miscdlgs/crdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: crdlg.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxxindex b3b521dfa704..0ad2a2e80ca4 100644--- a/sc/source/ui/miscdlgs/crnrdlg.cxx+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: crnrdlg.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxxindex 6df6a5693d5c..fd206ac537ba 100644--- a/sc/source/ui/miscdlgs/delcldlg.cxx+++ b/sc/source/ui/miscdlgs/delcldlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: delcldlg.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxxindex b0d9116e21ac..7be4c7a0bf3f 100644--- a/sc/source/ui/miscdlgs/delcodlg.cxx+++ b/sc/source/ui/miscdlgs/delcodlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: delcodlg.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxxindex f013c334bf37..2b247f0f9a07 100644--- a/sc/source/ui/miscdlgs/filldlg.cxx+++ b/sc/source/ui/miscdlgs/filldlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filldlg.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxxindex 42f9cbec71ae..d6eb1865b184 100644--- a/sc/source/ui/miscdlgs/groupdlg.cxx+++ b/sc/source/ui/miscdlgs/groupdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: groupdlg.cxx,v $- * $Revision: 1.7.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxxindex 74514940127c..dce755c10db3 100644--- a/sc/source/ui/miscdlgs/highred.cxx+++ b/sc/source/ui/miscdlgs/highred.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: highred.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.srcindex 774bc69d2953..a244a3e2a44e 100644--- a/sc/source/ui/miscdlgs/highred.src+++ b/sc/source/ui/miscdlgs/highred.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: highred.src,v $- * $Revision: 1.33 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxxindex 46059646a527..2a3489088489 100644--- a/sc/source/ui/miscdlgs/inscldlg.cxx+++ b/sc/source/ui/miscdlgs/inscldlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: inscldlg.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxxindex 73b651f1f2a7..b1c8e31ef373 100644--- a/sc/source/ui/miscdlgs/inscodlg.cxx+++ b/sc/source/ui/miscdlgs/inscodlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: inscodlg.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxxindex 72ebb9f08cbb..06d4f23389c0 100644--- a/sc/source/ui/miscdlgs/instbdlg.cxx+++ b/sc/source/ui/miscdlgs/instbdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: instbdlg.cxx,v $- * $Revision: 1.15 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/instbdlg.src b/sc/source/ui/miscdlgs/instbdlg.srcindex d1f6689e567a..6f64c0de1d62 100644--- a/sc/source/ui/miscdlgs/instbdlg.src+++ b/sc/source/ui/miscdlgs/instbdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: instbdlg.src,v $- * $Revision: 1.36 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxxindex 20827680fba2..79dcfe3b7ad8 100644--- a/sc/source/ui/miscdlgs/lbseldlg.cxx+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: lbseldlg.cxx,v $- * $Revision: 1.6.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxxindex 7d9ab1e5caa5..48e33622e99f 100644--- a/sc/source/ui/miscdlgs/linkarea.cxx+++ b/sc/source/ui/miscdlgs/linkarea.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: linkarea.cxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/linkarea.src b/sc/source/ui/miscdlgs/linkarea.srcindex 0a4b49c13981..715d3fd20766 100644--- a/sc/source/ui/miscdlgs/linkarea.src+++ b/sc/source/ui/miscdlgs/linkarea.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: linkarea.src,v $- * $Revision: 1.32 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/makefile.mk b/sc/source/ui/miscdlgs/makefile.mkindex 66e1f33618e2..9f5bb1dbc498 100644--- a/sc/source/ui/miscdlgs/makefile.mk+++ b/sc/source/ui/miscdlgs/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.14 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxxindex b9dadf126495..02bc77f8f89e 100644--- a/sc/source/ui/miscdlgs/mtrindlg.cxx+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: mtrindlg.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxxindex 822ff23d9994..296cf8a8637f 100644--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: mvtabdlg.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxxindex b4e7ddc32911..1714fddd3b3d 100644--- a/sc/source/ui/miscdlgs/namecrea.cxx+++ b/sc/source/ui/miscdlgs/namecrea.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: namecrea.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/namepast.cxx b/sc/source/ui/miscdlgs/namepast.cxxindex d037802f6b73..c621f14b431c 100644--- a/sc/source/ui/miscdlgs/namepast.cxx+++ b/sc/source/ui/miscdlgs/namepast.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: namepast.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxxindex 8783df43d3df..37759aef81b5 100644--- a/sc/source/ui/miscdlgs/optsolver.cxx+++ b/sc/source/ui/miscdlgs/optsolver.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optsolver.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxxindex a5116ef61d66..c10620bc8c4a 100644--- a/sc/source/ui/miscdlgs/protectiondlg.cxx+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: protectiondlg.cxx,v $- * $Revision: 1.1.2.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/protectiondlg.src b/sc/source/ui/miscdlgs/protectiondlg.srcindex 4919f93ca6f4..6b62efb4c784 100644--- a/sc/source/ui/miscdlgs/protectiondlg.src+++ b/sc/source/ui/miscdlgs/protectiondlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: protectiondlg.src,v $- * $Revision: 1.1.2.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxxindex dd1c312cd792..7046009f63b2 100644--- a/sc/source/ui/miscdlgs/redcom.cxx+++ b/sc/source/ui/miscdlgs/redcom.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: redcom.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxxindex 84a008f68f5f..24e5dc409c83 100644--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: retypepassdlg.cxx,v $- * $Revision: 1.1.2.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.srcindex 87d436881f69..794af9d43ebd 100644--- a/sc/source/ui/miscdlgs/retypepassdlg.src+++ b/sc/source/ui/miscdlgs/retypepassdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: retypepassdlg.src,v $- * $Revision: 1.1.2.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxxindex 32c49cf2a3ad..79d7c502921f 100644--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scuiautofmt.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -39,16 +36,16 @@ #include "scitems.hxx" #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/cntritem.hxx>-#include <svx/colritem.hxx>-#include <svx/crsditem.hxx>-#include <svx/fontitem.hxx>-#include <svx/postitem.hxx>-#include <svx/shdditem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/cntritem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/fontitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/shdditem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx> #include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <comphelper/processfactory.hxx>diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxxindex f9893f1d3faa..4a5b7cc2149b 100644--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sharedocdlg.cxx,v $- * $Revision: 1.6.134.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/sharedocdlg.src b/sc/source/ui/miscdlgs/sharedocdlg.srcindex 27765594dde5..fe55ee58c8e4 100644--- a/sc/source/ui/miscdlgs/sharedocdlg.src+++ b/sc/source/ui/miscdlgs/sharedocdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sharedocdlg.src,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxxindex a13ce8c010dc..7e57ebbe5d60 100644--- a/sc/source/ui/miscdlgs/shtabdlg.cxx+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: shtabdlg.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxxindex 416a4b1e7015..097016836ee5 100644--- a/sc/source/ui/miscdlgs/simpref.cxx+++ b/sc/source/ui/miscdlgs/simpref.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: simpref.cxx,v $- * $Revision: 1.11.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxxindex 08dbd00de0f9..418a88b3cbea 100644--- a/sc/source/ui/miscdlgs/solveroptions.cxx+++ b/sc/source/ui/miscdlgs/solveroptions.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: solveroptions.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxxindex dbfc699e481b..ae080f2525c7 100644--- a/sc/source/ui/miscdlgs/solverutil.cxx+++ b/sc/source/ui/miscdlgs/solverutil.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: solverutil.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxxindex 091329f1d03b..5b41592e8457 100644--- a/sc/source/ui/miscdlgs/solvrdlg.cxx+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: solvrdlg.cxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxxindex 92630493d32f..aa6db3075b64 100644--- a/sc/source/ui/miscdlgs/strindlg.cxx+++ b/sc/source/ui/miscdlgs/strindlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: strindlg.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxxindex 9d144a257ff3..38ae6bddaebd 100644--- a/sc/source/ui/miscdlgs/tabopdlg.cxx+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabopdlg.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/teamdlg.cxx b/sc/source/ui/miscdlgs/teamdlg.cxxindex ca5d0f94c708..a9f1bf2a17cf 100644--- a/sc/source/ui/miscdlgs/teamdlg.cxx+++ b/sc/source/ui/miscdlgs/teamdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: teamdlg.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxxindex a12ad4992bff..9f8b2474fc3e 100644--- a/sc/source/ui/miscdlgs/textdlgs.cxx+++ b/sc/source/ui/miscdlgs/textdlgs.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: textdlgs.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -42,7 +39,7 @@ #include <svx/svxids.hrc> //CHINA001 #include <svx/chardlg.hxx>-#include <svx/flstitem.hxx>+#include <editeng/flstitem.hxx> //CHINA001 #include <svx/paragrph.hxx> //CHINA001 #include <svx/tabstpge.hxx> #include <sfx2/objsh.hxx>diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxxindex b44bdf94355a..24b2e62a1c78 100644--- a/sc/source/ui/miscdlgs/warnbox.cxx+++ b/sc/source/ui/miscdlgs/warnbox.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: warnbox.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/namedlg/makefile.mk b/sc/source/ui/namedlg/makefile.mkindex 56aedb24bd2c..7c1151b8340b 100644--- a/sc/source/ui/namedlg/makefile.mk+++ b/sc/source/ui/namedlg/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.4 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxxindex 54b6c42926c3..bc79fa7c65e7 100644--- a/sc/source/ui/namedlg/namedlg.cxx+++ b/sc/source/ui/namedlg/namedlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: namedlg.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxxindex 8198e6adb0f4..a417621bb303 100644--- a/sc/source/ui/navipi/content.cxx+++ b/sc/source/ui/navipi/content.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: content.cxx,v $- * $Revision: 1.26.102.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -39,7 +36,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <svx/svdxcgv.hxx>-#include <svx/linkmgr.hxx>+#include <sfx2/linkmgr.hxx> #include <sfx2/docfile.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/help.hxx>@@ -830,7 +827,7 @@ void ScContentTree::GetLinkNames() if (!pDoc) return; - SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); DBG_ASSERT(pLinkManager, "kein LinkManager am Dokument?"); const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks(); USHORT nCount = rLinks.Count();@@ -851,7 +848,7 @@ const ScAreaLink* ScContentTree::GetLink( ULONG nIndex ) return NULL; ULONG nFound = 0;- SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); DBG_ASSERT(pLinkManager, "kein LinkManager am Dokument?"); const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks(); USHORT nCount = rLinks.Count();diff --git a/sc/source/ui/navipi/makefile.mk b/sc/source/ui/navipi/makefile.mkindex cfa2f84297d0..9c0de073dd8c 100644--- a/sc/source/ui/navipi/makefile.mk+++ b/sc/source/ui/navipi/makefile.mk@@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.-#-# Copyright 2008 by Sun Microsystems, Inc.+# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.6.90.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxxindex c3807844270a..e5002c44c60e 100644--- a/sc/source/ui/navipi/navcitem.cxx+++ b/sc/source/ui/navipi/navcitem.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: navcitem.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxxindex 0a216dac3709..846e2ce53310 100644--- a/sc/source/ui/navipi/navipi.cxx+++ b/sc/source/ui/navipi/navipi.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: navipi.cxx,v $- * $Revision: 1.26 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/navipi/navipi.hrc b/sc/source/ui/navipi/navipi.hrcindex e3757ac944fb..0adb65a5a042 100644--- a/sc/source/ui/navipi/navipi.hrc+++ b/sc/source/ui/navipi/navipi.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: navipi.hrc,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.srcindex 6d5baba4d075..c2e9ecb6a4e6 100644--- a/sc/source/ui/navipi/navipi.src+++ b/sc/source/ui/navipi/navipi.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: navipi.src,v $- * $Revision: 1.46 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxxindex c03e5efc82bd..e7dff0bf37c7 100644--- a/sc/source/ui/navipi/scenwnd.cxx+++ b/sc/source/ui/navipi/scenwnd.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scenwnd.cxx,v $- * $Revision: 1.9.90.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/optdlg/makefile.mk b/sc/source/ui/optdlg/makefile.mkindex e8a6d20902f6..52df7072ecf8 100644--- a/sc/source/ui/optdlg/makefile.mk+++ b/sc/source/ui/optdlg/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.6 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxxindex 247e64a07141..1a45ab715dee 100644--- a/sc/source/ui/optdlg/opredlin.cxx+++ b/sc/source/ui/optdlg/opredlin.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: opredlin.cxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxxindex 7b65a3804510..c6423ea73b23 100644--- a/sc/source/ui/optdlg/tpcalc.cxx+++ b/sc/source/ui/optdlg/tpcalc.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpcalc.cxx,v $- * $Revision: 1.18 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxxindex d6e8a3ae5009..d14b79bd739a 100644--- a/sc/source/ui/optdlg/tpprint.cxx+++ b/sc/source/ui/optdlg/tpprint.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpprint.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxxindex fcf74ef0eb65..eb7c8a6635eb 100644--- a/sc/source/ui/optdlg/tpusrlst.cxx+++ b/sc/source/ui/optdlg/tpusrlst.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpusrlst.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxxindex 05697d13ef52..5c2e8dd52c9f 100644--- a/sc/source/ui/optdlg/tpview.cxx+++ b/sc/source/ui/optdlg/tpview.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tpview.cxx,v $- * $Revision: 1.20 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxxindex f65105b0a687..915355d5d0f2 100644--- a/sc/source/ui/pagedlg/areasdlg.cxx+++ b/sc/source/ui/pagedlg/areasdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: areasdlg.cxx,v $- * $Revision: 1.18 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxxindex 7ab719e3e10b..52527d3f60ce 100644--- a/sc/source/ui/pagedlg/hfedtdlg.cxx+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hfedtdlg.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/pagedlg/hfedtdlg.hrc b/sc/source/ui/pagedlg/hfedtdlg.hrcindex ff36d114adc6..30e6f8ecae63 100644--- a/sc/source/ui/pagedlg/hfedtdlg.hrc+++ b/sc/source/ui/pagedlg/hfedtdlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hfedtdlg.hrc,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.srcindex 0aca9133bc63..1445636e8cc6 100644--- a/sc/source/ui/pagedlg/hfedtdlg.src+++ b/sc/source/ui/pagedlg/hfedtdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hfedtdlg.src,v $- * $Revision: 1.48 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/pagedlg/makefile.mk b/sc/source/ui/pagedlg/makefile.mkindex 4e67ed43b1ee..500e642e79eb 100644--- a/sc/source/ui/pagedlg/makefile.mk+++ b/sc/source/ui/pagedlg/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.6 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrcindex ca0e9e0f316a..2f3593c2f6d1 100644--- a/sc/source/ui/pagedlg/pagedlg.hrc+++ b/sc/source/ui/pagedlg/pagedlg.hrc@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pagedlg.hrc,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.srcindex 6db6b1c06cc7..d0f95c3d9f6b 100644--- a/sc/source/ui/pagedlg/pagedlg.src+++ b/sc/source/ui/pagedlg/pagedlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pagedlg.src,v $- * $Revision: 1.54 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxxindex e55c8405fc34..ba89691239c3 100644--- a/sc/source/ui/pagedlg/scuitphfedit.cxx+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scuitphfedit.cxx,v $- * $Revision: 1.10.172.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -39,13 +36,13 @@ #define _TPHFEDIT_CXX #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> //CHINA001 #include <svx/chardlg.hxx>-#include <svx/editobj.hxx>-#include <svx/editstat.hxx>-#include <svx/editview.hxx>-#include <svx/flditem.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editstat.hxx>+#include <editeng/editview.hxx>+#include <editeng/flditem.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/objsh.hxx> #include <vcl/msgbox.hxx>diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxxindex 58e5570aa01b..de647cf5f82a 100644--- a/sc/source/ui/pagedlg/tphf.cxx+++ b/sc/source/ui/pagedlg/tphf.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tphf.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/pagedlg/tphf.src b/sc/source/ui/pagedlg/tphf.srcindex d20d0e67b3e1..b2f59e06da72 100644--- a/sc/source/ui/pagedlg/tphf.src+++ b/sc/source/ui/pagedlg/tphf.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tphf.src,v $- * $Revision: 1.25 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxxindex e54dbfbca605..8e6b6efda28d 100644--- a/sc/source/ui/pagedlg/tphfedit.cxx+++ b/sc/source/ui/pagedlg/tphfedit.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tphfedit.cxx,v $- * $Revision: 1.20 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,15 +34,15 @@ #define _TPHFEDIT_CXX #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> //CHINA001 #include <svx/chardlg.hxx>-#include <svx/editobj.hxx>-#include <svx/editstat.hxx>-#include <svx/editview.hxx>-#include <svx/flditem.hxx>-#include <svx/adjitem.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editstat.hxx>+#include <editeng/editview.hxx>+#include <editeng/flditem.hxx>+#include <editeng/adjitem.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/objsh.hxx> #include <vcl/msgbox.hxx>diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxxindex b3640f2905c5..a2b732464e12 100644--- a/sc/source/ui/pagedlg/tptable.cxx+++ b/sc/source/ui/pagedlg/tptable.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tptable.cxx,v $- * $Revision: 1.13 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/attrdlg.src b/sc/source/ui/src/attrdlg.srcindex f08c4ba78ca3..ae130f7e8a96 100644--- a/sc/source/ui/src/attrdlg.src+++ b/sc/source/ui/src/attrdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: attrdlg.src,v $- * $Revision: 1.56 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/autofmt.src b/sc/source/ui/src/autofmt.srcindex 40018185e25b..cb56f6ac85a4 100644--- a/sc/source/ui/src/autofmt.src+++ b/sc/source/ui/src/autofmt.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: autofmt.src,v $- * $Revision: 1.44 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/condfrmt.src b/sc/source/ui/src/condfrmt.srcindex 982e2990485c..3018cc867e0d 100644--- a/sc/source/ui/src/condfrmt.src+++ b/sc/source/ui/src/condfrmt.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: condfrmt.src,v $- * $Revision: 1.32 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/crnrdlg.src b/sc/source/ui/src/crnrdlg.srcindex 3b35dcff1bfc..b16a3506bf7b 100644--- a/sc/source/ui/src/crnrdlg.src+++ b/sc/source/ui/src/crnrdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: crnrdlg.src,v $- * $Revision: 1.45 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/dbnamdlg.src b/sc/source/ui/src/dbnamdlg.srcindex 7f9914e542fe..50152d95d9d5 100644--- a/sc/source/ui/src/dbnamdlg.src+++ b/sc/source/ui/src/dbnamdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbnamdlg.src,v $- * $Revision: 1.46 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.srcindex 2e6a1c330671..52ce38db1516 100644--- a/sc/source/ui/src/filter.src+++ b/sc/source/ui/src/filter.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filter.src,v $- * $Revision: 1.58 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.srcindex fa883f593095..edb2165daf32 100644--- a/sc/source/ui/src/globstr.src+++ b/sc/source/ui/src/globstr.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: globstr.src,v $- * $Revision: 1.74.96.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.srcindex 7ba7b6a1c8fe..e4a82d38ec98 100644--- a/sc/source/ui/src/hdrcont.src+++ b/sc/source/ui/src/hdrcont.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hdrcont.src,v $- * $Revision: 1.35 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/makefile.mk b/sc/source/ui/src/makefile.mkindex 4e17e44675d8..96bb78e2902c 100644--- a/sc/source/ui/src/makefile.mk+++ b/sc/source/ui/src/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.11 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.srcindex d9ce050f1cd0..d4aa01d436ce 100644--- a/sc/source/ui/src/miscdlgs.src+++ b/sc/source/ui/src/miscdlgs.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: miscdlgs.src,v $- * $Revision: 1.74 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.srcindex 64d29a4bc425..38e1271b2959 100644--- a/sc/source/ui/src/namedlg.src+++ b/sc/source/ui/src/namedlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: namedlg.src,v $- * $Revision: 1.36 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/opredlin.src b/sc/source/ui/src/opredlin.srcindex aa05762245f9..a8c2daf4892a 100644--- a/sc/source/ui/src/opredlin.src+++ b/sc/source/ui/src/opredlin.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: opredlin.src,v $- * $Revision: 1.37 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.srcindex 66e42d08dcef..856463e27e40 100644--- a/sc/source/ui/src/optdlg.src+++ b/sc/source/ui/src/optdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optdlg.src,v $- * $Revision: 1.68 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.srcindex df1b739995ea..2fc5cf3a3c54 100644--- a/sc/source/ui/src/optsolver.src+++ b/sc/source/ui/src/optsolver.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optsolver.src,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.srcindex b03c0c0ae135..abda5c9a0994 100644--- a/sc/source/ui/src/popup.src+++ b/sc/source/ui/src/popup.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: popup.src,v $- * $Revision: 1.58.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/pseudo.src b/sc/source/ui/src/pseudo.srcindex b358ced79371..e3d27edf0ecb 100644--- a/sc/source/ui/src/pseudo.src+++ b/sc/source/ui/src/pseudo.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pseudo.src,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/sc.src b/sc/source/ui/src/sc.srcindex 4f1510582288..dae422e15cd0 100644--- a/sc/source/ui/src/sc.src+++ b/sc/source/ui/src/sc.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sc.src,v $- * $Revision: 1.26 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.srcindex 8ac544e44610..bdb76b2b710c 100644--- a/sc/source/ui/src/scerrors.src+++ b/sc/source/ui/src/scerrors.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scerrors.src,v $- * $Revision: 1.51 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.srcindex f05793872d4c..18adf9883373 100644--- a/sc/source/ui/src/scfuncs.src+++ b/sc/source/ui/src/scfuncs.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scfuncs.src,v $- * $Revision: 1.95 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.srcindex 2dfcd84a4726..7f5337e11b89 100644--- a/sc/source/ui/src/scstring.src+++ b/sc/source/ui/src/scstring.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scstring.src,v $- * $Revision: 1.89 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/scwarngs.src b/sc/source/ui/src/scwarngs.srcindex 74159403412b..9cd22567d77c 100644--- a/sc/source/ui/src/scwarngs.src+++ b/sc/source/ui/src/scwarngs.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scwarngs.src,v $- * $Revision: 1.24 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/simpref.src b/sc/source/ui/src/simpref.srcindex a87f6217fbde..03f41c1a56aa 100644--- a/sc/source/ui/src/simpref.src+++ b/sc/source/ui/src/simpref.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: simpref.src,v $- * $Revision: 1.22 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/solveroptions.src b/sc/source/ui/src/solveroptions.srcindex d2a7e97e1add..0a3432344f35 100644--- a/sc/source/ui/src/solveroptions.src+++ b/sc/source/ui/src/solveroptions.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: solveroptions.src,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/solvrdlg.src b/sc/source/ui/src/solvrdlg.srcindex 1437dba09d5d..6a8a3d955644 100644--- a/sc/source/ui/src/solvrdlg.src+++ b/sc/source/ui/src/solvrdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: solvrdlg.src,v $- * $Revision: 1.30 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/sortdlg.src b/sc/source/ui/src/sortdlg.srcindex 71aa7b594575..3aca09211edd 100644--- a/sc/source/ui/src/sortdlg.src+++ b/sc/source/ui/src/sortdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: sortdlg.src,v $- * $Revision: 1.42 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/subtdlg.src b/sc/source/ui/src/subtdlg.srcindex 02cc27459671..c0bcfba1b07b 100644--- a/sc/source/ui/src/subtdlg.src+++ b/sc/source/ui/src/subtdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: subtdlg.src,v $- * $Revision: 1.41 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/tabopdlg.src b/sc/source/ui/src/tabopdlg.srcindex 66511e41f38d..25af654f4147 100644--- a/sc/source/ui/src/tabopdlg.src+++ b/sc/source/ui/src/tabopdlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabopdlg.src,v $- * $Revision: 1.28 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/textdlgs.src b/sc/source/ui/src/textdlgs.srcindex 6da135614dcd..2b0e408262ba 100644--- a/sc/source/ui/src/textdlgs.src+++ b/sc/source/ui/src/textdlgs.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: textdlgs.src,v $- * $Revision: 1.30 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.srcindex c214b38d011b..6e4b89e5faa0 100644--- a/sc/source/ui/src/toolbox.src+++ b/sc/source/ui/src/toolbox.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: toolbox.src,v $- * $Revision: 1.77 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/styleui/makefile.mk b/sc/source/ui/styleui/makefile.mkindex bfd2f5fc8bd5..9361033a34a4 100644--- a/sc/source/ui/styleui/makefile.mk+++ b/sc/source/ui/styleui/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.7 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.srcindex 9c367b9daf7f..1968b6dca877 100644--- a/sc/source/ui/styleui/scstyles.src+++ b/sc/source/ui/styleui/scstyles.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scstyles.src,v $- * $Revision: 1.27 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxxindex ea94566b918f..72a52520d1c1 100644--- a/sc/source/ui/styleui/styledlg.cxx+++ b/sc/source/ui/styleui/styledlg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: styledlg.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -61,7 +58,7 @@ #include <svx/svxids.hrc> //CHINA001 #include <svx/dialogs.hrc> //CHINA001 #include <svl/intitem.hxx> //CHINA001-#include <svx/flstitem.hxx> //CHINA001+#include <editeng/flstitem.hxx> //CHINA001 #include <svl/aeitem.hxx> //CHINA001 #include <svx/flagsdef.hxx> //CHINA001 //==================================================================diff --git a/sc/source/ui/styleui/styledlg.src b/sc/source/ui/styleui/styledlg.srcindex c66421d1927f..4c862e21ebd0 100644--- a/sc/source/ui/styleui/styledlg.src+++ b/sc/source/ui/styleui/styledlg.src@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: styledlg.src,v $- * $Revision: 1.37 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxxindex a1ca8b9dabeb..8f5ce350b887 100644--- a/sc/source/ui/undo/areasave.cxx+++ b/sc/source/ui/undo/areasave.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: areasave.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,7 +34,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svx/linkmgr.hxx>+#include <sfx2/linkmgr.hxx> #include <tools/debug.hxx> #include "areasave.hxx"@@ -100,7 +97,7 @@ void ScAreaLinkSaver::InsertNewLink( ScDocument* pDoc ) const { // (see ScUndoRemoveAreaLink::Undo) - SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); SfxObjectShell* pObjSh = pDoc->GetDocumentShell(); if ( pLinkManager && pObjSh )@@ -140,7 +137,7 @@ BOOL ScAreaLinkSaveCollection::IsEqual( const ScDocument* pDoc ) const // IsEqual can be checked in sequence. // Neither ref-update nor removing links will change the order. - SvxLinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager();+ sfx2::LinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager(); if (pLinkManager) { USHORT nPos = 0;@@ -186,7 +183,7 @@ void ScAreaLinkSaveCollection::Restore( ScDocument* pDoc ) const // Entries from the save collection must be searched via source data, as the order // of links changes if deleted entries are re-added to the link manager (always at the end). - SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); if (pLinkManager) { const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();@@ -208,7 +205,7 @@ ScAreaLinkSaveCollection* ScAreaLinkSaveCollection::CreateFromDoc( const ScDocum { ScAreaLinkSaveCollection* pColl = NULL; - SvxLinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager();+ sfx2::LinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager(); if (pLinkManager) { const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();diff --git a/sc/source/ui/undo/makefile.mk b/sc/source/ui/undo/makefile.mkindex b25c2919a332..168130c022ea 100644--- a/sc/source/ui/undo/makefile.mk+++ b/sc/source/ui/undo/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.6 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/undo/refundo.cxx b/sc/source/ui/undo/refundo.cxxindex 8c72da7e7e25..c863259ddf94 100644--- a/sc/source/ui/undo/refundo.cxx+++ b/sc/source/ui/undo/refundo.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: refundo.cxx,v $- * $Revision: 1.6.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/undo/target.cxx b/sc/source/ui/undo/target.cxxindex af9b41d4c004..1c2e4a925378 100644--- a/sc/source/ui/undo/target.cxx+++ b/sc/source/ui/undo/target.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: target.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxxindex 200db8673cd2..fffb76ebd061 100644--- a/sc/source/ui/undo/undobase.cxx+++ b/sc/source/ui/undo/undobase.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undobase.cxx,v $- * $Revision: 1.9.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -45,6 +42,7 @@ #include "undodraw.hxx" #include "dbcolect.hxx" #include "attrib.hxx"+#include "queryparam.hxx" #include "globstr.hrc" // STATIC DATA -----------------------------------------------------------diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxxindex 8cc45d41a2e6..a35ba96112e3 100644--- a/sc/source/ui/undo/undoblk.cxx+++ b/sc/source/ui/undo/undoblk.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undoblk.cxx,v $- * $Revision: 1.27.128.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -40,7 +37,7 @@ #include "scitems.hxx" #include <vcl/virdev.hxx> #include <vcl/waitobj.hxx>-#include <svx/boxitem.hxx>+#include <editeng/boxitem.hxx> #include <sfx2/app.hxx> #include "undoblk.hxx"diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxxindex 46e59e8be69d..2ab03eb71923 100644--- a/sc/source/ui/undo/undoblk2.cxx+++ b/sc/source/ui/undo/undoblk2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undoblk2.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxxindex 4a94827ed1ec..4011d4755ab1 100644--- a/sc/source/ui/undo/undoblk3.cxx+++ b/sc/source/ui/undo/undoblk3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undoblk3.cxx,v $- * $Revision: 1.22.128.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,9 +31,9 @@ // INCLUDE ------------------------------------------------------------------- #include "scitems.hxx"-#include <svx/boxitem.hxx>-#include <svx/srchitem.hxx>-#include <svx/linkmgr.hxx>+#include <editeng/boxitem.hxx>+#include <svl/srchitem.hxx>+#include <sfx2/linkmgr.hxx> #include <sfx2/bindings.hxx> #include <vcl/virdev.hxx> #include <sfx2/app.hxx>@@ -1755,7 +1752,7 @@ BOOL __EXPORT ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const //---------------------------------------------------------------------------- -ScAreaLink* lcl_FindAreaLink( SvxLinkManager* pLinkManager, const String& rDoc,+ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDoc, const String& rFlt, const String& rOpt, const String& rSrc, const ScRange& rDest ) {@@ -1819,7 +1816,7 @@ String __EXPORT ScUndoInsertAreaLink::GetComment() const void __EXPORT ScUndoInsertAreaLink::Undo() { ScDocument* pDoc = pDocShell->GetDocument();- SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); ScAreaLink* pLink = lcl_FindAreaLink( pLinkManager, aDocName, aFltName, aOptions, aAreaName, aRange );@@ -1835,7 +1832,7 @@ void __EXPORT ScUndoInsertAreaLink::Undo() void __EXPORT ScUndoInsertAreaLink::Redo() { ScDocument* pDoc = pDocShell->GetDocument();- SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); ScAreaLink* pLink = new ScAreaLink( pDocShell, aDocName, aFltName, aOptions, aAreaName, aRange.aStart, nRefreshDelay );@@ -1909,7 +1906,7 @@ String __EXPORT ScUndoRemoveAreaLink::GetComment() const void __EXPORT ScUndoRemoveAreaLink::Undo() { ScDocument* pDoc = pDocShell->GetDocument();- SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); ScAreaLink* pLink = new ScAreaLink( pDocShell, aDocName, aFltName, aOptions, aAreaName, aRange.aStart, nRefreshDelay );@@ -1928,7 +1925,7 @@ void __EXPORT ScUndoRemoveAreaLink::Undo() void __EXPORT ScUndoRemoveAreaLink::Redo() { ScDocument* pDoc = pDocShell->GetDocument();- SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); ScAreaLink* pLink = lcl_FindAreaLink( pLinkManager, aDocName, aFltName, aOptions, aAreaName, aRange );@@ -2074,7 +2071,7 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const void __EXPORT ScUndoUpdateAreaLink::Undo() { ScDocument* pDoc = pDocShell->GetDocument();- SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); ScAreaLink* pLink = lcl_FindAreaLink( pLinkManager, aNewDoc, aNewFlt, aNewOpt, aNewArea, aNewRange ); if (pLink)@@ -2093,7 +2090,7 @@ void __EXPORT ScUndoUpdateAreaLink::Undo() void __EXPORT ScUndoUpdateAreaLink::Redo() { ScDocument* pDoc = pDocShell->GetDocument();- SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); ScAreaLink* pLink = lcl_FindAreaLink( pLinkManager, aOldDoc, aOldFlt, aOldOpt, aOldArea, aOldRange ); if (pLink)diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxxindex 87f83ce7a932..77142bb13799 100644--- a/sc/source/ui/undo/undocell.cxx+++ b/sc/source/ui/undo/undocell.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undocell.cxx,v $- * $Revision: 1.15.128.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,9 +29,9 @@ #include "precompiled_sc.hxx" #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/editobj.hxx>+#include <editeng/editobj.hxx> #include <svl/zforlist.hxx> #include <sfx2/app.hxx> diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxxindex 5c929ec7a11b..2ed65d5db6f5 100644--- a/sc/source/ui/undo/undodat.cxx+++ b/sc/source/ui/undo/undodat.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undodat.cxx,v $- * $Revision: 1.12.128.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxxindex 556b3c2d519e..a10a7381d808 100644--- a/sc/source/ui/undo/undodraw.cxx+++ b/sc/source/ui/undo/undodraw.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undodraw.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/undo/undoolk.cxx b/sc/source/ui/undo/undoolk.cxxindex 402dd779aa3b..183b9d1cd7b4 100644--- a/sc/source/ui/undo/undoolk.cxx+++ b/sc/source/ui/undo/undoolk.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undoolk.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxxindex 7e7f3db1d42c..67a91baa38ee 100644--- a/sc/source/ui/undo/undostyl.cxx+++ b/sc/source/ui/undo/undostyl.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undostyl.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxxindex 0fc638b7825e..17f15af54701 100644--- a/sc/source/ui/undo/undotab.cxx+++ b/sc/source/ui/undo/undotab.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undotab.cxx,v $- * $Revision: 1.19.28.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxxindex 7a990796ff45..168975cdda3a 100644--- a/sc/source/ui/undo/undoutil.cxx+++ b/sc/source/ui/undo/undoutil.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: undoutil.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxxindex 67157a590286..e8000d71518b 100644--- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx+++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: ChartRangeSelectionListener.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxxindex 9661335bbf35..10627222be80 100644--- a/sc/source/ui/unoobj/addruno.cxx+++ b/sc/source/ui/unoobj/addruno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: addruno.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxxindex e4b9ef8a8765..481c611773ed 100644--- a/sc/source/ui/unoobj/afmtuno.cxx+++ b/sc/source/ui/unoobj/afmtuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: afmtuno.cxx,v $- * $Revision: 1.16.144.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,6 +31,7 @@ #include "scitems.hxx"+#include <editeng/memberids.hrc> #include <tools/debug.hxx> #include <tools/shl.hxx> #include <svl/poolitem.hxx>diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxxindex a8944c427a99..8b20d9849f47 100644--- a/sc/source/ui/unoobj/appluno.cxx+++ b/sc/source/ui/unoobj/appluno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: appluno.cxx,v $- * $Revision: 1.25 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxxindex 2aa7a89b8797..246555d06f25 100644--- a/sc/source/ui/unoobj/celllistsource.cxx+++ b/sc/source/ui/unoobj/celllistsource.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: celllistsource.cxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxxindex 8860f9a5add6..f6b52f0b50f8 100644--- a/sc/source/ui/unoobj/celllistsource.hxx+++ b/sc/source/ui/unoobj/celllistsource.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: celllistsource.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxxindex babccf9a7053..c61a6443af99 100644--- a/sc/source/ui/unoobj/cellsuno.cxx+++ b/sc/source/ui/unoobj/cellsuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellsuno.cxx,v $- * $Revision: 1.113.126.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,21 +30,21 @@ #include "scitems.hxx"-#include <svx/eeitem.hxx>-+#include <editeng/eeitem.hxx>+#include <svx/svdpool.hxx> #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/editeng.hxx>-#include <svx/flditem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/editeng.hxx>+#include <editeng/flditem.hxx> #include <svx/fmdpage.hxx>-#include <svx/langitem.hxx>-#include <svx/linkmgr.hxx>-#include <svx/srchitem.hxx>+#include <editeng/langitem.hxx>+#include <sfx2/linkmgr.hxx>+#include <svl/srchitem.hxx> #include <svx/unomid.hxx>-#include <svx/unoprnms.hxx>-#include <svx/unotext.hxx>+#include <editeng/unoprnms.hxx>+#include <editeng/unotext.hxx> #include <svx/svdpage.hxx> #include <sfx2/bindings.hxx> #include <svl/zforlist.hxx>@@ -794,7 +791,7 @@ const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap() } const SvxItemPropertySet* lcl_GetEditPropertySet() {- static SvxItemPropertySet aEditPropertySet( lcl_GetEditPropertyMap() );+ static SvxItemPropertySet aEditPropertySet( lcl_GetEditPropertyMap(), SdrObject::GetGlobalDrawObjectItemPool() ); return &aEditPropertySet; } @@ -1126,7 +1123,7 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, { // #87871# accept integer types because Basic passes a floating point // variable as byte, short or long if it's an integer number.- double fVal;+ double fVal(0.0); rElement >>= fVal; pDoc->SetValue( nDocCol, nDocRow, nTab, fVal ); }@@ -7681,7 +7678,7 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr // Update immer, auch wenn der Link schon da war //! Update nur fuer die betroffene Tabelle??? - SvxLinkManager* pLinkManager = pDoc->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager(); USHORT nCount = pLinkManager->GetLinks().Count(); for ( USHORT i=0; i<nCount; i++ ) {diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxxindex 263c65a10b1c..3b806ccf80b7 100644--- a/sc/source/ui/unoobj/cellvaluebinding.cxx+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellvaluebinding.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxxindex 1b46e483fb12..c9537d546f7b 100644--- a/sc/source/ui/unoobj/cellvaluebinding.hxx+++ b/sc/source/ui/unoobj/cellvaluebinding.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellvaluebinding.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxxindex 07ed8709ab01..b8a751669e6f 100644--- a/sc/source/ui/unoobj/chart2uno.cxx+++ b/sc/source/ui/unoobj/chart2uno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chart2uno.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -2935,6 +2932,9 @@ void ScChart2DataSequence::BuildDataCache() ::std::list<sal_Int32>::const_iterator itr = aHiddenValues.begin(), itrEnd = aHiddenValues.end(); for (;itr != itrEnd; ++itr, ++pArr) *pArr = *itr;++ // Clear the data series cache when the array is re-built.+ m_aMixedDataCache.realloc(0); } void ScChart2DataSequence::RebuildDataCache()@@ -3127,7 +3127,6 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint if ( m_bGotDataChangedHint && m_pDocument ) { m_aDataArray.clear();- m_aDataArray.clear(); lang::EventObject aEvent; aEvent.Source.set((cppu::OWeakObject*)this); @@ -3302,19 +3301,24 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() throw uno::RuntimeException(); BuildDataCache();- sal_Int32 nCount = m_aDataArray.size();- uno::Sequence<uno::Any> aSeq(nCount);- uno::Any* pArr = aSeq.getArray();- ::std::list<Item>::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end();- for (; itr != itrEnd; ++itr, ++pArr)++ if (!m_aMixedDataCache.getLength()) {- if (itr->mbIsValue)- *pArr <<= itr->mfValue;- else- *pArr <<= itr->maString;- }+ // Build a cache for the 1st time... - return aSeq;+ sal_Int32 nCount = m_aDataArray.size();+ m_aMixedDataCache.realloc(nCount);+ uno::Any* pArr = m_aMixedDataCache.getArray();+ ::std::list<Item>::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end();+ for (; itr != itrEnd; ++itr, ++pArr)+ {+ if (itr->mbIsValue)+ *pArr <<= itr->mfValue;+ else+ *pArr <<= itr->maString;+ }+ }+ return m_aMixedDataCache; } // XNumericalDataSequence --------------------------------------------------diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxxindex d66600df4243..5feabe72207d 100644--- a/sc/source/ui/unoobj/chartuno.cxx+++ b/sc/source/ui/unoobj/chartuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: chartuno.cxx,v $- * $Revision: 1.22 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxxindex 87045ff5c053..dd8f15359559 100644--- a/sc/source/ui/unoobj/confuno.cxx+++ b/sc/source/ui/unoobj/confuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: confuno.cxx,v $- * $Revision: 1.32 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/convuno.cxx b/sc/source/ui/unoobj/convuno.cxxindex 30032d42377b..e3b0c09b25c2 100644--- a/sc/source/ui/unoobj/convuno.cxx+++ b/sc/source/ui/unoobj/convuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: convuno.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxxindex 99c907113bb8..39ed859aa574 100644--- a/sc/source/ui/unoobj/cursuno.cxx+++ b/sc/source/ui/unoobj/cursuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cursuno.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxxindex a7836b43f740..a921d1e125f2 100644--- a/sc/source/ui/unoobj/dapiuno.cxx+++ b/sc/source/ui/unoobj/dapiuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dapiuno.cxx,v $- * $Revision: 1.21.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxxindex 0dd364812d48..6e416764eb76 100644--- a/sc/source/ui/unoobj/datauno.cxx+++ b/sc/source/ui/unoobj/datauno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: datauno.cxx,v $- * $Revision: 1.30.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxxindex 3df667faad8c..141a7d0abb73 100644--- a/sc/source/ui/unoobj/defltuno.cxx+++ b/sc/source/ui/unoobj/defltuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: defltuno.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,7 +29,7 @@ #include "precompiled_sc.hxx" -+#include <editeng/memberids.hrc> #include <svl/smplhint.hxx> #include <svl/itemprop.hxx> #include <svx/unomid.hxx>diff --git a/sc/source/ui/unoobj/detreg.cxx b/sc/source/ui/unoobj/detreg.cxxindex 627192c2c1aa..498d0fc886ec 100644--- a/sc/source/ui/unoobj/detreg.cxx+++ b/sc/source/ui/unoobj/detreg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: detreg.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxxindex 99bce5579e14..cff547ce2652 100644--- a/sc/source/ui/unoobj/dispuno.cxx+++ b/sc/source/ui/unoobj/dispuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dispuno.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxxindex 71f4706085d8..8e857adca09c 100644--- a/sc/source/ui/unoobj/docuno.cxx+++ b/sc/source/ui/unoobj/docuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: docuno.cxx,v $- * $Revision: 1.68.52.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxxindex 5d1fd97d9455..52fce55dfc58 100644--- a/sc/source/ui/unoobj/drdefuno.cxx+++ b/sc/source/ui/unoobj/drdefuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drdefuno.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxxindex 476409fa5113..7febe374d0d9 100644--- a/sc/source/ui/unoobj/editsrc.cxx+++ b/sc/source/ui/unoobj/editsrc.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: editsrc.cxx,v $- * $Revision: 1.26.128.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,14 +31,14 @@ #include "editsrc.hxx" #include "scitems.hxx"-#include <svx/eeitem.hxx>-#include <svx/unofored.hxx>+#include <editeng/eeitem.hxx>+#include <editeng/unofored.hxx> #include <svx/svdpage.hxx> #include <svx/svditer.hxx> #include <svx/svdocapt.hxx>-#include <svx/outlobj.hxx>-#include <svx/editobj.hxx>-+#include <editeng/outlobj.hxx>+#include <editeng/editobj.hxx>+#include <editeng/outliner.hxx> #include "textuno.hxx" #include "editutil.hxx" #include "docsh.hxx"diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxxindex 8fd4bba512eb..8e3e39d07ef4 100644--- a/sc/source/ui/unoobj/fielduno.cxx+++ b/sc/source/ui/unoobj/fielduno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fielduno.cxx,v $- * $Revision: 1.18.32.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,11 +30,11 @@ #include <svl/smplhint.hxx> -#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/editeng.hxx>-#include <svx/editobj.hxx>-#include <svx/flditem.hxx>+#include <editeng/editeng.hxx>+#include <editeng/editobj.hxx>+#include <editeng/flditem.hxx> #include <rtl/uuid.h> #include <com/sun/star/beans/PropertyAttribute.hpp>diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxxindex eb415d1d3ff3..837d34544b60 100644--- a/sc/source/ui/unoobj/filtuno.cxx+++ b/sc/source/ui/unoobj/filtuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: filtuno.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxxindex f9407b544f76..392533c7cf93 100644--- a/sc/source/ui/unoobj/fmtuno.cxx+++ b/sc/source/ui/unoobj/fmtuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: fmtuno.cxx,v $- * $Revision: 1.18.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxxindex d8dc43d86071..2807a12f7dac 100644--- a/sc/source/ui/unoobj/forbiuno.cxx+++ b/sc/source/ui/unoobj/forbiuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: forbiuno.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,7 +30,7 @@ -#include <svx/forbiddencharacterstable.hxx>+#include <editeng/forbiddencharacterstable.hxx> #include "forbiuno.hxx" #include "docsh.hxx"diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxxindex a60bb836b142..0c197a8b738d 100644--- a/sc/source/ui/unoobj/funcuno.cxx+++ b/sc/source/ui/unoobj/funcuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: funcuno.cxx,v $- * $Revision: 1.21 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -417,7 +414,7 @@ public: { // #87871# accept integer types because Basic passes a floating point // variable as byte, short or long if it's an integer number.- double fVal;+ double fVal(0.0); rElement >>= fVal; visitElem( nCol, nRow, fVal ); }diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxxindex ddb5dc3b0496..6d9fcd1d23e4 100644--- a/sc/source/ui/unoobj/linkuno.cxx+++ b/sc/source/ui/unoobj/linkuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: linkuno.cxx,v $- * $Revision: 1.18.134.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,7 +31,7 @@ #include <svl/smplhint.hxx>-#include <svx/linkmgr.hxx>+#include <sfx2/linkmgr.hxx> #include "linkuno.hxx" #include "miscuno.hxx"@@ -131,7 +128,7 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const { if (pDocShell) {- SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); USHORT nCount = pLinkManager->GetLinks().Count(); for (USHORT i=0; i<nCount; i++) {@@ -304,7 +301,7 @@ void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName) ScTableLink* pLink = GetLink_Impl(); if (pLink) {- // pLink->Refresh mit neuem Dateinamen bringt SvxLinkManager durcheinander+ // pLink->Refresh mit neuem Dateinamen bringt sfx2::LinkManager durcheinander // darum per Hand die Tabellen umsetzen und Link per UpdateLinks neu erzeugen String aNewStr(ScGlobal::GetAbsDocName( String(rNewName), pDocShell ));@@ -605,7 +602,7 @@ ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, USHORT nPos ) { if (pDocShell) {- SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); USHORT nTotalCount = pLinkManager->GetLinks().Count(); USHORT nAreaCount = 0; for (USHORT i=0; i<nTotalCount; i++)@@ -678,7 +675,7 @@ void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUStr //! Undo fuer Loeschen //! Undo zusammenfassen - SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); pLinkManager->Remove( pLink ); pLink = NULL; // bei Remove geloescht @@ -1004,7 +1001,7 @@ void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Runti { //! SetAddUndo oder so - SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); pLinkManager->Remove( pLink ); } }@@ -1026,7 +1023,7 @@ sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException) INT32 nAreaCount = 0; if (pDocShell) {- SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();+ sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager(); USHORT nTotalCount = pLinkManager->GetLinks().Count(); for (USHORT i=0; i<nTotalCount; i++) {diff --git a/sc/source/ui/unoobj/listenercalls.cxx b/sc/source/ui/unoobj/listenercalls.cxxindex d9cd9730a9f5..9abc8e0ab826 100644--- a/sc/source/ui/unoobj/listenercalls.cxx+++ b/sc/source/ui/unoobj/listenercalls.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: listenercalls.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/makefile.mk b/sc/source/ui/unoobj/makefile.mkindex 1570ec510f97..35fdf164bf92 100644--- a/sc/source/ui/unoobj/makefile.mk+++ b/sc/source/ui/unoobj/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.21 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxxindex ee2a64bd8c78..4fdac0288796 100644--- a/sc/source/ui/unoobj/miscuno.cxx+++ b/sc/source/ui/unoobj/miscuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: miscuno.cxx,v $- * $Revision: 1.14.32.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxxindex ab8576949b75..474d07764127 100644--- a/sc/source/ui/unoobj/nameuno.cxx+++ b/sc/source/ui/unoobj/nameuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: nameuno.cxx,v $- * $Revision: 1.21.132.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxxindex 8477d1f17779..c5dd11977478 100644--- a/sc/source/ui/unoobj/notesuno.cxx+++ b/sc/source/ui/unoobj/notesuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: notesuno.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,8 +31,9 @@ #include "rangelst.hxx"-#include <svx/unotext.hxx>-+#include <editeng/unotext.hxx>+#include <svx/svdpool.hxx>+#include <svx/svdobj.hxx> #include "notesuno.hxx" #include "textuno.hxx" #include "cellsuno.hxx" // getParent@@ -52,7 +50,7 @@ #include "undocell.hxx" #include "unoguard.hxx" #include "userdat.hxx"-#include <svx/outlobj.hxx>+#include <editeng/outlobj.hxx> #include <svx/unoshape.hxx> #include <svx/svdocapt.hxx> #include <svx/svditer.hxx>@@ -70,7 +68,7 @@ const SvxItemPropertySet* lcl_GetAnnotationPropertySet() { {0,0,0,0,0,0} };- static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl );+ static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aAnnotationPropertySet_Impl; } diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxxindex f7c8d2827f50..0d277fdb19fe 100644--- a/sc/source/ui/unoobj/optuno.cxx+++ b/sc/source/ui/unoobj/optuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: optuno.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxxindex a17f12b9f98c..4687683a8ef4 100644--- a/sc/source/ui/unoobj/pageuno.cxx+++ b/sc/source/ui/unoobj/pageuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pageuno.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxxindex 4600244cf2df..cded62efa3a8 100644--- a/sc/source/ui/unoobj/scdetect.cxx+++ b/sc/source/ui/unoobj/scdetect.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scdetect.cxx,v $- * $Revision: 1.24 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxxindex 666102f4a542..a652d11df951 100644--- a/sc/source/ui/unoobj/scdetect.hxx+++ b/sc/source/ui/unoobj/scdetect.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scdetect.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxxindex 1f51bc1646af..0c57963a4f12 100644--- a/sc/source/ui/unoobj/servuno.cxx+++ b/sc/source/ui/unoobj/servuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: servuno.cxx,v $- * $Revision: 1.17.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ #include <tools/debug.hxx> #include <svtools/unoimap.hxx> #include <svx/unofill.hxx>-#include <svx/unonrule.hxx>+#include <editeng/unonrule.hxx> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include "servuno.hxx"@@ -60,9 +57,65 @@ // #100263# Support creation of GraphicObjectResolver and EmbeddedObjectResolver #include <svx/xmleohlp.hxx> #include <svx/xmlgrhlp.hxx>+#include <sfx2/docfile.hxx>+#include <sfx2/docfilt.hxx>+#include <com/sun/star/script/ScriptEventDescriptor.hpp>+#include <com/sun/star/document/XCodeNameQuery.hpp>+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>+#include <com/sun/star/form/XFormsSupplier.hpp>+#include <svx/unomod.hxx> using namespace ::com::sun::star; +class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery >+{+ScDocShell* mpDocShell;+public:+ ScVbaCodeNameProvider( ScDocShell* pDocShell ) : mpDocShell( pDocShell ) {}+ // XCodeNameQuery+ rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )+ {+ rtl::OUString sCodeName;+ if ( mpDocShell )+ {+ OSL_TRACE( "*** In ScVbaCodeNameProvider::getCodeNameForObject");+ // need to find the page ( and index ) for this control+ uno::Reference< drawing::XDrawPagesSupplier > xSupplier( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );+ uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPages(), uno::UNO_QUERY_THROW );+ sal_Int32 nLen = xIndex->getCount();+ bool bMatched = false;+ uno::Sequence< script::ScriptEventDescriptor > aFakeEvents;+ for ( sal_Int32 index = 0; index < nLen; ++index )+ {+ try+ {+ uno::Reference< form::XFormsSupplier > xFormSupplier( xIndex->getByIndex( index ), uno::UNO_QUERY_THROW );+ uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );+ // get the www-standard container+ uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW );+ sal_Int32 nCntrls = xFormControls->getCount();+ for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )+ {+ uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );+ bMatched = ( xControl == xIf );+ if ( bMatched )+ {+ String sName;+ mpDocShell->GetDocument()->GetCodeName( static_cast<SCTAB>( index ), sName );+ sCodeName = sName;+ }+ }+ }+ catch( uno::Exception& ) {}+ if ( bMatched )+ break;+ }+ }+ // Probably should throw here ( if !bMatched )+ return sCodeName;+ }++}; //------------------------------------------------------------------------ //@@ -119,6 +172,7 @@ static const ProvNamesId_Type __FAR_DATA aProvNamesId[] = { SC_SERVICENAME_CHDATAPROV, SC_SERVICE_CHDATAPROV }, { SC_SERVICENAME_FORMULAPARS, SC_SERVICE_FORMULAPARS }, { SC_SERVICENAME_OPCODEMAPPER, SC_SERVICE_OPCODEMAPPER },+ { "ooo.vba.VBACodeNameProvider", SC_SERVICE_VBACODENAMEPROVIDER }, // case-correct versions of the service names (#i102468#) { "com.sun.star.text.textfield.URL", SC_SERVICE_URLFIELD },@@ -180,7 +234,8 @@ static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] = "", // SC_SERVICE_SHEETDOCSET "", // SC_SERVICE_CHDATAPROV "", // SC_SERVICE_FORMULAPARS- "" // SC_SERVICE_OPCODEMAPPER+ "", // SC_SERVICE_OPCODEMAPPER+ "", // SC_SERVICE_VBACODENAMEPROVIDER }; @@ -383,9 +438,23 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( ScCompiler* pComp = new ScCompiler(pDoc,aAddress); pComp->SetGrammar( pDoc->GetGrammar() ); xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> (pComp))));+ break;+ }+ case SC_SERVICE_VBACODENAMEPROVIDER:+ {+ // Only create the excel faking service for excel docs+ const SfxFilter *pFilt = pDocShell->GetMedium()->GetFilter();+ if ( pFilt && pFilt->IsAlienFormat() )+ {+ // application/vnd.ms-excel is the mime type for Excel+ static const rtl::OUString sExcelMimeType( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.ms-excel" ) );+ if ( sExcelMimeType.equals( pFilt->GetMimeType() ) )+ xRet.set(static_cast<document::XCodeNameQuery*>(new ScVbaCodeNameProvider( pDocShell )));+ }+ break; }- break; }+ return xRet; } diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxxindex 8a5b92d0bd8c..1ed384ed2ebd 100644--- a/sc/source/ui/unoobj/shapeuno.cxx+++ b/sc/source/ui/unoobj/shapeuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: shapeuno.cxx,v $- * $Revision: 1.21.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -38,7 +35,7 @@ #include <svtools/unoimap.hxx> #include <svx/svdobj.hxx> #include <svx/unoshape.hxx>-#include <svx/unofield.hxx>+#include <editeng/unofield.hxx> #include <svx/shapepropertynotifier.hxx> #include <toolkit/helper/convert.hxx> #include <cppuhelper/implbase2.hxx>@@ -162,12 +159,12 @@ uno::Any SAL_CALL ScShapeObj::queryInterface( const uno::Type& rType ) void SAL_CALL ScShapeObj::acquire() throw() {- OWeakObject::acquire(); + OWeakObject::acquire(); } void SAL_CALL ScShapeObj::release() throw() {- OWeakObject::release(); + OWeakObject::release(); } void ScShapeObj::GetShapePropertySet()diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxxindex 14b271c16cb7..b005d16ce482 100644--- a/sc/source/ui/unoobj/srchuno.cxx+++ b/sc/source/ui/unoobj/srchuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: srchuno.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,7 +31,7 @@ #include "scitems.hxx"-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <osl/mutex.hxx> #include <rtl/uuid.h> diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxxindex 941f586a73c9..1ceaa424ecd6 100644--- a/sc/source/ui/unoobj/styleuno.cxx+++ b/sc/source/ui/unoobj/styleuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: styleuno.cxx,v $- * $Revision: 1.44.72.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,14 +31,15 @@ #include "scitems.hxx"+#include <editeng/memberids.hrc> #include <svx/algitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/langitem.hxx>-#include <svx/numitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/langitem.hxx>+#include <editeng/numitem.hxx> #include <svx/pageitem.hxx>-#include <svx/pbinitem.hxx>+#include <editeng/pbinitem.hxx> #include <svx/unomid.hxx>-#include <svx/unonrule.hxx>+#include <editeng/unonrule.hxx> #include <sfx2/bindings.hxx> #include <sfx2/printer.hxx> #include <vcl/virdev.hxx>diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxxindex 7d291235559a..aa4cdf58882d 100644--- a/sc/source/ui/unoobj/targuno.cxx+++ b/sc/source/ui/unoobj/targuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: targuno.cxx,v $- * $Revision: 1.9 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxxindex a9e6a799e010..5c45195621d8 100644--- a/sc/source/ui/unoobj/textuno.cxx+++ b/sc/source/ui/unoobj/textuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: textuno.cxx,v $- * $Revision: 1.25.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,21 +31,21 @@ #include "scitems.hxx"-#include <svx/eeitem.hxx>---#include <svx/editeng.hxx>-#include <svx/editobj.hxx>-#include <svx/flditem.hxx>+#include <editeng/eeitem.hxx>+#include <svx/svdpool.hxx>+#include <svx/svdobj.hxx>+#include <editeng/editeng.hxx>+#include <editeng/editobj.hxx>+#include <editeng/flditem.hxx> #include <svx/unomid.hxx>-#include <svx/unoprnms.hxx>-#include <svx/unofored.hxx>+#include <editeng/unoprnms.hxx>+#include <editeng/unofored.hxx> #include <rtl/uuid.h> #include <vcl/virdev.hxx> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp>-+#include <editeng/unoipset.hxx> #include "textuno.hxx" #include "fielduno.hxx" #include "servuno.hxx"@@ -100,7 +97,7 @@ const SvxItemPropertySet * lcl_GetHdFtPropertySet() } bTwipsSet = TRUE; }- static SvxItemPropertySet aHdFtPropertySet_Impl( aHdFtPropertyMap_Impl );+ static SvxItemPropertySet aHdFtPropertySet_Impl( aHdFtPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); return &aHdFtPropertySet_Impl; } diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxxindex 9d31b15fdf47..fc14b53a6372 100644--- a/sc/source/ui/unoobj/tokenuno.cxx+++ b/sc/source/ui/unoobj/tokenuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tokenuno.cxx,v $- * $Revision: 1.6.108.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxxindex e79cb113e496..9673db411ea0 100644--- a/sc/source/ui/unoobj/unodoc.cxx+++ b/sc/source/ui/unoobj/unodoc.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: unodoc.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/unoguard.cxx b/sc/source/ui/unoobj/unoguard.cxxindex baa60cdb693e..ff1c94338b72 100644--- a/sc/source/ui/unoobj/unoguard.cxx+++ b/sc/source/ui/unoobj/unoguard.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: unoguard.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/unoreflist.cxx b/sc/source/ui/unoobj/unoreflist.cxxindex 0b28001b9fc9..65f43273f6e7 100644--- a/sc/source/ui/unoobj/unoreflist.cxx+++ b/sc/source/ui/unoobj/unoreflist.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: unoreflist.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxxindex 0883c24a14f0..15fb8183a88f 100644--- a/sc/source/ui/unoobj/viewuno.cxx+++ b/sc/source/ui/unoobj/viewuno.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: viewuno.cxx,v $- * $Revision: 1.37.24.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,7 +29,7 @@ #include "precompiled_sc.hxx" -+#include <editeng/outliner.hxx> #include <svx/fmdpage.hxx> #include <svx/svditer.hxx> #include <svx/svdmark.hxx>diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxxindex 4bf4163aad3c..ce81fd2645c4 100644--- a/sc/source/ui/unoobj/warnpassword.cxx+++ b/sc/source/ui/unoobj/warnpassword.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: warnpassword.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxxindex dd0550709b96..4912863a446e 100644--- a/sc/source/ui/vba/excelvbahelper.cxx+++ b/sc/source/ui/vba/excelvbahelper.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbahelper.cxx,v $- * $Revision: 1.5.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxxindex bb222688236a..34b099e6db46 100644--- a/sc/source/ui/vba/excelvbahelper.hxx+++ b/sc/source/ui/vba/excelvbahelper.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbahelper.hxx,v $- * $Revision: 1.5.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/helperdecl.hxx b/sc/source/ui/vba/helperdecl.hxxindex 9c37d418a561..a9969179d52f 100644--- a/sc/source/ui/vba/helperdecl.hxx+++ b/sc/source/ui/vba/helperdecl.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: helperdecl.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/makefile.mk b/sc/source/ui/vba/makefile.mkindex 253d0f52ab96..00a26e2f94de 100644--- a/sc/source/ui/vba/makefile.mk+++ b/sc/source/ui/vba/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.6 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxxindex 6286b6873321..8be0f6d9f726 100644--- a/sc/source/ui/vba/service.cxx+++ b/sc/source/ui/vba/service.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: service.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/testvba/launchTest.pl b/sc/source/ui/vba/testvba/launchTest.plindex 1e3267b87983..243798616052 100644--- a/sc/source/ui/vba/testvba/launchTest.pl+++ b/sc/source/ui/vba/testvba/launchTest.pl@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. #-# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: launchTest.pl,v $-#-# $Revision: 1.3.138.1 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/testvba/makefile.mk b/sc/source/ui/vba/testvba/makefile.mkindex b89eedff20df..fb131f314ed3 100644--- a/sc/source/ui/vba/testvba/makefile.mk+++ b/sc/source/ui/vba/testvba/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.3 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxxindex 953a2aaee74e..5d9e513dabeb 100644--- a/sc/source/ui/vba/vbaapplication.cxx+++ b/sc/source/ui/vba/vbaapplication.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaapplication.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxxindex 8d5f4a3b2354..02822e9f18ad 100644--- a/sc/source/ui/vba/vbaapplication.hxx+++ b/sc/source/ui/vba/vbaapplication.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaapplication.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxxindex f99fb0c8819c..51105d60b0d4 100644--- a/sc/source/ui/vba/vbaassistant.cxx+++ b/sc/source/ui/vba/vbaassistant.cxx@@ -1,35 +1,27 @@ /************************************************************************* *- * OpenOffice.org - a multi-platform office productivity suite+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * $RCSfile$+ * Copyright 2000, 2010 Oracle and/or its affiliates. *- * $Revision$+ * OpenOffice.org - a multi-platform office productivity suite *- * last change: $Author$ $Date$+ * This file is part of OpenOffice.org. *- * The Contents of this file are made available subject to- * the terms of GNU Lesser General Public License Version 2.1.+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation. *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code). *- * GNU Lesser General Public License Version 2.1- * =============================================- * Copyright 2005 by Sun Microsystems, Inc.- * 901 San Antonio Road, Palo Alto, CA 94303, USA- *- * This library is free software; you can redistribute it and/or- * modify it under the terms of the GNU Lesser General Public- * License version 2.1, as published by the Free Software Foundation.- *- * This library is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU- * Lesser General Public License for more details.- *- * You should have received a copy of the GNU Lesser General Public- * License along with this library; if not, write to the Free Software- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,- * MA 02111-1307 USA+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License. * ************************************************************************/ #include <sfx2/app.hxx>diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxxindex fa811f548430..dbb95af4b689 100644--- a/sc/source/ui/vba/vbaassistant.hxx+++ b/sc/source/ui/vba/vbaassistant.hxx@@ -1,35 +1,27 @@ /************************************************************************* *- * OpenOffice.org - a multi-platform office productivity suite+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * $RCSfile$+ * Copyright 2000, 2010 Oracle and/or its affiliates. *- * $Revision$+ * OpenOffice.org - a multi-platform office productivity suite *- * last change: $Author$ $Date$+ * This file is part of OpenOffice.org. *- * The Contents of this file are made available subject to- * the terms of GNU Lesser General Public License Version 2.1.+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation. *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code). *- * GNU Lesser General Public License Version 2.1- * =============================================- * Copyright 2005 by Sun Microsystems, Inc.- * 901 San Antonio Road, Palo Alto, CA 94303, USA- *- * This library is free software; you can redistribute it and/or- * modify it under the terms of the GNU Lesser General Public- * License version 2.1, as published by the Free Software Foundation.- *- * This library is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU- * Lesser General Public License for more details.- *- * You should have received a copy of the GNU Lesser General Public- * License along with this library; if not, write to the Free Software- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,- * MA 02111-1307 USA+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef SC_VBA_ASSISTANT_HXXdiff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxxindex 37701e702662..d563ba105108 100644--- a/sc/source/ui/vba/vbaaxes.cxx+++ b/sc/source/ui/vba/vbaaxes.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaaxes.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxxindex 62be9ba97a39..5b5f88e2b72f 100644--- a/sc/source/ui/vba/vbaaxes.hxx+++ b/sc/source/ui/vba/vbaaxes.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaaxes.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxxindex 4c64430c2fb5..a9c91a4cea31 100644--- a/sc/source/ui/vba/vbaaxis.cxx+++ b/sc/source/ui/vba/vbaaxis.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaaxis.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxxindex 72ff614805e4..13432b231a27 100644--- a/sc/source/ui/vba/vbaaxis.hxx+++ b/sc/source/ui/vba/vbaaxis.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaaxis.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxxindex b0b30e3fc914..89b12b6e2870 100644--- a/sc/source/ui/vba/vbaaxistitle.cxx+++ b/sc/source/ui/vba/vbaaxistitle.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaaxistitle.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxxindex 685658cb39eb..59ba71d99a87 100644--- a/sc/source/ui/vba/vbaaxistitle.hxx+++ b/sc/source/ui/vba/vbaaxistitle.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaaxistitle.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxxindex 2344481dc18a..5424da041f84 100644--- a/sc/source/ui/vba/vbaborders.cxx+++ b/sc/source/ui/vba/vbaborders.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaborders.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxxindex ec7deed20ebe..a385ad2e7a14 100644--- a/sc/source/ui/vba/vbaborders.hxx+++ b/sc/source/ui/vba/vbaborders.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaborders.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxxindex 59fe5cf0dde4..6c0079ac7a82 100644--- a/sc/source/ui/vba/vbacharacters.cxx+++ b/sc/source/ui/vba/vbacharacters.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbacharacters.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxxindex 092d80a91e02..3400ff159d5e 100644--- a/sc/source/ui/vba/vbacharacters.hxx+++ b/sc/source/ui/vba/vbacharacters.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbacharacters.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxxindex 22f9a6a1afdc..e2f446f93f2b 100644--- a/sc/source/ui/vba/vbachart.cxx+++ b/sc/source/ui/vba/vbachart.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbachart.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxxindex 3ec8e77c4dc5..d0b53c34421f 100644--- a/sc/source/ui/vba/vbachart.hxx+++ b/sc/source/ui/vba/vbachart.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbachart.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxxindex 85104ff20cde..617a090b6d7a 100644--- a/sc/source/ui/vba/vbachartobject.cxx+++ b/sc/source/ui/vba/vbachartobject.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbachartobject.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxxindex c7bfbd15c4c1..3c1e224728ee 100644--- a/sc/source/ui/vba/vbachartobject.hxx+++ b/sc/source/ui/vba/vbachartobject.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbachartobject.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxxindex 7985a1c7c7d7..41b26501f4ad 100644--- a/sc/source/ui/vba/vbachartobjects.cxx+++ b/sc/source/ui/vba/vbachartobjects.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbachartobjects.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxxindex 5a11e92e8dbc..80ea038bb15d 100644--- a/sc/source/ui/vba/vbachartobjects.hxx+++ b/sc/source/ui/vba/vbachartobjects.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbachartobjects.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacharts.cxx b/sc/source/ui/vba/vbacharts.cxxindex 4c21720ca7f3..da0c7789134b 100644--- a/sc/source/ui/vba/vbacharts.cxx+++ b/sc/source/ui/vba/vbacharts.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbacharts.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacharts.hxx b/sc/source/ui/vba/vbacharts.hxxindex ac804e5ac873..b2ecfe23270f 100644--- a/sc/source/ui/vba/vbacharts.hxx+++ b/sc/source/ui/vba/vbacharts.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbacharts.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxxindex 7c90ea8edce0..e797c4a0269e 100644--- a/sc/source/ui/vba/vbacharttitle.cxx+++ b/sc/source/ui/vba/vbacharttitle.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbacharttitle.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxxindex 6108c9b0ae93..4d6ed34a86b6 100644--- a/sc/source/ui/vba/vbacharttitle.hxx+++ b/sc/source/ui/vba/vbacharttitle.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbacharttitle.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxxindex 9bda95e3429b..a8026f151c79 100644--- a/sc/source/ui/vba/vbacomment.cxx+++ b/sc/source/ui/vba/vbacomment.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbacomment.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxxindex 8601fa303844..91d8a8a8e437 100644--- a/sc/source/ui/vba/vbacomment.hxx+++ b/sc/source/ui/vba/vbacomment.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbacomment.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxxindex fdc8a3d886df..5090fa6f5ee6 100644--- a/sc/source/ui/vba/vbacomments.cxx+++ b/sc/source/ui/vba/vbacomments.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbacomments.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxxindex be876ab2f76e..0ab11e8d5e97 100644--- a/sc/source/ui/vba/vbacomments.hxx+++ b/sc/source/ui/vba/vbacomments.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbacomments.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxxindex 6a9aff4ce0ac..590d649ae561 100644--- a/sc/source/ui/vba/vbacondition.cxx+++ b/sc/source/ui/vba/vbacondition.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbacondition.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxxindex 823e889ae298..36052fe217ee 100644--- a/sc/source/ui/vba/vbacondition.hxx+++ b/sc/source/ui/vba/vbacondition.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbacondition.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbacontrol.cxx b/sc/source/ui/vba/vbacontrol.cxxdeleted file mode 100644index e69de29bb2d1..000000000000--- a/sc/source/ui/vba/vbacontrol.cxx+++ /dev/nulldiff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxxindex 06faebc3a37b..3c578a04e5d0 100644--- a/sc/source/ui/vba/vbadialog.cxx+++ b/sc/source/ui/vba/vbadialog.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbadialog.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxxindex 77be9341f7f3..40f4a4a83a11 100644--- a/sc/source/ui/vba/vbadialog.hxx+++ b/sc/source/ui/vba/vbadialog.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbadialog.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxxindex aa2161f33c21..67070879535b 100644--- a/sc/source/ui/vba/vbadialogs.cxx+++ b/sc/source/ui/vba/vbadialogs.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbadialogs.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxxindex a1785defc255..9aab5daf11fe 100644--- a/sc/source/ui/vba/vbadialogs.hxx+++ b/sc/source/ui/vba/vbadialogs.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbadialogs.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxxindex cb54532384b5..a8aac44770a9 100644--- a/sc/source/ui/vba/vbafont.cxx+++ b/sc/source/ui/vba/vbafont.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbafont.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxxindex 625985564cda..4cbcd483b2d8 100644--- a/sc/source/ui/vba/vbafont.hxx+++ b/sc/source/ui/vba/vbafont.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbafont.hxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxxindex 1d30f92e1c6c..c98029fb1292 100644--- a/sc/source/ui/vba/vbaformat.cxx+++ b/sc/source/ui/vba/vbaformat.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaformat.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxxindex cb33ad818f59..e024cd68b9ad 100644--- a/sc/source/ui/vba/vbaformat.hxx+++ b/sc/source/ui/vba/vbaformat.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaformat.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxxindex 285ea0ea3370..99d8a579956a 100644--- a/sc/source/ui/vba/vbaformatcondition.cxx+++ b/sc/source/ui/vba/vbaformatcondition.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaformatcondition.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxxindex 853b925020bb..075dbf658203 100644--- a/sc/source/ui/vba/vbaformatcondition.hxx+++ b/sc/source/ui/vba/vbaformatcondition.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaformatcondition.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxxindex 1048cd91d2d3..91d0429326dd 100644--- a/sc/source/ui/vba/vbaformatconditions.cxx+++ b/sc/source/ui/vba/vbaformatconditions.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaformatconditions.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxxindex 177ddd168f35..7dfa065ea8b6 100644--- a/sc/source/ui/vba/vbaformatconditions.hxx+++ b/sc/source/ui/vba/vbaformatconditions.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaformatconditions.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxxindex 982289f0002e..0cddacafd194 100644--- a/sc/source/ui/vba/vbaglobals.cxx+++ b/sc/source/ui/vba/vbaglobals.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaglobals.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxxindex 25d36af55c8d..ae34d710240f 100644--- a/sc/source/ui/vba/vbaglobals.hxx+++ b/sc/source/ui/vba/vbaglobals.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaglobals.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxxindex e010d1cf10f3..ca3b7825b232 100644--- a/sc/source/ui/vba/vbahelper.cxx+++ b/sc/source/ui/vba/vbahelper.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbahelper.cxx,v $- * $Revision: 1.5.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxxindex f6aa8cf8c4cb..f3203b130bf2 100644--- a/sc/source/ui/vba/vbahyperlink.cxx+++ b/sc/source/ui/vba/vbahyperlink.cxx@@ -1,35 +1,27 @@ /************************************************************************* *- * OpenOffice.org - a multi-platform office productivity suite+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * $RCSfile$+ * Copyright 2000, 2010 Oracle and/or its affiliates. *- * $Revision$+ * OpenOffice.org - a multi-platform office productivity suite *- * last change: $Author$ $Date$+ * This file is part of OpenOffice.org. *- * The Contents of this file are made available subject to- * the terms of GNU Lesser General Public License Version 2.1.+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation. *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code). *- * GNU Lesser General Public License Version 2.1- * =============================================- * Copyright 2005 by Sun Microsystems, Inc.- * 901 San Antonio Road, Palo Alto, CA 94303, USA- *- * This library is free software; you can redistribute it and/or- * modify it under the terms of the GNU Lesser General Public- * License version 2.1, as published by the Free Software Foundation.- *- * This library is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU- * Lesser General Public License for more details.- *- * You should have received a copy of the GNU Lesser General Public- * License along with this library; if not, write to the Free Software- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,- * MA 02111-1307 USA+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License. * ************************************************************************/ #include <vbahelper/helperdecl.hxx>diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxxindex a72eeb325ac6..570ecdcc2f45 100644--- a/sc/source/ui/vba/vbahyperlink.hxx+++ b/sc/source/ui/vba/vbahyperlink.hxx@@ -1,35 +1,27 @@ /************************************************************************* *- * OpenOffice.org - a multi-platform office productivity suite+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * $RCSfile$+ * Copyright 2000, 2010 Oracle and/or its affiliates. *- * $Revision$+ * OpenOffice.org - a multi-platform office productivity suite *- * last change: $Author$ $Date$+ * This file is part of OpenOffice.org. *- * The Contents of this file are made available subject to- * the terms of GNU Lesser General Public License Version 2.1.+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation. *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code). *- * GNU Lesser General Public License Version 2.1- * =============================================- * Copyright 2005 by Sun Microsystems, Inc.- * 901 San Antonio Road, Palo Alto, CA 94303, USA- *- * This library is free software; you can redistribute it and/or- * modify it under the terms of the GNU Lesser General Public- * License version 2.1, as published by the Free Software Foundation.- *- * This library is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU- * Lesser General Public License for more details.- *- * You should have received a copy of the GNU Lesser General Public- * License along with this library; if not, write to the Free Software- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,- * MA 02111-1307 USA+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef SC_VBA_HYPERLINK_HXXdiff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxxindex 9c309c997ed3..3af6243e0fa7 100644--- a/sc/source/ui/vba/vbainterior.cxx+++ b/sc/source/ui/vba/vbainterior.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbainterior.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxxindex d3ca677d4890..f0d4db1334fd 100644--- a/sc/source/ui/vba/vbainterior.hxx+++ b/sc/source/ui/vba/vbainterior.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbainterior.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxxindex 0d82f4ee45f8..bc0b016177c7 100644--- a/sc/source/ui/vba/vbaname.cxx+++ b/sc/source/ui/vba/vbaname.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaname.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxxindex 6fb585100d4c..81b2555a4ce1 100644--- a/sc/source/ui/vba/vbaname.hxx+++ b/sc/source/ui/vba/vbaname.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaname.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxxindex 043e7d386f15..d074f32b689d 100644--- a/sc/source/ui/vba/vbanames.cxx+++ b/sc/source/ui/vba/vbanames.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbanames.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxxindex 524277bdc0bd..1997ac6163d7 100644--- a/sc/source/ui/vba/vbanames.hxx+++ b/sc/source/ui/vba/vbanames.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbanames.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxxindex 64e5f05f90e1..a35ce4b3120f 100644--- a/sc/source/ui/vba/vbaoleobject.cxx+++ b/sc/source/ui/vba/vbaoleobject.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaoleobject.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxxindex 9ad6d6acc2b6..008564d71e16 100644--- a/sc/source/ui/vba/vbaoleobject.hxx+++ b/sc/source/ui/vba/vbaoleobject.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaoleobject.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxxindex d00ecf5e207d..69ba36cf8279 100644--- a/sc/source/ui/vba/vbaoleobjects.cxx+++ b/sc/source/ui/vba/vbaoleobjects.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaoleobjects.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxxindex 6372a1d2acf3..ab4ed29d163d 100644--- a/sc/source/ui/vba/vbaoleobjects.hxx+++ b/sc/source/ui/vba/vbaoleobjects.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaoleobjects.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxxindex 2e6b0f63731a..ee4c78c73151 100644--- a/sc/source/ui/vba/vbaoutline.cxx+++ b/sc/source/ui/vba/vbaoutline.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaoutline.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxxindex 423b97a34671..c954842cf7fd 100644--- a/sc/source/ui/vba/vbaoutline.hxx+++ b/sc/source/ui/vba/vbaoutline.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaoutline.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxxindex 6e8357be7a8c..1103c10f54c8 100644--- a/sc/source/ui/vba/vbapagebreak.cxx+++ b/sc/source/ui/vba/vbapagebreak.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile$- * $Revision$- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxxindex 2e83d3d9b6d6..4832464c1296 100644--- a/sc/source/ui/vba/vbapagebreak.hxx+++ b/sc/source/ui/vba/vbapagebreak.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile$- * $Revision$- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxxindex c3b86b77d0bd..25ccbb0f4cdc 100644--- a/sc/source/ui/vba/vbapagebreaks.cxx+++ b/sc/source/ui/vba/vbapagebreaks.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile$- * $Revision$- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxxindex 5c90745d61ff..de6174191e95 100644--- a/sc/source/ui/vba/vbapagebreaks.hxx+++ b/sc/source/ui/vba/vbapagebreaks.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile$- * $Revision$- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxxindex cbc9360db523..d660ddbbfd77 100644--- a/sc/source/ui/vba/vbapagesetup.cxx+++ b/sc/source/ui/vba/vbapagesetup.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile$- * $Revision$- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxxindex 2b8b1fffde43..d2c001b225cf 100644--- a/sc/source/ui/vba/vbapagesetup.hxx+++ b/sc/source/ui/vba/vbapagesetup.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile$- * $Revision$- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxxindex f9afaa00c191..0ce55547d4a1 100644--- a/sc/source/ui/vba/vbapalette.cxx+++ b/sc/source/ui/vba/vbapalette.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbapalette.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapalette.hxx b/sc/source/ui/vba/vbapalette.hxxindex 388fd5908b6b..9c7ea2ebc3f1 100644--- a/sc/source/ui/vba/vbapalette.hxx+++ b/sc/source/ui/vba/vbapalette.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbapalette.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxxindex 1ec6b2a2e642..263529dde145 100644--- a/sc/source/ui/vba/vbapane.cxx+++ b/sc/source/ui/vba/vbapane.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbapane.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxxindex 97eb3e8f366c..0fa1d49709de 100644--- a/sc/source/ui/vba/vbapane.hxx+++ b/sc/source/ui/vba/vbapane.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbapane.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxxindex b87a279ac842..322b42368b48 100644--- a/sc/source/ui/vba/vbapivotcache.cxx+++ b/sc/source/ui/vba/vbapivotcache.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbapivotcache.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxxindex 6e98344d115e..dea3e35d18bd 100644--- a/sc/source/ui/vba/vbapivotcache.hxx+++ b/sc/source/ui/vba/vbapivotcache.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbapivotcache.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxxindex b4050c9ca4f8..e5d78602dcdd 100644--- a/sc/source/ui/vba/vbapivottable.cxx+++ b/sc/source/ui/vba/vbapivottable.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbapivottable.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxxindex 7fccada818fc..e6e341830489 100644--- a/sc/source/ui/vba/vbapivottable.hxx+++ b/sc/source/ui/vba/vbapivottable.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbapivottable.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxxindex c03d347c1ba0..05a4201da977 100644--- a/sc/source/ui/vba/vbapivottables.cxx+++ b/sc/source/ui/vba/vbapivottables.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbapivottables.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxxindex b2f71cdc3ff0..3354d8a82953 100644--- a/sc/source/ui/vba/vbapivottables.hxx+++ b/sc/source/ui/vba/vbapivottables.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbapivottables.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapropvalue.cxx b/sc/source/ui/vba/vbapropvalue.cxxindex aad34760b882..ff821d17f479 100644--- a/sc/source/ui/vba/vbapropvalue.cxx+++ b/sc/source/ui/vba/vbapropvalue.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbapropvalue.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbapropvalue.hxx b/sc/source/ui/vba/vbapropvalue.hxxindex f521212f2ceb..af748dae5585 100644--- a/sc/source/ui/vba/vbapropvalue.hxx+++ b/sc/source/ui/vba/vbapropvalue.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbapropvalue.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxxindex f6c58c23f79a..b3307ffdc55d 100644--- a/sc/source/ui/vba/vbarange.cxx+++ b/sc/source/ui/vba/vbarange.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbarange.cxx,v $- * $Revision: 1.8.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -121,7 +118,7 @@ #include <ooo/vba/excel/XlSearchDirection.hpp> #include <scitems.hxx>-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <cellsuno.hxx> #include <dbcolect.hxx> #include "docfunc.hxx"diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxxindex 1d2d82442be3..89ae741c7535 100644--- a/sc/source/ui/vba/vbarange.hxx+++ b/sc/source/ui/vba/vbarange.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbarange.hxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaseriescollection.cxx b/sc/source/ui/vba/vbaseriescollection.cxxindex 8c6c07703ac7..8caa746beff0 100644--- a/sc/source/ui/vba/vbaseriescollection.cxx+++ b/sc/source/ui/vba/vbaseriescollection.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaseriescollection.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaseriescollection.hxx b/sc/source/ui/vba/vbaseriescollection.hxxindex 48ec78025d79..f61720102919 100644--- a/sc/source/ui/vba/vbaseriescollection.hxx+++ b/sc/source/ui/vba/vbaseriescollection.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaseriescollection.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxxindex 8b7731c2d358..b99b2e783101 100644--- a/sc/source/ui/vba/vbastyle.cxx+++ b/sc/source/ui/vba/vbastyle.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbastyle.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxxindex cc8bda0a0537..d5bb232dabc2 100644--- a/sc/source/ui/vba/vbastyle.hxx+++ b/sc/source/ui/vba/vbastyle.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbastyle.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxxindex 6cb35d19a67e..c323e2b3f6f6 100644--- a/sc/source/ui/vba/vbastyles.cxx+++ b/sc/source/ui/vba/vbastyles.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbastyles.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxxindex 1e238a9d1c13..300596d6b3fe 100644--- a/sc/source/ui/vba/vbastyles.hxx+++ b/sc/source/ui/vba/vbastyles.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbastyles.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxxindex b8148e129220..0ef9e0f7393b 100644--- a/sc/source/ui/vba/vbatextboxshape.cxx+++ b/sc/source/ui/vba/vbatextboxshape.cxx@@ -1,35 +1,27 @@ /************************************************************************* *- * OpenOffice.org - a multi-platform office productivity suite+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * $RCSfile$+ * Copyright 2000, 2010 Oracle and/or its affiliates. *- * $Revision$+ * OpenOffice.org - a multi-platform office productivity suite *- * last change: $Author$ $Date$+ * This file is part of OpenOffice.org. *- * The Contents of this file are made available subject to- * the terms of GNU Lesser General Public License Version 2.1.+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation. *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code). *- * GNU Lesser General Public License Version 2.1- * =============================================- * Copyright 2005 by Sun Microsystems, Inc.- * 901 San Antonio Road, Palo Alto, CA 94303, USA- *- * This library is free software; you can redistribute it and/or- * modify it under the terms of the GNU Lesser General Public- * License version 2.1, as published by the Free Software Foundation.- *- * This library is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU- * Lesser General Public License for more details.- *- * You should have received a copy of the GNU Lesser General Public- * License along with this library; if not, write to the Free Software- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,- * MA 02111-1307 USA+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License. * ************************************************************************/ diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxxindex 733849e6be12..c08a576b7155 100644--- a/sc/source/ui/vba/vbatextboxshape.hxx+++ b/sc/source/ui/vba/vbatextboxshape.hxx@@ -1,35 +1,27 @@ /************************************************************************* *- * OpenOffice.org - a multi-platform office productivity suite+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * $RCSfile$+ * Copyright 2000, 2010 Oracle and/or its affiliates. *- * $Revision$+ * OpenOffice.org - a multi-platform office productivity suite *- * last change: $Author$ $Date$+ * This file is part of OpenOffice.org. *- * The Contents of this file are made available subject to- * the terms of GNU Lesser General Public License Version 2.1.+ * OpenOffice.org is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Lesser General Public License version 3+ * only, as published by the Free Software Foundation. *+ * OpenOffice.org is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Lesser General Public License version 3 for more details+ * (a copy is included in the LICENSE file that accompanied this code). *- * GNU Lesser General Public License Version 2.1- * =============================================- * Copyright 2005 by Sun Microsystems, Inc.- * 901 San Antonio Road, Palo Alto, CA 94303, USA- *- * This library is free software; you can redistribute it and/or- * modify it under the terms of the GNU Lesser General Public- * License version 2.1, as published by the Free Software Foundation.- *- * This library is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU- * Lesser General Public License for more details.- *- * You should have received a copy of the GNU Lesser General Public- * License along with this library; if not, write to the Free Software- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,- * MA 02111-1307 USA+ * You should have received a copy of the GNU Lesser General Public License+ * version 3 along with OpenOffice.org. If not, see+ * <http://www.openoffice.org/license.html>+ * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef SC_VBA_TEXTBOX_HXXdiff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxxindex 81a8f0b5654c..b06777526c1f 100644--- a/sc/source/ui/vba/vbatextframe.cxx+++ b/sc/source/ui/vba/vbatextframe.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbatextframe.cxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxxindex 8aa85f34be09..b48cd8752ef9 100644--- a/sc/source/ui/vba/vbatextframe.hxx+++ b/sc/source/ui/vba/vbatextframe.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbatextframe.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxxindex e696640d757f..fb97f3f20f0c 100644--- a/sc/source/ui/vba/vbatitle.hxx+++ b/sc/source/ui/vba/vbatitle.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbatitle.hxx,v $- * $Revision: 1.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxxindex 411b002bdb9b..e2a768549e11 100644--- a/sc/source/ui/vba/vbavalidation.cxx+++ b/sc/source/ui/vba/vbavalidation.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbavalidation.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxxindex cef989aa3cea..563ee1d003b6 100644--- a/sc/source/ui/vba/vbavalidation.hxx+++ b/sc/source/ui/vba/vbavalidation.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbavalidation.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxxindex d782fb95dc70..0416b99abcb3 100644--- a/sc/source/ui/vba/vbawindow.cxx+++ b/sc/source/ui/vba/vbawindow.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbawindow.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxxindex 968d258961c8..e72401a2baac 100644--- a/sc/source/ui/vba/vbawindow.hxx+++ b/sc/source/ui/vba/vbawindow.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbawindow.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxxindex ae16efdebcf4..3ddc5f5b3b45 100644--- a/sc/source/ui/vba/vbawindows.cxx+++ b/sc/source/ui/vba/vbawindows.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbawindows.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxxindex 5aff0094ebf3..3441b6ccbac4 100644--- a/sc/source/ui/vba/vbawindows.hxx+++ b/sc/source/ui/vba/vbawindows.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbawindows.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxxindex 498d77e79a14..6694f4e5e135 100644--- a/sc/source/ui/vba/vbaworkbook.cxx+++ b/sc/source/ui/vba/vbaworkbook.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaworkbook.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxxindex cf221fd934a0..40234aca21d7 100644--- a/sc/source/ui/vba/vbaworkbook.hxx+++ b/sc/source/ui/vba/vbaworkbook.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaworkbook.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxxindex b2f194bff6c5..9f9c5dacd796 100644--- a/sc/source/ui/vba/vbaworkbooks.cxx+++ b/sc/source/ui/vba/vbaworkbooks.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaworkbooks.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxxindex 891a8a333695..5d6210244d80 100644--- a/sc/source/ui/vba/vbaworkbooks.hxx+++ b/sc/source/ui/vba/vbaworkbooks.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaworkbooks.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxxindex c382ffeb8afe..be988509aa68 100644--- a/sc/source/ui/vba/vbaworksheet.cxx+++ b/sc/source/ui/vba/vbaworksheet.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaworksheet.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxxindex da88e1c4b06f..5fe1343f9237 100644--- a/sc/source/ui/vba/vbaworksheet.hxx+++ b/sc/source/ui/vba/vbaworksheet.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaworksheet.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxxindex dca004a74e65..e7de0b82fcaa 100644--- a/sc/source/ui/vba/vbaworksheets.cxx+++ b/sc/source/ui/vba/vbaworksheets.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaworksheets.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxxindex e816e8ecf212..4c8120084b02 100644--- a/sc/source/ui/vba/vbaworksheets.hxx+++ b/sc/source/ui/vba/vbaworksheets.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbaworksheets.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxxindex f7fe703cec35..c355244f6815 100644--- a/sc/source/ui/vba/vbawsfunction.cxx+++ b/sc/source/ui/vba/vbawsfunction.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbawsfunction.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxxindex d3f8b105d29c..58a895f6d47b 100644--- a/sc/source/ui/vba/vbawsfunction.hxx+++ b/sc/source/ui/vba/vbawsfunction.hxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: vbawsfunction.hxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxxindex 3f09fd0e2ff4..2c80c154759d 100644--- a/sc/source/ui/view/auditsh.cxx+++ b/sc/source/ui/view/auditsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: auditsh.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ //------------------------------------------------------------------ #include "scitems.hxx"-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/objface.hxx> #include <sfx2/objsh.hxx>diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxxindex e9116b19c87b..916e670ec5b1 100644--- a/sc/source/ui/view/cellsh.cxx+++ b/sc/source/ui/view/cellsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellsh.cxx,v $- * $Revision: 1.48.126.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -49,7 +46,7 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <svx/clipfmtitem.hxx>-#include <svx/langitem.hxx>+#include <editeng/langitem.hxx> #include "cellsh.hxx" #include "sc.hrc"diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxxindex 6bdf172b9fb5..aec15fceef9e 100644--- a/sc/source/ui/view/cellsh1.cxx+++ b/sc/source/ui/view/cellsh1.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellsh1.cxx,v $- * $Revision: 1.54.102.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -65,7 +62,7 @@ #include <svx/svxdlg.hxx> #include <sot/formats.hxx> #include <svx/postattr.hxx>-#include <svx/fontitem.hxx>+#include <editeng/fontitem.hxx> #include <svx/clipfmtitem.hxx> #include <sfx2/passwd.hxx> #include <svx/hlnkitem.hxx>diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxxindex 47c55350f278..95ceffc5dc59 100644--- a/sc/source/ui/view/cellsh2.cxx+++ b/sc/source/ui/view/cellsh2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellsh2.cxx,v $- * $Revision: 1.34.24.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxxindex 2f96aec815fb..2cc42635b9b0 100644--- a/sc/source/ui/view/cellsh3.cxx+++ b/sc/source/ui/view/cellsh3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellsh3.cxx,v $- * $Revision: 1.24.90.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxxindex 1cbb63aa5e69..e8419a24c80f 100644--- a/sc/source/ui/view/cellsh4.cxx+++ b/sc/source/ui/view/cellsh4.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: cellsh4.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxxindex 984006d365d6..8916624fdb52 100644--- a/sc/source/ui/view/colrowba.cxx+++ b/sc/source/ui/view/colrowba.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: colrowba.cxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxxindex 48b6d3ba11f7..02dfd77f7460 100644--- a/sc/source/ui/view/dbfunc.cxx+++ b/sc/source/ui/view/dbfunc.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbfunc.cxx,v $- * $Revision: 1.15.126.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxxindex 4657618f9ebe..54ddde9b7710 100644--- a/sc/source/ui/view/dbfunc2.cxx+++ b/sc/source/ui/view/dbfunc2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbfunc2.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxxindex 41a959409727..2ef65f596c34 100644--- a/sc/source/ui/view/dbfunc3.cxx+++ b/sc/source/ui/view/dbfunc3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbfunc3.cxx,v $- * $Revision: 1.20 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxxindex 9e743c1f3cb3..870622293e37 100644--- a/sc/source/ui/view/dbfunc4.cxx+++ b/sc/source/ui/view/dbfunc4.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: dbfunc4.cxx,v $- * $Revision: 1.11 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxxindex 3b6f84eb81af..fa7872617c03 100644--- a/sc/source/ui/view/drawattr.cxx+++ b/sc/source/ui/view/drawattr.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawattr.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxxindex ca0607157c3c..3885b0adc752 100644--- a/sc/source/ui/view/drawutil.cxx+++ b/sc/source/ui/view/drawutil.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawutil.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxxindex 22130afa3480..c760ce86a3d7 100644--- a/sc/source/ui/view/drawvie2.cxx+++ b/sc/source/ui/view/drawvie2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawvie2.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxxindex 625d62ba280b..ffa1efe28654 100644--- a/sc/source/ui/view/drawvie3.cxx+++ b/sc/source/ui/view/drawvie3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawvie3.cxx,v $- * $Revision: 1.16.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxxindex 2b8273346b28..8b9debdabfae 100644--- a/sc/source/ui/view/drawvie4.cxx+++ b/sc/source/ui/view/drawvie4.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawvie4.cxx,v $- * $Revision: 1.31 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxxindex ef68bbc9bd0c..837cee2698b3 100644--- a/sc/source/ui/view/drawview.cxx+++ b/sc/source/ui/view/drawview.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: drawview.cxx,v $- * $Revision: 1.50.126.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -44,8 +41,8 @@ #include <svx/svdpage.hxx> #include <svx/svdundo.hxx> #include <svx/svdocapt.hxx>-#include <svx/outlobj.hxx>-#include <svx/writingmodeitem.hxx>+#include <editeng/outlobj.hxx>+#include <editeng/writingmodeitem.hxx> #include <svx/sdrpaintwindow.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx>diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxxindex b0f2197ad826..d228a205a5a3 100644--- a/sc/source/ui/view/editsh.cxx+++ b/sc/source/ui/view/editsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: editsh.cxx,v $- * $Revision: 1.35.44.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,25 +33,25 @@ //------------------------------------------------------------------ #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/clipfmtitem.hxx> #include <svx/svxdlg.hxx>-#include <svx/cntritem.hxx>+#include <editeng/cntritem.hxx> //CHINA001 #include <svx/chardlg.hxx>-#include <svx/crsditem.hxx>-#include <svx/editeng.hxx>-#include <svx/editview.hxx>-#include <svx/escpitem.hxx>-#include <svx/flditem.hxx>-#include <svx/fontitem.hxx>+#include <editeng/crsditem.hxx>+#include <editeng/editeng.hxx>+#include <editeng/editview.hxx>+#include <editeng/escpitem.hxx>+#include <editeng/flditem.hxx>+#include <editeng/fontitem.hxx> #include <svx/hlnkitem.hxx>-#include <svx/postitem.hxx>-#include <svx/scripttypeitem.hxx>-#include <svx/shdditem.hxx>-#include <svx/srchitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/wghtitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/scripttypeitem.hxx>+#include <editeng/shdditem.hxx>+#include <svl/srchitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/wghtitem.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/bindings.hxx> #include <sfx2/msg.hxx>diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxxindex fb83ed5624d6..e364705f90b6 100644--- a/sc/source/ui/view/formatsh.cxx+++ b/sc/source/ui/view/formatsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: formatsh.cxx,v $- * $Revision: 1.41.142.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -54,7 +51,7 @@ //------------------------------------------------------------------ #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx>@@ -67,24 +64,24 @@ #include <svl/stritem.hxx> #include <svl/zformat.hxx> #include <svl/languageoptions.hxx>-#include <svx/boxitem.hxx>-#include <svx/langitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/langitem.hxx> #include <svx/numinf.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/templdlg.hxx> #include <sfx2/tplpitem.hxx>-#include <svx/svxenum.hxx>+#include <editeng/svxenum.hxx> #include <svx/algitem.hxx>-#include <svx/wghtitem.hxx>-#include <svx/postitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/bolnitem.hxx>-#include <svx/colritem.hxx>-#include <svx/brshitem.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/scripttypeitem.hxx>+#include <editeng/wghtitem.hxx>+#include <editeng/postitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/bolnitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/scripttypeitem.hxx> #include <svtools/colorcfg.hxx>-#include <svx/shaditem.hxx>+#include <editeng/shaditem.hxx> #include "formatsh.hxx" #include "sc.hrc"diff --git a/sc/source/ui/view/galwrap.cxx b/sc/source/ui/view/galwrap.cxxindex 0348a68e4f4b..1d92cb5f303a 100644--- a/sc/source/ui/view/galwrap.cxx+++ b/sc/source/ui/view/galwrap.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: galwrap.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxxindex f1fbb813755e..5a1f501e38ca 100644--- a/sc/source/ui/view/gridmerg.cxx+++ b/sc/source/ui/view/gridmerg.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: gridmerg.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxxindex 7f78461aedb0..cd55e4f72c34 100644--- a/sc/source/ui/view/gridwin.cxx+++ b/sc/source/ui/view/gridwin.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: gridwin.cxx,v $- * $Revision: 1.96.50.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,14 +31,14 @@ #include "scitems.hxx" #include <memory> //auto_ptr-#include <svx/adjitem.hxx>+#include <editeng/adjitem.hxx> #include <svx/algitem.hxx> #include <svx/dbexch.hrc>-#include <svx/editview.hxx>-#include <svx/editstat.hxx>-#include <svx/flditem.hxx>+#include <editeng/editview.hxx>+#include <editeng/editstat.hxx>+#include <editeng/flditem.hxx> #include <svx/svdetc.hxx>-#include <svx/editobj.hxx>+#include <editeng/editobj.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/docfile.hxx>@@ -58,7 +55,7 @@ #include <sot/clsids.hxx> #include <svx/svdview.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT)-#include <svx/outliner.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT)+#include <editeng/outliner.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) #include <svx/svditer.hxx> #include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx>diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxxindex e0dd63ff090e..6d9bb94eb76b 100644--- a/sc/source/ui/view/gridwin2.cxx+++ b/sc/source/ui/view/gridwin2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: gridwin2.cxx,v $- * $Revision: 1.16.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxxindex fbff54b1408f..5bfc0483b553 100755..100644--- a/sc/source/ui/view/gridwin3.cxx+++ b/sc/source/ui/view/gridwin3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: gridwin3.cxx,v $- * $Revision: 1.20.126.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,12 +29,12 @@ #include "precompiled_sc.hxx" #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/svdoutl.hxx> #include <svx/svdotext.hxx> #include <svx/svdpagv.hxx>-#include <svx/sizeitem.hxx>+#include <editeng/sizeitem.hxx> #include <sfx2/bindings.hxx> #include <svl/ptitem.hxx> diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxxindex 7719dfcc5474..f698913ea758 100644--- a/sc/source/ui/view/gridwin4.cxx+++ b/sc/source/ui/view/gridwin4.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: gridwin4.cxx,v $- * $Revision: 1.40 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,14 +33,14 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svtools/colorcfg.hxx>-#include <svx/colritem.hxx>-#include <svx/editview.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/scripttypeitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/editview.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/scripttypeitem.hxx> #include <sfx2/bindings.hxx> #include <sfx2/printer.hxx> @@ -74,6 +71,7 @@ #include "inputopt.hxx" #include "fillinfo.hxx" #include "dpcontrol.hxx"+#include "queryparam.hxx" #include "sc.hrc" #include <vcl/virdev.hxx> diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxxindex f3d5b2781607..4a9dbbaf98b6 100644--- a/sc/source/ui/view/gridwin5.cxx+++ b/sc/source/ui/view/gridwin5.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: gridwin5.cxx,v $- * $Revision: 1.23.128.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -33,11 +30,11 @@ // INCLUDE --------------------------------------------------------------- -#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/flditem.hxx>+#include <editeng/flditem.hxx> -#include <svx/editview.hxx>+#include <editeng/editview.hxx> #include <svx/svdobj.hxx> #include <svx/svdpagv.hxx> #include <svtools/imapobj.hxx>diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxxindex 3ecacffd2d7b..511463db8a10 100644--- a/sc/source/ui/view/hdrcont.cxx+++ b/sc/source/ui/view/hdrcont.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hdrcont.cxx,v $- * $Revision: 1.21 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxxindex aa0e59016ab7..568923f42838 100644--- a/sc/source/ui/view/hintwin.cxx+++ b/sc/source/ui/view/hintwin.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: hintwin.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxxindex 287f66b5ea4c..b2f4fb714775 100644--- a/sc/source/ui/view/imapwrap.cxx+++ b/sc/source/ui/view/imapwrap.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: imapwrap.cxx,v $- * $Revision: 1.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxxindex ea7245b0bd4d..a895dc5faec0 100644--- a/sc/source/ui/view/invmerge.cxx+++ b/sc/source/ui/view/invmerge.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: invmerge.cxx,v $- * $Revision: 1.7 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/makefile.mk b/sc/source/ui/view/makefile.mkindex ed50324f68be..e40d6da5c09d 100644--- a/sc/source/ui/view/makefile.mk+++ b/sc/source/ui/view/makefile.mk@@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc.+# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite #-# $RCSfile: makefile.mk,v $-#-# $Revision: 1.17 $-# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxxindex 419124596147..065ba5899817 100644--- a/sc/source/ui/view/notemark.cxx+++ b/sc/source/ui/view/notemark.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: notemark.cxx,v $- * $Revision: 1.12.126.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxxindex 6e5535361653..bec88920f989 100644--- a/sc/source/ui/view/olinewin.cxx+++ b/sc/source/ui/view/olinewin.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: olinewin.cxx,v $- * $Revision: 1.15.32.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxxindex 3feb69044f43..248777f4e473 100644--- a/sc/source/ui/view/olkact.cxx+++ b/sc/source/ui/view/olkact.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: olkact.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxxindex 9d2da303988c..265e54fe0e12 100644--- a/sc/source/ui/view/output.cxx+++ b/sc/source/ui/view/output.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: output.cxx,v $- * $Revision: 1.35.100.3 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,13 +33,13 @@ #include <com/sun/star/embed/EmbedMisc.hpp> #include "scitems.hxx"-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>-#include <svx/editdata.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/editdata.hxx> #include <svtools/colorcfg.hxx> #include <svx/rotmodit.hxx>-#include <svx/shaditem.hxx>-#include <svx/svxfont.hxx>+#include <editeng/shaditem.hxx>+#include <editeng/svxfont.hxx> #include <svx/svdoole2.hxx> #include <tools/poly.hxx> #include <vcl/svapp.hxx>diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxxindex 700c32e4698f..53851f0e3cf0 100644--- a/sc/source/ui/view/output2.cxx+++ b/sc/source/ui/view/output2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: output2.cxx,v $- * $Revision: 1.56.142.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -37,24 +34,24 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/adjitem.hxx>+#include <editeng/adjitem.hxx> #include <svx/algitem.hxx>-#include <svx/brshitem.hxx>+#include <editeng/brshitem.hxx> #include <svtools/colorcfg.hxx>-#include <svx/colritem.hxx>-#include <svx/editobj.hxx>-#include <svx/editstat.hxx>-#include <svx/fhgtitem.hxx>-#include <svx/forbiddencharacterstable.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/langitem.hxx>+#include <editeng/colritem.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editstat.hxx>+#include <editeng/fhgtitem.hxx>+#include <editeng/forbiddencharacterstable.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/langitem.hxx> #include <svx/rotmodit.hxx>-#include <svx/scripttypeitem.hxx>-#include <svx/udlnitem.hxx>-#include <svx/unolingu.hxx>+#include <editeng/scripttypeitem.hxx>+#include <editeng/udlnitem.hxx>+#include <editeng/unolingu.hxx> #include <svl/zforlist.hxx> #include <vcl/svapp.hxx> #include <vcl/metric.hxx>diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxxindex ffc1112667f2..2c368937e156 100755..100644--- a/sc/source/ui/view/output3.cxx+++ b/sc/source/ui/view/output3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: output3.cxx,v $- * $Revision: 1.28 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -35,7 +32,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> #include <svx/svdoutl.hxx>diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxxindex ef014bd90f79..6a206ef3eb13 100644--- a/sc/source/ui/view/pfuncache.cxx+++ b/sc/source/ui/view/pfuncache.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pfuncache.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxxindex 3ab72f37ac35..0e792b2bb279 100644--- a/sc/source/ui/view/pgbrksh.cxx+++ b/sc/source/ui/view/pgbrksh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pgbrksh.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ //------------------------------------------------------------------ #include "scitems.hxx"-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/objsh.hxx>diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxxindex 2039934a6e45..a65f86ffed2c 100644--- a/sc/source/ui/view/pivotsh.cxx+++ b/sc/source/ui/view/pivotsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: pivotsh.cxx,v $- * $Revision: 1.10 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ //------------------------------------------------------------------ #include "scitems.hxx"-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/objsh.hxx>diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxxindex 31121f35aa1b..83fdab9000e6 100644--- a/sc/source/ui/view/preview.cxx+++ b/sc/source/ui/view/preview.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: preview.cxx,v $- * $Revision: 1.34 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,12 +33,12 @@ // INCLUDE --------------------------------------------------------------- #include <tools/pstm.hxx> #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svtools/colorcfg.hxx> #include <svx/fmview.hxx>-#include <svx/sizeitem.hxx>+#include <editeng/sizeitem.hxx> #include <svx/svdpagv.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx>@@ -68,9 +65,9 @@ #include "AccessibleDocumentPagePreview.hxx" #include <vcl/lineinfo.hxx> #include <svx/algitem.hxx>-#include <svx/lrspitem.hxx>-#include <svx/ulspitem.hxx>-#include <svx/sizeitem.hxx>+#include <editeng/lrspitem.hxx>+#include <editeng/ulspitem.hxx>+#include <editeng/sizeitem.hxx> #include "attrib.hxx" #include "pagepar.hxx" #include <com/sun/star/accessibility/XAccessible.hpp>diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxxindex 51f6712c70ca..67e1aa86553a 100644--- a/sc/source/ui/view/prevloc.cxx+++ b/sc/source/ui/view/prevloc.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: prevloc.cxx,v $- * $Revision: 1.16.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxxindex ebe58f5a0efc..f4b976b00e4d 100644--- a/sc/source/ui/view/prevwsh.cxx+++ b/sc/source/ui/view/prevwsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: prevwsh.cxx,v $- * $Revision: 1.44.30.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,11 +33,11 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <sfx2/app.hxx>-#include <svx/sizeitem.hxx>-#include <svx/srchitem.hxx>+#include <editeng/sizeitem.hxx>+#include <svl/srchitem.hxx> #include <svx/zoomslideritem.hxx> #include <svx/svdview.hxx> //CHINA001 #include <svx/zoom.hxx>diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxxindex d37d0c85046d..07af90f797aa 100644--- a/sc/source/ui/view/prevwsh2.cxx+++ b/sc/source/ui/view/prevwsh2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: prevwsh2.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxxindex 9c8b1f1d4ce6..afe23892e786 100755..100644--- a/sc/source/ui/view/printfun.cxx+++ b/sc/source/ui/view/printfun.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: printfun.cxx,v $- * $Revision: 1.58.50.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -34,25 +31,25 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include "printfun.hxx" #include <svx/svxids.hrc>-#include <svx/adjitem.hxx>-#include <svx/boxitem.hxx>-#include <svx/brshitem.hxx>+#include <editeng/adjitem.hxx>+#include <editeng/boxitem.hxx>+#include <editeng/brshitem.hxx> #include <svtools/colorcfg.hxx>-#include <svx/editstat.hxx> // EE_CNTRL_RTFSTYLESHEETS+#include <editeng/editstat.hxx> // EE_CNTRL_RTFSTYLESHEETS #include <svx/fmview.hxx>-#include <svx/frmdiritem.hxx>-#include <svx/lrspitem.hxx>-#include <svx/paperinf.hxx>-#include <svx/pbinitem.hxx>-#include <svx/shaditem.hxx>-#include <svx/sizeitem.hxx>+#include <editeng/frmdiritem.hxx>+#include <editeng/lrspitem.hxx>+#include <editeng/paperinf.hxx>+#include <editeng/pbinitem.hxx>+#include <editeng/shaditem.hxx>+#include <editeng/sizeitem.hxx> #include <svx/svdpagv.hxx>-#include <svx/ulspitem.hxx>+#include <editeng/ulspitem.hxx> #include <sfx2/app.hxx> #include <sfx2/printer.hxx> #include <sfx2/progress.hxx>diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxxindex 8b36ae6a480e..0d5d64964f5c 100644--- a/sc/source/ui/view/reffact.cxx+++ b/sc/source/ui/view/reffact.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: reffact.cxx,v $- * $Revision: 1.12 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxxindex e6b4a3d0c20e..bead62419bb3 100644--- a/sc/source/ui/view/scextopt.cxx+++ b/sc/source/ui/view/scextopt.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: scextopt.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxxindex b8d0da840db7..4887895c8e6b 100644--- a/sc/source/ui/view/select.cxx+++ b/sc/source/ui/view/select.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: select.cxx,v $- * $Revision: 1.20 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxxindex a3cdad1f046f..0edd50a0b825 100644--- a/sc/source/ui/view/selectionstate.cxx+++ b/sc/source/ui/view/selectionstate.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: selectionstate.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -32,7 +29,7 @@ #include "precompiled_sc.hxx" #include "selectionstate.hxx" -#include <svx/editview.hxx>+#include <editeng/editview.hxx> #include "viewdata.hxx" // ============================================================================diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxxindex e2d02348fbcb..8ff816263b4f 100644--- a/sc/source/ui/view/spelldialog.cxx+++ b/sc/source/ui/view/spelldialog.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: spelldialog.cxx,v $- * $Revision: 1.8 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,9 +33,9 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <svx/svxids.hrc>-#include <svx/editstat.hxx>-#include <svx/editview.hxx>-#include <svx/unolingu.hxx>+#include <editeng/editstat.hxx>+#include <editeng/editview.hxx>+#include <editeng/unolingu.hxx> #include "selectionstate.hxx" #include "spelleng.hxx"diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxxindex 40b9ff5dbea7..ac6288028dfc 100644--- a/sc/source/ui/view/spelleng.cxx+++ b/sc/source/ui/view/spelleng.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: spelleng.cxx,v $- * $Revision: 1.18.128.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,12 +33,12 @@ #include <memory> #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/langitem.hxx>-#include <svx/editobj.hxx>-#include <svx/editview.hxx>+#include <editeng/langitem.hxx>+#include <editeng/editobj.hxx>+#include <editeng/editview.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx>diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxxindex db1a8952aeef..c5572fb9844a 100644--- a/sc/source/ui/view/tabcont.cxx+++ b/sc/source/ui/view/tabcont.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabcont.cxx,v $- * $Revision: 1.17 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/tabpopsh.cxx b/sc/source/ui/view/tabpopsh.cxxindex 7e78b2b5fc4a..f5033d5d0df5 100644--- a/sc/source/ui/view/tabpopsh.cxx+++ b/sc/source/ui/view/tabpopsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabpopsh.cxx,v $- * $Revision: 1.5 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxxindex 02f91dd224fa..0f72e0e73d02 100644--- a/sc/source/ui/view/tabsplit.cxx+++ b/sc/source/ui/view/tabsplit.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabsplit.cxx,v $- * $Revision: 1.6 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxxindex c076575d4e6d..b8656e1e25a0 100644--- a/sc/source/ui/view/tabview.cxx+++ b/sc/source/ui/view/tabview.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabview.cxx,v $- * $Revision: 1.37 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxxindex 2caaae9146fb..b7a773ab2abd 100644--- a/sc/source/ui/view/tabview2.cxx+++ b/sc/source/ui/view/tabview2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabview2.cxx,v $- * $Revision: 1.21 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <vcl/timer.hxx>diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxxindex a19760e4c277..b61c3ade64f4 100644--- a/sc/source/ui/view/tabview3.cxx+++ b/sc/source/ui/view/tabview3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabview3.cxx,v $- * $Revision: 1.69.40.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -38,11 +35,11 @@ // INCLUDE --------------------------------------------------------------- #include <rangelst.hxx> #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> -#include <svx/brshitem.hxx>-#include <svx/editview.hxx>+#include <editeng/brshitem.hxx>+#include <editeng/editview.hxx> #include <svx/fmshell.hxx> #include <svx/svdoole2.hxx> #include <sfx2/bindings.hxx>diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxxindex 076a23c5e524..abbc0224704e 100644--- a/sc/source/ui/view/tabview4.cxx+++ b/sc/source/ui/view/tabview4.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabview4.cxx,v $- * $Revision: 1.11.32.2 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxxindex 75e961d5eeec..460f31b07175 100644--- a/sc/source/ui/view/tabview5.cxx+++ b/sc/source/ui/view/tabview5.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabview5.cxx,v $- * $Revision: 1.25.32.4 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <svx/fmshell.hxx>diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxxindex 4c73d14d51be..06aa294029d9 100644--- a/sc/source/ui/view/tabvwsh.cxx+++ b/sc/source/ui/view/tabvwsh.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabvwsh.cxx,v $- * $Revision: 1.14 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -39,9 +36,11 @@ #include "scitems.hxx" #include <svx/galbrws.hxx> #include <svx/imapdlg.hxx>-#include <svx/srchitem.hxx>+#include <svl/srchitem.hxx> #include <sfx2/templdlg.hxx> #include <sfx2/objface.hxx>+#include <sfx2/viewfrm.hxx>+#include <sfx2/bindings.hxx> #include <sfx2/app.hxx> #include <avmedia/mediaplayer.hxx> @@ -109,4 +108,9 @@ SFX_IMPL_VIEWFACTORY( ScTabViewShell, ScResId(STR_NONAME) ) //------------------------------------------------------------------ -+IMPL_LINK( ScTabViewShell, HtmlOptionsHdl, void*, EMPTYARG )+{+ // Invalidierung, falls blinkender Text erlaubt/verboten wurde+ GetViewFrame()->GetBindings().Invalidate(SID_DRAW_TEXT_MARQUEE);+ return 0;+}diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxxindex 08b7f5f4ad85..ab0dae319105 100644--- a/sc/source/ui/view/tabvwsh2.cxx+++ b/sc/source/ui/view/tabvwsh2.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabvwsh2.cxx,v $- * $Revision: 1.27.128.1 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modifydiff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxxindex c2812fdc4446..493760d7a6ba 100644--- a/sc/source/ui/view/tabvwsh3.cxx+++ b/sc/source/ui/view/tabvwsh3.cxx@@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *- * Copyright 2008 by Sun Microsystems, Inc.+ * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite *- * $RCSfile: tabvwsh3.cxx,v $- * $Revision: 1.40 $- * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify@@ -36,7 +33,7 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx"-#include <svx/eeitem.hxx>+#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> //CHINA001 #include <svx/zoom.hxx>diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxxindex 359c34ec3685..d7a0e2b080b0 100644--- a/sc/source/ui/view/tabvwsh4.cxx+++ b/sc/source/ui/view/tabvwsh4.cxx

1471 files changed, 4862 insertions, 7670 deletions

diff --git a/sc/addin/datefunc/dfa.cl b/sc/addin/datefunc/dfa.cl
index 2a2c0142222b..d45a1b548a0d 100644
--- a/sc/addin/datefunc/dfa.cl
+++ b/sc/addin/datefunc/dfa.cl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dfa.cl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/addin/datefunc/dfa.src b/sc/addin/datefunc/dfa.src
index 8fcd05375d02..6a38f3068cc5 100644
--- a/sc/addin/datefunc/dfa.src
+++ b/sc/addin/datefunc/dfa.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dfa.src,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/addin/datefunc/makefile.mk b/sc/addin/datefunc/makefile.mk
index f01e8b978e73..f781b3835833 100644
--- a/sc/addin/datefunc/makefile.mk
+++ b/sc/addin/datefunc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/addin/inc/addin.h b/sc/addin/inc/addin.h
index 8ff2f035280c..419d0e3a59db 100644
--- a/sc/addin/inc/addin.h
+++ b/sc/addin/inc/addin.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addin.h,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/addin/inc/dfa.hrc b/sc/addin/inc/dfa.hrc
index fc26564ac479..0d2af4f4bffd 100644
--- a/sc/addin/inc/dfa.hrc
+++ b/sc/addin/inc/dfa.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dfa.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/addin/inc/rot13.hrc b/sc/addin/inc/rot13.hrc
index 4ed09cfec6d8..a610c9cc6663 100644
--- a/sc/addin/inc/rot13.hrc
+++ b/sc/addin/inc/rot13.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rot13.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/addin/makefile.mk b/sc/addin/makefile.mk
index 5efbd7f333c4..e716a8d8477a 100644
--- a/sc/addin/makefile.mk
+++ b/sc/addin/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/addin/rot13/makefile.mk b/sc/addin/rot13/makefile.mk
index 95a6962e4dd3..a33c50d2a725 100644
--- a/sc/addin/rot13/makefile.mk
+++ b/sc/addin/rot13/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/addin/rot13/rot13.cl b/sc/addin/rot13/rot13.cl
index 3454dafa00f5..5c7e92ae3d3f 100644
--- a/sc/addin/rot13/rot13.cl
+++ b/sc/addin/rot13/rot13.cl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rot13.cl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/addin/rot13/rot13.src b/sc/addin/rot13/rot13.src
index 6c1f19cba7f3..5518ae0aa31f 100644
--- a/sc/addin/rot13/rot13.src
+++ b/sc/addin/rot13/rot13.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rot13.src,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/addin/util/cl2c.pl b/sc/addin/util/cl2c.pl
index 32a3a6cda312..6f5d3ee7e0d8 100644
--- a/sc/addin/util/cl2c.pl
+++ b/sc/addin/util/cl2c.pl
@@ -4,14 +4,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cl2c.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/addin/util/makefile.mk b/sc/addin/util/makefile.mk
index 7ce911de650e..2bd75148f80a 100644
--- a/sc/addin/util/makefile.mk
+++ b/sc/addin/util/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index 76344a65ceda..df72fec64f57 100644
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDataPilotControl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
index f5ad0fd5d74b..ecf5bdc5ad87 100644
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDataPilotControl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
index e901949286a1..7d01317c6b8d 100644
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDataPilotControl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx
index 9f17c2eaacae..a30ebf7ee18c 100644
--- a/sc/inc/AccessibleGlobal.hxx
+++ b/sc/inc/AccessibleGlobal.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDataPilotControl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx
index 38443e69fc07..9e787ea590fe 100644
--- a/sc/inc/ViewSettingsSequenceDefines.hxx
+++ b/sc/inc/ViewSettingsSequenceDefines.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ViewSettingsSequenceDefines.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/addincfg.hxx b/sc/inc/addincfg.hxx
index 431766393ab8..193da4095977 100644
--- a/sc/inc/addincfg.hxx
+++ b/sc/inc/addincfg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addincfg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 1eb9c3051a14..fbc1444cc6de 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addincol.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 728f011c3cbc..3eef919e2f1b 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: address.hxx,v $
- * $Revision: 1.17.30.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx
index c9089ba48d2e..d6df571a29aa 100644
--- a/sc/inc/addruno.hxx
+++ b/sc/inc/addruno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addruno.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index 843fa673543f..9cb402a03764 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: afmtuno.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 05de5a22cc90..050611eeeb9e 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appluno.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 219036728869..91fc43fc249a 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appoptio.hxx,v $
- * $Revision: 1.10.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index ad74f27f651b..46ce98709df1 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: arealink.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 5cbe1bafd290..6d7b7f48c2d7 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attarray.hxx,v $
- * $Revision: 1.9.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 9db8b4001690..96a0529c48a1 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attrib.hxx,v $
- * $Revision: 1.10.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index 8ec139ffa2d5..094f618fbc7c 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autoform.hxx,v $
- * $Revision: 1.8.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,22 +47,22 @@ JP 20.07.95:
 **************************************************************************/
 
 #include "scitems.hxx"
-#include <svx/adjitem.hxx>
+#include <editeng/adjitem.hxx>
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <svx/rotmodit.hxx>
 #include <svl/intitem.hxx>
-#include <svx/bolnitem.hxx>
+#include <editeng/bolnitem.hxx>
 #include "scdllapi.h"
 #include "collect.hxx"
 #include "global.hxx"
diff --git a/sc/inc/autonamecache.hxx b/sc/inc/autonamecache.hxx
index fd5c46f1c2a5..0eb1b51efe29 100644
--- a/sc/inc/autonamecache.hxx
+++ b/sc/inc/autonamecache.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autonamecache.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index 8675de7cbf39..d5a066d522cc 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bigrange.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index e7418c8dedfe..cdba4e3a78bb 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: brdcst.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx
index aee15caab79c..58962ea18c03 100644
--- a/sc/inc/callform.hxx
+++ b/sc/inc/callform.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: callform.hxx,v $
- * $Revision: 1.3.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 9355176e3a62..ad9ed02a0415 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cell.hxx,v $
- * $Revision: 1.30.38.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx
index 246f1deb30cd..b0b445a5993d 100644
--- a/sc/inc/cellform.hxx
+++ b/sc/inc/cellform.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellform.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 7d0cc1411263..13469b110455 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellsuno.hxx,v $
- * $Revision: 1.33 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/cfgids.hxx b/sc/inc/cfgids.hxx
index cd2537d29eab..4b07ddd0682f 100644
--- a/sc/inc/cfgids.hxx
+++ b/sc/inc/cfgids.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cfgids.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 32dc3a777086..d63e47d642b9 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chart2uno.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -533,6 +530,14 @@ private:
     };
 
     ::std::list<Item>           m_aDataArray;
+
+    /**
+     * Cached data for getData.  We may also need to cache data for the
+     * numerical and textural data series if they turn out to be bottlenecks
+     * under certain scenarios.
+     */
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aMixedDataCache;
+
     ::com::sun::star::uno::Sequence<sal_Int32>  m_aHiddenValues;
 
     // properties
diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx
index b04c70eb01b3..62f30a17c62e 100644
--- a/sc/inc/chartarr.hxx
+++ b/sc/inc/chartarr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartarr.hxx,v $
- * $Revision: 1.7.32.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx
index fb4aeccb7c61..b4c677d7c3c6 100644
--- a/sc/inc/charthelper.hxx
+++ b/sc/inc/charthelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charthelper.hxx,v $
- * $Revision: 1.1.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 0ebc84268f74..26831970d5b7 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartlis.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@ class ScChartUnoData;
 #include <com/sun/star/chart/XChartData.hpp>
 #include <com/sun/star/chart/XChartDataChangeEventListener.hpp>
 
-class ScChartListener : public StrData, public SvtListener
+class SC_DLLPUBLIC ScChartListener : public StrData, public SvtListener
 {
 public:
     class ExternalRefListener : public ScExternalRefManager::LinkListener
@@ -186,7 +183,7 @@ public:
                              const com::sun::star::uno::Reference< com::sun::star::chart::XChartData >& rSource );
     void            StartTimer();
     void            UpdateDirtyCharts();
-    void            SetDirty();
+    void SC_DLLPUBLIC SetDirty();
     void            SetDiffDirty( const ScChartListenerCollection&,
                         BOOL bSetChartRangeLists = FALSE );
 
diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx
index 9a6d65a88074..16f0fdd2cf4c 100644
--- a/sc/inc/chartlock.hxx
+++ b/sc/inc/chartlock.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartlock.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
index cd0bd47f2a32..84ffd2e877e2 100644
--- a/sc/inc/chartpos.hxx
+++ b/sc/inc/chartpos.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartpos.hxx,v $
- * $Revision: 1.3.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index 7c82b4874fca..795d655f3d06 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartuno.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 0018f8b2ac3c..ffe248bb3f65 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chgtrack.hxx,v $
- * $Revision: 1.31.32.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx
index dda49c8624b1..ddc0dcc14243 100644
--- a/sc/inc/chgviset.hxx
+++ b/sc/inc/chgviset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chgviset.hxx,v $
- * $Revision: 1.6.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx
index 896117bdef69..78b5474229d1 100644
--- a/sc/inc/clipparam.hxx
+++ b/sc/inc/clipparam.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: document.hxx,v $
- * $Revision: 1.115.36.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx
index dc7778d12da3..e8b9bed60865 100644
--- a/sc/inc/collect.hxx
+++ b/sc/inc/collect.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: collect.hxx,v $
- * $Revision: 1.6.32.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index b69fcb384e04..08f3d1f7b1e3 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: column.hxx,v $
- * $Revision: 1.21.128.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -114,7 +111,7 @@ private:
 friend class ScDocument;                    // fuer FillInfo
 friend class ScDocumentIterator;
 friend class ScValueIterator;
-friend class ScQueryValueIterator;
+friend class ScDBQueryDataIterator;
 friend class ScColumnIterator;
 friend class ScQueryCellIterator;
 friend class ScMarkedDataIter;
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index c981af2dad18..7d045db3c2aa 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: compiler.hxx,v $
- * $Revision: 1.36.30.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index ce7144008e2b..3b6f35366976 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: compressedarray.hxx,v $
- * $Revision: 1.7.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index f659c52d0892..75758841af7a 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: conditio.hxx,v $
- * $Revision: 1.13.32.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx
index a82e4fad1a09..bd74406eb37a 100644
--- a/sc/inc/confuno.hxx
+++ b/sc/inc/confuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: confuno.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
index 0fbaa1230e4b..4eb30b12c432 100644
--- a/sc/inc/consoli.hxx
+++ b/sc/inc/consoli.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: consoli.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx
index d1223b5ae29f..135ac055b2fe 100644
--- a/sc/inc/convuno.hxx
+++ b/sc/inc/convuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: convuno.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/cursuno.hxx b/sc/inc/cursuno.hxx
index 156bd49c0a7e..470f4e3c6f5c 100644
--- a/sc/inc/cursuno.hxx
+++ b/sc/inc/cursuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cursuno.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 86f395f525ca..ba695d8784bc 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dapiuno.hxx,v $
- * $Revision: 1.10.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 6cd2d1555bdf..79902b367ac7 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datauno.hxx,v $
- * $Revision: 1.8.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,8 +29,8 @@
 #define SC_DATAUNO_HXX
 
 #include "global.hxx"
-#include <svl/itemprop.hxx>
-#include <svl/lstner.hxx>
+#include "queryparam.hxx"
+
 #include <com/sun/star/sheet/TableFilterField.hpp>
 #include <com/sun/star/sheet/GeneralFunction.hpp>
 #include <com/sun/star/sheet/XCellRangeReferrer.hpp>
@@ -56,6 +53,8 @@
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/implbase6.hxx>
+#include "svl/itemprop.hxx"
+#include "svl/lstner.hxx"
 
 class ScDBData;
 class ScDocShell;
diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx
index 3d9d357b512b..488263bebf53 100644
--- a/sc/inc/dbcolect.hxx
+++ b/sc/inc/dbcolect.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbcolect.hxx,v $
- * $Revision: 1.13.32.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxx
index fc7306747caf..3071b542f4b6 100644
--- a/sc/inc/dbdocutl.hxx
+++ b/sc/inc/dbdocutl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbdocutl.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dbtoken.hxx b/sc/inc/dbtoken.hxx
index ffb8b8db6a34..1cdacfd97323 100644
--- a/sc/inc/dbtoken.hxx
+++ b/sc/inc/dbtoken.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbtoken.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx
index b93c386a77f0..5ef4f501061a 100644
--- a/sc/inc/defltuno.hxx
+++ b/sc/inc/defltuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: defltuno.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx
index b16b5a05778c..31055c270fbf 100644
--- a/sc/inc/detdata.hxx
+++ b/sc/inc/detdata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: detdata.hxx,v $
- * $Revision: 1.7.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx
index 98922c1776b8..5c57d32af898 100644
--- a/sc/inc/detfunc.hxx
+++ b/sc/inc/detfunc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: detfunc.hxx,v $
- * $Revision: 1.11.128.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx
index b09a064ee797..9526ed8ae3db 100644
--- a/sc/inc/dispuno.hxx
+++ b/sc/inc/dispuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispuno.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 3f9e77a82378..dd1d18e49a51 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dociter.hxx,v $
- * $Revision: 1.9.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,6 +32,9 @@
 #include <tools/solar.h>
 #include "global.hxx"
 #include "scdllapi.h"
+#include "queryparam.hxx"
+
+#include <memory>
 
 class ScDocument;
 class ScBaseCell;
@@ -127,34 +127,97 @@ public:
                     }
 };
 
-class ScQueryValueIterator            // alle Zahlenwerte in einem Bereich durchgehen
+// ============================================================================
+
+class ScDBQueryDataIterator
 {
+public:
+    struct Value
+    {
+        ::rtl::OUString maString;
+        double          mfValue;
+        sal_uInt16      mnError;
+        bool            mbIsNumber;
+
+        Value();
+    };
+
 private:
-    ScQueryParam    aParam;
-    ScDocument*     pDoc;
-    const ScAttrArray*  pAttrArray;
-    ULONG           nNumFormat;     // fuer CalcAsShown
-    ULONG           nNumFmtIndex;
-    SCCOL           nCol;
-    SCROW           nRow;
-    SCSIZE          nColRow;
-    SCROW           nAttrEndRow;
-    SCTAB           nTab;
-    short           nNumFmtType;
-    BOOL            bCalcAsShown;
+    static SCROW        GetRowByColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCCOL nCol, SCSIZE nColRow);
+    static ScBaseCell*  GetCellByColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCCOL nCol, SCSIZE nColRow);
+    static ScAttrArray* GetAttrArrayByCol(ScDocument& rDoc, SCTAB nTab, SCCOL nCol);
+    static bool         IsQueryValid(ScDocument& rDoc, const ScQueryParam& rParam, SCTAB nTab, SCROW nRow, ScBaseCell* pCell);
+    static SCSIZE       SearchColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCROW nRow, SCCOL nCol);
+
+    class DataAccess
+    {
+    public:
+        DataAccess(const ScDBQueryDataIterator* pParent);
+        virtual ~DataAccess() = 0;
+        virtual bool getCurrent(Value& rValue) = 0;
+        virtual bool getFirst(Value& rValue) = 0;
+        virtual bool getNext(Value& rValue) = 0;
+    protected:
+        const ScDBQueryDataIterator* mpParent;
+    };
+
+    class DataAccessInternal : public DataAccess
+    {
+    public:
+        DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc);
+        virtual ~DataAccessInternal();
+        virtual bool getCurrent(Value& rValue);
+        virtual bool getFirst(Value& rValue);
+        virtual bool getNext(Value& rValue);
+
+    private:
+        ScDBQueryParamInternal* mpParam;
+        ScDocument*         mpDoc;
+        const ScAttrArray*  pAttrArray;
+        ULONG               nNumFormat;     // for CalcAsShown
+        ULONG               nNumFmtIndex;
+        SCCOL               nCol;
+        SCROW               nRow;
+        SCSIZE              nColRow;
+        SCROW               nAttrEndRow;
+        SCTAB               nTab;
+        short               nNumFmtType;
+        bool                bCalcAsShown;
+    };
+
+    class DataAccessMatrix : public DataAccess
+    {
+    public:
+        DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam);
+        virtual ~DataAccessMatrix();
+        virtual bool getCurrent(Value& rValue);
+        virtual bool getFirst(Value& rValue);
+        virtual bool getNext(Value& rValue);
+
+    private:
+        bool isValidQuery(SCROW mnRow, const ScMatrix& rMat) const;
+
+        ScDBQueryParamMatrix* mpParam;
+        SCROW mnCurRow;
+        SCROW mnRows;
+        SCCOL mnCols;
+    };
+
+    ::std::auto_ptr<ScDBQueryParamBase> mpParam;
+    ::std::auto_ptr<DataAccess>         mpData;
+
+    bool            GetThis(Value& rValue);
 
-    BOOL            GetThis(double& rValue, USHORT& rErr);
 public:
-                    ScQueryValueIterator(ScDocument* pDocument, SCTAB nTable,
-                                         const ScQueryParam& aParam);
+                    ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam);
     /// Does NOT reset rValue if no value found!
-    BOOL            GetFirst(double& rValue, USHORT& rErr);
+    bool            GetFirst(Value& rValue);
     /// Does NOT reset rValue if no value found!
-    BOOL            GetNext(double& rValue, USHORT& rErr);
-    void            GetCurNumFmtInfo( short& nType, ULONG& nIndex )
-                        { nType = nNumFmtType; nIndex = nNumFmtIndex; }
+    bool            GetNext(Value& rValue);
 };
 
+// ============================================================================
+
 class ScCellIterator            // alle Zellen in einem Bereich durchgehen
 {                               // bei SubTotal aber keine ausgeblendeten und
 private:                        // SubTotalZeilen
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index f102b5ea966d..9dd1057db67f 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docoptio.hxx,v $
- * $Revision: 1.7.32.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index 52cf1a968163..d366ef1ec25a 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docpool.hxx,v $
- * $Revision: 1.10.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index cc575b529d73..44bda96f8322 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: document.hxx,v $
- * $Revision: 1.115.36.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,7 +66,9 @@ class SvxBoxInfoItem;
 class SvxBoxItem;
 class SvxBrushItem;
 class SvxForbiddenCharactersTable;
-class SvxLinkManager;
+namespace sfx2 {
+    class LinkManager;
+    }
 class SvxSearchItem;
 class SvxShadowItem;
 class Window;
@@ -227,7 +226,7 @@ class ScDocument
 {
 friend class ScDocumentIterator;
 friend class ScValueIterator;
-friend class ScQueryValueIterator;
+friend class ScDBQueryDataIterator;
 friend class ScCellIterator;
 friend class ScQueryCellIterator;
 friend class ScHorizontalCellIterator;
@@ -260,7 +259,7 @@ private:
     ScChartCollection*  pChartCollection;
     std::auto_ptr< ScTemporaryChartLock > apTemporaryChartLock;
     ScPatternAttr*      pSelectionAttr;                 // Attribute eines Blocks
-    mutable SvxLinkManager*     pLinkManager;
+    mutable sfx2::LinkManager*      pLinkManager;
     ScFormulaCell*      pFormulaTree;                   // Berechnungsbaum Start
     ScFormulaCell*      pEOFormulaTree;                 // Berechnungsbaum Ende, letzte Zelle
     ScFormulaCell*      pFormulaTrack;                  // BroadcastTrack Start
@@ -291,6 +290,7 @@ private:
                         mxFormulaParserPool;            /// Pool for all external formula parsers used by this document.
 
     String              aDocName;                       // opt: Dokumentname
+    String              aDocCodeName;                       // opt: Dokumentname
     ScRangePairListRef  xColNameRanges;
     ScRangePairListRef  xRowNameRanges;
 
@@ -420,6 +420,7 @@ private:
 
 public:
     SC_DLLPUBLIC ULONG          GetCellCount() const;       // alle Zellen
+    SCSIZE          GetCellCount(SCTAB nTab, SCCOL nCol) const;
     ULONG           GetWeightedCount() const;   // Formeln und Edit staerker gewichtet
     ULONG           GetCodeCount() const;       // RPN-Code in Formeln
     DECL_LINK( GetUserDefinedColor, USHORT * );
@@ -435,13 +436,15 @@ public:
 
     SC_DLLPUBLIC const String&  GetName() const { return aDocName; }
     void            SetName( const String& r ) { aDocName = r; }
+    const String&   GetCodeName() const { return aDocCodeName; }
+    void            SetCodeName( const String& r ) { aDocCodeName = r; }
 
     void            GetDocStat( ScDocStat& rDocStat );
 
     SC_DLLPUBLIC void           InitDrawLayer( SfxObjectShell* pDocShell = NULL );
     XColorTable*    GetColorTable();
 
-    SC_DLLPUBLIC SvxLinkManager*        GetLinkManager() const;
+    SC_DLLPUBLIC sfx2::LinkManager*     GetLinkManager() const;
 
     SC_DLLPUBLIC const ScDocOptions&        GetDocOptions() const;
     SC_DLLPUBLIC void                   SetDocOptions( const ScDocOptions& rOpt );
@@ -520,6 +523,8 @@ public:
 
     SC_DLLPUBLIC BOOL           HasTable( SCTAB nTab ) const;
     SC_DLLPUBLIC BOOL           GetName( SCTAB nTab, String& rName ) const;
+    SC_DLLPUBLIC BOOL           GetCodeName( SCTAB nTab, String& rName ) const;
+    SC_DLLPUBLIC BOOL           SetCodeName( SCTAB nTab, String& rName );
     SC_DLLPUBLIC BOOL           GetTable( const String& rName, SCTAB& rTab ) const;
     SC_DLLPUBLIC inline SCTAB   GetTableCount() const { return nMaxTableNumber; }
     SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; }
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 95d9ebc35a7c..15a0c5e72359 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docuno.hxx,v $
- * $Revision: 1.27.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx
index 2115eab7cc42..60dba0bc27db 100644
--- a/sc/inc/dpcachetable.hxx
+++ b/sc/inc/dpcachetable.hxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpcachetable.hxx,v $
- *
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,6 +56,7 @@ class ScDPDimension;
 class ScDPCollection;
 struct ScDPCacheCell;
 struct ScDPItemData;
+struct ScQueryParam;
 class Date;
 
 // ----------------------------------------------------------------------------
diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx
index 4c711eb67eb7..f887ed91ea32 100644
--- a/sc/inc/dpdimsave.hxx
+++ b/sc/inc/dpdimsave.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpdimsave.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index cb933f4d2a98..39770d2adffd 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpgroup.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index ef7a2c491c50..917d62f38bfe 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpobject.hxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index e3ab86423d4b..e97a56a9ecf2 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpoutput.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dpoutputgeometry.hxx b/sc/inc/dpoutputgeometry.hxx
index b665c9cc88b4..7069787e803d 100644
--- a/sc/inc/dpoutputgeometry.hxx
+++ b/sc/inc/dpoutputgeometry.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmldpimp.cxx,v $
- * $Revision: 1.27.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 86093ac8614b..587e23d8109b 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpsave.hxx,v $
- * $Revision: 1.11.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index b837b5811aad..1f980bdec3bf 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpsdbtab.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index 0bcdbeee517e..a0e67371eff1 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpshttab.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,6 +32,7 @@
 #include "global.hxx"
 #include "address.hxx"
 #include "scdllapi.h"
+#include "queryparam.hxx"
 
 #include <vector>
 
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 46c26b3f0bbe..43c719e9ee16 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dptabdat.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index a2574820da4a..d4e8807d4a3b 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dptabres.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index 94229f5b1d35..d2884281e1b8 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dptabsrc.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx
index ad0ce37e35c3..ee4f48ad9cf5 100644
--- a/sc/inc/drawattr.hxx
+++ b/sc/inc/drawattr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawattr.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 #define _IDLITEMS_HXX
 
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 
 
 class SvxDrawToolItem : public SfxEnumItem
diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx
index ff2f32a1d7ac..9c39fc71e5af 100644
--- a/sc/inc/drawpage.hxx
+++ b/sc/inc/drawpage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawpage.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/drdefuno.hxx b/sc/inc/drdefuno.hxx
index 4b0a534dc655..09fd3368271e 100644
--- a/sc/inc/drdefuno.hxx
+++ b/sc/inc/drdefuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drdefuno.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index a0492d82a2f3..563cf768b5ae 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drwlayer.hxx,v $
- * $Revision: 1.21.128.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx
index 3dd928384fe8..ed4423d629a8 100644
--- a/sc/inc/editsrc.hxx
+++ b/sc/inc/editsrc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editsrc.hxx,v $
- * $Revision: 1.17.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #define SC_EDITSRC_HXX
 
 #include "address.hxx"
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
 #include <svl/lstner.hxx>
 
 #include <memory>
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index b61bdf72ef7b..aefa789d2587 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editutil.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 
 #include "scdllapi.h"
 #include "address.hxx"
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <svx/pageitem.hxx>
 #include <tools/date.hxx>
 #include <tools/time.hxx>
diff --git a/sc/inc/eetext.hxx b/sc/inc/eetext.hxx
index 3e6300aaf2bb..28ee0d5f09b2 100644
--- a/sc/inc/eetext.hxx
+++ b/sc/inc/eetext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eetext.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 90adedd6d346..ae37b710a074 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: externalrefmgr.hxx,v $
- * $Revision: 1.1.2.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 6d777b38424a..584d62451cc6 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fielduno.hxx,v $
- * $Revision: 1.8.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 
 #include <svl/lstner.hxx>
 #include <svl/itemprop.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XContainer.hpp>
diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index d0be5b0cb897..8dead5b4fb05 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fillinfo.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 157795db2a42..8e3e540c9038 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filter.hxx,v $
- * $Revision: 1.8.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx
index 9170cca94c57..0efdfeeb5a30 100644
--- a/sc/inc/filtopt.hxx
+++ b/sc/inc/filtopt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtopt.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx
index eedfa0ffcf70..2bddb7fdd02c 100644
--- a/sc/inc/filtuno.hxx
+++ b/sc/inc/filtuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtuno.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index ccd93d982bdf..eebd808c30a4 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmtuno.hxx,v $
- * $Revision: 1.10.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/forbiuno.hxx b/sc/inc/forbiuno.hxx
index 305d818a299d..05e23cf96506 100644
--- a/sc/inc/forbiuno.hxx
+++ b/sc/inc/forbiuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: forbiuno.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 #ifndef SC_FORBIUNO_HXX
 #define SC_FORBIUNO_HXX
 
-#include <svx/UnoForbiddenCharsTable.hxx>
+#include <editeng/UnoForbiddenCharsTable.hxx>
 #include <svl/lstner.hxx>
 
 class ScDocShell;
diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx
index af6b0ed3ebf1..c65f7f9428ce 100644
--- a/sc/inc/formulaparserpool.hxx
+++ b/sc/inc/formulaparserpool.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formulaparserpool.hxx,v $
- * $Revision: 1.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index c8f50a92cd0b..bd99cca8f5d9 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formularesult.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index fa07e663063f..a8f495440554 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: funcdesc.hxx,v $
- * $Revision: 1.3.30.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index 4c45cdb627bc..3eef9082e26d 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: funcuno.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index c938968ddfef..8bcbd50b0f3c 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: global.hxx,v $
- * $Revision: 1.53.128.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -817,47 +814,6 @@ struct ScQueryEntry
     BOOL            operator==( const ScQueryEntry& r ) const;
 };
 
-struct SC_DLLPUBLIC ScQueryParam
-{
-    SCCOL           nCol1;
-    SCROW           nRow1;
-    SCCOL           nCol2;
-    SCROW           nRow2;
-    SCTAB           nTab;
-    BOOL            bHasHeader;
-    BOOL            bByRow;
-    BOOL            bInplace;
-    BOOL            bCaseSens;
-    BOOL            bRegExp;
-    BOOL            bMixedComparison;   // whether numbers are smaller than strings
-    BOOL            bDuplicate;
-    BOOL            bDestPers;          // nicht gespeichert
-    SCTAB           nDestTab;
-    SCCOL           nDestCol;
-    SCROW           nDestRow;
-
-private:
-    SCSIZE          nEntryCount;
-    ScQueryEntry*   pEntries;
-
-public:
-    ScQueryParam();
-    ScQueryParam( const ScQueryParam& r );
-    ~ScQueryParam();
-
-    SCSIZE          GetEntryCount() const           { return nEntryCount; }
-    ScQueryEntry&   GetEntry(SCSIZE n) const        { return pEntries[n]; }
-    void            Resize(SCSIZE nNew);
-
-    ScQueryParam&   operator=   ( const ScQueryParam& r );
-    BOOL            operator==  ( const ScQueryParam& rOther ) const;
-    void            Clear       ();
-    void            DeleteQuery( SCSIZE nPos );
-
-    void            MoveToDest();
-    void            FillInExcelSyntax(String& aCellStr, SCSIZE nIndex);
-};
-
 // -----------------------------------------------------------------------
 
 struct SC_DLLPUBLIC ScSubTotalParam
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 97d77dc06fc5..c635877e2ea2 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globstr.hrc,v $
- * $Revision: 1.22.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index 889dc302fcf6..00791921527d 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hints.hxx,v $
- * $Revision: 1.5.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index 4d56f70b4d33..62e258b76500 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inputopt.hxx,v $
- * $Revision: 1.5.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index 1a9479dff278..50b33c692752 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linkuno.hxx,v $
- * $Revision: 1.7.134.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/listenercalls.hxx b/sc/inc/listenercalls.hxx
index e84692c37e85..988cd2a24dd7 100644
--- a/sc/inc/listenercalls.hxx
+++ b/sc/inc/listenercalls.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: listenercalls.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 9261a6db0395..431f995d27c2 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lookupcache.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/makefile.mk b/sc/inc/makefile.mk
index 64c363b0e2c4..a3bcf29670a1 100644
--- a/sc/inc/makefile.mk
+++ b/sc/inc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx
index 84d7a9d88a1a..78bb2a6bba3d 100644
--- a/sc/inc/markarr.hxx
+++ b/sc/inc/markarr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: markarr.hxx,v $
- * $Revision: 1.6.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index 4405684f93f4..a982c8db47dd 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: markdata.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index df60b2822cb8..d1958eccceac 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: miscuno.hxx,v $
- * $Revision: 1.9.32.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/mutexhlp.hxx b/sc/inc/mutexhlp.hxx
index 5d05e5982b58..bd45332b9817 100644
--- a/sc/inc/mutexhlp.hxx
+++ b/sc/inc/mutexhlp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mutexhlp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 240cead3be83..b8cb1ad91754 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: nameuno.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/navicfg.hxx b/sc/inc/navicfg.hxx
index c960cef1ec06..23cd38e1f10a 100644
--- a/sc/inc/navicfg.hxx
+++ b/sc/inc/navicfg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navicfg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx
index 4cf8148eff17..a1648132f8e1 100644
--- a/sc/inc/notesuno.hxx
+++ b/sc/inc/notesuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: notesuno.hxx,v $
- * $Revision: 1.5.128.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx
index 4d42accdf729..3ffc03f4a249 100644
--- a/sc/inc/olinetab.hxx
+++ b/sc/inc/olinetab.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olinetab.hxx,v $
- * $Revision: 1.6.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx
index 648fc182a6a2..094ff1cfea32 100644
--- a/sc/inc/optuno.hxx
+++ b/sc/inc/optuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optuno.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx
index a00b3495d766..c197076ee642 100644
--- a/sc/inc/optutil.hxx
+++ b/sc/inc/optutil.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optutil.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/pagepar.hxx b/sc/inc/pagepar.hxx
index 0ed0ca1be7ea..935046e81a48 100644
--- a/sc/inc/pagepar.hxx
+++ b/sc/inc/pagepar.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pagepar.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx
index 74ae1ca1e7df..4b897748db1e 100644
--- a/sc/inc/pageuno.hxx
+++ b/sc/inc/pageuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pageuno.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/paramisc.hxx b/sc/inc/paramisc.hxx
index d71d6650a66a..896fec2e88d9 100644
--- a/sc/inc/paramisc.hxx
+++ b/sc/inc/paramisc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: paramisc.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index 65d350455ddd..b8929a450576 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: patattr.hxx,v $
- * $Revision: 1.14.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <svl/poolitem.hxx>
 #include <svl/itemset.hxx>
 #include <unotools/fontcvt.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include "scdllapi.h"
 
 class Font;
diff --git a/sc/inc/pch/precompiled_sc.cxx b/sc/inc/pch/precompiled_sc.cxx
index 5b5f7ead4070..6d7b708ffd69 100755
--- a/sc/inc/pch/precompiled_sc.cxx
+++ b/sc/inc/pch/precompiled_sc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_sc.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index dbb86fdf7484..048d7b638d57 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_sc.hxx,v $
- * $Revision: 1.8.160.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -162,10 +159,10 @@
 #include <unotools/pathoptions.hxx>
 #include <svl/solar.hrc>
 #include <unotools/useroptions.hxx>
-#include <svx/editobj.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/fmglob.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/sdangitm.hxx>
 #include <svx/sderitm.hxx>
 #include <svx/sdmetitm.hxx>
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 100463cb5542..2a1f17846afd 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pivot.hxx,v $
- * $Revision: 1.8.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index ee90a71375b4..a4363e3adfbc 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: postit.hxx,v $
- * $Revision: 1.7.128.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index 0c90ba4497fc..ec063d2d0e9b 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printopt.hxx,v $
- * $Revision: 1.5.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/prnsave.hxx b/sc/inc/prnsave.hxx
index 2db0e03d618c..b28d04cf48bf 100644
--- a/sc/inc/prnsave.hxx
+++ b/sc/inc/prnsave.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prnsave.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index c7706c2bc26b..a9cd3d2544bd 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: progress.hxx,v $
- * $Revision: 1.3.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
new file mode 100644
index 000000000000..8e84f1e53e36
--- /dev/null
+++ b/sc/inc/queryparam.hxx
@@ -0,0 +1,142 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: interpre.hxx,v $
+ * $Revision: 1.35.44.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_QUERYPARAM_HXX
+#define SC_QUERYPARAM_HXX
+
+#include "global.hxx"
+#include "scmatrix.hxx"
+
+#include <vector>
+
+struct ScDBQueryParamInternal;
+
+struct ScQueryParamBase
+{
+    bool            bHasHeader;
+    bool            bByRow;
+    bool            bInplace;
+    bool            bCaseSens;
+    bool            bRegExp;
+    bool            bDuplicate;
+    bool            bMixedComparison;   // whether numbers are smaller than strings
+
+    virtual ~ScQueryParamBase();
+
+    SC_DLLPUBLIC SCSIZE GetEntryCount() const;
+    SC_DLLPUBLIC ScQueryEntry& GetEntry(SCSIZE n) const;
+    void Resize(SCSIZE nNew);
+    SC_DLLPUBLIC void DeleteQuery( SCSIZE nPos );
+    void FillInExcelSyntax(String& aCellStr, SCSIZE nIndex);
+
+protected:
+    ScQueryParamBase();
+    ScQueryParamBase(const ScQueryParamBase& r);
+
+    mutable ::std::vector<ScQueryEntry>  maEntries;
+};
+
+// ============================================================================
+
+struct ScQueryParamTable
+{
+    SCCOL           nCol1;
+    SCROW           nRow1;
+    SCCOL           nCol2;
+    SCROW           nRow2;
+    SCTAB           nTab;
+
+    ScQueryParamTable();
+    ScQueryParamTable(const ScQueryParamTable& r);
+    virtual ~ScQueryParamTable();
+};
+
+// ============================================================================
+
+struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamTable
+{
+    BOOL            bDestPers;          // nicht gespeichert
+    SCTAB           nDestTab;
+    SCCOL           nDestCol;
+    SCROW           nDestRow;
+
+    ScQueryParam();
+    ScQueryParam( const ScQueryParam& r );
+    ScQueryParam( const ScDBQueryParamInternal& r );
+    virtual ~ScQueryParam();
+
+    ScQueryParam&   operator=   ( const ScQueryParam& r );
+    BOOL            operator==  ( const ScQueryParam& rOther ) const;
+    void            Clear();
+    void            ClearDestParams();
+    void            MoveToDest();
+};
+
+// ============================================================================
+
+struct ScDBQueryParamBase : public ScQueryParamBase
+{
+    enum DataType { INTERNAL, MATRIX };
+
+    SCCOL   mnField;    /// the field in which the values are processed during iteration.
+    bool    mbSkipString;
+
+    DataType        GetType() const;
+
+    virtual ~ScDBQueryParamBase();
+
+protected:
+    ScDBQueryParamBase(DataType eType);
+
+private:
+    ScDBQueryParamBase();
+
+    DataType        meType;
+};
+
+// ============================================================================
+
+struct ScDBQueryParamInternal : public ScDBQueryParamBase, public ScQueryParamTable
+{
+    ScDBQueryParamInternal();
+    virtual ~ScDBQueryParamInternal();
+};
+
+// ============================================================================
+
+struct ScDBQueryParamMatrix : public ScDBQueryParamBase
+{
+    ScMatrixRef mpMatrix;
+
+    ScDBQueryParamMatrix();
+    virtual ~ScDBQueryParamMatrix();
+};
+
+#endif
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index e2ceba32b2f1..2350cea085f0 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rangelst.hxx,v $
- * $Revision: 1.9.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 9963cf65c895..a9f324b8b737 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rangenam.hxx,v $
- * $Revision: 1.16.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx
index 895a337f2197..6238ea5f8050 100644
--- a/sc/inc/rangeseq.hxx
+++ b/sc/inc/rangeseq.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rangeseq.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index 5e07064cb3fd..ea5d2a901b54 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rangeutl.hxx,v $
- * $Revision: 1.10.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx
index a9e8a5cacd53..348159c12ce1 100644
--- a/sc/inc/rechead.hxx
+++ b/sc/inc/rechead.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rechead.hxx,v $
- * $Revision: 1.4.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index 64a8bf97659e..7b24e1a409b4 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: recursionhelper.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 12f29943fce0..f42f930084be 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: refdata.hxx,v $
- * $Revision: 1.7.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxx
index 0752e8685b74..775571adeab7 100644
--- a/sc/inc/reffind.hxx
+++ b/sc/inc/reffind.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: reffind.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index e8e213484f96..2a8512848ef0 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: refreshtimer.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx
index 5b06450ea56f..86fd36f691fa 100644
--- a/sc/inc/reftokenhelper.hxx
+++ b/sc/inc/reftokenhelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: token.hxx,v $
- * $Revision: 1.15.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -70,12 +67,12 @@ public:
 
     static void getTokensFromRangeList(::std::vector<ScSharedTokenRef>& pTokens, const ScRangeList& rRanges);
 
-    static bool isRef(const ScSharedTokenRef& pToken);
-    static bool isExternalRef(const ScSharedTokenRef& pToken);
+    static bool SC_DLLPUBLIC isRef(const ScSharedTokenRef& pToken);
+    static bool SC_DLLPUBLIC isExternalRef(const ScSharedTokenRef& pToken);
 
-    static bool intersects(const ::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
+    static bool SC_DLLPUBLIC intersects(const ::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
 
-    static void join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
+    static void SC_DLLPUBLIC join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken);
 
     static bool getDoubleRefDataFromToken(ScComplexRefData& rData, const ScSharedTokenRef& pToken);
 };
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 62114c892ec3..d9bce97f1bc8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sc.hrc,v $
- * $Revision: 1.63 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index ba62b9a5de06..f33077b3e090 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scabstdlg.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx
index 64b568076d28..1d2304c2a0f2 100644
--- a/sc/inc/scdll.hxx
+++ b/sc/inc/scdll.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scdll.hxx,v $
- * $Revision: 1.5.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxx
index 3b05a876163a..4f128ed57604 100644
--- a/sc/inc/scerrors.hxx
+++ b/sc/inc/scerrors.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scerrors.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx
index fdf05430cc69..b02df9816ef4 100644
--- a/sc/inc/scextopt.hxx
+++ b/sc/inc/scextopt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scextopt.hxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -124,6 +121,8 @@ public:
     const String&       GetCodeName( size_t nIdx ) const;
     /** Appends a codename for a sheet. */
     void                AppendCodeName( const String& rCodeName );
+    void                SetCodeName( const String& rCodeName, size_t nIdx );
+    void                DeleteCodeName( size_t nIdx );
 
 private:
     ::std::auto_ptr< ScExtDocOptionsImpl > mxImpl;
diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc
index 678ad0ffb251..8188deca5f40 100644
--- a/sc/inc/scfuncs.hrc
+++ b/sc/inc/scfuncs.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scfuncs.hrc,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/scimpexpmsg.hxx b/sc/inc/scimpexpmsg.hxx
index d74a7f0f1ee2..5574edd12083 100644
--- a/sc/inc/scimpexpmsg.hxx
+++ b/sc/inc/scimpexpmsg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scimpexpmsg.hxx,v $
- * $Revision: 1.4.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index 51e5ccd457ba..6788c906cb8d 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scitems.hxx,v $
- * $Revision: 1.12.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 7f3b5443d9d9..494ab86b0c74 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scmatrix.hxx,v $
- * $Revision: 1.11.148.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index bf7f8810fec3..ee2c956e7742 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scmod.hxx,v $
- * $Revision: 1.24.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx
index 348ef05d3d1d..067e5f03e307 100644
--- a/sc/inc/scresid.hxx
+++ b/sc/inc/scresid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scresid.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/scwarngs.hxx b/sc/inc/scwarngs.hxx
index 3b695208ead7..e823a66f7a80 100644
--- a/sc/inc/scwarngs.hxx
+++ b/sc/inc/scwarngs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scwarngs.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/segdefs.hxx b/sc/inc/segdefs.hxx
index 77351a4847fe..6e2153ddb6a5 100644
--- a/sc/inc/segdefs.hxx
+++ b/sc/inc/segdefs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: segdefs.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/segdefs_.hxx b/sc/inc/segdefs_.hxx
index f7f629a45bec..10e020d9da60 100644
--- a/sc/inc/segdefs_.hxx
+++ b/sc/inc/segdefs_.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: segdefs_.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx
index ace44dc5be4d..785e5e4049d0 100644
--- a/sc/inc/servuno.hxx
+++ b/sc/inc/servuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: servuno.hxx,v $
- * $Revision: 1.14.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -93,8 +90,9 @@ class ScDocShell;
 
 #define SC_SERVICE_FORMULAPARS  38
 #define SC_SERVICE_OPCODEMAPPER 39
+#define SC_SERVICE_VBACODENAMEPROVIDER   40
 
-#define SC_SERVICE_COUNT        40
+#define SC_SERVICE_COUNT        41
 #define SC_SERVICE_INVALID      USHRT_MAX
 
 
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index fe8912b87257..ddbbf3108daf 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shapeuno.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx
index 63853f6bc675..e23402c5fff0 100644
--- a/sc/inc/sheetdata.hxx
+++ b/sc/inc/sheetdata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sheetdata.hxx,v $
- * $Revision: 1.16.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #define SC_SHEETDATA_HXX
 
 #include <xmloff/maptype.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <vector>
 #include <hash_set>
 
diff --git a/sc/inc/shellids.hxx b/sc/inc/shellids.hxx
index 4e5388cb7533..7f4ccb60259f 100644
--- a/sc/inc/shellids.hxx
+++ b/sc/inc/shellids.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shellids.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index bf21e495e021..650293893678 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sortparam.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx
index ffa54cf29d70..f8f82ed25aff 100644
--- a/sc/inc/srchuno.hxx
+++ b/sc/inc/srchuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchuno.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx
index ce1d643cd27f..946a861231d9 100644
--- a/sc/inc/stlpool.hxx
+++ b/sc/inc/stlpool.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stlpool.hxx,v $
- * $Revision: 1.6.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index ddbbc41b4f80..4e42be6e2563 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stlsheet.hxx,v $
- * $Revision: 1.5.46.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/strload.hxx b/sc/inc/strload.hxx
index 1af3d953c6e0..6b44d8e4e3ef 100644
--- a/sc/inc/strload.hxx
+++ b/sc/inc/strload.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: strload.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 34d1b8d3302c..a1dee10fd75d 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: styleuno.hxx,v $
- * $Revision: 1.6.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx
index 92e03e140288..4349c2759ae9 100644
--- a/sc/inc/subtotal.hxx
+++ b/sc/inc/subtotal.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: subtotal.hxx,v $
- * $Revision: 1.5.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index f400054d00b7..55d31d30430e 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table.hxx,v $
- * $Revision: 1.35.126.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -89,6 +86,7 @@ private:
     ScColumn        aCol[MAXCOLCOUNT];
 
     String          aName;
+    String          aCodeName;
     String          aComment;
     BOOL            bScenario;
     BOOL            bLayoutRTL;
@@ -161,7 +159,7 @@ private:
 friend class ScDocument;                    // fuer FillInfo
 friend class ScDocumentIterator;
 friend class ScValueIterator;
-friend class ScQueryValueIterator;
+friend class ScDBQueryDataIterator;
 friend class ScCellIterator;
 friend class ScQueryCellIterator;
 friend class ScHorizontalCellIterator;
@@ -177,6 +175,7 @@ public:
 
     ScOutlineTable* GetOutlineTable()               { return pOutlineTable; }
 
+    SCSIZE      GetCellCount(SCCOL nCol) const;
     ULONG       GetCellCount() const;
     ULONG       GetWeightedCount() const;
     ULONG       GetCodeCount() const;       // RPN-Code in Formeln
@@ -229,6 +228,9 @@ public:
     void        GetName( String& rName ) const;
     void        SetName( const String& rNewName );
 
+    void        GetCodeName( String& rName ) const {  rName = aCodeName; }
+    void        SetCodeName( const String& rNewName ) { aCodeName = rNewName; }
+
     const String&   GetUpperName() const;
 
     const String&   GetPageStyle() const                    { return aPageStyle; }
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index b52c8efa6528..72b4de611c2e 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablink.hxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/tabopparams.hxx b/sc/inc/tabopparams.hxx
index 6c273be1f176..7baa461061fd 100644
--- a/sc/inc/tabopparams.hxx
+++ b/sc/inc/tabopparams.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabopparams.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
index a11355833e4c..d8dbd45d27fa 100644
--- a/sc/inc/tabprotection.hxx
+++ b/sc/inc/tabprotection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabprotection.hxx,v $
- * $Revision: 1.1.4.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx
index db8670521c25..857f4c0c25e2 100644
--- a/sc/inc/targuno.hxx
+++ b/sc/inc/targuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: targuno.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 64eb2aaba696..e8ff73bf7d85 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textuno.hxx,v $
- * $Revision: 1.15.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 
 #include "global.hxx"           // ScRange, ScAddress
 #include "address.hxx"
-#include <svx/unotext.hxx>
+#include <editeng/unotext.hxx>
 #include <svl/brdcst.hxx>
 #include <svl/lstner.hxx>
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 8aabb0fe725f..e4659921e7be 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: token.hxx,v $
- * $Revision: 1.15.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 59602b2f549d..5ded8f4410d3 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tokenarray.hxx,v $
- * $Revision: 1.12.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index 0c573c6961c1..c727063281e6 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tokenuno.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx
index 0310bf884d42..e21140699e4c 100644
--- a/sc/inc/unitconv.hxx
+++ b/sc/inc/unitconv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unitconv.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/unoguard.hxx b/sc/inc/unoguard.hxx
index d6568e2ad442..0768eada24d7 100644
--- a/sc/inc/unoguard.hxx
+++ b/sc/inc/unoguard.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoguard.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 18829290eb93..84e5c4b11cb1 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unonames.hxx,v $
- * $Revision: 1.82.104.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx
index 08223d546c57..3947f28cfb12 100644
--- a/sc/inc/unoreflist.hxx
+++ b/sc/inc/unoreflist.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoreflist.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/unowids.hxx b/sc/inc/unowids.hxx
index aa75f9cc8404..1765b9d06361 100644
--- a/sc/inc/unowids.hxx
+++ b/sc/inc/unowids.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unowids.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index f49dd2d7fea0..88dea98ec22a 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: userdat.hxx,v $
- * $Revision: 1.8.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx
index 6d0e3720345b..7190cd189156 100644
--- a/sc/inc/userlist.hxx
+++ b/sc/inc/userlist.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: userlist.hxx,v $
- * $Revision: 1.5.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index e41d81990378..1bff57055f82 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: validat.hxx,v $
- * $Revision: 1.15.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index bf6c59117b0f..44625ad2aeb5 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewopti.hxx,v $
- * $Revision: 1.8.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index 045ca7aac598..988602b2056f 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewuno.hxx,v $
- * $Revision: 1.12.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/waitoff.hxx b/sc/inc/waitoff.hxx
index 2e5ed4453af3..b17435f23d7f 100644
--- a/sc/inc/waitoff.hxx
+++ b/sc/inc/waitoff.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: waitoff.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/warnpassword.hxx b/sc/inc/warnpassword.hxx
index 50f29b58a9ba..15d35a70d8a2 100644
--- a/sc/inc/warnpassword.hxx
+++ b/sc/inc/warnpassword.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: warnpassword.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index 7245ee4f45b3..926b6ef50cd1 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlwrap.hxx,v $
- * $Revision: 1.16.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index 7c39c26179a5..7c5e9a2f07cb 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zforauto.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/calcPreview/ViewForwarder.java b/sc/qa/complex/calcPreview/ViewForwarder.java
index 36430b7b210a..160dc1ebd20a 100755
--- a/sc/qa/complex/calcPreview/ViewForwarder.java
+++ b/sc/qa/complex/calcPreview/ViewForwarder.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ViewForwarder.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/calcPreview/makefile.mk b/sc/qa/complex/calcPreview/makefile.mk
index d346f6ea9213..14f9428678e7 100755
--- a/sc/qa/complex/calcPreview/makefile.mk
+++ b/sc/qa/complex/calcPreview/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4.138.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java b/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java
index 8006c31fa917..b23abe2d6a57 100755
--- a/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java
+++ b/sc/qa/complex/cellRanges/CheckXCellRangesQuery.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CheckXCellRangesQuery.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/cellRanges/makefile.mk b/sc/qa/complex/cellRanges/makefile.mk
index 5ed6a3f083ff..fc296fe4f605 100755
--- a/sc/qa/complex/cellRanges/makefile.mk
+++ b/sc/qa/complex/cellRanges/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4.138.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/dataPilot/CheckDataPilot.java b/sc/qa/complex/dataPilot/CheckDataPilot.java
index cda58ecc6c58..d013daa24e1f 100644
--- a/sc/qa/complex/dataPilot/CheckDataPilot.java
+++ b/sc/qa/complex/dataPilot/CheckDataPilot.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CheckDataPilot.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java b/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java
index d19758c01af7..57d6474f51b8 100644
--- a/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java
+++ b/sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: _XPropertySet.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/dataPilot/interfaceTests/beans/makefile.mk b/sc/qa/complex/dataPilot/interfaceTests/beans/makefile.mk
index 307a56d77e14..6ef9f7456cbb 100644
--- a/sc/qa/complex/dataPilot/interfaceTests/beans/makefile.mk
+++ b/sc/qa/complex/dataPilot/interfaceTests/beans/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6.138.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java b/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java
index b27485bf6923..97763be2b199 100644
--- a/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java
+++ b/sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: _XNamed.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/dataPilot/interfaceTests/container/makefile.mk b/sc/qa/complex/dataPilot/interfaceTests/container/makefile.mk
index 1ebab5149b93..675fe7be9a1c 100644
--- a/sc/qa/complex/dataPilot/interfaceTests/container/makefile.mk
+++ b/sc/qa/complex/dataPilot/interfaceTests/container/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6.138.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java b/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java
index bb82002c710c..8358e5bb6106 100644
--- a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java
+++ b/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: _XDataPilotDescriptor.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java b/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java
index 4ce9a80a7272..d7f6e81b91e5 100644
--- a/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java
+++ b/sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: _XDataPilotTable.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/dataPilot/interfaceTests/sheet/makefile.mk b/sc/qa/complex/dataPilot/interfaceTests/sheet/makefile.mk
index e7979bb863d3..350e3fcb8f19 100644
--- a/sc/qa/complex/dataPilot/interfaceTests/sheet/makefile.mk
+++ b/sc/qa/complex/dataPilot/interfaceTests/sheet/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6.138.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/dataPilot/makefile.mk b/sc/qa/complex/dataPilot/makefile.mk
index bc20caca2e6f..a0bf1df34d0e 100644
--- a/sc/qa/complex/dataPilot/makefile.mk
+++ b/sc/qa/complex/dataPilot/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7.138.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/sc/CalcRTL.java b/sc/qa/complex/sc/CalcRTL.java
index 6257b83db3ef..9528c34b9267 100644
--- a/sc/qa/complex/sc/CalcRTL.java
+++ b/sc/qa/complex/sc/CalcRTL.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CalcRTL.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/qa/complex/sc/makefile.mk b/sc/qa/complex/sc/makefile.mk
index d25e004eb55b..097e6d0c5500 100644
--- a/sc/qa/complex/sc/makefile.mk
+++ b/sc/qa/complex/sc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7.138.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/app.sdi b/sc/sdi/app.sdi
index 31323927fa52..5c7e22a62dec 100644
--- a/sc/sdi/app.sdi
+++ b/sc/sdi/app.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: app.sdi,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/auditsh.sdi b/sc/sdi/auditsh.sdi
index 90dac92f5def..4504f6af735c 100644
--- a/sc/sdi/auditsh.sdi
+++ b/sc/sdi/auditsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: auditsh.sdi,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index bdabc363738f..ed6dc17fb2a0 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellsh.sdi,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/chartsh.sdi b/sc/sdi/chartsh.sdi
index abe3cc15ce13..e40c457b0e5e 100644
--- a/sc/sdi/chartsh.sdi
+++ b/sc/sdi/chartsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartsh.sdi,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi
index 5c6f9577cb08..80a330f51890 100644
--- a/sc/sdi/docsh.sdi
+++ b/sc/sdi/docsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docsh.sdi,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index ccf168db2376..98c7bf3a009d 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawsh.sdi,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/drformsh.sdi b/sc/sdi/drformsh.sdi
index 2e571ef9d8b0..f41842286992 100644
--- a/sc/sdi/drformsh.sdi
+++ b/sc/sdi/drformsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drformsh.sdi,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi
index 34d850bed6c2..cde7d77753a9 100644
--- a/sc/sdi/drtxtob.sdi
+++ b/sc/sdi/drtxtob.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drtxtob.sdi,v $
- * $Revision: 1.17.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/editsh.sdi b/sc/sdi/editsh.sdi
index da5ca92c0f1a..ae71120c883e 100644
--- a/sc/sdi/editsh.sdi
+++ b/sc/sdi/editsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editsh.sdi,v $
- * $Revision: 1.11.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi
index ded414f0f6d6..31ccf5c8af84 100644
--- a/sc/sdi/formatsh.sdi
+++ b/sc/sdi/formatsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formatsh.sdi,v $
- * $Revision: 1.14.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/graphsh.sdi b/sc/sdi/graphsh.sdi
index 1ae42f3559d0..4dac1dca12c1 100644
--- a/sc/sdi/graphsh.sdi
+++ b/sc/sdi/graphsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphsh.sdi,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/makefile.mk b/sc/sdi/makefile.mk
index 0ab1b486cd43..dc91cab89397 100644
--- a/sc/sdi/makefile.mk
+++ b/sc/sdi/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/mediash.sdi b/sc/sdi/mediash.sdi
index 69f1326f0e88..0f0b5297db1c 100644
--- a/sc/sdi/mediash.sdi
+++ b/sc/sdi/mediash.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediash.sdi,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/oleobjsh.sdi b/sc/sdi/oleobjsh.sdi
index f88cffd7dce1..e77d219fd694 100644
--- a/sc/sdi/oleobjsh.sdi
+++ b/sc/sdi/oleobjsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oleobjsh.sdi,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/pgbrksh.sdi b/sc/sdi/pgbrksh.sdi
index 6cc28b9eaf1b..c776c98b9d59 100644
--- a/sc/sdi/pgbrksh.sdi
+++ b/sc/sdi/pgbrksh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pgbrksh.sdi,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/pivotsh.sdi b/sc/sdi/pivotsh.sdi
index 5e781b35ea38..d763aa8c995a 100644
--- a/sc/sdi/pivotsh.sdi
+++ b/sc/sdi/pivotsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pivotsh.sdi,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdi
index 92add2aa2fd1..2af8e07a117b 100644
--- a/sc/sdi/prevwsh.sdi
+++ b/sc/sdi/prevwsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prevwsh.sdi,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index de3e3fff56bd..904ee22d3d8c 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scalc.sdi,v $
- * $Revision: 1.40 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/scslots.hrc b/sc/sdi/scslots.hrc
index fdb7cbe35a4b..6a7d3a3f7459 100644
--- a/sc/sdi/scslots.hrc
+++ b/sc/sdi/scslots.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scslots.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,4 +28,6 @@
 #include <svx/dialogs.hrc>
 #include <sfx2/sfxsids.hrc>
 #include <svx/svxids.hrc>
+#include <editeng/editids.hrc>
+#include <editeng/memberids.hrc>
 #include <sc.hrc>
diff --git a/sc/sdi/scslots.sdi b/sc/sdi/scslots.sdi
index e50d282ab60d..3b3f1ad57295 100644
--- a/sc/sdi/scslots.sdi
+++ b/sc/sdi/scslots.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scslots.sdi,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/tabpopsh.sdi b/sc/sdi/tabpopsh.sdi
index 2f5ae872ae2e..cdf7d108bbe7 100644
--- a/sc/sdi/tabpopsh.sdi
+++ b/sc/sdi/tabpopsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabpopsh.sdi,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index 8e075ee8166c..4129aaef7d85 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabvwsh.sdi,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index a4875ba4d1e3..67be752fd8c8 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attarray.cxx,v $
- * $Revision: 1.25.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,12 +34,12 @@
 
 #include "scitems.hxx"
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/bolnitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/shaditem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/bolnitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/shaditem.hxx>
 #include <svl/poolcach.hxx>
-#include <svx/fontitem.hxx>
+#include <editeng/fontitem.hxx>
 #include <unotools/fontcvt.hxx>
 
 #include "attarray.hxx"
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index dcc6418445fa..301883197fb8 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attrib.cxx,v $
- * $Revision: 1.19.32.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,13 +39,13 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/boxitem.hxx>
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/flditem.hxx>
 
 #include "attrib.hxx"
 #include "global.hxx"
diff --git a/sc/source/core/data/autonamecache.cxx b/sc/source/core/data/autonamecache.cxx
index 2daa10fa29d4..c9abd4aa90b8 100644
--- a/sc/source/core/data/autonamecache.cxx
+++ b/sc/source/core/data/autonamecache.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autonamecache.cxx,v $
- * $Revision: 1.4.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,6 +37,7 @@
 #include "autonamecache.hxx"
 #include "dociter.hxx"
 #include "cell.hxx"
+#include "queryparam.hxx"
 
 // -----------------------------------------------------------------------
 
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 2d8688ce5b3b..48a0e8597e1c 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bcaslot.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index e7c74d34a95e..56be361f6d38 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cell.cxx,v $
- * $Revision: 1.44.38.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,9 +51,9 @@
 #include "recursionhelper.hxx"
 #include "postit.hxx"
 #include "externalrefmgr.hxx"
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <svl/intitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 #include <svl/broadcast.hxx>
 
 using namespace formula;
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 4caaa1cb3267..9a3670d2a9e0 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cell2.cxx,v $
- * $Revision: 1.34.102.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,8 +37,8 @@
 #include <boost/bind.hpp>
 
 #include <vcl/mapmod.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editstat.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
 
 #include "cell.hxx"
 #include "compiler.hxx"
diff --git a/sc/source/core/data/clipparam.cxx b/sc/source/core/data/clipparam.cxx
index b2ec555a0d5c..9ab5995ca26c 100644
--- a/sc/source/core/data/clipparam.cxx
+++ b/sc/source/core/data/clipparam.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: document.cxx,v $
- * $Revision: 1.90.36.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index b5dc01a8b059..49ae4a98b1c6 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: column.cxx,v $
- * $Revision: 1.31.128.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,7 +36,7 @@
 
 #include <svl/poolcach.hxx>
 #include <svl/zforlist.hxx>
-#include <svx/scripttypeitem.hxx>
+#include <editeng/scripttypeitem.hxx>
 #include <string.h>
 
 #include "scitems.hxx"
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 3da3d3810f0b..9e3ed1c7ef5e 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: column2.cxx,v $
- * $Revision: 1.32.126.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,17 +33,17 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <svx/algitem.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editstat.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/forbiddencharacterstable.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 #include <svx/rotmodit.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/unolingu.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/broadcast.hxx>
 #include <svl/listeneriter.hxx>
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index e94cfca12ab7..30081a6bf402 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: column3.cxx,v $
- * $Revision: 1.27.128.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx
index 71edac0cd0c8..95da04fef0e0 100644
--- a/sc/source/core/data/compressedarray.cxx
+++ b/sc/source/core/data/compressedarray.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: compressedarray.cxx,v $
- * $Revision: 1.10.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 857c149476b7..b08838198477 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: conditio.cxx,v $
- * $Revision: 1.25.30.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx
index 215f2d34aab1..39675704fb70 100644
--- a/sc/source/core/data/dbdocutl.cxx
+++ b/sc/source/core/data/dbdocutl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbdocutl.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 4548f1f7a1b5..b68ad36364f3 100644..100755
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dociter.cxx,v $
- * $Revision: 1.22.88.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,9 +44,23 @@
 #include "docoptio.hxx"
 #include "cellform.hxx"
 
+#include <vector>
+
+using ::rtl::math::approxEqual;
+using ::std::vector;
+using ::rtl::OUString;
 
 // STATIC DATA -----------------------------------------------------------
 
+namespace {
+
+void lcl_toUpper(OUString& rStr)
+{
+    rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, static_cast<USHORT>(rStr.getLength()));
+}
+
+}
+
 ScDocumentIterator::ScDocumentIterator( ScDocument* pDocument,
                             SCTAB nStartTable, SCTAB nEndTable ) :
     pDoc( pDocument ),
@@ -482,83 +493,121 @@ BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr)
 }
 */
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
+// ============================================================================
 
-ScQueryValueIterator::ScQueryValueIterator(ScDocument* pDocument, SCTAB nTable, const ScQueryParam& rParam) :
-    aParam (rParam),
-    pDoc( pDocument ),
-    nNumFmtIndex(0),
-    nTab( nTable),
-    nNumFmtType( NUMBERFORMAT_UNDEFINED ),
-    bCalcAsShown( pDocument->GetDocOptions().IsCalcAsShown() )
+ScDBQueryDataIterator::DataAccess::DataAccess(const ScDBQueryDataIterator* pParent) :
+    mpParent(pParent)
 {
-    nCol = aParam.nCol1;
-    nRow = aParam.nRow1;
+}
+
+ScDBQueryDataIterator::DataAccess::~DataAccess()
+{
+}
+
+SCROW ScDBQueryDataIterator::GetRowByColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCCOL nCol, SCSIZE nColRow)
+{
+    ScColumn* pCol = &rDoc.pTab[nTab]->aCol[nCol];
+    return pCol->pItems[nColRow].nRow;
+}
+
+ScBaseCell* ScDBQueryDataIterator::GetCellByColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCCOL nCol, SCSIZE nColRow)
+{
+    ScColumn* pCol = &rDoc.pTab[nTab]->aCol[nCol];
+    return pCol->pItems[nColRow].pCell;
+}
+
+ScAttrArray* ScDBQueryDataIterator::GetAttrArrayByCol(ScDocument& rDoc, SCTAB nTab, SCCOL nCol)
+{
+    ScColumn* pCol = &rDoc.pTab[nTab]->aCol[nCol];
+    return pCol->pAttrArray;
+}
+
+bool ScDBQueryDataIterator::IsQueryValid(ScDocument& rDoc, const ScQueryParam& rParam, SCTAB nTab, SCROW nRow, ScBaseCell* pCell)
+{
+    return rDoc.pTab[nTab]->ValidQuery(nRow, rParam, NULL, pCell);
+}
+
+SCSIZE ScDBQueryDataIterator::SearchColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCROW nRow, SCCOL nCol)
+{
+    ScColumn* pCol = &rDoc.pTab[nTab]->aCol[nCol];
+    SCSIZE nColRow;
+    pCol->Search(nRow, nColRow);
+    return nColRow;
+}
+
+// ----------------------------------------------------------------------------
+
+ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc) :
+    DataAccess(pParent),
+    mpParam(pParam),
+    mpDoc(pDoc)
+{
+    nCol = mpParam->mnField;
+    nRow = mpParam->nRow1;
+    nTab = mpParam->nTab;
+
     nColRow = 0;                    // wird bei GetFirst initialisiert
     SCSIZE i;
-    SCSIZE nCount = aParam.GetEntryCount();
-    for (i=0; (i<nCount) && (aParam.GetEntry(i).bDoQuery); i++)
+    SCSIZE nCount = mpParam->GetEntryCount();
+    for (i=0; (i<nCount) && (mpParam->GetEntry(i).bDoQuery); i++)
     {
-        ScQueryEntry& rEntry = aParam.GetEntry(i);
+        ScQueryEntry& rEntry = mpParam->GetEntry(i);
         sal_uInt32 nIndex = 0;
         rEntry.bQueryByString =
-                !(pDoc->GetFormatTable()->IsNumberFormat(*rEntry.pStr, nIndex, rEntry.nVal));
+            !(mpDoc->GetFormatTable()->IsNumberFormat(*rEntry.pStr, nIndex, rEntry.nVal));
     }
     nNumFormat = 0;                 // werden bei GetNumberFormat initialisiert
     pAttrArray = 0;
     nAttrEndRow = 0;
 }
 
-BOOL ScQueryValueIterator::GetThis(double& rValue, USHORT& rErr)
+ScDBQueryDataIterator::DataAccessInternal::~DataAccessInternal()
 {
-    ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol];
-    SCCOLROW nFirstQueryField = aParam.GetEntry(0).nField;
+}
+
+bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue)
+{
+    SCCOLROW nFirstQueryField = mpParam->GetEntry(0).nField;
     for ( ;; )
     {
-        if ( nRow > aParam.nRow2 )
+        if (nRow > mpParam->nRow2)
         {
-            nRow = aParam.nRow1;
-            if (aParam.bHasHeader)
-                nRow++;
-            do
-            {
-                nCol++;
-                if ( nCol > aParam.nCol2 )
-                {
-                    // rValue = 0.0;    // do not change caller's value!
-                    rErr = 0;
-                    return FALSE;               // Ende und Aus
-                }
-                pCol = &(pDoc->pTab[nTab])->aCol[nCol];
-            } while ( pCol->nCount == 0 );
-            pCol->Search( nRow, nColRow );
+            // Bottom of the range reached.  Bail out.
+            rValue.mnError = 0;
+            return false;
         }
 
-        while ( (nColRow < pCol->nCount) && (pCol->pItems[nColRow].nRow < nRow) )
-            nColRow++;
+        SCSIZE nCellCount = mpDoc->GetCellCount(nTab, nCol);
+        SCROW nThisRow = ScDBQueryDataIterator::GetRowByColEntryIndex(*mpDoc, nTab, nCol, nColRow);
+        while ( (nColRow < nCellCount) && (nThisRow < nRow) )
+            nThisRow = ScDBQueryDataIterator::GetRowByColEntryIndex(*mpDoc, nTab, nCol, ++nColRow);
 
-        if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= aParam.nRow2 )
+        if ( nColRow < nCellCount && nThisRow <= mpParam->nRow2 )
         {
-            nRow = pCol->pItems[nColRow].nRow;
-            ScBaseCell* pCell = pCol->pItems[nColRow].pCell;
-            if ( (pDoc->pTab[nTab])->ValidQuery( nRow, aParam, NULL,
-                    (nCol == static_cast<SCCOL>(nFirstQueryField) ? pCell : NULL) ) )
+            nRow = nThisRow;
+            ScBaseCell* pCell = NULL;
+            if (nCol == static_cast<SCCOL>(nFirstQueryField))
+                pCell = ScDBQueryDataIterator::GetCellByColEntryIndex(*mpDoc, nTab, nCol, nColRow);
+
+            if (ScDBQueryDataIterator::IsQueryValid(*mpDoc, *mpParam, nTab, nRow, pCell))
             {
                 switch (pCell->GetCellType())
                 {
                     case CELLTYPE_VALUE:
                         {
-                            rValue = ((ScValueCell*)pCell)->GetValue();
+                            rValue.mfValue = ((ScValueCell*)pCell)->GetValue();
+                            rValue.mbIsNumber = true;
                             if ( bCalcAsShown )
                             {
+                                const ScAttrArray* pNewAttrArray =
+                                    ScDBQueryDataIterator::GetAttrArrayByCol(*mpDoc, nTab, nCol);
                                 lcl_IterGetNumberFormat( nNumFormat, pAttrArray,
-                                    nAttrEndRow, pCol->pAttrArray, nRow, pDoc );
-                                rValue = pDoc->RoundValueAsShown( rValue, nNumFormat );
+                                    nAttrEndRow, pNewAttrArray, nRow, mpDoc );
+                                rValue.mfValue = mpDoc->RoundValueAsShown( rValue.mfValue, nNumFormat );
                             }
                             nNumFmtType = NUMBERFORMAT_NUMBER;
                             nNumFmtIndex = 0;
-                            rErr = 0;
+                            rValue.mnError = 0;
                             return TRUE;        // gefunden
                         }
 //                        break;
@@ -566,17 +615,31 @@ BOOL ScQueryValueIterator::GetThis(double& rValue, USHORT& rErr)
                         {
                             if (((ScFormulaCell*)pCell)->IsValue())
                             {
-                                rValue = ((ScFormulaCell*)pCell)->GetValue();
-                                pDoc->GetNumberFormatInfo( nNumFmtType,
+                                rValue.mfValue = ((ScFormulaCell*)pCell)->GetValue();
+                                rValue.mbIsNumber = true;
+                                mpDoc->GetNumberFormatInfo( nNumFmtType,
                                     nNumFmtIndex, ScAddress( nCol, nRow, nTab ),
                                     pCell );
-                                rErr = ((ScFormulaCell*)pCell)->GetErrCode();
+                                rValue.mnError = ((ScFormulaCell*)pCell)->GetErrCode();
                                 return TRUE;    // gefunden
                             }
                             else
                                 nRow++;
                         }
                         break;
+                    case CELLTYPE_STRING:
+                    case CELLTYPE_EDIT:
+                        if (mpParam->mbSkipString)
+                            ++nRow;
+                        else
+                        {
+                            rValue.maString = pCell->GetStringData();
+                            rValue.mfValue = 0.0;
+                            rValue.mnError = 0;
+                            rValue.mbIsNumber = false;
+                            return true;
+                        }
+                        break;
                     default:
                         nRow++;
                         break;
@@ -586,30 +649,309 @@ BOOL ScQueryValueIterator::GetThis(double& rValue, USHORT& rErr)
                 nRow++;
         }
         else
-            nRow = aParam.nRow2 + 1; // Naechste Spalte
+            nRow = mpParam->nRow2 + 1; // Naechste Spalte
     }
-//    return FALSE;
+// statement unreachable
+//    return false;
 }
 
-BOOL ScQueryValueIterator::GetFirst(double& rValue, USHORT& rErr)
+bool ScDBQueryDataIterator::DataAccessInternal::getFirst(Value& rValue)
 {
-    nCol = aParam.nCol1;
-    nRow = aParam.nRow1;
-    if (aParam.bHasHeader)
+    if (mpParam->bHasHeader)
         nRow++;
-//  nColRow = 0;
-    ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol];
-    pCol->Search( nRow, nColRow );
-    return GetThis(rValue, rErr);
+
+    nColRow = ScDBQueryDataIterator::SearchColEntryIndex(*mpDoc, nTab, nRow, nCol);
+    return getCurrent(rValue);
 }
 
-BOOL ScQueryValueIterator::GetNext(double& rValue, USHORT& rErr)
+bool ScDBQueryDataIterator::DataAccessInternal::getNext(Value& rValue)
 {
     ++nRow;
-    return GetThis(rValue, rErr);
+    return getCurrent(rValue);
 }
 
-//-------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+ScDBQueryDataIterator::DataAccessMatrix::DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam) :
+    DataAccess(pParent),
+    mpParam(pParam)
+{
+    SCSIZE nC, nR;
+    mpParam->mpMatrix->GetDimensions(nC, nR);
+    mnRows = static_cast<SCROW>(nR);
+    mnCols = static_cast<SCCOL>(nC);
+}
+
+ScDBQueryDataIterator::DataAccessMatrix::~DataAccessMatrix()
+{
+}
+
+bool ScDBQueryDataIterator::DataAccessMatrix::getCurrent(Value& rValue)
+{
+    // Starting from row == mnCurRow, get the first row that satisfies all the
+    // query parameters.
+    for ( ;mnCurRow < mnRows; ++mnCurRow)
+    {
+        const ScMatrix& rMat = *mpParam->mpMatrix;
+        if (rMat.IsEmpty(mpParam->mnField, mnCurRow))
+            // Don't take empty values into account.
+            continue;
+
+        bool bIsStrVal = rMat.IsString(mpParam->mnField, mnCurRow);
+        if (bIsStrVal && mpParam->mbSkipString)
+            continue;
+
+        if (isValidQuery(mnCurRow, rMat))
+        {
+            rValue.maString = rMat.GetString(mpParam->mnField, mnCurRow);
+            rValue.mfValue = rMat.GetDouble(mpParam->mnField, mnCurRow);
+            rValue.mbIsNumber = !bIsStrVal;
+            rValue.mnError = 0;
+            return true;
+        }
+    }
+    return false;
+}
+
+bool ScDBQueryDataIterator::DataAccessMatrix::getFirst(Value& rValue)
+{
+    mnCurRow = mpParam->bHasHeader ? 1 : 0;
+    return getCurrent(rValue);
+}
+
+bool ScDBQueryDataIterator::DataAccessMatrix::getNext(Value& rValue)
+{
+    ++mnCurRow;
+    return getCurrent(rValue);
+}
+
+namespace {
+
+bool lcl_isQueryByValue(const ScQueryEntry& rEntry, const ScMatrix& rMat, SCSIZE nCol, SCSIZE nRow)
+{
+    if (rEntry.bQueryByString)
+        return false;
+
+    if (!rMat.IsValueOrEmpty(nCol, nRow))
+        return false;
+
+    return true;
+}
+
+bool lcl_isQueryByString(const ScQueryEntry& rEntry, const ScMatrix& rMat, SCSIZE nCol, SCSIZE nRow)
+{
+    switch (rEntry.eOp)
+    {
+        case SC_EQUAL:
+        case SC_NOT_EQUAL:
+        case SC_CONTAINS:
+        case SC_DOES_NOT_CONTAIN:
+        case SC_BEGINS_WITH:
+        case SC_ENDS_WITH:
+        case SC_DOES_NOT_BEGIN_WITH:
+        case SC_DOES_NOT_END_WITH:
+            return true;
+        default:
+            ;
+    }
+
+    if (rEntry.bQueryByString && rMat.IsString(nCol, nRow))
+        return true;
+
+    return false;
+}
+
+}
+
+bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScMatrix& rMat) const
+{
+    SCSIZE nEntryCount = mpParam->GetEntryCount();
+    vector<bool> aResults;
+    aResults.reserve(nEntryCount);
+
+    const CollatorWrapper& rCollator =
+        mpParam->bCaseSens ? *ScGlobal::GetCaseCollator() : *ScGlobal::GetCollator();
+
+    for (SCSIZE i = 0; i < nEntryCount; ++i)
+    {
+        const ScQueryEntry& rEntry = mpParam->GetEntry(i);
+        if (!rEntry.bDoQuery)
+            continue;
+
+        switch (rEntry.eOp)
+        {
+            case SC_EQUAL:
+            case SC_LESS:
+            case SC_GREATER:
+            case SC_LESS_EQUAL:
+            case SC_GREATER_EQUAL:
+            case SC_NOT_EQUAL:
+                break;
+            default:
+                // Only the above operators are supported.
+                continue;
+        }
+
+        bool bValid = false;
+
+        SCSIZE nField = static_cast<SCSIZE>(rEntry.nField);
+        if (lcl_isQueryByValue(rEntry, rMat, nField, nRow))
+        {
+            // By value
+            double fMatVal = rMat.GetDouble(nField, nRow);
+            bool bEqual = approxEqual(fMatVal, rEntry.nVal);
+            switch (rEntry.eOp)
+            {
+                case SC_EQUAL:
+                    bValid = bEqual;
+                break;
+                case SC_LESS:
+                    bValid = (fMatVal < rEntry.nVal) && !bEqual;
+                break;
+                case SC_GREATER:
+                    bValid = (fMatVal > rEntry.nVal) && !bEqual;
+                break;
+                case SC_LESS_EQUAL:
+                    bValid = (fMatVal < rEntry.nVal) || bEqual;
+                break;
+                case SC_GREATER_EQUAL:
+                    bValid = (fMatVal > rEntry.nVal) || bEqual;
+                break;
+                case SC_NOT_EQUAL:
+                    bValid = !bEqual;
+                break;
+                default:
+                    ;
+            }
+        }
+        else if (lcl_isQueryByString(rEntry, rMat, nField, nRow))
+        {
+            // By string
+            do
+            {
+                if (!rEntry.pStr)
+                    break;
+
+                // Equality check first.
+
+                OUString aMatStr = rMat.GetString(nField, nRow);
+                lcl_toUpper(aMatStr);
+                OUString aQueryStr = *rEntry.pStr;
+                lcl_toUpper(aQueryStr);
+                bool bDone = false;
+                switch (rEntry.eOp)
+                {
+                    case SC_EQUAL:
+                        bValid = aMatStr.equals(aQueryStr);
+                        bDone = true;
+                    break;
+                    case SC_NOT_EQUAL:
+                        bValid = !aMatStr.equals(aQueryStr);
+                        bDone = true;
+                    break;
+                    default:
+                        ;
+                }
+
+                if (bDone)
+                    break;
+
+                // Unequality check using collator.
+
+                sal_Int32 nCompare = rCollator.compareString(aMatStr, aQueryStr);
+                switch (rEntry.eOp)
+                {
+                    case SC_LESS :
+                        bValid = (nCompare < 0);
+                    break;
+                    case SC_GREATER :
+                        bValid = (nCompare > 0);
+                    break;
+                    case SC_LESS_EQUAL :
+                        bValid = (nCompare <= 0);
+                    break;
+                    case SC_GREATER_EQUAL :
+                        bValid = (nCompare >= 0);
+                    break;
+                    default:
+                        ;
+                }
+            }
+            while (false);
+        }
+        else if (mpParam->bMixedComparison)
+        {
+            // Not used at the moment.
+        }
+
+        if (aResults.empty())
+            // First query entry.
+            aResults.push_back(bValid);
+        else if (rEntry.eConnect == SC_AND)
+        {
+            // For AND op, tuck the result into the last result value.
+            size_t n = aResults.size();
+            aResults[n-1] = aResults[n-1] && bValid;
+        }
+        else
+            // For OR op, store its own result.
+            aResults.push_back(bValid);
+    }
+
+    // Row is valid as long as there is at least one result being true.
+    vector<bool>::const_iterator itr = aResults.begin(), itrEnd = aResults.end();
+    for (; itr != itrEnd; ++itr)
+        if (*itr)
+            return true;
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+
+ScDBQueryDataIterator::Value::Value() :
+    mnError(0), mbIsNumber(true)
+{
+    ::rtl::math::setNan(&mfValue);
+}
+
+// ----------------------------------------------------------------------------
+
+ScDBQueryDataIterator::ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam) :
+    mpParam (pParam)
+{
+    switch (mpParam->GetType())
+    {
+        case ScDBQueryParamBase::INTERNAL:
+        {
+            ScDBQueryParamInternal* p = static_cast<ScDBQueryParamInternal*>(pParam);
+            mpData.reset(new DataAccessInternal(this, p, pDocument));
+        }
+        break;
+        case ScDBQueryParamBase::MATRIX:
+        {
+            ScDBQueryParamMatrix* p = static_cast<ScDBQueryParamMatrix*>(pParam);
+            mpData.reset(new DataAccessMatrix(this, p));
+        }
+    }
+}
+
+bool ScDBQueryDataIterator::GetThis(Value& rValue)
+{
+    return mpData->getCurrent(rValue);
+}
+
+bool ScDBQueryDataIterator::GetFirst(Value& rValue)
+{
+    return mpData->getFirst(rValue);
+}
+
+bool ScDBQueryDataIterator::GetNext(Value& rValue)
+{
+    return mpData->getNext(rValue);
+}
+
+// ============================================================================
 
 ScCellIterator::ScCellIterator( ScDocument* pDocument,
                                 SCCOL nSCol, SCROW nSRow, SCTAB nSTab,
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 662e524b2bfc..d6aa91efcca6 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docpool.cxx,v $
- * $Revision: 1.25.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,37 +36,37 @@
 #include <svl/aeitem.hxx>
 #include <svl/itemiter.hxx>
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/bolnitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/bolnitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/forbiddenruleitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/hngpnctitem.hxx>
-#include <svx/itemtype.hxx>
-#include <svx/langitem.hxx>
-#include <svx/lrspitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/forbiddenruleitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/hngpnctitem.hxx>
+#include <editeng/itemtype.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/lrspitem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/pbinitem.hxx>
-#include <svx/postitem.hxx>
+#include <editeng/pbinitem.hxx>
+#include <editeng/postitem.hxx>
 #include <svx/rotmodit.hxx>
-#include <svx/scriptspaceitem.hxx>
-#include <svx/shaditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/sizeitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/sizeitem.hxx>
 #include <svx/svxitems.hrc>
-#include <svx/udlnitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/xmlcnitm.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/xmlcnitm.hxx>
 
 #include "docpool.hxx"
 #include "global.hxx"
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 09477e5a7eb4..c08fb7a10228 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: documen2.cxx,v $
- * $Revision: 1.75.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,11 +32,11 @@
 
 #define _ZFORLIST_DECLARE_TABLE
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/editeng.hxx>
-#include <svx/forbiddencharacterstable.hxx>
-#include <svx/linkmgr.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdobj.hxx>
 #include <sfx2/bindings.hxx>
@@ -228,7 +225,7 @@ ScDocument::ScDocument( ScDocumentMode  eMode,
     if ( eMode == SCDOCMODE_DOCUMENT )
     {
         if ( pDocShell )
-            pLinkManager = new SvxLinkManager( pDocShell );
+            pLinkManager = new sfx2::LinkManager( pDocShell );
 
         xPoolHelper = new ScPoolHelper( this );
 
@@ -263,11 +260,11 @@ ScDocument::ScDocument( ScDocumentMode  eMode,
     aTrackTimer.SetTimeout( 100 );
 }
 
-SvxLinkManager* ScDocument::GetLinkManager()  const
+sfx2::LinkManager*  ScDocument::GetLinkManager()  const
 {
     if ( bAutoCalc && !pLinkManager && pShell)
     {
-        pLinkManager = new SvxLinkManager( pShell );
+        pLinkManager = new sfx2::LinkManager( pShell );
     }
     return pLinkManager;
 }
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 2529d0ad7f1d..cc06d7ac6b32 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: documen3.cxx,v $
- * $Revision: 1.42.100.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,9 +31,9 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/langitem.hxx>
-#include <svx/srchitem.hxx>
-#include <svx/linkmgr.hxx>
+#include <editeng/langitem.hxx>
+#include <svl/srchitem.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/zforlist.hxx>
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index ae79fae7e8d3..bb6b4cd295ce 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: documen4.cxx,v $
- * $Revision: 1.23.102.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 0be1e6717891..14a88abd32ca 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: documen5.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx
index 68c5655bb6c4..8706c49320d1 100644
--- a/sc/source/core/data/documen6.cxx
+++ b/sc/source/core/data/documen6.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: documen6.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 
 
 #include "scitems.hxx"
-#include <svx/scripttypeitem.hxx>
+#include <editeng/scripttypeitem.hxx>
 
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 9527089ebde3..ad2ec90379df 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: documen7.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 18370d2f5a0f..e3c9d251fab7 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: documen8.cxx,v $
- * $Revision: 1.52.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,16 +31,16 @@
 
 #define _ZFORLIST_DECLARE_TABLE
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <tools/string.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editstat.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/linkmgr.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/langitem.hxx>
+#include <sfx2/linkmgr.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/unolingu.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/printer.hxx>
@@ -1191,7 +1188,7 @@ namespace {
                      (does not include other links from link manager).
     @return  The DDE link, if it exists, otherwise 0. */
 ScDdeLink* lclGetDdeLink(
-        const SvxLinkManager* pLinkManager,
+        const sfx2::LinkManager* pLinkManager,
         const String& rAppl, const String& rTopic, const String& rItem, BYTE nMode,
         USHORT* pnDdePos = NULL )
 {
@@ -1220,7 +1217,7 @@ ScDdeLink* lclGetDdeLink(
 /** Returns a pointer to the specified DDE link.
     @param nDdePos  Index of the DDE link (does not include other links from link manager).
     @return  The DDE link, if it exists, otherwise 0. */
-ScDdeLink* lclGetDdeLink( const SvxLinkManager* pLinkManager, USHORT nDdePos )
+ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, USHORT nDdePos )
 {
     if( pLinkManager )
     {
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 772ed496d2e1..b9abe0839279 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: documen9.cxx,v $
- * $Revision: 1.43.52.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,13 +35,13 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <sot/exchange.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/forbiddencharacterstable.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
+#include <editeng/langitem.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdocapt.hxx>
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index f8fa2bc46c9b..fa4fb296d9a7 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: document.cxx,v $
- * $Revision: 1.90.36.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,12 +32,12 @@
 
 #define _ZFORLIST_DECLARE_TABLE
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/boxitem.hxx>
-#include <svx/frmdiritem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/frmdiritem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdocapt.hxx>
@@ -154,6 +151,32 @@ BOOL ScDocument::GetName( SCTAB nTab, String& rName ) const
     return FALSE;
 }
 
+BOOL ScDocument::SetCodeName( SCTAB nTab, String& rName )
+{
+    if (VALIDTAB(nTab))
+    {
+        if (pTab[nTab])
+        {
+            pTab[nTab]->SetCodeName( rName );
+            return TRUE;
+        }
+    }
+    OSL_TRACE( "**** can't set code name %s", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr() );
+    return FALSE;
+}
+
+BOOL ScDocument::GetCodeName( SCTAB nTab, String& rName ) const
+{
+    if (VALIDTAB(nTab))
+        if (pTab[nTab])
+        {
+            pTab[nTab]->GetCodeName( rName );
+            return TRUE;
+        }
+    rName.Erase();
+    return FALSE;
+}
+
 
 BOOL ScDocument::GetTable( const String& rName, SCTAB& rTab ) const
 {
@@ -293,6 +316,7 @@ BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName,
         if (nPos == SC_TAB_APPEND || nPos == nTabCount)
         {
             pTab[nTabCount] = new ScTable(this, nTabCount, rName);
+            pTab[nTabCount]->SetCodeName( rName );
             ++nMaxTableNumber;
             if ( bExternalDocument )
                 pTab[nTabCount]->SetVisible( FALSE );
@@ -320,10 +344,16 @@ BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName,
                 for (i = 0; i <= MAXTAB; i++)
                     if (pTab[i])
                         pTab[i]->UpdateInsertTab(nPos);
+
                 for (i = nTabCount; i > nPos; i--)
+                {
                     pTab[i] = pTab[i - 1];
+                }
+
                 pTab[nPos] = new ScTable(this, nPos, rName);
+                pTab[nPos]->SetCodeName( rName );
                 ++nMaxTableNumber;
+
                 // UpdateBroadcastAreas must be called between UpdateInsertTab,
                 // which ends listening, and StartAllListeners, to not modify
                 // areas that are to be inserted by starting listeners.
@@ -4670,6 +4700,13 @@ ULONG ScDocument::GetCellCount() const
     return nCellCount;
 }
 
+SCSIZE ScDocument::GetCellCount(SCTAB nTab, SCCOL nCol) const
+{
+    if (!ValidTab(nTab) || !pTab[nTab])
+        return 0;
+
+    return pTab[nTab]->GetCellCount(nCol);
+}
 
 ULONG ScDocument::GetCodeCount() const
 {
diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx
index dc9b6450ac75..237d7ffd16db 100644
--- a/sc/source/core/data/dpcachetable.cxx
+++ b/sc/source/core/data/dpcachetable.cxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpcachetable.cxx,v $
- *
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,6 +34,7 @@
 #include "dptabdat.hxx"
 #include "dptabsrc.hxx"
 #include "dpobject.hxx"
+#include "queryparam.hxx"
 
 #include <com/sun/star/i18n/LocaleDataItem.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
@@ -209,9 +206,39 @@ sal_Int32 ScDPCacheTable::getColSize() const
     return maTable.empty() ? 0 : maTable[0].size();
 }
 
+namespace {
+
+/**
+ * While the macro interpret level is incremented, the formula cells are
+ * (semi-)guaranteed to be interpreted.
+ */
+class MacroInterpretIncrementer
+{
+public:
+    MacroInterpretIncrementer(ScDocument* pDoc) :
+        mpDoc(pDoc)
+    {
+        mpDoc->IncMacroInterpretLevel();
+    }
+    ~MacroInterpretIncrementer()
+    {
+        mpDoc->DecMacroInterpretLevel();
+    }
+private:
+    ScDocument* mpDoc;
+};
+
+}
+
 void ScDPCacheTable::fillTable(ScDocument* pDoc, const ScRange& rRange, const ScQueryParam& rQuery, BOOL* pSpecial,
                                bool bIgnoreEmptyRows)
 {
+    // Make sure the formula cells within the data range are interpreted
+    // during this call, for this method may be called from the interpretation
+    // of GETPIVOTDATA, which disables nested formula interpretation without
+    // increasing the macro level.
+    MacroInterpretIncrementer aMacroInc(pDoc);
+
     SCTAB nTab = rRange.aStart.Tab();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 49e2c5b09c94..21669eb7a435 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpdimsave.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 29284b20e4bb..1bc888100a9f 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpgroup.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 295ed78159b3..66ac3a4bedbb 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpobject.cxx,v $
- * $Revision: 1.23.30.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 10dcbfa8238e..7ecdc3d34702 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpoutput.cxx,v $
- * $Revision: 1.17.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,9 +34,9 @@
 
 #include "scitems.hxx"
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <unotools/transliterationwrapper.hxx>
 
 #include "dpoutput.hxx"
diff --git a/sc/source/core/data/dpoutputgeometry.cxx b/sc/source/core/data/dpoutputgeometry.cxx
index 9eace100c137..fd9bee0ed572 100644
--- a/sc/source/core/data/dpoutputgeometry.cxx
+++ b/sc/source/core/data/dpoutputgeometry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmldpimp.cxx,v $
- * $Revision: 1.27.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index e66bd8dfe705..58a9e112ab7d 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpsave.cxx,v $
- * $Revision: 1.13.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 01f63f0cbaa9..be8eca58ce95 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpsdbtab.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 29fe2dc7b6e5..c7e75f438ce1 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpshttab.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index 41e44f84b647..530f1c44123f 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dptabdat.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index e548db56d7ff..63f5da3290d7 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dptabres.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 2a091c8b45b5..205c14021444 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dptabsrc.cxx,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx
index 909d1e6111a9..715b99f362a1 100644
--- a/sc/source/core/data/drawpage.cxx
+++ b/sc/source/core/data/drawpage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawpage.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index cb82ede30dca..4e9de6179809 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drwlayer.cxx,v $
- * $Revision: 1.55.128.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,8 +40,8 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
-#include <svx/frmdiritem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/frmdiritem.hxx>
 #include <sot/exchange.hxx>
 #include <svx/objfac3d.hxx>
 #include <svx/xtable.hxx>
@@ -56,10 +53,10 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <svx/drawitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/scriptspaceitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
 #include <svx/shapepropertynotifier.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index ac4cb9908a3f..05e0d98c9719 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fillinfo.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,10 +33,10 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/boxitem.hxx>
-#include <svx/bolnitem.hxx>
-#include <svx/editdata.hxx>     // can be removed if table has a bLayoutRTL flag
-#include <svx/shaditem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/bolnitem.hxx>
+#include <editeng/editdata.hxx>     // can be removed if table has a bLayoutRTL flag
+#include <editeng/shaditem.hxx>
 
 #include "fillinfo.hxx"
 #include "document.hxx"
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index d49e8e1aa139..2081181b7537 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: global.cxx,v $
- * $Revision: 1.56.102.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,11 +34,11 @@
 #include <vcl/svapp.hxx>
 #include "scitems.hxx"
 #include <svx/algitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/editobj.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/srchitem.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <svl/srchitem.hxx>
+#include <editeng/langitem.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index ffeb6cc0684c..21c09688aeee 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: global2.cxx,v $
- * $Revision: 1.23.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -243,238 +240,6 @@ utl::TextSearch* ScQueryEntry::GetSearchTextPtr( BOOL bCaseSens )
 }
 
 //------------------------------------------------------------------------
-
-ScQueryParam::ScQueryParam()
-{
-    nEntryCount = 0;
-    Clear();
-}
-
-//------------------------------------------------------------------------
-
-ScQueryParam::ScQueryParam( const ScQueryParam& r ) :
-        nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nTab(r.nTab),
-        bHasHeader(r.bHasHeader), bByRow(r.bByRow), bInplace(r.bInplace), bCaseSens(r.bCaseSens),
-        bRegExp(r.bRegExp), bMixedComparison(r.bMixedComparison),
-        bDuplicate(r.bDuplicate), bDestPers(r.bDestPers),
-        nDestTab(r.nDestTab), nDestCol(r.nDestCol), nDestRow(r.nDestRow)
-{
-    nEntryCount = 0;
-
-    Resize( r.nEntryCount );
-    for (USHORT i=0; i<nEntryCount; i++)
-        pEntries[i] = r.pEntries[i];
-}
-
-//------------------------------------------------------------------------
-
-ScQueryParam::~ScQueryParam()
-{
-    delete[] pEntries;
-}
-
-//------------------------------------------------------------------------
-
-void ScQueryParam::Clear()
-{
-    nCol1=nCol2=nDestCol = 0;
-    nRow1=nRow2=nDestRow = 0;
-    nDestTab = 0;
-    nTab = SCTAB_MAX;
-    bHasHeader = bCaseSens = bRegExp = bMixedComparison = FALSE;
-    bInplace = bByRow = bDuplicate = bDestPers = TRUE;
-
-    Resize( MAXQUERY );
-    for (USHORT i=0; i<MAXQUERY; i++)
-        pEntries[i].Clear();
-}
-
-//------------------------------------------------------------------------
-
-ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )
-{
-    nCol1       = r.nCol1;
-    nRow1       = r.nRow1;
-    nCol2       = r.nCol2;
-    nRow2       = r.nRow2;
-    nTab        = r.nTab;
-    nDestTab    = r.nDestTab;
-    nDestCol    = r.nDestCol;
-    nDestRow    = r.nDestRow;
-    bHasHeader  = r.bHasHeader;
-    bInplace    = r.bInplace;
-    bCaseSens   = r.bCaseSens;
-    bRegExp     = r.bRegExp;
-    bMixedComparison = r.bMixedComparison;
-    bDuplicate  = r.bDuplicate;
-    bByRow      = r.bByRow;
-    bDestPers   = r.bDestPers;
-
-    Resize( r.nEntryCount );
-    for (USHORT i=0; i<nEntryCount; i++)
-        pEntries[i] = r.pEntries[i];
-
-    return *this;
-}
-
-//------------------------------------------------------------------------
-
-BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
-{
-    BOOL bEqual = FALSE;
-
-    // Anzahl der Queries gleich?
-    USHORT nUsed      = 0;
-    USHORT nOtherUsed = 0;
-    while ( nUsed<nEntryCount && pEntries[nUsed].bDoQuery ) ++nUsed;
-    while ( nOtherUsed<rOther.nEntryCount && rOther.pEntries[nOtherUsed].bDoQuery )
-        ++nOtherUsed;
-
-    if (   (nUsed       == nOtherUsed)
-        && (nCol1       == rOther.nCol1)
-        && (nRow1       == rOther.nRow1)
-        && (nCol2       == rOther.nCol2)
-        && (nRow2       == rOther.nRow2)
-        && (nTab        == rOther.nTab)
-        && (bHasHeader  == rOther.bHasHeader)
-        && (bByRow      == rOther.bByRow)
-        && (bInplace    == rOther.bInplace)
-        && (bCaseSens   == rOther.bCaseSens)
-        && (bRegExp     == rOther.bRegExp)
-        && (bMixedComparison == rOther.bMixedComparison)
-        && (bDuplicate  == rOther.bDuplicate)
-        && (bDestPers   == rOther.bDestPers)
-        && (nDestTab    == rOther.nDestTab)
-        && (nDestCol    == rOther.nDestCol)
-        && (nDestRow    == rOther.nDestRow) )
-    {
-        bEqual = TRUE;
-        for ( USHORT i=0; i<nUsed && bEqual; i++ )
-            bEqual = pEntries[i] == rOther.pEntries[i];
-    }
-    return bEqual;
-}
-
-//------------------------------------------------------------------------
-
-void ScQueryParam::DeleteQuery( SCSIZE nPos )
-{
-    if (nPos<nEntryCount)
-    {
-        for (SCSIZE i=nPos; i+1<nEntryCount; i++)
-            pEntries[i] = pEntries[i+1];
-
-        pEntries[nEntryCount-1].Clear();
-    }
-    else
-    {
-        DBG_ERROR("Falscher Parameter bei ScQueryParam::DeleteQuery");
-    }
-}
-
-//------------------------------------------------------------------------
-
-void ScQueryParam::Resize(SCSIZE nNew)
-{
-    if ( nNew < MAXQUERY )
-        nNew = MAXQUERY;                // nie weniger als MAXQUERY
-
-    ScQueryEntry* pNewEntries = NULL;
-    if ( nNew )
-        pNewEntries = new ScQueryEntry[nNew];
-
-    SCSIZE nCopy = Min( nEntryCount, nNew );
-    for (SCSIZE i=0; i<nCopy; i++)
-        pNewEntries[i] = pEntries[i];
-
-    if ( nEntryCount )
-        delete[] pEntries;
-    nEntryCount = nNew;
-    pEntries = pNewEntries;
-}
-
-//------------------------------------------------------------------------
-
-void ScQueryParam::MoveToDest()
-{
-    if (!bInplace)
-    {
-        SCsCOL nDifX = ((SCsCOL) nDestCol) - ((SCsCOL) nCol1);
-        SCsROW nDifY = ((SCsROW) nDestRow) - ((SCsROW) nRow1);
-        SCsTAB nDifZ = ((SCsTAB) nDestTab) - ((SCsTAB) nTab);
-
-        nCol1 = sal::static_int_cast<SCCOL>( nCol1 + nDifX );
-        nRow1 = sal::static_int_cast<SCROW>( nRow1 + nDifY );
-        nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );
-        nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );
-        nTab  = sal::static_int_cast<SCTAB>( nTab  + nDifZ );
-        for (USHORT i=0; i<nEntryCount; i++)
-            pEntries[i].nField += nDifX;
-
-        bInplace = TRUE;
-    }
-    else
-    {
-        DBG_ERROR("MoveToDest, bInplace == TRUE");
-    }
-}
-
-//------------------------------------------------------------------------
-
-void ScQueryParam::FillInExcelSyntax(String& aCellStr, SCSIZE nIndex)
-{
-    if (aCellStr.Len() > 0)
-    {
-        if ( nIndex >= nEntryCount )
-            Resize( nIndex+1 );
-
-        ScQueryEntry& rEntry = pEntries[nIndex];
-
-        rEntry.bDoQuery = TRUE;
-        // Operatoren herausfiltern
-        if (aCellStr.GetChar(0) == '<')
-        {
-            if (aCellStr.GetChar(1) == '>')
-            {
-                *rEntry.pStr = aCellStr.Copy(2);
-                rEntry.eOp   = SC_NOT_EQUAL;
-            }
-            else if (aCellStr.GetChar(1) == '=')
-            {
-                *rEntry.pStr = aCellStr.Copy(2);
-                rEntry.eOp   = SC_LESS_EQUAL;
-            }
-            else
-            {
-                *rEntry.pStr = aCellStr.Copy(1);
-                rEntry.eOp   = SC_LESS;
-            }
-        }
-        else if (aCellStr.GetChar(0) == '>')
-        {
-            if (aCellStr.GetChar(1) == '=')
-            {
-                *rEntry.pStr = aCellStr.Copy(2);
-                rEntry.eOp   = SC_GREATER_EQUAL;
-            }
-            else
-            {
-                *rEntry.pStr = aCellStr.Copy(1);
-                rEntry.eOp   = SC_GREATER;
-            }
-        }
-        else
-        {
-            if (aCellStr.GetChar(0) == '=')
-                *rEntry.pStr = aCellStr.Copy(1);
-            else
-                *rEntry.pStr = aCellStr;
-            rEntry.eOp = SC_EQUAL;
-        }
-    }
-}
-
-//------------------------------------------------------------------------
 // struct ScSubTotalParam:
 
 ScSubTotalParam::ScSubTotalParam()
diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx
index a5b14a3cc8c5..2accdadeb781 100644
--- a/sc/source/core/data/globalx.cxx
+++ b/sc/source/core/data/globalx.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globalx.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/makefile.mk b/sc/source/core/data/makefile.mk
index ecd3aad07c0b..1dd60f75176e 100644
--- a/sc/source/core/data/makefile.mk
+++ b/sc/source/core/data/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.26.100.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx
index 362c7e769b7a..aeca394437cd 100644
--- a/sc/source/core/data/markarr.cxx
+++ b/sc/source/core/data/markarr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: markarr.cxx,v $
- * $Revision: 1.11.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 015a33928b7e..baf3f4cf3f95 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: markdata.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index 11112e5774ac..55f7ba46b898 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olinetab.cxx,v $
- * $Revision: 1.10.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx
index 444f10a5df8e..318f5c19501b 100644
--- a/sc/source/core/data/pagepar.cxx
+++ b/sc/source/core/data/pagepar.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pagepar.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index dbc5bbf50c63..b66aea63dd05 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: patattr.cxx,v $
- * $Revision: 1.34.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,31 +32,31 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/adjitem.hxx>
+#include <editeng/adjitem.hxx>
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/bolnitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/cntritem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/bolnitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/cntritem.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/forbiddenruleitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/postitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/forbiddenruleitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/postitem.hxx>
 #include <svx/rotmodit.hxx>
-#include <svx/scriptspaceitem.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/shaditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/wrlmitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/wrlmitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/zforlist.hxx>
 #include <vcl/outdev.hxx>
diff --git a/sc/source/core/data/pivot.cxx b/sc/source/core/data/pivot.cxx
index 00cdf2a84eac..e63b228de703 100644
--- a/sc/source/core/data/pivot.cxx
+++ b/sc/source/core/data/pivot.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pivot.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index 951a656d841d..5a6174bc0129 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pivot2.cxx,v $
- * $Revision: 1.14.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,8 +37,8 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/boxitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <svx/algitem.hxx>
 #include <unotools/transliterationwrapper.hxx>
 
diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx
index 2bd7cc9c1ea9..010cc502798b 100644
--- a/sc/source/core/data/poolhelp.cxx
+++ b/sc/source/core/data/poolhelp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: poolhelp.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include <svl/zforlist.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 
 #include "poolhelp.hxx"
 #include "document.hxx"
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 6489b4f21a6a..a4bc9a473768 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: postit.cxx,v $
- * $Revision: 1.12.54.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,8 +34,8 @@
 #include <unotools/useroptions.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdocapt.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/editobj.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
 #include "scitems.hxx"
diff --git a/sc/source/core/data/scimpexpmsg.cxx b/sc/source/core/data/scimpexpmsg.cxx
index 00dde7d9fa2a..0d883fe5535a 100644
--- a/sc/source/core/data/scimpexpmsg.cxx
+++ b/sc/source/core/data/scimpexpmsg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scimpexpmsg.cxx,v $
- * $Revision: 1.5.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
index 15691a642d7e..9e8d355e74fa 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sortparam.cxx,v $
- * $Revision: 1.8.146.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,6 +33,7 @@
 #include "sortparam.hxx"
 #include "global.hxx"
 #include "address.hxx"
+#include "queryparam.hxx"
 #include <tools/debug.hxx>
 
 
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index e47f3899bfeb..d722856dc80a 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stlpool.cxx,v $
- * $Revision: 1.18.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,20 +32,20 @@
 //------------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/fontitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/fontitem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <svl/itemset.hxx>
 #include <svl/zforlist.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 277a7ce9f326..4a4210a7925c 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stlsheet.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,14 +36,14 @@
 #include "stlpool.hxx"
 
 #include "scitems.hxx"
-#include <svx/boxitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/lrspitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/lrspitem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/paperinf.hxx>
-#include <svx/pbinitem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/ulspitem.hxx>
+#include <editeng/paperinf.hxx>
+#include <editeng/pbinitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/ulspitem.hxx>
 #include <sfx2/printer.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 403377342661..76656accdf46 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table1.cxx,v $
- * $Revision: 1.25.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -125,6 +122,7 @@ extern BOOL bIsOlk, bOderSo;
 ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
                     BOOL bColInfo, BOOL bRowInfo ) :
     aName( rNewName ),
+    aCodeName( rNewName ),
     bScenario( FALSE ),
     bLayoutRTL( FALSE ),
     bLoadingRTL( FALSE ),
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 4d0eaf76a976..5b3f6078d489 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table2.cxx,v $
- * $Revision: 1.40.124.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/boxitem.hxx>
+#include <editeng/boxitem.hxx>
 #include <tools/urlobj.hxx>
 #include <svl/poolcach.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index b85b910795a5..09a9f41929b5 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table3.cxx,v $
- * $Revision: 1.30.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,6 +57,7 @@
 #include "progress.hxx"
 #include "cellform.hxx"
 #include "postit.hxx"
+#include "queryparam.hxx"
 
 #include <vector>
 
@@ -1818,6 +1816,11 @@ BOOL ScTable::GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStri
     return aCol[nCol].GetDataEntries( nRow, rStrings, bLimit );
 }
 
+SCSIZE ScTable::GetCellCount(SCCOL nCol) const
+{
+    return aCol[nCol].GetCellCount();
+}
+
 ULONG ScTable::GetCellCount() const
 {
     ULONG nCellCount = 0;
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index b10741f46c3f..4a736e8c11b7 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table4.cxx,v $
- * $Revision: 1.23.126.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,23 +41,23 @@
 
 #include "scitems.hxx"
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <svx/rotmodit.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editeng.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/escpitem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/escpitem.hxx>
 #include <svl/zforlist.hxx>
 #include <vcl/keycodes.hxx>
 #include <rtl/math.hxx>
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 4a0cd9e135d5..3a7117dfcd10 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table5.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 09362b9996ed..500ac1bb3614 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table6.cxx,v $
- * $Revision: 1.18.128.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,8 +33,8 @@
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 
 #include <unotools/textsearch.hxx>
-#include <svx/srchitem.hxx>
-#include <svx/editobj.hxx>
+#include <svl/srchitem.hxx>
+#include <editeng/editobj.hxx>
 
 #include "table.hxx"
 #include "collect.hxx"
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index c19cd8cf6b21..5b87fef3151a 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabprotection.cxx,v $
- * $Revision: 1.1.4.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx
index 66397700676c..466e83b15fad 100644
--- a/sc/source/core/data/userdat.cxx
+++ b/sc/source/core/data/userdat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: userdat.cxx,v $
- * $Revision: 1.12.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 9b0970611254..2239b1d0f773 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: validat.cxx,v $
- * $Revision: 1.24.110.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx
index 9f6efb6299d2..b2f085ed64e5 100644
--- a/sc/source/core/inc/addinhelpid.hxx
+++ b/sc/source/core/inc/addinhelpid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addinhelpid.hxx,v $
- * $Revision: 1.4.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx
index 367ee96f79ea..6c0f98386920 100644
--- a/sc/source/core/inc/addinlis.hxx
+++ b/sc/source/core/inc/addinlis.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addinlis.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx
index cc696499d025..4d0997fce63d 100644
--- a/sc/source/core/inc/adiasync.hxx
+++ b/sc/source/core/inc/adiasync.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: adiasync.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index a198861092d6..1ecbefe4a9b1 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bcaslot.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx
index 6bf9b9210af3..536e521a78da 100644
--- a/sc/source/core/inc/cellkeytranslator.hxx
+++ b/sc/source/core/inc/cellkeytranslator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellkeytranslator.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx
index 19d0463e7871..3e637550cd64 100644
--- a/sc/source/core/inc/core_pch.hxx
+++ b/sc/source/core/inc/core_pch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: core_pch.hxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -174,10 +171,10 @@
 #include <vcl/combobox.hxx>
 #include <vcl/combobox.h>
 #include <refupdat.hxx>
-#include <svx/boxitem.hxx>
+#include <editeng/boxitem.hxx>
 #include <conditio.hxx>
 #include <brdcst.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <dociter.hxx>
 #include <scdll.hxx>
 #include <stdio.h>
@@ -208,35 +205,35 @@
 #include <svx/pageitem.hxx>
 #include <dbcolect.hxx>
 #include <userlist.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <basic/sbxvar.hxx>
 #include <basic/sbxcore.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdsob.hxx>
 #include <svx/svdglue.hxx>
-#include <svx/langitem.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <callform.hxx>
 #include <validat.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <sot/exchange.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <vcl/fonttype.hxx>
-#include <svx/editobj.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/fhgtitem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <svl/stritem.hxx>
 #include <pivot.hxx>
 #include <vcl/gdimtf.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdlayer.hxx>
-#include <svx/linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <ctype.h>
 #include <vcl/font.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/postitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
 #include <svx/svditer.hxx>
-#include <svx/udlnitem.hxx>
+#include <editeng/udlnitem.hxx>
 #include <adiasync.hxx>
 #include <sfx2/bindings.hxx>
 #include <ddelink.hxx>
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index 465c58afb823..4f0652753e65 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ddelink.hxx,v $
- * $Revision: 1.11.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx
new file mode 100644
index 000000000000..e7bd2dfa6ae1
--- /dev/null
+++ b/sc/source/core/inc/doubleref.hxx
@@ -0,0 +1,194 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: interpre.hxx,v $
+ * $Revision: 1.35.44.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SC_DOUBLEREF_HXX
+#define SC_DOUBLEREF_HXX
+
+#include "address.hxx"
+#include "scmatrix.hxx"
+
+class ScDocument;
+class ScBaseCell;
+struct ScDBQueryParamBase;
+struct ScQueryParamBase;
+
+// ============================================================================
+
+/**
+ * Base class for abstracting range data backends for database functions.
+ */
+class ScDBRangeBase
+{
+public:
+    enum RefType { INTERNAL, EXTERNAL };
+
+    virtual ~ScDBRangeBase() = 0;
+
+    RefType getType() const;
+    bool fillQueryEntries(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef) const;
+
+    virtual SCCOL getColSize() const = 0;
+    virtual SCROW getRowSize() const = 0;
+    virtual SCSIZE getVisibleDataCellCount() const = 0;
+
+    /**
+     * Get a string value of a specified cell position.  Note that the
+     * position of the upper left cell of the range is always (0, 0) even if
+     * the reference type is of internal range.
+     *
+     * @param nCol column position (0 to column size-1)
+     * @param nRow row position (0 to row size-1)
+     */
+    virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const = 0;
+
+    virtual SCCOL getFirstFieldColumn() const = 0;
+
+    /**
+     * Get a <i>0-based</i> column index that corresponds with the passed field
+     * index.  Note that the field index passed as the 1st parameter is
+     * <i>1-based.</i>
+     *
+     * @param nIndex 1-based field index.
+     *
+     * @return 0-based column index
+     */
+    virtual SCCOL findFieldColumn(SCCOL nIndex) const = 0;
+    virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const = 0;
+    virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const = 0;
+    virtual bool isRangeEqual(const ScRange& rRange) const = 0;
+
+protected:
+    ScDBRangeBase(ScDocument* pDoc, RefType eType);
+    ScDocument* getDoc() const;
+
+    /**
+     * Populate query options that are always the same for all database
+     * queries.
+     */
+    static void fillQueryOptions(ScQueryParamBase* pParam);
+
+private:
+    ScDBRangeBase(); // disabled
+
+    ScDocument* mpDoc;
+    RefType meType;
+};
+
+// ============================================================================
+
+class ScDBInternalRange : public ScDBRangeBase
+{
+public:
+    explicit ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange);
+    virtual ~ScDBInternalRange();
+
+    const ScRange& getRange() const;
+
+    virtual SCCOL getColSize() const;
+    virtual SCROW getRowSize() const;
+    virtual SCSIZE getVisibleDataCellCount() const;
+
+    /**
+     * Get a string value of a specified cell position.  Note that the
+     * position of the upper left cell of the range is always (0, 0) even if
+     * the reference type is of internal range.
+     *
+     * @param nCol column position (0 to column size-1)
+     * @param nRow row position (0 to row size-1)
+     */
+    virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const;
+
+    virtual SCCOL getFirstFieldColumn() const;
+    /**
+     * Get a <i>0-based</i> column index that corresponds with the passed field
+     * index.  Note that the field index passed as the 1st parameter is
+     * <i>1-based.</i>
+     *
+     * @param nIndex 1-based field index.
+     *
+     * @return 0-based column index
+     */
+    virtual SCCOL findFieldColumn(SCCOL nIndex) const;
+    virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const;
+    virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const;
+    virtual bool isRangeEqual(const ScRange& rRange) const;
+
+private:
+    sal_uInt16 getCellString(::rtl::OUString& rStr, ScBaseCell* pCell) const;
+
+private:
+    ScRange maRange;
+};
+
+// ============================================================================
+
+class ScDBExternalRange : public ScDBRangeBase
+{
+public:
+    explicit ScDBExternalRange(ScDocument* pDoc, const ScMatrixRef& pMat);
+    virtual ~ScDBExternalRange();
+
+    virtual SCCOL getColSize() const;
+    virtual SCROW getRowSize() const;
+    virtual SCSIZE getVisibleDataCellCount() const;
+
+    /**
+     * Get a string value of a specified cell position.  Note that the
+     * position of the upper left cell of the range is always (0, 0) even if
+     * the reference type is of internal range.
+     *
+     * @param nCol column position (0 to column size-1)
+     * @param nRow row position (0 to row size-1)
+     */
+    virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const;
+
+    virtual SCCOL getFirstFieldColumn() const;
+
+    /**
+     * Get a <i>0-based</i> column index that corresponds with the passed field
+     * index.  Note that the field index passed as the 1st parameter is
+     * <i>1-based.</i>
+     *
+     * @param nIndex 1-based field index.
+     *
+     * @return 0-based column index
+     */
+    virtual SCCOL findFieldColumn(SCCOL nIndex) const;
+    virtual SCCOL findFieldColumn(const ::rtl::OUString& rStr, sal_uInt16* pErr = NULL) const;
+    virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const;
+    virtual bool isRangeEqual(const ScRange& rRange) const;
+
+private:
+    const ScMatrixRef mpMatrix;
+    SCCOL mnCols;
+    SCROW mnRows;
+};
+
+#endif
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 659884dfd5de..2394bfb56799 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: interpre.hxx,v $
- * $Revision: 1.35.44.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,10 @@ class SbxVariable;
 class ScBaseCell;
 class ScFormulaCell;
 class SvNumberFormatter;
+class ScDBRangeBase;
 struct MatrixDoubleOp;
+struct ScQueryParam;
+struct ScDBQueryParamBase;
 
 struct ScCompare
 {
@@ -302,6 +302,7 @@ void DoubleRefToVars( const ScToken* p,
         SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
         SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
         BOOL bDontCheckForTableOp = FALSE );
+ScDBRangeBase* PopDoubleRef();
 void PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
                           SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
                           BOOL bDontCheckForTableOp = FALSE );
@@ -491,7 +492,7 @@ void ScSubTotal();
 // compatibility). If this was the case then rMissingField is set to TRUE upon
 // return. If rMissingField==FALSE upon call all "missing cases" are considered
 // to be an error.
-BOOL GetDBParams( SCTAB& rTab, ScQueryParam& rParam, BOOL& rMissingField );
+ScDBQueryParamBase* GetDBParams( BOOL& rMissingField );
 
 void DBIterator( ScIterFunc );
 void ScDBSum();
diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx
index 56b7273f3ace..8089d6653730 100644
--- a/sc/source/core/inc/jumpmatrix.hxx
+++ b/sc/source/core/inc/jumpmatrix.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jumpmatrix.hxx,v $
- * $Revision: 1.6.148.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/makefile.mk b/sc/source/core/inc/makefile.mk
index 3c33d006edf9..1b35ca49549d 100644
--- a/sc/source/core/inc/makefile.mk
+++ b/sc/source/core/inc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/parclass.hxx b/sc/source/core/inc/parclass.hxx
index c72bcece7f19..39844de7ae22 100644
--- a/sc/source/core/inc/parclass.hxx
+++ b/sc/source/core/inc/parclass.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: parclass.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx
index 00474d63c080..f98963513c59 100644
--- a/sc/source/core/inc/poolhelp.hxx
+++ b/sc/source/core/inc/poolhelp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: poolhelp.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/refupdat.hxx b/sc/source/core/inc/refupdat.hxx
index 6ecc67259463..17da3bf5e635 100644
--- a/sc/source/core/inc/refupdat.hxx
+++ b/sc/source/core/inc/refupdat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: refupdat.hxx,v $
- * $Revision: 1.5.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/scrdata.hxx b/sc/source/core/inc/scrdata.hxx
index 697a848e7ff3..b569bddddd6b 100644
--- a/sc/source/core/inc/scrdata.hxx
+++ b/sc/source/core/inc/scrdata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scrdata.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/inc/sctictac.hxx b/sc/source/core/inc/sctictac.hxx
index 90afbdcb720d..1c8242150369 100644
--- a/sc/source/core/inc/sctictac.hxx
+++ b/sc/source/core/inc/sctictac.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sctictac.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/src/compiler.src b/sc/source/core/src/compiler.src
index ced403a2baef..a45c2b6aa458 100644
--- a/sc/source/core/src/compiler.src
+++ b/sc/source/core/src/compiler.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: compiler.src,v $
- * $Revision: 1.59 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/src/makefile.mk b/sc/source/core/src/makefile.mk
index e699880ae69b..13d0c2127c6d 100644
--- a/sc/source/core/src/makefile.mk
+++ b/sc/source/core/src/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxx
index 82ed4f31b859..c76b60eae077 100644
--- a/sc/source/core/tool/addincfg.cxx
+++ b/sc/source/core/tool/addincfg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addincfg.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 31f7fcd74ce6..c0ae60f13841 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addincol.cxx,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx
index e22ef4ec0bf5..a4de52e27b1b 100644
--- a/sc/source/core/tool/addinhelpid.cxx
+++ b/sc/source/core/tool/addinhelpid.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addinhelpid.cxx,v $
- * $Revision: 1.5.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx
index 00acd7f52438..ad6b60073ccb 100644
--- a/sc/source/core/tool/addinlis.cxx
+++ b/sc/source/core/tool/addinlis.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addinlis.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 4cf317073b56..509a9fe293fb 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: address.cxx,v $
- * $Revision: 1.11.30.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index ae94eeefc300..4f19a043a34d 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: adiasync.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 3ba9ffb49abb..857efd972886 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appoptio.cxx,v $
- * $Revision: 1.12.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index f9a9f0bd51a0..5a7f117e75d9 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autoform.cxx,v $
- * $Revision: 1.22.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
 #include <vcl/outdev.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
-#include <svx/langitem.hxx>
+#include <editeng/langitem.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <tools/tenccvt.hxx>
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index b98525e45968..e8e2b28f3f8e 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: callform.cxx,v $
- * $Revision: 1.12.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 5305db490f8d..45d2c4a890bb 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellform.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx
index 3751dcb8e2c1..4db8c22d19d8 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellkeytranslator.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index e4def00c10b0..9e4e77b7c1d4 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartarr.cxx,v $
- * $Revision: 1.24.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index 6f2e130da847..756493cc86e9 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charthelper.cxx,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index d66cdae50f4c..b729ce0b30b5 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartlis.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx
index c861720dadee..54a49fb4b4aa 100644
--- a/sc/source/core/tool/chartlock.cxx
+++ b/sc/source/core/tool/chartlock.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartlock.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index 9873ea42ff13..fc3d9bf51be2 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartpos.cxx,v $
- * $Revision: 1.4.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 7dfd75206a9f..ba3f3e47bfb7 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chgtrack.cxx,v $
- * $Revision: 1.32.100.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx
index 8e5ad0f09ca0..ac587db2bd12 100644
--- a/sc/source/core/tool/chgviset.cxx
+++ b/sc/source/core/tool/chgviset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chgviset.cxx,v $
- * $Revision: 1.8.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/collect.cxx b/sc/source/core/tool/collect.cxx
index e66c14ee0317..13df9307bc11 100644
--- a/sc/source/core/tool/collect.cxx
+++ b/sc/source/core/tool/collect.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: collect.cxx,v $
- * $Revision: 1.14.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 4eab9aa85c9e..d2b1963c544d 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: compiler.cxx,v $
- * $Revision: 1.82.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index b464c78e1c8f..addd92082cfd 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: consoli.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/dbcolect.cxx b/sc/source/core/tool/dbcolect.cxx
index 61ca8ee00195..4eea4db97a0a 100644
--- a/sc/source/core/tool/dbcolect.cxx
+++ b/sc/source/core/tool/dbcolect.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbcolect.cxx,v $
- * $Revision: 1.17.32.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,6 +37,7 @@
 #include "refupdat.hxx"
 #include "rechead.hxx"
 #include "document.hxx"
+#include "queryparam.hxx"
 #include "globstr.hrc"
 
 
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index 446f892452fc..977161760eb0 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ddelink.cxx,v $
- * $Revision: 1.16.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 #include <tools/list.hxx>
-#include <svx/linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <sfx2/bindings.hxx>
 #include <svl/zforlist.hxx>
 
@@ -250,7 +247,7 @@ void __EXPORT ScDdeLink::ListenersGone()
 
     ScDocument* pStackDoc = pDoc;   // member pDoc can't be used after removing the link
 
-    SvxLinkManager* pLinkMgr = pDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkMgr = pDoc->GetLinkManager();
     pLinkMgr->Remove( this);        // deletes this
 
     if ( !pLinkMgr->GetLinks().Count() )            // letzten geloescht ?
diff --git a/sc/source/core/tool/detdata.cxx b/sc/source/core/tool/detdata.cxx
index 6f0d0239f02c..a1add9ca6939 100644
--- a/sc/source/core/tool/detdata.cxx
+++ b/sc/source/core/tool/detdata.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: detdata.cxx,v $
- * $Revision: 1.8.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index fed4a3b0ae40..1f257512ae50 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: detfunc.cxx,v $
- * $Revision: 1.30.20.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,8 +32,8 @@
 
 #include "scitems.hxx"
 #include <svtools/colorcfg.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/sdshitm.hxx>
 #include <svx/sdsxyitm.hxx>
 #include <svx/sdtditm.hxx>
@@ -58,11 +55,11 @@
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svx/xtable.hxx>
-#include <svx/outliner.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/editobj.hxx>
 #include <svx/sxcecitm.hxx>
 #include <svl/whiter.hxx>
-#include <svx/writingmodeitem.hxx>
+#include <editeng/writingmodeitem.hxx>
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 37e6c68fbf03..a99b3c01dd1f 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docoptio.cxx,v $
- * $Revision: 1.9.32.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx
new file mode 100644
index 000000000000..28fae20ddb62
--- /dev/null
+++ b/sc/source/core/tool/doubleref.cxx
@@ -0,0 +1,568 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: interpre.hxx,v $
+ * $Revision: 1.35.44.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sc.hxx"
+
+// INCLUDE ---------------------------------------------------------------
+
+#include "doubleref.hxx"
+#include "cell.hxx"
+#include "global.hxx"
+#include "document.hxx"
+#include "queryparam.hxx"
+#include "globstr.hrc"
+
+#include <memory>
+#include <vector>
+
+using ::rtl::OUString;
+using ::std::auto_ptr;
+using ::std::vector;
+
+namespace {
+
+void lcl_toUpper(OUString& rStr)
+{
+    rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, static_cast<xub_StrLen>(rStr.getLength()));
+}
+
+bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)
+{
+    // A valid StarQuery must be at least 4 columns wide. To be precise it
+    // should be exactly 4 columns ...
+    // Additionally, if this wasn't checked, a formula pointing to a valid 1-3
+    // column Excel style query range immediately left to itself would result
+    // in a circular reference when the field name or operator or value (first
+    // to third query range column) is obtained (#i58354#). Furthermore, if the
+    // range wasn't sufficiently specified data changes wouldn't flag formula
+    // cells for recalculation.
+
+    if (pQueryRef->getColSize() < 4)
+        return false;
+
+    BOOL bValid;
+    BOOL bFound;
+    OUString aCellStr;
+    SCSIZE nIndex = 0;
+    SCROW nRow = 0;
+    SCROW nRows = pDBRef->getRowSize();
+    SCSIZE nNewEntries = static_cast<SCSIZE>(nRows);
+    pParam->Resize(nNewEntries);
+
+    do
+    {
+        ScQueryEntry& rEntry = pParam->GetEntry(nIndex);
+
+        bValid = FALSE;
+
+        if (nIndex > 0)
+        {
+            // For all entries after the first one, check the and/or connector in the first column.
+            aCellStr = pQueryRef->getString(0, nRow);
+            lcl_toUpper(aCellStr);
+            if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_UND)) )
+            {
+                rEntry.eConnect = SC_AND;
+                bValid = TRUE;
+            }
+            else if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_ODER)) )
+            {
+                rEntry.eConnect = SC_OR;
+                bValid = TRUE;
+            }
+        }
+
+        if ((nIndex < 1) || bValid)
+        {
+            // field name in the 2nd column.
+            bFound = FALSE;
+            aCellStr = pQueryRef->getString(1, nRow);
+            SCCOL nField = pDBRef->findFieldColumn(aCellStr); // TODO: must be case insensitive comparison.
+            if (ValidCol(nField))
+            {
+                rEntry.nField = nField;
+                bValid = true;
+            }
+            else
+                bValid = false;
+        }
+
+        if (bValid)
+        {
+            // equality, non-equality operator in the 3rd column.
+            bFound = FALSE;
+            aCellStr = pQueryRef->getString(2, nRow);
+            lcl_toUpper(aCellStr);
+            const sal_Unicode* p = aCellStr.getStr();
+            if (p[0] == sal_Unicode('<'))
+            {
+                if (p[1] == sal_Unicode('>'))
+                    rEntry.eOp = SC_NOT_EQUAL;
+                else if (p[1] == sal_Unicode('='))
+                    rEntry.eOp = SC_LESS_EQUAL;
+                else
+                    rEntry.eOp = SC_LESS;
+            }
+            else if (p[0] == sal_Unicode('>'))
+            {
+                if (p[1] == sal_Unicode('='))
+                    rEntry.eOp = SC_GREATER_EQUAL;
+                else
+                    rEntry.eOp = SC_GREATER;
+            }
+            else if (p[0] == sal_Unicode('='))
+                rEntry.eOp = SC_EQUAL;
+
+        }
+
+        if (bValid)
+        {
+            // Finally, the right-hand-side value in the 4th column.
+            *rEntry.pStr = pQueryRef->getString(3, nRow);
+            rEntry.bDoQuery = TRUE;
+        }
+        nIndex++;
+        nRow++;
+    }
+    while (bValid && (nRow < nRows) /* && (nIndex < MAXQUERY) */ );
+    return bValid;
+}
+
+bool lcl_createExcelQuery(
+    ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)
+{
+    bool bValid = true;
+    SCCOL nCols = pQueryRef->getColSize();
+    SCROW nRows = pQueryRef->getRowSize();
+    vector<SCCOL> aFields(nCols);
+    SCCOL nCol = 0;
+    while (bValid && (nCol < nCols))
+    {
+        OUString aQueryStr = pQueryRef->getString(nCol, 0);
+        SCCOL nField = pDBRef->findFieldColumn(aQueryStr);
+        if (ValidCol(nField))
+            aFields[nCol] = nField;
+        else
+            bValid = false;
+        ++nCol;
+    }
+
+    if (bValid)
+    {
+//      ULONG nVisible = 0;
+//      for ( nCol=nCol1; nCol<=nCol2; nCol++ )
+//          nVisible += aCol[nCol].VisibleCount( nRow1+1, nRow2 );
+
+        // Count the number of visible cells (excluding the header row).  Each
+        // visible cell corresponds with a single query.
+        SCSIZE nVisible = pQueryRef->getVisibleDataCellCount();
+        if ( nVisible > SCSIZE_MAX / sizeof(void*) )
+        {
+            DBG_ERROR("zu viele Filterkritierien");
+            nVisible = 0;
+        }
+
+        SCSIZE nNewEntries = nVisible;
+        pParam->Resize( nNewEntries );
+
+        SCSIZE nIndex = 0;
+        SCROW nRow = 1;
+        String aCellStr;
+        while (nRow < nRows)
+        {
+            nCol = 0;
+            while (nCol < nCols)
+            {
+                aCellStr = pQueryRef->getString(nCol, nRow);
+                ScGlobal::pCharClass->toUpper( aCellStr );
+                if (aCellStr.Len() > 0)
+                {
+                    if (nIndex < nNewEntries)
+                    {
+                        pParam->GetEntry(nIndex).nField = aFields[nCol];
+                        pParam->FillInExcelSyntax(aCellStr, nIndex);
+                        nIndex++;
+                        if (nIndex < nNewEntries)
+                            pParam->GetEntry(nIndex).eConnect = SC_AND;
+                    }
+                    else
+                        bValid = FALSE;
+                }
+                nCol++;
+            }
+            nRow++;
+            if (nIndex < nNewEntries)
+                pParam->GetEntry(nIndex).eConnect = SC_OR;
+        }
+    }
+    return bValid;
+}
+
+bool lcl_fillQueryEntries(
+    ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)
+{
+    SCSIZE nCount = pParam->GetEntryCount();
+    for (SCSIZE i = 0; i < nCount; ++i)
+        pParam->GetEntry(i).Clear();
+
+    // Standard QueryTabelle
+    bool bValid = lcl_createStarQuery(pParam, pDBRef, pQueryRef);
+    // Excel QueryTabelle
+    if (!bValid)
+        bValid = lcl_createExcelQuery(pParam, pDBRef, pQueryRef);
+
+    nCount = pParam->GetEntryCount();
+    if (bValid)
+    {
+        //  bQueryByString muss gesetzt sein
+        for (SCSIZE i = 0; i < nCount; ++i)
+            pParam->GetEntry(i).bQueryByString = true;
+    }
+    else
+    {
+        //  nix
+        for (SCSIZE i = 0; i < nCount; ++i)
+            pParam->GetEntry(i).Clear();
+    }
+    return bValid;
+}
+
+}
+
+// ============================================================================
+
+ScDBRangeBase::ScDBRangeBase(ScDocument* pDoc, RefType eType) :
+    mpDoc(pDoc), meType(eType)
+{
+}
+
+ScDBRangeBase::~ScDBRangeBase()
+{
+}
+
+ScDBRangeBase::RefType ScDBRangeBase::getType() const
+{
+    return meType;
+}
+
+bool ScDBRangeBase::fillQueryEntries(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef) const
+{
+    if (!pDBRef)
+        return false;
+
+    return lcl_fillQueryEntries(pParam, pDBRef, this);
+}
+
+void ScDBRangeBase::fillQueryOptions(ScQueryParamBase* pParam)
+{
+    pParam->bHasHeader = true;
+    pParam->bByRow = true;
+    pParam->bInplace = true;
+    pParam->bCaseSens = false;
+    pParam->bRegExp = false;
+    pParam->bDuplicate = true;
+    pParam->bMixedComparison = false;
+}
+
+ScDocument* ScDBRangeBase::getDoc() const
+{
+    return mpDoc;
+}
+
+// ============================================================================
+
+ScDBInternalRange::ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange) :
+    ScDBRangeBase(pDoc, INTERNAL), maRange(rRange)
+{
+}
+
+ScDBInternalRange::~ScDBInternalRange()
+{
+}
+
+const ScRange& ScDBInternalRange::getRange() const
+{
+    return maRange;
+}
+
+SCCOL ScDBInternalRange::getColSize() const
+{
+    return maRange.aEnd.Col() - maRange.aStart.Col() + 1;
+}
+
+SCROW ScDBInternalRange::getRowSize() const
+{
+    return maRange.aEnd.Row() - maRange.aStart.Row() + 1;
+}
+
+SCSIZE ScDBInternalRange::getVisibleDataCellCount() const
+{
+    SCCOL nCols = getColSize();
+    SCROW nRows = getRowSize();
+    if (nRows <= 1)
+        return 0;
+
+    return (nRows-1)*nCols;
+}
+
+OUString ScDBInternalRange::getString(SCCOL nCol, SCROW nRow) const
+{
+    String aStr;
+    const ScAddress& s = maRange.aStart;
+    getDoc()->GetString(s.Col() + nCol, s.Row() + nRow, maRange.aStart.Tab(), aStr);
+    return aStr;
+}
+
+SCCOL ScDBInternalRange::getFirstFieldColumn() const
+{
+    return getRange().aStart.Col();
+}
+
+SCCOL ScDBInternalRange::findFieldColumn(SCCOL nIndex) const
+{
+    const ScRange& rRange = getRange();
+    const ScAddress& s = rRange.aStart;
+    const ScAddress& e = rRange.aEnd;
+
+    SCCOL nDBCol1 = s.Col();
+    SCCOL nDBCol2 = e.Col();
+
+    if ( nIndex <= 0 || nIndex > (nDBCol2 - nDBCol1 + 1) )
+        return nDBCol1;
+
+    return Min(nDBCol2, static_cast<SCCOL>(nDBCol1 + nIndex - 1));
+}
+
+sal_uInt16 ScDBInternalRange::getCellString(OUString& rStr, ScBaseCell* pCell) const
+{
+    sal_uInt16 nErr = 0;
+    String aStr;
+    if (pCell)
+    {
+        SvNumberFormatter* pFormatter = getDoc()->GetFormatTable();
+        switch (pCell->GetCellType())
+        {
+            case CELLTYPE_STRING:
+                ((ScStringCell*) pCell)->GetString(aStr);
+            break;
+            case CELLTYPE_EDIT:
+                ((ScEditCell*) pCell)->GetString(aStr);
+            break;
+            case CELLTYPE_FORMULA:
+            {
+                ScFormulaCell* pFCell = (ScFormulaCell*) pCell;
+                nErr = pFCell->GetErrCode();
+                if (pFCell->IsValue())
+                {
+                    double fVal = pFCell->GetValue();
+                    ULONG nIndex = pFormatter->GetStandardFormat(
+                                        NUMBERFORMAT_NUMBER,
+                                        ScGlobal::eLnge);
+                    pFormatter->GetInputLineString(fVal, nIndex, aStr);
+                }
+                else
+                    pFCell->GetString(aStr);
+            }
+            break;
+            case CELLTYPE_VALUE:
+            {
+                double fVal = ((ScValueCell*) pCell)->GetValue();
+                ULONG nIndex = pFormatter->GetStandardFormat(
+                                        NUMBERFORMAT_NUMBER,
+                                        ScGlobal::eLnge);
+                pFormatter->GetInputLineString(fVal, nIndex, aStr);
+            }
+            break;
+            default:
+                ;
+        }
+    }
+    rStr = aStr;
+    return nErr;
+}
+
+SCCOL ScDBInternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr) const
+{
+    const ScAddress& s = maRange.aStart;
+    const ScAddress& e = maRange.aEnd;
+    OUString aUpper = rStr;
+    lcl_toUpper(aUpper);
+
+    SCCOL nDBCol1 = s.Col();
+    SCROW nDBRow1 = s.Row();
+    SCTAB nDBTab1 = s.Tab();
+    SCCOL nDBCol2 = e.Col();
+
+    SCCOL   nField = nDBCol1;
+    BOOL    bFound = TRUE;
+
+    bFound = FALSE;
+    OUString aCellStr;
+    ScAddress aLook( nDBCol1, nDBRow1, nDBTab1 );
+    while (!bFound && (aLook.Col() <= nDBCol2))
+    {
+        ScBaseCell* pCell = getDoc()->GetCell( aLook );
+        sal_uInt16 nErr = getCellString( aCellStr, pCell );
+        if (pErr)
+            *pErr = nErr;
+        lcl_toUpper(aCellStr);
+        bFound = ScGlobal::GetpTransliteration()->isEqual(aCellStr, aUpper);
+        if (!bFound)
+            aLook.IncCol();
+    }
+    nField = aLook.Col();
+
+    return bFound ? nField : -1;
+}
+
+ScDBQueryParamBase* ScDBInternalRange::createQueryParam(const ScDBRangeBase* pQueryRef) const
+{
+    auto_ptr<ScDBQueryParamInternal> pParam(new ScDBQueryParamInternal);
+
+    // Set the database range first.
+    const ScAddress& s = maRange.aStart;
+    const ScAddress& e = maRange.aEnd;
+    pParam->nCol1 = s.Col();
+    pParam->nRow1 = s.Row();
+    pParam->nCol2 = e.Col();
+    pParam->nRow2 = e.Row();
+    pParam->nTab  = s.Tab();
+
+    fillQueryOptions(pParam.get());
+
+    // Now construct the query entries from the query range.
+    if (!pQueryRef->fillQueryEntries(pParam.get(), this))
+        return NULL;
+
+    return pParam.release();
+}
+
+bool ScDBInternalRange::isRangeEqual(const ScRange& rRange) const
+{
+    return maRange == rRange;
+}
+
+// ============================================================================
+
+ScDBExternalRange::ScDBExternalRange(ScDocument* pDoc, const ScMatrixRef& pMat) :
+    ScDBRangeBase(pDoc, EXTERNAL), mpMatrix(pMat)
+{
+    SCSIZE nC, nR;
+    mpMatrix->GetDimensions(nC, nR);
+    mnCols = static_cast<SCCOL>(nC);
+    mnRows = static_cast<SCROW>(nR);
+}
+
+ScDBExternalRange::~ScDBExternalRange()
+{
+}
+
+SCCOL ScDBExternalRange::getColSize() const
+{
+    return mnCols;
+}
+
+SCROW ScDBExternalRange::getRowSize() const
+{
+    return mnRows;
+}
+
+SCSIZE ScDBExternalRange::getVisibleDataCellCount() const
+{
+    SCCOL nCols = getColSize();
+    SCROW nRows = getRowSize();
+    if (nRows <= 1)
+        return 0;
+
+    return (nRows-1)*nCols;
+}
+
+OUString ScDBExternalRange::getString(SCCOL nCol, SCROW nRow) const
+{
+    if (nCol >= mnCols || nRow >= mnRows)
+        return OUString();
+
+    return mpMatrix->GetString(nCol, nRow);
+}
+
+SCCOL ScDBExternalRange::getFirstFieldColumn() const
+{
+    return 0;
+}
+
+SCCOL ScDBExternalRange::findFieldColumn(SCCOL nIndex) const
+{
+    if (nIndex < 1)
+        // 1st field
+        return 0;
+
+    if (nIndex > mnCols)
+        // last field
+        return mnCols - 1;
+
+    return nIndex - 1;
+}
+
+SCCOL ScDBExternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr) const
+{
+    if (pErr)
+        pErr = 0;
+
+    OUString aUpper = rStr;
+    lcl_toUpper(aUpper);
+    for (SCCOL i = 0; i < mnCols; ++i)
+    {
+        OUString aUpperVal = mpMatrix->GetString(i, 0);
+        lcl_toUpper(aUpperVal);
+        if (aUpper.equals(aUpperVal))
+            return i;
+    }
+    return -1;
+}
+
+ScDBQueryParamBase* ScDBExternalRange::createQueryParam(const ScDBRangeBase* pQueryRef) const
+{
+    auto_ptr<ScDBQueryParamMatrix> pParam(new ScDBQueryParamMatrix);
+    pParam->mpMatrix = mpMatrix;
+    fillQueryOptions(pParam.get());
+
+    // Now construct the query entries from the query range.
+    if (!pQueryRef->fillQueryEntries(pParam.get(), this))
+        return NULL;
+
+    return pParam.release();
+}
+
+bool ScDBExternalRange::isRangeEqual(const ScRange& /*rRange*/) const
+{
+    return false;
+}
+
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index e4f2c07a3c57..483f0cea6b57 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editutil.cxx,v $
- * $Revision: 1.33 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,15 +35,15 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <svx/algitem.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svx/editview.hxx>
-#include <svx/editstat.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/numitem.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/numitem.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 #include <svl/inethist.hxx>
diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx
index 6da2bc989e6f..7ac3d710b420 100644
--- a/sc/source/core/tool/filtopt.cxx
+++ b/sc/source/core/tool/filtopt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtopt.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx
index 94259a56d6e2..75d1c874eba8 100644
--- a/sc/source/core/tool/formulaparserpool.cxx
+++ b/sc/source/core/tool/formulaparserpool.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formulaparserpool.cxx,v $
- * $Revision: 1.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -161,7 +158,7 @@ Reference< XFormulaParser > ScFormulaParserPool::getFormulaParser( const OUStrin
         ScParserFactoryMap& rFactoryMap = ScParserFactorySingleton::get();
         rxParser = rFactoryMap.createFormulaParser( xComponent, rNamespace );
     }
-    catch( Exception& )

+    catch( Exception& )
     {
     }
     return rxParser;
diff --git a/sc/source/core/tool/hints.cxx b/sc/source/core/tool/hints.cxx
index 531eddff57d8..e2bcb11fc573 100644
--- a/sc/source/core/tool/hints.cxx
+++ b/sc/source/core/tool/hints.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hints.cxx,v $
- * $Revision: 1.6.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index ce878a17fb78..ed5a74582348 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inputopt.cxx,v $
- * $Revision: 1.10.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f92703064d3d..166261b98ffd 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: interpr1.cxx,v $
- * $Revision: 1.61 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/langitem.hxx>
+#include <editeng/langitem.hxx>
 #include <svx/algitem.hxx>
 #include <unotools/textsearch.hxx>
 #include <svl/zforlist.hxx>
@@ -68,11 +65,14 @@
 #include <string.h>
 #include <math.h>
 #include <vector>
+#include <memory>
 #include "cellkeytranslator.hxx"
 #include "lookupcache.hxx"
 #include "rangenam.hxx"
 #include "compiler.hxx"
 #include "externalrefmgr.hxx"
+#include "doubleref.hxx"
+#include "queryparam.hxx"
 
 #define SC_DOUBLE_MAXVALUE  1.7e307
 
@@ -83,6 +83,8 @@ ScTokenStack* ScInterpreter::pGlobalStack = NULL;
 BOOL ScInterpreter::bGlobalStackInUse = FALSE;
 
 using namespace formula;
+using ::std::auto_ptr;
+
 //-----------------------------------------------------------------------------
 // Funktionen
 //-----------------------------------------------------------------------------
@@ -5828,11 +5830,9 @@ void ScInterpreter::ScSubTotal()
 #endif
 
 
-BOOL ScInterpreter::GetDBParams(SCTAB& rTab, ScQueryParam& rParam,
-        BOOL& rMissingField )
+ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetDBParams" );
-    BOOL bRet = FALSE;
     BOOL bAllowMissingField = FALSE;
     if ( rMissingField )
     {
@@ -5841,14 +5841,10 @@ BOOL ScInterpreter::GetDBParams(SCTAB& rTab, ScQueryParam& rParam,
     }
     if ( GetByte() == 3 )
     {
-
-        SCCOL nQCol1;
-        SCROW nQRow1;
-        SCTAB nQTab1;
-        SCCOL nQCol2;
-        SCROW nQRow2;
-        SCTAB nQTab2;
-        PopDoubleRef(nQCol1, nQRow1, nQTab1, nQCol2, nQRow2, nQTab2);
+        // First, get the query criteria range.
+        ::std::auto_ptr<ScDBRangeBase> pQueryRef( PopDoubleRef() );
+        if (!pQueryRef.get())
+            return NULL;
 
         BOOL    bByVal = TRUE;
         double  nVal = 0.0;
@@ -5904,116 +5900,85 @@ BOOL ScInterpreter::GetDBParams(SCTAB& rTab, ScQueryParam& rParam,
                 SetError( errIllegalParameter );
         }
 
-        SCCOL nDBCol1;
-        SCROW nDBRow1;
-        SCTAB nDBTab1;
-        SCCOL nDBCol2;
-        SCROW nDBRow2;
-        SCTAB nDBTab2;
-        PopDoubleRef(nDBCol1, nDBRow1, nDBTab1, nDBCol2, nDBRow2, nDBTab2);
+        auto_ptr<ScDBRangeBase> pDBRef( PopDoubleRef() );
+
+        if (nGlobalError || !pDBRef.get())
+            return NULL;
 
-        if ( nGlobalError == 0 && bRangeFake )
+        if ( bRangeFake )
         {
             // range parameter must match entire database range
-            if ( aMissingRange == ScRange( nDBCol1, nDBRow1, nDBTab1, nDBCol2,
-                        nDBRow2, nDBTab2) )
+            if (pDBRef->isRangeEqual(aMissingRange))
                 rMissingField = TRUE;
             else
                 SetError( errIllegalParameter );
         }
 
-        if (nGlobalError == 0)
+        if (nGlobalError)
+            return NULL;
+
+        SCCOL nField = pDBRef->getFirstFieldColumn();
+        if (rMissingField)
+            ; // special case
+        else if (bByVal)
+            nField = pDBRef->findFieldColumn(static_cast<SCCOL>(nVal));
+        else
+        {
+            sal_uInt16 nErr = 0;
+            nField = pDBRef->findFieldColumn(aStr, &nErr);
+            SetError(nErr);
+        }
+
+        if (!ValidCol(nField))
+            return NULL;
+
+        auto_ptr<ScDBQueryParamBase> pParam( pDBRef->createQueryParam(pQueryRef.get()) );
+
+        if (pParam.get())
         {
-            SCCOL   nField = nDBCol1;
-            BOOL    bFound = TRUE;
+            // An allowed missing field parameter sets the result field
+            // to any of the query fields, just to be able to return
+            // some cell from the iterator.
             if ( rMissingField )
-                ;   // special case
-            else if ( bByVal )
-            {
-                if ( nVal <= 0 || nVal > (nDBCol2 - nDBCol1 + 1) )
-                    bFound = FALSE;
-                else
-                    nField = Min(nDBCol2, (SCCOL)(nDBCol1 + (SCCOL)nVal - 1));
-            }
-            else
+                nField = static_cast<SCCOL>(pParam->GetEntry(0).nField);
+            pParam->mnField = nField;
+
+            SCSIZE nCount = pParam->GetEntryCount();
+            for ( SCSIZE i=0; i < nCount; i++ )
             {
-                bFound = FALSE;
-                String aCellStr;
-                ScAddress aLook( nDBCol1, nDBRow1, nDBTab1 );
-                while (!bFound && (aLook.Col() <= nDBCol2))
-                {
-                    ScBaseCell* pCell = GetCell( aLook );
-                    GetCellString( aCellStr, pCell );
-                    bFound = ScGlobal::GetpTransliteration()->isEqual( aCellStr, aStr );
-                    if (!bFound)
-                        aLook.IncCol();
-                }
-                nField = aLook.Col();
-            }
-            if (bFound)
-            {
-                rParam.nCol1 = nDBCol1;
-                rParam.nRow1 = nDBRow1;
-                rParam.nCol2 = nDBCol2;
-                rParam.nRow2 = nDBRow2;
-                rParam.nTab  = nDBTab1;
-                rParam.bHasHeader = TRUE;
-                rParam.bByRow = TRUE;
-                rParam.bInplace = TRUE;
-                rParam.bCaseSens = FALSE;
-                rParam.bRegExp = FALSE;
-                rParam.bDuplicate = TRUE;
-                if (pDok->CreateQueryParam(nQCol1, nQRow1, nQCol2, nQRow2, nQTab1, rParam))
-                {
-                    // An allowed missing field parameter sets the result field
-                    // to any of the query fields, just to be able to return
-                    // some cell from the iterator.
-                    if ( rMissingField )
-                        nField = static_cast<SCCOL>(rParam.GetEntry(0).nField);
-
-                    rParam.nCol1 = nField;
-                    rParam.nCol2 = nField;
-                    rTab = nDBTab1;
-                    bRet = TRUE;
-                    SCSIZE nCount = rParam.GetEntryCount();
-                    for ( SCSIZE i=0; i < nCount; i++ )
-                    {
-                        ScQueryEntry& rEntry = rParam.GetEntry(i);
-                        if ( rEntry.bDoQuery )
-                        {
-                            sal_uInt32 nIndex = 0;
-                            rEntry.bQueryByString = !pFormatter->IsNumberFormat(
-                                *rEntry.pStr, nIndex, rEntry.nVal );
-                            if ( rEntry.bQueryByString && !rParam.bRegExp )
-                                rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
-                        }
-                        else
-                            break;  // for
-                    }
+                ScQueryEntry& rEntry = pParam->GetEntry(i);
+                if ( rEntry.bDoQuery )
+                {
+                    sal_uInt32 nIndex = 0;
+                    rEntry.bQueryByString = !pFormatter->IsNumberFormat(
+                        *rEntry.pStr, nIndex, rEntry.nVal );
+                    if ( rEntry.bQueryByString && !pParam->bRegExp )
+                        pParam->bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
                 }
+                else
+                    break;  // for
             }
+            return pParam.release();
         }
     }
-    return bRet;
+    return false;
 }
 
 
 void ScInterpreter::DBIterator( ScIterFunc eFunc )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::DBIterator" );
-    SCTAB nTab1;
     double nErg = 0.0;
     double fMem = 0.0;
     BOOL bNull = TRUE;
     ULONG nCount = 0;
-    ScQueryParam aQueryParam;
     BOOL bMissingField = FALSE;
-    if ( GetDBParams( nTab1, aQueryParam, bMissingField) )
+    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+    if (pQueryParam.get())
     {
-        double nVal;
-        USHORT nErr;
-        ScQueryValueIterator aValIter(pDok, nTab1, aQueryParam);
-        if ( aValIter.GetFirst(nVal, nErr) && !nErr )
+        ScDBQueryDataIterator aValIter(pDok, pQueryParam.release());
+        ScDBQueryDataIterator::Value aValue;
+        if ( aValIter.GetFirst(aValue) && !aValue.mnError )
         {
             switch( eFunc )
             {
@@ -6029,24 +5994,24 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc )
                 {
                     case ifAVERAGE:
                     case ifSUM:
-                        if ( bNull && nVal != 0.0 )
+                        if ( bNull && aValue.mfValue != 0.0 )
                         {
                             bNull = FALSE;
-                            fMem = nVal;
+                            fMem = aValue.mfValue;
                         }
                         else
-                            nErg += nVal;
+                            nErg += aValue.mfValue;
                         break;
-                    case ifSUMSQ:   nErg += nVal * nVal; break;
-                    case ifPRODUCT: nErg *= nVal; break;
-                    case ifMAX:     if( nVal > nErg ) nErg = nVal; break;
-                    case ifMIN:     if( nVal < nErg ) nErg = nVal; break;
+                    case ifSUMSQ:   nErg += aValue.mfValue * aValue.mfValue; break;
+                    case ifPRODUCT: nErg *= aValue.mfValue; break;
+                    case ifMAX:     if( aValue.mfValue > nErg ) nErg = aValue.mfValue; break;
+                    case ifMIN:     if( aValue.mfValue < nErg ) nErg = aValue.mfValue; break;
                     default: ; // nothing
                 }
             }
-            while ( aValIter.GetNext(nVal, nErr) && !nErr );
+            while ( aValIter.GetNext(aValue) && !aValue.mnError );
         }
-        SetError(nErr);
+        SetError(aValue.mnError);
     }
     else
         SetError( errIllegalParameter);
@@ -6071,13 +6036,12 @@ void ScInterpreter::ScDBSum()
 void ScInterpreter::ScDBCount()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBCount" );
-    SCTAB nTab;
-    ScQueryParam aQueryParam;
     BOOL bMissingField = TRUE;
-    if ( GetDBParams( nTab, aQueryParam, bMissingField) )
+    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+    if (pQueryParam.get())
     {
         ULONG nCount = 0;
-        if ( bMissingField )
+        if ( bMissingField && pQueryParam->GetType() == ScDBQueryParamBase::INTERNAL )
         {   // count all matching records
             // TODO: currently the QueryIterators only return cell pointers of
             // existing cells, so if a query matches an empty cell there's
@@ -6087,7 +6051,9 @@ void ScInterpreter::ScDBCount()
             // have to live with it until we reimplement the iterators to also
             // return empty cells, which would mean to adapt all callers of
             // iterators.
-            ScQueryCellIterator aCellIter( pDok, nTab, aQueryParam);
+            ScDBQueryParamInternal* p = static_cast<ScDBQueryParamInternal*>(pQueryParam.get());
+            SCTAB nTab = p->nTab;
+            ScQueryCellIterator aCellIter( pDok, nTab, *p);
             if ( aCellIter.GetFirst() )
             {
                 do
@@ -6098,17 +6064,17 @@ void ScInterpreter::ScDBCount()
         }
         else
         {   // count only matching records with a value in the "result" field
-            double nVal;
-            USHORT nErr = 0;
-            ScQueryValueIterator aValIter( pDok, nTab, aQueryParam);
-            if ( aValIter.GetFirst( nVal, nErr) && !nErr )
+            ScDBQueryDataIterator aValIter( pDok, pQueryParam.release());
+            ScDBQueryDataIterator::Value aValue;
+            if ( aValIter.GetFirst(aValue) && !aValue.mnError )
             {
                 do
                 {
                     nCount++;
-                } while ( aValIter.GetNext( nVal, nErr) && !nErr );
+                }
+                while ( aValIter.GetNext(aValue) && !aValue.mnError );
             }
-            SetError( nErr );
+            SetError(aValue.mnError);
         }
         PushDouble( nCount );
     }
@@ -6120,21 +6086,24 @@ void ScInterpreter::ScDBCount()
 void ScInterpreter::ScDBCount2()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBCount2" );
-    SCTAB nTab;
-    ScQueryParam aQueryParam;
     BOOL bMissingField = TRUE;
-    if (GetDBParams( nTab, aQueryParam, bMissingField))
+    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+    if (pQueryParam.get())
     {
         ULONG nCount = 0;
-        ScQueryCellIterator aCellIter(pDok, nTab, aQueryParam);
-        if ( aCellIter.GetFirst() )
+        pQueryParam->mbSkipString = false;
+        ScDBQueryDataIterator aValIter( pDok, pQueryParam.release());
+        ScDBQueryDataIterator::Value aValue;
+        if ( aValIter.GetFirst(aValue) && !aValue.mnError )
         {
             do
             {
                 nCount++;
-            } while ( aCellIter.GetNext() );
+            }
+            while ( aValIter.GetNext(aValue) && !aValue.mnError );
         }
-        PushDouble(nCount);
+        SetError(aValue.mnError);
+        PushDouble( nCount );
     }
     else
         PushIllegalParameter();
@@ -6178,25 +6147,23 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount )
 
     rValCount = 0.0;
     double fSum    = 0.0;
-    SCTAB nTab;
-    ScQueryParam aQueryParam;
     BOOL bMissingField = FALSE;
-    if (GetDBParams( nTab, aQueryParam, bMissingField))
+    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+    if (pQueryParam.get())
     {
-        double fVal;
-        USHORT nErr;
-        ScQueryValueIterator aValIter(pDok, nTab, aQueryParam);
-        if (aValIter.GetFirst(fVal, nErr) && !nErr)
+        ScDBQueryDataIterator aValIter(pDok, pQueryParam.release());
+        ScDBQueryDataIterator::Value aValue;
+        if (aValIter.GetFirst(aValue) && !aValue.mnError)
         {
             do
             {
                 rValCount++;
-                values.push_back(fVal);
-                fSum += fVal;
+                values.push_back(aValue.mfValue);
+                fSum += aValue.mfValue;
             }
-            while ((nErr == 0) && aValIter.GetNext(fVal, nErr));
+            while ((aValue.mnError == 0) && aValIter.GetNext(aValue));
         }
-        SetError(nErr);
+        SetError(aValue.mnError);
     }
     else
         SetError( errIllegalParameter);
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index cb418476e9d9..dac5f0c99ac5 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: interpr2.cxx,v $
- * $Revision: 1.37.88.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svx/linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/stritem.hxx>
@@ -2102,7 +2099,7 @@ void ScInterpreter::ScStyle()
         PushIllegalParameter();
 }
 
-ScDdeLink* lcl_GetDdeLink( SvxLinkManager* pLinkMgr,
+ScDdeLink* lcl_GetDdeLink( sfx2::LinkManager* pLinkMgr,
                                 const String& rA, const String& rT, const String& rI, BYTE nM )
 {
     USHORT nCount = pLinkMgr->GetLinks().Count();
@@ -2145,7 +2142,7 @@ void ScInterpreter::ScDde()
         //  temporary documents (ScFunctionAccess) have no DocShell
         //  and no LinkManager -> abort
 
-        SvxLinkManager* pLinkMgr = pDok->GetLinkManager();
+        sfx2::LinkManager* pLinkMgr = pDok->GetLinkManager();
         if (!pLinkMgr)
         {
             PushNoValue();
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 4d4a59509fca..bcea57703d78 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: interpr3.cxx,v $
- * $Revision: 1.25 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 2880d7708b10..8a6c0df0db16 100644..100755
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: interpr4.cxx,v $
- * $Revision: 1.57.92.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -68,15 +65,18 @@
 #include "jumpmatrix.hxx"
 #include "parclass.hxx"
 #include "externalrefmgr.hxx"
+#include "doubleref.hxx"
 
 #include <math.h>
 #include <float.h>
 #include <map>
 #include <algorithm>
 #include <functional>
+#include <memory>
 
 using namespace com::sun::star;
 using namespace formula;
+using ::std::auto_ptr;
 
 #define ADDIN_MAXSTRLEN 256
 
@@ -1222,6 +1222,42 @@ void ScInterpreter::DoubleRefToVars( const ScToken* p,
     }
 }
 
+ScDBRangeBase* ScInterpreter::PopDoubleRef()
+{
+    if (!sp)
+    {
+        SetError(errUnknownStackVariable);
+        return NULL;
+    }
+
+    --sp;
+    FormulaToken* p = pStack[sp];
+    switch (p->GetType())
+    {
+        case svError:
+            nGlobalError = p->GetError();
+        break;
+        case svDoubleRef:
+        {
+            SCCOL nCol1, nCol2;
+            SCROW nRow1, nRow2;
+            SCTAB nTab1, nTab2;
+            DoubleRefToVars(static_cast<ScToken*>(p),
+                            nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, false);
+
+            return new ScDBInternalRange(pDok,
+                ScRange(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2));
+        }
+        case svMatrix:
+        {
+            ScMatrixRef pMat = static_cast<ScToken*>(p)->GetMatrix();
+            return new ScDBExternalRange(pDok, pMat);
+        }
+        default:
+            SetError( errIllegalParameter);
+    }
+    return NULL;
+}
 
 void ScInterpreter::PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
                                  SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
@@ -2055,78 +2091,37 @@ ScMatValType ScInterpreter::GetDoubleOrStringFromMatrix( double& rDouble,
 void ScInterpreter::ScDBGet()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBGet" );
-    SCTAB nTab;
-    ScQueryParam aQueryParam;
     BOOL bMissingField = FALSE;
-    if (GetDBParams( nTab, aQueryParam, bMissingField))
+    auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
+    if (!pQueryParam.get())
     {
-        ScBaseCell* pCell;
-        ScQueryCellIterator aCellIter(pDok, nTab, aQueryParam);
-        if ( (pCell = aCellIter.GetFirst()) != NULL )
-        {
-            if (aCellIter.GetNext())
-                PushIllegalArgument();
-            else
-            {
-                switch (pCell->GetCellType())
-                {
-                    case CELLTYPE_VALUE:
-                    {
-                        double rValue = ((ScValueCell*)pCell)->GetValue();
-                        if ( bCalcAsShown )
-                        {
-                            ULONG nFormat;
-                            nFormat = aCellIter.GetNumberFormat();
-                            rValue = pDok->RoundValueAsShown( rValue, nFormat );
-                        }
-                        PushDouble(rValue);
-                    }
-                    break;
-                    case CELLTYPE_STRING:
-                    {
-                        String rString;
-                        ((ScStringCell*)pCell)->GetString(rString);
-                        PushString(rString);
-                    }
-                    break;
-                    case CELLTYPE_EDIT:
-                    {
-                        String rString;
-                        ((ScEditCell*)pCell)->GetString(rString);
-                        PushString(rString);
-                    }
-                    break;
-                    case CELLTYPE_FORMULA:
-                    {
-                        USHORT rErr = ((ScFormulaCell*)pCell)->GetErrCode();
-                        if (rErr)
-                            PushError(rErr);
-                        else if (((ScFormulaCell*)pCell)->IsValue())
-                        {
-                            double rValue = ((ScFormulaCell*)pCell)->GetValue();
-                            PushDouble(rValue);
-                        }
-                        else
-                        {
-                            String rString;
-                            ((ScFormulaCell*)pCell)->GetString(rString);
-                            PushString(rString);
-                        }
-                    }
-                    break;
-                    case CELLTYPE_NONE:
-                    case CELLTYPE_NOTE:
-                    default:
-                        PushIllegalArgument();
-                    break;
-                }
-            }
-        }
-        else
-            PushNoValue();
+        // Failed to create query param.
+        PushIllegalParameter();
+        return;
     }
+
+    pQueryParam->mbSkipString = false;
+    ScDBQueryDataIterator aValIter(pDok, pQueryParam.release());
+    ScDBQueryDataIterator::Value aValue;
+    if (!aValIter.GetFirst(aValue) || aValue.mnError)
+    {
+        // No match found.
+        PushNoValue();
+        return;
+    }
+
+    ScDBQueryDataIterator::Value aValNext;
+    if (aValIter.GetNext(aValNext) && !aValNext.mnError)
+    {
+        // There should be only one unique match.
+        PushIllegalArgument();
+        return;
+    }
+
+    if (aValue.mbIsNumber)
+        PushDouble(aValue.mfValue);
     else
-        PushIllegalParameter();
+        PushString(aValue.maString);
 }
 
 
@@ -3336,7 +3331,7 @@ void ScInterpreter::ScSpewFunc()
 #include "sctictac.hxx"
 #include "scmod.hxx"
 
-extern "C" { static void SAL_CALL thisModule() {} }
+//extern "C" { static void SAL_CALL thisModule() {} }
 
 void ScInterpreter::ScGame()
 {
@@ -3491,19 +3486,6 @@ int main()
                             SetError( errIllegalParameter );
                     }
                     break;
-                    case SC_GAME_STARWARS :
-                    {
-                        oslModule m_tfu = osl_loadModuleRelative(&thisModule, rtl::OUString::createFromAscii( SVLIBRARY( "tfu" ) ).pData, SAL_LOADMODULE_NOW);
-                        typedef void StartInvader_Type (Window*, ResMgr*);
-
-                        StartInvader_Type *StartInvader = (StartInvader_Type *) osl_getFunctionSymbol( m_tfu, rtl::OUString::createFromAscii("StartInvader").pData );
-                        if ( StartInvader )
-                            StartInvader( Application::GetDefDialogParent(), ResMgr::CreateResMgr( "tfu" ));
-                    }
-                    break;
-                    case SC_GAME_FROGGER :
-                        //Game();
-                    break;
                     default:
                     {
                         // added to avoid warnings
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 482748cbb547..ba4322a3281a 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: interpr5.cxx,v $
- * $Revision: 1.33.36.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index e8b69a4e6eda..1e3a9a292f16 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: interpr6.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/lookupcache.cxx b/sc/source/core/tool/lookupcache.cxx
index 192fc2e9e8a0..3ba66011d0e4 100644
--- a/sc/source/core/tool/lookupcache.cxx
+++ b/sc/source/core/tool/lookupcache.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lookupcache.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/makefile.mk b/sc/source/core/tool/makefile.mk
index 52d9bad7c18c..0bc433a7b187 100644
--- a/sc/source/core/tool/makefile.mk
+++ b/sc/source/core/tool/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.30.168.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -76,6 +72,7 @@ SLOFILES =  \
         $(SLO)$/detdata.obj  \
         $(SLO)$/detfunc.obj  \
         $(SLO)$/docoptio.obj \
+        $(SLO)$/doubleref.obj \
         $(SLO)$/editutil.obj \
         $(SLO)$/filtopt.obj \
         $(SLO)$/formulaparserpool.obj \
@@ -95,6 +92,7 @@ SLOFILES =  \
         $(SLO)$/printopt.obj \
         $(SLO)$/prnsave.obj \
         $(SLO)$/progress.obj \
+        $(SLO)$/queryparam.obj \
         $(SLO)$/rangelst.obj \
         $(SLO)$/rangenam.obj \
         $(SLO)$/rangeseq.obj \
@@ -122,6 +120,7 @@ EXCEPTIONSFILES= \
         $(SLO)$/chartlock.obj \
         $(SLO)$/chgtrack.obj \
         $(SLO)$/compiler.obj \
+        $(SLO)$/doubleref.obj \
         $(SLO)$/formulaparserpool.obj \
         $(SLO)$/interpr1.obj \
         $(SLO)$/interpr2.obj \
@@ -130,6 +129,7 @@ EXCEPTIONSFILES= \
         $(SLO)$/interpr5.obj \
         $(SLO)$/lookupcache.obj \
         $(SLO)$/prnsave.obj \
+        $(SLO)$/queryparam.obj \
         $(SLO)$/reftokenhelper.obj \
         $(SLO)$/token.obj
 
diff --git a/sc/source/core/tool/navicfg.cxx b/sc/source/core/tool/navicfg.cxx
index 400da97b25ea..0991071774ed 100644
--- a/sc/source/core/tool/navicfg.cxx
+++ b/sc/source/core/tool/navicfg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navicfg.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx
index c89880a4c39f..0ffaa4aae025 100644
--- a/sc/source/core/tool/odffmap.cxx
+++ b/sc/source/core/tool/odffmap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: odffmap.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx
index 36fea8a5e899..4de458f698da 100644
--- a/sc/source/core/tool/optutil.cxx
+++ b/sc/source/core/tool/optutil.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optutil.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 5f2094d2f0f7..a863bc0a68c2 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: parclass.cxx,v $
- * $Revision: 1.12.148.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index 87a64874f651..c701c558310b 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printopt.cxx,v $
- * $Revision: 1.7.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx
index 7640913ae568..b432f585e854 100644
--- a/sc/source/core/tool/prnsave.cxx
+++ b/sc/source/core/tool/prnsave.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prnsave.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index a24c33cf6255..a2fa45764bcc 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: progress.cxx,v $
- * $Revision: 1.7.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
new file mode 100644
index 000000000000..47418ec85f4d
--- /dev/null
+++ b/sc/source/core/tool/queryparam.cxx
@@ -0,0 +1,365 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: interpr4.cxx,v $
+ * $Revision: 1.57.92.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sc.hxx"
+
+// INCLUDE ---------------------------------------------------------------
+
+#include "queryparam.hxx"
+
+using ::std::vector;
+
+// ============================================================================
+
+ScQueryParamBase::ScQueryParamBase()
+{
+    Resize( MAXQUERY );
+    for (USHORT i=0; i<MAXQUERY; i++)
+        maEntries[i].Clear();
+}
+
+ScQueryParamBase::ScQueryParamBase(const ScQueryParamBase& r) :
+    bHasHeader(r.bHasHeader), bByRow(r.bByRow), bInplace(r.bInplace), bCaseSens(r.bCaseSens),
+    bRegExp(r.bRegExp), bDuplicate(r.bDuplicate), bMixedComparison(r.bMixedComparison),
+    maEntries(r.maEntries)
+{
+}
+
+ScQueryParamBase::~ScQueryParamBase()
+{
+}
+
+SCSIZE ScQueryParamBase::GetEntryCount() const
+{
+    return maEntries.size();
+}
+
+ScQueryEntry& ScQueryParamBase::GetEntry(SCSIZE n) const
+{
+    return maEntries[n];
+}
+
+void ScQueryParamBase::Resize(SCSIZE nNew)
+{
+    if ( nNew < MAXQUERY )
+        nNew = MAXQUERY;                // nie weniger als MAXQUERY
+
+    vector<ScQueryEntry> aNewEntries(nNew);
+    SCSIZE nCopy = ::std::min(maEntries.size(), nNew);
+    for (SCSIZE i=0; i<nCopy; i++)
+        aNewEntries[i] = maEntries[i];
+
+    maEntries.swap(aNewEntries);
+}
+
+void ScQueryParamBase::DeleteQuery( SCSIZE nPos )
+{
+    if (nPos >= maEntries.size())
+        return;
+
+    size_t n = maEntries.size();
+    vector<ScQueryEntry> aNewEntries;
+    aNewEntries.reserve(n);
+    for (size_t i = 0; i < n; ++i)
+        if (i != nPos)
+            aNewEntries.push_back(maEntries[i]);
+
+    // Don't forget to append an empty entry to make up for the removed one.
+    // The size of the entries is not supposed to change.
+    aNewEntries.push_back(ScQueryEntry());
+
+    maEntries.swap(aNewEntries);
+}
+
+void ScQueryParamBase::FillInExcelSyntax(String& aCellStr, SCSIZE nIndex)
+{
+    if (aCellStr.Len() > 0)
+    {
+        if ( nIndex >= maEntries.size() )
+            Resize( nIndex+1 );
+
+        ScQueryEntry& rEntry = GetEntry(nIndex);
+
+        rEntry.bDoQuery = TRUE;
+        // Operatoren herausfiltern
+        if (aCellStr.GetChar(0) == '<')
+        {
+            if (aCellStr.GetChar(1) == '>')
+            {
+                *rEntry.pStr = aCellStr.Copy(2);
+                rEntry.eOp   = SC_NOT_EQUAL;
+            }
+            else if (aCellStr.GetChar(1) == '=')
+            {
+                *rEntry.pStr = aCellStr.Copy(2);
+                rEntry.eOp   = SC_LESS_EQUAL;
+            }
+            else
+            {
+                *rEntry.pStr = aCellStr.Copy(1);
+                rEntry.eOp   = SC_LESS;
+            }
+        }
+        else if (aCellStr.GetChar(0) == '>')
+        {
+            if (aCellStr.GetChar(1) == '=')
+            {
+                *rEntry.pStr = aCellStr.Copy(2);
+                rEntry.eOp   = SC_GREATER_EQUAL;
+            }
+            else
+            {
+                *rEntry.pStr = aCellStr.Copy(1);
+                rEntry.eOp   = SC_GREATER;
+            }
+        }
+        else
+        {
+            if (aCellStr.GetChar(0) == '=')
+                *rEntry.pStr = aCellStr.Copy(1);
+            else
+                *rEntry.pStr = aCellStr;
+            rEntry.eOp = SC_EQUAL;
+        }
+    }
+}
+
+// ============================================================================
+
+ScQueryParamTable::ScQueryParamTable()
+{
+}
+
+ScQueryParamTable::ScQueryParamTable(const ScQueryParamTable& r) :
+    nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nTab(r.nTab)
+{
+}
+
+ScQueryParamTable::~ScQueryParamTable()
+{
+}
+
+// ============================================================================
+
+ScQueryParam::ScQueryParam() :
+    ScQueryParamBase(),
+    ScQueryParamTable()
+{
+    Clear();
+}
+
+//------------------------------------------------------------------------
+
+ScQueryParam::ScQueryParam( const ScQueryParam& r ) :
+    ScQueryParamBase(r),
+    ScQueryParamTable(r),
+    bDestPers(r.bDestPers), nDestTab(r.nDestTab), nDestCol(r.nDestCol), nDestRow(r.nDestRow)
+{
+}
+
+ScQueryParam::ScQueryParam( const ScDBQueryParamInternal& r ) :
+    ScQueryParamBase(r),
+    ScQueryParamTable(r),
+    bDestPers(true),
+    nDestTab(0),
+    nDestCol(0),
+    nDestRow(0)
+{
+}
+
+
+//------------------------------------------------------------------------
+
+ScQueryParam::~ScQueryParam()
+{
+}
+
+//------------------------------------------------------------------------
+
+void ScQueryParam::Clear()
+{
+    nCol1=nCol2 = 0;
+    nRow1=nRow2 = 0;
+    nTab = SCTAB_MAX;
+    bHasHeader = bCaseSens = bRegExp = bMixedComparison = FALSE;
+    bInplace = bByRow = bDuplicate = TRUE;
+
+    Resize( MAXQUERY );
+    for (USHORT i=0; i<MAXQUERY; i++)
+        maEntries[i].Clear();
+
+    ClearDestParams();
+}
+
+void ScQueryParam::ClearDestParams()
+{
+    bDestPers = true;
+    nDestTab = 0;
+    nDestCol = 0;
+    nDestRow = 0;
+}
+
+//------------------------------------------------------------------------
+
+ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )
+{
+    nCol1       = r.nCol1;
+    nRow1       = r.nRow1;
+    nCol2       = r.nCol2;
+    nRow2       = r.nRow2;
+    nTab        = r.nTab;
+    nDestTab    = r.nDestTab;
+    nDestCol    = r.nDestCol;
+    nDestRow    = r.nDestRow;
+    bHasHeader  = r.bHasHeader;
+    bInplace    = r.bInplace;
+    bCaseSens   = r.bCaseSens;
+    bRegExp     = r.bRegExp;
+    bMixedComparison = r.bMixedComparison;
+    bDuplicate  = r.bDuplicate;
+    bByRow      = r.bByRow;
+    bDestPers   = r.bDestPers;
+
+    maEntries = r.maEntries;
+
+    return *this;
+}
+
+//------------------------------------------------------------------------
+
+BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
+{
+    BOOL bEqual = FALSE;
+
+    // Anzahl der Queries gleich?
+    SCSIZE nUsed      = 0;
+    SCSIZE nOtherUsed = 0;
+    SCSIZE nEntryCount = GetEntryCount();
+    SCSIZE nOtherEntryCount = rOther.GetEntryCount();
+
+    while ( nUsed<nEntryCount && maEntries[nUsed].bDoQuery ) ++nUsed;
+    while ( nOtherUsed<nOtherEntryCount && rOther.maEntries[nOtherUsed].bDoQuery )
+        ++nOtherUsed;
+
+    if (   (nUsed       == nOtherUsed)
+        && (nCol1       == rOther.nCol1)
+        && (nRow1       == rOther.nRow1)
+        && (nCol2       == rOther.nCol2)
+        && (nRow2       == rOther.nRow2)
+        && (nTab        == rOther.nTab)
+        && (bHasHeader  == rOther.bHasHeader)
+        && (bByRow      == rOther.bByRow)
+        && (bInplace    == rOther.bInplace)
+        && (bCaseSens   == rOther.bCaseSens)
+        && (bRegExp     == rOther.bRegExp)
+        && (bMixedComparison == rOther.bMixedComparison)
+        && (bDuplicate  == rOther.bDuplicate)
+        && (bDestPers   == rOther.bDestPers)
+        && (nDestTab    == rOther.nDestTab)
+        && (nDestCol    == rOther.nDestCol)
+        && (nDestRow    == rOther.nDestRow) )
+    {
+        bEqual = TRUE;
+        for ( SCSIZE i=0; i<nUsed && bEqual; i++ )
+            bEqual = maEntries[i] == rOther.maEntries[i];
+    }
+    return bEqual;
+}
+
+//------------------------------------------------------------------------
+
+void ScQueryParam::MoveToDest()
+{
+    if (!bInplace)
+    {
+        SCsCOL nDifX = ((SCsCOL) nDestCol) - ((SCsCOL) nCol1);
+        SCsROW nDifY = ((SCsROW) nDestRow) - ((SCsROW) nRow1);
+        SCsTAB nDifZ = ((SCsTAB) nDestTab) - ((SCsTAB) nTab);
+
+        nCol1 = sal::static_int_cast<SCCOL>( nCol1 + nDifX );
+        nRow1 = sal::static_int_cast<SCROW>( nRow1 + nDifY );
+        nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );
+        nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );
+        nTab  = sal::static_int_cast<SCTAB>( nTab  + nDifZ );
+        size_t n = maEntries.size();
+        for (size_t i=0; i<n; i++)
+            maEntries[i].nField += nDifX;
+
+        bInplace = TRUE;
+    }
+    else
+    {
+        DBG_ERROR("MoveToDest, bInplace == TRUE");
+    }
+}
+
+// ============================================================================
+
+ScDBQueryParamBase::ScDBQueryParamBase(DataType eType) :
+    ScQueryParamBase(),
+    mnField(-1),
+    mbSkipString(true),
+    meType(eType)
+{
+}
+
+ScDBQueryParamBase::~ScDBQueryParamBase()
+{
+}
+
+ScDBQueryParamBase::DataType ScDBQueryParamBase::GetType() const
+{
+    return meType;
+}
+
+// ============================================================================
+
+ScDBQueryParamInternal::ScDBQueryParamInternal() :
+    ScDBQueryParamBase(ScDBQueryParamBase::INTERNAL),
+    ScQueryParamTable()
+{
+}
+
+ScDBQueryParamInternal::~ScDBQueryParamInternal()
+{
+}
+
+// ============================================================================
+
+ScDBQueryParamMatrix::ScDBQueryParamMatrix() :
+    ScDBQueryParamBase(ScDBQueryParamBase::MATRIX)
+{
+}
+
+ScDBQueryParamMatrix::~ScDBQueryParamMatrix()
+{
+}
+
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 775b0207be59..d0dd8ec9c163 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rangelst.cxx,v $
- * $Revision: 1.11.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 7795256dce3c..e81f1f3bd94d 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rangenam.cxx,v $
- * $Revision: 1.28.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx
index 078f9a774c09..5584fb1c37e2 100644
--- a/sc/source/core/tool/rangeseq.cxx
+++ b/sc/source/core/tool/rangeseq.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rangeseq.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 4a26a5004799..9f6526a54cf6 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rangeutl.cxx,v $
- * $Revision: 1.12.30.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx
index ce1d91c28744..6da946463697 100644
--- a/sc/source/core/tool/rechead.cxx
+++ b/sc/source/core/tool/rechead.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rechead.cxx,v $
- * $Revision: 1.6.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx
index c96ce2763cd3..47774d348044 100644
--- a/sc/source/core/tool/refdata.cxx
+++ b/sc/source/core/tool/refdata.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: refdata.cxx,v $
- * $Revision: 1.7.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx
index e98a8a8165cb..cdb5962b2b9c 100644
--- a/sc/source/core/tool/reffind.cxx
+++ b/sc/source/core/tool/reffind.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: reffind.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx
index 45ccbc187b4e..5520aac6d6eb 100644
--- a/sc/source/core/tool/refreshtimer.cxx
+++ b/sc/source/core/tool/refreshtimer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: refreshtimer.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx
index 53a87667e8c6..f4976a914c39 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: token.hxx,v $
- * $Revision: 1.15.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx
index 1f70ef80963c..ad11190be75d 100644
--- a/sc/source/core/tool/refupdat.cxx
+++ b/sc/source/core/tool/refupdat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: refupdat.cxx,v $
- * $Revision: 1.8.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 6195164e34fa..326fda49eb30 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scmatrix.cxx,v $
- * $Revision: 1.17.136.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/sctictac.cxx b/sc/source/core/tool/sctictac.cxx
index e3e882de956a..d784f45deb87 100644
--- a/sc/source/core/tool/sctictac.cxx
+++ b/sc/source/core/tool/sctictac.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sctictac.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxx
index c8061441abfc..077b5a9d9751 100644
--- a/sc/source/core/tool/subtotal.cxx
+++ b/sc/source/core/tool/subtotal.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: subtotal.cxx,v $
- * $Revision: 1.7.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index e4a97d96d2e4..81862c49fd21 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: token.cxx,v $
- * $Revision: 1.33.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx
index 477316b4c0fb..21f80cb1c628 100644
--- a/sc/source/core/tool/unitconv.cxx
+++ b/sc/source/core/tool/unitconv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unitconv.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index 24dd852c6a5f..08609eeff940 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: userlist.cxx,v $
- * $Revision: 1.11.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index de32467d561b..7dc36bc1b548 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewopti.cxx,v $
- * $Revision: 1.9.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index 62a6b48c4da0..b505e5a5051c 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zforauto.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index fc891c864a79..69421879983e 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: difexp.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 77803d338788..2088cc84a791 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: difimp.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/dif/makefile.mk b/sc/source/filter/dif/makefile.mk
index 9d571c71fa9d..c24de4cb4164 100644
--- a/sc/source/filter/dif/makefile.mk
+++ b/sc/source/filter/dif/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx
index b1ec8752de7b..3a48aa6b96ba 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: colrowst.cxx,v $
- * $Revision: 1.34.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,6 +40,7 @@
 #include "xltable.hxx"
 #include "xistream.hxx"
 #include "xistyle.hxx"
+#include "queryparam.hxx"
 
 // for filter manager
 #include "excimp8.hxx"
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index 998208541157..b5e0f25f516c 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: excdoc.cxx,v $
- * $Revision: 1.69.60.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,8 +37,8 @@
 #include <svx/svdobj.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/zformat.hxx>
 #include <sot/storage.hxx>
@@ -235,7 +232,7 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
             Add( new XclExpFilePass( GetRoot() ) );
         Add( new XclExpInterfaceHdr( nCodePage ) );
         Add( new XclExpUInt16Record( EXC_ID_MMS, 0 ) );
-        Add( new XclExpEmptyRecord( EXC_ID_INTERFACEEND ) );
+        Add( new XclExpInterfaceEnd );
         Add( new XclExpWriteAccess );
     }
 
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 41529b66346f..3a43a23cd624 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: excel.cxx,v $
- * $Revision: 1.26.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 6d83f263d47b..5642c098027e 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: excform.cxx,v $
- * $Revision: 1.52.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index 10fc15c633b6..608d65dfc801 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: excform8.cxx,v $
- * $Revision: 1.47.134.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index a172bd63e69b..e424ad2d95fe 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: excimp8.cxx,v $
- * $Revision: 1.127.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,21 +37,21 @@
 
 #include <svtools/wmf.hxx>
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editstat.hxx>
-#include <svx/colritem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/flditem.hxx>
 #include <svx/xflclit.hxx>
 #include <filter/msfilter/svxmsbas.hxx>
 
@@ -117,7 +114,7 @@ using namespace com::sun::star;
 
 
 ImportExcel8::ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ) :
-    ImportExcel( rImpData, rStrm )
+    ImportExcel( rImpData, rStrm ), mnTab(0)
 {
     delete pFormConv;
 
@@ -240,9 +237,15 @@ void ImportExcel8::Codename( BOOL bWorkbookGlobals )
         if( aName.Len() )
         {
             if( bWorkbookGlobals )
+            {
                 GetExtDocOptions().GetDocSettings().maGlobCodeName = aName;
+                GetDoc().SetCodeName( aName );
+            }
             else
+            {
                 GetExtDocOptions().AppendCodeName( aName );
+                GetDoc().SetCodeName( mnTab++, aName );
+            }
         }
     }
 }
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index ce824fa70e44..d49c04624cdf 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: excrecds.cxx,v $
- * $Revision: 1.88 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,27 +38,27 @@
 #include <filter/msfilter/countryid.hxx>
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <sfx2/objsh.hxx>
 
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editstat.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
 
-#include <svx/flditem.hxx>
-#include <svx/flstitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/flstitem.hxx>
 
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/paperinf.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/escpitem.hxx>
+#include <editeng/paperinf.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/escpitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx
index d698278d9d3c..ba4a8339c829 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: exctools.cxx,v $
- * $Revision: 1.61.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,12 +33,12 @@
 //------------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editstat.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
 
 #include "document.hxx"
 #include "patattr.hxx"
diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index 1a79aef3f0ec..d28fa2063c91 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: expop2.cxx,v $
- * $Revision: 1.35.14.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx
index f1e2c920a731..dca6723181ae 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontbuff.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,14 +31,14 @@
 #include "lotfntbf.hxx"
 
 #include "scitems.hxx"
-#include <svx/cntritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <sfx2/printer.hxx>
 
 #include "attrib.hxx"
diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx
index db50598d30b6..78883b4a5c76 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmbase.cxx,v $
- * $Revision: 1.10.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 7003cc683688..dfb3a69c219a 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impop.cxx,v $
- * $Revision: 1.95.36.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,15 +33,15 @@
 #include <filter/msfilter/countryid.hxx>
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editstat.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/flditem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/docfile.hxx>
 #include <svl/zforlist.hxx>
diff --git a/sc/source/filter/excel/makefile.mk b/sc/source/filter/excel/makefile.mk
index 4c94b0712d89..33a5babda815 100644
--- a/sc/source/filter/excel/makefile.mk
+++ b/sc/source/filter/excel/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.42.90.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index b01f5a728263..7db7d17ed307 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: namebuff.cxx,v $
- * $Revision: 1.26.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 6f0f214d3938..91b749030dd7 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: read.cxx,v $
- * $Revision: 1.70.88.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 34c2b9284fed..8685f404543a 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tokstack.cxx,v $
- * $Revision: 1.14.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 261bf8c42e30..637aacd4e722 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xechart.cxx,v $
- * $Revision: 1.10.62.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index ad51304b3e3e..7bfd57be7290 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xecontent.cxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,8 +40,8 @@
 #include <svl/itemset.hxx>
 #include <formula/grammar.hxx>
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/flditem.hxx>
 #include "document.hxx"
 #include "validat.hxx"
 #include "unonames.hxx"
@@ -748,19 +745,19 @@ void XclExpCFImpl::WriteBody( XclExpStream& rStrm )
             // font used flag for underline -> 0 = used, 1 = default
             sal_uInt32 nFontFlags3 = mbUnderlUsed ? 0 : EXC_CF_FONT_UNDERL;
 
-            rStrm.WriteZeroBytes( 64 );
+            rStrm.WriteZeroBytesToRecord( 64 );
             rStrm   << nHeight
                     << nStyle
                     << maFontData.mnWeight
                     << EXC_FONTESC_NONE
                     << maFontData.mnUnderline;
-            rStrm.WriteZeroBytes( 3 );
+            rStrm.WriteZeroBytesToRecord( 3 );
             rStrm   << nColor
                     << sal_uInt32( 0 )
                     << nFontFlags1
                     << EXC_CF_FONT_ESCAPEM      // escapement never used -> set the flag
                     << nFontFlags3;
-            rStrm.WriteZeroBytes( 16 );
+            rStrm.WriteZeroBytesToRecord( 16 );
             rStrm   << sal_uInt16( 1 );         // must be 1
         }
 
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index af1a90291b99..1f46bdb66178 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xeescher.cxx,v $
- * $Revision: 1.24.128.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,8 +49,8 @@
 #include <vcl/bmpacc.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdocapt.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/editobj.hxx>
 
 #include "editutil.hxx"
 #include "unonames.hxx"
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 849ac080bb1d..34e48671a3bc 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xeformula.cxx,v $
- * $Revision: 1.25.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 30b30639f7c7..bce037bd05c1 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xehelper.cxx,v $
- * $Revision: 1.31.148.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,15 +35,15 @@
 #include <svl/itemset.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include "scitems.hxx"
-#include <svx/fhgtitem.hxx>
-#include <svx/flstitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/svxfont.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/flstitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/svxfont.hxx>
 
 #define _SVSTDARR_USHORTS
 #include <svl/svstdarr.hxx>
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 46fcd166ecf1..421a15b6da95 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xelink.cxx,v $
- * $Revision: 1.21.134.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index 004fbfa2932c..af275bef7eef 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xename.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx
index 47414c07bec8..753d43e8d584 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xepage.cxx,v $
- * $Revision: 1.15.90.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,10 +34,10 @@
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/brshitem.hxx>
 #include "document.hxx"
 #include "stlpool.hxx"
 #include "stlsheet.hxx"
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 8680623dc29b..cb248f0eaf76 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xepivot.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx
index b422781db143..853a0e52bc8b 100644
--- a/sc/source/filter/excel/xerecord.cxx
+++ b/sc/source/filter/excel/xerecord.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xerecord.cxx,v $
- * $Revision: 1.10.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx
index 45f90732b070..922adceb061b 100644
--- a/sc/source/filter/excel/xeroot.cxx
+++ b/sc/source/filter/excel/xeroot.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xeroot.cxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 1dd1bbc747f7..f828079c8735 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xestream.cxx,v $
- * $Revision: 1.11.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -259,6 +256,17 @@ void XclExpStream::WriteZeroBytes( sal_Size nBytes )
         WriteRawZeroBytes( nBytes );
 }
 
+void XclExpStream::WriteZeroBytesToRecord( sal_Size nBytes )
+{
+    if (!mbInRec)
+        // not in record.
+        return;
+
+    sal_uInt8 nZero = 0;
+    for (sal_Size i = 0; i < nBytes; ++i)
+        *this << nZero;
+}
+
 sal_Size XclExpStream::CopyFromStream( SvStream& rInStrm, sal_Size nBytes )
 {
     sal_Size nStrmPos = rInStrm.Tell();
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index b657e3b1f1d0..cd0b083aa208 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xestring.cxx,v $
- * $Revision: 1.13.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index f70452461682..315282098cec 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xestyle.cxx,v $
- * $Revision: 1.33.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,14 +39,14 @@
 #include <sfx2/printer.hxx>
 #include "scitems.hxx"
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/bolnitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/bolnitem.hxx>
 #include <svx/rotmodit.hxx>
-#include <svx/colritem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/escpitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/escpitem.hxx>
 #include "document.hxx"
 #include "stlpool.hxx"
 #include "stlsheet.hxx"
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 1583828706cc..e9aaa70bceba 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xetable.cxx,v $
- * $Revision: 1.18.126.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx
index 649bc0de32e6..c342b5a40ea1 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xeview.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index dc542a1c1eeb..4470bf789412 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xichart.cxx,v $
- * $Revision: 1.20.62.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,6 +31,7 @@
 #include "xichart.hxx"
 
 #include <algorithm>
+#include <memory>
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/drawing/Direction3D.hpp>
@@ -72,6 +70,8 @@
 #include "tokenarray.hxx"
 #include "token.hxx"
 #include "compiler.hxx"
+#include "reftokenhelper.hxx"
+#include "chartlis.hxx"
 #include "fprogressbar.hxx"
 #include "xltracer.hxx"
 #include "xistream.hxx"
@@ -123,6 +123,8 @@ using ::com::sun::star::chart2::data::XDataSequence;
 using ::formula::FormulaToken;
 using ::formula::StackVar;
 
+using ::std::vector;
+
 // Helpers ====================================================================
 
 namespace {
@@ -791,6 +793,22 @@ Sequence< Reference< XFormattedString > > XclImpChSourceLink::CreateStringSequen
     return ScfApiHelper::VectorToSequence( aStringVec );
 }
 
+void XclImpChSourceLink::FillSourceLink(vector<ScSharedTokenRef>& rTokens) const
+{
+    if (!mxTokenArray.is())
+        // no links to fill.
+        return;
+
+    mxTokenArray->Reset();
+    for (FormulaToken* p = mxTokenArray->First(); p; p = mxTokenArray->Next())
+    {
+        ScSharedTokenRef pToken(static_cast<ScToken*>(p->Clone()));
+        if (ScRefTokenHelper::isRef(pToken))
+            // This is a reference token.  Store it.
+            ScRefTokenHelper::join(rTokens, pToken);
+    }
+}
+
 // Text =======================================================================
 
 XclImpChFontBase::~XclImpChFontBase()
@@ -1837,6 +1855,18 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const
     return xDataSeries;
 }
 
+void XclImpChSeries::FillAllSourceLinks(vector<ScSharedTokenRef>& rTokens) const
+{
+    if (mxValueLink.is())
+        mxValueLink->FillSourceLink(rTokens);
+    if (mxCategLink.is())
+        mxCategLink->FillSourceLink(rTokens);
+    if (mxTitleLink.is())
+        mxTitleLink->FillSourceLink(rTokens);
+    if (mxBubbleLink.is())
+        mxBubbleLink->FillSourceLink(rTokens);
+}
+
 void XclImpChSeries::ReadChSourceLink( XclImpStream& rStrm )
 {
     XclImpChSourceLinkRef xSrcLink( new XclImpChSourceLink( GetChRoot() ) );
@@ -3483,7 +3513,7 @@ XclImpChTextRef XclImpChChart::GetDefaultText( XclChTextType eTextType ) const
     return maDefTexts.get( nDefTextId );
 }
 
-void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressBar& rProgress ) const
+void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressBar& rProgress, const OUString& rObjName ) const
 {
     // initialize conversion (locks the model to suppress any internal updates)
     InitConversion( xChartDoc );
@@ -3526,6 +3556,28 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressB
 
     // unlock the model
     FinishConversion( rProgress );
+
+    ScDocument* pDoc = &GetRoot().GetDoc();
+    ScChartListenerCollection* pChartCollection = pDoc->GetChartListenerCollection();
+    if (pChartCollection)
+    {
+        // Now, start listening to this chart.
+        ::std::auto_ptr< vector<ScSharedTokenRef> > pRefTokens(new vector<ScSharedTokenRef>);
+        for (XclImpChSeriesVec::const_iterator itr = maSeries.begin(), itrEnd = maSeries.end(); itr != itrEnd; ++itr)
+        {
+            const XclImpChSeriesRef& rSeries = *itr;
+            rSeries->FillAllSourceLinks(*pRefTokens);
+        }
+        if (!pRefTokens->empty())
+        {
+            ::std::auto_ptr<ScChartListener> pListener(
+                new ScChartListener(rObjName, pDoc, pRefTokens.release()));
+            pListener->SetUsed(true);
+            pListener->StartListeningTo();
+            pChartCollection->Insert(pListener.release());
+
+        }
+    }
 }
 
 void XclImpChChart::ReadChSeries( XclImpStream& rStrm )
@@ -3751,11 +3803,11 @@ sal_Size XclImpChart::GetProgressSize() const
     return mxChartData.is() ? mxChartData->GetProgressSize() : 0;
 }
 
-void XclImpChart::Convert( Reference< XModel > xModel, ScfProgressBar& rProgress ) const
+void XclImpChart::Convert( Reference< XModel > xModel, ScfProgressBar& rProgress, const OUString& rObjName ) const
 {
     Reference< XChartDocument > xChartDoc( xModel, UNO_QUERY );
     if( mxChartData.is() && xChartDoc.is() )
-        mxChartData->Convert( xChartDoc, rProgress );
+        mxChartData->Convert( xChartDoc, rProgress, rObjName );
 }
 
 void XclImpChart::ReadChChart( XclImpStream& rStrm )
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 444cf4c848d1..9c130d2ebb78 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xicontent.cxx,v $
- * $Revision: 1.31.88.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,21 +31,21 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <tools/urlobj.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
-#include <svx/linkmgr.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <svl/itemset.hxx>
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
 #include "document.hxx"
 #include "editutil.hxx"
 #include "cell.hxx"
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index dece34280d8b..e963495a3f4b 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xiescher.cxx,v $
- * $Revision: 1.57.52.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -79,18 +76,18 @@
 #include <svx/svdocapt.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/editobj.hxx>
-#include <svx/outliner.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/svditer.hxx>
-#include <svx/writingmodeitem.hxx>
+#include <editeng/writingmodeitem.hxx>
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/colritem.hxx>
 #include <svx/xflclit.hxx>
-#include <svx/adjitem.hxx>
+#include <editeng/adjitem.hxx>
 #include <svx/xlineit.hxx>
 #include <svx/xlinjoit.hxx>
 #include <svx/xlntrit.hxx>
@@ -105,6 +102,7 @@
 #include "convuno.hxx"
 #include "postit.hxx"
 #include "globstr.hrc"
+#include "chartlis.hxx"
 
 #include "fprogressbar.hxx"
 #include "xltracer.hxx"
@@ -1662,7 +1660,7 @@ SdrObject* XclImpChartObj::DoCreateSdrObj( const Rectangle& rAnchorRect, ScfProg
         if( svt::EmbeddedObjectRef::TryRunningState( xEmbObj ) )
         {
             Reference< XModel > xModel( xEmbObj->getComponent(), UNO_QUERY );
-            mxChart->Convert( xModel, rProgress );
+            mxChart->Convert( xModel, rProgress, aEmbObjName );
 
             Reference< XEmbedPersist > xPers( xEmbObj, UNO_QUERY );
             if( xPers.is() )
@@ -3838,6 +3836,9 @@ void XclImpObjectManager::ConvertObjects()
                     rDffManager.ProcessDrawing( maDffStrm, *aPIt );
         }
     }
+    ScChartListenerCollection* pChartListeners = GetDoc().GetChartListenerCollection();
+    if (pChartListeners && pChartListeners->GetCount())
+        pChartListeners->SetDirty();
 }
 
 String XclImpObjectManager::GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const
diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx
index f6b030aa8250..40c6ef9be374 100644
--- a/sc/source/filter/excel/xiformula.cxx
+++ b/sc/source/filter/excel/xiformula.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xiformula.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index 99dd5632443b..1afcba154c4a 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xihelper.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,11 +29,11 @@
 #include "precompiled_sc.hxx"
 #include "xihelper.hxx"
 #include <svl/itemset.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <tools/urlobj.hxx>
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/flditem.hxx>
 #include "document.hxx"
 #include "cell.hxx"
 #include "rangelst.hxx"
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index 00268215a5dc..1183b077b626 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xilink.cxx,v $
- * $Revision: 1.25.46.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index 502e643b6c76..70ff46a0d741 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xiname.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx
index 4d5b5c1ce56b..75ec91626cf6 100644
--- a/sc/source/filter/excel/xipage.cxx
+++ b/sc/source/filter/excel/xipage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xipage.cxx,v $
- * $Revision: 1.18.90.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,10 +34,10 @@
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/brshitem.hxx>
 #include "document.hxx"
 #include "stlsheet.hxx"
 #include "attrib.hxx"
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index 687dfb9333fe..ac184224c611 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xipivot.cxx,v $
- * $Revision: 1.20.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx
index 30cab47f57f5..7b03d56408c9 100644
--- a/sc/source/filter/excel/xiroot.cxx
+++ b/sc/source/filter/excel/xiroot.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xiroot.cxx,v $
- * $Revision: 1.24.88.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index a040f21b1c4f..98db9dcb4471 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xistream.cxx,v $
- * $Revision: 1.22.30.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -678,56 +675,56 @@ XclImpStream& XclImpStream::operator>>( double& rfValue )
 
 sal_Int8 XclImpStream::ReadInt8()
 {
-    sal_Int8 nValue;
+    sal_Int8 nValue(0);
     operator>>( nValue );
     return nValue;
 }
 
 sal_uInt8 XclImpStream::ReaduInt8()
 {
-    sal_uInt8 nValue;
+    sal_uInt8 nValue(0);
     operator>>( nValue );
     return nValue;
 }
 
 sal_Int16 XclImpStream::ReadInt16()
 {
-    sal_Int16 nValue;
+    sal_Int16 nValue(0);
     operator>>( nValue );
     return nValue;
 }
 
 sal_uInt16 XclImpStream::ReaduInt16()
 {
-    sal_uInt16 nValue;
+    sal_uInt16 nValue(0);
     operator>>( nValue );
     return nValue;
 }
 
 sal_Int32 XclImpStream::ReadInt32()
 {
-    sal_Int32 nValue;
+    sal_Int32 nValue(0);
     operator>>( nValue );
     return nValue;
 }
 
 sal_uInt32 XclImpStream::ReaduInt32()
 {
-    sal_uInt32 nValue;
+    sal_uInt32 nValue(0);
     operator>>( nValue );
     return nValue;
 }
 
 float XclImpStream::ReadFloat()
 {
-    float fValue;
+    float fValue(0.0);
     operator>>( fValue );
     return fValue;
 }
 
 double XclImpStream::ReadDouble()
 {
-    double fValue;
+    double fValue(0.0);
     operator>>( fValue );
     return fValue;
 }
diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx
index d6e0b3182d41..cb2645bec538 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xistring.cxx,v $
- * $Revision: 1.5.90.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 07368f6db680..4e0ff5079471 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xistyle.cxx,v $
- * $Revision: 1.38.14.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,26 +31,26 @@
 #include <sfx2/printer.hxx>
 #include <sfx2/objsh.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include "scitems.hxx"
-#include <svx/fontitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/escpitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/escpitem.hxx>
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/bolnitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/bolnitem.hxx>
 #include <svx/rotmodit.hxx>
-#include <svx/colritem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/flstitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/flstitem.hxx>
 #include "document.hxx"
 #include "docpool.hxx"
 #include "attrib.hxx"
diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx
index a871bdd0c1d7..6eeee8e04839 100644
--- a/sc/source/filter/excel/xiview.cxx
+++ b/sc/source/filter/excel/xiview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xiview.cxx,v $
- * $Revision: 1.9.90.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx
index 9f2bde6672f1..d0c1a925f8ab 100644
--- a/sc/source/filter/excel/xladdress.cxx
+++ b/sc/source/filter/excel/xladdress.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xladdress.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index 5e7f1665c0e0..2391eb7ef92e 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlchart.cxx,v $
- * $Revision: 1.11.62.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,7 +53,7 @@
 #include <svx/xbtmpit.hxx>
 #include <svx/unomid.hxx>
 #include <filter/msfilter/escherex.hxx>
-
+#include <editeng/memberids.hrc>
 #include "global.hxx"
 #include "xlconst.hxx"
 #include "xlstyle.hxx"
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index bea2ed17ddd1..5d74346608fd 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlescher.cxx,v $
- * $Revision: 1.14.90.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index b8c18eb3e7c0..c46df189ab74 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlformula.cxx,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx
index d1bea1addcec..a59c6f761667 100644
--- a/sc/source/filter/excel/xlpage.cxx
+++ b/sc/source/filter/excel/xlpage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlpage.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,11 +29,11 @@
 #include "precompiled_sc.hxx"
 #include "xlpage.hxx"
 #include <sfx2/printer.hxx>
-#include <svx/svxenum.hxx>
-#include <svx/paperinf.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/paperinf.hxx>
 #include <vcl/svapp.hxx>
 #include "scitems.hxx"
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include "global.hxx"
 #include "xlconst.hxx"
 
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index 8f5d026379d9..ed7aadd0a410 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlpivot.cxx,v $
- * $Revision: 1.12.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 9706279307d1..8a22b05828b9 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlroot.cxx,v $
- * $Revision: 1.32.88.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,9 +36,9 @@
 #include <sfx2/printer.hxx>
 #include <sfx2/docfile.hxx>
 #include <vcl/font.hxx>
-#include <svx/editstat.hxx>
+#include <editeng/editstat.hxx>
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include "document.hxx"
 #include "docpool.hxx"
 #include "docuno.hxx"
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 401f135b381a..4a48584da7fa 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlstyle.cxx,v $
- * $Revision: 1.27.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,7 +37,7 @@
 #include <vcl/font.hxx>
 #include <rtl/tencinfo.h>
 #include <toolkit/unohlp.hxx>
-#include <svx/svxfont.hxx>
+#include <editeng/svxfont.hxx>
 #include "global.hxx"
 #include "xlroot.hxx"
 
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 4aa46c2ebed9..926eb3e54fdc 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xltools.cxx,v $
- * $Revision: 1.31.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 #include <sal/mathconf.h>
 #include <unotools/fontcvt.hxx>
 #include <sfx2/objsh.hxx>
-#include <svx/editstat.hxx>
+#include <editeng/editstat.hxx>
 #include "xestream.hxx"
 #include "document.hxx"
 #include "docuno.hxx"
diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx
index fa7c0a17c5c1..7dadbde8198a 100644
--- a/sc/source/filter/excel/xltracer.cxx
+++ b/sc/source/filter/excel/xltracer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xltracer.cxx,v $
- * $Revision: 1.10.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx
index e3290e844bd5..d9cbbbb4b7c0 100644
--- a/sc/source/filter/excel/xlview.cxx
+++ b/sc/source/filter/excel/xlview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlview.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index 299708d2e11c..eeef52aed550 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fapihelper.cxx,v $
- * $Revision: 1.10.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx
index 9471a1d1a2bf..bcee6f690f48 100644
--- a/sc/source/filter/ftools/fprogressbar.cxx
+++ b/sc/source/filter/ftools/fprogressbar.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fprogressbar.cxx,v $
- * $Revision: 1.10.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 917cba6c34ce..72e5f115fed0 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftools.cxx,v $
- * $Revision: 1.20.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/ftools/makefile.mk b/sc/source/filter/ftools/makefile.mk
index 138bf44a0c8b..27a960efc6b0 100644
--- a/sc/source/filter/ftools/makefile.mk
+++ b/sc/source/filter/ftools/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.90.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 8d6486fca38d..e8c71d20af11 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: htmlexp.cxx,v $
- * $Revision: 1.38.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,24 +33,24 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #define _SVSTDARR_STRINGSSORTDTOR
 #include <rtl/tencinfo.h>
 
 #include <vcl/svapp.hxx>
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <svx/xoutbmp.hxx>
-#include <svx/editeng.hxx>
-#include <svx/htmlcfg.hxx>
+#include <editeng/editeng.hxx>
+#include <svtools/htmlcfg.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/frmhtmlw.hxx>
 #include <sfx2/objsh.hxx>
@@ -86,8 +83,8 @@
 #include "ftools.hxx"
 
 
-#include <svx/flditem.hxx>
-#include <svx/borderline.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/borderline.hxx>
 #include <unotools/syslocale.hxx>
 
 
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index 6793cb879751..341f9afbc739 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: htmlexp2.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index 5591e8ec993e..ad3a5e041151 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: htmlimp.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,13 +33,13 @@
 //------------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/lrspitem.hxx>
-#include <svx/paperinf.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/boxitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/paperinf.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/boxitem.hxx>
 #include <vcl/svapp.hxx>
 
 #include "htmlimp.hxx"
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 99b5150621ef..2716dc216ed1 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: htmlpars.cxx,v $
- * $Revision: 1.34.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,20 +32,19 @@
 
 #define SC_HTMLPARS_CXX
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/htmlcfg.hxx>
+#include <svtools/htmlcfg.hxx>
 #include <svx/algitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/editeng.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/impgrf.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/boxitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/boxitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/eitem.hxx>
 #include <svtools/filter.hxx>
@@ -1375,8 +1371,8 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo )
 
     USHORT nFormat;
     Graphic* pGraphic = new Graphic;
-    GraphicFilter* pFilter = ::GetGrfFilter();
-    if ( GRFILTER_OK != ::LoadGraphic( pImage->aURL, pImage->aFilterName,
+    GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter();
+    if ( GRFILTER_OK != GraphicFilter::LoadGraphic( pImage->aURL, pImage->aFilterName,
             *pGraphic, pFilter, &nFormat ) )
     {
         delete pGraphic;
diff --git a/sc/source/filter/html/makefile.mk b/sc/source/filter/html/makefile.mk
index 3f2338da4a1c..93e992c67e31 100644
--- a/sc/source/filter/html/makefile.mk
+++ b/sc/source/filter/html/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 2dd2570353be..01eb076f6b3d 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XclExpChangeTrack.hxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx
index 65f981fef973..c850d6681235 100644
--- a/sc/source/filter/inc/XclImpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclImpChangeTrack.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XclImpChangeTrack.hxx,v $
- * $Revision: 1.21.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx
index fa0a83cb4f2a..479dc0f577f5 100644
--- a/sc/source/filter/inc/biff.hxx
+++ b/sc/source/filter/inc/biff.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: biff.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx
index 19b696ec3a07..325d380cc19c 100644
--- a/sc/source/filter/inc/colrowst.hxx
+++ b/sc/source/filter/inc/colrowst.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: colrowst.hxx,v $
- * $Revision: 1.23.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/decl.h b/sc/source/filter/inc/decl.h
index f9d3ca4e81c7..e888b7dca5fe 100644
--- a/sc/source/filter/inc/decl.h
+++ b/sc/source/filter/inc/decl.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: decl.h,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx
index 9fc63f72f72b..20b2400cf5a2 100644
--- a/sc/source/filter/inc/dif.hxx
+++ b/sc/source/filter/inc/dif.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dif.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx
index a601c7a20cbf..59225a5a7138 100644
--- a/sc/source/filter/inc/eeimport.hxx
+++ b/sc/source/filter/inc/eeimport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eeimport.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx
index a5398fb8fa84..afc8c959392b 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eeparser.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 #include <vcl/graph.hxx>
 #include <tools/table.hxx>
 #include <svl/itemset.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <address.hxx>
 
 const sal_Char nHorizontal = 1;
diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx
index 63fa4386d8fb..2d489af7e427 100644
--- a/sc/source/filter/inc/excdefs.hxx
+++ b/sc/source/filter/inc/excdefs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: excdefs.hxx,v $
- * $Revision: 1.49 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index cb98096c458f..f00e8d091590 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: excdoc.hxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx
index 54cde7ab8a8b..ed771637b704 100644
--- a/sc/source/filter/inc/excform.hxx
+++ b/sc/source/filter/inc/excform.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: excform.hxx,v $
- * $Revision: 1.22.62.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx
index 9bd633eae879..1340f7c6f8be 100644
--- a/sc/source/filter/inc/excimp8.hxx
+++ b/sc/source/filter/inc/excimp8.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: excimp8.hxx,v $
- * $Revision: 1.71.14.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,6 +34,7 @@
 #include "excscen.hxx"
 #include "excdefs.hxx"
 #include "ftools.hxx"
+#include "queryparam.hxx"
 
 class SotStorage;
 
@@ -52,6 +50,7 @@ class XclImpStream;
 
 class ImportExcel8 : public ImportExcel
 {
+        SCTAB mnTab;
     protected:
         ExcScenarioList         aScenList;
 
diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
index b1571637828a..bc960f05b3a5 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: excrecds.hxx,v $
- * $Revision: 1.51 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx
index 4c43e59bf332..125f74e9fa54 100644
--- a/sc/source/filter/inc/excscen.hxx
+++ b/sc/source/filter/inc/excscen.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: excscen.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx
index 4afe6eff534d..79fff8675d84 100644
--- a/sc/source/filter/inc/exp_op.hxx
+++ b/sc/source/filter/inc/exp_op.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: exp_op.hxx,v $
- * $Revision: 1.13.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx
index 94420c740621..3744bf497927 100644
--- a/sc/source/filter/inc/expbase.hxx
+++ b/sc/source/filter/inc/expbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: expbase.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index f3cdc782ee9c..8c204f1cef35 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fapihelper.hxx,v $
- * $Revision: 1.11.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx
index 606cc2c98482..7ab2aadf1511 100644
--- a/sc/source/filter/inc/filt_pch.hxx
+++ b/sc/source/filter/inc/filt_pch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filt_pch.hxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -161,7 +158,7 @@
 #include <namebuff.hxx>
 #include <tools/shl.hxx>
 #include <tools/pstm.hxx>
-#include <svx/fhgtitem.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <vos/types.hxx>
 #include <vos/object.hxx>
 #include <vos/macros.hxx>
@@ -171,7 +168,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <attrib.hxx>
 #include <svl/zforlist.hxx>
-#include <svx/fontitem.hxx>
+#include <editeng/fontitem.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XEventListener.hdl>
 #include <com/sun/star/lang/EventObject.hdl>
@@ -231,20 +228,20 @@
 #include <vos/runnable.hxx>
 #include <vos/refernce.hxx>
 #include <vcl/apptypes.hxx>
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
 #include <com/sun/star/lang/WrappedTargetException.hdl>
 #include <com/sun/star/lang/WrappedTargetException.hpp>
 #include <sfx2/shell.hxx>
 #include <tools/stack.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XComponent.hdl>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <formel.hxx>
 #include <com/sun/star/container/XElementAccess.hdl>
 #include <com/sun/star/container/XElementAccess.hpp>
 #include <svl/itempool.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <rangenam.hxx>
 #include <vcl/syswin.hxx>
 #include <svl/smplhint.hxx>
@@ -302,7 +299,7 @@
 #include <com/sun/star/lang/IllegalArgumentException.hdl>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <tools/urlobj.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include <vcl/wrkwin.hxx>
 #include <excimp8.hxx>
 #include <excscen.hxx>
diff --git a/sc/source/filter/inc/fkttab.h b/sc/source/filter/inc/fkttab.h
index 8895a9fe21cb..3d834c5cf04d 100644
--- a/sc/source/filter/inc/fkttab.h
+++ b/sc/source/filter/inc/fkttab.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fkttab.h,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/flttypes.hxx b/sc/source/filter/inc/flttypes.hxx
index e1f8bf951462..0a78889feb8c 100644
--- a/sc/source/filter/inc/flttypes.hxx
+++ b/sc/source/filter/inc/flttypes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: flttypes.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index 0961533731cb..6c7d4288c372 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formel.hxx,v $
- * $Revision: 1.11.32.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx
index ade7ba7b6bec..f399d7ea5064 100644
--- a/sc/source/filter/inc/fprogressbar.hxx
+++ b/sc/source/filter/inc/fprogressbar.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fprogressbar.hxx,v $
- * $Revision: 1.8.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index 5fd338a73bb5..bdb17178d75c 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftools.hxx,v $
- * $Revision: 1.24.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/funktion.h b/sc/source/filter/inc/funktion.h
index 57391283b3e4..ef8ecabc256a 100644
--- a/sc/source/filter/inc/funktion.h
+++ b/sc/source/filter/inc/funktion.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: funktion.h,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index d284eedcc120..4cdf71b8610d 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: htmlexp.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx
index d50998ba295c..8a1d1c41b4fd 100644
--- a/sc/source/filter/inc/htmlimp.hxx
+++ b/sc/source/filter/inc/htmlimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: htmlimp.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index e3f53a5ddc5b..f053a1088ff1 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: htmlpars.hxx,v $
- * $Revision: 1.16.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index fa0e6b7f5074..065678d5c792 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imp_op.hxx,v $
- * $Revision: 1.43.14.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx
index 07b8804b7380..7015136f1be1 100644
--- a/sc/source/filter/inc/lotattr.hxx
+++ b/sc/source/filter/inc/lotattr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lotattr.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx
index f994e1243564..5c8771814206 100644
--- a/sc/source/filter/inc/lotfntbf.hxx
+++ b/sc/source/filter/inc/lotfntbf.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lotfntbf.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,9 +31,9 @@
 #include <tools/solar.h>
 
 #include "scitems.hxx"
-#include <svx/fontitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/colritem.hxx>
 
 // ---------------------------------------------------- class LotusFontBuffer -
 
diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx
index 0461df8d48c6..0a341e29ae51 100644
--- a/sc/source/filter/inc/lotform.hxx
+++ b/sc/source/filter/inc/lotform.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lotform.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx
index bae6b7f8e3c6..15c0a2931dc4 100644
--- a/sc/source/filter/inc/lotimpop.hxx
+++ b/sc/source/filter/inc/lotimpop.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lotimpop.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx
index e544e953bab3..ab9acf9f476e 100644
--- a/sc/source/filter/inc/lotrange.hxx
+++ b/sc/source/filter/inc/lotrange.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lotrange.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/makefile.mk b/sc/source/filter/inc/makefile.mk
index 3c33d006edf9..1b35ca49549d 100644
--- a/sc/source/filter/inc/makefile.mk
+++ b/sc/source/filter/inc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index e19252a795a8..c8182e8c0c17 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: namebuff.hxx,v $
- * $Revision: 1.15.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/op.h b/sc/source/filter/inc/op.h
index 2bfbedde0aed..2548bdfa34c3 100644
--- a/sc/source/filter/inc/op.h
+++ b/sc/source/filter/inc/op.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: op.h,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/optab.h b/sc/source/filter/inc/optab.h
index bf12bf9f19cd..d70eb1f29bb0 100644
--- a/sc/source/filter/inc/optab.h
+++ b/sc/source/filter/inc/optab.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optab.h,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/otlnbuff.hxx b/sc/source/filter/inc/otlnbuff.hxx
index 883705afc6d7..6ccca361345b 100644
--- a/sc/source/filter/inc/otlnbuff.hxx
+++ b/sc/source/filter/inc/otlnbuff.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: otlnbuff.hxx,v $
- * $Revision: 1.5.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/qpro.hxx b/sc/source/filter/inc/qpro.hxx
index a9b1c61955c5..f631da120373 100644
--- a/sc/source/filter/inc/qpro.hxx
+++ b/sc/source/filter/inc/qpro.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: qpro.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx
index 7118db9f2f5f..18327cd141df 100644
--- a/sc/source/filter/inc/qproform.hxx
+++ b/sc/source/filter/inc/qproform.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: qproform.hxx,v $
- * $Revision: 1.3.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/qprostyle.hxx b/sc/source/filter/inc/qprostyle.hxx
index e7195704c04f..ffce2630b310 100644
--- a/sc/source/filter/inc/qprostyle.hxx
+++ b/sc/source/filter/inc/qprostyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: qprostyle.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx
index ffff5dd9ff94..fcac4da4be62 100644
--- a/sc/source/filter/inc/root.hxx
+++ b/sc/source/filter/inc/root.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: root.hxx,v $
- * $Revision: 1.44.14.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxx
index a8903c96eedf..4733d243d1a5 100644
--- a/sc/source/filter/inc/rtfexp.hxx
+++ b/sc/source/filter/inc/rtfexp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rtfexp.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/rtfimp.hxx b/sc/source/filter/inc/rtfimp.hxx
index 7b05e617f6da..13ade86b7cd5 100644
--- a/sc/source/filter/inc/rtfimp.hxx
+++ b/sc/source/filter/inc/rtfimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rtfimp.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx
index efc404a5dfa8..135e11e572ae 100644
--- a/sc/source/filter/inc/rtfparse.hxx
+++ b/sc/source/filter/inc/rtfparse.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rtfparse.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index 0c43f9b0824a..995de274b28b 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/inc/scflt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scflt.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/scfobj.hxx b/sc/source/filter/inc/scfobj.hxx
index a0c9e85247a3..4ed1784f4354 100644
--- a/sc/source/filter/inc/scfobj.hxx
+++ b/sc/source/filter/inc/scfobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scfobj.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/scmem.h b/sc/source/filter/inc/scmem.h
index fa5c0ee9c2cf..03e30c1e9fc6 100644
--- a/sc/source/filter/inc/scmem.h
+++ b/sc/source/filter/inc/scmem.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scmem.h,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index 3a60b709d5bf..80c94c729270 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tokstack.hxx,v $
- * $Revision: 1.14.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index 24de125426b8..93cc074d89f6 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tool.h,v $
- * $Revision: 1.5.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xcl97dum.hxx b/sc/source/filter/inc/xcl97dum.hxx
index 3dadb6ff3ed0..a76a93321557 100644
--- a/sc/source/filter/inc/xcl97dum.hxx
+++ b/sc/source/filter/inc/xcl97dum.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xcl97dum.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index 50583debc17f..2aa7c824af99 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xcl97esc.hxx,v $
- * $Revision: 1.13.14.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx
index ef97a60a8a8e..2c6ae2f9ab0c 100644
--- a/sc/source/filter/inc/xcl97rec.hxx
+++ b/sc/source/filter/inc/xcl97rec.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xcl97rec.hxx,v $
- * $Revision: 1.48.30.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -570,6 +567,19 @@ private:
 
 // ============================================================================
 
+/** End of User Interface Records */
+class XclExpInterfaceEnd : public XclExpRecord
+{
+public:
+    explicit XclExpInterfaceEnd();
+    virtual ~XclExpInterfaceEnd();
+
+private:
+    virtual void WriteBody( XclExpStream& rStrm );
+};
+
+// ============================================================================
+
 /** Write Access User Name - This record contains the user name, which is
     the name you type when you install Excel. */
 class XclExpWriteAccess : public XclExpRecord
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index 8a724aab1457..eb6026a82e9a 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xechart.hxx,v $
- * $Revision: 1.7.62.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx
index 92e80eceb2af..50c9466d2801 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xecontent.hxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index 1acb7ac08892..6448ccb4853e 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xeescher.hxx,v $
- * $Revision: 1.10.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxx
index 32eae4ed0158..258070f0791e 100644
--- a/sc/source/filter/inc/xeformula.hxx
+++ b/sc/source/filter/inc/xeformula.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xeformula.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx
index cb9170396ead..606ce51c889b 100644
--- a/sc/source/filter/inc/xehelper.hxx
+++ b/sc/source/filter/inc/xehelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xehelper.hxx,v $
- * $Revision: 1.20.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx
index 1b49bf7bac02..c70e496400a4 100644
--- a/sc/source/filter/inc/xelink.hxx
+++ b/sc/source/filter/inc/xelink.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xelink.hxx,v $
- * $Revision: 1.13.134.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx
index 32c48e779cad..f0740735ea28 100644
--- a/sc/source/filter/inc/xename.hxx
+++ b/sc/source/filter/inc/xename.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xename.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx
index 3e119d3e4c1a..b9454a3cdb3c 100644
--- a/sc/source/filter/inc/xepage.hxx
+++ b/sc/source/filter/inc/xepage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xepage.hxx,v $
- * $Revision: 1.6.90.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index 716f0bf7a515..0c730952e69e 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xepivot.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx
index 8abd4d0c3eae..fa3810c0e92b 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xerecord.hxx,v $
- * $Revision: 1.14.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx
index 178bb19763f8..ce32a46cbc66 100644
--- a/sc/source/filter/inc/xeroot.hxx
+++ b/sc/source/filter/inc/xeroot.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xeroot.hxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index 95d172baf9c2..3308827441dd 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xestream.hxx,v $
- * $Revision: 1.8.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -126,6 +123,9 @@ public:
     sal_Size            Write( const void* pData, sal_Size nBytes );
     /** Writes a sequence of nBytes zero bytes (respects slice setting). */
     void                WriteZeroBytes( sal_Size nBytes );
+
+    void                WriteZeroBytesToRecord( sal_Size nBytes );
+
     /** Copies nBytes bytes from current position of the stream rInStrm.
         @descr  Omitting the second parameter means: read to end of stream. */
     sal_Size            CopyFromStream( SvStream& rInStrm, sal_Size nBytes = STREAM_SEEK_TO_END );
diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx
index 5fe5e4fb813f..b468696cb3ff 100644
--- a/sc/source/filter/inc/xestring.hxx
+++ b/sc/source/filter/inc/xestring.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xestring.hxx,v $
- * $Revision: 1.11.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index d26739b868ae..cb12e03b21ad 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xestyle.hxx,v $
- * $Revision: 1.20.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 #include <tools/string.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/nfkeytab.hxx>
-#include <svx/svxfont.hxx>
+#include <editeng/svxfont.hxx>
 #include "xerecord.hxx"
 #include "xlstyle.hxx"
 #include "xeroot.hxx"
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 6680aa1719ca..723f9dde09e0 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xetable.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx
index 149cdad4d85b..ca94e6eae3f9 100644
--- a/sc/source/filter/inc/xeview.hxx
+++ b/sc/source/filter/inc/xeview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xeview.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index e09530083965..25e52f3f0168 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xichart.hxx,v $
- * $Revision: 1.13.62.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,6 +36,7 @@
 #include <svl/itemset.hxx>
 
 #include "rangelst.hxx"
+#include "token.hxx"
 #include "xlchart.hxx"
 #include "xlstyle.hxx"
 #include "xistring.hxx"
@@ -403,6 +401,8 @@ public:
     XFormattedStringSeq CreateStringSequence( const XclImpChRoot& rRoot,
                             sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const;
 
+    void                FillSourceLink(::std::vector<ScSharedTokenRef>& rTokens) const;
+
 private:
     XclChSourceLink     maData;             /// Contents of the CHSOURCELINK record.
     XclImpStringRef     mxString;           /// Text data (CHSTRING record).
@@ -811,6 +811,8 @@ public:
     /** Creates a data series object with initialized source links. */
     XDataSeriesRef      CreateDataSeries() const;
 
+    void                FillAllSourceLinks(::std::vector<ScSharedTokenRef>& rTokens) const;
+
 private:
     /** Reads a CHSOURCELINK record. */
     void                ReadChSourceLink( XclImpStream& rStrm );
@@ -1353,7 +1355,7 @@ public:
     inline sal_Size     GetProgressSize() const { return 2 * EXC_CHART_PROGRESS_SIZE; }
 
     /** Converts and writes all properties to the passed chart. */
-    void                Convert( XChartDocRef xChartDoc, ScfProgressBar& rProgress ) const;
+    void                Convert( XChartDocRef xChartDoc, ScfProgressBar& rProgress, const ::rtl::OUString& rObjName ) const;
 
 private:
     /** Reads a CHSERIES group (data series source and formatting). */
@@ -1421,7 +1423,7 @@ public:
     inline bool         IsPivotChart() const { return mbIsPivotChart; }
 
     /** Creates the chart object in the passed component. */
-    void                Convert( XModelRef xModel, ScfProgressBar& rProgress ) const;
+    void                Convert( XModelRef xModel, ScfProgressBar& rProgress, const ::rtl::OUString& rObjName ) const;
 
 private:
     /** Reads the CHCHART group (entire chart data). */
diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx
index 53ed10583249..810c435d34bf 100644
--- a/sc/source/filter/inc/xicontent.hxx
+++ b/sc/source/filter/inc/xicontent.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xicontent.hxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index f551b90e10f7..258720e89584 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xiescher.hxx,v $
- * $Revision: 1.28.90.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xiformula.hxx b/sc/source/filter/inc/xiformula.hxx
index 4b169276f5e2..6151222746cd 100644
--- a/sc/source/filter/inc/xiformula.hxx
+++ b/sc/source/filter/inc/xiformula.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xiformula.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx
index a46d473f02a9..9a836c8844db 100644
--- a/sc/source/filter/inc/xihelper.hxx
+++ b/sc/source/filter/inc/xihelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xihelper.hxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 #ifndef SC_XIHELPER_HXX
 #define SC_XIHELPER_HXX
 
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include "scmatrix.hxx"
 #include "xladdress.hxx"
 #include "xiroot.hxx"
diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx
index bb64a84a900e..dbbb4606114e 100644
--- a/sc/source/filter/inc/xilink.hxx
+++ b/sc/source/filter/inc/xilink.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xilink.hxx,v $
- * $Revision: 1.14.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx
index a93c652a0136..ccf1b88af947 100644
--- a/sc/source/filter/inc/xiname.hxx
+++ b/sc/source/filter/inc/xiname.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xiname.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xipage.hxx b/sc/source/filter/inc/xipage.hxx
index 3b052418b945..0571e10e7046 100644
--- a/sc/source/filter/inc/xipage.hxx
+++ b/sc/source/filter/inc/xipage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xipage.hxx,v $
- * $Revision: 1.7.90.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index 9e0e577b1756..edac8a0fd99f 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xipivot.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx
index f331683988ab..3881adaaf911 100644
--- a/sc/source/filter/inc/xiroot.hxx
+++ b/sc/source/filter/inc/xiroot.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xiroot.hxx,v $
- * $Revision: 1.22.88.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx
index 8ff3c26e9abe..9b27077d78e7 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xistream.hxx,v $
- * $Revision: 1.13.30.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx
index 66bc88515d8c..a6f00d26d2e2 100644
--- a/sc/source/filter/inc/xistring.hxx
+++ b/sc/source/filter/inc/xistring.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xistring.hxx,v $
- * $Revision: 1.4.90.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index a67458366057..4a347062905c 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xistyle.hxx,v $
- * $Revision: 1.23.90.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xiview.hxx b/sc/source/filter/inc/xiview.hxx
index 432bd394b70c..5f6d11c3439d 100644
--- a/sc/source/filter/inc/xiview.hxx
+++ b/sc/source/filter/inc/xiview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xiview.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx
index c4aff693a964..0ac5ca3031a4 100644
--- a/sc/source/filter/inc/xladdress.hxx
+++ b/sc/source/filter/inc/xladdress.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xladdress.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 7e3873b1f1cf..7e5f90fda4a7 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlchart.hxx,v $
- * $Revision: 1.14.62.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx
index eeb3fb3982b9..0ffdcc3f1a6d 100644
--- a/sc/source/filter/inc/xlconst.hxx
+++ b/sc/source/filter/inc/xlconst.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlconst.hxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlcontent.hxx b/sc/source/filter/inc/xlcontent.hxx
index 6c86e0be68b7..41e916472e70 100644
--- a/sc/source/filter/inc/xlcontent.hxx
+++ b/sc/source/filter/inc/xlcontent.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlcontent.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx
index 97fb5674bb2d..f60d6d3a5ee5 100644
--- a/sc/source/filter/inc/xlescher.hxx
+++ b/sc/source/filter/inc/xlescher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlescher.hxx,v $
- * $Revision: 1.22.90.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx
index aed77452b311..83bab2acd24a 100644
--- a/sc/source/filter/inc/xlformula.hxx
+++ b/sc/source/filter/inc/xlformula.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlformula.hxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xllink.hxx b/sc/source/filter/inc/xllink.hxx
index a291abb52d78..3e41fb350acb 100644
--- a/sc/source/filter/inc/xllink.hxx
+++ b/sc/source/filter/inc/xllink.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xllink.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlname.hxx b/sc/source/filter/inc/xlname.hxx
index 03ff84579f5f..5bfcf9164892 100644
--- a/sc/source/filter/inc/xlname.hxx
+++ b/sc/source/filter/inc/xlname.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlname.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxx
index 59339970fd56..f6860595cd20 100644
--- a/sc/source/filter/inc/xlpage.hxx
+++ b/sc/source/filter/inc/xlpage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlpage.hxx,v $
- * $Revision: 1.8.90.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index 3ea464e7b919..ad48c05a93f4 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlpivot.hxx,v $
- * $Revision: 1.12.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 8b0873b25475..f3b0f78a948c 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlroot.hxx,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxx
index 603a4cfab3fc..0a9074371c33 100644
--- a/sc/source/filter/inc/xlstream.hxx
+++ b/sc/source/filter/inc/xlstream.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlstream.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx
index 32ee23f83d85..5ee505e25024 100644
--- a/sc/source/filter/inc/xlstring.hxx
+++ b/sc/source/filter/inc/xlstring.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlstring.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx
index f8cca7199f24..604b53a1f8ff 100644
--- a/sc/source/filter/inc/xlstyle.hxx
+++ b/sc/source/filter/inc/xlstyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlstyle.hxx,v $
- * $Revision: 1.23.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,8 +34,8 @@
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <tools/color.hxx>
 #include <vcl/vclenum.hxx>
-#include <svx/svxenum.hxx>
-#include <svx/frmdir.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/frmdir.hxx>
 #include <svl/zforlist.hxx>
 #include "fapihelper.hxx"
 
diff --git a/sc/source/filter/inc/xltable.hxx b/sc/source/filter/inc/xltable.hxx
index 67fbfdcc0a45..6b8f650568a9 100644
--- a/sc/source/filter/inc/xltable.hxx
+++ b/sc/source/filter/inc/xltable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xltable.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx
index 392b0a2ae1fc..b2519a51d156 100644
--- a/sc/source/filter/inc/xltools.hxx
+++ b/sc/source/filter/inc/xltools.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xltools.hxx,v $
- * $Revision: 1.27.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx
index 38dd444b93ac..73ed3d0502c3 100644
--- a/sc/source/filter/inc/xltracer.hxx
+++ b/sc/source/filter/inc/xltracer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xltracer.hxx,v $
- * $Revision: 1.9.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx
index 91b4866cccf9..1a116c84c08e 100644
--- a/sc/source/filter/inc/xlview.hxx
+++ b/sc/source/filter/inc/xlview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlview.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/lotus/expop.cxx b/sc/source/filter/lotus/expop.cxx
index 8aabf12099a4..7ecc9127b49d 100644
--- a/sc/source/filter/lotus/expop.cxx
+++ b/sc/source/filter/lotus/expop.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: expop.cxx,v $
- * $Revision: 1.7.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/lotus/export.cxx b/sc/source/filter/lotus/export.cxx
index ab5554591c15..a9be45e24f23 100644
--- a/sc/source/filter/lotus/export.cxx
+++ b/sc/source/filter/lotus/export.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: export.cxx,v $
- * $Revision: 1.5.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index cd4a7cd9fbca..3a6e39b7d818 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filter.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx
index 0df6ccb39bb3..6a05585cf326 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lotattr.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,8 +34,8 @@
 
 #include "scitems.hxx"
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
 
 #include "document.hxx"
 #include "patattr.hxx"
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 42b55943026e..e39891568e33 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lotform.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index d289f3f888e5..5173d5303321 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lotimpop.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index ba0fc9a0b9dc..917337fa91d5 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lotread.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index 5d6b4045e007..a1a428c5dbeb 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lotus.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/lotus/makefile.mk b/sc/source/filter/lotus/makefile.mk
index 3ad32c8bc295..8fb2360ea2ca 100644
--- a/sc/source/filter/lotus/makefile.mk
+++ b/sc/source/filter/lotus/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxx
index 7c5577e26f24..1ac1fa5c470f 100644
--- a/sc/source/filter/lotus/memory.cxx
+++ b/sc/source/filter/lotus/memory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: memory.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 8759d21297f3..0306bdc6315b 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: op.cxx,v $
- * $Revision: 1.18.126.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,9 +45,9 @@
 #include "patattr.hxx"
 #include "docpool.hxx"
 #include <svx/algitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
 
 #include "cell.hxx"
 #include "rangenam.hxx"
diff --git a/sc/source/filter/lotus/optab.cxx b/sc/source/filter/lotus/optab.cxx
index 2d9090d87607..503d271a5b74 100644
--- a/sc/source/filter/lotus/optab.cxx
+++ b/sc/source/filter/lotus/optab.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optab.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index a0c9a25d58d9..0e99b1140c2a 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tool.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/qpro/biff.cxx b/sc/source/filter/qpro/biff.cxx
index 0d0beaa5ddb1..1d490358d315 100644
--- a/sc/source/filter/qpro/biff.cxx
+++ b/sc/source/filter/qpro/biff.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: biff.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/qpro/makefile.mk b/sc/source/filter/qpro/makefile.mk
index f3ea4c7232cd..fa8b018f23b7 100644
--- a/sc/source/filter/qpro/makefile.mk
+++ b/sc/source/filter/qpro/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 5ea9efae2b3e..084aab135f70 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: qpro.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 9d30ae1f8adb..9cb4a2d7b245 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: qproform.cxx,v $
- * $Revision: 1.9.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/qpro/qprostyle.cxx b/sc/source/filter/qpro/qprostyle.cxx
index 2496347e8479..6213cbb4ebf2 100644
--- a/sc/source/filter/qpro/qprostyle.cxx
+++ b/sc/source/filter/qpro/qprostyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: qprostyle.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,12 +40,12 @@
 #include <tools/color.hxx>
 #include <scitems.hxx>
 #include <svx/algitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/fontitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
 #include <map>
 
 #include "global.hxx"
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index c3650e882973..756b384b7f11 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eeimpars.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,18 +33,18 @@
 //------------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
-#include <svx/adjitem.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editview.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/langitem.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/htmlcfg.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <svtools/htmlcfg.hxx>
 #include <sfx2/sfxhtml.hxx>
 #include <svtools/parhtml.hxx>
 #include <svl/zforlist.hxx>
diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx
index 7b83bc19eb61..3188b4f920e7 100644
--- a/sc/source/filter/rtf/expbase.cxx
+++ b/sc/source/filter/rtf/expbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: expbase.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/rtf/makefile.mk b/sc/source/filter/rtf/makefile.mk
index 5240252abe85..a680751de620 100644
--- a/sc/source/filter/rtf/makefile.mk
+++ b/sc/source/filter/rtf/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 88611ca72283..c817fc2844eb 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rtfexp.cxx,v $
- * $Revision: 1.10.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,15 +31,15 @@
 
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
 #include <svx/algitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/fhgtitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <svl/style.hxx>
 #include <svtools/rtfout.hxx>
 #include <svtools/rtfkeywd.hxx>
diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxx
index 742954d4a519..83b48b1fa2b1 100644
--- a/sc/source/filter/rtf/rtfimp.cxx
+++ b/sc/source/filter/rtf/rtfimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rtfimp.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index 8af3659da66d..b3373bbf4596 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rtfparse.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,12 +33,12 @@
 //------------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
-#include <svx/editeng.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/svxrtf.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/svxrtf.hxx>
 #include <vcl/outdev.hxx>
 #include <svtools/rtftoken.h>
 
diff --git a/sc/source/filter/starcalc/makefile.mk b/sc/source/filter/starcalc/makefile.mk
index 529d3772562a..836f6b0d3621 100644
--- a/sc/source/filter/starcalc/makefile.mk
+++ b/sc/source/filter/starcalc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index b54e3bb97fab..104d0d7fe192 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scflt.cxx,v $
- * $Revision: 1.25.124.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,25 +33,25 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/lrspitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/lrspitem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/PasswordHelper.hxx>
 #include <stdio.h>
diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx
index d15cb3c5a227..c0f575313459 100644
--- a/sc/source/filter/starcalc/scfobj.cxx
+++ b/sc/source/filter/starcalc/scfobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scfobj.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index a38b023d4f55..42cb37250c5c 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XclExpChangeTrack.cxx,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 1a8480a5e758..96a301e1bef5 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XclImpChangeTrack.cxx,v $
- * $Revision: 1.34.48.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xcl97/makefile.mk b/sc/source/filter/xcl97/makefile.mk
index 58e2b8cb3074..3ce71ba142df 100644
--- a/sc/source/filter/xcl97/makefile.mk
+++ b/sc/source/filter/xcl97/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.16.88.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xcl97/xcl97dum.cxx b/sc/source/filter/xcl97/xcl97dum.cxx
index d189d6ae69de..1550fa97ed40 100644
--- a/sc/source/filter/xcl97/xcl97dum.cxx
+++ b/sc/source/filter/xcl97/xcl97dum.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xcl97dum.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index db8b085f7629..2c5a30f085d3 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xcl97esc.cxx,v $
- * $Revision: 1.26.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,7 +35,7 @@
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 
 #include <svx/svdpage.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 45c64cca1e4f..e4c4443ea56e 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xcl97rec.cxx,v $
- * $Revision: 1.87.30.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,14 +31,14 @@
 #include <svx/svdpool.hxx>
 #include <svx/sdtaitm.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <svx/svdoole2.hxx>
 #include <sot/storage.hxx>
 #include <svl/itemset.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/unoapi.hxx>
-#include <svx/writingmodeitem.hxx>
+#include <editeng/writingmodeitem.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/math.hxx>
 #include <svl/zformat.hxx>
@@ -58,11 +55,11 @@
 #include "scitems.hxx"
 
 #include <unotools/fltrcfg.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <filter/msfilter/msoleexp.hxx>
 
 #include <unotools/localedatawrapper.hxx>
@@ -1459,6 +1456,19 @@ void XclExpInterfaceHdr::WriteBody( XclExpStream& rStrm )
 
 // ============================================================================
 
+XclExpInterfaceEnd::XclExpInterfaceEnd() :
+    XclExpRecord(0x00E2, 0) {}
+
+XclExpInterfaceEnd::~XclExpInterfaceEnd() {}
+
+void XclExpInterfaceEnd::WriteBody( XclExpStream& rStrm )
+{
+    // Don't forget to re-enable encryption.
+    rStrm.EnableEncryption();
+}
+
+// ============================================================================
+
 XclExpWriteAccess::XclExpWriteAccess() :
     XclExpRecord(0x005C, 112)
 {
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index 303dc837b157..b124e77ac745 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLCalculationSettingsContext.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
index 3c2b1eeee8db..8fe5a7f1db1c 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLCalculationSettingsContext.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
index f2564e738549..9826e8385075 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLCellRangeSourceContext.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
index 5b5c3e38ecd8..fde1b5534134 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLCellRangeSourceContext.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index da3c6c29bc30..5cd97e0714a9 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChangeTrackingExportHelper.cxx,v $
- * $Revision: 1.33.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
index e7775eb58a4f..f07f0ed905a0 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChangeTrackingExportHelper.hxx,v $
- * $Revision: 1.17.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index 33a77df4f4dd..d928444dd8ce 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChangeTrackingImportHelper.cxx,v $
- * $Revision: 1.30.52.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
index c675a9f7df59..9857683b13ac 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChangeTrackingImportHelper.hxx,v $
- * $Revision: 1.18.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
index a88071b04d23..4c2929de02e3 100644
--- a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLColumnRowGroupExport.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
index c992486f738b..51a93445ccfb 100644
--- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLColumnRowGroupExport.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx
index 5e3bf2280a96..0ca5fc360533 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.cxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLConsolidationContext.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx
index 86b90ece5d68..52061c715ae7 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.hxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLConsolidationContext.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx
index 84fdba343630..4de6246f4f28 100644
--- a/sc/source/filter/xml/XMLConverter.cxx
+++ b/sc/source/filter/xml/XMLConverter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLConverter.cxx,v $
- * $Revision: 1.29.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx
index 090a3553aa91..94766ebe08ff 100644
--- a/sc/source/filter/xml/XMLConverter.hxx
+++ b/sc/source/filter/xml/XMLConverter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLConverter.hxx,v $
- * $Revision: 1.15.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx
index ce77178500bb..d7fafe1d9423 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLDDELinksContext.cxx,v $
- * $Revision: 1.18.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx
index 3337b0fc521b..e9c1db58548f 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.hxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLDDELinksContext.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx
index c77ecf72309f..c127ca518266 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.cxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLDetectiveContext.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx
index 3dc7deae095a..30a8bc600bb0 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.hxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLDetectiveContext.hxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx
index 0560130aa00a..dbba2732ecee 100644
--- a/sc/source/filter/xml/XMLEmptyContext.cxx
+++ b/sc/source/filter/xml/XMLEmptyContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLEmptyContext.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx
index 071a8525102a..ab8b69ad8403 100644
--- a/sc/source/filter/xml/XMLEmptyContext.hxx
+++ b/sc/source/filter/xml/XMLEmptyContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLEmptyContext.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx
index ceb2391c0f94..a29394bf850b 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.cxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLExportDDELinks.cxx,v $
- * $Revision: 1.18.148.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx
index 94d8896ce81e..245a95934449 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.hxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLExportDDELinks.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index 97926ee7113f..a37617e0b8b9 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLExportDataPilot.cxx,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx
index 8bf884ab2fd6..600d96aa1d73 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.hxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLExportDataPilot.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,6 +41,7 @@ class ScDPDimensionSaveData;
 class ScDPSaveGroupDimension;
 class ScDPSaveNumGroupDimension;
 struct ScDPNumGroupInfo;
+struct ScQueryParam;
 
 class ScXMLExportDataPilot
 {
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 6a182dcdc737..3c7ee76c41e8 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLExportDatabaseRanges.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
index 81d1399e16b3..a581eb1271f1 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLExportDatabaseRanges.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx
index c0b50a06b45a..154fdebed95e 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLExportIterator.cxx,v $
- * $Revision: 1.46 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index 92c61ca060e9..dfd3a4d59ac1 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLExportIterator.hxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx
index 1a4b3f8277ae..eede3aa73499 100644
--- a/sc/source/filter/xml/XMLExportSharedData.cxx
+++ b/sc/source/filter/xml/XMLExportSharedData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLExportSharedData.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx
index ff75cae497a0..e808101805fd 100644
--- a/sc/source/filter/xml/XMLExportSharedData.hxx
+++ b/sc/source/filter/xml/XMLExportSharedData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLExportSharedData.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 98100f4b3646..f8bafa32f205 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLStylesExportHelper.cxx,v $
- * $Revision: 1.52 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx
index a9e42afcd585..34672aeef96e 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLStylesExportHelper.hxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx
index b28d11ac6d6f..492c7a63ee30 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLStylesImportHelper.cxx,v $
- * $Revision: 1.22.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx
index 17f23f9dbfd1..3a15dbeff52a 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLStylesImportHelper.hxx,v $
- * $Revision: 1.10.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index 0f3abae9f453..fb0b1235007e 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableHeaderFooterContext.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
index 06226bbfb810..a3ce9c4c970d 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableHeaderFooterContext.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx
index 069d8e237432..91f27ab646a7 100644
--- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx
+++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableMasterPageExport.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx
index b992f248cbb1..0a277bec0bb9 100644
--- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx
+++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableMasterPageExport.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
index f498faf93e5b..cc425e0f4d65 100644
--- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableShapeImportHelper.cxx,v $
- * $Revision: 1.29.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx
index 06d49dc4beed..94a64312c8ed 100644
--- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx
+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableShapeImportHelper.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index ca6d23a6459a..415057c219f2 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableShapeResizer.cxx,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.hxx b/sc/source/filter/xml/XMLTableShapeResizer.hxx
index 543577089af2..9ece92995101 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.hxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableShapeResizer.hxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx
index 379e026b1785..d841e1c4c748 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.cxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableShapesContext.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx
index 33a76354f117..f12cb56d30da 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.hxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableShapesContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx
index 1b496b1ba934..00f5c9184a53 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.cxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableSourceContext.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx
index 653ad8938cd9..2d72a4a3364c 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.hxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableSourceContext.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTextPContext.cxx b/sc/source/filter/xml/XMLTextPContext.cxx
index 21e59d2636e5..d6d02567b9bd 100644
--- a/sc/source/filter/xml/XMLTextPContext.cxx
+++ b/sc/source/filter/xml/XMLTextPContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextPContext.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTextPContext.hxx b/sc/source/filter/xml/XMLTextPContext.hxx
index b2e16217c0a5..a920e13f84a3 100644
--- a/sc/source/filter/xml/XMLTextPContext.hxx
+++ b/sc/source/filter/xml/XMLTextPContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextPContext.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 74b0518a6c62..cf415142213a 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTrackedChangesContext.cxx,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx
index 925489f21f94..ec66fe7f22e7 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTrackedChangesContext.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/makefile.mk b/sc/source/filter/xml/makefile.mk
index c1e7e215e199..360148d38244 100644
--- a/sc/source/filter/xml/makefile.mk
+++ b/sc/source/filter/xml/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.33.134.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx
index a8b96eb6d768..66b1c2579dd4 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sheetdata.cxx,v $
- * $Revision: 1.69.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx
index 294a335033c1..14fc34954564 100644
--- a/sc/source/filter/xml/xmlannoi.cxx
+++ b/sc/source/filter/xml/xmlannoi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlannoi.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx
index 41b206bd4380..ad2eed21b23a 100644
--- a/sc/source/filter/xml/xmlannoi.hxx
+++ b/sc/source/filter/xml/xmlannoi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlannoi.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index a301ddbf27e6..00c87cd661d7 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlbodyi.cxx,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx
index 2c489418bfff..e61e413ff79b 100644
--- a/sc/source/filter/xml/xmlbodyi.hxx
+++ b/sc/source/filter/xml/xmlbodyi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlbodyi.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 2f3f847c6c58..8e78f64b2090 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlcelli.cxx,v $
- * $Revision: 1.96.128.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +48,7 @@
 #include "XMLStylesImportHelper.hxx"
 
 #include "arealink.hxx"
-#include <svx/linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #include "convuno.hxx"
 #include "XMLConverter.hxx"
 #include "scerrors.hxx"
@@ -67,8 +64,8 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <svl/zforlist.hxx>
 #include <svx/svdocapt.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/editobj.hxx>
 #include <svx/unoapi.hxx>
 #include <svl/languageoptions.hxx>
 
@@ -739,7 +736,7 @@ void ScXMLTableRowCellContext::SetCellRangeSource( const table::CellAddress& rPo
             String sSourceStr( pCellRangeSource->sSourceStr );
             ScAreaLink* pLink = new ScAreaLink( pDoc->GetDocumentShell(), pCellRangeSource->sURL,
                 sFilterName, pCellRangeSource->sFilterOptions, sSourceStr, aDestRange, pCellRangeSource->nRefresh );
-            SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+            sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
             pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, pCellRangeSource->sURL, &sFilterName, &sSourceStr );
         }
     }
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index fe2bfd116348..6a63e785f959 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlcelli.hxx,v $
- * $Revision: 1.26.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index 73c06f23a7bf..6ea5b0192ab2 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlcoli.cxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx
index fbb36baf5d97..2edb496b4b28 100644
--- a/sc/source/filter/xml/xmlcoli.hxx
+++ b/sc/source/filter/xml/xmlcoli.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlcoli.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx
index da4191a470fc..3a0f5ef3126e 100644
--- a/sc/source/filter/xml/xmlconti.cxx
+++ b/sc/source/filter/xml/xmlconti.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlconti.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx
index cca4cf0dcab8..83151a934d48 100644
--- a/sc/source/filter/xml/xmlconti.hxx
+++ b/sc/source/filter/xml/xmlconti.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlconti.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index aeff28f3eed6..451b085afe9e 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlcvali.cxx,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx
index b8502375abdb..226d2e2d91b5 100644
--- a/sc/source/filter/xml/xmlcvali.hxx
+++ b/sc/source/filter/xml/xmlcvali.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlcvali.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index 08e8633978b1..580dd2ee0791 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmldpimp.cxx,v $
- * $Revision: 1.27.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx
index 50dc7e6d9c0d..32300138bc3b 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmldpimp.hxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,6 +37,7 @@
 #include "global.hxx"
 #include "dpobject.hxx"
 #include "dpsave.hxx"
+#include "queryparam.hxx"
 
 #include <hash_set>
 
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 55a1859211d0..c5731dfc28fb 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmldrani.cxx,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx
index be55e5b143cc..e170c9eb84c0 100644
--- a/sc/source/filter/xml/xmldrani.hxx
+++ b/sc/source/filter/xml/xmldrani.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmldrani.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index c2fd53acb736..d53f26a5e887 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlexprt.cxx,v $
- * $Revision: 1.213.94.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include "xmlexprt.hxx"
 #include "XMLConverter.hxx"
@@ -91,11 +88,11 @@
 #include <svl/zforlist.hxx>
 #include <svx/unoshape.hxx>
 #include <comphelper/extract.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdocapt.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdpage.hxx>
 
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index b71886c1871e..e024fc6a0de0 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlexprt.hxx,v $
- * $Revision: 1.84.52.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx
index b53431843a57..ce1f58f5d912 100644
--- a/sc/source/filter/xml/xmlexternaltabi.cxx
+++ b/sc/source/filter/xml/xmlexternaltabi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlexternaltabi.cxx,v $
- * $Revision: 1.1.2.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx
index 567df13f1643..0007a8b29702 100644
--- a/sc/source/filter/xml/xmlexternaltabi.hxx
+++ b/sc/source/filter/xml/xmlexternaltabi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlexternaltabi.hxx,v $
- * $Revision: 1.1.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index 87bdc748906c..55670d97637d 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlfilti.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx
index b2b45175c138..df222eeb23c2 100644
--- a/sc/source/filter/xml/xmlfilti.hxx
+++ b/sc/source/filter/xml/xmlfilti.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlfilti.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx
index 6209387448ed..5cbb2604581f 100644
--- a/sc/source/filter/xml/xmlfonte.cxx
+++ b/sc/source/filter/xml/xmlfonte.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlfonte.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,13 +34,13 @@
 
 #include "scitems.hxx"
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
 #include <xmloff/XMLFontAutoStylePool.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editeng.hxx>
 #include "document.hxx"
 #include "docpool.hxx"
 #include "xmlexprt.hxx"
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index f2fe367a2c64..d1ef48bfa9ed 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1,31 +1,28 @@
 /*************************************************************************
 *
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: xmlimprt.cxx,v $
-* $Revision: 1.132.30.4 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index c110c70f72e2..e2cea5ae9609 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlimprt.hxx,v $
- * $Revision: 1.97.52.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx
index adc3093b9c88..70ec803cc46f 100644
--- a/sc/source/filter/xml/xmllabri.cxx
+++ b/sc/source/filter/xml/xmllabri.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmllabri.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx
index b7a0a52eefdb..c3cbd6532c90 100644
--- a/sc/source/filter/xml/xmllabri.hxx
+++ b/sc/source/filter/xml/xmllabri.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmllabri.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx
index 9a2a49f0b021..3ef17c321f23 100644
--- a/sc/source/filter/xml/xmlnexpi.cxx
+++ b/sc/source/filter/xml/xmlnexpi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnexpi.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx
index cb74294bbcff..94d0b2738d52 100644
--- a/sc/source/filter/xml/xmlnexpi.hxx
+++ b/sc/source/filter/xml/xmlnexpi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnexpi.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index f62208cdd2ff..341445431cc8 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlrowi.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx
index a0b83e7d8fda..558555b233e3 100644
--- a/sc/source/filter/xml/xmlrowi.hxx
+++ b/sc/source/filter/xml/xmlrowi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlrowi.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx
index e1ce4af9b47c..652dd0a1dd43 100644
--- a/sc/source/filter/xml/xmlsceni.cxx
+++ b/sc/source/filter/xml/xmlsceni.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlsceni.cxx,v $
- * $Revision: 1.15.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx
index ffffa031bd89..f3a5a75fa563 100644
--- a/sc/source/filter/xml/xmlsceni.hxx
+++ b/sc/source/filter/xml/xmlsceni.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlsceni.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx
index 535108a094f4..ff007240b12b 100644
--- a/sc/source/filter/xml/xmlsorti.cxx
+++ b/sc/source/filter/xml/xmlsorti.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlsorti.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx
index d68d9ea47df1..30ac31e0dd22 100644
--- a/sc/source/filter/xml/xmlsorti.hxx
+++ b/sc/source/filter/xml/xmlsorti.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlsorti.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index 365d57a53571..f9f0d063a843 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlstyle.cxx,v $
- * $Revision: 1.70.62.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx
index da1dc8ab4849..07e7138afc71 100644
--- a/sc/source/filter/xml/xmlstyle.hxx
+++ b/sc/source/filter/xml/xmlstyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlstyle.hxx,v $
- * $Revision: 1.32.62.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 20158d1f13db..9a04e284bf45 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlstyli.cxx,v $
- * $Revision: 1.63 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx
index c80ea8b5c92d..b2a8589f5524 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlstyli.hxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
index 0f980c4a9608..89077eb4bee9 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlsubti.cxx,v $
- * $Revision: 1.50.30.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx
index c5a16e2c3ef4..6e39844b5b8f 100644
--- a/sc/source/filter/xml/xmlsubti.hxx
+++ b/sc/source/filter/xml/xmlsubti.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlsubti.hxx,v $
- * $Revision: 1.32.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index 8ea9701ecd32..9afc08308feb 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltabi.cxx,v $
- * $Revision: 1.40.134.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx
index 1a4438b28955..c066b8bf3a9e 100644
--- a/sc/source/filter/xml/xmltabi.hxx
+++ b/sc/source/filter/xml/xmltabi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltabi.hxx,v $
- * $Revision: 1.11.134.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index e5a9f4b251a8..fde7f00bb05a 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlwrap.cxx,v $
- * $Revision: 1.69.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessibilityHints.cxx b/sc/source/ui/Accessibility/AccessibilityHints.cxx
index c14953abe95d..6c276b806e88 100644
--- a/sc/source/ui/Accessibility/AccessibilityHints.cxx
+++ b/sc/source/ui/Accessibility/AccessibilityHints.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibilityHints.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 4dbc47524276..434ea2dea40c 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleCell.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 
 #include "AccessibleCell.hxx"
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
 #include "AccessibleText.hxx"
@@ -61,7 +58,7 @@
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
 #include <rtl/uuid.h>
 #include <tools/debug.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <comphelper/sequence.hxx>
 #include <float.h>
 
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 19cbc028bee0..92ff551f2724 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleCellBase.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
 #include <tools/debug.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <rtl/uuid.h>
 #include <comphelper/sequence.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index c6c08e8a9c65..e438224ecfb6 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleContextBase.cxx,v $
- * $Revision: 1.33.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 8d141f0fe753..e99bd1971e4c 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleCsvControl.cxx,v $
- * $Revision: 1.22.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,9 +50,9 @@
 #endif
 #include <comphelper/sequence.hxx>
 #include "scitems.hxx"
-#include <svx/fontitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/langitem.hxx>
 #include "csvcontrol.hxx"
 #include "csvruler.hxx"
 #include "csvgrid.hxx"
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index 076f6e15870f..1848c7bfefc0 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDataPilotControl.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 2e6d9a256d75..1c1126e07640 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDocument.cxx,v $
- * $Revision: 1.76.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
index 9200bc701c7f..76be8e67aa07 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDocumentBase.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 9801c9eeb972..894e57d3802e 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDocumentPagePreview.cxx,v $
- * $Revision: 1.38.128.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 6228fd8a041b..fd7cbaf454c1 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleEditObject.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #include "precompiled_sc.hxx"
 #include "AccessibleEditObject.hxx"
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include "unoguard.hxx"
 #include "AccessibleText.hxx"
 #include "editsrc.hxx"
@@ -51,8 +48,8 @@
 #include <rtl/uuid.h>
 #include <tools/debug.hxx>
 #include <svx/AccessibleTextHelper.hxx>
-#include <svx/editview.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
 #include <svx/svdmodel.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index 0c663af87fd1..02fb5c12463e 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDataPilotControl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,9 +37,9 @@
 #include "docpool.hxx"
 
 #include "tools/gen.hxx"
-#include "svx/unoedsrc.hxx"
-#include "svx/editdata.hxx"
-#include "svx/outliner.hxx"
+#include "editeng/unoedsrc.hxx"
+#include "editeng/editdata.hxx"
+#include "editeng/outliner.hxx"
 #include "vcl/unohelp.hxx"
 #include "dpcontrol.hxx"
 
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
index 9f5524dcb8ce..0da1e6858a75 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDataPilotControl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
index 832cb37dd096..f536b8b9a8f7 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDataPilotControl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessibleGlobal.cxx b/sc/source/ui/Accessibility/AccessibleGlobal.cxx
index 6ac7190a132b..ac2562fa9bd5 100644
--- a/sc/source/ui/Accessibility/AccessibleGlobal.cxx
+++ b/sc/source/ui/Accessibility/AccessibleGlobal.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDataPilotControl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 960e58760512..6c28d22b0236 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessiblePageHeader.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,7 +53,7 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <svl/style.hxx>
 #include <svl/itempool.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <toolkit/helper/convert.hxx>
 
 #include <algorithm>
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 0cb20b22ffb8..10c6a9eff13f 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessiblePageHeaderArea.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #endif
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <svx/AccessibleTextHelper.hxx>
 #include <rtl/uuid.h>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index 692472fe635a..c07eb0844b7f 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessiblePreviewCell.cxx,v $
- * $Revision: 1.21.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <tools/gen.hxx>
 #include "AccessibleText.hxx"
 #include "editsrc.hxx"
@@ -43,7 +40,7 @@
 #include "document.hxx"
 #include <svx/AccessibleTextHelper.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <vcl/window.hxx>
 #include <toolkit/helper/convert.hxx>
 
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index fabd1fc932cc..3bb66ae01d4f 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessiblePreviewHeaderCell.cxx,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <tools/gen.hxx>
 #include "AccessibleText.hxx"
 #include "editsrc.hxx"
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 0746495ca099..e3fe26f47b4d 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessiblePreviewTable.cxx,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index e9420dd89a58..f85fb22531aa 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleSpreadsheet.cxx,v $
- * $Revision: 1.51 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index abace2a08ff8..2d46d3eb776b 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleTableBase.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index fd01269729db..4073e23f837f 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleText.cxx,v $
- * $Revision: 1.42.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #include "precompiled_sc.hxx"
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
 #include <memory>
@@ -48,12 +45,12 @@
 #include "unoguard.hxx"
 #include "patattr.hxx"
 #include "inputwin.hxx"
-#include <svx/unofored.hxx>
-#include <svx/editview.hxx>
-#include <svx/unoedhlp.hxx>
+#include <editeng/unofored.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/unoedhlp.hxx>
 #include <vcl/virdev.hxx>
-#include <svx/editobj.hxx>
-#include <svx/adjitem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/adjitem.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/algitem.hxx>
 
diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
index 4adc839e055f..31bf438772d0 100644
--- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
+++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DrawModelBroadcaster.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/Accessibility/makefile.mk b/sc/source/ui/Accessibility/makefile.mk
index 1ef6db37e0c1..32df95750f85 100644
--- a/sc/source/ui/Accessibility/makefile.mk
+++ b/sc/source/ui/Accessibility/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx
index 1cdd8bf750de..b1cb325ceb69 100644
--- a/sc/source/ui/app/client.cxx
+++ b/sc/source/ui/app/client.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: client.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 88b3d42996f6..b256233d7394 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drwtrans.cxx,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -76,10 +73,10 @@
 #include "scitems.hxx"
 
 // #108584#
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 // #108584#
-#include <svx/fhgtitem.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace com::sun::star;
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index c6901707d2c3..485ea4b88589 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inputhdl.cxx,v $
- * $Revision: 1.77.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,24 +31,24 @@
 //------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <sfx2/app.hxx>
-#include <svx/acorrcfg.hxx>
+#include <editeng/acorrcfg.hxx>
 #include <svx/algitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svx/colritem.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editstat.hxx>
-#include <svx/editview.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/forbiddencharacterstable.hxx>
-#include <svx/langitem.hxx>
-#include <svx/svxacorr.hxx>
-#include <svx/unolingu.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/svxacorr.hxx>
+#include <editeng/unolingu.hxx>
+#include <editeng/wghtitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index fc92ab261ab9..f6fc2cb27b71 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inputwin.cxx,v $
- * $Revision: 1.57.22.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,22 +31,22 @@
 #include <algorithm>
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <sfx2/app.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/editview.hxx>
-#include <svx/editstat.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/lspcitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/event.hxx>
 #include <sfx2/imgmgr.hxx>
 #include <stdlib.h>     // qsort
-#include <svx/scriptspaceitem.hxx>
-#include <svx/scripttypeitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/scripttypeitem.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/help.hxx>
 #include <svl/stritem.hxx>
@@ -73,7 +70,7 @@
 #include "rangeutl.hxx"
 #include "docfunc.hxx"
 #include "funcdesc.hxx"
-#include <svx/fontitem.hxx>
+#include <editeng/fontitem.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include "AccessibleEditObject.hxx"
 #include "AccessibleText.hxx"
diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx
index 89a51cd2b2b0..2e0f5d276a97 100644
--- a/sc/source/ui/app/lnktrans.cxx
+++ b/sc/source/ui/app/lnktrans.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lnktrans.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/app/makefile.mk b/sc/source/ui/app/makefile.mk
index 1dbac01e6a44..a5e4fe8cc024 100644
--- a/sc/source/ui/app/makefile.mk
+++ b/sc/source/ui/app/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx
index bb558c3a42ec..78cb70fa64f0 100644
--- a/sc/source/ui/app/msgpool.cxx
+++ b/sc/source/ui/app/msgpool.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msgpool.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx
index ee9dc001db27..3d62c0396b51 100644
--- a/sc/source/ui/app/rfindlst.cxx
+++ b/sc/source/ui/app/rfindlst.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rfindlst.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 2be737d9a717..11e33a8892e8 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scdll.cxx,v $
- * $Revision: 1.44.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 
 
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
 #ifndef _FM_FMOBJFAC_HXX
@@ -96,7 +93,7 @@
 #include <svx/selctrl.hxx>
 #include <svx/insctrl.hxx>
 #include <svx/zoomctrl.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 #include <svx/modctrl.hxx>
 #include <svx/pszctrl.hxx>
 #include <svx/fntctl.hxx>
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index b9d8682c412b..dc5d1010dfc8 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scmod.cxx,v $
- * $Revision: 1.58.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,10 +38,10 @@
 
 #include "scitems.hxx"
 #include <sfx2/app.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/flditem.hxx>
-#include <svx/outliner.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/outliner.hxx>
 #include <basic/sbstar.hxx>
 
 #include <sfx2/sfxdlg.hxx>
@@ -63,7 +60,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/macrconf.hxx>
 #include <sfx2/printer.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/langitem.hxx>
 #include <svtools/colorcfg.hxx>
 
 #include <svl/whiter.hxx>
diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx
index 7e0b43bdd156..c92f0bf5d206 100644
--- a/sc/source/ui/app/scmod2.cxx
+++ b/sc/source/ui/app/scmod2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scmod2.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 
 //------------------------------------------------------------------
 
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <unotools/lingucfg.hxx>
 #include <i18npool/mslangid.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 59b9b8810723..0b213709863d 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: seltrans.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/app/template.cxx b/sc/source/ui/app/template.cxx
index ede408ac8030..80dc667c5de6 100644
--- a/sc/source/ui/app/template.cxx
+++ b/sc/source/ui/app/template.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: template.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index c37fced30109..a5b286e8a9ea 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: transobj.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
 #include <com/sun/star/uno/Sequence.hxx>
@@ -63,8 +60,8 @@
 #include "scmod.hxx"
 
 // for InitDocShell
-#include <svx/paperinf.hxx>
-#include <svx/sizeitem.hxx>
+#include <editeng/paperinf.hxx>
+#include <editeng/sizeitem.hxx>
 #include <svx/algitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/zforlist.hxx>
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index 1a36b8ca5125..4450c00db807 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: typemap.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 #include <svx/svxids.hrc>
 #include "sc.hrc"
 #include "scitems.hxx"
-
+#include <editeng/memberids.hrc>
 
 
 #define ITEMID_DBTYPE           0
@@ -67,24 +64,24 @@
 #include <svl/stritem.hxx>
 #include <svl/slstitm.hxx>
 #include <sfx2/objitem.hxx>
-#include <svx/fontitem.hxx>
+#include <editeng/fontitem.hxx>
 #include <svx/hlnkitem.hxx>
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <svx/postattr.hxx>
-#include <svx/postitem.hxx>
+#include <editeng/postitem.hxx>
 #include <sfx2/tplpitem.hxx>
 #include <svx/zoomitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/bolnitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/bolnitem.hxx>
 #include <svl/ptitem.hxx>
-#include <svx/sizeitem.hxx>
+#include <editeng/sizeitem.hxx>
 #include <svx/algitem.hxx>
 #include <svx/clipfmtitem.hxx>
-#include <svx/udlnitem.hxx>
+#include <editeng/udlnitem.hxx>
 #include <svx/xlnstit.hxx>
 #include <svx/xlnedit.hxx>
 #include <svx/xfillit0.hxx>
@@ -107,14 +104,14 @@
 #include <svx/xftshcit.hxx>
 #include <svx/xftshxy.hxx>
 #include <svx/xftsfit.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/langitem.hxx>
 #include <svx/grafctrl.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/shaditem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/brkitem.hxx>
-#include <svx/charreliefitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/brkitem.hxx>
+#include <editeng/charreliefitem.hxx>
 #include <svx/rotmodit.hxx>
 #include <svx/drawitem.hxx>
 #include <svl/ilstitem.hxx>
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index 4ae240edb222..a63491f0929b 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uiitems.cxx,v $
- * $Revision: 1.9.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 
 
 
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 
 #include "userlist.hxx"
 #include "uiitems.hxx"
diff --git a/sc/source/ui/app/wtcdummy.cxx b/sc/source/ui/app/wtcdummy.cxx
index d545730c8d84..a755830cbd71 100644
--- a/sc/source/ui/app/wtcdummy.cxx
+++ b/sc/source/ui/app/wtcdummy.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wtcdummy.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 05bcf624a1b3..ca62ebb887a5 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attrdlg.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@
 #include <svx/svxdlg.hxx> //CHINA001
 #include <svx/dialogs.hrc> //CHINA001
 #include <svx/flagsdef.hxx> //CHINA001
-#include <svx/flstitem.hxx> //CHINA001
+#include <editeng/flstitem.hxx> //CHINA001
 #include <sfx2/app.hxx> //CHINA001
 
 #if !LAYOUT_SFX_TABDIALOG_BROKEN
diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx
index c08f8fa2dcea..5e3b23af8afa 100644
--- a/sc/source/ui/attrdlg/condfrmt.cxx
+++ b/sc/source/ui/attrdlg/condfrmt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: condfrmt.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/attrdlg/makefile.mk b/sc/source/ui/attrdlg/makefile.mk
index aed07601fd26..378fd1052ff7 100644
--- a/sc/source/ui/attrdlg/makefile.mk
+++ b/sc/source/ui/attrdlg/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx
index 9a57e73d51d0..b50435041409 100644
--- a/sc/source/ui/attrdlg/scabstdlg.cxx
+++ b/sc/source/ui/attrdlg/scabstdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scabstdlg.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 8d5e0e1e6791..ff42e379be13 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scdlgfact.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 530220858f35..7a9b03217655 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scdlgfact.hxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx
index e86269399c4a..35a0a3a1fb35 100644
--- a/sc/source/ui/attrdlg/scuiexp.cxx
+++ b/sc/source/ui/attrdlg/scuiexp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scuiexp.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index fbc6659a34ae..21c769cf0603 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabpages.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index efa93cce014d..6004fdfcfc51 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cbuttonw.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index a938948e1b26..fa14a5497826 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: document.hxx,v $
- * $Revision: 1.115.36.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/cctrl/dpcontrol.src b/sc/source/ui/cctrl/dpcontrol.src
index 31cbb62085e5..b38548369be5 100644
--- a/sc/source/ui/cctrl/dpcontrol.src
+++ b/sc/source/ui/cctrl/dpcontrol.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globstr.src,v $
- * $Revision: 1.74.96.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx
index 0bc6478fe89b..4358694f6b04 100644
--- a/sc/source/ui/cctrl/editfield.cxx
+++ b/sc/source/ui/cctrl/editfield.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editfield.cxx,v $
- * $Revision: 1.6.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/cctrl/makefile.mk b/sc/source/ui/cctrl/makefile.mk
index 541a90cc4347..17fd9b40cb95 100644
--- a/sc/source/ui/cctrl/makefile.mk
+++ b/sc/source/ui/cctrl/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/cctrl/popmenu.cxx b/sc/source/ui/cctrl/popmenu.cxx
index 9ceb734bd2ea..6510fff87ead 100644
--- a/sc/source/ui/cctrl/popmenu.cxx
+++ b/sc/source/ui/cctrl/popmenu.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: popmenu.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 618c7f97a881..e27baecec115 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbinsert.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 8e1f839c39e4..7d43b31e0b30 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -1,36 +1,28 @@
 /*************************************************************************
 *
-*  OpenOffice.org - a multi-platform office productivity suite
-*
-*  $RCSfile: tbzoomsliderctrl.cxx,v $
-*
-*  $Revision: 1.1 $
-*
-*  last change: $Author: maoyg $ $Date: 2008/04/25 10:08:08 $
-*
-*  The Contents of this file are made available subject to
-*  the terms of GNU Lesser General Public License Version 2.1.
-*
-*
-*    GNU Lesser General Public License Version 2.1
-*    =============================================
-*    Copyright 2005 by Sun Microsystems, Inc.
-*    901 San Antonio Road, Palo Alto, CA 94303, USA
-*
-*    This library is free software; you can redistribute it and/or
-*    modify it under the terms of the GNU Lesser General Public
-*    License version 2.1, as published by the Free Software Foundation.
-*
-*    This library is distributed in the hope that it will be useful,
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-*    Lesser General Public License for more details.
-*
-*    You should have received a copy of the GNU Lesser General Public
-*    License along with this library; if not, write to the Free Software
-*    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-*    MA  02111-1307  USA
-*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 #include "precompiled_sc.hxx"
 #ifndef _SC_ZOOMSLIDERTBCONTRL_HXX
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index a2a20a047a3e..a40a5fb994ea 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: asciiopt.cxx,v $
- * $Revision: 1.25 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc
index 29dca4596441..275de80f5972 100644
--- a/sc/source/ui/dbgui/asciiopt.hrc
+++ b/sc/source/ui/dbgui/asciiopt.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: asciiopt.hrc,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.src
index b9854c175344..b527719cb6de 100644
--- a/sc/source/ui/dbgui/asciiopt.src
+++ b/sc/source/ui/dbgui/asciiopt.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: asciiopt.src,v $
- * $Revision: 1.36 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index e4f53c5129fd..e094149ab99b 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: consdlg.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/consdlg.hrc b/sc/source/ui/dbgui/consdlg.hrc
index 31233e2ab0fe..6f9f6708c388 100644
--- a/sc/source/ui/dbgui/consdlg.hrc
+++ b/sc/source/ui/dbgui/consdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: consdlg.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/consdlg.src b/sc/source/ui/dbgui/consdlg.src
index fb6d65818299..5226c22629c6 100644
--- a/sc/source/ui/dbgui/consdlg.src
+++ b/sc/source/ui/dbgui/consdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: consdlg.src,v $
- * $Revision: 1.39 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx
index f2f77e8b0608..0dbc4e7dab39 100644
--- a/sc/source/ui/dbgui/csvcontrol.cxx
+++ b/sc/source/ui/dbgui/csvcontrol.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csvcontrol.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index e33ecde514a4..2ec05af2f72e 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csvgrid.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,12 +43,12 @@
 
 // *** edit engine ***
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
-#include <svx/colritem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/fontitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
 #include <svl/itemset.hxx>
 #include "editutil.hxx"
 // *** edit engine ***
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 6f97ecd4c9d9..d84c938bfd14 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csvruler.cxx,v $
- * $Revision: 1.16.146.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx
index ad9a51534541..b93bb09b5151 100644
--- a/sc/source/ui/dbgui/csvsplits.cxx
+++ b/sc/source/ui/dbgui/csvsplits.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csvsplits.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx
index c3cfb97cd52c..842f1cc81dea 100644
--- a/sc/source/ui/dbgui/csvtablebox.cxx
+++ b/sc/source/ui/dbgui/csvtablebox.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csvtablebox.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index 1b44ef86c7d4..87de71767a17 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dapidata.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 9a5076f4b3ce..31aafbcb13da 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dapitype.cxx,v $
- * $Revision: 1.7.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/dapitype.hrc b/sc/source/ui/dbgui/dapitype.hrc
index 224054412e4c..efbabe64fa04 100644
--- a/sc/source/ui/dbgui/dapitype.hrc
+++ b/sc/source/ui/dbgui/dapitype.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dapitype.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src
index ee046df035f9..5cf1dacad819 100644
--- a/sc/source/ui/dbgui/dapitype.src
+++ b/sc/source/ui/dbgui/dapitype.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dapitype.src,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 6fae453a9f52..a2f4d61af537 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbnamdlg.cxx,v $
- * $Revision: 1.9.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 70f7c9a03b10..4ac3fb8d68ad 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpgroupdlg.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/dpgroupdlg.hrc b/sc/source/ui/dbgui/dpgroupdlg.hrc
index 4e0391ab3ec2..5a4797489ddf 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.hrc
+++ b/sc/source/ui/dbgui/dpgroupdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpgroupdlg.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/dpgroupdlg.src b/sc/source/ui/dbgui/dpgroupdlg.src
index b13369e38f7c..f9a5ac589af5 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.src
+++ b/sc/source/ui/dbgui/dpgroupdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpgroupdlg.src,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/expftext.cxx b/sc/source/ui/dbgui/expftext.cxx
index 053433743185..405a18fcc004 100644
--- a/sc/source/ui/dbgui/expftext.cxx
+++ b/sc/source/ui/dbgui/expftext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: expftext.cxx,v $
- * $Revision: 1.4.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 4d3c478d9068..d4b477cd4b33 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fieldwnd.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index a7a80165566f..56878f623828 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtdlg.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 603a9a3a5eea..1e274690c31c 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: foptmgr.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,6 +42,7 @@
 #include "dbcolect.hxx"
 #include "viewdata.hxx"
 #include "document.hxx"
+#include "queryparam.hxx"
 
 #define _FOPTMGR_CXX
 #include "foptmgr.hxx"
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 14f278fc5575..bd18008afd47 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imoptdlg.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/imoptdlg.hrc b/sc/source/ui/dbgui/imoptdlg.hrc
index 3c09a5e0e225..5fd9256e8009 100644
--- a/sc/source/ui/dbgui/imoptdlg.hrc
+++ b/sc/source/ui/dbgui/imoptdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imoptdlg.hrc,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/imoptdlg.src b/sc/source/ui/dbgui/imoptdlg.src
index 55903711dbae..914f2d1fb027 100644
--- a/sc/source/ui/dbgui/imoptdlg.src
+++ b/sc/source/ui/dbgui/imoptdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imoptdlg.src,v $
- * $Revision: 1.35 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/makefile.mk b/sc/source/ui/dbgui/makefile.mk
index 9ff21b6c4d08..ee855d22aef1 100644
--- a/sc/source/ui/dbgui/makefile.mk
+++ b/sc/source/ui/dbgui/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src
index 2cd94becb48c..cd59bf3b099d 100644
--- a/sc/source/ui/dbgui/outline.src
+++ b/sc/source/ui/dbgui/outline.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outline.src,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 8a44d512cbe6..cde18fcc3b52 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pfiltdlg.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/pivot.hrc b/sc/source/ui/dbgui/pivot.hrc
index b7aefcfd996a..1a97d4c75b52 100644
--- a/sc/source/ui/dbgui/pivot.hrc
+++ b/sc/source/ui/dbgui/pivot.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pivot.hrc,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/pivot.src b/sc/source/ui/dbgui/pivot.src
index a4694e756edb..359c8a92d8e5 100644
--- a/sc/source/ui/dbgui/pivot.src
+++ b/sc/source/ui/dbgui/pivot.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pivot.src,v $
- * $Revision: 1.60 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 30ee1a44d384..8609bfcbfb0a 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pvfundlg.cxx,v $
- * $Revision: 1.12.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/pvfundlg.hrc b/sc/source/ui/dbgui/pvfundlg.hrc
index 141a41494198..c9b6f562a9e1 100644
--- a/sc/source/ui/dbgui/pvfundlg.hrc
+++ b/sc/source/ui/dbgui/pvfundlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pvfundlg.hrc,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src
index 5aa547ff951e..70bce3ed30e9 100644
--- a/sc/source/ui/dbgui/pvfundlg.src
+++ b/sc/source/ui/dbgui/pvfundlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pvfundlg.src,v $
- * $Revision: 1.39 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/pvglob.hxx b/sc/source/ui/dbgui/pvglob.hxx
index 76001b340146..6b6526266035 100644
--- a/sc/source/ui/dbgui/pvglob.hxx
+++ b/sc/source/ui/dbgui/pvglob.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pvglob.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index 6a9bb63e3ae3..1eca44a787ed 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pvlaydlg.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 0065af288783..96c9f120f5b1 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scendlg.cxx,v $
- * $Revision: 1.16.296.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/scendlg.hrc b/sc/source/ui/dbgui/scendlg.hrc
index 3d1e0e8e246f..83818773bf5a 100644
--- a/sc/source/ui/dbgui/scendlg.hrc
+++ b/sc/source/ui/dbgui/scendlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scendlg.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/scendlg.src b/sc/source/ui/dbgui/scendlg.src
index 2c2913103f9c..40cfeb01b8ff 100644
--- a/sc/source/ui/dbgui/scendlg.src
+++ b/sc/source/ui/dbgui/scendlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scendlg.src,v $
- * $Revision: 1.44 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 773862088155..e4e568e00882 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scuiasciiopt.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 76934e12c8df..5440f515c86a 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scuiimoptdlg.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 86f344c11c55..f70fbb094c92 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfiltdlg.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 7d1462f62f27..f2a733af3aa8 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sortdlg.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index 0c23c205114b..2c9cba31cd13 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: subtdlg.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 1e6c2b3f8fa7..18c1eb25664a 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpsort.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 8bbc561c9e43..fbada165b55d 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpsubt.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 81e8ff35195d..5fdf386323d9 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: validate.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src
index 1f8e4b48deac..c861fbc200cb 100644
--- a/sc/source/ui/dbgui/validate.src
+++ b/sc/source/ui/dbgui/validate.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: validate.src,v $
- * $Revision: 1.46 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index fc745318b105..d819785c843b 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: arealink.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,7 +36,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svx/linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/msgbox.hxx>
 
@@ -130,7 +127,7 @@ void __EXPORT ScAreaLink::DataChanged( const String&,
     if (bInCreate)
         return;
 
-    SvxLinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();
+    sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();
     if (pLinkManager!=NULL)
     {
         String aFile;
diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx
index 3759d3359a7d..61683e169f02 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autostyl.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 4042154b9a52..1633af000b51 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbdocfun.cxx,v $
- * $Revision: 1.20.128.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 09e4dd7aa4af..17b07099a491 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbdocimp.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index e292187c80c9..cd28daa99401 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docfunc.cxx,v $
- * $Revision: 1.70.100.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,11 +33,11 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <sfx2/app.hxx>
-#include <svx/editobj.hxx>
-#include <svx/linkmgr.hxx>
+#include <editeng/editobj.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <svx/svdundo.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/printer.hxx>
@@ -4551,7 +4548,7 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
     ScDocument* pDoc = rDocShell.GetDocument();
     BOOL bUndo (pDoc->IsUndoEnabled());
 
-    SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
 
     //  #i52120# if other area links exist at the same start position,
     //  remove them first (file format specifies only one link definition
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 17cb07ca0a49..1b4f9b677f81 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docsh.cxx,v $
- * $Revision: 1.103.36.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,8 +32,8 @@
 
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/svxenum.hxx>
 #include <svx/algitem.hxx>
 
 
@@ -62,7 +59,7 @@
 #include <sfx2/sfx.hrc>
 #include <sfx2/topfrm.hxx>
 #include <sfx2/objface.hxx>
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <unotools/fltrcfg.hxx>
 #include <svl/documentlockfile.hxx>
 #include <svl/sharecontrolfile.hxx>
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 386ac8528cec..4b76c18edbe6 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docsh2.cxx,v $
- * $Revision: 1.25.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,7 +37,7 @@
 #include "scitems.hxx"
 #include <tools/gen.hxx>
 #include <svtools/ctrltool.hxx>
-#include <svx/flstitem.hxx>
+#include <editeng/flstitem.hxx>
 #include <svx/drawitem.hxx>
 #include <sfx2/printer.hxx>
 #include <svl/smplhint.hxx>
@@ -48,9 +45,9 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
 #include <vcl/svapp.hxx>
-#include <svx/asiancfg.hxx>
-#include <svx/forbiddencharacterstable.hxx>
-#include <svx/unolingu.hxx>
+#include <svl/asiancfg.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
+#include <editeng/unolingu.hxx>
 #include <rtl/logfile.hxx>
 
 #include <comphelper/processfactory.hxx>
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 1416c57f1165..7ff714c2cbdd 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docsh3.cxx,v $
- * $Revision: 1.38.52.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,11 +37,11 @@
 
 #include "scitems.hxx"
 #include "rangelst.hxx"
-#include <svx/flstitem.hxx>
+#include <editeng/flstitem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/paperinf.hxx>
+#include <editeng/paperinf.hxx>
 #include <svx/postattr.hxx>
-#include <svx/sizeitem.hxx>
+#include <editeng/sizeitem.hxx>
 #include <unotools/misccfg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 3ab36ce131ad..97403008915d 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docsh4.cxx,v $
- * $Revision: 1.61.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@ using namespace ::com::sun::star;
 
 #include "scitems.hxx"
 #include <sfx2/fcontnr.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index b4b5f4721900..6fa6a5ac7863 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docsh5.cxx,v $
- * $Revision: 1.20.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index e3f1f6904af4..fbb6dc8ead35 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docsh6.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,7 +37,7 @@
 
 #include <svx/pageitem.hxx>
 #include <vcl/virdev.hxx>
-#include <svx/linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #endif
 
 // INCLUDE ---------------------------------------------------------------
@@ -367,7 +364,7 @@ BOOL __EXPORT ScDocShell::Insert( SfxObjectShell &rSource,
 
 void ScDocShell::UpdateLinks()
 {
-    SvxLinkManager* pLinkManager = aDocument.GetLinkManager();
+    sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager();
     ScStrCollection aNames;
 
     // nicht mehr benutzte Links raus
@@ -438,7 +435,7 @@ void ScDocShell::UpdateLinks()
 
 BOOL ScDocShell::ReloadTabLinks()
 {
-    SvxLinkManager* pLinkManager = aDocument.GetLinkManager();
+    sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager();
 
     BOOL bAny = FALSE;
     USHORT nCount = pLinkManager->GetLinks().Count();
diff --git a/sc/source/ui/docshell/docsh7.cxx b/sc/source/ui/docshell/docsh7.cxx
index ea930bb12f53..89f082672b29 100644
--- a/sc/source/ui/docshell/docsh7.cxx
+++ b/sc/source/ui/docshell/docsh7.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docsh7.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 174207bbf673..b761dd75d9df 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docsh8.cxx,v $
- * $Revision: 1.27.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/docshimp.hxx b/sc/source/ui/docshell/docshimp.hxx
index e230b6f42fda..6532c46d0835 100644
--- a/sc/source/ui/docshell/docshimp.hxx
+++ b/sc/source/ui/docshell/docshimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docshimp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx
index c25df4dd0035..d381ff067a99 100644
--- a/sc/source/ui/docshell/editable.cxx
+++ b/sc/source/ui/docshell/editable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editable.cxx,v $
- * $Revision: 1.5.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index e18ef20d96b9..836d6cdf98e6 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: externalrefmgr.cxx,v $
- * $Revision: 1.1.2.33 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,7 @@
 #include "svl/stritem.hxx"
 #include "svl/urihelper.hxx"
 #include "svl/zformat.hxx"
-#include "svx/linkmgr.hxx"
+#include "sfx2/linkmgr.hxx"
 #include "tools/urlobj.hxx"
 #include "unotools/ucbhelper.hxx"
 
@@ -1061,8 +1058,11 @@ void ScExternalRefLink::DataChanged(const String& /*rMimeType*/, const Any& /*rV
     else
     {
         // The source document has changed.
+        ScDocShell* pDocShell = ScDocShell::GetViewData()->GetDocShell();
+        ScDocShellModificator aMod(*pDocShell);
         pMgr->switchSrcFile(mnFileId, aFile, aFilter);
         maFilterName = aFilter;
+        aMod.SetDocumentModified();
     }
 }
 
@@ -1994,7 +1994,7 @@ void ScExternalRefManager::maybeLinkExternalFile(sal_uInt16 nFileId)
 
     String aFilter, aOptions;
     ScDocumentLoader::GetFilterName(*pFileName, aFilter, aOptions, true, false);
-    SvxLinkManager* pLinkMgr = mpDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkMgr = mpDoc->GetLinkManager();
     ScExternalRefLink* pLink = new ScExternalRefLink(mpDoc, nFileId, aFilter);
     DBG_ASSERT(pFileName, "ScExternalRefManager::insertExternalFileLink: file name pointer is NULL");
     pLinkMgr->InsertFileLink(*pLink, OBJECT_CLIENT_FILE, *pFileName, &aFilter);
diff --git a/sc/source/ui/docshell/hiranges.cxx b/sc/source/ui/docshell/hiranges.cxx
index 32af772bfd72..af1226216a06 100644
--- a/sc/source/ui/docshell/hiranges.cxx
+++ b/sc/source/ui/docshell/hiranges.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hiranges.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 25a1c867b0e3..8fc49696ba59 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impex.cxx,v $
- * $Revision: 1.43 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/makefile.mk b/sc/source/ui/docshell/makefile.mk
index f3179c440b67..99a7495b6b49 100644
--- a/sc/source/ui/docshell/makefile.mk
+++ b/sc/source/ui/docshell/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13.134.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx
index 20ffb63f43fd..2f42c77ed5f4 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olinefun.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx
index d9205b1f9a2a..db55c2364305 100644
--- a/sc/source/ui/docshell/pagedata.cxx
+++ b/sc/source/ui/docshell/pagedata.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pagedata.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx
index 803eb0fbb90f..764d431f3af0 100644
--- a/sc/source/ui/docshell/pntlock.cxx
+++ b/sc/source/ui/docshell/pntlock.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pntlock.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index aeb4b6604e67..dabe38fb8c1d 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: servobj.cxx,v $
- * $Revision: 1.11.10.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 
 #include <sot/formats.hxx>
 #include <sfx2/app.hxx>
-#include <svx/linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #include "servobj.hxx"
 #include "docsh.hxx"
 #include "impex.hxx"
diff --git a/sc/source/ui/docshell/sizedev.cxx b/sc/source/ui/docshell/sizedev.cxx
index 1abebc5ad8e0..d89009540156 100644
--- a/sc/source/ui/docshell/sizedev.cxx
+++ b/sc/source/ui/docshell/sizedev.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sizedev.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index c86c7591cd36..4d18f9f18c37 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablink.cxx,v $
- * $Revision: 1.31.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <svx/linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/transliterationwrapper.hxx>
 
@@ -146,7 +143,7 @@ void __EXPORT ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl )
 void __EXPORT ScTableLink::DataChanged( const String&,
                                         const ::com::sun::star::uno::Any& )
 {
-    SvxLinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();
+    sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();
     if (pLinkManager!=NULL)
     {
         String aFile;
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index 3aa9b873ea67..1072af30c7a1 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpstat.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/tpstat.hrc b/sc/source/ui/docshell/tpstat.hrc
index 7f08f543cbcd..2b57d20f1a26 100644
--- a/sc/source/ui/docshell/tpstat.hrc
+++ b/sc/source/ui/docshell/tpstat.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpstat.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/docshell/tpstat.src b/sc/source/ui/docshell/tpstat.src
index a1bf65f53986..7226da4642c3 100644
--- a/sc/source/ui/docshell/tpstat.src
+++ b/sc/source/ui/docshell/tpstat.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpstat.src,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index e4d39e21d7be..605611f2e309 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartsh.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,10 +31,10 @@
 
 
 //------------------------------------------------------------------
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/fontwork.hxx>
 //CHINA001 #include <svx/labdlg.hxx>
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <svx/tabarea.hxx>
 #include <svx/tabline.hxx>
 //CHINA001 #include <svx/transfrm.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index e53fea436d12..b44c396f4e0c 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawsh.cxx,v $
- * $Revision: 1.15.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,10 +33,10 @@
 
 #include "scitems.hxx"
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/fontwork.hxx>
 //#include <svx/labdlg.hxx> CHINA001
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <svx/tabarea.hxx>
 #include <svx/tabline.hxx>
 //CHINA001 #include <svx/transfrm.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index ad36ad72e796..7da571fc05a7 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawsh2.cxx,v $
- * $Revision: 1.26.128.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,8 +32,8 @@
 #include <com/sun/star/embed/EmbedMisc.hpp>
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
-#include <svx/sizeitem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/sizeitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/xdef.hxx>
 #include <sfx2/app.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx
index 8de1416852d1..45b26584f29a 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawsh4.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 5d8e4cb1ca33..e79097ef8874 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawsh5.cxx,v $
- * $Revision: 1.37.128.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 
 //------------------------------------------------------------------
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 8987c9194cb2..44b88738430a 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drformsh.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,10 +32,10 @@
 
 //------------------------------------------------------------------
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/fontwork.hxx>
 //CHINA001 #include <svx/labdlg.hxx>
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <svx/tabarea.hxx>
 #include <svx/tabline.hxx>
 //CHINA001 #include <svx/transfrm.hxx>
diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src
index f94d70a782ff..b20ceb9841a5 100644
--- a/sc/source/ui/drawfunc/drformsh.src
+++ b/sc/source/ui/drawfunc/drformsh.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drformsh.src,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 908eba68cee5..ece7c4ad6c3a 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drtxtob.cxx,v $
- * $Revision: 1.34.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,26 +34,26 @@
 
 #include "scitems.hxx"
 
-#include <svx/adjitem.hxx>
+#include <editeng/adjitem.hxx>
 #include <svx/clipfmtitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/editeng.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/frmdiritem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/frmdiritem.hxx>
 #include <svx/hlnkitem.hxx>
-#include <svx/lspcitem.hxx>
+#include <editeng/lspcitem.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/postitem.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/srchitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/writingmodeitem.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <svl/srchitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/writingmodeitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objface.hxx>
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index a1d85b1dc13a..61fbf3d0f96e 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drtxtob1.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,15 +33,15 @@
 //------------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <svx/svxdlg.hxx>
-#include <svx/brkitem.hxx>
-#include <svx/hyznitem.hxx>
-#include <svx/orphitem.hxx>
-#include <svx/outliner.hxx>
-#include <svx/spltitem.hxx>
-#include <svx/widwitem.hxx>
+#include <editeng/brkitem.hxx>
+#include <editeng/hyznitem.hxx>
+#include <editeng/orphitem.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/spltitem.hxx>
+#include <editeng/widwitem.hxx>
 #include <sot/exchange.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/transfer.hxx>
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index 3389c362901b..27f1a3dbb77f 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drtxtob2.cxx,v $
- * $Revision: 1.19.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,14 +29,14 @@
 #include "precompiled_sc.hxx"
 
 #include "scitems.hxx"
-#include <svx/adjitem.hxx>
+#include <editeng/adjitem.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/fontwork.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/xtextit.hxx>
-#include <svx/writingmodeitem.hxx>
+#include <editeng/writingmodeitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 57d84879df52..20daacffac0e 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuconarc.cxx,v $
- * $Revision: 1.9.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 0398d5a63b43..69a47f0584d0 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuconcustomshape.cxx,v $
- * $Revision: 1.13.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,20 +29,20 @@
 #include "precompiled_sc.hxx"
 
 #include "fuconcustomshape.hxx"
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <svx/gallery.hxx>
 #include <sfx2/request.hxx>
 #include <svx/fmmodel.hxx>
 #include <svl/itempool.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdoashp.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/sdtagitm.hxx>
 #include "fuconuno.hxx"
 #include "tabvwsh.hxx"
 #include "sc.hrc"
 #include "drawview.hxx"
-#include <svx/adjitem.hxx>
+#include <editeng/adjitem.hxx>
 
 #include <math.h>
 
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index b46fb5082c55..440f49f41326 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuconpol.cxx,v $
- * $Revision: 1.9.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index a62890f7a51c..733c6fe08b45 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuconrec.cxx,v $
- * $Revision: 1.14.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 #include "sc.hrc"
 #include "drawview.hxx"
 
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 // #98185# Create default drawing objects via keyboard
 #include <svx/svdopath.hxx>
 #include <svx/svdocapt.hxx>
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index aea0c7a1b804..bb918e9005ae 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuconstr.cxx,v $
- * $Revision: 1.11.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,8 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-#include <svx/outliner.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdouno.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index 8022d101ddba..c1212d4d9699 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuconuno.cxx,v $
- * $Revision: 1.10.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index fadb8270b6a6..3a3fc833a515 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fudraw.cxx,v $
- * $Revision: 1.25.128.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,8 +30,8 @@
 
 //------------------------------------------------------------------------
 
-#include <svx/editeng.hxx>  // EditEngine::IsSimpleCharInput
-#include <svx/outlobj.hxx>
+#include <editeng/editeng.hxx>  // EditEngine::IsSimpleCharInput
+#include <editeng/outlobj.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdouno.hxx>
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 35d46f234182..53a44f058dda 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuins1.cxx,v $
- * $Revision: 1.12.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,8 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-#include <svx/impgrf.hxx>
-#include <svx/opengrf.hxx>
+#include <sfx2/opengrf.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/svdpage.hxx>
@@ -273,7 +269,7 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell*   pViewSh,
             bAsLink = ((const SfxBoolItem*)pItem)->GetValue();
 
         Graphic aGraphic;
-        int nError = ::LoadGraphic( aFileName, aFilterName, aGraphic, ::GetGrfFilter() );
+        int nError = GraphicFilter::LoadGraphic( aFileName, aFilterName, aGraphic, GraphicFilter::GetGraphicFilter() );
         if ( nError == GRFILTER_OK )
         {
             lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, TRUE, pViewSh, pWindow, pView );
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 1f7534a7fcb4..e0721fc47f50 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuins2.cxx,v $
- * $Revision: 1.31.20.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx
index 6cc1c70ff5cf..02554c495729 100644
--- a/sc/source/ui/drawfunc/fumark.cxx
+++ b/sc/source/ui/drawfunc/fumark.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fumark.cxx,v $
- * $Revision: 1.9.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 23aefe17c71b..0bffdfe7ef84 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fupoor.cxx,v $
- * $Revision: 1.13.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpagv.hxx>
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 79c466f9f2c3..213169b8b9fd 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fusel.cxx,v $
- * $Revision: 1.23.128.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,8 +32,8 @@
 
 #include <com/sun/star/embed/EmbedStates.hpp>
 
-#include <svx/eeitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/flditem.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdotext.hxx>
 #include <sfx2/dispatch.hxx>
@@ -44,7 +41,7 @@
 #include <svx/svdouno.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/svdocapt.hxx>
 #include <sfx2/app.hxx>
 
diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx
index 7c096fd51d71..402143ac0a8c 100644
--- a/sc/source/ui/drawfunc/fusel2.cxx
+++ b/sc/source/ui/drawfunc/fusel2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fusel2.cxx,v $
- * $Revision: 1.12.128.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,7 +36,7 @@
 #include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 
 #include "fusel.hxx"
 #include "tabvwsh.hxx"
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index a96ce6c18980..a13cfc61d1c6 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: futext.cxx,v $
- * $Revision: 1.28.128.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,17 +30,17 @@
 
 #include <svx/svddef.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/sdtaaitm.hxx>
 #include <svx/sdtacitm.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <svx/svdocapt.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/svxids.hrc>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
 
 #include "futext.hxx"
diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx
index 9570836e53fe..340e71faa71c 100644
--- a/sc/source/ui/drawfunc/futext2.cxx
+++ b/sc/source/ui/drawfunc/futext2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: futext2.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index 2152abfd4f8b..534e68705fa8 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: futext3.cxx,v $
- * $Revision: 1.15.128.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,16 +28,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-#include <svx/editeng.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdview.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <vcl/cursor.hxx>
 #include <sfx2/objsh.hxx>
-#include <svx/writingmodeitem.hxx>
+#include <editeng/writingmodeitem.hxx>
 
 #include "global.hxx"
 #include "drwlayer.hxx"
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 34c32fb8bc08..25cda28aaa9d 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphsh.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/makefile.mk b/sc/source/ui/drawfunc/makefile.mk
index 0e381849ab80..52f54b56edce 100644
--- a/sc/source/ui/drawfunc/makefile.mk
+++ b/sc/source/ui/drawfunc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 9469cd43c96e..78948550aea6 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediash.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src
index 1f3a374fc34a..0cd8fdd54e4b 100644
--- a/sc/source/ui/drawfunc/objdraw.src
+++ b/sc/source/ui/drawfunc/objdraw.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objdraw.src,v $
- * $Revision: 1.72.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index c9da807019c9..f9346dd8da88 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oleobjsh.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,10 +32,10 @@
 
 //------------------------------------------------------------------
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/fontwork.hxx>
 //CHINA001 #include <svx/labdlg.hxx>
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <svx/tabarea.hxx>
 #include <svx/tabline.hxx>
 //CHINA001 #include <svx/transfrm.hxx>
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index feda9d1657f1..1d522fb3211e 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dwfunctr.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/formdlg/dwfunctr.hrc b/sc/source/ui/formdlg/dwfunctr.hrc
index 6f706ad7771d..388fea28b7ca 100644
--- a/sc/source/ui/formdlg/dwfunctr.hrc
+++ b/sc/source/ui/formdlg/dwfunctr.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dwfunctr.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/formdlg/dwfunctr.src b/sc/source/ui/formdlg/dwfunctr.src
index ca06d8189ba5..6f8a054dd6ff 100644
--- a/sc/source/ui/formdlg/dwfunctr.src
+++ b/sc/source/ui/formdlg/dwfunctr.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dwfunctr.src,v $
- * $Revision: 1.35 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxx
index e9d4a293888d..e493e3f7b00f 100644
--- a/sc/source/ui/formdlg/formdata.cxx
+++ b/sc/source/ui/formdlg/formdata.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formdata.cxx,v $
- * $Revision: 1.6.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/formdlg/formdlgs.src b/sc/source/ui/formdlg/formdlgs.src
index bc7a2fd573d3..e3550030c74e 100644
--- a/sc/source/ui/formdlg/formdlgs.src
+++ b/sc/source/ui/formdlg/formdlgs.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formdlgs.src,v $
- * $Revision: 1.49 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index f9146b96c04c..d9add14952a4 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formula.cxx,v $
- * $Revision: 1.18.30.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/formdlg/makefile.mk b/sc/source/ui/formdlg/makefile.mk
index dd705c8085ff..339e8fa4d581 100644
--- a/sc/source/ui/formdlg/makefile.mk
+++ b/sc/source/ui/formdlg/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx
index c6eedbc5f06e..a3b27ba21b1d 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: privsplt.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx
index e89069ade49a..8d966a78fa7f 100644
--- a/sc/source/ui/inc/AccessibilityHints.hxx
+++ b/sc/source/ui/inc/AccessibilityHints.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibilityHints.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx
index ed57d453ef7b..38dfdc483886 100644
--- a/sc/source/ui/inc/AccessibleCell.hxx
+++ b/sc/source/ui/inc/AccessibleCell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleCell.hxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,7 +34,7 @@
 #include "viewdata.hxx"
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <unotools/accessiblerelationsethelper.hxx>
-#include <svx/AccessibleStaticTextBase.hxx>
+#include <editeng/AccessibleStaticTextBase.hxx>
 #include <comphelper/uno3.hxx>
 
 class ScTabViewShell;
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx
index a246cf68e074..2bcef463480d 100644
--- a/sc/source/ui/inc/AccessibleCellBase.hxx
+++ b/sc/source/ui/inc/AccessibleCellBase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleCellBase.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index 4c79c4388e44..191f56c22d3d 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleContextBase.hxx,v $
- * $Revision: 1.23.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx
index d7fc64c75562..14f48b51efc1 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleCsvControl.hxx,v $
- * $Revision: 1.15.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,7 +38,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
-#include <svx/AccessibleStaticTextBase.hxx>
+#include <editeng/AccessibleStaticTextBase.hxx>
 #include <comphelper/uno3.hxx>
 #include "AccessibleContextBase.hxx"
 
diff --git a/sc/source/ui/inc/AccessibleDataPilotControl.hxx b/sc/source/ui/inc/AccessibleDataPilotControl.hxx
index 526768799907..c86d598b6e9c 100644
--- a/sc/source/ui/inc/AccessibleDataPilotControl.hxx
+++ b/sc/source/ui/inc/AccessibleDataPilotControl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDataPilotControl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx
index 41a7b7de4270..2ec612e0865b 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDocument.hxx,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx
index 831c56e78df2..fc76a8d771cf 100644
--- a/sc/source/ui/inc/AccessibleDocumentBase.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDocumentBase.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
index af871def7b65..8ce9050c6094 100644
--- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleDocumentPagePreview.hxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx
index 633c4595efae..55bb92f13424 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleEditObject.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx
index 1335541087ea..1e28670419a4 100644
--- a/sc/source/ui/inc/AccessiblePageHeader.hxx
+++ b/sc/source/ui/inc/AccessiblePageHeader.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessiblePageHeader.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 #define _SC_ACCESSIBLEPAGEHEADER_HXX
 
 #include "AccessibleContextBase.hxx"
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 
 class ScPreviewShell;
 class EditTextObject;
diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
index 15a3c23c64b8..dbf7c126b617 100644
--- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
+++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessiblePageHeaderArea.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 #ifndef _SC_ACCESSIBLE_CONTEXT_BASE_HXX
 #include "AccessibleContextBase.hxx"
 #endif
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 
 class EditTextObject;
 namespace accessibility
diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx
index 1920d75f3671..47a2be3b6713 100644
--- a/sc/source/ui/inc/AccessiblePreviewCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessiblePreviewCell.hxx,v $
- * $Revision: 1.11.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
index 5f275693e209..520abe7c53c3 100644
--- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessiblePreviewHeaderCell.hxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx
index a29db7ce00a2..6d9ae3c3025f 100644
--- a/sc/source/ui/inc/AccessiblePreviewTable.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessiblePreviewTable.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index 0955e56f982f..87447285dea2 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleSpreadsheet.hxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx
index 4cb54dd02e3d..017ef4dfca3f 100644
--- a/sc/source/ui/inc/AccessibleTableBase.hxx
+++ b/sc/source/ui/inc/AccessibleTableBase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleTableBase.hxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx
index a1138e869d3b..0a61280a574a 100644
--- a/sc/source/ui/inc/AccessibleText.hxx
+++ b/sc/source/ui/inc/AccessibleText.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleText.hxx,v $
- * $Revision: 1.19.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include "textuno.hxx"
 #include "global.hxx"
 #include "viewdata.hxx"
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 
 #include <memory>
 
diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx
index aeae7c7cd85b..65c725da5675 100644
--- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx
+++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChartRangeSelectionListener.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx
index fac00ea550e4..045e9bc86f41 100644
--- a/sc/source/ui/inc/DrawModelBroadcaster.hxx
+++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DrawModelBroadcaster.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/IAnyRefDialog.hxx b/sc/source/ui/inc/IAnyRefDialog.hxx
index bd115b2ad1c0..70731ac8a1f7 100644
--- a/sc/source/ui/inc/IAnyRefDialog.hxx
+++ b/sc/source/ui/inc/IAnyRefDialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formula.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/ScDevChart.hxx b/sc/source/ui/inc/ScDevChart.hxx
index 08b528f790f5..a08a89da0570 100644
--- a/sc/source/ui/inc/ScDevChart.hxx
+++ b/sc/source/ui/inc/ScDevChart.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScDevChart.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/acredlin.hrc b/sc/source/ui/inc/acredlin.hrc
index ca6f6031b47a..b21676ee6ae9 100644
--- a/sc/source/ui/inc/acredlin.hrc
+++ b/sc/source/ui/inc/acredlin.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acredlin.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index cdde064fc588..a077129c374c 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acredlin.hxx,v $
- * $Revision: 1.8.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 18125076d5cf..0e7560fe0c50 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: anyrefdg.hxx,v $
- * $Revision: 1.11.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx
index e00fa9905216..608f95a3bb51 100644
--- a/sc/source/ui/inc/areasave.hxx
+++ b/sc/source/ui/inc/areasave.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: areasave.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 9b7e7234123e..08c6e3cf0a91 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: areasdlg.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index a26929dc92ea..aee63d682a26 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: asciiopt.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/attrdlg.hrc b/sc/source/ui/inc/attrdlg.hrc
index 9f85196a030b..f43c1cb30b86 100644
--- a/sc/source/ui/inc/attrdlg.hrc
+++ b/sc/source/ui/inc/attrdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attrdlg.hrc,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx
index fe881f988813..752ee01ddd62 100644
--- a/sc/source/ui/inc/attrdlg.hxx
+++ b/sc/source/ui/inc/attrdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attrdlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx
index b03c2d205782..75059f4f88cc 100644
--- a/sc/source/ui/inc/auditsh.hxx
+++ b/sc/source/ui/inc/auditsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: auditsh.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index 7e5f95cfa090..52a033c202b2 100644
--- a/sc/source/ui/inc/autofmt.hxx
+++ b/sc/source/ui/inc/autofmt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autofmt.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx
index a37277e11bf2..5540ecf87aac 100644
--- a/sc/source/ui/inc/autostyl.hxx
+++ b/sc/source/ui/inc/autostyl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autostyl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx
index ba88647d952e..8de5dafe7768 100644
--- a/sc/source/ui/inc/cbutton.hxx
+++ b/sc/source/ui/inc/cbutton.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cbutton.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 90adbe40d2d2..563e18d96656 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellsh.hxx,v $
- * $Revision: 1.9.90.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx
index c039b9722002..95efd03f3b76 100644
--- a/sc/source/ui/inc/chartsh.hxx
+++ b/sc/source/ui/inc/chartsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartsh.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx
index 21fb8582d13d..1b13ee224d77 100644
--- a/sc/source/ui/inc/client.hxx
+++ b/sc/source/ui/inc/client.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: client.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx
index 3b825ad1908d..587412defea2 100644
--- a/sc/source/ui/inc/colrowba.hxx
+++ b/sc/source/ui/inc/colrowba.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: colrowba.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/condfrmt.hrc b/sc/source/ui/inc/condfrmt.hrc
index 943e41219e7b..099d82b2fa85 100644
--- a/sc/source/ui/inc/condfrmt.hrc
+++ b/sc/source/ui/inc/condfrmt.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: condfrmt.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/condfrmt.hxx b/sc/source/ui/inc/condfrmt.hxx
index db36fef2066a..ecd4c529d57a 100644
--- a/sc/source/ui/inc/condfrmt.hxx
+++ b/sc/source/ui/inc/condfrmt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: condfrmt.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/conflictsdlg.hrc b/sc/source/ui/inc/conflictsdlg.hrc
index 5caea216c396..7935a6ee21d7 100644
--- a/sc/source/ui/inc/conflictsdlg.hrc
+++ b/sc/source/ui/inc/conflictsdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: conflictsdlg.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index 98a622097781..faeecb370c78 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: conflictsdlg.hxx,v $
- * $Revision: 1.4.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index a4db4575f64d..e82e2619cce0 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: consdlg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index 0553cee15d29..b7d4d292c406 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: content.hxx,v $
- * $Revision: 1.13.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx
index 185ba543e4f6..424326565619 100644
--- a/sc/source/ui/inc/corodlg.hxx
+++ b/sc/source/ui/inc/corodlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: corodlg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx
index d1357a5218ce..20dd79f359ad 100644
--- a/sc/source/ui/inc/crdlg.hxx
+++ b/sc/source/ui/inc/crdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: crdlg.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/crnrdlg.hrc b/sc/source/ui/inc/crnrdlg.hrc
index 1c11a040b3c3..1d27531f9bc1 100644
--- a/sc/source/ui/inc/crnrdlg.hrc
+++ b/sc/source/ui/inc/crnrdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: crnrdlg.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index 5ae033947b2f..e45ff4403633 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: crnrdlg.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index 005a3e70dd7c..c38abfb83598 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csvcontrol.hxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx
index 583c4fd2c414..fb6d687533e6 100644
--- a/sc/source/ui/inc/csvgrid.hxx
+++ b/sc/source/ui/inc/csvgrid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csvgrid.hxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx
index cb79644f3aed..5ddeb1f1ceba 100644
--- a/sc/source/ui/inc/csvruler.hxx
+++ b/sc/source/ui/inc/csvruler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csvruler.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/csvsplits.hxx b/sc/source/ui/inc/csvsplits.hxx
index aff9e75b72cc..4685269936d5 100644
--- a/sc/source/ui/inc/csvsplits.hxx
+++ b/sc/source/ui/inc/csvsplits.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csvsplits.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx
index 6e9c6b379ca9..205e8b50cad1 100644
--- a/sc/source/ui/inc/csvtablebox.hxx
+++ b/sc/source/ui/inc/csvtablebox.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csvtablebox.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx
index 9728180206c8..13d7e91bdceb 100644
--- a/sc/source/ui/inc/dapidata.hxx
+++ b/sc/source/ui/inc/dapidata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dapidata.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx
index 577a78158a60..07659b1dbc59 100644
--- a/sc/source/ui/inc/dapitype.hxx
+++ b/sc/source/ui/inc/dapitype.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dapitype.hxx,v $
- * $Revision: 1.4.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx
index 1eaf2200de10..efdd29b44738 100644
--- a/sc/source/ui/inc/dbdocfun.hxx
+++ b/sc/source/ui/inc/dbdocfun.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbdocfun.hxx,v $
- * $Revision: 1.10.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index 875576a22889..87df03b8ecd9 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbfunc.hxx,v $
- * $Revision: 1.12.100.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/dbnamdlg.hrc b/sc/source/ui/inc/dbnamdlg.hrc
index 8fe17ccfc373..fd0205e3bbed 100644
--- a/sc/source/ui/inc/dbnamdlg.hrc
+++ b/sc/source/ui/inc/dbnamdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbnamdlg.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx
index d8d6e34a0885..cd878c651d6c 100644
--- a/sc/source/ui/inc/dbnamdlg.hxx
+++ b/sc/source/ui/inc/dbnamdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbnamdlg.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx
index e373fe3dade5..e1a816e78c0f 100644
--- a/sc/source/ui/inc/delcldlg.hxx
+++ b/sc/source/ui/inc/delcldlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: delcldlg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx
index 73266bbac0ee..8773b9c78f3a 100644
--- a/sc/source/ui/inc/delcodlg.hxx
+++ b/sc/source/ui/inc/delcodlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: delcodlg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 3e9ff5258682..df4ff685816f 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docfunc.hxx,v $
- * $Revision: 1.19.100.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 548125bffd9a..da5e5e7ffbff 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docsh.hxx,v $
- * $Revision: 1.50.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/dpcontrol.hrc b/sc/source/ui/inc/dpcontrol.hrc
index 2275b601c17a..687f999970ad 100644
--- a/sc/source/ui/inc/dpcontrol.hrc
+++ b/sc/source/ui/inc/dpcontrol.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: protectiondlg.hrc,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx
index 1b99f6a38842..40e6167aee48 100644
--- a/sc/source/ui/inc/dpcontrol.hxx
+++ b/sc/source/ui/inc/dpcontrol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: document.hxx,v $
- * $Revision: 1.115.36.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx
index a1444a358031..52f2e7c8f592 100644
--- a/sc/source/ui/inc/dpgroupdlg.hxx
+++ b/sc/source/ui/inc/dpgroupdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dpgroupdlg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index 8b3f0705324c..d417d1427dda 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawsh.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/drawutil.hxx b/sc/source/ui/inc/drawutil.hxx
index 6789c3d25b56..67e1c0ba836f 100644
--- a/sc/source/ui/inc/drawutil.hxx
+++ b/sc/source/ui/inc/drawutil.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawutil.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index 1890bb1247c4..fa6b03638551 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawview.hxx,v $
- * $Revision: 1.12.126.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxx
index 4c29ca20a9ad..7f7473eb7519 100644
--- a/sc/source/ui/inc/drformsh.hxx
+++ b/sc/source/ui/inc/drformsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drformsh.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx
index 423b80d9ea01..5c493df2f769 100644
--- a/sc/source/ui/inc/drtxtob.hxx
+++ b/sc/source/ui/inc/drtxtob.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drtxtob.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index b7a20cb8b113..9a1175d3310d 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drwtrans.hxx,v $
- *
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 6a468a415b44..800696970fbd 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dwfunctr.hxx,v $
- * $Revision: 1.7.46.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxx
index d1bb36b786bf..4b6e8d0596bc 100644
--- a/sc/source/ui/inc/editable.hxx
+++ b/sc/source/ui/inc/editable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editable.hxx,v $
- * $Revision: 1.4.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx
index 2dbbdec9b012..9836e94aa215 100644
--- a/sc/source/ui/inc/editfield.hxx
+++ b/sc/source/ui/inc/editfield.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editfield.hxx,v $
- * $Revision: 1.4.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx
index a0903a59abaa..ebada82a32fb 100644
--- a/sc/source/ui/inc/editsh.hxx
+++ b/sc/source/ui/inc/editsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editsh.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 #include <tools/link.hxx>
 
 #include "shellids.hxx"
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 
 class EditView;
 class ScViewData;
diff --git a/sc/source/ui/inc/expftext.hxx b/sc/source/ui/inc/expftext.hxx
index e8456ff4ed60..170deba5b403 100644
--- a/sc/source/ui/inc/expftext.hxx
+++ b/sc/source/ui/inc/expftext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: expftext.hxx,v $
- * $Revision: 1.4.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx
index ae2dbf1ffb52..45a573e72157 100644
--- a/sc/source/ui/inc/fieldwnd.hxx
+++ b/sc/source/ui/inc/fieldwnd.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fieldwnd.hxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx
index e7f8eafa7f17..7f2fb046093c 100644
--- a/sc/source/ui/inc/filldlg.hxx
+++ b/sc/source/ui/inc/filldlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filldlg.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 7e9ed68706ef..068a48b8d689 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtdlg.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc
index 65e965b6bea3..508c5af9aab5 100644
--- a/sc/source/ui/inc/filter.hrc
+++ b/sc/source/ui/inc/filter.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filter.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx
index 424493b2506a..92e3833dff7d 100644
--- a/sc/source/ui/inc/foptmgr.hxx
+++ b/sc/source/ui/inc/foptmgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: foptmgr.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxx
index 06e819a031ef..e45fb99c54ef 100644
--- a/sc/source/ui/inc/formatsh.hxx
+++ b/sc/source/ui/inc/formatsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formatsh.hxx,v $
- * $Revision: 1.6.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx
index c36a625543c5..72c7862a007b 100644
--- a/sc/source/ui/inc/formdata.hxx
+++ b/sc/source/ui/inc/formdata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formdata.hxx,v $
- * $Revision: 1.3.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index d490e37b93ca..f863662f7cd0 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formula.hxx,v $
- * $Revision: 1.5.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx
index cfd21532cc6e..686f2a00ae5b 100644
--- a/sc/source/ui/inc/fuconarc.hxx
+++ b/sc/source/ui/inc/fuconarc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuconarc.hxx,v $
- * $Revision: 1.4.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx
index 085cad8d7815..e6ecbfb2e2c3 100644
--- a/sc/source/ui/inc/fuconcustomshape.hxx
+++ b/sc/source/ui/inc/fuconcustomshape.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuconcustomshape.hxx,v $
- * $Revision: 1.5.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx
index bcfb20aa6896..3a27ffcc2f69 100644
--- a/sc/source/ui/inc/fuconpol.hxx
+++ b/sc/source/ui/inc/fuconpol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuconpol.hxx,v $
- * $Revision: 1.4.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx
index ddd7579782a7..fb609e4a7681 100644
--- a/sc/source/ui/inc/fuconrec.hxx
+++ b/sc/source/ui/inc/fuconrec.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuconrec.hxx,v $
- * $Revision: 1.4.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx
index daae26dd84ed..28b20c7a94df 100644
--- a/sc/source/ui/inc/fuconstr.hxx
+++ b/sc/source/ui/inc/fuconstr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuconstr.hxx,v $
- * $Revision: 1.3.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx
index b5ff2bcce5e0..ffe2c1e9722b 100644
--- a/sc/source/ui/inc/fuconuno.hxx
+++ b/sc/source/ui/inc/fuconuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuconuno.hxx,v $
- * $Revision: 1.4.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx
index 24355c3a8560..2344ca629c2f 100644
--- a/sc/source/ui/inc/fudraw.hxx
+++ b/sc/source/ui/inc/fudraw.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fudraw.hxx,v $
- * $Revision: 1.6.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fuedipo.hxx b/sc/source/ui/inc/fuedipo.hxx
index e2cdedef73fc..5138a134cc2e 100644
--- a/sc/source/ui/inc/fuedipo.hxx
+++ b/sc/source/ui/inc/fuedipo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuedipo.hxx,v $
- * $Revision: 1.3.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx
index bef04f585794..4dda7cb2b5ba 100644
--- a/sc/source/ui/inc/fuinsert.hxx
+++ b/sc/source/ui/inc/fuinsert.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fuinsert.hxx,v $
- * $Revision: 1.4.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx
index 8983154562a0..fcadc54768e8 100644
--- a/sc/source/ui/inc/fumark.hxx
+++ b/sc/source/ui/inc/fumark.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fumark.hxx,v $
- * $Revision: 1.3.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
index fc8f1813be56..d8b5c7796971 100644
--- a/sc/source/ui/inc/funcpage.hxx
+++ b/sc/source/ui/inc/funcpage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: funcpage.hxx,v $
- * $Revision: 1.4.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/funcutl.hxx b/sc/source/ui/inc/funcutl.hxx
index b511c105e8ca..715c9d36a101 100644
--- a/sc/source/ui/inc/funcutl.hxx
+++ b/sc/source/ui/inc/funcutl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: funcutl.hxx,v $
- * $Revision: 1.5.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index 8411b1a3fbfc..6d9b7ae2af5a 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fupoor.hxx,v $
- * $Revision: 1.7.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx
index c0366292a2c0..c12b5739d61c 100644
--- a/sc/source/ui/inc/fusel.hxx
+++ b/sc/source/ui/inc/fusel.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fusel.hxx,v $
- * $Revision: 1.4.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx
index 488b1ecf2508..41a41b054554 100644
--- a/sc/source/ui/inc/futext.hxx
+++ b/sc/source/ui/inc/futext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: futext.hxx,v $
- * $Revision: 1.7.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxx
index 1b05796b397a..db9d04096142 100644
--- a/sc/source/ui/inc/graphsh.hxx
+++ b/sc/source/ui/inc/graphsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphsh.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/gridmerg.hxx b/sc/source/ui/inc/gridmerg.hxx
index 5d1c431bc371..dd656b948a6b 100644
--- a/sc/source/ui/inc/gridmerg.hxx
+++ b/sc/source/ui/inc/gridmerg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridmerg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 68f7ece9a249..0f8e479f6e54 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridwin.hxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx
index ec721bb117c4..38b96f21e90e 100644
--- a/sc/source/ui/inc/groupdlg.hxx
+++ b/sc/source/ui/inc/groupdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: groupdlg.hxx,v $
- * $Revision: 1.4.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index 561dc28e6fc0..02a4df09afd2 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hdrcont.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx
index 188b141a00f2..1f1ea7242b17 100644
--- a/sc/source/ui/inc/hfedtdlg.hxx
+++ b/sc/source/ui/inc/hfedtdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hfedtdlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/highred.hrc b/sc/source/ui/inc/highred.hrc
index de814a43e7f4..426c9ba29ee2 100644
--- a/sc/source/ui/inc/highred.hrc
+++ b/sc/source/ui/inc/highred.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: highred.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index 0250c2bafe1b..b500473b2071 100644
--- a/sc/source/ui/inc/highred.hxx
+++ b/sc/source/ui/inc/highred.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: highred.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx
index 51e193ffd45c..2fd9e7897ab6 100644
--- a/sc/source/ui/inc/hintwin.hxx
+++ b/sc/source/ui/inc/hintwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hintwin.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx
index 9c38a54a3c05..6182d30dc96e 100644
--- a/sc/source/ui/inc/hiranges.hxx
+++ b/sc/source/ui/inc/hiranges.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hiranges.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx
index 57606d2eb37a..01e10f9a3983 100644
--- a/sc/source/ui/inc/imoptdlg.hxx
+++ b/sc/source/ui/inc/imoptdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imoptdlg.hxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index fb4dcaa83958..fe4177df7cae 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impex.hxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 2ed7b6d7c807..bcc5ba0dd396 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inputhdl.hxx,v $
- * $Revision: 1.15.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 #include "address.hxx"
 #include <tools/fract.hxx>
 #include <tools/gen.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 
 class ScDocument;
 class ScTabView;
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index a5b7c4d94e5f..236d34a8254f 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inputwin.hxx,v $
- * $Revision: 1.17.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx
index ae63a1bfe282..fd8c090cfd33 100644
--- a/sc/source/ui/inc/inscldlg.hxx
+++ b/sc/source/ui/inc/inscldlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inscldlg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx
index 5549dc8ba795..ffdccaba6a10 100644
--- a/sc/source/ui/inc/inscodlg.hxx
+++ b/sc/source/ui/inc/inscodlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inscodlg.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/instbdlg.hrc b/sc/source/ui/inc/instbdlg.hrc
index 77970963b637..08bff85388dd 100644
--- a/sc/source/ui/inc/instbdlg.hrc
+++ b/sc/source/ui/inc/instbdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: instbdlg.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index 419a3beb2cfc..660d16b62cca 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: instbdlg.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/invmerge.hxx b/sc/source/ui/inc/invmerge.hxx
index c8609da90343..49dfbc730fee 100644
--- a/sc/source/ui/inc/invmerge.hxx
+++ b/sc/source/ui/inc/invmerge.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: invmerge.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx
index 786d51a6e720..fa288c609070 100644
--- a/sc/source/ui/inc/lbseldlg.hxx
+++ b/sc/source/ui/inc/lbseldlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lbseldlg.hxx,v $
- * $Revision: 1.4.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/linkarea.hrc b/sc/source/ui/inc/linkarea.hrc
index 041deac29a2b..bc906fdb14ad 100644
--- a/sc/source/ui/inc/linkarea.hrc
+++ b/sc/source/ui/inc/linkarea.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linkarea.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index 947a893b8f93..c90e1ea47e94 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linkarea.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx
index 9581ec80213a..7e37c6cce554 100644
--- a/sc/source/ui/inc/lnktrans.hxx
+++ b/sc/source/ui/inc/lnktrans.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lnktrans.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/makefile.mk b/sc/source/ui/inc/makefile.mk
index 3c33d006edf9..1b35ca49549d 100644
--- a/sc/source/ui/inc/makefile.mk
+++ b/sc/source/ui/inc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxx
index d8e2e6def16a..e297dc11777a 100644
--- a/sc/source/ui/inc/mediash.hxx
+++ b/sc/source/ui/inc/mediash.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediash.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index fc04f2b5ed1f..908a6bd2221c 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: miscdlgs.hrc,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx
index 44514766601d..7bc33b3af96b 100644
--- a/sc/source/ui/inc/msgpool.hxx
+++ b/sc/source/ui/inc/msgpool.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msgpool.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #define SC_MSGPOOL_HXX
 
 #include "scitems.hxx"
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 
 
 #include <svl/itempool.hxx>
diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx
index 57244f33a83a..f88f57a74e58 100644
--- a/sc/source/ui/inc/mtrindlg.hxx
+++ b/sc/source/ui/inc/mtrindlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mtrindlg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index b48fa7fdffa2..d5ce7726243f 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mvtabdlg.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx
index d8ff95106f62..e4e053fe0bcf 100644
--- a/sc/source/ui/inc/namecrea.hxx
+++ b/sc/source/ui/inc/namecrea.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: namecrea.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc
index b1e32952504d..b2eec6879ec3 100644
--- a/sc/source/ui/inc/namedlg.hrc
+++ b/sc/source/ui/inc/namedlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: namedlg.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 5afa0d244987..b122c57a19fd 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: namedlg.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx
index 81ae6d9254d0..3286af7b81bc 100644
--- a/sc/source/ui/inc/namepast.hxx
+++ b/sc/source/ui/inc/namepast.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: namepast.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx
index 76b3d0debacf..b464bd6cc9ad 100644
--- a/sc/source/ui/inc/navcitem.hxx
+++ b/sc/source/ui/inc/navcitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navcitem.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index b14e668fabd0..8d53742b6f1e 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navipi.hxx,v $
- * $Revision: 1.13.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/navsett.hxx b/sc/source/ui/inc/navsett.hxx
index 24762c4c90d7..896c64606646 100644
--- a/sc/source/ui/inc/navsett.hxx
+++ b/sc/source/ui/inc/navsett.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navsett.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx
index ccc173d299f5..65e36565ceb8 100644
--- a/sc/source/ui/inc/notemark.hxx
+++ b/sc/source/ui/inc/notemark.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: notemark.hxx,v $
- * $Revision: 1.5.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx
index 16db6ea92db9..fa4f71729c97 100644
--- a/sc/source/ui/inc/oleobjsh.hxx
+++ b/sc/source/ui/inc/oleobjsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oleobjsh.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx
index 33a6e854b9d9..444774ed2068 100644
--- a/sc/source/ui/inc/olinefun.hxx
+++ b/sc/source/ui/inc/olinefun.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olinefun.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx
index d69d945b12e5..104f9e8f11da 100644
--- a/sc/source/ui/inc/olinewin.hxx
+++ b/sc/source/ui/inc/olinewin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olinewin.hxx,v $
- * $Revision: 1.11.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/opredlin.hrc b/sc/source/ui/inc/opredlin.hrc
index bdd723964d7d..2b52d8b46118 100644
--- a/sc/source/ui/inc/opredlin.hrc
+++ b/sc/source/ui/inc/opredlin.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opredlin.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index 144ad93726e7..0573ecb86f1e 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opredlin.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index e55323937889..00cfdb2c6d5a 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optdlg.hrc,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/optload.hrc b/sc/source/ui/inc/optload.hrc
index b972f7c3bc3c..992bb8c737e4 100644
--- a/sc/source/ui/inc/optload.hrc
+++ b/sc/source/ui/inc/optload.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optload.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/optload.hxx b/sc/source/ui/inc/optload.hxx
index c6c1fc11ff0f..93d5fefa8358 100644
--- a/sc/source/ui/inc/optload.hxx
+++ b/sc/source/ui/inc/optload.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optload.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/optsolver.hrc b/sc/source/ui/inc/optsolver.hrc
index 013237737448..9df8eea1d7f4 100644
--- a/sc/source/ui/inc/optsolver.hrc
+++ b/sc/source/ui/inc/optsolver.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optsolver.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index 3fc71d5d9b75..bbd98f1d1818 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optsolver.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 80da3d20982e..8d512898afd3 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: output.hxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/pagedata.hxx b/sc/source/ui/inc/pagedata.hxx
index 5a5819d88deb..bcd85c8f5a96 100644
--- a/sc/source/ui/inc/pagedata.hxx
+++ b/sc/source/ui/inc/pagedata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pagedata.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx
index 087c8937de9d..ae02fdb38114 100644
--- a/sc/source/ui/inc/parawin.hxx
+++ b/sc/source/ui/inc/parawin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: parawin.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 4009f06417dc..426f95399b33 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pfiltdlg.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,8 +50,8 @@
 #ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
 #endif
-#include "global.hxx" // -> ScQueryParam
 #include "address.hxx"
+#include "queryparam.hxx"
 
 //------------------------------------------------------------------
 
diff --git a/sc/source/ui/inc/pfuncache.hxx b/sc/source/ui/inc/pfuncache.hxx
index a35084d453d6..365df0acc38b 100644
--- a/sc/source/ui/inc/pfuncache.hxx
+++ b/sc/source/ui/inc/pfuncache.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pfuncache.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx
index a56858c6679a..f367b4cc4f1f 100644
--- a/sc/source/ui/inc/pgbrksh.hxx
+++ b/sc/source/ui/inc/pgbrksh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pgbrksh.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx
index c03a5259b42f..2d3a21fa9756 100644
--- a/sc/source/ui/inc/pivotsh.hxx
+++ b/sc/source/ui/inc/pivotsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pivotsh.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/pntlock.hxx b/sc/source/ui/inc/pntlock.hxx
index 73f01a7f3254..60a7502c9734 100644
--- a/sc/source/ui/inc/pntlock.hxx
+++ b/sc/source/ui/inc/pntlock.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pntlock.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxx
index a207c5f44697..8ac0fba4e80d 100644
--- a/sc/source/ui/inc/popmenu.hxx
+++ b/sc/source/ui/inc/popmenu.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: popmenu.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index 413d37da2925..87d15dcdaf86 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: preview.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx
index 0d2e4411c9b4..15b477abad3c 100644
--- a/sc/source/ui/inc/prevloc.hxx
+++ b/sc/source/ui/inc/prevloc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prevloc.hxx,v $
- * $Revision: 1.12.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 6b98d2c51754..7ff97f8d0152 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prevwsh.hxx,v $
- * $Revision: 1.13.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index fd607975ff47..e3966bdc3d37 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printfun.hxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx
index 901fa6c87eb9..6194a4342849 100644
--- a/sc/source/ui/inc/privsplt.hxx
+++ b/sc/source/ui/inc/privsplt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: privsplt.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/protectiondlg.hrc b/sc/source/ui/inc/protectiondlg.hrc
index 79285d3ce125..52e57040922c 100644
--- a/sc/source/ui/inc/protectiondlg.hrc
+++ b/sc/source/ui/inc/protectiondlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: protectiondlg.hrc,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx
index 36330498c941..d7d555ff5ac5 100644
--- a/sc/source/ui/inc/protectiondlg.hxx
+++ b/sc/source/ui/inc/protectiondlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: protectiondlg.hxx,v $
- * $Revision: 1.1.2.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 6b9aa62c37a3..ef245ebf26cf 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pvfundlg.hxx,v $
- * $Revision: 1.7.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index c77364d3761f..c74b9e028d2f 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pvlaydlg.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx
index 52495109a499..e7e064359349 100644
--- a/sc/source/ui/inc/redcom.hxx
+++ b/sc/source/ui/inc/redcom.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: redcom.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index bc43aedf918f..617d7c0a669a 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: reffact.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/refundo.hxx b/sc/source/ui/inc/refundo.hxx
index f3250e708b4c..87b5330e0f96 100644
--- a/sc/source/ui/inc/refundo.hxx
+++ b/sc/source/ui/inc/refundo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: refundo.hxx,v $
- * $Revision: 1.5.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/retypepassdlg.hrc b/sc/source/ui/inc/retypepassdlg.hrc
index fe0f7e8a760a..f027b6bc7ded 100644
--- a/sc/source/ui/inc/retypepassdlg.hrc
+++ b/sc/source/ui/inc/retypepassdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: retypepassdlg.hrc,v $
- * $Revision: 1.1.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx
index 657773d112f7..59753d8d386b 100644
--- a/sc/source/ui/inc/retypepassdlg.hxx
+++ b/sc/source/ui/inc/retypepassdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: retypepassdlg.hxx,v $
- * $Revision: 1.1.2.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx
index f9916cbbde68..225fd01451df 100644
--- a/sc/source/ui/inc/rfindlst.hxx
+++ b/sc/source/ui/inc/rfindlst.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rfindlst.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx
index f3dbf950a296..6281bb58b02c 100644
--- a/sc/source/ui/inc/scendlg.hxx
+++ b/sc/source/ui/inc/scendlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scendlg.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/scui_def.hxx b/sc/source/ui/inc/scui_def.hxx
index e2a11bb3204c..ca34ab0775b2 100644
--- a/sc/source/ui/inc/scui_def.hxx
+++ b/sc/source/ui/inc/scui_def.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scui_def.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index 89b7ff9f8a0a..a1f73458c3a0 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scuiasciiopt.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx
index 3722a237ef9f..84a408267b20 100644
--- a/sc/source/ui/inc/scuiautofmt.hxx
+++ b/sc/source/ui/inc/scuiautofmt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scuiautofmt.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx
index 6e229fb6a451..957d174a3deb 100644
--- a/sc/source/ui/inc/scuiimoptdlg.hxx
+++ b/sc/source/ui/inc/scuiimoptdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scuiimoptdlg.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index 9c9ad413a00b..99bd6c2a805a 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scuitphfedit.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx
index 08057bed4fd0..ad12d9c743ad 100644
--- a/sc/source/ui/inc/select.hxx
+++ b/sc/source/ui/inc/select.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: select.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx
index def589536317..cbdc6b1faff7 100644
--- a/sc/source/ui/inc/selectionstate.hxx
+++ b/sc/source/ui/inc/selectionstate.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: selectionstate.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 #ifndef SC_SELECTIONSTATE_HXX
 #define SC_SELECTIONSTATE_HXX
 
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include "rangelst.hxx"
 
 // ============================================================================
diff --git a/sc/source/ui/inc/seltrans.hxx b/sc/source/ui/inc/seltrans.hxx
index a8d44ae4c936..c695c918dad0 100644
--- a/sc/source/ui/inc/seltrans.hxx
+++ b/sc/source/ui/inc/seltrans.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: seltrans.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx
index 7cd6c04bc91e..68e807461cad 100644
--- a/sc/source/ui/inc/servobj.hxx
+++ b/sc/source/ui/inc/servobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: servobj.hxx,v $
- * $Revision: 1.6.46.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/sharedocdlg.hrc b/sc/source/ui/inc/sharedocdlg.hrc
index 2c693be939d1..cc38e81bbddb 100644
--- a/sc/source/ui/inc/sharedocdlg.hrc
+++ b/sc/source/ui/inc/sharedocdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sharedocdlg.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index 92fdde653466..52c2f393b19a 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sharedocdlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx
index ec8140734f8c..6c89c43b3a51 100644
--- a/sc/source/ui/inc/shtabdlg.hxx
+++ b/sc/source/ui/inc/shtabdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shtabdlg.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/simpref.hrc b/sc/source/ui/inc/simpref.hrc
index 20c7cd0eb083..d6fb6d4412eb 100644
--- a/sc/source/ui/inc/simpref.hrc
+++ b/sc/source/ui/inc/simpref.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simpref.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index 127e3ac2bc56..ba5b8ca287c3 100644
--- a/sc/source/ui/inc/simpref.hxx
+++ b/sc/source/ui/inc/simpref.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simpref.hxx,v $
- * $Revision: 1.6.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/sizedev.hxx b/sc/source/ui/inc/sizedev.hxx
index 5df41629ba01..615755be0240 100644
--- a/sc/source/ui/inc/sizedev.hxx
+++ b/sc/source/ui/inc/sizedev.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sizedev.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/solveroptions.hrc b/sc/source/ui/inc/solveroptions.hrc
index e56ad8a71213..e3be150ccd1b 100644
--- a/sc/source/ui/inc/solveroptions.hrc
+++ b/sc/source/ui/inc/solveroptions.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solveroptions.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx
index 0ceb3f12f02b..fc0714558be4 100644
--- a/sc/source/ui/inc/solveroptions.hxx
+++ b/sc/source/ui/inc/solveroptions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solveroptions.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx
index 5a832bab35b8..89997e03c1a3 100644
--- a/sc/source/ui/inc/solverutil.hxx
+++ b/sc/source/ui/inc/solverutil.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solverutil.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/solvrdlg.hrc b/sc/source/ui/inc/solvrdlg.hrc
index d54e7bc0f82e..7139abd2a5f6 100644
--- a/sc/source/ui/inc/solvrdlg.hrc
+++ b/sc/source/ui/inc/solvrdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solvrdlg.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx
index 21e36fd92366..fa1b9eb6341c 100644
--- a/sc/source/ui/inc/solvrdlg.hxx
+++ b/sc/source/ui/inc/solvrdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solvrdlg.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/sortdlg.hrc b/sc/source/ui/inc/sortdlg.hrc
index 8f2f641e7574..387690531cfd 100644
--- a/sc/source/ui/inc/sortdlg.hrc
+++ b/sc/source/ui/inc/sortdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sortdlg.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx
index d1ffb8aac0ed..e6f9ab1bf0c8 100644
--- a/sc/source/ui/inc/sortdlg.hxx
+++ b/sc/source/ui/inc/sortdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sortdlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx
index b69a02361456..af97519a2b43 100644
--- a/sc/source/ui/inc/spelldialog.hxx
+++ b/sc/source/ui/inc/spelldialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spelldialog.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx
index cc99328a38cc..f44d4a8f7094 100644
--- a/sc/source/ui/inc/spelleng.hxx
+++ b/sc/source/ui/inc/spelleng.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spelleng.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx
index 2528b1de4df9..ecc66d7ccdcb 100644
--- a/sc/source/ui/inc/spellparam.hxx
+++ b/sc/source/ui/inc/spellparam.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spellparam.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx
index 3c812cc7b5c2..f84d8e4e2b51 100644
--- a/sc/source/ui/inc/strindlg.hxx
+++ b/sc/source/ui/inc/strindlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: strindlg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/styledlg.hrc b/sc/source/ui/inc/styledlg.hrc
index d04078b66314..4a954bb3afc1 100644
--- a/sc/source/ui/inc/styledlg.hrc
+++ b/sc/source/ui/inc/styledlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: styledlg.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx
index 3c5fc896b455..63e37becf188 100644
--- a/sc/source/ui/inc/styledlg.hxx
+++ b/sc/source/ui/inc/styledlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: styledlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/submenu.hrc b/sc/source/ui/inc/submenu.hrc
index 5c5bc1c7b8b2..4e5ad6d28d9e 100644
--- a/sc/source/ui/inc/submenu.hrc
+++ b/sc/source/ui/inc/submenu.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: submenu.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/subtdlg.hrc b/sc/source/ui/inc/subtdlg.hrc
index fff0feecd264..66c63df48953 100644
--- a/sc/source/ui/inc/subtdlg.hrc
+++ b/sc/source/ui/inc/subtdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: subtdlg.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx
index 725261e8fecf..ec68d0e1fba1 100644
--- a/sc/source/ui/inc/subtdlg.hxx
+++ b/sc/source/ui/inc/subtdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: subtdlg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx
index 79a640f1c19c..d77ee812fdb3 100644
--- a/sc/source/ui/inc/tabcont.hxx
+++ b/sc/source/ui/inc/tabcont.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabcont.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tabopdlg.hrc b/sc/source/ui/inc/tabopdlg.hrc
index 842a5a2163c2..5ae127b63e73 100644
--- a/sc/source/ui/inc/tabopdlg.hrc
+++ b/sc/source/ui/inc/tabopdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabopdlg.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx
index fd1e880c8901..e9286ca5ee96 100644
--- a/sc/source/ui/inc/tabopdlg.hxx
+++ b/sc/source/ui/inc/tabopdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabopdlg.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index b7c501cc14db..71d62f964fef 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabpages.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tabpopsh.hxx b/sc/source/ui/inc/tabpopsh.hxx
index dedc106a9c61..177e3d75136f 100644
--- a/sc/source/ui/inc/tabpopsh.hxx
+++ b/sc/source/ui/inc/tabpopsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabpopsh.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx
index 8ad6525dc66e..a06664c7c4ee 100644
--- a/sc/source/ui/inc/tabsplit.hxx
+++ b/sc/source/ui/inc/tabsplit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabsplit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index dab44cdf33df..a6e99613f2ea 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabview.hxx,v $
- * $Revision: 1.28.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index eede290aa8db..b4313c1d7a32 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabvwsh.hxx,v $
- * $Revision: 1.30.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,9 +28,10 @@
 #ifndef SC_TABVWSH_HXX
 #define SC_TABVWSH_HXX
 
+#include <svtools/htmlcfg.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfac.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include "scdllapi.h"
 #include "dbfunc.hxx"           // -> tabview
 #include "target.hxx"
@@ -106,6 +104,7 @@ private:
     static USHORT           nInsCellsCtrlState;
     static USHORT           nInsObjCtrlState;
 
+    SvxHtmlOptions          aHTMLOpt;
     ObjectSelectionType     eCurOST;
     USHORT                  nDrawSfxId;
     USHORT                  nCtrlSfxId;
@@ -198,6 +197,7 @@ private:
     DECL_LINK( SimpleRefAborted, String* );
     DECL_LINK( SimpleRefChange, String* );
     DECL_LINK( FormControlActivated, FmFormShell* );
+    DECL_LINK( HtmlOptionsHdl, void * );
 
 protected:
     virtual void    Activate(BOOL bMDI);
diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx
index 1e65821915f3..6fc62ffaa8cf 100644
--- a/sc/source/ui/inc/target.hxx
+++ b/sc/source/ui/inc/target.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: target.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tbinsert.hrc b/sc/source/ui/inc/tbinsert.hrc
index 6d3f954c6948..44c0d295cfc6 100644
--- a/sc/source/ui/inc/tbinsert.hrc
+++ b/sc/source/ui/inc/tbinsert.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbinsert.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx
index 34bcf9d3e104..a056da0a982c 100644
--- a/sc/source/ui/inc/tbinsert.hxx
+++ b/sc/source/ui/inc/tbinsert.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbinsert.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
index ba1370b1960f..6ea4f6e169ed 100644
--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@@ -1,36 +1,28 @@
 /*************************************************************************
 *
-*  OpenOffice.org - a multi-platform office productivity suite
-*
-*  $RCSfile: tbzoomsliderctrl.hxx,v $
-*
-*  $Revision: 1.1 $
-*
-*  last change: $Author: maoyg $ $Date: 2008/04/25 10:08:08 $
-*
-*  The Contents of this file are made available subject to
-*  the terms of GNU Lesser General Public License Version 2.1.
-*
-*
-*    GNU Lesser General Public License Version 2.1
-*    =============================================
-*    Copyright 2005 by Sun Microsystems, Inc.
-*    901 San Antonio Road, Palo Alto, CA 94303, USA
-*
-*    This library is free software; you can redistribute it and/or
-*    modify it under the terms of the GNU Lesser General Public
-*    License version 2.1, as published by the Free Software Foundation.
-*
-*    This library is distributed in the hope that it will be useful,
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-*    Lesser General Public License for more details.
-*
-*    You should have received a copy of the GNU Lesser General Public
-*    License along with this library; if not, write to the Free Software
-*    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-*    MA  02111-1307  USA
-*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 #ifndef _SC_ZOOMSLIDERTBCONTRL_HXX
 #define _SC_ZOOMSLIDERTBCONTRL_HXX
diff --git a/sc/source/ui/inc/teamdlg.hxx b/sc/source/ui/inc/teamdlg.hxx
index b684848fada5..9f44f06c4b12 100644
--- a/sc/source/ui/inc/teamdlg.hxx
+++ b/sc/source/ui/inc/teamdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: teamdlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx
index 9928488c8c9d..302b5de5ffd2 100644
--- a/sc/source/ui/inc/textdlgs.hxx
+++ b/sc/source/ui/inc/textdlgs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textdlgs.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index ffdc8d5f06d3..ea9e53a23ee4 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpcalc.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index db889a546c8a..dcf730712a40 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tphf.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 07d8f7967d90..d9d26d2111cd 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tphfedit.hxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx
index 66cbc5987ac3..358c29f83d97 100644
--- a/sc/source/ui/inc/tpprint.hxx
+++ b/sc/source/ui/inc/tpprint.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpprint.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index dfa8c9cb8cf3..d1ba772a8ca2 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpsort.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx
index 5a3ee8c9dd31..1c928ff2ef13 100644
--- a/sc/source/ui/inc/tpstat.hxx
+++ b/sc/source/ui/inc/tpstat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpstat.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index bfe67c857259..6dd640e7925e 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpsubt.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index a8580ccf487e..980a574dc61d 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tptable.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index a3a31339fb08..f26e48889f1d 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpusrlst.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 945a9e9e9259..81760eb66c67 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpview.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index 31d2d03167c5..e2dbad485812 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: transobj.hxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index d9b21fd2f0d4..ba0cd9dbd3ce 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/sc/source/ui/inc/ui_pch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ui_pch.hxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -239,7 +236,7 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/animate.hxx>
 #include <vcl/graph.h>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <svtools/stdctrl.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <conditio.hxx>
@@ -248,7 +245,7 @@
 #include <uiitems.hxx>
 #include <svx/svdmodel.hxx>
 #include <vcl/gdiobj.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <svx/pageitem.hxx>
 #include <anyrefdg.hxx>
 #include <basic/sbxcore.hxx>
@@ -304,10 +301,9 @@
 #include <drawview.hxx>
 #include <svx/view3d.hxx>
 #include <svx/def3d.hxx>
-#include <goodies/vector3d.hxx>
 #include <vcl/floatwin.hxx>
 #include <basic/sbxobj.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <svx/xtextit0.hxx>
 #include <svx/svdtrans.hxx>
 #include <svl/style.hxx>
@@ -324,11 +320,11 @@
 #include <fupoor.hxx>
 #include <docpool.hxx>
 #include <vcl/button.hxx>
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <svx/svdorect.hxx>
 #include <svl/whiter.hxx>
 #include <stlpool.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <inputhdl.hxx>
 #include <svx/svdpage.hxx>
 
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index bfa1603adb80..770411b63e1b 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uiitems.hxx,v $
- * $Revision: 1.7.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,6 +31,7 @@
 #include "scdllapi.h"
 #include "conditio.hxx"
 #include "sortparam.hxx"
+#include "queryparam.hxx"
 #include "paramisc.hxx"
 #include <svl/poolitem.hxx>
 
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 8398b030ed68..6f2bb3572832 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undobase.hxx,v $
- * $Revision: 1.6.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 281f44f4fe82..574926ecbf52 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undoblk.hxx,v $
- * $Revision: 1.15.128.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index f6b218fdfb44..53f129166d10 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undocell.hxx,v $
- * $Revision: 1.5.128.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index 3e92fc5fd5fa..a2fcd392e9b4 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undodat.hxx,v $
- * $Revision: 1.8.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,6 +33,7 @@
 #include "rangelst.hxx"     // ScRangeListRef
 #include "markdata.hxx"
 #include "sortparam.hxx"
+#include "queryparam.hxx"
 #include "pivot.hxx"
 
 class ScDocShell;
diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx
index 5ded731d5105..a2647985af9f 100644
--- a/sc/source/ui/inc/undodraw.hxx
+++ b/sc/source/ui/inc/undodraw.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undodraw.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/undoolk.hxx b/sc/source/ui/inc/undoolk.hxx
index 4678f1963962..527c973b6705 100644
--- a/sc/source/ui/inc/undoolk.hxx
+++ b/sc/source/ui/inc/undoolk.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undoolk.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx
index d029be13918f..5e7b86449722 100644
--- a/sc/source/ui/inc/undostyl.hxx
+++ b/sc/source/ui/inc/undostyl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undostyl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index 40177a31e68e..276ea3d7e204 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undotab.hxx,v $
- * $Revision: 1.10.28.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/undoutil.hxx b/sc/source/ui/inc/undoutil.hxx
index de2343968e62..38302096b1fa 100644
--- a/sc/source/ui/inc/undoutil.hxx
+++ b/sc/source/ui/inc/undoutil.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undoutil.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/validate.hrc b/sc/source/ui/inc/validate.hrc
index 4d46d42263b2..45e5dda39c2d 100644
--- a/sc/source/ui/inc/validate.hrc
+++ b/sc/source/ui/inc/validate.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: validate.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 0ac51e75b5d5..f7cb9af23b63 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: validate.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index dc2fe4522ecd..106d196a8175 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewdata.hxx,v $
- * $Revision: 1.24.24.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 82ddc0bad026..21feb272c339 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewfunc.hxx,v $
- * $Revision: 1.34.128.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx
index e7e4e27f233c..8b103d3761d8 100644
--- a/sc/source/ui/inc/viewutil.hxx
+++ b/sc/source/ui/inc/viewutil.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewutil.hxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx
index e36e15214d26..3b06c98c9e3e 100644
--- a/sc/source/ui/inc/warnbox.hxx
+++ b/sc/source/ui/inc/warnbox.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: warnbox.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index ab2cdaba3b69..6f59b64c52fc 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acredlin.cxx,v $
- * $Revision: 1.25.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src
index 58db7355c81f..cad4747acb63 100644
--- a/sc/source/ui/miscdlgs/acredlin.src
+++ b/sc/source/ui/miscdlgs/acredlin.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acredlin.src,v $
- * $Revision: 1.35 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 0d93eb0c7a93..30e34def4620 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: anyrefdg.cxx,v $
- * $Revision: 1.21.30.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index fb29b6d673ca..78e5ea066c7d 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autofmt.cxx,v $
- * $Revision: 1.19.122.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,16 +34,16 @@
 
 #include "scitems.hxx"
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <sfx2/topfrm.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/zforlist.hxx>
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index c0576c44e78b..361f201281dc 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: conflictsdlg.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.src
index 84365449646e..1facf85da95b 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.src
+++ b/sc/source/ui/miscdlgs/conflictsdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: conflictsdlg.src,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index 621fb55e778e..074d54a5c912 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: crdlg.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index b3b521dfa704..0ad2a2e80ca4 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: crnrdlg.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx
index 6df6a5693d5c..fd206ac537ba 100644
--- a/sc/source/ui/miscdlgs/delcldlg.cxx
+++ b/sc/source/ui/miscdlgs/delcldlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: delcldlg.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx
index b0d9116e21ac..7be4c7a0bf3f 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: delcodlg.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index f013c334bf37..2b247f0f9a07 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filldlg.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx
index 42f9cbec71ae..d6eb1865b184 100644
--- a/sc/source/ui/miscdlgs/groupdlg.cxx
+++ b/sc/source/ui/miscdlgs/groupdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: groupdlg.cxx,v $
- * $Revision: 1.7.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 74514940127c..dce755c10db3 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: highred.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src
index 774bc69d2953..a244a3e2a44e 100644
--- a/sc/source/ui/miscdlgs/highred.src
+++ b/sc/source/ui/miscdlgs/highred.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: highred.src,v $
- * $Revision: 1.33 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx
index 46059646a527..2a3489088489 100644
--- a/sc/source/ui/miscdlgs/inscldlg.cxx
+++ b/sc/source/ui/miscdlgs/inscldlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inscldlg.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index 73b651f1f2a7..b1c8e31ef373 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inscodlg.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 72ebb9f08cbb..06d4f23389c0 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: instbdlg.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/instbdlg.src b/sc/source/ui/miscdlgs/instbdlg.src
index d1f6689e567a..6f64c0de1d62 100644
--- a/sc/source/ui/miscdlgs/instbdlg.src
+++ b/sc/source/ui/miscdlgs/instbdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: instbdlg.src,v $
- * $Revision: 1.36 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index 20827680fba2..79dcfe3b7ad8 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lbseldlg.cxx,v $
- * $Revision: 1.6.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index 7d9ab1e5caa5..48e33622e99f 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linkarea.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/linkarea.src b/sc/source/ui/miscdlgs/linkarea.src
index 0a4b49c13981..715d3fd20766 100644
--- a/sc/source/ui/miscdlgs/linkarea.src
+++ b/sc/source/ui/miscdlgs/linkarea.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linkarea.src,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/makefile.mk b/sc/source/ui/miscdlgs/makefile.mk
index 66e1f33618e2..9f5bb1dbc498 100644
--- a/sc/source/ui/miscdlgs/makefile.mk
+++ b/sc/source/ui/miscdlgs/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index b9dadf126495..02bc77f8f89e 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mtrindlg.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 822ff23d9994..296cf8a8637f 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mvtabdlg.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx
index b4e7ddc32911..1714fddd3b3d 100644
--- a/sc/source/ui/miscdlgs/namecrea.cxx
+++ b/sc/source/ui/miscdlgs/namecrea.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: namecrea.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/namepast.cxx b/sc/source/ui/miscdlgs/namepast.cxx
index d037802f6b73..c621f14b431c 100644
--- a/sc/source/ui/miscdlgs/namepast.cxx
+++ b/sc/source/ui/miscdlgs/namepast.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: namepast.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 8783df43d3df..37759aef81b5 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optsolver.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx
index a5116ef61d66..c10620bc8c4a 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: protectiondlg.cxx,v $
- * $Revision: 1.1.2.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/protectiondlg.src b/sc/source/ui/miscdlgs/protectiondlg.src
index 4919f93ca6f4..6b62efb4c784 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.src
+++ b/sc/source/ui/miscdlgs/protectiondlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: protectiondlg.src,v $
- * $Revision: 1.1.2.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx
index dd1c312cd792..7046009f63b2 100644
--- a/sc/source/ui/miscdlgs/redcom.cxx
+++ b/sc/source/ui/miscdlgs/redcom.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: redcom.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index 84a008f68f5f..24e5dc409c83 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: retypepassdlg.cxx,v $
- * $Revision: 1.1.2.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src
index 87d436881f69..794af9d43ebd 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.src
+++ b/sc/source/ui/miscdlgs/retypepassdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: retypepassdlg.src,v $
- * $Revision: 1.1.2.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 32c49cf2a3ad..79d7c502921f 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scuiautofmt.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,16 +36,16 @@
 
 #include "scitems.hxx"
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index f9893f1d3faa..4a5b7cc2149b 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sharedocdlg.cxx,v $
- * $Revision: 1.6.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.src b/sc/source/ui/miscdlgs/sharedocdlg.src
index 27765594dde5..fe55ee58c8e4 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.src
+++ b/sc/source/ui/miscdlgs/sharedocdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sharedocdlg.src,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index a13ce8c010dc..7e57ebbe5d60 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shtabdlg.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index 416a4b1e7015..097016836ee5 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simpref.cxx,v $
- * $Revision: 1.11.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 08dbd00de0f9..418a88b3cbea 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solveroptions.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx
index dbfc699e481b..ae080f2525c7 100644
--- a/sc/source/ui/miscdlgs/solverutil.cxx
+++ b/sc/source/ui/miscdlgs/solverutil.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solverutil.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 091329f1d03b..5b41592e8457 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solvrdlg.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx
index 92630493d32f..aa6db3075b64 100644
--- a/sc/source/ui/miscdlgs/strindlg.cxx
+++ b/sc/source/ui/miscdlgs/strindlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: strindlg.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index 9d144a257ff3..38ae6bddaebd 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabopdlg.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/teamdlg.cxx b/sc/source/ui/miscdlgs/teamdlg.cxx
index ca5d0f94c708..a9f1bf2a17cf 100644
--- a/sc/source/ui/miscdlgs/teamdlg.cxx
+++ b/sc/source/ui/miscdlgs/teamdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: teamdlg.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx
index a12ad4992bff..9f8b2474fc3e 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textdlgs.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,7 +39,7 @@
 #include <svx/svxids.hrc>
 
 //CHINA001 #include <svx/chardlg.hxx>
-#include <svx/flstitem.hxx>
+#include <editeng/flstitem.hxx>
 //CHINA001 #include <svx/paragrph.hxx>
 //CHINA001 #include <svx/tabstpge.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx
index b44bdf94355a..24b2e62a1c78 100644
--- a/sc/source/ui/miscdlgs/warnbox.cxx
+++ b/sc/source/ui/miscdlgs/warnbox.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: warnbox.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/namedlg/makefile.mk b/sc/source/ui/namedlg/makefile.mk
index 56aedb24bd2c..7c1151b8340b 100644
--- a/sc/source/ui/namedlg/makefile.mk
+++ b/sc/source/ui/namedlg/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 54b6c42926c3..bc79fa7c65e7 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: namedlg.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 8198e6adb0f4..a417621bb303 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: content.cxx,v $
- * $Revision: 1.26.102.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,7 +36,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdxcgv.hxx>
-#include <svx/linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/help.hxx>
@@ -830,7 +827,7 @@ void ScContentTree::GetLinkNames()
     if (!pDoc)
         return;
 
-    SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
     DBG_ASSERT(pLinkManager, "kein LinkManager am Dokument?");
     const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
     USHORT nCount = rLinks.Count();
@@ -851,7 +848,7 @@ const ScAreaLink* ScContentTree::GetLink( ULONG nIndex )
         return NULL;
 
     ULONG nFound = 0;
-    SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
     DBG_ASSERT(pLinkManager, "kein LinkManager am Dokument?");
     const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
     USHORT nCount = rLinks.Count();
diff --git a/sc/source/ui/navipi/makefile.mk b/sc/source/ui/navipi/makefile.mk
index cfa2f84297d0..9c0de073dd8c 100644
--- a/sc/source/ui/navipi/makefile.mk
+++ b/sc/source/ui/navipi/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6.90.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx
index c3807844270a..e5002c44c60e 100644
--- a/sc/source/ui/navipi/navcitem.cxx
+++ b/sc/source/ui/navipi/navcitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navcitem.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 0a216dac3709..846e2ce53310 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navipi.cxx,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/navipi/navipi.hrc b/sc/source/ui/navipi/navipi.hrc
index e3757ac944fb..0adb65a5a042 100644
--- a/sc/source/ui/navipi/navipi.hrc
+++ b/sc/source/ui/navipi/navipi.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navipi.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
index 6d5baba4d075..c2e9ecb6a4e6 100644
--- a/sc/source/ui/navipi/navipi.src
+++ b/sc/source/ui/navipi/navipi.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navipi.src,v $
- * $Revision: 1.46 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index c03e5efc82bd..e7dff0bf37c7 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scenwnd.cxx,v $
- * $Revision: 1.9.90.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/optdlg/makefile.mk b/sc/source/ui/optdlg/makefile.mk
index e8a6d20902f6..52df7072ecf8 100644
--- a/sc/source/ui/optdlg/makefile.mk
+++ b/sc/source/ui/optdlg/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 247e64a07141..1a45ab715dee 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opredlin.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 7b65a3804510..c6423ea73b23 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpcalc.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index d6e8a3ae5009..d14b79bd739a 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpprint.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index fcf74ef0eb65..eb7c8a6635eb 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpusrlst.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 05697d13ef52..5c2e8dd52c9f 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tpview.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index f65105b0a687..915355d5d0f2 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: areasdlg.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index 7ab719e3e10b..52527d3f60ce 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hfedtdlg.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/pagedlg/hfedtdlg.hrc b/sc/source/ui/pagedlg/hfedtdlg.hrc
index ff36d114adc6..30e6f8ecae63 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.hrc
+++ b/sc/source/ui/pagedlg/hfedtdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hfedtdlg.hrc,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src
index 0aca9133bc63..1445636e8cc6 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.src
+++ b/sc/source/ui/pagedlg/hfedtdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hfedtdlg.src,v $
- * $Revision: 1.48 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/pagedlg/makefile.mk b/sc/source/ui/pagedlg/makefile.mk
index 4e67ed43b1ee..500e642e79eb 100644
--- a/sc/source/ui/pagedlg/makefile.mk
+++ b/sc/source/ui/pagedlg/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc
index ca0e9e0f316a..2f3593c2f6d1 100644
--- a/sc/source/ui/pagedlg/pagedlg.hrc
+++ b/sc/source/ui/pagedlg/pagedlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pagedlg.hrc,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src
index 6db6b1c06cc7..d0f95c3d9f6b 100644
--- a/sc/source/ui/pagedlg/pagedlg.src
+++ b/sc/source/ui/pagedlg/pagedlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pagedlg.src,v $
- * $Revision: 1.54 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index e55c8405fc34..ba89691239c3 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scuitphfedit.cxx,v $
- * $Revision: 1.10.172.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,13 +36,13 @@
 
 #define _TPHFEDIT_CXX
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 //CHINA001 #include <svx/chardlg.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editstat.hxx>
-#include <svx/editview.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/flditem.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 58e5570aa01b..de647cf5f82a 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tphf.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/pagedlg/tphf.src b/sc/source/ui/pagedlg/tphf.src
index d20d0e67b3e1..b2f59e06da72 100644
--- a/sc/source/ui/pagedlg/tphf.src
+++ b/sc/source/ui/pagedlg/tphf.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tphf.src,v $
- * $Revision: 1.25 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index e54dbfbca605..8e6b6efda28d 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tphfedit.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,15 +34,15 @@
 
 #define _TPHFEDIT_CXX
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
 //CHINA001 #include <svx/chardlg.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editstat.hxx>
-#include <svx/editview.hxx>
-#include <svx/flditem.hxx>
-#include <svx/adjitem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/adjitem.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index b3640f2905c5..a2b732464e12 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tptable.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/attrdlg.src b/sc/source/ui/src/attrdlg.src
index f08c4ba78ca3..ae130f7e8a96 100644
--- a/sc/source/ui/src/attrdlg.src
+++ b/sc/source/ui/src/attrdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attrdlg.src,v $
- * $Revision: 1.56 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/autofmt.src b/sc/source/ui/src/autofmt.src
index 40018185e25b..cb56f6ac85a4 100644
--- a/sc/source/ui/src/autofmt.src
+++ b/sc/source/ui/src/autofmt.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autofmt.src,v $
- * $Revision: 1.44 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/condfrmt.src b/sc/source/ui/src/condfrmt.src
index 982e2990485c..3018cc867e0d 100644
--- a/sc/source/ui/src/condfrmt.src
+++ b/sc/source/ui/src/condfrmt.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: condfrmt.src,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/crnrdlg.src b/sc/source/ui/src/crnrdlg.src
index 3b35dcff1bfc..b16a3506bf7b 100644
--- a/sc/source/ui/src/crnrdlg.src
+++ b/sc/source/ui/src/crnrdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: crnrdlg.src,v $
- * $Revision: 1.45 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/dbnamdlg.src b/sc/source/ui/src/dbnamdlg.src
index 7f9914e542fe..50152d95d9d5 100644
--- a/sc/source/ui/src/dbnamdlg.src
+++ b/sc/source/ui/src/dbnamdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbnamdlg.src,v $
- * $Revision: 1.46 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src
index 2e6a1c330671..52ce38db1516 100644
--- a/sc/source/ui/src/filter.src
+++ b/sc/source/ui/src/filter.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filter.src,v $
- * $Revision: 1.58 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index fa883f593095..edb2165daf32 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globstr.src,v $
- * $Revision: 1.74.96.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src
index 7ba7b6a1c8fe..e4a82d38ec98 100644
--- a/sc/source/ui/src/hdrcont.src
+++ b/sc/source/ui/src/hdrcont.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hdrcont.src,v $
- * $Revision: 1.35 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/makefile.mk b/sc/source/ui/src/makefile.mk
index 4e17e44675d8..96bb78e2902c 100644
--- a/sc/source/ui/src/makefile.mk
+++ b/sc/source/ui/src/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index d9ce050f1cd0..d4aa01d436ce 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: miscdlgs.src,v $
- * $Revision: 1.74 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index 64d29a4bc425..38e1271b2959 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: namedlg.src,v $
- * $Revision: 1.36 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/opredlin.src b/sc/source/ui/src/opredlin.src
index aa05762245f9..a8c2daf4892a 100644
--- a/sc/source/ui/src/opredlin.src
+++ b/sc/source/ui/src/opredlin.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opredlin.src,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 66e42d08dcef..856463e27e40 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optdlg.src,v $
- * $Revision: 1.68 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src
index df1b739995ea..2fc5cf3a3c54 100644
--- a/sc/source/ui/src/optsolver.src
+++ b/sc/source/ui/src/optsolver.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optsolver.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index b03c0c0ae135..abda5c9a0994 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: popup.src,v $
- * $Revision: 1.58.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/pseudo.src b/sc/source/ui/src/pseudo.src
index b358ced79371..e3d27edf0ecb 100644
--- a/sc/source/ui/src/pseudo.src
+++ b/sc/source/ui/src/pseudo.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pseudo.src,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/sc.src b/sc/source/ui/src/sc.src
index 4f1510582288..dae422e15cd0 100644
--- a/sc/source/ui/src/sc.src
+++ b/sc/source/ui/src/sc.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sc.src,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.src
index 8ac544e44610..bdb76b2b710c 100644
--- a/sc/source/ui/src/scerrors.src
+++ b/sc/source/ui/src/scerrors.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scerrors.src,v $
- * $Revision: 1.51 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index f05793872d4c..18adf9883373 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scfuncs.src,v $
- * $Revision: 1.95 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 2dfcd84a4726..7f5337e11b89 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scstring.src,v $
- * $Revision: 1.89 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/scwarngs.src b/sc/source/ui/src/scwarngs.src
index 74159403412b..9cd22567d77c 100644
--- a/sc/source/ui/src/scwarngs.src
+++ b/sc/source/ui/src/scwarngs.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scwarngs.src,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/simpref.src b/sc/source/ui/src/simpref.src
index a87f6217fbde..03f41c1a56aa 100644
--- a/sc/source/ui/src/simpref.src
+++ b/sc/source/ui/src/simpref.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simpref.src,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/solveroptions.src b/sc/source/ui/src/solveroptions.src
index d2a7e97e1add..0a3432344f35 100644
--- a/sc/source/ui/src/solveroptions.src
+++ b/sc/source/ui/src/solveroptions.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solveroptions.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/solvrdlg.src b/sc/source/ui/src/solvrdlg.src
index 1437dba09d5d..6a8a3d955644 100644
--- a/sc/source/ui/src/solvrdlg.src
+++ b/sc/source/ui/src/solvrdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solvrdlg.src,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/sortdlg.src b/sc/source/ui/src/sortdlg.src
index 71aa7b594575..3aca09211edd 100644
--- a/sc/source/ui/src/sortdlg.src
+++ b/sc/source/ui/src/sortdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sortdlg.src,v $
- * $Revision: 1.42 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/subtdlg.src b/sc/source/ui/src/subtdlg.src
index 02cc27459671..c0bcfba1b07b 100644
--- a/sc/source/ui/src/subtdlg.src
+++ b/sc/source/ui/src/subtdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: subtdlg.src,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/tabopdlg.src b/sc/source/ui/src/tabopdlg.src
index 66511e41f38d..25af654f4147 100644
--- a/sc/source/ui/src/tabopdlg.src
+++ b/sc/source/ui/src/tabopdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabopdlg.src,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/textdlgs.src b/sc/source/ui/src/textdlgs.src
index 6da135614dcd..2b0e408262ba 100644
--- a/sc/source/ui/src/textdlgs.src
+++ b/sc/source/ui/src/textdlgs.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textdlgs.src,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src
index c214b38d011b..6e4b89e5faa0 100644
--- a/sc/source/ui/src/toolbox.src
+++ b/sc/source/ui/src/toolbox.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbox.src,v $
- * $Revision: 1.77 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/styleui/makefile.mk b/sc/source/ui/styleui/makefile.mk
index bfd2f5fc8bd5..9361033a34a4 100644
--- a/sc/source/ui/styleui/makefile.mk
+++ b/sc/source/ui/styleui/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src
index 9c367b9daf7f..1968b6dca877 100644
--- a/sc/source/ui/styleui/scstyles.src
+++ b/sc/source/ui/styleui/scstyles.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scstyles.src,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index ea94566b918f..72a52520d1c1 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: styledlg.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,7 @@
 #include <svx/svxids.hrc> //CHINA001
 #include <svx/dialogs.hrc> //CHINA001
 #include <svl/intitem.hxx> //CHINA001
-#include <svx/flstitem.hxx> //CHINA001
+#include <editeng/flstitem.hxx> //CHINA001
 #include <svl/aeitem.hxx> //CHINA001
 #include <svx/flagsdef.hxx> //CHINA001
 //==================================================================
diff --git a/sc/source/ui/styleui/styledlg.src b/sc/source/ui/styleui/styledlg.src
index c66421d1927f..4c862e21ebd0 100644
--- a/sc/source/ui/styleui/styledlg.src
+++ b/sc/source/ui/styleui/styledlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: styledlg.src,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx
index a1ca8b9dabeb..8f5ce350b887 100644
--- a/sc/source/ui/undo/areasave.cxx
+++ b/sc/source/ui/undo/areasave.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: areasave.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,7 +34,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svx/linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <tools/debug.hxx>
 
 #include "areasave.hxx"
@@ -100,7 +97,7 @@ void ScAreaLinkSaver::InsertNewLink( ScDocument* pDoc ) const
 {
     // (see ScUndoRemoveAreaLink::Undo)
 
-    SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
     SfxObjectShell* pObjSh = pDoc->GetDocumentShell();
 
     if ( pLinkManager && pObjSh )
@@ -140,7 +137,7 @@ BOOL ScAreaLinkSaveCollection::IsEqual( const ScDocument* pDoc ) const
     // IsEqual can be checked in sequence.
     // Neither ref-update nor removing links will change the order.
 
-    SvxLinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager();
     if (pLinkManager)
     {
         USHORT nPos = 0;
@@ -186,7 +183,7 @@ void ScAreaLinkSaveCollection::Restore( ScDocument* pDoc ) const
     // Entries from the save collection must be searched via source data, as the order
     // of links changes if deleted entries are re-added to the link manager (always at the end).
 
-    SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
     if (pLinkManager)
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
@@ -208,7 +205,7 @@ ScAreaLinkSaveCollection* ScAreaLinkSaveCollection::CreateFromDoc( const ScDocum
 {
     ScAreaLinkSaveCollection* pColl = NULL;
 
-    SvxLinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager();
     if (pLinkManager)
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
diff --git a/sc/source/ui/undo/makefile.mk b/sc/source/ui/undo/makefile.mk
index b25c2919a332..168130c022ea 100644
--- a/sc/source/ui/undo/makefile.mk
+++ b/sc/source/ui/undo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/undo/refundo.cxx b/sc/source/ui/undo/refundo.cxx
index 8c72da7e7e25..c863259ddf94 100644
--- a/sc/source/ui/undo/refundo.cxx
+++ b/sc/source/ui/undo/refundo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: refundo.cxx,v $
- * $Revision: 1.6.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/undo/target.cxx b/sc/source/ui/undo/target.cxx
index af9b41d4c004..1c2e4a925378 100644
--- a/sc/source/ui/undo/target.cxx
+++ b/sc/source/ui/undo/target.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: target.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index 200db8673cd2..fffb76ebd061 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undobase.cxx,v $
- * $Revision: 1.9.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,6 +42,7 @@
 #include "undodraw.hxx"
 #include "dbcolect.hxx"
 #include "attrib.hxx"
+#include "queryparam.hxx"
 #include "globstr.hrc"
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 8cc45d41a2e6..a35ba96112e3 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undoblk.cxx,v $
- * $Revision: 1.27.128.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,7 +37,7 @@
 #include "scitems.hxx"
 #include <vcl/virdev.hxx>
 #include <vcl/waitobj.hxx>
-#include <svx/boxitem.hxx>
+#include <editeng/boxitem.hxx>
 #include <sfx2/app.hxx>
 
 #include "undoblk.hxx"
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index 46e59e8be69d..2ab03eb71923 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undoblk2.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 4a94827ed1ec..4011d4755ab1 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undoblk3.cxx,v $
- * $Revision: 1.22.128.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,9 +31,9 @@
 // INCLUDE -------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/boxitem.hxx>
-#include <svx/srchitem.hxx>
-#include <svx/linkmgr.hxx>
+#include <editeng/boxitem.hxx>
+#include <svl/srchitem.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <sfx2/bindings.hxx>
 #include <vcl/virdev.hxx>
 #include <sfx2/app.hxx>
@@ -1755,7 +1752,7 @@ BOOL __EXPORT ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 
 //----------------------------------------------------------------------------
 
-ScAreaLink* lcl_FindAreaLink( SvxLinkManager* pLinkManager, const String& rDoc,
+ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDoc,
                             const String& rFlt, const String& rOpt,
                             const String& rSrc, const ScRange& rDest )
 {
@@ -1819,7 +1816,7 @@ String __EXPORT ScUndoInsertAreaLink::GetComment() const
 void __EXPORT ScUndoInsertAreaLink::Undo()
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
 
     ScAreaLink* pLink = lcl_FindAreaLink( pLinkManager, aDocName, aFltName, aOptions,
                                             aAreaName, aRange );
@@ -1835,7 +1832,7 @@ void __EXPORT ScUndoInsertAreaLink::Undo()
 void __EXPORT ScUndoInsertAreaLink::Redo()
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
 
     ScAreaLink* pLink = new ScAreaLink( pDocShell, aDocName, aFltName, aOptions,
                                             aAreaName, aRange.aStart, nRefreshDelay );
@@ -1909,7 +1906,7 @@ String __EXPORT ScUndoRemoveAreaLink::GetComment() const
 void __EXPORT ScUndoRemoveAreaLink::Undo()
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
 
     ScAreaLink* pLink = new ScAreaLink( pDocShell, aDocName, aFltName, aOptions,
                                         aAreaName, aRange.aStart, nRefreshDelay );
@@ -1928,7 +1925,7 @@ void __EXPORT ScUndoRemoveAreaLink::Undo()
 void __EXPORT ScUndoRemoveAreaLink::Redo()
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
 
     ScAreaLink* pLink = lcl_FindAreaLink( pLinkManager, aDocName, aFltName, aOptions,
                                             aAreaName, aRange );
@@ -2074,7 +2071,7 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const
 void __EXPORT ScUndoUpdateAreaLink::Undo()
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
     ScAreaLink* pLink = lcl_FindAreaLink( pLinkManager, aNewDoc, aNewFlt, aNewOpt,
                                             aNewArea, aNewRange );
     if (pLink)
@@ -2093,7 +2090,7 @@ void __EXPORT ScUndoUpdateAreaLink::Undo()
 void __EXPORT ScUndoUpdateAreaLink::Redo()
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+    sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
     ScAreaLink* pLink = lcl_FindAreaLink( pLinkManager, aOldDoc, aOldFlt, aOldOpt,
                                             aOldArea, aOldRange );
     if (pLink)
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 87f83ce7a932..77142bb13799 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undocell.cxx,v $
- * $Revision: 1.15.128.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,9 +29,9 @@
 #include "precompiled_sc.hxx"
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <svl/zforlist.hxx>
 #include <sfx2/app.hxx>
 
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 5c929ec7a11b..2ed65d5db6f5 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undodat.cxx,v $
- * $Revision: 1.12.128.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx
index 556b3c2d519e..a10a7381d808 100644
--- a/sc/source/ui/undo/undodraw.cxx
+++ b/sc/source/ui/undo/undodraw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undodraw.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/undo/undoolk.cxx b/sc/source/ui/undo/undoolk.cxx
index 402dd779aa3b..183b9d1cd7b4 100644
--- a/sc/source/ui/undo/undoolk.cxx
+++ b/sc/source/ui/undo/undoolk.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undoolk.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index 7e7f3db1d42c..67a91baa38ee 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undostyl.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 0fc638b7825e..17f15af54701 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undotab.cxx,v $
- * $Revision: 1.19.28.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx
index 7a990796ff45..168975cdda3a 100644
--- a/sc/source/ui/undo/undoutil.cxx
+++ b/sc/source/ui/undo/undoutil.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undoutil.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
index 67157a590286..e8000d71518b 100644
--- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
+++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChartRangeSelectionListener.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index 9661335bbf35..10627222be80 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addruno.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index e4b9ef8a8765..481c611773ed 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: afmtuno.cxx,v $
- * $Revision: 1.16.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,6 +31,7 @@
 
 
 #include "scitems.hxx"
+#include <editeng/memberids.hrc>
 #include <tools/debug.hxx>
 #include <tools/shl.hxx>
 #include <svl/poolitem.hxx>
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index a8944c427a99..8b20d9849f47 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appluno.cxx,v $
- * $Revision: 1.25 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx
index 2aa7a89b8797..246555d06f25 100644
--- a/sc/source/ui/unoobj/celllistsource.cxx
+++ b/sc/source/ui/unoobj/celllistsource.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: celllistsource.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx
index 8860f9a5add6..f6b52f0b50f8 100644
--- a/sc/source/ui/unoobj/celllistsource.hxx
+++ b/sc/source/ui/unoobj/celllistsource.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: celllistsource.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index babccf9a7053..c61a6443af99 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellsuno.cxx,v $
- * $Revision: 1.113.126.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,21 +30,21 @@
 
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
-
+#include <editeng/eeitem.hxx>
+#include <svx/svdpool.hxx>
 
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/editeng.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/flditem.hxx>
 #include <svx/fmdpage.hxx>
-#include <svx/langitem.hxx>
-#include <svx/linkmgr.hxx>
-#include <svx/srchitem.hxx>
+#include <editeng/langitem.hxx>
+#include <sfx2/linkmgr.hxx>
+#include <svl/srchitem.hxx>
 #include <svx/unomid.hxx>
-#include <svx/unoprnms.hxx>
-#include <svx/unotext.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unotext.hxx>
 #include <svx/svdpage.hxx>
 #include <sfx2/bindings.hxx>
 #include <svl/zforlist.hxx>
@@ -794,7 +791,7 @@ const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap()
 }
 const SvxItemPropertySet* lcl_GetEditPropertySet()
 {
-    static SvxItemPropertySet aEditPropertySet( lcl_GetEditPropertyMap() );
+    static SvxItemPropertySet aEditPropertySet( lcl_GetEditPropertyMap(), SdrObject::GetGlobalDrawObjectItemPool() );
     return &aEditPropertySet;
 }
 
@@ -1126,7 +1123,7 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
                 {
                     //  #87871# accept integer types because Basic passes a floating point
                     //  variable as byte, short or long if it's an integer number.
-                    double fVal;
+                    double fVal(0.0);
                     rElement >>= fVal;
                     pDoc->SetValue( nDocCol, nDocRow, nTab, fVal );
                 }
@@ -7681,7 +7678,7 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr
             //  Update immer, auch wenn der Link schon da war
             //! Update nur fuer die betroffene Tabelle???
 
-            SvxLinkManager* pLinkManager = pDoc->GetLinkManager();
+            sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
             USHORT nCount = pLinkManager->GetLinks().Count();
             for ( USHORT i=0; i<nCount; i++ )
             {
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx
index 263c65a10b1c..3b806ccf80b7 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellvaluebinding.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx
index 1b46e483fb12..c9537d546f7b 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.hxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellvaluebinding.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 07ed8709ab01..b8a751669e6f 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chart2uno.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2935,6 +2932,9 @@ void ScChart2DataSequence::BuildDataCache()
     ::std::list<sal_Int32>::const_iterator itr = aHiddenValues.begin(), itrEnd = aHiddenValues.end();
     for (;itr != itrEnd; ++itr, ++pArr)
         *pArr = *itr;
+
+    // Clear the data series cache when the array is re-built.
+    m_aMixedDataCache.realloc(0);
 }
 
 void ScChart2DataSequence::RebuildDataCache()
@@ -3127,7 +3127,6 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
             if ( m_bGotDataChangedHint && m_pDocument )
             {
                 m_aDataArray.clear();
-                m_aDataArray.clear();
                 lang::EventObject aEvent;
                 aEvent.Source.set((cppu::OWeakObject*)this);
 
@@ -3302,19 +3301,24 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData()
         throw uno::RuntimeException();
 
     BuildDataCache();
-    sal_Int32 nCount = m_aDataArray.size();
-    uno::Sequence<uno::Any> aSeq(nCount);
-    uno::Any* pArr = aSeq.getArray();
-    ::std::list<Item>::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end();
-    for (; itr != itrEnd; ++itr, ++pArr)
+
+    if (!m_aMixedDataCache.getLength())
     {
-        if (itr->mbIsValue)
-            *pArr <<= itr->mfValue;
-        else
-            *pArr <<= itr->maString;
-    }
+        // Build a cache for the 1st time...
 
-    return aSeq;
+        sal_Int32 nCount = m_aDataArray.size();
+        m_aMixedDataCache.realloc(nCount);
+        uno::Any* pArr = m_aMixedDataCache.getArray();
+        ::std::list<Item>::const_iterator itr = m_aDataArray.begin(), itrEnd = m_aDataArray.end();
+        for (; itr != itrEnd; ++itr, ++pArr)
+        {
+            if (itr->mbIsValue)
+                *pArr <<= itr->mfValue;
+            else
+                *pArr <<= itr->maString;
+        }
+    }
+    return m_aMixedDataCache;
 }
 
 // XNumericalDataSequence --------------------------------------------------
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index d66600df4243..5feabe72207d 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chartuno.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 87045ff5c053..dd8f15359559 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: confuno.cxx,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/convuno.cxx b/sc/source/ui/unoobj/convuno.cxx
index 30032d42377b..e3b0c09b25c2 100644
--- a/sc/source/ui/unoobj/convuno.cxx
+++ b/sc/source/ui/unoobj/convuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: convuno.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index 99c907113bb8..39ed859aa574 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cursuno.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index a7836b43f740..a921d1e125f2 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dapiuno.cxx,v $
- * $Revision: 1.21.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 0dd364812d48..6e416764eb76 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datauno.cxx,v $
- * $Revision: 1.30.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index 3df667faad8c..141a7d0abb73 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: defltuno.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #include "precompiled_sc.hxx"
 
 
-
+#include <editeng/memberids.hrc>
 #include <svl/smplhint.hxx>
 #include <svl/itemprop.hxx>
 #include <svx/unomid.hxx>
diff --git a/sc/source/ui/unoobj/detreg.cxx b/sc/source/ui/unoobj/detreg.cxx
index 627192c2c1aa..498d0fc886ec 100644
--- a/sc/source/ui/unoobj/detreg.cxx
+++ b/sc/source/ui/unoobj/detreg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: detreg.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 99bce5579e14..cff547ce2652 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispuno.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 71f4706085d8..8e857adca09c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docuno.cxx,v $
- * $Revision: 1.68.52.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx
index 5d1fd97d9455..52fce55dfc58 100644
--- a/sc/source/ui/unoobj/drdefuno.cxx
+++ b/sc/source/ui/unoobj/drdefuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drdefuno.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index 476409fa5113..7febe374d0d9 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editsrc.cxx,v $
- * $Revision: 1.26.128.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,14 +31,14 @@
 #include "editsrc.hxx"
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
-#include <svx/unofored.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/unofored.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdocapt.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/editobj.hxx>
-
+#include <editeng/outlobj.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/outliner.hxx>
 #include "textuno.hxx"
 #include "editutil.hxx"
 #include "docsh.hxx"
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 8fd4bba512eb..8e3e39d07ef4 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fielduno.cxx,v $
- * $Revision: 1.18.32.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,11 +30,11 @@
 #include <svl/smplhint.hxx>
 
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/flditem.hxx>
 #include <rtl/uuid.h>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index eb415d1d3ff3..837d34544b60 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtuno.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index f9407b544f76..392533c7cf93 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmtuno.cxx,v $
- * $Revision: 1.18.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxx
index d8dc43d86071..2807a12f7dac 100644
--- a/sc/source/ui/unoobj/forbiuno.cxx
+++ b/sc/source/ui/unoobj/forbiuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: forbiuno.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 
 
 
-#include <svx/forbiddencharacterstable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 
 #include "forbiuno.hxx"
 #include "docsh.hxx"
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index a60bb836b142..0c197a8b738d 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: funcuno.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -417,7 +414,7 @@ public:
         {
             //  #87871# accept integer types because Basic passes a floating point
             //  variable as byte, short or long if it's an integer number.
-            double fVal;
+            double fVal(0.0);
             rElement >>= fVal;
             visitElem( nCol, nRow, fVal );
         }
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index ddb5dc3b0496..6d9fcd1d23e4 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linkuno.cxx,v $
- * $Revision: 1.18.134.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 
 
 #include <svl/smplhint.hxx>
-#include <svx/linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 
 #include "linkuno.hxx"
 #include "miscuno.hxx"
@@ -131,7 +128,7 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const
 {
     if (pDocShell)
     {
-        SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
+        sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
         USHORT nCount = pLinkManager->GetLinks().Count();
         for (USHORT i=0; i<nCount; i++)
         {
@@ -304,7 +301,7 @@ void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName)
     ScTableLink* pLink = GetLink_Impl();
     if (pLink)
     {
-        //  pLink->Refresh mit neuem Dateinamen bringt SvxLinkManager durcheinander
+        //  pLink->Refresh mit neuem Dateinamen bringt sfx2::LinkManager durcheinander
         //  darum per Hand die Tabellen umsetzen und Link per UpdateLinks neu erzeugen
 
         String aNewStr(ScGlobal::GetAbsDocName( String(rNewName), pDocShell ));
@@ -605,7 +602,7 @@ ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, USHORT nPos )
 {
     if (pDocShell)
     {
-        SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
+        sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
         USHORT nTotalCount = pLinkManager->GetLinks().Count();
         USHORT nAreaCount = 0;
         for (USHORT i=0; i<nTotalCount; i++)
@@ -678,7 +675,7 @@ void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUStr
         //! Undo fuer Loeschen
         //! Undo zusammenfassen
 
-        SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
+        sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
         pLinkManager->Remove( pLink );
         pLink = NULL;   // bei Remove geloescht
 
@@ -1004,7 +1001,7 @@ void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Runti
     {
         //! SetAddUndo oder so
 
-        SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
+        sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
         pLinkManager->Remove( pLink );
     }
 }
@@ -1026,7 +1023,7 @@ sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException)
     INT32 nAreaCount = 0;
     if (pDocShell)
     {
-        SvxLinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
+        sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
         USHORT nTotalCount = pLinkManager->GetLinks().Count();
         for (USHORT i=0; i<nTotalCount; i++)
         {
diff --git a/sc/source/ui/unoobj/listenercalls.cxx b/sc/source/ui/unoobj/listenercalls.cxx
index d9cd9730a9f5..9abc8e0ab826 100644
--- a/sc/source/ui/unoobj/listenercalls.cxx
+++ b/sc/source/ui/unoobj/listenercalls.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: listenercalls.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/makefile.mk b/sc/source/ui/unoobj/makefile.mk
index 1570ec510f97..35fdf164bf92 100644
--- a/sc/source/ui/unoobj/makefile.mk
+++ b/sc/source/ui/unoobj/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.21 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index ee2a64bd8c78..4fdac0288796 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: miscuno.cxx,v $
- * $Revision: 1.14.32.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index ab8576949b75..474d07764127 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: nameuno.cxx,v $
- * $Revision: 1.21.132.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx
index 8477d1f17779..c5dd11977478 100644
--- a/sc/source/ui/unoobj/notesuno.cxx
+++ b/sc/source/ui/unoobj/notesuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: notesuno.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,8 +31,9 @@
 
 
 #include "rangelst.hxx"
-#include <svx/unotext.hxx>
-
+#include <editeng/unotext.hxx>
+#include <svx/svdpool.hxx>
+#include <svx/svdobj.hxx>
 #include "notesuno.hxx"
 #include "textuno.hxx"
 #include "cellsuno.hxx"     // getParent
@@ -52,7 +50,7 @@
 #include "undocell.hxx"
 #include "unoguard.hxx"
 #include "userdat.hxx"
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svditer.hxx>
@@ -70,7 +68,7 @@ const SvxItemPropertySet* lcl_GetAnnotationPropertySet()
     {
         {0,0,0,0,0,0}
     };
-    static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl );
+    static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
     return &aAnnotationPropertySet_Impl;
 }
 
diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx
index f7c8d2827f50..0d277fdb19fe 100644
--- a/sc/source/ui/unoobj/optuno.cxx
+++ b/sc/source/ui/unoobj/optuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optuno.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx
index a17f12b9f98c..4687683a8ef4 100644
--- a/sc/source/ui/unoobj/pageuno.cxx
+++ b/sc/source/ui/unoobj/pageuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pageuno.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 4600244cf2df..cded62efa3a8 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scdetect.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx
index 666102f4a542..a652d11df951 100644
--- a/sc/source/ui/unoobj/scdetect.hxx
+++ b/sc/source/ui/unoobj/scdetect.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scdetect.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 1f51bc1646af..0c57963a4f12 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: servuno.cxx,v $
- * $Revision: 1.17.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 #include <tools/debug.hxx>
 #include <svtools/unoimap.hxx>
 #include <svx/unofill.hxx>
-#include <svx/unonrule.hxx>
+#include <editeng/unonrule.hxx>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 
 #include "servuno.hxx"
@@ -60,9 +57,65 @@
 // #100263# Support creation of GraphicObjectResolver and EmbeddedObjectResolver
 #include <svx/xmleohlp.hxx>
 #include <svx/xmlgrhlp.hxx>
+#include <sfx2/docfile.hxx>
+#include <sfx2/docfilt.hxx>
+#include <com/sun/star/script/ScriptEventDescriptor.hpp>
+#include <com/sun/star/document/XCodeNameQuery.hpp>
+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
+#include <com/sun/star/form/XFormsSupplier.hpp>
+#include <svx/unomod.hxx>
 
 using namespace ::com::sun::star;
 
+class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery >
+{
+ScDocShell* mpDocShell;
+public:
+    ScVbaCodeNameProvider( ScDocShell* pDocShell ) : mpDocShell( pDocShell ) {}
+    // XCodeNameQuery
+    rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
+    {
+        rtl::OUString sCodeName;
+        if ( mpDocShell )
+        {
+            OSL_TRACE( "*** In ScVbaCodeNameProvider::getCodeNameForObject");
+            // need to find the page ( and index )  for this control
+            uno::Reference< drawing::XDrawPagesSupplier > xSupplier( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
+            uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPages(), uno::UNO_QUERY_THROW );
+            sal_Int32 nLen = xIndex->getCount();
+            bool bMatched = false;
+            uno::Sequence< script::ScriptEventDescriptor > aFakeEvents;
+            for ( sal_Int32 index = 0; index < nLen; ++index )
+            {
+                try
+                {
+                    uno::Reference< form::XFormsSupplier >  xFormSupplier( xIndex->getByIndex( index ), uno::UNO_QUERY_THROW );
+                    uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
+                    // get the www-standard container
+                    uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW );
+                    sal_Int32 nCntrls = xFormControls->getCount();
+                    for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )
+                    {
+                        uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );
+                        bMatched = ( xControl == xIf );
+                        if ( bMatched )
+                        {
+                            String sName;
+                            mpDocShell->GetDocument()->GetCodeName( static_cast<SCTAB>( index ), sName );
+                            sCodeName = sName;
+                        }
+                    }
+                }
+                catch( uno::Exception& ) {}
+                if ( bMatched )
+                    break;
+            }
+        }
+        // Probably should throw here ( if !bMatched )
+         return sCodeName;
+    }
+
+};
 
 //------------------------------------------------------------------------
 //
@@ -119,6 +172,7 @@ static const ProvNamesId_Type __FAR_DATA aProvNamesId[] =
     { SC_SERVICENAME_CHDATAPROV,            SC_SERVICE_CHDATAPROV },
     { SC_SERVICENAME_FORMULAPARS,           SC_SERVICE_FORMULAPARS },
     { SC_SERVICENAME_OPCODEMAPPER,          SC_SERVICE_OPCODEMAPPER },
+    { "ooo.vba.VBACodeNameProvider",        SC_SERVICE_VBACODENAMEPROVIDER },
 
     // case-correct versions of the service names (#i102468#)
     { "com.sun.star.text.textfield.URL",                SC_SERVICE_URLFIELD },
@@ -180,7 +234,8 @@ static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] =
         "",                                         // SC_SERVICE_SHEETDOCSET
         "",                                         // SC_SERVICE_CHDATAPROV
         "",                                         // SC_SERVICE_FORMULAPARS
-        ""                                          // SC_SERVICE_OPCODEMAPPER
+        "",                                         // SC_SERVICE_OPCODEMAPPER
+        "",                                         // SC_SERVICE_VBACODENAMEPROVIDER
     };
 
 
@@ -383,9 +438,23 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
                 ScCompiler* pComp = new ScCompiler(pDoc,aAddress);
                 pComp->SetGrammar( pDoc->GetGrammar() );
                 xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> (pComp))));
+                break;
+            }
+        case SC_SERVICE_VBACODENAMEPROVIDER:
+            {
+                // Only create the excel faking service for excel docs
+                const SfxFilter *pFilt = pDocShell->GetMedium()->GetFilter();
+                if ( pFilt && pFilt->IsAlienFormat() )
+                {
+                    // application/vnd.ms-excel is the mime type for Excel
+                    static const rtl::OUString sExcelMimeType( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.ms-excel" ) );
+                    if ( sExcelMimeType.equals( pFilt->GetMimeType() ) )
+                    xRet.set(static_cast<document::XCodeNameQuery*>(new ScVbaCodeNameProvider( pDocShell )));
+                }
+                break;
             }
-            break;
     }
+
     return xRet;
 }
 
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 8a5b92d0bd8c..1ed384ed2ebd 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shapeuno.cxx,v $
- * $Revision: 1.21.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,7 +35,7 @@
 #include <svtools/unoimap.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/unoshape.hxx>
-#include <svx/unofield.hxx>
+#include <editeng/unofield.hxx>
 #include <svx/shapepropertynotifier.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <cppuhelper/implbase2.hxx>
@@ -162,12 +159,12 @@ uno::Any SAL_CALL ScShapeObj::queryInterface( const uno::Type& rType )
 
 void SAL_CALL ScShapeObj::acquire() throw()
 {
-        OWeakObject::acquire();

+        OWeakObject::acquire();
 }
 
 void SAL_CALL ScShapeObj::release() throw()
 {
-        OWeakObject::release();

+        OWeakObject::release();
 }
 
 void ScShapeObj::GetShapePropertySet()
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index 14b271c16cb7..b005d16ce482 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchuno.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 
 
 #include "scitems.hxx"
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/uuid.h>
 
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 941f586a73c9..1ceaa424ecd6 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: styleuno.cxx,v $
- * $Revision: 1.44.72.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,14 +31,15 @@
 
 
 #include "scitems.hxx"
+#include <editeng/memberids.hrc>
 #include <svx/algitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/numitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/numitem.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/pbinitem.hxx>
+#include <editeng/pbinitem.hxx>
 #include <svx/unomid.hxx>
-#include <svx/unonrule.hxx>
+#include <editeng/unonrule.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/printer.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index 7d291235559a..aa4cdf58882d 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: targuno.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index a9e6a799e010..5c45195621d8 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textuno.cxx,v $
- * $Revision: 1.25.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,21 +31,21 @@
 
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
-
-
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/eeitem.hxx>
+#include <svx/svdpool.hxx>
+#include <svx/svdobj.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/flditem.hxx>
 #include <svx/unomid.hxx>
-#include <svx/unoprnms.hxx>
-#include <svx/unofored.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unofored.hxx>
 #include <rtl/uuid.h>
 #include <vcl/virdev.hxx>
 #include <com/sun/star/awt/FontSlant.hpp>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-
+#include <editeng/unoipset.hxx>
 #include "textuno.hxx"
 #include "fielduno.hxx"
 #include "servuno.hxx"
@@ -100,7 +97,7 @@ const SvxItemPropertySet * lcl_GetHdFtPropertySet()
         }
         bTwipsSet = TRUE;
     }
-    static SvxItemPropertySet aHdFtPropertySet_Impl( aHdFtPropertyMap_Impl );
+    static SvxItemPropertySet aHdFtPropertySet_Impl( aHdFtPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
     return &aHdFtPropertySet_Impl;
 }
 
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index 9d31b15fdf47..fc14b53a6372 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tokenuno.cxx,v $
- * $Revision: 1.6.108.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx
index e79cb113e496..9673db411ea0 100644
--- a/sc/source/ui/unoobj/unodoc.cxx
+++ b/sc/source/ui/unoobj/unodoc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unodoc.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/unoguard.cxx b/sc/source/ui/unoobj/unoguard.cxx
index baa60cdb693e..ff1c94338b72 100644
--- a/sc/source/ui/unoobj/unoguard.cxx
+++ b/sc/source/ui/unoobj/unoguard.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoguard.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/unoreflist.cxx b/sc/source/ui/unoobj/unoreflist.cxx
index 0b28001b9fc9..65f43273f6e7 100644
--- a/sc/source/ui/unoobj/unoreflist.cxx
+++ b/sc/source/ui/unoobj/unoreflist.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoreflist.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 0883c24a14f0..15fb8183a88f 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewuno.cxx,v $
- * $Revision: 1.37.24.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #include "precompiled_sc.hxx"
 
 
-
+#include <editeng/outliner.hxx>
 #include <svx/fmdpage.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdmark.hxx>
diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx
index 4bf4163aad3c..ce81fd2645c4 100644
--- a/sc/source/ui/unoobj/warnpassword.cxx
+++ b/sc/source/ui/unoobj/warnpassword.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: warnpassword.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index dd0550709b96..4912863a446e 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbahelper.cxx,v $
- * $Revision: 1.5.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx
index bb222688236a..34b099e6db46 100644
--- a/sc/source/ui/vba/excelvbahelper.hxx
+++ b/sc/source/ui/vba/excelvbahelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbahelper.hxx,v $
- * $Revision: 1.5.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/helperdecl.hxx b/sc/source/ui/vba/helperdecl.hxx
index 9c37d418a561..a9969179d52f 100644
--- a/sc/source/ui/vba/helperdecl.hxx
+++ b/sc/source/ui/vba/helperdecl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helperdecl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/makefile.mk b/sc/source/ui/vba/makefile.mk
index 253d0f52ab96..00a26e2f94de 100644
--- a/sc/source/ui/vba/makefile.mk
+++ b/sc/source/ui/vba/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx
index 6286b6873321..8be0f6d9f726 100644
--- a/sc/source/ui/vba/service.cxx
+++ b/sc/source/ui/vba/service.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: service.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/testvba/launchTest.pl b/sc/source/ui/vba/testvba/launchTest.pl
index 1e3267b87983..243798616052 100644
--- a/sc/source/ui/vba/testvba/launchTest.pl
+++ b/sc/source/ui/vba/testvba/launchTest.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: launchTest.pl,v $
-#
-# $Revision: 1.3.138.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/testvba/makefile.mk b/sc/source/ui/vba/testvba/makefile.mk
index b89eedff20df..fb131f314ed3 100644
--- a/sc/source/ui/vba/testvba/makefile.mk
+++ b/sc/source/ui/vba/testvba/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 953a2aaee74e..5d9e513dabeb 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaapplication.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx
index 8d5f4a3b2354..02822e9f18ad 100644
--- a/sc/source/ui/vba/vbaapplication.hxx
+++ b/sc/source/ui/vba/vbaapplication.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaapplication.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx
index f99fb0c8819c..51105d60b0d4 100644
--- a/sc/source/ui/vba/vbaassistant.cxx
+++ b/sc/source/ui/vba/vbaassistant.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #include <sfx2/app.hxx>
diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx
index fa811f548430..dbb95af4b689 100644
--- a/sc/source/ui/vba/vbaassistant.hxx
+++ b/sc/source/ui/vba/vbaassistant.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef SC_VBA_ASSISTANT_HXX
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index 37701e702662..d563ba105108 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaaxes.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx
index 62be9ba97a39..5b5f88e2b72f 100644
--- a/sc/source/ui/vba/vbaaxes.hxx
+++ b/sc/source/ui/vba/vbaaxes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaaxes.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index 4c64430c2fb5..a9c91a4cea31 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaaxis.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx
index 72ff614805e4..13432b231a27 100644
--- a/sc/source/ui/vba/vbaaxis.hxx
+++ b/sc/source/ui/vba/vbaaxis.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaaxis.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx
index b0b30e3fc914..89b12b6e2870 100644
--- a/sc/source/ui/vba/vbaaxistitle.cxx
+++ b/sc/source/ui/vba/vbaaxistitle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaaxistitle.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx
index 685658cb39eb..59ba71d99a87 100644
--- a/sc/source/ui/vba/vbaaxistitle.hxx
+++ b/sc/source/ui/vba/vbaaxistitle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaaxistitle.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index 2344481dc18a..5424da041f84 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaborders.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx
index ec7deed20ebe..a385ad2e7a14 100644
--- a/sc/source/ui/vba/vbaborders.hxx
+++ b/sc/source/ui/vba/vbaborders.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaborders.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx
index 59fe5cf0dde4..6c0079ac7a82 100644
--- a/sc/source/ui/vba/vbacharacters.cxx
+++ b/sc/source/ui/vba/vbacharacters.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacharacters.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx
index 092d80a91e02..3400ff159d5e 100644
--- a/sc/source/ui/vba/vbacharacters.hxx
+++ b/sc/source/ui/vba/vbacharacters.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacharacters.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index 22f9a6a1afdc..e2f446f93f2b 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbachart.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx
index 3ec8e77c4dc5..d0b53c34421f 100644
--- a/sc/source/ui/vba/vbachart.hxx
+++ b/sc/source/ui/vba/vbachart.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbachart.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx
index 85104ff20cde..617a090b6d7a 100644
--- a/sc/source/ui/vba/vbachartobject.cxx
+++ b/sc/source/ui/vba/vbachartobject.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbachartobject.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx
index c7bfbd15c4c1..3c1e224728ee 100644
--- a/sc/source/ui/vba/vbachartobject.hxx
+++ b/sc/source/ui/vba/vbachartobject.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbachartobject.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx
index 7985a1c7c7d7..41b26501f4ad 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbachartobjects.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx
index 5a11e92e8dbc..80ea038bb15d 100644
--- a/sc/source/ui/vba/vbachartobjects.hxx
+++ b/sc/source/ui/vba/vbachartobjects.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbachartobjects.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacharts.cxx b/sc/source/ui/vba/vbacharts.cxx
index 4c21720ca7f3..da0c7789134b 100644
--- a/sc/source/ui/vba/vbacharts.cxx
+++ b/sc/source/ui/vba/vbacharts.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacharts.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacharts.hxx b/sc/source/ui/vba/vbacharts.hxx
index ac804e5ac873..b2ecfe23270f 100644
--- a/sc/source/ui/vba/vbacharts.hxx
+++ b/sc/source/ui/vba/vbacharts.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacharts.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx
index 7c90ea8edce0..e797c4a0269e 100644
--- a/sc/source/ui/vba/vbacharttitle.cxx
+++ b/sc/source/ui/vba/vbacharttitle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacharttitle.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx
index 6108c9b0ae93..4d6ed34a86b6 100644
--- a/sc/source/ui/vba/vbacharttitle.hxx
+++ b/sc/source/ui/vba/vbacharttitle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacharttitle.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx
index 9bda95e3429b..a8026f151c79 100644
--- a/sc/source/ui/vba/vbacomment.cxx
+++ b/sc/source/ui/vba/vbacomment.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacomment.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx
index 8601fa303844..91d8a8a8e437 100644
--- a/sc/source/ui/vba/vbacomment.hxx
+++ b/sc/source/ui/vba/vbacomment.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacomment.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx
index fdc8a3d886df..5090fa6f5ee6 100644
--- a/sc/source/ui/vba/vbacomments.cxx
+++ b/sc/source/ui/vba/vbacomments.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacomments.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx
index be876ab2f76e..0ab11e8d5e97 100644
--- a/sc/source/ui/vba/vbacomments.hxx
+++ b/sc/source/ui/vba/vbacomments.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacomments.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx
index 6a9aff4ce0ac..590d649ae561 100644
--- a/sc/source/ui/vba/vbacondition.cxx
+++ b/sc/source/ui/vba/vbacondition.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacondition.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx
index 823e889ae298..36052fe217ee 100644
--- a/sc/source/ui/vba/vbacondition.hxx
+++ b/sc/source/ui/vba/vbacondition.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacondition.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbacontrol.cxx b/sc/source/ui/vba/vbacontrol.cxx
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sc/source/ui/vba/vbacontrol.cxx
+++ /dev/null
diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx
index 06faebc3a37b..3c578a04e5d0 100644
--- a/sc/source/ui/vba/vbadialog.cxx
+++ b/sc/source/ui/vba/vbadialog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbadialog.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx
index 77be9341f7f3..40f4a4a83a11 100644
--- a/sc/source/ui/vba/vbadialog.hxx
+++ b/sc/source/ui/vba/vbadialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbadialog.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx
index aa2161f33c21..67070879535b 100644
--- a/sc/source/ui/vba/vbadialogs.cxx
+++ b/sc/source/ui/vba/vbadialogs.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbadialogs.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx
index a1785defc255..9aab5daf11fe 100644
--- a/sc/source/ui/vba/vbadialogs.hxx
+++ b/sc/source/ui/vba/vbadialogs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbadialogs.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index cb54532384b5..a8aac44770a9 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbafont.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx
index 625985564cda..4cbcd483b2d8 100644
--- a/sc/source/ui/vba/vbafont.hxx
+++ b/sc/source/ui/vba/vbafont.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbafont.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 1d30f92e1c6c..c98029fb1292 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaformat.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx
index cb33ad818f59..e024cd68b9ad 100644
--- a/sc/source/ui/vba/vbaformat.hxx
+++ b/sc/source/ui/vba/vbaformat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaformat.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx
index 285ea0ea3370..99d8a579956a 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaformatcondition.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx
index 853b925020bb..075dbf658203 100644
--- a/sc/source/ui/vba/vbaformatcondition.hxx
+++ b/sc/source/ui/vba/vbaformatcondition.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaformatcondition.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx
index 1048cd91d2d3..91d0429326dd 100644
--- a/sc/source/ui/vba/vbaformatconditions.cxx
+++ b/sc/source/ui/vba/vbaformatconditions.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaformatconditions.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx
index 177ddd168f35..7dfa065ea8b6 100644
--- a/sc/source/ui/vba/vbaformatconditions.hxx
+++ b/sc/source/ui/vba/vbaformatconditions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaformatconditions.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx
index 982289f0002e..0cddacafd194 100644
--- a/sc/source/ui/vba/vbaglobals.cxx
+++ b/sc/source/ui/vba/vbaglobals.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaglobals.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx
index 25d36af55c8d..ae34d710240f 100644
--- a/sc/source/ui/vba/vbaglobals.hxx
+++ b/sc/source/ui/vba/vbaglobals.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaglobals.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index e010d1cf10f3..ca3b7825b232 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbahelper.cxx,v $
- * $Revision: 1.5.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx
index f6aa8cf8c4cb..f3203b130bf2 100644
--- a/sc/source/ui/vba/vbahyperlink.cxx
+++ b/sc/source/ui/vba/vbahyperlink.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #include <vbahelper/helperdecl.hxx>
diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx
index a72eeb325ac6..570ecdcc2f45 100644
--- a/sc/source/ui/vba/vbahyperlink.hxx
+++ b/sc/source/ui/vba/vbahyperlink.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef SC_VBA_HYPERLINK_HXX
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index 9c309c997ed3..3af6243e0fa7 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbainterior.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx
index d3ca677d4890..f0d4db1334fd 100644
--- a/sc/source/ui/vba/vbainterior.hxx
+++ b/sc/source/ui/vba/vbainterior.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbainterior.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index 0d82f4ee45f8..bc0b016177c7 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaname.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx
index 6fb585100d4c..81b2555a4ce1 100644
--- a/sc/source/ui/vba/vbaname.hxx
+++ b/sc/source/ui/vba/vbaname.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaname.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx
index 043e7d386f15..d074f32b689d 100644
--- a/sc/source/ui/vba/vbanames.cxx
+++ b/sc/source/ui/vba/vbanames.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbanames.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx
index 524277bdc0bd..1997ac6163d7 100644
--- a/sc/source/ui/vba/vbanames.hxx
+++ b/sc/source/ui/vba/vbanames.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbanames.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx
index 64e5f05f90e1..a35ce4b3120f 100644
--- a/sc/source/ui/vba/vbaoleobject.cxx
+++ b/sc/source/ui/vba/vbaoleobject.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaoleobject.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx
index 9ad6d6acc2b6..008564d71e16 100644
--- a/sc/source/ui/vba/vbaoleobject.hxx
+++ b/sc/source/ui/vba/vbaoleobject.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaoleobject.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx
index d00ecf5e207d..69ba36cf8279 100644
--- a/sc/source/ui/vba/vbaoleobjects.cxx
+++ b/sc/source/ui/vba/vbaoleobjects.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaoleobjects.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx
index 6372a1d2acf3..ab4ed29d163d 100644
--- a/sc/source/ui/vba/vbaoleobjects.hxx
+++ b/sc/source/ui/vba/vbaoleobjects.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaoleobjects.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx
index 2e6b0f63731a..ee4c78c73151 100644
--- a/sc/source/ui/vba/vbaoutline.cxx
+++ b/sc/source/ui/vba/vbaoutline.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaoutline.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx
index 423b97a34671..c954842cf7fd 100644
--- a/sc/source/ui/vba/vbaoutline.hxx
+++ b/sc/source/ui/vba/vbaoutline.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaoutline.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx
index 6e8357be7a8c..1103c10f54c8 100644
--- a/sc/source/ui/vba/vbapagebreak.cxx
+++ b/sc/source/ui/vba/vbapagebreak.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx
index 2e83d3d9b6d6..4832464c1296 100644
--- a/sc/source/ui/vba/vbapagebreak.hxx
+++ b/sc/source/ui/vba/vbapagebreak.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx
index c3b86b77d0bd..25ccbb0f4cdc 100644
--- a/sc/source/ui/vba/vbapagebreaks.cxx
+++ b/sc/source/ui/vba/vbapagebreaks.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx
index 5c90745d61ff..de6174191e95 100644
--- a/sc/source/ui/vba/vbapagebreaks.hxx
+++ b/sc/source/ui/vba/vbapagebreaks.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index cbc9360db523..d660ddbbfd77 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx
index 2b8b1fffde43..d2c001b225cf 100644
--- a/sc/source/ui/vba/vbapagesetup.hxx
+++ b/sc/source/ui/vba/vbapagesetup.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx
index f9afaa00c191..0ce55547d4a1 100644
--- a/sc/source/ui/vba/vbapalette.cxx
+++ b/sc/source/ui/vba/vbapalette.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapalette.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapalette.hxx b/sc/source/ui/vba/vbapalette.hxx
index 388fd5908b6b..9c7ea2ebc3f1 100644
--- a/sc/source/ui/vba/vbapalette.hxx
+++ b/sc/source/ui/vba/vbapalette.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapalette.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx
index 1ec6b2a2e642..263529dde145 100644
--- a/sc/source/ui/vba/vbapane.cxx
+++ b/sc/source/ui/vba/vbapane.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapane.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx
index 97eb3e8f366c..0fa1d49709de 100644
--- a/sc/source/ui/vba/vbapane.hxx
+++ b/sc/source/ui/vba/vbapane.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapane.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx
index b87a279ac842..322b42368b48 100644
--- a/sc/source/ui/vba/vbapivotcache.cxx
+++ b/sc/source/ui/vba/vbapivotcache.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapivotcache.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx
index 6e98344d115e..dea3e35d18bd 100644
--- a/sc/source/ui/vba/vbapivotcache.hxx
+++ b/sc/source/ui/vba/vbapivotcache.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapivotcache.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx
index b4050c9ca4f8..e5d78602dcdd 100644
--- a/sc/source/ui/vba/vbapivottable.cxx
+++ b/sc/source/ui/vba/vbapivottable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapivottable.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx
index 7fccada818fc..e6e341830489 100644
--- a/sc/source/ui/vba/vbapivottable.hxx
+++ b/sc/source/ui/vba/vbapivottable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapivottable.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx
index c03d347c1ba0..05a4201da977 100644
--- a/sc/source/ui/vba/vbapivottables.cxx
+++ b/sc/source/ui/vba/vbapivottables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapivottables.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx
index b2f71cdc3ff0..3354d8a82953 100644
--- a/sc/source/ui/vba/vbapivottables.hxx
+++ b/sc/source/ui/vba/vbapivottables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapivottables.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapropvalue.cxx b/sc/source/ui/vba/vbapropvalue.cxx
index aad34760b882..ff821d17f479 100644
--- a/sc/source/ui/vba/vbapropvalue.cxx
+++ b/sc/source/ui/vba/vbapropvalue.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapropvalue.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbapropvalue.hxx b/sc/source/ui/vba/vbapropvalue.hxx
index f521212f2ceb..af748dae5585 100644
--- a/sc/source/ui/vba/vbapropvalue.hxx
+++ b/sc/source/ui/vba/vbapropvalue.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapropvalue.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index f6c58c23f79a..b3307ffdc55d 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbarange.cxx,v $
- * $Revision: 1.8.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -121,7 +118,7 @@
 #include <ooo/vba/excel/XlSearchDirection.hpp>
 
 #include <scitems.hxx>
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <cellsuno.hxx>
 #include <dbcolect.hxx>
 #include "docfunc.hxx"
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 1d2d82442be3..89ae741c7535 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbarange.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaseriescollection.cxx b/sc/source/ui/vba/vbaseriescollection.cxx
index 8c6c07703ac7..8caa746beff0 100644
--- a/sc/source/ui/vba/vbaseriescollection.cxx
+++ b/sc/source/ui/vba/vbaseriescollection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaseriescollection.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaseriescollection.hxx b/sc/source/ui/vba/vbaseriescollection.hxx
index 48ec78025d79..f61720102919 100644
--- a/sc/source/ui/vba/vbaseriescollection.hxx
+++ b/sc/source/ui/vba/vbaseriescollection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaseriescollection.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx
index 8b7731c2d358..b99b2e783101 100644
--- a/sc/source/ui/vba/vbastyle.cxx
+++ b/sc/source/ui/vba/vbastyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbastyle.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx
index cc8bda0a0537..d5bb232dabc2 100644
--- a/sc/source/ui/vba/vbastyle.hxx
+++ b/sc/source/ui/vba/vbastyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbastyle.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx
index 6cb35d19a67e..c323e2b3f6f6 100644
--- a/sc/source/ui/vba/vbastyles.cxx
+++ b/sc/source/ui/vba/vbastyles.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbastyles.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx
index 1e238a9d1c13..300596d6b3fe 100644
--- a/sc/source/ui/vba/vbastyles.hxx
+++ b/sc/source/ui/vba/vbastyles.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbastyles.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx
index b8148e129220..0ef9e0f7393b 100644
--- a/sc/source/ui/vba/vbatextboxshape.cxx
+++ b/sc/source/ui/vba/vbatextboxshape.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx
index 733849e6be12..c08a576b7155 100644
--- a/sc/source/ui/vba/vbatextboxshape.hxx
+++ b/sc/source/ui/vba/vbatextboxshape.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile$
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision$
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author$ $Date$
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef SC_VBA_TEXTBOX_HXX
diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx
index 81a8f0b5654c..b06777526c1f 100644
--- a/sc/source/ui/vba/vbatextframe.cxx
+++ b/sc/source/ui/vba/vbatextframe.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbatextframe.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx
index 8aa85f34be09..b48cd8752ef9 100644
--- a/sc/source/ui/vba/vbatextframe.hxx
+++ b/sc/source/ui/vba/vbatextframe.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbatextframe.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx
index e696640d757f..fb97f3f20f0c 100644
--- a/sc/source/ui/vba/vbatitle.hxx
+++ b/sc/source/ui/vba/vbatitle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbatitle.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx
index 411b002bdb9b..e2a768549e11 100644
--- a/sc/source/ui/vba/vbavalidation.cxx
+++ b/sc/source/ui/vba/vbavalidation.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbavalidation.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx
index cef989aa3cea..563ee1d003b6 100644
--- a/sc/source/ui/vba/vbavalidation.hxx
+++ b/sc/source/ui/vba/vbavalidation.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbavalidation.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index d782fb95dc70..0416b99abcb3 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbawindow.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx
index 968d258961c8..e72401a2baac 100644
--- a/sc/source/ui/vba/vbawindow.hxx
+++ b/sc/source/ui/vba/vbawindow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbawindow.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index ae16efdebcf4..3ddc5f5b3b45 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbawindows.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx
index 5aff0094ebf3..3441b6ccbac4 100644
--- a/sc/source/ui/vba/vbawindows.hxx
+++ b/sc/source/ui/vba/vbawindows.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbawindows.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 498d77e79a14..6694f4e5e135 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaworkbook.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx
index cf221fd934a0..40234aca21d7 100644
--- a/sc/source/ui/vba/vbaworkbook.hxx
+++ b/sc/source/ui/vba/vbaworkbook.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaworkbook.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index b2f194bff6c5..9f9c5dacd796 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaworkbooks.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx
index 891a8a333695..5d6210244d80 100644
--- a/sc/source/ui/vba/vbaworkbooks.hxx
+++ b/sc/source/ui/vba/vbaworkbooks.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaworkbooks.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index c382ffeb8afe..be988509aa68 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaworksheet.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx
index da88e1c4b06f..5fe1343f9237 100644
--- a/sc/source/ui/vba/vbaworksheet.hxx
+++ b/sc/source/ui/vba/vbaworksheet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaworksheet.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index dca004a74e65..e7de0b82fcaa 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaworksheets.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx
index e816e8ecf212..4c8120084b02 100644
--- a/sc/source/ui/vba/vbaworksheets.hxx
+++ b/sc/source/ui/vba/vbaworksheets.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaworksheets.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx
index f7fe703cec35..c355244f6815 100644
--- a/sc/source/ui/vba/vbawsfunction.cxx
+++ b/sc/source/ui/vba/vbawsfunction.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbawsfunction.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx
index d3f8b105d29c..58a895f6d47b 100644
--- a/sc/source/ui/vba/vbawsfunction.hxx
+++ b/sc/source/ui/vba/vbawsfunction.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbawsfunction.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index 3f09fd0e2ff4..2c80c154759d 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: auditsh.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 //------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index e9116b19c87b..916e670ec5b1 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellsh.cxx,v $
- * $Revision: 1.48.126.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/clipfmtitem.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/langitem.hxx>
 
 #include "cellsh.hxx"
 #include "sc.hrc"
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 6bdf172b9fb5..aec15fceef9e 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellsh1.cxx,v $
- * $Revision: 1.54.102.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,7 +62,7 @@
 #include <svx/svxdlg.hxx>
 #include <sot/formats.hxx>
 #include <svx/postattr.hxx>
-#include <svx/fontitem.hxx>
+#include <editeng/fontitem.hxx>
 #include <svx/clipfmtitem.hxx>
 #include <sfx2/passwd.hxx>
 #include <svx/hlnkitem.hxx>
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 47c55350f278..95ceffc5dc59 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellsh2.cxx,v $
- * $Revision: 1.34.24.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 2f96aec815fb..2cc42635b9b0 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellsh3.cxx,v $
- * $Revision: 1.24.90.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index 1cbb63aa5e69..e8419a24c80f 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellsh4.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 984006d365d6..8916624fdb52 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: colrowba.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 48b6d3ba11f7..02dfd77f7460 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbfunc.cxx,v $
- * $Revision: 1.15.126.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx
index 4657618f9ebe..54ddde9b7710 100644
--- a/sc/source/ui/view/dbfunc2.cxx
+++ b/sc/source/ui/view/dbfunc2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbfunc2.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 41a959409727..2ef65f596c34 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbfunc3.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx
index 9e743c1f3cb3..870622293e37 100644
--- a/sc/source/ui/view/dbfunc4.cxx
+++ b/sc/source/ui/view/dbfunc4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbfunc4.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx
index 3b6f84eb81af..fa7872617c03 100644
--- a/sc/source/ui/view/drawattr.cxx
+++ b/sc/source/ui/view/drawattr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawattr.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx
index ca0607157c3c..3885b0adc752 100644
--- a/sc/source/ui/view/drawutil.cxx
+++ b/sc/source/ui/view/drawutil.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawutil.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx
index 22130afa3480..c760ce86a3d7 100644
--- a/sc/source/ui/view/drawvie2.cxx
+++ b/sc/source/ui/view/drawvie2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawvie2.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 625d62ba280b..ffa1efe28654 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawvie3.cxx,v $
- * $Revision: 1.16.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 2b8273346b28..8b9debdabfae 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawvie4.cxx,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index ef68bbc9bd0c..837cee2698b3 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawview.cxx,v $
- * $Revision: 1.50.126.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,8 +41,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdocapt.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/writingmodeitem.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/writingmodeitem.hxx>
 #include <svx/sdrpaintwindow.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index b0f2197ad826..d228a205a5a3 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editsh.cxx,v $
- * $Revision: 1.35.44.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,25 +33,25 @@
 //------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <svx/clipfmtitem.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/cntritem.hxx>
+#include <editeng/cntritem.hxx>
 //CHINA001 #include <svx/chardlg.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/fontitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/fontitem.hxx>
 #include <svx/hlnkitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/srchitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <svl/srchitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/msg.hxx>
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index fb83ed5624d6..e364705f90b6 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formatsh.cxx,v $
- * $Revision: 1.41.142.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@
 //------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -67,24 +64,24 @@
 #include <svl/stritem.hxx>
 #include <svl/zformat.hxx>
 #include <svl/languageoptions.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/langitem.hxx>
 #include <svx/numinf.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/templdlg.hxx>
 #include <sfx2/tplpitem.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <svx/algitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/bolnitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/scripttypeitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/bolnitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/scripttypeitem.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svx/shaditem.hxx>
+#include <editeng/shaditem.hxx>
 
 #include "formatsh.hxx"
 #include "sc.hrc"
diff --git a/sc/source/ui/view/galwrap.cxx b/sc/source/ui/view/galwrap.cxx
index 0348a68e4f4b..1d92cb5f303a 100644
--- a/sc/source/ui/view/galwrap.cxx
+++ b/sc/source/ui/view/galwrap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galwrap.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx
index f1fbb813755e..5a1f501e38ca 100644
--- a/sc/source/ui/view/gridmerg.cxx
+++ b/sc/source/ui/view/gridmerg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridmerg.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 7f78461aedb0..cd55e4f72c34 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridwin.cxx,v $
- * $Revision: 1.96.50.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,14 +31,14 @@
 #include "scitems.hxx"
 
 #include <memory> //auto_ptr
-#include <svx/adjitem.hxx>
+#include <editeng/adjitem.hxx>
 #include <svx/algitem.hxx>
 #include <svx/dbexch.hrc>
-#include <svx/editview.hxx>
-#include <svx/editstat.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/flditem.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfile.hxx>
@@ -58,7 +55,7 @@
 #include <sot/clsids.hxx>
 
 #include <svx/svdview.hxx>      // fuer Command-Handler (COMMAND_INSERTTEXT)
-#include <svx/outliner.hxx>     // fuer Command-Handler (COMMAND_INSERTTEXT)
+#include <editeng/outliner.hxx>     // fuer Command-Handler (COMMAND_INSERTTEXT)
 #include <svx/svditer.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index e0dd63ff090e..6d9bb94eb76b 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridwin2.cxx,v $
- * $Revision: 1.16.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index fbff54b1408f..5bfc0483b553 100755..100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridwin3.cxx,v $
- * $Revision: 1.20.126.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,12 +29,12 @@
 #include "precompiled_sc.hxx"
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <svx/svdoutl.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/sizeitem.hxx>
+#include <editeng/sizeitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <svl/ptitem.hxx>
 
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 7719dfcc5474..f698913ea758 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridwin4.cxx,v $
- * $Revision: 1.40 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,14 +33,14 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
 #include <svtools/colorcfg.hxx>
-#include <svx/colritem.hxx>
-#include <svx/editview.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/scripttypeitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/scripttypeitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/printer.hxx>
 
@@ -74,6 +71,7 @@
 #include "inputopt.hxx"
 #include "fillinfo.hxx"
 #include "dpcontrol.hxx"
+#include "queryparam.hxx"
 #include "sc.hrc"
 #include <vcl/virdev.hxx>
 
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index f3d5b2781607..4a9dbbaf98b6 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridwin5.cxx,v $
- * $Revision: 1.23.128.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,11 +30,11 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpagv.hxx>
 #include <svtools/imapobj.hxx>
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 3ecacffd2d7b..511463db8a10 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hdrcont.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index aa0e59016ab7..568923f42838 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hintwin.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx
index 287f66b5ea4c..b2f4fb714775 100644
--- a/sc/source/ui/view/imapwrap.cxx
+++ b/sc/source/ui/view/imapwrap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imapwrap.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx
index ea7245b0bd4d..a895dc5faec0 100644
--- a/sc/source/ui/view/invmerge.cxx
+++ b/sc/source/ui/view/invmerge.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: invmerge.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/makefile.mk b/sc/source/ui/view/makefile.mk
index ed50324f68be..e40d6da5c09d 100644
--- a/sc/source/ui/view/makefile.mk
+++ b/sc/source/ui/view/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 419124596147..065ba5899817 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: notemark.cxx,v $
- * $Revision: 1.12.126.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index 6e5535361653..bec88920f989 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olinewin.cxx,v $
- * $Revision: 1.15.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx
index 3feb69044f43..248777f4e473 100644
--- a/sc/source/ui/view/olkact.cxx
+++ b/sc/source/ui/view/olkact.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olkact.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 9d2da303988c..265e54fe0e12 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: output.cxx,v $
- * $Revision: 1.35.100.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,13 +33,13 @@
 #include <com/sun/star/embed/EmbedMisc.hpp>
 
 #include "scitems.hxx"
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/editdata.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svx/rotmodit.hxx>
-#include <svx/shaditem.hxx>
-#include <svx/svxfont.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/svxfont.hxx>
 #include <svx/svdoole2.hxx>
 #include <tools/poly.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 700c32e4698f..53851f0e3cf0 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: output2.cxx,v $
- * $Revision: 1.56.142.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,24 +34,24 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
-#include <svx/adjitem.hxx>
+#include <editeng/adjitem.hxx>
 #include <svx/algitem.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svx/colritem.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editstat.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/forbiddencharacterstable.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/langitem.hxx>
 #include <svx/rotmodit.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/unolingu.hxx>
 #include <svl/zforlist.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/metric.hxx>
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index ffc1112667f2..2c368937e156 100755..100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: output3.cxx,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdoutl.hxx>
diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx
index ef014bd90f79..6a206ef3eb13 100644
--- a/sc/source/ui/view/pfuncache.cxx
+++ b/sc/source/ui/view/pfuncache.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pfuncache.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index 3ab72f37ac35..0e792b2bb279 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pgbrksh.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 //------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index 2039934a6e45..a65f86ffed2c 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pivotsh.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 //------------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 31121f35aa1b..83fdab9000e6 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: preview.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,12 +33,12 @@
 // INCLUDE ---------------------------------------------------------------
 #include <tools/pstm.hxx>
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
 #include <svtools/colorcfg.hxx>
 #include <svx/fmview.hxx>
-#include <svx/sizeitem.hxx>
+#include <editeng/sizeitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -68,9 +65,9 @@
 #include "AccessibleDocumentPagePreview.hxx"
 #include <vcl/lineinfo.hxx>
 #include <svx/algitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/sizeitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/sizeitem.hxx>
 #include "attrib.hxx"
 #include "pagepar.hxx"
 #include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx
index 51f6712c70ca..67e1aa86553a 100644
--- a/sc/source/ui/view/prevloc.cxx
+++ b/sc/source/ui/view/prevloc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prevloc.cxx,v $
- * $Revision: 1.16.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index ebe58f5a0efc..f4b976b00e4d 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prevwsh.cxx,v $
- * $Revision: 1.44.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,11 +33,11 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <sfx2/app.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/srchitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <svl/srchitem.hxx>
 #include <svx/zoomslideritem.hxx>
 #include <svx/svdview.hxx>
 //CHINA001 #include <svx/zoom.hxx>
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index d37d0c85046d..07af90f797aa 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prevwsh2.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 9c8b1f1d4ce6..afe23892e786 100755..100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printfun.cxx,v $
- * $Revision: 1.58.50.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,25 +31,25 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include "printfun.hxx"
 
 #include <svx/svxids.hrc>
-#include <svx/adjitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svx/editstat.hxx>     // EE_CNTRL_RTFSTYLESHEETS
+#include <editeng/editstat.hxx>     // EE_CNTRL_RTFSTYLESHEETS
 #include <svx/fmview.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/paperinf.hxx>
-#include <svx/pbinitem.hxx>
-#include <svx/shaditem.hxx>
-#include <svx/sizeitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/paperinf.hxx>
+#include <editeng/pbinitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/sizeitem.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/ulspitem.hxx>
+#include <editeng/ulspitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/progress.hxx>
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 8b36ae6a480e..0d5d64964f5c 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: reffact.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx
index e6b4a3d0c20e..bead62419bb3 100644
--- a/sc/source/ui/view/scextopt.cxx
+++ b/sc/source/ui/view/scextopt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scextopt.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index b8d0da840db7..4887895c8e6b 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: select.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx
index a3cdad1f046f..0edd50a0b825 100644
--- a/sc/source/ui/view/selectionstate.cxx
+++ b/sc/source/ui/view/selectionstate.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: selectionstate.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #include "precompiled_sc.hxx"
 #include "selectionstate.hxx"
 
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 #include "viewdata.hxx"
 
 // ============================================================================
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index e2d02348fbcb..8ff816263b4f 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spelldialog.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,9 +33,9 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svxids.hrc>
-#include <svx/editstat.hxx>
-#include <svx/editview.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/unolingu.hxx>
 #include "selectionstate.hxx"
 
 #include "spelleng.hxx"
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index 40b9ff5dbea7..ac6288028dfc 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spelleng.cxx,v $
- * $Revision: 1.18.128.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,12 +33,12 @@
 #include <memory>
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
-#include <svx/langitem.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editview.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editview.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index db1a8952aeef..c5572fb9844a 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabcont.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/tabpopsh.cxx b/sc/source/ui/view/tabpopsh.cxx
index 7e78b2b5fc4a..f5033d5d0df5 100644
--- a/sc/source/ui/view/tabpopsh.cxx
+++ b/sc/source/ui/view/tabpopsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabpopsh.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx
index 02f91dd224fa..0f72e0e73d02 100644
--- a/sc/source/ui/view/tabsplit.cxx
+++ b/sc/source/ui/view/tabsplit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabsplit.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index c076575d4e6d..b8656e1e25a0 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabview.cxx,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 2caaae9146fb..b7a773ab2abd 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabview2.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
 #include <vcl/timer.hxx>
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index a19760e4c277..b61c3ade64f4 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabview3.cxx,v $
- * $Revision: 1.69.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,11 +35,11 @@
 // INCLUDE ---------------------------------------------------------------
 #include <rangelst.hxx>
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
-#include <svx/brshitem.hxx>
-#include <svx/editview.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/editview.hxx>
 #include <svx/fmshell.hxx>
 #include <svx/svdoole2.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 076a23c5e524..abbc0224704e 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabview4.cxx,v $
- * $Revision: 1.11.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 75e961d5eeec..460f31b07175 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabview5.cxx,v $
- * $Revision: 1.25.32.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 
 #include <svx/fmshell.hxx>
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 4c73d14d51be..06aa294029d9 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabvwsh.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,9 +36,11 @@
 #include "scitems.hxx"
 #include <svx/galbrws.hxx>
 #include <svx/imapdlg.hxx>
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <sfx2/templdlg.hxx>
 #include <sfx2/objface.hxx>
+#include <sfx2/viewfrm.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/app.hxx>
 #include <avmedia/mediaplayer.hxx>
 
@@ -109,4 +108,9 @@ SFX_IMPL_VIEWFACTORY( ScTabViewShell, ScResId(STR_NONAME) )
 
 //------------------------------------------------------------------
 
-
+IMPL_LINK( ScTabViewShell, HtmlOptionsHdl, void*, EMPTYARG )
+{
+    // Invalidierung, falls blinkender Text erlaubt/verboten wurde
+    GetViewFrame()->GetBindings().Invalidate(SID_DRAW_TEXT_MARQUEE);
+    return 0;
+}
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 08b7f5f4ad85..ab0dae319105 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabvwsh2.cxx,v $
- * $Revision: 1.27.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index c2812fdc4446..493760d7a6ba 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabvwsh3.cxx,v $
- * $Revision: 1.40 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include <sfx2/app.hxx>
 //CHINA001 #include <svx/zoom.hxx>
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 359c34ec3685..d7a0e2b080b0 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx