summaryrefslogtreecommitdiff
path: root/offapi
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-05-06 06:16:56 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-05-07 21:22:28 +0200
commita28bcb6e57aef0a05e04195c9bdc52a4bc39bba1 (patch)
treee015cd138ac869c678f4b8c72b5fac6363e93f69 /offapi
parent42a47cd66eb6d277e5560efa341efa423f9e8fff (diff)
provide the OpenGL window
This approach looks much better. We get size and position correct without much work and can easily plug the window into the sc window hierarchy. We still have a crash on exit as the ScGridWindow goes out of scope and the SystemChildWindow is still alive. We need to fix it and bind the lifecycle of the SystemChildWindow to ScGridWindow. Another open item is the OpenGL context work. Right now it looks like the best way forward is to create a subclass of SystemChildWindow that contains the OpenGLContext. Change-Id: Ie0a74531e1b818cea92912345464c8fa219bbae2
Diffstat (limited to 'offapi')
-rw-r--r--offapi/UnoApi_offapi.mk1
-rw-r--r--offapi/com/sun/star/chart2/X3DChartWindowProvider.idl33
2 files changed, 34 insertions, 0 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 8074e8bf29c2..3ce5e0647b24 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2005,6 +2005,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/chart2,\
SymbolStyle \
TickmarkStyle \
TransparencyStyle \
+ X3DChartWindowProvider \
XAnyDescriptionAccess \
XAxis \
XChartDocument \
diff --git a/offapi/com/sun/star/chart2/X3DChartWindowProvider.idl b/offapi/com/sun/star/chart2/X3DChartWindowProvider.idl
new file mode 100644
index 000000000000..ff67fc323553
--- /dev/null
+++ b/offapi/com/sun/star/chart2/X3DChartWindowProvider.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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_chart2_X3DChartWindowProvider_idl__
+#define __com_sun_star_chart2_X3DChartWindowProvider_idl__
+
+module com { module sun { module star { module chart2 {
+
+interface X3DChartWindowProvider
+{
+ void setWindow( [in] unsigned hyper window );
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */