diff --git a/.gitignore b/.gitignore index 78e32a9..c8073fe 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,7 @@ /libreoffice-core-3.6.4.3.tar.xz /libreoffice-help-3.6.4.3.tar.xz /libreoffice-translations-3.6.4.3.tar.xz +/libreoffice-binfilter-3.6.5.2.tar.xz +/libreoffice-core-3.6.5.2.tar.xz +/libreoffice-help-3.6.5.2.tar.xz +/libreoffice-translations-3.6.5.2.tar.xz diff --git a/0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch b/0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch deleted file mode 100644 index d434c9b..0000000 --- a/0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4fc8af89257436b9cad70de574a166aa11ec42f1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Mon, 9 Jul 2012 12:51:16 +0100 -Subject: [PATCH] Resolves: rhbz#838368 --view ignored while -view accepted - -and our ooviewdoc script uses --view - -Change-Id: Ice708f1c72c8d29d411ba21e93cb19876af13881 ---- - desktop/source/app/cmdlineargs.cxx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx -index af7ee26..c67db8c 100644 ---- a/desktop/source/app/cmdlineargs.cxx -+++ b/desktop/source/app/cmdlineargs.cxx -@@ -217,7 +217,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) - bStartEvent = false; - bDisplaySpec = false; - } -- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-view" ))) -+ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "view" ))) - { - // open in viewmode - bOpenEvent = false; -@@ -229,7 +229,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) - bStartEvent = false; - bDisplaySpec = false; - } -- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-show" ))) -+ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "show" ))) - { - // open in viewmode - bOpenEvent = false; --- -1.7.10.4 - diff --git a/0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch b/0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch deleted file mode 100644 index 5cdb4be..0000000 --- a/0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch +++ /dev/null @@ -1,66 +0,0 @@ -From e99813f9372d24d3d2d734573c582d3e257cb5cc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 22 Aug 2012 11:46:50 +0100 -Subject: [PATCH] Resolves: rhbz#846775 Clipboard must be disposed before - Selection - -Change-Id: I968bc6da85cd444d504b08f85300a1fe251cdeee ---- - sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 5 +++-- - sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx -index 10ca623..ae9a6e9 100644 ---- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx -+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx -@@ -110,10 +110,10 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) - mpPageSelector(), - mpFocusManager(), - mpSlotManager(), -- mpClipboard(), - mpScrollBarManager(), - mpCurrentSlideManager(), - mpSelectionManager(), -+ mpClipboard(), - mpInsertionIndicatorHandler(new InsertionIndicatorHandler(rSlideSorter)), - mpAnimator(new Animator(rSlideSorter)), - mpVisibleAreaManager(new VisibleAreaManager(rSlideSorter)), -@@ -156,9 +156,9 @@ void SlideSorterController::Init (void) - mpPageSelector.reset(new PageSelector(mrSlideSorter)); - mpFocusManager.reset(new FocusManager(mrSlideSorter)); - mpSlotManager.reset(new SlotManager(mrSlideSorter)); -- mpClipboard.reset(new Clipboard(mrSlideSorter)); - mpScrollBarManager.reset(new ScrollBarManager(mrSlideSorter)); - mpSelectionManager.reset(new SelectionManager(mrSlideSorter)); -+ mpClipboard.reset(new Clipboard(mrSlideSorter)); - - mpScrollBarManager->LateInitialization(); - -@@ -202,6 +202,7 @@ SlideSorterController::~SlideSorterController (void) - void SlideSorterController::Dispose (void) - { - mpInsertionIndicatorHandler->End(Animator::AM_Immediate); -+ mpClipboard.reset(); - mpSelectionManager.reset(); - mpAnimator->Dispose(); - } -diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx -index f456cb4..bf3d844 100644 ---- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx -+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx -@@ -243,10 +243,10 @@ private: - ::boost::scoped_ptr mpPageSelector; - ::boost::scoped_ptr mpFocusManager; - ::boost::shared_ptr mpSlotManager; -- ::boost::scoped_ptr mpClipboard; - ::boost::scoped_ptr mpScrollBarManager; - mutable ::boost::shared_ptr mpCurrentSlideManager; - ::boost::shared_ptr mpSelectionManager; -+ ::boost::scoped_ptr mpClipboard; - ::boost::shared_ptr mpInsertionIndicatorHandler; - ::boost::shared_ptr mpAnimator; - ::boost::scoped_ptr mpVisibleAreaManager; --- -1.7.11.2 - diff --git a/0001-bigendian-utext-mixup-triggering-regression-test-fai.patch b/0001-bigendian-utext-mixup-triggering-regression-test-fai.patch deleted file mode 100644 index 50590cc..0000000 --- a/0001-bigendian-utext-mixup-triggering-regression-test-fai.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 49f2a69fa7d8eaa23d77519ac29748f4dc3e4c5a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 28 Nov 2012 11:15:56 +0000 -Subject: [PATCH] bigendian utext mixup triggering regression test failure - -text takes a pointer to a sal_uInt8 buffer but -utext takes a pointer to a sal_Unicode buffer - -passing a sal_uInt8 sequence of e.g. "\x0D\x00" to utext only happens -to work on little endian machines to represent 0x000D, its 0x0D00 on -bigendian. - -for more excitement text and utext do not share the same logic! -Various special chars are treated different in text vs utext so -we can't simply blindly change utext() calls to text() calls and -get the same behaviour without reworking those. - -So keep the text()/utext() calls as they are, but change what's -passed to be the right thing. - -Change-Id: I66696530c4a9482690c461146bdcf0a507b39b68 ---- - .../source/ooxml/OOXMLFastContextHandler.cxx | 51 +++++++++++----------- - 1 file changed, 25 insertions(+), 26 deletions(-) - -diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx -index 920bf31..c6f03bb 100644 ---- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx -+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx -@@ -39,19 +39,18 @@ - #include "Handler.hxx" - #include "ooxmlLoggers.hxx" - --static const sal_uInt8 s0x7[] = { 0x7, 0x0 }; --static const sal_uInt8 s0xd[] = { 0xd, 0x0 }; --static const sal_uInt8 sCR[] = { 0xd, 0x0 }; --static const sal_uInt8 sFtnEdnRef[] = { 0x2, 0x0 }; --static const sal_uInt8 sFtnEdnSep[] = { 0x3, 0x0 }; --static const sal_uInt8 sFtnEdnCont[] = { 0x4, 0x0 }; --static const sal_uInt8 sTab[] = { 0x9, 0x0 }; --static const sal_uInt8 sPgNum[] = { 0x0, 0x0 }; --static const sal_uInt8 sFieldStart[] = { 0x13 }; --static const sal_uInt8 sFieldSep[] = { 0x14 }; --static const sal_uInt8 sFieldEnd[] = { 0x15 }; --static const sal_uInt8 sNoBreakHyphen[] = { 0x1e, 0x0 }; --static const sal_uInt8 sSoftHyphen[] = { 0x1f, 0x0 }; -+static const sal_Unicode uCR = 0xd; -+static const sal_Unicode uFtnEdnRef = 0x2; -+static const sal_Unicode uFtnEdnSep = 0x3; -+static const sal_Unicode uTab = 0x9; -+static const sal_Unicode uPgNum = 0x0; -+static const sal_Unicode uNoBreakHyphen = 0x1e; -+static const sal_Unicode uSoftHyphen = 0x1f; -+ -+static const sal_uInt8 cFtnEdnCont = 0x4; -+static const sal_uInt8 cFieldStart = 0x13; -+static const sal_uInt8 cFieldSep = 0x14; -+static const sal_uInt8 cFieldEnd = 0x15; - - namespace writerfilter { - namespace ooxml -@@ -710,7 +709,7 @@ void OOXMLFastContextHandler::startField() - #endif - startCharacterGroup(); - if (isForwardEvents()) -- mpStream->text(sFieldStart, 1); -+ mpStream->text(&cFieldStart, 1); - endCharacterGroup(); - } - -@@ -721,7 +720,7 @@ void OOXMLFastContextHandler::fieldSeparator() - #endif - startCharacterGroup(); - if (isForwardEvents()) -- mpStream->text(sFieldSep, 1); -+ mpStream->text(&cFieldSep, 1); - endCharacterGroup(); - } - -@@ -732,7 +731,7 @@ void OOXMLFastContextHandler::endField() - #endif - startCharacterGroup(); - if (isForwardEvents()) -- mpStream->text(sFieldEnd, 1); -+ mpStream->text(&cFieldEnd, 1); - endCharacterGroup(); - } - -@@ -742,7 +741,7 @@ void OOXMLFastContextHandler::ftnednref() - debug_logger->element("contexthandler.ftnednref"); - #endif - if (isForwardEvents()) -- mpStream->utext(sFtnEdnRef, 1); -+ mpStream->utext((const sal_uInt8*)&uFtnEdnRef, 1); - } - - void OOXMLFastContextHandler::ftnednsep() -@@ -751,7 +750,7 @@ void OOXMLFastContextHandler::ftnednsep() - debug_logger->element("contexthandler.ftnednsep"); - #endif - if (isForwardEvents()) -- mpStream->utext(sFtnEdnSep, 1); -+ mpStream->utext((const sal_uInt8*)&uFtnEdnSep, 1); - } - - void OOXMLFastContextHandler::ftnedncont() -@@ -760,7 +759,7 @@ void OOXMLFastContextHandler::ftnedncont() - debug_logger->element("contexthandler.ftnedncont"); - #endif - if (isForwardEvents()) -- mpStream->text(sFtnEdnCont, 1); -+ mpStream->text(&cFtnEdnCont, 1); - } - - void OOXMLFastContextHandler::pgNum() -@@ -769,7 +768,7 @@ void OOXMLFastContextHandler::pgNum() - debug_logger->element("contexthandler.pgNum"); - #endif - if (isForwardEvents()) -- mpStream->utext((const sal_uInt8*)sPgNum, 1); -+ mpStream->utext((const sal_uInt8*)&uPgNum, 1); - } - - void OOXMLFastContextHandler::tab() -@@ -778,7 +777,7 @@ void OOXMLFastContextHandler::tab() - debug_logger->element("contexthandler.tab"); - #endif - if (isForwardEvents()) -- mpStream->utext((const sal_uInt8*)sTab, 1); -+ mpStream->utext((const sal_uInt8*)&uTab, 1); - } - - void OOXMLFastContextHandler::cr() -@@ -787,7 +786,7 @@ void OOXMLFastContextHandler::cr() - debug_logger->element("contexthandler.cr"); - #endif - if (isForwardEvents()) -- mpStream->utext((const sal_uInt8*)sCR, 1); -+ mpStream->utext((const sal_uInt8*)&uCR, 1); - } - - void OOXMLFastContextHandler::noBreakHyphen() -@@ -796,7 +795,7 @@ void OOXMLFastContextHandler::noBreakHyphen() - debug_logger->element("contexthandler.noBreakHyphen"); - #endif - if (isForwardEvents()) -- mpStream->utext((const sal_uInt8*)sNoBreakHyphen, 1); -+ mpStream->utext((const sal_uInt8*)&uNoBreakHyphen, 1); - } - - void OOXMLFastContextHandler::softHyphen() -@@ -805,7 +804,7 @@ void OOXMLFastContextHandler::softHyphen() - debug_logger->element("contexthandler.softHyphen"); - #endif - if (isForwardEvents()) -- mpStream->utext((const sal_uInt8*)sSoftHyphen, 1); -+ mpStream->utext((const sal_uInt8*)&uSoftHyphen, 1); - } - - void OOXMLFastContextHandler::handleLastParagraphInSection() -@@ -829,7 +828,7 @@ void OOXMLFastContextHandler::endOfParagraph() - if (! mpParserState->isInCharacterGroup()) - startCharacterGroup(); - if (isForwardEvents()) -- mpStream->utext((const sal_uInt8*)sCR, 1); -+ mpStream->utext((const sal_uInt8*)&uCR, 1); - } - - void OOXMLFastContextHandler::startTxbxContent() -@@ -1876,7 +1875,7 @@ void OOXMLFastContextHandlerTextTableRow::endRow() - startCharacterGroup(); - - if (isForwardEvents()) -- mpStream->utext(s0xd, 1); -+ mpStream->utext((const sal_uInt8*)&uCR, 1); - - endCharacterGroup(); - endParagraphGroup(); --- -1.7.11.7 - diff --git a/0001-split-qnametostr-up-to-try-and-make-.o-s-small-enoug.patch b/0001-split-qnametostr-up-to-try-and-make-.o-s-small-enoug.patch deleted file mode 100644 index 1a34347..0000000 --- a/0001-split-qnametostr-up-to-try-and-make-.o-s-small-enoug.patch +++ /dev/null @@ -1,232 +0,0 @@ -From f1c795baf1268c2650c706fc2aec28c2a7fbaf0e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 23 Nov 2012 09:42:39 +0000 -Subject: [PATCH] split qnametostr up to try and make .o's small enough for - ppc64 - -i.e. relocation truncated to fix: R_PPC64_TOC16_DS - -while I'm at it merge the standalone header/footer files into the .xslt and -simplify the makefile. - -Change-Id: Iee0e9b5dd96868f49f1bed22fb5dc6d28c8cef81 ---- - writerfilter/CustomTarget_source.mk | 16 +++---- - writerfilter/Library_writerfilter.mk | 21 ++------- - writerfilter/source/doctok/qnametostr.xsl | 6 +++ - writerfilter/source/ooxml/qnametostr.xsl | 8 +++- - .../source/resourcemodel/qnametostrcore.cxx | 52 ++++++++++++++++++++++ - writerfilter/source/resourcemodel/qnametostrfooter | 7 --- - writerfilter/source/resourcemodel/qnametostrheader | 48 -------------------- - 7 files changed, 74 insertions(+), 84 deletions(-) - create mode 100644 writerfilter/source/resourcemodel/qnametostrcore.cxx - delete mode 100644 writerfilter/source/resourcemodel/qnametostrfooter - delete mode 100644 writerfilter/source/resourcemodel/qnametostrheader - -diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk -index fc29784..5ee3041 100644 ---- a/writerfilter/CustomTarget_source.mk -+++ b/writerfilter/CustomTarget_source.mk -@@ -157,8 +157,8 @@ - - # resourcemodel - --wf_GEN_model_QNameToStr_cxx=$(writerfilter_WORK)/qnametostr.cxx --wf_GEN_ooxml_QNameToStr_tmp=$(writerfilter_WORK)/OOXMLqnameToStr.tmp -+wf_GEN_doctok_QNameToStr_cxx=$(writerfilter_WORK)/doctok/qnametostr.cxx -+wf_GEN_ooxml_QNameToStr_cxx=$(writerfilter_WORK)/ooxml/qnametostr.cxx - wf_GEN_model_SprmCodeToStr_cxx=$(writerfilter_WORK)/sprmcodetostr.cxx - wf_GEN_model_SprmCodeToStr_tmp=$(writerfilter_WORK)/sprmcodetostr.tmp - wf_GEN_doctok_QnameToStr_tmp=$(writerfilter_WORK)/DOCTOKqnameToStr.tmp -@@ -170,18 +170,14 @@ - wf_DEP_ooxml_namespaces_txt=$(OUTDIR)/inc/oox/namespaces.txt - wf_GEN_ooxml_preprocess_xsl=$(writerfilter_WORK)/modelpreprocess.xsl - --$(wf_GEN_ooxml_QNameToStr_tmp): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed) -+$(wf_GEN_ooxml_QNameToStr_cxx): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed) $(wf_SRC_ooxml_FactoryTools_xsl) - $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)) > $@ - --$(wf_GEN_doctok_QnameToStr_tmp): $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model) | $(writerfilter_WORK)/.dir -+$(wf_GEN_doctok_QNameToStr_cxx): $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model) $(wf_SRC_doctok_ResourceTools_xsl) | $(writerfilter_WORK)/.dir - $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)) > $@ - --$(wf_GEN_model_QNameToStr_cxx): $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(writerfilter_SRC)/resourcemodel/qnametostrheader $(writerfilter_SRC)/resourcemodel/qnametostrfooter $(wf_SRC_ooxml_FactoryTools_xsl) $(wf_SRC_doctok_ResourceTools_xsl) -- $(call gb_Output_announce,$@,build,CAT,1) -- cat $(writerfilter_SRC)/resourcemodel/qnametostrheader $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(writerfilter_SRC)/resourcemodel/qnametostrfooter > $@ -- - $(wf_GEN_model_SprmCodeToStr_tmp) : $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model) | $(writerfilter_WORK)/.dir - $(call gb_Output_announce,$@,build,XSL,1) - $(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)) > $@ -@@ -218,7 +214,8 @@ - $(wf_GEN_ooxml_FastTokens_hxx) \ - $(wf_GEN_ooxml_GperfFastToken_hxx) \ - $(wf_GEN_ooxml_NamespaceIds_hxx) \ -- $(wf_GEN_model_QNameToStr_cxx) \ -+ $(wf_GEN_doctok_QNameToStr_cxx) \ -+ $(wf_GEN_ooxml_QNameToStr_cxx) \ - $(wf_GEN_model_SprmCodeToStr_cxx) \ - $(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.hxx,$(WRITERFILTER_OOXMLNAMESPACES)) \ - $(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.cxx,$(WRITERFILTER_OOXMLNAMESPACES)) \ -diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk -index 1d7c667..870732f 100644 ---- a/writerfilter/Library_writerfilter.mk -+++ b/writerfilter/Library_writerfilter.mk -@@ -170,6 +170,7 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ - writerfilter/source/resourcemodel/TagLogger \ - writerfilter/source/resourcemodel/WW8Analyzer \ - writerfilter/source/resourcemodel/XPathLogger \ -+ writerfilter/source/resourcemodel/qnametostrcore \ - writerfilter/source/resourcemodel/resourcemodel \ - writerfilter/source/resourcemodel/util \ - )) -@@ -180,24 +181,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,writerfilter,\ - CustomTarget/writerfilter/source/OOXMLFactory_generated \ - CustomTarget/writerfilter/source/OOXMLFactory_values \ - CustomTarget/writerfilter/source/sprmcodetostr \ -+ CustomTarget/writerfilter/source/doctok/qnametostr \ -+ CustomTarget/writerfilter/source/ooxml/qnametostr \ - )) - --ifneq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-POWERPC64) --#Apparently some compilers, according to the original .mk this was converted --#from, require this to be noopt or they fail to compile it, probably good to --#revisit that and narrow this down to where it's necessary --$(eval $(call gb_Library_add_generated_cxxobjects,writerfilter,\ -- CustomTarget/writerfilter/source/qnametostr \ -- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ --)) --else --#Ironically, on RHEL-6 PPC64 with no-opt the output is too large for the --#toolchain, "Error: operand out of range", but it build fine with --#normal flags --$(eval $(call gb_Library_add_generated_cxxobjects,writerfilter,\ -- CustomTarget/writerfilter/source/qnametostr \ -- , $(gb_LinkTarget_EXCEPTIONFLAGS) \ --)) --endif -- - # vim: set noet sw=4 ts=4: -diff --git a/writerfilter/source/doctok/qnametostr.xsl b/writerfilter/source/doctok/qnametostr.xsl -index a416512..e3009c9 100644 ---- a/writerfilter/source/doctok/qnametostr.xsl -+++ b/writerfilter/source/doctok/qnametostr.xsl -@@ -22,8 +22,14 @@ - - - -+#include "doctok/resourceids.hxx" -+#include "resourcemodel/QNameToString.hxx" -+ -+namespace writerfilter -+{ - - - -+} - - -diff --git a/writerfilter/source/ooxml/qnametostr.xsl b/writerfilter/source/ooxml/qnametostr.xsl -index 1dc689f..a7a7d6c 100644 ---- a/writerfilter/source/ooxml/qnametostr.xsl -+++ b/writerfilter/source/ooxml/qnametostr.xsl -@@ -113,8 +113,14 @@ void ooxmlidsToXML(::std::ostream & out) - - - -+#include "ooxml/resourceids.hxx" -+#include "resourcemodel/QNameToString.hxx" -+ -+namespace writerfilter -+{ - - -+} - - -- -\ No newline at end of file -+ -diff --git a/writerfilter/source/resourcemodel/qnametostrcore.cxx b/writerfilter/source/resourcemodel/qnametostrcore.cxx -new file mode 100644 -index 0000000..81ed0f1 ---- /dev/null -+++ b/writerfilter/source/resourcemodel/qnametostrcore.cxx -@@ -0,0 +1,76 @@ -+/* -+ * This file is part of the LibreOffice project. -+ * -+ * This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. -+ * -+ * This file incorporates work covered by the following license notice: -+ * -+ * Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed -+ * with this work for additional information regarding copyright -+ * ownership. The ASF licenses this file to you under the Apache -+ * License, Version 2.0 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -+ */ -+ -+#include -+#include -+#include -+ -+namespace writerfilter -+{ -+ -+QNameToString::Pointer_t QNameToString::pInstance; -+ -+QNameToString::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::Instance() -+{ -+ if (pInstance.get() == NULL) -+ pInstance = QNameToString::Pointer_t(new QNameToString()); -+ -+ return pInstance; -+} -+ -+string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::operator()(Id qName) -+{ -+ string sResult; -+ -+ Map::const_iterator aIt = mMap.find(qName); -+ -+ if (aIt != mMap.end()) -+ sResult = aIt->second; -+ -+ return mMap[qName]; -+} -+ -+QNameToString::QNameToString() -+{ -+ init_doctok(); -+ init_ooxml(); -+} -+ -+extern void ooxmlsprmidsToXML(::std::ostream &out); -+extern void sprmidsToXML(::std::ostream &out); -+extern void doctokidsToXML(::std::ostream &out); -+extern void ooxmlidsToXML(::std::ostream &out); -+ -+void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC analyzerIds() -+{ -+ cout << "" << endl; -+ -+ sprmidsToXML(cout); -+ ooxmlsprmidsToXML(cout); -+ -+ cout << "" << endl; -+ -+ cout << "" << endl; -+ -+ doctokidsToXML(cout); -+ ooxmlidsToXML(cout); -+ -+ cout << "" << endl; -+} -+ -+} diff --git a/libreoffice.spec b/libreoffice.spec index 559345b..16a90fd 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%define libo_version 3.6.4 +%define libo_version 3.6.5 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -17,8 +17,8 @@ %define _default_patch_flags -s -l # make it easier to download sources from pre-release site # http://dev-builds.libreoffice.org/pre-releases/src -%define source_url http://dev-builds.libreoffice.org/pre-releases/src -# %%define source_url http://download.documentfoundation.org/libreoffice/src/%{libo_version} +# %%define source_url http://dev-builds.libreoffice.org/pre-releases/src +%define source_url http://download.documentfoundation.org/libreoffice/src/%{libo_version} # use rpmbuild --without binfilter (or mock --without binfilter) to get # a faster build without old binary filters @@ -43,8 +43,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.3 -Release: 4%{?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.documentfoundation.org/develop @@ -224,37 +224,33 @@ Patch4: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch Patch5: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch Patch6: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch Patch7: libreoffice-installfix.patch -Patch8: 0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch -Patch9: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch -Patch10: 0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch -Patch11: 0001-Resolves-rhbz-842292-crash-in-calling-callback-whose.patch -Patch12: 0001-Resolves-rhbz-855541-XIOError-handler-multithread-wo.patch -Patch13: 0001-tentative-initial-attempt-at-re-work-for-new-playbin.patch -Patch14: 0002-gstreamer-make-gstreamer-1.0-and-0.10-dual-compile.patch -Patch15: 0003-make-avmedia-build-with-gstreamer-0.10.patch -Patch16: 0004-tweak-old-school-gstreamer-link-line.patch -Patch17: 0005-Don-t-fail-configure-with-older-gstreamer-plugins-ba.patch -Patch18: 0006-gstreamer-various-fixes-for-1.0-and-cleanups.patch -Patch19: 0007-gstreamer-fix-leaking-pads.patch -Patch20: 0001-convert-java-XSL-transformer-into-extension.patch -Patch21: 0002-rework-selection-of-transformer-for-an-XSLT-filter.patch -Patch22: 0003-drop-saxon-based-XSLT-transformer.patch -Patch23: 0004-remove-all-traces-of-saxon.patch -Patch24: 0001-do-not-strip-install-set.patch -Patch25: 0001-Resolves-fdo-56198-collect-scrollbar-click-preferenc.patch -Patch26: 0001-bigendian-utext-mixup-triggering-regression-test-fai.patch -Patch27: 0001-fiddle-system-db-test-to-link-on-RHEL-6.patch -Patch28: 0001-split-qnametostr-up-to-try-and-make-.o-s-small-enoug.patch -Patch29: 0001-startup-more-reliable-startup-of-multiple-instances.patch -Patch30: 0002-Related-fdo-33484-Terminate-OfficeIPCThread-by-closi.patch +Patch8: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch +Patch9: 0001-Resolves-rhbz-842292-crash-in-calling-callback-whose.patch +Patch10: 0001-Resolves-rhbz-855541-XIOError-handler-multithread-wo.patch +Patch11: 0001-tentative-initial-attempt-at-re-work-for-new-playbin.patch +Patch12: 0002-gstreamer-make-gstreamer-1.0-and-0.10-dual-compile.patch +Patch13: 0003-make-avmedia-build-with-gstreamer-0.10.patch +Patch14: 0004-tweak-old-school-gstreamer-link-line.patch +Patch15: 0005-Don-t-fail-configure-with-older-gstreamer-plugins-ba.patch +Patch16: 0006-gstreamer-various-fixes-for-1.0-and-cleanups.patch +Patch17: 0007-gstreamer-fix-leaking-pads.patch +Patch18: 0001-convert-java-XSL-transformer-into-extension.patch +Patch19: 0002-rework-selection-of-transformer-for-an-XSLT-filter.patch +Patch20: 0003-drop-saxon-based-XSLT-transformer.patch +Patch21: 0004-remove-all-traces-of-saxon.patch +Patch22: 0001-do-not-strip-install-set.patch +Patch23: 0001-Resolves-fdo-56198-collect-scrollbar-click-preferenc.patch +Patch24: 0001-fiddle-system-db-test-to-link-on-RHEL-6.patch +Patch25: 0001-startup-more-reliable-startup-of-multiple-instances.patch +Patch26: 0002-Related-fdo-33484-Terminate-OfficeIPCThread-by-closi.patch +Patch27: 0001-Resolves-fdo-58730-workaround-UL-LR-Space-100-proble.patch +Patch28: 0001-rhbz-760765-copy-custom-styles-on-copy-paste.patch %if 0%{?rhel} && 0%{?rhel} < 7 -Patch31: libreoffice-rhel6gcj.patch -Patch32: libreoffice-rhel6poppler.patch -Patch33: libreoffice-rhel6langs.patch -Patch34: 0001-rhbz-891082-CMXDocument-isSupported-catch-exceptions.patch +Patch29: libreoffice-rhel6gcj.patch +Patch30: libreoffice-rhel6poppler.patch +Patch31: libreoffice-rhel6langs.patch +Patch32: 0001-rhbz-891082-CMXDocument-isSupported-catch-exceptions.patch %endif -Patch35: 0001-Resolves-fdo-58730-workaround-UL-LR-Space-100-proble.patch -Patch36: 0001-rhbz-760765-copy-custom-styles-on-copy-paste.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -972,37 +968,33 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch5 -p1 -b .ooo101274.opening-a-directory.patch %patch6 -p1 -b .ooo105784.vcl.sniffscriptforsubs.patch %patch7 -p1 -b .libreoffice-installfix.patch -%patch8 -p1 -b .rhbz838368-view-ignored-while-view-accepte.patch -%patch9 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch -%patch10 -p1 -b .rhbz-846775-Clipboard-must-be-disposed-befo.patch -%patch11 -p1 -b .rhbz-842292-crash-in-calling-callback-whose.patch -%patch12 -p1 -b .rhbz-855541-XIOError-handler-multithread-wo.patch -%patch13 -p1 -b .tentative-initial-attempt-at-re-work-for-new-playbin.patch -%patch14 -p1 -b .gstreamer-make-gstreamer-1.0-and-0.10-dual-compile.patch -%patch15 -p1 -b .make-avmedia-build-with-gstreamer-0.10.patch -%patch16 -p1 -b .tweak-old-school-gstreamer-link-line.patch -%patch17 -p1 -b .Don-t-fail-configure-with-older-gstreamer-plugins-ba.patch -%patch18 -p1 -b .gstreamer-various-fixes-for-1.0-and-cleanups.patch -%patch19 -p1 -b .gstreamer-fix-leaking-pads.patch -%patch20 -p1 -b .convert-java-XSL-transformer-into-extension.patch -%patch21 -p1 -b .rework-selection-of-transformer-for-an-XSLT-filter.patch -%patch22 -p1 -b .drop-saxon-based-XSLT-transformer.patch -%patch23 -p1 -b .remove-all-traces-of-saxon.patch -%patch24 -p1 -b .do-not-strip-install-set.patch -%patch25 -p1 -b .fdo-56198-collect-scrollbar-click-preferenc.patch -%patch26 -p1 -b .bigendian-utext-mixup-triggering-regression-test-fai.patch -%patch27 -p1 -b .fiddle-system-db-test-to-link-on-RHEL-6.patch -%patch28 -p1 -b .split-qnametostr-up-to-try-and-make-.o-s-small-enoug.patch -%patch29 -p1 -b .startup-more-reliable-startup-of-multiple-instances.patch -%patch30 -p1 -b .Related-fdo-33484-Terminate-OfficeIPCThread-by-closi.patch +%patch8 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch +%patch9 -p1 -b .rhbz-842292-crash-in-calling-callback-whose.patch +%patch10 -p1 -b .rhbz-855541-XIOError-handler-multithread-wo.patch +%patch11 -p1 -b .tentative-initial-attempt-at-re-work-for-new-playbin.patch +%patch12 -p1 -b .gstreamer-make-gstreamer-1.0-and-0.10-dual-compile.patch +%patch13 -p1 -b .make-avmedia-build-with-gstreamer-0.10.patch +%patch14 -p1 -b .tweak-old-school-gstreamer-link-line.patch +%patch15 -p1 -b .Don-t-fail-configure-with-older-gstreamer-plugins-ba.patch +%patch16 -p1 -b .gstreamer-various-fixes-for-1.0-and-cleanups.patch +%patch17 -p1 -b .gstreamer-fix-leaking-pads.patch +%patch18 -p1 -b .convert-java-XSL-transformer-into-extension.patch +%patch19 -p1 -b .rework-selection-of-transformer-for-an-XSLT-filter.patch +%patch20 -p1 -b .drop-saxon-based-XSLT-transformer.patch +%patch21 -p1 -b .remove-all-traces-of-saxon.patch +%patch22 -p1 -b .do-not-strip-install-set.patch +%patch23 -p1 -b .fdo-56198-collect-scrollbar-click-preferenc.patch +%patch24 -p1 -b .fiddle-system-db-test-to-link-on-RHEL-6.patch +%patch25 -p1 -b .startup-more-reliable-startup-of-multiple-instances.patch +%patch26 -p1 -b .Related-fdo-33484-Terminate-OfficeIPCThread-by-closi.patch +%patch27 -p1 -b .Resolves-fdo-58730-workaround-UL-LR-Space-100-proble.patch +%patch28 -p1 -b .rhbz-760765-copy-custom-styles-on-copy-paste.patch %if 0%{?rhel} && 0%{?rhel} < 7 -%patch31 -p1 -b .rhel6gcj.patch -%patch32 -p1 -b .rhel6poppler.patch -%patch33 -p1 -b .rhel6langs.patch -%patch34 -p1 -b .rhbz-891082-CMXDocument-isSupported-catch-exceptions.patch +%patch29 -p1 -b .rhel6gcj.patch +%patch30 -p1 -b .rhel6poppler.patch +%patch31 -p1 -b .rhel6langs.patch +%patch32 -p1 -b .rhbz-891082-CMXDocument-isSupported-catch-exceptions.patch %endif -%patch35 -p1 -b .Resolves-fdo-58730-workaround-UL-LR-Space-100-proble.patch -%patch36 -p1 -b .rhbz-760765-copy-custom-styles-on-copy-paste.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2271,6 +2263,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Fri Jan 25 2013 David Tardon - 1:3.6.5.2-1 +- 3.6.5 rc2 + * Tue Jan 22 2013 David Tardon - 1:3.6.4.3-4 - Resolves: rhbz#901346 do not install 512x512 icons - Resolves: rhbz#760765 Impress doesn't copy custom styles from one file diff --git a/sources b/sources index eacc75f..8d7a383 100644 --- a/sources +++ b/sources @@ -12,3 +12,7 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 6e88d3a83691cb8ee5081487c8345a6a libreoffice-core-3.6.4.3.tar.xz 388acc72e3bb86afd036140a91d4e0d6 libreoffice-help-3.6.4.3.tar.xz f656e24263ffdff1c7748d41e18eca9c libreoffice-translations-3.6.4.3.tar.xz +c29dc2f9c7c753a3b27c461f5000b3c7 libreoffice-binfilter-3.6.5.2.tar.xz +b99c80c841dc0cb4461a2ddb5362dc60 libreoffice-core-3.6.5.2.tar.xz +e8b3964f2505e719ba987ac4c753d235 libreoffice-help-3.6.5.2.tar.xz +6b28c8457c71597e405de54a6941f740 libreoffice-translations-3.6.5.2.tar.xz