[ooo-build-commit] .: 2 commits - patches/dev300
Thorsten Behrens
thorsten at kemper.freedesktop.org
Mon Aug 16 01:46:41 PDT 2010
patches/dev300/apply | 4 -
patches/dev300/sd-create-table-height-fix.diff | 38 +++++++++---------
patches/dev300/svtools-wmf-clipperf.diff | 52 +++++++++----------------
3 files changed, 40 insertions(+), 54 deletions(-)
New commits:
commit 7a8e48fa54db0045f62d759ec7087d5bfb9cb447
Author: Thorsten Behrens <thb at openoffice.org>
Date: Mon Aug 16 10:41:04 2010 +0200
Ported Impress table height fix to OOO330
* patches/dev300/apply: enabled below patch again
* patches/dev300/sd-create-table-height-fix.diff: ported to OOO330
code line
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8dc0388..ebaa738 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3016,7 +3016,7 @@ oox-pptx-export-fix-hidden-slides.diff, n#499131, rodo
external-apm-header.diff, freuter
wmf-mm-text.diff, n#417818, rodo
wmf-mm-text-1.diff, n#417818, rodo
-# FIXME dev300-m83 sd-create-table-height-fix.diff, i#100275, thorsten
+sd-create-table-height-fix.diff, i#100275, thorsten
[ OOXML ]
# FIXME ooo330-m2: disabled some hunks; the files were probably completely
diff --git a/patches/dev300/sd-create-table-height-fix.diff b/patches/dev300/sd-create-table-height-fix.diff
index 19993e6..f88a0df 100644
--- a/patches/dev300/sd-create-table-height-fix.diff
+++ b/patches/dev300/sd-create-table-height-fix.diff
@@ -1,14 +1,16 @@
-From a9342868c071231bb5d6089590ad6b0f71715aed Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:06:21 +0200
-Subject: [PATCH 624/768] sd-create-table-height-fix.diff
+Make initial table row height default to font height
+
+From: Thorsten Behrens <thb at openoffice.org>
+
---
+
sd/source/ui/table/tablefunction.cxx | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
+
diff --git sd/source/ui/table/tablefunction.cxx sd/source/ui/table/tablefunction.cxx
-index 525826e..ea0abd3 100644
+index 3485f09..6123080 100755
--- sd/source/ui/table/tablefunction.cxx
+++ sd/source/ui/table/tablefunction.cxx
@@ -67,6 +67,7 @@
@@ -19,19 +21,17 @@ index 525826e..ea0abd3 100644
#include "Window.hxx"
#include "drawview.hxx"
#include "sdresid.hxx"
-@@ -147,7 +148,11 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
- nRows = pDlg->getRows();
+@@ -158,8 +159,12 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
}
+ else
+ {
+- Size aSize( 14100, 200 );
++ Size aSize( 14100, 3000 );
-- Size aSize( 14100, 200 );
-+ Size aSize( 14100, 3000 );
-+
-+ ::sd::Outliner* pSdOutliner = GetDoc()->GetOutliner();
-+ const long nTextHeight = pSdOutliner->GetTextHeight();
-+ aSize.Height() = std::max(aSize.Height(),nRows*nTextHeight);
-
- Point aPos;
- Rectangle aWinRect(aPos, GetActiveWindow()->GetOutputSizePixel() );
---
-1.7.0.1
-
++ ::sd::Outliner* pSdOutliner = GetDoc()->GetOutliner();
++ const long nTextHeight = pSdOutliner->GetTextHeight();
++ aSize.Height() = std::max(aSize.Height(),nRows*nTextHeight);
++
+ Point aPos;
+ Rectangle aWinRect(aPos, GetActiveWindow()->GetOutputSizePixel() );
+ aPos = aWinRect.Center();
commit 9adead5ee60dffe95682493beef9ee39a7e4dd1b
Author: Thorsten Behrens <thb at openoffice.org>
Date: Mon Aug 16 10:32:24 2010 +0200
Ported wmf import speedup to OOO330
* patches/dev300/apply: enabled below patch again
* patches/dev300/svtools-wmf-clipperf.diff: ported changes to OOO330
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 02bc66e..8dc0388 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3557,7 +3557,7 @@ slideshow-sound.diff, n#515553, rodo
vcl-gtk-process-events-on-exit.diff, rodo
sfx2-add-to-recently-used-after-save.diff, rodo
-# FIXME dev300-m77 svtools-wmf-clipperf.diff, n#535304, thorsten # update
+svtools-wmf-clipperf.diff, n#535304, thorsten
[ Fixes ]
# Fix for UTF-8 encoded hyphen dictionaries (e.g. Hungarian)
diff --git a/patches/dev300/svtools-wmf-clipperf.diff b/patches/dev300/svtools-wmf-clipperf.diff
index a7dccd8..d3a5323 100644
--- a/patches/dev300/svtools-wmf-clipperf.diff
+++ b/patches/dev300/svtools-wmf-clipperf.diff
@@ -1,18 +1,19 @@
-From 2df013cf3a2ab8de56804825e92730b84b8883a5 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:09:09 +0200
-Subject: [PATCH 853/878] svtools-wmf-clipperf.diff
+Use speedy basegfx clipper on wmf import
+
+From: Thorsten Behrens <thb at openoffice.org>
+
---
- svtools/source/filter.vcl/wmf/winmtf.cxx | 182 +++++++++++------------------
- svtools/source/filter.vcl/wmf/winmtf.hxx | 38 +++----
- svtools/util/makefile.mk | 1 +
- 3 files changed, 86 insertions(+), 135 deletions(-)
-diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx
-index b49c26e..30e406c 100644
---- a/svtools/source/filter.vcl/wmf/winmtf.cxx
-+++ b/svtools/source/filter.vcl/wmf/winmtf.cxx
+ svtools/source/filter.vcl/wmf/winmtf.cxx | 182 +++++++++++-------------------
+ svtools/source/filter.vcl/wmf/winmtf.hxx | 38 +++---
+ 2 files changed, 85 insertions(+), 135 deletions(-)
+
+
+diff --git svtools/source/filter.vcl/wmf/winmtf.cxx svtools/source/filter.vcl/wmf/winmtf.cxx
+index 3c7e25f..88d45ec 100644
+--- svtools/source/filter.vcl/wmf/winmtf.cxx
++++ svtools/source/filter.vcl/wmf/winmtf.cxx
@@ -30,8 +30,11 @@
@@ -26,8 +27,8 @@ index b49c26e..30e406c 100644
#include <rtl/tencinfo.h>
@@ -42,103 +45,56 @@
-
- #define WIN_MTF_MAX_CLIP_DEPTH 16
+ #define EMFP_DEBUG(x)
+ //#define EMFP_DEBUG(x) x
-void WinMtfClipPath::ImpUpdateType()
+void WinMtfClipPath::intersectClipRect( const Rectangle& rRect )
@@ -326,10 +327,10 @@ index b49c26e..30e406c 100644
}
if ( meLatestRasterOp != meRasterOp )
mpGDIMetaFile->AddAction( new MetaRasterOpAction( meRasterOp ) );
-diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx
-index 7efc8db..0266f4b 100644
---- a/svtools/source/filter.vcl/wmf/winmtf.hxx
-+++ b/svtools/source/filter.vcl/wmf/winmtf.hxx
+diff --git svtools/source/filter.vcl/wmf/winmtf.hxx svtools/source/filter.vcl/wmf/winmtf.hxx
+index c427281..d9c95bf 100644
+--- svtools/source/filter.vcl/wmf/winmtf.hxx
++++ svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -45,6 +45,7 @@
#include <vcl/graph.hxx>
#include <vcl/virdev.hxx>
@@ -396,18 +397,3 @@ index 7efc8db..0266f4b 100644
std::vector< SaveStructPtr > vSaveStack;
-diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk
-index 3166a0f..40b1e54 100644
---- a/svtools/util/makefile.mk
-+++ b/svtools/util/makefile.mk
-@@ -136,6 +136,7 @@ SHL1STDLIBS+= \
- $(VCLLIB) \
- $(SVLLIB) \
- $(SOTLIB) \
-+ $(BASEGFXLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list