summaryrefslogtreecommitdiffstats
path: root/chart2
Commit message (Collapse)AuthorAgeFilesLines
* Avoid signed-integer-overflow parsing table:cell-range-address="PivotChart"Stephan Bergmann2021-11-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...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) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125233 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#134603 [en|dis]able logic reversedCaolán McNamara2020-07-081-3/+3
| | | | | | | Change-Id: I192b7a6da4bcd311e64a31d9dc2b4c2b422194cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98267 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* tdf#132956 Chart view: fix missing plot areaBalazs Varga2020-07-073-10/+20
| | | | | | | | | | | | | | | | | | | 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>
* tdf#132594 Chart XLSX import: fix legend entries in pie chartsTünde Tóth2020-06-012-0/+11
| | | | | | | | | | | | | | | | Legend entry text of pie chart wasn't imported correctly in XLSX documents created with Excel 2007. Regression from commit: e0b0502516a10181bbd1737b93b38b2bba4c98e8 (tdf#128016 Chart OOXML Import: fix duplicated category labels) Change-Id: I4567437a41fe66e124dccbd148c0c49196d5c007 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94864 Tested-by: Jenkins 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/+/95294
* tdf#131979 Chart ODF import-export of Link to source formatBalazs Varga2020-04-284-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | 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
* tdf#132174 Chart DOCX import: fix label number formatBalazs Varga2020-04-282-0/+24
| | | | | | | | | | | | | | | | | | | The inner data table of charts has no own cell number format, unlike the MSO embedded XLSX, so we always have to set the link number format to false, if we have an inner data table. Regression from commit: 9c1063ba13028244346528e307d5563d6faf949d (tdf#129173 tdf#129175 Fix number format of data labels) Change-Id: I5e7865cb8c19fc6fae5b68305c7dc302516c0ad4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92695 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> (cherry picked from commit e0da00d655ecca5986eea3812a8a670c6adbc40f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93007 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
* tdf#132355 fix X axis position of stock chartsTünde Tóth2020-04-285-18/+19
| | | | | | | | | | | | | | | | 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
* tdf#131873 data table fills with extra columns during scrollCaolán McNamara2020-04-161-3/+8
| | | | | | | Change-Id: Iccdb113a609e0873fb68cfb52405993a0f4362bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91713 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
* tdf#129095 Chart view: fix missing inner chart areaBalazs Varga2020-03-312-18/+22
| | | | | | | | | | | | | | | | | 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>
* tdf#123268 fix lost chart if all legend entries are hiddenTünde Tóth2020-03-251-0/+2
| | | | | | | | | | | | | | 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>
* tdf#130986 Chart OOXML export: fix number format of custom labelBalazs Varga2020-03-112-6/+17
| | | | | | | | | | | | | Export correct sourceLinked attribute in c:dLbls/c:dLbl/c:numFmt, as in c:dLbls/c:numFmt. Change-Id: I0e52720b3cb2c99550a779763f01ba12f762050d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89638 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/+/89947 Tested-by: Jenkins
* tdf#131060 tdf#117088 chart view: fix missing or truncated axis labelsBalazs Varga2020-03-101-11/+28
| | | | | | | | | | | | | | | | | | | | | 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>
* tdf#128995: Special case for single variable regression...Deena Francis2020-03-022-36/+111
| | | | | | | | | | | | | | | like in LINEST implementation in Calc. Use a straightforward regression solver in this case, so that it is easier to handle the numerical error in the intercept term using ::rtl::math::approxSub(). Change-Id: I627c0c48e377cac5385a85050c4f472ee963f3d6 Reviewed-on: https://gerrit.libreoffice.org/85222 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 8df6f6ec12972ce2c14a162e6f4dd2c0d32367ef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85504 Reviewed-by: Eike Rathke <erack@redhat.com>
* tdf#130955 chart export: fix repeated custom labelsBalazs Varga2020-03-022-0/+20
| | | | | | | | | | | | | | | | | | | | Do not add mCustomLabelText to aDataPointVector when we write leading empty data points, it is enough to add them, when we write data-point with style. Note: this fixes also DOCX import, when the embedded charts are imported by using ODF export in the background. Regression from commit: 7d2c7e7af04d9604d86d2d605ef95b9abb10966c (tdf#123206 Store custom label as chart:data-label) Change-Id: Ib3b370236323a57ac6800035d71321f7ee5dbe41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89504 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/+/89818 Tested-by: Jenkins
* tdf#130657 OOXML chart import: fix charts without CrossBetweenBalazs Varga2020-02-262-0/+17
| | | | | | | | | | | | | | | | by using default values for ShiftedCategoryPosition. Regression from commit 111c260ab2883b7906f1a66e222dbf4dc3c58c4f (tdf#127777 OOXML chart export: fix "CrossBetween" for not imported charts) Change-Id: Idd48a8343e7d6609b487daf7182e9716f2f5e01f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88709 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 8163f4ad81487ae187d00d3ce86214e520cb8b69) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89517 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
* tdf#130105 Chart OOXML Import: Fix data label positionBalazs Varga2020-02-262-3/+29
| | | | | | | | | | | | | | | | | | | The position of datapoint labels was overwritten with the position of series placement. Do not overwrite datapoint labels placement, if we have explicit datapoint label placement. Regression from commit: 70944a849dc59fa686e3f316a3983dbc8a47017f (tdf#109858: Override default point label placement setting...) Change-Id: Ic27c8a7eb93e8c3776389d1b3d285d120568f024 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87137 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit a4cdd4d1266e77330d4745f369db85ee7dba265c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87594 Tested-by: Jenkins Reviewed-by: Balazs Varga <balazs.varga991@gmail.com> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
* tdf#130389: Data ranges dialog, data series tab, move up/down reversedJulien Nabet2020-02-051-1/+1
| | | | | | | | | Change-Id: I6a12acacec9bad33cab9fd86b0ffa7193ee74b75 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87921 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 93670d6cb7669b41d20feb91309eeb9930c67a27) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87982
* GtkImage property should be icon_name in welded dialogsCaolán McNamara2020-02-031-4/+4
| | | | | | | Change-Id: I8e832599854e3ef52f25167e35470939c6e75bd8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87840 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* tdf#121458: chart: change "Data Ranges" button enabled condition.Vasily Melenchuk2020-01-091-9/+5
| | | | | | | | | | | | | | "Data Ranges" button right now enabled if chart has no own table (as it was before 0074951704022d173a5fdb9df933f47be1dcbb91) or own table exists and it is possible to create data provider (LibreOffice will warn later about destroying data table). Change-Id: If92b0aad8a6099250effdb68022addb277ef4371 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86391 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 985b76d237b26b428771bfc03d1ef74cdb5d77f0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86402
* tdf#123206 Add test: import custom-label-fieldTamas Bunth2020-01-082-1/+20
| | | | | | | | | | | | Add test for deprecated custom-label-field attribute of the data-point element. Change-Id: I9a7619898fa72900323e5b41728d2146c14203e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86103 Tested-by: Jenkins Reviewed-by: Tamás Bunth <btomi96@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86123 Reviewed-by: Andras Timar <andras.timar@collabora.com>
* tdf#128996 Chart: Fix disappeared vertical X axis labelsBalazs Varga2020-01-073-11/+10
| | | | | | | | | | | | | | | Regression from commit: 75ef0e41ea8a9096ac619356d2b837c5333b47e6 (tdf#125334 Chart: allow text break in bar chart axis labels) Change-Id: Ib935de74314b7dec489d94a4aa3c65072e18d9e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86010 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit d53de6b0bfff08dfbde4fe305e2a9b7a60255458) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86259 Reviewed-by: Balazs Varga <balazs.varga991@gmail.com> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
* tdf#125444 Add pptx import test for percentageTamas Bunth2020-01-072-0/+22
| | | | | | | | | | | | Add test for imporing custom label field of type "PERCENTAGE" from a pptx document. Change-Id: Ide6baa95d07836cafb97efc9c00ec2ab224a1d1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86109 Tested-by: Jenkins Reviewed-by: Tamás Bunth <btomi96@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86128 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
* tdf#125444 Percentage as custom chart labelTamas Bunth2020-01-071-0/+5
| | | | | | | | | | | | Support importing ooxml charts with a field of type "PERCENTAGE" as custom label. Change-Id: Ie8931f77e3b6199d98635422d11d776e675f6e5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86067 Tested-by: Jenkins Reviewed-by: Tamás Bunth <btomi96@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86124 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
* tdf#129173 tdf#129175 Fix number format of data labelsBalazs Varga2019-12-177-48/+17
| | | | | | | | | | | | | | | | | | | | | | Show the real value (cell value) of datapoints instead of the recalculated value in case of Percent Stacked Area chart. Also fix: tdf#95425 Do not reset number format of data labels when open dialog of 'Format data series' and close dialog. Note: Inherits the data series/point label format from the cell format and not the axis format, if we set the 'link to source data' option to true. Change-Id: I04e9968034a67c6bc6b92941df61d945b4292d79 Reviewed-on: https://gerrit.libreoffice.org/84819 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit e57d90cd4e51a1353eafc87bb29cfe6076704a7c) Reviewed-on: https://gerrit.libreoffice.org/85198 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
* tdf#121991 Chart OOXML import: fix deleted legend entriesTünde Tóth2019-12-142-0/+15
| | | | | | | | | | | | | The legend showed deleted legend entries too. Change-Id: I1e205cdfc4262c73d2bb189237d6bc316781931d Reviewed-on: https://gerrit.libreoffice.org/84516 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit cea1ae2a4f7abdcfc3874d714bdafef801910c1c) Reviewed-on: https://gerrit.libreoffice.org/85024 Tested-by: Jenkins Reviewed-by: Tünde Tóth <tundeth@gmail.com>
* tdf#129056: No need for catastropheMuhammet Kara2019-12-131-1/+12
| | | | | | | | | | | | | | | We can continue working without hurting others in case of an invalid reference. Putting in a warning so that it doesn't become a black hole which silences errors. Change-Id: I6d75edeba227a4293b0ae16217811e49ae336a6b Reviewed-on: https://gerrit.libreoffice.org/85111 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> (cherry picked from commit e290c3f3e233f03a0b13d19553c637f0a7070fbf) Reviewed-on: https://gerrit.libreoffice.org/85130
* tdf#34517 Bring forward/backward in chart series switchedKelemen Gábor2019-12-131-1/+2
| | | | | | | | | | | | | | | | | | | Turns out bringing a data series forward means its index is increased while bringing backwards means decreasing it. Since the bool MOVE_SERIES_FORWARD is defined as true in ControllerCommandDispatch.cxx the condition here meant that bringing forward decreased the index and MOVE_SERIES_BACKWARD as false meant that bringing backward increased the index. Now the commands do the expected series order change. Change-Id: Ib49b301eacc227439b8fb3b0dc3513e59cbdc484 Reviewed-on: https://gerrit.libreoffice.org/84608 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 6cdab5c92cecf90090ba72dfa6c22edf0d41028f) Reviewed-on: https://gerrit.libreoffice.org/85025
* tdf#129054 Chart OOXML Import: Fix size of Pie ChartBalazs Varga2019-12-053-1/+14
| | | | | | | | | | | | | Do not shift (set to false ShiftedCategoryPosition) the category axis for Pie chart with complex category. Change-Id: I3b1d99899a2daf9fd7a596c88531797aa5084734 Reviewed-on: https://gerrit.libreoffice.org/83871 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit ea97f0926e138712c3800f5274012f0f04fc1c47) Reviewed-on: https://gerrit.libreoffice.org/84187 Reviewed-by: Balazs Varga <balazs.varga991@gmail.com>
* tdf#115630 tdf#88922 Chart: fix custom legend position and sizeBalazs Varga2019-12-022-19/+18
| | | | | | | | | | | | | | | | Do not need to set the "AnchorPosition" value, when we move the legend object. It is enough to set only the "Expansion" as custom, so we keep the previously set "AnchorPosition" value and we can use the lcl_calculatePositionAndRemainingSpace function to calculate the remaining space of the inner chart area. Change-Id: I7b577bc6acf2de9b6755329b92603ea5ba631d57 Reviewed-on: https://gerrit.libreoffice.org/83399 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 739ed2c29f49ea5e83bcd1352b2644c2e2d09f7b) Reviewed-on: https://gerrit.libreoffice.org/83890 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
* tdf#123206 Import/Export chart custom label textTamas Bunth2019-12-022-0/+16
| | | | | | | | | | | | | | | | | | | | | | OOX import supports custom label texts in chart diagrams (produced by e.g. double clicking on a data label, and write custom text), but - since embedded objects are exported and imported to odf right after migration - it is not displayed in case of a Writer document. In order to make it work, we have to support custom label text in the odf structure. This commit only allows the import/export of pure text, it should be improved to store and load formatted string. A new XML token is added, which currently refers to an attribute of the chart:data-point tag. If we want to store formatted string, something more clever has to be done. Change-Id: I80c4a3a0dbcf59f1dc732d795fb716da318411cb Reviewed-on: https://gerrit.libreoffice.org/80156 Tested-by: Jenkins Reviewed-by: Tamás Bunth <btomi96@gmail.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/84076
* tdf#123774 OOXML chart export: keep digits of percentages of data points Balazs Varga2019-11-224-0/+16
| | | | | | | | | | | | | | | | | | | | | | | by exporting PercentageNumberFormat, checking the "Label" format directly and taking the respective number format based on that. Note: also fix the "LinkNumberFormatToSource" property. If we create a pie chart with data labels and set the "Show value as number" or "Show value as percentage" and check on/off "Source format", this move is not set the property in the XPropertySet. Because of this, it fixes also the export of correct value of "link-data-style-to-source" property into ODS files. But this patch doesn't fix the export of old ODS files to OOXML, because they contain wrong (always true) "link-data-style-to-source" value. Change-Id: I4098a245dec5bf35cde20c9ccb79aca726230118 Reviewed-on: https://gerrit.libreoffice.org/82703 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit a59eb39c6ec01ae2a9d8ddbb61a9c27f527c9caa) Reviewed-on: https://gerrit.libreoffice.org/83410
* tdf#127777 fix "CrossBetween" for not imported combined chartBalazs Varga2019-11-191-1/+4
| | | | | | | | | | | | | | | | Set the ShiftedCategoryPosition for true in case of combined chart. See also commit 111c260ab2883b7906f1a66e222dbf4dc3c58c4f 'tdf#127777 OOXML chart export: fix "CrossBetween" for not imported charts Change-Id: I52fdcdc52e75ac15c85e04c2982b25cc180d7815 Reviewed-on: https://gerrit.libreoffice.org/82617 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 071007d83d9d29fa7879b71b0e7b396da70963a5) Reviewed-on: https://gerrit.libreoffice.org/83097 Reviewed-by: Balazs Varga <balazs.varga991@gmail.com>
* tdf#128733 Chart import: fix secondary X axisBalazs Varga2019-11-133-0/+18
| | | | | | | | | | | | | | shiftedcategoryposition value. When inserting secondary axes it applies the ShiftedCategoryPosition of the main axis. Regression from the commit 111c260ab2883b7906f1a66e222dbf4dc3c58c4f (tdf#127777 OOXML chart export: fix "CrossBetween" for not imported charts) Change-Id: Ia043fe2873f633cbd5f7db206cf9d1b0d2f8c34c Reviewed-on: https://gerrit.libreoffice.org/82511 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
* chart2: Separate definition from declaration for ChartResourceGroupsMuhammet Kara2019-11-133-421/+457
| | | | | | | | | Change-Id: I861eaf0e519c428debc28436ea41724fdf493359 Reviewed-on: https://gerrit.libreoffice.org/81634 Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Tested-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/82463 Tested-by: Jenkins
* tdf#128732 Chart OOXML import: fix rounding error of color transparencyBalazs Varga2019-11-132-0/+27
| | | | | | | Change-Id: I52efb541d62a9536c2eb5f99453dc2cb594e6fe4 Reviewed-on: https://gerrit.libreoffice.org/82500 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
* tdf#128619 Chart OOXML export: fix gradient positionBalazs Varga2019-11-132-0/+14
| | | | | | | | | | | Export the gradient border value as gradient stop position of the first color at LINEAR GradientStyle. Change-Id: I1a2b986a004fecbf68050c6bf95be549684fea70 Reviewed-on: https://gerrit.libreoffice.org/82446 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
* chart2: Separate ChartResourceGroups to reuseMuhammet Kara2019-11-135-570/+610
| | | | | | | | | Change-Id: I0ca2ea9cd520013250faaba0e17e713da1e6fca3 Reviewed-on: https://gerrit.libreoffice.org/81581 Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Tested-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/82462 Tested-by: Jenkins
* tdf#128627 tdf#128634 Fix OOXML import of CrossBetweenBalazs Varga2019-11-123-0/+34
| | | | | | | | | | | | | | | | | | | | | | Set default 'midCat' value during the import, for Radar charts, because MSO created them with default 'midCat', but exported a 'between' value. Set default 'between' value during the import, for 3D Bar and Stock charts, because sometimes the OOXML file can contain a wrong CrossBetween value, but MSO import them with default values. tdf#128627 regression from commit: 830e539547c463b932ce643517f880789185032d (tdf#127393 OOXML chart import: fix X axis position setting "CrossBetween") tdf#128634 regression from commit: 111c260ab2883b7906f1a66e222dbf4dc3c58c4f (tdf#127777 OOXML chart export: fix "CrossBetween" for not imported charts) Change-Id: Ie9763197b79c3a661e66043da7b89b4f0f00ba33 Reviewed-on: https://gerrit.libreoffice.org/82211 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
* chart2: Move some headers to incMuhammet Kara2019-11-1211-311/+386
| | | | | | | | | | | | So that they will be accessible from inside the sidebar dir. Change-Id: Iaf7b1a800a3b35a5c497d8122f68c97c8cdc9eff Reviewed-on: https://gerrit.libreoffice.org/80922 Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Tested-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/82461 Tested-by: Jenkins
* Don't call setPropertyValue with empty valueMuhammet Kara2019-11-091-1/+5
| | | | | | | Change-Id: I3dd2525e5649cf71b47c2733db4d121625b33342 Reviewed-on: https://gerrit.libreoffice.org/82348 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
* Make ControllerCommandDispatch::commandAvailable() more talkativeMuhammet Kara2019-11-091-1/+1
| | | | | | | Change-Id: I7d89a27692c619707ccb8356241422c9578fb081 Reviewed-on: https://gerrit.libreoffice.org/82345 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
* tdf#128618 OOXML chart export: deleted automatic title returns on saveBalazs Varga2019-11-082-0/+10
| | | | | | | | | | | | | If there is no main title and/or subtitle, write out autoTitleDeleted with a true value. Regression from the commit 96a29c12a9d8734c9d2a812f38fc6654b5df9c48 (tdf#101322 Chart OOXML Export: fix missing subtitle) Change-Id: I0094014fc4da4cb66d31e4249f916452d00758c7 Reviewed-on: https://gerrit.libreoffice.org/82142 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
* tdf#128633 Chart OOXML Export: Fix position of bar in chartsBalazs Varga2019-11-082-0/+11
| | | | | | | | | | | | | Fix export of c:crossBetween tag if the category axis is deleted. Regression from commit: e0b0502516a10181bbd1737b93b38b2bba4c98e8 (tdf#128016 Chart OOXML Import: fix duplicated category labels) Change-Id: I46ab45f3ba4f3d0fdde3ddf017a7f512b6e2e403 Reviewed-on: https://gerrit.libreoffice.org/82194 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
* tdf#128625 set only one active radiobutton per groupCaolán McNamara2019-11-081-6/+0
| | | | | | | | Change-Id: Ia44438ec4da771eb093a46311f37e49d1df7b511 Reviewed-on: https://gerrit.libreoffice.org/82254 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* tdf#128625 Fix radio button alignments in Error Bars dialogGabor Kelemen2019-11-071-8/+17
| | | | | | | | | | This seems to fix the multiple selection problem with QT5 backend Change-Id: I1be16512db1a485b4c610cd3b5eceaba3b68ef84 Reviewed-on: https://gerrit.libreoffice.org/82247 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* loplugin:unusedvariablecheck tweak to find more stuffNoel Grandin2019-11-062-4/+0
| | | | | | | | | but leave the tweak commented out, since it generates false positives Change-Id: Iaf3f92414d2618f8780561f98765e33e282afe0c Reviewed-on: https://gerrit.libreoffice.org/82121 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* loplugin:indentation find broken if statementsNoel Grandin2019-11-061-1/+3
| | | | | | | | | so I don't read the "then" block as being a sequential statements Change-Id: Ib2004acd3518bd4ebd2246f02a26c2c0a8bbab4c Reviewed-on: https://gerrit.libreoffice.org/82069 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* tdf#108065 tdf#128609 OOXML chart export: fix transparent color gradientBalazs Varga2019-11-053-0/+28
| | | | | | | | | | Linear and axial color gradients keep their solid or gradient transparencies. Change-Id: I37dfe016864bded49c767cea5c8c865455281de0 Reviewed-on: https://gerrit.libreoffice.org/81308 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
* loplugin:stringaddNoel Grandin2019-11-031-5/+5
| | | | | | | | | | tweak the plugin to be more permissive, then validate by hand afterwards Change-Id: I40c5c911fe6ff7e45baaca372abf7dac211d9654 Reviewed-on: https://gerrit.libreoffice.org/81942 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* New loplugin:conditionalstringStephan Bergmann2019-11-021-1/+1
| | | | | | | Change-Id: I2eab990c15f845b44a3b598571aca361dadf9ff3 Reviewed-on: https://gerrit.libreoffice.org/81946 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>