Jan Holesovsky acfdc69e78 Merge commit 'ooo/DEV300_m103' ...

Conflicts:
	sc/source/filter/starcalc/scflt.cxx
	sc/source/ui/unoobj/chart2uno.cxx

2011-03-23 16:58:51 +01:00

..

AxisItemConverter.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-10 20:21:13 -05:00

CharacterPropertyItemConverter.cxx

Merge commit 'ooo/DEV300_m103'

2011-03-23 16:58:51 +01:00

DataPointItemConverter.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-10 20:21:13 -05:00

ErrorBarItemConverter.cxx

Merge remote-tracking branch 'origin/integration/dev300_m101'

2011-03-18 15:33:40 +01:00

GraphicPropertyItemConverter.cxx

Merge remote-tracking branch 'origin/integration/dev300_m101'

2011-03-18 15:33:40 +01:00

ItemConverter.cxx

Merge remote-tracking branch 'origin/integration/dev300_m101'

2011-03-18 15:33:40 +01:00

LegendItemConverter.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-10 20:21:13 -05:00

makefile.mk

chartpositioning: #i100778# simplify user interface: reduce sizing options to new excluding mode only

2010-05-05 18:16:33 +02:00

MultipleChartConverters.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-10 20:21:13 -05:00

MultipleItemConverter.cxx

Add vim/emacs modelines to all source files

2010-10-13 10:57:18 +02:00

RegressionCurveItemConverter.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-10 20:21:13 -05:00

RegressionEquationItemConverter.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-10 20:21:13 -05:00

SchWhichPairs.hxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-10 20:21:13 -05:00

SeriesOptionsItemConverter.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-10 20:21:13 -05:00

StatisticsItemConverter.cxx

Merge remote-tracking branch 'origin/integration/dev300_m101'

2011-03-18 15:33:40 +01:00

TitleItemConverter.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-10 20:21:13 -05:00