rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try as :💹:PropertyHelper::getFastPropertyValue

Browse Source
This commit is contained in:
Caolán McNamara 2020-07-25 11:40:25 +01:00
parent 970f41098c
commit 95c97bd96f
3 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-fix-f33-build.patch
View File

@ -18,8 +18,8 @@ index 606d51a6c035..10c8114da941 100644
bool bShowHiLow = false;
- getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
- getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
+ ::property::OPropertySet::getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
+ ::property::OPropertySet::getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
+ ::chart::PropertyHelper::getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
+ ::chart::PropertyHelper::getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
std::vector< OUString > aMandRoles;
@ -29,8 +29,8 @@ index 606d51a6c035..10c8114da941 100644
bool bShowHiLow = false;
- getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
- getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
+ ::property::OPropertySet::getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
+ ::property::OPropertySet::getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
+ ::chart::PropertyHelper::getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
+ ::chart::PropertyHelper::getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
std::vector< OUString > aOptRoles;

38
0001-using-seems-to-have-gone-wrong.patch
View File

@ -1,38 +0,0 @@
From d4b1a6e8e2f16ca18b002269f8cef005ad603eec Mon Sep 17 00:00:00 2001
From: rpmbuild <rpmbuild@fedoraproject.org>
Date: Sat, 25 Jul 2020 00:06:16 +0100
Subject: [PATCH] using seems to have gone wrong
---
chart2/source/model/template/CandleStickChartType.cxx | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 606d51a..1b0a7db 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -216,8 +216,10 @@ uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRo
{
bool bShowFirst = true;
bool bShowHiLow = false;
+#if 0
getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
+#endif
std::vector< OUString > aMandRoles;
@@ -240,8 +242,10 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles()
{
bool bShowFirst = true;
bool bShowHiLow = false;
+#if 0
getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
+#endif
std::vector< OUString > aOptRoles;
--
2.26.2

1
libreoffice.spec
View File

@ -250,7 +250,6 @@ Patch6: 0001-Restructure-solenv-bin-assemble-flatpak.sh.patch
Patch7: 0001-Related-tdf-127782-resize-the-print-dialog-to-its-op.patch
Patch8: 0001-fix-f33-build.patch
Patch9: 0001-workaround-internal-compiler-error.patch
Patch10: 0001-using-seems-to-have-gone-wrong.patch
%if 0%{?rhel}
# not upstreamed