diff --git a/0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch b/0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch index bb65243..e69de29 100644 --- a/0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch +++ b/0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch @@ -1,152 +0,0 @@ -From 8636f3f41f8f6950a0e3c05f50eb4423c4035b2f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 27 Jan 2011 16:41:00 +0000 -Subject: [PATCH 1/2] Related: rhbz#672872 cancel gtk file-dialog on desktop::terminate - ---- - fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 7 +++++-- - fpicker/source/unx/gnome/SalGtkFolderPicker.cxx | 5 ++++- - fpicker/source/unx/gnome/SalGtkPicker.cxx | 19 ++++++++++++++++--- - fpicker/source/unx/gnome/SalGtkPicker.hxx | 20 +++++++++++++++++--- - 4 files changed, 42 insertions(+), 9 deletions(-) - -diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx -index d08125e..068ead5 100644 ---- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx -+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx -@@ -1030,7 +1030,10 @@ - uno::Reference< awt::XExtendedToolkit > xToolkit( - m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY); - -- RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit); -+ uno::Reference< frame::XDesktop > xDesktop( -+ m_xServiceMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), uno::UNO_QUERY); -+ -+ RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit, xDesktop); - uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog); - while( GTK_RESPONSE_NO == btn ) - { -@@ -1063,7 +1066,7 @@ - OUStringToOString(aResProvider.getResString(FILE_PICKER_TITLE_SAVE ), - RTL_TEXTENCODING_UTF8 ).getStr() ); - -- RunDialog* pAnotherDialog = new RunDialog(dlg, xToolkit); -+ RunDialog* pAnotherDialog = new RunDialog(dlg, xToolkit, xDesktop); - uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherDialog); - btn = pAnotherDialog->run(); - -diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx -index c42021c..08bbf04 100644 ---- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx -+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx -@@ -184,7 +184,10 @@ - uno::Reference< awt::XExtendedToolkit > xToolkit( - m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY); - -- RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit); -+ uno::Reference< frame::XDesktop > xDesktop( -+ m_xServiceMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), uno::UNO_QUERY); -+ -+ RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit, xDesktop); - uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog); - gint nStatus = pRunDialog->run(); - switch( nStatus ) -diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx -index 6dbaa03..9bdad50 100644 ---- a/fpicker/source/unx/gnome/SalGtkPicker.cxx -+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx -@@ -130,9 +130,10 @@ extern "C" - extern GdkDisplay* gdk_x11_lookup_xdisplay (void*xdisplay); - } - --RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit ) : -- cppu::WeakComponentImplHelper1< awt::XTopWindowListener >( maLock ), -- mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit) -+RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit, -+ uno::Reference< frame::XDesktop >& rDesktop ) : -+ cppu::WeakComponentImplHelper2< awt::XTopWindowListener, frame::XTerminateListener >( maLock ), -+ mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit), mxDesktop(rDesktop) - { - awt::SystemDependentXWindow aWindowHandle; - -@@ -186,6 +187,18 @@ void SAL_CALL RunDialog::windowOpened( const ::com::sun::star::lang::EventObject - g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, (GSourceFunc)canceldialog, this, NULL); - } - -+void SAL_CALL RunDialog::queryTermination( const ::com::sun::star::lang::EventObject& ) -+ throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException) -+{ -+} -+ -+void SAL_CALL RunDialog::notifyTermination( const ::com::sun::star::lang::EventObject& ) -+ throw(::com::sun::star::uno::RuntimeException) -+{ -+ GdkThreadLock aLock; -+ g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, (GSourceFunc)canceldialog, this, NULL); -+} -+ - void RunDialog::cancel() - { - GdkThreadLock aLock; -diff --git a/fpicker/source/unx/gnome/SalGtkPicker.hxx b/fpicker/source/unx/gnome/SalGtkPicker.hxx -index 889790d..52fe5a0 100644 ---- a/fpicker/source/unx/gnome/SalGtkPicker.hxx -+++ b/fpicker/source/unx/gnome/SalGtkPicker.hxx -@@ -34,7 +34,7 @@ - //_____________________________________________________________________________ - - #include --#include -+#include - #include - #include - #include -@@ -43,6 +43,8 @@ - - #include - #include -+#include -+#include - - #include - #include -@@ -85,13 +87,16 @@ public: - //to happen while we're opened waiting for user input, e.g. - //https://bugzilla.redhat.com/show_bug.cgi?id=441108 - class RunDialog : -- public cppu::WeakComponentImplHelper1< ::com::sun::star::awt::XTopWindowListener > -+ public cppu::WeakComponentImplHelper2< -+ ::com::sun::star::awt::XTopWindowListener, -+ ::com::sun::star::frame::XTerminateListener > - { - private: - osl::Mutex maLock; - GtkWidget *mpDialog; - GdkWindow *mpCreatedParent; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit> mxToolkit; -+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop > mxDesktop; - public: - - // XTopWindowListener -@@ -112,8 +117,17 @@ public: - throw (::com::sun::star::uno::RuntimeException) {} - virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) {} -+ -+ // XTerminateListener -+ virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) -+ throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException); -+ virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) -+ throw(::com::sun::star::uno::RuntimeException); - public: -- RunDialog(GtkWidget *pDialog, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit); -+ RunDialog(GtkWidget *pDialog, -+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit, -+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop > &rDesktop -+ ); - gint run(); - void cancel(); - ~RunDialog(); --- -1.7.3.5 - diff --git a/0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch b/0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch index 4251db7..e69de29 100644 --- a/0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch +++ b/0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch @@ -1,37 +0,0 @@ -From 092e1494c1d7d68873f50a0da7699b0fdd15c439 Mon Sep 17 00:00:00 2001 -From: Andy Hearn -Date: Sat, 8 Jan 2011 23:26:13 +0000 -Subject: [PATCH] Removed suspect hack. Cursor on post-it now scrolls out of view. - -Previously, when the user scrolls when the cursor is within a -post-it note, the main view judders, refusing to let the cursor - go out of view. The removed lines appears to have been a hack -to retain focus of a post-it note containing the cursor. ---- - sw/source/ui/docvw/PostItMgr.cxx | 10 ---------- - 1 files changed, 0 insertions(+), 10 deletions(-) - -diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx -index cb3e783..7dcdad7 100644 ---- a/sw/source/ui/docvw/PostItMgr.cxx -+++ b/sw/source/ui/docvw/PostItMgr.cxx -@@ -716,16 +716,6 @@ void SwPostItMgr::LayoutPostIts() - OSL_ENSURE(mPages[n]->bScrollbar,"SwPostItMgr::LayoutByPage(): note overlaps, but bScrollbar is not true"); - } - } -- -- // do some magic so we really see the focused note -- for(SwSidebarWin_iterator i = aVisiblePostItList.begin(); i!= aVisiblePostItList.end() ; i++) -- { -- if ((*i)->HasChildPathFocus()) -- { -- MakeVisible((*i),n+1); -- break; -- } -- } - } - else - { --- -1.7.3.4 - diff --git a/0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch b/0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch index 0e37637..e69de29 100644 --- a/0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch +++ b/0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch @@ -1,104 +0,0 @@ -From ec7ff475f480619787131d0a193d7786c30dac10 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 28 Jan 2011 21:16:36 +0000 -Subject: [PATCH] Resolves: fdo#33509, #i62414# out-by-one breaks CTL spell-checking popup - -ABCD -0123 - ^ - -Currently calls GetCharRect for position "0" and position "4". It should be -"3". We were placing the cursor *after* the final character. We really need to -place it *before* the final character and get the bounding box of the last char -to union it with the first char's bounding box. It works out ok for western -text, but you get a far different value for CTL text. ---- - sw/source/core/crsr/crsrsh.cxx | 4 ++-- - sw/source/core/edit/edlingu.cxx | 14 +++++--------- - 2 files changed, 7 insertions(+), 11 deletions(-) - -diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx -index ed8d37b..a6db747 100644 ---- a/sw/source/core/crsr/crsrsh.cxx -+++ b/sw/source/core/crsr/crsrsh.cxx -@@ -3419,7 +3419,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect, - //no determine the rectangle in the current line - xub_StrLen nWordStart = (nBegin + nLeft) < nLineStart ? nLineStart : nBegin + nLeft; - //take one less than the line end - otherwise the next line would be calculated -- xub_StrLen nWordEnd = (nBegin + nLen - nLeft - nRight) > nLineEnd ? nLineEnd - 1: (nBegin + nLen - nLeft - nRight); -+ xub_StrLen nWordEnd = (nBegin + nLen - nLeft - nRight) > nLineEnd ? nLineEnd : (nBegin + nLen - nLeft - nRight); - Push(); - pCrsr->DeleteMark(); - SwIndex& rContent = GetCrsr()->GetPoint()->nContent; -@@ -3431,7 +3431,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect, - SwCntntFrm *pCntntFrame = pCntntNode->GetFrm( &rPt, pCrsr->GetPoint(), FALSE); - - pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState ); -- rContent = nWordEnd; -+ rContent = nWordEnd - 1; - SwRect aEndRect; - pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState ); - rSelectRect = aStartRect.Union( aEndRect ); -diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx -index 7e186f9..a3d1572 100644 ---- a/sw/source/core/edit/edlingu.cxx -+++ b/sw/source/core/edit/edlingu.cxx -@@ -550,7 +550,6 @@ uno::Any SwHyphIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ) - - const sal_Bool bAuto = IsAuto(); - uno::Reference< XHyphenatedWord > xHyphWord; -- sal_uInt16 nRet; - sal_Bool bGoOn = sal_False; - do { - SwPaM *pCrsr; -@@ -565,10 +564,7 @@ uno::Any SwHyphIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ) - pCrsr->SetMark(); - } - -- // geraten BUG: -- if ( *pCrsr->End() > *GetEnd() ) -- nRet = 0; -- else -+ if ( *pCrsr->End() <= *GetEnd() ) - { - *pCrsr->GetMark() = *GetEnd(); - -@@ -1076,7 +1072,7 @@ uno::Reference< XSpellAlternatives > - //no determine the rectangle in the current line - xub_StrLen nWordStart = (nBegin + nLeft) < nLineStart ? nLineStart : nBegin + nLeft; - //take one less than the line end - otherwise the next line would be calculated -- xub_StrLen nWordEnd = (nBegin + nLen - nLeft - nRight) > nLineEnd ? nLineEnd - 1: (nBegin + nLen - nLeft - nRight); -+ xub_StrLen nWordEnd = (nBegin + nLen - nLeft - nRight) > nLineEnd ? nLineEnd: (nBegin + nLen - nLeft - nRight); - Push(); - pCrsr->DeleteMark(); - SwIndex& rContent = GetCrsr()->GetPoint()->nContent; -@@ -1088,7 +1084,7 @@ uno::Reference< XSpellAlternatives > - SwCntntFrm *pCntntFrame = pCntntNode->GetFrm(pPt, pCrsr->GetPoint(), FALSE); - - pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState ); -- rContent = nWordEnd; -+ rContent = nWordEnd - 1; - SwRect aEndRect; - pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState ); - rSelectRect = aStartRect.Union( aEndRect ); -@@ -1210,7 +1206,7 @@ bool SwEditShell::GetGrammarCorrection( - //no determine the rectangle in the current line - xub_StrLen nWordStart = (nBegin + nLeft) < nLineStart ? nLineStart : nBegin + nLeft; - //take one less than the line end - otherwise the next line would be calculated -- xub_StrLen nWordEnd = (nBegin + nLen - nLeft - nRight) > nLineEnd ? nLineEnd - 1: (nBegin + nLen - nLeft - nRight); -+ xub_StrLen nWordEnd = (nBegin + nLen - nLeft - nRight) > nLineEnd ? nLineEnd: (nBegin + nLen - nLeft - nRight); - Push(); - pCrsr->DeleteMark(); - SwIndex& rContent = GetCrsr()->GetPoint()->nContent; -@@ -1222,7 +1218,7 @@ bool SwEditShell::GetGrammarCorrection( - SwCntntFrm *pCntntFrame = pCntntNode->GetFrm(pPt, pCrsr->GetPoint(), FALSE); - - pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState ); -- rContent = nWordEnd; -+ rContent = nWordEnd - 1; - SwRect aEndRect; - pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState ); - rSelectRect = aStartRect.Union( aEndRect ); --- -1.7.3.5 - diff --git a/0001-free-ctxt-after-taking-lastError-details.patch b/0001-free-ctxt-after-taking-lastError-details.patch index a6ec54e..e69de29 100644 --- a/0001-free-ctxt-after-taking-lastError-details.patch +++ b/0001-free-ctxt-after-taking-lastError-details.patch @@ -1,34 +0,0 @@ -From e7473329c8d79ba3988aa07172290beedcaaf325 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 18 Jan 2011 12:10:32 +0000 -Subject: [PATCH] free ctxt *after* taking lastError details - ---- - unoxml/source/dom/documentbuilder.cxx | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx -index bcce353..9e052c3 100644 ---- a/unoxml/source/dom/documentbuilder.cxx -+++ b/unoxml/source/dom/documentbuilder.cxx -@@ -314,13 +314,13 @@ namespace DOM - - } // extern "C" - -- void throwEx(xmlParserCtxtPtr ctxt) { -- OUString msg = make_error_message(ctxt); -- xmlFreeParserCtxt(ctxt); -+ void throwEx(xmlParserCtxtPtr ctxt) -+ { - com::sun::star::xml::sax::SAXParseException saxex; -- saxex.Message = msg; -+ saxex.Message = make_error_message(ctxt); - saxex.LineNumber = static_cast(ctxt->lastError.line); - saxex.ColumnNumber = static_cast(ctxt->lastError.int2); -+ xmlFreeParserCtxt(ctxt); - throw saxex; - } - --- -1.7.3.4 - diff --git a/0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch b/0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch index 42f2f7c..41765a2 100644 --- a/0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch +++ b/0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch @@ -206,4 +206,4 @@ index 81b73e5..daee39b 100644 + return svt::BinFilterUtils::CreateOUStringFromUniStringArray( reinterpret_cast< const char* >( pArray.get() ), nReadSize ); } - TBCHeader::TBCHeader() : bSignature( 0x3 ) + TBCH \ No newline at end of file diff --git a/libreoffice.spec b/libreoffice.spec index 8bc7176..20cdf62 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -28,7 +28,7 @@ %define langpacks 1 Name: libreoffice -Version: 4.4.1.1 +Version: 4.4.1.2 Release: 1mamba Summary: Free Office Suite Group: Graphical Desktop/Applications/Office @@ -221,7 +221,7 @@ BuildRequires: libidn-devel BuildRequires: libjpeg-turbo-devel BuildRequires: liblp_solve-devel BuildRequires: libmdds-devel -BuildRequires: libmysql5-devel +BuildRequires: libmysqlclient-devel BuildRequires: libmythes-devel BuildRequires: libneon-devel BuildRequires: libnss-devel @@ -668,10 +668,9 @@ Requires: %{name}-core = %{version}-%{release} A plug-in for LibreOffice that enables integration into the GNOME desktop environment. %prep -%setup -q -c -a 2 -a 3 -a4 -a 32 -#% setup -q -c -#-T -D -#:<< ____EOF +#% setup -q -c -a 2 -a 3 -a4 -a 32 +%setup -q -c -T -D +:<< ____EOF rm -rf libreoffice-*/git-hooks for a in libreoffice-*/*; do mv $PWD/$a .; done @@ -713,7 +712,7 @@ ln -s %{SOURCE31} ext_sources chmod +x bin/unpack-sources %build -#:<< ___EOF +:<< ___EOF echo build start time is `date`, diskspace: `df -h . | tail -n 1` export QT4DIR=%{_qt4_prefix} @@ -794,6 +793,8 @@ export JAVA_HOME=%{java_home} # --with-intro-progressbar-position=60,316 \ # --with-intro-progressbar-size=409,8 \ +___EOF + for i in $RPM_OPT_FLAGS; do case "$i" in -O?|-pipe|-Wall|-g|-fexceptions) continue;; @@ -2673,6 +2674,9 @@ This package contains additional Zulu translations and resources for LibreOffice %endif %changelog +* Tue Mar 31 2015 Automatic Build System 4.4.1.2-1mamba +- automatic update by autodist + * Tue Feb 17 2015 Silvan Calarco 4.4.1.1-1mamba - update to 4.4.1.1