diff --git a/fdo32572-sc-dont-double-paste.patch b/fdo32572-sc-dont-double-paste.patch new file mode 100644 index 0000000..dba2cfd --- /dev/null +++ b/fdo32572-sc-dont-double-paste.patch @@ -0,0 +1,27 @@ +diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx +index 0d32bae..7ecdbfa 100644 +--- a/sc/source/ui/view/gridwin.cxx ++++ b/sc/source/ui/view/gridwin.cxx +@@ -1689,6 +1689,22 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) + SCTAB nTab = pViewData->GetTabNo(); + ScDocument* pDoc = pViewData->GetDocument(); + ++ { ++ //If the mouse down was inside a visible note window, ignore it and leave ++ //it up to the ScPostIt to handle it ++ ScAddress aCellPos(pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo()); ++ ScPostIt* pNote = pDoc->GetNote(aCellPos); ++ SdrObject* pObj = pNote ? pNote->GetCaption() : 0; ++ if (pObj && ScDrawLayer::IsNoteCaption(pObj)) ++ { ++ Point aLogicPos = PixelToLogic(aPos); ++ if (pObj->GetLogicRect().IsInside(aLogicPos)) ++ { ++ bEEMouse = TRUE; ++ return; ++ } ++ } ++ } + + // + // AutoFilter buttons diff --git a/libreoffice.spec b/libreoffice.spec index b9c6582..8c3b40c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -28,7 +28,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Version: 3.3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -95,6 +95,7 @@ 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: fdo32572-sc-dont-double-paste.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -705,6 +706,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %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 .fdo32572-sc-dont-double-paste.patch touch scripting/source/pyprov/delzip touch scripting/util/provider/beanshell/delzip touch scripting/util/provider/javascript/delzip @@ -2006,6 +2008,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/share/registry/pyuno.xcd %changelog +* Wed Dec 22 2010 Caolán McNamara 3.3.0.2-2 +- Resolves: rhbz#663724 fdo32572-sc-dont-double-paste.patch + * Tue Dec 21 2010 Caolán McNamara 3.3.0.2-1 - latest version