diff --git a/.gitignore b/.gitignore index 1496399..3c02c93 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,6 @@ /libreoffice-multiliblauncher.sh /0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz /b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz -/libreoffice-4.2.3.3.tar.xz -/libreoffice-help-4.2.3.3.tar.xz -/libreoffice-translations-4.2.3.3.tar.xz /15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 /22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz /32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz @@ -27,10 +24,11 @@ /ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 /Firebird-2.5.2.26540-0.tar.bz2 /harfbuzz-0.9.23.tar.bz2 +/language-subtag-registry-2014-03-27.tar.bz2 /libabw-0.0.2.tar.bz2 /libatomic_ops-7_2d.zip -/libcdr-0.0.14.tar.bz2 -/libe-book-0.0.3.tar.bz2 +/libcdr-0.0.15.tar.bz2 +/libe-book-0.0.4.tar.bz2 /libeot-0.01.tar.bz2 /libetonyek-0.0.3.tar.bz2 /libfreehand-0.0.0.tar.bz2 @@ -38,3 +36,6 @@ /libmwaw-0.2.0.tar.bz2 /libodfgen-0.0.4.tar.bz2 /libvisio-0.0.31.tar.bz2 +/libreoffice-4.2.4.1.tar.xz +/libreoffice-help-4.2.4.1.tar.xz +/libreoffice-translations-4.2.4.1.tar.xz diff --git a/0001-Related-rhbz-1076264-intermittent-a11y-crash-in-calc.patch b/0001-Related-rhbz-1076264-intermittent-a11y-crash-in-calc.patch deleted file mode 100644 index fe10336..0000000 --- a/0001-Related-rhbz-1076264-intermittent-a11y-crash-in-calc.patch +++ /dev/null @@ -1,203 +0,0 @@ -From 135bdf4ef1a5d256f00bebf1b734ae44544d757c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 14 Mar 2014 20:28:10 +0000 -Subject: [PATCH] Related: rhbz#1076264 intermittent a11y crash in calc - -http://retrace.fedoraproject.org/faf/reports/338291/ - -this crash refuses to be captured alive. But seeing as -we sometimes check mpViewShell against NULL and sometimes check -GetViewData against NULL its worth making those checks everytime -for consistency - -see also... - -rhbz#923993 rhbz#896711 rhbz#602273 rhbz#577595 lp#811057 lp#760665 - -(cherry picked from commit fae1e19af05e664364c55d4f686aaab860fd538d) - -Conflicts: - sc/source/ui/Accessibility/AccessibleDocument.cxx - -Change-Id: I5553848018f500b63ade60bcfc756a736b27c64f ---- - sc/source/ui/Accessibility/AccessibleDocument.cxx | 70 ++++++++++++++--------- - 1 file changed, 43 insertions(+), 27 deletions(-) - -diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx -index 6d3b7f8..14ac8fe 100644 ---- a/sc/source/ui/Accessibility/AccessibleDocument.cxx -+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx -@@ -337,13 +337,14 @@ ScChildrenShapes::ScChildrenShapes(ScAccessibleDocument* pAccessibleDocument, Sc - } - if (pViewShell) - { -- SfxBroadcaster* pDrawBC = pViewShell->GetViewData()->GetDocument()->GetDrawBroadcaster(); -+ ScViewData *pViewData = pViewShell->GetViewData(); -+ SfxBroadcaster* pDrawBC = pViewData ? pViewData->GetDocument()->GetDrawBroadcaster() : NULL; - if (pDrawBC) - { - StartListening(*pDrawBC); - -- maShapeTreeInfo.SetModelBroadcaster( new ScDrawModelBroadcaster(pViewShell->GetViewData()->GetDocument()->GetDrawLayer()) ); -- maShapeTreeInfo.SetSdrView(pViewShell->GetViewData()->GetScDrawView()); -+ maShapeTreeInfo.SetModelBroadcaster( new ScDrawModelBroadcaster(pViewData->GetDocument()->GetDrawLayer()) ); -+ maShapeTreeInfo.SetSdrView(pViewData->GetScDrawView()); - maShapeTreeInfo.SetController(NULL); - maShapeTreeInfo.SetWindow(pViewShell->GetWindowByPos(meSplitPos)); - maShapeTreeInfo.SetViewForwarder(mpAccessibleDocument); -@@ -356,7 +357,8 @@ ScChildrenShapes::~ScChildrenShapes() - std::for_each(maZOrderedShapes.begin(), maZOrderedShapes.end(), Destroy()); - if (mpViewShell) - { -- SfxBroadcaster* pDrawBC = mpViewShell->GetViewData()->GetDocument()->GetDrawBroadcaster(); -+ ScViewData *pViewData = mpViewShell->GetViewData(); -+ SfxBroadcaster* pDrawBC = pViewData ? pViewData->GetDocument()->GetDrawBroadcaster() : NULL; - if (pDrawBC) - EndListening(*pDrawBC); - } -@@ -366,13 +368,14 @@ void ScChildrenShapes::SetDrawBroadcaster() - { - if (mpViewShell) - { -- SfxBroadcaster* pDrawBC = mpViewShell->GetViewData()->GetDocument()->GetDrawBroadcaster(); -+ ScViewData *pViewData = mpViewShell->GetViewData(); -+ SfxBroadcaster* pDrawBC = pViewData ? pViewData->GetDocument()->GetDrawBroadcaster() : NULL; - if (pDrawBC) - { - StartListening(*pDrawBC, sal_True); - -- maShapeTreeInfo.SetModelBroadcaster( new ScDrawModelBroadcaster(mpViewShell->GetViewData()->GetDocument()->GetDrawLayer()) ); -- maShapeTreeInfo.SetSdrView(mpViewShell->GetViewData()->GetScDrawView()); -+ maShapeTreeInfo.SetModelBroadcaster( new ScDrawModelBroadcaster(pViewData->GetDocument()->GetDrawLayer()) ); -+ maShapeTreeInfo.SetSdrView(pViewData->GetScDrawView()); - maShapeTreeInfo.SetController(NULL); - maShapeTreeInfo.SetWindow(mpViewShell->GetWindowByPos(meSplitPos)); - maShapeTreeInfo.SetViewForwarder(mpAccessibleDocument); -@@ -827,7 +830,8 @@ SdrPage* ScChildrenShapes::GetDrawPage() const - SdrPage* pDrawPage = NULL; - if (mpViewShell) - { -- ScDocument* pDoc = mpViewShell->GetViewData()->GetDocument(); -+ ScViewData *pViewData = mpViewShell->GetViewData(); -+ ScDocument* pDoc = pViewData ? pViewData->GetDocument() : NULL; - if (pDoc && pDoc->GetDrawLayer()) - { - ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer(); -@@ -1239,9 +1243,10 @@ ScAccessibleDocument::ScAccessibleDocument( - AddChild( pChildWin->GetAccessible(), false ); - } - } -- if (pViewShell->GetViewData()->HasEditView( eSplitPos )) -+ ScViewData *pViewData = pViewShell->GetViewData(); -+ if (pViewData && pViewData->HasEditView(eSplitPos)) - { -- uno::Reference xAcc = new ScAccessibleEditObject(this, pViewShell->GetViewData()->GetEditView(eSplitPos), -+ uno::Reference xAcc = new ScAccessibleEditObject(this, pViewData->GetEditView(eSplitPos), - pViewShell->GetWindowByPos(eSplitPos), GetCurrentCellName(), GetCurrentCellDescription(), - ScAccessibleEditObject::CellInEditMode); - AddChild(xAcc, false); -@@ -1382,9 +1387,10 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) - } - else if ((rRef.GetId() == SC_HINT_ACC_ENTEREDITMODE)) // this event comes only on creating edit field of a cell - { -- if (mpViewShell && mpViewShell->GetViewData()->HasEditView(meSplitPos)) -+ ScViewData *pViewData = mpViewShell ? mpViewShell->GetViewData() : NULL; -+ if (pViewData && pViewData->HasEditView(meSplitPos)) - { -- mpTempAccEdit = new ScAccessibleEditObject(this, mpViewShell->GetViewData()->GetEditView(meSplitPos), -+ mpTempAccEdit = new ScAccessibleEditObject(this, pViewData->GetEditView(meSplitPos), - mpViewShell->GetWindowByPos(meSplitPos), GetCurrentCellName(), - OUString(ScResId(STR_ACC_EDITLINE_DESCR)), ScAccessibleEditObject::CellInEditMode); - uno::Reference xAcc = mpTempAccEdit; -@@ -1639,7 +1645,7 @@ void SAL_CALL - SolarMutexGuard aGuard; - IsObjectValid(); - -- if (mpChildrenShapes) -+ if (mpChildrenShapes && mpViewShell) - { - sal_Int32 nCount(mpChildrenShapes->GetCount()); //all shapes and the table - if (mxTempAcc.is()) -@@ -1782,7 +1788,7 @@ void SAL_CALL - SolarMutexGuard aGuard; - IsObjectValid(); - -- if (mpChildrenShapes) -+ if (mpChildrenShapes && mpViewShell) - { - sal_Int32 nCount(mpChildrenShapes->GetCount()); //all shapes and the table - if (mxTempAcc.is()) -@@ -1861,14 +1867,21 @@ Rectangle ScAccessibleDocument::GetVisibleArea_Impl() const - { - Rectangle aVisRect(GetBoundingBox()); - -- Point aPoint(mpViewShell->GetViewData()->GetPixPos(meSplitPos)); // returns a negative Point -- aPoint.setX(-aPoint.getX()); -- aPoint.setY(-aPoint.getY()); -- aVisRect.SetPos(aPoint); -+ if (mpViewShell) -+ { -+ ScViewData *pViewData = mpViewShell->GetViewData(); -+ if (pViewData) -+ { -+ Point aPoint(pViewData->GetPixPos(meSplitPos)); // returns a negative Point -+ aPoint.setX(-aPoint.getX()); -+ aPoint.setY(-aPoint.getY()); -+ aVisRect.SetPos(aPoint); -+ } - -- ScGridWindow* pWin = static_cast(mpViewShell->GetWindowByPos(meSplitPos)); -- if (pWin) -- aVisRect = pWin->PixelToLogic(aVisRect, pWin->GetDrawMapMode()); -+ ScGridWindow* pWin = static_cast(mpViewShell->GetWindowByPos(meSplitPos)); -+ if (pWin) -+ aVisRect = pWin->PixelToLogic(aVisRect, pWin->GetDrawMapMode()); -+ } - - return aVisRect; - } -@@ -1989,8 +2002,9 @@ Rectangle ScAccessibleDocument::GetBoundingBox() const - SCTAB ScAccessibleDocument::getVisibleTable() const - { - SCTAB nVisibleTable(0); -- if (mpViewShell && mpViewShell->GetViewData()) -- nVisibleTable = mpViewShell->GetViewData()->GetTabNo(); -+ ScViewData *pViewData = mpViewShell ? mpViewShell->GetViewData() : NULL; -+ if (pViewData) -+ nVisibleTable = pViewData->GetTabNo(); - return nVisibleTable; - } - -@@ -2020,11 +2034,12 @@ void ScAccessibleDocument::FreeAccessibleSpreadsheet() - sal_Bool ScAccessibleDocument::IsTableSelected() const - { - sal_Bool bResult (false); -- if(mpViewShell) -+ ScViewData *pViewData = mpViewShell ? mpViewShell->GetViewData() : NULL; -+ if(pViewData) - { - SCTAB nTab(getVisibleTable()); - //#103800#; use a copy of MarkData -- ScMarkData aMarkData(mpViewShell->GetViewData()->GetMarkData()); -+ ScMarkData aMarkData(pViewData->GetMarkData()); - aMarkData.MarkToMulti(); - if (aMarkData.IsAllMarked(ScRange(ScAddress(0, 0, nTab),ScAddress(MAXCOL, MAXROW, nTab)))) - bResult = sal_True; -@@ -2084,10 +2099,11 @@ void ScAccessibleDocument::RemoveChild(const uno::Reference& xAcc, - OUString ScAccessibleDocument::GetCurrentCellName() const - { - OUString sName(SC_RESSTR(STR_ACC_CELL_NAME)); -- if (mpViewShell) -+ ScViewData *pViewData = mpViewShell ? mpViewShell->GetViewData() : NULL; -+ if (pViewData) - { - // Document not needed, because only the cell address, but not the tablename is needed -- OUString sAddress(mpViewShell->GetViewData()->GetCurPos().Format(SCA_VALID, NULL)); -+ OUString sAddress(pViewData->GetCurPos().Format(SCA_VALID, NULL)); - sName = sName.replaceFirst("%1", sAddress); - } - return sName; --- -1.8.5.3 - diff --git a/0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch b/0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch index 4bd4a64..7a969ed 100644 --- a/0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch +++ b/0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch @@ -1,7 +1,7 @@ -From c309eed705edd358ba2db8b26d711d0f8ae41dca Mon Sep 17 00:00:00 2001 +From cc9493e690c6dbe40a1da47a06acf7172a33ffa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 24 Feb 2014 11:38:13 +0000 -Subject: [PATCH 3/4] Resolves: rhbz#1065807 use xdg ~/Templates for default +Subject: [PATCH 1/2] Resolves: rhbz#1065807 use xdg ~/Templates for default Template location (if it exists) @@ -33,11 +33,11 @@ index 15fb3c0..bdb2949 100644 xPath->getByName(CFGPROP_ISSINGLEPATH) >>= aPathVal.bIsSinglePath; diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu -index 4b5ec7d..2ef605e 100644 +index 05f8e0b..2a9eb5c 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu -@@ -160,8 +160,21 @@ - +@@ -161,8 +161,21 @@ + +