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

Accepting request 341426 from LibreOffice:Factory

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/341426
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=98
This commit is contained in:
Dominique Leuenberger 2015-10-30 15:35:19 +00:00 committed by Git OBS Bridge
commit c9a3f5581f
15 changed files with 629 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt Normal file
View File

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

3
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
View File

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

2
_constraints
View File

@ -1,7 +1,7 @@
<constraints>
<hardware>
<physicalmemory>
<size unit="M">4000</size>
<size unit="M">6000</size>
</physicalmemory>
<disk>
<size unit="G">30</size>

30
bnc-679938.diff Normal file
View File

@ -0,0 +1,30 @@
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 Normal file
View File

@ -0,0 +1,389 @@
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

17
disable-flaky-hsqldb-test.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 200dea0..1f10c00 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -49,12 +49,6 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
CppunitTest_dbaccess_RowSetClones) \
))
-ifeq ($(ENABLE_JAVA),TRUE)
-$(eval $(call gb_Module_add_check_targets,dbaccess,\
- CppunitTest_dbaccess_hsqldb_test \
-))
-endif
-
# This runs a suite of peformance tests on embedded firebird and HSQLDB.
# Instructions on running the test can be found in qa/unit/embeddedb_performancetest
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)

3
libreoffice-5.0.1.2.tar.xz
View File

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

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

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

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

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

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

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

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

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

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

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

90
libreoffice.changes
View File

@ -1,3 +1,93 @@
-------------------------------------------------------------------
Thu Oct 22 08:11:48 UTC 2015 - tchvatal@suse.com
- Add patch to fix flaky test:
* use-long-for-test-comparsion.patch
-------------------------------------------------------------------
Wed Oct 21 16:58:28 UTC 2015 - tchvatal@suse.com
- Remove upstream merged:
* bnc-939996.diff
-------------------------------------------------------------------
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
- Add patch to disable flaky hsqldb test:
* disable-flaky-hsqldb-test.patch
-------------------------------------------------------------------
Fri Oct 16 08:04:32 UTC 2015 - tchvatal@suse.com
- Version update to 5.0.3RC1 as it should fix i586 test failure
- Drop upstreamed patch:
* kde4filepicker.patch
- Update text2number extension to 1.5.0
-------------------------------------------------------------------
Fri Oct 16 07:26:33 UTC 2015 - meissner@suse.com
- obsolete libreoffice-mono
- pentaho-flow-reporting require is conditional on system_libs
-------------------------------------------------------------------
Mon Oct 5 11:14:07 UTC 2015 - tchvatal@suse.com
- Update icon theme dependencies
* https://lists.debian.org/debian-openoffice/2015/09/msg00343.html
-------------------------------------------------------------------
Mon Sep 21 08:55:05 UTC 2015 - tchvatal@suse.com
- Version bump to 5.0.2 final fate#318856 fate#319071 bnc#943075
bnc#945692:
* Small tweaks compared to rc1
- For sake of completion this release also contains security fixes
for bnc#910806 CVE-2014-8147, bnc#907636 CVE-2014-9093
-------------------------------------------------------------------
Thu Sep 17 13:27:07 UTC 2015 - tchvatal@suse.com
- Use gcc48 to build on sle11sp4
-------------------------------------------------------------------
Thu Sep 17 12:05:26 UTC 2015 - tchvatal@suse.com
- Make debuginfo's smaller on IBS.
-------------------------------------------------------------------
Thu Sep 17 08:20:21 UTC 2015 - tchvatal@suse.com
- Fix chrpath call after the libs got -lo suffixing
-------------------------------------------------------------------
Tue Sep 15 09:47:21 UTC 2015 - tchvatal@suse.com
- Add patch to fix qt4 features detection:
* kde4filepicker.patch
-------------------------------------------------------------------
Fri Sep 11 11:56:03 UTC 2015 - tchvatal@suse.com
- Split out gtk3 UI to separate subpkg that requires gnome subpkg
* This is to allow people to test gtk3 while it not being default
-------------------------------------------------------------------
Wed Sep 9 07:34:59 UTC 2015 - tchvatal@suse.com
- Version update to 5.0.2 rc1:
* Various small tweaks and integration of our SLE11 patchsets
-------------------------------------------------------------------
Fri Aug 28 07:33:41 UTC 2015 - tchvatal@suse.com

76
libreoffice.spec
View File

@ -19,11 +19,10 @@
# List of supported langs, populated bellow in the lang macros
%global langpack_langs %{nil}
# extensions
%define ct2n_version 1.3.2
%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.1
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.0.3
# Old Make and bundle or not
%if 0%{?suse_version} > 1230
%bcond_with oldmake
@ -65,7 +64,7 @@ Requires: python-importlib
%endif
# This is used due to the need for beta releases
Name: libreoffice
Version: 5.0.1.2
Version: 5.0.3.1
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
@ -82,7 +81,7 @@ Source201: sofficerc-upstream
# prebuilt extensions
Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt
# used extensions sources
Source450: %{external_url}/451ccf439a36a568653b024534669971-ConvertTextToNumber-%{ct2n_version}.oxt
Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
# Internal bundled stuff we can't remove
# XMLSec is patched over and over in here
@ -156,6 +155,8 @@ Source2061: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.t
Source2062: %{external_url}/language-subtag-registry-2015-06-08.tar.bz2
# Make for old distros where too old gnumake resides
Source3000: http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2
# PATCH-FIX-SUSE: disable really fragile test run on hsqldb
Patch0: disable-flaky-hsqldb-test.patch
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build
# FIXME: make it configurable and push upstream
@ -168,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#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
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -188,6 +195,8 @@ BuildRequires: fdupes
BuildRequires: flac-devel
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
@ -244,6 +253,8 @@ Provides: %{name}-kde = %{version}
Obsoletes: %{name}-kde < %{version}
Provides: %{name}-l10n-prebuild = %{version}
Obsoletes: %{name}-l10n-prebuild < %{version}
Provides: %{name}-mono = %{version}
Obsoletes: %{name}-mono < %{version}
Provides: %{name}-ure = %{version}
Obsoletes: %{name}-ure < %{version}
Provides: %{name}-icon-theme-crystal = %{version}
@ -324,7 +335,7 @@ BuildRequires: gstreamer-plugins-base-devel
BuildRequires: gtk3-devel
BuildRequires: libgltf-devel
%else
BuildRequires: gcc47-c++
BuildRequires: gcc48-c++
BuildRequires: gstreamer010-plugins-base-devel
%endif
# we need a JRE for oobase and the other stuff
@ -385,6 +396,7 @@ This package includes the original branding for the LibreOffice office suite.
Summary: Breeze LibreOffice Icon Theme (KDE Frameworks default)
License: LGPL-2.1
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker
Supplements: packageand(libreoffice:plasma5-workspace)
@ -418,6 +430,7 @@ This package provides Galaxy LibreOffice icon theme. It is used in the original
Summary: Hicontrast LibreOffice Icon Theme
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker
Supplements: libreoffice
@ -434,6 +447,7 @@ This package provides Hicontrast LibreOffice icon theme.
Summary: Oxygen LibreOffice Icon Theme (KDE4 default)
License: LGPL-3.0 or CC-BY-SA-3.0
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker
Supplements: packageand(libreoffice:kdebase4-workspace)
@ -450,6 +464,8 @@ This package provides Oxygen LibreOffice icon theme. It is used in KDE4 by defau
Summary: Sifr LibreOffice Icon Theme
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-breeze
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker
Supplements: libreoffice
@ -466,6 +482,7 @@ This package provides Sifr LibreOffice icon theme.
Summary: Tango LibreOffice Icon Theme (GNOME default)
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker
Supplements: packageand(libreoffice:gnome-session)
@ -484,7 +501,9 @@ Summary: LibreOffice Base
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
%if %{with systemlibs}
Requires: pentaho-reporting-flow-engine
%endif
Supplements: %{name}
%description base
@ -617,6 +636,15 @@ Requires: %{name} = %{version}
%description gnome
This package contains some GNOME extensions for LibreOffice.
%package gtk3
Summary: Gtk3 interface for LibreOffice
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %{name}-gnome = %{version}
%description gtk3
This package contains Gtk3 interface rendering option for LibreOffice.
%package kde4
Summary: KDE4 Extensions for LibreOffice
License: LGPL-3.0
@ -966,6 +994,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%prep
%setup -q -b1 -b2
%patch0 -p1
%patch1
%patch3 -p1
%patch4
@ -973,6 +1002,9 @@ Provides additional %{langname} translations and resources for %{project}. \
%if !%{with systemlibs}
%patch7 -p1
%endif
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch990 -p1
# 256x256 icons
tar -xjf %{SOURCE20}
@ -1020,7 +1052,12 @@ fi
# make sure that JAVA_HOME is set correctly
source %{_sysconfdir}/profile.d/alljava.sh
# use RPM_OPT_FLAGS, ...
%if 0%{?is_opensuse} != 1
# ON IBS remove big debugsymbols as we simply consume too much space
ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`"
%else
ARCH_FLAGS="%{optflags}"
%endif
CFLAGS="$ARCH_FLAGS"
CXXFLAGS="$ARCH_FLAGS"
export ARCH_FLAGS CFLAGS CXXFLAGS
@ -1042,8 +1079,8 @@ export PYTHON_LIBS=`%{python_type}-config --libs`
# Old systems need help in finding the gcc
%if !%{with newmedia}
export CC=%{_bindir}/gcc-4.7
export CXX=%{_bindir}/g++-4.7
export CC=%{_bindir}/gcc-4.8
export CXX=%{_bindir}/g++-4.8
%endif
%if %{with oldmake}
@ -1166,6 +1203,10 @@ set +x
install -m755 instdir/program/libsaxlo.so %{buildroot}/%{_libdir}/%{name}/program/libsaxlo.so
echo "%{_libdir}/%{name}/program/libsaxlo.so" >>file-lists/common_list.txt
# Split out gtk3 interface to -gtk3 subpackage
grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_list.txt > tmplist
mv tmplist file-lists/gnome_list.txt
################
# update desktop files
builddir=`pwd`
@ -1185,8 +1226,7 @@ for desktop in * ; do
app=`echo $desktop_new | sed "s/.desktop//"`
%suse_update_desktop_file $app
done
# FIXED: (only the first sed part) 4.3 branch
sed -i -e 's:Office;:Office;Spreadsheet;:g' -e 's:NoDisplay=false:NoDisplay=true:g' %{buildroot}/%{_datadir}/applications/math.desktop
sed -i -e 's:NoDisplay=false:NoDisplay=true:g' %{buildroot}/%{_datadir}/applications/math.desktop
cd -
################
# compat stuff for noarch packages
@ -1304,12 +1344,12 @@ rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
# Remove RPATH on some 3rd party bundled libs
%if !%{with systemlibs}
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwpd-0.10.so.10
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwpg-0.3.so.3
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libetonyek-0.1.so.1
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libmwaw-0.3.so.3
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwps-0.4.so.4
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libodfgen-0.1.so.1
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwpd-0.10-lo.so.10
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwpg-0.3-lo.so.3
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libetonyek-0.1-lo.so.1
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libmwaw-0.3-lo.so.3
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwps-0.4-lo.so.4
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libodfgen-0.1-lo.so.1
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librdf-lo.so.0
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3
%endif
@ -1540,6 +1580,12 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null |
%files -f file-lists/gnome_list.txt gnome
%defattr(-,root,root)
%if %{with newmedia}
%files gtk3
%defattr(-,root,root)
%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so
%endif
%files -f file-lists/kde4_list.txt kde4
%defattr(-,root,root)

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

@ -0,0 +1,29 @@
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