[ooo-build-commit] .: 3 commits - patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Tue Jun 29 10:08:22 PDT 2010
patches/dev300/apply | 10
patches/dev300/buildfix-filter-system-saxon.diff | 12 +
patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff | 19 +
patches/dev300/sd-bitmapex-static-pointer.diff | 146 +++++++++++++
4 files changed, 187 insertions(+)
New commits:
commit 86363afb96014da22223811989af956d6868b7a9
Author: Rene Engelhard <rene at debian.org>
Date: Tue Jun 29 17:01:30 2010 +0200
fix crash in smoketest (from issue 112758)
* patches/dev300/apply:
* patches/dev300/sd-bitmapex-static-pointer.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index af7ece7..2d54883 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3541,6 +3541,10 @@ evaluation-row-limit.diff
# FIXME dev300-m77 valgrind-fixes.diff, thorsten #fixme
framework-menubar-fix.diff, thorsten
+[ Fixes < dev300-m84 ]
+# fix smoketest after m81
+sd-bitmapex-static-pointer.diff, i#112758
+
[ BuildBits ]
# Allow oowintool to detect java sdk 1.6.x
oowintool-java6.diff, fridrich
diff --git a/patches/dev300/sd-bitmapex-static-pointer.diff b/patches/dev300/sd-bitmapex-static-pointer.diff
new file mode 100644
index 0000000..7efd8a3
--- /dev/null
+++ b/patches/dev300/sd-bitmapex-static-pointer.diff
@@ -0,0 +1,146 @@
+
+# HG changeset patch
+# User obo <obo at openoffice.org>
+# Date 1277818304 -7200
+# Node ID 85e7cfbbb08a63f906a1e6b83423c151680ccc19
+# Parent ee646bc28185b4ef4bb642d6e504f99ae89c7746
+masterfix: #i112758# integration of renaissance2 in m81 broke smoketestoo_native
+
+diff -r ee646bc28185 -r 85e7cfbbb08a sd/source/ui/inc/view/viewoverlaymanager.hxx
+--- sd/source/ui/inc/view/viewoverlaymanager.hxx Tue Jun 29 12:23:10 2010 +0200
++++ sd/source/ui/inc/view/viewoverlaymanager.hxx Tue Jun 29 15:31:44 2010 +0200
+@@ -59,12 +59,7 @@
+
+ virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
+
+- static BitmapEx maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START];
+- static BitmapEx maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START];
+-
+ private:
+- void UpdateImages();
+-
+ ViewShellBase& mrBase;
+ ULONG mnUpdateTagsEvent;
+
+diff -r ee646bc28185 -r 85e7cfbbb08a sd/source/ui/view/viewoverlaymanager.cxx
+--- sd/source/ui/view/viewoverlaymanager.cxx Tue Jun 29 12:23:10 2010 +0200
++++ sd/source/ui/view/viewoverlaymanager.cxx Tue Jun 29 15:31:44 2010 +0200
+@@ -45,6 +45,7 @@
+
+ #include <vcl/help.hxx>
+ #include <vcl/imagerepository.hxx>
++#include <vcl/lazydelete.hxx>
+
+ #include <svx/sdrpagewindow.hxx>
+ #include <svx/sdrpaintwindow.hxx>
+@@ -79,9 +80,6 @@
+
+ // --------------------------------------------------------------------
+
+-BitmapEx ViewOverlayManager::maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START];
+-BitmapEx ViewOverlayManager::maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START];
+-
+ static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
+ static USHORT gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE };
+
+@@ -97,6 +95,32 @@
+
+ // --------------------------------------------------------------------
+
++static BitmapEx* getButtonImage( int index, bool large )
++{
++ static vcl::DeleteOnDeinit< BitmapEx > gSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START] = { 0, 0, 0, 0, 0, 0, 0, 0 };
++ static vcl::DeleteOnDeinit< BitmapEx > gLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START] = { 0, 0, 0, 0, 0, 0, 0, 0 };
++
++ if( !gSmallButtonImages[0].get() )
++ {
++ for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ )
++ {
++ gSmallButtonImages[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_SMALL_START + i ) ) );
++ gLargeButtonImages[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_LARGE_START + i ) ) );
++ }
++ }
++
++ if( large )
++ {
++ return gLargeButtonImages[index].get();
++ }
++ else
++ {
++ return gSmallButtonImages[index].get();
++ }
++}
++
++// --------------------------------------------------------------------
++
+ const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32;
+
+ class ChangePlaceholderTag : public SmartTag
+@@ -374,20 +398,20 @@
+ Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize());
+ long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height());
+
+- BitmapEx* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0];
++ bool bLarge = nShapeSizePix > 250;
+
+- Size aSize( pImages->GetSizePixel() );
++ Size aSize( getButtonImage( 0, bLarge )->GetSizePixel() );
+
+ aRet.SetSizePixel( Size( aSize.Width() << 1, aSize.Height() << 1 ) );
+
+ const Rectangle aRectSrc( Point( 0, 0 ), aSize );
+
+- aRet = pImages[(nHighlight == 0) ? 4 : 0];
++ aRet = *(getButtonImage((nHighlight == 0) ? 4 : 0, bLarge));
+ aRet.Expand( aSize.Width(), aSize.Height(), NULL, TRUE );
+
+- aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, &pImages[(nHighlight == 1) ? 5 : 1] );
+- aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, &pImages[(nHighlight == 2) ? 6 : 2] );
+- aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, &pImages[(nHighlight == 3) ? 7 : 3] );
++ aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, getButtonImage((nHighlight == 1) ? 5 : 1, bLarge) );
++ aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 2) ? 6 : 2, bLarge) );
++ aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 3) ? 7 : 3, bLarge) );
+ }
+
+ return aRet;
+@@ -411,9 +435,9 @@
+ if( 50 > nShapeSizePix )
+ return;
+
+- BitmapEx* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0];
++ bool bLarge = nShapeSizePix > 250;
+
+- Size aButtonSize( pDev->PixelToLogic(pImages[0].GetSizePixel()) );
++ Size aButtonSize( pDev->PixelToLogic( getButtonImage(0, bLarge )->GetSizePixel()) );
+
+ const int nColumns = 2;
+ const int nRows = 2;
+@@ -490,17 +514,6 @@
+
+ // --------------------------------------------------------------------
+
+-void ViewOverlayManager::UpdateImages()
+-{
+- for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ )
+- {
+- maSmallButtonImages[i] = loadImageResource( BMP_PLACEHOLDER_SMALL_START + i );
+- maLargeButtonImages[i] = loadImageResource( BMP_PLACEHOLDER_LARGE_START + i );
+- }
+-}
+-
+-// --------------------------------------------------------------------
+-
+ void ViewOverlayManager::Notify(SfxBroadcaster&, const SfxHint& rHint)
+ {
+ const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
+@@ -548,9 +561,6 @@
+
+ if( pPage )
+ {
+- if( !maSmallButtonImages[0] )
+- UpdateImages();
+-
+ const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList();
+
+ for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ )
+
commit 31eda420561c57e36561d941d62aac0145108eab
Author: Rene Engelhard <rene at debian.org>
Date: Mon Jun 28 17:01:23 2010 +0200
fix build without PKGFORMAT set
* patches/dev300/apply:
* patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8dbbea8..af7ece7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -273,6 +273,9 @@ gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
# add the .archive flag to some instsetoo_native/util/makefile.mk rules
buildfix-instsetoo_native-archive.diff, i#111617
+[ TemporaryHacks >= dev300-m83 ]
+buildfix-instsetoo_native-no-PKGFORMAT.diff, i#112761, rengelha
+
[ TemporaryHacks and not MacOSXOnly ]
# don't lstat() that much while creating absolute URLs - breaks unopkg
diff --git a/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff b/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
new file mode 100644
index 0000000..466d8a0
--- /dev/null
+++ b/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
@@ -0,0 +1,19 @@
+diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
+--- instsetoo_native/util/makefile.mk
++++ instsetoo_native/util/makefile.mk
+@@ -201,6 +201,7 @@
+
+ .ENDIF # "$(BUILD_SPECIAL)"!=""
+
++.IF "$(PKGFORMAT)" != ""
+ $(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
+ .IF "$(MAKETARGETS)"!=""
+ .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
+@@ -277,6 +278,7 @@
+ @echo cannot pack nothing...
+
+ .ENDIF # "$(alllangiso)"!=""
++.ENDIF
+
+ .IF "$(LOCALPYFILES)"!=""
+ $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
commit bd5930ee7f6ac07ed2ef14002a919a5c52bbda23
Author: Rene Engelhard <rene at debian.org>
Date: Mon Jun 28 10:41:39 2010 +0200
fix XCLASSPATH setting for system-saxon
* patches/dev300/apply:
* patches/dev300/buildfix-filter-system-saxon.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index dd87505..8dbbea8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1078,6 +1078,9 @@ dmake-space-in-envvar-name.diff, i#101786, jholesov
# return 0 with -h option
# FIXME dev300-m77 transex3-localize.pl-ooo-build.diff, i#107386, pmladek # RENAMED transex3 -> l10ntools
+# fix XCLASSPATH setting for system-saxon
+buildfix-filter-system-saxon.diff. i#112741
+
[ Gcc44 ]
oox-tokenmap.string.h.diff, i#105219
diff --git a/patches/dev300/buildfix-filter-system-saxon.diff b/patches/dev300/buildfix-filter-system-saxon.diff
new file mode 100644
index 0000000..8fc4c44
--- /dev/null
+++ b/patches/dev300/buildfix-filter-system-saxon.diff
@@ -0,0 +1,12 @@
+diff --git a/filter/source/xsltfilter/makefile.mk b/filter/source/xsltfilter/makefile.mk
+--- filter/source/xsltfilter/makefile.mk
++++ filter/source/xsltfilter/makefile.mk
+@@ -66,7 +66,7 @@
+ JARTARGET = $(TARGET).jar
+
+ .IF "$(SYSTEM_SAXON)" == "YES"
+-XCLASSPATH+=$(SAXON_JAR)
++XCLASSPATH:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR)
+ .ELSE
+ JARFILES += saxon9.jar
+ .ENDIF
More information about the ooo-build-commit
mailing list