You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
2.5 KiB
53 lines
2.5 KiB
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
|
|
|