Added a twips converter for column widths and row heights

3 files changed, 135 insertions, 4 deletions

diff --git a/xmerge/java/org/openoffice/xmerge/util/Debug.properties b/xmerge/java/org/openoffice/xmerge/util/Debug.properties
index e08f38f8f601..981106d058f5 100644
--- a/xmerge/java/org/openoffice/xmerge/util/Debug.properties
+++ b/xmerge/java/org/openoffice/xmerge/util/Debug.properties
@@ -57,9 +57,9 @@
 #  debug logging information and settings.
 #
 
-debug.info=false
-debug.trace=false
-debug.error=false
-debug.output=System.err
+debug.info=true
+debug.trace=true
+debug.error=true
+debug.output=System.out
 
 
diff --git a/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java b/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java
new file mode 100644
index 000000000000..3a2ba05ead1d
--- /dev/null
+++ b/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java
@@ -0,0 +1,130 @@
+/************************************************************************
+ *
+ *  EndianConverter.java
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2001 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+
+package org.openoffice.xmerge.util;
+
+
+/**
+ * <p>Helper class providing static methods to convert data to/from
+ *    twips</p>
+ *
+ * @author  Martin Maher
+ */
+public class TwipsConverter {
+
+    /**
+     * <p>Convert from twips to cm's</p>
+     *
+     * @param   value   The <code>short</code> to be converted.
+     *
+     * @return   float containing the converted
+     */
+    public static float twips2cm(int value) {
+
+        float inches = (float) value/1440;
+        float cm = (float) inches*(float)2.54;
+
+        return cm;
+    }
+
+
+
+    /**
+     * <p>Convert from cm's to twips</p>
+     *
+     * @param   value   <code>byte</code> array containing the LE representation
+     *                  of the value.
+     *
+     * @return  int containing the converted value.
+     */
+    public static int cm2twips(float value) {
+
+        int twips = (int) ((value/2.54)*1440);
+
+        return twips;
+    }
+
+    /**
+     * <p>Convert from twips to cm's</p>
+     *
+     * @param   value   The <code>short</code> to be converted.
+     *
+     * @return   float containing the converted
+     */
+    public static float twips2inches(int value) {
+
+        return (float) value/1440;
+    }
+
+
+
+    /**
+     * <p>Convert from cm's to twips</p>
+     *
+     * @param   value   <code>byte</code> array containing the LE representation
+     *                  of the value.
+     *
+     * @return  int containing the converted value.
+     */
+    public static int inches2twips(float value) {
+
+        return (int) (value*1440);
+    }
+
+
+}
diff --git a/xmerge/java/org/openoffice/xmerge/util/build.xml b/xmerge/java/org/openoffice/xmerge/util/build.xml
index 816c64d0844c..d956d0f2f673 100644
--- a/xmerge/java/org/openoffice/xmerge/util/build.xml
+++ b/xmerge/java/org/openoffice/xmerge/util/build.xml
@@ -139,6 +139,7 @@
             <include name="${package}/XmlUtil.java"/>
             <include name="${package}/Debug.java"/>
             <include name="${package}/EndianConverter.java"/>
+            <include name="${package}/TwipsConverter.java"/>
             <include name="${package}/OfficeUtil.java"/>
             <include name="${package}/ActiveSyncDriver.java"/>
         </javac>