[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - 2 commits - configure.in NEWS patches/dev300

[Petr Mladek]

 NEWS                                                    |   33 ++++++++++++++++
 configure.in                                            |    4 -
 patches/dev300/optional-icon-themes-without-oxygen.diff |    8 ++-
 patches/dev300/optional-icon-themes.diff                |    8 ++-
 4 files changed, 47 insertions(+), 6 deletions(-)

New commits:
commit 89dbb3bb1fc8fb28c907449aa549dfee2f6d4f90
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue May 25 17:23:28 2010 +0200

    Release ooo-build-3.2.1.2  (3.2.1-rc2)
    
    * version 3.2.1.2  (3.2-rc2)
    * tag OOO_BUILD_3_2_1_2

diff --git a/NEWS b/NEWS
index 772e99d..f18b79e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,36 @@
+ooo-build-3.2.1.2 (3.2.1-rc2)
+
+    + features:
+	+ support ooo320-m18 [Rene]
+	+ updated extensionaids to version 20100518 [KAMI]
+    + common bits:
+	+ show the really used default icon theme in options (bnc#603169) [Petr]
+    + Calc bits:
+	+ pasting time data into two cells crasher (bnc#606975) [Kohei]
+    + Draw bits:
+	+ associate application/x-wpg with oodraw (bnc#589624) [Petr]
+    + Impress bits:
+	+ embedded media break on 2nd load [Thorsten]
+	+ pressing 'Apply' in the Media Player crasher (bnc#597691) [Thorsten]
+    + Writer bits:
+	+ document comparsion saving improvements [Thorsten] 
+	+ bullets RTF import/export bugs (bnc#569266) [Cédric]
+    + l10n bugs:
+	+ localize the layouted zoom dialog (bnc#595823)
+    + KDE4 bits:
+	+ redraw the status bar when needed (bnc#567886, i#107945) [pl, Petr]
+    + build bits:
+	+ build on MAC (Thorsten)
+    + split build:
+	+ sort filelists to get repeatable results [AndreasJ]
+    + Novell bits:
+	+ disable gcj in supported JRE's [Petr]
+    + Ubuntu bits:
+	+ add support to turn off locking for cifs [Chris]
+    + pending:
+	+ sheet name in formula column in WatchWindow ext. (bnc#604638) [Kohei]
+	+ set FileFormatVersion for the ISO/IEC OOXML presentation filters [Tor]
+
 ooo-build-3.2.1.1 (3.2.1-rc1)
 
     + features:
diff --git a/configure.in b/configure.in
index e6aa30a..1860f56 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
-AC_INIT(ooo-build, 3.2.1.1)
+AC_INIT(ooo-build, 3.2.1.2)
 AC_PREREQ(2.51)
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
 
-DEFAULT_TAG=ooo320-m17
+DEFAULT_TAG=ooo320-m18
 # For the upstream packages it is like:
 # DEFAULT_TAG=OOO320_m1
 
commit 501f0e5cb908e6814e2dcfbbffcf6f22166f0b2b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue May 25 16:51:59 2010 +0200

    Show the really used default icon theme in options (bnc#603169)
    
    * patches/dev300/optional-icon-themes-without-oxygen.diff:
    * patches/dev300/optional-icon-themes.diff: check also the icon theme
      prefered by the native widget plugin (bnc#603169)

diff --git a/patches/dev300/optional-icon-themes-without-oxygen.diff b/patches/dev300/optional-icon-themes-without-oxygen.diff
index 591b6d7..327a61d 100644
--- a/patches/dev300/optional-icon-themes-without-oxygen.diff
+++ b/patches/dev300/optional-icon-themes-without-oxygen.diff
@@ -311,7 +311,7 @@
      // add real theme name to 'auto' theme, e.g. 'auto' => 'auto (classic)'
      if( aIconStyleLB.GetEntryCount() > 1 )
      {
-@@ -809,19 +834,14 @@ OfaViewTabPage::OfaViewTabPage(Window* p
+@@ -809,19 +834,18 @@ OfaViewTabPage::OfaViewTabPage(Window* p
  
          aAutoStr += ::rtl::OUString::createFromAscii( " (" );
  
@@ -324,7 +324,11 @@
 -            case STYLE_SYMBOLS_CLASSIC:     aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
 -            case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
 -        }
-+        ULONG nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
++        // prefer the icon style set by the desktop native widgets modules
++        ULONG nAutoStyle = aStyleSettings.GetPreferredSymbolsStyle();
++        // fallback to the statically defined values
++        if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId[nAutoStyle] )
++            nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
 +        if ( aIconStyleItemId[nAutoStyle] )
 +                aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] );
  
diff --git a/patches/dev300/optional-icon-themes.diff b/patches/dev300/optional-icon-themes.diff
index aba6b6e..31eaac4 100644
--- a/patches/dev300/optional-icon-themes.diff
+++ b/patches/dev300/optional-icon-themes.diff
@@ -311,7 +311,7 @@
      // add real theme name to 'auto' theme, e.g. 'auto' => 'auto (classic)'
      if( aIconStyleLB.GetEntryCount() > 1 )
      {
-@@ -809,20 +834,14 @@ OfaViewTabPage::OfaViewTabPage(Window* p
+@@ -809,20 +834,18 @@ OfaViewTabPage::OfaViewTabPage(Window* p
  
          aAutoStr += ::rtl::OUString::createFromAscii( " (" );
  
@@ -325,7 +325,11 @@
 -            case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
 -            case STYLE_SYMBOLS_OXYGEN:      aAutoStr += aIconStyleLB.GetEntry( 7 ); break;
 -        }
-+        ULONG nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
++        // prefer the icon style set by the desktop native widgets modules
++        ULONG nAutoStyle = aStyleSettings.GetPreferredSymbolsStyle();
++        // fallback to the statically defined values
++        if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId[nAutoStyle] )
++            nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
 +        if ( aIconStyleItemId[nAutoStyle] )
 +                aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] );