[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - 2 commits - extensions/watchwindow

[Kohei Yoshida]

 extensions/watchwindow/build.xml                              |    9 +-
 extensions/watchwindow/watchwindow-leave-ref-flags-alone.diff |   35 ++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

New commits:
commit f130a005c60ed3e7fbea87490685ad9845f9e29c
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri May 14 10:12:14 2010 -0400

    Patch for the WatchWindow extension.
    
    * extensions/watchwindow/watchwindow-leave-ref-flags-alone.diff:
      We should not reset the flags of reference tokens from formula
      cells, as it alters their appearance when they get displayed.
      (n#604638)

diff --git a/extensions/watchwindow/watchwindow-leave-ref-flags-alone.diff b/extensions/watchwindow/watchwindow-leave-ref-flags-alone.diff
new file mode 100644
index 0000000..d960cb1
--- /dev/null
+++ b/extensions/watchwindow/watchwindow-leave-ref-flags-alone.diff
@@ -0,0 +1,35 @@
+diff --git src/description.xml src/description.xml
+index 725cf7e..ff1eaaf 100644
+--- src/description.xml
++++ src/description.xml
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--Created with OpenOffice.org API plug-in for NetBeans Version 2.0.6-->
+ <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
+-    <version value="1.1.2"/>
++    <version value="1.1.2.1"/>
+     <identifier value="org.openoffice.extensions.watchwindow.WatchWindow"/>
+     <extension-description>
+         <src lang="en" xlink:href="description/description_en.txt"/>
+diff --git src/org/openoffice/extensions/watchwindow/WatchedCell.java src/org/openoffice/extensions/watchwindow/WatchedCell.java
+index ed31d18..dd7ed5f 100644
+--- src/org/openoffice/extensions/watchwindow/WatchedCell.java
++++ src/org/openoffice/extensions/watchwindow/WatchedCell.java
+@@ -154,17 +154,6 @@ public class WatchedCell implements XModifyListener, XEventListener{
+     public void setFormula() {
+         XFormulaTokens xTokens = (XFormulaTokens) UnoRuntime.queryInterface(XFormulaTokens.class, m_xCell);
+         FormulaToken[] tokens = xTokens.getTokens();
+-        for(int i=0;i<tokens.length;i++){
+-            if(tokens[i].Data.toString().startsWith("com.sun.star.sheet.ComplexReference")){
+-                ComplexReference ref = (ComplexReference) (tokens[i].Data);
+-                ref.Reference1.Flags = ref.Reference2.Flags = 0;
+-            }
+-            if(tokens[i].Data.toString().startsWith("com.sun.star.sheet.SingleReference")){
+-                SingleReference ref = (SingleReference)(tokens[i].Data);
+-                ref.Flags = 0;
+-            }
+-        }
+-
+         m_formula = m_Controller.getFormulaParser().printFormula(tokens, new CellAddress());
+         if (!m_formula.isEmpty()) {
+             m_formula = "=" + m_formula;
commit d59e6921b43b91c50be26e3d946ddd4db0f11a4c
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri May 14 09:58:34 2010 -0400

    Fixed build.xml for the watch window extension.
    
    * extensions/watchwindow/build.xml:

diff --git a/extensions/watchwindow/build.xml b/extensions/watchwindow/build.xml
index 87ec6a3..485f94c 100644
--- a/extensions/watchwindow/build.xml
+++ b/extensions/watchwindow/build.xml
@@ -3,8 +3,6 @@
     <property name="src" location="src"/>
     <property name="build" location="build"/>
 
-    <property name="version" value="1.0.0"/>
-
     <property name="ooodir" value="/usr/lib/ooo3"/>
     <property name="basisdir" value="${ooodir}/basis-link"/>
     <property name="clsdir" value="${ooodir}/basis-link/ure-link/share/java"/>
@@ -13,7 +11,7 @@
     <property name="clspath" value="${ooo_jars}:."/>
 
     <property name="extjarname" value="WatchWindow.jar"/>
-    <property name="packname" value="watchwindow_${version}.oxt"/>
+    <property name="packname" value="WatchWindow.oxt"/>
 
     <property name="idlc" value="${ooodir}/basis-link/sdk/bin/idlc"/>
     <property name="javamaker" value="${ooodir}/basis-link/sdk/bin/javamaker"/>
@@ -52,8 +50,9 @@
             <fileset dir="." includes="${extjarname}"/>
             <fileset dir="." includes="registry/data/org/openoffice/Office/*.xcu"/>
             <fileset dir="." includes="dialogs/*"/>
-	    <fileset dir="." includes="licenses/*"/>
-	    <fileset dir="." includes="images/*"/>
+            <fileset dir="." includes="licenses/*"/>
+            <fileset dir="." includes="images/*"/>
+            <fileset dir="." includes="description/*"/>
             <fileset dir="src" includes="description.xml"/>
             <zipfileset dir="src" includes="uno-extension-manifest.xml" fullpath="META-INF/manifest.xml"/>
         </zip>