summaryrefslogtreecommitdiff
path: root/chart2/source
AgeCommit message (Collapse)Author
2021-11-24Avoid signed-integer-overflow parsing table:cell-range-address="PivotChart"Stephan Bergmann
...as happens during UITest_chart UITEST_TEST_NAME=tdf107097.tdf107097.test_tdf107097 ever since 86b192965ee8d625092b723337f6a65bdf34dcb7 "tdf#107097: sc: Add UItest" added that test (see <https://ci.libreoffice.org/job/lo_ubsan/1919/>), > /chart2/source/tools/XMLRangeHelper.cxx:136:52: runtime error: signed integer overflow: 15 * 308915776 cannot be represented in type 'int' > #0 0x2ad74a554918 in (anonymous namespace)::lcl_getSingleCellAddressFromXMLString(rtl::OUString const&, int, int, chart::XMLRangeHelper::Cell&) /chart2/source/tools/XMLRangeHelper.cxx:136:52 > #1 0x2ad74a553482 in (anonymous namespace)::lcl_getCellAddressFromXMLString(rtl::OUString const&, int, int, chart::XMLRangeHelper::Cell&, rtl::OUString&) /chart2/source/tools/XMLRangeHelper.cxx:217:13 > #2 0x2ad74a5505da in (anonymous namespace)::lcl_getCellRangeAddressFromXMLString(rtl::OUString const&, int, int, chart::XMLRangeHelper::CellRange&) /chart2/source/tools/XMLRangeHelper.cxx:253:19 > #3 0x2ad74a54fde1 in chart::XMLRangeHelper::getCellRangeFromXMLString(rtl::OUString const&) /chart2/source/tools/XMLRangeHelper.cxx:328:15 > #4 0x2ad74a2aed4d in chart::InternalDataProvider::convertRangeFromXML(rtl::OUString const&) /chart2/source/tools/InternalDataProvider.cxx:1227:39 > #5 0x2ad74a2b0164 in non-virtual thunk to chart::InternalDataProvider::convertRangeFromXML(rtl::OUString const&) /chart2/source/tools/InternalDataProvider.cxx > #6 0x2ad6c4784257 in (anonymous namespace)::lcl_ConvertRange(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::chart2::XChartDocument> const&) /xmloff/source/chart/SchXMLPlotAreaContext.cxx:76:32 > #7 0x2ad6c4779a67 in SchXMLPlotAreaContext::startFastElement(int, com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&) /xmloff/source/chart/SchXMLPlotAreaContext.cxx:233:34 > #8 0x2ad6c4c6328a in SvXMLImport::startFastElement(int, com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&) /xmloff/source/core/xmlimp.cxx:797:15 > #9 0x2ad704988b78 in (anonymous namespace)::Entity::startElement((anonymous namespace)::Event const*) /sax/source/fastparser/fastparser.cxx:468:27 > #10 0x2ad70496f681 in sax_fastparser::FastSaxParserImpl::consume((anonymous namespace)::EventList&) /sax/source/fastparser/fastparser.cxx:1026:25 > #11 0x2ad70496c65f in sax_fastparser::FastSaxParserImpl::parseStream(com::sun::star::xml::sax::InputSource const&) /sax/source/fastparser/fastparser.cxx:870:22 > #12 0x2ad7049905d1 in sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource const&) /sax/source/fastparser/fastparser.cxx:1482:13 > #13 0x2ad6c4c52b80 in SvXMLImport::parseStream(com::sun::star::xml::sax::InputSource const&) /xmloff/source/core/xmlimp.cxx:504:15 > #14 0x2ad749aafe1e in chart::XMLFilter::impl_ImportStream(rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiComponentFactory> const&, com::sun::star::uno::Reference<com::sun::star::document::XGraphicStorageHandler> const&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&) /chart2/source/model/filter/XMLFilter.cxx:473:34 > #15 0x2ad749aa9f01 in chart::XMLFilter::impl_Import(com::sun::star::uno::Reference<com::sun::star::lang::XComponent> const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /chart2/source/model/filter/XMLFilter.cxx:375:35 > #16 0x2ad749aa0988 in chart::XMLFilter::filter(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /chart2/source/model/filter/XMLFilter.cxx:221:13 > #17 0x2ad749c2c76e in chart::ChartModel::impl_load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&) /chart2/source/model/main/ChartModel_Persistence.cxx:567:18 > #18 0x2ad749c30eea in chart::ChartModel::loadFromStorage(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /chart2/source/model/main/ChartModel_Persistence.cxx:759:5 > #19 0x2ad74244b977 in OCommonEmbeddedObject::LoadDocumentFromStorage_Impl() /embeddedobj/source/commonembedding/persistence.cxx:535:19 > #20 0x2ad7423d7bde in OCommonEmbeddedObject::SwitchStateTo_Impl(int) /embeddedobj/source/commonembedding/embedobj.cxx:185:49 > #21 0x2ad7423e32ff in OCommonEmbeddedObject::changeState(int) /embeddedobj/source/commonembedding/embedobj.cxx:453:13 > #22 0x2ad7424b7057 in OCommonEmbeddedObject::getPreferredVisualRepresentation(long) /embeddedobj/source/commonembedding/visobj.cxx:168:9 > #23 0x2ad67e08fdb6 in comphelper::EmbeddedObjectContainer::GetGraphicReplacementStream(long, com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&, rtl::OUString*) /comphelper/source/container/embeddedobjectcontainer.cxx:1425:54 > #24 0x2ad6a447182c in svt::EmbeddedObjectRef::GetGraphicReplacementStream(long, com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&, rtl::OUString*) /svtools/source/misc/embedhlp.cxx:809:12 > #25 0x2ad6a446c7d4 in svt::EmbeddedObjectRef::GetGraphicStream(bool) const /svtools/source/misc/embedhlp.cxx:616:23 > #26 0x2ad6a4469e58 in svt::EmbeddedObjectRef::GetReplacement(bool) /svtools/source/misc/embedhlp.cxx:424:46 > #27 0x2ad6a446d4ea in svt::EmbeddedObjectRef::GetGraphic() const /svtools/source/misc/embedhlp.cxx:453:54 > #28 0x2ad69d4a9470 in SdrOle2Obj::GetGraphic() const /svx/source/svdraw/svdoole2.cxx:1635:33 > #29 0x2ad71b222d01 in ScDrawTransferObj::ScDrawTransferObj(std::unique_ptr<SdrModel, std::default_delete<SdrModel> >, ScDocShell*, TransferableObjectDescriptor const&) /sc/source/ui/app/drwtrans.cxx:191:107 > #30 0x2ad71d7da932 in ScDrawView::DoCopy() /sc/source/ui/view/drawvie4.cxx:364:56 > #31 0x2ad71c1fb75a in ScDrawShell::ExecDrawFunc(SfxRequest&) /sc/source/ui/drawfunc/drawsh5.cxx:328:20 > #32 0x2ad71c1b181f in SfxStubScDrawShellExecDrawFunc(SfxShell*, SfxRequest&) /workdir/SdiTarget/sc/sdi/scslots.hxx:2823:1 > #33 0x2ad68de39d05 in SfxShell::CallExec(void (*)(SfxShell*, SfxRequest&), SfxRequest&) /include/sfx2/shell.hxx:197:35 > #34 0x2ad68ddd1214 in SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) /sfx2/source/control/dispatch.cxx:253:16 > #35 0x2ad68dde721f in SfxDispatcher::Execute_(SfxShell&, SfxSlot const&, SfxRequest&, SfxCallMode) /sfx2/source/control/dispatch.cxx:753:9 > #36 0x2ad68dd5edff in SfxBindings::Execute_Impl(SfxRequest&, SfxSlot const*, SfxShell*) /sfx2/source/control/bindings.cxx:1060:22 > #37 0x2ad68e24a322 in SfxDispatchController_Impl::dispatch(com::sun::star::util::URL const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XDispatchResultListener> const&) /sfx2/source/control/unoctitm.cxx:758:53 > #38 0x2ad68e245261 in SfxOfficeDispatch::dispatch(com::sun::star::util::URL const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) /sfx2/source/control/unoctitm.cxx:229:16 > #39 0x2ad67e465052 in comphelper::dispatchCommand(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XDispatchResultListener> const&) /comphelper/source/misc/dispatchcommand.cxx:61:12 > #40 0x2ad67e4657c5 in comphelper::dispatchCommand(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XDispatchResultListener> const&) /comphelper/source/misc/dispatchcommand.cxx:76:12 > #41 0x2ad6b39a49a6 in UITest::executeCommand(rtl::OUString const&) /vcl/source/uitest/uitest.cxx:24:12 > #42 0x2ad6b39b7240 in (anonymous namespace)::UITestUnoObj::executeCommand(rtl::OUString const&) /vcl/source/uitest/uno/uitest_uno.cxx:69:12 > #43 0x2ad6ee6508db in gcc3::callVirtualMethod(void*, unsigned int, void*, _typelib_TypeDescriptionReference*, bool, unsigned long*, unsigned int, unsigned long*, double*) /bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:77:5 > #44 0x2ad6ee64abf2 in cpp_call(bridges::cpp_uno::shared::UnoInterfaceProxy*, bridges::cpp_uno::shared::VtableSlot, _typelib_TypeDescriptionReference*, int, _typelib_MethodParameter*, void*, void**, _uno_Any**) /bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:233:13 > #45 0x2ad6ee64773d in unoInterfaceProxyDispatch /bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:413:13 > #46 0x2ad6f3a7d2ca in binaryurp::IncomingRequest::execute_throw(binaryurp::BinaryAny*, std::__debug::vector<binaryurp::BinaryAny, std::allocator<binaryurp::BinaryAny> >*) const /binaryurp/source/incomingrequest.cxx:235:13 Creating a pivot chart apparently generates XML output containing <chart:plot-area table:cell-range-address="PivotChart" ...> which does not conform to ODF, see the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2021-February/086884.html> "Integer overflow in Calc lcl_getSingleCellAddressFromXMLString nColumn computation" for details. And, ignoring the signed-integer-overflow UB for now, InternalDataProvider::convertRangeFromXML would always have returned an empty OUString for an input of aXMLRange="PivotChart": chart::XMLRangeHelper::getCellRangeFromXMLString with rXMLString="PivotChart" calls lcl_getCellAddressFromXMLString with rXMLString="PivotChart", nStartPos=0, nEndPos=9, its leading while-loop mis-computes nDelimiterPos=nEndPos, so calls lcl_getCellAddressFromXMLString with rXMLString="PivotChart", nStartPos=0, nEndPos=9, its leading while-loop mis-computes nDelimiterPos=nEndPos, so it doesn't set rOutTableName, so lcl_getCellAddressFromXMLString returns bResult=false, so chart::XMLRangeHelper::getCellRangeFromXMLString returns an empty CellRange(). So, similar to 9e5314f19c9dcff35b5cee5c5a1b7f744e495b2e "tdf#107097 invoke internal DP and correctly handle 'range' names" added special handling of aXMLRange values starting with "PT@" to InternalDataProvider::convertRangeFromXML, also add explicit special handling for "PivotChart" (instead of relying on the later code returning an empty string, but after invoking UB). Change-Id: I1671f0ab3b3ab00dce8e348aa3b7141ebebaaad5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112207 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 6d43ba110084605462901bcee786c7ae4c1f3bdf)
2021-08-04improve LOK notifyInvalidationNoel Grandin
(*) tweak buffer in SfxLokHelper::notifyInvalidation to be a bit larger, so we avoid the cost of a resize&copy (*) use our optimised OString concatentation instead of going via std::stringstream (*) pass down a pointer to rectangle, instead of a string. later we will use this to avoid doing the stringify until later Change-Id: Ia3e3042bc919d9b9cb80e47a93704eb236438605 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119994 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2021-01-07chart2: avoid assert on SvxAdjustItem with WhichId 0Michael Stahl
Insert a chart, then insert a rhombus shape into the chart: svl/source/items/itemset.cxx:150: SfxItemSet::SfxItemSet(SfxItemPool&, std::initializer_list<SfxItemSet::Pair>): Assertion `svl::detail::validRange(p.wid1, p.wid2)' failed. Presumably this item doesn't actually do anything since it was added in 2009 in commit 4d3c143900d87f23cb4e66f1ebf9e0dae0541e0f Alternatively it could be EE_PARA_JUST perhaps? but not sure if that can always be used. Change-Id: Ia1addb1095714acafe7db596ece4b9a706354d34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94537 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2021-01-06lok: send chart line width updatesSzymon Kłos
Change-Id: I4c9c4a977df12a1cefb81cfbcac73b61ff26e488 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108843 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2021-01-06lok: Apply chart line widthSzymon Kłos
Change-Id: I94a6406eeb929498592ca5430cf7248cfd3e9f77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108815 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2021-01-06lok: send chart color updatesSzymon Kłos
Change-Id: I037049fb19ddf4c1450d7d9327c574cb4e37977c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108793 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2021-01-06lok: Apply chart line colorSzymon Kłos
Change-Id: I21b96485f26439844f19278e0d6340b55012d4ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108666 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-12-21replace ODFDefaultVersion usage with ODFSaneDefaultVersionMichael Stahl
Compare with ODFSVER_012 mostly works the same, except for places where namespaces are defined where the ODFSVER_EXTENDED bit should be checked. Conflicts: sc/source/filter/xml/XMLExportDataPilot.cxx xmloff/source/chart/SchXMLExport.cxx Change-Id: I86469b763bc2f903632976bc9d6ec04d543d705e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108107 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-11-19tdf#136267 OOXML Chart Import: create main category axis labels onceBalazs Varga
because InternalDataProvider can not handle different category names on the primary and secondary category axis. Revert e0b0502516a10181bbd1737b93b38b2bba4c98e8 commit, except the relevant unit test. Regression from commit: e0b0502516a10181bbd1737b93b38b2bba4c98e8 (tdf#128016 Chart OOXML Import: fix duplicated category labels) Also fix tdf#129994 (FILEOPEN - hang at import time), which is a a regression from commit fa0a981af41a2606541eec1cb20a379a739691e0 (tdf#114166 DOCX chart import: fix missing complex categories) Change-Id: I5d049e760eb1a647ea774be264349a2f16f15f5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102463 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103617 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106084 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-11-18lok: Make the chart (sub)title work even from the mobile-wizard.Jan Holesovsky
Change-Id: Ic6346a403639e283ade47429f581f91e7a468f63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104436 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105617 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-11-14chart2: Add the possibility to edit title & subtitle from the sidebar.Jan Holesovsky
Change-Id: I4be15acbc2127ebb6eca8864a0209ba57b488100 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104313 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105614 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-11-13Sidebar tdf#92768: Fix title & subtitle checkboxes on the ChartDeckMuhammet Kara
Turns out the 2nd part of tdf#92768 was not implemented yet, so it is still necessary to remove the title/subtitle for good, otherwise we set the "Visibility" property, but nothing actually reads that when rendering. So the titles now work as they did before the regression. An uncheck action removes the title/subtitle, and a check action just makes the existing title/subtitle visible or creates a new one if it doesn't exist Change-Id: I23122d1be2d95af878b824ba194bd1aeed5f4f89 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90692 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105640 Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-11-11tdf#133630 Check object type when updating side panel dataOuyang Leyan
Change-Id: I033b4c7fb1dc1787d28caf5b925ed45bbb63cf06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102544 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105525 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-10-27Fire selection change event before sidebar is unregisteredSzymon Kłos
Prevent us from crash in online using mobile phone when leaving chart edit mode with chart type modified. Change-Id: I8da70612786141a2c92b55a45822ef8ff5713e5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104605 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-10-07lok: Add posibility to change chart fill gradientSzymon Kłos
Change-Id: I942d478cd870036710390d2c03413b6fc0454038 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103619 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104034 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-10-06Use default diagram page selection for chartsSzymon Kłos
Change-Id: I0bf0e5d2d1ef43a61c1bb723b25bafa30b5ad5c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103602 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104016 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-09-22lok: Add posibility to change chart fill colorSzymon Kłos
Change-Id: I519a0fe15c4983803109aed7eef840d36a5e7b21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102920 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 5b7d841f062de8872457369da4d4e8e35be9bf60) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103062 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-09-02On double click on chart select the chart backgroudPranam Lashkari
Change-Id: I03fa26a6d88f1436bac00fef7867451378efa04a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101848 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-08-25Revert tdf#127777 fix due to reggressionco-6.4-3Gülşah Köse
This reverts commit 111c260ab2883b7906f1a66e222dbf4dc3c58c4f. Change-Id: I60c54b506f6721f08a21ebcfb306f38dd9ebff62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101328 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-08-25Revert tdf#128733 fix due to reggressionGülşah Köse
This reverts commit 71f9961488232697bcdb37db349569a20f15bb2d. Change-Id: I6a930fecbf2e82f9c9765b9ed0aa983a6b45ddbd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101327 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-08-25Revert tdf#132355 fix due to reggression.Gülşah Köse
This reverts commit 06a8f5d17061a8fd59fa37c0cdd1a89c72223337. Change-Id: Iee296e423e3e76d82db9556137459249b5d87508 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101326 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-07-15Related: tdf#131175 OOXML chart: import data label fill patternGülşah Köse
(cherry picked from commit 6f752061d5153da50d6f536d506358c8f512a397) Conflicts: oox/source/drawingml/chart/seriesconverter.cxx Change-Id: I2db64489c86e4381167eb13af4ab5118113960d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98808 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-07-15tdf#131175 Import data label solid fill and color.Gülşah Köse
(cherry picked from commit 603df08a1e0211099ce2cf258cfe64a74ed6ded9) Conflicts: oox/source/drawingml/chart/seriesconverter.cxx Change-Id: I8a3ef6e60d4f2a13310bb9a8fc4eb873df3f9b4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98807 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-07-11tdf#134603 [en|dis]able logic reversedCaolán McNamara
Change-Id: I192b7a6da4bcd311e64a31d9dc2b4c2b422194cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98267 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98514 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-07-10tdf#132956 Chart view: fix missing plot areaBalazs Varga
Do not reduce the inside area of the chart depending on the size of the legend. Use the default legend size. Regression from commit: 739ed2c29f49ea5e83bcd1352b2644c2e2d09f7b (tdf#115630 tdf#88922 Chart: fix custom legend position and size) cherry picked from commit cf46500243c51071227e08c5067041e414180ebc Change-Id: Ic191229d7ceab1f2689ab07424353108f8cb2b95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94059 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: Tünde Tóth <tundeth@gmail.com> Reviewed-by: László Németh <nemeth@numbertext.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95583 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98507 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-05-28lok: set device form factor of the client on view creationMarco Cecchetti
This patch allows the lok core to know about the device form facor of the client requesting the creation of new view, immediately instead of a later time. When a new view is needed a "DeviceFormFactor" parameter is forwarded to lo_documentLoadWithOptions and doc_createViewWithOptions from the client. This parameter can have one of the following values: 'desktop', 'tablet','mobile' and it is used to set a global variable accessible by SfxLokHelper::setDeviceFormFactor and SfxLokHelper::getDeviceFormFactor. This global variable is retrived in the SfxViewShell constructor for setting SfxViewShell::maLOKDeviceFormFactor attribute. In SfxViewShell we have the following 3 methods: - bool isLOKDesktop() - bool isLOKTablet() - bool isLOKMobilePhone() which replace the following boolean functions: - comphelper::LibreOfficeKit::isTablet - comphelper::LibreOfficeKit::::isMobilePhone Change-Id: I9b36f354278df8c216fcb90f6a9da8256ec9c1e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93340 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-05-27Fix test UI_chartSzymon Kłos
Sync chart wizard code with master Change-Id: I4ab2cbfa9efd3caca3c7951150b7daa3a133b634
2020-05-27ChartTypePanel: Remove unused varsMuhammet Kara
Change-Id: I6a19fa269efaf008345b48341d1c501e1c7e7d17 Reviewed-on: https://gerrit.libreoffice.org/82244 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/82812 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94898 Tested-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-05-27Rename getCurrentParamter() as getCurrentParameter()Muhammet Kara
Change-Id: I0116b4526fea377130b1d1e101d30b3107af3c81 Reviewed-on: https://gerrit.libreoffice.org/82243 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/82811 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94897 Tested-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-05-27Remove unused var m_xChartTypeLabelMuhammet Kara
Change-Id: I3de7eb4e438021f9522e581c60a84fb7fcc168c7 Reviewed-on: https://gerrit.libreoffice.org/82242 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/82810 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94896 Tested-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-05-27Add SplineResourceGroup to ChartTypePanelMuhammet Kara
Change-Id: I229eb1cc4963c04968ed9ac32b65847dbfd602c3 Reviewed-on: https://gerrit.libreoffice.org/82807 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94895 Tested-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-05-27Add more resource groups to ChartTypePanelMuhammet Kara
Change-Id: I64c1d8b418f9abb537b4f23c3b31aa0e48bd3faa Reviewed-on: https://gerrit.libreoffice.org/82119 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/82801 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94894 Tested-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-05-27chart2: Weld ChartTypePanelMuhammet Kara
Change-Id: I8ed178ffe0d880b362f98b9754bce40b20942bd7 Reviewed-on: https://gerrit.libreoffice.org/82768 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94893 Tested-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-05-26Remove unused lokit-only selection properties in..Dennis Francis
CID string for charts. This is messing up the parsing of CID string in ObjectIdentifier::getObjectType() and elsewhere where parsing CID is attempted, which inturn causes at least the sidebar's chart line properties listboxes not getting updated. The selection properties insertion in chart CID was introduced in commit 3d705b98ca7f40a44f632f5565407274322ffde3 but these are not even used in online as of present. Change-Id: Ic8040d84e1ad16f182fc7bdc3a9f533ad9664458 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89300 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit eea0bc558fc1ac8d5c1537df2cf95f73720f3620) Conflicts: chart2/source/controller/main/ChartController_Window.cxx
2020-05-21lok: introduce QueryControlState functionHenry Castro
The sidebar usually executes UNO commands to the core framework, however the controls already have formatted the text that is useful in Online client side. For example the units conversion. The QueryControlState method will retrieve the current formatted text of the sidebar control to be used in Client Side. Change-Id: I0b3e3a1462d4391ac911352f35808a5e5d9f9ffb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91237 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91577 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94516 Tested-by: Henry Castro <hcastro@collabora.com>
2020-05-17Rename isMobile to isMobilePhone and introduce a separate isTabletTor Lillqvist
The intended semantics of isMobile() has been to say whether the device is a mobile phone ot not. Not whether it is a mobile device in general. So make that explicit. Adjust call sites as necessary. Also, in a couple of places where it is likely that what is relevant is whether it is a mobile device in general, not just whether it is a mobile phone, check both isMobile() and isTablet(). For stable interoperability with current Online, keep accepting also the .uno:LOKSetMobile "command" (and .uno:LOKUnSetMobile, except that Online never sends that), but Online will be changed to use .uno:LOKSetMobilePhone. Also drop the default value for the bool parameter to setMobilePhone(). Default bool parameters can be quite confusing, and it was especially silly in this case as there is one (1) call site. Change-Id: I2a71c37323ee151cbc671bd8e714e1dee10f8b1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90560 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94390 Tested-by: Tor Lillqvist <tml@collabora.com>
2020-05-17Move SplinePropertiesDialog & SteppedPropertiesDialog to reuseMuhammet Kara
Change-Id: I2937c617bed0d000734784301421237f282014e9 ecefe02a664e6a6852cf132d615c20e56e580e92 Reviewed-on: https://gerrit.libreoffice.org/82124 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/82648 Tested-by: Jenkins
2020-05-17Add ChartTypePanel to the ChartDeckMuhammet Kara
Consists of the first part of the implementation. Pushing to be able to see/use/tinker with it on the online/mobile side. Will be completed with follow-up patches. Change-Id: If49be54418c3b4c5ccc92fc7ee3e414847904162 Reviewed-on: https://gerrit.libreoffice.org/80799 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/82663 Tested-by: Jenkins
2020-05-16lokit: Mark document as modified on chart insert/edit...Dennis Francis
immediately at least in the case when LOKit is active. This is to allow prompt emission of .uno:ModifiedStatus=true statechange message from lokit to the client. Without this, in online the chart insert/modify related changes may not get saved on client exit. (cherry picked from commit 75adb624dfff4659e6f3099a1720fbd697560f9c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91036 Tested-by: Jenkins Reviewed-by: Dennis Francis <dennis.francis@collabora.com> Change-Id: I8c38a37cc455f74a70d43b6aaa3e5035b283d47f
2020-05-16chart2: Fix the color uno command in ChartColorWrapperDennis Francis
The uno command for color depends on the property name. For LineColor it should be .uno:XLineColor and the only other case is FillColor for which it should be .uno:FillColor. Without this fix, on selecting the chart for editing the first time, the sidebar line-color control is disabled as a side-effect. Change-Id: Ia71ed2f6d9e0f31523f1415f3ee089fd9d7d1b2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89304 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 9a80969f3115fc33778005861442f91127344dc0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89677 Tested-by: Jenkins
2020-05-16chart2: clear listener parents in disposeAshod Nakashian
Change-Id: Icdab125589ab0f55255f683a1ea39e036de661b1 Reviewed-on: https://gerrit.libreoffice.org/84997 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2020-05-13lok: Chart context menu: Disable menu items which are not available.Tamás Zolnai
Change-Id: Id7487c581759389e66ca513381d6706f3ae49980 Reviewed-on: https://gerrit.libreoffice.org/83605 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-05-13lok: Chart context menu: Replace tunneled context menu with JS context menu.Tamás Zolnai
Change-Id: I36db90887bff86036093ce0732db6fc6c76e79f6 Reviewed-on: https://gerrit.libreoffice.org/83604 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-05-13Make Chart Creation Wizard asyncSzymon Kłos
* FuInsertChart as a memeber in ScTabViewShell stores instance is needed to react on the dialog's result * CreationWizardUnoDlg converted to XAsynchronousExecutableDialog added dialog close handler which notifies listeners In the Online dialog become dead after closing, additional PostUserEvent was needed to kill the dialog after real close (without it user needed to select any cell to close dialog) * Reuse in Writer Change-Id: Ib09b5d83af9e1aa67218e093aa161419e8ddb922
2020-04-28tdf#131979 Chart ODF import-export of Link to source formatBalazs Varga
setting also into data point styles, fixing lost numbering style of custom data points. (Only export into the data series style was supported previously.) Also fix tdf#131115 - FILEOPEN: Incorrect format of single data label Regression from commit: e57d90cd4e51a1353eafc87bb29cfe6076704a7c (tdf#129173 tdf#129175 Fix number format of data labels) Data point styles in older ODF files do not contain the 'link-data-style-to-source' property, so they used the data series style property during the import previously. Now we set the default false value, if the data point style contains a 'data-style-name' (number format). Change-Id: I4786e62ca75770ed632463bcf1275ece7ea793f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91967 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92653 Tested-by: Jenkins
2020-04-28tdf#132355 fix X axis position of stock chartsTünde Tóth
Set the ShiftedCategoryPosition for true in case of stock chart. Regression from commit: 111c260ab2883b7906f1a66e222dbf4dc3c58c4f (tdf#127777 OOXML chart export: fix "CrossBetween" for not imported charts) Change-Id: I7ced1b03158908e838f7bb44c89dea23c5b347b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92759 Reviewed-by: Balazs Varga <balazs.varga991@gmail.com> Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93045 Tested-by: Jenkins
2020-04-16tdf#131873 data table fills with extra columns during scrollCaolán McNamara
Change-Id: Iccdb113a609e0873fb68cfb52405993a0f4362bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91713 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-03-31tdf#129095 Chart view: fix missing inner chart areaBalazs Varga
If the inner chart area has RelativeSize, always create the plot area with that setting. Regression from commit: 739ed2c29f49ea5e83bcd1352b2644c2e2d09f7b (tdf#115630 tdf#88922 Chart: fix custom legend position and size) Change-Id: I9265843c5d0d148c6a392e440b5d3b0c4ccf0e54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90708 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91374 Tested-by: Jenkins Reviewed-by: Balazs Varga <balazs.varga991@gmail.com>
2020-03-25tdf#123268 fix lost chart if all legend entries are hiddenTünde Tóth
See also commit 19b2ed4dee1ec33ad55473d43bfcd0bfa194cbee (related tdf#51671, add UI options for new "hide legend entry" feature) Change-Id: If20ab167d867d2845fa414ba0bbc490bed09f61c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89123 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 300e65cc47f3d6ae1563350757dbfadc080d7452) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90387 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-03-10tdf#131060 tdf#117088 chart view: fix missing or truncated axis labelsBalazs Varga
if we have enough space under the horizontal X axis. Note: allow truncation of vertical X axis labels only if they are text labels and the position is NEAR_AXIS or OUTSIDE_START. Regressions from commit 35d062f7879d5414334643cb90bff411726b2168 (tdf#116163: Limit label height in chart if needed) and commit 26caf1bc59c81704f11225e3e431e412deb8c475 (tdf#114179: Custom size and position of the chart wall) Change-Id: Idf86bc2b5482bb50a266cda57cc502621c2e08ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89829 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 7c300296dd727990455449b19b111b9fc49eadad) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90043 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>