[Libreoffice-commits] .: bin/setup.in bin/unpack configure.in download.in po/sdf-templates

[Kalman "" Szalai]

 bin/setup.in                      |    1 +
 bin/unpack                        |    7 +++++++
 configure.in                      |   19 +++++++++++++++++++
 download.in                       |    3 +++
 po/sdf-templates/OxygenOffice.sdf |    2 ++
 5 files changed, 32 insertions(+)

New commits:
commit fca06d2bb9f916456f2e421cc315510a0a741c39
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Sat Oct 30 19:59:08 2010 +0200

    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

diff --git a/bin/setup.in b/bin/setup.in
index 6ed5af0..14db4b9 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -43,6 +43,7 @@ HUNART_EXTENSION='@HUNART_EXTENSION@'
 TYPO_EXTENSION='@TYPO_EXTENSION@'
 CT2N_EXTENSION='@CT2N_EXTENSION@'
 WATCH_WINDOW_EXTENSION='@WATCH_WINDOW_EXTENSION@'
+DIAGRAM_EXTENSION='@DIAGRAM_EXTENSION@'
 GOOGLE_DOCS_EXTENSION='@GOOGLE_DOCS_EXTENSION@'
 NLPSOLVER_EXTENSION='@NLPSOLVER_EXTENSION@'
 LANGUAGETOOL_EXTENSION='@LANGUAGETOOL_EXTENSION@'
diff --git a/bin/unpack b/bin/unpack
index 6c13d39..461e10b 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -908,6 +908,13 @@ if test "x$WATCH_WINDOW_EXTENSION" != "x"; then
     cp $SRCDIR/$WATCH_WINDOW_EXTENSION $OOBUILDDIR/extras/source/extensions/WatchWindow.oxt || exit 1
 fi
 
+if test "x$DIAGRAM_EXTENSION" != "x"; then
+    check_file $SRCDIR/$DIAGRAM_EXTENSION
+    echo "Copying Diagram extension into the tree"
+    mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
+    cp $SRCDIR/$DIAGRAM_EXTENSION $OOBUILDDIR/extras/source/extensions/Diagram.oxt || exit 1
+fi
+
 if test "x$GOOGLE_DOCS_EXTENSION" != "x"; then
     check_file $SRCDIR/$GOOGLE_DOCS_EXTENSION
     echo "Copying Google Docs extension into the tree"
diff --git a/configure.in b/configure.in
index 69b10f0..c229e8d 100755
--- a/configure.in
+++ b/configure.in
@@ -476,6 +476,11 @@ AC_ARG_WITH(watch-window,
   --with-watch-window     Download and integrate Watch Window extension to Calc.],
 ,)
 
+AC_ARG_WITH(diagram,
+[
+  --with-diagram          Download and integrate Diagram extension.],
+,)
+
 AC_ARG_WITH(win32,
 [
   --with-win32            Define the build to be on Win32; this sets a number of
@@ -1368,6 +1373,20 @@ fi
 AC_SUBST(WITH_WATCH_WINDOW)
 AC_SUBST(WATCH_WINDOW_EXTENSION)
 
+AC_MSG_CHECKING([whether to include Diagram extension for Calc])
+if test "$enable_extensions" != "no" ; then
+    if test "z$with_diagram" = "zyes" ; then
+        DIAGRAM_EXTENSION="Diagram_1.1.0.0.oxt"
+        WITH_DIAGRAM=YES
+        AC_MSG_RESULT([yes])
+    else
+        WITH_DIAGRAM=NO
+        AC_MSG_RESULT([no])
+    fi
+fi
+AC_SUBST(WITH_DIAGRAM)
+AC_SUBST(DIAGRAM_EXTENSION)
+
 AC_MSG_CHECKING([whether to include Google Docs extension])
 if test "$enable_extensions" != "no" ; then
     if test "z$with_google_docs" = "zyes" ; then
diff --git a/download.in b/download.in
index f65d128..cd3fae6 100755
--- a/download.in
+++ b/download.in
@@ -213,6 +213,9 @@ sub download_tests_dependencies() {
 # Watch Window extension
     'WatchWindow*'                       => 'http://ftp.devall.hu/kami/go-oo/',
 
+# Diagram extension
+    'Diagram*'                           => 'http://ftp.devall.hu/kami/go-oo/',
+
 # Google Docs Extension
     'gdocs*'                             => 'http://download.go-oo.org/src/',
 
diff --git a/po/sdf-templates/OxygenOffice.sdf b/po/sdf-templates/OxygenOffice.sdf
index 0cb5c83..36f630b 100644
--- a/po/sdf-templates/OxygenOffice.sdf
+++ b/po/sdf-templates/OxygenOffice.sdf
@@ -40,6 +40,8 @@ scp2	source\extensions\module_extensions.ulf	0	LngText	STR_NAME_MODULE_OPTIONAL_
 scp2	source\extensions\module_extensions.ulf	0	LngText	STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TYPO				0	en-US	Toolbar for Graphite smart font features: ligatures, small caps, old style numbers, proportional or monospaced numbers, automatic thousand separators, minus sign, real superscript and subscript, German umlaut variants, fractions.				20090819 18:33:07
 scp2	source\extensions\module_extensions.ulf	0	LngText	STR_NAME_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW				0	en-US	Watch Window				20090819 18:33:07
 scp2	source\extensions\module_extensions.ulf	0	LngText	STR_DESC_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW				0	en-US	The Watch Window is a separate, small window that remains "on top" and enables users to monitor a selected set of cells.				20090819 18:33:07
+scp2	source\extensions\module_extensions.ulf	0	LngText	STR_NAME_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM				0	en-US	Diagram				20101030 19:19:00
+scp2	source\extensions\module_extensions.ulf	0	LngText	STR_DESC_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM				0	en-US	Create organization chart, Venn and other diagrams for your documents.				20101030 19:19:00
 scp2	source\extensions\module_extensions.ulf	0	LngText	STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER				0	en-US	Metaweblog Support				20090819 18:33:07
 scp2	source\extensions\module_extensions.ulf	0	LngText	STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER				0	en-US	Metaweblog Support				20090819 18:33:07
 scp2	source\extensions\module_extensions.ulf	0	LngText	STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER				0	en-US	NLP Solver				20090819 18:33:07