Conflicts: avmedia/inc/avmedia/mediaitem.hxx avmedia/prj/build.lst avmedia/source/framework/mediaitem.cxx avmedia/source/gstreamer/gstcommon.hxx avmedia/source/gstreamer/gstframegrabber.cxx avmedia/source/gstreamer/gstframegrabber.hxx avmedia/source/gstreamer/gstmanager.cxx avmedia/source/gstreamer/gstmanager.hxx avmedia/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.hxx avmedia/source/gstreamer/gstuno.cxx avmedia/source/gstreamer/gstwindow.cxx avmedia/source/gstreamer/gstwindow.hxx avmedia/source/gstreamer/makefile.mk avmedia/source/quicktime/quicktimeuno.cxx avmedia/source/viewer/mediawindow.cxx avmedia/source/viewer/mediawindow_impl.cxx avmedia/source/viewer/mediawindow_impl.hxx avmedia/source/viewer/mediawindowbase_impl.cxx avmedia/source/win/winuno.cxx basic/inc/basic/basmgr.hxx basic/inc/basic/mybasic.hxx basic/inc/basic/process.hxx basic/inc/basic/sbmeth.hxx basic/inc/basic/sbmod.hxx basic/inc/basic/sbxdef.hxx basic/inc/basic/sbxvar.hxx basic/source/app/app.cxx basic/source/app/app.hxx basic/source/app/appbased.cxx basic/source/app/appedit.cxx basic/source/app/appwin.cxx basic/source/app/appwin.hxx basic/source/app/brkpnts.cxx basic/source/app/brkpnts.hxx basic/source/app/dialogs.cxx basic/source/app/dialogs.hxx basic/source/app/msgedit.cxx basic/source/app/mybasic.cxx basic/source/app/process.cxx basic/source/app/processw.hxx basic/source/app/textedit.cxx basic/source/basmgr/basicmanagerrepository.cxx basic/source/basmgr/basmgr.cxx basic/source/classes/disas.cxx basic/source/classes/eventatt.cxx basic/source/classes/image.cxx basic/source/classes/sb.cxx basic/source/classes/sbunoobj.cxx basic/source/classes/sbxmod.cxx basic/source/comp/codegen.cxx basic/source/comp/dim.cxx basic/source/comp/exprgen.cxx basic/source/comp/exprnode.cxx basic/source/comp/exprtree.cxx basic/source/comp/sbcomp.cxx basic/source/inc/expr.hxx basic/source/inc/object.hxx basic/source/inc/sbunoobj.hxx basic/source/runtime/dllmgr-x86.cxx basic/source/runtime/iosys.cxx basic/source/runtime/makefile.mk basic/source/runtime/methods.cxx basic/source/runtime/methods1.cxx basic/source/runtime/runtime.cxx basic/source/runtime/stdobj.cxx basic/source/runtime/step0.cxx basic/source/runtime/step1.cxx basic/source/runtime/step2.cxx basic/source/sbx/sbxarray.cxx basic/source/sbx/sbxbase.cxx basic/source/sbx/sbxbool.cxx basic/source/sbx/sbxbyte.cxx basic/source/sbx/sbxcoll.cxx basic/source/sbx/sbxconv.hxx basic/source/sbx/sbxcurr.cxx basic/source/sbx/sbxexec.cxx basic/source/sbx/sbxint.cxx basic/source/sbx/sbxobj.cxx basic/source/sbx/sbxscan.cxx basic/source/sbx/sbxstr.cxx basic/source/sbx/sbxvals.cxx basic/source/sbx/sbxvalue.cxx basic/source/sbx/sbxvar.cxx basic/workben/mgrtest.cxx configmgr/prj/build.lst configmgr/source/access.cxx configmgr/source/configurationprovider.cxx configmgr/source/defaultprovider.cxx configmgr/source/pad.cxx configmgr/source/services.cxx configmgr/source/update.cxx configmgr/source/xmlreader.cxx configmgr/source/xmlreader.hxx connectivity/prj/build.lst connectivity/qa/complex/connectivity/TestCase.java connectivity/source/cpool/Zregistration.cxx connectivity/source/drivers/adabas/Bservices.cxx connectivity/source/drivers/ado/Aservices.cxx connectivity/source/drivers/calc/Cservices.cxx connectivity/source/drivers/calc/makefile.mk connectivity/source/drivers/dbase/DIndex.cxx connectivity/source/drivers/dbase/DIndexIter.cxx connectivity/source/drivers/dbase/DNoException.cxx connectivity/source/drivers/dbase/DTable.cxx connectivity/source/drivers/dbase/Dservices.cxx connectivity/source/drivers/dbase/dindexnode.cxx connectivity/source/drivers/evoab/LNoException.cxx connectivity/source/drivers/evoab/LServices.cxx connectivity/source/drivers/evoab2/NServices.cxx connectivity/source/drivers/file/FNoException.cxx connectivity/source/drivers/file/FPreparedStatement.cxx connectivity/source/drivers/file/FResultSet.cxx connectivity/source/drivers/file/FStatement.cxx connectivity/source/drivers/file/quotedstring.cxx connectivity/source/drivers/flat/ETable.cxx connectivity/source/drivers/flat/Eservices.cxx connectivity/source/drivers/hsqldb/Hservices.cxx connectivity/source/drivers/jdbc/jservices.cxx connectivity/source/drivers/kab/KServices.cxx connectivity/source/drivers/macab/MacabServices.cxx connectivity/source/drivers/mozab/MResultSet.cxx connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx connectivity/source/drivers/mysql/Yservices.cxx connectivity/source/drivers/odbc/OFunctions.cxx connectivity/source/drivers/odbc/oservices.cxx connectivity/source/inc/dbase/DIndexPage.hxx connectivity/source/inc/file/FTable.hxx connectivity/source/manager/mregistration.cxx connectivity/source/parse/PColumn.cxx desktop/prj/build.lst desktop/qa/deployment_misc/test_dp_version.cxx desktop/source/app/app.cxx desktop/source/app/appfirststart.cxx desktop/source/app/cmdlineargs.cxx desktop/source/app/cmdlineargs.hxx desktop/source/app/sofficemain.cxx desktop/source/deployment/gui/dp_gui.hrc desktop/source/deployment/gui/dp_gui_dialog2.cxx desktop/source/deployment/gui/dp_gui_dialog2.hxx desktop/source/deployment/gui/dp_gui_updatedialog.cxx desktop/source/deployment/gui/dp_gui_updatedialog.hxx desktop/source/deployment/manager/dp_extensionmanager.cxx desktop/source/deployment/manager/dp_extensionmanager.hxx desktop/source/deployment/misc/dp_misc.src desktop/source/deployment/registry/component/dp_component.cxx desktop/source/deployment/registry/configuration/dp_configuration.cxx desktop/source/deployment/registry/dp_backend.cxx desktop/source/deployment/registry/help/dp_help.cxx desktop/source/deployment/registry/script/dp_script.cxx desktop/source/migration/pages.cxx desktop/source/migration/pages.hxx desktop/source/migration/wizard.cxx desktop/source/migration/wizard.hrc desktop/source/migration/wizard.hxx desktop/source/migration/wizard.src desktop/source/pkgchk/unopkg/unopkg_shared.h desktop/source/so_comp/services.cxx desktop/source/splash/makefile.mk desktop/source/splash/services_spl.cxx desktop/source/splash/splash.cxx drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx editeng/inc/editeng/adjitem.hxx editeng/inc/editeng/bolnitem.hxx editeng/inc/editeng/borderline.hxx editeng/inc/editeng/boxitem.hxx editeng/inc/editeng/brkitem.hxx editeng/inc/editeng/brshitem.hxx editeng/inc/editeng/bulitem.hxx editeng/inc/editeng/charreliefitem.hxx editeng/inc/editeng/charrotateitem.hxx editeng/inc/editeng/charscaleitem.hxx editeng/inc/editeng/cmapitem.hxx editeng/inc/editeng/colritem.hxx editeng/inc/editeng/crsditem.hxx editeng/inc/editeng/editdata.hxx editeng/inc/editeng/editeng.hxx editeng/inc/editeng/editobj.hxx editeng/inc/editeng/editstat.hxx editeng/inc/editeng/editview.hxx editeng/inc/editeng/emphitem.hxx editeng/inc/editeng/escpitem.hxx editeng/inc/editeng/fhgtitem.hxx editeng/inc/editeng/flstitem.hxx editeng/inc/editeng/fontitem.hxx editeng/inc/editeng/frmdiritem.hxx editeng/inc/editeng/fwdtitem.hxx editeng/inc/editeng/hyznitem.hxx editeng/inc/editeng/kernitem.hxx editeng/inc/editeng/langitem.hxx editeng/inc/editeng/lrspitem.hxx editeng/inc/editeng/lspcitem.hxx editeng/inc/editeng/numitem.hxx editeng/inc/editeng/outliner.hxx editeng/inc/editeng/paravertalignitem.hxx editeng/inc/editeng/pmdlitem.hxx editeng/inc/editeng/postitem.hxx editeng/inc/editeng/protitem.hxx editeng/inc/editeng/shaditem.hxx editeng/inc/editeng/sizeitem.hxx editeng/inc/editeng/svxacorr.hxx editeng/inc/editeng/svxfont.hxx editeng/inc/editeng/svxrtf.hxx editeng/inc/editeng/swafopt.hxx editeng/inc/editeng/tstpitem.hxx editeng/inc/editeng/twolinesitem.hxx editeng/inc/editeng/txtrange.hxx editeng/inc/editeng/udlnitem.hxx editeng/inc/editeng/ulspitem.hxx editeng/inc/editeng/wghtitem.hxx editeng/inc/editeng/writingmodeitem.hxx editeng/inc/editeng/xmlcnitm.hxx editeng/inc/helpid.hrc editeng/inc/pch/precompiled_editeng.hxx editeng/source/editeng/editdbg.cxx editeng/source/editeng/editdoc.cxx editeng/source/editeng/editdoc.hxx editeng/source/editeng/editdoc2.cxx editeng/source/editeng/editeng.cxx editeng/source/editeng/editobj.cxx editeng/source/editeng/editobj2.hxx editeng/source/editeng/editsel.cxx editeng/source/editeng/editundo.cxx editeng/source/editeng/editundo.hxx editeng/source/editeng/editview.cxx editeng/source/editeng/edtspell.hxx editeng/source/editeng/eehtml.cxx editeng/source/editeng/eehtml.hxx editeng/source/editeng/eeobj.cxx editeng/source/editeng/eerdll.cxx editeng/source/editeng/eertfpar.cxx editeng/source/editeng/impedit.cxx editeng/source/editeng/impedit.hxx editeng/source/editeng/impedit2.cxx editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit4.cxx editeng/source/editeng/impedit5.cxx editeng/source/editeng/makefile.mk editeng/source/items/bulitem.cxx editeng/source/items/charhiddenitem.cxx editeng/source/items/flditem.cxx editeng/source/items/frmitems.cxx editeng/source/items/makefile.mk editeng/source/items/numitem.cxx editeng/source/items/paraitem.cxx editeng/source/items/svxfont.cxx editeng/source/items/textitem.cxx editeng/source/items/writingmodeitem.cxx editeng/source/items/xmlcnitm.cxx editeng/source/misc/SvXMLAutoCorrectImport.cxx editeng/source/misc/svxacorr.cxx editeng/source/misc/txtrange.cxx editeng/source/misc/unolingu.cxx editeng/source/outliner/outleeng.cxx editeng/source/outliner/outliner.cxx editeng/source/outliner/outlundo.hxx editeng/source/outliner/outlvw.cxx editeng/source/outliner/paralist.cxx editeng/source/outliner/paralist.hxx editeng/source/rtf/rtfgrf.cxx editeng/source/rtf/rtfitem.cxx editeng/source/rtf/svxrtf.cxx editeng/source/uno/unoipset.cxx editeng/util/makefile.mk embeddedobj/prj/build.lst embeddedobj/source/commonembedding/miscobj.cxx eventattacher/prj/build.lst fileaccess/source/FileAccess.cxx formula/inc/formula/FormulaCompiler.hxx formula/inc/formula/token.hxx formula/inc/formula/tokenarray.hxx formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/token.cxx formula/source/ui/dlg/FormulaHelper.cxx formula/source/ui/dlg/formula.cxx formula/source/ui/dlg/parawin.cxx formula/source/ui/dlg/structpg.cxx fpicker/prj/d.lst fpicker/source/aqua/FPentry.cxx fpicker/source/office/OfficeControlAccess.cxx fpicker/source/office/iodlg.cxx fpicker/source/office/iodlg.hxx fpicker/source/office/iodlg.src fpicker/source/office/iodlgimp.cxx fpicker/source/unx/gnome/FPentry.cxx fpicker/source/unx/gnome/SalGtkFilePicker.cxx fpicker/source/unx/gnome/SalGtkPicker.cxx fpicker/source/unx/kde4/KDE4FPEntry.cxx fpicker/source/win32/filepicker/FPentry.cxx framework/AllLangResTarget_fwe.mk framework/inc/dispatch/interaction.hxx framework/inc/framework/addonmenu.hxx framework/inc/framework/addonsoptions.hxx framework/inc/framework/bmkmenu.hxx framework/inc/framework/imageproducer.hxx framework/inc/framework/sfxhelperfunctions.hxx framework/inc/framework/statusbarconfiguration.hxx framework/inc/framework/titlehelper.hxx framework/inc/framework/toolboxconfiguration.hxx framework/inc/threadhelp/lockhelper.hxx framework/inc/xml/eventsdocumenthandler.hxx framework/inc/xml/statusbardocumenthandler.hxx framework/inc/xml/toolboxconfiguration.hxx framework/inc/xml/toolboxconfigurationdefines.hxx framework/inc/xml/toolboxdocumenthandler.hxx framework/prj/build.lst framework/qa/complex/ModuleManager/makefile.mk framework/qa/complex/accelerators/makefile.mk framework/qa/complex/framework/recovery/makefile.mk framework/qa/complex/imageManager/_XInitialization.java framework/source/classes/menumanager.cxx framework/source/dispatch/interaction.cxx framework/source/fwe/classes/bmkmenu.cxx framework/source/fwe/helper/actiontriggerhelper.cxx framework/source/fwe/helper/imageproducer.cxx framework/source/fwe/xml/menuconfiguration.cxx framework/source/fwe/xml/toolboxdocumenthandler.cxx framework/source/helper/uiconfigelementwrapperbase.cxx framework/source/helper/uielementwrapperbase.cxx framework/source/inc/pattern/window.hxx framework/source/jobs/jobdata.cxx framework/source/layoutmanager/layoutmanager.cxx framework/source/layoutmanager/panel.hxx framework/source/loadenv/loadenv.cxx framework/source/register/registerservices.cxx framework/source/services/menudocumenthandler.cxx framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx framework/source/uiconfiguration/uiconfigurationmanager.cxx framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx framework/source/uielement/addonstoolbarmanager.cxx framework/source/uielement/controlmenucontroller.cxx framework/source/uielement/fontsizemenucontroller.cxx framework/source/uielement/imagebuttontoolbarcontroller.cxx framework/source/uielement/macrosmenucontroller.cxx framework/source/uielement/menubarmanager.cxx framework/source/uielement/newmenucontroller.cxx framework/source/uielement/togglebuttontoolbarcontroller.cxx framework/source/uielement/toolbarmanager.cxx framework/source/uielement/toolbarsmenucontroller.cxx framework/test/makefile.mk framework/test/threadtest/makefile.mk framework/test/typecfg/makefile.mk framework/util/guiapps/makefile.mk framework/util/makefile.mk idl/inc/bastype.hxx idl/inc/hash.hxx idl/inc/lex.hxx idl/inc/module.hxx idl/inc/object.hxx idl/inc/slot.hxx idl/inc/types.hxx idl/source/cmptools/hash.cxx idl/source/cmptools/lex.cxx idl/source/objects/basobj.cxx idl/source/objects/bastype.cxx idl/source/objects/module.cxx idl/source/objects/object.cxx idl/source/objects/slot.cxx idl/source/objects/types.cxx idl/source/prj/command.cxx idl/source/prj/database.cxx idl/source/prj/globals.cxx idl/source/prj/svidl.cxx linguistic/inc/linguistic/misc.hxx linguistic/prj/build.lst linguistic/source/convdic.cxx linguistic/source/convdiclist.cxx linguistic/source/dicimp.cxx linguistic/source/dlistimp.cxx linguistic/source/gciterator.cxx linguistic/source/iprcache.cxx linguistic/source/lngopt.cxx linguistic/source/lngprophelp.cxx linguistic/source/lngsvcmgr.cxx linguistic/source/lngsvcmgr.hxx linguistic/source/misc2.cxx linguistic/workben/sprophelp.cxx officecfg/registry/data/org/openoffice/VCL.xcu officecfg/util/makefile.mk oovbaapi/ooo/vba/XApplicationBase.idl oovbaapi/ooo/vba/XVBAAppService.idl oovbaapi/ooo/vba/XVBADocService.idl oovbaapi/ooo/vba/excel/XApplication.idl oovbaapi/ooo/vba/excel/XRange.idl oovbaapi/ooo/vba/excel/XWorkbook.idl oovbaapi/ooo/vba/excel/XWorksheet.idl oovbaapi/ooo/vba/word/XApplication.idl oovbaapi/ooo/vba/word/XGlobals.idl oovbaapi/ooo/vba/word/XTableOfContents.idl readlicense_oo/prj/build.lst scripting/prj/build.lst scripting/prj/d.lst scripting/source/basprov/basprov.cxx scripting/source/basprov/basscript.cxx scripting/source/basprov/basscript.hxx scripting/source/dlgprov/dlgprov.cxx scripting/source/inc/util/util.hxx scripting/source/protocolhandler/scripthandler.cxx scripting/source/provider/ProviderCache.cxx scripting/source/pyprov/makefile.mk scripting/source/runtimemgr/ScriptNameResolverImpl.cxx scripting/source/runtimemgr/ScriptRuntimeManager.cxx scripting/source/runtimemgr/StorageBridge.cxx scripting/source/storage/ScriptMetadataImporter.cxx scripting/source/storage/ScriptSecurityManager.cxx scripting/source/storage/ScriptStorage.cxx scripting/source/storage/ScriptStorageManager.cxx sfx2/inc/about.hxx sfx2/inc/brokenpackageint.hxx sfx2/inc/docvor.hxx sfx2/inc/pch/precompiled_sfx2.hxx sfx2/inc/sfx2/app.hxx sfx2/inc/sfx2/basmgr.hxx sfx2/inc/sfx2/bindings.hxx sfx2/inc/sfx2/childwin.hxx sfx2/inc/sfx2/ctrlitem.hxx sfx2/inc/sfx2/dinfdlg.hxx sfx2/inc/sfx2/dispatch.hxx sfx2/inc/sfx2/docfilt.hxx sfx2/inc/sfx2/evntconf.hxx sfx2/inc/sfx2/fcontnr.hxx sfx2/inc/sfx2/frame.hxx sfx2/inc/sfx2/imagemgr.hxx sfx2/inc/sfx2/imgmgr.hxx sfx2/inc/sfx2/linksrc.hxx sfx2/inc/sfx2/macrconf.hxx sfx2/inc/sfx2/macropg.hxx sfx2/inc/sfx2/mnuitem.hxx sfx2/inc/sfx2/mnumgr.hxx sfx2/inc/sfx2/module.hxx sfx2/inc/sfx2/msg.hxx sfx2/inc/sfx2/objsh.hxx sfx2/inc/sfx2/passwd.hxx sfx2/inc/sfx2/prnmon.hxx sfx2/inc/sfx2/request.hxx sfx2/inc/sfx2/sfx.hrc sfx2/inc/sfx2/sfxbasemodel.hxx sfx2/inc/sfx2/sfxhtml.hxx sfx2/inc/sfx2/sfxresid.hxx sfx2/inc/sfx2/sfxsids.hrc sfx2/inc/sfx2/sfxuno.hxx sfx2/inc/sfx2/shell.hxx sfx2/inc/sfx2/stbitem.hxx sfx2/inc/sfx2/styfitem.hxx sfx2/inc/sfx2/tabdlg.hxx sfx2/inc/sfx2/tbxctrl.hxx sfx2/inc/sfx2/tplpitem.hxx sfx2/inc/sfx2/viewfrm.hxx sfx2/inc/sfx2/viewsh.hxx sfx2/inc/sfxbasic.hxx sfx2/inc/sorgitm.hxx sfx2/prj/build.lst sfx2/qa/complex/docinfo/makefile.mk sfx2/qa/cppunit/makefile.mk sfx2/sdi/makefile.mk sfx2/source/appl/app.cxx sfx2/source/appl/app.hrc sfx2/source/appl/app.src sfx2/source/appl/appbas.cxx sfx2/source/appl/appcfg.cxx sfx2/source/appl/appchild.cxx sfx2/source/appl/appmain.cxx sfx2/source/appl/appmisc.cxx sfx2/source/appl/appopen.cxx sfx2/source/appl/appquit.cxx sfx2/source/appl/appserv.cxx sfx2/source/appl/appuno.cxx sfx2/source/appl/childwin.cxx sfx2/source/appl/fileobj.cxx sfx2/source/appl/helpinterceptor.cxx sfx2/source/appl/imagemgr.cxx sfx2/source/appl/impldde.cxx sfx2/source/appl/impldde.hxx sfx2/source/appl/linkmgr2.cxx sfx2/source/appl/lnkbase2.cxx sfx2/source/appl/makefile.mk sfx2/source/appl/module.cxx sfx2/source/appl/newhelp.cxx sfx2/source/appl/opengrf.cxx sfx2/source/appl/sfxdll.cxx sfx2/source/appl/sfxhelp.cxx sfx2/source/appl/shutdownicon.cxx sfx2/source/appl/shutdowniconunx.cxx sfx2/source/appl/workwin.cxx sfx2/source/bastyp/fltfnc.cxx sfx2/source/bastyp/frmhtml.cxx sfx2/source/bastyp/frmhtmlw.cxx sfx2/source/bastyp/helper.cxx sfx2/source/bastyp/minarray.cxx sfx2/source/bastyp/progress.cxx sfx2/source/bastyp/sfxhtml.cxx sfx2/source/config/evntconf.cxx sfx2/source/control/bindings.cxx sfx2/source/control/ctrlitem.cxx sfx2/source/control/dispatch.cxx sfx2/source/control/macrconf.cxx sfx2/source/control/macro.cxx sfx2/source/control/makefile.mk sfx2/source/control/minfitem.cxx sfx2/source/control/msg.cxx sfx2/source/control/msgpool.cxx sfx2/source/control/objface.cxx sfx2/source/control/request.cxx sfx2/source/control/shell.cxx sfx2/source/control/sorgitm.cxx sfx2/source/dialog/about.cxx sfx2/source/dialog/basedlgs.cxx sfx2/source/dialog/dinfdlg.cxx sfx2/source/dialog/dinfedt.cxx sfx2/source/dialog/dockwin.cxx sfx2/source/dialog/filedlghelper.cxx sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mailmodelapi.cxx sfx2/source/dialog/makefile.mk sfx2/source/dialog/mgetempl.cxx sfx2/source/dialog/passwd.cxx sfx2/source/dialog/passwd.hrc sfx2/source/dialog/printopt.cxx sfx2/source/dialog/securitypage.cxx sfx2/source/dialog/splitwin.cxx sfx2/source/dialog/styfitem.cxx sfx2/source/dialog/tabdlg.cxx sfx2/source/dialog/taskpane.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/dialog/tplpitem.cxx sfx2/source/dialog/versdlg.cxx sfx2/source/doc/QuerySaveDocument.cxx sfx2/source/doc/SfxDocumentMetaData.cxx sfx2/source/doc/applet.cxx sfx2/source/doc/doc.hrc sfx2/source/doc/doc.src sfx2/source/doc/docfile.cxx sfx2/source/doc/docinf.cxx sfx2/source/doc/doctempl.cxx sfx2/source/doc/doctemplates.cxx sfx2/source/doc/docvor.cxx sfx2/source/doc/guisaveas.cxx sfx2/source/doc/makefile.mk sfx2/source/doc/objcont.cxx sfx2/source/doc/objitem.cxx sfx2/source/doc/objmisc.cxx sfx2/source/doc/objserv.cxx sfx2/source/doc/printhelper.cxx sfx2/source/doc/sfxacldetect.cxx sfx2/source/doc/sfxbasemodel.cxx sfx2/source/inc/applet.hxx sfx2/source/inc/fltoptint.hxx sfx2/source/inc/sfxlocal.hrc sfx2/source/inc/virtmenu.hxx sfx2/source/inc/workwin.hxx sfx2/source/menu/mnuitem.cxx sfx2/source/menu/objmnctl.cxx sfx2/source/menu/virtmenu.cxx sfx2/source/notify/eventsupplier.cxx sfx2/source/notify/makefile.mk sfx2/source/toolbox/imgmgr.cxx sfx2/source/toolbox/tbxitem.cxx sfx2/source/view/frame.cxx sfx2/source/view/orgmgr.cxx sfx2/source/view/printer.cxx sfx2/source/view/prnmon.cxx sfx2/source/view/viewfrm.cxx sfx2/source/view/viewprn.cxx sfx2/source/view/viewsh.cxx sfx2/util/makefile.mk sfx2/workben/custompanel/makefile.mk shell/source/backends/desktopbe/desktopbackend.cxx shell/source/backends/gconfbe/gconfbackend.cxx shell/source/backends/kde4be/kde4backend.cxx shell/source/backends/kdebe/kdebackend.cxx shell/source/win32/SysShentry.cxx shell/source/win32/shlxthandler/propsheets/propsheets.cxx shell/source/win32/simplemail/smplmailentry.cxx svx/inc/float3d.hrc svx/inc/fmhelp.hrc svx/inc/globlmn_tmpl.hrc svx/inc/helpid.hrc svx/inc/pch/precompiled_svx.hxx svx/inc/sjctrl.hxx svx/inc/srchitem.hxx svx/inc/svdibrow.hxx svx/inc/svx/SmartTagItem.hxx svx/inc/svx/algitem.hxx svx/inc/svx/camera3d.hxx svx/inc/svx/chrtitem.hxx svx/inc/svx/clipfmtitem.hxx svx/inc/svx/ctredlin.hxx svx/inc/svx/dbtoolsclient.hxx svx/inc/svx/deflt3d.hxx svx/inc/svx/dialogs.hrc svx/inc/svx/drawitem.hxx svx/inc/svx/e3ditem.hxx svx/inc/svx/extrud3d.hxx svx/inc/svx/flagsdef.hxx svx/inc/svx/float3d.hxx svx/inc/svx/frmsel.hxx svx/inc/svx/gallery.hxx svx/inc/svx/gallery1.hxx svx/inc/svx/galtheme.hxx svx/inc/svx/grfcrop.hxx svx/inc/svx/hdft.hxx svx/inc/svx/hlnkitem.hxx svx/inc/svx/hyprlink.hxx svx/inc/svx/itemwin.hxx svx/inc/svx/lathe3d.hxx svx/inc/svx/linkwarn.hxx svx/inc/svx/modctrl.hxx svx/inc/svx/msdffdef.hxx svx/inc/svx/obj3d.hxx svx/inc/svx/optgenrl.hxx svx/inc/svx/optgrid.hxx svx/inc/svx/pageitem.hxx svx/inc/svx/paraprev.hxx svx/inc/svx/postattr.hxx svx/inc/svx/rotmodit.hxx svx/inc/svx/ruler.hxx svx/inc/svx/rulritem.hxx svx/inc/svx/scene3d.hxx svx/inc/svx/sdasaitm.hxx svx/inc/svx/sdasitm.hxx svx/inc/svx/sdggaitm.hxx svx/inc/svx/sdmetitm.hxx svx/inc/svx/sdtaaitm.hxx svx/inc/svx/sdtaditm.hxx svx/inc/svx/sdtaitm.hxx svx/inc/svx/sdtakitm.hxx svx/inc/svx/sdtfchim.hxx svx/inc/svx/sdtfsitm.hxx svx/inc/svx/srchdlg.hxx svx/inc/svx/svddrag.hxx svx/inc/svx/svdetc.hxx svx/inc/svx/svdglue.hxx svx/inc/svx/svdhlpln.hxx svx/inc/svx/svdlayer.hxx svx/inc/svx/svdmark.hxx svx/inc/svx/svdmodel.hxx svx/inc/svx/svdoashp.hxx svx/inc/svx/svdobj.hxx svx/inc/svx/svdocirc.hxx svx/inc/svx/svdoedge.hxx svx/inc/svx/svdogrp.hxx svx/inc/svx/svdomeas.hxx svx/inc/svx/svdoole2.hxx svx/inc/svx/svdorect.hxx svx/inc/svx/svdotable.hxx svx/inc/svx/svdotext.hxx svx/inc/svx/svdovirt.hxx svx/inc/svx/svdpage.hxx svx/inc/svx/svdsnpv.hxx svx/inc/svx/svdtrans.hxx svx/inc/svx/svdundo.hxx svx/inc/svx/svimbase.hxx svx/inc/svx/svx3ditems.hxx svx/inc/svx/svxdlg.hxx svx/inc/svx/sxcikitm.hxx svx/inc/svx/sxekitm.hxx svx/inc/svx/sxelditm.hxx svx/inc/svx/sxenditm.hxx svx/inc/svx/sxmkitm.hxx svx/inc/svx/sxmtpitm.hxx svx/inc/svx/sxmuitm.hxx svx/inc/svx/tabarea.hxx svx/inc/svx/tabline.hxx svx/inc/svx/unoprov.hxx svx/inc/svx/viewlayoutitem.hxx svx/inc/svx/xbitmap.hxx svx/inc/svx/xbtmpit.hxx svx/inc/svx/xcolit.hxx svx/inc/svx/xfillit0.hxx svx/inc/svx/xflclit.hxx svx/inc/svx/xflftrit.hxx svx/inc/svx/xflgrit.hxx svx/inc/svx/xflhtit.hxx svx/inc/svx/xftadit.hxx svx/inc/svx/xftsfit.hxx svx/inc/svx/xftshit.hxx svx/inc/svx/xlineit0.hxx svx/inc/svx/xlinjoit.hxx svx/inc/svx/xlnclit.hxx svx/inc/svx/xlndsit.hxx svx/inc/svx/xlnedcit.hxx svx/inc/svx/xlnedit.hxx svx/inc/svx/xlnedwit.hxx svx/inc/svx/xlnstcit.hxx svx/inc/svx/xlnstit.hxx svx/inc/svx/xlnstwit.hxx svx/inc/svx/xlnwtit.hxx svx/inc/svx/xtextit0.hxx svx/inc/svx/zoomitem.hxx svx/inc/svx/zoomslideritem.hxx svx/inc/xpolyimp.hxx svx/inc/zoom_def.hxx svx/prj/d.lst svx/source/accessibility/AccessibleShape.cxx svx/source/accessibility/DescriptionGenerator.cxx svx/source/customshapes/EnhancedCustomShapeEngine.cxx svx/source/customshapes/EnhancedCustomShapeFontWork.cxx svx/source/dialog/_bmpmask.cxx svx/source/dialog/_contdlg.cxx svx/source/dialog/connctrl.cxx svx/source/dialog/contwnd.cxx svx/source/dialog/ctredlin.cxx svx/source/dialog/ctredlin.hrc svx/source/dialog/ctredlin.src svx/source/dialog/dialcontrol.cxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/docrecovery.cxx svx/source/dialog/fntctrl.cxx svx/source/dialog/fontwork.cxx svx/source/dialog/frmsel.cxx svx/source/dialog/graphctl.cxx svx/source/dialog/grfflt.cxx svx/source/dialog/hdft.cxx svx/source/dialog/hyperdlg.cxx svx/source/dialog/hyprdlg.hxx svx/source/dialog/hyprlink.cxx svx/source/dialog/hyprlink.hxx svx/source/dialog/hyprlink.src svx/source/dialog/imapdlg.cxx svx/source/dialog/imapwnd.cxx svx/source/dialog/linkwarn.hrc svx/source/dialog/makefile.mk svx/source/dialog/optgrid.cxx svx/source/dialog/orienthelper.cxx svx/source/dialog/pagectrl.cxx svx/source/dialog/prtqry.cxx svx/source/dialog/rlrcitem.cxx svx/source/dialog/rubydialog.cxx svx/source/dialog/rulritem.cxx svx/source/dialog/simptabl.cxx svx/source/dialog/srchdlg.cxx svx/source/dialog/svxbmpnumvalueset.cxx svx/source/dialog/svxruler.cxx svx/source/dialog/swframeexample.cxx svx/source/engine3d/float3d.cxx svx/source/engine3d/float3d.src svx/source/engine3d/svx3ditems.cxx svx/source/fmcomp/gridctrl.cxx svx/source/fmcomp/trace.cxx svx/source/form/ParseContext.cxx svx/source/form/datanavi.cxx svx/source/form/filtnav.cxx svx/source/form/fmexch.cxx svx/source/form/fmexpl.cxx svx/source/form/fmobjfac.cxx svx/source/form/fmpage.cxx svx/source/form/fmshell.cxx svx/source/form/fmshimp.cxx svx/source/form/fmsrcimp.cxx svx/source/form/fmvwimp.cxx svx/source/form/makefile.mk svx/source/form/tabwin.cxx svx/source/form/tbxform.cxx svx/source/form/typemap.cxx svx/source/gallery2/galbrws1.cxx svx/source/gallery2/galbrws2.cxx svx/source/gallery2/galexpl.cxx svx/source/gallery2/gallery1.cxx svx/source/gallery2/galtheme.cxx svx/source/gallery2/makefile.mk svx/source/gengal/gengal.cxx svx/source/gengal/makefile.mk svx/source/inc/fmgroup.hxx svx/source/intro/about_ooo.hrc svx/source/intro/iso.src svx/source/intro/ooo.src svx/source/items/SmartTagItem.cxx svx/source/items/algitem.cxx svx/source/items/chrtitem.cxx svx/source/items/clipfmtitem.cxx svx/source/items/customshapeitem.cxx svx/source/items/drawitem.cxx svx/source/items/e3ditem.cxx svx/source/items/grfitem.cxx svx/source/items/hlnkitem.cxx svx/source/items/makefile.mk svx/source/items/pageitem.cxx svx/source/items/rotmodit.cxx svx/source/items/viewlayoutitem.cxx svx/source/items/zoomitem.cxx svx/source/items/zoomslideritem.cxx svx/source/src/app.hrc svx/source/stbctrls/makefile.mk svx/source/stbctrls/modctrl.cxx svx/source/stbctrls/xmlsecctrl.cxx svx/source/stbctrls/zoomctrl.cxx svx/source/svdraw/clonelist.cxx svx/source/svdraw/svdattr.cxx svx/source/svdraw/svdcrtv.cxx svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdedtv2.cxx svx/source/svdraw/svdedxv.cxx svx/source/svdraw/svdetc.cxx svx/source/svdraw/svdfmtf.cxx svx/source/svdraw/svdfmtf.hxx svx/source/svdraw/svdglue.cxx svx/source/svdraw/svdhdl.cxx svx/source/svdraw/svdhlpln.cxx svx/source/svdraw/svdibrow.cxx svx/source/svdraw/svdlayer.cxx svx/source/svdraw/svdmodel.cxx svx/source/svdraw/svdoashp.cxx svx/source/svdraw/svdobj.cxx svx/source/svdraw/svdocapt.cxx svx/source/svdraw/svdocirc.cxx svx/source/svdraw/svdoedge.cxx svx/source/svdraw/svdograf.cxx svx/source/svdraw/svdogrp.cxx svx/source/svdraw/svdomeas.cxx svx/source/svdraw/svdomedia.cxx svx/source/svdraw/svdopath.cxx svx/source/svdraw/svdotext.cxx svx/source/svdraw/svdotxdr.cxx svx/source/svdraw/svdotxed.cxx svx/source/svdraw/svdotxfl.cxx svx/source/svdraw/svdotxln.cxx svx/source/svdraw/svdotxtr.cxx svx/source/svdraw/svdoutl.cxx svx/source/svdraw/svdpage.cxx svx/source/svdraw/svdpagv.cxx svx/source/svdraw/svdpntv.cxx svx/source/svdraw/svdpoev.cxx svx/source/svdraw/svdsnpv.cxx svx/source/svdraw/svdstr.src svx/source/svdraw/svdtrans.cxx svx/source/svdraw/svdundo.cxx svx/source/svdraw/svdview.cxx svx/source/svdraw/svdxcgv.cxx svx/source/table/svdotable.cxx svx/source/tbxctrls/colorwindow.hxx svx/source/tbxctrls/extrusioncontrols.cxx svx/source/tbxctrls/fillctrl.cxx svx/source/tbxctrls/grafctrl.cxx svx/source/tbxctrls/itemwin.cxx svx/source/tbxctrls/layctrl.cxx svx/source/tbxctrls/lboxctrl.cxx svx/source/tbxctrls/linectrl.cxx svx/source/tbxctrls/tbcontrl.cxx svx/source/tbxctrls/verttexttbxctrl.cxx svx/source/unodraw/unomod.cxx svx/source/unodraw/unopage.cxx svx/source/unodraw/unoprov.cxx svx/source/unodraw/unoshape.cxx svx/source/unodraw/unoshtxt.cxx svx/source/xml/xmlxtexp.cxx svx/source/xoutdev/_xpoly.cxx svx/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr2.cxx svx/source/xoutdev/xattrbmp.cxx svx/source/xoutdev/xtabcolr.cxx svx/util/makefile.mk svx/workben/edittest.cxx sysui/desktop/productversion.mk ucb/prj/build.lst ucb/source/cacher/cacheserv.cxx ucb/source/core/ucb1.component ucb/source/core/ucbserv.cxx ucb/source/core/ucbstore.cxx ucb/source/core/ucbstore.hxx ucb/source/sorter/sortmain.cxx ucb/source/ucp/file/prov.cxx ucb/source/ucp/file/shell.cxx ucb/source/ucp/ftp/ftpservices.cxx ucb/source/ucp/gio/gio_provider.cxx ucb/source/ucp/gvfs/gvfs_provider.cxx ucb/source/ucp/hierarchy/hierarchyservices.cxx ucb/source/ucp/odma/odma_lib.cxx ucb/source/ucp/odma/odma_services.cxx ucb/source/ucp/package/pkgservices.cxx ucb/source/ucp/tdoc/tdoc_services.cxx ucb/source/ucp/webdav/ContentProperties.cxx ucb/source/ucp/webdav/NeonHeadRequest.cxx ucb/source/ucp/webdav/webdavcontent.cxx ucb/source/ucp/webdav/webdavservices.cxx uui/source/iahndl.cxx uui/source/iahndl.hxx uui/source/loginerr.hxx uui/source/nameclashdlg.hxx uui/source/passcrtdlg.cxx uui/source/passworddlg.cxx uui/source/passworddlg.hxx uui/source/services.cxx vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/prj/build.lst vbahelper/prj/d.lst vbahelper/source/msforms/makefile.mk vbahelper/source/msforms/vbauserform.cxx vbahelper/source/vbahelper/makefile.mk vbahelper/source/vbahelper/vbaapplicationbase.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbadocumentbase.cxx vbahelper/source/vbahelper/vbadocumentsbase.cxx vbahelper/source/vbahelper/vbahelper.cxx vbahelper/util/makefile.mk xmlhelp/source/cxxhelp/provider/databases.cxx xmlhelp/source/cxxhelp/provider/services.cxx xmlhelp/source/treeview/tvfactory.cxx xmloff/JunitTest_xmloff_unoapi.mk xmloff/inc/functional.hxx xmloff/inc/xmloff/formlayerexport.hxx xmloff/inc/xmloff/formlayerimport.hxx xmloff/inc/xmloff/functional.hxx xmloff/inc/xmloff/shapeimport.hxx xmloff/inc/xmloff/xmlcnitm.hxx xmloff/inc/xmloff/xmlnumfi.hxx xmloff/prj/build.lst xmloff/source/chart/SchXMLChartContext.cxx xmloff/source/chart/SchXMLExport.cxx xmloff/source/chart/SchXMLImport.cxx xmloff/source/chart/SchXMLLegendContext.hxx xmloff/source/chart/SchXMLPlotAreaContext.cxx xmloff/source/core/xmluconv.cxx xmloff/source/draw/sdxmlexp.cxx xmloff/source/draw/shapeexport4.cxx xmloff/source/draw/ximp3dobject.cxx xmloff/source/draw/ximp3dscene.cxx xmloff/source/forms/formlayerexport.cxx xmloff/source/forms/formlayerimport.cxx xmloff/source/forms/handler/vcl_time_handler.hxx xmloff/source/forms/layerimport.cxx xmloff/source/forms/layerimport.hxx xmloff/source/forms/property_meta_data.hxx xmloff/source/style/PageHeaderFooterContext.cxx xmloff/source/style/PageMasterStyleMap.cxx xmloff/source/style/prstylei.cxx xmloff/source/style/xmlimppr.cxx xmloff/source/style/xmlnumfi.cxx xmloff/source/style/xmlstyle.cxx xmloff/source/table/tabledesignsimporter.cxx xmloff/source/text/XMLTextNumRuleInfo.cxx xmloff/source/text/XMLTextShapeStyleContext.cxx xmloff/source/text/txtstyle.cxx xmloff/source/transform/ChartOOoTContext.cxx xmloff/source/transform/EventOOoTContext.cxx xmloff/source/transform/TransformerBase.cxx xmloff/util/makefile.mk xmlscript/util/xcr.component
1400 lines
57 KiB
C++
Executable File
1400 lines
57 KiB
C++
Executable File
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*************************************************************************
|
|
*
|
|
* 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
|
|
#include "precompiled_xmloff.hxx"
|
|
#include "ximpcustomshape.hxx"
|
|
#include "ximpshap.hxx"
|
|
#include "xmlehelp.hxx"
|
|
#include <rtl/math.hxx>
|
|
#include <rtl/ustrbuf.hxx>
|
|
#include <rtl/ustring.hxx>
|
|
#include <com/sun/star/uno/Reference.h>
|
|
#include <com/sun/star/beans/XPropertySet.hpp>
|
|
#include <com/sun/star/xml/sax/XAttributeList.hpp>
|
|
#include <com/sun/star/container/XIndexContainer.hpp>
|
|
#include <xmloff/xmltoken.hxx>
|
|
#include "EnhancedCustomShapeToken.hxx"
|
|
#include <xmloff/xmlimp.hxx>
|
|
#include <xmloff/xmltkmap.hxx>
|
|
#include "xmloff/xmlnmspe.hxx"
|
|
#include <xmloff/nmspmap.hxx>
|
|
#include <xmloff/xmluconv.hxx>
|
|
#include "xexptran.hxx"
|
|
#include "xmloff/xmlerror.hxx"
|
|
#include <tools/debug.hxx>
|
|
#include <com/sun/star/drawing/Direction3D.hpp>
|
|
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
|
|
#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
|
|
#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
|
|
#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
|
|
#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
|
|
#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
|
|
#include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp>
|
|
#include <com/sun/star/drawing/ProjectionMode.hpp>
|
|
#include <boost/unordered_map.hpp>
|
|
|
|
using namespace ::com::sun::star;
|
|
using namespace ::xmloff::token;
|
|
using namespace ::xmloff::EnhancedCustomShapeToken;
|
|
|
|
TYPEINIT1( XMLEnhancedCustomShapeContext, SvXMLImportContext );
|
|
|
|
XMLEnhancedCustomShapeContext::XMLEnhancedCustomShapeContext( SvXMLImport& rImport,
|
|
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
|
|
sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
|
|
std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ) :
|
|
SvXMLImportContext( rImport, nPrefix, rLocalName ),
|
|
mrUnitConverter( rImport.GetMM100UnitConverter() ),
|
|
mrxShape( rxShape ),
|
|
mrCustomShapeGeometry( rCustomShapeGeometry )
|
|
{
|
|
}
|
|
|
|
const SvXMLEnumMapEntry aXML_GluePointEnumMap[] =
|
|
{
|
|
{ XML_NONE, 0 },
|
|
{ XML_SEGMENTS, 1 },
|
|
{ XML_NONE, 2 },
|
|
{ XML_RECTANGLE, 3 },
|
|
{ XML_TOKEN_INVALID, 0 }
|
|
};
|
|
void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest,
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
|
|
{
|
|
bool bAttrBool;
|
|
if ( SvXMLUnitConverter::convertBool( bAttrBool, rValue ) )
|
|
{
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= bAttrBool;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
void GetInt32( std::vector< com::sun::star::beans::PropertyValue >& rDest,
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
|
|
{
|
|
sal_Int32 nAttrNumber;
|
|
if ( SvXMLUnitConverter::convertNumber( nAttrNumber, rValue ) )
|
|
{
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= nAttrNumber;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest,
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
|
|
{
|
|
double fAttrDouble;
|
|
if ( SvXMLUnitConverter::convertDouble( fAttrDouble, rValue ) )
|
|
{
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= fAttrDouble;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
void GetDistance( std::vector< com::sun::star::beans::PropertyValue >& rDest,
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
|
|
{
|
|
double fAttrDouble;
|
|
MapUnit eSrcUnit( SvXMLExportHelper::GetUnitFromString( rValue, MAP_100TH_MM ) );
|
|
if ( SvXMLUnitConverter::convertDouble( fAttrDouble, rValue, eSrcUnit, MAP_100TH_MM ) )
|
|
{
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= fAttrDouble;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest,
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
|
|
{
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= rValue;
|
|
rDest.push_back( aProp );
|
|
}
|
|
|
|
void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest,
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp,
|
|
const SvXMLEnumMapEntry& rMap )
|
|
{
|
|
sal_uInt16 eKind;
|
|
if( SvXMLUnitConverter::convertEnum( eKind, rValue, &rMap ) )
|
|
{
|
|
sal_Int16 nEnum = (sal_Int16)eKind;
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= nEnum;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& rDest,
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
|
|
{
|
|
MapUnit eSrcUnit = SvXMLExportHelper::GetUnitFromString( rValue, MAP_100TH_MM );
|
|
if ( eSrcUnit == MAP_RELATIVE )
|
|
{
|
|
rtl_math_ConversionStatus eStatus;
|
|
double fAttrDouble = ::rtl::math::stringToDouble( rValue,
|
|
(sal_Unicode)('.'), (sal_Unicode)(','), &eStatus, NULL );
|
|
if ( eStatus == rtl_math_ConversionStatus_Ok )
|
|
{
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= fAttrDouble;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
}
|
|
|
|
void GetB3DVector( std::vector< com::sun::star::beans::PropertyValue >& rDest,
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
|
|
{
|
|
::basegfx::B3DVector aB3DVector;
|
|
if ( SvXMLUnitConverter::convertB3DVector( aB3DVector, rValue ) )
|
|
{
|
|
drawing::Direction3D aDirection3D( aB3DVector.getX(), aB3DVector.getY(), aB3DVector.getZ() );
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= aDirection3D;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
sal_Bool GetEquationName( const rtl::OUString& rEquation, const sal_Int32 nStart, rtl::OUString& rEquationName )
|
|
{
|
|
sal_Int32 nIndex = nStart;
|
|
while( nIndex < rEquation.getLength() )
|
|
{
|
|
sal_Unicode nChar = rEquation[ nIndex ];
|
|
if (
|
|
( ( nChar >= 'a' ) && ( nChar <= 'z' ) )
|
|
|| ( ( nChar >= 'A' ) && ( nChar <= 'Z' ) )
|
|
|| ( ( nChar >= '0' ) && ( nChar <= '9' ) )
|
|
)
|
|
{
|
|
nIndex++;
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
sal_Bool bValid = ( nIndex - nStart ) != 0;
|
|
if ( bValid )
|
|
rEquationName = rEquation.copy( nStart, nIndex - nStart );
|
|
return bValid;
|
|
}
|
|
|
|
sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const rtl::OUString& rParaString )
|
|
{
|
|
if ( nIndex >= rParaString.getLength() )
|
|
return sal_False;
|
|
|
|
sal_Bool bValid = sal_True;
|
|
sal_Bool bNumberRequired = sal_True;
|
|
sal_Bool bMustBePositiveWholeNumbered = sal_False;
|
|
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL;
|
|
if ( rParaString[ nIndex ] == (sal_Unicode)'$' )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT;
|
|
bMustBePositiveWholeNumbered = sal_True;
|
|
nIndex++;
|
|
}
|
|
else if ( rParaString[ nIndex ] == (sal_Unicode)'?' )
|
|
{
|
|
nIndex++;
|
|
bNumberRequired = sal_False;
|
|
rtl::OUString aEquationName;
|
|
bValid = GetEquationName( rParaString, nIndex, aEquationName );
|
|
if ( bValid )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION;
|
|
rParameter.Value <<= aEquationName;
|
|
nIndex += aEquationName.getLength();
|
|
}
|
|
}
|
|
else if ( rParaString[ nIndex ] > (sal_Unicode)'9' )
|
|
{
|
|
bNumberRequired = sal_False;
|
|
if ( rParaString.matchIgnoreAsciiCaseAsciiL( "left", 4, nIndex ) )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT;
|
|
nIndex += 4;
|
|
}
|
|
else if ( rParaString.matchIgnoreAsciiCaseAsciiL( "top", 3, nIndex ) )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP;
|
|
nIndex += 3;
|
|
}
|
|
else if ( rParaString.matchIgnoreAsciiCaseAsciiL( "right", 5, nIndex ) )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT;
|
|
nIndex += 5;
|
|
}
|
|
else if ( rParaString.matchIgnoreAsciiCaseAsciiL( "bottom", 6, nIndex ) )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM;
|
|
nIndex += 6;
|
|
}
|
|
else if ( rParaString.matchIgnoreAsciiCaseAsciiL( "xstretch", 8, nIndex ) )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::XSTRETCH;
|
|
nIndex += 8;
|
|
}
|
|
else if ( rParaString.matchIgnoreAsciiCaseAsciiL( "ystretch", 8, nIndex ) )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::YSTRETCH;
|
|
nIndex += 8;
|
|
}
|
|
else if ( rParaString.matchIgnoreAsciiCaseAsciiL( "hasstroke", 9, nIndex ) )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::HASSTROKE;
|
|
nIndex += 9;
|
|
}
|
|
else if ( rParaString.matchIgnoreAsciiCaseAsciiL( "hasfill", 7, nIndex ) )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::HASFILL;
|
|
nIndex += 7;
|
|
}
|
|
else if ( rParaString.matchIgnoreAsciiCaseAsciiL( "width", 5, nIndex ) )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::WIDTH;
|
|
nIndex += 5;
|
|
}
|
|
else if ( rParaString.matchIgnoreAsciiCaseAsciiL( "height", 6, nIndex ) )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::HEIGHT;
|
|
nIndex += 6;
|
|
}
|
|
else if ( rParaString.matchIgnoreAsciiCaseAsciiL( "logwidth", 8, nIndex ) )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::LOGWIDTH;
|
|
nIndex += 8;
|
|
}
|
|
else if ( rParaString.matchIgnoreAsciiCaseAsciiL( "logheight", 9, nIndex ) )
|
|
{
|
|
rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::LOGHEIGHT;
|
|
nIndex += 9;
|
|
}
|
|
else
|
|
bValid = sal_False;
|
|
}
|
|
if ( bValid )
|
|
{
|
|
if ( bNumberRequired )
|
|
{
|
|
sal_Int32 nStartIndex = nIndex;
|
|
sal_Int32 nEIndex = 0; // index of "E" in double
|
|
|
|
sal_Bool bE = sal_False; // set if a double is including a "E" statement
|
|
sal_Bool bENum = sal_False; // there is at least one number after "E"
|
|
sal_Bool bDot = sal_False; // set if there is a dot included
|
|
sal_Bool bEnd = sal_False; // set for each value that can not be part of a double/integer
|
|
|
|
while( ( nIndex < rParaString.getLength() ) && bValid )
|
|
{
|
|
switch( rParaString[ nIndex ] )
|
|
{
|
|
case '.' :
|
|
{
|
|
if ( bMustBePositiveWholeNumbered )
|
|
bValid = sal_False;
|
|
else
|
|
{
|
|
if ( bDot )
|
|
bValid = sal_False;
|
|
else
|
|
bDot = sal_True;
|
|
}
|
|
}
|
|
break;
|
|
case '-' :
|
|
{
|
|
if ( bMustBePositiveWholeNumbered )
|
|
bValid = sal_False;
|
|
else
|
|
{
|
|
if ( nStartIndex == nIndex )
|
|
bValid = sal_True;
|
|
else if ( bE )
|
|
{
|
|
if ( nEIndex + 1 == nIndex )
|
|
bValid = sal_True;
|
|
else if ( bENum )
|
|
bEnd = sal_True;
|
|
else
|
|
bValid = sal_False;
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
|
|
case 'e' :
|
|
case 'E' :
|
|
{
|
|
if ( bMustBePositiveWholeNumbered )
|
|
bEnd = sal_True;
|
|
else
|
|
{
|
|
if ( !bE )
|
|
{
|
|
bE = sal_True;
|
|
nEIndex = nIndex;
|
|
}
|
|
else
|
|
bEnd = sal_True;
|
|
}
|
|
}
|
|
break;
|
|
case '0' :
|
|
case '1' :
|
|
case '2' :
|
|
case '3' :
|
|
case '4' :
|
|
case '5' :
|
|
case '6' :
|
|
case '7' :
|
|
case '8' :
|
|
case '9' :
|
|
{
|
|
if ( bE && ! bENum )
|
|
bENum = sal_True;
|
|
}
|
|
break;
|
|
default:
|
|
bEnd = sal_True;
|
|
}
|
|
if ( !bEnd )
|
|
nIndex++;
|
|
else
|
|
break;
|
|
}
|
|
if ( nIndex == nStartIndex )
|
|
bValid = sal_False;
|
|
if ( bValid )
|
|
{
|
|
rtl::OUString aNumber( rParaString.copy( nStartIndex, nIndex - nStartIndex ) );
|
|
if ( bE || bDot )
|
|
{
|
|
double fAttrDouble;
|
|
if ( SvXMLUnitConverter::convertDouble( fAttrDouble, aNumber ) )
|
|
rParameter.Value <<= fAttrDouble;
|
|
else
|
|
bValid = sal_False;
|
|
}
|
|
else
|
|
{
|
|
sal_Int32 nValue;
|
|
if ( SvXMLUnitConverter::convertNumber( nValue, aNumber ) )
|
|
rParameter.Value <<= nValue;
|
|
else
|
|
bValid = sal_False;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if ( bValid )
|
|
{ // skipping white spaces
|
|
while( ( nIndex < rParaString.getLength() ) && rParaString[ nIndex ] == (sal_Unicode)' ' )
|
|
nIndex++;
|
|
}
|
|
return bValid;
|
|
}
|
|
|
|
void GetPosition3D( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:extrusion-viewpoint
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp,
|
|
SvXMLUnitConverter& rUnitConverter )
|
|
{
|
|
drawing::Position3D aPosition3D;
|
|
if ( rUnitConverter.convertPosition3D( aPosition3D, rValue ) )
|
|
{
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= aPosition3D;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
void GetDoubleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:glue-point-leaving-directions
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
|
|
{
|
|
std::vector< double > vDirection;
|
|
sal_Int32 nIndex = 0;
|
|
do
|
|
{
|
|
double fAttrDouble;
|
|
rtl::OUString aToken( rValue.getToken( 0, ',', nIndex ) );
|
|
if ( !SvXMLUnitConverter::convertDouble( fAttrDouble, aToken ) )
|
|
break;
|
|
else
|
|
vDirection.push_back( fAttrDouble );
|
|
}
|
|
while ( nIndex >= 0 );
|
|
|
|
if ( !vDirection.empty() )
|
|
{
|
|
uno::Sequence< double > aDirectionsSeq( vDirection.size() );
|
|
std::vector< double >::const_iterator aIter = vDirection.begin();
|
|
std::vector< double >::const_iterator aEnd = vDirection.end();
|
|
double* pValues = aDirectionsSeq.getArray();
|
|
|
|
while ( aIter != aEnd )
|
|
*pValues++ = *aIter++;
|
|
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= aDirectionsSeq;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
void GetEnhancedParameter( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:handle-position
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
|
|
{
|
|
sal_Int32 nIndex = 0;
|
|
com::sun::star::drawing::EnhancedCustomShapeParameter aParameter;
|
|
if ( GetNextParameter( aParameter, nIndex, rValue ) )
|
|
{
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= aParameter;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
void GetEnhancedParameterPair( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:handle-position
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
|
|
{
|
|
sal_Int32 nIndex = 0;
|
|
com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameterPair;
|
|
if ( GetNextParameter( aParameterPair.First, nIndex, rValue )
|
|
&& GetNextParameter( aParameterPair.Second, nIndex, rValue ) )
|
|
{
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= aParameterPair;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
sal_Int32 GetEnhancedParameterPairSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:glue-points
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
|
|
{
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > vParameter;
|
|
com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameter;
|
|
|
|
sal_Int32 nIndex = 0;
|
|
while ( GetNextParameter( aParameter.First, nIndex, rValue )
|
|
&& GetNextParameter( aParameter.Second, nIndex, rValue ) )
|
|
{
|
|
vParameter.push_back( aParameter );
|
|
}
|
|
if ( !vParameter.empty() )
|
|
{
|
|
uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aParameterSeq( vParameter.size() );
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair >::const_iterator aIter = vParameter.begin();
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair >::const_iterator aEnd = vParameter.end();
|
|
com::sun::star::drawing::EnhancedCustomShapeParameterPair* pValues = aParameterSeq.getArray();
|
|
|
|
while ( aIter != aEnd )
|
|
*pValues++ = *aIter++;
|
|
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= aParameterSeq;
|
|
rDest.push_back( aProp );
|
|
}
|
|
return vParameter.size();
|
|
}
|
|
|
|
void GetEnhancedRectangleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:text-areas
|
|
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
|
|
{
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeTextFrame > vTextFrame;
|
|
com::sun::star::drawing::EnhancedCustomShapeTextFrame aParameter;
|
|
|
|
sal_Int32 nIndex = 0;
|
|
|
|
while ( GetNextParameter( aParameter.TopLeft.First, nIndex, rValue )
|
|
&& GetNextParameter( aParameter.TopLeft.Second, nIndex, rValue )
|
|
&& GetNextParameter( aParameter.BottomRight.First, nIndex, rValue )
|
|
&& GetNextParameter( aParameter.BottomRight.Second, nIndex, rValue ) )
|
|
{
|
|
vTextFrame.push_back( aParameter );
|
|
}
|
|
if ( !vTextFrame.empty() )
|
|
{
|
|
uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > aTextFrameSeq( vTextFrame.size() );
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeTextFrame >::const_iterator aIter = vTextFrame.begin();
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeTextFrame >::const_iterator aEnd = vTextFrame.end();
|
|
com::sun::star::drawing::EnhancedCustomShapeTextFrame* pValues = aTextFrameSeq.getArray();
|
|
|
|
while ( aIter != aEnd )
|
|
*pValues++ = *aIter++;
|
|
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( eDestProp );
|
|
aProp.Value <<= aTextFrameSeq;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:enhanced-path
|
|
const rtl::OUString& rValue )
|
|
{
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > vCoordinates;
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment > vSegments;
|
|
|
|
sal_Int32 nIndex = 0;
|
|
sal_Int32 nParameterCount = 0;
|
|
|
|
sal_Int32 nParametersNeeded = 1;
|
|
sal_Int16 nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO;
|
|
|
|
sal_Bool bValid = sal_True;
|
|
|
|
while( bValid && ( nIndex < rValue.getLength() ) )
|
|
{
|
|
switch( rValue[ nIndex ] )
|
|
{
|
|
case 'M' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO;
|
|
nParametersNeeded = 1;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'L' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LINETO;
|
|
nParametersNeeded = 1;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'C' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CURVETO;
|
|
nParametersNeeded = 3;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'Z' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH;
|
|
nParametersNeeded = 0;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'N' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH;
|
|
nParametersNeeded = 0;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'F' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOFILL;
|
|
nParametersNeeded = 0;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'S' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOSTROKE;
|
|
nParametersNeeded = 0;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'T' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO;
|
|
nParametersNeeded = 3;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'U' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE;
|
|
nParametersNeeded = 3;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'A' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCTO;
|
|
nParametersNeeded = 4;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'B' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARC;
|
|
nParametersNeeded = 4;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'W' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO;
|
|
nParametersNeeded = 4;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'V' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC;
|
|
nParametersNeeded = 4;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'X' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX;
|
|
nParametersNeeded = 1;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'Y' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY;
|
|
nParametersNeeded = 1;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case 'Q' :
|
|
{
|
|
nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO;
|
|
nParametersNeeded = 2;
|
|
nIndex++;
|
|
}
|
|
break;
|
|
case ' ' :
|
|
{
|
|
nIndex++;
|
|
}
|
|
break;
|
|
|
|
case '$' :
|
|
case '?' :
|
|
case '0' :
|
|
case '1' :
|
|
case '2' :
|
|
case '3' :
|
|
case '4' :
|
|
case '5' :
|
|
case '6' :
|
|
case '7' :
|
|
case '8' :
|
|
case '9' :
|
|
case '.' :
|
|
case '-' :
|
|
{
|
|
com::sun::star::drawing::EnhancedCustomShapeParameterPair aPair;
|
|
if ( GetNextParameter( aPair.First, nIndex, rValue ) &&
|
|
GetNextParameter( aPair.Second, nIndex, rValue ) )
|
|
{
|
|
vCoordinates.push_back( aPair );
|
|
nParameterCount++;
|
|
}
|
|
else
|
|
bValid = sal_False;
|
|
}
|
|
break;
|
|
default:
|
|
nIndex++;
|
|
break;
|
|
}
|
|
if ( !nParameterCount && !nParametersNeeded )
|
|
{
|
|
com::sun::star::drawing::EnhancedCustomShapeSegment aSegment;
|
|
aSegment.Command = nLatestSegmentCommand;
|
|
aSegment.Count = 0;
|
|
vSegments.push_back( aSegment );
|
|
nParametersNeeded = 0x7fffffff;
|
|
}
|
|
else if ( nParameterCount >= nParametersNeeded )
|
|
{
|
|
// check if the last command is identical,
|
|
// if so, we just need to increment the count
|
|
if ( !vSegments.empty() && ( vSegments[ vSegments.size() - 1 ].Command == nLatestSegmentCommand ) )
|
|
vSegments[ vSegments.size() -1 ].Count++;
|
|
else
|
|
{
|
|
com::sun::star::drawing::EnhancedCustomShapeSegment aSegment;
|
|
aSegment.Command = nLatestSegmentCommand;
|
|
aSegment.Count = 1;
|
|
vSegments.push_back( aSegment );
|
|
}
|
|
nParameterCount = 0;
|
|
}
|
|
}
|
|
// adding the Coordinates property
|
|
uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > seqCoordinates( vCoordinates.size() );
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair >::const_iterator aCoordinatesIter = vCoordinates.begin();
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair >::const_iterator aCoordinatesEnd = vCoordinates.end();
|
|
com::sun::star::drawing::EnhancedCustomShapeParameterPair* pCoordinateValues = seqCoordinates.getArray();
|
|
|
|
while ( aCoordinatesIter != aCoordinatesEnd )
|
|
*pCoordinateValues++ = *aCoordinatesIter++;
|
|
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( EAS_Coordinates );
|
|
aProp.Value <<= seqCoordinates;
|
|
rDest.push_back( aProp );
|
|
|
|
|
|
// adding the Segments property
|
|
uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > seqSegments( vSegments.size() );
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >::const_iterator aSegmentsIter = vSegments.begin();
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >::const_iterator aSegmentsEnd = vSegments.end();
|
|
com::sun::star::drawing::EnhancedCustomShapeSegment* pSegmentValues = seqSegments.getArray();
|
|
|
|
while ( aSegmentsIter != aSegmentsEnd )
|
|
*pSegmentValues++ = *aSegmentsIter++;
|
|
|
|
aProp.Name = EASGet( EAS_Segments );
|
|
aProp.Value <<= seqSegments;
|
|
rDest.push_back( aProp );
|
|
}
|
|
|
|
void GetAdjustmentValues( std::vector< com::sun::star::beans::PropertyValue >& rDest, // draw:adjustments
|
|
const rtl::OUString& rValue )
|
|
{
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > vAdjustmentValue;
|
|
com::sun::star::drawing::EnhancedCustomShapeParameter aParameter;
|
|
sal_Int32 nIndex = 0;
|
|
while ( GetNextParameter( aParameter, nIndex, rValue ) )
|
|
{
|
|
com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue aAdj;
|
|
if ( aParameter.Type == com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL )
|
|
{
|
|
aAdj.Value <<= aParameter.Value;
|
|
aAdj.State = beans::PropertyState_DIRECT_VALUE;
|
|
}
|
|
else
|
|
aAdj.State = beans::PropertyState_DEFAULT_VALUE; // this should not be, but better than setting nothing
|
|
|
|
vAdjustmentValue.push_back( aAdj );
|
|
}
|
|
|
|
sal_Int32 nAdjustmentValues = vAdjustmentValue.size();
|
|
if ( nAdjustmentValues )
|
|
{
|
|
uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentValues( nAdjustmentValues );
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue >::const_iterator aIter = vAdjustmentValue.begin();
|
|
std::vector< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue >::const_iterator aEnd = vAdjustmentValue.end();
|
|
com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue* pValues = aAdjustmentValues.getArray();
|
|
|
|
while ( aIter != aEnd )
|
|
*pValues++ = *aIter++;
|
|
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( EAS_AdjustmentValues );
|
|
aProp.Value <<= aAdjustmentValues;
|
|
rDest.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
|
|
{
|
|
sal_Int16 nLength = xAttrList->getLength();
|
|
if ( nLength )
|
|
{
|
|
sal_Int32 nAttrNumber;
|
|
for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ )
|
|
{
|
|
rtl::OUString aLocalName;
|
|
const rtl::OUString& rValue = xAttrList->getValueByIndex( nAttr );
|
|
/* sven fixme, this must be checked! sal_uInt16 nPrefix = */ GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( nAttr ), &aLocalName );
|
|
|
|
switch( EASGet( aLocalName ) )
|
|
{
|
|
case EAS_type :
|
|
GetString( mrCustomShapeGeometry, rValue, EAS_Type );
|
|
break;
|
|
case EAS_mirror_horizontal :
|
|
GetBool( mrCustomShapeGeometry, rValue, EAS_MirroredX );
|
|
break;
|
|
case EAS_mirror_vertical :
|
|
GetBool( mrCustomShapeGeometry, rValue, EAS_MirroredY );
|
|
break;
|
|
case EAS_viewBox :
|
|
{
|
|
SdXMLImExViewBox aViewBox( rValue, GetImport().GetMM100UnitConverter() );
|
|
awt::Rectangle aRect( aViewBox.GetX(), aViewBox.GetY(), aViewBox.GetWidth(), aViewBox.GetHeight() );
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( EAS_ViewBox );
|
|
aProp.Value <<= aRect;
|
|
mrCustomShapeGeometry.push_back( aProp );
|
|
}
|
|
break;
|
|
case EAS_text_rotate_angle :
|
|
GetDouble( mrCustomShapeGeometry, rValue, EAS_TextRotateAngle );
|
|
break;
|
|
case EAS_extrusion_allowed :
|
|
GetBool( maPath, rValue, EAS_ExtrusionAllowed );
|
|
break;
|
|
case EAS_text_path_allowed :
|
|
GetBool( maPath, rValue, EAS_TextPathAllowed );
|
|
break;
|
|
case EAS_concentric_gradient_fill_allowed :
|
|
GetBool( maPath, rValue, EAS_ConcentricGradientFillAllowed );
|
|
break;
|
|
case EAS_extrusion :
|
|
GetBool( maExtrusion, rValue, EAS_Extrusion );
|
|
break;
|
|
case EAS_extrusion_brightness :
|
|
GetDoublePercentage( maExtrusion, rValue, EAS_Brightness );
|
|
break;
|
|
case EAS_extrusion_depth :
|
|
{
|
|
sal_Int32 nIndex = 0;
|
|
com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameterPair;
|
|
com::sun::star::drawing::EnhancedCustomShapeParameter& rDepth = aParameterPair.First;
|
|
com::sun::star::drawing::EnhancedCustomShapeParameter& rFraction = aParameterPair.Second;
|
|
if ( GetNextParameter( rDepth, nIndex, rValue ) )
|
|
{
|
|
// try to catch the unit for the depth
|
|
MapUnit eSrcUnit( SvXMLExportHelper::GetUnitFromString( rValue, MAP_100TH_MM ) );
|
|
|
|
rtl::OUStringBuffer aUnitStr;
|
|
double fFactor = SvXMLExportHelper::GetConversionFactor( aUnitStr, MAP_100TH_MM, eSrcUnit );
|
|
if ( ( fFactor != 1.0 ) && ( fFactor != 0.0 ) )
|
|
{
|
|
double fDepth(0.0);
|
|
if ( rDepth.Value >>= fDepth )
|
|
{
|
|
fDepth /= fFactor;
|
|
rDepth.Value <<= fDepth;
|
|
}
|
|
}
|
|
if ( rValue.matchIgnoreAsciiCase( rtl::OUString( aUnitStr ), nIndex ) )
|
|
nIndex += aUnitStr.getLength();
|
|
|
|
// skipping white spaces
|
|
while( ( nIndex < rValue.getLength() ) && rValue[ nIndex ] == (sal_Unicode)' ' )
|
|
nIndex++;
|
|
|
|
if ( GetNextParameter( rFraction, nIndex, rValue ) )
|
|
{
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( EAS_Depth );
|
|
aProp.Value <<= aParameterPair;
|
|
maExtrusion.push_back( aProp );
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
case EAS_extrusion_diffusion :
|
|
GetDoublePercentage( maExtrusion, rValue, EAS_Diffusion );
|
|
break;
|
|
case EAS_extrusion_number_of_line_segments :
|
|
GetInt32( maExtrusion, rValue, EAS_NumberOfLineSegments );
|
|
break;
|
|
case EAS_extrusion_light_face :
|
|
GetBool( maExtrusion, rValue, EAS_LightFace );
|
|
break;
|
|
case EAS_extrusion_first_light_harsh :
|
|
GetBool( maExtrusion, rValue, EAS_FirstLightHarsh );
|
|
break;
|
|
case EAS_extrusion_second_light_harsh :
|
|
GetBool( maExtrusion, rValue, EAS_SecondLightHarsh );
|
|
break;
|
|
case EAS_extrusion_first_light_level :
|
|
GetDoublePercentage( maExtrusion, rValue, EAS_FirstLightLevel );
|
|
break;
|
|
case EAS_extrusion_second_light_level :
|
|
GetDoublePercentage( maExtrusion, rValue, EAS_SecondLightLevel );
|
|
break;
|
|
case EAS_extrusion_first_light_direction :
|
|
GetB3DVector( maExtrusion, rValue, EAS_FirstLightDirection );
|
|
break;
|
|
case EAS_extrusion_second_light_direction :
|
|
GetB3DVector( maExtrusion, rValue, EAS_SecondLightDirection );
|
|
break;
|
|
case EAS_extrusion_metal :
|
|
GetBool( maExtrusion, rValue, EAS_Metal );
|
|
break;
|
|
case EAS_shade_mode :
|
|
{
|
|
drawing::ShadeMode eShadeMode( drawing::ShadeMode_FLAT );
|
|
if( IsXMLToken( rValue, XML_PHONG ) )
|
|
eShadeMode = drawing::ShadeMode_PHONG;
|
|
else if ( IsXMLToken( rValue, XML_GOURAUD ) )
|
|
eShadeMode = drawing::ShadeMode_SMOOTH;
|
|
else if ( IsXMLToken( rValue, XML_DRAFT ) )
|
|
eShadeMode = drawing::ShadeMode_DRAFT;
|
|
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( EAS_ShadeMode );
|
|
aProp.Value <<= eShadeMode;
|
|
maExtrusion.push_back( aProp );
|
|
}
|
|
break;
|
|
case EAS_extrusion_rotation_angle :
|
|
GetEnhancedParameterPair( maExtrusion, rValue, EAS_RotateAngle );
|
|
break;
|
|
case EAS_extrusion_rotation_center :
|
|
GetB3DVector( maExtrusion, rValue, EAS_RotationCenter );
|
|
break;
|
|
case EAS_extrusion_shininess :
|
|
GetDoublePercentage( maExtrusion, rValue, EAS_Shininess );
|
|
break;
|
|
case EAS_extrusion_skew :
|
|
GetEnhancedParameterPair( maExtrusion, rValue, EAS_Skew );
|
|
break;
|
|
case EAS_extrusion_specularity :
|
|
GetDoublePercentage( maExtrusion, rValue, EAS_Specularity );
|
|
break;
|
|
case EAS_projection :
|
|
{
|
|
drawing::ProjectionMode eProjectionMode( drawing::ProjectionMode_PERSPECTIVE );
|
|
if( IsXMLToken( rValue, XML_PARALLEL ) )
|
|
eProjectionMode = drawing::ProjectionMode_PARALLEL;
|
|
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( EAS_ProjectionMode );
|
|
aProp.Value <<= eProjectionMode;
|
|
maExtrusion.push_back( aProp );
|
|
}
|
|
break;
|
|
case EAS_extrusion_viewpoint :
|
|
GetPosition3D( maExtrusion, rValue, EAS_ViewPoint, mrUnitConverter );
|
|
break;
|
|
case EAS_extrusion_origin :
|
|
GetEnhancedParameterPair( maExtrusion, rValue, EAS_Origin );
|
|
break;
|
|
case EAS_extrusion_color :
|
|
GetBool( maExtrusion, rValue, EAS_Color );
|
|
break;
|
|
case EAS_enhanced_path :
|
|
GetEnhancedPath( maPath, rValue );
|
|
break;
|
|
case EAS_path_stretchpoint_x :
|
|
{
|
|
if ( SvXMLUnitConverter::convertNumber( nAttrNumber, rValue ) )
|
|
{
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( EAS_StretchX );
|
|
aProp.Value <<= nAttrNumber;
|
|
maPath.push_back( aProp );
|
|
}
|
|
}
|
|
break;
|
|
case EAS_path_stretchpoint_y :
|
|
{
|
|
if ( SvXMLUnitConverter::convertNumber( nAttrNumber, rValue ) )
|
|
{
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( EAS_StretchY );
|
|
aProp.Value <<= nAttrNumber;
|
|
maPath.push_back( aProp );
|
|
}
|
|
}
|
|
break;
|
|
case EAS_text_areas :
|
|
GetEnhancedRectangleSequence( maPath, rValue, EAS_TextFrames );
|
|
break;
|
|
case EAS_glue_points :
|
|
{
|
|
sal_Int32 i, nPairs = GetEnhancedParameterPairSequence( maPath, rValue, EAS_GluePoints );
|
|
GetImport().GetShapeImport()->moveGluePointMapping( mrxShape, nPairs );
|
|
for ( i = 0; i < nPairs; i++ )
|
|
GetImport().GetShapeImport()->addGluePointMapping( mrxShape, i + 4, i + 4 );
|
|
}
|
|
break;
|
|
case EAS_glue_point_type :
|
|
GetEnum( maPath, rValue, EAS_GluePointType, *aXML_GluePointEnumMap );
|
|
break;
|
|
case EAS_glue_point_leaving_directions :
|
|
GetDoubleSequence( maPath, rValue, EAS_GluePointLeavingDirections );
|
|
break;
|
|
case EAS_text_path :
|
|
GetBool( maTextPath, rValue, EAS_TextPath );
|
|
break;
|
|
case EAS_text_path_mode :
|
|
{
|
|
com::sun::star::drawing::EnhancedCustomShapeTextPathMode eTextPathMode( com::sun::star::drawing::EnhancedCustomShapeTextPathMode_NORMAL );
|
|
if( IsXMLToken( rValue, XML_PATH ) )
|
|
eTextPathMode = com::sun::star::drawing::EnhancedCustomShapeTextPathMode_PATH;
|
|
else if ( IsXMLToken( rValue, XML_SHAPE ) )
|
|
eTextPathMode = com::sun::star::drawing::EnhancedCustomShapeTextPathMode_SHAPE;
|
|
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( EAS_TextPathMode );
|
|
aProp.Value <<= eTextPathMode;
|
|
maTextPath.push_back( aProp );
|
|
}
|
|
break;
|
|
case EAS_text_path_scale :
|
|
{
|
|
sal_Bool bScaleX = IsXMLToken( rValue, XML_SHAPE );
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = EASGet( EAS_ScaleX );
|
|
aProp.Value <<= bScaleX;
|
|
maTextPath.push_back( aProp );
|
|
}
|
|
break;
|
|
case EAS_text_path_same_letter_heights :
|
|
GetBool( maTextPath, rValue, EAS_SameLetterHeights );
|
|
break;
|
|
case EAS_modifiers :
|
|
GetAdjustmentValues( mrCustomShapeGeometry, rValue );
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec,
|
|
const std::vector< beans::PropertyValues >& rElement,
|
|
const rtl::OUString& rElementName )
|
|
{
|
|
if ( !rElement.empty() )
|
|
{
|
|
uno::Sequence< beans::PropertyValues > aPropSeq( rElement.size() );
|
|
std::vector< beans::PropertyValues >::const_iterator aIter = rElement.begin();
|
|
std::vector< beans::PropertyValues >::const_iterator aEnd = rElement.end();
|
|
beans::PropertyValues* pValues = aPropSeq.getArray();
|
|
|
|
while ( aIter != aEnd )
|
|
*pValues++ = *aIter++;
|
|
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = rElementName;
|
|
aProp.Value <<= aPropSeq;
|
|
rPropVec.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec,
|
|
const std::vector< rtl::OUString >& rElement,
|
|
const rtl::OUString& rElementName )
|
|
{
|
|
if ( !rElement.empty() )
|
|
{
|
|
uno::Sequence< rtl::OUString > aPropSeq( rElement.size() );
|
|
std::vector< rtl::OUString >::const_iterator aIter = rElement.begin();
|
|
std::vector< rtl::OUString >::const_iterator aEnd = rElement.end();
|
|
rtl::OUString* pValues = aPropSeq.getArray();
|
|
|
|
while ( aIter != aEnd )
|
|
*pValues++ = *aIter++;
|
|
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = rElementName;
|
|
aProp.Value <<= aPropSeq;
|
|
rPropVec.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec,
|
|
const std::vector< com::sun::star::beans::PropertyValue >& rElement,
|
|
const rtl::OUString& rElementName )
|
|
{
|
|
if ( !rElement.empty() )
|
|
{
|
|
uno::Sequence< beans::PropertyValue > aPropSeq( rElement.size() );
|
|
std::vector< beans::PropertyValue >::const_iterator aIter = rElement.begin();
|
|
std::vector< beans::PropertyValue >::const_iterator aEnd = rElement.end();
|
|
beans::PropertyValue* pValues = aPropSeq.getArray();
|
|
|
|
while ( aIter != aEnd )
|
|
*pValues++ = *aIter++;
|
|
|
|
beans::PropertyValue aProp;
|
|
aProp.Name = rElementName;
|
|
aProp.Value <<= aPropSeq;
|
|
rPropVec.push_back( aProp );
|
|
}
|
|
}
|
|
|
|
typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, OUStringEqFunc> EquationHashMap;
|
|
|
|
/* if rPara.Type is from type EnhancedCustomShapeParameterType::EQUATION, the name of the equation
|
|
will be converted from rtl::OUString to index */
|
|
void CheckAndResolveEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rPara, EquationHashMap* pH )
|
|
{
|
|
if ( rPara.Type == com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION )
|
|
{
|
|
rtl::OUString aEquationName;
|
|
if ( rPara.Value >>= aEquationName )
|
|
{
|
|
sal_Int32 nIndex = 0;
|
|
EquationHashMap::iterator aHashIter( pH->find( aEquationName ) );
|
|
if ( aHashIter != pH->end() )
|
|
nIndex = (*aHashIter).second;
|
|
rPara.Value <<= nIndex;
|
|
}
|
|
}
|
|
}
|
|
|
|
void XMLEnhancedCustomShapeContext::EndElement()
|
|
{
|
|
// resolve properties that are indexing a Equation
|
|
if ( !maEquations.empty() )
|
|
{
|
|
// creating hash map containing the name and index of each equation
|
|
EquationHashMap* pH = new EquationHashMap;
|
|
std::vector< rtl::OUString >::iterator aEquationNameIter = maEquationNames.begin();
|
|
std::vector< rtl::OUString >::iterator aEquationNameEnd = maEquationNames.end();
|
|
while( aEquationNameIter != aEquationNameEnd )
|
|
{
|
|
(*pH)[ *aEquationNameIter ] = (sal_Int32)( aEquationNameIter - maEquationNames.begin() );
|
|
++aEquationNameIter;
|
|
}
|
|
|
|
// resolve equation
|
|
std::vector< rtl::OUString >::iterator aEquationIter = maEquations.begin();
|
|
std::vector< rtl::OUString >::iterator aEquationEnd = maEquations.end();
|
|
while( aEquationIter != aEquationEnd )
|
|
{
|
|
sal_Int32 nIndexOf = 0;
|
|
do
|
|
{
|
|
nIndexOf = aEquationIter->indexOf( '?', nIndexOf );
|
|
if ( nIndexOf != -1 )
|
|
{
|
|
rtl::OUString aEquationName;
|
|
if ( GetEquationName( *aEquationIter, nIndexOf + 1, aEquationName ) )
|
|
{
|
|
// copying first characters inclusive '?'
|
|
rtl::OUString aNew( aEquationIter->copy( 0, nIndexOf + 1 ) );
|
|
sal_Int32 nIndex = 0;
|
|
EquationHashMap::iterator aHashIter( pH->find( aEquationName ) );
|
|
if ( aHashIter != pH->end() )
|
|
nIndex = (*aHashIter).second;
|
|
aNew += rtl::OUString::valueOf( nIndex );
|
|
aNew += aEquationIter->copy( nIndexOf + aEquationName.getLength() + 1 );
|
|
*aEquationIter = aNew;
|
|
}
|
|
nIndexOf++;
|
|
}
|
|
}
|
|
while( nIndexOf != -1 );
|
|
++aEquationIter;
|
|
}
|
|
|
|
// Path
|
|
sal_Int32 i;
|
|
std::vector< beans::PropertyValue >::iterator aPathIter = maPath.begin();
|
|
std::vector< beans::PropertyValue >::iterator aPathEnd = maPath.end();
|
|
while ( aPathIter != aPathEnd )
|
|
{
|
|
switch( EASGet( aPathIter->Name ) )
|
|
{
|
|
case EAS_Coordinates :
|
|
case EAS_GluePoints :
|
|
{
|
|
uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair >& rSeq =
|
|
*((uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair >*)
|
|
aPathIter->Value.getValue());
|
|
for ( i = 0; i < rSeq.getLength(); i++ )
|
|
{
|
|
CheckAndResolveEquationParameter( rSeq[ i ].First, pH );
|
|
CheckAndResolveEquationParameter( rSeq[ i ].Second, pH );
|
|
}
|
|
}
|
|
break;
|
|
case EAS_TextFrames :
|
|
{
|
|
uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame >& rSeq =
|
|
*((uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame >*)
|
|
aPathIter->Value.getValue());
|
|
for ( i = 0; i < rSeq.getLength(); i++ )
|
|
{
|
|
CheckAndResolveEquationParameter( rSeq[ i ].TopLeft.First, pH );
|
|
CheckAndResolveEquationParameter( rSeq[ i ].TopLeft.Second, pH );
|
|
CheckAndResolveEquationParameter( rSeq[ i ].BottomRight.First, pH );
|
|
CheckAndResolveEquationParameter( rSeq[ i ].BottomRight.Second, pH );
|
|
}
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
++aPathIter;
|
|
}
|
|
std::vector< beans::PropertyValues >::iterator aHandleIter = maHandles.begin();
|
|
std::vector< beans::PropertyValues >::iterator aHandleEnd = maHandles.end();
|
|
while ( aHandleIter != aHandleEnd )
|
|
{
|
|
beans::PropertyValue* pValues = aHandleIter->getArray();
|
|
for ( i = 0; i < aHandleIter->getLength(); i++ )
|
|
{
|
|
switch( EASGet( pValues->Name ) )
|
|
{
|
|
case EAS_RangeYMinimum :
|
|
case EAS_RangeYMaximum :
|
|
case EAS_RangeXMinimum :
|
|
case EAS_RangeXMaximum :
|
|
case EAS_RadiusRangeMinimum :
|
|
case EAS_RadiusRangeMaximum :
|
|
{
|
|
CheckAndResolveEquationParameter( *((com::sun::star::drawing::EnhancedCustomShapeParameter*)
|
|
pValues->Value.getValue()), pH );
|
|
}
|
|
break;
|
|
|
|
case EAS_Position :
|
|
case EAS_Polar :
|
|
{
|
|
CheckAndResolveEquationParameter( (*((com::sun::star::drawing::EnhancedCustomShapeParameterPair*)
|
|
pValues->Value.getValue())).First, pH );
|
|
CheckAndResolveEquationParameter( (*((com::sun::star::drawing::EnhancedCustomShapeParameterPair*)
|
|
pValues->Value.getValue())).Second, pH );
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
pValues++;
|
|
}
|
|
++aHandleIter;
|
|
}
|
|
delete pH;
|
|
}
|
|
|
|
SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maExtrusion, EASGet( EAS_Extrusion ) );
|
|
SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maPath, EASGet( EAS_Path ) );
|
|
SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maTextPath, EASGet( EAS_TextPath ) );
|
|
SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maEquations, EASGet( EAS_Equations ) );
|
|
if ( !maHandles.empty() )
|
|
SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maHandles, EASGet( EAS_Handles ) );
|
|
}
|
|
|
|
SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const rtl::OUString& rLocalName,
|
|
const uno::Reference< xml::sax::XAttributeList> & xAttrList )
|
|
{
|
|
EnhancedCustomShapeTokenEnum aTokenEnum = EASGet( rLocalName );
|
|
if ( aTokenEnum == EAS_equation )
|
|
{
|
|
sal_Int16 nLength = xAttrList->getLength();
|
|
if ( nLength )
|
|
{
|
|
rtl::OUString aFormula;
|
|
rtl::OUString aFormulaName;
|
|
for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ )
|
|
{
|
|
rtl::OUString aLocalName;
|
|
const rtl::OUString& rValue = xAttrList->getValueByIndex( nAttr );
|
|
/* fixme sven, this needs to be chekced! sal_uInt16 nPrefix = */ GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( nAttr ), &aLocalName );
|
|
|
|
switch( EASGet( aLocalName ) )
|
|
{
|
|
case EAS_formula :
|
|
aFormula = rValue;
|
|
break;
|
|
case EAS_name :
|
|
aFormulaName = rValue;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
if ( aFormulaName.getLength() || aFormula.getLength() )
|
|
{
|
|
maEquations.push_back( aFormula );
|
|
maEquationNames.push_back( aFormulaName );
|
|
}
|
|
}
|
|
}
|
|
else if ( aTokenEnum == EAS_handle )
|
|
{
|
|
std::vector< com::sun::star::beans::PropertyValue > aHandle;
|
|
const sal_Int16 nLength = xAttrList->getLength();
|
|
for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ )
|
|
{
|
|
rtl::OUString aLocalName;
|
|
const rtl::OUString& rValue = xAttrList->getValueByIndex( nAttr );
|
|
/* fixme sven, this needs to be chekced! sal_uInt16 nPrefix = */ GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( nAttr ), &aLocalName );
|
|
switch( EASGet( aLocalName ) )
|
|
{
|
|
case EAS_handle_mirror_vertical :
|
|
GetBool( aHandle, rValue, EAS_MirroredY );
|
|
break;
|
|
case EAS_handle_mirror_horizontal :
|
|
GetBool( aHandle, rValue, EAS_MirroredX );
|
|
break;
|
|
case EAS_handle_switched :
|
|
GetBool( aHandle, rValue, EAS_Switched );
|
|
break;
|
|
case EAS_handle_position :
|
|
GetEnhancedParameterPair( aHandle, rValue, EAS_Position );
|
|
break;
|
|
case EAS_handle_range_x_minimum :
|
|
GetEnhancedParameter( aHandle, rValue, EAS_RangeXMinimum );
|
|
break;
|
|
case EAS_handle_range_x_maximum :
|
|
GetEnhancedParameter( aHandle, rValue, EAS_RangeXMaximum );
|
|
break;
|
|
case EAS_handle_range_y_minimum :
|
|
GetEnhancedParameter( aHandle, rValue, EAS_RangeYMinimum );
|
|
break;
|
|
case EAS_handle_range_y_maximum :
|
|
GetEnhancedParameter( aHandle, rValue, EAS_RangeYMaximum );
|
|
break;
|
|
case EAS_handle_polar :
|
|
GetEnhancedParameterPair( aHandle, rValue, EAS_Polar );
|
|
break;
|
|
case EAS_handle_radius_range_minimum :
|
|
GetEnhancedParameter( aHandle, rValue, EAS_RadiusRangeMinimum );
|
|
break;
|
|
case EAS_handle_radius_range_maximum :
|
|
GetEnhancedParameter( aHandle, rValue, EAS_RadiusRangeMaximum );
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
beans::PropertyValues aPropSeq( aHandle.size() );
|
|
std::vector< beans::PropertyValue >::const_iterator aIter = aHandle.begin();
|
|
std::vector< beans::PropertyValue >::const_iterator aEnd = aHandle.end();
|
|
beans::PropertyValue* pValues = aPropSeq.getArray();
|
|
|
|
while ( aIter != aEnd )
|
|
*pValues++ = *aIter++;
|
|
|
|
maHandles.push_back( aPropSeq );
|
|
}
|
|
return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|