diff options
| author | David Tardon <dtardon@redhat.com> | 2017-02-22 10:28:43 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-02-22 12:17:20 +0000 |
| commit | ac956e0424c79b59bb5ad433d18b3016bd47b9b2 (patch) | |
| tree | ffe715e7593315e1a92dcbb2e0025aab864bcbd6 /external | |
| parent | 433b98683bf0f0e6992d0d805b58f552ab9a265c (diff) | |
upload libstaroffice 0.0.3
Change-Id: I5cb29e5cc8635988e84f0285164cf139ed4a62b0
Reviewed-on: https://gerrit.libreoffice.org/34536
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
3 files changed, 2 insertions, 55 deletions
diff --git a/external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1 b/external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1 deleted file mode 100644 index 1c579b30170e..000000000000 --- a/external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1 +++ /dev/null @@ -1,54 +0,0 @@ -From 1bbb89aff70e81d47af617bb1407e70545a2f99a Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Wed, 10 Aug 2016 18:52:46 +0200 -Subject: [PATCH] error C2512: 'StarObject' : no appropriate default - constructor available - ---- - src/lib/StarObjectChart.cxx | 2 +- - src/lib/StarObjectDraw.cxx | 2 +- - src/lib/StarObjectSpreadsheet.cxx | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/lib/StarObjectChart.cxx b/src/lib/StarObjectChart.cxx -index 3438beb..d9b1604 100644 ---- a/src/lib/StarObjectChart.cxx -+++ b/src/lib/StarObjectChart.cxx -@@ -71,7 +71,7 @@ struct State { - //////////////////////////////////////////////////////////// - // constructor/destructor, ... - //////////////////////////////////////////////////////////// --StarObjectChart::StarObjectChart(StarObject const &orig, bool duplicateState) : StarObject::StarObject(orig, duplicateState), m_chartState(new StarObjectChartInternal::State) -+StarObjectChart::StarObjectChart(StarObject const &orig, bool duplicateState) : StarObject(orig, duplicateState), m_chartState(new StarObjectChartInternal::State) - { - } - -diff --git a/src/lib/StarObjectDraw.cxx b/src/lib/StarObjectDraw.cxx -index bb660a9..4e4fdc2 100644 ---- a/src/lib/StarObjectDraw.cxx -+++ b/src/lib/StarObjectDraw.cxx -@@ -76,7 +76,7 @@ struct State { - //////////////////////////////////////////////////////////// - // constructor/destructor, ... - //////////////////////////////////////////////////////////// --StarObjectDraw::StarObjectDraw(StarObject const &orig, bool duplicateState) : StarObject::StarObject(orig, duplicateState), m_drawState(new StarObjectDrawInternal::State) -+StarObjectDraw::StarObjectDraw(StarObject const &orig, bool duplicateState) : StarObject(orig, duplicateState), m_drawState(new StarObjectDrawInternal::State) - { - } - -diff --git a/src/lib/StarObjectSpreadsheet.cxx b/src/lib/StarObjectSpreadsheet.cxx -index 58409c8..c8bd71b 100644 ---- a/src/lib/StarObjectSpreadsheet.cxx -+++ b/src/lib/StarObjectSpreadsheet.cxx -@@ -521,7 +521,7 @@ void SubDocument::parse(STOFFListenerPtr &listener, libstoff::SubDocumentType /* - //////////////////////////////////////////////////////////// - // constructor/destructor, ... - //////////////////////////////////////////////////////////// --StarObjectSpreadsheet::StarObjectSpreadsheet(StarObject const &orig, bool duplicateState) : StarObject::StarObject(orig, duplicateState), m_spreadsheetState(new StarObjectSpreadsheetInternal::State) -+StarObjectSpreadsheet::StarObjectSpreadsheet(StarObject const &orig, bool duplicateState) : StarObject(orig, duplicateState), m_spreadsheetState(new StarObjectSpreadsheetInternal::State) - { - } - --- -2.7.4 - diff --git a/external/libstaroffice/Library_staroffice.mk b/external/libstaroffice/Library_staroffice.mk index 0bd8ed73c06e..50f77dc543d3 100644 --- a/external/libstaroffice/Library_staroffice.mk +++ b/external/libstaroffice/Library_staroffice.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,staroffice,\ UnpackedTarball/libstaroffice/src/lib/STOFFDocument \ UnpackedTarball/libstaroffice/src/lib/STOFFEntry \ UnpackedTarball/libstaroffice/src/lib/STOFFFont \ + UnpackedTarball/libstaroffice/src/lib/STOFFFrameStyle \ UnpackedTarball/libstaroffice/src/lib/STOFFGraphicDecoder \ UnpackedTarball/libstaroffice/src/lib/STOFFGraphicEncoder \ UnpackedTarball/libstaroffice/src/lib/STOFFGraphicListener \ @@ -80,6 +81,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,staroffice,\ UnpackedTarball/libstaroffice/src/lib/StarEncryption \ UnpackedTarball/libstaroffice/src/lib/StarFileManager \ UnpackedTarball/libstaroffice/src/lib/StarFormatManager \ + UnpackedTarball/libstaroffice/src/lib/StarFrameAttribute \ UnpackedTarball/libstaroffice/src/lib/StarGraphicAttribute \ UnpackedTarball/libstaroffice/src/lib/StarGraphicStruct \ UnpackedTarball/libstaroffice/src/lib/StarItem \ diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk index 957c11859ac5..e85d13aa8dc6 100644 --- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk +++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk @@ -36,7 +36,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ endif $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ - external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1 \ )) # vim: set noet sw=4 ts=4: |