From 2e0d961b2b58ec6dad95fe37ed0aa62a46e9f03f Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 24 Jul 2013 09:39:14 +0200 Subject: [PATCH] 4.1.0 rc4 --- .gitignore | 3 + ...24-switching-to-master-view-is-broke.patch | 76 ------------------- libreoffice.spec | 13 ++-- sources | 6 +- 4 files changed, 13 insertions(+), 85 deletions(-) delete mode 100644 0001-Resolves-fdo-66924-switching-to-master-view-is-broke.patch diff --git a/.gitignore b/.gitignore index 1ee6372..d013a4f 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,6 @@ /libreoffice-4.1.0.3.tar.xz /libreoffice-help-4.1.0.3.tar.xz /libreoffice-translations-4.1.0.3.tar.xz +/libreoffice-4.1.0.4.tar.xz +/libreoffice-help-4.1.0.4.tar.xz +/libreoffice-translations-4.1.0.4.tar.xz diff --git a/0001-Resolves-fdo-66924-switching-to-master-view-is-broke.patch b/0001-Resolves-fdo-66924-switching-to-master-view-is-broke.patch deleted file mode 100644 index 23eb9bd..0000000 --- a/0001-Resolves-fdo-66924-switching-to-master-view-is-broke.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 4a578dc9c7b9c5697f624807790565c99ccb919d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 18 Jul 2013 14:27:15 +0100 -Subject: [PATCH] Resolves: fdo#66924 switching to master view is broken - -It seems 0143805a565418d2a114c16b7eeba3b784176d9e wanted to not call -SfxShell::Activate from ViewShell::Activate and removed that call and added an -explicit SfxShell::BroadcastContextForActivation(true) (which is the body of -SfxShell::Activate) to OutlineViewShell::Activate for the case where it was -apparently wanted. - -Then DrawViewShell::Deactivate had the call to ViewShell::Deactivate removed -persumably to avoid calling SfxShell::Deactivate via ViewShell::Deactivate - -But with ViewShell::Deactivate omitted switching to master view is broken, it -does quite a lot more than call just SfxShell::Deactivate - -Restore the call of ViewShell::Deactivate from DrawViewShell::Deactivate and -remove the call of SfxShell::Deactivate from ViewShell::Deactivate and put its -equivalent of SfxShell::BroadcastContextForActivation(false) into -OutlineViewShell::Deactivate to balance OutlineViewShell::Activate - -regression since 0143805a565418d2a114c16b7eeba3b784176d9e - -Change-Id: I5175378af6a6527a8be4d5011f13029d028b4304 ---- - sd/source/ui/view/drviews1.cxx | 4 ++-- - sd/source/ui/view/outlnvsh.cxx | 1 + - sd/source/ui/view/viewshel.cxx | 3 +-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx -index fe0f1dd..f6eb20f 100644 ---- a/sd/source/ui/view/drviews1.cxx -+++ b/sd/source/ui/view/drviews1.cxx -@@ -114,9 +114,9 @@ void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli ) - } - - --void DrawViewShell::Deactivate(sal_Bool /*bIsMDIActivate*/) -+void DrawViewShell::Deactivate(sal_Bool bIsMDIActivate) - { -- // Do not forward to ViewShell::Deactivate() to prevent a context change. -+ ViewShell::Deactivate(bIsMDIActivate); - } - - namespace -diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx -index df93540..37e28e9 100644 ---- a/sd/source/ui/view/outlnvsh.cxx -+++ b/sd/source/ui/view/outlnvsh.cxx -@@ -383,6 +383,7 @@ void OutlineViewShell::Deactivate( sal_Bool bIsMDIActivate ) - // Links must be kept also on deactivated viewshell, to allow drag'n'drop - // to function properly - ViewShell::Deactivate( bIsMDIActivate ); -+ SfxShell::BroadcastContextForActivation(false); - } - - /** -diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx -index 0da2ef2..f27195f 100644 ---- a/sd/source/ui/view/viewshel.cxx -+++ b/sd/source/ui/view/viewshel.cxx -@@ -403,8 +403,7 @@ void ViewShell::Deactivate(sal_Bool bIsMDIActivate) - mpHorizontalRuler->SetActive(sal_False); - if (mpVerticalRuler.get() != NULL) - mpVerticalRuler->SetActive(sal_False); -- -- SfxShell::Deactivate(bIsMDIActivate); -+ // Do not forward to SfxShell::Deactivate() - } - - --- -1.8.3.1 - diff --git a/libreoffice.spec b/libreoffice.spec index 10427fc..5d44dea 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,8 +42,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.3 -Release: 2%{?libo_prerelease}%{?dist} +Version: %{libo_version}.4 +Release: 1%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 Group: Applications/Productivity URL: http://www.libreoffice.org/default/ @@ -254,8 +254,7 @@ Patch16: 0001-Related-rhbz-968892-discard-impossible-languages-for.patch Patch17: 0002-Related-rhbz-968892-discard-impossible-languages-for.patch Patch18: 0001-rhbz-980387-fix-filter-selection-from-file-ext.patch Patch19: 0001-WaE-assuming-signed-overflow-does-not-occur-when-ass.patch -Patch20: 0001-Resolves-fdo-66924-switching-to-master-view-is-broke.patch -Patch21: 0001-Resolves-fdo-48835-application-menu-for-LibreOffice.patch +Patch20: 0001-Resolves-fdo-48835-application-menu-for-LibreOffice.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -1007,8 +1006,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch17 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch %patch18 -p1 -b .rhbz-980387-fix-filter-selection-from-file-ext.patch %patch19 -p1 -b .WaE-assuming-signed-overflow-does-not-occur-when-ass.patch -%patch20 -p1 -b .fdo-66924-switching-to-master-view-is-broke.patch -%patch21 -p1 -b .fdo-48835-application-menu-for-LibreOffice.patch +%patch20 -p1 -b .fdo-48835-application-menu-for-LibreOffice.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2095,6 +2093,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Wed Jul 24 2013 David Tardon - 1:4.1.0.4-1 +- 4.1.0 rc4 + * Mon Jul 22 2013 Eike Rathke - 1:4.1.0.3-2 - force rebuild with icu-50.1.2-7 diff --git a/sources b/sources index 16aa4d8..42f0e13 100644 --- a/sources +++ b/sources @@ -6,6 +6,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh -bde276e90861120ae526520fcccacbbe libreoffice-4.1.0.3.tar.xz -4f84be7874e81a2fb3f3644ad9ce88ff libreoffice-help-4.1.0.3.tar.xz -fd17438d3192bc213a3d0200052adcde libreoffice-translations-4.1.0.3.tar.xz +5311656e1b54eadd4b93f948dfd5e68e libreoffice-4.1.0.4.tar.xz +e2cd3b63e3050771a1330fc98e41a701 libreoffice-help-4.1.0.4.tar.xz +1f4438828cbcf83c257742482dade3ef libreoffice-translations-4.1.0.4.tar.xz