[Libreoffice-commits] .: 2 commits - patches/dev300
Michael Meeks
michael at kemper.freedesktop.org
Tue Mar 29 04:21:03 PDT 2011
patches/dev300/apply | 69 --
patches/dev300/corporate-dictionary.diff | 34 -
patches/dev300/cws-koheichart02-chart2.diff | 620 -------------------------
patches/dev300/cws-koheichart02-sc.diff | 285 -----------
patches/dev300/cws-koheichart02-xmloff.diff | 90 ---
patches/dev300/printer-properties-disable.diff | 51 --
6 files changed, 19 insertions(+), 1130 deletions(-)
New commits:
commit 8dfae3835aee3f0e5039413a274fd93c6554a373
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue Mar 29 12:20:05 2011 +0100
remove obsolete patches and sections
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ccf328e..d4a9316 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -25,15 +25,14 @@ LinuxCommon : Common, Defaults, FontConfigTemporaryHacks, \
CliMonoCommon, Mono, MonoComp, AddressBooks, QuickStarter, KDE4, Netbook, \
GlobalNSPluginSupport
MacOSXCommon : Common, Defaults
-Win32Common : Common, Defaults, Win32Only, CliMonoCommon, CliComponent, NotDebian
+Win32Common : Common, Defaults, Win32Only, CliMonoCommon, CliComponent
# Experimental sections
Experimental: VBAUntested, ArkOnlyExperimental, \
UnUsedButNotYetRemovedFromGit, WebDAV, \
PostgreSQL, RadioButtons, WWInProgress, \
- KDE4Experimental, MinGW, CalcExperimental, \
- OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
- WriterNavigation \
- HPPA, AXP, Speed, GSoC2010, Toolbars, Win32Packaging
+ KDE4Experimental, MinGW, \
+ CrossWin32Patches, AutoLayout, \
+ Speed, GSoC2010, Toolbars, Win32Packaging
DebianLooseSections: DebianBaseNoHelpContent
# Optional sections
Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
@@ -47,8 +46,7 @@ Piece : PieceBits
Localize : LocalizeFixes
# Novell
-NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
- NotDebian, Split, CustomUserConfig
+NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, Split, CustomUserConfig
SUSE-9.1 : NovellBase, DisableGCJ
SUSE-9.2 : NovellBase, DisableGCJ
SUSE-9.3 : NovellBase, DisableGCJ
@@ -61,10 +59,10 @@ SUSE-11.1 : NovellBase, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL
SUSE-11.2 : NovellBase, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL, SUSE112
SUSE : NovellBase, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL, SUSE112
# Slackware
-Slackware : LinuxCommon, NotDebian, Mono, msaccess
+Slackware : LinuxCommon, Mono, msaccess
# Debian
DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL
-Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, HPPA, AXP, kFreeBSD
+Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
# Ubuntu
UbuntuBased : DebianBase, UbuntuOnly
@@ -76,29 +74,29 @@ UbuntuMaverick : UbuntuBased, UbuntuMaverickOnly
UbuntuNatty : UbuntuBased, UbuntuNattyOnly
UbuntuL10n : UbuntuBased, UbuntuL10nOnly
# DroplineGNOME
-DroplineGNOME : LinuxCommon, NotDebian, Mono, msaccess
-DroplineGNOME64 : LinuxCommon, NotDebian, Mono, msaccess
+DroplineGNOME : LinuxCommon, Mono, msaccess
+DroplineGNOME64 : LinuxCommon, Mono, msaccess
# Ark Linux
-Ark: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, KDE4
+Ark: LinuxCommon, ArkOnly, BerkeleyDB43, KDE4
# www.pld-linux.org
-PLDBase: LinuxCommon, NotDebian, PLDOnly
+PLDBase: LinuxCommon, PLDOnly
PLD: PLDBase
PLD64: PLDBase
# Mandriva Linux
-MandrivaBase: MandrivaOnly, LinuxCommon, Split, NotDebian
+MandrivaBase: MandrivaOnly, LinuxCommon, Split
Mandriva: MandrivaBase
Mandriva64: MandrivaBase
# Frugalware Linux
-Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, NotDebian, FrugalwareOnly
+Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, FrugalwareOnly
# openmamba
openmamba: LinuxCommon, GlobalDesktopFiles
#Gentoo
-GentooBase : LinuxCommon, GentooOnly, NotDebian, BerkeleyDB43
+GentooBase : LinuxCommon, GentooOnly, BerkeleyDB43
GentooUnstable: GentooBase, GentooExperimental
Gentoo : GentooBase
Gentoo64: GentooBase
# rPath Linux
-rPathCommon: LinuxCommon, NotDebian, BerkeleyDB43
+rPathCommon: LinuxCommon, BerkeleyDB43
rpl2: rPathCommon
rpl2-64: rPathCommon
# ArchLinux
@@ -116,8 +114,8 @@ NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, Novell
# Mac OS X
MacOSX : MacOSXCommon, MacOSXOnly
# Pardus
-Pardus2007: PardusOnly, LinuxCommon, NotDebian
-Pardus2008: PardusOnly, LinuxCommon, NotDebian
+Pardus2007: PardusOnly, LinuxCommon
+Pardus2008: PardusOnly, LinuxCommon
# Solaris
Solaris: NovellBase, UnstableExtensions
# OxygenOffice Professional
@@ -125,7 +123,7 @@ OxygenOfficeLinuxCommon : Common, Defaults, FontConfigTemporaryHacks, LinuxOnly
msaccess, OpenGLTransitions, CliMonoCommon, Mono, MonoComp, AddressBooks, QuickStarter, KDE4,\
Netbook, GlobalNSPluginSupport
OxygenOfficeMacOSXCommon : Common, Defaults
-OxygenOfficeWin32Common : Common, Defaults, Win32Only, CliMonoCommon, CliComponent, NotDebian
+OxygenOfficeWin32Common : Common, Defaults, Win32Only, CliMonoCommon, CliComponent
OxygenOfficeLinux: OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeLinuxOnly
OxygenOfficeWindows: OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only
@@ -392,27 +390,13 @@ document-password-change-sfx2.diff, kohei
# go-oo.org people active in this release
go-oo-team.diff, michael
-
[ NovellOnly ]
-# add in an entry for a corporate common dictionary
-corporate-dictionary.diff, michael
-
# Some Novell colors ...
novell-palette.diff, michael
# finally disable -fsigned-char on pcc
solenv-really-use-unsinged-char-on-ppc.diff, i#81127, n#169875, pmladek
-[ NotDebian ]
-
-# Disable the printer properties which are unused#583
-# related issue: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=353595
-# also last comment in: https://bugzilla.novell.com/show_bug.cgi?id=83925
-# also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=373974
-
-# due to popular demand, putting back the paper orientation checkbox
-#printer-properties-disable.diff, i#14036, michael
-
[ CustomUserConfig ]
# This section includes patches that deal with custom user configuration items
@@ -628,9 +612,6 @@ i18nutil-glibc-braindamage-workaround.diff, brosenk
# of files does not conflict with the main package, i#64802
sdk-gid-module-name.diff, pmladek, i#64802
-# do not pack any potential .orig files with ppds
-psprint_config-no-orig.diff, jholesov
-
[ DebianOnly ]
open-url-support-iceanimals.diff
@@ -1742,10 +1723,6 @@ normalize-template-paths-fix.diff, n#512146, thorsten
[ Experimental ]
experimental_ooapi.diff, flr
-[ CalcExperimental ]
-# It's empty but please don't remove this section.
-SectionOwner => kohei
-
[ AutoLayout ]
impress-autolayout.diff, cocofan
diff --git a/patches/dev300/corporate-dictionary.diff b/patches/dev300/corporate-dictionary.diff
deleted file mode 100644
index ba56a16..0000000
--- a/patches/dev300/corporate-dictionary.diff
+++ /dev/null
@@ -1,34 +0,0 @@
----
- extras/source/wordbook/makefile.mk | 2 +-
- .../schema/org/openoffice/Office/Linguistic.xcs | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git extras/source/wordbook/makefile.mk extras/source/wordbook/makefile.mk
-index 7d4e618..62f8318 100644
---- extras/source/wordbook/makefile.mk
-+++ extras/source/wordbook/makefile.mk
-@@ -39,7 +39,7 @@ TARGET=wordbookall
-
- ZIP1TARGET = $(WORDBOOK_ALL_TARGET)
-
--ZIP1LIST = technical.dic
-+ZIP1LIST = technical.dic Novell.dic
-
-
- ZIP2TARGET = $(WORDBOOK_USER_TARGET)
-diff --git officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
-index 7cb13b7..e0828fa 100644
---- officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
-@@ -252,7 +252,7 @@
- <desc>Specifies the custom dictionaries to be used. The Ignore list (IgnoreAllList (All)) is administered in the RAM only for the current spellcheck.</desc>
- <label>Custom dictionaries</label>
- </info>
-- <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;technical.dic</value>
-+ <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;Novell.dic;technical.dic;corporate.dic</value>
- </prop>
- <prop oor:name="IsUseDictionaryList" oor:type="xs:boolean">
- <!-- OldLocation: NEW -->
---
-1.7.0.1
-
diff --git a/patches/dev300/printer-properties-disable.diff b/patches/dev300/printer-properties-disable.diff
deleted file mode 100644
index 0aaaf13..0000000
--- a/patches/dev300/printer-properties-disable.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- padmin/source/rtsetup.src 2004-06-26 08:42:01.000000000 +0530
-+++ padmin/source/rtsetup.src 2005-03-02 11:48:29.000000000 +0530
-@@ -138,6 +138,7 @@ TabPage RID_RTS_PAPERPAGE
- };
- FixedText RID_RTS_PAPER_ORIENTATION_TXT
- {
-+ Hide = TRUE;
- Pos = MAP_APPFONT( 5, 20 );
- Size = MAP_APPFONT( 80, 8 );
- Text [ en-US ] = "~Orientation";
-@@ -145,6 +146,7 @@ TabPage RID_RTS_PAPERPAGE
- };
- ListBox RID_RTS_PAPER_ORIENTATION_BOX
- {
-+ Hide = TRUE;
- Border = TRUE;
- DropDown = TRUE;
- Pos = MAP_APPFONT( 115, 20 );
-@@ -152,7 +154,7 @@ TabPage RID_RTS_PAPERPAGE
- };
- FixedText RID_RTS_PAPER_DUPLEX_TXT
- {
-- Pos = MAP_APPFONT( 5, 35 );
-+ Pos = MAP_APPFONT( 5, 20 );
- Size = MAP_APPFONT( 80, 8 );
- Text [ en-US ] = "~Duplex";
- };
-@@ -161,12 +163,12 @@ TabPage RID_RTS_PAPERPAGE
- {
- Border = TRUE;
- DropDown = TRUE;
-- Pos = MAP_APPFONT( 115, 35 );
-+ Pos = MAP_APPFONT( 115, 20 );
- Size = MAP_APPFONT( 110, 120 );
- };
- FixedText RID_RTS_PAPER_SLOT_TXT
- {
-- Pos = MAP_APPFONT( 5, 50 );
-+ Pos = MAP_APPFONT( 5, 35 );
- Size = MAP_APPFONT( 80, 8 );
- Text [ en-US ] = "Paper tray";
- };
-@@ -175,7 +177,7 @@ TabPage RID_RTS_PAPERPAGE
- {
- Border = TRUE;
- DropDown = TRUE;
-- Pos = MAP_APPFONT( 115, 50 );
-+ Pos = MAP_APPFONT( 115, 35 );
- Size = MAP_APPFONT( 110, 120 );
- };
- };
commit c91b939d97090c28ec5c5334d1688745fb7dae95
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue Mar 29 12:08:00 2011 +0100
remove chart02 backport - it is in 3.4
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8f68b7c..ccf328e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -13,7 +13,7 @@ OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
Icons, CalcFixes, WriterFixes, EasterEgg, \
- CWSBackports, Cleanups, WMF, GnomeVFS, \
+ Cleanups, WMF, GnomeVFS, \
Layout, VBABits, VBAObjects, CalcErrors, GCJ, \
OOXML, OOXMLExportDevel, OOXMLExport, \
FedoraCommonFixes, LayoutDialogs, Fuzz, \
@@ -157,12 +157,6 @@ cli-mono-common.diff
[ CliComponent ]
cli-component.diff
-[ CWSBackports ]
-# koheichart02 cws (supported mixed chart types in single diagram).
-cws-koheichart02-chart2.diff, kohei
-cws-koheichart02-sc.diff, kohei
-cws-koheichart02-xmloff.diff, kohei
-
[ LinuxOnly ]
# add accelerator to the OK and Cancel buttons.
ok-cancel-btn-add-accel.diff, kohei
@@ -233,8 +227,6 @@ speed-sal-fewer-lstats.diff, i#89730, jholesov
# for mixed font set
#FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin
-[ CWSBackports ]
-
[ GCJ ]
# gij/libgcj paths...
jvmfwk-gij-paths.diff, rengelha
diff --git a/patches/dev300/cws-koheichart02-chart2.diff b/patches/dev300/cws-koheichart02-chart2.diff
deleted file mode 100644
index 303651a..0000000
--- a/patches/dev300/cws-koheichart02-chart2.diff
+++ /dev/null
@@ -1,620 +0,0 @@
----
- chart2/source/model/template/AreaChartType.cxx | 114 ++++++++++++++++++++
- chart2/source/model/template/AreaChartType.hxx | 10 ++
- .../model/template/AreaChartTypeTemplate.cxx | 3 +
- .../source/model/template/BarChartTypeTemplate.cxx | 1 +
- chart2/source/model/template/ChartTypeTemplate.cxx | 43 ++++++++
- chart2/source/model/template/ChartTypeTemplate.hxx | 5 +
- chart2/source/model/template/ColumnChartType.cxx | 20 ++++-
- .../model/template/ColumnLineChartTypeTemplate.cxx | 1 +
- chart2/source/model/template/LineChartType.cxx | 20 ++++-
- .../model/template/LineChartTypeTemplate.cxx | 1 +
- .../source/model/template/NetChartTypeTemplate.cxx | 1 +
- .../source/model/template/PieChartTypeTemplate.cxx | 1 +
- .../model/template/ScatterChartTypeTemplate.cxx | 1 +
- .../model/template/StockChartTypeTemplate.cxx | 1 +
- chart2/source/view/axes/ScaleAutomatism.cxx | 16 +++
- chart2/source/view/charttypes/AreaChart.cxx | 38 ++++++-
- chart2/source/view/charttypes/BarChart.cxx | 13 +++
- chart2/source/view/charttypes/VSeriesPlotter.cxx | 34 ++++++
- 18 files changed, 319 insertions(+), 4 deletions(-)
-
-diff --git chart2/source/model/template/AreaChartType.cxx chart2/source/model/template/AreaChartType.cxx
-index 475234f..4cc6b77 100644
---- chart2/source/model/template/AreaChartType.cxx
-+++ chart2/source/model/template/AreaChartType.cxx
-@@ -30,8 +30,72 @@
- #include "AreaChartType.hxx"
- #include "macros.hxx"
- #include "servicenames_charttypes.hxx"
-+#include "PropertyHelper.hxx"
-+#include "ContainerHelper.hxx"
-+
-+#include <com/sun/star/beans/PropertyAttribute.hpp>
-
- using namespace ::com::sun::star;
-+using ::com::sun::star::beans::Property;
-+using ::com::sun::star::uno::Sequence;
-+
-+namespace
-+{
-+
-+enum
-+{
-+ PROP_AREACHARTTYPE_STACKED,
-+ PROP_AREACHARTTYPE_PERCENT
-+};
-+
-+void lcl_AddPropertiesToVector(
-+ ::std::vector< Property > & rOutProperties )
-+{
-+ rOutProperties.push_back(
-+ Property( C2U( "Stacked" ),
-+ PROP_AREACHARTTYPE_STACKED,
-+ ::getBooleanCppuType(),
-+ beans::PropertyAttribute::BOUND
-+ | beans::PropertyAttribute::MAYBEDEFAULT ));
-+ rOutProperties.push_back(
-+ Property( C2U( "Percent" ),
-+ PROP_AREACHARTTYPE_PERCENT,
-+ ::getBooleanCppuType(),
-+ beans::PropertyAttribute::BOUND
-+ | beans::PropertyAttribute::MAYBEDEFAULT ));
-+}
-+
-+void lcl_AddDefaultsToMap(
-+ ::chart::tPropertyValueMap & rOutMap )
-+{
-+ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AREACHARTTYPE_STACKED, false );
-+ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AREACHARTTYPE_PERCENT, false );
-+}
-+
-+const Sequence< Property > & lcl_GetPropertySequence()
-+{
-+ static Sequence< Property > aPropSeq;
-+
-+ // /--
-+ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-+ if( 0 == aPropSeq.getLength() )
-+ {
-+ // get properties
-+ ::std::vector< ::com::sun::star::beans::Property > aProperties;
-+ lcl_AddPropertiesToVector( aProperties );
-+
-+ // and sort them for access via bsearch
-+ ::std::sort( aProperties.begin(), aProperties.end(),
-+ ::chart::PropertyNameLess() );
-+
-+ // transfer result to static Sequence
-+ aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
-+ }
-+
-+ return aPropSeq;
-+}
-+
-+} // anonymous namespace
-
- namespace chart
- {
-@@ -62,6 +126,56 @@ uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone()
- return CHART2_SERVICE_NAME_CHARTTYPE_AREA;
- }
-
-+// ____ OPropertySet ____
-+uno::Any AreaChartType::GetDefaultValue( sal_Int32 nHandle ) const
-+ throw(beans::UnknownPropertyException)
-+{
-+ static tPropertyValueMap aStaticDefaults;
-+
-+ // /--
-+ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-+ if( 0 == aStaticDefaults.size() )
-+ {
-+ // initialize defaults
-+ lcl_AddDefaultsToMap( aStaticDefaults );
-+ }
-+
-+ tPropertyValueMap::const_iterator aFound(
-+ aStaticDefaults.find( nHandle ));
-+
-+ if( aFound == aStaticDefaults.end())
-+ return uno::Any();
-+
-+ return (*aFound).second;
-+ // \--
-+}
-+
-+::cppu::IPropertyArrayHelper & SAL_CALL AreaChartType::getInfoHelper()
-+{
-+ static ::cppu::OPropertyArrayHelper aArrayHelper( lcl_GetPropertySequence(),
-+ /* bSorted = */ sal_True );
-+
-+ return aArrayHelper;
-+}
-+
-+// ____ XPropertySet ____
-+uno::Reference< beans::XPropertySetInfo > SAL_CALL AreaChartType::getPropertySetInfo()
-+ throw (uno::RuntimeException)
-+{
-+ static uno::Reference< beans::XPropertySetInfo > xInfo;
-+
-+ // /--
-+ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-+ if( !xInfo.is())
-+ {
-+ xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
-+ getInfoHelper());
-+ }
-+
-+ return xInfo;
-+ // \--
-+}
-+
- uno::Sequence< ::rtl::OUString > AreaChartType::getSupportedServiceNames_Static()
- {
- uno::Sequence< ::rtl::OUString > aServices( 2 );
-diff --git chart2/source/model/template/AreaChartType.hxx chart2/source/model/template/AreaChartType.hxx
-index 546ca1e..197c8dd 100644
---- chart2/source/model/template/AreaChartType.hxx
-+++ chart2/source/model/template/AreaChartType.hxx
-@@ -53,6 +53,16 @@ protected:
- virtual ::rtl::OUString SAL_CALL getChartType()
- throw (::com::sun::star::uno::RuntimeException);
-
-+ // ____ OPropertySet ____
-+ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-+ throw(::com::sun::star::beans::UnknownPropertyException);
-+ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-+
-+ // ____ XPropertySet ____
-+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
-+ getPropertySetInfo()
-+ throw (::com::sun::star::uno::RuntimeException);
-+
- // ____ XCloneable ____
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
- throw (::com::sun::star::uno::RuntimeException);
-diff --git chart2/source/model/template/AreaChartTypeTemplate.cxx chart2/source/model/template/AreaChartTypeTemplate.cxx
-index bcc5030..7ffce6b 100644
---- chart2/source/model/template/AreaChartTypeTemplate.cxx
-+++ chart2/source/model/template/AreaChartTypeTemplate.cxx
-@@ -46,6 +46,8 @@ using ::com::sun::star::beans::Property;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::Any;
-+using ::com::sun::star::uno::UNO_QUERY;
-+using ::com::sun::star::uno::UNO_QUERY_THROW;
- using ::osl::MutexGuard;
-
- namespace
-@@ -258,6 +260,7 @@ Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForN
- {
- Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) );
- ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult );
-+ setStackModePropertiesToChartType(xResult);
- return xResult;
- }
-
-diff --git chart2/source/model/template/BarChartTypeTemplate.cxx chart2/source/model/template/BarChartTypeTemplate.cxx
-index 2235cb5..44c6dd4 100644
---- chart2/source/model/template/BarChartTypeTemplate.cxx
-+++ chart2/source/model/template/BarChartTypeTemplate.cxx
-@@ -218,6 +218,7 @@ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNe
- {
- Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) );
- ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult );
-+ setStackModePropertiesToChartType(xResult);
- return xResult;
- }
-
-diff --git chart2/source/model/template/ChartTypeTemplate.cxx chart2/source/model/template/ChartTypeTemplate.cxx
-index c001b03..8db1c17 100644
---- chart2/source/model/template/ChartTypeTemplate.cxx
-+++ chart2/source/model/template/ChartTypeTemplate.cxx
-@@ -59,6 +59,7 @@ using ::rtl::OUString;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::Any;
-+using ::com::sun::star::uno::UNO_QUERY;
-
- // ======================================================================
-
-@@ -909,6 +910,48 @@ void ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem(
- comphelper::copyProperties( xSource, xDestination );
- }
-
-+void ChartTypeTemplate::setStackModePropertiesToChartType(const Reference<XChartType>& xChartType)
-+{
-+ Reference<beans::XPropertySet> xPropSet(xChartType, UNO_QUERY);
-+ if (!xPropSet.is())
-+ return;
-+
-+ bool bStacked = false;
-+ bool bPercent = false;
-+ switch (getStackMode(0))
-+ {
-+ case StackMode_Y_STACKED:
-+ bStacked = true;
-+ break;
-+ case StackMode_Y_STACKED_PERCENT:
-+ bStacked = true;
-+ bPercent = true;
-+ break;
-+ case StackMode_Z_STACKED:
-+ break;
-+ default:
-+ ;
-+ }
-+
-+ try
-+ {
-+ xPropSet->setPropertyValue(
-+ C2U("Stacked"), uno::makeAny(static_cast<sal_Bool>(bStacked)));
-+ }
-+ catch (const beans::UnknownPropertyException&)
-+ {
-+ }
-+
-+ try
-+ {
-+ xPropSet->setPropertyValue(
-+ C2U("Percent"), uno::makeAny(static_cast<sal_Bool>(bPercent)));
-+ }
-+ catch (const beans::UnknownPropertyException&)
-+ {
-+ }
-+}
-+
- // ________
-
- Sequence< OUString > ChartTypeTemplate::getSupportedServiceNames_Static()
-diff --git chart2/source/model/template/ChartTypeTemplate.hxx chart2/source/model/template/ChartTypeTemplate.hxx
-index d50b0bf..1edfbc2 100644
---- chart2/source/model/template/ChartTypeTemplate.hxx
-+++ chart2/source/model/template/ChartTypeTemplate.hxx
-@@ -267,6 +267,11 @@ protected:
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartType > & xNewChartType );
-
-+ void setStackModePropertiesToChartType(
-+ const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::chart2::XChartType>& xChartType );
-+
-+
- protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
- m_xContext;
-diff --git chart2/source/model/template/ColumnChartType.cxx chart2/source/model/template/ColumnChartType.cxx
-index 3c73d48..793355c 100644
---- chart2/source/model/template/ColumnChartType.cxx
-+++ chart2/source/model/template/ColumnChartType.cxx
-@@ -46,7 +46,9 @@ namespace
- enum
- {
- PROP_BARCHARTTYPE_OVERLAP_SEQUENCE,
-- PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE
-+ PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE,
-+ PROP_BARCHARTTYPE_STACKED,
-+ PROP_BARCHARTTYPE_PERCENT
- };
-
- void lcl_AddPropertiesToVector(
-@@ -65,6 +67,19 @@ void lcl_AddPropertiesToVector(
- ::getCppuType( reinterpret_cast< const Sequence< sal_Int32 > * >(0)),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
-+
-+ rOutProperties.push_back(
-+ Property( C2U( "Stacked" ),
-+ PROP_BARCHARTTYPE_STACKED,
-+ ::getBooleanCppuType(),
-+ beans::PropertyAttribute::BOUND
-+ | beans::PropertyAttribute::MAYBEDEFAULT ));
-+ rOutProperties.push_back(
-+ Property( C2U( "Percent" ),
-+ PROP_BARCHARTTYPE_PERCENT,
-+ ::getBooleanCppuType(),
-+ beans::PropertyAttribute::BOUND
-+ | beans::PropertyAttribute::MAYBEDEFAULT ));
- }
-
- void lcl_AddDefaultsToMap(
-@@ -77,6 +92,9 @@ void lcl_AddDefaultsToMap(
-
- aSeq[0] = aSeq[1] = 100;
- ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE, aSeq );
-+
-+ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_STACKED, false );
-+ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BARCHARTTYPE_PERCENT, false );
- }
-
- const Sequence< Property > & lcl_GetPropertySequence()
-diff --git chart2/source/model/template/ColumnLineChartTypeTemplate.cxx chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
-index 4b9d623..d0f26b7 100644
---- chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
-+++ chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
-@@ -412,6 +412,7 @@ Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNew
- ASSERT_EXCEPTION( ex );
- }
-
-+ setStackModePropertiesToChartType(xResult);
- return xResult;
- }
-
-diff --git chart2/source/model/template/LineChartType.cxx chart2/source/model/template/LineChartType.cxx
-index 9da5962..70aeb2a 100644
---- chart2/source/model/template/LineChartType.cxx
-+++ chart2/source/model/template/LineChartType.cxx
-@@ -51,7 +51,9 @@ enum
- {
- PROP_LINECHARTTYPE_CURVE_STYLE,
- PROP_LINECHARTTYPE_CURVE_RESOLUTION,
-- PROP_LINECHARTTYPE_SPLINE_ORDER
-+ PROP_LINECHARTTYPE_SPLINE_ORDER,
-+ PROP_LINECHARTTYPE_STACKED,
-+ PROP_LINECHARTTYPE_PERCENT
- };
-
- void lcl_AddPropertiesToVector(
-@@ -76,6 +78,19 @@ void lcl_AddPropertiesToVector(
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
-+
-+ rOutProperties.push_back(
-+ Property( C2U( "Stacked" ),
-+ PROP_LINECHARTTYPE_STACKED,
-+ ::getBooleanCppuType(),
-+ beans::PropertyAttribute::BOUND
-+ | beans::PropertyAttribute::MAYBEDEFAULT ));
-+ rOutProperties.push_back(
-+ Property( C2U( "Percent" ),
-+ PROP_LINECHARTTYPE_PERCENT,
-+ ::getBooleanCppuType(),
-+ beans::PropertyAttribute::BOUND
-+ | beans::PropertyAttribute::MAYBEDEFAULT ));
- }
-
- void lcl_AddDefaultsToMap(
-@@ -87,6 +102,9 @@ void lcl_AddDefaultsToMap(
- // todo: check whether order 3 means polygons of order 3 or 2. (see
- // http://www.people.nnov.ru/fractal/Splines/Basis.htm )
- ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_SPLINE_ORDER, 3 );
-+
-+ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_STACKED, false );
-+ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_PERCENT, false );
- }
-
- const Sequence< Property > & lcl_GetPropertySequence()
-diff --git chart2/source/model/template/LineChartTypeTemplate.cxx chart2/source/model/template/LineChartTypeTemplate.cxx
-index 34f9c09..62eb7a5 100644
---- chart2/source/model/template/LineChartTypeTemplate.cxx
-+++ chart2/source/model/template/LineChartTypeTemplate.cxx
-@@ -333,6 +333,7 @@ Reference< chart2::XChartType > LineChartTypeTemplate::getChartTypeForIndex( sal
- ASSERT_EXCEPTION( ex );
- }
-
-+ setStackModePropertiesToChartType(xResult);
- return xResult;
- }
-
-diff --git chart2/source/model/template/NetChartTypeTemplate.cxx chart2/source/model/template/NetChartTypeTemplate.cxx
-index 1e21f44..3cca17b 100644
---- chart2/source/model/template/NetChartTypeTemplate.cxx
-+++ chart2/source/model/template/NetChartTypeTemplate.cxx
-@@ -210,6 +210,7 @@ Reference< chart2::XChartType > SAL_CALL NetChartTypeTemplate::getChartTypeForNe
- {
- Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) );
- ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult );
-+ setStackModePropertiesToChartType(xResult);
- return xResult;
- }
-
-diff --git chart2/source/model/template/PieChartTypeTemplate.cxx chart2/source/model/template/PieChartTypeTemplate.cxx
-index 474f8ea..31515e3 100644
---- chart2/source/model/template/PieChartTypeTemplate.cxx
-+++ chart2/source/model/template/PieChartTypeTemplate.cxx
-@@ -471,6 +471,7 @@ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNe
- ASSERT_EXCEPTION( ex );
- }
-
-+ setStackModePropertiesToChartType(xResult);
- return xResult;
- }
-
-diff --git chart2/source/model/template/ScatterChartTypeTemplate.cxx chart2/source/model/template/ScatterChartTypeTemplate.cxx
-index 00a85f2..970720b 100644
---- chart2/source/model/template/ScatterChartTypeTemplate.cxx
-+++ chart2/source/model/template/ScatterChartTypeTemplate.cxx
-@@ -367,6 +367,7 @@ Reference< chart2::XChartType > ScatterChartTypeTemplate::getChartTypeForIndex(
- ASSERT_EXCEPTION( ex );
- }
-
-+ setStackModePropertiesToChartType(xResult);
- return xResult;
- }
-
-diff --git chart2/source/model/template/StockChartTypeTemplate.cxx chart2/source/model/template/StockChartTypeTemplate.cxx
-index 4f31960..24aba4f 100644
---- chart2/source/model/template/StockChartTypeTemplate.cxx
-+++ chart2/source/model/template/StockChartTypeTemplate.cxx
-@@ -529,6 +529,7 @@ Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSerie
- ASSERT_EXCEPTION( ex );
- }
-
-+ setStackModePropertiesToChartType(xResult);
- return xResult;
- }
-
-diff --git chart2/source/view/axes/ScaleAutomatism.cxx chart2/source/view/axes/ScaleAutomatism.cxx
-index 54d0eef..90f9832 100644
---- chart2/source/view/axes/ScaleAutomatism.cxx
-+++ chart2/source/view/axes/ScaleAutomatism.cxx
-@@ -128,7 +128,15 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
- if( bAutoMinimum )
- {
- if( m_aSourceScale.AxisType==AxisType::PERCENT )
-+ {
- rExplicitScale.Minimum = 0.0;
-+ if (!::rtl::math::isNan(m_fValueMinimum))
-+ {
-+ double fMin = m_fValueMinimum / 100.0;
-+ if (rExplicitScale.Minimum > fMin)
-+ rExplicitScale.Minimum = fMin;
-+ }
-+ }
- else if( ::rtl::math::isNan( m_fValueMinimum ) )
- rExplicitScale.Minimum = 0.0; //@todo get Minimum from scaling or from plotter????
- else
-@@ -139,7 +147,15 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
- if( bAutoMaximum )
- {
- if( m_aSourceScale.AxisType==AxisType::PERCENT )
-+ {
- rExplicitScale.Maximum = 1.0;
-+ if (!::rtl::math::isNan(m_fValueMaximum))
-+ {
-+ double fMax = m_fValueMaximum / 100.0;
-+ if (rExplicitScale.Maximum < fMax)
-+ rExplicitScale.Maximum = fMax;
-+ }
-+ }
- else if( ::rtl::math::isNan( m_fValueMaximum ) )
- rExplicitScale.Maximum = 10.0; //@todo get Maximum from scaling or from plotter????
- else
-diff --git chart2/source/view/charttypes/AreaChart.cxx chart2/source/view/charttypes/AreaChart.cxx
-index 8313188..2cc4172 100644
---- chart2/source/view/charttypes/AreaChart.cxx
-+++ chart2/source/view/charttypes/AreaChart.cxx
-@@ -601,6 +601,19 @@ struct FormerPoint
-
- void AreaChart::createShapes()
- {
-+ sal_Bool bPercent = sal_False;
-+ uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
-+ if (xPropSet.is())
-+ {
-+ try
-+ {
-+ xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
-+ }
-+ catch (const beans::UnknownPropertyException&)
-+ {
-+ }
-+ }
-+
- if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
- return;
-
-@@ -750,9 +763,30 @@ void AreaChart::createShapes()
- if( m_nDimension==3 && m_bArea && pSeriesList->size()!=1 )
- fLogicY = fabs( fLogicY );
-
-- if( pPosHelper->isPercentY() && !::rtl::math::approxEqual( aLogicYSumMap[nAttachedAxisIndex], 0.0 ) )
-+ if (bPercent)
-+ {
-+ // This data series is percent-stacked.
-+
-+ if (::rtl::math::approxEqual(aLogicYSumMap[nAttachedAxisIndex], 0.0))
-+ fLogicY = 0.0;
-+ else
-+ fLogicY = fabs( fLogicY )/aLogicYSumMap[nAttachedAxisIndex];
-+
-+ if (!pPosHelper->isPercentY())
-+ {
-+ // When the axis itself is not percent-stacked,
-+ // their internal range value is 0 - 100. So we
-+ // need to adjust the data point values
-+ // accordingly.
-+ fLogicY *= 100.0;
-+ }
-+ }
-+ else if (pPosHelper->isPercentY())
- {
-- fLogicY = fabs( fLogicY )/aLogicYSumMap[nAttachedAxisIndex];
-+ // The data series is not percent-stacked, but the
-+ // axis itself is. In this case, the axis' internal
-+ // range is 0 to 1. Adjust the data point values.
-+ fLogicY /= 100.0;
- }
-
- if( ::rtl::math::isNan(fLogicX) || ::rtl::math::isInf(fLogicX)
-diff --git chart2/source/view/charttypes/BarChart.cxx chart2/source/view/charttypes/BarChart.cxx
-index 3130609..f1846e1 100755
---- chart2/source/view/charttypes/BarChart.cxx
-+++ chart2/source/view/charttypes/BarChart.cxx
-@@ -472,6 +472,19 @@ void BarChart::adaptOverlapAndGapwidthForGroupBarsPerAxis()
-
- void BarChart::createShapes()
- {
-+ uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
-+ sal_Bool bPercent = sal_False;
-+ if (xPropSet.is())
-+ {
-+ try
-+ {
-+ xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
-+ }
-+ catch (const beans::UnknownPropertyException&)
-+ {
-+ }
-+ }
-+
- if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
- return;
-
-diff --git chart2/source/view/charttypes/VSeriesPlotter.cxx chart2/source/view/charttypes/VSeriesPlotter.cxx
-index 541255c..10c5a34 100644
---- chart2/source/view/charttypes/VSeriesPlotter.cxx
-+++ chart2/source/view/charttypes/VSeriesPlotter.cxx
-@@ -1162,6 +1162,23 @@ double VSeriesPlotter::getMaximumX()
-
- double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex )
- {
-+ sal_Bool bPercent = sal_False;
-+ uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
-+ if (xPropSet.is())
-+ {
-+ try
-+ {
-+ xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
-+ }
-+ catch (const beans::UnknownPropertyException&)
-+ {
-+ }
-+ }
-+
-+ if (bPercent)
-+ // This plotter is percent-stacked.
-+ return 0.0;
-+
- if( !m_bCategoryXAxis )
- {
- double fMinY, fMaxY;
-@@ -1196,6 +1213,23 @@ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, s
-
- double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex )
- {
-+ sal_Bool bPercent = sal_False;
-+ uno::Reference< beans::XPropertySet > xPropSet(m_xChartTypeModel, uno::UNO_QUERY);
-+ if (xPropSet.is())
-+ {
-+ try
-+ {
-+ xPropSet->getPropertyValue(C2U("Percent")) >>= bPercent;
-+ }
-+ catch (const beans::UnknownPropertyException&)
-+ {
-+ }
-+ }
-+
-+ if (bPercent)
-+ // This plotter is percent-stacked.
-+ return 100.0;
-+
- if( !m_bCategoryXAxis )
- {
- double fMinY, fMaxY;
---
-1.7.0.1
-
diff --git a/patches/dev300/cws-koheichart02-sc.diff b/patches/dev300/cws-koheichart02-sc.diff
deleted file mode 100644
index cd9b79c..0000000
--- a/patches/dev300/cws-koheichart02-sc.diff
+++ /dev/null
@@ -1,285 +0,0 @@
----
- sc/source/filter/excel/xechart.cxx | 48 ++++++++++++++++++++++-------------
- sc/source/filter/excel/xichart.cxx | 29 ++++++++++++++++++---
- sc/source/filter/inc/xechart.hxx | 7 +++--
- sc/source/filter/inc/xichart.hxx | 2 +-
- sc/source/filter/inc/xlchart.hxx | 2 +
- 5 files changed, 61 insertions(+), 27 deletions(-)
-
-diff --git sc/source/filter/excel/xechart.cxx sc/source/filter/excel/xechart.cxx
-index 4295aca..76a2cfc 100644
---- sc/source/filter/excel/xechart.cxx
-+++ sc/source/filter/excel/xechart.cxx
-@@ -156,16 +156,27 @@ void lclWriteChFrBlockRecord( XclExpStream& rStrm, const XclChFrBlock& rFrBlock,
- }
-
- template< typename Type >
--inline bool lclIsAutoAnyOrGetValue( Type& rValue, const Any& rAny )
-+inline bool lclIsAutoAnyOrGetValue( Type& rValue, const Any& rAny, bool bPercent )
- {
-- return !rAny.hasValue() || !(rAny >>= rValue);
-+ if (!rAny.hasValue())
-+ return true;
-+
-+ if (rAny >>= rValue)
-+ {
-+ if (bPercent)
-+ rValue *= 100.0;
-+ return false;
-+ }
-+ else
-+ return true;
- }
-
--bool lclIsAutoAnyOrGetScaledValue( double& rfValue, const Any& rAny, bool bLogScale )
-+bool lclIsAutoAnyOrGetScaledValue( double& rfValue, const Any& rAny, bool bLogScale, bool bPercent )
- {
-- bool bIsAuto = lclIsAutoAnyOrGetValue( rfValue, rAny );
-+ bool bIsAuto = lclIsAutoAnyOrGetValue( rfValue, rAny, bPercent );
- if( !bIsAuto && bLogScale )
- rfValue = log( rfValue ) / log( 10.0 );
-+
- return bIsAuto;
- }
-
-@@ -2550,7 +2561,7 @@ void XclExpChLabelRange::Convert( const ScaleData& rScaleData, bool bMirrorOrien
- {
- // origin
- double fOrigin = 0.0;
-- if( !lclIsAutoAnyOrGetValue( fOrigin, rScaleData.Origin ) )
-+ if( !lclIsAutoAnyOrGetValue( fOrigin, rScaleData.Origin, false ) )
- maData.mnCross = limit_cast< sal_uInt16 >( fOrigin, 1, 31999 );
-
- // reverse order
-@@ -2587,31 +2598,31 @@ XclExpChValueRange::XclExpChValueRange( const XclExpChRoot& rRoot ) :
- {
- }
-
--void XclExpChValueRange::Convert( const ScaleData& rScaleData )
-+void XclExpChValueRange::Convert( const ScaleData& rScaleData, bool bPercent )
- {
- // scaling algorithm
- bool bLogScale = ScfApiHelper::GetServiceName( rScaleData.Scaling ) == SERVICE_CHART2_LOGSCALING;
- ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_LOGSCALE, bLogScale );
-
- // min/max
-- bool bAutoMin = lclIsAutoAnyOrGetScaledValue( maData.mfMin, rScaleData.Minimum, bLogScale );
-+ bool bAutoMin = lclIsAutoAnyOrGetScaledValue( maData.mfMin, rScaleData.Minimum, bLogScale, bPercent );
- ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMIN, bAutoMin );
-- bool bAutoMax = lclIsAutoAnyOrGetScaledValue( maData.mfMax, rScaleData.Maximum, bLogScale );
-+ bool bAutoMax = lclIsAutoAnyOrGetScaledValue( maData.mfMax, rScaleData.Maximum, bLogScale, bPercent );
- ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAX, bAutoMax );
-
- // origin
-- bool bAutoCross = lclIsAutoAnyOrGetScaledValue( maData.mfCross, rScaleData.Origin, bLogScale );
-+ bool bAutoCross = lclIsAutoAnyOrGetScaledValue( maData.mfCross, rScaleData.Origin, bLogScale, bPercent );
- ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOCROSS, bAutoCross );
-
- // major increment
- const IncrementData& rIncrementData = rScaleData.IncrementData;
-- bool bAutoMajor = lclIsAutoAnyOrGetValue( maData.mfMajorStep, rIncrementData.Distance ) || (maData.mfMajorStep <= 0.0);
-+ bool bAutoMajor = lclIsAutoAnyOrGetValue( maData.mfMajorStep, rIncrementData.Distance, bPercent ) || (maData.mfMajorStep <= 0.0);
- ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAJOR, bAutoMajor );
- // minor increment
- const Sequence< SubIncrement >& rSubIncrementSeq = rIncrementData.SubIncrements;
- sal_Int32 nCount = 0;
- bool bAutoMinor = bLogScale || bAutoMajor || (rSubIncrementSeq.getLength() < 1) ||
-- lclIsAutoAnyOrGetValue( nCount, rSubIncrementSeq[ 0 ].IntervalCount ) || (nCount < 1);
-+ lclIsAutoAnyOrGetValue( nCount, rSubIncrementSeq[ 0 ].IntervalCount, false ) || (nCount < 1);
- if( !bAutoMinor )
- maData.mfMinorStep = maData.mfMajorStep / nCount;
- ::set_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMINOR, bAutoMinor );
-@@ -2786,7 +2797,7 @@ void XclExpChAxis::SetRotation( sal_uInt16 nRotation )
- mxTick->SetRotation( nRotation );
- }
-
--void XclExpChAxis::Convert( Reference< XAxis > xAxis, Reference< XAxis > xCrossingAxis, const XclChExtTypeInfo& rTypeInfo )
-+void XclExpChAxis::Convert( Reference< XAxis > xAxis, Reference< XAxis > xCrossingAxis, const XclChExtTypeInfo& rTypeInfo, bool bPercent )
- {
- ScfPropertySet aAxisProp( xAxis );
- bool bCategoryAxis = ((GetAxisType() == EXC_CHAXIS_X) && rTypeInfo.mbCategoryAxis) || (GetAxisType() == EXC_CHAXIS_Z);
-@@ -2816,7 +2827,7 @@ void XclExpChAxis::Convert( Reference< XAxis > xAxis, Reference< XAxis > xCrossi
- {
- mxValueRange.reset( new XclExpChValueRange( GetChRoot() ) );
- if( xAxis.is() )
-- mxValueRange->Convert( xAxis->getScaleData() );
-+ mxValueRange->Convert( xAxis->getScaleData(), bPercent );
- // get position of crossing axis on this axis from passed axis object
- if( aCrossingProp.Is() )
- mxValueRange->ConvertAxisPosition( aCrossingProp );
-@@ -2991,10 +3002,10 @@ sal_uInt16 XclExpChAxesSet::Convert( Reference< XDiagram > xDiagram, sal_uInt16
- // create axes according to chart type (no axes for pie and donut charts)
- if( rTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE )
- {
-- ConvertAxis( mxXAxis, EXC_CHAXIS_X, mxXAxisTitle, EXC_CHOBJLINK_XAXIS, xCoordSystem, rTypeInfo, EXC_CHART_AXIS_Y );
-- ConvertAxis( mxYAxis, EXC_CHAXIS_Y, mxYAxisTitle, EXC_CHOBJLINK_YAXIS, xCoordSystem, rTypeInfo, EXC_CHART_AXIS_X );
-+ ConvertAxis( mxXAxis, EXC_CHAXIS_X, mxXAxisTitle, EXC_CHOBJLINK_XAXIS, xCoordSystem, rTypeInfo, EXC_CHART_AXIS_Y, bPercent );
-+ ConvertAxis( mxYAxis, EXC_CHAXIS_Y, mxYAxisTitle, EXC_CHOBJLINK_YAXIS, xCoordSystem, rTypeInfo, EXC_CHART_AXIS_X, bPercent );
- if( pGroup->Is3dDeepChart() )
-- ConvertAxis( mxZAxis, EXC_CHAXIS_Z, mxZAxisTitle, EXC_CHOBJLINK_ZAXIS, xCoordSystem, rTypeInfo, EXC_CHART_AXIS_NONE );
-+ ConvertAxis( mxZAxis, EXC_CHAXIS_Z, mxZAxisTitle, EXC_CHOBJLINK_ZAXIS, xCoordSystem, rTypeInfo, EXC_CHART_AXIS_NONE, bPercent );
- }
-
- // X axis category ranges
-@@ -3102,7 +3113,8 @@ void XclExpChAxesSet::ConvertAxis(
- XclExpChAxisRef& rxChAxis, sal_uInt16 nAxisType,
- XclExpChTextRef& rxChAxisTitle, sal_uInt16 nTitleTarget,
- Reference< XCoordinateSystem > xCoordSystem, const XclChExtTypeInfo& rTypeInfo,
-- sal_Int32 nCrossingAxisDim )
-+ sal_Int32 nCrossingAxisDim,
-+ bool bPercent )
- {
- // create and convert axis object
- rxChAxis.reset( new XclExpChAxis( GetChRoot(), nAxisType ) );
-@@ -3110,7 +3122,7 @@ void XclExpChAxesSet::ConvertAxis(
- sal_Int32 nApiAxesSetIdx = GetApiAxesSetIndex();
- Reference< XAxis > xAxis = lclGetApiAxis( xCoordSystem, nApiAxisDim, nApiAxesSetIdx );
- Reference< XAxis > xCrossingAxis = lclGetApiAxis( xCoordSystem, nCrossingAxisDim, nApiAxesSetIdx );
-- rxChAxis->Convert( xAxis, xCrossingAxis, rTypeInfo );
-+ rxChAxis->Convert( xAxis, xCrossingAxis, rTypeInfo, bPercent );
-
- // create and convert axis title
- Reference< XTitled > xTitled( xAxis, UNO_QUERY );
-diff --git sc/source/filter/excel/xichart.cxx sc/source/filter/excel/xichart.cxx
-index 1eaa250..8a47c21 100755
---- sc/source/filter/excel/xichart.cxx
-+++ sc/source/filter/excel/xichart.cxx
-@@ -2244,6 +2244,15 @@ Reference< XChartType > XclImpChType::CreateChartType( Reference< XDiagram > xDi
- // additional properties
- switch( maTypeInfo.meTypeCateg )
- {
-+ case EXC_CHTYPECATEG_LINE:
-+ {
-+ ScfPropertySet aTypeProp(xChartType);
-+ bool bStacked = (maData.mnFlags & EXC_CHLINE_STACKED);
-+ bool bPercent = (maData.mnFlags & EXC_CHLINE_PERCENT);
-+ aTypeProp.SetBoolProperty(EXC_CHPROP_STACKED, bStacked);
-+ aTypeProp.SetBoolProperty(EXC_CHPROP_PERCENT, bPercent);
-+ }
-+ break;
- case EXC_CHTYPECATEG_BAR:
- {
- ScfPropertySet aTypeProp( xChartType );
-@@ -2252,6 +2261,10 @@ Reference< XChartType > XclImpChType::CreateChartType( Reference< XDiagram > xDi
- aTypeProp.SetProperty( EXC_CHPROP_OVERLAPSEQ, aInt32Seq );
- aInt32Seq[ 0 ] = aInt32Seq[ 1 ] = maData.mnGap;
- aTypeProp.SetProperty( EXC_CHPROP_GAPWIDTHSEQ, aInt32Seq );
-+ bool bStacked = (maData.mnFlags & EXC_CHBAR_STACKED);
-+ bool bPercent = (maData.mnFlags & EXC_CHBAR_PERCENT);
-+ aTypeProp.SetBoolProperty(EXC_CHPROP_STACKED, bStacked);
-+ aTypeProp.SetBoolProperty(EXC_CHPROP_PERCENT, bPercent);
- }
- break;
- case EXC_CHTYPECATEG_PIE:
-@@ -2879,7 +2892,7 @@ void XclImpChValueRange::ReadChValueRange( XclImpStream& rStrm )
- >> maData.mnFlags;
- }
-
--void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient ) const
-+void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient, bool bPercent ) const
- {
- // scaling algorithm
- bool bLogScale = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_LOGSCALE );
-@@ -2887,15 +2900,18 @@ void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient ) co
- rScaleData.Scaling.set( ScfApiHelper::CreateInstance( aScalingService ), UNO_QUERY );
-
- // min/max
-- lclSetExpValueOrClearAny( rScaleData.Minimum, maData.mfMin, bLogScale, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMIN ) );
-- lclSetExpValueOrClearAny( rScaleData.Maximum, maData.mfMax, bLogScale, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAX ) );
-+ double fMinVal = bPercent ? maData.mfMin/100.0 : maData.mfMin;
-+ double fMaxVal = bPercent ? maData.mfMax/100.0 : maData.mfMax;
-+ lclSetExpValueOrClearAny( rScaleData.Minimum, fMinVal, bLogScale, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMIN ) );
-+ lclSetExpValueOrClearAny( rScaleData.Maximum, fMaxVal, bLogScale, ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAX ) );
-
- // increment
- bool bAutoMajor = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMAJOR );
- bool bAutoMinor = ::get_flag( maData.mnFlags, EXC_CHVALUERANGE_AUTOMINOR );
- // major increment
- IncrementData& rIncrementData = rScaleData.IncrementData;
-- lclSetValueOrClearAny( rIncrementData.Distance, maData.mfMajorStep, bAutoMajor );
-+ double fMajorStep = bPercent ? maData.mfMajorStep/100.0 : maData.mfMajorStep;
-+ lclSetValueOrClearAny( rIncrementData.Distance, fMajorStep, bAutoMajor );
- // minor increment
- Sequence< SubIncrement >& rSubIncrementSeq = rIncrementData.SubIncrements;
- rSubIncrementSeq.realloc( 1 );
-@@ -3171,8 +3187,11 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup
- break;
- case cssc2::AxisType::REALNUMBER:
- case cssc2::AxisType::PERCENT:
-+ {
-+ bool bPercent = (aScaleData.AxisType == cssc2::AxisType::PERCENT);
- // #i85167# pie/donut charts have reversed rotation direction (at Y axis!)
-- mxValueRange->Convert( aScaleData, rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE );
-+ mxValueRange->Convert( aScaleData, rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE, bPercent );
-+ }
- break;
- default:
- DBG_ERRORFILE( "XclImpChAxis::CreateAxis - unknown axis type" );
-diff --git sc/source/filter/inc/xechart.hxx sc/source/filter/inc/xechart.hxx
-index 2bcdb99..4e265f0 100644
---- sc/source/filter/inc/xechart.hxx
-+++ sc/source/filter/inc/xechart.hxx
-@@ -1035,7 +1035,7 @@ public:
- explicit XclExpChValueRange( const XclExpChRoot& rRoot );
-
- /** Converts value axis scaling settings. */
-- void Convert( const ::com::sun::star::chart2::ScaleData& rScaleData );
-+ void Convert( const ::com::sun::star::chart2::ScaleData& rScaleData, bool bPercent );
- /** Converts position settings of a crossing axis at this axis. */
- void ConvertAxisPosition( const ScfPropertySet& rPropSet );
-
-@@ -1095,7 +1095,7 @@ public:
- virtual void SetRotation( sal_uInt16 nRotation );
-
- /** Converts formatting and scaling settings from the passed axis. */
-- void Convert( XAxisRef xAxis, XAxisRef xCrossingAxis, const XclChExtTypeInfo& rTypeInfo );
-+ void Convert( XAxisRef xAxis, XAxisRef xCrossingAxis, const XclChExtTypeInfo& rTypeInfo, bool bPercent );
- /** Converts and writes 3D wall/floor properties from the passed diagram. */
- void ConvertWall( XDiagramRef xDiagram );
-
-@@ -1168,7 +1168,8 @@ private:
- void ConvertAxis( XclExpChAxisRef& rxChAxis, sal_uInt16 nAxisType,
- XclExpChTextRef& rxChAxisTitle, sal_uInt16 nTitleTarget,
- XCoordSystemRef xCoordSystem, const XclChExtTypeInfo& rTypeInfo,
-- sal_Int32 nCrossingAxisDim );
-+ sal_Int32 nCrossingAxisDim,
-+ bool bPercent );
-
- virtual void WriteBody( XclExpStream& rStrm );
-
-diff --git sc/source/filter/inc/xichart.hxx sc/source/filter/inc/xichart.hxx
-index 72e5d8c..25b8f42 100644
---- sc/source/filter/inc/xichart.hxx
-+++ sc/source/filter/inc/xichart.hxx
-@@ -1157,7 +1157,7 @@ public:
- /** Reads the CHVALUERANGE record (numeric axis scaling properties). */
- void ReadChValueRange( XclImpStream& rStrm );
- /** Converts value axis scaling settings. */
-- void Convert( ScaleData& rScaleData, bool bMirrorOrient ) const;
-+ void Convert( ScaleData& rScaleData, bool bMirrorOrient, bool bPercent ) const;
- /** Converts position settings of this axis at a crossing axis. */
- void ConvertAxisPosition( ScfPropertySet& rPropSet ) const;
-
-diff --git sc/source/filter/inc/xlchart.hxx sc/source/filter/inc/xlchart.hxx
-index f039c74..f76b812 100755
---- sc/source/filter/inc/xlchart.hxx
-+++ sc/source/filter/inc/xlchart.hxx
-@@ -121,6 +121,7 @@ class XclRoot;
- #define EXC_CHPROP_OFFSET CREATE_OUSTRING( "Offset" )
- #define EXC_CHPROP_OVERLAPSEQ CREATE_OUSTRING( "OverlapSequence" )
- #define EXC_CHPROP_PERCENTAGENUMFMT CREATE_OUSTRING( "PercentageNumberFormat" )
-+#define EXC_CHPROP_PERCENT CREATE_OUSTRING( "Percent" )
- #define EXC_CHPROP_PERCENTDIAGONAL CREATE_OUSTRING( "PercentDiagonal" )
- #define EXC_CHPROP_PERSPECTIVE CREATE_OUSTRING( "Perspective" )
- #define EXC_CHPROP_POSITIVEERROR CREATE_OUSTRING( "PositiveError" )
-@@ -136,6 +137,7 @@ class XclRoot;
- #define EXC_CHPROP_SHOWHIGHLOW CREATE_OUSTRING( "ShowHighLow" )
- #define EXC_CHPROP_SHOWNEGATIVEERROR CREATE_OUSTRING( "ShowNegativeError" )
- #define EXC_CHPROP_SHOWPOSITIVEERROR CREATE_OUSTRING( "ShowPositiveError" )
-+#define EXC_CHPROP_STACKED CREATE_OUSTRING( "Stacked" )
- #define EXC_CHPROP_STACKCHARACTERS CREATE_OUSTRING( "StackCharacters" )
- #define EXC_CHPROP_STACKINGDIR CREATE_OUSTRING( "StackingDirection" )
- #define EXC_CHPROP_STARTINGANGLE CREATE_OUSTRING( "StartingAngle" )
---
-1.7.0.1
-
diff --git a/patches/dev300/cws-koheichart02-xmloff.diff b/patches/dev300/cws-koheichart02-xmloff.diff
deleted file mode 100644
index 7e4b598..0000000
--- a/patches/dev300/cws-koheichart02-xmloff.diff
+++ /dev/null
@@ -1,90 +0,0 @@
----
- xmloff/source/chart/SchXMLChartContext.cxx | 51 ++++++++++++++++++++++++++++
- 1 files changed, 51 insertions(+), 0 deletions(-)
-
-diff --git xmloff/source/chart/SchXMLChartContext.cxx xmloff/source/chart/SchXMLChartContext.cxx
-index e3d9727..729bfa3 100644
---- xmloff/source/chart/SchXMLChartContext.cxx
-+++ xmloff/source/chart/SchXMLChartContext.cxx
-@@ -67,13 +67,17 @@
- #include <com/sun/star/chart2/data/XDataSink.hpp>
- #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
- #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
-+#include <com/sun/star/chart2/XCoordinateSystem.hpp>
- #include <com/sun/star/chart2/XChartTypeContainer.hpp>
-+#include <com/sun/star/chart2/XChartType.hpp>
- #include <com/sun/star/chart2/XTitled.hpp>
-
- using namespace com::sun::star;
- using namespace ::xmloff::token;
- using ::rtl::OUString;
- using com::sun::star::uno::Reference;
-+using ::com::sun::star::uno::Sequence;
-+using ::com::sun::star::uno::UNO_QUERY;
- using namespace ::SchXMLTools;
-
- namespace
-@@ -763,6 +767,48 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
- xTemplate->changeDiagramData( xNewDia, xDataSource, aArgs );
- }
-
-+static void lcl_setStackTypeToAllChartTypes(
-+ const Reference<chart2::XDiagram>& rDiagram, const uno::Any& rStacked, const uno::Any& rPercent)
-+{
-+ Reference<chart2::XCoordinateSystemContainer> xCoordContainer(rDiagram, uno::UNO_QUERY);
-+ if (!xCoordContainer.is())
-+ return;
-+
-+ Sequence< Reference<chart2::XCoordinateSystem> > xCoords = xCoordContainer->getCoordinateSystems();
-+
-+ sal_Int32 n = xCoords.getLength();
-+ if (!n)
-+ return;
-+
-+ for (sal_Int32 i = 0; i < n; ++i)
-+ {
-+ Reference<chart2::XChartTypeContainer> xChartTypeContainer(xCoords[i], UNO_QUERY);
-+ if (!xChartTypeContainer.is())
-+ continue;
-+
-+ Sequence< Reference<chart2::XChartType> > xChartTypes = xChartTypeContainer->getChartTypes();
-+ sal_Int32 nChartTypeCount = xChartTypes.getLength();
-+ for (sal_Int32 j = 0; j < nChartTypeCount; ++j)
-+ {
-+ Reference<beans::XPropertySet> xProp(xChartTypes[j], UNO_QUERY);
-+ if (!xProp.is())
-+ continue;
-+
-+ try
-+ {
-+ if (rStacked.hasValue())
-+ xProp->setPropertyValue(OUString::createFromAscii("Stacked"), rStacked);
-+ if (rPercent.hasValue())
-+ xProp->setPropertyValue(OUString::createFromAscii("Percent"), rPercent);
-+ }
-+ catch (const beans::UnknownPropertyException&)
-+ {
-+ // fail silently.
-+ }
-+ }
-+ }
-+}
-+
- void SchXMLChartContext::EndElement()
- {
- uno::Reference< chart::XChartDocument > xDoc = mrImportHelper.GetChartDocument();
-@@ -940,6 +986,11 @@ void SchXMLChartContext::EndElement()
- , SchXMLSeriesHelper::getDataSeriesIndexMapFromDiagram(xNewDiagram) );
- }
-
-+ // For now, set the diagram's stack-related properties to all included
-+ // chart types until we support chart types of mixed stack states.
-+ lcl_setStackTypeToAllChartTypes(
-+ xNewDoc->getFirstDiagram(), maSeriesDefaultsAndStyles.maStackedDefault, maSeriesDefaultsAndStyles.maPercentDefault);
-+
- SchXMLSeries2Context::initSeriesPropertySets( maSeriesDefaultsAndStyles, uno::Reference< frame::XModel >(xDoc, uno::UNO_QUERY ) );
-
- //set defaults from diagram to the new series:
---
-1.7.0.1
-
More information about the Libreoffice-commits
mailing list