[Libreoffice-commits] .: patches/dev300
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Oct 11 08:56:35 PDT 2010
patches/dev300/apply | 20 ------
patches/dev300/crash-startup.diff | 47 ---------------
patches/dev300/desktop-quickstart-option-enable-unx.diff | 24 -------
patches/dev300/no-splash-takeover.diff | 20 ------
4 files changed, 111 deletions(-)
New commits:
commit 7dcad398deff51f797d12b140eaba01a0e41ea4b
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Oct 11 16:55:15 2010 +0100
merge some quickstarter fixes, drop legacy splash WM workarouind
diff --git a/patches/dev300/apply b/patches/dev300/apply
index f66f4e5..08106ba 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -465,16 +465,6 @@ unxsplash-bmp-alias.diff, i#60696, jholesov
# FIXME: we need to install also the intro.bmp because the splash supports only the bmp file format
unxsplash-install-bmp-intro.diff, pmladek
-[ QuickStarter ]
-# enable -quistart option on Linux
-# cleaner solution by Caolan, i#108846
-desktop-quickstart-option-enable-unx.diff, i#108918, n#575555, pmladek
-
-# more quickstart fixes from Caolan
-sfx2-qstartfixes.diff, i#108846, caolan
-
-[ WriterFixes ]
-
[ CalcFixes ]
# fix incorrect export of combo boxes, by adding two empty bytes to make Excel
@@ -895,16 +885,6 @@ liberation_packaging_fix.diff, kami
#liberation_making_fix.diff, kami
[ VCL ]
-
-#
-# These two patches are consequences of each other quite
-# possibly, the real fix is in the WM, or the toolkit backend.
-#
-# don't throw an exception we can't catch when throwing up the splash.
-crash-startup.diff, i#100171, michael
-# Don't let the splash screen take over
-no-splash-takeover.diff, i#23609, rodo
-
# prioritize hebrew culmus fonts, Debian bugs #280084, #296152, #300642
hebrew-culmus.diff, noelpwer
diff --git a/patches/dev300/crash-startup.diff b/patches/dev300/crash-startup.diff
deleted file mode 100644
index 31188ee..0000000
--- a/patches/dev300/crash-startup.diff
+++ /dev/null
@@ -1,47 +0,0 @@
----
- vcl/source/gdi/makefile.mk | 2 +-
- vcl/unx/gtk/window/gtkframe.cxx | 8 +++++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git vcl/source/gdi/makefile.mk vcl/source/gdi/makefile.mk
-index f069828..72bbbe3 100644
---- vcl/source/gdi/makefile.mk
-+++ vcl/source/gdi/makefile.mk
-@@ -48,6 +48,7 @@ CDEFS+=-DENABLE_GRAPHITE
- # --- Files --------------------------------------------------------
-
- EXCEPTIONSFILES= $(SLO)$/salmisc.obj \
-+ $(SLO)$/bitmapex.obj \
- $(SLO)$/outdev.obj \
- $(SLO)$/outdev3.obj \
- $(SLO)$/outdevnative.obj \
-@@ -83,7 +84,6 @@ SLOFILES= $(EXCEPTIONSFILES) \
- $(SLO)$/bitmap3.obj \
- $(SLO)$/bitmap4.obj \
- $(SLO)$/alpha.obj \
-- $(SLO)$/bitmapex.obj \
- $(SLO)$/bmpacc.obj \
- $(SLO)$/bmpacc2.obj \
- $(SLO)$/bmpacc3.obj \
-diff --git vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
-index 5748c43..df15dd7 100644
---- vcl/unx/gtk/window/gtkframe.cxx
-+++ vcl/unx/gtk/window/gtkframe.cxx
-@@ -1135,7 +1135,13 @@ void GtkSalFrame::SetIcon( USHORT nIcon )
- {
- // #i44723# workaround gcc temporary problem
- ResId aResId( nOffsets[nIndex] + nIcon, *ImplGetResMgr() );
-- BitmapEx aIcon( aResId );
-+ BitmapEx aIcon;
-+ try {
-+ aIcon = BitmapEx( aResId );
-+ } catch (com::sun::star::uno::RuntimeException &) {
-+ // UCB not initialized for splash screen creation; very exceptional.
-+ continue;
-+ }
-
- // #i81083# convert to 24bit/8bit alpha bitmap
- Bitmap aBmp = aIcon.GetBitmap();
---
-1.7.0.1
-
diff --git a/patches/dev300/desktop-quickstart-option-enable-unx.diff b/patches/dev300/desktop-quickstart-option-enable-unx.diff
deleted file mode 100644
index 09cbfaf..0000000
--- a/patches/dev300/desktop-quickstart-option-enable-unx.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- desktop/source/app/cmdlineargs.cxx.old 2010-07-29 16:12:53.000000000 +0200
-+++ desktop/source/app/cmdlineargs.cxx 2010-07-29 16:13:18.000000000 +0200
-@@ -396,7 +396,7 @@ sal_Bool CommandLineArgs::InterpretComma
- }
- else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-quickstart" )) == sal_True )
- {
--#if defined(WNT) || defined(OS2) || defined(QUARTZ)
-+#if defined(ENABLE_QUICKSTART_APPLET)
- SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_True );
- #endif
- SetBoolParam_Impl( CMD_BOOLPARAM_NOQUICKSTART, sal_False );
---- desktop/source/app/makefile.mk.old 2010-07-26 15:06:38.000000000 +0200
-+++ desktop/source/app/makefile.mk 2010-07-29 16:13:18.000000000 +0200
-@@ -53,6 +53,10 @@ CFLAGS+=-DGNOME_VFS_ENABLED
- # DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX)
- # .ENDIF
-
-+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-+CFLAGS+=-DENABLE_QUICKSTART_APPLET
-+.ENDIF
-+
- SHL1TARGET = sofficeapp
- SHL1OBJS = \
- $(SLO)$/app.obj \
diff --git a/patches/dev300/no-splash-takeover.diff b/patches/dev300/no-splash-takeover.diff
deleted file mode 100644
index f545514..0000000
--- a/patches/dev300/no-splash-takeover.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- vcl/source/window/window.cxx | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git vcl/source/window/window.cxx vcl/source/window/window.cxx
-index fcad734..a231e12 100644
---- vcl/source/window/window.cxx
-+++ vcl/source/window/window.cxx
-@@ -804,8 +804,6 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
- else if( mpWindowImpl->mbFloatWin )
- nFrameStyle |= SAL_FRAME_STYLE_TOOLWINDOW;
-
-- if( nStyle & WB_INTROWIN )
-- nFrameStyle |= SAL_FRAME_STYLE_INTRO;
- if( nStyle & WB_TOOLTIPWIN )
- nFrameStyle |= SAL_FRAME_STYLE_TOOLTIP;
-
---
-1.7.0.1
-
More information about the Libreoffice-commits
mailing list