pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 354894 from LibreOffice:Factory

Browse Source 
- Update to 5.1.0.2:
  * More small fixes here and there for the RC2 release
- Remove upstreamed patches:
  * libreoffice-graphite.patch
  * libreoffice-uno-py26.patch
  * libreoffice-kde4-filelist.patch
  * libreoffice-old-gtkapi.patch

- Reenable collada, debian and fedora both build with it so do the
  same

- Set ulimit to unlimited prior build to allow better debugging of
  build crashes

- Add patch attempting to fix build on old gtk2 versions:
  * libreoffice-old-gtkapi.patch

- Add patch to fix filelist generating after kde3 removal:
  * libreoffice-kde4-filelist.patch

- Add patch to fix graphite2 bundled build on SLE11:
  * libreoffice-graphite.patch
- Add patch to fix build of pyuno with python2.6:
  * libreoffice-uno-py26.patch

- Version update to 5.1.0.1:
  * Update few bundled libs for SLE11
- Drop support for gvfs2
- Drop kde/kdeab switches
- Drop lockdown enabler

OBS-URL: https://build.opensuse.org/request/show/354894
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=103
This commit is contained in:
Dominique Leuenberger 2016-01-23 00:14:51 +00:00 committed by Git OBS Bridge
commit 504db3f1ee
38 changed files with 142 additions and 798 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c3dd456762cd0b5fd1687f066c4bdf253d70b14729851b9cd05936a1cb46923b
size 651785

3
3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f1083eb034efbc3b2017ef052d58f3e9bd70963ec2acd26b3d59231ee1633d4
size 925313

3
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
size 555291

3
594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43c6229d787673ac1d35ebaad52dfdcc78c8b55d13ee78d8e4d7e4a6cb72b050
size 860275

3
5c0c9ac0996fbb4a0e17780ff5441959-graphite2-minimal-1.3.4.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a574d0a7871463fdfc5f9e459b80ad054a8796a9ffd5cee4c1829f8c8e144d9
size 156569

3
7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7773a8f5f0b810e0f146dbcf3dbb42e89dd8af0868235e01d9f0cdefde41a8a9
size 1665988

3
Firebird-2.5.2.26540-0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bbb9a408198898818d5be3c301dde0f8524fd8e2f509662121d7393e02520721
size 13805637

3
Firebird-2.5.4.26856-0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e775dcf218640d3af507a816aef0060f52a295b9ee5f66ec66f0b0564da18d3
size 13744859

3
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:08e2f64bfe3f750be7391eb0af53967e164b628c59f02be4d83789eb4f036eaa
size 672452

30
bnc-679938.diff
View File

@ -1,30 +0,0 @@
From 4215bca95511af8e4ee96e3c8f521b35f638aef3 Mon Sep 17 00:00:00 2001
From: Andras Timar <andras.timar@collabora.com>
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 <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
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<const SwChapterField*>(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

389
bnc-889755.diff
View File

@ -1,389 +0,0 @@
From 7f309e9d9288eb6220b5b98a8737e3450d068301 Mon Sep 17 00:00:00 2001
From: Marco Cecchetti <marco.cecchetti@collabora.com>
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 <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
---
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<OUString>::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<bool>::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<OUString>::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<bool>::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 <drawingml/chart/chartcontextbase.hxx>
+#include <svl/zforlist.hxx>
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 <comphelper/processfactory.hxx>
+#include <oox/core/xmlfilterbase.hxx>
+#include <svl/zforlist.hxx>
#include <osl/diagnose.h>
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<uno::XComponentContext> 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

104
bnc-945047.diff
View File

@ -1,104 +0,0 @@
From 0b6c9ddce0478bbedc36e8531f31b154bbce661c Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Thu, 3 Dec 2015 19:05:03 +1000
Subject: [PATCH] tdf#96206: Avoid scaling objects while copying to clipboard
... to prevent duplicating masters on slide copy-paste.
Also fixed a 10-year copy-paste error (pRefPage wasn't replaced
with pNPage).
Fixed argument evaluation order issue (aStream.GetEndOfData()
depends on Flush() but doesn't call it, so will return incorrect
result if called before aStream.GetBuffer()).
Replaced compare of hashes with results of stringify(),
because it removes useless overhead (hashes are calculated from
stringify() anyway, and are not cached anywhere).
Removed Flush() called from SvMemoryStream::GetBuffer(), because
it calls GetData(), which calls Flush() itself.
Change-Id: Ia46d4e9a017fc628d424949a9d229045a249a4ca
---
sd/source/core/drawdoc3.cxx | 22 ++++++++++++++++------
svx/source/svdraw/svdobj.cxx | 1 +
tools/source/stream/stream.cxx | 1 -
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 3f966e8..cb15650 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -51,6 +51,7 @@
#include "strmname.h"
#include "anminfo.hxx"
#include "customshowlist.hxx"
+#include "sdxfer.hxx"
#include "../ui/inc/unmovss.hxx"
#include "../ui/inc/unchss.hxx"
@@ -110,7 +111,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc
{
// Ignore Layouts with "Default" these seem to be special - in the sense that there are lot of assumption all over Impress
// about this
- if( bRenameDuplicates && aTest != OUString( SdResId( STR_LAYOUT_DEFAULT_NAME ) ) && pTestPage->getHash() != pBMMPage->getHash() )
+ if( bRenameDuplicates && aTest != OUString( SdResId( STR_LAYOUT_DEFAULT_NAME ) ) && pTestPage->stringify() != pBMMPage->stringify() )
{
pBookmarkDoc->RenameLayoutTemplate( pBMMPage->GetLayoutName(), OUString(pBMMPage->GetName())+=OUString("_") );
aLayout = pBMMPage->GetName();
@@ -438,17 +439,26 @@ bool SdDrawDocument::InsertBookmarkAsPage(
sal_Int32 nNRight = pNPage->GetRgtBorder();
sal_Int32 nNUpper = pNPage->GetUppBorder();
sal_Int32 nNLower = pNPage->GetLwrBorder();
- Orientation eNOrient = pRefPage->GetOrientation();
+ Orientation eNOrient = pNPage->GetOrientation();
// Adapt page size and margins to those of the later pages?
pRefPage = GetSdPage(nSdPageCount - 1, PK_STANDARD);
if( bNoDialogs )
{
- if( rBookmarkList.empty() )
- bScaleObjects = pRefPage->IsScaleObjects();
- else
- bScaleObjects = true;
+ // If this is clipboard, then no need to scale objects:
+ // this will make copied masters to differ from the originals,
+ // and thus InsertBookmarkAsPage_FindDuplicateLayouts will
+ // duplicate masters on insert to same document
+ bool bIsClipBoard = (SD_MOD()->pTransferClip &&
+ SD_MOD()->pTransferClip->GetWorkDocument() == this);
+ if (!bIsClipBoard)
+ {
+ if (rBookmarkList.empty())
+ bScaleObjects = pRefPage->IsScaleObjects();
+ else
+ bScaleObjects = true;
+ }
}
else
{
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index b6d3827..b712850 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1776,6 +1776,7 @@ OString SdrObject::stringify() const
SfxItemSet aSet(GetMergedItemSet());
aSet.InvalidateDefaultItems();
aSet.Store(aStream, true);
+ aStream.Flush(); // for correct results from aStream.GetEndOfData()
aString.append(static_cast<const char *>(aStream.GetBuffer()), aStream.GetEndOfData());
return aString.makeStringAndClear();
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index bb6d21e..17bdcd1 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1723,7 +1723,6 @@ SvMemoryStream::~SvMemoryStream()
const void* SvMemoryStream::GetBuffer()
{
- Flush();
return GetData();
}
--
2.1.4

156
bnc-954345.diff
View File

@ -1,156 +0,0 @@
From 611be3d78d45c46c942b88e1149dfc428070fc71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?=
<laszlo.nemeth@collabora.com>
Date: Fri, 27 Nov 2015 21:59:30 +0100
Subject: [PATCH] tdf#95614 fix freezing with linked graphic
When an unloaded linked picture comes into the visible view
(including repainting a page), SwNoTextFrm::PaintPicture()
starts a thread to load it in the background using the
TriggerAsyncRetrieveInputStream() method of the graphic node.
To avoid to start a second thread on the same graphic node,
TriggerAsyncRetrieveInputStream() checks mpThreadConsumer,
the graphic node member variable for the possible thread object.
The problem is that when the thread finished and
SwGrfNode::UpdateLinkWithInputStream() reset mpThreadConsumer,
the graphic object of the graphic node is still in unloaded
state (its type is GRAPHIC_DEFAULT or GRAPHIC_NONE instead of
GRAPHIC_BITMAP or GRAPHIC_GDIMETAFILE) for a while, because
its modification is solved asynchronously after several
SvFileObject::GetData() calls. In the intermediate state
of the graphic object, with the high priority repaints of
the new scheduler, PaintPicture() could start new thread
to load the image again.
Using the new member variable SwGrfNode::mbUpdateLinkInProgress,
this patch will prevent the graphic node to start newer thread
unnecessarily.
Change-Id: I9433f0fa4613294103a00a3955fc2f35d8863b59
---
sw/inc/ndgrf.hxx | 3 +++
sw/source/core/doc/notxtfrm.cxx | 15 ++++++++++-----
sw/source/core/graphic/ndgrf.cxx | 7 +++++--
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 668c5f5..e7b2261 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -51,6 +51,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
bool mbLinkedInputStreamReady;
+ bool mbUpdateLinkInProgress;
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream;
bool mbIsStreamReadOnly;
@@ -198,6 +199,8 @@ public:
boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;}
bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;}
+ bool IsUpdateLinkInProgress() const { return mbUpdateLinkInProgress;}
+ void SetUpdateLinkInProgress(bool b) { mbUpdateLinkInProgress = b; }
void TriggerAsyncRetrieveInputStream();
void ApplyInputStream(
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 02a815b..d943e6d 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -897,10 +897,11 @@ void SwNoTextFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfArea
{
Size aTmpSz;
::sfx2::SvLinkSource* pGrfObj = pGrfNd->GetLink()->GetObj();
- if( !pGrfObj ||
- !pGrfObj->IsDataComplete() ||
- !(aTmpSz = pGrfNd->GetTwipSize()).Width() ||
- !aTmpSz.Height() || !pGrfNd->GetAutoFormatLvl() )
+ if ( ( !pGrfObj ||
+ !pGrfObj->IsDataComplete() ||
+ !(aTmpSz = pGrfNd->GetTwipSize()).Width() ||
+ !aTmpSz.Height() || !pGrfNd->GetAutoFormatLvl() ) &&
+ !pGrfNd->IsUpdateLinkInProgress() )
{
pGrfNd->TriggerAsyncRetrieveInputStream(); // #i73788#
}
@@ -909,9 +910,13 @@ void SwNoTextFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfArea
GetRealURL( *pGrfNd, aText );
::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, false );
bContinue = false;
+ } else if ( rGrfObj.GetType() != GRAPHIC_DEFAULT &&
+ rGrfObj.GetType() != GRAPHIC_NONE &&
+ pGrfNd->IsUpdateLinkInProgress() )
+ {
+ pGrfNd->SetUpdateLinkInProgress( false );
}
}
-
if( bContinue )
{
if( rGrfObj.GetGraphic().IsSupportedGraphic())
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 5c2867e..dbbe379 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -71,6 +71,7 @@ SwGrfNode::SwGrfNode(
mpReplacementGraphic(0),
// #i73788#
mbLinkedInputStreamReady( false ),
+ mbUpdateLinkInProgress( false ),
mbIsStreamReadOnly( false )
{
maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) );
@@ -89,6 +90,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
mpReplacementGraphic(0),
// #i73788#
mbLinkedInputStreamReady( false ),
+ mbUpdateLinkInProgress( false ),
mbIsStreamReadOnly( false )
{
maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) );
@@ -112,6 +114,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
mpReplacementGraphic(0),
// #i73788#
mbLinkedInputStreamReady( false ),
+ mbUpdateLinkInProgress( false ),
mbIsStreamReadOnly( false )
{
maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) );
@@ -521,7 +524,6 @@ bool SwGrfNode::SwapIn( bool bWaitForData )
bool bRet = false;
bInSwapIn = true;
SwBaseLink* pLink = static_cast<SwBaseLink*>((::sfx2::SvBaseLink*) refLink);
-
if( pLink )
{
if( GRAPHIC_NONE == maGrfObj.GetType() ||
@@ -1089,7 +1091,6 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream()
OSL_FAIL( "<SwGrfNode::TriggerAsyncLoad()> - Method is misused. Method call is only valid for graphic nodes, which refer a linked graphic file" );
return;
}
-
if ( mpThreadConsumer.get() == 0 )
{
mpThreadConsumer.reset( new SwAsyncRetrieveInputStreamThreadConsumer( *this ) );
@@ -1104,6 +1105,7 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream()
}
mpThreadConsumer->CreateThread( sGrfNm, sReferer );
}
+
}
@@ -1137,6 +1139,7 @@ void SwGrfNode::UpdateLinkWithInputStream()
// #i88291#
mxInputStream.clear();
GetLink()->clearStreamToLoadFrom();
+ mbUpdateLinkInProgress = true;
mbLinkedInputStreamReady = false;
mpThreadConsumer.reset();
}
--
2.1.4

3
boost_1_59_0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca
size 70389425

3
c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816
size 25721871

3
d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52
size 58146647

3
e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3
size 25485678

3
graphite2-1.2.4.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4bc3d5168029bcc0aa00eb2c973269d29407be2796ff56f9c80e10736bd8b003
size 6938866

3
libetonyek-0.1.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9963d8a2b0125390fa259fe872ab707a6642817d2aa1e667e9f97a1ba3510d1f
size 460867

3
libetonyek-0.1.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b0b28dd5965c15776be879553d442eb8922d35c20cd3239140b352c0ad80b0b
size 1580354

3
libmwaw-0.3.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fe71b7f120aca311a977569f51ffb258e824616db6afbb29ea0072398fc4c9b4
size 1304580

3
libmwaw-0.3.7.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a66b3e45a5ba5dd89849a766e128585cac8aaf9e9c6f037040200e5bf31f1427
size 1390872

3
libodfgen-0.1.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f74999d2c93ac0cc077a0a9c36340daff29dc772992160ae81dd010345f72b80
size 435590

3
libodfgen-0.1.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9caa824bf60fea84fb7cad26ebbffe585b1349fe4d0ddbafcd8b3aee47c26ebd
size 437050

3
liborcus-0.9.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:adcf90f6cb1e6546ef1ea11277db39cb875786ea4b283e37f5e37c8c09b4952b
size 1936620

3
libreoffice-5.0.4.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:647440b70fc190a43a3373cfe5b06a87558ee07711e3d74cab8fb9d8cbac6dc8
size 167305516

3
libreoffice-5.1.0.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f9ad7194eeea9bc6079816c622d36250348bb9c9e304b96adbecb1503d68fb0
size 175725812

3
libreoffice-help-5.0.4.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d3c20037a8c2abc04aa3d5991a956538a8dad6669ce0ee0de56d78ebce5b200
size 1882964

3
libreoffice-help-5.1.0.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8acecf7ba99890cbf6aa470beedeaf248daaa1e12e4be770b4b3c20a47987e89
size 1904348

3
libreoffice-translations-5.0.4.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0adeb2b7ccc4ffb2fb58b036029c161f8971b03610c383cc120be2a712d1b9cd
size 130096064

3
libreoffice-translations-5.1.0.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:83d8f4339edb21781fecd3aba28a470c06ece3da9466fa24e21d374fb7db523f
size 131463556

66
libreoffice.changes
View File

@ -1,13 +1,77 @@
-------------------------------------------------------------------
Sun Jan 17 08:04:26 UTC 2016 - tchvatal@suse.com
- Update to 5.1.0.2:
* More small fixes here and there for the RC2 release
- Remove upstreamed patches:
* libreoffice-graphite.patch
* libreoffice-uno-py26.patch
* libreoffice-kde4-filelist.patch
* libreoffice-old-gtkapi.patch
-------------------------------------------------------------------
Wed Jan 13 01:55:23 UTC 2016 - tchvatal@suse.com
- Reenable collada, debian and fedora both build with it so do the
same
-------------------------------------------------------------------
Wed Jan 13 01:52:54 UTC 2016 - tchvatal@suse.com
- Set ulimit to unlimited prior build to allow better debugging of
build crashes
-------------------------------------------------------------------
Sun Jan 3 15:00:06 UTC 2016 - tchvatal@suse.com
- Add patch attempting to fix build on old gtk2 versions:
* libreoffice-old-gtkapi.patch
-------------------------------------------------------------------
Mon Dec 28 16:25:19 UTC 2015 - tchvatal@suse.com
- Add patch to fix filelist generating after kde3 removal:
* libreoffice-kde4-filelist.patch
-------------------------------------------------------------------
Tue Dec 22 14:43:52 UTC 2015 - tchvatal@suse.com
- Add patch to fix graphite2 bundled build on SLE11:
* libreoffice-graphite.patch
- Add patch to fix build of pyuno with python2.6:
* libreoffice-uno-py26.patch
-------------------------------------------------------------------
Mon Dec 21 11:48:07 UTC 2015 - andras.timar@collabora.com
- bnc#951579 - LO-L3: [LibreOffice] Calc 5.0 fails to open ods files
* deleted RPATH prevented loading of bundled 3rd party RDF handler libs
-------------------------------------------------------------------
Mon Dec 21 10:36:40 UTC 2015 - tchvatal@suse.com
- Version update to 5.1.0.1:
* Update few bundled libs for SLE11
- Drop support for gvfs2
- Drop kde/kdeab switches
- Drop lockdown enabler
-------------------------------------------------------------------
Thu Dec 17 09:45:29 UTC 2015 - tchvatal@suse.com
- Version update to 5.1.0.0.beta2:
* testing the changes for 5.1 series
- Remove upstreamed patches:
* bnc-679938.diff
* bnc-889755.diff
* bnc-945047.diff
* bnc-954345.diff
* use-long-for-test-comparsion.patch
-------------------------------------------------------------------
Tue Dec 15 11:47:08 UTC 2015 - tchvatal@suse.com
- Version update to 5.0.4.2:
- Version update to 5.0.4.2 bnc#959716:
* Final of the 5.0.4 series
-------------------------------------------------------------------

73
libreoffice.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libreoffice
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@
%define numbertext_version 0.9.5
# Urls
%define external_url http://dev-www.libreoffice.org/src/
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.0.4
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.1.0
# Old Make and bundle or not
%if 0%{?suse_version} > 1230
%bcond_with oldmake
@ -64,7 +64,7 @@ Requires: python-importlib
%endif
# This is used due to the need for beta releases
Name: libreoffice
Version: 5.0.4.2
Version: 5.1.0.2
Release: 0
Summary: A Free Office Suite (Framework)
License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C
@ -83,6 +83,8 @@ Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{nu
# used extensions sources
Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
# This never had an release so just bundle it as per what other distros do
Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
# Internal bundled stuff we can't remove
# XMLSec is patched over and over in here
Source2000: %{external_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
@ -99,38 +101,38 @@ Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
Source2006: %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
Source2007: %{external_url}/librevenge-0.0.2.tar.bz2
Source2008: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
Source2009: %{external_url}/libetonyek-0.1.3.tar.bz2
Source2009: %{external_url}/libetonyek-0.1.5.tar.bz2
Source2010: %{external_url}/libe-book-0.1.2.tar.bz2
Source2011: %{external_url}/libfreehand-0.1.1.tar.bz2
Source2012: %{external_url}/libodfgen-0.1.4.tar.bz2
Source2012: %{external_url}/libodfgen-0.1.5.tar.bz2
Source2013: %{external_url}/libcdr-0.1.1.tar.bz2
Source2014: %{external_url}/libmspub-0.1.2.tar.bz2
Source2015: %{external_url}/libmwaw-0.3.5.tar.bz2
Source2015: %{external_url}/libmwaw-0.3.7.tar.bz2
Source2016: %{external_url}/libpagemaker-0.0.2.tar.bz2
Source2017: %{external_url}/libvisio-0.1.1.tar.bz2
Source2017: %{external_url}/libvisio-0.1.3.tar.bz2
Source2018: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
Source2019: %{external_url}/libwpd-0.10.0.tar.bz2
Source2020: %{external_url}/libwpg-0.3.0.tar.bz2
Source2021: %{external_url}/libwps-0.4.0.tar.bz2
Source2021: %{external_url}/libwps-0.4.2.tar.bz2
Source2022: %{external_url}/libabw-0.1.1.tar.bz2
Source2023: %{external_url}/lcms2-2.6.tar.gz
Source2024: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
Source2025: %{external_url}/mdds_0.12.1.tar.bz2
Source2026: %{external_url}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
Source2027: %{external_url}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
Source2028: %{external_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
Source2029: %{external_url}/594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip
Source2028: %{external_url}/boost_1_59_0.tar.bz2
Source2029: %{external_url}/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip
Source2030: %{external_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
Source2031: %{external_url}/e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz
Source2032: %{external_url}/graphite2-1.2.4.tgz
Source2033: %{external_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
Source2031: %{external_url}/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz
Source2032: %{external_url}/5c0c9ac0996fbb4a0e17780ff5441959-graphite2-minimal-1.3.4.tgz
Source2033: %{external_url}/liborcus-0.9.2.tar.gz
Source2034: %{external_url}/harfbuzz-0.9.40.tar.bz2
Source2035: %{external_url}/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
Source2036: %{external_url}/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
Source2037: %{external_url}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
Source2038: %{external_url}/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip
Source2039: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
Source2040: %{external_url}/Firebird-2.5.2.26540-0.tar.bz2
Source2040: %{external_url}/Firebird-2.5.4.26856-0.tar.bz2
Source2041: %{external_url}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
Source2042: %{external_url}/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
Source2043: %{external_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
@ -148,7 +150,7 @@ Source2054: %{external_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1
Source2055: %{external_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
Source2056: %{external_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
Source2057: %{external_url}/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
Source2058: %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
Source2058: %{external_url}/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
Source2059: %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
Source2060: %{external_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
Source2061: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
@ -169,16 +171,6 @@ 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#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
# PATCH-FIX-UPSTREAM: taken from Master to fix flaky test
Patch12: use-long-for-test-comparsion.patch
# bnc#954345 - LO-L3: Insert-->Image-->Insert as Link hangs writer
Patch13: bnc-954345.diff
# bnc#945047 - LO-L3: LO is duplicating master pages
Patch14: bnc-945047.diff
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -201,7 +193,6 @@ BuildRequires: flex
BuildRequires: gcc-c++
# Only for backtracking to see failing tests, pain to rebuild otherwise
BuildRequires: gdb
BuildRequires: gnome-vfs2-devel
BuildRequires: gperf
BuildRequires: gtk2-devel
BuildRequires: hunspell-devel
@ -286,7 +277,7 @@ BuildRequires: libbase
BuildRequires: libcdr-devel >= 0.1
BuildRequires: libcmis-devel >= 0.5.0
BuildRequires: libe-book-devel >= 0.1.1
BuildRequires: libetonyek-devel >= 0.1.2
BuildRequires: libetonyek-devel >= 0.1.4
BuildRequires: libexif
BuildRequires: libexttextcat-devel >= 3.1.1
BuildRequires: libfbembed-devel
@ -303,7 +294,7 @@ BuildRequires: libmwaw-devel >= 0.3.5
BuildRequires: libmysqlclient-devel
BuildRequires: libmysqlcppconn-devel >= 1.0.6
BuildRequires: libodfgen-devel >= 0.1.4
BuildRequires: liborcus-devel >= 0.7.0
BuildRequires: liborcus-devel >= 0.9.1
BuildRequires: libpagemaker-devel
BuildRequires: libredland-devel
BuildRequires: librepository
@ -313,12 +304,13 @@ BuildRequires: libserializer
BuildRequires: libvisio-devel >= 0.1
BuildRequires: libwpd-devel >= 0.10
BuildRequires: libwpg-devel
BuildRequires: libwps-devel >= 0.4.0
BuildRequires: libwps-devel >= 0.4.2
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: lpsolve-devel
BuildRequires: mdds-devel >= 0.12.0
BuildRequires: npapi-sdk
BuildRequires: openCOLLADA-devel
BuildRequires: pentaho-libxml
BuildRequires: pentaho-reporting-flow-engine
BuildRequires: postgresql-devel
@ -1006,11 +998,6 @@ Provides additional %{langname} translations and resources for %{project}. \
%if !%{with systemlibs}
%patch7 -p1
%endif
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch990 -p1
# 256x256 icons
tar -xjf %{SOURCE20}
@ -1117,7 +1104,6 @@ export NOCONFIGURE=yes
--with-system-hunspell \
--with-system-mythes \
--with-system-bluez \
--with-system-mesa-headers \
--with-system-openldap \
--with-system-odbc \
--with-system-nss \
@ -1134,9 +1120,6 @@ export NOCONFIGURE=yes
--disable-fetch-external \
--with-external-tar="$RPM_SOURCE_DIR" \
--disable-epm \
--disable-gnome-vfs \
--disable-kdeab \
--disable-kde \
--disable-online-update \
--disable-systray \
%if %{with newmedia}
@ -1145,6 +1128,7 @@ export NOCONFIGURE=yes
--enable-gtk3 \
--with-doxygen \
--enable-gltf \
--enable-collada --with-system-opencollada \
%else
--enable-gstreamer-0-10 \
--disable-gstreamer-1-0 \
@ -1173,7 +1157,6 @@ export NOCONFIGURE=yes
--enable-odk \
--enable-kde4 \
--enable-evolution2 \
--enable-lockdown \
--enable-dbus \
--enable-hardlink-deliver \
--enable-ext-ct2n \
@ -1187,13 +1170,14 @@ export NOCONFIGURE=yes
--enable-neon \
--disable-ccache \
--disable-coinmp \
--disable-collada \
--enable-symbols
# no coinormp packages for coinmp
# hack to correctly bootstrap python stuff with system python, (deb#501028, i#90701)
sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py
# Allow deep backtracking if the build crashes
ulimit -c unlimited
# just call make here as we added the jobs in configure
# The check phase is run here too if it is split with nocheck
# install of jars get broken sometimes
@ -1341,10 +1325,6 @@ for appdata in base calc draw impress writer; do
done
%endif
# Merge kde and kde4 filelists as we do not bother with compat anymore
# Not worth fixing unless really cleaning up the install completely
cat file-lists/kde_list.txt >> file-lists/kde4_list.txt
# Remove pointless readmes
rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
@ -1555,21 +1535,26 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null |
%files -f file-lists/base_list.txt base
%defattr(-,root,root)
%{_datadir}/appdata/libreoffice-base.appdata.xml
%files -f file-lists/calc_list.txt calc
%defattr(-,root,root)
%{_datadir}/appdata/libreoffice-calc.appdata.xml
%files -f file-lists/draw_list.txt draw
%defattr(-,root,root)
%{_datadir}/appdata/libreoffice-draw.appdata.xml
%files -f file-lists/math_list.txt math
%defattr(-,root,root)
%files -f file-lists/impress_list.txt impress
%defattr(-,root,root)
%{_datadir}/appdata/libreoffice-impress.appdata.xml
%files -f file-lists/writer_list.txt writer
%defattr(-,root,root)
%{_datadir}/appdata/libreoffice-writer.appdata.xml
%files -f file-lists/postgresql_list.txt base-drivers-postgresql
%defattr(-,root,root)

3
libvisio-0.1.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be166f55208de20362cccab111deb371e2a81b17fb0a0aa93682e248759fca8d
size 515702

3
libvisio-0.1.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ef38410a6f0c4b0c04d600ee7bbd9581f62fc6635961344d56ae27c3b6f8fae
size 595228

3
libwps-0.4.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b60d574aefe6a2e446500edb8802f9bc7885fa261e2e47ee3042432a02bb2d35
size 564733

3
libwps-0.4.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:254b8aeb36a3b58eabf682b04a5a6cf9b01267e762c7dc57d4533b95f30dc587
size 708847

29
use-long-for-test-comparsion.patch
View File

@ -1,29 +0,0 @@
From 494aa9ee5d01699c0dcbc912091de30a314c09fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Fri, 18 Sep 2015 12:57:39 +0200
Subject: Workaround unit test failure by comparing as long
On 32bit system, for some reason casting to double gives wrong results.
Failing unit test was testTdf87924 in CppunitTest_sw_ooxmlimport.
Change-Id: If93e5288a381e50f30d035d56131b1d9235ac658
Reviewed-on: https://gerrit.libreoffice.org/18684
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 657071b..0cf558c 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -100,7 +100,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
// If the text is not rotated the way the shape wants it already, set the angle.
const sal_Int32 nRotation = -270;
- if (basegfx::rad2deg(fRotate) != static_cast<double>(NormAngle360(nRotation * 100)) / 100)
+ if (static_cast<long>(basegfx::rad2deg(fRotate)) != NormAngle360(nRotation * 100) / 100)
{
comphelper::SequenceAsHashMap aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
aCustomShapeGeometry["TextPreRotateAngle"] = uno::makeAny(nRotation);
--
cgit v0.10.2