parent
37e061f5a2
commit
40097e0e1c
@ -1,52 +0,0 @@
|
|||||||
From 77580b12520f218a85b13330743f0d6fe700dca3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
||||||
Date: Wed, 22 Jul 2020 14:11:38 +0100
|
|
||||||
Subject: [PATCH] fix f33 build
|
|
||||||
|
|
||||||
Change-Id: I68a9a58ac33eca0163c5f97ab61a264db75ae544
|
|
||||||
---
|
|
||||||
chart2/source/model/template/CandleStickChartType.cxx | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
|
|
||||||
index 606d51a6c035..10c8114da941 100644
|
|
||||||
--- a/chart2/source/model/template/CandleStickChartType.cxx
|
|
||||||
+++ b/chart2/source/model/template/CandleStickChartType.cxx
|
|
||||||
@@ -216,8 +216,8 @@ uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRo
|
|
||||||
{
|
|
||||||
bool bShowFirst = true;
|
|
||||||
bool bShowHiLow = false;
|
|
||||||
- getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
|
|
||||||
- getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
|
|
||||||
+ ::cppu::OPropertySetHelper::getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
|
|
||||||
+ ::cppu::OPropertySetHelper::getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
|
|
||||||
|
|
||||||
std::vector< OUString > aMandRoles;
|
|
||||||
|
|
||||||
@@ -240,8 +240,8 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles()
|
|
||||||
{
|
|
||||||
bool bShowFirst = true;
|
|
||||||
bool bShowHiLow = false;
|
|
||||||
- getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
|
|
||||||
- getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
|
|
||||||
+ ::cppu::OPropertySetHelper::getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
|
|
||||||
+ ::cppu::OPropertySetHelper::getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
|
|
||||||
|
|
||||||
std::vector< OUString > aOptRoles;
|
|
||||||
|
|
||||||
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
|
|
||||||
index 12d44e5..4f7a64b 100644
|
|
||||||
--- a/forms/source/component/ImageControl.cxx
|
|
||||||
+++ b/forms/source/component/ImageControl.cxx
|
|
||||||
@@ -305,7 +305,7 @@ sal_Bool OImageControlModel::convertFastPropertyValue(Any& rConvertedValue, Any&
|
|
||||||
|
|
||||||
case PROPERTY_ID_GRAPHIC:
|
|
||||||
{
|
|
||||||
- const Reference< XGraphic > xGraphic( getFastPropertyValue( PROPERTY_ID_GRAPHIC ), UNO_QUERY );
|
|
||||||
+ const Reference< XGraphic > xGraphic( OImageControlModel::getFastPropertyValue( PROPERTY_ID_GRAPHIC ), UNO_QUERY );
|
|
||||||
return tryPropertyValue( rConvertedValue, rOldValue, rValue, xGraphic );
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
@ -1,52 +0,0 @@
|
|||||||
From e7379dfe3d3d92fe265d762a3f0399205e5b2816 Mon Sep 17 00:00:00 2001
|
|
||||||
From: rpmbuild <rpmbuild@fedoraproject.org>
|
|
||||||
Date: Fri, 24 Jul 2020 20:37:13 +0100
|
|
||||||
Subject: [PATCH] workaround internal compiler error
|
|
||||||
|
|
||||||
---
|
|
||||||
forms/source/component/ListBox.cxx | 2 +-
|
|
||||||
vcl/workben/vcldemo.cxx | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
|
|
||||||
index 7c51f7c..0e75606 100644
|
|
||||||
--- a/forms/source/component/ListBox.cxx
|
|
||||||
+++ b/forms/source/component/ListBox.cxx
|
|
||||||
@@ -1994,7 +1994,7 @@ namespace frm
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (t.is()) {
|
|
||||||
- t->join();
|
|
||||||
+ t->comphelper::AsyncEventNotifier::join();
|
|
||||||
}
|
|
||||||
|
|
||||||
OBoundControl::disposing();
|
|
||||||
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
|
|
||||||
index 74dc6fb..9655a77 100644
|
|
||||||
--- a/vcl/workben/vcldemo.cxx
|
|
||||||
+++ b/vcl/workben/vcldemo.cxx
|
|
||||||
@@ -1730,7 +1730,7 @@ class DemoWin : public WorkWindow
|
|
||||||
}
|
|
||||||
virtual ~RenderThread() override
|
|
||||||
{
|
|
||||||
- join();
|
|
||||||
+ salhelper::Thread::join();
|
|
||||||
}
|
|
||||||
virtual void execute() override
|
|
||||||
{
|
|
||||||
diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx
|
|
||||||
index c73bd22..2095359 100644
|
|
||||||
--- a/comphelper/source/misc/asyncnotification.cxx
|
|
||||||
+++ b/comphelper/source/misc/asyncnotification.cxx
|
|
||||||
@@ -195,7 +195,7 @@ namespace comphelper
|
|
||||||
if (pNotifier)
|
|
||||||
{
|
|
||||||
pNotifier->terminate();
|
|
||||||
- pNotifier->join();
|
|
||||||
+ pNotifier->AsyncEventNotifierAutoJoin::join();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// note it's possible that g_Notifiers isn't empty now in case of leaks,
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
Loading…
Reference in new issue