[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 3 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/ooo86080.unopkg.bodge.diff               |   15 ++----------
 patches/dev300/oooXXXXX.vcl.x86_64.impressatk.diff      |   11 ---------
 patches/dev300/oox-xlsx-import-fix-connector-shape.diff |   19 +---------------
 3 files changed, 6 insertions(+), 39 deletions(-)

New commits:
commit a9daa21b0896c557ae79acdd2bb9f1a45b76a101
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:27:38 2011 +0300

    Make ooo86080.unopkg.bodge.diff apply again

diff --git a/patches/dev300/ooo86080.unopkg.bodge.diff b/patches/dev300/ooo86080.unopkg.bodge.diff
index a6a1af3..5850521 100644
--- a/patches/dev300/ooo86080.unopkg.bodge.diff
+++ b/patches/dev300/ooo86080.unopkg.bodge.diff
@@ -1,9 +1,3 @@
----
- desktop/scripts/unopkg.sh |   29 +++++++++++++++++++++++++++--
- 1 files changed, 27 insertions(+), 2 deletions(-)
-
-diff --git desktop/scripts/unopkg.sh desktop/scripts/unopkg.sh
-index 5a8ee26..df3856a 100644
 --- desktop/scripts/unopkg.sh
 +++ desktop/scripts/unopkg.sh
 @@ -43,6 +43,29 @@ fi
@@ -35,18 +29,15 @@ index 5a8ee26..df3856a 100644
 +
  #collect all bootstrap variables specified on the command line
  #so that they can be passed as arguments to javaldx later on
- for arg in $@
+ #Recognize the "sync" option. sync must be applied without any other
 @@ -71,6 +94,8 @@ unset XENVIRONMENT
  # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
  
  # execute binary
--exec "$sd_prog/unopkg.bin" "$@" \
-+"$sd_prog/unopkg.bin" "$@" \
+-exec "$sd_prog/unopkg.bin" "$@"  "$JVMFWKPARAMS" \
++"$sd_prog/unopkg.bin" "$@" "$JVMFWKPARAMS" \
      "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
 -
 +if [ -n "$INSTDIR" ]; then
 +   rm -rf $INSTDIR
 +fi
--- 
-1.7.0.1
-
commit 9a2164222f5081a7daf5c23e19390b3bd56c57a3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:25:19 2011 +0300

    Make oooXXXXX.vcl.x86_64.impressatk.diff apply again

diff --git a/patches/dev300/oooXXXXX.vcl.x86_64.impressatk.diff b/patches/dev300/oooXXXXX.vcl.x86_64.impressatk.diff
index bdb80e3..ae00951 100644
--- a/patches/dev300/oooXXXXX.vcl.x86_64.impressatk.diff
+++ b/patches/dev300/oooXXXXX.vcl.x86_64.impressatk.diff
@@ -1,9 +1,3 @@
----
- vcl/unx/gtk/a11y/atkutil.cxx |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git vcl/unx/gtk/a11y/atkutil.cxx vcl/unx/gtk/a11y/atkutil.cxx
-index 1f0eca8..0d54d8e 100644
 --- vcl/unx/gtk/a11y/atkutil.cxx
 +++ vcl/unx/gtk/a11y/atkutil.cxx
 @@ -624,6 +624,7 @@ static void handle_menu_highlighted(::VclMenuEvent const * pEvent)
@@ -15,7 +9,7 @@ index 1f0eca8..0d54d8e 100644
      {
      case VCLEVENT_WINDOW_SHOW:
 @@ -708,6 +709,10 @@ long WindowEventHandler(void *, ::VclSimpleEvent const * pEvent)
- //        OSL_TRACE("got event %d \n", pEvent->GetId());
+     default:
          break;
      }
 +    } catch(lang::IndexOutOfBoundsException e)
@@ -25,6 +19,3 @@ index 1f0eca8..0d54d8e 100644
      return 0;
  }
  
--- 
-1.7.0.1
-
commit f3d7ab55db6708155899168e5a2e7451ae9bce2c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:23:26 2011 +0300

    Make oox-xlsx-import-fix-connector-shape.diff apply again

diff --git a/patches/dev300/oox-xlsx-import-fix-connector-shape.diff b/patches/dev300/oox-xlsx-import-fix-connector-shape.diff
index 609e6fe..c4623c8 100644
--- a/patches/dev300/oox-xlsx-import-fix-connector-shape.diff
+++ b/patches/dev300/oox-xlsx-import-fix-connector-shape.diff
@@ -1,11 +1,3 @@
----
- oox/source/drawingml/shape.cxx     |   12 ++++++++++++
- oox/source/token/properties.txt    |    1 +
- oox/source/xls/drawingfragment.cxx |   22 +++++++++++++++++++---
- 3 files changed, 32 insertions(+), 3 deletions(-)
-
-diff --git oox/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx
-index eed2241..765a559 100644
 --- oox/source/drawingml/shape.cxx
 +++ oox/source/drawingml/shape.cxx
 @@ -47,6 +47,7 @@
@@ -15,7 +7,7 @@ index eed2241..765a559 100644
 +#include <com/sun/star/drawing/ConnectorType.hpp>
  #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
  #include <com/sun/star/text/XText.hpp>
- #include <com/sun/star/style/ParagraphAdjust.hpp>
+ #include <com/sun/star/chart2/XChartDocument.hpp>
 @@ -337,6 +338,17 @@ Reference< XShape > Shape::createAndInsert(
  
          maShapeProperties[ PROP_StartPosition ] <<= aAWTStartPosition;
@@ -34,8 +26,6 @@ index eed2241..765a559 100644
      }
      else
      {
-diff --git oox/source/token/properties.txt oox/source/token/properties.txt
-index f702ff6..2ebd712 100644
 --- oox/source/token/properties.txt
 +++ oox/source/token/properties.txt
 @@ -115,6 +115,7 @@ DisplayLabels
@@ -46,8 +36,6 @@ index f702ff6..2ebd712 100644
  EnableVisible
  Enabled
  EndPosition
-diff --git oox/source/xls/drawingfragment.cxx oox/source/xls/drawingfragment.cxx
-index 7e6cae7..fe7cc9e 100644
 --- oox/source/xls/drawingfragment.cxx
 +++ oox/source/xls/drawingfragment.cxx
 @@ -506,10 +506,26 @@ void OoxDrawingFragment::onEndElement( const OUString& rChars )
@@ -79,7 +67,4 @@ index 7e6cae7..fe7cc9e 100644
 +                if( (aShapeRect.Width >= 0) && (aShapeRect.Height >= 0) )
                  {
                      mxShape->addShape( getOoxFilter(), &getTheme(), mxDrawPage, &aShapeRect );
-                     // collect all shape positions in the WorksheetHelper base class
--- 
-1.7.0.1
-
+                     /*  Collect all shape positions in the WorksheetHelper base