From 9a48ff5ca07865ddcc5ea5c14a35c7e8e616bd8a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Jan 12 2011 16:57:16 +0000 Subject: drop integrated patches --- diff --git a/0001-Avoid-double-paste-when-pasting-text-into-cell-comme.patch b/0001-Avoid-double-paste-when-pasting-text-into-cell-comme.patch deleted file mode 100644 index e3e5ec5..0000000 --- a/0001-Avoid-double-paste-when-pasting-text-into-cell-comme.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 342f3cfe6f2b27ea62bd9883e16014c188276356 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Wed, 22 Dec 2010 12:31:22 -0500 -Subject: [PATCH 1/2] Avoid double-paste when pasting text into cell comment. (fdo#32572) - -Original patch is from Caolan. I re-worked it to handle more use -cases. ---- - sc/source/ui/view/gridwin.cxx | 20 ++++++++++++++++++++ - 1 files changed, 20 insertions(+), 0 deletions(-) - -diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx -index 0d32bae..6826829 100644 ---- a/sc/source/ui/view/gridwin.cxx -+++ b/sc/source/ui/view/gridwin.cxx -@@ -4298,6 +4298,23 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) - SCsROW nPosY; - pViewData->GetPosFromPixel( rPosPixel.X(), rPosPixel.Y(), eWhich, nPosX, nPosY ); - -+ // If the mouse down was inside a visible note window, ignore it and -+ // leave it up to the ScPostIt to handle it -+ SdrView* pDrawView = pViewData->GetViewShell()->GetSdrView(); -+ if (pDrawView) -+ { -+ ULONG nCount = pDrawView->GetMarkedObjectCount(); -+ for (ULONG i = 0; i < nCount; ++i) -+ { -+ SdrObject* pObj = pDrawView->GetMarkedObjectByIndex(i); -+ if (pObj && pObj->GetLogicRect().IsInside(aLogicPos)) -+ { -+ // Inside an active drawing object. Bail out. -+ return; -+ } -+ } -+ } -+ - ScSelectionTransferObj* pOwnSelection = SC_MOD()->GetSelectionTransfer(); - if ( pOwnSelection ) - { diff --git a/0001-Resolves-rhbz-660342-Undo-Redo-crash-with-postits.patch b/0001-Resolves-rhbz-660342-Undo-Redo-crash-with-postits.patch deleted file mode 100644 index 07e069e..0000000 --- a/0001-Resolves-rhbz-660342-Undo-Redo-crash-with-postits.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1b58066892daa9365d23b39d7439fbbe7d562b13 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 22 Dec 2010 14:18:41 +0000 -Subject: [PATCH] Resolves: rhbz#660342 Undo/Redo crash with postits - ---- - sw/source/core/undo/SwUndoField.cxx | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx -index 6d93bfc..7bb38c3 100644 ---- a/sw/source/core/undo/SwUndoField.cxx -+++ b/sw/source/core/undo/SwUndoField.cxx -@@ -87,7 +87,8 @@ SwUndoFieldFromDoc::~SwUndoFieldFromDoc() - void SwUndoFieldFromDoc::Undo( SwUndoIter& ) - { - SwTxtFld * pTxtFld = SwDoc::GetTxtFld(GetPosition()); -- const SwField * pField = pTxtFld->GetFld().GetFld(); -+ -+ const SwField * pField = pTxtFld ? pTxtFld->GetFld().GetFld() : NULL; - - if (pField) - { -@@ -102,7 +103,7 @@ void SwUndoFieldFromDoc::Undo( SwUndoIter& ) - void SwUndoFieldFromDoc::Redo( SwUndoIter& ) - { - SwTxtFld * pTxtFld = SwDoc::GetTxtFld(GetPosition()); -- const SwField * pField = pTxtFld->GetFld().GetFld(); -+ const SwField * pField = pTxtFld ? pTxtFld->GetFld().GetFld() : NULL; - - if (pField) - { --- -1.7.3.3 - diff --git a/0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch b/0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch deleted file mode 100644 index 25e1824..0000000 --- a/0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 963c6b655032b4e5d0f26555f3c26a129a9efb03 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Sat, 18 Dec 2010 18:26:18 +0000 -Subject: [PATCH] Resoves: rhbz#663857 font color missing; C++ FAQ 10.3 doomage - ---- - slideshow/source/engine/color.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx -index 0f8a8f7..341a54a 100644 ---- a/slideshow/source/engine/color.cxx -+++ b/slideshow/source/engine/color.cxx -@@ -229,8 +229,8 @@ namespace slideshow - } - - RGBColor::RGBColor(const RGBColor& rLHS) -+ : maRGBTriple( rLHS.maRGBTriple ) - { -- RGBColor(rLHS.getRed(), rLHS.getGreen(), rLHS.getBlue()); - } - - RGBColor& RGBColor::operator=( const RGBColor& rLHS ){ --- -1.7.3.3 - diff --git a/libreoffice.spec b/libreoffice.spec index f883f9f..e240e21 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -97,11 +97,7 @@ Patch11: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch Patch12: turn-script-providers-into-extensions.patch Patch13: libreoffice-installfix.patch Patch14: 0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch -Patch15: 0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch -Patch16: 0001-Avoid-double-paste-when-pasting-text-into-cell-comme.patch -Patch17: 0001-Resolves-rhbz-660342-Undo-Redo-crash-with-postits.patch -Patch18: libreoffice-bootstrap-kde.patch -Patch19: 0001-Resolves-rhbz-666088-clean-up-search-cache-singleton.patch +Patch15: libreoffice-bootstrap-kde.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -719,11 +715,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch12 -p1 -b .turn-script-providers-into-extensions.patch %patch13 -p1 -b .libreoffice-installfix.patch %patch14 -p1 -b .don-t-bail-out-on-mislength-records.patch -%patch15 -p1 -b .font-color-missing-C-FAQ-10.3-do.patch -%patch16 -p1 -b .Avoid-double-paste-when-pasting-text-into-cell-comme.patch -%patch17 -p1 -b .rhbz-660342-Undo-Redo-crash-with-postits.patch -%patch18 -p1 -b .libreoffice-bootstrap-kde.patch -%patch19 -p1 -b .rhbz-666088-clean-up-search-cache-singleton.patch +%patch15 -p1 -b .libreoffice-bootstrap-kde.patch touch scripting/source/pyprov/delzip touch scripting/util/provider/beanshell/delzip touch scripting/util/provider/javascript/delzip @@ -2064,6 +2056,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %changelog * Wed Jan 12 2011 Caolán McNamara 3.3.0.3-1 - latest version +- drop integrated 0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch +- drop integrated 0001-Avoid-double-paste-when-pasting-text-into-cell-comme.patch +- drop integrated 0001-Resolves-rhbz-660342-Undo-Redo-crash-with-postits.patch +- drop integrated 0001-Resolves-rhbz-666088-clean-up-search-cache-singleton.patch * Thu Jan 06 2011 Caolán McNamara 3.3.0.2-5 - Resolves: rhbz#666088 don't crash on clean up of search cache