[Libreoffice-commits] core.git: Branch 'feature/polynomialregression' - 322 commits - android/sdremote basctl/AllLangResTarget_basctl.mk basctl/source basctl/uiconfig basic/qa basic/source binaryurp/source bin/distro-install-desktop-integration boost/boost_1_44_0-gcc4.8.patch boost/boost.3780.aliasing.patch boost/boost.4510.warnings.patch boost/boost.gcc47679.patch boost/boost.libcdr.warnings.patch.1 boost/boost.wconstexpr-not-const.patch.0 boost/boost.wshadow.patch boost/boost.wunused.patch boost/UnpackedTarball_boost.mk bridges/Library_cpp_uno.mk bridges/source chart2/source chart2/uiconfig cli_ure/source codemaker/source compilerplugins/clang compilerplugins/Makefile-clang.mk config_host.mk.in configure.ac connectivity/source cppunit/ExternalProject_cppunit.mk cui/AllLangResTarget_cui.mk cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk dbaccess/AllLangResTarget_dbu.mk dbaccess/source dbaccess/uiconfig desktop/source dictionaries drawinglayer/source editeng/source embedded obj/source extensions/source extensions/test extras/source filter/source forms/source framework/inc framework/source framework/uiconfig helpcontent2 hsqldb/patches hunspell/hunspell-1.3.2-overflow.patch hyphen/hyphen-android.patch i18npool/source icon-themes/galaxy icon-themes/hicontrast icon-themes/oxygen idlc/inc idlc/source idlc/test include/com include/comphelper include/editeng include/filter include/oox include/osl include/prex.h include/registry include/rtl include/sal include/sfx2 include/svtools include/svx include/toolkit include/unotools include/vcl include/xmloff ios/experimental jfreereport/patches jvmfwk/plugins l10ntools/inc l10ntools/source lcms2/ExternalPackage_lcms2.mk lcms2/ExternalProject_lcms2.mk libcmis/libcmis-0.3.0-proxy.patch liborcus/ExternalProject_liborcus.mk liborcus/liborcus_0.1.0-dllimport.patch Makefile.in mysqlcppconn/config.h nss/nss.aix.patch nss/nss.patch odk/config odk/CustomTarget_doxygen.mk odk/pack offapi/com offapi/type_reference offa pi/UnoApi_offapi.mk officecfg/registry oox/source package/source padmin/source postprocess/Rdb_services.mk python3/ExternalProject_python3.mk python3/python-3.3.0-15833.patch.1 python3/python-3.3.0-i42553.patch.2 pyuno/Module_pyuno.mk pyuno/Rdb_pyuno.mk qadevOOo/tests redland/raptor redland/rasqal redland/README redland/redland registry/source registry/tools reportdesign/AllLangResTarget_rpt.mk reportdesign/AllLangResTarget_rptui.mk reportdesign/source RepositoryExternal.mk Repository.mk RepositoryModule_host.mk sal/qa sc/AllLangResTarget_sc.mk sc/inc sc/Library_scfilt.mk sc/Library_sc.mk scp2/AutoInstallLibs_math.mk scp2/InstallModule_math.mk scp2/Module_scp2.mk scp2/source sc/qa scripting/source sc/source sc/uiconfig sc/UIConfig_scalc.mk sc/util sd/AllLangResTarget_sd.mk sdext/source sd/inc sd/source sd/uiconfig sfx2/Library_sfx.mk sfx2/sdi sfx2/source slideshow/source solenv/bin solenv/Executable_concat-deps.mk solenv/gbuild solenv/gdb solenv/Package_gdb.mk starmath/AllLa ngResTarget_sm.mk starmath/inc starmath/qa starmath/sdi starmath/source starmath/uiconfig starmath/UIConfig_smath.mk stoc/source svtools/source svtools/uiconfig svx/AllLangResTarget_svx.mk svx/inc svx/Library_svxcore.mk svx/Library_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk svx/util sw/AllLangResTarget_sw.mk sw/inc sw/qa sw/README sw/source sw/uiconfig sw/UIConfig_swriter.mk sysui/desktop sysui/productlist.mk translations ucb/source unoidl/source unotools/source vcl/generic vcl/inc vcl/source vcl/unx writerfilter/inc writerfilter/README writerfilter/source xmloff/Library_xo.mk xmloff/source xmlscript/test
Tomaž Vajngerl
quikee at gmail.com
Sun Jun 2 13:43:38 PDT 2013
Makefile.in | 16
Repository.mk | 7
RepositoryExternal.mk | 2
RepositoryModule_host.mk | 33
android/sdremote/res/values/strings.xml | 4
basctl/AllLangResTarget_basctl.mk | 4
basctl/source/dlged/dlged.cxx | 11
basctl/uiconfig/basicide/toolbar/findbar.xml | 1
basctl/uiconfig/basicide/toolbar/standardbar.xml | 2
basic/qa/vba_tests/strconv.vb | 2
basic/source/classes/eventatt.cxx | 44
basic/source/classes/propacc.cxx | 2
basic/source/runtime/methods.cxx | 10
basic/source/runtime/methods1.cxx | 2
bin/distro-install-desktop-integration | 2
binaryurp/source/cache.hxx | 112 -
binaryurp/source/lessoperators.cxx | 44
binaryurp/source/lessoperators.hxx | 4
boost/UnpackedTarball_boost.mk | 1
boost/boost.3780.aliasing.patch | 2
boost/boost.4510.warnings.patch | 2
boost/boost.gcc47679.patch | 2
boost/boost.libcdr.warnings.patch.1 | 3
boost/boost.wconstexpr-not-const.patch.0 | 43
boost/boost.wshadow.patch | 2
boost/boost.wunused.patch | 11
boost/boost_1_44_0-gcc4.8.patch | 209 ++
bridges/Library_cpp_uno.mk | 24
bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx | 6
bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx | 9
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 9
chart2/source/model/main/ChartModel.cxx | 3
chart2/source/view/main/ChartView.cxx | 6
chart2/uiconfig/toolbar/standardbar.xml | 4
compilerplugins/Makefile-clang.mk | 10
compilerplugins/clang/bodynotinblock.hxx | 2
compilerplugins/clang/checkconfigmacros.cxx | 45
compilerplugins/clang/literalalternative.cxx | 2
compilerplugins/clang/plugin.cxx | 2
compilerplugins/clang/pluginhandler.hxx | 2
compilerplugins/clang/postfixincrementfix.hxx | 2
compilerplugins/clang/rtlconstasciimacro.cxx | 14
compilerplugins/clang/sallogareas.hxx | 2
compilerplugins/clang/store/lclstaticfix.hxx | 2
compilerplugins/clang/store/referencecasting.hxx | 2
compilerplugins/clang/store/removeforwardstringdecl.hxx | 2
compilerplugins/clang/store/tutorial/tutorial1.hxx | 2
compilerplugins/clang/store/tutorial/tutorial2.hxx | 2
compilerplugins/clang/store/tutorial/tutorial3.hxx | 2
compilerplugins/clang/store/unusedcode.cxx | 2
compilerplugins/clang/unusedvariablecheck.hxx | 2
config_host.mk.in | 2
configure.ac | 178 +-
connectivity/source/drivers/flat/ETable.cxx | 21
connectivity/source/drivers/mysql/YDriver.cxx | 19
connectivity/source/manager/mdrivermanager.cxx | 8
connectivity/source/manager/mdrivermanager.hxx | 7
cppunit/ExternalProject_cppunit.mk | 9
cui/AllLangResTarget_cui.mk | 2
cui/Library_cui.mk | 1
cui/UIConfig_cui.mk | 4
cui/source/customize/acccfg.cxx | 2
cui/source/inc/helpid.hrc | 4
cui/source/inc/paragrph.hxx | 91 -
cui/source/inc/postdlg.hxx | 2
cui/source/options/optctl.cxx | 98 -
cui/source/options/optctl.hrc | 51
cui/source/options/optctl.hxx | 22
cui/source/options/optctl.src | 116 -
cui/source/options/optgdlg.cxx | 313 +--
cui/source/options/optgdlg.hrc | 71
cui/source/options/optgdlg.hxx | 52
cui/source/options/optgdlg.src | 231 --
cui/source/options/optinet2.hxx | 1
cui/source/options/optjava.cxx | 7
cui/source/options/optjava.hxx | 2
cui/source/options/optpath.cxx | 1
cui/source/options/optsave.hxx | 1
cui/source/options/readonlyimage.cxx | 60
cui/source/options/readonlyimage.hxx | 36
cui/source/options/readonlyimage.src | 35
cui/source/options/securityoptions.hxx | 1
cui/source/tabpages/paragrph.cxx | 790 +++++-----
cui/source/tabpages/paragrph.hrc | 49
cui/source/tabpages/paragrph.src | 396 -----
cui/uiconfig/ui/colorpage.ui | 2
cui/uiconfig/ui/comment.ui | 2
cui/uiconfig/ui/optadvancedpage.ui | 2
cui/uiconfig/ui/optctlpage.ui | 285 +++
cui/uiconfig/ui/optlanguagespage.ui | 431 +++++
cui/uiconfig/ui/optsecuritypage.ui | 2
cui/uiconfig/ui/paragalignpage.ui | 492 ++++++
cui/uiconfig/ui/paraindentspacing.ui | 584 +++++++
dbaccess/AllLangResTarget_dbu.mk | 4
dbaccess/source/sdbtools/connection/connectiontools.cxx | 11
dbaccess/source/ui/browser/brwctrlr.cxx | 4
dbaccess/source/ui/dlg/dbwizsetup.cxx | 1
dbaccess/uiconfig/dbapp/toolbar/toolbar.xml | 4
desktop/source/app/app.cxx | 148 -
desktop/source/app/appinit.cxx | 21
desktop/source/app/check_ext_deps.cxx | 7
desktop/source/deployment/registry/package/dp_package.cxx | 9
desktop/source/offacc/acceptor.cxx | 16
desktop/source/splash/splash.cxx | 5
dev/null |binary
dictionaries | 2
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 20
editeng/source/editeng/editeng.cxx | 6
editeng/source/editeng/editundo.cxx | 15
editeng/source/editeng/impedit.hxx | 34
editeng/source/items/textitem.cxx | 4
editeng/source/outliner/outleeng.cxx | 2
editeng/source/outliner/outlin2.cxx | 2
editeng/source/outliner/outliner.cxx | 98 -
editeng/source/outliner/outlvw.cxx | 446 ++---
embeddedobj/source/commonembedding/embedobj.cxx | 13
embeddedobj/source/commonembedding/persistence.cxx | 66
embeddedobj/source/commonembedding/visobj.cxx | 18
embeddedobj/source/commonembedding/xfactory.cxx | 13
embeddedobj/source/general/xcreator.cxx | 13
embeddedobj/source/msole/oleembed.cxx | 15
embeddedobj/source/msole/olepersist.cxx | 44
embeddedobj/source/msole/olevisual.cxx | 22
embeddedobj/source/msole/xolefactory.cxx | 13
extensions/source/logging/loggerconfig.cxx | 43
extensions/source/propctrlr/propertycomposer.cxx | 2
extensions/source/propctrlr/propertycomposer.hxx | 4
extensions/source/update/check/updatehdl.cxx | 13
extensions/test/ole/cpnt/makefile.mk | 9
extras/source/autotext/lang/bg/crdbus50.bau |binary
extras/source/autotext/lang/bg/standard.bau |binary
extras/source/autotext/lang/bg/template.bau |binary
extras/source/glade/libreoffice-catalog.xml.in | 7
filter/source/config/cache/filtercache.cxx | 25
filter/source/msfilter/escherex.cxx | 87 -
filter/source/msfilter/msdffimp.cxx | 13
filter/source/t602/t602filter.cxx | 28
forms/source/component/FormsCollection.cxx | 3
forms/source/component/ListBox.cxx | 21
forms/source/xforms/model.hxx | 2
framework/inc/helper/persistentwindowstate.hxx | 4
framework/inc/helper/statusindicatorfactory.hxx | 4
framework/inc/helper/titlebarupdate.hxx | 6
framework/inc/helper/vclstatusindicator.hxx | 6
framework/inc/jobs/job.hxx | 6
framework/inc/jobs/jobdispatch.hxx | 4
framework/inc/jobs/jobexecutor.hxx | 4
framework/inc/jobs/shelljob.hxx | 6
framework/inc/recording/dispatchrecorder.hxx | 3
framework/inc/services.h | 7
framework/inc/services/autorecovery.hxx | 4
framework/inc/services/backingcomp.hxx | 5
framework/inc/services/frame.hxx | 4
framework/inc/services/layoutmanager.hxx | 16
framework/inc/uiconfiguration/moduleimagemanager.hxx | 2
framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx | 8
framework/inc/uiconfiguration/uiconfigurationmanager.hxx | 7
framework/inc/uielement/statusbarmanager.hxx | 3
framework/source/accelerators/acceleratorconfiguration.cxx | 34
framework/source/accelerators/documentacceleratorconfiguration.cxx | 30
framework/source/accelerators/globalacceleratorconfiguration.cxx | 13
framework/source/accelerators/moduleacceleratorconfiguration.cxx | 27
framework/source/accelerators/presethandler.cxx | 18
framework/source/classes/taskcreator.cxx | 4
framework/source/dispatch/dispatchinformationprovider.cxx | 3
framework/source/dispatch/popupmenudispatcher.cxx | 2
framework/source/fwe/classes/bmkmenu.cxx | 3
framework/source/helper/persistentwindowstate.cxx | 6
framework/source/helper/statusindicatorfactory.cxx | 31
framework/source/helper/titlebarupdate.cxx | 13
framework/source/helper/vclstatusindicator.cxx | 4
framework/source/inc/accelerators/acceleratorconfiguration.hxx | 8
framework/source/inc/accelerators/documentacceleratorconfiguration.hxx | 2
framework/source/inc/accelerators/globalacceleratorconfiguration.hxx | 2
framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx | 2
framework/source/inc/accelerators/presethandler.hxx | 6
framework/source/jobs/job.cxx | 20
framework/source/jobs/jobdispatch.cxx | 36
framework/source/jobs/jobexecutor.cxx | 39
framework/source/jobs/shelljob.cxx | 15
framework/source/layoutmanager/layoutmanager.cxx | 76
framework/source/recording/dispatchrecorder.cxx | 7
framework/source/services/autorecovery.cxx | 76
framework/source/services/backingcomp.cxx | 18
framework/source/services/backingwindow.cxx | 191 --
framework/source/services/backingwindow.hxx | 19
framework/source/services/desktop.cxx | 5
framework/source/services/frame.cxx | 52
framework/source/services/pathsettings.cxx | 17
framework/source/services/taskcreatorsrv.cxx | 4
framework/source/uiconfiguration/imagemanagerimpl.cxx | 3
framework/source/uiconfiguration/moduleimagemanager.cxx | 7
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 39
framework/source/uiconfiguration/uicategorydescription.cxx | 33
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 17
framework/source/uielement/addonstoolbarmanager.cxx | 6
framework/source/uielement/menubarmanager.cxx | 4
framework/source/uielement/newmenucontroller.cxx | 4
framework/source/uielement/popupmenucontroller.cxx | 5
framework/source/uielement/statusbarmanager.cxx | 122 -
framework/source/uielement/toolbarmanager.cxx | 4
framework/uiconfig/startmodule/toolbar/standardbar.xml | 2
helpcontent2 | 2
hsqldb/patches/jdbc-4.1.patch | 14
hunspell/hunspell-1.3.2-overflow.patch | 4
hyphen/hyphen-android.patch | 2
i18npool/source/breakiterator/breakiterator_unicode.cxx | 3
icon-themes/galaxy/cmd/lc_autopilotmenu.png |binary
icon-themes/galaxy/cmd/sc_autopilotmenu.png |binary
icon-themes/hicontrast/cmd/lch_autopilotmenu.png |binary
icon-themes/hicontrast/cmd/sch_autopilotmenu.png |binary
idlc/inc/idlc/astattribute.hxx | 2
idlc/inc/idlc/idlctypes.hxx | 2
idlc/source/astdump.cxx | 2
idlc/source/errorhandler.cxx | 2
idlc/source/parser.y | 6
idlc/source/scanner.l | 2
idlc/test/parser/attribute.tests | 2
include/com/sun/star/uno/Any.h | 7
include/comphelper/namedvaluecollection.hxx | 14
include/comphelper/propertybag.hxx | 2
include/editeng/editeng.hxx | 4
include/editeng/editund2.hxx | 6
include/editeng/outliner.hxx | 68
include/filter/msfilter/escherex.hxx | 9
include/oox/vml/vmlformatting.hxx | 12
include/oox/vml/vmlshape.hxx | 1
include/osl/socket_decl.hxx | 3
include/prex.h | 4
include/registry/types.h | 4
include/rtl/strbuf.hxx | 2
include/rtl/string.hxx | 10
include/rtl/ustring.hxx | 4
include/sal/log-areas.dox | 6
include/sal/log.hxx | 8
include/sfx2/linkmgr.hxx | 2
include/sfx2/objsh.hxx | 3
include/sfx2/shell.hxx | 15
include/sfx2/sidebar/CommandInfoProvider.hxx | 4
include/sfx2/sidebar/EnumContext.hxx | 1
include/sfx2/sidebar/SidebarPanelBase.hxx | 2
include/sfx2/sidebar/SidebarToolBox.hxx | 6
include/svtools/imagemgr.hrc | 2
include/svtools/restartdialog.hxx | 5
include/svtools/statusbarcontroller.hxx | 1
include/svx/SvxColorValueSet.hxx | 2
include/svx/dialogs.hrc | 3
include/svx/hdft.hxx | 24
include/svx/msdffdef.hxx | 2
include/svx/paraprev.hxx | 29
include/svx/relfld.hxx | 5
include/svx/sdrundomanager.hxx | 65
include/svx/sidebar/PanelLayout.hxx | 34
include/svx/sidebar/SelectionAnalyzer.hxx | 16
include/svx/sidebar/SelectionChangeHandler.hxx | 4
include/svx/svdedxv.hxx | 14
include/svx/svdxcgv.hxx | 1
include/toolkit/controls/dialogcontrol.hxx | 74
include/unotools/fontdefs.hxx | 9
include/vcl/builder.hxx | 9
include/vcl/gdimtf.hxx | 2
include/vcl/layout.hxx | 26
include/vcl/toolbox.hxx | 12
include/vcl/vclenum.hxx | 4
include/xmloff/xmltoken.hxx | 1
ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj | 2
jfreereport/patches/flow-engine.patch | 3
jfreereport/patches/liblayout.patch | 3
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 18
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 1
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 22
l10ntools/source/idxdict/idxdict.cxx | 12
lcms2/ExternalPackage_lcms2.mk | 2
lcms2/ExternalProject_lcms2.mk | 10
libcmis/libcmis-0.3.0-proxy.patch | 2
liborcus/ExternalProject_liborcus.mk | 2
liborcus/liborcus_0.1.0-dllimport.patch | 2
mysqlcppconn/config.h | 4
nss/nss.aix.patch | 2
nss/nss.patch | 8
odk/CustomTarget_doxygen.mk | 5
odk/config/setsdkenv_unix | 2
odk/config/setsdkenv_windows.bat | 2
odk/pack/gendocu/Doxyfile | 4
offapi/UnoApi_offapi.mk | 9
offapi/com/sun/star/awt/DialogProvider.idl | 7
offapi/com/sun/star/awt/UnoControlDialog.idl | 20
offapi/com/sun/star/awt/XUnoControlDialog.idl | 58
offapi/com/sun/star/frame/LayoutManager.idl | 53
offapi/com/sun/star/frame/XLayoutManager2.idl | 88 +
offapi/com/sun/star/frame/XStatusbarController.idl | 9
offapi/com/sun/star/oox/ExcelFilterExport.idl | 37
offapi/com/sun/star/ui/DocumentAcceleratorConfiguration.idl | 40
offapi/com/sun/star/ui/ModuleAcceleratorConfiguration.idl | 39
offapi/com/sun/star/ui/XSidebarPanel.idl | 4
offapi/com/sun/star/ui/XUIConfigurationManager.idl | 3
offapi/type_reference/offapi.rdb |binary
officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu | 28
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 12
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 13
officecfg/registry/schema/org/openoffice/Office/Logging.xcs | 18
oox/source/docprop/docprophandler.cxx | 41
oox/source/drawingml/color.cxx | 6
oox/source/export/drawingml.cxx | 4
oox/source/export/shapes.cxx | 22
oox/source/vml/vmlformatting.cxx | 55
oox/source/vml/vmlshape.cxx | 18
oox/source/vml/vmlshapecontext.cxx | 3
package/source/zipapi/ZipFile.cxx | 1
padmin/source/padialog.cxx | 2
padmin/source/padialog.hrc | 2
padmin/source/padialog.src | 2
postprocess/Rdb_services.mk | 3
python3/ExternalProject_python3.mk | 7
python3/python-3.3.0-15833.patch.1 | 3
python3/python-3.3.0-i42553.patch.2 | 1
pyuno/Module_pyuno.mk | 1
pyuno/Rdb_pyuno.mk | 16
qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java | 2
redland/README | 18
redland/raptor/raptor-freebsd.patch.1 | 2
redland/rasqal/rasqal-freebsd.patch.1 | 2
redland/redland/redland-freebsd.patch.1 | 2
registry/source/regimpl.cxx | 2
registry/tools/regcompare.cxx | 2
reportdesign/AllLangResTarget_rpt.mk | 4
reportdesign/AllLangResTarget_rptui.mk | 4
reportdesign/source/core/resource/strings.src | 2
sal/qa/rtl/strings/test_oustring_compare.cxx | 18
sc/AllLangResTarget_sc.mk | 4
sc/Library_sc.mk | 1
sc/Library_scfilt.mk | 5
sc/UIConfig_scalc.mk | 2
sc/inc/arealink.hxx | 2
sc/inc/document.hxx | 21
sc/inc/formulacell.hxx | 15
sc/inc/formularesult.hxx | 2
sc/inc/helpids.h | 1
sc/inc/linkuno.hxx | 4
sc/inc/simpleformulacalc.hxx | 54
sc/qa/extras/testdocuments/Ranges-3.xls |binary
sc/qa/unit/data/dif/universal-content.dif | 86 +
sc/qa/unit/filters-test.cxx | 15
sc/qa/unit/helper/csv_handler.hxx | 4
sc/qa/unit/helper/qahelper.hxx | 3
sc/qa/unit/ucalc.cxx | 344 ++--
sc/source/core/data/attarray.cxx | 3
sc/source/core/data/bcaslot.cxx | 6
sc/source/core/data/column.cxx | 20
sc/source/core/data/column2.cxx | 23
sc/source/core/data/column3.cxx | 18
sc/source/core/data/dociter.cxx | 25
sc/source/core/data/documen8.cxx | 35
sc/source/core/data/document.cxx | 14
sc/source/core/data/formulacell.cxx | 59
sc/source/core/data/simpleformulacalc.cxx | 100 +
sc/source/core/data/table2.cxx | 4
sc/source/core/inc/bcaslot.hxx | 2
sc/source/core/tool/cellform.cxx | 9
sc/source/core/tool/cellkeytranslator.cxx | 6
sc/source/core/tool/interpr1.cxx | 2
sc/source/core/tool/interpr2.cxx | 18
sc/source/core/tool/interpr4.cxx | 24
sc/source/core/tool/interpr5.cxx | 4
sc/source/filter/dif/difimp.cxx | 39
sc/source/filter/excel/xecontent.cxx | 1
sc/source/filter/excel/xeescher.cxx | 5
sc/source/filter/excel/xelink.cxx | 2
sc/source/filter/excel/xestream.cxx | 91 -
sc/source/filter/excel/xestyle.cxx | 2
sc/source/filter/excel/xetable.cxx | 70
sc/source/filter/excel/xiescher.cxx | 4
sc/source/filter/html/htmlexp.cxx | 3
sc/source/filter/inc/condformatbuffer.hxx | 47
sc/source/filter/inc/dif.hxx | 2
sc/source/filter/inc/excelfilter.hxx | 32
sc/source/filter/inc/extlstcontext.hxx | 6
sc/source/filter/inc/sheetdatabuffer.hxx | 19
sc/source/filter/inc/sheetdatacontext.hxx | 3
sc/source/filter/inc/stylesbuffer.hxx | 4
sc/source/filter/inc/xeescher.hxx | 3
sc/source/filter/inc/xetable.hxx | 3
sc/source/filter/inc/xiescher.hxx | 4
sc/source/filter/oox/condformatbuffer.cxx | 114 +
sc/source/filter/oox/condformatcontext.cxx | 2
sc/source/filter/oox/excelfilter.cxx | 61
sc/source/filter/oox/extlstcontext.cxx | 98 -
sc/source/filter/oox/sheetdatabuffer.cxx | 122 +
sc/source/filter/oox/sheetdatacontext.cxx | 31
sc/source/filter/oox/stylesbuffer.cxx | 64
sc/source/filter/oox/workbookhelper.cxx | 8
sc/source/filter/oox/worksheethelper.cxx | 1
sc/source/filter/services.cxx | 43
sc/source/filter/xml/XMLDDELinksContext.cxx | 13
sc/source/filter/xml/xmlcelli.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 29
sc/source/ui/app/inputhdl.cxx | 122 -
sc/source/ui/app/transobj.cxx | 13
sc/source/ui/docshell/arealink.cxx | 7
sc/source/ui/docshell/docsh.cxx | 3
sc/source/ui/docshell/docsh6.cxx | 14
sc/source/ui/docshell/docsh8.cxx | 6
sc/source/ui/drawfunc/drawsh2.cxx | 26
sc/source/ui/formdlg/formula.cxx | 21
sc/source/ui/inc/drawsh.hxx | 4
sc/source/ui/inc/drawview.hxx | 4
sc/source/ui/inc/formula.hxx | 1
sc/source/ui/inc/inscldlg.hxx | 12
sc/source/ui/inc/miscdlgs.hrc | 5
sc/source/ui/inc/optdlg.hrc | 7
sc/source/ui/inc/tpdefaults.hxx | 7
sc/source/ui/miscdlgs/inscldlg.cxx | 46
sc/source/ui/optdlg/tpdefaults.cxx | 59
sc/source/ui/src/miscdlgs.src | 68
sc/source/ui/src/optdlg.src | 45
sc/source/ui/unoobj/chart2uno.cxx | 12
sc/source/ui/unoobj/funcuno.cxx | 24
sc/source/ui/unoobj/linkuno.cxx | 68
sc/source/ui/vba/vbahelper.cxx | 2
sc/source/ui/vba/vbarange.cxx | 22
sc/source/ui/vba/vbawindow.cxx | 83 -
sc/source/ui/vba/vbawindow.hxx | 2
sc/source/ui/view/drawview.cxx | 8
sc/source/ui/view/gridwin5.cxx | 4
sc/source/ui/view/output2.cxx | 50
sc/source/ui/view/tabvwsha.cxx | 7
sc/uiconfig/scalc/toolbar/findbar.xml | 1
sc/uiconfig/scalc/toolbar/standardbar.xml | 2
sc/uiconfig/scalc/ui/insertcells.ui | 194 ++
sc/uiconfig/scalc/ui/optdefaultpage.ui | 119 +
sc/util/scfilt.component | 3
scp2/AutoInstallLibs_math.mk | 12
scp2/InstallModule_math.mk | 2
scp2/Module_scp2.mk | 1
scp2/source/math/file_math.scp | 4
scp2/source/math/module_math.scp | 5
scp2/source/ooo/vc_redist.scp | 22
scp2/source/python/file_python.scp | 7
scp2/source/python/module_python.scp | 1
scp2/source/winexplorerext/file_winexplorerext.scp | 44
scp2/source/winexplorerext/module_winexplorerext.scp | 6
scripting/source/dlgprov/dlgprov.cxx | 92 -
scripting/source/dlgprov/dlgprov.hxx | 11
sd/AllLangResTarget_sd.mk | 4
sd/inc/undo/undomanager.hxx | 10
sd/source/core/CustomAnimationPreset.cxx | 4
sd/source/core/drawdoc3.cxx | 158 +-
sd/source/core/drawdoc4.cxx | 12
sd/source/core/sdpage.cxx | 6
sd/source/core/stlfamily.cxx | 4
sd/source/core/stlpool.cxx | 10
sd/source/core/undo/undomanager.cxx | 8
sd/source/filter/eppt/epptso.cxx | 15
sd/source/filter/eppt/pptx-text.cxx | 26
sd/source/filter/html/buttonset.cxx | 2
sd/source/filter/html/htmlex.cxx | 83 -
sd/source/filter/ppt/pptin.cxx | 4
sd/source/filter/xml/sdxmlwrp.cxx | 25
sd/source/ui/app/sdmod.cxx | 4
sd/source/ui/dlg/TemplateScanner.cxx | 8
sd/source/ui/dlg/diactrl.cxx | 2
sd/source/ui/dlg/dlgass.cxx | 4
sd/source/ui/dlg/dlgolbul.cxx | 2
sd/source/ui/dlg/present.cxx | 2
sd/source/ui/dlg/prltempl.cxx | 2
sd/source/ui/dlg/unchss.cxx | 2
sd/source/ui/framework/factories/TaskPanelFactory.cxx | 1
sd/source/ui/func/fudraw.cxx | 8
sd/source/ui/func/fuolbull.cxx | 360 +---
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/inc/DrawViewShell.hxx | 5
sd/source/ui/inc/View.hxx | 27
sd/source/ui/inc/fuolbull.hxx | 4
sd/source/ui/sidebar/CustomAnimationPanel.cxx | 2
sd/source/ui/sidebar/LayoutMenu.cxx | 2
sd/source/ui/sidebar/PanelBase.cxx | 2
sd/source/ui/sidebar/PanelFactory.cxx | 11
sd/source/ui/sidebar/SlideTransitionPanel.cxx | 2
sd/source/ui/sidebar/TableDesignPanel.cxx | 2
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 21
sd/source/ui/view/ToolBarManager.cxx | 6
sd/source/ui/view/drtxtob1.cxx | 2
sd/source/ui/view/drviews1.cxx | 12
sd/source/ui/view/drviewsa.cxx | 36
sd/source/ui/view/drviewse.cxx | 5
sd/source/ui/view/outlnvsh.cxx | 2
sd/source/ui/view/sdview.cxx | 51
sd/source/ui/view/viewshel.cxx | 2
sd/uiconfig/sdraw/toolbar/findbar.xml | 1
sd/uiconfig/sdraw/toolbar/standardbar.xml | 2
sd/uiconfig/simpress/toolbar/findbar.xml | 1
sd/uiconfig/simpress/toolbar/standardbar.xml | 2
sd/uiconfig/simpress/ui/presentationdialog.ui | 2
sdext/source/minimizer/optimizerdialog.cxx | 2
sdext/source/minimizer/unodialog.cxx | 51
sdext/source/minimizer/unodialog.hxx | 7
sfx2/Library_sfx.mk | 2
sfx2/sdi/appslots.sdi | 8
sfx2/source/appl/appserv.cxx | 16
sfx2/source/appl/linkmgr2.cxx | 29
sfx2/source/control/shell.cxx | 25
sfx2/source/control/templateremoteview.cxx | 2
sfx2/source/dialog/taskpane.cxx | 18
sfx2/source/doc/objstor.cxx | 4
sfx2/source/sidebar/Accessible.cxx | 63
sfx2/source/sidebar/Accessible.hxx | 70
sfx2/source/sidebar/AccessibleTitleBar.cxx | 67
sfx2/source/sidebar/AccessibleTitleBar.hxx | 49
sfx2/source/sidebar/CommandInfoProvider.cxx | 41
sfx2/source/sidebar/ControllerFactory.cxx | 1
sfx2/source/sidebar/Deck.cxx | 4
sfx2/source/sidebar/Deck.hxx | 3
sfx2/source/sidebar/DeckLayouter.cxx | 13
sfx2/source/sidebar/DeckLayouter.hxx | 3
sfx2/source/sidebar/DeckTitleBar.cxx | 11
sfx2/source/sidebar/DeckTitleBar.hxx | 1
sfx2/source/sidebar/EnumContext.cxx | 8
sfx2/source/sidebar/Panel.cxx | 7
sfx2/source/sidebar/PanelTitleBar.cxx | 21
sfx2/source/sidebar/PanelTitleBar.hxx | 2
sfx2/source/sidebar/SidebarController.cxx | 74
sfx2/source/sidebar/SidebarController.hxx | 18
sfx2/source/sidebar/SidebarPanelBase.cxx | 21
sfx2/source/sidebar/SidebarToolBox.cxx | 16
sfx2/source/sidebar/TitleBar.cxx | 32
sfx2/source/sidebar/TitleBar.hxx | 5
slideshow/source/engine/activities/activitiesfactory.cxx | 4
solenv/Executable_concat-deps.mk | 5
solenv/Package_gdb.mk | 2
solenv/bin/install-gdb-printers | 4
solenv/bin/linkoo | 2
solenv/bin/msg_filter | 78
solenv/gbuild/AllLangResTarget.mk | 16
solenv/gbuild/Helper.mk | 2
solenv/gbuild/UnpackedTarball.mk | 2
solenv/gbuild/platform/macosx.mk | 2
solenv/gdb/boost/smart_ptr.py | 9
solenv/gdb/libreoffice/writerfilter.py | 88 +
starmath/AllLangResTarget_sm.mk | 4
starmath/UIConfig_smath.mk | 1
starmath/inc/starmath.hrc | 6
starmath/qa/cppunit/test_starmath.cxx | 9
starmath/sdi/smath.sdi | 124 -
starmath/sdi/smslots.sdi | 31
starmath/source/dialog.cxx | 39
starmath/source/edit.cxx | 40
starmath/source/smdll.cxx | 2
starmath/source/smres.src | 15
starmath/source/typemap.cxx | 1
starmath/source/view.cxx | 47
starmath/uiconfig/smath/statusbar/statusbar.xml | 5
starmath/uiconfig/smath/toolbar/standardbar.xml | 2
starmath/uiconfig/smath/toolbar/toolbar.xml | 6
starmath/uiconfig/smath/ui/savedefaultsdialog.ui | 34
stoc/source/registry_tdprovider/tdservice.cxx | 2
svtools/source/contnr/contentenumeration.cxx | 4
svtools/source/dialogs/restartdialog.cxx | 3
svtools/source/misc/acceleratorexecute.cxx | 4
svtools/source/misc/imagemgr.cxx | 4
svtools/source/misc/imagemgr.src | 2
svtools/uiconfig/ui/restartdialog.ui | 16
svx/AllLangResTarget_svx.mk | 1
svx/Library_svx.mk | 1
svx/Library_svxcore.mk | 1
svx/UIConfig_svx.mk | 3
svx/inc/tbunosearchcontrollers.hxx | 38
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 63
svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx | 3
svx/source/dialog/charmap.cxx | 4
svx/source/dialog/frmdirlbox.cxx | 4
svx/source/dialog/frmsel.cxx | 6
svx/source/dialog/hdft.cxx | 9
svx/source/dialog/hdft.src | 29
svx/source/dialog/paraprev.cxx | 47
svx/source/dialog/relfld.cxx | 16
svx/source/dialog/ucsubset.src | 2
svx/source/engine3d/camera3d.cxx | 2
svx/source/engine3d/float3d.cxx | 1
svx/source/sidebar/PanelLayout.cxx | 39
svx/source/sidebar/SelectionAnalyzer.cxx | 54
svx/source/sidebar/SelectionChangeHandler.cxx | 5
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 98 -
svx/source/sidebar/text/SvxSBFontNameBox.cxx | 16
svx/source/sidebar/text/SvxSBFontNameBox.hxx | 3
svx/source/sidebar/text/TextPropertyPanel.cxx | 493 +++---
svx/source/sidebar/text/TextPropertyPanel.hrc | 26
svx/source/sidebar/text/TextPropertyPanel.hxx | 39
svx/source/sidebar/text/TextPropertyPanel.src | 249 ---
svx/source/svdraw/sdrundomanager.cxx | 116 +
svx/source/svdraw/svdedxv.cxx | 106 +
svx/source/svdraw/svdundo.cxx | 18
svx/source/svdraw/svdxcgv.cxx | 146 +
svx/source/tbxctrls/SvxColorValueSet.cxx | 9
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 120 +
svx/source/unodraw/unoctabl.cxx | 7
svx/uiconfig/ui/deletefooterdialog.ui | 34
svx/uiconfig/ui/deleteheaderdialog.ui | 34
svx/uiconfig/ui/redlineviewpage.ui | 2
svx/uiconfig/ui/sidebartextpanel.ui | 341 ++++
svx/util/svx.component | 3
sw/AllLangResTarget_sw.mk | 6
sw/README | 22
sw/UIConfig_swriter.mk | 2
sw/inc/fmtcol.hxx | 2
sw/inc/globals.hrc | 1
sw/inc/helpid.h | 2
sw/inc/unomap.hxx | 3
sw/inc/unoprnms.hxx | 4
sw/qa/extras/ooxmlimport/data/n816593.docx |binary
sw/qa/extras/ooxmlimport/data/page-background.docx |binary
sw/qa/extras/ooxmlimport/data/page-border-shadow.docx |binary
sw/qa/extras/ooxmlimport/data/table_width.docx |binary
sw/qa/extras/ooxmlimport/data/watermark.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 62
sw/qa/extras/rtfimport/data/fdo64671.rtf | 3
sw/qa/extras/rtfimport/data/page-background.rtf | 30
sw/qa/extras/rtfimport/rtfimport.cxx | 17
sw/source/core/doc/doctxm.cxx | 4
sw/source/core/doc/poolfmt.cxx | 105 -
sw/source/core/draw/dview.cxx | 12
sw/source/core/inc/UndoManager.hxx | 6
sw/source/core/inc/dview.hxx | 4
sw/source/core/layout/anchoreddrawobject.cxx | 10
sw/source/core/layout/anchoredobject.cxx | 9
sw/source/core/layout/atrfrm.cxx | 26
sw/source/core/layout/calcmove.cxx | 13
sw/source/core/layout/colfrm.cxx | 7
sw/source/core/layout/dbg_lay.cxx | 7
sw/source/core/layout/paintfrm.cxx | 13
sw/source/core/txtnode/fntcap.cxx | 11
sw/source/core/txtnode/swfont.cxx | 6
sw/source/core/undo/docundo.cxx | 109 -
sw/source/core/unocore/unoframe.cxx | 5
sw/source/core/unocore/unomap.cxx | 1
sw/source/core/unocore/unoprnms.cxx | 1
sw/source/filter/ww8/WW8TableInfo.hxx | 89 -
sw/source/filter/ww8/writerhelper.cxx | 8
sw/source/filter/ww8/writerhelper.hxx | 12
sw/source/filter/ww8/writerwordglue.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 57
sw/source/filter/ww8/wrtw8num.cxx | 5
sw/source/filter/ww8/ww8par5.cxx | 9
sw/source/filter/xml/xmltbli.cxx | 29
sw/source/ui/app/app.src | 2
sw/source/ui/config/optdlg.hrc | 38
sw/source/ui/config/optdlg.src | 245 ---
sw/source/ui/config/optpage.cxx | 279 +--
sw/source/ui/dialog/swdlgfact.cxx | 1
sw/source/ui/fldui/fldref.src | 26
sw/source/ui/inc/optpage.hxx | 57
sw/source/ui/shells/drwtxtex.cxx | 1
sw/source/ui/shells/drwtxtsh.cxx | 1
sw/source/ui/uno/swdet2.cxx | 2
sw/source/ui/uno/unoatxt.cxx | 17
sw/source/ui/uno/unomailmerge.cxx | 35
sw/source/ui/uno/unomod.cxx | 6
sw/source/ui/uno/unotxdoc.cxx | 8
sw/source/ui/wrtsh/wrtsh1.cxx | 11
sw/uiconfig/sglobal/toolbar/findbar.xml | 1
sw/uiconfig/sglobal/toolbar/standardbar.xml | 2
sw/uiconfig/sweb/toolbar/findbar.xml | 1
sw/uiconfig/sweb/toolbar/standardbar.xml | 2
sw/uiconfig/swform/toolbar/standardbar.xml | 2
sw/uiconfig/swreport/toolbar/standardbar.xml | 2
sw/uiconfig/swriter/toolbar/findbar.xml | 1
sw/uiconfig/swriter/toolbar/standardbar.xml | 2
sw/uiconfig/swriter/ui/optcomparison.ui | 202 ++
sw/uiconfig/swriter/ui/optformataidspage.ui | 516 ++++++
sw/uiconfig/swxform/toolbar/findbar.xml | 1
sw/uiconfig/swxform/toolbar/standardbar.xml | 2
sysui/desktop/macosx/gen_strings.pl | 1
sysui/productlist.mk | 6
translations | 2
ucb/source/ucp/package/pkgcontent.cxx | 30
ucb/source/ucp/package/pkgprovider.cxx | 54
ucb/source/ucp/package/pkgprovider.hxx | 2
ucb/source/ucp/webdav-neon/NeonLockStore.cxx | 24
ucb/source/ucp/webdav-neon/NeonLockStore.hxx | 2
ucb/source/ucp/webdav/AprEnv.cxx | 2
ucb/source/ucp/webdav/DAVRequestEnvironment.hxx | 2
ucb/source/ucp/webdav/DAVResource.hxx | 4
ucb/source/ucp/webdav/DAVResourceAccess.cxx | 55
ucb/source/ucp/webdav/DAVResourceAccess.hxx | 8
ucb/source/ucp/webdav/SerfCallbacks.cxx | 6
ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx | 2
ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx | 2
ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx | 2
ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx | 2
ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx | 2
ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx | 6
ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx | 2
ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx | 6
ucb/source/ucp/webdav/SerfLockStore.cxx | 6
ucb/source/ucp/webdav/SerfLockStore.hxx | 4
ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx | 2
ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx | 2
ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx | 2
ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx | 2
ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx | 2
ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx | 4
ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx | 36
ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx | 4
ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx | 85 -
ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx | 4
ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx | 2
ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx | 2
ucb/source/ucp/webdav/SerfRequestProcessor.cxx | 10
ucb/source/ucp/webdav/SerfRequestProcessor.hxx | 8
ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx | 2
ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx | 2
ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx | 22
ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx | 4
ucb/source/ucp/webdav/SerfSession.cxx | 16
ucb/source/ucp/webdav/SerfSession.hxx | 6
ucb/source/ucp/webdav/SerfUri.cxx | 2
ucb/source/ucp/webdav/SerfUri.hxx | 2
ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx | 2
ucb/source/ucp/webdav/webdavcontent.cxx | 162 +-
ucb/source/ucp/webdav/webdavprovider.cxx | 2
ucb/source/ucp/webdav/webdavresponseparser.cxx | 2
ucb/source/ucp/webdav/webdavresponseparser.hxx | 2
unoidl/source/legacyprovider.cxx | 2
unotools/source/misc/fontcvt.cxx | 89 -
unotools/source/misc/fontdefs.cxx | 9
vcl/generic/fontmanager/fontsubst.cxx | 7
vcl/generic/glyphs/gcach_ftyp.cxx | 8
vcl/inc/salbmp.hxx | 1
vcl/source/control/field.cxx | 22
vcl/source/filter/igif/decode.cxx | 18
vcl/source/filter/igif/decode.hxx | 6
vcl/source/filter/igif/gifread.cxx | 96 -
vcl/source/filter/igif/gifread.hxx | 24
vcl/source/filter/ixbm/xbmread.cxx | 42
vcl/source/filter/ixbm/xbmread.hxx | 6
vcl/source/filter/ixpm/xpmread.cxx | 88 -
vcl/source/filter/ixpm/xpmread.hxx | 20
vcl/source/filter/jpeg/JpegReader.cxx | 10
vcl/source/filter/jpeg/JpegReader.hxx | 4
vcl/source/filter/jpeg/JpegWriter.cxx | 2
vcl/source/filter/jpeg/JpegWriter.hxx | 2
vcl/source/filter/sgfbram.cxx | 36
vcl/source/filter/sgfbram.hxx | 4
vcl/source/filter/sgffilt.hxx | 6
vcl/source/filter/sgvmain.cxx | 26
vcl/source/filter/sgvtext.cxx | 2
vcl/source/filter/wmf/wmfwr.cxx | 6
vcl/source/gdi/gdimtf.cxx | 56
vcl/source/gdi/metaact.cxx | 6
vcl/source/gdi/outdev3.cxx | 8
vcl/source/gdi/pdfwriter_impl2.cxx | 2
vcl/source/window/builder.cxx | 39
vcl/source/window/layout.cxx | 143 +
vcl/source/window/toolbox.cxx | 5
vcl/source/window/toolbox2.cxx | 136 +
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 5
vcl/unx/kde/salnativewidgets-kde.cxx | 18
vcl/unx/kde4/KDESalFrame.cxx | 15
vcl/unx/kde4/KDESalGraphics.cxx | 3
writerfilter/README | 12
writerfilter/inc/resourcemodel/TableData.hxx | 5
writerfilter/inc/resourcemodel/TableManager.hxx | 31
writerfilter/source/dmapper/BorderHandler.cxx | 9
writerfilter/source/dmapper/BorderHandler.hxx | 2
writerfilter/source/dmapper/DomainMapper.cxx | 5
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 20
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 61
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 4
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 5
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 3
writerfilter/source/dmapper/PageBordersHandler.cxx | 6
writerfilter/source/dmapper/PageBordersHandler.hxx | 1
writerfilter/source/dmapper/PropertyIds.cxx | 1
writerfilter/source/dmapper/PropertyIds.hxx | 1
writerfilter/source/dmapper/PropertyMap.cxx | 52
writerfilter/source/dmapper/PropertyMap.hxx | 3
writerfilter/source/dmapper/TablePositionHandler.cxx | 10
writerfilter/source/dmapper/TablePositionHandler.hxx | 2
writerfilter/source/ooxml/OOXMLParserState.cxx | 3
writerfilter/source/ooxml/model.xml | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 9
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 4
writerfilter/source/rtftok/rtfsdrimport.cxx | 13
xmloff/Library_xo.mk | 2
xmloff/source/chart/PropertyMap.hxx | 14
xmloff/source/chart/PropertyMaps.cxx | 24
xmloff/source/chart/SchXMLChartContext.cxx | 3
xmloff/source/chart/SchXMLChartContext.hxx | 1
xmloff/source/chart/SchXMLExport.cxx | 14
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 128 -
xmloff/source/chart/SchXMLPlotAreaContext.hxx | 28
xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx | 208 ++
xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx | 88 +
xmloff/source/chart/SchXMLSeries2Context.cxx | 97 -
xmloff/source/chart/SchXMLSeries2Context.hxx | 9
xmloff/source/chart/XMLRegressionTypePropertyHdl.cxx | 62
xmloff/source/chart/XMLRegressionTypePropertyHdl.hxx | 27
xmloff/source/chart/transporttypes.hxx | 36
xmloff/source/core/xmltoken.cxx | 1
xmloff/source/draw/ximpcustomshape.cxx | 21
xmlscript/test/imexp.cxx | 24
801 files changed, 13206 insertions(+), 8288 deletions(-)
New commits:
commit 8d1107e9a2ab0ad1e8c0d055a3549850ade4a515
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Sun Jun 2 22:22:43 2013 +0200
Refactor regression curve handling in xmloff import to use chart2.
Additionally support more regression curves per one series and
add polynomial an moving average tokens.
Change-Id: I9dfebb1f47942c88ab0ccff48ec7632136fb1bc9
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index a40da2c..9b01d0a 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1219,6 +1219,7 @@ namespace xmloff { namespace token {
XML_MOVEMENT,
XML_MOVEMENT_CUT_OFF,
XML_MOVER,
+ XML_MOVING_AVERAGE,
XML_MPADDED,
XML_MPHANTOM,
XML_MPRESCRIPTS,
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index ba9efca..3196831 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/chart/SchXMLLegendContext \
xmloff/source/chart/SchXMLParagraphContext \
xmloff/source/chart/SchXMLPlotAreaContext \
+ xmloff/source/chart/SchXMLRegressionCurveObjectContext \
xmloff/source/chart/SchXMLSeries2Context \
xmloff/source/chart/SchXMLSeriesHelper \
xmloff/source/chart/SchXMLTableContext \
@@ -80,6 +81,7 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/chart/XMLErrorBarStylePropertyHdl \
xmloff/source/chart/XMLErrorIndicatorPropertyHdl \
xmloff/source/chart/XMLLabelSeparatorContext \
+ xmloff/source/chart/XMLRegressionTypePropertyHdl \
xmloff/source/chart/XMLSymbolImageContext \
xmloff/source/chart/XMLSymbolTypePropertyHdl \
xmloff/source/chart/XMLTextOrientationHdl \
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx
index f19b365..a5f1bd2 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
#include <com/sun/star/chart/ErrorBarStyle.hpp>
#include <com/sun/star/chart/ChartErrorIndicatorType.hpp>
-#include <com/sun/star/chart/ChartRegressionCurveType.hpp>
#include <com/sun/star/chart/ChartSolidType.hpp>
#include <com/sun/star/chart/ChartDataRowSource.hpp>
#include <com/sun/star/chart/DataLabelPlacement.hpp>
@@ -184,7 +183,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
MAP_ENTRY( "ShowNegativeError", CHART, XML_ERROR_LOWER_INDICATOR, XML_TYPE_BOOL),
MAP_ENTRY( "ErrorBarStyle", CHART, XML_ERROR_CATEGORY, XML_SCH_TYPE_ERROR_BAR_STYLE ),
MAP_ENTRY( "PercentageError", CHART, XML_ERROR_PERCENTAGE, XML_TYPE_DOUBLE ),
- MAP_ENTRY( "RegressionCurves", CHART, XML_REGRESSION_TYPE, XML_SCH_TYPE_REGRESSION_TYPE ),
+ MAP_ENTRY( "RegressionType", CHART, XML_REGRESSION_TYPE, XML_SCH_TYPE_REGRESSION_TYPE ),
MAP_SPECIAL_ODF12( "ErrorBarRangePositive", CHART, XML_ERROR_UPPER_RANGE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only
MAP_SPECIAL_ODF12( "ErrorBarRangeNegative", CHART, XML_ERROR_LOWER_RANGE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only
@@ -256,17 +255,6 @@ SvXMLEnumMapEntry aXMLChartErrorBarStyleEnumMap[] =
{ ::xmloff::token::XML_TOKEN_INVALID, 0 }
};
-SvXMLEnumMapEntry aXMLChartRegressionCurveTypeEnumMap[] =
-{
- { ::xmloff::token::XML_NONE, ::com::sun::star::chart::ChartRegressionCurveType_NONE },
- { ::xmloff::token::XML_LINEAR, ::com::sun::star::chart::ChartRegressionCurveType_LINEAR },
- { ::xmloff::token::XML_LOGARITHMIC, ::com::sun::star::chart::ChartRegressionCurveType_LOGARITHM },
- { ::xmloff::token::XML_EXPONENTIAL, ::com::sun::star::chart::ChartRegressionCurveType_EXPONENTIAL },
- { ::xmloff::token::XML_POLYNOMIAL, ::com::sun::star::chart::ChartRegressionCurveType_POLYNOMIAL },
- { ::xmloff::token::XML_POWER, ::com::sun::star::chart::ChartRegressionCurveType_POWER },
- { ::xmloff::token::XML_TOKEN_INVALID, 0 }
-};
-
SvXMLEnumMapEntry aXMLChartSolidTypeEnumMap[] =
{
{ ::xmloff::token::XML_CUBOID, ::com::sun::star::chart::ChartSolidType::RECTANGULAR_SOLID },
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 9962a09d..8f17023 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -28,8 +28,15 @@
#include <sax/tools/converter.hxx>
-#include "XMLChartPropertySetMapper.hxx"
#include "SchXMLTools.hxx"
+#include "XMLChartPropertySetMapper.hxx"
+#include "XMLErrorIndicatorPropertyHdl.hxx"
+#include "XMLErrorBarStylePropertyHdl.hxx"
+#include "XMLTextOrientationHdl.hxx"
+#include "XMLSymbolTypePropertyHdl.hxx"
+#include "XMLAxisPositionPropertyHdl.hxx"
+#include "XMLRegressionTypePropertyHdl.hxx"
+
#include <xmloff/EnumPropertyHdl.hxx>
#include <xmloff/XMLConstantsPropertyHandler.hxx>
#include <xmloff/attrlist.hxx>
@@ -39,17 +46,13 @@
#include <xmloff/NamedBoolPropertyHdl.hxx>
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmltoken.hxx>
-#include "XMLErrorIndicatorPropertyHdl.hxx"
-#include "XMLErrorBarStylePropertyHdl.hxx"
-#include "XMLTextOrientationHdl.hxx"
-#include "XMLSymbolTypePropertyHdl.hxx"
-#include "XMLAxisPositionPropertyHdl.hxx"
-#include <com/sun/star/chart/ChartAxisMarks.hpp>
-#include <com/sun/star/chart/ChartDataCaption.hpp>
-#include <com/sun/star/chart/ChartSymbolType.hpp>
+
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/LineJoint.hpp>
+#include <com/sun/star/chart/ChartAxisMarks.hpp>
+#include <com/sun/star/chart/ChartDataCaption.hpp>
+#include <com/sun/star/chart/ChartSymbolType.hpp>
#include <com/sun/star/chart/ChartDataRowSource.hpp>
#include <com/sun/star/chart/ChartAxisPosition.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
@@ -116,8 +119,7 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32
break;
case XML_SCH_TYPE_REGRESSION_TYPE:
- pHdl = new XMLEnumPropertyHdl( aXMLChartRegressionCurveTypeEnumMap,
- ::getCppuType((const chart::ChartRegressionCurveType*)0) );
+ pHdl = new XMLRegressionTypePropertyHdl( );
break;
case XML_SCH_TYPE_ERROR_INDICATOR_LOWER:
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 5aeb93b..bb5f9d8 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -887,6 +887,9 @@ void SchXMLChartContext::EndElement()
// ... then set attributes for statistics (after their existence was set in the series)
SchXMLSeries2Context::setStylesToStatisticsObjects( maSeriesDefaultsAndStyles
, pStylesCtxt, pStyle, sCurrStyleName );
+
+ SchXMLSeries2Context::setStylesToRegressionCurves( maSeriesDefaultsAndStyles
+ , pStylesCtxt, pStyle, sCurrStyleName );
}
}
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index 91057b8..1e86bb3 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -73,6 +73,7 @@ struct SeriesDefaultsAndStyles
//styles for series and datapoints
::std::list< DataRowPointStyle > maSeriesStyleList;
+ ::std::list< RegressionStyle > maRegressionStyleList;
};
class SchXMLChartContext : public SvXMLImportContext
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 1200702..2eb8b2c 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2668,7 +2668,6 @@ void SchXMLExportHelper_Impl::exportSeries(
sal_Int32 nSeriesLength = 0;
sal_Int32 nAttachedAxis = chart::ChartAxisAssign::PRIMARY_Y;
sal_Bool bHasMeanValueLine = false;
- chart::ChartRegressionCurveType eRegressionType( chart::ChartRegressionCurveType_NONE );
Reference< beans::XPropertySet > xPropSet;
tLabelValuesDataPair aSeriesLabelValuesPair;
@@ -2725,10 +2724,6 @@ void SchXMLExportHelper_Impl::exportSeries(
aAny = xPropSet->getPropertyValue(
OUString( "MeanValue" ));
aAny >>= bHasMeanValueLine;
-
- aAny = xPropSet->getPropertyValue(
- OUString( "RegressionCurves" ));
- aAny >>= eRegressionType;
}
catch( const beans::UnknownPropertyException & rEx )
{
@@ -2889,8 +2884,7 @@ void SchXMLExportHelper_Impl::exportSeries(
}
}
- if( eRegressionType != chart::ChartRegressionCurveType_NONE &&
- xPropSet.is() &&
+ if( xPropSet.is() &&
mxExpPropMapper.is() )
{
exportRegressionCurve( aSeriesSeq[nSeriesIdx], xPropSet, rPageSize, bExportContent );
@@ -2914,9 +2908,9 @@ void SchXMLExportHelper_Impl::exportSeries(
}
void SchXMLExportHelper_Impl::exportRegressionCurve(
- const Reference< chart2::XDataSeries > & xSeries,
- const Reference< beans::XPropertySet > & xSeriesProp,
- const awt::Size & rPageSize,
+ const Reference< chart2::XDataSeries >& xSeries,
+ const Reference< beans::XPropertySet >& xSeriesProp,
+ const awt::Size& rPageSize,
sal_Bool bExportContent )
{
OSL_ASSERT( mxExpPropMapper.is());
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index d8b56b2..1581562 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -21,6 +21,7 @@
#include <sax/tools/converter.hxx>
#include "SchXMLPlotAreaContext.hxx"
+#include "SchXMLRegressionCurveObjectContext.hxx"
#include "SchXMLImport.hxx"
#include "SchXMLAxisContext.hxx"
#include "SchXMLSeries2Context.hxx"
@@ -46,7 +47,6 @@
#include <com/sun/star/chart/X3DDisplay.hpp>
#include <com/sun/star/chart/XStatisticDisplay.hpp>
#include <com/sun/star/chart/XDiagramPositioning.hpp>
-#include <com/sun/star/chart2/RegressionEquation.hpp>
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
@@ -491,6 +491,7 @@ SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext(
mrImportHelper, GetImport(), rLocalName,
mxNewDoc, maAxes,
mrSeriesDefaultsAndStyles.maSeriesStyleList,
+ mrSeriesDefaultsAndStyles.maRegressionStyleList,
mnSeries,
mbStockHasVolume,
m_aGlobalSeriesImportInfo,
@@ -996,7 +997,6 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume
}
SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext(
-
SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
sal_uInt16 nPrefix,
@@ -1136,7 +1136,6 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere
}
-
void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
@@ -1149,6 +1148,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
{
OUString sAttrName = xAttrList->getNameByIndex( i );
OUString aLocalName;
+
sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
if( nPrefix == XML_NAMESPACE_CHART )
@@ -1164,9 +1164,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
}
}
- // note: regression-curves must get a style-object even if there is no
- // auto-style set, because they can contain an equation
- if( !sAutoStyleName.isEmpty() || meContextType == CONTEXT_TYPE_REGRESSION_CURVE )
+ if( !sAutoStyleName.isEmpty() )
{
DataRowPointStyle aStyle( DataRowPointStyle::MEAN_VALUE, m_xSeries, -1, 1, sAutoStyleName );
@@ -1175,14 +1173,10 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
case CONTEXT_TYPE_MEAN_VALUE_LINE:
aStyle.meType = DataRowPointStyle::MEAN_VALUE;
break;
- case CONTEXT_TYPE_REGRESSION_CURVE:
- aStyle.meType = DataRowPointStyle::REGRESSION;
- break;
case CONTEXT_TYPE_ERROR_INDICATOR:
{
aStyle.meType = DataRowPointStyle::ERROR_INDICATOR;
- ;
uno::Reference< lang::XMultiServiceFactory > xFact( comphelper::getProcessServiceFactory(),
uno::UNO_QUERY );
@@ -1231,120 +1225,8 @@ SvXMLImportContext* SchXMLStatisticsObjectContext::CreateChildContext(
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
SvXMLImportContext* pContext = 0;
-
- if( nPrefix == XML_NAMESPACE_CHART &&
- IsXMLToken( rLocalName, XML_EQUATION ) )
- {
- pContext = new SchXMLEquationContext(
- mrImportHelper, GetImport(), nPrefix, rLocalName, m_xSeries, maChartSize, mrStyleList.back());
- }
- else
- {
- pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
- }
-
+ pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
return pContext;
}
-// ========================================
-
-SchXMLEquationContext::SchXMLEquationContext(
- SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDataSeries >& xSeries,
- const awt::Size & rChartSize,
- DataRowPointStyle & rRegressionStyle ) :
- SvXMLImportContext( rImport, nPrefix, rLocalName ),
- mrImportHelper( rImpHelper ),
- mrRegressionStyle( rRegressionStyle ),
- m_xSeries( xSeries ),
- maChartSize( rChartSize )
-{}
-
-SchXMLEquationContext::~SchXMLEquationContext()
-{}
-
-void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
-{
- // parse attributes
- sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
- SchXMLImport& rImport = ( SchXMLImport& )GetImport();
- const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetRegEquationAttrTokenMap();
- OUString sAutoStyleName;
-
- bool bShowEquation = true;
- bool bShowRSquare = false;
- awt::Point aPosition;
- bool bHasXPos = false;
- bool bHasYPos = false;
-
- for( sal_Int16 i = 0; i < nAttrCount; i++ )
- {
- OUString sAttrName = xAttrList->getNameByIndex( i );
- OUString aLocalName;
- OUString aValue = xAttrList->getValueByIndex( i );
- sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
-
- switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
- {
- case XML_TOK_REGEQ_POS_X:
- rImport.GetMM100UnitConverter().convertMeasureToCore(
- aPosition.X, aValue );
- bHasXPos = true;
- break;
- case XML_TOK_REGEQ_POS_Y:
- rImport.GetMM100UnitConverter().convertMeasureToCore(
- aPosition.Y, aValue );
- bHasYPos = true;
- break;
- case XML_TOK_REGEQ_DISPLAY_EQUATION:
- ::sax::Converter::convertBool(bShowEquation, aValue);
- break;
- case XML_TOK_REGEQ_DISPLAY_R_SQUARE:
- ::sax::Converter::convertBool(bShowRSquare, aValue);
- break;
- case XML_TOK_REGEQ_STYLE_NAME:
- sAutoStyleName = aValue;
- break;
- }
- }
-
- if( !sAutoStyleName.isEmpty() || bShowEquation || bShowRSquare )
- {
- uno::Reference< beans::XPropertySet > xEqProp = chart2::RegressionEquation::create( comphelper::getProcessComponentContext() );
-
- if( !sAutoStyleName.isEmpty() )
- {
- const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext();
- if( pStylesCtxt )
- {
- const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
- mrImportHelper.GetChartFamilyID(), sAutoStyleName );
- // note: SvXMLStyleContext::FillPropertySet is not const
- XMLPropStyleContext * pPropStyleContext =
- const_cast< XMLPropStyleContext * >( dynamic_cast< const XMLPropStyleContext * >( pStyle ));
-
- if( pPropStyleContext )
- pPropStyleContext->FillPropertySet( xEqProp );
- }
- }
- xEqProp->setPropertyValue( OUString( "ShowEquation"), uno::makeAny( bShowEquation ));
- xEqProp->setPropertyValue( OUString( "ShowCorrelationCoefficient"), uno::makeAny( bShowRSquare ));
-
- if( bHasXPos && bHasYPos )
- {
- chart2::RelativePosition aRelPos;
- aRelPos.Primary = static_cast< double >( aPosition.X ) / static_cast< double >( maChartSize.Width );
- aRelPos.Secondary = static_cast< double >( aPosition.Y ) / static_cast< double >( maChartSize.Height );
- xEqProp->setPropertyValue( OUString( "RelativePosition" ),
- uno::makeAny( aRelPos ));
- }
- SAL_WARN_IF( mrRegressionStyle.meType != DataRowPointStyle::REGRESSION, "xmloff.chart", "mrRegressionStyle.meType != DataRowPointStyle::REGRESSION" );
- mrRegressionStyle.m_xEquationProperties.set( xEqProp );
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index cf945c1..7fee620 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -251,7 +251,6 @@ public:
enum ContextType
{
CONTEXT_TYPE_MEAN_VALUE_LINE,
- CONTEXT_TYPE_REGRESSION_CURVE,
CONTEXT_TYPE_ERROR_INDICATOR
};
@@ -287,33 +286,6 @@ private:
tSchXMLLSequencesPerIndex& mrLSequencesPerIndex;
};
-// ----------------------------------------
-
-class SchXMLEquationContext : public SvXMLImportContext
-{
-public:
- SchXMLEquationContext(
- SchXMLImportHelper& rImportHelper,
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDataSeries >& xSeries,
- const ::com::sun::star::awt::Size & rChartSize,
- DataRowPointStyle & rRegressionStyle );
-
- virtual ~SchXMLEquationContext();
-
- virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
-
-private:
- SchXMLImportHelper & mrImportHelper;
- DataRowPointStyle & mrRegressionStyle;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDataSeries > m_xSeries;
- ::com::sun::star::awt::Size maChartSize;
-};
-
#endif // _SCH_XMLPLOTAREACONTEXT_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
new file mode 100644
index 0000000..0e45160
--- /dev/null
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
@@ -0,0 +1,208 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "SchXMLRegressionCurveObjectContext.hxx"
+
+#include <sax/tools/converter.hxx>
+
+#include <xmloff/nmspmap.hxx>
+#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/xmlement.hxx>
+#include <xmloff/xmluconv.hxx>
+#include <xmloff/prstylei.hxx>
+#include <xmloff/xmlstyle.hxx>
+
+#include <comphelper/processfactory.hxx>
+
+#include <com/sun/star/chart2/RegressionEquation.hpp>
+#include <com/sun/star/chart2/RelativePosition.hpp>
+
+using namespace com::sun::star;
+using namespace xmloff::token;
+
+using com::sun::star::uno::Reference;
+
+SchXMLRegressionCurveObjectContext::SchXMLRegressionCurveObjectContext(
+ SchXMLImportHelper& rImpHelper,
+ SvXMLImport& rImport,
+ sal_uInt16 nPrefix,
+ const OUString& rLocalName,
+ const OUString &rSeriesStyleName,
+ std::list< RegressionStyle >& rRegressionStyleList,
+ const css::uno::Reference<
+ css::chart2::XDataSeries >& xSeries,
+ const awt::Size & rChartSize) :
+ SvXMLImportContext( rImport, nPrefix, rLocalName ),
+ mrImportHelper( rImpHelper ),
+ mxSeries( xSeries ),
+ maChartSize( rChartSize ),
+ maSeriesStyleName( rSeriesStyleName),
+ mrRegressionStyleList( rRegressionStyleList )
+{
+}
+
+SchXMLRegressionCurveObjectContext::~SchXMLRegressionCurveObjectContext()
+{
+}
+
+void SchXMLRegressionCurveObjectContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttributeList )
+{
+ sal_Int16 nAttributeCount = xAttributeList.is()? xAttributeList->getLength(): 0;
+ OUString sAutoStyleName;
+
+ for( sal_Int16 i = 0; i < nAttributeCount; i++ )
+ {
+ OUString sAttributeName = xAttributeList->getNameByIndex( i );
+ OUString aLocalName;
+
+ sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttributeName, &aLocalName );
+
+ if( nPrefix == XML_NAMESPACE_CHART )
+ {
+ if( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+ {
+ sAutoStyleName = xAttributeList->getValueByIndex( i );
+ }
+ }
+ }
+
+ RegressionStyle aStyle( mxSeries, sAutoStyleName );
+ mrRegressionStyleList.push_back( aStyle );
+}
+
+SvXMLImportContext* SchXMLRegressionCurveObjectContext::CreateChildContext(
+ sal_uInt16 nPrefix,
+ const OUString& rLocalName,
+ const uno::Reference< xml::sax::XAttributeList >& xAttrList )
+{
+ SvXMLImportContext* pContext = 0;
+
+ if( nPrefix == XML_NAMESPACE_CHART && IsXMLToken( rLocalName, XML_EQUATION ) )
+ {
+ pContext = new SchXMLEquationContext(
+ mrImportHelper, GetImport(), nPrefix, rLocalName, mxSeries, maChartSize, mrRegressionStyleList.back());
+ }
+ else
+ {
+ pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ }
+
+ return pContext;
+}
+
+SchXMLEquationContext::SchXMLEquationContext(
+ SchXMLImportHelper& rImpHelper,
+ SvXMLImport& rImport,
+ sal_uInt16 nPrefix,
+ const OUString& rLocalName,
+ const css::uno::Reference<
+ css::chart2::XDataSeries >& xSeries,
+ const awt::Size& rChartSize,
+ RegressionStyle& rRegressionStyle ) :
+
+ SvXMLImportContext( rImport, nPrefix, rLocalName ),
+ mrImportHelper( rImpHelper ),
+ mrRegressionStyle( rRegressionStyle ),
+ mxSeries( xSeries ),
+ maChartSize( rChartSize )
+{}
+
+SchXMLEquationContext::~SchXMLEquationContext()
+{}
+
+void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
+{
+ // parse attributes
+ sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
+ SchXMLImport& rImport = ( SchXMLImport& )GetImport();
+ const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetRegEquationAttrTokenMap();
+ OUString sAutoStyleName;
+
+ bool bShowEquation = true;
+ bool bShowRSquare = false;
+ awt::Point aPosition;
+ bool bHasXPos = false;
+ bool bHasYPos = false;
+
+ for( sal_Int16 i = 0; i < nAttrCount; i++ )
+ {
+ OUString sAttrName = xAttrList->getNameByIndex( i );
+ OUString aLocalName;
+ OUString aValue = xAttrList->getValueByIndex( i );
+ sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+
+ switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
+ {
+ case XML_TOK_REGEQ_POS_X:
+ rImport.GetMM100UnitConverter().convertMeasureToCore(
+ aPosition.X, aValue );
+ bHasXPos = true;
+ break;
+ case XML_TOK_REGEQ_POS_Y:
+ rImport.GetMM100UnitConverter().convertMeasureToCore(
+ aPosition.Y, aValue );
+ bHasYPos = true;
+ break;
+ case XML_TOK_REGEQ_DISPLAY_EQUATION:
+ ::sax::Converter::convertBool(bShowEquation, aValue);
+ break;
+ case XML_TOK_REGEQ_DISPLAY_R_SQUARE:
+ ::sax::Converter::convertBool(bShowRSquare, aValue);
+ break;
+ case XML_TOK_REGEQ_STYLE_NAME:
+ sAutoStyleName = aValue;
+ break;
+ }
+ }
+
+ if( !sAutoStyleName.isEmpty() || bShowEquation || bShowRSquare )
+ {
+ uno::Reference< beans::XPropertySet > xEqProp = chart2::RegressionEquation::create( comphelper::getProcessComponentContext() );
+
+ if( !sAutoStyleName.isEmpty() )
+ {
+ const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext();
+ if( pStylesCtxt )
+ {
+ const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
+ mrImportHelper.GetChartFamilyID(), sAutoStyleName );
+ // note: SvXMLStyleContext::FillPropertySet is not const
+ XMLPropStyleContext * pPropStyleContext =
+ const_cast< XMLPropStyleContext * >( dynamic_cast< const XMLPropStyleContext * >( pStyle ));
+
+ if( pPropStyleContext )
+ pPropStyleContext->FillPropertySet( xEqProp );
+ }
+ }
+ xEqProp->setPropertyValue( OUString( "ShowEquation"), uno::makeAny( bShowEquation ));
+ xEqProp->setPropertyValue( OUString( "ShowCorrelationCoefficient"), uno::makeAny( bShowRSquare ));
+
+ if( bHasXPos && bHasYPos )
+ {
+ chart2::RelativePosition aRelPos;
+ aRelPos.Primary = static_cast< double >( aPosition.X ) / static_cast< double >( maChartSize.Width );
+ aRelPos.Secondary = static_cast< double >( aPosition.Y ) / static_cast< double >( maChartSize.Height );
+ xEqProp->setPropertyValue( OUString( "RelativePosition" ),
+ uno::makeAny( aRelPos ));
+ }
+ mrRegressionStyle.m_xEquationProperties.set( xEqProp );
+ }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
new file mode 100644
index 0000000..e355449
--- /dev/null
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef _SCH_XMLREGRESSIONCURVEOBJECTCONTEXT_HXX_
+#define _SCH_XMLREGRESSIONCURVEOBJECTCONTEXT_HXX_
+
+#include "SchXMLImport.hxx"
+
+#include <xmloff/xmlictxt.hxx>
+#include <xmloff/shapeimport.hxx>
+#include <list>
+
+#include "transporttypes.hxx"
+
+class SchXMLRegressionCurveObjectContext : public SvXMLImportContext
+{
+public:
+ SchXMLRegressionCurveObjectContext(
+ SchXMLImportHelper& rImportHelper,
+ SvXMLImport& rImport,
+ sal_uInt16 nPrefix,
+ const OUString& rLocalName,
+ const OUString &rSeriesStyleName,
+ std::list< RegressionStyle >& rRegressionStyleList,
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::chart2::XDataSeries >& xSeries,
+ const ::com::sun::star::awt::Size & rChartSize );
+
+ virtual ~SchXMLRegressionCurveObjectContext();
+
+ virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+ virtual SvXMLImportContext* CreateChildContext(
+ sal_uInt16 nPrefix,
+ const OUString& rLocalName,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+
+private:
+
+ SchXMLImportHelper& mrImportHelper;
+ com::sun::star::uno::Reference<com::sun::star::chart2::XDataSeries > mxSeries;
+ com::sun::star::awt::Size maChartSize;
+ OUString maSeriesStyleName;
+ std::list< RegressionStyle >& mrRegressionStyleList;
+};
+
+class SchXMLEquationContext : public SvXMLImportContext
+{
+public:
+ SchXMLEquationContext(
+ SchXMLImportHelper& rImportHelper,
+ SvXMLImport& rImport,
+ sal_uInt16 nPrefix,
+ const OUString& rLocalName,
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::chart2::XDataSeries >& xSeries,
+ const ::com::sun::star::awt::Size & rChartSize,
+ RegressionStyle & rRegressionStyle );
+
+ virtual ~SchXMLEquationContext();
+
+ virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+
+private:
+ SchXMLImportHelper& mrImportHelper;
+ RegressionStyle& mrRegressionStyle;
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::chart2::XDataSeries > mxSeries;
+ ::com::sun::star::awt::Size maChartSize;
+};
+
+#endif // _SCH_XMLPLOTAREACONTEXT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 148b735..45c7295 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -20,12 +20,14 @@
#include "SchXMLSeries2Context.hxx"
#include "SchXMLPlotAreaContext.hxx"
+#include "SchXMLRegressionCurveObjectContext.hxx"
#include "SchXMLTools.hxx"
#include "PropertyMap.hxx"
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XDataSeries.hpp>
#include <com/sun/star/chart2/XRegressionCurve.hpp>
+#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
#include <com/sun/star/chart2/data/XDataReceiver.hpp>
@@ -38,6 +40,8 @@
#include <com/sun/star/embed/XVisualObject.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <comphelper/processfactory.hxx>
+
// header for define DBG_ERROR1
#include <tools/debug.hxx>
#include <rtl/ustrbuf.hxx>
@@ -247,6 +251,7 @@ SchXMLSeries2Context::SchXMLSeries2Context(
const Reference< chart2::XChartDocument > & xNewDoc,
std::vector< SchXMLAxis >& rAxes,
::std::list< DataRowPointStyle >& rStyleList,
+ ::std::list< RegressionStyle >& rRegressionStyleList,
sal_Int32 nSeriesIndex,
sal_Bool bStockHasVolume,
GlobalSeriesImportInfo& rGlobalSeriesImportInfo,
@@ -259,6 +264,7 @@ SchXMLSeries2Context::SchXMLSeries2Context(
mxNewDoc( xNewDoc ),
mrAxes( rAxes ),
mrStyleList( rStyleList ),
+ mrRegressionStyleList( rRegressionStyleList ),
m_xSeries(0),
mnSeriesIndex( nSeriesIndex ),
mnDataPointIndex( 0 ),
@@ -644,12 +650,10 @@ SvXMLImportContext* SchXMLSeries2Context::CreateChildContext(
maChartSize, mrLSequencesPerIndex );
break;
case XML_TOK_SERIES_REGRESSION_CURVE:
- pContext = new SchXMLStatisticsObjectContext(
+ pContext = new SchXMLRegressionCurveObjectContext(
mrImportHelper, GetImport(),
- nPrefix, rLocalName, msAutoStyleName,
- mrStyleList, m_xSeries,
- SchXMLStatisticsObjectContext::CONTEXT_TYPE_REGRESSION_CURVE,
- maChartSize, mrLSequencesPerIndex );
+ nPrefix, rLocalName, msAutoStyleName, mrRegressionStyleList,
+ m_xSeries, maChartSize );
break;
case XML_TOK_SERIES_ERROR_INDICATOR:
pContext = new SchXMLStatisticsObjectContext(
@@ -842,6 +846,70 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe
}
// static
+void SchXMLSeries2Context::setStylesToRegressionCurves(
+ SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles,
+ const SvXMLStylesContext* pStylesCtxt,
+ const SvXMLStyleContext*& rpStyle,
+ OUString& rCurrStyleName )
+{
+ std::list< RegressionStyle >::iterator iStyle;
+
+ // iterate over regession etc
+ for( iStyle = rSeriesDefaultsAndStyles.maRegressionStyleList.begin(); iStyle != rSeriesDefaultsAndStyles.maRegressionStyleList.end(); ++iStyle )
+ {
+ try
+ {
+ if( !(iStyle->msStyleName).isEmpty() )
+ {
+ if( !rCurrStyleName.equals( iStyle->msStyleName ) )
+ {
+ rCurrStyleName = iStyle->msStyleName;
+ rpStyle = pStylesCtxt->FindStyleChildContext(
+ SchXMLImportHelper::GetChartFamilyID(), rCurrStyleName );
+ }
+
+ XMLPropStyleContext* pPropStyleContext =
+ const_cast< XMLPropStyleContext* >(
+ dynamic_cast< const XMLPropStyleContext* >( rpStyle ));
+
+ if( pPropStyleContext )
+ {
+ uno::Any aAny = SchXMLTools::getPropertyFromContext("RegressionType", pPropStyleContext, pStylesCtxt);
+
+ if ( aAny.hasValue() )
+ {
+ OUString aServiceName;
+ aAny >>= aServiceName;
+
+ if( !aServiceName.isEmpty() )
+ {
+ Reference< lang::XMultiServiceFactory > xMSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
+ Reference< chart2::XRegressionCurve > xRegCurve( xMSF->createInstance( aServiceName ), uno::UNO_QUERY_THROW );
+ if( xRegCurve.is())
+ {
+ Reference< beans::XPropertySet > xCurveProperties( xRegCurve, uno::UNO_QUERY );
+ pPropStyleContext->FillPropertySet( xCurveProperties );
+
+ xRegCurve->setEquationProperties( iStyle->m_xEquationProperties );
+ }
+
+ Reference< chart2::XRegressionCurveContainer > xRegCurveCont( iStyle->m_xSeries, uno::UNO_QUERY_THROW );
+ xRegCurveCont->addRegressionCurve( xRegCurve );
+
+ }
+ }
+ }
+ }
+ }
+ catch( const uno::Exception & rEx )
+ {
+ SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx.Message );
+ }
+
+ }
+}
+
+// static
void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles
, const SvXMLStylesContext* pStylesCtxt
, const SvXMLStyleContext*& rpStyle
@@ -852,8 +920,7 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles
// iterate over regession etc
for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleList.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleList.end(); ++iStyle )
{
- if( iStyle->meType == DataRowPointStyle::REGRESSION ||
- iStyle->meType == DataRowPointStyle::ERROR_INDICATOR ||
+ if( iStyle->meType == DataRowPointStyle::ERROR_INDICATOR ||
iStyle->meType == DataRowPointStyle::MEAN_VALUE )
{
if ( iStyle->meType == DataRowPointStyle::ERROR_INDICATOR )
@@ -895,10 +962,6 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles
xSeriesProp->getPropertyValue(
OUString( "DataMeanValueProperties" )) >>= xStatPropSet;
break;
- case DataRowPointStyle::REGRESSION:
- xSeriesProp->getPropertyValue(
- OUString( "DataRegressionProperties" )) >>= xStatPropSet;
- break;
case DataRowPointStyle::ERROR_INDICATOR:
xSeriesProp->getPropertyValue(
OUString( "DataErrorProperties" )) >>= xStatPropSet;
@@ -910,18 +973,6 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles
pPropStyleContext->FillPropertySet( xStatPropSet );
}
}
-
- // set equation properties at a regression curve
- // note: this must be done after setting the regression
- // properties at the old API, otherwise the curve itself does
- // not exist here
- if( iStyle->meType == DataRowPointStyle::REGRESSION && iStyle->m_xEquationProperties.is())
- {
- SAL_WARN_IF( !iStyle->m_xSeries.is(), "xmloff.chart", "iStyle->m_xSeries is NULL");
- Reference< chart2::XRegressionCurve > xRegCurve( SchXMLTools::getRegressionCurve( iStyle->m_xSeries ));
- if( xRegCurve.is())
- xRegCurve->setEquationProperties( iStyle->m_xEquationProperties );
- }
}
catch( const uno::Exception & rEx )
{
diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx
index 44819bb..7503bc1 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.hxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.hxx
@@ -48,6 +48,8 @@ private:
::com::sun::star::chart2::XChartDocument > mxNewDoc;
::std::vector< SchXMLAxis >& mrAxes;
::std::list< DataRowPointStyle >& mrStyleList;
+ ::std::list< RegressionStyle >& mrRegressionStyleList;
+
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > m_xSeries;
sal_Int32 mnSeriesIndex;
sal_Int32 mnDataPointIndex;
@@ -77,6 +79,7 @@ public:
::com::sun::star::chart2::XChartDocument > & xNewDoc,
std::vector< SchXMLAxis >& rAxes,
::std::list< DataRowPointStyle >& rStyleList,
+ ::std::list< RegressionStyle >& rRegressionStyleList,
sal_Int32 nSeriesIndex,
sal_Bool bStockHasVolume,
GlobalSeriesImportInfo& rGlobalSeriesImportInfo,
@@ -112,6 +115,12 @@ public:
, const SvXMLStyleContext*& rpStyle
, OUString &rCurrStyleName );
+ static void setStylesToRegressionCurves(
+ SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles,
+ const SvXMLStylesContext* pStylesCtxt,
+ const SvXMLStyleContext*& rpStyle,
+ OUString &rCurrStyleName );
+
static void setStylesToDataPoints( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles
, const SvXMLStylesContext* pStylesCtxt
, const SvXMLStyleContext*& rpStyle
diff --git a/xmloff/source/chart/XMLRegressionTypePropertyHdl.cxx b/xmloff/source/chart/XMLRegressionTypePropertyHdl.cxx
new file mode 100644
index 0000000..62e1ef7
--- /dev/null
+++ b/xmloff/source/chart/XMLRegressionTypePropertyHdl.cxx
@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "XMLRegressionTypePropertyHdl.hxx"
+#include <xmloff/xmluconv.hxx>
+
+using namespace css;
+using namespace xmloff::token;
+
+XMLRegressionTypePropertyHdl::XMLRegressionTypePropertyHdl()
+{}
+
+XMLRegressionTypePropertyHdl::~XMLRegressionTypePropertyHdl()
+{}
+
+sal_Bool XMLRegressionTypePropertyHdl::importXML( const OUString& rStrImpValue,
+ uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
+{
+ OUString aServiceName;
+
+ if (IsXMLToken( rStrImpValue, XML_LINEAR ))
+ {
+ aServiceName = "com.sun.star.chart2.LinearRegressionCurve";
+ }
+ else if (IsXMLToken( rStrImpValue, XML_LOGARITHMIC))
+ {
+ aServiceName = "com.sun.star.chart2.LogarithmicRegressionCurve";
+ }
+ else if (IsXMLToken( rStrImpValue, XML_EXPONENTIAL))
+ {
+ aServiceName = "com.sun.star.chart2.ExponentialRegressionCurve";
+ }
+ else if (IsXMLToken( rStrImpValue, XML_POWER))
+ {
+ aServiceName = "com.sun.star.chart2.PotentialRegressionCurve";
+ }
+ else if (IsXMLToken( rStrImpValue, XML_POLYNOMIAL))
+ {
+ aServiceName = "com.sun.star.chart2.PolynomialRegressionCurve";
+ }
+ else if (IsXMLToken( rStrImpValue, XML_MOVING_AVERAGE))
+ {
+ aServiceName = "com.sun.star.chart2.MovingAverageRegressionCurve";
+ }
+ rValue <<= aServiceName;
+
+ return true;
+}
+
+sal_Bool XMLRegressionTypePropertyHdl::exportXML( OUString& /*rStrExpValue*/,
+ const uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
+{
+ return true;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLRegressionTypePropertyHdl.hxx b/xmloff/source/chart/XMLRegressionTypePropertyHdl.hxx
new file mode 100644
index 0000000..c53544f
--- /dev/null
+++ b/xmloff/source/chart/XMLRegressionTypePropertyHdl.hxx
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef _XMLREGRESSIONTYPEPROPERTYHDL_HXX_
+#define _XMLREGRESSIONTYPEPROPERTYHDL_HXX_
+
+#include <xmloff/xmlprhdl.hxx>
+
+class XMLRegressionTypePropertyHdl : public XMLPropertyHandler
+{
+public:
+ XMLRegressionTypePropertyHdl();
+ virtual ~XMLRegressionTypePropertyHdl();
+
+ virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+ virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
+};
+
+#endif // _XMLERRORBARSTYLEPROPERTYHDL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx
index 92efcae..65afd19 100644
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -151,6 +151,23 @@ struct GlobalSeriesImportInfo
sal_Int32 nFirstSecondDomainIndex;
};
+struct RegressionStyle
+{
+ com::sun::star::uno::Reference<
+ com::sun::star::chart2::XDataSeries > m_xSeries;
+ com::sun::star::uno::Reference<
+ com::sun::star::beans::XPropertySet > m_xEquationProperties;
+
+ OUString msStyleName;
+
+ RegressionStyle(const com::sun::star::uno::Reference<
+ com::sun::star::chart2::XDataSeries >& xSeries,
+ OUString sStyleName) :
+ m_xSeries ( xSeries ),
+ msStyleName ( sStyleName )
+ {}
+};
+
struct DataRowPointStyle
{
enum StyleType
@@ -158,21 +175,22 @@ struct DataRowPointStyle
DATA_POINT,
DATA_SERIES,
MEAN_VALUE,
- REGRESSION,
ERROR_INDICATOR
};
StyleType meType;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDataSeries > m_xSeries;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > m_xOldAPISeries;
+ com::sun::star::uno::Reference<
+ com::sun::star::chart2::XDataSeries > m_xSeries;
+
+ com::sun::star::uno::Reference<
+ com::sun::star::beans::XPropertySet > m_xOldAPISeries;
+
com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet > m_xErrorXProperties;
+
com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet > m_xErrorYProperties;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > m_xEquationProperties;
+
sal_Int32 m_nPointIndex;
sal_Int32 m_nPointRepeat;
OUString msStyleName;
@@ -181,8 +199,8 @@ struct DataRowPointStyle
bool mbSymbolSizeForSeriesIsMissingInFile;
DataRowPointStyle( StyleType eType
- , const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDataSeries >& xSeries
+ , const com::sun::star::uno::Reference<
+ com::sun::star::chart2::XDataSeries >& xSeries
, sal_Int32 nPointIndex
, sal_Int32 nPointRepeat
, OUString sStyleName
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 2dfbe31..85e153e 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1225,6 +1225,7 @@ namespace xmloff { namespace token {
TOKEN( "movement", XML_MOVEMENT ),
TOKEN( "movement-cut-off", XML_MOVEMENT_CUT_OFF ),
TOKEN( "mover", XML_MOVER ),
+ TOKEN( "moving-average", XML_MOVING_AVERAGE ),
TOKEN( "mpadded", XML_MPADDED ),
TOKEN( "mphantom", XML_MPHANTOM ),
TOKEN( "mprescripts", XML_MPRESCRIPTS ),
commit f5783bdecf9f67094812c66ecd5cedc43db6f806
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Jun 2 22:29:24 2013 +0200
clang, -Wunused-private-field
Change-Id: I8aa3d67c50a7b248cfdefb9a3152afd259b8ebbd
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 997e198..2082bc9 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -48,7 +48,6 @@ class ScFormulaDlg : public formula::FormulaDlg,
public IAnyRefDialog
{
ScFormulaReferenceHelper m_aHelper;
- ScFormulaCell* pCell;
::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> m_xParser;
::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper;
commit 4984ae8f2a9a215d08d87f65cfeecaf72355aebb
Author: Andras Timar <atimar at suse.com>
Date: Sun Jun 2 22:18:27 2013 +0200
Updated core
Project: dictionaries 721ecacc70123ccb748e9b2c13b30dfcc671cb2f
diff --git a/dictionaries b/dictionaries
index 0bc4511..721ecac 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 0bc4511b6060f68b422630c136a2e224e7ab3c8d
+Subproject commit 721ecacc70123ccb748e9b2c13b30dfcc671cb2f
commit 0a23ed06efba71d919381074dbbb4aa50c0b8b3c
Author: Andras Timar <atimar at suse.com>
Date: Sun Jun 2 22:16:42 2013 +0200
Updated core
Project: translations 388a988b3a02f0bbd68c91520503fca3b7f53d04
diff --git a/translations b/translations
index f354669..388a988 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f3546694e706114bcccd978f444f0800a382dbf9
+Subproject commit 388a988b3a02f0bbd68c91520503fca3b7f53d04
commit 025b87692ec06a6f824b21d080b3a4439ee84a75
Author: Michael Stahl <mstahl at redhat.com>
Date: Sun Jun 2 16:37:40 2013 +0200
jvmfwk: de-Pascalize do_msvcr71_magic
The uninitialized Module variable causes the smoketest to fail when
built with MSVC 2012 (assinging to it raises some weird exception).
Change-Id: I77b3b591a94f4dfbb373938e3787f75e6a8e09c5
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index f9528b0..981b827 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -482,20 +482,15 @@ static void load_msvcr71(LPCWSTR jvm_dll)
// and just let the implicit loading try to take care of it.
static void do_msvcr71_magic(rtl_uString *jvm_dll)
{
- FILE *f;
- rtl_uString* Module;
- oslFileError nError;
+ rtl_uString* Module(0);
struct stat st;
- PIMAGE_DOS_HEADER dos_hdr;
- IMAGE_NT_HEADERS *nt_hdr;
- IMAGE_IMPORT_DESCRIPTOR *imports;
- nError = osl_getSystemPathFromFileURL(jvm_dll, &Module);
+ oslFileError nError = osl_getSystemPathFromFileURL(jvm_dll, &Module);
if ( osl_File_E_None != nError )
rtl_uString_assign(&Module, jvm_dll);
- f = _wfopen(reinterpret_cast<LPCWSTR>(Module->buffer), L"rb");
+ FILE *f = _wfopen(reinterpret_cast<LPCWSTR>(Module->buffer), L"rb");
if (fstat(fileno(f), &st) == -1)
{
@@ -503,7 +498,7 @@ static void do_msvcr71_magic(rtl_uString *jvm_dll)
return;
}
- dos_hdr = (PIMAGE_DOS_HEADER) malloc(st.st_size);
+ PIMAGE_DOS_HEADER dos_hdr = (PIMAGE_DOS_HEADER) malloc(st.st_size);
if (fread(dos_hdr, st.st_size, 1, f) != 1 ||
memcmp(dos_hdr, "MZ", 2) != 0 ||
@@ -517,9 +512,10 @@ static void do_msvcr71_magic(rtl_uString *jvm_dll)
fclose(f);
- nt_hdr = (IMAGE_NT_HEADERS *) ((char *)dos_hdr + dos_hdr->e_lfanew);
+ IMAGE_NT_HEADERS *nt_hdr = (IMAGE_NT_HEADERS *) ((char *)dos_hdr + dos_hdr->e_lfanew);
- imports = (IMAGE_IMPORT_DESCRIPTOR *) ((char *) dos_hdr + nt_hdr->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress);
+ IMAGE_IMPORT_DESCRIPTOR *imports =
+ (IMAGE_IMPORT_DESCRIPTOR *) ((char *) dos_hdr + nt_hdr->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress);
while (imports <= (IMAGE_IMPORT_DESCRIPTOR *) ((char *) dos_hdr + st.st_size - sizeof (IMAGE_IMPORT_DESCRIPTOR)) &&
imports->Name != 0 &&
commit 26f0d9e41caaee7b3f7cb338f170951936f1ab5d
Author: Michael Stahl <mstahl at redhat.com>
Date: Sun Jun 2 13:26:30 2013 +0200
mysqlcppconn: MSVC 2010 finally has grown a stdint.h
Change-Id: I5b8d948aad94ba492075245c18c8ed781baa469e
diff --git a/mysqlcppconn/config.h b/mysqlcppconn/config.h
index 19cf389..e30a0cb 100644
--- a/mysqlcppconn/config.h
+++ b/mysqlcppconn/config.h
@@ -5,10 +5,12 @@
#define HAVE_FUNCTION_STRTOL 1
#define HAVE_FUNCTION_STRTOULL 1
-#if defined(MACOSX) || defined(SOLARIS) || defined(LINUX)
+#if defined(MACOSX) || defined(SOLARIS) || defined(LINUX) || (defined _MSC_VER && _MSC_VER >= 1600)
#define HAVE_STDINT_H
+#ifndef _MSC_VER
#define HAVE_INTTYPES_H
#endif
+#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
commit 5a724595364f2af72cde33b603b9c3a393c514d0
Author: Michael Stahl <mstahl at redhat.com>
Date: Sun Jun 2 13:24:23 2013 +0200
configure: fix warning about missing test parameter
Change-Id: I9478a0c3703f5c9c6341f60db13eade195d074b4
diff --git a/configure.ac b/configure.ac
index 54ef307..6bf8c1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7397,7 +7397,7 @@ no|disable)
AC_MSG_RESULT([none])
;;
""|yes|auto)
- if test "$DISABLE_SCRIPTING" = TRUE -a -n $PYTHON_FOR_BUILD; then
+ if test "$DISABLE_SCRIPTING" = TRUE -a -n "$PYTHON_FOR_BUILD"; then
AC_MSG_RESULT([no, overridden by --disable-scripting])
enable_python=no
elif test $build_os = cygwin; then
commit baca147c8448ecf20adcfe431b2f623222ac5c11
Author: Matthias Freund <matti_lx at yahoo.de>
Date: Sun Jun 2 00:09:56 2013 +0200
fdo#39468 Comment translation GER-ENG in sw/source/ui/uno
Cleanups and translations.
Change-Id: Ia5ef91c120354ed868a69c3dbfc9cebe0fd61bab
Reviewed-on: https://gerrit.libreoffice.org/4129
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index ebe5aeb..ecd96a3 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -43,8 +43,6 @@ bool IsDocShellRegistered()
return SvtModuleOptions().IsWriter();
}
-//-------------------------------------------------------------------------
-
sal_uLong SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter )
{
sal_uLong nRet = ERRCODE_NONE;
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index d495848..3a180d6 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -112,7 +112,7 @@ uno::Type SwXAutoTextContainer::getElementType(void) throw( uno::RuntimeExceptio
sal_Bool SwXAutoTextContainer::hasElements(void) throw( uno::RuntimeException )
{
- //zumindest Standard sollte es immer geben!
+ // At least standard should always exists!
return sal_True;
}
@@ -142,15 +142,13 @@ uno::Sequence< OUString > SwXAutoTextContainer::getElementNames(void) throw( uno
for ( sal_uInt16 i = 0; i < nCount; i++ )
{
- // Die Namen werden ohne Pfad-Extension weitergegeben
+ // The names will be passed without a path extension.
String sGroupName(pGlossaries->GetGroupName(i));
pArr[i] = sGroupName.GetToken(0, GLOS_DELIM);
}
return aGroupNames;
}
-/*-----------------------------------------------------------------------
- findet Gruppennamen mit und ohne Pfadindex
- -----------------------------------------------------------------------*/
+// Finds group names with or without path index.
sal_Bool SwXAutoTextContainer::hasByName(const OUString& Name)
throw( uno::RuntimeException )
{
@@ -199,7 +197,7 @@ uno::Reference< text::XAutoTextGroup > SwXAutoTextContainer::insertNewByName(
uno::Reference< text::XAutoTextGroup > xGroup = pGlossaries->GetAutoTextGroup( sGroup, true );
OSL_ENSURE( xGroup.is(), "SwXAutoTextContainer::insertNewByName: no UNO object created? How this?" );
- // we just inserted the group into the glossaries, so why doesn't it exist?
+ // We just inserted the group into the glossaries, so why doesn't it exist?
return xGroup;
}
@@ -208,7 +206,7 @@ void SwXAutoTextContainer::removeByName(const OUString& aGroupName)
throw( container::NoSuchElementException, uno::RuntimeException )
{
SolarMutexGuard aGuard;
- //zunaechst den Namen mit Pfad-Extension finden
+ // At first find the name with path extension
String sGroupName = pGlossaries->GetCompleteGroupName( aGroupName );
if(!sGroupName.Len())
throw container::NoSuchElementException();
@@ -403,7 +401,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const
SwDoc* pGDoc = pGlosGroup->GetDoc();
- // Bis es eine Option dafuer gibt, base util::URL loeschen
+ // Until there is an option for that, delete base util::URL
if(rCfg.IsSaveRelFile())
{
INetURLObject aTemp(pGlosGroup->GetFileName());
@@ -1127,7 +1125,4 @@ void SwAutoTextEventDescriptor::getByName(
}
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index 2f3e4ec..fecb485 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -70,7 +70,6 @@
#include <unomid.h>
-
#define SN_MAIL_MERGE "com.sun.star.text.MailMerge"
#define SN_DATA_ACCESS_DESCRIPTOR "com.sun.star.sdb.DataAccessDescriptor"
@@ -82,20 +81,14 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::text;
using namespace SWUnoHelper;
-////////////////////////////////////////////////////////////
-
typedef ::utl::SharedUNOComponent< XInterface > SharedComponent;
-////////////////////////////////////////////////////////////
-
osl::Mutex & GetMailMergeMutex()
{
static osl::Mutex aMutex;
return aMutex;
}
-////////////////////////////////////////////////////////////
-
enum CloseResult
{
eSuccess, // successfully closed
@@ -136,8 +129,6 @@ static CloseResult CloseModelAndDocSh(
return eResult;
}
-////////////////////////////////////////////////////////////
-
static bool LoadFromURL_impl(
Reference< frame::XModel > &rxModel,
SfxObjectShellRef &rxDocSh,
@@ -192,7 +183,6 @@ static bool LoadFromURL_impl(
return bRes;
}
-//==========================================================
namespace
{
class DelayedFileDeletion : public ::cppu::WeakImplHelper1< util::XCloseListener >
@@ -227,7 +217,6 @@ namespace
DelayedFileDeletion& operator=( const DelayedFileDeletion& ); // never implemented
};
- //------------------------------------------------------
DelayedFileDeletion::DelayedFileDeletion( const Reference< XModel >& _rxModel, const String& _rTemporaryFile )
:
m_xDocument( _rxModel, UNO_QUERY )
@@ -254,7 +243,6 @@ namespace
osl_atomic_decrement( &m_refCount );
}
- //--------------------------------------------------------------------
IMPL_LINK_NOARG(DelayedFileDeletion, OnTryDeleteFile)
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -296,7 +284,6 @@ namespace
return 0L;
}
- //--------------------------------------------------------------------
void DelayedFileDeletion::implTakeOwnership( )
{
// revoke ourself as listener
@@ -315,7 +302,6 @@ namespace
m_aDeleteTimer.Start( );
}
- //--------------------------------------------------------------------
void SAL_CALL DelayedFileDeletion::queryClosing( const EventObject& , sal_Bool _bGetsOwnership ) throw (util::CloseVetoException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -327,7 +313,6 @@ namespace
throw util::CloseVetoException( );
}
- //--------------------------------------------------------------------
void SAL_CALL DelayedFileDeletion::notifyClosing( const EventObject& ) throw (RuntimeException)
{
OSL_FAIL("DelayedFileDeletion::notifyClosing: how this?" );
@@ -336,7 +321,6 @@ namespace
// Or, we ourself close the document, then we should not be a listener anymore
}
- //------------------------------------------------------
void SAL_CALL DelayedFileDeletion::disposing( const EventObject& ) throw (RuntimeException)
{
OSL_FAIL("DelayedFileDeletion::disposing: how this?" );
@@ -345,14 +329,11 @@ namespace
// Or, we ourself close the document, then we should not be a listener anymore
}
- //------------------------------------------------------
DelayedFileDeletion::~DelayedFileDeletion( )
{
}
}
-////////////////////////////////////////////////////////////
-
static bool DeleteTmpFile_Impl(
Reference< frame::XModel > &rxModel,
SfxObjectShellRef &rxDocSh,
@@ -389,8 +370,6 @@ static bool DeleteTmpFile_Impl(
return bRes;
}
-////////////////////////////////////////////////////////////
-
SwXMailMerge::SwXMailMerge() :
aEvtListeners ( GetMailMergeMutex() ),
aMergeListeners ( GetMailMergeMutex() ),
@@ -408,7 +387,7 @@ SwXMailMerge::SwXMailMerge() :
xDocSh->DoInitNew( 0 );
SfxViewFrame *pFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
SwView *pView = (SwView*) pFrame->GetViewShell();
- pView->AttrChangedNotify( &pView->GetWrtShell() );//Damit SelectShell gerufen wird.
+ pView->AttrChangedNotify( &pView->GetWrtShell() );//So that SelectShell is called.
xModel = pDocShell->GetModel();
@@ -444,11 +423,10 @@ uno::Any SAL_CALL SwXMailMerge::execute(
{
SolarMutexGuard aGuard;
- //
// get property values to be used
// (use values from the service as default and override them with
// the values that are provided as arguments)
- //
+
uno::Sequence< uno::Any > aCurSelection = aSelection;
uno::Reference< sdbc::XResultSet > xCurResultSet = xResultSet;
uno::Reference< sdbc::XConnection > xCurConnection = xConnection;
@@ -464,9 +442,9 @@ uno::Any SAL_CALL SwXMailMerge::execute(
sal_Bool bCurEscapeProcessing = bEscapeProcessing;
sal_Bool bCurSinglePrintJobs = bSinglePrintJobs;
sal_Bool bCurFileNameFromColumn = bFileNameFromColumn;
- //
+
SfxObjectShellRef xCurDocSh = xDocSh; // the document
- //
+
const beans::NamedValue *pArguments = rArguments.getConstArray();
sal_Int32 nArgs = rArguments.getLength();
for (sal_Int32 i = 0; i < nArgs; ++i)
@@ -615,7 +593,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
// while still in Update of Sfx.
// (GetSelection in Update is not allowed)
if (!aCurDocumentURL.isEmpty())
- pView->AttrChangedNotify( &pView->GetWrtShell() );//Damit SelectShell gerufen wird.
+ pView->AttrChangedNotify( &pView->GetWrtShell() );//So that SelectShell is called.
SharedComponent aRowSetDisposeHelper;
if (!xCurResultSet.is())
@@ -772,7 +750,6 @@ uno::Any SAL_CALL SwXMailMerge::execute(
}
}
-
// save document with temporary filename
const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat(
OUString( FILTER_XML ),
@@ -1196,8 +1173,6 @@ uno::Sequence< OUString > SAL_CALL SwXMailMerge::getSupportedServiceNames()
return SwXMailMerge_getSupportedServiceNames();
}
-////////////////////////////////////////////////////////////
-
uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames()
throw()
{
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index 54423f6..bb1115b 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -189,9 +189,6 @@ static ChainablePropertySetInfo * lcl_createPrintSettingsInfo()
return new ChainablePropertySetInfo ( aPrintSettingsMap_Impl );
}
-/******************************************************************
- * SwXModule
- ******************************************************************/
Reference< uno::XInterface > SAL_CALL SwXModule_createInstance(
const Reference< XMultiServiceFactory > & /*rSMgr*/) throw( Exception )
{
@@ -268,9 +265,6 @@ Sequence< OUString > SwXModule::getSupportedServiceNames(void) throw( RuntimeExc
return SwXModule_getSupportedServiceNames();
}
-/******************************************************************
- * SwXPrintSettings
- ******************************************************************/
SwXPrintSettings::SwXPrintSettings(SwXPrintSettingsType eType, SwDoc* pDoc)
: ChainableHelperNoState ( lcl_createPrintSettingsInfo (), &Application::GetSolarMutex() )
, meType(eType)
commit e6fb2d2fb413a0023bb9ddcdce5c54eb07034838
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sun Jun 2 17:47:57 2013 +0200
remove unused variable
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index a2fcc11..8d77350 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -773,7 +773,6 @@ void ScTransferObj::StripRefs( ScDocument* pDoc,
return;
}
- SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
ScRange aRef;
ScCellIterator aIter( pDoc, ScRange(nStartX, nStartY, nSrcTab, nEndX, nEndY, nSrcTab) );
commit 42443f6e0e5cedf459b1b54e14c745e6eb93e22f
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Sun Jun 2 16:30:52 2013 +0200
fix plugin build with clang < 3.3
Change-Id: If2eb7595ca7d25f6d491e332bb3060061d3b42a7
diff --git a/compilerplugins/clang/checkconfigmacros.cxx b/compilerplugins/clang/checkconfigmacros.cxx
index 8524d7b..86b7e43 100644
--- a/compilerplugins/clang/checkconfigmacros.cxx
+++ b/compilerplugins/clang/checkconfigmacros.cxx
@@ -32,7 +32,7 @@ class CheckConfigMacros
public:
explicit CheckConfigMacros( CompilerInstance& compiler );
virtual void run() override;
-#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 2
+#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 3
virtual void MacroDefined( const Token& macroToken, const MacroInfo* info ) override;
virtual void MacroUndefined( const Token& macroToken, const MacroInfo* info ) override;
virtual void Ifdef( SourceLocation location, const Token& macroToken ) override;
@@ -61,7 +61,7 @@ void CheckConfigMacros::run()
// nothing, only check preprocessor usage
}
-#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 2
+#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 3
void CheckConfigMacros::MacroDefined( const Token& macroToken, const MacroInfo* info )
{
SourceLocation location = info->getDefinitionLoc();
@@ -80,7 +80,7 @@ void CheckConfigMacros::MacroDefined( const Token& macroToken, const MacroDirect
}
}
-#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 2
+#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 3
void CheckConfigMacros::MacroUndefined( const Token& macroToken, const MacroInfo* )
#else
void CheckConfigMacros::MacroUndefined( const Token& macroToken, const MacroDirective* )
@@ -89,7 +89,7 @@ void CheckConfigMacros::MacroUndefined( const Token& macroToken, const MacroDire
configMacros.erase( macroToken.getIdentifierInfo()->getName());
}
-#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 2
+#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 3
void CheckConfigMacros::Ifdef( SourceLocation location, const Token& macroToken )
#else
void CheckConfigMacros::Ifdef( SourceLocation location, const Token& macroToken, const MacroDirective* )
@@ -98,7 +98,7 @@ void CheckConfigMacros::Ifdef( SourceLocation location, const Token& macroToken,
checkMacro( macroToken, location );
}
-#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 2
+#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 3
void CheckConfigMacros::Ifndef( SourceLocation location, const Token& macroToken )
#else
void CheckConfigMacros::Ifndef( SourceLocation location, const Token& macroToken, const MacroDirective* )
@@ -107,7 +107,7 @@ void CheckConfigMacros::Ifndef( SourceLocation location, const Token& macroToken
checkMacro( macroToken, location );
}
-#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 2
+#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 3
void CheckConfigMacros::Defined( const Token& macroToken )
#else
void CheckConfigMacros::Defined( const Token& macroToken, const MacroDirective* )
commit cc4666286d64c91d82d8d7099f3e474543d9b5b7
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sun Jun 2 06:57:28 2013 +0200
fix Werror tinderbox problem
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 52969b2..82713a7 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -55,8 +55,8 @@ Deck::Deck (
maIcon(),
msIconURL(rDeckDescriptor.msIconURL),
msHighContrastIconURL(rDeckDescriptor.msHighContrastIconURL),
- maPanels(),
mnMinimalWidth(0),
+ maPanels(),
mpTitleBar(new DeckTitleBar(rDeckDescriptor.msTitle, this, rCloserAction)),
mpScrollClipWindow(new Window(this)),
mpScrollContainer(new ScrollContainerWindow(mpScrollClipWindow.get())),
commit 5936692c4bdb7efe15dda58914cae14a77da62f7
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sun Jun 2 04:46:58 2013 +0200
sidebar: Restrict the minimal width of the sidebar.
Change-Id: I99051830c4393b420125332e787c3abdc5a6aa61
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 330533a..a7e8db1 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -97,6 +97,8 @@ public:
// XSidebarPanel
virtual css::ui::LayoutSize SAL_CALL getHeightForWidth (sal_Int32 nWidth)
throw(cssu::RuntimeException);
+ virtual sal_Int32 SAL_CALL getMinimalWidth ()
+ throw(cssu::RuntimeException);
protected:
cssu::Reference<css::frame::XFrame> mxFrame;
diff --git a/offapi/com/sun/star/ui/XSidebarPanel.idl b/offapi/com/sun/star/ui/XSidebarPanel.idl
index 1852c97..25d3f95 100644
--- a/offapi/com/sun/star/ui/XSidebarPanel.idl
+++ b/offapi/com/sun/star/ui/XSidebarPanel.idl
@@ -51,6 +51,10 @@ interface XSidebarPanel
The height is set via the XWindow interface.
*/
LayoutSize getHeightForWidth ( [in] long nWidth);
+
+ /** Minimal possible width of this panel.
+ */
+ long getMinimalWidth();
} ;
} ; } ; } ; } ;
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 9a16ad5..52969b2 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -56,6 +56,7 @@ Deck::Deck (
msIconURL(rDeckDescriptor.msIconURL),
msHighContrastIconURL(rDeckDescriptor.msHighContrastIconURL),
maPanels(),
+ mnMinimalWidth(0),
mpTitleBar(new DeckTitleBar(rDeckDescriptor.msTitle, this, rCloserAction)),
mpScrollClipWindow(new Window(this)),
mpScrollContainer(new ScrollContainerWindow(mpScrollClipWindow.get())),
@@ -294,8 +295,11 @@ const SharedPanelContainer& Deck::GetPanels (void) const
void Deck::RequestLayout (void)
{
+ mnMinimalWidth = 0;
+
DeckLayouter::LayoutDeck(
GetContentArea(),
+ mnMinimalWidth,
maPanels,
*GetTitleBar(),
*mpScrollClipWindow,
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index f49d38f..0dc86ff 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -75,6 +75,8 @@ public:
void PrintWindowTree (const ::std::vector<Panel*>& rPanels);
static void PrintWindowSubTree (Window* pRoot, int nIndentation);
+ sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; }
+
class ScrollContainerWindow : public Window
{
public:
@@ -92,6 +94,7 @@ private:
Image maIcon;
const ::rtl::OUString msIconURL;
const ::rtl::OUString msHighContrastIconURL;
+ sal_Int32 mnMinimalWidth;
SharedPanelContainer maPanels;
::boost::scoped_ptr<DeckTitleBar> mpTitleBar;
::boost::scoped_ptr<Window> mpScrollClipWindow;
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index d68ae29..858fe93 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -47,6 +47,7 @@ namespace {
void DeckLayouter::LayoutDeck (
const Rectangle aContentArea,
+ sal_Int32& rMinimalWidth,
SharedPanelContainer& rPanels,
Window& rDeckTitleBar,
Window& rScrollClipWindow,
@@ -70,6 +71,7 @@ void DeckLayouter::LayoutDeck (
}
aBox = LayoutPanels(
aBox,
+ rMinimalWidth,
aLayoutItems,
rScrollClipWindow,
rScrollContainer,
@@ -84,6 +86,7 @@ void DeckLayouter::LayoutDeck (
Rectangle DeckLayouter::LayoutPanels (
const Rectangle aContentArea,
+ sal_Int32& rMinimalWidth,
::std::vector<LayoutItem>& rLayoutItems,
Window& rScrollClipWindow,
Window& rScrollContainer,
@@ -98,7 +101,7 @@ Rectangle DeckLayouter::LayoutPanels (
// height that is left when all panel titles and separators are
// taken into account.
sal_Int32 nAvailableHeight (aBox.GetHeight());
- GetRequestedSizes(rLayoutItems, nAvailableHeight, aBox);
+ GetRequestedSizes(rLayoutItems, nAvailableHeight, rMinimalWidth, aBox);
const sal_Int32 nTotalDecorationHeight (aBox.GetHeight() - nAvailableHeight);
// Analyze the requested heights.
@@ -120,6 +123,7 @@ Rectangle DeckLayouter::LayoutPanels (
// Show a vertical scrollbar.
return LayoutPanels(
aContentArea,
+ rMinimalWidth,
rLayoutItems,
rScrollClipWindow,
rScrollContainer,
@@ -284,6 +288,7 @@ sal_Int32 DeckLayouter::PlacePanels (
void DeckLayouter::GetRequestedSizes (
::std::vector<LayoutItem>& rLayoutItems,
sal_Int32& rAvailableHeight,
+ sal_Int32& rMinimalWidth,
const Rectangle& rContentBox)
{
rAvailableHeight = rContentBox.GetHeight();
@@ -316,7 +321,13 @@ void DeckLayouter::GetRequestedSizes (
{
Reference<ui::XSidebarPanel> xPanel (iItem->mpPanel->GetPanelComponent());
if (xPanel.is())
+ {
aLayoutSize = xPanel->getHeightForWidth(rContentBox.GetWidth());
+
+ sal_Int32 nWidth = xPanel->getMinimalWidth();
+ if (nWidth > rMinimalWidth)
+ rMinimalWidth = nWidth;
+ }
else
aLayoutSize = ui::LayoutSize(MinimalPanelHeight, -1, 0);
}
diff --git a/sfx2/source/sidebar/DeckLayouter.hxx b/sfx2/source/sidebar/DeckLayouter.hxx
index e1df7f2..a284c08 100644
--- a/sfx2/source/sidebar/DeckLayouter.hxx
+++ b/sfx2/source/sidebar/DeckLayouter.hxx
@@ -44,6 +44,7 @@ class DeckLayouter
public:
static void LayoutDeck (
const Rectangle aContentArea,
+ sal_Int32& rMinimalWidth,
SharedPanelContainer& rPanels,
Window& pDeckTitleBar,
Window& pScrollClipWindow,
@@ -78,6 +79,7 @@ private:
};
static Rectangle LayoutPanels (
const Rectangle aContentArea,
+ sal_Int32& rMinimalWidth,
::std::vector<LayoutItem>& rLayoutItems,
Window& rScrollClipWindow,
Window& rScrollContainer,
@@ -86,6 +88,7 @@ private:
static void GetRequestedSizes (
::std::vector<LayoutItem>& rLayoutItem,
sal_Int32& rAvailableHeight,
+ sal_Int32& rMinimalWidth,
const Rectangle& rContentBox);
static void DistributeHeights (
::std::vector<LayoutItem>& rLayoutItems,
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index bce2f6f..970e96a 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -272,9 +272,13 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv
void SAL_CALL SidebarController::requestLayout (void)
throw(cssu::RuntimeException)
{
+ sal_Int32 nMinimalWidth = 0;
if (mpCurrentDeck)
+ {
mpCurrentDeck->RequestLayout();
- RestrictWidth();
+ nMinimalWidth = mpCurrentDeck->GetMinimalWidth();
+ }
+ RestrictWidth(nMinimalWidth);
}
@@ -340,14 +344,16 @@ void SidebarController::NotifyResize (void)
mpTabBar->Show();
// Determine if the closer of the deck can be shown.
+ sal_Int32 nMinimalWidth = 0;
if (mpCurrentDeck)
{
DeckTitleBar* pTitleBar = mpCurrentDeck->GetTitleBar();
if (pTitleBar != NULL && pTitleBar->IsVisible())
pTitleBar->SetCloserVisible(CanModifyChildWindowWidth());
+ nMinimalWidth = mpCurrentDeck->GetMinimalWidth();
}
- RestrictWidth();
+ RestrictWidth(nMinimalWidth);
}
@@ -1050,7 +1056,7 @@ sal_Int32 SidebarController::SetChildWindowWidth (const sal_Int32 nNewWidth)
-void SidebarController::RestrictWidth (void)
+void SidebarController::RestrictWidth (sal_Int32 nWidth)
{
SfxSplitWindow* pSplitWindow = GetSplitWindow();
if (pSplitWindow != NULL)
@@ -1059,7 +1065,7 @@ void SidebarController::RestrictWidth (void)
const sal_uInt16 nSetId (pSplitWindow->GetSet(nId));
pSplitWindow->SetItemSizeRange(
nSetId,
- Range(TabBar::GetDefaultWidth(), gnMaximumSidebarWidth));
+ Range(TabBar::GetDefaultWidth() + nWidth, gnMaximumSidebarWidth));
}
}
diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index 5f2c82b..bdebeb8 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -213,7 +213,7 @@ private:
void UpdateTitleBarIcons (void);
void UpdateDeckOpenState (void);
- void RestrictWidth (void);
+ void RestrictWidth (sal_Int32 nWidth);
SfxSplitWindow* GetSplitWindow (void);
void ProcessNewWidth (const sal_Int32 nNewWidth);
void UpdateCloseIndicator (const bool bIsIndicatorVisible);
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 263e970..a4e037a 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -248,4 +248,15 @@ ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWi
return ui::LayoutSize(0,0,0);
}
+sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth () throw(cssu::RuntimeException)
+{
+ if (isLayoutEnabled(mpControl))
+ {
+ // widget layout-based sidebar
+ Size aSize(mpControl->GetOptimalSize());
+ return aSize.Width();
+ }
+ return 0;
+}
+
} } // end of namespace sfx2::sidebar
commit 6dd50b81297c95cd2f7bc0731aa6f23f64e5ee5c
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sun Jun 2 03:56:28 2013 +0200
sidebar: Don't overlap widgets in the .ui based panels.
Change-Id: I32c978188a38d54f2b05d40b5d47b9d5520f3cca
diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx
index 03ff130..568f151 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -26,6 +26,10 @@ Size PanelLayout::GetOptimalSize() const
void PanelLayout::setPosSizePixel(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags)
{
+ Size aSize(GetOptimalSize());
+ nWidth = std::max(nWidth,aSize.Width());
+ nHeight = std::max(nHeight,aSize.Height());
+
Control::setPosSizePixel(nX, nY, nWidth, nHeight, nFlags);
if (isLayoutEnabled(this) && (nFlags & WINDOW_POSSIZE_SIZE))
commit ffaf62fcc33f7b265e8819aac9ff2a70ce2fb544
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sun Jun 2 02:10:34 2013 +0200
sidebar: Convert TextPropertyPanel to .ui + adapt code.
Change-Id: I1e446ca520b10f0fba4f79d2e840d10835850f66
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 75d0e67..9e3c2cf 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/redlinecontrol \
svx/uiconfig/ui/redlinefilterpage \
svx/uiconfig/ui/redlineviewpage \
+ svx/uiconfig/ui/sidebartextpanel \
))
# vim: set noet sw=4 ts=4:
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.cxx b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
index 1137617..f5ca5c3 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.cxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
@@ -93,6 +93,22 @@ SvxSBFontNameBox::SvxSBFontNameBox( Window* pParent, const ResId& rResId ) :
// StartListening( *SFX_APP() );
}
+SvxSBFontNameBox::SvxSBFontNameBox( Window* pParent ) :
+ FontNameBox ( pParent, WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP|WB_DROPDOWN )
+, pFontList ( NULL )
+, nFtCount ( 0 )
+, pBindings(NULL)
+{
+ EnableControls_Impl();
+ EnableAutoSize(true);
+// StartListening( *SFX_APP() );
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxSBFontNameBox(Window *pParent)
+{
+ return new SvxSBFontNameBox(pParent);
+}
+
void SvxSBFontNameBox::EnableControls_Impl()
{
SvtFontOptions aFontOpt;
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.hxx b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
index 82289e3..7470f06 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.hxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
@@ -58,7 +58,8 @@ protected:
virtual void Select();
public:
- SvxSBFontNameBox( Window* pParent, const ResId& rResId );
+ SvxSBFontNameBox( Window* pParent, const ResId& rResId );
+ SvxSBFontNameBox( Window* pParent );
void FillList();
sal_uInt16 GetListCount() { return nFtCount; }
void Clear() { FontNameBox::Clear(); nFtCount = 0; }
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 258a730..abb05a5 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -63,6 +63,20 @@ using namespace cssu;
using ::sfx2::sidebar::Theme;
using ::sfx2::sidebar::ControlFactory;
+const char UNO_BACKCOLOR[] = ".uno:BackColor";
+const char UNO_BOLD[] = ".uno:Bold";
+const char UNO_COLOR[] = ".uno:Color";
+const char UNO_FONTCOLOR[] = ".uno:FontColor";
+const char UNO_GROW[] = ".uno:Grow";
+const char UNO_ITALIC[] = ".uno:Italic";
+const char UNO_STRIKEOUT[] = ".uno:Strikeout";
+const char UNO_SHADOWED[] = ".uno:Shadowed";
+const char UNO_SHRINK[] = ".uno:Shrink";
+const char UNO_SPACING[] = ".uno:Spacing";
+const char UNO_SUBSCRIPT[] = ".uno:SubScript";
+const char UNO_SUPERSCRIPT[] = ".uno:SuperScript";
+const char UNO_UNDERLINE[] = ".uno:Underline";
+
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
namespace svx { namespace sidebar {
@@ -116,52 +130,8 @@ TextPropertyPanel* TextPropertyPanel::Create (
return maSpacingControl;
}
-TextPropertyPanel::TextPropertyPanel (
- Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
- SfxBindings* pBindings,
- const ::sfx2::sidebar::EnumContext& rContext)
- : Control(pParent, SVX_RES(RID_SIDEBAR_TEXT_PANEL)),
- mpFontNameBox (new SvxSBFontNameBox(this, SVX_RES(CB_SBFONT_FONT))),
- maFontSizeBox (this, SVX_RES(MB_SBFONT_FONTSIZE)),
- mpToolBoxFontBackground(ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxFont(ControlFactory::CreateToolBox(
- mpToolBoxFontBackground.get(),
- SVX_RES(TB_FONT))),
- mpToolBoxIncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxIncDec(ControlFactory::CreateToolBox(
- mpToolBoxIncDecBackground.get(),
- SVX_RES(TB_INCREASE_DECREASE))),
- mpToolBoxScriptBackground(ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxScript(ControlFactory::CreateToolBox(
- mpToolBoxScriptBackground.get(),
- SVX_RES(TB_SCRIPT))),
- mpToolBoxScriptSwBackground(ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxScriptSw(ControlFactory::CreateToolBox(
- mpToolBoxScriptSwBackground.get(),
- SVX_RES(TB_SCRIPT_SW))),
- mpToolBoxSpacingBackground(ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxSpacing(ControlFactory::CreateToolBox(
- mpToolBoxSpacingBackground.get(),
- SVX_RES(TB_SPACING))),
- mpToolBoxFontColorBackground(ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxFontColor(ControlFactory::CreateToolBox(
- mpToolBoxFontColorBackground.get(),
- SVX_RES(TB_FONTCOLOR),
- rxFrame)),
- mpToolBoxFontColorBackgroundSW(ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxFontColorSW(ControlFactory::CreateToolBox(
- mpToolBoxFontColorBackgroundSW.get(),
- SVX_RES(TB_FONTCOLOR_SW),
- rxFrame)),
- mpToolBoxHighlightBackground(ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxHighlight(ControlFactory::CreateToolBox(
- mpToolBoxHighlightBackground.get(),
- SVX_RES(TB_HIGHLIGHT),
- rxFrame)),
- mpFontColorUpdater(),
- mpHighlightUpdater(),
-
+TextPropertyPanel::TextPropertyPanel ( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& rContext )
+ : PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", rxFrame),
maFontNameControl (SID_ATTR_CHAR_FONT, *pBindings, *this, A2S("CharFontName"), rxFrame),
maFontSizeControl (SID_ATTR_CHAR_FONTHEIGHT, *pBindings, *this, A2S("FontHeight"), rxFrame),
maWeightControl (SID_ATTR_CHAR_WEIGHT, *pBindings, *this, A2S("Bold"), rxFrame),
@@ -182,13 +152,18 @@ TextPropertyPanel::TextPropertyPanel (
maCharSpacePopup(this, ::boost::bind(&TextPropertyPanel::CreateCharacterSpacingControl, this, _1)),
maUnderlinePopup(this, ::boost::bind(&TextPropertyPanel::CreateUnderlinePopupControl, this, _1)),
- mxFrame(rxFrame),
maContext(),
mpBindings(pBindings)
{
- Initialize();
+ get(mpFontNameBox, "font");
+ get(mpFontSizeBox, "fontsize");
+ get(mpToolBoxFont, "fonteffects");
+ get(mpToolBoxIncDec, "fontadjust");
+ get(mpToolBoxScript, "position");
+ get(mpToolBoxSpacing, "spacingbar");
+ get(mpToolBoxFontColor, "colorbar");
- FreeResource();
+ Initialize();
UpdateFontColorToolbox(rContext);
}
@@ -200,26 +175,6 @@ TextPropertyPanel::~TextPropertyPanel (void)
{
if(mbMustDelete)
delete mpFontList;
-
- // Destroy the toolbox windows.
- mpToolBoxIncDec.reset();
- mpToolBoxFont.reset();
- mpToolBoxFontColor.reset();
- mpToolBoxFontColorSW.reset();
- mpToolBoxScript.reset();
- mpToolBoxScriptSw.reset();
- mpToolBoxSpacing.reset();
- mpToolBoxHighlight.reset();
-
- // Destroy the background windows of the toolboxes.
- mpToolBoxIncDecBackground.reset();
- mpToolBoxFontBackground.reset();
- mpToolBoxFontColorBackground.reset();
- mpToolBoxFontColorBackgroundSW.reset();
- mpToolBoxScriptBackground.reset();
- mpToolBoxScriptSwBackground.reset();
- mpToolBoxSpacingBackground.reset();
- mpToolBoxHighlightBackground.reset();
}
@@ -245,34 +200,30 @@ void TextPropertyPanel::HandleContextChange (
{
case CombinedEnumContext(Application_Calc, Context_Cell):
case CombinedEnumContext(Application_Calc, Context_Pivot):
- mpToolBoxScriptSw->Hide();
- mpToolBoxHighlight->Hide();
+ mpToolBoxFontColor->HideItem(mpToolBoxFontColor->GetItemId(UNO_BACKCOLOR));
mpToolBoxScript->Disable();
mpToolBoxSpacing->Disable();
break;
case CombinedEnumContext(Application_Calc, Context_EditCell):
case CombinedEnumContext(Application_Calc, Context_DrawText):
- mpToolBoxScriptSw->Hide();
- mpToolBoxHighlight->Hide();
+ mpToolBoxFontColor->HideItem(mpToolBoxFontColor->GetItemId(UNO_BACKCOLOR));
mpToolBoxScript->Enable();
mpToolBoxSpacing->Enable();
break;
case CombinedEnumContext(Application_WriterVariants, Context_Text):
case CombinedEnumContext(Application_WriterVariants, Context_Table):
- mpToolBoxScriptSw->Show();
- mpToolBoxScript->Hide();
- mpToolBoxHighlight->Show();
+ mpToolBoxFontColor->ShowItem(mpToolBoxFontColor->GetItemId(UNO_BACKCOLOR));
+ mpToolBoxScript->Enable();
mpToolBoxSpacing->Show();
break;
case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
case CombinedEnumContext(Application_WriterVariants, Context_Annotation):
- mpToolBoxScriptSw->Show();
- mpToolBoxScript->Hide();
+ mpToolBoxFontColor->HideItem(mpToolBoxFontColor->GetItemId(UNO_BACKCOLOR));
+ mpToolBoxScript->Enable();
mpToolBoxSpacing->Show();
- mpToolBoxHighlight->Hide();
break;
case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
@@ -282,10 +233,9 @@ void TextPropertyPanel::HandleContextChange (
case CombinedEnumContext(Application_DrawImpress, Context_Draw):
case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
- mpToolBoxScriptSw->Hide();
- mpToolBoxScript->Show();
+ mpToolBoxFontColor->HideItem(mpToolBoxFontColor->GetItemId(UNO_BACKCOLOR));
+ mpToolBoxScript->Enable();
mpToolBoxSpacing->Show();
- mpToolBoxHighlight->Hide();
break;
default:
@@ -307,13 +257,13 @@ void TextPropertyPanel::UpdateFontColorToolbox (
bIsWriterFontColor = true;
if (bIsWriterFontColor)
{
- mpToolBoxFontColor->Hide();
- mpToolBoxFontColorSW->Show();
+ mpToolBoxFontColor->HideItem(mpToolBoxFontColor->GetItemId(UNO_COLOR));
+ mpToolBoxFontColor->ShowItem(mpToolBoxFontColor->GetItemId(UNO_FONTCOLOR));
}
else
{
- mpToolBoxFontColor->Show();
- mpToolBoxFontColorSW->Hide();
+ mpToolBoxFontColor->ShowItem(mpToolBoxFontColor->GetItemId(UNO_COLOR));
+ mpToolBoxFontColor->HideItem(mpToolBoxFontColor->GetItemId(UNO_FONTCOLOR));
}
}
@@ -348,8 +298,8 @@ void TextPropertyPanel::Initialize (void)
mpFontNameBox->SetAccessibleName(mpFontNameBox->GetQuickHelpText());
const FontInfo aFontInfo (mpFontList->Get( OUString( "" ), OUString( "" )));
- maFontSizeBox.Fill(&aFontInfo,mpFontList);
- maFontSizeBox.SetAccessibleName(maFontSizeBox.GetQuickHelpText());
+ mpFontSizeBox->Fill(&aFontInfo,mpFontList);
+ mpFontSizeBox->SetAccessibleName(mpFontSizeBox->GetQuickHelpText());
//toolbox
SetupToolboxItems();
@@ -359,17 +309,15 @@ void TextPropertyPanel::Initialize (void)
InitToolBoxSpacing();
#ifdef HAS_IA2
- mpFontNameBox->SetAccRelationLabeledBy(&mpFontNameBox);
- mpFontNameBox->SetMpSubEditAccLableBy(&mpFontNameBox);
- maFontSizeBox.SetAccRelationLabeledBy(&maFontSizeBox);
- maFontSizeBox.SetMpSubEditAccLableBy(&maFontSizeBox);
- mpToolBoxFont.SetAccRelationLabeledBy(&mpToolBoxFont);
- mpToolBoxIncDec.SetAccRelationLabeledBy(&mpToolBoxIncDec);
- mpToolBoxFontColor.SetAccRelationLabeledBy(&mpToolBoxFontColor);
- mpToolBoxScript.SetAccRelationLabeledBy(&mpToolBoxScript);
- mpToolBoxScriptSw.SetAccRelationLabeledBy(&mpToolBoxScriptSw);
- mpToolBoxSpacing.SetAccRelationLabeledBy(&mpToolBoxSpacing);
- mpToolBoxHighlight.SetAccRelationLabeledBy(&mpToolBoxHighlight);
+ mpFontNameBox->SetAccRelationLabeledBy(mpFontNameBox);
+ mpFontNameBox->SetMpSubEditAccLableBy(mpFontNameBox);
+ mpFontSizeBox->SetAccRelationLabeledBy(mpFontSizeBox);
+ mpFontSizeBox->SetMpSubEditAccLableBy(mpFontSizeBox);
+ mpToolBoxFont->SetAccRelationLabeledBy(mpToolBoxFont);
+ mpToolBoxIncDec->SetAccRelationLabeledBy(mpToolBoxIncDec);
+ mpToolBoxFontColor->SetAccRelationLabeledBy(mpToolBoxFontColor);
+ mpToolBoxScriptSetAccRelationLabeledBy(mpToolBoxScript);
+ mpToolBoxSpacing->SetAccRelationLabeledBy(mpToolBoxSpacing);
#endif
//init state
@@ -394,11 +342,11 @@ void TextPropertyPanel::Initialize (void)
Link aLink = LINK(this, TextPropertyPanel, FontSelHdl);
mpFontNameBox->SetSelectHdl(aLink);
aLink = LINK(this, TextPropertyPanel, FontSizeModifyHdl);
- maFontSizeBox.SetModifyHdl(aLink);
+ mpFontSizeBox->SetModifyHdl(aLink);
aLink = LINK(this, TextPropertyPanel, FontSizeSelHdl);
- maFontSizeBox.SetSelectHdl(aLink);
+ mpFontSizeBox->SetSelectHdl(aLink);
aLink = LINK(this, TextPropertyPanel, FontSizeLoseFocus);
- maFontSizeBox.SetLoseFocusHdl(aLink);
+ mpFontSizeBox->SetLoseFocusHdl(aLink);
}
void TextPropertyPanel::EndSpacingPopupMode (void)
@@ -414,14 +362,9 @@ void TextPropertyPanel::EndUnderlinePopupMode (void)
void TextPropertyPanel::InitToolBoxFont()
{
- mpToolBoxFont->SetBackground(Wallpaper());
- mpToolBoxFont->SetPaintTransparent(true);
-
- Size aTbxSize( mpToolBoxFont->CalcWindowSizePixel() );
- mpToolBoxFont->SetOutputSizePixel( aTbxSize );
-
- Link aLink = LINK(this, TextPropertyPanel, ToolboxFontSelectHandler);
+ Link aLink = LINK(this, TextPropertyPanel, ToolboxFontSelectHandler);
mpToolBoxFont->SetSelectHdl ( aLink );
+
aLink = LINK(this, TextPropertyPanel, ToolBoxUnderlineClickHdl);
mpToolBoxFont->SetDropdownClickHdl(aLink);
}
@@ -431,9 +374,6 @@ void TextPropertyPanel::InitToolBoxFont()
void TextPropertyPanel::InitToolBoxIncDec()
{
- Size aTbxSize( mpToolBoxIncDec->CalcWindowSizePixel() );
- mpToolBoxIncDec->SetOutputSizePixel( aTbxSize );
-
Link aLink = LINK(this, TextPropertyPanel, ToolboxIncDecSelectHdl);
mpToolBoxIncDec->SetSelectHdl ( aLink );
}
@@ -443,23 +383,14 @@ void TextPropertyPanel::InitToolBoxIncDec()
void TextPropertyPanel::InitToolBoxScript()
{
- Size aTbxSize( mpToolBoxScriptSw->CalcWindowSizePixel() );
- mpToolBoxScriptSw->SetOutputSizePixel( aTbxSize );
-
- Link aLink = LINK(this, TextPropertyPanel, ToolBoxSwScriptSelectHdl);
- mpToolBoxScriptSw->SetSelectHdl ( aLink );
-
- aTbxSize = mpToolBoxScript->CalcWindowSizePixel() ;
- mpToolBoxScript->SetOutputSizePixel( aTbxSize );
-
- aLink = LINK(this, TextPropertyPanel, ToolBoxScriptSelectHdl);
+ Link aLink = LINK(this, TextPropertyPanel, ToolBoxScriptSelectHdl);
mpToolBoxScript->SetSelectHdl ( aLink );
}
+
void TextPropertyPanel::InitToolBoxSpacing()
{
- Size aTbxSize( mpToolBoxSpacing->CalcWindowSizePixel() );
- mpToolBoxSpacing->SetOutputSizePixel( aTbxSize );
- mpToolBoxSpacing->SetItemBits( TBI_SPACING, mpToolBoxSpacing->GetItemBits( TBI_SPACING ) | TIB_DROPDOWNONLY );
+ const sal_uInt16 nId = mpToolBoxSpacing->GetItemId(UNO_SPACING);
+ mpToolBoxSpacing->SetItemBits(nId, mpToolBoxSpacing->GetItemBits(nId) | TIB_DROPDOWNONLY);
Link aLink = LINK(this, TextPropertyPanel, SpacingClickHdl);
mpToolBoxSpacing->SetDropdownClickHdl ( aLink );
@@ -471,22 +402,19 @@ void TextPropertyPanel::InitToolBoxSpacing()
void TextPropertyPanel::SetupToolboxItems (void)
{
- maSDFontGrow.SetupToolBoxItem(*mpToolBoxIncDec, TBI_INCREASE);
- maSDFontShrink.SetupToolBoxItem(*mpToolBoxIncDec, TBI_DECREASE);
-
- maWeightControl.SetupToolBoxItem(*mpToolBoxFont, TBI_BOLD);
- maItalicControl.SetupToolBoxItem(*mpToolBoxFont, TBI_ITALIC);
- maUnderlineControl.SetupToolBoxItem(*mpToolBoxFont, TBI_UNDERLINE);
- maStrikeControl.SetupToolBoxItem(*mpToolBoxFont, TBI_STRIKEOUT);
- maShadowControl.SetupToolBoxItem(*mpToolBoxFont, TBI_SHADOWED);
-
- //for sw
- maSuperScriptControl.SetupToolBoxItem(*mpToolBoxScriptSw, TBI_SUPER_SW);
- maSubScriptControl.SetupToolBoxItem(*mpToolBoxScriptSw, TBI_SUB_SW);
- //for sc and sd
- maSuperScriptControl.SetupToolBoxItem(*mpToolBoxScript, TBI_SUPER);
- maSubScriptControl.SetupToolBoxItem(*mpToolBoxScript, TBI_SUB);
- maSpacingControl.SetupToolBoxItem(*mpToolBoxSpacing, TBI_SPACING);
+ maSDFontGrow.SetupToolBoxItem(*mpToolBoxIncDec, mpToolBoxIncDec->GetItemId(UNO_GROW));
+ maSDFontShrink.SetupToolBoxItem(*mpToolBoxIncDec, mpToolBoxIncDec->GetItemId(UNO_SHRINK));
+
+ maWeightControl.SetupToolBoxItem(*mpToolBoxFont, mpToolBoxFont->GetItemId(UNO_BOLD));
+ maItalicControl.SetupToolBoxItem(*mpToolBoxFont, mpToolBoxFont->GetItemId(UNO_ITALIC));
+ maUnderlineControl.SetupToolBoxItem(*mpToolBoxFont, mpToolBoxFont->GetItemId(UNO_UNDERLINE));
+ maStrikeControl.SetupToolBoxItem(*mpToolBoxFont, mpToolBoxFont->GetItemId(UNO_STRIKEOUT));
+ maShadowControl.SetupToolBoxItem(*mpToolBoxFont, mpToolBoxFont->GetItemId(UNO_SHADOWED));
+
+ maSuperScriptControl.SetupToolBoxItem(*mpToolBoxScript, mpToolBoxScript->GetItemId(UNO_SUPERSCRIPT));
+ maSubScriptControl.SetupToolBoxItem(*mpToolBoxScript, mpToolBoxScript->GetItemId(UNO_SUBSCRIPT));
+
+ maSpacingControl.SetupToolBoxItem(*mpToolBoxSpacing, mpToolBoxSpacing->GetItemId(UNO_SPACING));
}
@@ -509,7 +437,7 @@ IMPL_LINK( TextPropertyPanel, FontSelHdl, FontNameBox*, pBox )
IMPL_LINK( TextPropertyPanel, FontSizeModifyHdl, FontSizeBox*, pSizeBox )
{
- if (pSizeBox == &maFontSizeBox)
+ if (pSizeBox == mpFontSizeBox)
{
long nSize = pSizeBox->GetValue();
mbFocusOnFontSizeCtrl = true;
@@ -542,7 +470,7 @@ IMPL_LINK( TextPropertyPanel, FontSizeSelHdl, FontSizeBox*, pSizeBox )
IMPL_LINK(TextPropertyPanel, FontSizeLoseFocus, FontSizeBox*, pSizeBox)
{
- if(pSizeBox == &maFontSizeBox)
+ if(pSizeBox == mpFontSizeBox)
{
mbFocusOnFontSizeCtrl = false;
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list