[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Jan Holesovsky]

 patches/dev300/apply                                           |    3 
 patches/dev300/table-wizard-swap-private-business-i102019.diff |   48 ++++++++++
 2 files changed, 51 insertions(+)

New commits:
commit 32617318071d3202efc72ca9b1aa96dcb71059dd
Author: Rail Aliev <rail at openoffice.org>
Date:   Mon Aug 10 17:13:29 2009 +0400

    Fix Base Table Wizard categories
    
    Base Table Wizard wrongly swaps Business and Private table categories. Fixed
    upstream in dba32d, DEV300_m52. See i#102019 for the details.
    
    * patches/dev300/apply:
    * patches/dev300/table-wizard-swap-private-business-i102019.diff: patch to fix
      i#102019.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0b4324f..3252cac 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -319,6 +319,9 @@ basic-add-missing-includes-after-cws-npower10.diff
 # GetDialogParent() symbol needs to be exported.
 vba-show-data-form-link-fix.diff, kohei
 
+# Base Table Wizard bug, fixed in dba32d, integrated into DEV300_m52
+table-wizard-swap-private-business-i102019.diff
+
 [ WPG ]
 # libwpg-based import filter for WordPerfect Graphics
 libwpg.diff
diff --git a/patches/dev300/table-wizard-swap-private-business-i102019.diff b/patches/dev300/table-wizard-swap-private-business-i102019.diff
new file mode 100644
index 0000000..af783a1
--- /dev/null
+++ b/patches/dev300/table-wizard-swap-private-business-i102019.diff
@@ -0,0 +1,48 @@
+--- wizards/com/sun/star/wizards/table/ScenarioSelector.java.orig	2009-08-09 09:21:24.000000000 +0400
++++ wizards/com/sun/star/wizards/table/ScenarioSelector.java	2009-08-09 09:23:37.000000000 +0400
+@@ -67,6 +67,9 @@
+ public class ScenarioSelector extends FieldSelection implements XItemListener, XFieldSelectionListener
+ {
+ 
++    final static int PRIVATE = 0;
++    final static int BUSINESS = 1;
++    
+     XFixedText lblExplanation;
+     XFixedText lblCategories;
+     XRadioButton optBusiness;
+@@ -171,18 +174,18 @@
+         {
+             e.printStackTrace(System.out);
+         }
+-        initializeCategory(0);
++        initializeCategory(BUSINESS);
+     }
+ 
+     public int getCategory()
+     {
+         if (optBusiness.getState())
+         {
+-            curcategory = 0;
++            curcategory = BUSINESS;
+         }
+         else
+         {
+-            curcategory = 1;
++            curcategory = PRIVATE;
+         }
+         return curcategory;
+     }
+@@ -191,11 +194,11 @@
+     {
+         if (optBusiness.getState())
+         {
+-            initializeCategory(0);
++            initializeCategory(BUSINESS);
+         }
+         else
+         {
+-            initializeCategory(1);
++            initializeCategory(PRIVATE);
+         }
+     }
+