[ooo-build-commit] 4 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Aug 21 03:53:45 PDT 2009
patches/dev300/apply | 7 +-
patches/dev300/pptx-autoplay-fix.diff | 4 -
patches/dev300/sd-pptx-crash-fix.diff | 87 -----------------------------
patches/dev300/vcl-gtk-fullscreen-fix.diff | 24 --------
patches/dev300/vcl-startup-crash-fix.diff | 58 -------------------
5 files changed, 4 insertions(+), 176 deletions(-)
New commits:
commit 7664c2c282a0f72ca05076075c4c9ad73525b213
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 21 13:52:33 2009 +0300
vcl-startup-crash-fix.diff is upstream
* patches/dev300/vcl-startup-crash-fix.diff: Delete, is
upstream. i#103148 is fixed and closed.
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a27eefa..d21a55c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3210,7 +3210,6 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
# Fix for crash on Windows by Rail Aliev. Root cause unknown.
configmgr-validate-removedtree.diff, n#505704
svx-fix-fit-to-frame-crash.diff, n#508621, rodo
-vcl-startup-crash-fix.diff, i#103148, thorsten
# adds various color conversion functions to basegfx's BColor
basegfx-color-tools.diff, thorsten
diff --git a/patches/dev300/vcl-startup-crash-fix.diff b/patches/dev300/vcl-startup-crash-fix.diff
deleted file mode 100644
index 19fd373..0000000
--- a/patches/dev300/vcl-startup-crash-fix.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-Early-startup crash due to non-initialized ucb
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- vcl/unx/source/window/salframe.cxx | 28 ++++++++++++++++++++--------
- 1 files changed, 20 insertions(+), 8 deletions(-)
-
-
-diff --git vcl/unx/source/window/salframe.cxx vcl/unx/source/window/salframe.cxx
-index c5bd4e2..26a88ea 100644
---- vcl/unx/source/window/salframe.cxx
-+++ vcl/unx/source/window/salframe.cxx
-@@ -71,6 +71,7 @@
- #include <i18n_ic.hxx>
- #include <i18n_keysym.hxx>
- #include <i18n_status.hxx>
-+#include <com/sun/star/uno/Exception.hpp>
-
- #include <algorithm>
-
-@@ -424,15 +425,26 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
- if( IsOverrideRedirect() )
- Attributes.override_redirect = True;
- // default icon
-- if( (nStyle_ & SAL_FRAME_STYLE_INTRO) == 0 &&
-- SelectAppIconPixmap( pDisplay_, m_nScreen,
-- mnIconID != 1 ? mnIconID :
-- (mpParent ? mpParent->mnIconID : 1), 32,
-- Hints.icon_pixmap, Hints.icon_mask ))
-+ if( (nStyle_ & SAL_FRAME_STYLE_INTRO) == 0 )
- {
-- Hints.flags |= IconPixmapHint;
-- if( Hints.icon_mask )
-- Hints.flags |= IconMaskHint;
-+ bool bOk=false;
-+ try
-+ {
-+ bOk=SelectAppIconPixmap( pDisplay_, m_nScreen,
-+ mnIconID != 1 ? mnIconID :
-+ (mpParent ? mpParent->mnIconID : 1), 32,
-+ Hints.icon_pixmap, Hints.icon_mask );
-+ }
-+ catch( com::sun::star::uno::Exception& )
-+ {
-+ // can happen - no ucb during early startup
-+ }
-+ if( bOk )
-+ {
-+ Hints.flags |= IconPixmapHint;
-+ if( Hints.icon_mask )
-+ Hints.flags |= IconMaskHint;
-+ }
- }
-
- // find the top level frame of the transience hierarchy
commit 0543b81cbd058ba893d0379c0eae62ec65afe37f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 21 13:49:29 2009 +0300
vcl-gtk-fullscreen-fix.diff is upstream
* patches/dev300/vcl-gtk-fullscreen-fix.diff: Delete, is upstream.
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index fae67bc..a27eefa 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3210,7 +3210,6 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
# Fix for crash on Windows by Rail Aliev. Root cause unknown.
configmgr-validate-removedtree.diff, n#505704
svx-fix-fit-to-frame-crash.diff, n#508621, rodo
-vcl-gtk-fullscreen-fix.diff, n#480324, thorsten
vcl-startup-crash-fix.diff, i#103148, thorsten
# adds various color conversion functions to basegfx's BColor
diff --git a/patches/dev300/vcl-gtk-fullscreen-fix.diff b/patches/dev300/vcl-gtk-fullscreen-fix.diff
deleted file mode 100644
index a693e80..0000000
--- a/patches/dev300/vcl-gtk-fullscreen-fix.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix sticky fullscreen window state for xinerama case
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- vcl/unx/gtk/window/gtkframe.cxx | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-
-diff --git vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
-index c1fbbc5..96dfa14 100644
---- vcl/unx/gtk/window/gtkframe.cxx
-+++ vcl/unx/gtk/window/gtkframe.cxx
-@@ -826,7 +826,7 @@ void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
- }
- if( (nStyle & SAL_FRAME_STYLE_PARTIAL_FULLSCREEN ) )
- {
-- eType = GDK_WINDOW_TYPE_HINT_DOCK;
-+ eType = GDK_WINDOW_TYPE_HINT_TOOLBAR;
- gtk_window_set_keep_above( GTK_WINDOW(m_pWindow), true );
- }
-
commit 54dbd492fc15438d9aaa8f931902f0d9b046971a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 21 13:47:54 2009 +0300
Adapt pptx-autoplay-fix.diff for dev300-m54
* patches/dev300/pptx-autoplay-fix.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/pptx-autoplay-fix.diff b/patches/dev300/pptx-autoplay-fix.diff
index 4ebbe95..c42bf34 100644
--- a/patches/dev300/pptx-autoplay-fix.diff
+++ b/patches/dev300/pptx-autoplay-fix.diff
@@ -456,14 +456,12 @@ index c65280b..d3b1b42 100644
sal_Bool ExportTo( SfxMedium &rMedium );
// xmlsec05, check with SFX team
-diff --git sfx2/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
-index 367e954..258c9e3 100644
--- sfx2/source/doc/objstor.cxx
+++ sfx2/source/doc/objstor.cxx
@@ -756,6 +756,9 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
sal_uInt32 nError = HandleFilter( pMedium, this );
if ( nError != ERRCODE_NONE )
- SetError( nError );
+ SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+
+ if (pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARTPRESENTATION)
+ pSet->Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, TRUE) );
commit 442db1094f90138117c938a2df0ceaeb0fd1e5f3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 21 13:38:03 2009 +0300
Bypass one patch, drop another
* patches/dev300/apply: sd-pptx-crash-fix.diff if upstream. Bypass
oox-calc-export-row-limit.diff for now.
* patches/dev300/sd-pptx-crash-fix.diff: Delete.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 51d560b..fae67bc 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3179,11 +3179,12 @@ calc-perf-lazy-overlay-objects.diff, n#511006, kohei
calc-perf-rowheight-no-progress-bar.diff, n#514156, kohei
[ OOXMLExport ]
-oox-calc-export-row-limit.diff, n#504623, janneke.
+# FIXME: 2009-08-21: Otherwise applies, but patches nonexistent files
+# (created by diffs above that are commented out for now).
+# oox-calc-export-row-limit.diff, n#504623, janneke.
[ Fixes ]
wmf-mm-text.diff, n#417818, rodo
-sd-pptx-crash-fix.diff, i#101563, sj
sd-create-table-height-fix.diff, i#100275, thorsten
svx-pptin-global-child-bounds-fix.diff, n#485637, thorsten
pptx-autoplay-fix.diff, n#485645, thorsten
diff --git a/patches/dev300/sd-pptx-crash-fix.diff b/patches/dev300/sd-pptx-crash-fix.diff
deleted file mode 100644
index e5c5c02..0000000
--- a/patches/dev300/sd-pptx-crash-fix.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-Author: sj
-Date: Wed May 13 12:59:08 2009
-New Revision: 271862
-
-Log:
-#i101563# fixed crash when loading pptx document
-
-Modified:
- cws/impress171/sd/source/ui/unoidl/unopback.cxx
-
-Modified: cws/impress171/sd/source/ui/unoidl/unopback.cxx
-==============================================================================
---- sd/source/ui/unoidl/unopback.cxx Wed May 13 12:39:35 2009 (r271861)
-+++ sd/source/ui/unoidl/unopback.cxx Wed May 13 12:59:08 2009 (r271862)
-@@ -140,22 +140,56 @@
- if( pAny )
- {
- OUString aPropertyName( OUString::createFromAscii(pMap->pName));
-- if ( pMap->nWID == XATTR_FILLBITMAP )
-+ switch( pMap->nWID )
- {
-- if ( ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0) ) ||
-- ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >*)0) ) ) &&
-- ( pMap->nMemberId == MID_BITMAP ) )
-+ case XATTR_FILLFLOATTRANSPARENCE :
-+ case XATTR_FILLGRADIENT :
- {
-- setPropertyValue( aPropertyName, *pAny );
-+ if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::awt::Gradient*)0) )
-+ && ( pMap->nMemberId == MID_FILLGRADIENT ) )
-+ {
-+ setPropertyValue( aPropertyName, *pAny );
-+ }
-+ else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
-+ ( pMap->nMemberId == MID_NAME ) )
-+ {
-+ setPropertyValue( aPropertyName, *pAny );
-+ }
- }
-- else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
-- ( ( pMap->nMemberId == MID_NAME ) || ( pMap->nMemberId == MID_GRAFURL ) ) )
-+ break;
-+ case XATTR_FILLHATCH :
- {
-- setPropertyValue( aPropertyName, *pAny );
-+ if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::drawing::Hatch*)0) )
-+ && ( pMap->nMemberId == MID_FILLHATCH ) )
-+ {
-+ setPropertyValue( aPropertyName, *pAny );
-+ }
-+ else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
-+ ( pMap->nMemberId == MID_NAME ) )
-+ {
-+ setPropertyValue( aPropertyName, *pAny );
-+ }
- }
-- }
-- else
-- setPropertyValue( aPropertyName, *pAny );
-+ break;
-+ case XATTR_FILLBITMAP :
-+ {
-+ if ( ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0) ) ||
-+ ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >*)0) ) ) &&
-+ ( pMap->nMemberId == MID_BITMAP ) )
-+ {
-+ setPropertyValue( aPropertyName, *pAny );
-+ }
-+ else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
-+ ( ( pMap->nMemberId == MID_NAME ) || ( pMap->nMemberId == MID_GRAFURL ) ) )
-+ {
-+ setPropertyValue( aPropertyName, *pAny );
-+ }
-+ }
-+ break;
-+
-+ default:
-+ setPropertyValue( aPropertyName, *pAny );
-+ }
- }
- pMap++;
- }
-
----------------------------------------------------------------------
-To unsubscribe, e-mail: allsvn-unsubscribe at openoffice.org
-For additional commands, e-mail: allsvn-help at openoffice.org
-
More information about the ooo-build-commit
mailing list