diff --git a/bnc-679938.diff b/bnc-679938.diff new file mode 100644 index 0000000..9465549 --- /dev/null +++ b/bnc-679938.diff @@ -0,0 +1,30 @@ +From 4215bca95511af8e4ee96e3c8f521b35f638aef3 Mon Sep 17 00:00:00 2001 +From: Andras Timar +Date: Fri, 21 Aug 2015 10:42:06 +0200 +Subject: export 'Chapter' field type as 'StyleRef' into .doc + +Change-Id: I7e635c76b08636a9915cee30aaebb08fc854633d +Reviewed-on: https://gerrit.libreoffice.org/17888 +Tested-by: Jenkins +Reviewed-by: Andras Timar + +diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx +index d2472d2..3da8f9e 100644 +--- a/sw/source/filter/ww8/ww8atr.cxx ++++ b/sw/source/filter/ww8/ww8atr.cxx +@@ -2879,7 +2879,11 @@ void AttributeOutputBase::TextField( const SwFormatField& rField ) + { + SwChapterField aCopy(*static_cast(pField)); + aCopy.ChangeExpansion(*pTextNd, false); +- WriteExpand( &aCopy ); ++ const OUString sStr = FieldString(ww::eSTYLEREF) ++ + " " ++ + OUString::number(aCopy.GetLevel() + 1) ++ + " \\* MERGEFORMAT "; ++ GetExport().OutputField(pField, ww::eSTYLEREF, sStr); + bWriteExpand = false; + } + } +-- +cgit v0.10.2 + diff --git a/bnc-889755.diff b/bnc-889755.diff new file mode 100644 index 0000000..84e0f1f --- /dev/null +++ b/bnc-889755.diff @@ -0,0 +1,389 @@ +From 7f309e9d9288eb6220b5b98a8737e3450d068301 Mon Sep 17 00:00:00 2001 +From: Marco Cecchetti +Date: Fri, 31 Jul 2015 22:14:41 +0200 +Subject: [PATCH] tdf#88154 workaround and unit test + +Fixed 45-degree layout for axis labels, too. + +Change-Id: I9764e281aeee0a439fa9eec1e3b0df840221b72f +Reviewed-on: https://gerrit.libreoffice.org/18889 +Reviewed-by: Jan Holesovsky +Tested-by: Jan Holesovsky +--- + chart2/qa/extras/chart2import.cxx | 31 +++++++++++ + chart2/qa/extras/data/pptx/bnc889755.pptx | Bin 0 -> 34771 bytes + .../controller/chartapiwrapper/AxisWrapper.cxx | 13 ++++- + chart2/source/model/main/Axis.cxx | 15 ++++- + chart2/source/view/axes/VAxisProperties.cxx | 7 +++ + chart2/source/view/axes/VAxisProperties.hxx | 5 ++ + chart2/source/view/axes/VCartesianAxis.cxx | 23 +++++--- + include/xmloff/xmltoken.hxx | 1 + + offapi/com/sun/star/chart2/Axis.idl | 7 +++ + oox/inc/drawingml/chart/datasourcecontext.hxx | 5 ++ + oox/source/drawingml/chart/datasourcecontext.cxx | 62 ++++++++++++++++++++- + xmloff/source/chart/PropertyMap.hxx | 1 + + xmloff/source/chart/SchXMLAxisContext.cxx | 7 +++ + xmloff/source/core/xmltoken.cxx | 1 + + 14 files changed, 165 insertions(+), 13 deletions(-) + create mode 100644 chart2/qa/extras/data/pptx/bnc889755.pptx + +diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +index ee32f16..ddf589c 100644 +--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx ++++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +@@ -102,7 +102,8 @@ enum + PROP_AXIS_OVERLAP, + PROP_AXIS_GAP_WIDTH, + PROP_AXIS_DISPLAY_UNITS, +- PROP_AXIS_BUILTINUNIT ++ PROP_AXIS_BUILTINUNIT, ++ PROP_AXIS_TRY_STAGGERING_FIRST + }; + + void lcl_AddPropertiesToVector( +@@ -356,6 +357,15 @@ void lcl_AddPropertiesToVector( + cppu::UnoType::get(), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::MAYBEDEFAULT )); ++ ++ // Compatibility option: starting from LibreOffice 5.1 the rotated ++ // layout is preferred to staggering for axis labels. ++ rOutProperties.push_back( ++ Property( "TryStaggeringFirst", ++ PROP_AXIS_TRY_STAGGERING_FIRST, ++ cppu::UnoType::get(), ++ beans::PropertyAttribute::BOUND ++ | beans::PropertyAttribute::MAYBEDEFAULT )); + } + + struct StaticAxisWrapperPropertyArray_Initializer +@@ -656,6 +666,7 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties() + aWrappedProperties.push_back( new WrappedProperty("ArrangeOrder","ArrangeOrder") ); + aWrappedProperties.push_back( new WrappedProperty("Visible","Show") ); + aWrappedProperties.push_back( new WrappedDirectStateProperty("DisplayLabels","DisplayLabels") ); ++ aWrappedProperties.push_back( new WrappedDirectStateProperty("TryStaggeringFirst","TryStaggeringFirst") ); + aWrappedProperties.push_back( new WrappedDirectStateProperty("TextBreak","TextBreak") ); + aWrappedProperties.push_back( new WrappedNumberFormatProperty(m_spChart2ModelContact) ); + aWrappedProperties.push_back( new WrappedLinkNumberFormatProperty(m_spChart2ModelContact) ); +diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx +index 7fcaaec..79855d6 100644 +--- a/chart2/source/model/main/Axis.cxx ++++ b/chart2/source/model/main/Axis.cxx +@@ -83,7 +83,9 @@ enum + PROP_AXIS_MARK_POSITION, + + PROP_AXIS_DISPLAY_UNITS, +- PROP_AXIS_BUILTINUNIT ++ PROP_AXIS_BUILTINUNIT, ++ ++ PROP_AXIS_TRY_STAGGERING_FIRST + }; + + void lcl_AddPropertiesToVector( +@@ -210,6 +212,16 @@ void lcl_AddPropertiesToVector( + cppu::UnoType::get(), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::MAYBEDEFAULT )); ++ ++ // Compatibility option: starting from LibreOffice 5.1 the rotated ++ // layout is preferred to staggering for axis labels. ++ rOutProperties.push_back( ++ Property( "TryStaggeringFirst", ++ PROP_AXIS_TRY_STAGGERING_FIRST, ++ cppu::UnoType::get(), ++ beans::PropertyAttribute::BOUND ++ | beans::PropertyAttribute::MAYBEDEFAULT )); ++ + } + + struct StaticAxisDefaults_Initializer +@@ -246,6 +258,7 @@ private: + ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AXIS_MINOR_TICKMARKS, 0 /* CHAXIS_MARK_NONE */ ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_MARK_POSITION, ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_DISPLAY_UNITS, false ); ++ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_TRY_STAGGERING_FIRST, false ); + } + }; + +diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx +index 3db365d..85721ad 100644 +--- a/chart2/source/view/axes/VAxisProperties.cxx ++++ b/chart2/source/view/axes/VAxisProperties.cxx +@@ -164,6 +164,7 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel + , m_bCrossingAxisHasReverseDirection(false) + , m_bCrossingAxisIsCategoryAxes(false) + , m_bDisplayLabels( true ) ++ , m_bTryStaggeringFirst( false ) + , m_nNumberFormatKey(0) + , m_nMajorTickmarks(1) + , m_nMinorTickmarks(1) +@@ -189,6 +190,7 @@ AxisProperties::AxisProperties( const AxisProperties& rAxisProperties ) + , m_bCrossingAxisIsCategoryAxes( rAxisProperties.m_bCrossingAxisIsCategoryAxes ) + , maLabelAlignment( rAxisProperties.maLabelAlignment ) + , m_bDisplayLabels( rAxisProperties.m_bDisplayLabels ) ++ , m_bTryStaggeringFirst( rAxisProperties.m_bTryStaggeringFirst ) + , m_nNumberFormatKey( rAxisProperties.m_nNumberFormatKey ) + , m_nMajorTickmarks( rAxisProperties.m_nMajorTickmarks ) + , m_nMinorTickmarks( rAxisProperties.m_nMinorTickmarks ) +@@ -331,6 +333,11 @@ void AxisProperties::init( bool bCartesian ) + //init display labels + xProp->getPropertyValue( "DisplayLabels" ) >>= m_bDisplayLabels; + ++ // Init layout strategy hint for axis labels. ++ // Compatibility option: starting from LibreOffice 5.1 the rotated ++ // layout is preferred to staggering for axis labels. ++ xProp->getPropertyValue( "TryStaggeringFirst" ) >>= m_bTryStaggeringFirst; ++ + //init TickmarkProperties + xProp->getPropertyValue( "MajorTickmarks" ) >>= m_nMajorTickmarks; + xProp->getPropertyValue( "MinorTickmarks" ) >>= m_nMinorTickmarks; +diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx +index 1eadf70..039bd1c 100644 +--- a/chart2/source/view/axes/VAxisProperties.hxx ++++ b/chart2/source/view/axes/VAxisProperties.hxx +@@ -118,6 +118,11 @@ struct AxisProperties SAL_FINAL + + bool m_bDisplayLabels; + ++ // Compatibility option: starting from LibreOffice 5.1 the rotated ++ // layout is preferred to staggering for axis labels. ++ // So the default value of this flag for new documents is `false`. ++ bool m_bTryStaggeringFirst; ++ + sal_Int32 m_nNumberFormatKey; + + /* +diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx +index c8ae9e0..7651fee 100644 +--- a/chart2/source/view/axes/VCartesianAxis.cxx ++++ b/chart2/source/view/axes/VCartesianAxis.cxx +@@ -826,15 +826,20 @@ bool VCartesianAxis::createTextShapes( + bool bOverlapsAfterAutoStagger = true; + if( !bIsStaggered && isAutoStaggeringOfLabelsAllowed( rAxisLabelProperties, bIsHorizontalAxis, bIsVerticalAxis ) ) + { +- bIsStaggered = true; +- rAxisLabelProperties.eStaggering = STAGGER_EVEN; +- pLastVisibleNeighbourTickInfo = pPREPreviousVisibleTickInfo; +- if( !pLastVisibleNeighbourTickInfo || +- !lcl_doesShapeOverlapWithTickmark( pLastVisibleNeighbourTickInfo->xTextShape +- , rAxisLabelProperties.fRotationAngleDegree +- , pTickInfo->aTickScreenPosition +- , bIsHorizontalAxis, bIsVerticalAxis ) ) +- bOverlapsAfterAutoStagger = false; ++ // Compatibility option: starting from LibreOffice 5.1 the rotated ++ // layout is preferred to staggering for axis labels. ++ if( m_aAxisProperties.m_bTryStaggeringFirst || !(::rtl::math::approxEqual( rAxisLabelProperties.fRotationAngleDegree, 0.0 ) ) ) ++ { ++ bIsStaggered = true; ++ rAxisLabelProperties.eStaggering = STAGGER_EVEN; ++ pLastVisibleNeighbourTickInfo = pPREPreviousVisibleTickInfo; ++ if( !pLastVisibleNeighbourTickInfo || ++ !lcl_doesShapeOverlapWithTickmark( pLastVisibleNeighbourTickInfo->xTextShape ++ , rAxisLabelProperties.fRotationAngleDegree ++ , pTickInfo->aTickScreenPosition ++ , bIsHorizontalAxis, bIsVerticalAxis ) ) ++ bOverlapsAfterAutoStagger = false; ++ } + } + + if (bOverlapsAfterAutoStagger) +diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx +index 1eea8c1..29af403 100644 +--- a/include/xmloff/xmltoken.hxx ++++ b/include/xmloff/xmltoken.hxx +@@ -1909,6 +1909,7 @@ namespace xmloff { namespace token { + XML_TRANSPOSE, + XML_TRUE, + XML_TRUNCATE_ON_OVERFLOW, ++ XML_TRY_STAGGERING_FIRST, + XML_TTB, + XML_TYPE, + XML_DOT_DASH, +diff --git a/offapi/com/sun/star/chart2/Axis.idl b/offapi/com/sun/star/chart2/Axis.idl +index c27bf8a..28f5c19 100644 +--- a/offapi/com/sun/star/chart2/Axis.idl ++++ b/offapi/com/sun/star/chart2/Axis.idl +@@ -134,6 +134,13 @@ service Axis + @since LibreOffice 4.3 + */ + [optional, property] string BuiltInUnit; ++ ++ /** Compatibility option: determines which strategy should be tried first for fixing axis labels overlapping issues ++ ++ @since LibreOffice 5.1 ++ */ ++ [optional, property] boolean TryStaggeringFirst; ++ + }; + + } ; // chart2 +diff --git a/oox/inc/drawingml/chart/datasourcecontext.hxx b/oox/inc/drawingml/chart/datasourcecontext.hxx +index 82aa38e..ef3298c 100644 +--- a/oox/inc/drawingml/chart/datasourcecontext.hxx ++++ b/oox/inc/drawingml/chart/datasourcecontext.hxx +@@ -21,6 +21,7 @@ + #define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX + + #include ++#include + + namespace oox { + namespace drawingml { +@@ -46,7 +47,11 @@ public: + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + + private: ++ SvNumberFormatter* getNumberFormatter(); ++ ++private: + sal_Int32 mnPtIndex; /// Current data point index. ++ SvNumberFormatter* mpNumberFormatter; + }; + + +diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx +index 946b5bd..10ac7c6 100644 +--- a/oox/source/drawingml/chart/datasourcecontext.cxx ++++ b/oox/source/drawingml/chart/datasourcecontext.cxx +@@ -21,6 +21,9 @@ + + #include "oox/drawingml/chart/datasourcemodel.hxx" + ++#include ++#include ++#include + #include + + namespace oox { +@@ -30,14 +33,21 @@ namespace chart { + using ::oox::core::ContextHandler2Helper; + using ::oox::core::ContextHandlerRef; + ++using namespace ::com::sun::star; ++ + DoubleSequenceContext::DoubleSequenceContext( ContextHandler2Helper& rParent, DataSequenceModel& rModel ) : + DataSequenceContextBase( rParent, rModel ), +- mnPtIndex( -1 ) ++ mnPtIndex( -1 ), ++ mpNumberFormatter( NULL ) + { + } + + DoubleSequenceContext::~DoubleSequenceContext() + { ++ if( mpNumberFormatter != NULL ) ++ { ++ delete mpNumberFormatter; ++ } + } + + ContextHandlerRef DoubleSequenceContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) +@@ -98,14 +108,62 @@ void DoubleSequenceContext::onCharacters( const OUString& rChars ) + * TODO: NumberFormat conversion, remove the check then. + */ + if( isParentElement( C_TOKEN( cat ), 4 ) ) +- mrModel.maData[ mnPtIndex ] <<= rChars; ++ { ++ // workaround for bug n#889755 ++ SvNumberFormatter* pNumFrmt = getNumberFormatter(); ++ if( pNumFrmt ) ++ { ++ sal_uInt32 nKey = pNumFrmt->GetEntryKey( mrModel.maFormatCode ); ++ bool bNoKey = ( nKey == NUMBERFORMAT_ENTRY_NOT_FOUND ); ++ if( bNoKey ) ++ { ++ OUString aFormatCode = mrModel.maFormatCode; ++ sal_Int32 nCheckPos = 0; ++ short nType; ++ pNumFrmt->PutEntry( aFormatCode, nCheckPos, nType, nKey ); ++ bNoKey = (nCheckPos != 0); ++ } ++ if( bNoKey ) ++ { ++ mrModel.maData[ mnPtIndex ] <<= rChars; ++ } ++ else ++ { ++ double fValue = rChars.toDouble(); ++ Color* pColor = NULL; ++ OUString aFormattedValue; ++ pNumFrmt->GetOutputString( fValue, nKey, aFormattedValue, &pColor ); ++ mrModel.maData[ mnPtIndex ] <<= aFormattedValue; ++ } ++ } ++ else ++ { ++ mrModel.maData[ mnPtIndex ] <<= rChars; ++ } ++ } + else ++ { + mrModel.maData[ mnPtIndex ] <<= rChars.toDouble(); ++ } + } + break; + } + } + ++ ++SvNumberFormatter* DoubleSequenceContext::getNumberFormatter() ++{ ++ if( mpNumberFormatter == NULL ) ++ { ++ uno::Reference rContext = ++ this->getFilter().getComponentContext(); ++ mpNumberFormatter = ++ new SvNumberFormatter(rContext, LANGUAGE_DONTKNOW); ++ } ++ return mpNumberFormatter; ++} ++ ++ + StringSequenceContext::StringSequenceContext( ContextHandler2Helper& rParent, DataSequenceModel& rModel ) + : DataSequenceContextBase( rParent, rModel ) + , mnPtIndex(-1) +diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx +index 0145bde..4a22c47 100644 +--- a/xmloff/source/chart/PropertyMap.hxx ++++ b/xmloff/source/chart/PropertyMap.hxx +@@ -184,6 +184,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = + MAP_ENTRY( "TextCanOverlap", CHART, XML_TEXT_OVERLAP, XML_TYPE_BOOL ), + MAP_ENTRY_ODF12( "ReverseDirection", CHART, XML_REVERSE_DIRECTION, XML_TYPE_BOOL ), + MAP_ENTRY( "TextBreak", TEXT, XML_LINE_BREAK, XML_TYPE_BOOL ), ++ MAP_ENTRY_ODF_EXT( "TryStaggeringFirst", LO_EXT, XML_TRY_STAGGERING_FIRST, XML_TYPE_BOOL ), + MAP_ENTRY( "ArrangeOrder", CHART, XML_LABEL_ARRANGEMENT, XML_SCH_TYPE_AXIS_ARRANGEMENT ), + MAP_SPECIAL( "NumberFormat", STYLE, XML_DATA_STYLE_NAME, XML_TYPE_NUMBER, XML_SCH_CONTEXT_SPECIAL_NUMBER_FORMAT ), + MAP_ENTRY( "LinkNumberFormatToSource", CHART, XML_LINK_DATA_STYLE_TO_SOURCE, XML_TYPE_BOOL ), +diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx +index 502ef08..b693355 100644 +--- a/xmloff/source/chart/SchXMLAxisContext.cxx ++++ b/xmloff/source/chart/SchXMLAxisContext.cxx +@@ -459,6 +459,13 @@ void SchXMLAxisContext::CreateAxis() + + m_xAxisProps->setPropertyValue("DisplayLabels", aFalseBool ); + ++ // Compatibility option: starting from LibreOffice 5.1 the rotated ++ // layout is preferred to staggering for axis labels. ++ // So the import default value for having compatibility with ODF ++ // documents created with erlier LibreOffice versions is `true`. ++ if( GetImport().getGeneratorVersion() != SvXMLImport::ProductVersionUnknown ) ++ m_xAxisProps->setPropertyValue("TryStaggeringFirst", aTrueBool ); ++ + // #88077# AutoOrigin 'on' is default + m_xAxisProps->setPropertyValue("AutoOrigin", aTrueBool ); + +diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx +index 63e4aff..0d4ed2d 100644 +--- a/xmloff/source/core/xmltoken.cxx ++++ b/xmloff/source/core/xmltoken.cxx +@@ -1914,6 +1914,7 @@ namespace xmloff { namespace token { + TOKEN( "transpose", XML_TRANSPOSE ), + TOKEN( "true", XML_TRUE ), + TOKEN( "truncate-on-overflow", XML_TRUNCATE_ON_OVERFLOW ), ++ TOKEN( "try-staggering-first", XML_TRY_STAGGERING_FIRST ), + TOKEN( "ttb", XML_TTB ), + TOKEN( "type", XML_TYPE ), + TOKEN( "dot-dash", XML_DOT_DASH ), +-- +2.1.4 + diff --git a/bnc-939996.diff b/bnc-939996.diff new file mode 100644 index 0000000..747550c --- /dev/null +++ b/bnc-939996.diff @@ -0,0 +1,45 @@ +From 8e911fe7e14d20ea5abe2991ed93ced62385462d Mon Sep 17 00:00:00 2001 +From: Miklos Vajna +Date: Mon, 28 Sep 2015 14:03:25 +0200 +Subject: [PATCH] bnc#939996 tdf#93919 DOCX import: fix left-from-style and + first-from-direct + +With this, as direct paragraph formatting and + as a numbering level formatting is +properly merged, i.e. w:left is not lost, defaulting to 0. + +(cherry picked from commit 56341e5d496f576dc45fe8e6c44831d780fecb73) + +Conflicts: + sw/qa/extras/ooxmlimport/ooxmlimport.cxx + +Change-Id: If5534fbd9ee6d41139b0ed3a3df9d0cc5aad3239 +Reviewed-on: https://gerrit.libreoffice.org/18906 +Reviewed-by: Andras Timar +Tested-by: Andras Timar +--- + sw/qa/extras/ooxmlimport/data/tdf93919.docx | Bin 0 -> 15336 bytes + sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 6 ++++++ + writerfilter/source/dmapper/DomainMapper.cxx | 5 +++++ + 3 files changed, 11 insertions(+) + create mode 100644 sw/qa/extras/ooxmlimport/data/tdf93919.docx + +diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx +index 8f13b5b..f7ef226 100644 +--- a/writerfilter/source/dmapper/DomainMapper.cxx ++++ b/writerfilter/source/dmapper/DomainMapper.cxx +@@ -482,6 +482,11 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) + sal_Int32 nValue = ConversionHelper::convertTwipToMM100( nIntValue ); + m_pImpl->GetTopContext()->Insert( + PROP_PARA_FIRST_LINE_INDENT, uno::makeAny( - nValue )); ++ ++ // See above, need to inherit left margin from list style when first is set. ++ sal_Int32 nParaLeftMargin = m_pImpl->getCurrentNumberingProperty("IndentAt"); ++ if (nParaLeftMargin != 0) ++ m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, uno::makeAny(nParaLeftMargin), /*bOverwrite=*/false); + } + break; + case NS_ooxml::LN_CT_Ind_firstLine: +-- +2.1.4 + diff --git a/libreoffice.changes b/libreoffice.changes index 1170734..3b6a87b 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 21 14:32:00 UTC 2015 - andras.timar@collabora.com + +- Fix bnc#939996 - LO-L3: Some bits from DOCX file are not imported + * bnc-939996.diff +- Fix bnc#889755 - LO-L3: PPTX: chart axis number format incorrect + * bnc-889755.diff +- bnc#679938 - LO-L3: saving to doc file the chapter name in the header does not change with chapters + * bnc-679938.diff + ------------------------------------------------------------------- Wed Oct 21 11:13:33 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index f8d402e..4418259 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -169,6 +169,12 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-FIX-SUSE: do not declare java6 available for without system libs build Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch +# bnc#939996 - LO-L3: Some bits from DOCX file are not imported +Patch9: bnc-939996.diff +# bnc#889755 - LO-L3: PPTX: chart axis number format incorrect +Patch10: bnc-889755.diff +# bnc#679938 - LO-L3: saving to doc file the chapter name in the header does not change with chapters +Patch11: bnc-679938.diff # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -996,6 +1002,9 @@ Provides additional %{langname} translations and resources for %{project}. \ %if !%{with systemlibs} %patch7 -p1 %endif +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20}