mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
93cc3a3a71017b0a2f46725cef0ba21d9e194afd
libreoffice/chart2/source/controller/dialogs/DataBrowserModel.cxx

927 lines
36 KiB
C++
Raw Normal View History

INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
/*************************************************************************
*
INTEGRATION: CWS changefileheader (1.4.20); FILE MERGED 2008/03/28 16:43:20 rt 1.4.20.1: #i87441# Change license header to LPGL v3.
2008-04-10 18:43:34 +00:00
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
*
INTEGRATION: CWS changefileheader (1.4.20); FILE MERGED 2008/03/28 16:43:20 rt 1.4.20.1: #i87441# Change license header to LPGL v3.
2008-04-10 18:43:34 +00:00
* Copyright 2008 by Sun Microsystems, Inc.
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
*
INTEGRATION: CWS changefileheader (1.4.20); FILE MERGED 2008/03/28 16:43:20 rt 1.4.20.1: #i87441# Change license header to LPGL v3.
2008-04-10 18:43:34 +00:00
* OpenOffice.org - a multi-platform office productivity suite
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
*
INTEGRATION: CWS changefileheader (1.4.20); FILE MERGED 2008/03/28 16:43:20 rt 1.4.20.1: #i87441# Change license header to LPGL v3.
2008-04-10 18:43:34 +00:00
* $RCSfile: DataBrowserModel.cxx,v $
CWS-TOOLING: integrate CWS chart30
2008-10-01 07:35:04 +00:00
* $Revision: 1.6.16.2 $
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
*
INTEGRATION: CWS changefileheader (1.4.20); FILE MERGED 2008/03/28 16:43:20 rt 1.4.20.1: #i87441# Change license header to LPGL v3.
2008-04-10 18:43:34 +00:00
* This file is part of OpenOffice.org.
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
*
INTEGRATION: CWS changefileheader (1.4.20); FILE MERGED 2008/03/28 16:43:20 rt 1.4.20.1: #i87441# Change license header to LPGL v3.
2008-04-10 18:43:34 +00:00
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
*
INTEGRATION: CWS changefileheader (1.4.20); FILE MERGED 2008/03/28 16:43:20 rt 1.4.20.1: #i87441# Change license header to LPGL v3.
2008-04-10 18:43:34 +00:00
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
*
INTEGRATION: CWS changefileheader (1.4.20); FILE MERGED 2008/03/28 16:43:20 rt 1.4.20.1: #i87441# Change license header to LPGL v3.
2008-04-10 18:43:34 +00:00
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
*
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_chart2.hxx"
#include "DataBrowserModel.hxx"
#include "DialogModel.hxx"
#include "ChartModelHelper.hxx"
#include "DiagramHelper.hxx"
#include "DataSeriesHelper.hxx"
#include "PropertyHelper.hxx"
#include "ControllerLockGuard.hxx"
#include "macros.hxx"
INTEGRATION: CWS chart20_DEV300 (1.3.76); FILE MERGED 2008/02/21 15:59:25 bm 1.3.76.1: #i366# error bars from ranges
2008-03-06 15:24:36 +00:00
#include "StatisticsHelper.hxx"
CWS-TOOLING: integrate CWS chart35 2009-02-20 12:33:54 +0100 nn r268312 : correct line ends 2009-01-19 12:50:45 +0100 iha r266491 : #i91800# style:text-position='0' is wrongly imported 2009-01-19 11:59:09 +0100 iha r266486 : #i91037# Position of Datalabels in 3D Bar-Charts are crossing the edge 2009-01-16 16:45:50 +0100 iha r266435 : #i93802# clockwise does not work on solars sparc 2009-01-16 13:23:37 +0100 iha r266414 : #i91037# Position of Datalabels in 3D Bar-Charts are crossing the edge 2009-01-15 14:09:27 +0100 iha r266370 : #i98102# checkbox show equation should not be checked initially 2009-01-14 17:41:33 +0100 iha r266323 : #i97133# #i97318# chart type is not detected correctly in case of invisible series 2009-01-14 16:23:06 +0100 iha r266316 : #i97133# #i97318# chart type is not detected correctly in case of invisible series 2009-01-14 13:43:38 +0100 iha r266298 : #i84417# Unable to edit existing chart title with clipboard 2009-01-14 13:43:04 +0100 iha r266297 : #i84417# Unable to edit existing chart title with IME 2009-01-14 13:14:15 +0100 dr r266293 : do not set CharEscapement property if not needed 2009-01-14 00:48:46 +0100 er r266262 : #i81383# changed ASC and JIS to use transliteration provided by i18n transliteration; patch from <bluedwarf> 2009-01-14 00:28:06 +0100 er r266261 : #i97536# silence gcc's unbracketed && || warnings 2009-01-13 22:43:45 +0100 er r266259 : #i97905# corrected IndexKey order 2009-01-13 20:36:15 +0100 er r266254 : #i97905# add SKK/EUR conversion (plus MTL/EUR and CYP/EUR) 2009-01-13 20:31:17 +0100 er r266253 : #i97905# updated locale data; contributed by <brko> 2009-01-13 11:57:08 +0100 iha r266204 : #i84103# cannot set data in xy diagram in draw 2009-01-12 20:29:37 +0100 nn r266181 : #i97680# GetStylesContainer: handle non-available style family 2009-01-12 19:53:19 +0100 nn r266180 : #i98000# don't get initial zoom value via SfxViewFrame::Current 2009-01-12 16:11:19 +0100 iha r266166 : #i71686# XY charts without valid x values are not imported correctly from Excel 2009-01-09 17:10:20 +0100 iha r266102 : #i95051# truncated asian strings on scale tabpage 2009-01-09 15:58:46 +0100 iha r266094 : #i89430# truncated asian strings in smooth lines dialog 2009-01-09 13:09:14 +0100 iha r266076 : #i94813# importing pie chart with multiline categories crashes
2009-03-03 11:39:43 +00:00
#include "ContainerHelper.hxx"
CWS-TOOLING: integrate CWS bubblechart 2009-06-17 08:41:14 +0200 hde r273051 : i101635: added new charttype bubble 2009-06-17 08:39:37 +0200 hde r273050 : i101635: created new testcase tCreateNewBubbleChart 2009-06-17 08:38:07 +0200 hde r273049 : i101635: created new testcase tCreateNewBubbleChart 2009-06-15 15:22:32 +0200 hde r272991 : 101635 2009-06-11 12:44:01 +0200 iha r272864 : rebase to dev300m50 2009-06-10 23:27:54 +0200 iha r272841 : CWS-TOOLING: rebase CWS bubblechart to trunk@272827 (milestone: DEV300:m50) 2009-06-04 18:07:35 +0200 iha r272649 : #i64689# Bubble Chart 2009-06-04 17:26:44 +0200 iha r272647 : #i64689# Bubble Chart 2009-06-04 11:24:25 +0200 iha r272618 : #i64689# add more spacing between bubbles and data labels 2009-05-26 18:05:23 +0200 ufi r272314 : i101637 2009-04-22 14:37:50 +0200 iha r271115 : #i64689# bubble chart 2009-04-21 17:52:23 +0200 iha r271052 : #i64689# bubble chart 2009-04-21 17:50:48 +0200 iha r271051 : #i76728# type icon for xy chart 2009-04-21 17:25:52 +0200 iha r271049 : #i76728# type icon for xy chart 2009-04-09 11:18:09 +0200 iha r270685 : #i100977# autoscaling works not correct if missing values should be treated as zero 2009-04-08 16:39:43 +0200 iha r270656 : #i64689# bubble chart - missing value treatment 2009-04-08 15:13:25 +0200 iha r270655 : #i64689# bubble chart - remove unused code 2009-04-08 15:12:19 +0200 iha r270653 : #i64689# bubble chart - determine sereis length correctly on export 2009-04-08 14:22:43 +0200 iha r270650 : #i64689# bubble chart - remove unused code 2009-04-08 14:12:09 +0200 iha r270646 : #i64689# bubble chart - export domains even if no main sequence was found 2009-04-08 14:11:07 +0200 iha r270645 : #i64689# bubble chart - don't replace missing size values with 1.0 2009-04-07 16:20:22 +0200 iha r270602 : #i64689# bubble chart - do not offer percent values for data label display for xy and bubble chart 2009-04-07 16:17:42 +0200 iha r270601 : remove superfluous code 2009-04-06 16:39:32 +0200 iha r270569 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-02 17:33:33 +0200 iha r270427 : use input string for formatting in data table during edit 2009-04-02 16:00:29 +0200 iha r270413 : #i64689# bubble chart - when creating a new series within the data table give it the same number format as the former series, thus the new bubble size values can be edited with the same format immidiately 2009-04-02 11:25:33 +0200 iha r270385 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-01 11:32:03 +0200 iha r270312 : #i64689# bubble chart - add further parameter for view creation 2009-03-31 17:52:08 +0200 iha r270291 : #i64689# bubble chart - scale bubble size with diagram size 2009-03-31 13:38:13 +0200 iha r270278 : #i64689# bubble chart - wrong size for small values < 1 2009-03-27 19:11:07 +0100 iha r270169 : #i64689# bubble chart 2009-03-27 19:07:11 +0100 iha r270168 : #i64689# bubble chart - remove unused code 2009-03-27 18:33:57 +0100 iha r270167 : #i64689# bubble chart - create no shape for invalid sizes 2009-03-27 15:18:21 +0100 iha r270157 : #i76728# type icon for xy chart 2009-03-27 14:34:38 +0100 iha r270156 : #i64689# bubble chart - correct scaling 2009-03-27 14:27:27 +0100 iha r270155 : #i64689# bubble chart - images 2009-03-27 14:25:45 +0100 iha r270154 : #i64689# bubble chart - images 2009-03-27 11:38:57 +0100 iha r270142 : #i64689# bubble chart - values-size is the main series 2009-03-27 11:30:20 +0100 iha r270140 : #i64689# correct order of sequences after load thus switching charttypes afterwards produces expected results now 2009-03-26 10:22:55 +0100 iha r270056 : #i64689# bubble chart 2009-03-24 17:45:15 +0100 iha r269984 : #i64689# bubble chart - user properties from points (not only from the series) 2009-03-24 15:10:57 +0100 dr r269954 : #i64989# export bubble charts to xls 2009-03-24 14:55:29 +0100 dr r269952 : #i64989# import bubble charts from xls 2009-03-24 14:54:46 +0100 dr r269950 : #i64989# import bubble charts from ooxml 2009-03-23 18:59:08 +0100 iha r269895 : further cleanups possible with new member m_aGlobalSeriesImportInfo 2009-03-23 16:54:04 +0100 iha r269886 : #i64689# bubble chart - a single sequence must be interpreted as sizes because of ODF specification 2009-03-23 16:50:43 +0100 iha r269885 : #i64689# save&load bubble chart 2009-03-20 19:30:29 +0100 iha r269826 : CWS-TOOLING: rebase CWS bubblechart to trunk@269781 (milestone: DEV300:m44) 2009-03-19 11:30:33 +0100 iha r269732 : #i64689# rename SchXMLCategoriesDomainContext to SchXMLCategoriesContext avoid confusion with domains 2009-03-18 17:11:13 +0100 iha r269693 : #i64689# add charttype bubble 2009-03-18 17:09:22 +0100 iha r269692 : #i64689# remove unused code 2009-03-13 12:18:26 +0100 iha r269467 : #i64689# corrected lineends 2009-03-12 11:25:14 +0100 iha r269376 : #i64689# bubble chart (part 1)
2009-07-02 19:17:43 +00:00
#include "ChartTypeHelper.hxx"
#include "chartview/ExplicitValueProvider.hxx"
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
#include <com/sun/star/container/XIndexReplace.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <com/sun/star/chart2/XInternalDataProvider.hpp>
#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/data/XDataSource.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
#include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
#include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
#include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
#include <rtl/math.hxx>
#include <algorithm>
INTEGRATION: CWS chart20_DEV300 (1.3.76); FILE MERGED 2008/02/21 15:59:25 bm 1.3.76.1: #i366# error bars from ranges
2008-03-06 15:24:36 +00:00
#if OSL_DEBUG_LEVEL > 1
#include <cstdio>
#endif
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::rtl::OUString;
namespace
{
OUString lcl_getRole(
const Reference< chart2::data::XDataSequence > & xSeq )
{
OUString aResult;
Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY );
if( xProp.is())
{
try
{
xProp->getPropertyValue( C2U("Role")) >>= aResult;
}
catch( const uno::Exception & ex )
{
ASSERT_EXCEPTION( ex );
}
}
return aResult;
}
OUString lcl_getRole(
const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
{
OUString aResult;
if( xLSeq.is())
aResult = lcl_getRole( xLSeq->getValues());
return aResult;
}
OUString lcl_getUIRoleName(
const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
{
OUString aResult( lcl_getRole( xLSeq ));
if( aResult.getLength())
CWS-TOOLING: integrate CWS chart37 2009-05-22 09:10:36 +0200 iha r272170 : #i102130# color of pies is not loaded correctly 2009-04-27 17:16:20 +0200 iha r271294 : #i24203# compiler problem 2009-04-27 16:43:21 +0200 iha r271292 : #i101281# missing API documentation for secondary axis title properties 2009-04-27 15:26:05 +0200 hde r271276 : #i100987 2009-04-27 15:24:42 +0200 hde r271273 : #i100987 2009-04-24 15:08:33 +0200 iha r271214 : #i100995# crash with some logarithmic scalings 2009-04-22 18:50:56 +0200 dr r271134 : #i82177# write out deleted point labels 2009-04-22 18:40:48 +0200 iha r271133 : #i101281# missing API documentation for secondary axis title properties 2009-04-22 16:39:42 +0200 dr r271128 : #i82177# extensions for bubble charts 2009-04-22 14:37:00 +0200 dr r271114 : #i82177# import/export data label type and separator 2009-04-22 14:36:24 +0200 dr r271113 : #i82177# import/export data label type and separator 2009-04-21 15:25:26 +0200 dr r271038 : #i82177# import data label type and separator from BIFF8 CHFR records 2009-04-21 14:37:16 +0200 dr r271037 : #i82177# dump BIFF8 chart future records 2009-04-20 17:44:27 +0200 iha r271002 : #i96898# reduce library exports 2009-04-20 13:01:13 +0200 iha r270975 : #i24203# rotate data labels - help ids 2009-04-20 11:40:33 +0200 dr r270969 : #i96600# export of axis scaling/positioning properties 2009-04-16 16:02:31 +0200 dr r270892 : #i69599# keep Y axis left in 3d charts 2009-04-15 18:16:46 +0200 dr r270859 : #i69599# import of axis position settings 2009-04-15 18:16:01 +0200 dr r270858 : #i69599# correct handling of logarithmic crossing axes 2009-04-14 16:27:48 +0200 dr r270794 : #i96599# handle auto axis position on logarithmic axes 2009-04-09 19:59:51 +0200 dr r270722 : #i96599# import axis crossing settings, fix import of logarithmic scaling settings 2009-04-09 18:26:00 +0200 iha r270720 : #i96898# reduce library exports 2009-04-09 15:17:04 +0200 iha r270710 : #i96898# reduce library exports 2009-04-09 10:50:14 +0200 dr r270682 : #i24203# import/export of data label rotation, fixed some other broken stuff too 2009-04-08 16:54:54 +0200 dr r270657 : #i24203# import rotation for data point labels 2009-04-06 18:19:17 +0200 iha r270571 : #i100876# Axis scaling settings dialog wrong after API usage (anys different from double type) 2009-04-06 15:57:05 +0200 iha r270567 : #i100105# #i58585# leftover -> 2009-04-06 15:55:48 +0200 iha r270564 : #i58585# leftover -> 2009-04-02 16:41:07 +0200 iha r270422 : #i99721# remove unused code 2009-04-02 14:29:03 +0200 iha r270407 : #i99721# remove unused code 2009-03-26 10:58:23 +0100 iha r270059 : #i96898# reduce library exports 2009-03-26 10:13:49 +0100 iha r270055 : #i96898# reduce library exports 2009-03-25 09:39:13 +0100 iha r269998 : CWS-TOOLING: rebase CWS chart37 to trunk@269781 (milestone: DEV300:m44) 2009-03-24 17:56:56 +0100 iha r269986 : #i96898# reduce library exports 2009-03-24 16:56:44 +0100 iha r269974 : #i99721# remove unused code 2009-03-24 16:48:48 +0100 iha r269970 : #i89731# remove unused string 2009-03-24 15:44:04 +0100 iha r269961 : remove unused code 2009-03-24 15:22:45 +0100 iha r269959 : remove unused code 2009-03-24 15:17:17 +0100 iha r269957 : remove unused code 2009-03-24 11:14:53 +0100 iha r269923 : #i24203# rotate data labels 2009-03-09 12:10:25 +0100 hde r269076 : #i99300# 2009-03-06 15:56:26 +0100 iha r269011 : #i93953# Source Format for secondary axis without data 2009-02-17 15:59:05 +0100 iha r268177 : avoid warning during build 2009-02-17 15:01:59 +0100 iha r268173 : avoid warning during build 2009-02-13 09:39:03 +0100 ufi r267693 : i96999 2009-02-11 15:12:35 +0100 iha r267604 : removed unused string 2009-02-11 14:00:29 +0100 iha r267600 : #i96999# Corrected wording from 'correlation coefficient' to 'coefficient of determination' 2009-02-11 10:56:45 +0100 iha r267584 : #i89731# typo in resource string 2009-02-11 10:01:29 +0100 iha r267582 : #i89031# compile error on asian windows systems 2009-02-10 16:15:16 +0100 iha r267552 : #i24203# rotate data labels 2009-02-04 18:00:33 +0100 iha r267395 : #i98893# don't export defaults to file 2009-02-04 15:48:15 +0100 iha r267390 : #i92128# asian typography for chart elements 2009-02-04 15:17:41 +0100 iha r267386 : #i92128# asian typography for chart elements 2009-01-30 14:41:10 +0100 iha r267197 : CWS-TOOLING: rebase CWS chart37 to trunk@267171 (milestone: DEV300:m41)
2009-06-04 09:41:18 +00:00
aResult = ::chart::DialogModel::ConvertRoleFromInternalToUI( aResult );
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
return aResult;
}
void lcl_copyDataSequenceProperties(
const Reference< chart2::data::XDataSequence > & xOldSequence,
const Reference< chart2::data::XDataSequence > & xNewSequence )
{
Reference< beans::XPropertySet > xOldSeqProp( xOldSequence, uno::UNO_QUERY );
Reference< beans::XPropertySet > xNewSeqProp( xNewSequence, uno::UNO_QUERY );
INTEGRATION: CWS rptchart02 (1.4.4); FILE MERGED 2008/04/16 06:35:20 oj 1.4.4.2: RESYNC: (1.4-1.5); FILE MERGED 2008/04/15 12:50:17 oj 1.4.4.1: use comphelper copyProperties
2008-06-16 11:47:48 +00:00
comphelper::copyProperties( xOldSeqProp, xNewSeqProp );
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
}
bool lcl_SequenceOfSeriesIsShared(
const Reference< chart2::XDataSeries > & xSeries,
const Reference< chart2::data::XDataSequence > & xValues )
{
bool bResult = false;
if( !xValues.is())
return bResult;
try
{
OUString aValuesRole( lcl_getRole( xValues ));
OUString aValuesRep( xValues->getSourceRangeRepresentation());
Reference< chart2::data::XDataSource > xSource( xSeries, uno::UNO_QUERY_THROW );
Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeq( xSource->getDataSequences());
for( sal_Int32 i=0; i<aLSeq.getLength(); ++i )
if( aLSeq[i].is() &&
lcl_getRole( aLSeq[i] ).equals( aValuesRole ))
{
// getValues().is(), because lcl_getRole checked that already
bResult = (aValuesRep == aLSeq[i]->getValues()->getSourceRangeRepresentation());
// assumption: a role appears only once in a series
break;
}
}
catch( const uno::Exception & ex )
{
ASSERT_EXCEPTION( ex );
}
return bResult;
}
typedef ::std::vector< Reference< chart2::data::XLabeledDataSequence > > lcl_tSharedSeqVec;
lcl_tSharedSeqVec lcl_getSharedSequences( const Sequence< Reference< chart2::XDataSeries > > & rSeries )
{
// @todo: if only some series share a sequence, those have to be duplicated
// and made unshared for all series
lcl_tSharedSeqVec aResult;
// if we have only one series, we don't want any shared sequences
if( rSeries.getLength() <= 1 )
return aResult;
Reference< chart2::data::XDataSource > xSource( rSeries[0], uno::UNO_QUERY );
Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeq( xSource->getDataSequences());
for( sal_Int32 nIdx=0; nIdx<aLSeq.getLength(); ++nIdx )
{
Reference< chart2::data::XDataSequence > xValues( aLSeq[nIdx]->getValues());
bool bShared = true;
for( sal_Int32 nSeriesIdx=1; nSeriesIdx<rSeries.getLength(); ++nSeriesIdx )
{
bShared = lcl_SequenceOfSeriesIsShared( rSeries[nSeriesIdx], xValues );
if( !bShared )
break;
}
if( bShared )
aResult.push_back( aLSeq[nIdx] );
}
return aResult;
}
sal_Int32 lcl_getValuesRepresentationIndex(
const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
{
sal_Int32 nResult = -1;
if( xLSeq.is())
{
Reference< chart2::data::XDataSequence > xSeq( xLSeq->getValues());
if( xSeq.is())
{
OUString aRep( xSeq->getSourceRangeRepresentation());
nResult = aRep.toInt32();
}
}
return nResult;
}
struct lcl_RepresentationsOfLSeqMatch : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool >
{
lcl_RepresentationsOfLSeqMatch( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) :
m_aValuesRep( xLSeq.is() ?
(xLSeq->getValues().is() ? xLSeq->getValues()->getSourceRangeRepresentation() : OUString())
: OUString() )
{}
bool operator() ( const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
{
return (xLSeq.is() &&
xLSeq->getValues().is() &&
(xLSeq->getValues()->getSourceRangeRepresentation() == m_aValuesRep ));
}
private:
OUString m_aValuesRep;
};
struct lcl_RolesOfLSeqMatch : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool >
{
lcl_RolesOfLSeqMatch( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) :
m_aRole( lcl_getRole( xLSeq ))
{}
bool operator() ( const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
{
return lcl_getRole( xLSeq ).equals( m_aRole );
}
private:
OUString m_aRole;
};
bool lcl_ShowCategories( const Reference< chart2::XDiagram > & /* xDiagram */ )
{
// show categories for all charts
return true;
// return DiagramHelper::isCategoryDiagram( xDiagram );
}
bool lcl_ShowCategoriesAsDataLabel( const Reference< chart2::XDiagram > & xDiagram )
{
return ! ::chart::DiagramHelper::isCategoryDiagram( xDiagram );
}
} // anonymous namespace
namespace chart
{
struct DataBrowserModel::tDataColumn
{
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries > m_xDataSeries;
sal_Int32 m_nIndexInDataSeries;
::rtl::OUString m_aUIRoleName;
::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence > m_xLabeledDataSequence;
eCellType m_eCellType;
sal_Int32 m_nNumberFormatKey;
// default CTOR
tDataColumn() : m_nIndexInDataSeries( -1 ), m_eCellType( TEXT ), m_nNumberFormatKey( 0 ) {}
// "full" CTOR
tDataColumn(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries > & xDataSeries,
sal_Int32 nIndexInDataSeries,
::rtl::OUString aUIRoleName,
::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence > xLabeledDataSequence,
eCellType aCellType,
sal_Int32 nNumberFormatKey ) :
m_xDataSeries( xDataSeries ),
m_nIndexInDataSeries( nIndexInDataSeries ),
m_aUIRoleName( aUIRoleName ),
m_xLabeledDataSequence( xLabeledDataSequence ),
m_eCellType( aCellType ),
m_nNumberFormatKey( nNumberFormatKey )
{}
};
struct DataBrowserModel::implColumnLess : public ::std::binary_function<
DataBrowserModel::tDataColumn, DataBrowserModel::tDataColumn, bool >
{
bool operator() ( const first_argument_type & rLeft, const second_argument_type & rRight )
{
if( rLeft.m_xLabeledDataSequence.is() && rRight.m_xLabeledDataSequence.is())
{
CWS-TOOLING: integrate CWS chart37 2009-05-22 09:10:36 +0200 iha r272170 : #i102130# color of pies is not loaded correctly 2009-04-27 17:16:20 +0200 iha r271294 : #i24203# compiler problem 2009-04-27 16:43:21 +0200 iha r271292 : #i101281# missing API documentation for secondary axis title properties 2009-04-27 15:26:05 +0200 hde r271276 : #i100987 2009-04-27 15:24:42 +0200 hde r271273 : #i100987 2009-04-24 15:08:33 +0200 iha r271214 : #i100995# crash with some logarithmic scalings 2009-04-22 18:50:56 +0200 dr r271134 : #i82177# write out deleted point labels 2009-04-22 18:40:48 +0200 iha r271133 : #i101281# missing API documentation for secondary axis title properties 2009-04-22 16:39:42 +0200 dr r271128 : #i82177# extensions for bubble charts 2009-04-22 14:37:00 +0200 dr r271114 : #i82177# import/export data label type and separator 2009-04-22 14:36:24 +0200 dr r271113 : #i82177# import/export data label type and separator 2009-04-21 15:25:26 +0200 dr r271038 : #i82177# import data label type and separator from BIFF8 CHFR records 2009-04-21 14:37:16 +0200 dr r271037 : #i82177# dump BIFF8 chart future records 2009-04-20 17:44:27 +0200 iha r271002 : #i96898# reduce library exports 2009-04-20 13:01:13 +0200 iha r270975 : #i24203# rotate data labels - help ids 2009-04-20 11:40:33 +0200 dr r270969 : #i96600# export of axis scaling/positioning properties 2009-04-16 16:02:31 +0200 dr r270892 : #i69599# keep Y axis left in 3d charts 2009-04-15 18:16:46 +0200 dr r270859 : #i69599# import of axis position settings 2009-04-15 18:16:01 +0200 dr r270858 : #i69599# correct handling of logarithmic crossing axes 2009-04-14 16:27:48 +0200 dr r270794 : #i96599# handle auto axis position on logarithmic axes 2009-04-09 19:59:51 +0200 dr r270722 : #i96599# import axis crossing settings, fix import of logarithmic scaling settings 2009-04-09 18:26:00 +0200 iha r270720 : #i96898# reduce library exports 2009-04-09 15:17:04 +0200 iha r270710 : #i96898# reduce library exports 2009-04-09 10:50:14 +0200 dr r270682 : #i24203# import/export of data label rotation, fixed some other broken stuff too 2009-04-08 16:54:54 +0200 dr r270657 : #i24203# import rotation for data point labels 2009-04-06 18:19:17 +0200 iha r270571 : #i100876# Axis scaling settings dialog wrong after API usage (anys different from double type) 2009-04-06 15:57:05 +0200 iha r270567 : #i100105# #i58585# leftover -> 2009-04-06 15:55:48 +0200 iha r270564 : #i58585# leftover -> 2009-04-02 16:41:07 +0200 iha r270422 : #i99721# remove unused code 2009-04-02 14:29:03 +0200 iha r270407 : #i99721# remove unused code 2009-03-26 10:58:23 +0100 iha r270059 : #i96898# reduce library exports 2009-03-26 10:13:49 +0100 iha r270055 : #i96898# reduce library exports 2009-03-25 09:39:13 +0100 iha r269998 : CWS-TOOLING: rebase CWS chart37 to trunk@269781 (milestone: DEV300:m44) 2009-03-24 17:56:56 +0100 iha r269986 : #i96898# reduce library exports 2009-03-24 16:56:44 +0100 iha r269974 : #i99721# remove unused code 2009-03-24 16:48:48 +0100 iha r269970 : #i89731# remove unused string 2009-03-24 15:44:04 +0100 iha r269961 : remove unused code 2009-03-24 15:22:45 +0100 iha r269959 : remove unused code 2009-03-24 15:17:17 +0100 iha r269957 : remove unused code 2009-03-24 11:14:53 +0100 iha r269923 : #i24203# rotate data labels 2009-03-09 12:10:25 +0100 hde r269076 : #i99300# 2009-03-06 15:56:26 +0100 iha r269011 : #i93953# Source Format for secondary axis without data 2009-02-17 15:59:05 +0100 iha r268177 : avoid warning during build 2009-02-17 15:01:59 +0100 iha r268173 : avoid warning during build 2009-02-13 09:39:03 +0100 ufi r267693 : i96999 2009-02-11 15:12:35 +0100 iha r267604 : removed unused string 2009-02-11 14:00:29 +0100 iha r267600 : #i96999# Corrected wording from 'correlation coefficient' to 'coefficient of determination' 2009-02-11 10:56:45 +0100 iha r267584 : #i89731# typo in resource string 2009-02-11 10:01:29 +0100 iha r267582 : #i89031# compile error on asian windows systems 2009-02-10 16:15:16 +0100 iha r267552 : #i24203# rotate data labels 2009-02-04 18:00:33 +0100 iha r267395 : #i98893# don't export defaults to file 2009-02-04 15:48:15 +0100 iha r267390 : #i92128# asian typography for chart elements 2009-02-04 15:17:41 +0100 iha r267386 : #i92128# asian typography for chart elements 2009-01-30 14:41:10 +0100 iha r267197 : CWS-TOOLING: rebase CWS chart37 to trunk@267171 (milestone: DEV300:m41)
2009-06-04 09:41:18 +00:00
return DialogModel::GetRoleIndexForSorting( lcl_getRole( rLeft.m_xLabeledDataSequence )) <
DialogModel::GetRoleIndexForSorting( lcl_getRole( rRight.m_xLabeledDataSequence ));
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
}
return true;
}
};
DataBrowserModel::DataBrowserModel(
const Reference< chart2::XChartDocument > & xChartDoc,
const Reference< uno::XComponentContext > & xContext ) :
m_xChartDocument( xChartDoc ),
m_xContext( xContext ),
m_apDialogModel( new DialogModel( xChartDoc, xContext ))
{
updateFromModel();
}
DataBrowserModel::~DataBrowserModel()
{}
namespace
{
struct lcl_DataSeriesOfHeaderMatches : public ::std::unary_function< ::chart::DataBrowserModel::tDataHeader, bool >
{
lcl_DataSeriesOfHeaderMatches(
const Reference< chart2::XDataSeries > & xSeriesToCompareWith ) :
m_xSeries( xSeriesToCompareWith )
{}
bool operator() ( const ::chart::DataBrowserModel::tDataHeader & rHeader )
{
return (m_xSeries == rHeader.m_xDataSeries);
}
private:
Reference< chart2::XDataSeries > m_xSeries;
};
}
void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
{
OSL_ASSERT( m_apDialogModel.get());
Reference< chart2::XInternalDataProvider > xDataProvider(
m_apDialogModel->getDataProvider(), uno::UNO_QUERY );
if( xDataProvider.is())
{
sal_Int32 nStartCol = 0;
Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartDocument ));
Reference< chart2::XChartType > xChartType;
Reference< chart2::XDataSeries > xSeries;
if( static_cast< tDataColumnVector::size_type >( nAfterColumnIndex ) <= m_aColumns.size())
xSeries.set( m_aColumns[nAfterColumnIndex].m_xDataSeries );
CWS-TOOLING: integrate CWS bubblechart 2009-06-17 08:41:14 +0200 hde r273051 : i101635: added new charttype bubble 2009-06-17 08:39:37 +0200 hde r273050 : i101635: created new testcase tCreateNewBubbleChart 2009-06-17 08:38:07 +0200 hde r273049 : i101635: created new testcase tCreateNewBubbleChart 2009-06-15 15:22:32 +0200 hde r272991 : 101635 2009-06-11 12:44:01 +0200 iha r272864 : rebase to dev300m50 2009-06-10 23:27:54 +0200 iha r272841 : CWS-TOOLING: rebase CWS bubblechart to trunk@272827 (milestone: DEV300:m50) 2009-06-04 18:07:35 +0200 iha r272649 : #i64689# Bubble Chart 2009-06-04 17:26:44 +0200 iha r272647 : #i64689# Bubble Chart 2009-06-04 11:24:25 +0200 iha r272618 : #i64689# add more spacing between bubbles and data labels 2009-05-26 18:05:23 +0200 ufi r272314 : i101637 2009-04-22 14:37:50 +0200 iha r271115 : #i64689# bubble chart 2009-04-21 17:52:23 +0200 iha r271052 : #i64689# bubble chart 2009-04-21 17:50:48 +0200 iha r271051 : #i76728# type icon for xy chart 2009-04-21 17:25:52 +0200 iha r271049 : #i76728# type icon for xy chart 2009-04-09 11:18:09 +0200 iha r270685 : #i100977# autoscaling works not correct if missing values should be treated as zero 2009-04-08 16:39:43 +0200 iha r270656 : #i64689# bubble chart - missing value treatment 2009-04-08 15:13:25 +0200 iha r270655 : #i64689# bubble chart - remove unused code 2009-04-08 15:12:19 +0200 iha r270653 : #i64689# bubble chart - determine sereis length correctly on export 2009-04-08 14:22:43 +0200 iha r270650 : #i64689# bubble chart - remove unused code 2009-04-08 14:12:09 +0200 iha r270646 : #i64689# bubble chart - export domains even if no main sequence was found 2009-04-08 14:11:07 +0200 iha r270645 : #i64689# bubble chart - don't replace missing size values with 1.0 2009-04-07 16:20:22 +0200 iha r270602 : #i64689# bubble chart - do not offer percent values for data label display for xy and bubble chart 2009-04-07 16:17:42 +0200 iha r270601 : remove superfluous code 2009-04-06 16:39:32 +0200 iha r270569 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-02 17:33:33 +0200 iha r270427 : use input string for formatting in data table during edit 2009-04-02 16:00:29 +0200 iha r270413 : #i64689# bubble chart - when creating a new series within the data table give it the same number format as the former series, thus the new bubble size values can be edited with the same format immidiately 2009-04-02 11:25:33 +0200 iha r270385 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-01 11:32:03 +0200 iha r270312 : #i64689# bubble chart - add further parameter for view creation 2009-03-31 17:52:08 +0200 iha r270291 : #i64689# bubble chart - scale bubble size with diagram size 2009-03-31 13:38:13 +0200 iha r270278 : #i64689# bubble chart - wrong size for small values < 1 2009-03-27 19:11:07 +0100 iha r270169 : #i64689# bubble chart 2009-03-27 19:07:11 +0100 iha r270168 : #i64689# bubble chart - remove unused code 2009-03-27 18:33:57 +0100 iha r270167 : #i64689# bubble chart - create no shape for invalid sizes 2009-03-27 15:18:21 +0100 iha r270157 : #i76728# type icon for xy chart 2009-03-27 14:34:38 +0100 iha r270156 : #i64689# bubble chart - correct scaling 2009-03-27 14:27:27 +0100 iha r270155 : #i64689# bubble chart - images 2009-03-27 14:25:45 +0100 iha r270154 : #i64689# bubble chart - images 2009-03-27 11:38:57 +0100 iha r270142 : #i64689# bubble chart - values-size is the main series 2009-03-27 11:30:20 +0100 iha r270140 : #i64689# correct order of sequences after load thus switching charttypes afterwards produces expected results now 2009-03-26 10:22:55 +0100 iha r270056 : #i64689# bubble chart 2009-03-24 17:45:15 +0100 iha r269984 : #i64689# bubble chart - user properties from points (not only from the series) 2009-03-24 15:10:57 +0100 dr r269954 : #i64989# export bubble charts to xls 2009-03-24 14:55:29 +0100 dr r269952 : #i64989# import bubble charts from xls 2009-03-24 14:54:46 +0100 dr r269950 : #i64989# import bubble charts from ooxml 2009-03-23 18:59:08 +0100 iha r269895 : further cleanups possible with new member m_aGlobalSeriesImportInfo 2009-03-23 16:54:04 +0100 iha r269886 : #i64689# bubble chart - a single sequence must be interpreted as sizes because of ODF specification 2009-03-23 16:50:43 +0100 iha r269885 : #i64689# save&load bubble chart 2009-03-20 19:30:29 +0100 iha r269826 : CWS-TOOLING: rebase CWS bubblechart to trunk@269781 (milestone: DEV300:m44) 2009-03-19 11:30:33 +0100 iha r269732 : #i64689# rename SchXMLCategoriesDomainContext to SchXMLCategoriesContext avoid confusion with domains 2009-03-18 17:11:13 +0100 iha r269693 : #i64689# add charttype bubble 2009-03-18 17:09:22 +0100 iha r269692 : #i64689# remove unused code 2009-03-13 12:18:26 +0100 iha r269467 : #i64689# corrected lineends 2009-03-12 11:25:14 +0100 iha r269376 : #i64689# bubble chart (part 1)
2009-07-02 19:17:43 +00:00
sal_Int32 nSeriesNumberFormat = 0;
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
if( xSeries.is())
{
xChartType.set( DiagramHelper::getChartTypeOfSeries( xDiagram, xSeries ));
tDataHeaderVector::const_iterator aIt(
::std::find_if( m_aHeaders.begin(), m_aHeaders.end(),
lcl_DataSeriesOfHeaderMatches( xSeries )));
if( aIt != m_aHeaders.end())
nStartCol = aIt->m_nEndColumn;
CWS-TOOLING: integrate CWS bubblechart 2009-06-17 08:41:14 +0200 hde r273051 : i101635: added new charttype bubble 2009-06-17 08:39:37 +0200 hde r273050 : i101635: created new testcase tCreateNewBubbleChart 2009-06-17 08:38:07 +0200 hde r273049 : i101635: created new testcase tCreateNewBubbleChart 2009-06-15 15:22:32 +0200 hde r272991 : 101635 2009-06-11 12:44:01 +0200 iha r272864 : rebase to dev300m50 2009-06-10 23:27:54 +0200 iha r272841 : CWS-TOOLING: rebase CWS bubblechart to trunk@272827 (milestone: DEV300:m50) 2009-06-04 18:07:35 +0200 iha r272649 : #i64689# Bubble Chart 2009-06-04 17:26:44 +0200 iha r272647 : #i64689# Bubble Chart 2009-06-04 11:24:25 +0200 iha r272618 : #i64689# add more spacing between bubbles and data labels 2009-05-26 18:05:23 +0200 ufi r272314 : i101637 2009-04-22 14:37:50 +0200 iha r271115 : #i64689# bubble chart 2009-04-21 17:52:23 +0200 iha r271052 : #i64689# bubble chart 2009-04-21 17:50:48 +0200 iha r271051 : #i76728# type icon for xy chart 2009-04-21 17:25:52 +0200 iha r271049 : #i76728# type icon for xy chart 2009-04-09 11:18:09 +0200 iha r270685 : #i100977# autoscaling works not correct if missing values should be treated as zero 2009-04-08 16:39:43 +0200 iha r270656 : #i64689# bubble chart - missing value treatment 2009-04-08 15:13:25 +0200 iha r270655 : #i64689# bubble chart - remove unused code 2009-04-08 15:12:19 +0200 iha r270653 : #i64689# bubble chart - determine sereis length correctly on export 2009-04-08 14:22:43 +0200 iha r270650 : #i64689# bubble chart - remove unused code 2009-04-08 14:12:09 +0200 iha r270646 : #i64689# bubble chart - export domains even if no main sequence was found 2009-04-08 14:11:07 +0200 iha r270645 : #i64689# bubble chart - don't replace missing size values with 1.0 2009-04-07 16:20:22 +0200 iha r270602 : #i64689# bubble chart - do not offer percent values for data label display for xy and bubble chart 2009-04-07 16:17:42 +0200 iha r270601 : remove superfluous code 2009-04-06 16:39:32 +0200 iha r270569 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-02 17:33:33 +0200 iha r270427 : use input string for formatting in data table during edit 2009-04-02 16:00:29 +0200 iha r270413 : #i64689# bubble chart - when creating a new series within the data table give it the same number format as the former series, thus the new bubble size values can be edited with the same format immidiately 2009-04-02 11:25:33 +0200 iha r270385 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-01 11:32:03 +0200 iha r270312 : #i64689# bubble chart - add further parameter for view creation 2009-03-31 17:52:08 +0200 iha r270291 : #i64689# bubble chart - scale bubble size with diagram size 2009-03-31 13:38:13 +0200 iha r270278 : #i64689# bubble chart - wrong size for small values < 1 2009-03-27 19:11:07 +0100 iha r270169 : #i64689# bubble chart 2009-03-27 19:07:11 +0100 iha r270168 : #i64689# bubble chart - remove unused code 2009-03-27 18:33:57 +0100 iha r270167 : #i64689# bubble chart - create no shape for invalid sizes 2009-03-27 15:18:21 +0100 iha r270157 : #i76728# type icon for xy chart 2009-03-27 14:34:38 +0100 iha r270156 : #i64689# bubble chart - correct scaling 2009-03-27 14:27:27 +0100 iha r270155 : #i64689# bubble chart - images 2009-03-27 14:25:45 +0100 iha r270154 : #i64689# bubble chart - images 2009-03-27 11:38:57 +0100 iha r270142 : #i64689# bubble chart - values-size is the main series 2009-03-27 11:30:20 +0100 iha r270140 : #i64689# correct order of sequences after load thus switching charttypes afterwards produces expected results now 2009-03-26 10:22:55 +0100 iha r270056 : #i64689# bubble chart 2009-03-24 17:45:15 +0100 iha r269984 : #i64689# bubble chart - user properties from points (not only from the series) 2009-03-24 15:10:57 +0100 dr r269954 : #i64989# export bubble charts to xls 2009-03-24 14:55:29 +0100 dr r269952 : #i64989# import bubble charts from xls 2009-03-24 14:54:46 +0100 dr r269950 : #i64989# import bubble charts from ooxml 2009-03-23 18:59:08 +0100 iha r269895 : further cleanups possible with new member m_aGlobalSeriesImportInfo 2009-03-23 16:54:04 +0100 iha r269886 : #i64689# bubble chart - a single sequence must be interpreted as sizes because of ODF specification 2009-03-23 16:50:43 +0100 iha r269885 : #i64689# save&load bubble chart 2009-03-20 19:30:29 +0100 iha r269826 : CWS-TOOLING: rebase CWS bubblechart to trunk@269781 (milestone: DEV300:m44) 2009-03-19 11:30:33 +0100 iha r269732 : #i64689# rename SchXMLCategoriesDomainContext to SchXMLCategoriesContext avoid confusion with domains 2009-03-18 17:11:13 +0100 iha r269693 : #i64689# add charttype bubble 2009-03-18 17:09:22 +0100 iha r269692 : #i64689# remove unused code 2009-03-13 12:18:26 +0100 iha r269467 : #i64689# corrected lineends 2009-03-12 11:25:14 +0100 iha r269376 : #i64689# bubble chart (part 1)
2009-07-02 19:17:43 +00:00
Reference< beans::XPropertySet > xSeriesProps( xSeries, uno::UNO_QUERY );
if( xSeriesProps.is() )
xSeriesProps->getPropertyValue( C2U( "NumberFormat" )) >>= nSeriesNumberFormat;
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
}
else
{
xChartType.set( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ));
nStartCol = nAfterColumnIndex;
}
if( xChartType.is())
{
sal_Int32 nOffset = 0;
if( xDiagram.is() && lcl_ShowCategories( xDiagram ))
++nOffset;
// get shared sequences of current series
Reference< chart2::XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY );
lcl_tSharedSeqVec aSharedSequences;
if( xSeriesCnt.is())
aSharedSequences = lcl_getSharedSequences( xSeriesCnt->getDataSeries());
Reference< chart2::XDataSeries > xNewSeries(
m_apDialogModel->insertSeriesAfter( xSeries, xChartType, true /* bCreateDataCachedSequences */ ));
if( xNewSeries.is())
{
{
Reference< chart2::data::XDataSource > xSource( xNewSeries, uno::UNO_QUERY );
if( xSource.is())
{
Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSequences(
xSource->getDataSequences());
sal_Int32 nSeqIdx = 0;
sal_Int32 nSeqSize = aLSequences.getLength();
nStartCol -= (nOffset - 1);
for( sal_Int32 nIndex = nStartCol;
(nSeqIdx < nSeqSize);
++nSeqIdx )
{
lcl_tSharedSeqVec::const_iterator aSharedIt(
::std::find_if( aSharedSequences.begin(), aSharedSequences.end(),
lcl_RolesOfLSeqMatch( aLSequences[nSeqIdx] )));
if( aSharedIt != aSharedSequences.end())
{
aLSequences[nSeqIdx]->setValues( (*aSharedIt)->getValues());
aLSequences[nSeqIdx]->setLabel( (*aSharedIt)->getLabel());
}
else
{
xDataProvider->insertSequence( nIndex - 1 );
// values
Reference< chart2::data::XDataSequence > xNewSeq(
xDataProvider->createDataSequenceByRangeRepresentation(
OUString::valueOf( nIndex )));
lcl_copyDataSequenceProperties(
aLSequences[nSeqIdx]->getValues(), xNewSeq );
aLSequences[nSeqIdx]->setValues( xNewSeq );
// labels
Reference< chart2::data::XDataSequence > xNewLabelSeq(
xDataProvider->createDataSequenceByRangeRepresentation(
OUString( RTL_CONSTASCII_USTRINGPARAM( "label " )) +
OUString::valueOf( nIndex )));
lcl_copyDataSequenceProperties(
aLSequences[nSeqIdx]->getLabel(), xNewLabelSeq );
aLSequences[nSeqIdx]->setLabel( xNewLabelSeq );
++nIndex;
}
}
}
}
CWS-TOOLING: integrate CWS bubblechart 2009-06-17 08:41:14 +0200 hde r273051 : i101635: added new charttype bubble 2009-06-17 08:39:37 +0200 hde r273050 : i101635: created new testcase tCreateNewBubbleChart 2009-06-17 08:38:07 +0200 hde r273049 : i101635: created new testcase tCreateNewBubbleChart 2009-06-15 15:22:32 +0200 hde r272991 : 101635 2009-06-11 12:44:01 +0200 iha r272864 : rebase to dev300m50 2009-06-10 23:27:54 +0200 iha r272841 : CWS-TOOLING: rebase CWS bubblechart to trunk@272827 (milestone: DEV300:m50) 2009-06-04 18:07:35 +0200 iha r272649 : #i64689# Bubble Chart 2009-06-04 17:26:44 +0200 iha r272647 : #i64689# Bubble Chart 2009-06-04 11:24:25 +0200 iha r272618 : #i64689# add more spacing between bubbles and data labels 2009-05-26 18:05:23 +0200 ufi r272314 : i101637 2009-04-22 14:37:50 +0200 iha r271115 : #i64689# bubble chart 2009-04-21 17:52:23 +0200 iha r271052 : #i64689# bubble chart 2009-04-21 17:50:48 +0200 iha r271051 : #i76728# type icon for xy chart 2009-04-21 17:25:52 +0200 iha r271049 : #i76728# type icon for xy chart 2009-04-09 11:18:09 +0200 iha r270685 : #i100977# autoscaling works not correct if missing values should be treated as zero 2009-04-08 16:39:43 +0200 iha r270656 : #i64689# bubble chart - missing value treatment 2009-04-08 15:13:25 +0200 iha r270655 : #i64689# bubble chart - remove unused code 2009-04-08 15:12:19 +0200 iha r270653 : #i64689# bubble chart - determine sereis length correctly on export 2009-04-08 14:22:43 +0200 iha r270650 : #i64689# bubble chart - remove unused code 2009-04-08 14:12:09 +0200 iha r270646 : #i64689# bubble chart - export domains even if no main sequence was found 2009-04-08 14:11:07 +0200 iha r270645 : #i64689# bubble chart - don't replace missing size values with 1.0 2009-04-07 16:20:22 +0200 iha r270602 : #i64689# bubble chart - do not offer percent values for data label display for xy and bubble chart 2009-04-07 16:17:42 +0200 iha r270601 : remove superfluous code 2009-04-06 16:39:32 +0200 iha r270569 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-02 17:33:33 +0200 iha r270427 : use input string for formatting in data table during edit 2009-04-02 16:00:29 +0200 iha r270413 : #i64689# bubble chart - when creating a new series within the data table give it the same number format as the former series, thus the new bubble size values can be edited with the same format immidiately 2009-04-02 11:25:33 +0200 iha r270385 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-01 11:32:03 +0200 iha r270312 : #i64689# bubble chart - add further parameter for view creation 2009-03-31 17:52:08 +0200 iha r270291 : #i64689# bubble chart - scale bubble size with diagram size 2009-03-31 13:38:13 +0200 iha r270278 : #i64689# bubble chart - wrong size for small values < 1 2009-03-27 19:11:07 +0100 iha r270169 : #i64689# bubble chart 2009-03-27 19:07:11 +0100 iha r270168 : #i64689# bubble chart - remove unused code 2009-03-27 18:33:57 +0100 iha r270167 : #i64689# bubble chart - create no shape for invalid sizes 2009-03-27 15:18:21 +0100 iha r270157 : #i76728# type icon for xy chart 2009-03-27 14:34:38 +0100 iha r270156 : #i64689# bubble chart - correct scaling 2009-03-27 14:27:27 +0100 iha r270155 : #i64689# bubble chart - images 2009-03-27 14:25:45 +0100 iha r270154 : #i64689# bubble chart - images 2009-03-27 11:38:57 +0100 iha r270142 : #i64689# bubble chart - values-size is the main series 2009-03-27 11:30:20 +0100 iha r270140 : #i64689# correct order of sequences after load thus switching charttypes afterwards produces expected results now 2009-03-26 10:22:55 +0100 iha r270056 : #i64689# bubble chart 2009-03-24 17:45:15 +0100 iha r269984 : #i64689# bubble chart - user properties from points (not only from the series) 2009-03-24 15:10:57 +0100 dr r269954 : #i64989# export bubble charts to xls 2009-03-24 14:55:29 +0100 dr r269952 : #i64989# import bubble charts from xls 2009-03-24 14:54:46 +0100 dr r269950 : #i64989# import bubble charts from ooxml 2009-03-23 18:59:08 +0100 iha r269895 : further cleanups possible with new member m_aGlobalSeriesImportInfo 2009-03-23 16:54:04 +0100 iha r269886 : #i64689# bubble chart - a single sequence must be interpreted as sizes because of ODF specification 2009-03-23 16:50:43 +0100 iha r269885 : #i64689# save&load bubble chart 2009-03-20 19:30:29 +0100 iha r269826 : CWS-TOOLING: rebase CWS bubblechart to trunk@269781 (milestone: DEV300:m44) 2009-03-19 11:30:33 +0100 iha r269732 : #i64689# rename SchXMLCategoriesDomainContext to SchXMLCategoriesContext avoid confusion with domains 2009-03-18 17:11:13 +0100 iha r269693 : #i64689# add charttype bubble 2009-03-18 17:09:22 +0100 iha r269692 : #i64689# remove unused code 2009-03-13 12:18:26 +0100 iha r269467 : #i64689# corrected lineends 2009-03-12 11:25:14 +0100 iha r269376 : #i64689# bubble chart (part 1)
2009-07-02 19:17:43 +00:00
if( nSeriesNumberFormat != 0 )
{
//give the new series the same number format as the former series especially for bubble charts thus the bubble size values can be edited with same format immidiately
Reference< beans::XPropertySet > xNewSeriesProps( xNewSeries, uno::UNO_QUERY );
if( xNewSeriesProps.is() )
xNewSeriesProps->setPropertyValue( C2U( "NumberFormat" ), uno::makeAny( nSeriesNumberFormat ) );
}
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
updateFromModel();
}
}
}
}
void DataBrowserModel::removeDataSeries( sal_Int32 nAtColumnIndex )
{
OSL_ASSERT( m_apDialogModel.get());
if( static_cast< tDataColumnVector::size_type >( nAtColumnIndex ) < m_aColumns.size())
{
Reference< chart2::XDataSeries > xSeries( m_aColumns[nAtColumnIndex].m_xDataSeries );
if( xSeries.is())
{
m_apDialogModel->deleteSeries(
xSeries, getHeaderForSeries( xSeries ).m_xChartType );
CWS-TOOLING: integrate CWS chart35 2009-02-20 12:33:54 +0100 nn r268312 : correct line ends 2009-01-19 12:50:45 +0100 iha r266491 : #i91800# style:text-position='0' is wrongly imported 2009-01-19 11:59:09 +0100 iha r266486 : #i91037# Position of Datalabels in 3D Bar-Charts are crossing the edge 2009-01-16 16:45:50 +0100 iha r266435 : #i93802# clockwise does not work on solars sparc 2009-01-16 13:23:37 +0100 iha r266414 : #i91037# Position of Datalabels in 3D Bar-Charts are crossing the edge 2009-01-15 14:09:27 +0100 iha r266370 : #i98102# checkbox show equation should not be checked initially 2009-01-14 17:41:33 +0100 iha r266323 : #i97133# #i97318# chart type is not detected correctly in case of invisible series 2009-01-14 16:23:06 +0100 iha r266316 : #i97133# #i97318# chart type is not detected correctly in case of invisible series 2009-01-14 13:43:38 +0100 iha r266298 : #i84417# Unable to edit existing chart title with clipboard 2009-01-14 13:43:04 +0100 iha r266297 : #i84417# Unable to edit existing chart title with IME 2009-01-14 13:14:15 +0100 dr r266293 : do not set CharEscapement property if not needed 2009-01-14 00:48:46 +0100 er r266262 : #i81383# changed ASC and JIS to use transliteration provided by i18n transliteration; patch from <bluedwarf> 2009-01-14 00:28:06 +0100 er r266261 : #i97536# silence gcc's unbracketed && || warnings 2009-01-13 22:43:45 +0100 er r266259 : #i97905# corrected IndexKey order 2009-01-13 20:36:15 +0100 er r266254 : #i97905# add SKK/EUR conversion (plus MTL/EUR and CYP/EUR) 2009-01-13 20:31:17 +0100 er r266253 : #i97905# updated locale data; contributed by <brko> 2009-01-13 11:57:08 +0100 iha r266204 : #i84103# cannot set data in xy diagram in draw 2009-01-12 20:29:37 +0100 nn r266181 : #i97680# GetStylesContainer: handle non-available style family 2009-01-12 19:53:19 +0100 nn r266180 : #i98000# don't get initial zoom value via SfxViewFrame::Current 2009-01-12 16:11:19 +0100 iha r266166 : #i71686# XY charts without valid x values are not imported correctly from Excel 2009-01-09 17:10:20 +0100 iha r266102 : #i95051# truncated asian strings on scale tabpage 2009-01-09 15:58:46 +0100 iha r266094 : #i89430# truncated asian strings in smooth lines dialog 2009-01-09 13:09:14 +0100 iha r266076 : #i94813# importing pie chart with multiline categories crashes
2009-03-03 11:39:43 +00:00
//delete sequences from internal data provider that are not used anymore
//but do not delete sequences that are still in use by the remaining series
Reference< chart2::XInternalDataProvider > xDataProvider( m_apDialogModel->getDataProvider(), uno::UNO_QUERY );
Reference< chart2::data::XDataSource > xSourceOfDeletedSeries( xSeries, uno::UNO_QUERY );
if( xDataProvider.is() && xSourceOfDeletedSeries.is())
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
{
::std::vector< sal_Int32 > aSequenceIndexesToDelete;
CWS-TOOLING: integrate CWS chart35 2009-02-20 12:33:54 +0100 nn r268312 : correct line ends 2009-01-19 12:50:45 +0100 iha r266491 : #i91800# style:text-position='0' is wrongly imported 2009-01-19 11:59:09 +0100 iha r266486 : #i91037# Position of Datalabels in 3D Bar-Charts are crossing the edge 2009-01-16 16:45:50 +0100 iha r266435 : #i93802# clockwise does not work on solars sparc 2009-01-16 13:23:37 +0100 iha r266414 : #i91037# Position of Datalabels in 3D Bar-Charts are crossing the edge 2009-01-15 14:09:27 +0100 iha r266370 : #i98102# checkbox show equation should not be checked initially 2009-01-14 17:41:33 +0100 iha r266323 : #i97133# #i97318# chart type is not detected correctly in case of invisible series 2009-01-14 16:23:06 +0100 iha r266316 : #i97133# #i97318# chart type is not detected correctly in case of invisible series 2009-01-14 13:43:38 +0100 iha r266298 : #i84417# Unable to edit existing chart title with clipboard 2009-01-14 13:43:04 +0100 iha r266297 : #i84417# Unable to edit existing chart title with IME 2009-01-14 13:14:15 +0100 dr r266293 : do not set CharEscapement property if not needed 2009-01-14 00:48:46 +0100 er r266262 : #i81383# changed ASC and JIS to use transliteration provided by i18n transliteration; patch from <bluedwarf> 2009-01-14 00:28:06 +0100 er r266261 : #i97536# silence gcc's unbracketed && || warnings 2009-01-13 22:43:45 +0100 er r266259 : #i97905# corrected IndexKey order 2009-01-13 20:36:15 +0100 er r266254 : #i97905# add SKK/EUR conversion (plus MTL/EUR and CYP/EUR) 2009-01-13 20:31:17 +0100 er r266253 : #i97905# updated locale data; contributed by <brko> 2009-01-13 11:57:08 +0100 iha r266204 : #i84103# cannot set data in xy diagram in draw 2009-01-12 20:29:37 +0100 nn r266181 : #i97680# GetStylesContainer: handle non-available style family 2009-01-12 19:53:19 +0100 nn r266180 : #i98000# don't get initial zoom value via SfxViewFrame::Current 2009-01-12 16:11:19 +0100 iha r266166 : #i71686# XY charts without valid x values are not imported correctly from Excel 2009-01-09 17:10:20 +0100 iha r266102 : #i95051# truncated asian strings on scale tabpage 2009-01-09 15:58:46 +0100 iha r266094 : #i89430# truncated asian strings in smooth lines dialog 2009-01-09 13:09:14 +0100 iha r266076 : #i94813# importing pie chart with multiline categories crashes
2009-03-03 11:39:43 +00:00
Sequence< Reference< chart2::data::XLabeledDataSequence > > aSequencesOfDeletedSeries( xSourceOfDeletedSeries->getDataSequences() );
Reference< chart2::XDataSeriesContainer > xSeriesCnt( getHeaderForSeries( xSeries ).m_xChartType, uno::UNO_QUERY );
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
if( xSeriesCnt.is())
{
CWS-TOOLING: integrate CWS chart35 2009-02-20 12:33:54 +0100 nn r268312 : correct line ends 2009-01-19 12:50:45 +0100 iha r266491 : #i91800# style:text-position='0' is wrongly imported 2009-01-19 11:59:09 +0100 iha r266486 : #i91037# Position of Datalabels in 3D Bar-Charts are crossing the edge 2009-01-16 16:45:50 +0100 iha r266435 : #i93802# clockwise does not work on solars sparc 2009-01-16 13:23:37 +0100 iha r266414 : #i91037# Position of Datalabels in 3D Bar-Charts are crossing the edge 2009-01-15 14:09:27 +0100 iha r266370 : #i98102# checkbox show equation should not be checked initially 2009-01-14 17:41:33 +0100 iha r266323 : #i97133# #i97318# chart type is not detected correctly in case of invisible series 2009-01-14 16:23:06 +0100 iha r266316 : #i97133# #i97318# chart type is not detected correctly in case of invisible series 2009-01-14 13:43:38 +0100 iha r266298 : #i84417# Unable to edit existing chart title with clipboard 2009-01-14 13:43:04 +0100 iha r266297 : #i84417# Unable to edit existing chart title with IME 2009-01-14 13:14:15 +0100 dr r266293 : do not set CharEscapement property if not needed 2009-01-14 00:48:46 +0100 er r266262 : #i81383# changed ASC and JIS to use transliteration provided by i18n transliteration; patch from <bluedwarf> 2009-01-14 00:28:06 +0100 er r266261 : #i97536# silence gcc's unbracketed && || warnings 2009-01-13 22:43:45 +0100 er r266259 : #i97905# corrected IndexKey order 2009-01-13 20:36:15 +0100 er r266254 : #i97905# add SKK/EUR conversion (plus MTL/EUR and CYP/EUR) 2009-01-13 20:31:17 +0100 er r266253 : #i97905# updated locale data; contributed by <brko> 2009-01-13 11:57:08 +0100 iha r266204 : #i84103# cannot set data in xy diagram in draw 2009-01-12 20:29:37 +0100 nn r266181 : #i97680# GetStylesContainer: handle non-available style family 2009-01-12 19:53:19 +0100 nn r266180 : #i98000# don't get initial zoom value via SfxViewFrame::Current 2009-01-12 16:11:19 +0100 iha r266166 : #i71686# XY charts without valid x values are not imported correctly from Excel 2009-01-09 17:10:20 +0100 iha r266102 : #i95051# truncated asian strings on scale tabpage 2009-01-09 15:58:46 +0100 iha r266094 : #i89430# truncated asian strings in smooth lines dialog 2009-01-09 13:09:14 +0100 iha r266076 : #i94813# importing pie chart with multiline categories crashes
2009-03-03 11:39:43 +00:00
Reference< chart2::data::XDataSource > xRemainingDataSource( DataSeriesHelper::getDataSource( xSeriesCnt->getDataSeries() ) );
if( xRemainingDataSource.is() )
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
{
CWS-TOOLING: integrate CWS chart35 2009-02-20 12:33:54 +0100 nn r268312 : correct line ends 2009-01-19 12:50:45 +0100 iha r266491 : #i91800# style:text-position='0' is wrongly imported 2009-01-19 11:59:09 +0100 iha r266486 : #i91037# Position of Datalabels in 3D Bar-Charts are crossing the edge 2009-01-16 16:45:50 +0100 iha r266435 : #i93802# clockwise does not work on solars sparc 2009-01-16 13:23:37 +0100 iha r266414 : #i91037# Position of Datalabels in 3D Bar-Charts are crossing the edge 2009-01-15 14:09:27 +0100 iha r266370 : #i98102# checkbox show equation should not be checked initially 2009-01-14 17:41:33 +0100 iha r266323 : #i97133# #i97318# chart type is not detected correctly in case of invisible series 2009-01-14 16:23:06 +0100 iha r266316 : #i97133# #i97318# chart type is not detected correctly in case of invisible series 2009-01-14 13:43:38 +0100 iha r266298 : #i84417# Unable to edit existing chart title with clipboard 2009-01-14 13:43:04 +0100 iha r266297 : #i84417# Unable to edit existing chart title with IME 2009-01-14 13:14:15 +0100 dr r266293 : do not set CharEscapement property if not needed 2009-01-14 00:48:46 +0100 er r266262 : #i81383# changed ASC and JIS to use transliteration provided by i18n transliteration; patch from <bluedwarf> 2009-01-14 00:28:06 +0100 er r266261 : #i97536# silence gcc's unbracketed && || warnings 2009-01-13 22:43:45 +0100 er r266259 : #i97905# corrected IndexKey order 2009-01-13 20:36:15 +0100 er r266254 : #i97905# add SKK/EUR conversion (plus MTL/EUR and CYP/EUR) 2009-01-13 20:31:17 +0100 er r266253 : #i97905# updated locale data; contributed by <brko> 2009-01-13 11:57:08 +0100 iha r266204 : #i84103# cannot set data in xy diagram in draw 2009-01-12 20:29:37 +0100 nn r266181 : #i97680# GetStylesContainer: handle non-available style family 2009-01-12 19:53:19 +0100 nn r266180 : #i98000# don't get initial zoom value via SfxViewFrame::Current 2009-01-12 16:11:19 +0100 iha r266166 : #i71686# XY charts without valid x values are not imported correctly from Excel 2009-01-09 17:10:20 +0100 iha r266102 : #i95051# truncated asian strings on scale tabpage 2009-01-09 15:58:46 +0100 iha r266094 : #i89430# truncated asian strings in smooth lines dialog 2009-01-09 13:09:14 +0100 iha r266076 : #i94813# importing pie chart with multiline categories crashes
2009-03-03 11:39:43 +00:00
::std::vector< Reference< chart2::data::XLabeledDataSequence > > aRemainingSeq( ContainerHelper::SequenceToVector( xRemainingDataSource->getDataSequences() ) );
for( sal_Int32 i=0; i<aSequencesOfDeletedSeries.getLength(); ++i )
{
::std::vector< Reference< chart2::data::XLabeledDataSequence > >::const_iterator aHitIt(
::std::find_if( aRemainingSeq.begin(), aRemainingSeq.end(),
lcl_RepresentationsOfLSeqMatch( aSequencesOfDeletedSeries[i] )));
// if not used by the remaining series this sequence can be deleted
if( aHitIt == aRemainingSeq.end() )
aSequenceIndexesToDelete.push_back( lcl_getValuesRepresentationIndex( aSequencesOfDeletedSeries[i] ) );
}
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
}
}
// delete unnecessary sequences of the internal data
// iterate using greatest index first, so that deletion does not
// shift other sequences that will be deleted later
::std::sort( aSequenceIndexesToDelete.begin(), aSequenceIndexesToDelete.end());
for( ::std::vector< sal_Int32 >::reverse_iterator aIt(
aSequenceIndexesToDelete.rbegin()); aIt != aSequenceIndexesToDelete.rend(); ++aIt )
{
if( *aIt != -1 )
xDataProvider->deleteSequence( *aIt );
}
}
updateFromModel();
}
}
}
void DataBrowserModel::swapDataSeries( sal_Int32 nFirstColumnIndex )
{
OSL_ASSERT( m_apDialogModel.get());
if( static_cast< tDataColumnVector::size_type >( nFirstColumnIndex ) < m_aColumns.size() - 1 )
{
Reference< chart2::XDataSeries > xSeries( m_aColumns[nFirstColumnIndex].m_xDataSeries );
if( xSeries.is())
{
m_apDialogModel->moveSeries( xSeries, DialogModel::MOVE_DOWN );
updateFromModel();
}
}
}
void DataBrowserModel::swapDataPointForAllSeries( sal_Int32 nFirstIndex )
{
OSL_ASSERT( m_apDialogModel.get());
Reference< chart2::XInternalDataProvider > xDataProvider(
m_apDialogModel->getDataProvider(), uno::UNO_QUERY );
// lockControllers
ControllerLockGuard aGuard( m_apDialogModel->getChartModel());
if( xDataProvider.is())
xDataProvider->swapDataPointWithNextOneForAllSequences( nFirstIndex );
// unlockControllers
}
void DataBrowserModel::insertDataPointForAllSeries( sal_Int32 nAfterIndex )
{
Reference< chart2::XInternalDataProvider > xDataProvider(
m_apDialogModel->getDataProvider(), uno::UNO_QUERY );
// lockControllers
ControllerLockGuard aGuard( m_apDialogModel->getChartModel());
if( xDataProvider.is())
xDataProvider->insertDataPointForAllSequences( nAfterIndex );
// unlockControllers
}
void DataBrowserModel::removeDataPointForAllSeries( sal_Int32 nAtIndex )
{
Reference< chart2::XInternalDataProvider > xDataProvider(
m_apDialogModel->getDataProvider(), uno::UNO_QUERY );
// lockControllers
ControllerLockGuard aGuard( m_apDialogModel->getChartModel());
if( xDataProvider.is())
xDataProvider->deleteDataPointForAllSequences( nAtIndex );
// unlockControllers
}
DataBrowserModel::tDataHeader DataBrowserModel::getHeaderForSeries(
const Reference< chart2::XDataSeries > & xSeries ) const
{
for( tDataHeaderVector::const_iterator aIt( m_aHeaders.begin());
aIt != m_aHeaders.end(); ++aIt )
{
if( aIt->m_xDataSeries == xSeries )
return (*aIt);
}
return tDataHeader();
}
Reference< chart2::XDataSeries >
DataBrowserModel::getDataSeriesByColumn( sal_Int32 nColumn ) const
{
tDataColumnVector::size_type nIndex( nColumn );
if( nIndex < m_aColumns.size())
return m_aColumns[nIndex].m_xDataSeries;
return 0;
}
DataBrowserModel::eCellType DataBrowserModel::getCellType( sal_Int32 nAtColumn, sal_Int32 /* nAtRow */ )
{
eCellType eResult = TEXT;
tDataColumnVector::size_type nIndex( nAtColumn );
if( nIndex < m_aColumns.size())
eResult = m_aColumns[nIndex].m_eCellType;
return eResult;
}
double DataBrowserModel::getCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow )
{
double fResult;
::rtl::math::setNan( & fResult );
tDataColumnVector::size_type nIndex( nAtColumn );
if( nIndex < m_aColumns.size() &&
m_aColumns[ nIndex ].m_xLabeledDataSequence.is())
{
Reference< chart2::data::XNumericalDataSequence > xData(
m_aColumns[ nIndex ].m_xLabeledDataSequence->getValues(), uno::UNO_QUERY );
if( xData.is())
{
Sequence< double > aValues( xData->getNumericalData());
if( nAtRow < aValues.getLength())
fResult = aValues[nAtRow];
}
}
return fResult;
}
OUString DataBrowserModel::getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow )
{
OUString aResult;
tDataColumnVector::size_type nIndex( nAtColumn );
if( nIndex < m_aColumns.size() &&
m_aColumns[ nIndex ].m_xLabeledDataSequence.is())
{
Reference< chart2::data::XTextualDataSequence > xData(
m_aColumns[ nIndex ].m_xLabeledDataSequence->getValues(), uno::UNO_QUERY );
if( xData.is())
{
Sequence< OUString > aValues( xData->getTextualData());
if( nAtRow < aValues.getLength())
aResult = aValues[nAtRow];
}
}
return aResult;
}
sal_uInt32 DataBrowserModel::getNumberFormatKey( sal_Int32 nAtColumn, sal_Int32 /* nAtRow */ )
{
tDataColumnVector::size_type nIndex( nAtColumn );
if( nIndex < m_aColumns.size())
return m_aColumns[ nIndex ].m_nNumberFormatKey;
return 0;
}
bool DataBrowserModel::setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const uno::Any & rValue )
{
bool bResult = false;
tDataColumnVector::size_type nIndex( nAtColumn );
if( nIndex < m_aColumns.size() &&
m_aColumns[ nIndex ].m_xLabeledDataSequence.is())
{
bResult = true;
try
{
// label
if( nAtRow == -1 )
{
Reference< container::XIndexReplace > xIndexReplace(
m_aColumns[ nIndex ].m_xLabeledDataSequence->getLabel(), uno::UNO_QUERY_THROW );
xIndexReplace->replaceByIndex( 0, rValue );
}
else
{
Reference< container::XIndexReplace > xIndexReplace(
m_aColumns[ nIndex ].m_xLabeledDataSequence->getValues(), uno::UNO_QUERY_THROW );
xIndexReplace->replaceByIndex( nAtRow, rValue );
}
}
catch( const uno::Exception & ex )
{
INTEGRATION: CWS chart07 (1.2.12); FILE MERGED 2007/07/10 15:21:56 bm 1.2.12.2: #i69281# warnings removed 2007/07/10 15:21:33 bm 1.2.12.1: #i69281# warnings removed
2007-07-25 07:30:25 +00:00
(void)(ex);
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
bResult = false;
}
}
return bResult;
}
bool DataBrowserModel::setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue )
{
return (getCellType( nAtColumn, nAtRow ) == NUMBER) &&
setCellAny( nAtColumn, nAtRow, uno::makeAny( fValue ));
}
bool DataBrowserModel::setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText )
{
return (getCellType( nAtColumn, nAtRow ) == TEXT) &&
setCellAny( nAtColumn, nAtRow, uno::makeAny( rText ));
}
sal_Int32 DataBrowserModel::getColumnCount() const
{
return static_cast< sal_Int32 >( m_aColumns.size());
}
sal_Int32 DataBrowserModel::getMaxRowCount() const
{
sal_Int32 nResult = 0;
tDataColumnVector::const_iterator aIt( m_aColumns.begin());
for( ; aIt != m_aColumns.end(); ++aIt )
{
if( aIt->m_xLabeledDataSequence.is())
{
Reference< chart2::data::XDataSequence > xSeq(
aIt->m_xLabeledDataSequence->getValues());
if( !xSeq.is())
continue;
sal_Int32 nLength( xSeq->getData().getLength());
if( nLength > nResult )
nResult = nLength;
}
}
return nResult;
}
OUString DataBrowserModel::getRoleOfColumn( sal_Int32 nColumnIndex ) const
{
if( nColumnIndex != -1 &&
static_cast< sal_uInt32 >( nColumnIndex ) < m_aColumns.size())
return m_aColumns[ nColumnIndex ].m_aUIRoleName;
return OUString();
}
Reference< chart2::data::XLabeledDataSequence >
DataBrowserModel::getCategories() const throw()
{
OSL_ASSERT( m_apDialogModel.get());
return m_apDialogModel->getCategories();
}
INTEGRATION: CWS rptchart02 (1.4.4); FILE MERGED 2008/04/16 06:35:20 oj 1.4.4.2: RESYNC: (1.4-1.5); FILE MERGED 2008/04/15 12:50:17 oj 1.4.4.1: use comphelper copyProperties
2008-06-16 11:47:48 +00:00
const DataBrowserModel::tDataHeaderVector& DataBrowserModel::getDataHeaders() const
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
{
return m_aHeaders;
}
void DataBrowserModel::updateFromModel()
{
if( !m_xChartDocument.is())
return;
m_aColumns.clear();
m_aHeaders.clear();
Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartDocument ));
if( !xDiagram.is())
return;
// set template at DialogModel
uno::Reference< lang::XMultiServiceFactory > xFact( m_xChartDocument->getChartTypeManager(), uno::UNO_QUERY );
DiagramHelper::tTemplateWithServiceName aTemplateAndService =
DiagramHelper::getTemplateForDiagram( xDiagram, xFact );
if( aTemplateAndService.first.is())
m_apDialogModel->setTemplate( aTemplateAndService.first );
sal_Int32 nHeaderStart = 0;
sal_Int32 nHeaderEnd = 0;
if( lcl_ShowCategories( xDiagram ))
{
Reference< chart2::data::XLabeledDataSequence > xCategories( this->getCategories());
tDataColumn aCategories;
aCategories.m_xLabeledDataSequence.set( xCategories );
if( lcl_ShowCategoriesAsDataLabel( xDiagram ))
CWS-TOOLING: integrate CWS chart37 2009-05-22 09:10:36 +0200 iha r272170 : #i102130# color of pies is not loaded correctly 2009-04-27 17:16:20 +0200 iha r271294 : #i24203# compiler problem 2009-04-27 16:43:21 +0200 iha r271292 : #i101281# missing API documentation for secondary axis title properties 2009-04-27 15:26:05 +0200 hde r271276 : #i100987 2009-04-27 15:24:42 +0200 hde r271273 : #i100987 2009-04-24 15:08:33 +0200 iha r271214 : #i100995# crash with some logarithmic scalings 2009-04-22 18:50:56 +0200 dr r271134 : #i82177# write out deleted point labels 2009-04-22 18:40:48 +0200 iha r271133 : #i101281# missing API documentation for secondary axis title properties 2009-04-22 16:39:42 +0200 dr r271128 : #i82177# extensions for bubble charts 2009-04-22 14:37:00 +0200 dr r271114 : #i82177# import/export data label type and separator 2009-04-22 14:36:24 +0200 dr r271113 : #i82177# import/export data label type and separator 2009-04-21 15:25:26 +0200 dr r271038 : #i82177# import data label type and separator from BIFF8 CHFR records 2009-04-21 14:37:16 +0200 dr r271037 : #i82177# dump BIFF8 chart future records 2009-04-20 17:44:27 +0200 iha r271002 : #i96898# reduce library exports 2009-04-20 13:01:13 +0200 iha r270975 : #i24203# rotate data labels - help ids 2009-04-20 11:40:33 +0200 dr r270969 : #i96600# export of axis scaling/positioning properties 2009-04-16 16:02:31 +0200 dr r270892 : #i69599# keep Y axis left in 3d charts 2009-04-15 18:16:46 +0200 dr r270859 : #i69599# import of axis position settings 2009-04-15 18:16:01 +0200 dr r270858 : #i69599# correct handling of logarithmic crossing axes 2009-04-14 16:27:48 +0200 dr r270794 : #i96599# handle auto axis position on logarithmic axes 2009-04-09 19:59:51 +0200 dr r270722 : #i96599# import axis crossing settings, fix import of logarithmic scaling settings 2009-04-09 18:26:00 +0200 iha r270720 : #i96898# reduce library exports 2009-04-09 15:17:04 +0200 iha r270710 : #i96898# reduce library exports 2009-04-09 10:50:14 +0200 dr r270682 : #i24203# import/export of data label rotation, fixed some other broken stuff too 2009-04-08 16:54:54 +0200 dr r270657 : #i24203# import rotation for data point labels 2009-04-06 18:19:17 +0200 iha r270571 : #i100876# Axis scaling settings dialog wrong after API usage (anys different from double type) 2009-04-06 15:57:05 +0200 iha r270567 : #i100105# #i58585# leftover -> 2009-04-06 15:55:48 +0200 iha r270564 : #i58585# leftover -> 2009-04-02 16:41:07 +0200 iha r270422 : #i99721# remove unused code 2009-04-02 14:29:03 +0200 iha r270407 : #i99721# remove unused code 2009-03-26 10:58:23 +0100 iha r270059 : #i96898# reduce library exports 2009-03-26 10:13:49 +0100 iha r270055 : #i96898# reduce library exports 2009-03-25 09:39:13 +0100 iha r269998 : CWS-TOOLING: rebase CWS chart37 to trunk@269781 (milestone: DEV300:m44) 2009-03-24 17:56:56 +0100 iha r269986 : #i96898# reduce library exports 2009-03-24 16:56:44 +0100 iha r269974 : #i99721# remove unused code 2009-03-24 16:48:48 +0100 iha r269970 : #i89731# remove unused string 2009-03-24 15:44:04 +0100 iha r269961 : remove unused code 2009-03-24 15:22:45 +0100 iha r269959 : remove unused code 2009-03-24 15:17:17 +0100 iha r269957 : remove unused code 2009-03-24 11:14:53 +0100 iha r269923 : #i24203# rotate data labels 2009-03-09 12:10:25 +0100 hde r269076 : #i99300# 2009-03-06 15:56:26 +0100 iha r269011 : #i93953# Source Format for secondary axis without data 2009-02-17 15:59:05 +0100 iha r268177 : avoid warning during build 2009-02-17 15:01:59 +0100 iha r268173 : avoid warning during build 2009-02-13 09:39:03 +0100 ufi r267693 : i96999 2009-02-11 15:12:35 +0100 iha r267604 : removed unused string 2009-02-11 14:00:29 +0100 iha r267600 : #i96999# Corrected wording from 'correlation coefficient' to 'coefficient of determination' 2009-02-11 10:56:45 +0100 iha r267584 : #i89731# typo in resource string 2009-02-11 10:01:29 +0100 iha r267582 : #i89031# compile error on asian windows systems 2009-02-10 16:15:16 +0100 iha r267552 : #i24203# rotate data labels 2009-02-04 18:00:33 +0100 iha r267395 : #i98893# don't export defaults to file 2009-02-04 15:48:15 +0100 iha r267390 : #i92128# asian typography for chart elements 2009-02-04 15:17:41 +0100 iha r267386 : #i92128# asian typography for chart elements 2009-01-30 14:41:10 +0100 iha r267197 : CWS-TOOLING: rebase CWS chart37 to trunk@267171 (milestone: DEV300:m41)
2009-06-04 09:41:18 +00:00
aCategories.m_aUIRoleName = DialogModel::GetRoleDataLabel();
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
else
aCategories.m_aUIRoleName = lcl_getUIRoleName( xCategories );
aCategories.m_eCellType = TEXT;
m_aColumns.push_back( aCategories );
++nHeaderStart;
}
Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY );
if( !xCooSysCnt.is())
return;
Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems());
for( sal_Int32 nCooSysIdx=0; nCooSysIdx<aCooSysSeq.getLength(); ++nCooSysIdx )
{
Reference< chart2::XChartTypeContainer > xCTCnt( aCooSysSeq[nCooSysIdx], uno::UNO_QUERY_THROW );
Sequence< Reference< chart2::XChartType > > aChartTypes( xCTCnt->getChartTypes());
CWS-TOOLING: integrate CWS bubblechart 2009-06-17 08:41:14 +0200 hde r273051 : i101635: added new charttype bubble 2009-06-17 08:39:37 +0200 hde r273050 : i101635: created new testcase tCreateNewBubbleChart 2009-06-17 08:38:07 +0200 hde r273049 : i101635: created new testcase tCreateNewBubbleChart 2009-06-15 15:22:32 +0200 hde r272991 : 101635 2009-06-11 12:44:01 +0200 iha r272864 : rebase to dev300m50 2009-06-10 23:27:54 +0200 iha r272841 : CWS-TOOLING: rebase CWS bubblechart to trunk@272827 (milestone: DEV300:m50) 2009-06-04 18:07:35 +0200 iha r272649 : #i64689# Bubble Chart 2009-06-04 17:26:44 +0200 iha r272647 : #i64689# Bubble Chart 2009-06-04 11:24:25 +0200 iha r272618 : #i64689# add more spacing between bubbles and data labels 2009-05-26 18:05:23 +0200 ufi r272314 : i101637 2009-04-22 14:37:50 +0200 iha r271115 : #i64689# bubble chart 2009-04-21 17:52:23 +0200 iha r271052 : #i64689# bubble chart 2009-04-21 17:50:48 +0200 iha r271051 : #i76728# type icon for xy chart 2009-04-21 17:25:52 +0200 iha r271049 : #i76728# type icon for xy chart 2009-04-09 11:18:09 +0200 iha r270685 : #i100977# autoscaling works not correct if missing values should be treated as zero 2009-04-08 16:39:43 +0200 iha r270656 : #i64689# bubble chart - missing value treatment 2009-04-08 15:13:25 +0200 iha r270655 : #i64689# bubble chart - remove unused code 2009-04-08 15:12:19 +0200 iha r270653 : #i64689# bubble chart - determine sereis length correctly on export 2009-04-08 14:22:43 +0200 iha r270650 : #i64689# bubble chart - remove unused code 2009-04-08 14:12:09 +0200 iha r270646 : #i64689# bubble chart - export domains even if no main sequence was found 2009-04-08 14:11:07 +0200 iha r270645 : #i64689# bubble chart - don't replace missing size values with 1.0 2009-04-07 16:20:22 +0200 iha r270602 : #i64689# bubble chart - do not offer percent values for data label display for xy and bubble chart 2009-04-07 16:17:42 +0200 iha r270601 : remove superfluous code 2009-04-06 16:39:32 +0200 iha r270569 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-02 17:33:33 +0200 iha r270427 : use input string for formatting in data table during edit 2009-04-02 16:00:29 +0200 iha r270413 : #i64689# bubble chart - when creating a new series within the data table give it the same number format as the former series, thus the new bubble size values can be edited with the same format immidiately 2009-04-02 11:25:33 +0200 iha r270385 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-01 11:32:03 +0200 iha r270312 : #i64689# bubble chart - add further parameter for view creation 2009-03-31 17:52:08 +0200 iha r270291 : #i64689# bubble chart - scale bubble size with diagram size 2009-03-31 13:38:13 +0200 iha r270278 : #i64689# bubble chart - wrong size for small values < 1 2009-03-27 19:11:07 +0100 iha r270169 : #i64689# bubble chart 2009-03-27 19:07:11 +0100 iha r270168 : #i64689# bubble chart - remove unused code 2009-03-27 18:33:57 +0100 iha r270167 : #i64689# bubble chart - create no shape for invalid sizes 2009-03-27 15:18:21 +0100 iha r270157 : #i76728# type icon for xy chart 2009-03-27 14:34:38 +0100 iha r270156 : #i64689# bubble chart - correct scaling 2009-03-27 14:27:27 +0100 iha r270155 : #i64689# bubble chart - images 2009-03-27 14:25:45 +0100 iha r270154 : #i64689# bubble chart - images 2009-03-27 11:38:57 +0100 iha r270142 : #i64689# bubble chart - values-size is the main series 2009-03-27 11:30:20 +0100 iha r270140 : #i64689# correct order of sequences after load thus switching charttypes afterwards produces expected results now 2009-03-26 10:22:55 +0100 iha r270056 : #i64689# bubble chart 2009-03-24 17:45:15 +0100 iha r269984 : #i64689# bubble chart - user properties from points (not only from the series) 2009-03-24 15:10:57 +0100 dr r269954 : #i64989# export bubble charts to xls 2009-03-24 14:55:29 +0100 dr r269952 : #i64989# import bubble charts from xls 2009-03-24 14:54:46 +0100 dr r269950 : #i64989# import bubble charts from ooxml 2009-03-23 18:59:08 +0100 iha r269895 : further cleanups possible with new member m_aGlobalSeriesImportInfo 2009-03-23 16:54:04 +0100 iha r269886 : #i64689# bubble chart - a single sequence must be interpreted as sizes because of ODF specification 2009-03-23 16:50:43 +0100 iha r269885 : #i64689# save&load bubble chart 2009-03-20 19:30:29 +0100 iha r269826 : CWS-TOOLING: rebase CWS bubblechart to trunk@269781 (milestone: DEV300:m44) 2009-03-19 11:30:33 +0100 iha r269732 : #i64689# rename SchXMLCategoriesDomainContext to SchXMLCategoriesContext avoid confusion with domains 2009-03-18 17:11:13 +0100 iha r269693 : #i64689# add charttype bubble 2009-03-18 17:09:22 +0100 iha r269692 : #i64689# remove unused code 2009-03-13 12:18:26 +0100 iha r269467 : #i64689# corrected lineends 2009-03-12 11:25:14 +0100 iha r269376 : #i64689# bubble chart (part 1)
2009-07-02 19:17:43 +00:00
sal_Int32 nXAxisNumberFormat = DataSeriesHelper::getNumberFormatKeyFromAxis( 0, aCooSysSeq[nCooSysIdx], 0, 0 );
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
for( sal_Int32 nCTIdx=0; nCTIdx<aChartTypes.getLength(); ++nCTIdx )
{
Reference< chart2::XDataSeriesContainer > xSeriesCnt( aChartTypes[nCTIdx], uno::UNO_QUERY );
if( xSeriesCnt.is())
{
CWS-TOOLING: integrate CWS bubblechart 2009-06-17 08:41:14 +0200 hde r273051 : i101635: added new charttype bubble 2009-06-17 08:39:37 +0200 hde r273050 : i101635: created new testcase tCreateNewBubbleChart 2009-06-17 08:38:07 +0200 hde r273049 : i101635: created new testcase tCreateNewBubbleChart 2009-06-15 15:22:32 +0200 hde r272991 : 101635 2009-06-11 12:44:01 +0200 iha r272864 : rebase to dev300m50 2009-06-10 23:27:54 +0200 iha r272841 : CWS-TOOLING: rebase CWS bubblechart to trunk@272827 (milestone: DEV300:m50) 2009-06-04 18:07:35 +0200 iha r272649 : #i64689# Bubble Chart 2009-06-04 17:26:44 +0200 iha r272647 : #i64689# Bubble Chart 2009-06-04 11:24:25 +0200 iha r272618 : #i64689# add more spacing between bubbles and data labels 2009-05-26 18:05:23 +0200 ufi r272314 : i101637 2009-04-22 14:37:50 +0200 iha r271115 : #i64689# bubble chart 2009-04-21 17:52:23 +0200 iha r271052 : #i64689# bubble chart 2009-04-21 17:50:48 +0200 iha r271051 : #i76728# type icon for xy chart 2009-04-21 17:25:52 +0200 iha r271049 : #i76728# type icon for xy chart 2009-04-09 11:18:09 +0200 iha r270685 : #i100977# autoscaling works not correct if missing values should be treated as zero 2009-04-08 16:39:43 +0200 iha r270656 : #i64689# bubble chart - missing value treatment 2009-04-08 15:13:25 +0200 iha r270655 : #i64689# bubble chart - remove unused code 2009-04-08 15:12:19 +0200 iha r270653 : #i64689# bubble chart - determine sereis length correctly on export 2009-04-08 14:22:43 +0200 iha r270650 : #i64689# bubble chart - remove unused code 2009-04-08 14:12:09 +0200 iha r270646 : #i64689# bubble chart - export domains even if no main sequence was found 2009-04-08 14:11:07 +0200 iha r270645 : #i64689# bubble chart - don't replace missing size values with 1.0 2009-04-07 16:20:22 +0200 iha r270602 : #i64689# bubble chart - do not offer percent values for data label display for xy and bubble chart 2009-04-07 16:17:42 +0200 iha r270601 : remove superfluous code 2009-04-06 16:39:32 +0200 iha r270569 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-02 17:33:33 +0200 iha r270427 : use input string for formatting in data table during edit 2009-04-02 16:00:29 +0200 iha r270413 : #i64689# bubble chart - when creating a new series within the data table give it the same number format as the former series, thus the new bubble size values can be edited with the same format immidiately 2009-04-02 11:25:33 +0200 iha r270385 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-01 11:32:03 +0200 iha r270312 : #i64689# bubble chart - add further parameter for view creation 2009-03-31 17:52:08 +0200 iha r270291 : #i64689# bubble chart - scale bubble size with diagram size 2009-03-31 13:38:13 +0200 iha r270278 : #i64689# bubble chart - wrong size for small values < 1 2009-03-27 19:11:07 +0100 iha r270169 : #i64689# bubble chart 2009-03-27 19:07:11 +0100 iha r270168 : #i64689# bubble chart - remove unused code 2009-03-27 18:33:57 +0100 iha r270167 : #i64689# bubble chart - create no shape for invalid sizes 2009-03-27 15:18:21 +0100 iha r270157 : #i76728# type icon for xy chart 2009-03-27 14:34:38 +0100 iha r270156 : #i64689# bubble chart - correct scaling 2009-03-27 14:27:27 +0100 iha r270155 : #i64689# bubble chart - images 2009-03-27 14:25:45 +0100 iha r270154 : #i64689# bubble chart - images 2009-03-27 11:38:57 +0100 iha r270142 : #i64689# bubble chart - values-size is the main series 2009-03-27 11:30:20 +0100 iha r270140 : #i64689# correct order of sequences after load thus switching charttypes afterwards produces expected results now 2009-03-26 10:22:55 +0100 iha r270056 : #i64689# bubble chart 2009-03-24 17:45:15 +0100 iha r269984 : #i64689# bubble chart - user properties from points (not only from the series) 2009-03-24 15:10:57 +0100 dr r269954 : #i64989# export bubble charts to xls 2009-03-24 14:55:29 +0100 dr r269952 : #i64989# import bubble charts from xls 2009-03-24 14:54:46 +0100 dr r269950 : #i64989# import bubble charts from ooxml 2009-03-23 18:59:08 +0100 iha r269895 : further cleanups possible with new member m_aGlobalSeriesImportInfo 2009-03-23 16:54:04 +0100 iha r269886 : #i64689# bubble chart - a single sequence must be interpreted as sizes because of ODF specification 2009-03-23 16:50:43 +0100 iha r269885 : #i64689# save&load bubble chart 2009-03-20 19:30:29 +0100 iha r269826 : CWS-TOOLING: rebase CWS bubblechart to trunk@269781 (milestone: DEV300:m44) 2009-03-19 11:30:33 +0100 iha r269732 : #i64689# rename SchXMLCategoriesDomainContext to SchXMLCategoriesContext avoid confusion with domains 2009-03-18 17:11:13 +0100 iha r269693 : #i64689# add charttype bubble 2009-03-18 17:09:22 +0100 iha r269692 : #i64689# remove unused code 2009-03-13 12:18:26 +0100 iha r269467 : #i64689# corrected lineends 2009-03-12 11:25:14 +0100 iha r269376 : #i64689# bubble chart (part 1)
2009-07-02 19:17:43 +00:00
rtl::OUString aRoleForDataLabelNumberFormat = ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( aChartTypes[nCTIdx] );
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
Sequence< Reference< chart2::XDataSeries > > aSeries( xSeriesCnt->getDataSeries());
lcl_tSharedSeqVec aSharedSequences( lcl_getSharedSequences( aSeries ));
for( lcl_tSharedSeqVec::const_iterator aIt( aSharedSequences.begin());
aIt != aSharedSequences.end(); ++aIt )
{
tDataColumn aSharedSequence;
aSharedSequence.m_xLabeledDataSequence = *aIt;
aSharedSequence.m_aUIRoleName = lcl_getUIRoleName( *aIt );
aSharedSequence.m_eCellType = NUMBER;
// as the sequences are shared it should be ok to take the first series
// @todo: dimension index 0 for x-values used here. This is just a guess.
// Also, the axis index is 0, as there is usually only one x-axis
CWS-TOOLING: integrate CWS bubblechart 2009-06-17 08:41:14 +0200 hde r273051 : i101635: added new charttype bubble 2009-06-17 08:39:37 +0200 hde r273050 : i101635: created new testcase tCreateNewBubbleChart 2009-06-17 08:38:07 +0200 hde r273049 : i101635: created new testcase tCreateNewBubbleChart 2009-06-15 15:22:32 +0200 hde r272991 : 101635 2009-06-11 12:44:01 +0200 iha r272864 : rebase to dev300m50 2009-06-10 23:27:54 +0200 iha r272841 : CWS-TOOLING: rebase CWS bubblechart to trunk@272827 (milestone: DEV300:m50) 2009-06-04 18:07:35 +0200 iha r272649 : #i64689# Bubble Chart 2009-06-04 17:26:44 +0200 iha r272647 : #i64689# Bubble Chart 2009-06-04 11:24:25 +0200 iha r272618 : #i64689# add more spacing between bubbles and data labels 2009-05-26 18:05:23 +0200 ufi r272314 : i101637 2009-04-22 14:37:50 +0200 iha r271115 : #i64689# bubble chart 2009-04-21 17:52:23 +0200 iha r271052 : #i64689# bubble chart 2009-04-21 17:50:48 +0200 iha r271051 : #i76728# type icon for xy chart 2009-04-21 17:25:52 +0200 iha r271049 : #i76728# type icon for xy chart 2009-04-09 11:18:09 +0200 iha r270685 : #i100977# autoscaling works not correct if missing values should be treated as zero 2009-04-08 16:39:43 +0200 iha r270656 : #i64689# bubble chart - missing value treatment 2009-04-08 15:13:25 +0200 iha r270655 : #i64689# bubble chart - remove unused code 2009-04-08 15:12:19 +0200 iha r270653 : #i64689# bubble chart - determine sereis length correctly on export 2009-04-08 14:22:43 +0200 iha r270650 : #i64689# bubble chart - remove unused code 2009-04-08 14:12:09 +0200 iha r270646 : #i64689# bubble chart - export domains even if no main sequence was found 2009-04-08 14:11:07 +0200 iha r270645 : #i64689# bubble chart - don't replace missing size values with 1.0 2009-04-07 16:20:22 +0200 iha r270602 : #i64689# bubble chart - do not offer percent values for data label display for xy and bubble chart 2009-04-07 16:17:42 +0200 iha r270601 : remove superfluous code 2009-04-06 16:39:32 +0200 iha r270569 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-02 17:33:33 +0200 iha r270427 : use input string for formatting in data table during edit 2009-04-02 16:00:29 +0200 iha r270413 : #i64689# bubble chart - when creating a new series within the data table give it the same number format as the former series, thus the new bubble size values can be edited with the same format immidiately 2009-04-02 11:25:33 +0200 iha r270385 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-01 11:32:03 +0200 iha r270312 : #i64689# bubble chart - add further parameter for view creation 2009-03-31 17:52:08 +0200 iha r270291 : #i64689# bubble chart - scale bubble size with diagram size 2009-03-31 13:38:13 +0200 iha r270278 : #i64689# bubble chart - wrong size for small values < 1 2009-03-27 19:11:07 +0100 iha r270169 : #i64689# bubble chart 2009-03-27 19:07:11 +0100 iha r270168 : #i64689# bubble chart - remove unused code 2009-03-27 18:33:57 +0100 iha r270167 : #i64689# bubble chart - create no shape for invalid sizes 2009-03-27 15:18:21 +0100 iha r270157 : #i76728# type icon for xy chart 2009-03-27 14:34:38 +0100 iha r270156 : #i64689# bubble chart - correct scaling 2009-03-27 14:27:27 +0100 iha r270155 : #i64689# bubble chart - images 2009-03-27 14:25:45 +0100 iha r270154 : #i64689# bubble chart - images 2009-03-27 11:38:57 +0100 iha r270142 : #i64689# bubble chart - values-size is the main series 2009-03-27 11:30:20 +0100 iha r270140 : #i64689# correct order of sequences after load thus switching charttypes afterwards produces expected results now 2009-03-26 10:22:55 +0100 iha r270056 : #i64689# bubble chart 2009-03-24 17:45:15 +0100 iha r269984 : #i64689# bubble chart - user properties from points (not only from the series) 2009-03-24 15:10:57 +0100 dr r269954 : #i64989# export bubble charts to xls 2009-03-24 14:55:29 +0100 dr r269952 : #i64989# import bubble charts from xls 2009-03-24 14:54:46 +0100 dr r269950 : #i64989# import bubble charts from ooxml 2009-03-23 18:59:08 +0100 iha r269895 : further cleanups possible with new member m_aGlobalSeriesImportInfo 2009-03-23 16:54:04 +0100 iha r269886 : #i64689# bubble chart - a single sequence must be interpreted as sizes because of ODF specification 2009-03-23 16:50:43 +0100 iha r269885 : #i64689# save&load bubble chart 2009-03-20 19:30:29 +0100 iha r269826 : CWS-TOOLING: rebase CWS bubblechart to trunk@269781 (milestone: DEV300:m44) 2009-03-19 11:30:33 +0100 iha r269732 : #i64689# rename SchXMLCategoriesDomainContext to SchXMLCategoriesContext avoid confusion with domains 2009-03-18 17:11:13 +0100 iha r269693 : #i64689# add charttype bubble 2009-03-18 17:09:22 +0100 iha r269692 : #i64689# remove unused code 2009-03-13 12:18:26 +0100 iha r269467 : #i64689# corrected lineends 2009-03-12 11:25:14 +0100 iha r269376 : #i64689# bubble chart (part 1)
2009-07-02 19:17:43 +00:00
aSharedSequence.m_nNumberFormatKey = nXAxisNumberFormat;
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
m_aColumns.push_back( aSharedSequence );
++nHeaderStart;
}
for( sal_Int32 nSeriesIdx=0; nSeriesIdx<aSeries.getLength(); ++nSeriesIdx )
{
tDataColumnVector::size_type nStartColIndex = m_aColumns.size();
CWS-TOOLING: integrate CWS bubblechart 2009-06-17 08:41:14 +0200 hde r273051 : i101635: added new charttype bubble 2009-06-17 08:39:37 +0200 hde r273050 : i101635: created new testcase tCreateNewBubbleChart 2009-06-17 08:38:07 +0200 hde r273049 : i101635: created new testcase tCreateNewBubbleChart 2009-06-15 15:22:32 +0200 hde r272991 : 101635 2009-06-11 12:44:01 +0200 iha r272864 : rebase to dev300m50 2009-06-10 23:27:54 +0200 iha r272841 : CWS-TOOLING: rebase CWS bubblechart to trunk@272827 (milestone: DEV300:m50) 2009-06-04 18:07:35 +0200 iha r272649 : #i64689# Bubble Chart 2009-06-04 17:26:44 +0200 iha r272647 : #i64689# Bubble Chart 2009-06-04 11:24:25 +0200 iha r272618 : #i64689# add more spacing between bubbles and data labels 2009-05-26 18:05:23 +0200 ufi r272314 : i101637 2009-04-22 14:37:50 +0200 iha r271115 : #i64689# bubble chart 2009-04-21 17:52:23 +0200 iha r271052 : #i64689# bubble chart 2009-04-21 17:50:48 +0200 iha r271051 : #i76728# type icon for xy chart 2009-04-21 17:25:52 +0200 iha r271049 : #i76728# type icon for xy chart 2009-04-09 11:18:09 +0200 iha r270685 : #i100977# autoscaling works not correct if missing values should be treated as zero 2009-04-08 16:39:43 +0200 iha r270656 : #i64689# bubble chart - missing value treatment 2009-04-08 15:13:25 +0200 iha r270655 : #i64689# bubble chart - remove unused code 2009-04-08 15:12:19 +0200 iha r270653 : #i64689# bubble chart - determine sereis length correctly on export 2009-04-08 14:22:43 +0200 iha r270650 : #i64689# bubble chart - remove unused code 2009-04-08 14:12:09 +0200 iha r270646 : #i64689# bubble chart - export domains even if no main sequence was found 2009-04-08 14:11:07 +0200 iha r270645 : #i64689# bubble chart - don't replace missing size values with 1.0 2009-04-07 16:20:22 +0200 iha r270602 : #i64689# bubble chart - do not offer percent values for data label display for xy and bubble chart 2009-04-07 16:17:42 +0200 iha r270601 : remove superfluous code 2009-04-06 16:39:32 +0200 iha r270569 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-02 17:33:33 +0200 iha r270427 : use input string for formatting in data table during edit 2009-04-02 16:00:29 +0200 iha r270413 : #i64689# bubble chart - when creating a new series within the data table give it the same number format as the former series, thus the new bubble size values can be edited with the same format immidiately 2009-04-02 11:25:33 +0200 iha r270385 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-01 11:32:03 +0200 iha r270312 : #i64689# bubble chart - add further parameter for view creation 2009-03-31 17:52:08 +0200 iha r270291 : #i64689# bubble chart - scale bubble size with diagram size 2009-03-31 13:38:13 +0200 iha r270278 : #i64689# bubble chart - wrong size for small values < 1 2009-03-27 19:11:07 +0100 iha r270169 : #i64689# bubble chart 2009-03-27 19:07:11 +0100 iha r270168 : #i64689# bubble chart - remove unused code 2009-03-27 18:33:57 +0100 iha r270167 : #i64689# bubble chart - create no shape for invalid sizes 2009-03-27 15:18:21 +0100 iha r270157 : #i76728# type icon for xy chart 2009-03-27 14:34:38 +0100 iha r270156 : #i64689# bubble chart - correct scaling 2009-03-27 14:27:27 +0100 iha r270155 : #i64689# bubble chart - images 2009-03-27 14:25:45 +0100 iha r270154 : #i64689# bubble chart - images 2009-03-27 11:38:57 +0100 iha r270142 : #i64689# bubble chart - values-size is the main series 2009-03-27 11:30:20 +0100 iha r270140 : #i64689# correct order of sequences after load thus switching charttypes afterwards produces expected results now 2009-03-26 10:22:55 +0100 iha r270056 : #i64689# bubble chart 2009-03-24 17:45:15 +0100 iha r269984 : #i64689# bubble chart - user properties from points (not only from the series) 2009-03-24 15:10:57 +0100 dr r269954 : #i64989# export bubble charts to xls 2009-03-24 14:55:29 +0100 dr r269952 : #i64989# import bubble charts from xls 2009-03-24 14:54:46 +0100 dr r269950 : #i64989# import bubble charts from ooxml 2009-03-23 18:59:08 +0100 iha r269895 : further cleanups possible with new member m_aGlobalSeriesImportInfo 2009-03-23 16:54:04 +0100 iha r269886 : #i64689# bubble chart - a single sequence must be interpreted as sizes because of ODF specification 2009-03-23 16:50:43 +0100 iha r269885 : #i64689# save&load bubble chart 2009-03-20 19:30:29 +0100 iha r269826 : CWS-TOOLING: rebase CWS bubblechart to trunk@269781 (milestone: DEV300:m44) 2009-03-19 11:30:33 +0100 iha r269732 : #i64689# rename SchXMLCategoriesDomainContext to SchXMLCategoriesContext avoid confusion with domains 2009-03-18 17:11:13 +0100 iha r269693 : #i64689# add charttype bubble 2009-03-18 17:09:22 +0100 iha r269692 : #i64689# remove unused code 2009-03-13 12:18:26 +0100 iha r269467 : #i64689# corrected lineends 2009-03-12 11:25:14 +0100 iha r269376 : #i64689# bubble chart (part 1)
2009-07-02 19:17:43 +00:00
Reference< chart2::XDataSeries > xSeries( aSeries[nSeriesIdx] );
Reference< chart2::data::XDataSource > xSource( xSeries, uno::UNO_QUERY );
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
if( xSource.is())
{
Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeqs( xSource->getDataSequences());
if( aLSeqs.getLength() == 0 )
continue;
nHeaderEnd = nHeaderStart;
// @todo: dimension index 1 for y-values used here. This is just a guess
CWS-TOOLING: integrate CWS chart30
2008-10-01 07:35:04 +00:00
sal_Int32 nYAxisNumberFormatKey =
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
DataSeriesHelper::getNumberFormatKeyFromAxis(
aSeries[nSeriesIdx], aCooSysSeq[nCooSysIdx], 1 );
INTEGRATION: CWS chart20_DEV300 (1.3.76); FILE MERGED 2008/02/21 15:59:25 bm 1.3.76.1: #i366# error bars from ranges
2008-03-06 15:24:36 +00:00
sal_Int32 nSeqIdx=0;
for( ; nSeqIdx<aLSeqs.getLength(); ++nSeqIdx )
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
{
CWS-TOOLING: integrate CWS chart30
2008-10-01 07:35:04 +00:00
sal_Int32 nSequenceNumberFormatKey = nYAxisNumberFormatKey;
OUString aRole = lcl_getRole( aLSeqs[nSeqIdx] );
CWS-TOOLING: integrate CWS bubblechart 2009-06-17 08:41:14 +0200 hde r273051 : i101635: added new charttype bubble 2009-06-17 08:39:37 +0200 hde r273050 : i101635: created new testcase tCreateNewBubbleChart 2009-06-17 08:38:07 +0200 hde r273049 : i101635: created new testcase tCreateNewBubbleChart 2009-06-15 15:22:32 +0200 hde r272991 : 101635 2009-06-11 12:44:01 +0200 iha r272864 : rebase to dev300m50 2009-06-10 23:27:54 +0200 iha r272841 : CWS-TOOLING: rebase CWS bubblechart to trunk@272827 (milestone: DEV300:m50) 2009-06-04 18:07:35 +0200 iha r272649 : #i64689# Bubble Chart 2009-06-04 17:26:44 +0200 iha r272647 : #i64689# Bubble Chart 2009-06-04 11:24:25 +0200 iha r272618 : #i64689# add more spacing between bubbles and data labels 2009-05-26 18:05:23 +0200 ufi r272314 : i101637 2009-04-22 14:37:50 +0200 iha r271115 : #i64689# bubble chart 2009-04-21 17:52:23 +0200 iha r271052 : #i64689# bubble chart 2009-04-21 17:50:48 +0200 iha r271051 : #i76728# type icon for xy chart 2009-04-21 17:25:52 +0200 iha r271049 : #i76728# type icon for xy chart 2009-04-09 11:18:09 +0200 iha r270685 : #i100977# autoscaling works not correct if missing values should be treated as zero 2009-04-08 16:39:43 +0200 iha r270656 : #i64689# bubble chart - missing value treatment 2009-04-08 15:13:25 +0200 iha r270655 : #i64689# bubble chart - remove unused code 2009-04-08 15:12:19 +0200 iha r270653 : #i64689# bubble chart - determine sereis length correctly on export 2009-04-08 14:22:43 +0200 iha r270650 : #i64689# bubble chart - remove unused code 2009-04-08 14:12:09 +0200 iha r270646 : #i64689# bubble chart - export domains even if no main sequence was found 2009-04-08 14:11:07 +0200 iha r270645 : #i64689# bubble chart - don't replace missing size values with 1.0 2009-04-07 16:20:22 +0200 iha r270602 : #i64689# bubble chart - do not offer percent values for data label display for xy and bubble chart 2009-04-07 16:17:42 +0200 iha r270601 : remove superfluous code 2009-04-06 16:39:32 +0200 iha r270569 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-02 17:33:33 +0200 iha r270427 : use input string for formatting in data table during edit 2009-04-02 16:00:29 +0200 iha r270413 : #i64689# bubble chart - when creating a new series within the data table give it the same number format as the former series, thus the new bubble size values can be edited with the same format immidiately 2009-04-02 11:25:33 +0200 iha r270385 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat 2009-04-01 11:32:03 +0200 iha r270312 : #i64689# bubble chart - add further parameter for view creation 2009-03-31 17:52:08 +0200 iha r270291 : #i64689# bubble chart - scale bubble size with diagram size 2009-03-31 13:38:13 +0200 iha r270278 : #i64689# bubble chart - wrong size for small values < 1 2009-03-27 19:11:07 +0100 iha r270169 : #i64689# bubble chart 2009-03-27 19:07:11 +0100 iha r270168 : #i64689# bubble chart - remove unused code 2009-03-27 18:33:57 +0100 iha r270167 : #i64689# bubble chart - create no shape for invalid sizes 2009-03-27 15:18:21 +0100 iha r270157 : #i76728# type icon for xy chart 2009-03-27 14:34:38 +0100 iha r270156 : #i64689# bubble chart - correct scaling 2009-03-27 14:27:27 +0100 iha r270155 : #i64689# bubble chart - images 2009-03-27 14:25:45 +0100 iha r270154 : #i64689# bubble chart - images 2009-03-27 11:38:57 +0100 iha r270142 : #i64689# bubble chart - values-size is the main series 2009-03-27 11:30:20 +0100 iha r270140 : #i64689# correct order of sequences after load thus switching charttypes afterwards produces expected results now 2009-03-26 10:22:55 +0100 iha r270056 : #i64689# bubble chart 2009-03-24 17:45:15 +0100 iha r269984 : #i64689# bubble chart - user properties from points (not only from the series) 2009-03-24 15:10:57 +0100 dr r269954 : #i64989# export bubble charts to xls 2009-03-24 14:55:29 +0100 dr r269952 : #i64989# import bubble charts from xls 2009-03-24 14:54:46 +0100 dr r269950 : #i64989# import bubble charts from ooxml 2009-03-23 18:59:08 +0100 iha r269895 : further cleanups possible with new member m_aGlobalSeriesImportInfo 2009-03-23 16:54:04 +0100 iha r269886 : #i64689# bubble chart - a single sequence must be interpreted as sizes because of ODF specification 2009-03-23 16:50:43 +0100 iha r269885 : #i64689# save&load bubble chart 2009-03-20 19:30:29 +0100 iha r269826 : CWS-TOOLING: rebase CWS bubblechart to trunk@269781 (milestone: DEV300:m44) 2009-03-19 11:30:33 +0100 iha r269732 : #i64689# rename SchXMLCategoriesDomainContext to SchXMLCategoriesContext avoid confusion with domains 2009-03-18 17:11:13 +0100 iha r269693 : #i64689# add charttype bubble 2009-03-18 17:09:22 +0100 iha r269692 : #i64689# remove unused code 2009-03-13 12:18:26 +0100 iha r269467 : #i64689# corrected lineends 2009-03-12 11:25:14 +0100 iha r269376 : #i64689# bubble chart (part 1)
2009-07-02 19:17:43 +00:00
if( aRole.equals( aRoleForDataLabelNumberFormat ) )
{
nSequenceNumberFormatKey = ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel(
Reference< beans::XPropertySet >( xSeries, uno::UNO_QUERY ), xSeries, -1, xDiagram );
}
else if( aRole.equals( C2U( "values-x" ) ) )
nSequenceNumberFormatKey = nXAxisNumberFormat;
CWS-TOOLING: integrate CWS chart30
2008-10-01 07:35:04 +00:00
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
if( ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(),
lcl_RepresentationsOfLSeqMatch( aLSeqs[nSeqIdx] )) == aSharedSequences.end())
{
// no shared sequence
m_aColumns.push_back(
tDataColumn(
aSeries[nSeriesIdx],
nSeqIdx,
lcl_getUIRoleName( aLSeqs[nSeqIdx] ),
aLSeqs[nSeqIdx],
NUMBER,
CWS-TOOLING: integrate CWS chart30
2008-10-01 07:35:04 +00:00
nSequenceNumberFormatKey ));
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
++nHeaderEnd;
}
// else skip
}
bool bSwapXAndYAxis = false;
try
{
Reference< beans::XPropertySet > xProp( aCooSysSeq[nCooSysIdx], uno::UNO_QUERY );
xProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("SwapXAndYAxis"))) >>= bSwapXAndYAxis;
}
catch( const beans::UnknownPropertyException & ex )
{
INTEGRATION: CWS chart07 (1.2.12); FILE MERGED 2007/07/10 15:21:56 bm 1.2.12.2: #i69281# warnings removed 2007/07/10 15:21:33 bm 1.2.12.1: #i69281# warnings removed
2007-07-25 07:30:25 +00:00
(void)ex;
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
}
INTEGRATION: CWS chart20_DEV300 (1.3.76); FILE MERGED 2008/02/21 15:59:25 bm 1.3.76.1: #i366# error bars from ranges
2008-03-06 15:24:36 +00:00
// add ranges for error bars if present for a series
if( StatisticsHelper::usesErrorBarRanges( aSeries[nSeriesIdx], /* bYError = */ true ))
CWS-TOOLING: integrate CWS chart30
2008-10-01 07:35:04 +00:00
addErrorBarRanges( aSeries[nSeriesIdx], nYAxisNumberFormatKey, nSeqIdx, nHeaderEnd );
INTEGRATION: CWS chart20_DEV300 (1.3.76); FILE MERGED 2008/02/21 15:59:25 bm 1.3.76.1: #i366# error bars from ranges
2008-03-06 15:24:36 +00:00
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
m_aHeaders.push_back(
tDataHeader(
aSeries[nSeriesIdx],
aChartTypes[nCTIdx],
bSwapXAndYAxis,
nHeaderStart,
nHeaderEnd - 1 ));
INTEGRATION: CWS chart20_DEV300 (1.3.76); FILE MERGED 2008/02/21 15:59:25 bm 1.3.76.1: #i366# error bars from ranges
2008-03-06 15:24:36 +00:00
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
nHeaderStart = nHeaderEnd;
::std::sort( m_aColumns.begin() + nStartColIndex, m_aColumns.end(), implColumnLess() );
}
}
}
}
}
}
INTEGRATION: CWS chart20_DEV300 (1.3.76); FILE MERGED 2008/02/21 15:59:25 bm 1.3.76.1: #i366# error bars from ranges
2008-03-06 15:24:36 +00:00
void DataBrowserModel::addErrorBarRanges(
const Reference< chart2::XDataSeries > & xDataSeries,
sal_Int32 nNumberFormatKey,
sal_Int32 & rInOutSequenceIndex,
sal_Int32 & rInOutHeaderEnd )
{
try
{
::std::vector< Reference< chart2::data::XLabeledDataSequence > > aSequences;
// x error bars
// ------------
Reference< chart2::data::XDataSource > xErrorSource(
StatisticsHelper::getErrorBars( xDataSeries, /* bYError = */ false ), uno::UNO_QUERY );
// positive x error bars
Reference< chart2::data::XLabeledDataSequence > xErrorLSequence(
StatisticsHelper::getErrorLabeledDataSequenceFromDataSource(
xErrorSource,
/* bPositiveValue = */ true,
/* bYError = */ false ));
if( xErrorLSequence.is())
aSequences.push_back( xErrorLSequence );
// negative x error bars
xErrorLSequence.set(
StatisticsHelper::getErrorLabeledDataSequenceFromDataSource(
xErrorSource,
/* bPositiveValue = */ false,
/* bYError = */ false ));
if( xErrorLSequence.is())
aSequences.push_back( xErrorLSequence );
// y error bars
// ------------
xErrorSource.set(
StatisticsHelper::getErrorBars( xDataSeries, /* bYError = */ true ), uno::UNO_QUERY );
// positive y error bars
xErrorLSequence.set(
StatisticsHelper::getErrorLabeledDataSequenceFromDataSource(
xErrorSource,
/* bPositiveValue = */ true,
/* bYError = */ true ));
if( xErrorLSequence.is())
aSequences.push_back( xErrorLSequence );
// negative y error bars
xErrorLSequence.set(
StatisticsHelper::getErrorLabeledDataSequenceFromDataSource(
xErrorSource,
/* bPositiveValue = */ false,
/* bYError = */ true ));
if( xErrorLSequence.is())
aSequences.push_back( xErrorLSequence );
for( ::std::vector< Reference< chart2::data::XLabeledDataSequence > >::const_iterator aIt( aSequences.begin());
aIt != aSequences.end(); ++aIt )
{
m_aColumns.push_back(
tDataColumn(
xDataSeries,
rInOutSequenceIndex,
lcl_getUIRoleName( *aIt ),
*aIt,
NUMBER,
nNumberFormatKey ));
++rInOutSequenceIndex;
++rInOutHeaderEnd;
}
}
catch( const uno::Exception & ex )
{
ASSERT_EXCEPTION( ex );
}
}
INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED 2007/02/14 16:30:14 bm 1.1.2.14: #i72340# allow swapping rows 2007/02/08 21:25:31 iha 1.1.2.13: resync m195 -> m202 2006/12/13 17:39:49 bm 1.1.2.12: private struct access problem with solaris compiler 2006/12/13 14:38:17 bm 1.1.2.11: correct order of roles data dialog 2006/12/12 18:04:10 bm 1.1.2.10: #i71666# show categories also for scatter charts, as data labels 2006/10/25 11:24:10 bm 1.1.2.9: allow setting previously unset sequences, e.g. labels at data series with external data provider 2006/07/30 21:27:54 bm 1.1.2.8: lcl_getSharedSequences: pass the sequence as const ref to allow temporaries 2006/07/26 14:46:18 bm 1.1.2.7: allow insertion of data series into empty chart 2006/07/25 16:46:02 bm 1.1.2.6: #i64824# handle number formats in the data browser 2006/07/25 12:51:40 bm 1.1.2.5: #i64824# lock controllers during adding/deleting of data points of all series to avoid multiple model updates 2006/07/24 14:42:10 bm 1.1.2.4: #i64824# forgot to remove commented-out lines 2006/07/24 14:40:55 bm 1.1.2.3: #i64824# fixed insertion of new data series and deletion of series. 2006/07/20 09:53:52 bm 1.1.2.2: #i64824# show shared sequences correctly. Missing: insert new series 2006/07/19 15:48:22 bm 1.1.2.1: #i64824# link between the data provider and the data browser control
2007-05-22 16:27:50 +00:00
} // namespace chart
Reference in New Issue Copy Permalink