From 7f580d4fba2da90da2ccfbad7f0e21c12e810a26 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Thu, 26 Apr 2018 17:03:55 +0900 Subject: [API CHANGE] revert SymbolBitmapURL impl, add SymbolBitmap property This adds back the implementation for setting the SymbolBitmapURL property (getting returns an empty string) and adds SymbolBitmap property to the UNO API (LineDiagram.idl). SymbolBitmapURL property was already deprecated, but we still need to add the SymbolBitmap for compatibility. [ Miklos Vajna: updated qadevOOo tests to handle the new write-only properties. ] Change-Id: Id00d78299b7fd5ba9d78c36c5f03a10d9e61c60a Reviewed-on: https://gerrit.libreoffice.org/53492 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- .../sch/com.sun.star.comp.office.ChXDataPoint.csv | 1 - .../sch/com.sun.star.comp.office.ChXDataRow.csv | 1 - .../sch/com.sun.star.comp.office.ChXDiagram.csv | 1 - .../java/ifc/chart/_ChartDataPointProperties.java | 22 +++++++++++++++++++++- qadevOOo/tests/java/ifc/chart/_LineDiagram.java | 22 +++++++++++++++++++++- 5 files changed, 42 insertions(+), 5 deletions(-) (limited to 'qadevOOo') diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataPoint.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataPoint.csv index af4ebc6b2f74..69bad48ea738 100644 --- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataPoint.csv +++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataPoint.csv @@ -15,7 +15,6 @@ "ChXDataPoint";"com::sun::star::chart::Chart3DBarProperties#optional";"SolidType" "ChXDataPoint";"com::sun::star::chart::ChartDataPointProperties";"DataCaption" "ChXDataPoint";"com::sun::star::chart::ChartDataPointProperties";"SymbolType#optional" -"ChXDataPoint";"com::sun::star::chart::ChartDataPointProperties";"SymbolBitmapURL#optional" "ChXDataPoint";"com::sun::star::drawing::FillProperties";"FillStyle" "ChXDataPoint";"com::sun::star::drawing::FillProperties";"FillColor" "ChXDataPoint";"com::sun::star::drawing::FillProperties";"FillTransparence" diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataRow.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataRow.csv index f64c24d83035..482d206da493 100644 --- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataRow.csv +++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDataRow.csv @@ -15,7 +15,6 @@ "ChXDataRow";"com::sun::star::chart::Chart3DBarProperties#optional";"SolidType" "ChXDataRow";"com::sun::star::chart::ChartDataPointProperties";"DataCaption" "ChXDataRow";"com::sun::star::chart::ChartDataPointProperties";"SymbolType#optional" -"ChXDataRow";"com::sun::star::chart::ChartDataPointProperties";"SymbolBitmapURL#optional" "ChXDataRow";"com::sun::star::drawing::FillProperties#optional";"FillStyle" "ChXDataRow";"com::sun::star::drawing::FillProperties#optional";"FillColor" "ChXDataRow";"com::sun::star::drawing::FillProperties#optional";"FillTransparence" diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv index 8976f4ae236a..5a0ca113d696 100644 --- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv +++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChXDiagram.csv @@ -61,7 +61,6 @@ "ChXDiagram";"com::sun::star::drawing::XShape";"setSize()" "ChXDiagram";"com::sun::star::chart::LineDiagram";"SymbolType" "ChXDiagram";"com::sun::star::chart::LineDiagram";"SymbolSize#optional" -"ChXDiagram";"com::sun::star::chart::LineDiagram";"SymbolBitmapURL#optional" "ChXDiagram";"com::sun::star::chart::LineDiagram";"Lines" "ChXDiagram";"com::sun::star::chart::LineDiagram";"SplineType" "ChXDiagram";"com::sun::star::chart::LineDiagram";"SplineOrder#optional" diff --git a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java b/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java index fbf59aa5dac6..c78d87951750 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java @@ -102,7 +102,27 @@ public class _ChartDataPointProperties extends MultiPropertyTest { throw new StatusException("Exception while set property value", e); } - testProperty("SymbolBitmapURL", URLTester); + try { + oObj.setPropertyValue( + "SymbolBitmapURL", + utils.getFullTestURL("space-metal.jpg") ); + } catch(com.sun.star.lang.WrappedTargetException e) { + log.println("Exception while set property value"); + e.printStackTrace(log); + throw new StatusException("Exception while set property value", e); + } catch(com.sun.star.lang.IllegalArgumentException e) { + log.println("Exception while set property value"); + e.printStackTrace(log); + throw new StatusException("Exception while set property value", e); + } catch(com.sun.star.beans.PropertyVetoException e) { + log.println("Exception while set property value"); + e.printStackTrace(log); + throw new StatusException("Exception while set property value", e); + } catch(com.sun.star.beans.UnknownPropertyException e) { + log.println("Exception while set property value"); + e.printStackTrace(log); + throw new StatusException("Exception while set property value", e); + } } } diff --git a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java index d461844513cc..aaade8f9bc29 100644 --- a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java @@ -183,7 +183,27 @@ public class _LineDiagram extends MultiPropertyTest { throw new StatusException("Exception while set property value", e); } - testProperty("SymbolBitmapURL", URLTester) ; + try { + oObj.setPropertyValue( + "SymbolBitmapURL", + util.utils.getFullTestURL("space-metal.jpg") ); + } catch(com.sun.star.lang.WrappedTargetException e) { + log.println("Exception while set property value"); + e.printStackTrace(log); + throw new StatusException("Exception while set property value", e); + } catch(com.sun.star.lang.IllegalArgumentException e) { + log.println("Exception while set property value"); + e.printStackTrace(log); + throw new StatusException("Exception while set property value", e); + } catch(com.sun.star.beans.PropertyVetoException e) { + log.println("Exception while set property value"); + e.printStackTrace(log); + throw new StatusException("Exception while set property value", e); + } catch(com.sun.star.beans.UnknownPropertyException e) { + log.println("Exception while set property value"); + e.printStackTrace(log); + throw new StatusException("Exception while set property value", e); + } } } // EOF LineDiagram -- cgit v1.2.3