diff options
| author | Tünde Tóth <tundeth@gmail.com> | 2020-03-06 10:29:03 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-04-09 11:12:22 +0200 |
| commit | 40d83914d43f60a196dfabddea0b52e2046b333a (patch) | |
| tree | 86165bf504f42aba1195249c48f0a109722e23b3 /chart2/source/controller/chartapiwrapper | |
| parent | 31de39108ce19c002ab4ef6ab369dd5bfa668634 (diff) | |
tdf#127792 implement UNO chart attribute MajorOrigin
based on the specification in OFFICE-3936 for ODF 1.4:
https://issues.oasis-open.org/browse/OFFICE-3936
Note: import of the embedded chart of the DOCX unit test
document uses also ODF format in the background, testing
also the extension of the native file format.
Follow-up of commit 830e539547c463b932ce643517f880789185032d
(tdf#127393 OOXML chart import: fix X axis position setting
"CrossBetween"). See also commits with "ShiftedCategoryPosition"
in their descriptions.
Change-Id: I9cd278ac0172c0fab7c51d585a65c34a0ad60b82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90081
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2/source/controller/chartapiwrapper')
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 3516d7a29ba2..b0a1d5f85746 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -96,7 +96,8 @@ enum PROP_AXIS_GAP_WIDTH, PROP_AXIS_DISPLAY_UNITS, PROP_AXIS_BUILTINUNIT, - PROP_AXIS_TRY_STAGGERING_FIRST + PROP_AXIS_TRY_STAGGERING_FIRST, + PROP_AXIS_MAJOR_ORIGIN }; void lcl_AddPropertiesToVector( @@ -323,6 +324,12 @@ void lcl_AddPropertiesToVector( cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT ); + + rOutProperties.emplace_back( "MajorOrigin", + PROP_AXIS_MAJOR_ORIGIN, + cppu::UnoType<double>::get(), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::MAYBEVOID ); } struct StaticAxisWrapperPropertyArray_Initializer @@ -616,6 +623,7 @@ std::vector< std::unique_ptr<WrappedProperty> > AxisWrapper::createWrappedProper aWrappedProperties.emplace_back( new WrappedLinkNumberFormatProperty ); aWrappedProperties.emplace_back( new WrappedProperty("StackedText","StackCharacters") ); aWrappedProperties.emplace_back( new WrappedDirectStateProperty("CrossoverPosition","CrossoverPosition") ); + aWrappedProperties.emplace_back( new WrappedDirectStateProperty("MajorOrigin","MajorOrigin") ); { WrappedGapwidthProperty* pWrappedGapwidthProperty( new WrappedGapwidthProperty( m_spChart2ModelContact ) ); WrappedBarOverlapProperty* pWrappedBarOverlapProperty( new WrappedBarOverlapProperty( m_spChart2ModelContact ) ); |