summaryrefslogtreecommitdiff
path: root/chart2
AgeCommit message (Collapse)Author
2014-09-12bnc#892610: OOXML import: Improve chart number formats.Matúš Kukan
If sourceLinked is used, do not set "PercentageNumberFormat" even if showPercent is true. The format string should be used for "NumberFormat". c8cc89ff802d86b1f3a69afe1b4835b7df7f70c7 unnecessarily disabled "LinkNumberFormatToSource". Use that for data labels but not for axis. Also, actually make attaching number format supplier work for Calc. Previously, non standard formats were added into wrong supplier, and they were thrown away later because it was attached too late. (See also ChartModel::attachNumberFormatsSupplier) (cherry picked from commit d22a4d945ccf1456fbdb2c39802d956afa583a2a) Conflicts: chart2/qa/extras/chart2import.cxx oox/source/drawingml/chart/chartconverter.cxx Change-Id: Iaf9945abc3d82d0ac63d9f36b8888eb49f39ab57 Reviewed-on: https://gerrit.libreoffice.org/11415 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-08-06bnc#886540: Let's not push the available area down when no titles are there.Kohei Yoshida
This improves visual layout compability with MS Office chart & looks better. Change-Id: I348ea81152eca4e3bba9e0d9460448d9314738ad (cherry picked from commit b398ed8e3f95b75705bb2e53d49589ef7fdbb1c7) Reviewed-on: https://gerrit.libreoffice.org/10771 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-08-01fdo#75380: Let's not always set the line style to NONE here.Kohei Yoshida
This one line guarantees that no matter what the real line style is, it will be ignored. Change-Id: I3bceaf49ce13ddb42ceb56750d8a4ccfef54033b (cherry picked from commit 6053491532a5d9954caaa4abf09af30850f0cb94) Reviewed-on: https://gerrit.libreoffice.org/10672 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-15fdo#79676: Initialize with a default chart only from the UI.Kohei Yoshida
When creating an embedded chart object during import, we don't want to create a default chart which would only mess up the chart data. With this change, ChartModel::initNew() is a no-op. (cherry picked from commit c5539bb585370f095cb6c09e38a7dd005d237295) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: chart2/source/model/main/ChartModel_Persistence.cxx sc/source/ui/drawfunc/fuins2.cxx sw/source/uibase/table/tablemgr.cxx Change-Id: Id29659c3885ec1e06bed26d2c851123fb63072cc (cherry picked from commit 1eccdc5c39587d4019cb4c88f8483b1fe14d5dda) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-07-15fdo#71076, fdo#71767: Preserve number formats when charts are copied.Kohei Yoshida
(cherry picked from commit 1d38cb365543924f9c50014e6b2227e77de1d0c9) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: xmloff/source/chart/SchXMLExport.cxx sd/source/ui/view/sdview3.cxx chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx chart2/source/controller/main/ChartTransferable.cxx chart2/source/controller/main/ChartTransferable.hxx chart2/source/model/main/Axis.cxx chart2/source/model/template/ChartTypeTemplate.cxx chart2/source/tools/AxisHelper.cxx chart2/source/view/main/ChartView.cxx comphelper/source/container/embeddedobjectcontainer.cxx dbaccess/source/ui/browser/dbexchange.cxx dbaccess/source/ui/inc/JoinExchange.hxx dbaccess/source/ui/inc/TableRowExchange.hxx dbaccess/source/ui/inc/dbexchange.hxx dbaccess/source/ui/querydesign/JoinExchange.cxx dbaccess/source/ui/tabledesign/TableRowExchange.cxx embeddedobj/source/commonembedding/persistence.cxx embeddedobj/source/inc/commonembobj.hxx include/comphelper/embeddedobjectcontainer.hxx include/svtools/embedtransfer.hxx include/svtools/stringtransfer.hxx include/svtools/transfer.hxx include/svx/dbaexchange.hxx include/svx/dbaobjectex.hxx include/svx/fmview.hxx include/svx/galmisc.hxx include/svx/svdobj.hxx include/svx/svdoole2.hxx include/svx/svdxcgv.hxx include/svx/view3d.hxx include/svx/xmlexchg.hxx include/xmloff/xmlexp.hxx reportdesign/source/ui/dlg/GroupExchange.cxx reportdesign/source/ui/dlg/GroupExchange.hxx reportdesign/source/ui/inc/dlgedclip.hxx reportdesign/source/ui/report/dlgedclip.cxx sc/inc/column.hxx sc/source/ui/app/drwtrans.cxx sc/source/ui/app/lnktrans.cxx sc/source/ui/app/seltrans.cxx sc/source/ui/app/transobj.cxx sc/source/ui/inc/drwtrans.hxx sc/source/ui/inc/lnktrans.hxx sc/source/ui/inc/seltrans.hxx sc/source/ui/inc/transobj.hxx sc/source/ui/inc/viewfunc.hxx sc/source/ui/view/viewfun5.cxx sc/source/ui/view/viewfun7.cxx sd/source/ui/app/sdxfer.cxx sd/source/ui/dlg/sdtreelb.cxx sd/source/ui/inc/TabControl.hxx sd/source/ui/inc/View.hxx sd/source/ui/inc/sdtreelb.hxx sd/source/ui/inc/sdxfer.hxx sd/source/ui/view/sdview2.cxx sd/source/ui/view/tabcontr.cxx sfx2/source/doc/objxtor.cxx svtools/source/misc/embedtransfer.cxx svtools/source/misc/stringtransfer.cxx svtools/source/misc/transfer.cxx svtools/source/misc/transfer2.cxx svx/source/engine3d/view3d.cxx svx/source/fmcomp/dbaexchange.cxx svx/source/fmcomp/dbaobjectex.cxx svx/source/fmcomp/xmlexchg.cxx svx/source/form/fmexch.cxx svx/source/form/fmview.cxx svx/source/gallery2/galmisc.cxx svx/source/inc/fmexch.hxx svx/source/svdraw/svdoole2.cxx svx/source/svdraw/svdxcgv.cxx svx/source/tbxctrls/colrctrl.cxx sw/source/core/uibase/dochdl/swdtflvr.cxx sw/source/core/uibase/inc/swdtflvr.hxx sw/source/core/undo/unins.cxx Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a (cherry picked from commit 4ee53683df4beda260aff26d2c9e56fe643f45bb) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-07-03More fine-grained check of data series labels in the unit test.Kohei Yoshida
(cherry picked from commit bdad8d9051c207b2eff0d5a7842da83e6119a600) Change-Id: I6b23126816bb114407f2b75545094bc297ee7cc3 Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-07-03bnc#812796: Correctly handle static value array for OOXML charts.Kohei Yoshida
We need to pass the role of the data sequence in order to avoid unreliable guess work when importing static value array. Also, not all Excel's scatter plots have real numeric X values; some have textural X values in which case Excel switch to generating 1, 2, 3, ... as X values. When importing to our chart implementation, using "categories" role in such cases instead of "values-x" results in a more faithful chart rendering. (cherry picked from commit 6c4e21a234f12e1310ba06f9859e08b424acf8bf) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: chart2/source/inc/InternalDataProvider.hxx chart2/source/tools/InternalDataProvider.cxx Conflicts: chart2/source/inc/InternalDataProvider.hxx dbaccess/source/core/inc/DatabaseDataProvider.hxx dbaccess/source/core/misc/DatabaseDataProvider.cxx sc/source/filter/inc/excelchartconverter.hxx Change-Id: If4bc1f650bb024dcd1b1b36537f457fb38404a78 Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-06-30fdo#79151: No need to offset column index by category labels.Kohei Yoshida
In fact, doing so would lead to a corrupt internal data table. The internal data stores category labels separately from the column data, so there is no reason why we need to offset for category labels here. (cherry picked from commit ecde8155fefcdacb08177a10a4eddc24f6675b0b) Conflicts: chart2/source/controller/dialogs/DataBrowserModel.cxx Change-Id: I29dd99e53837cba7a1e28d2a1ef39a5384378805 Reviewed-on: https://gerrit.libreoffice.org/9928 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-05set graphic properties for error bars during import, fdo#78041Markus Mohrhard
Change-Id: I43138745b074dcacdafa090d97eeb9aa2ccecf78 Reviewed-on: https://gerrit.libreoffice.org/9233 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-05-05be explicit about text rotations, fdo#70670Markus Mohrhard
Change-Id: I5090a49c2383e6a30165a8eca22b527972c0f507 Reviewed-on: https://gerrit.libreoffice.org/9231 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-03-31Resolves: #i124085# disabled CF_DIBV5...Armin Le Grand
(no advantages but some problems), increased png support (cherry picked from commit c991f7cae8dcb306cb0d1f32bc5fcd8ea0a1ea81) Change-Id: I52bef1295b32eb3692a0428c96edd0c55287f34a Reviewed-on: https://gerrit.libreoffice.org/8784 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-19the type in the Any is a util::Date and not a DateTime, fdo#74549Markus Mohrhard
Either that was always broken or it is a recent regression that operator>>= does not convert from Date to DateTime. Change-Id: Ic948224c139ed84b3fe006385fcafd6ce16c30f1 (cherry picked from commit 22c7da0ca5438b69165609db2a1ef219aa167dc2) Reviewed-on: https://gerrit.libreoffice.org/8652 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-11fix negative error bar range export, fdo#75510Markus Mohrhard
Change-Id: Icca2f9fc26b15b968a940e5c73f7ad3781f75e94 (cherry picked from commit 7470b3ef17570581fe590a4853de59cac1be6ea5) Reviewed-on: https://gerrit.libreoffice.org/8535 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-03-07fdo#75538 R^2 calculation of trendline similar to LINEST functionLaurent Balland-Poirier
Modify for forced intercept of trendline, calculation of R^2 in the same way as LINEST function does calculation Update fo 4.2 Change-Id: I06ba4e7f5e07f7db150e1bf1070870bf64ad6f61 Reviewed-on: https://gerrit.libreoffice.org/8462 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2014-02-10fdo#73374 Trendline: correct R^2 for forced interceptLaurent Balland-Poirier
In case of forced intercept, R^2 must be calculated in a different way. This patch calculates R^2 of trend line in the same way as LINEST function. Change-Id: I3ac361f014569261f05d513acb3428de5c7641ab Reviewed-on: https://gerrit.libreoffice.org/7326 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 9e67015be6e9e53e19466117d692de17c18463da) Reviewed-on: https://gerrit.libreoffice.org/7956 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-01-10fdo#72005: Insert the border rectangle to the bottom of the stack.Kohei Yoshida
This will make the border and fill shape to be drawn first, then everything else drawn on top. This commit may look large, but it's actually a very trivial change. The important part is in SvxShapeGroup where new methods have been added to allow different insertion positions for the new shapes being inserted, and have the chart2 code make use of it to insert the fill rectangle to the bottom rather than to the top. (cherry picked from commit 10840ad753b60886ea5175060cb0ec2a77e1579a) (cherry picked from commit d1846cd8d4530d620b996f27a0ea7ab0c91639b5) Change-Id: I999160daf6fc9ce3d7e641f57b1998543df1cc4e Reviewed-on: https://gerrit.libreoffice.org/7379 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-12-16initial install-package-foo target for partial installsBjoern Michaelsen
make packageinfo target add uiconfig file translations add missing l10n config files add missing help files in packageinfo Reviewed-on: https://gerrit.libreoffice.org/6754 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Conflicts: helpcontent2 translations a2498a118e729276a78ef3a4eb43b5d0b302d326 9bb39bdd677af4be0da621370c51eb9e22ecc33f a7e654cdeffd832f51016ff51aa180fe3924ff4e 4ee41fdb600cb3a89da387dffe64e6a30192761c 349fb24a388775c58be7a326832b3fc0ec38180f 8a2ca73c02fd6b04ce60e7701c51d2362ef7ec06 Change-Id: Id5f6f5c1f3e46df2d9033ccd5bbf2af6ab38a9e8 Reviewed-on: https://gerrit.libreoffice.org/6982 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-12-14fdo#40316 Remove SpinButton in UI for extrapolate trendlineLaurent Balland-Poirier
UI Trendline: Spinbutton are not adapted for real value of x-values used in extrapolate For/Back-ward. Replaced with FormattedFiled like Intercept value Change-Id: Idc49f842a0f76906eb3c027e15a493e625c3d535 Reviewed-on: https://gerrit.libreoffice.org/7067 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2013-12-10fdo#40315 Improve text for moving average trendlineLaurent Balland-Poirier
Change text in status bar for moving average trendline: no equation, no R² Change-Id: I0e18a72ff1f1d78e3bb28cab4d5f215c096898dc Reviewed-on: https://gerrit.libreoffice.org/7015 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2013-12-10WaE: unused variable 'aService' [loplugin]Tor Lillqvist
Change-Id: Ifc907dad0849f17aec728b9f0e85d44048755a14 (cherry picked from commit 6e0e5503a998b6b0996d1f8013cdd963576b840e)
2013-12-09More clearly name the trendline in chart's element selection box.Tomaž Vajngerl
Change-Id: I5f787eb064524a3b2399d591866a5b8cbdee6294
2013-12-09Display correct equation with multiple trendlines in chart.Tomaž Vajngerl
When there were multiple trendlines for one data series and one was selected, always the equation and R^2 of the first trendline was displayed in status bar. Change-Id: I320261e129c51bbdd1228173ca2f1d8447fdcb89
2013-12-09fdo#72137 Allocate enough points in MovingAverageRegression calc.Tomaž Vajngerl
Change-Id: I9ae058cad678cdb86709a4e40e3d4bd47900d386
2013-12-09fdo#40314 Force intercept only for linear/poly trendlinesLaurent Balland-Poirier
Force intercept option is available only for linear and polynomial trendlines Change-Id: I98f551a51b4d1e85924ce23135588a03fabbea35 Reviewed-on: https://gerrit.libreoffice.org/7001 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2013-12-08fdo#40314 Free value of intercept for trend lineLaurent Balland-Poirier
Intercept value field has been changed to FormattedField to support scientific notation and more than 4 digits after decimal point Change-Id: Idb2d27862ddabcdc96a036d93f1f3498cc6327df Reviewed-on: https://gerrit.libreoffice.org/6904 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2013-12-03Blind fix for sal_Int32/int confusionTor Lillqvist
Change-Id: Ia052922ec323220b8785b1a156e5bc2fbf44c11b (cherry picked from commit 40e98f439f892af47b508968aaa25c2327b97868) Signed-off-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03Test trendline properties using an emport -> ixport cycleTomaž Vajngerl
Added a test which checks the preservation of properties for trendlines / regression curves in an export -> import cycle using different file formats - ODS, XLS and XLSX. Change-Id: I59fe6c045f7f503ee074e6a2741fa017756b3018 Reviewed-on: https://gerrit.libreoffice.org/6877 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03Custom name for a trend line (shown in legend).Tomaž Vajngerl
Previously, a trendline name was fixed to a combination of the trendline type and the name of the series. With this it is possible to add a custom name for the trendline, which is shown in the legend. Change-Id: I61eaaf14e6df45088abdf1f3e9c24877d26ae8a7 Reviewed-on: https://gerrit.libreoffice.org/6873 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03Simplify conversion from/to ItemSet/PropertySet for RegressionCurvesTomaž Vajngerl
Change-Id: I5ddf53f984508a88fd02063eb9f81cd05cf627c9 Reviewed-on: https://gerrit.libreoffice.org/6872 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03DRY-cleanup RegressionCurveItemConverterTomaž Vajngerl
Change-Id: I8fb799b2efc81587252161ccadfa1dbd6b096bda Reviewed-on: https://gerrit.libreoffice.org/6871 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-11-30fdo#40315 Improve UI for moving average trendlineLaurent Balland-Poirier
If moving average trendline is selected, show equation is uncheked, and all options disable Change-Id: Ic25c09b8c8410a12ac9f14cb0ba7833f304053ee Reviewed-on: https://gerrit.libreoffice.org/6796 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/6856
2013-11-30fdo#35712 fdo#40315 fdo#40314 Autoselect trendline typeLaurent Balland-Poirier
Modification of Degree or Period select trendline type Modification of Intercept select option Change-Id: If3a212c381061e831ee4411c8e17fbaf8ca12895 Reviewed-on: https://gerrit.libreoffice.org/6815 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/6855
2013-11-20both help ids end up in the same helpCaolán McNamara
Change-Id: Ia08494cd48a510be53006d6beda14e4b5affbdc2
2013-11-20Convert chart axis scale tab page to widget UI.Olivier Hallot
Obs: -Several widget positioning methods turned useless and were deleted -Corner case related to axis origin untested (couldn't find where it is used) Change-Id: I6a563c89ddcfbff62494ce7726f3e7d6089e6b57 Reviewed-on: https://gerrit.libreoffice.org/6730 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-20remove unnecessary RTL_CONSTASCII_STRINGPARAM in appendAscii callsNoel Grandin
Convert code like: aStrBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "ln(x)" )); to: aStrBuf.append( "ln(x)" ); which compiles down to the same code. Change-Id: I24c7cb45ceb32fd7cd6ec7ed203c2a5d746f1c5c
2013-11-19unknown log areaStephan Bergmann
Change-Id: Ideb0742c2c6f3f7ba45af23359d5a653f58b120c
2013-11-19-Werror,-Wunused-functionStephan Bergmann
Change-Id: I337691b4a7548c5c92bc0484c2ef9224ce461ba5
2013-11-19-Werror,-Wunused-functionStephan Bergmann
Change-Id: I4ae45a0809cc57fad3d8e872952aedfead27a518
2013-11-19this only works with c++11Markus Mohrhard
2013-11-19fix tinderboxMarkus Mohrhard
2013-11-19disable building the OpenGL piecesMarkus Mohrhard
2013-11-19fix testsMarkus Mohrhard
Change-Id: Ib090d9a6a007a738a0603d1d0a38d5b274feadcc
2013-11-19fix the windows buildMarkus Mohrhard
Change-Id: Ie3625211a32c41dd0fadf94294bc689aef7b1c24
2013-11-19more windows build fixesMarkus Mohrhard
Change-Id: I79b75bbb193851855328a7dbbd8ab547afe29aec
2013-11-19fix windows buildMarkus Mohrhard
Change-Id: I51942eb3719459abc0353a7fd024784f2c4abdb3
2013-11-19we need to depend on mesa headers for windows & unix without openglMarkus Mohrhard
Change-Id: I0144586864045b5f6091dc49ed7e1e1a73705ce1
2013-11-19removed unused variableMarkus Mohrhard
Change-Id: I74af65aba6d19e39f889a28b15d04f7e293168c5
2013-11-19fix crash in opengl backendMarkus Mohrhard
Change-Id: I1257f4568e55ca545e96bda8a53f272ba8e1f0b0
2013-11-19dbgutil build fixMarkus Mohrhard
Change-Id: I54abcc2a9fbe7d30bdf64d194df1a435d21f24ac
2013-11-19we need to init manually nowMarkus Mohrhard
Change-Id: I1374814e549dcbb33de75ffa118d1eccfd168893
generated by cgit (git 2.34.1) at 2024-06-17 02:35:58 +0000