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

[Tor Lillqvist]

 patches/dev300/goodies-eps-filter-unix.diff             |   15 +++------------
 patches/dev300/svx-sdrobjeditview-update-edit-area.diff |   11 +----------
 2 files changed, 4 insertions(+), 22 deletions(-)

New commits:
commit db0b98084cf9bd88a12e3bea171c1e2113d868d8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 11:52:41 2011 +0300

    Make goodies-eps-filter-unix.diff apply again

diff --git a/patches/dev300/goodies-eps-filter-unix.diff b/patches/dev300/goodies-eps-filter-unix.diff
index 02956a9..0b18796 100644
--- a/patches/dev300/goodies-eps-filter-unix.diff
+++ b/patches/dev300/goodies-eps-filter-unix.diff
@@ -1,19 +1,13 @@
----
- filter/source/graphicfilter/eps/eps.cxx |   14 +++++++++++++-
- 1 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git filter/source/graphicfilter/eps/eps.cxx filter/source/graphicfilter/eps/eps.cxx
-index 4cf73f0..499fc6c 100644
 --- filter/source/graphicfilter/eps/eps.cxx
 +++ filter/source/graphicfilter/eps/eps.cxx
 @@ -293,7 +293,11 @@ BOOL PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter
      // default values for the dialog options
      mnLevel = 2;
-     mbGrayScale = FALSE;
+     mbGrayScale = sal_False;
 +#ifdef UNX // don't compress by default on unix as ghostscript is unable to read LZW compressed eps
-+    mbCompression = FALSE;
++    mbCompression = sal_False;
 +#else
-     mbCompression = TRUE;
+     mbCompression = sal_True;
 +#endif
      mnTextMode = 0;			// default0 : export glyph outlines
  
@@ -40,6 +34,3 @@ index 4cf73f0..499fc6c 100644
              String sTextMode( RTL_CONSTASCII_USTRINGPARAM( "TextMode" ) );
              mnTextMode = pFilterConfigItem->ReadInt32( sTextMode, 0 );
              if ( mnTextMode > 2 )
--- 
-1.7.0.1
-
commit 8c5fb52b7eacfcd14bc0465d5167397a40699a02
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 11:51:15 2011 +0300

    Make svx-sdrobjeditview-update-edit-area.diff apply again

diff --git a/patches/dev300/svx-sdrobjeditview-update-edit-area.diff b/patches/dev300/svx-sdrobjeditview-update-edit-area.diff
index 56dadca..010ee67 100644
--- a/patches/dev300/svx-sdrobjeditview-update-edit-area.diff
+++ b/patches/dev300/svx-sdrobjeditview-update-edit-area.diff
@@ -1,9 +1,3 @@
----
- svx/source/svdraw/svdedxv.cxx |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git svx/source/svdraw/svdedxv.cxx svx/source/svdraw/svdedxv.cxx
-index f277e35..ab0148b 100644
 --- svx/source/svdraw/svdedxv.cxx
 +++ svx/source/svdraw/svdedxv.cxx
 @@ -455,8 +455,9 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, BOOL /*bNoPaint*
@@ -12,11 +6,8 @@ index f277e35..ab0148b 100644
      }
 -    pOutlView->SetOutputArea(aTextEditArea);
 +    // do update before setting output area so that aTextEditArea can be recalculated
-     pTextEditOutliner->SetUpdateMode(TRUE);
+     pTextEditOutliner->SetUpdateMode(sal_True);
 +    pOutlView->SetOutputArea(aTextEditArea);
      ImpInvalidateOutlinerView(*pOutlView);
      return pOutlView;
  }
--- 
-1.7.0.1
-