[Libreoffice-commits] core.git: 2 commits - offapi/com offapi/UnoApi_offapi.mk sc/inc
offapi/UnoApi_offapi.mk |3
offapi/com/sun/star/sheet/ColorScale.idl | 32
offapi/com/sun/star/sheet/ColorScaleEntryType.idl | 35 +
offapi/com/sun/star/sheet/ConditionEntryType.idl | 34 +
offapi/com/sun/star/sheet/ConditionFormatEntry.idl| 34 +
offapi/com/sun/star/sheet/ConditionFormatOperator.idl | 67 ++
offapi/com/sun/star/sheet/ConditionalFormat.idl | 48
offapi/com/sun/star/sheet/DataBar.idl | 45
offapi/com/sun/star/sheet/DataBarAxis.idl | 29 +++
offapi/com/sun/star/sheet/DataBarEntryType.idl| 37 +
offapi/com/sun/star/sheet/IconSet.idl | 37 +
offapi/com/sun/star/sheet/IconSetFormatEntry.idl | 31
offapi/com/sun/star/sheet/IconSetType.idl | 62
offapi/com/sun/star/sheet/Spreadsheet.idl |5 +
offapi/com/sun/star/sheet/XColorScaleEntry.idl| 36 +
offapi/com/sun/star/sheet/XConditionEntry.idl | 32
offapi/com/sun/star/sheet/XConditionalFormat.idl | 30
offapi/com/sun/star/sheet/XConditionalFormats.idl | 39 ++
offapi/com/sun/star/sheet/XDataBarEntry.idl | 32
offapi/com/sun/star/sheet/XIconSetEntry.idl | 34 +
sc/inc/conditio.hxx |9 --
21 files changed, 705 insertions(+), 6 deletions(-)
New commits:
commit 1d9bfd6e289a1cc8872038b54b060a282d02ea08
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri Feb 6 01:09:28 2015 +0100
small clean-up
Change-Id: I6a327df821ea439e6dcffe26022c3e3583e8
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 341e032..57dd2d9 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -281,8 +281,7 @@ private:
mutable boost::scoped_ptrScConditionEntryCache mpCache;
};
-// single entry for conditional formatting
-
+// single condition entry for conditional formatting
class SC_DLLPUBLIC ScCondFormatEntry : public ScConditionEntry
{
OUString aStyleName;
@@ -375,7 +374,6 @@ private:
};
// complete conditional formatting
-
class SC_DLLPUBLIC ScConditionalFormat: private boost::noncopyable
{
ScDocument* pDoc;
@@ -433,7 +431,7 @@ public:
boolMarkUsedExternalReferences() const;
-// sorted (via PTRARR) by Index
+// sorted (via boost::ptr_set) by Index
// operator== only for sorting
bool operator ==( const ScConditionalFormat r ) const { return nKey ==
r.nKey; }
bool operator ( const ScConditionalFormat r ) const { return nKey
r.nKey; }
@@ -442,8 +440,7 @@ public:
void endRendering();
};
-// List of areas and formats:
-
+// List of all conditional formats in a sheet
class SC_DLLPUBLIC ScConditionalFormatList
{
private:
commit b523c0244aef7c1e223f326eb8b5e5abdfbb9106
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Feb 11 02:36:11 2015 +0100
add first useful version of new conditional format UNO API
Change-Id: I8b58ae33ad71d0df6ea30f205b4f331541f5b821
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 63f242c..e5fb2eb 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3449,6 +3449,9 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,com/sun/star/sheet,\
XCellRangesQuery \
XCellSeries \
XCompatibilityNames \
+ XConditionalFormat \
+ XConditionalFormats \
+ XConditionEntry \
XConsolidatable \
XConsolidationDescriptor \
XDDELink \
diff --git a/offapi/com/sun/star/sheet/ColorScale.idl
b/offapi/com/sun/star/sheet/ColorScale.idl
new file mode 100644
index 000..b7d79e2
--- /dev/null
+++ b/offapi/com/sun/star/sheet/ColorScale.idl
@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef __com_sun_star_sheet_Colorscale_idl__
+#define __com_sun_star_sheet_Colorscale_idl__
+
+#include com/sun/star/sheet/XConditionEntry.idl
+#include com/sun/star/sheet/XColorScaleEntry.idl
+
+module com { module sun { module star { module sheet {
+
+service ColorScale
+{
+interface XConditionEntry;
+
+[property] sequenceXColorScaleEntry ColorScaleEntries;
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
+
diff --git a/offapi/com/sun/star/sheet/ColorScaleEntryType.idl
b/offapi/com/sun/star/sheet/ColorScaleEntryType.idl
new file mode 100644
index 000..bab3d8c4
--- /dev/null
+++
[Libreoffice-commits] core.git: 2 commits - offapi/com offapi/UnoApi_offapi.mk sc/inc sc/source
offapi/UnoApi_offapi.mk |7 +
offapi/com/sun/star/sheet/opencl/OpenCLDevice.idl | 37 +++
offapi/com/sun/star/sheet/opencl/OpenCLPlatform.idl | 33 ++
offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl | 52 +++
sc/inc/docuno.hxx | 25 +
sc/inc/formulagroup.hxx |1
sc/source/core/opencl/formulagroupcl.cxx |5 +
sc/source/core/opencl/openclwrapper.cxx | 39
sc/source/core/opencl/openclwrapper.hxx |2
sc/source/core/tool/formulagroup.cxx | 33 ++
sc/source/ui/unoobj/docuno.cxx| 85 +-
11 files changed, 317 insertions(+), 2 deletions(-)
New commits:
commit 4e736a8b8ce4d69c5be924b77bb07bd19b1e4d73
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Nov 23 20:02:26 2013 +0100
add API to retrieve all available OpenCL platforms and devices
Change-Id: I2475961ae315ee7193ca2cedd5943b663bfee7a0
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index e7c52f2..a1ad831 100755
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3327,6 +3327,8 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,com/sun/star/security,\
))
$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/sheet/opencl,\
+ OpenCLDevice \
+ OpenCLPlatform \
XOpenCLSelection \
))
diff --git a/offapi/com/sun/star/sheet/opencl/OpenCLDevice.idl
b/offapi/com/sun/star/sheet/opencl/OpenCLDevice.idl
new file mode 100644
index 000..7cf795f
--- /dev/null
+++ b/offapi/com/sun/star/sheet/opencl/OpenCLDevice.idl
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef __com_sun_star_sheet_opencl_OpenCLDevice_idl__
+#define __com_sun_star_sheet_opencl_OpenCLDevice_idl__
+
+module com { module sun { module star { module sheet { module opencl {
+
+struct OpenCLDevice
+{
+/**
+ * The name of the device as returned by OpenCL
+ */
+string Name;
+
+/**
+ * The vendor of the device as returned by OpenCL
+ */
+string Vendor;
+
+/**
+ * The driver version as returned by OpenCL
+ */
+string Driver;
+};
+
+}; }; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sheet/opencl/OpenCLPlatform.idl
b/offapi/com/sun/star/sheet/opencl/OpenCLPlatform.idl
new file mode 100644
index 000..bb8a683
--- /dev/null
+++ b/offapi/com/sun/star/sheet/opencl/OpenCLPlatform.idl
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef __com_sun_star_sheet_opencl_OpenCLPlatform_idl__
+#define __com_sun_star_sheet_opencl_OpenCLPlatform_idl__
+
+#include com/sun/star/sheet/opencl/OpenCLDevice.idl
+
+module com { module sun { module star { module sheet { module opencl {
+
+struct OpenCLPlatform
+{
+/**
+ * The name of the platform as returned by OpenCL
+ */
+string Name;
+
+string Vendor;
+
+sequence OpenCLDevice Devices;
+};
+
+}; }; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
index c6e18cf..26ab328 100644
--- a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
+++ b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include com/sun/star/sheet/opencl/OpenCLPlatform.idl
+
module com { module sun { module star { module sheet { module opencl {
interface XOpenCLSelection : com::sun::star::uno::XInterface
@@ -38,6 +40,11 @@ interface XOpenCLSelection : com::sun::star::uno::XInterface
*/
long getDeviceID();
+/**
+ * lists all OpenCL devices and platforms
+ */
+sequence OpenCLPlatform getOpenCLPlatforms();
+
};
}; }; }; }; };
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index a3b7680..1228afe 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -46,6 +46,7 @@
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/sheet/XCellRangesAccess.hpp
#include com/sun/star/sheet/opencl/XOpenCLSelection.hpp
+#include com/sun/star/sheet/opencl/OpenCLPlatform.hpp
#include com/sun/star/util/XChangesNotifier.hpp
