From f3e201d7d73e9da6fea4ebcee75e90a7c7644962 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 30 Apr 2014 23:48:39 +0200 Subject: [PATCH] update to 4.2.4 rc2 --- .gitignore | 3 + ...3-crash-while-editing-Impress-tables.patch | 40 ------ ...8625-PresenterPaintManager-seen-as-N.patch | 54 -------- ...40-crash-after-undoing-master-page-a.patch | 73 ----------- ...ting-text-in-comments-midway-in-para.patch | 32 ----- ...ered-print-job-is-reported-as-failed.patch | 120 ------------------ ...sizing-when-rows-columns-added-to-it.patch | 59 --------- libreoffice.spec | 25 ++-- sources | 6 +- 9 files changed, 17 insertions(+), 395 deletions(-) delete mode 100644 0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch delete mode 100644 0001-Related-rhbz-1088625-PresenterPaintManager-seen-as-N.patch delete mode 100644 0001-Resolves-fdo-60040-crash-after-undoing-master-page-a.patch delete mode 100644 0001-crash-in-selecting-text-in-comments-midway-in-para.patch delete mode 100644 0001-every-even-numbered-print-job-is-reported-as-failed.patch delete mode 100644 0001-table-not-resizing-when-rows-columns-added-to-it.patch diff --git a/.gitignore b/.gitignore index 3c02c93..d3c0fc1 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,6 @@ /libreoffice-4.2.4.1.tar.xz /libreoffice-help-4.2.4.1.tar.xz /libreoffice-translations-4.2.4.1.tar.xz +/libreoffice-4.2.4.2.tar.xz +/libreoffice-help-4.2.4.2.tar.xz +/libreoffice-translations-4.2.4.2.tar.xz diff --git a/0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch b/0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch deleted file mode 100644 index 4780c83..0000000 --- a/0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4128c63d655869e0ab7befde2c46761d8e1b273f Mon Sep 17 00:00:00 2001 -From: Thorsten Behrens -Date: Thu, 10 Apr 2014 19:40:54 +0200 -Subject: [PATCH] Fix fdo#71423 - crash while editing Impress tables. - -Band-aid fix for this nasty crasher, seems sometimes the -family item is not found. - -Change-Id: I7f78d59cbf2c9595ad512fa7a78370629924cd06 -(cherry picked from commit 058cfa72dcdd91df302be45f7fc59b0d961a420b) -Signed-off-by: Andras Timar ---- - sfx2/source/dialog/templdlg.cxx | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx -index ecc4d41..cbd856f 100644 ---- a/sfx2/source/dialog/templdlg.cxx -+++ b/sfx2/source/dialog/templdlg.cxx -@@ -1245,6 +1245,8 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox() - if(pStyleSheetPool && nActFamily != 0xffff) - { - const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl(); -+ if(!pItem) -+ return; - pStyleSheetPool->SetSearchMask(pItem->GetFamily(), SFXSTYLEBIT_ALL_VISIBLE); - StyleTreeArr_Impl aArr; - SfxStyleSheetBase *pStyle = pStyleSheetPool->First(); -@@ -1589,7 +1591,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl() - // other filters for automatic - CheckItem( nActFamily, sal_True ); - const SfxStyleFamilyItem *pStyleItem = GetFamilyItem_Impl(); -- if ( 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags -+ if ( pStyleItem && 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags - && nAppFilter != pItem->GetValue()) - { - nAppFilter = pItem->GetValue(); --- -1.9.0 - diff --git a/0001-Related-rhbz-1088625-PresenterPaintManager-seen-as-N.patch b/0001-Related-rhbz-1088625-PresenterPaintManager-seen-as-N.patch deleted file mode 100644 index 988b1fc..0000000 --- a/0001-Related-rhbz-1088625-PresenterPaintManager-seen-as-N.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b2e9afcdfb0d9cd4d5c1b1073ad325403a13ef32 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 18 Apr 2014 09:45:38 +0100 -Subject: [PATCH] Related: rhbz#1088625 PresenterPaintManager seen as NULL - -Change-Id: I3b7ba51d48ebc5f9304f6125de0595d41d50ad4d ---- - sdext/source/presenter/PresenterToolBar.cxx | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx -index dd0ca91..4c825ed 100644 ---- a/sdext/source/presenter/PresenterToolBar.cxx -+++ b/sdext/source/presenter/PresenterToolBar.cxx -@@ -457,7 +457,10 @@ void PresenterToolBar::InvalidateArea ( - const awt::Rectangle& rRepaintBox, - const bool bSynchronous) - { -- mpPresenterController->GetPaintManager()->Invalidate( -+ ::boost::shared_ptr xManager(mpPresenterController->GetPaintManager()); -+ if (!xManager) -+ return; -+ xManager->Invalidate( - mxWindow, - rRepaintBox, - bSynchronous); -@@ -467,7 +470,11 @@ void PresenterToolBar::RequestLayout (void) - { - mbIsLayoutPending = true; - -- mpPresenterController->GetPaintManager()->Invalidate(mxWindow); -+ ::boost::shared_ptr xManager(mpPresenterController->GetPaintManager()); -+ if (!xManager) -+ return; -+ -+ xManager->Invalidate(mxWindow); - } - - geometry::RealSize2D PresenterToolBar::GetMinimalSize (void) -@@ -822,7 +829,10 @@ void PresenterToolBar::Layout ( - } - - // The whole window has to be repainted. -- mpPresenterController->GetPaintManager()->Invalidate(mxWindow); -+ ::boost::shared_ptr xManager(mpPresenterController->GetPaintManager()); -+ if (!xManager) -+ return; -+ xManager->Invalidate(mxWindow); - } - - geometry::RealSize2D PresenterToolBar::CalculatePartSize ( --- -1.9.0 - diff --git a/0001-Resolves-fdo-60040-crash-after-undoing-master-page-a.patch b/0001-Resolves-fdo-60040-crash-after-undoing-master-page-a.patch deleted file mode 100644 index cf7323f..0000000 --- a/0001-Resolves-fdo-60040-crash-after-undoing-master-page-a.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 20934180ab2c5978a613668bf8df49a60ba7a686 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 24 Apr 2014 17:10:12 +0100 -Subject: [PATCH] Resolves: fdo#60040 crash after undoing master page - application - - regression since 839cb94a2bd9dfadb6a7e11a97f0540a78f79b6b - -Change-Id: Ie7068ecd1655ecae169948dc1e08330dc4200bf9 ---- - sd/source/core/drawdoc3.cxx | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx -index 9986219..ea0b6e0 100644 ---- a/sd/source/core/drawdoc3.cxx -+++ b/sd/source/core/drawdoc3.cxx -@@ -1367,7 +1367,6 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, - SdPage& rOldNotesMaster = (SdPage&)pNotes->TRG_GetMasterPage(); - SdPage* pMaster = NULL; - SdPage* pNotesMaster = NULL; -- SdPage* pPage = NULL; - OUString aOldPageLayoutName(pSelectedPage->GetLayoutName()); - OUString aOldLayoutName(aOldPageLayoutName); - sal_Int32 nIndex = aOldLayoutName.indexOf( SD_LT_SEPARATOR ); -@@ -1664,7 +1663,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, - { - for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++) - { -- pPage = (SdPage*) GetPage(nPage); -+ SdPage* pPage = (SdPage*) GetPage(nPage); - OUString aTest = pPage->GetLayoutName(); - if (aTest == aOldPageLayoutName) - { -@@ -1681,20 +1680,21 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, - - for (std::vector::iterator pIter = aPageList.begin(); pIter != aPageList.end(); ++pIter) - { -- AutoLayout eAutoLayout = (*pIter)->GetAutoLayout(); -+ SdPage* pPage = *pIter; -+ AutoLayout eAutoLayout = pPage->GetAutoLayout(); - - if( bUndo ) - { - SdPresentationLayoutUndoAction * pPLUndoAction = - new SdPresentationLayoutUndoAction - (this, -- ( pPage && pPage->IsMasterPage() ) ? aLayoutName : aOldLayoutName, -+ pPage ? aLayoutName : aOldLayoutName, - aLayoutName, -- eAutoLayout, eAutoLayout, sal_False, *pIter); -+ eAutoLayout, eAutoLayout, sal_False, pPage); - pUndoMgr->AddUndoAction(pPLUndoAction); - } -- (*pIter)->SetPresentationLayout(aLayoutName); -- (*pIter)->SetAutoLayout(eAutoLayout); -+ pPage->SetPresentationLayout(aLayoutName); -+ pPage->SetAutoLayout(eAutoLayout); - } - - // Adapt new master pages -@@ -1797,7 +1797,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, - { - for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++) - { -- pPage = (SdPage*) GetPage(nPage); -+ SdPage* pPage = (SdPage*) GetPage(nPage); - if (pPage->GetLayoutName() == aOldPageLayoutName) - { - aPageList.push_back(pPage); --- -1.9.0 - diff --git a/0001-crash-in-selecting-text-in-comments-midway-in-para.patch b/0001-crash-in-selecting-text-in-comments-midway-in-para.patch deleted file mode 100644 index 689cd8c..0000000 --- a/0001-crash-in-selecting-text-in-comments-midway-in-para.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 29b969d29225400e9f8ace12ea2c1276541f9ead Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 24 Apr 2014 13:51:27 +0100 -Subject: [PATCH] crash in selecting text in comments midway in para - -(cherry picked from commit 7dca5341d799d59a81e6dac84586fa2daa02a550) - -Conflicts: - sw/source/core/uibase/shells/langhelper.cxx - -Change-Id: Iaab71e201fae6a03936ccc6aac040027a183209c ---- - sw/source/ui/shells/langhelper.cxx | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx -index d3055a2..52ca770 100644 ---- a/sw/source/ui/shells/langhelper.cxx -+++ b/sw/source/ui/shells/langhelper.cxx -@@ -573,7 +573,8 @@ namespace SwLangHelper - // string for guessing language - OUString aText; - -- aText = rEditEngine->GetText(aDocSelection); -+ // get the full text of the paragraph that the end of selection is in -+ aText = rEditEngine->GetText(aDocSelection.nEndPos); - if (!aText.isEmpty()) - { - xub_StrLen nStt = 0; --- -1.9.0 - diff --git a/0001-every-even-numbered-print-job-is-reported-as-failed.patch b/0001-every-even-numbered-print-job-is-reported-as-failed.patch deleted file mode 100644 index a19a334..0000000 --- a/0001-every-even-numbered-print-job-is-reported-as-failed.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 2dae70268e8f53b11301c4c8490efea57b0cc51c Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Thu, 9 Jan 2014 23:09:12 +0100 -Subject: [PATCH] every even numbered print job is reported as failed - -because of. -bool bSuccess; -... -bSuccess &= ...endSpool(...); - -in PspSalPrinter::StartJob - -was... - -endSpool return value is effectively success flag, not job ID - -(cherry picked from commit e6323214830895d1c76ec44ee53990bf577fbda2) - -Change-Id: I5b96eeff80ca29f0f8f24ee6da7a2ca76cbb05ce ---- - include/vcl/printerinfomanager.hxx | 4 ++-- - vcl/generic/print/printerjob.cxx | 2 +- - vcl/inc/cupsmgr.hxx | 2 +- - vcl/null/printerinfomanager.cxx | 2 +- - vcl/unx/generic/printer/cupsmgr.cxx | 4 ++-- - vcl/unx/generic/printer/printerinfomanager.cxx | 2 +- - 6 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx -index 96e7846..7e3ccd6 100644 ---- a/include/vcl/printerinfomanager.hxx -+++ b/include/vcl/printerinfomanager.hxx -@@ -211,8 +211,8 @@ public: - // close the FILE* returned by startSpool and does the actual spooling - // set bBanner to "false" will attempt to suppress banner printing - // set bBanner to "true" will rely on the system default -- // returns a numerical job id -- virtual int endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); -+ // returns true on success -+ virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); - - // for spadmin: whether adding or removing a printer is possible - virtual bool addOrRemovePossible() const; -diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx -index 7c1b359..f611c26 100644 ---- a/vcl/generic/print/printerjob.cxx -+++ b/vcl/generic/print/printerjob.cxx -@@ -530,7 +530,7 @@ PrinterJob::EndJob () - else - { - PrinterInfoManager& rPrinterInfoManager = PrinterInfoManager::get(); -- if (0 == rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName, -+ if (!rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName, - maJobTitle, pDestFILE, m_aDocumentJobData, true )) - { - bSuccess = sal_False; -diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx -index 8c659fe..a8c06bb 100644 ---- a/vcl/inc/cupsmgr.hxx -+++ b/vcl/inc/cupsmgr.hxx -@@ -78,7 +78,7 @@ public: - const char* authenticateUser( const char* ); - - virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand ); -- virtual int endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); -+ virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); - virtual void setupJobContextData( JobData& rData ); - - /// changes the info about a named printer -diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx -index a480856..4845ec3 100644 ---- a/vcl/null/printerinfomanager.cxx -+++ b/vcl/null/printerinfomanager.cxx -@@ -147,7 +147,7 @@ FILE* PrinterInfoManager::startSpool( const OUString& /* rPrintername */, bool / - return NULL; - } - --int PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUString& /*rJobTitle*/, FILE* /* pFile */, const JobData& /*rDocumentJobData*/, bool /*bBanner*/ ) -+bool PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUString& /*rJobTitle*/, FILE* /* pFile */, const JobData& /*rDocumentJobData*/, bool /*bBanner*/ ) - { - return true; - } -diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx -index 069df7d..ecf44e7 100644 ---- a/vcl/unx/generic/printer/cupsmgr.cxx -+++ b/vcl/unx/generic/printer/cupsmgr.cxx -@@ -640,7 +640,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner - } - } - --int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ) -+bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ) - { - OSL_TRACE( "endSpool: %s, %s, copy count = %d", - OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(), -@@ -699,7 +699,7 @@ int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTit - cupsFreeOptions( nNumOptions, pOptions ); - } - -- return nJobID; -+ return nJobID != 0; - } - - -diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx -index 4f8f56e..45b9f62 100644 ---- a/vcl/unx/generic/printer/printerinfomanager.cxx -+++ b/vcl/unx/generic/printer/printerinfomanager.cxx -@@ -1117,7 +1117,7 @@ FILE* PrinterInfoManager::startSpool( const OUString& rPrintername, bool bQuickC - return popen (aShellCommand.getStr(), "w"); - } - --int PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUString& /*rJobTitle*/, FILE* pFile, const JobData& /*rDocumentJobData*/, bool /*bBanner*/ ) -+bool PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUString& /*rJobTitle*/, FILE* pFile, const JobData& /*rDocumentJobData*/, bool /*bBanner*/ ) - { - return (0 == pclose( pFile )); - } --- -1.9.0 - diff --git a/0001-table-not-resizing-when-rows-columns-added-to-it.patch b/0001-table-not-resizing-when-rows-columns-added-to-it.patch deleted file mode 100644 index d72c4e7..0000000 --- a/0001-table-not-resizing-when-rows-columns-added-to-it.patch +++ /dev/null @@ -1,59 +0,0 @@ -From bbcfb0a054efbe3aa106bff62938e218fea91d29 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 22 Apr 2014 12:05:48 +0100 -Subject: [PATCH] table not resizing when rows/columns added to it - -I happened across a presentation whose table didn't resize when extra rows and -columns were added to it. It worked on a higher resolution machine, but not on -a 1024x768 one - -Change-Id: I98a7a04bee0b0175174e6376e9ebc046b9eff2dc -(cherry picked from commit 88c3b4bbf005299203370efecbc09dd9d9d26a72) ---- - svx/source/table/svdotable.cxx | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx -index d59c166..45c6a30 100644 ---- a/svx/source/table/svdotable.cxx -+++ b/svx/source/table/svdotable.cxx -@@ -248,6 +248,8 @@ private: - static bool lastLayoutFitWidth; - static bool lastLayoutFitHeight; - static WritingMode lastLayoutMode; -+ static sal_Int32 lastRowCount; -+ static sal_Int32 lastColCount; - }; - - SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = NULL; -@@ -255,6 +257,8 @@ Rectangle SdrTableObjImpl::lastLayoutRectangle; - bool SdrTableObjImpl::lastLayoutFitWidth; - bool SdrTableObjImpl::lastLayoutFitHeight; - WritingMode SdrTableObjImpl::lastLayoutMode; -+sal_Int32 SdrTableObjImpl::lastRowCount; -+sal_Int32 SdrTableObjImpl::lastColCount; - - // ----------------------------------------------------------------------------- - -@@ -696,13 +700,17 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe - WritingMode writingMode = mpTableObj->GetWritingMode(); - if( lastLayoutTable != this || lastLayoutRectangle != rArea - || lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight != bFitHeight -- || lastLayoutMode != writingMode ) -+ || lastLayoutMode != writingMode -+ || lastRowCount != getRowCount() -+ || lastColCount != getColumnCount() ) - { - lastLayoutTable = this; - lastLayoutRectangle = rArea; - lastLayoutFitWidth = bFitWidth; - lastLayoutFitHeight = bFitHeight; - lastLayoutMode = writingMode; -+ lastRowCount = getRowCount(); -+ lastColCount = getColumnCount(); - TableModelNotifyGuard aGuard( mxTable.get() ); - mpLayouter->LayoutTable( rArea, bFitWidth, bFitHeight ); - } --- -1.9.0 - diff --git a/libreoffice.spec b/libreoffice.spec index 492798f..cd35678 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -36,8 +36,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 -Release: 7%{?libo_prerelease}%{?dist} +Version: %{libo_version}.2 +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/ @@ -289,18 +289,12 @@ Patch28: 0001-prevent-KDE-Qt-from-interfering-with-the-session-man.patch Patch29: 0001-Resolves-fdo-36815-enable-printing-WYSIWYG-sidewindo.patch Patch30: 0001-Related-fdo-36815-print-the-text-highlight-range-as-.patch Patch31: 0001-Resolves-rhbz-1086714-overlarge-pixmap.patch -Patch32: 0001-every-even-numbered-print-job-is-reported-as-failed.patch -Patch33: 0001-Related-rhbz-1088625-PresenterPaintManager-seen-as-N.patch -Patch34: 0001-table-not-resizing-when-rows-columns-added-to-it.patch -Patch35: 0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch -Patch36: 0001-Resolves-rhbz-1089377-crash-on-loading-a-specific-rt.patch -Patch37: 0001-add-a-format-all-comments-feature.patch -Patch38: 0001-Resolves-fdo-37130-use-10pt-Default-style-font-for-c.patch -Patch39: 0001-Related-fdo-36815-center-scaled-comment-page-vertica.patch -Patch40: 0001-crash-in-selecting-text-in-comments-midway-in-para.patch -Patch41: 0001-Resolves-fdo-60040-crash-after-undoing-master-page-a.patch -Patch42: 0001-Related-rhbz-1032774-slide-restarter-should-disable-.patch -Patch43: 0001-add-X-TryExec-entries-to-desktop-files.patch +Patch32: 0001-Resolves-rhbz-1089377-crash-on-loading-a-specific-rt.patch +Patch33: 0001-add-a-format-all-comments-feature.patch +Patch34: 0001-Resolves-fdo-37130-use-10pt-Default-style-font-for-c.patch +Patch35: 0001-Related-fdo-36815-center-scaled-comment-page-vertica.patch +Patch36: 0001-Related-rhbz-1032774-slide-restarter-should-disable-.patch +Patch37: 0001-add-X-TryExec-entries-to-desktop-files.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2264,6 +2258,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Wed Apr 30 2014 David Tardon - 1:4.2.4.2-1 +- update to 4.2.4 rc2 + * Fri Apr 25 2014 Caolán McNamara - 1:4.2.4.1-7 - Related: rhbz#1032774 disable autoexit when switching monitors diff --git a/sources b/sources index a64349d..3183cf6 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 -421526597871b578c3a4c81ed1527f2a libreoffice-4.2.4.1.tar.xz -f7616a86c66ddfc8385789b7254cb0e7 libreoffice-help-4.2.4.1.tar.xz -b7a5f08250f1b10388533d574fcc9b1e libreoffice-translations-4.2.4.1.tar.xz +698a482f0cacd8b5eba9865fdd8a5403 libreoffice-4.2.4.2.tar.xz +a0ed88ac1758d2f87687fcf4bb7c9432 libreoffice-help-4.2.4.2.tar.xz +3db05930dc7c694d2cf58875b3245c2e libreoffice-translations-4.2.4.2.tar.xz