From 87ec34b20ec01d1ae6724605ec4ab96681802cab Mon Sep 17 00:00:00 2001
From: Kalman Szalai - KAMI <kami911@gmail.com>
Date: Sat, 30 Oct 2010 19:57:14 +0200
Subject: [PATCH] Adding Diagram extension

Diagram is an OpenOffice.org Draw and Impress extension that creates your favorite diagrams with few clicks.
http://wiki.services.openoffice.org/wiki/Diagram_Extension
---
 configure.in                                  | 17 +++++++++++++++
 .../extensions/directory_extensions.scp       | 15 +++++++++++--
 scp2/source/extensions/file_extensions.scp    | 17 +++++++++++++--
 scp2/source/extensions/module_extensions.scp  | 21 +++++++++++++++++--
 scp2/source/extensions/module_extensions.ulf  | 10 +++++++--
 5 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/configure.in b/configure.in
index 9b6872f8fee3..29dd71da1598 100644
--- a/configure.in
+++ b/configure.in
@@ -897,6 +897,11 @@ AC_ARG_WITH(watch-window,
   --with-watch-window      Integrate Watch Window extension to Calc],
 ,)
 
+AC_ARG_WITH(diagram,
+[
+  --with-diagram      Integrate Diagram extension],
+,)
+
 AC_ARG_WITH(google-docs,
 [
   --with-google-docs      Download and integrate Google Documents extension.],
@@ -6813,6 +6818,18 @@ else
 fi
 AC_SUBST(WITH_WATCH_WINDOW_EXTENSION)
 
+dnl ===================================================================
+dnl Test whether to include Diagram extension
+dnl ===================================================================
+AC_MSG_CHECKING([for Diagram extension integration])
+if test "z$with_diagram" = "z" -o "z$with_diagram" = "zno" ; then
+  AC_MSG_RESULT([no])
+else
+  AC_MSG_RESULT([yes])
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_DIAGRAM"
+fi
+AC_SUBST(WITH_DIAGRAM_EXTENSION)
+
 dnl ===================================================================
 dnl Test whether to include ConvertTextToNumber extension
 dnl ===================================================================
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index abcf3b813ddd..1dc50904868e 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: directory_extensions.scp,v $
  *
- *  $Revision: 1.0 $
+ *  $Revision: 1.1 $
  *
- *  last change: $Author: KAMI $ $Date: 2010/08/12 21:29:17 $
+ *  last change: $Author: KAMI $ $Date: 2010/10/30 19:40:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 3.
@@ -154,6 +154,17 @@ End
 
 #endif
 
+/* ** Diagram ** */
+
+#ifdef WITH_EXTENSION_DIAGRAM
+
+Directory gid_Brand_Dir_Share_Extensions_Diagram
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "Diagram";
+End
+
+#endif
+
 /* ** Google Docs ** */
 
 #ifdef WITH_EXTENSION_GOOGLE_DOCS
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 7128b2baee39..8a8c61df8713 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: file_extensions.scp,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: KAMI $ $Date: 2010/08/010 23:58:39 $
+ *  last change: $Author: KAMI $ $Date: 2010/10/30 19:40:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 3.
@@ -181,6 +181,19 @@ End
 
 #endif
 
+/* ** Diagram ** */
+
+#ifdef WITH_EXTENSION_DIAGRAM
+
+File gid_File_Oxt_Diagram
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Diagram;
+    Name = "Diagram.oxt";
+End
+
+#endif
+
 /* ** Google Docs ** */
 
 #ifdef WITH_EXTENSION_GOOGLE_DOCS
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 557ad3d1d939..d8b68f5d7d84 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: module_accessories.scp,v $
  *
- *  $Revision: 1.0 $
+ *  $Revision: 1.1 $
  *
- *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
+ *  last change: $Author: KAMI $ $Date: 2010/10/30 19:40:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 3.
@@ -228,6 +228,23 @@ End
 #endif
 #endif
 
+/* ** Diagram ** */
+
+#ifdef WITH_EXTENSION_DIAGRAM
+#ifdef WITH_EXTENSION_INTEGRATION
+Module gid_Module_Optional_Extensions_Diagram
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_DIAGRAM);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Diagram );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+#endif
+
 /* ** Google Docs ** */
 
 #ifdef WITH_EXTENSION_GOOGLE_DOCS
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
index 971c1a70ded0..b77751a514bd 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: module_accessories.ulf,v $
  *
- *  $Revision: 1.0 $
+ *  $Revision: 1.1 $
  *
- *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
+ *  last change: $Author: KAMI $ $Date: 2010/10/30 19:40:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 3.
@@ -105,6 +105,12 @@ en-US = "Watch Window"
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW]
 en-US = "Watch Window"
 
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM]
+en-US = "Diagram"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM]
+en-US = "Diagram"
+
 [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS]
 en-US = "Google Docs & Zoho"