diff --git a/.gitignore b/.gitignore index 6d3cc54..21ef8ca 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,23 @@ /libreoffice-filters-3.4.5.2.tar.bz2 /libreoffice-help-3.4.5.2.tar.bz2 /libreoffice-impress-3.4.5.2.tar.bz2 +/libreoffice-artwork-3.4.6.2.tar.bz2 +/libreoffice-base-3.4.6.2.tar.bz2 +/libreoffice-bootstrap-3.4.6.2.tar.bz2 +/libreoffice-calc-3.4.6.2.tar.bz2 +/libreoffice-components-3.4.6.2.tar.bz2 +/libreoffice-extensions-3.4.6.2.tar.bz2 +/libreoffice-extras-3.4.6.2.tar.bz2 +/libreoffice-filters-3.4.6.2.tar.bz2 +/libreoffice-help-3.4.6.2.tar.bz2 +/libreoffice-impress-3.4.6.2.tar.bz2 +/libreoffice-libs-core-3.4.6.2.tar.bz2 +/libreoffice-libs-extern-3.4.6.2.tar.bz2 +/libreoffice-libs-extern-sys-3.4.6.2.tar.bz2 +/libreoffice-libs-gui-3.4.6.2.tar.bz2 +/libreoffice-postprocess-3.4.6.2.tar.bz2 +/libreoffice-sdk-3.4.6.2.tar.bz2 +/libreoffice-testing-3.4.6.2.tar.bz2 +/libreoffice-translations-3.4.6.2.tar.bz2 +/libreoffice-ure-3.4.6.2.tar.bz2 +/libreoffice-writer-3.4.6.2.tar.bz2 diff --git a/0001-Correctly-calculate-leap-year.patch b/0001-Correctly-calculate-leap-year.patch deleted file mode 100644 index 441c865..0000000 --- a/0001-Correctly-calculate-leap-year.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a2d96b51f3272ecbdc0f4f9d4b2ee65409892554 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Tue, 28 Feb 2012 22:01:52 -0500 -Subject: [PATCH 1/2] Correctly calculate leap year. - -With the old code, year 2000 would not be a leap year, but it actually -is. With this, Calc correctly loads cell with date value of 2000-2-29. - -(regression from CWS sw33bf02 8786083eb9dabb0d7b328a217ba99a1d71493ad7) - -Signed-off-by: Stephan Bergmann -Signed-off-by: Eike Rathke -Signed-off-by: Michael Stahl -(cherry picked from commit 3c993bd0c3120445f27cb37e6ecfd8b45c6605e0) ---- - sax/source/tools/converter.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx -index f2dea8a..eb22e0f 100644 ---- a/sax/source/tools/converter.cxx -+++ b/sax/source/tools/converter.cxx -@@ -1320,7 +1320,7 @@ readDateTimeComponent(const ::rtl::OUString & rString, - static bool lcl_isLeapYear(const sal_uInt32 nYear) - { - return ((nYear % 4) == 0) -- && !(((nYear % 100) == 0) || ((nYear % 400) == 0)); -+ && (((nYear % 100) != 0) || ((nYear % 400) == 0)); - } - - static sal_uInt16 --- -1.7.7.6 - diff --git a/0001-Disable-problematic-reading-of-external-entities-in-.patch b/0001-Disable-problematic-reading-of-external-entities-in-.patch deleted file mode 100644 index 5526c1f..0000000 --- a/0001-Disable-problematic-reading-of-external-entities-in-.patch +++ /dev/null @@ -1,418 +0,0 @@ -From b1c116c9c0bbd3b367a7a644ca1ddd0e224d0f11 Mon Sep 17 00:00:00 2001 -From: Petr Mladek -Date: Tue, 28 Feb 2012 11:02:38 +0100 -Subject: [PATCH] Disable problematic reading of external entities in raptor - -Signed-off-by: Michael Meeks ---- - redland/raptor/makefile.mk | 3 +- - redland/raptor/raptor-1.4.18.entities.patch | 383 +++++++++++++++++++++++++++ - 2 files changed, 385 insertions(+), 1 deletions(-) - create mode 100644 redland/raptor/raptor-1.4.18.entities.patch - -diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk -index bbedd36..8ad5b34 100644 ---- a/redland/raptor/makefile.mk -+++ b/redland/raptor/makefile.mk -@@ -57,7 +57,8 @@ OOO_PATCH_FILES= \ - $(TARFILE_NAME).patch.ooo_build \ - $(TARFILE_NAME).patch.dmake \ - $(TARFILE_NAME).patch.win32 \ -- raptor-aix.patch -+ raptor-aix.patch \ -+ $(TARFILE_NAME).entities.patch - - PATCH_FILES=$(OOO_PATCH_FILES) - -diff --git a/redland/raptor/raptor-1.4.18.entities.patch b/redland/raptor/raptor-1.4.18.entities.patch -new file mode 100644 -index 0000000..4964dae ---- /dev/null -+++ b/redland/raptor/raptor-1.4.18.entities.patch -@@ -0,0 +1,383 @@ -+--- misc/raptor-1.4.18/src/raptor.h.old 2008-06-20 07:47:38.000000000 +0200 -++++ misc/build/raptor-1.4.18/src/raptor.h 2012-02-15 16:54:21.000000000 +0100 -+@@ -376,6 +376,7 @@ typedef struct { -+ * @RAPTOR_FEATURE_JSON_EXTRA_DATA: JSON serializer extra top-level data -+ * @RAPTOR_FEATURE_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples it finds (none, rdf-xml, atom-triples) -+ * @RAPTOR_FEATURE_ATOM_ENTRY_URI: Atom entry URI. If given, generate an Atom Entry Document with the item having the given URI, otherwise generate an Atom Feed Document with any items found. -++ * @RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: When reading XML, load external entities. -+ * @RAPTOR_FEATURE_LAST: Internal -+ * -+ * Raptor parser, serializer or XML writer features. -+@@ -416,7 +417,8 @@ typedef enum { -+ RAPTOR_FEATURE_JSON_EXTRA_DATA, -+ RAPTOR_FEATURE_RSS_TRIPLES, -+ RAPTOR_FEATURE_ATOM_ENTRY_URI, -+- RAPTOR_FEATURE_LAST=RAPTOR_FEATURE_ATOM_ENTRY_URI -++ RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES, -++ RAPTOR_FEATURE_LAST=RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES -+ } raptor_feature; -+ -+ -+--- misc/raptor-1.4.18/src/raptor_feature.c.old 2008-06-05 08:54:16.000000000 +0200 -++++ misc/build/raptor-1.4.18/src/raptor_feature.c 2012-02-15 16:55:09.000000000 +0100 -+@@ -89,7 +89,8 @@ static const struct -+ { RAPTOR_FEATURE_JSON_CALLBACK , 6, "jsonCallback", "JSON serializer callback" }, -+ { RAPTOR_FEATURE_JSON_EXTRA_DATA , 6, "jsonExtraData", "JSON serializer extra data" }, -+ { RAPTOR_FEATURE_RSS_TRIPLES , 6, "rssTriples", "Atom/RSS serializer writes extra RDF triples" }, -+- { RAPTOR_FEATURE_ATOM_ENTRY_URI , 6, "atomEntryUri", "Atom serializer Entry URI" } -++ { RAPTOR_FEATURE_ATOM_ENTRY_URI , 6, "atomEntryUri", "Atom serializer Entry URI" }, -++ { RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES, 1, "loadExternalEntities", "Load external XML entities." } -+ }; -+ -+ -+--- misc/raptor-1.4.18/src/raptor_internal.h.old 2008-06-03 07:04:09.000000000 +0200 -++++ misc/build/raptor-1.4.18/src/raptor_internal.h 2012-02-15 16:52:08.000000000 +0100 -+@@ -983,6 +983,14 @@ struct raptor_sax2_s { -+ -+ /* base URI for resolving relative URIs or xml:base URIs */ -+ raptor_uri* base_uri; -++ -++ /* call SAX2 handlers if non-0 */ -++ int enabled; -++ -++ /* FEATURE: -++ * non 0 if XML entities should be loaded -++ */ -++ int feature_load_external_entities; -+ }; -+ -+ int raptor_sax2_init(void); -+--- misc/raptor-1.4.18/src/raptor_libxml.c.old 2008-06-14 05:35:27.000000000 +0200 -++++ misc/build/raptor-1.4.18/src/raptor_libxml.c 2012-02-15 16:52:08.000000000 +0100 -+@@ -142,18 +142,115 @@ raptor_libxml_hasExternalSubset (void* u -+ -+ static xmlParserInputPtr -+ raptor_libxml_resolveEntity(void* user_data, -+- const xmlChar *publicId, const xmlChar *systemId) { -+- raptor_sax2* sax2=(raptor_sax2*)user_data; -+- return libxml2_resolveEntity(sax2->xc, publicId, systemId); -++ const xmlChar *publicId, const xmlChar *systemId) -++{ -++ raptor_sax2* sax2 = (raptor_sax2*)user_data; -++ xmlParserCtxtPtr ctxt = sax2->xc; -++ const unsigned char *uri_string = NULL; -++ xmlParserInputPtr entity_input; -++ int load_entity = 0; -++ -++ if(ctxt->input) -++ uri_string = (const unsigned char *)ctxt->input->filename; -++ -++ if(!uri_string) -++ uri_string = (const unsigned char *)ctxt->directory; -++ -++ load_entity = sax2->feature_load_external_entities; -++ -++ if(load_entity) { -++ entity_input = xmlLoadExternalEntity((const char*)uri_string, -++ (const char*)publicId, -++ ctxt); -++ } else { -++ RAPTOR_DEBUG4("Not loading entity URI %s by policy for publicId '%s' systemId '%s'\n", uri_string, publicId, systemId); -++ } -++ -++ return entity_input; -+ } -+ -+ -+ static xmlEntityPtr -+-raptor_libxml_getEntity(void* user_data, const xmlChar *name) { -+- raptor_sax2* sax2=(raptor_sax2*)user_data; -+- return libxml2_getEntity(sax2->xc, name); -+-} -++raptor_libxml_getEntity(void* user_data, const xmlChar *name) -++{ -++ raptor_sax2* sax2 = (raptor_sax2*)user_data; -++ xmlParserCtxtPtr xc = sax2->xc; -++ xmlEntityPtr ret = NULL; -++ -++ if(!xc) -++ return NULL; -++ -++ if(!xc->inSubset) { -++ /* looks for hardcoded set of entity names - lt, gt etc. */ -++ ret = xmlGetPredefinedEntity(name); -++ if(ret) { -++ RAPTOR_DEBUG2("Entity '%s' found in predefined set\n", name); -++ return ret; -++ } -++ } -+ -++ /* This section uses xmlGetDocEntity which looks for entities in -++ * memory only, never from a file or URI -++ */ -++ if(xc->myDoc && (xc->myDoc->standalone == 1)) { -++ RAPTOR_DEBUG2("Entity '%s' document is standalone\n", name); -++ /* Document is standalone: no entities are required to interpret doc */ -++ if(xc->inSubset == 2) { -++ xc->myDoc->standalone = 0; -++ ret = xmlGetDocEntity(xc->myDoc, name); -++ xc->myDoc->standalone = 1; -++ } else { -++ ret = xmlGetDocEntity(xc->myDoc, name); -++ if(!ret) { -++ xc->myDoc->standalone = 0; -++ ret = xmlGetDocEntity(xc->myDoc, name); -++ xc->myDoc->standalone = 1; -++ } -++ } -++ } else { -++ ret = xmlGetDocEntity(xc->myDoc, name); -++ } -++ -++ if(ret && !ret->children && -++ (ret->etype == XML_EXTERNAL_GENERAL_PARSED_ENTITY)) { -++ /* Entity is an external general parsed entity. It may be in a -++ * catalog file, user file or user URI -++ */ -++ int val = 0; -++ xmlNodePtr children; -++ int load_entity = 0; -++ -++ load_entity = sax2->feature_load_external_entities; -++ -++ if(!load_entity) { -++ RAPTOR_DEBUG2("Not getting entity URI %s by policy\n", ret->URI); -++ children = xmlNewText((const xmlChar*)""); -++ } else { -++ /* Disable SAX2 handlers so that the SAX2 events do not all get -++ * sent to callbacks during dealing with the entity parsing. -++ */ -++ sax2->enabled = 0; -++ val = xmlParseCtxtExternalEntity(xc, ret->URI, ret->ExternalID, &children); -++ sax2->enabled = 1; -++ } -++ -++ if(!val) { -++ xmlAddChildList((xmlNodePtr)ret, children); -++ } else { -++ xc->validate = 0; -++ return NULL; -++ } -++ -++ ret->owner = 1; -++ -++ /* Mark this entity as having been checked - never do this again */ -++ if(!ret->checked) -++ ret->checked = 1; -++ } -++ -++ return ret; -++} -++ -+ -+ static xmlEntityPtr -+ raptor_libxml_getParameterEntity(void* user_data, const xmlChar *name) { -+--- misc/raptor-1.4.18/src/raptor_parse.c.old 2008-06-15 09:18:50.000000000 +0200 -++++ misc/build/raptor-1.4.18/src/raptor_parse.c 2012-02-15 16:52:08.000000000 +0100 -+@@ -1294,6 +1294,7 @@ raptor_set_feature(raptor_parser *parser -+ case RAPTOR_FEATURE_MICROFORMATS: -+ case RAPTOR_FEATURE_HTML_LINK: -+ case RAPTOR_FEATURE_WWW_TIMEOUT: -++ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: -+ parser->features[(int)feature]=value; -+ break; -+ -+@@ -1414,6 +1415,7 @@ raptor_get_feature(raptor_parser *parser -+ case RAPTOR_FEATURE_MICROFORMATS: -+ case RAPTOR_FEATURE_HTML_LINK: -+ case RAPTOR_FEATURE_WWW_TIMEOUT: -++ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: -+ result=(parser->features[(int)feature] != 0); -+ break; -+ -+--- misc/raptor-1.4.18/src/raptor_rdfxml.c.old 2008-06-15 10:12:06.000000000 +0200 -++++ misc/build/raptor-1.4.18/src/raptor_rdfxml.c 2012-02-15 16:52:08.000000000 +0100 -+@@ -1124,6 +1124,9 @@ raptor_rdfxml_parse_start(raptor_parser* -+ raptor_sax2_set_feature(rdf_xml_parser->sax2, -+ RAPTOR_FEATURE_NO_NET, -+ rdf_parser->features[RAPTOR_FEATURE_NO_NET]); -++ raptor_sax2_set_feature(rdf_xml_parser->sax2, -++ RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES, -++ rdf_parser->features[RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES]); -+ -+ raptor_sax2_parse_start(rdf_xml_parser->sax2, uri); -+ -+--- misc/raptor-1.4.18/src/raptor_rss.c.old 2008-05-21 22:25:57.000000000 +0200 -++++ misc/build/raptor-1.4.18/src/raptor_rss.c 2012-02-15 16:52:08.000000000 +0100 -+@@ -251,6 +251,9 @@ raptor_rss_parse_start(raptor_parser *rd -+ raptor_sax2_set_feature(rss_parser->sax2, -+ RAPTOR_FEATURE_NO_NET, -+ rdf_parser->features[RAPTOR_FEATURE_NO_NET]); -++ raptor_sax2_set_feature(rss_parser->sax2, -++ RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES, -++ rdf_parser->features[RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES]); -+ -+ raptor_sax2_parse_start(rss_parser->sax2, uri); -+ -+--- misc/raptor-1.4.18/src/raptor_sax2.c.old 2008-06-15 10:12:20.000000000 +0200 -++++ misc/build/raptor-1.4.18/src/raptor_sax2.c 2012-02-15 16:52:08.000000000 +0100 -+@@ -96,6 +96,8 @@ raptor_new_sax2(void* user_data, raptor_ -+ -+ sax2->user_data=user_data; -+ -++ sax2->enabled = 1; -++ -+ sax2->locator=error_handlers->locator; -+ -+ sax2->error_handlers=error_handlers; -+@@ -687,6 +689,10 @@ raptor_sax2_set_feature(raptor_sax2 *sax -+ sax2->feature_no_net=value; -+ break; -+ -++ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: -++ sax2->feature_load_external_entities=value; -++ break; -++ -+ case RAPTOR_FEATURE_SCANNING: -+ case RAPTOR_FEATURE_ASSUME_IS_RDF: -+ case RAPTOR_FEATURE_ALLOW_NON_NS_ATTRIBUTES: -+@@ -767,6 +773,9 @@ raptor_sax2_start_element(void* user_dat -+ unsigned char *xml_language=NULL; -+ raptor_uri *xml_base=NULL; -+ -++ if(!sax2->enabled) -++ return; -++ -+ #ifdef RAPTOR_XML_EXPAT -+ #ifdef EXPAT_UTF8_BOM_CRASH -+ sax2->tokens_count++; -+@@ -990,6 +999,9 @@ raptor_sax2_end_element(void* user_data, -+ raptor_sax2* sax2=(raptor_sax2*)user_data; -+ raptor_xml_element* xml_element; -+ -++ if(!sax2->enabled) -++ return; -++ -+ #ifdef RAPTOR_XML_EXPAT -+ #ifdef EXPAT_UTF8_BOM_CRASH -+ sax2->tokens_count++; -+@@ -1025,6 +1037,10 @@ void -+ raptor_sax2_characters(void* user_data, const unsigned char *s, int len) -+ { -+ raptor_sax2* sax2=(raptor_sax2*)user_data; -++ -++ if(!sax2->enabled) -++ return; -++ -+ if(sax2->characters_handler) -+ sax2->characters_handler(sax2->user_data, sax2->current_element, s, len); -+ } -+@@ -1035,6 +1051,10 @@ void -+ raptor_sax2_cdata(void* user_data, const unsigned char *s, int len) -+ { -+ raptor_sax2* sax2=(raptor_sax2*)user_data; -++ -++ if(!sax2->enabled) -++ return; -++ -+ #ifdef RAPTOR_XML_EXPAT -+ #ifdef EXPAT_UTF8_BOM_CRASH -+ sax2->tokens_count++; -+@@ -1051,6 +1071,10 @@ void -+ raptor_sax2_comment(void* user_data, const unsigned char *s) -+ { -+ raptor_sax2* sax2=(raptor_sax2*)user_data; -++ -++ if(!sax2->enabled) -++ return; -++ -+ if(sax2->comment_handler) -+ sax2->comment_handler(sax2->user_data, sax2->current_element, s); -+ } -+@@ -1066,6 +1090,10 @@ raptor_sax2_unparsed_entity_decl(void* u -+ const unsigned char* notationName) -+ { -+ raptor_sax2* sax2=(raptor_sax2*)user_data; -++ -++ if(!sax2->enabled) -++ return; -++ -+ if(sax2->unparsed_entity_decl_handler) -+ sax2->unparsed_entity_decl_handler(sax2->user_data, -+ entityName, base, systemId, -+@@ -1082,6 +1110,10 @@ raptor_sax2_external_entity_ref(void* us -+ const unsigned char* publicId) -+ { -+ raptor_sax2* sax2=(raptor_sax2*)user_data; -++ -++ if(!sax2->enabled) -++ return 0; -++ -+ if(sax2->external_entity_ref_handler) -+ return sax2->external_entity_ref_handler(sax2->user_data, -+ context, base, systemId, publicId); -+--- misc/raptor-1.4.18/src/raptor_serialize.c.old 2008-06-20 02:55:31.000000000 +0200 -++++ misc/build/raptor-1.4.18/src/raptor_serialize.c 2012-02-15 16:52:08.000000000 +0100 -+@@ -859,6 +859,7 @@ raptor_serializer_set_feature(raptor_ser -+ -+ /* Shared */ -+ case RAPTOR_FEATURE_NO_NET: -++ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: -+ -+ /* XML writer features */ -+ case RAPTOR_FEATURE_WRITER_AUTO_INDENT: -+@@ -965,6 +966,7 @@ raptor_serializer_set_feature_string(rap -+ -+ /* Shared */ -+ case RAPTOR_FEATURE_NO_NET: -++ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: -+ -+ /* XML writer features */ -+ case RAPTOR_FEATURE_WRITER_AUTO_INDENT: -+@@ -1102,6 +1104,7 @@ raptor_serializer_get_feature(raptor_ser -+ -+ /* Shared */ -+ case RAPTOR_FEATURE_NO_NET: -++ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: -+ -+ /* XML writer features */ -+ case RAPTOR_FEATURE_WRITER_AUTO_INDENT: -+@@ -1201,6 +1204,7 @@ raptor_serializer_get_feature_string(rap -+ -+ /* Shared */ -+ case RAPTOR_FEATURE_NO_NET: -++ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: -+ -+ /* XML writer features */ -+ case RAPTOR_FEATURE_WRITER_AUTO_INDENT: -+--- misc/raptor-1.4.18/src/raptor_turtle_writer.c.old 2008-06-20 07:47:48.000000000 +0200 -++++ misc/build/raptor-1.4.18/src/raptor_turtle_writer.c 2012-02-15 16:52:08.000000000 +0100 -+@@ -723,6 +723,7 @@ raptor_turtle_writer_set_feature(raptor_ -+ -+ /* Shared */ -+ case RAPTOR_FEATURE_NO_NET: -++ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: -+ -+ /* XML writer features */ -+ case RAPTOR_FEATURE_RELATIVE_URIS: -+@@ -836,6 +837,7 @@ raptor_turtle_writer_get_feature(raptor_ -+ -+ /* Shared */ -+ case RAPTOR_FEATURE_NO_NET: -++ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: -+ -+ /* XML writer features */ -+ case RAPTOR_FEATURE_RELATIVE_URIS: -+--- misc/raptor-1.4.18/src/raptor_xml_writer.c.old 2008-06-03 07:05:56.000000000 +0200 -++++ misc/build/raptor-1.4.18/src/raptor_xml_writer.c 2012-02-15 16:52:08.000000000 +0100 -+@@ -906,6 +906,7 @@ raptor_xml_writer_set_feature(raptor_xml -+ -+ /* Shared */ -+ case RAPTOR_FEATURE_NO_NET: -++ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: -+ -+ /* XML writer features */ -+ case RAPTOR_FEATURE_RELATIVE_URIS: -+@@ -1026,6 +1027,7 @@ raptor_xml_writer_get_feature(raptor_xml -+ -+ /* Shared */ -+ case RAPTOR_FEATURE_NO_NET: -++ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: -+ -+ /* XML writer features */ -+ case RAPTOR_FEATURE_RELATIVE_URIS: --- -1.7.7.6 - diff --git a/0001-Fix-fdo-44040-VIEWING-Crash-when-page-preview-after-.patch b/0001-Fix-fdo-44040-VIEWING-Crash-when-page-preview-after-.patch deleted file mode 100644 index e38dcab..0000000 --- a/0001-Fix-fdo-44040-VIEWING-Crash-when-page-preview-after-.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 300578ec39bfc829afefb30d4149881297a799fa Mon Sep 17 00:00:00 2001 -From: Julien Nabet -Date: Mon, 23 Jan 2012 21:09:24 +0100 -Subject: [PATCH] Fix fdo#44040 VIEWING: Crash when page preview after - (data sources) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Caolán fixed Iterator management which was buggy. (thank you !) - -Signed-off-by: Tor Lillqvist ---- - dbaccess/source/ui/browser/unodatbr.cxx | 18 ++++++++---------- - 1 files changed, 8 insertions(+), 10 deletions(-) - -diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx -index 37f0880..3525fcf 100644 ---- a/dbaccess/source/ui/browser/unodatbr.cxx -+++ b/dbaccess/source/ui/browser/unodatbr.cxx -@@ -1409,24 +1409,22 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const EventObject& _rSource ) thr - Reference< XDispatch > xSource(_rSource.Source, UNO_QUERY); - if(xSource.is()) - { -- for ( ExternalFeaturesMap::iterator aLoop = m_aExternalFeatures.begin(); -- aLoop != m_aExternalFeatures.end(); -- ++aLoop -- ) -+ ExternalFeaturesMap::iterator aLoop = m_aExternalFeatures.begin(); -+ ExternalFeaturesMap::iterator aEnd = m_aExternalFeatures.end(); -+ while (aLoop != aEnd) - { -- if ( aLoop->second.xDispatcher.get() == xSource.get() ) -+ ExternalFeaturesMap::iterator aI = aLoop++; -+ if ( aI->second.xDispatcher.get() == xSource.get() ) - { -- ExternalFeaturesMap::iterator aPrevious = aLoop; -- --aPrevious; -+ sal_uInt16 nSlot = aI->first; - - // remove it -- m_aExternalFeatures.erase( aLoop ); -+ m_aExternalFeatures.erase(aI); - - // maybe update the UI -- implCheckExternalSlot(aLoop->first); -+ implCheckExternalSlot(nSlot); - - // continue, the same XDispatch may be resposible for more than one URL -- aLoop = aPrevious; - } - } - } --- -1.7.7.6 - diff --git a/0001-Fix-fdo-44065.patch b/0001-Fix-fdo-44065.patch deleted file mode 100644 index 5ffbc70..0000000 --- a/0001-Fix-fdo-44065.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0d7e8c41cfe5b93e52df03bd0c7420956a98814b Mon Sep 17 00:00:00 2001 -From: Julien Nabet -Date: Sat, 7 Jan 2012 17:48:13 +0100 -Subject: [PATCH 1/8] Fix fdo#44065 - -Signed-off-by: Andras Timar ---- - .../drivers/mozab/mozillasrc/MLdapAttributeMap.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx -index 02f580a..5471d2f 100644 ---- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx -+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx -@@ -120,7 +120,7 @@ namespace connectivity { namespace mozab { - { "WebPage2", "homeurl", DEF_CARD_ACCESS( WebPage2 ) }, - { "BirthYear", "birthyear", DEF_CARD_ACCESS( BirthYear ) }, - { "BirthMonth", "birthmonth", DEF_CARD_ACCESS( BirthMonth ) }, -- { "BirthYear", "birthday", DEF_CARD_ACCESS( BirthDay ) }, -+ { "BirthDay", "birthday", DEF_CARD_ACCESS( BirthDay ) }, - { "Custom1", "custom1", DEF_CARD_ACCESS( Custom1 ) }, - { "Custom2", "custom2", DEF_CARD_ACCESS( Custom2 ) }, - { "Custom3", "custom3", DEF_CARD_ACCESS( Custom3 ) }, --- -1.7.7.6 - diff --git a/0001-Resolves-fdo-44078-fix-unfortunate-name-alias-mixups.patch b/0001-Resolves-fdo-44078-fix-unfortunate-name-alias-mixups.patch deleted file mode 100644 index ad1e523..0000000 --- a/0001-Resolves-fdo-44078-fix-unfortunate-name-alias-mixups.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/vcl/unx/source/fontmanager/fontconfig.cxx -+++ b/vcl/unx/source/fontmanager/fontconfig.cxx -@@ -303,7 +303,7 @@ - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontNameToLocalized; - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aLocalizedToCanonical; - private: -- void cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8 *bestfontname, const std::vector< lang_and_element > &lang_and_elements); -+ void cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8 *bestfontname, const std::vector< lang_and_element > &lang_and_elements); - }; - - oslGenericFunction FontCfgWrapper::loadSymbol( const char* pSymbol ) -@@ -665,6 +665,7 @@ - - std::vector::const_iterator aEnd = elements.end(); - bool alreadyclosematch = false; -+ bool found_fallback_englishname = false; - for( std::vector::const_iterator aIter = elements.begin(); aIter != aEnd; ++aIter ) - { - const char *pLang = (const char*)aIter->first; -@@ -676,7 +677,8 @@ - } - else if( alreadyclosematch ) - { -- // override candidate only if there is a perfect match -+ // current candidate matches lang of lang-TERRITORY -+ // override candidate only if there is a full match - continue; - } - else if( rtl_str_compare( pLang, sLangMatch.getStr()) == 0) -@@ -685,10 +687,18 @@ - candidate = aIter->second; - alreadyclosematch = true; - } -+ else if( found_fallback_englishname ) -+ { -+ // already found an english fallback, don't override candidate -+ // unless there is a better language match -+ continue; -+ } - else if( rtl_str_compare( pLang, "en") == 0) - { -- // fallback to the english element name -+ // select a fallback candidate of the first english element -+ // name - candidate = aIter->second; -+ found_fallback_englishname = true; - } - } - return candidate; -@@ -696,7 +706,8 @@ - } - - //Set up maps to quickly map between a fonts best UI name and all the rest of its names, and vice versa --void FontCfgWrapper::cacheLocalizedFontNames(FcChar8 *origfontname, FcChar8 *bestfontname, const std::vector< lang_and_element > &lang_and_elements) -+void FontCfgWrapper::cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8 *bestfontname, -+ const std::vector< lang_and_element > &lang_and_elements) - { - std::vector::const_iterator aEnd = lang_and_elements.end(); - for (std::vector::const_iterator aIter = lang_and_elements.begin(); aIter != aEnd; ++aIter) diff --git a/0001-SwRootFrm-SwRootFrm-refactor.patch b/0001-SwRootFrm-SwRootFrm-refactor.patch deleted file mode 100644 index e05ad34..0000000 --- a/0001-SwRootFrm-SwRootFrm-refactor.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 011a970de6f65fe6543337c7da643d998a450750 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Mon, 27 Feb 2012 20:43:27 +0100 -Subject: [PATCH] SwRootFrm::~SwRootFrm: refactor: - -Since CWS swlayoutrefactoring the SwRootFrms are destroyed with -SwDoc::IsInDtor not set. This can cause at least reads of freed -SwRootFrm members when executing the dtors of SwRootFrm base class -SwLayoutFrm calling into SwRootFrm::GetPageAtPos. - -Prevent this scenario by: -- moving the implementation of SwRootFrm base class dtors to new - methods SwFrm::Destroy and SwLayoutFrm::Destroy -- calling SwFrm::Destroy and SwLayoutFrm::Destroy explicitly before - SwRootFrm members are freed -(cherry picked from commit ebb74441790a9852b1a1532d6e025c324666f6fc) - -Signed-off-by: Miklos Vajna ---- - sw/source/core/inc/frame.hxx | 2 ++ - sw/source/core/inc/layfrm.hxx | 4 +++- - sw/source/core/inc/rootfrm.hxx | 2 +- - sw/source/core/layout/newfrm.cxx | 9 ++++++++- - sw/source/core/layout/ssfrm.cxx | 21 +++++++++++++++++++-- - 5 files changed, 33 insertions(+), 5 deletions(-) - -diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx -index ba148cc..f118233 100644 ---- a/sw/source/core/inc/frame.hxx -+++ b/sw/source/core/inc/frame.hxx -@@ -442,6 +442,8 @@ protected: - void ColLock() { bColLocked = sal_True; } - void ColUnlock() { bColLocked = sal_False; } - -+ void Destroy(); // for ~SwRootFrm -+ - // Only used by SwRootFrm Ctor to get 'this' into mpRoot... - void setRootFrm( SwRootFrm* pRoot ) { mpRoot = pRoot; } - -diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx -index c6d17ba..14f4a3e 100644 ---- a/sw/source/core/inc/layfrm.hxx -+++ b/sw/source/core/inc/layfrm.hxx -@@ -56,6 +56,8 @@ class SwLayoutFrm: public SwFrm - - void CopySubtree( const SwLayoutFrm *pDest ); - protected: -+ void Destroy(); // for ~SwRootFrm -+ - virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - virtual void MakeAll(); - -@@ -104,7 +106,7 @@ public: - const sal_Bool bDefaultExpand = sal_True ) const; - - SwLayoutFrm( SwFrmFmt*, SwFrm* ); -- ~SwLayoutFrm(); -+ virtual ~SwLayoutFrm(); - - virtual void Paint( SwRect const&, - SwPrintData const*const pPrintData = NULL ) const; -diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx -index a73b28b..e460486 100644 ---- a/sw/source/core/inc/rootfrm.hxx -+++ b/sw/source/core/inc/rootfrm.hxx -@@ -178,7 +178,7 @@ public: - static sal_Bool HasSameRect( const SwRect& rRect ); - - SwRootFrm( SwFrmFmt*, ViewShell* ); -- ~SwRootFrm(); -+ virtual ~SwRootFrm(); - void Init(SwFrmFmt*); - - ViewShell *GetCurrShell() const { return pCurrShell; } -diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx -index f51aa6b..e96ebb8 100644 ---- a/sw/source/core/layout/newfrm.cxx -+++ b/sw/source/core/layout/newfrm.cxx -@@ -630,8 +630,15 @@ SwRootFrm::~SwRootFrm() - (*pCurrShells)[i]->pRoot = 0; - - delete pCurrShells; -+ pCurrShells = 0; - -- OSL_ENSURE( 0==nAccessibleShells, "Some accessible shells are left" ); -+ // Some accessible shells are left => problems on second SwFrm::Destroy call -+ assert(0 == nAccessibleShells); -+ -+ // manually call base classes Destroy because it could call stuff -+ // that accesses members of this -+ SwLayoutFrm::Destroy(); -+ SwFrm::Destroy(); - } - - /************************************************************************* -diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx -index 6ac8bc7..a77b00b 100644 ---- a/sw/source/core/layout/ssfrm.cxx -+++ b/sw/source/core/layout/ssfrm.cxx -@@ -365,7 +365,7 @@ Point SwFrm::GetFrmAnchorPos( sal_Bool bIgnoreFlysAnchoredAtThisFrame ) const - |* - |*************************************************************************/ - --SwFrm::~SwFrm() -+void SwFrm::Destroy() - { - // accessible objects for fly and cell frames have been already disposed - // by the destructors of the derived classes. -@@ -405,6 +405,7 @@ SwFrm::~SwFrm() - } - if ( pDrawObjs ) - delete pDrawObjs; -+ pDrawObjs = 0; - } - - #if OSL_DEBUG_LEVEL > 1 -@@ -413,6 +414,14 @@ SwFrm::~SwFrm() - #endif - } - -+SwFrm::~SwFrm() -+{ -+ if (!IsRootFrm()) // ~SwRootFrm already calls Destroy! -+ { -+ Destroy(); -+ } -+} -+ - /*************************************************************************/ - - const SwFrmFmt * SwLayoutFrm::GetFmt() const -@@ -560,7 +569,7 @@ void SwCntntFrm::DelFrms( const SwCntntNode& rNode ) - |*************************************************************************/ - - --SwLayoutFrm::~SwLayoutFrm() -+void SwLayoutFrm::Destroy() - { - SwFrm *pFrm = pLower; - -@@ -644,6 +653,14 @@ SwLayoutFrm::~SwLayoutFrm() - } - } - -+SwLayoutFrm::~SwLayoutFrm() -+{ -+ if (!IsRootFrm()) // ~SwRootFrm already calls Destroy! -+ { -+ Destroy(); -+ } -+} -+ - /************************************************************************* - |* - |* SwFrm::PaintArea() --- -1.7.7.6 - diff --git a/0001-cast-from-BorderLine-to-BorderLine2-is-not-valid.patch b/0001-cast-from-BorderLine-to-BorderLine2-is-not-valid.patch deleted file mode 100644 index c27702e..0000000 --- a/0001-cast-from-BorderLine-to-BorderLine2-is-not-valid.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ff3a6a514d4a95653d111610ea06954b8130a869 Mon Sep 17 00:00:00 2001 -From: Eike Rathke -Date: Thu, 26 Jan 2012 14:03:12 +0100 -Subject: [PATCH 1/3] cast from BorderLine to BorderLine2 is not valid - -Don't access a css::table::BorderLine struct as if it was -a css::table::BorderLine2 struct, which it isn't. A proper implementation -would need to pass BorderLine2 structs around for which it would need -a css::table::TableBorder2 struct that holds BorderLine2 instead of -BorderLine, and adapt various places for API compatibility to support both. -For now use the default table::BorderLineStyle::SOLID to set the line style at -::editeng::SvxBorderLine - -This also fixes fdo#39117. - -(cherry picked from commit 97c66b3b13528cc50f271217663718b3d6681bd9) - -Signed-off-by: Michael Stahl ---- - sc/source/ui/unoobj/cellsuno.cxx | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx -index 8e7475d..63ba3ef 100644 ---- a/sc/source/ui/unoobj/cellsuno.cxx -+++ b/sc/source/ui/unoobj/cellsuno.cxx -@@ -61,6 +61,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -952,8 +953,7 @@ ScSubTotalFunc lcl_SummaryToSubTotal( sheet::GeneralFunction eSummary ) - const ::editeng::SvxBorderLine* ScHelperFunctions::GetBorderLine( ::editeng::SvxBorderLine& rLine, const table::BorderLine& rStruct ) - { - // Calc needs Twips, and there are 1/100mm in the Uno structure -- const table::BorderLine2& rBorder2 = static_cast< const table::BorderLine2& >( rStruct ); -- rLine.SetStyle( ::editeng::SvxBorderStyle( rBorder2.LineStyle ) ); -+ rLine.SetStyle( ::editeng::SvxBorderStyle( table::BorderLineStyle::SOLID ) ); - rLine.GuessLinesWidths( rLine.GetStyle(), - (sal_uInt16)HMMToTwips( rStruct.OuterLineWidth ), - (sal_uInt16)HMMToTwips( rStruct.InnerLineWidth ), --- -1.7.7.6 - diff --git a/0001-default-shortcut-for-.uno-SearchDialog-should-be-Ctr.patch b/0001-default-shortcut-for-.uno-SearchDialog-should-be-Ctr.patch deleted file mode 100644 index 27075f1..0000000 --- a/0001-default-shortcut-for-.uno-SearchDialog-should-be-Ctr.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 3bb279c73e0034c7c50e5561de82c681a2f3b3b9 Mon Sep 17 00:00:00 2001 -From: Andras Timar -Date: Wed, 14 Sep 2011 19:43:08 +0200 -Subject: [PATCH 1/2] default shortcut for .uno:SearchDialog should be Ctrl+H -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Ctrl+Alt+F was not good, because on some keyboard layouts it enters -a character. Ctrl+Alt (=AltGr on Windows) should be avoided, if possible. - -Signed-off-by: Caolán McNamara ---- - .../data/org/openoffice/Office/Accelerators.xcu | 9 ++------- - 1 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu -index 44de8c4..4fd42dc 100644 ---- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu -+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu -@@ -85,7 +85,7 @@ - vnd.sun.star.findbar:FocusToFindbar - - -- -+ - I10N SHORTCUTS - NO TRANSLATE - .uno:SearchDialog - -@@ -235,7 +235,7 @@ - vnd.sun.star.findbar:FocusToFindbar - - -- -+ - I10N SHORTCUTS - NO TRANSLATE - .uno.SearchDialog - -@@ -635,11 +635,6 @@ - .uno:GoToStartSel - - -- -- I10N SHORTCUTS - NO TRANSLATE -- .uno:SuperScript -- -- - - I10N SHORTCUTS - NO TRANSLATE - .uno:InsertContents --- -1.7.7.6 - diff --git a/0001-fdo-31966-do-not-create-an-empty-slide-when-printing.patch b/0001-fdo-31966-do-not-create-an-empty-slide-when-printing.patch deleted file mode 100644 index f84d329..0000000 --- a/0001-fdo-31966-do-not-create-an-empty-slide-when-printing.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6c0f9cc00e81862e888b680a83bd14c0f16811aa Mon Sep 17 00:00:00 2001 -From: Ivan Timofeev -Date: Mon, 27 Feb 2012 16:26:39 +0400 -Subject: [PATCH] fdo#31966: do not create an empty slide when printing - handouts - -Signed-off-by: Michael Meeks ---- - sd/source/ui/view/DocumentRenderer.cxx | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx -index 758e5ed..64cd478 100644 ---- a/sd/source/ui/view/DocumentRenderer.cxx -+++ b/sd/source/ui/view/DocumentRenderer.cxx -@@ -1967,8 +1967,8 @@ private: - - // Create a printer page when we have found one page for each - // placeholder or when this is the last (and special) loop. -- if (aPageIndices.size() == nShapeCount -- || nIndex==nCount) -+ if (!aPageIndices.empty() && -+ (aPageIndices.size() == nShapeCount || nIndex == nCount)) - { - maPrinterPages.push_back( - ::boost::shared_ptr( --- -1.7.7.6 - diff --git a/0001-fdo-36109-in-INDIRECT-make-a-non-existing-sheet-prod.patch b/0001-fdo-36109-in-INDIRECT-make-a-non-existing-sheet-prod.patch deleted file mode 100644 index 90f5a47..0000000 --- a/0001-fdo-36109-in-INDIRECT-make-a-non-existing-sheet-prod.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 619e36de3fec38d172e33a5f14fdc322e6ad479f Mon Sep 17 00:00:00 2001 -Message-Id: <619e36de3fec38d172e33a5f14fdc322e6ad479f.1329144791.git.erack@redhat.com> -From: Eike Rathke -Date: Tue, 23 Aug 2011 16:34:42 +0000 -Subject: [PATCH] fdo#36109 in INDIRECT() make a non-existing sheet produce an - error again -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------erAck-patch-parts" - -This is a multi-part message in MIME format. ---------------erAck-patch-parts -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -* In lcl_ScAddress_Parse_OOo() don't assume non-existing sheets would be - external documents if there was no sheet separator. This lead to an - external reference being created that is only an error if - dereferenced, not if fed to ISERROR() and the like. -* In ScInterpreter::ScIndirect() push errNoRef instead of - errInvalidArgument to produce a #REF! error. - -Signed-off-by: Markus Mohrhard ---- - sc/source/core/tool/address.cxx | 4 +++- - sc/source/core/tool/interpr1.cxx | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - - ---------------erAck-patch-parts -Content-Type: text/x-patch; name="0001-fdo-36109-in-INDIRECT-make-a-non-existing-sheet-prod.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0001-fdo-36109-in-INDIRECT-make-a-non-existing-sheet-prod.patch" - -diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx -index 156043b..0c4e235 100644 ---- a/sc/source/core/tool/address.cxx -+++ b/sc/source/core/tool/address.cxx -@@ -1013,12 +1013,14 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd - if (!bExtDoc && (!pDoc || !pDoc->GetTable( aTab, nTab ))) - { - // Specified table name is not found in this document. Assume this is an external document. -- bExtDoc = true; - aDocName = aTab; - xub_StrLen n = aTab.SearchBackward('.'); - if (n != STRING_NOTFOUND && n > 0) -+ { - // Extension found. Strip it. - aTab.Erase(n); -+ bExtDoc = true; -+ } - else - // No extension found. This is probably not an external document. - nBits = 0; -diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx -index eb5ab56..f8b8dfb 100644 ---- a/sc/source/core/tool/interpr1.cxx -+++ b/sc/source/core/tool/interpr1.cxx -@@ -6655,7 +6655,7 @@ void ScInterpreter::ScIndirect() - } - while (false); - -- PushIllegalArgument(); -+ PushError( errNoRef); - } - } - } - ---------------erAck-patch-parts-- - - diff --git a/0001-fdo-38515-Fixed-crasher-in-dialog-destructor.patch b/0001-fdo-38515-Fixed-crasher-in-dialog-destructor.patch deleted file mode 100644 index dd3362c..0000000 --- a/0001-fdo-38515-Fixed-crasher-in-dialog-destructor.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 36f83debd1b8a200515fafdf66bdd7a4aec01ad5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= -Date: Fri, 13 Jan 2012 16:08:17 +0100 -Subject: [PATCH 1/4] fdo#38515: Fixed crasher in dialog destructor - -Signed-off-by: Michael Meeks ---- - sw/source/ui/index/cnttab.cxx | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx -index ae7dfad..fcfb2f8 100644 ---- a/sw/source/ui/index/cnttab.cxx -+++ b/sw/source/ui/index/cnttab.cxx -@@ -358,6 +358,9 @@ SwMultiTOXTabDialog::~SwMultiTOXTabDialog() - { - SW_MOD()->GetModuleConfig()->SetShowIndexPreview(aShowExampleCB.IsChecked()); - -+ // fdo#38515 Avoid setting focus on deleted controls in the destructors -+ EnableInput( sal_False ); -+ - for(sal_uInt16 i = 0; i < nTypeCount; i++) - { - delete pFormArr[i]; --- -1.7.7.6 - diff --git a/0001-fdo-38745-fix-hilariously-stupid-stack-guards.patch b/0001-fdo-38745-fix-hilariously-stupid-stack-guards.patch deleted file mode 100644 index 7fd1ef7..0000000 --- a/0001-fdo-38745-fix-hilariously-stupid-stack-guards.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 637d80a4aebf2b65a855283a68e6dd72e9d6de30 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Mon, 6 Feb 2012 22:01:27 +0100 -Subject: [PATCH 1/4] fdo#38745: fix hilariously stupid stack guards: - -The UndoRedoRedlineGuards that SwUndo::{Un,Re}doWithContext wants to -put on the stack aren't actually variables, so the destructor gets -invoked before the function call that the guard is supposed to protect. -Regression from CWS undoapi. -(cherry picked from commit 13424b43c25389e303774c3fb2f2beb3e20ceae5) - -Signed-off-by: Stephan Bergmann ---- - sw/source/core/undo/undobj.cxx | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx -index 60eaaf3..1645b32 100644 ---- a/sw/source/core/undo/undobj.cxx -+++ b/sw/source/core/undo/undobj.cxx -@@ -251,7 +251,7 @@ void SwUndo::UndoWithContext(SfxUndoContext & rContext) - dynamic_cast< ::sw::UndoRedoContext * >(& rContext)); - OSL_ASSERT(pContext); - if (!pContext) { return; } -- UndoRedoRedlineGuard(*pContext, *this); -+ UndoRedoRedlineGuard const g(*pContext, *this); - UndoImpl(*pContext); - } - -@@ -261,7 +261,7 @@ void SwUndo::RedoWithContext(SfxUndoContext & rContext) - dynamic_cast< ::sw::UndoRedoContext * >(& rContext)); - OSL_ASSERT(pContext); - if (!pContext) { return; } -- UndoRedoRedlineGuard(*pContext, *this); -+ UndoRedoRedlineGuard const g(*pContext, *this); - RedoImpl(*pContext); - } - --- -1.7.7.6 - diff --git a/0001-fdo-39118-Fixed-chart-listener-registration-during-O.patch b/0001-fdo-39118-Fixed-chart-listener-registration-during-O.patch deleted file mode 100644 index e5198bb..0000000 --- a/0001-fdo-39118-Fixed-chart-listener-registration-during-O.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 99484e05a48f6253ebbbb1ff4fd2e8cc80cdbe5d Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Mon, 16 Jan 2012 14:33:24 +0100 -Subject: [PATCH 1/5] fdo#39118: Fixed chart listener registration during ODS - import. - -The breakage was due to the drawing layer re-work. We do need to store -charts (or all OLE shapes with associated listening ranges) for later -registration regardless of anchor types. - -Signed-off-by: Eike Rathke ---- - sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2 +- - sc/source/filter/xml/XMLTableShapeResizer.cxx | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx -index 9222749..06f8854 100644 ---- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx -+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx -@@ -152,7 +152,7 @@ void XMLTableShapeImportHelper::finishShape( - } - } - -- if ( bOnTable && pRangeList ) -+ if (pRangeList) - { - // #i78086# If there are notification ranges, the ChartListener must be created - // also when anchored to the sheet -diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx -index 6d61b80..3d4ddea 100644 ---- a/sc/source/filter/xml/XMLTableShapeResizer.cxx -+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx -@@ -81,6 +81,7 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, - } - - OUString aRangeStr; -+ // This one returns ranges with ';' as the separators. - ScRangeStringConverter::GetStringFromXMLRangeString(aRangeStr, rRangeList, pDoc); - if (!aRangeStr.getLength()) - { -@@ -95,9 +96,8 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc, - return; - - auto_ptr< vector > pRefTokens(new vector); -- const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); - ScRefTokenHelper::compileRangeRepresentation( -- *pRefTokens, aRangeStr, pDoc, cSep, formula::FormulaGrammar::GRAM_ENGLISH); -+ *pRefTokens, aRangeStr, pDoc, ';', formula::FormulaGrammar::GRAM_ENGLISH); - if (!pRefTokens->empty()) - { - ScChartListener* pCL(new ScChartListener(rName, pDoc, pRefTokens.release())); --- -1.7.7.6 - diff --git a/0001-fdo-39510-fix-yet-more-layout-crashes-in-SwRootFrm.patch b/0001-fdo-39510-fix-yet-more-layout-crashes-in-SwRootFrm.patch deleted file mode 100644 index 1e8d041..0000000 --- a/0001-fdo-39510-fix-yet-more-layout-crashes-in-SwRootFrm.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 962d0500c4debaef43e5f146e47e08c66d851562 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Sat, 18 Feb 2012 00:06:33 +0100 -Subject: [PATCH] fdo#39510: fix yet more layout crashes in ~SwRootFrm: - -Call SwRootFrm::RemoveFtns with the proper boolean to also eliminate -EndNotes, and fix a faulty while loop in RemoveFtns that's been preventing -removal of footnotes in certain sections since the dawn of CVS history. -(regression from CWS swlayoutrefactoring, crashes on bugdoc from i#101776) ---- - sw/source/core/layout/ftnfrm.cxx | 2 +- - sw/source/core/layout/newfrm.cxx | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx -index 7d3ea83..940bc11 100644 ---- a/sw/source/core/layout/ftnfrm.cxx -+++ b/sw/source/core/layout/ftnfrm.cxx -@@ -1000,7 +1000,7 @@ void lcl_RemoveFtns( SwFtnBossFrm* pBoss, sal_Bool bPageOnly, sal_Bool bEndNotes - if( pBody && pBody->Lower() ) - { - SwFrm* pLow = pBody->Lower(); -- while( pLow->GetNext() ) -+ while (pLow) - { - if( pLow->IsSctFrm() && ( !pLow->GetNext() || - ((SwSectionFrm*)pLow)->IsAnyNoteAtEnd() ) && -diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx -index 1e9b0e8..5f12ef5 100644 ---- a/sw/source/core/layout/newfrm.cxx -+++ b/sw/source/core/layout/newfrm.cxx -@@ -610,7 +610,7 @@ SwRootFrm::~SwRootFrm() - // also searches backwards to find the master of footnotes, they must be - // considered to be owned by the SwRootFrm and also be destroyed here, - // before tearing down the (now footnote free) rest of the layout. -- AllRemoveFtns(); -+ RemoveFtns(0, false, true); - - if(pBlink) - pBlink->FrmDelete( this ); --- -1.7.7.6 - diff --git a/0001-fdo-39657-fix-crash-when-parsing-XML-signatures.patch b/0001-fdo-39657-fix-crash-when-parsing-XML-signatures.patch deleted file mode 100644 index 7a7673a..0000000 --- a/0001-fdo-39657-fix-crash-when-parsing-XML-signatures.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 67c396fb66a9c21c9eafaf4bcc3654706f643df0 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Sat, 18 Feb 2012 00:03:39 +0100 -Subject: [PATCH] fdo#39657: fix crash when parsing XML signatures - ---- - xmlsecurity/source/helper/xsecverify.cxx | 86 +++++++++++++++++++++++++---- - 1 files changed, 74 insertions(+), 12 deletions(-) - -diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx -index a61eb6e..0f225996 100644 ---- a/xmlsecurity/source/helper/xsecverify.cxx -+++ b/xmlsecurity/source/helper/xsecverify.cxx -@@ -121,7 +121,12 @@ void XSecController::addSignature() - - void XSecController::addReference( const rtl::OUString& ouUri) - { -- InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1]; -+ if (m_vInternalSignatureInformations.empty()) -+ { -+ OSL_TRACE("XSecController::addReference: no signature"); -+ return; -+ } -+ InternalSignatureInformation &isi = m_vInternalSignatureInformations.back(); - isi.addReference(TYPE_SAMEDOCUMENT_REFERENCE,ouUri, -1 ); - } - -@@ -131,7 +136,12 @@ void XSecController::addStreamReference( - { - sal_Int32 type = (isBinary?TYPE_BINARYSTREAM_REFERENCE:TYPE_XMLSTREAM_REFERENCE); - -- InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1]; -+ if (m_vInternalSignatureInformations.empty()) -+ { -+ OSL_TRACE("XSecController::addStreamReference: no signature"); -+ return; -+ } -+ InternalSignatureInformation &isi = m_vInternalSignatureInformations.back(); - - if ( isi.xReferenceResolvedListener.is() ) - { -@@ -154,7 +164,13 @@ void XSecController::addStreamReference( - - void XSecController::setReferenceCount() const - { -- const InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1]; -+ if (m_vInternalSignatureInformations.empty()) -+ { -+ OSL_TRACE("XSecController::setReferenceCount: no signature"); -+ return; -+ } -+ const InternalSignatureInformation &isi = -+ m_vInternalSignatureInformations.back(); - - if ( isi.xReferenceResolvedListener.is() ) - { -@@ -182,51 +198,97 @@ void XSecController::setReferenceCount() const - - void XSecController::setX509IssuerName( rtl::OUString& ouX509IssuerName ) - { -- InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1]; -+ if (m_vInternalSignatureInformations.empty()) -+ { -+ OSL_TRACE("XSecController::setX509IssuerName: no signature"); -+ return; -+ } -+ InternalSignatureInformation &isi = m_vInternalSignatureInformations.back(); - isi.signatureInfor.ouX509IssuerName = ouX509IssuerName; - } - - void XSecController::setX509SerialNumber( rtl::OUString& ouX509SerialNumber ) - { -- InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1]; -+ if (m_vInternalSignatureInformations.empty()) -+ { -+ OSL_TRACE("XSecController::setX509SerialNumber: no signature"); -+ return; -+ } -+ InternalSignatureInformation &isi = m_vInternalSignatureInformations.back(); - isi.signatureInfor.ouX509SerialNumber = ouX509SerialNumber; - } - - void XSecController::setX509Certificate( rtl::OUString& ouX509Certificate ) - { -- InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1]; -+ if (m_vInternalSignatureInformations.empty()) -+ { -+ OSL_TRACE("XSecController::setX509Certificate: no signature"); -+ return; -+ } -+ InternalSignatureInformation &isi = m_vInternalSignatureInformations.back(); - isi.signatureInfor.ouX509Certificate = ouX509Certificate; - } - - void XSecController::setSignatureValue( rtl::OUString& ouSignatureValue ) - { -- InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1]; -+ if (m_vInternalSignatureInformations.empty()) -+ { -+ OSL_TRACE("XSecController::setSignatureValue: no signature"); -+ return; -+ } -+ InternalSignatureInformation &isi = m_vInternalSignatureInformations.back(); - isi.signatureInfor.ouSignatureValue = ouSignatureValue; - } - - void XSecController::setDigestValue( rtl::OUString& ouDigestValue ) - { -- SignatureInformation &si = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1].signatureInfor; -- SignatureReferenceInformation &reference = si.vSignatureReferenceInfors[si.vSignatureReferenceInfors.size()-1]; -+ if (m_vInternalSignatureInformations.empty()) -+ { -+ OSL_TRACE("XSecController::setDigestValue: no signature"); -+ return; -+ } -+ InternalSignatureInformation &isi = m_vInternalSignatureInformations.back(); -+ if (isi.signatureInfor.vSignatureReferenceInfors.empty()) -+ { -+ OSL_TRACE("XSecController::setDigestValue: no signature reference"); -+ return; -+ } -+ SignatureReferenceInformation &reference = -+ isi.signatureInfor.vSignatureReferenceInfors.back(); - reference.ouDigestValue = ouDigestValue; - } - - void XSecController::setDate( rtl::OUString& ouDate ) - { -- InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1]; -+ if (m_vInternalSignatureInformations.empty()) -+ { -+ OSL_TRACE("XSecController::setDate: no signature"); -+ return; -+ } -+ InternalSignatureInformation &isi = m_vInternalSignatureInformations.back(); - convertDateTime( isi.signatureInfor.stDateTime, ouDate ); - isi.signatureInfor.ouDateTime = ouDate; - } - - void XSecController::setId( rtl::OUString& ouId ) - { -- InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1]; -+ if (m_vInternalSignatureInformations.empty()) -+ { -+ OSL_TRACE("XSecController::setId: no signature"); -+ return; -+ } -+ InternalSignatureInformation &isi = m_vInternalSignatureInformations.back(); - isi.signatureInfor.ouSignatureId = ouId; - } - - void XSecController::setPropertyId( rtl::OUString& ouPropertyId ) - { -- InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1]; -+ if (m_vInternalSignatureInformations.empty()) -+ { -+ OSL_TRACE("XSecController::setPropertyId: no signature"); -+ return; -+ } -+ InternalSignatureInformation &isi = m_vInternalSignatureInformations.back(); - isi.signatureInfor.ouPropertyId = ouPropertyId; - } - --- -1.7.7.6 - diff --git a/0001-fdo-39694-SwTxtFld-do-expand-the-field-in-the-ctor.patch b/0001-fdo-39694-SwTxtFld-do-expand-the-field-in-the-ctor.patch deleted file mode 100644 index 6f1814a..0000000 --- a/0001-fdo-39694-SwTxtFld-do-expand-the-field-in-the-ctor.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 9519deda120b73b72e75d89c3b2ae3d66220ec2d Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Fri, 2 Mar 2012 19:02:03 +0100 -Subject: [PATCH 1/2] fdo#39694: SwTxtFld: do expand the field in the ctor - -While only the text formatting is able to expand all fields correctly, -this is still good enough for many field types and fixes a race -condition when the field value is requested before layout is finished. -(regression from CWS sw34bf01, 8485708f3001fca132c3353c464fe7187ef62bed) ---- - sw/inc/txtfld.hxx | 3 ++- - sw/source/core/crsr/crstrvl.cxx | 3 ++- - sw/source/core/txtnode/atrfld.cxx | 7 +++++-- - sw/source/core/txtnode/thints.cxx | 3 ++- - 4 files changed, 11 insertions(+), 5 deletions(-) - -diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx -index 3ecabb8..f574811 100644 ---- a/sw/inc/txtfld.hxx -+++ b/sw/inc/txtfld.hxx -@@ -42,7 +42,8 @@ class SwTxtFld : public SwTxtAttr - SwTxtNode * m_pTxtNode; - - public: -- SwTxtFld(SwFmtFld & rAttr, xub_StrLen const nStart); -+ SwTxtFld(SwFmtFld & rAttr, xub_StrLen const nStart, -+ bool const bInClipboard); - virtual ~SwTxtFld(); - - void CopyFld( SwTxtFld *pDest ) const; -diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx -index fad9d8b..12e8e5f 100644 ---- a/sw/source/core/crsr/crstrvl.cxx -+++ b/sw/source/core/crsr/crstrvl.cxx -@@ -710,7 +710,8 @@ sal_Bool SwCrsrShell::MoveFldType( const SwFieldType* pFldType, sal_Bool bNext, - SwFmtFld* pFmtFld = new SwFmtFld( SwDateTimeField( - (SwDateTimeFieldType*)pDoc->GetSysFldType( RES_DATETIMEFLD ) ) ); - -- pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex() ); -+ pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex(), -+ pDoc->IsClipBoard() ); - pTxtFld->ChgTxtNode( pTNd ); - } - -diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx -index dc285ef..b0b0757 100644 ---- a/sw/source/core/txtnode/atrfld.cxx -+++ b/sw/source/core/txtnode/atrfld.cxx -@@ -283,9 +283,12 @@ sal_Bool SwFmtFld::IsProtect() const - |* - *************************************************************************/ - --SwTxtFld::SwTxtFld(SwFmtFld & rAttr, xub_StrLen const nStartPos) -+SwTxtFld::SwTxtFld(SwFmtFld & rAttr, xub_StrLen const nStartPos, -+ bool const bInClipboard) - : SwTxtAttr( rAttr, nStartPos ) -- , m_aExpand( rAttr.GetFld()->ExpandField(true) ) -+// fdo#39694 the ExpandField here may not give the correct result in all cases, -+// but is better than nothing -+ , m_aExpand( rAttr.GetFld()->ExpandField(bInClipboard) ) - , m_pTxtNode( 0 ) - { - rAttr.pTxtAttr = this; -diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx -index f6bf2e3..5064935 100644 ---- a/sw/source/core/txtnode/thints.cxx -+++ b/sw/source/core/txtnode/thints.cxx -@@ -1035,7 +1035,8 @@ SwTxtAttr* MakeTxtAttr( SwDoc & rDoc, SfxPoolItem& rAttr, - pNew = new SwTxtINetFmt( (SwFmtINetFmt&)rNew, nStt, nEnd ); - break; - case RES_TXTATR_FIELD: -- pNew = new SwTxtFld( static_cast(rNew), nStt ); -+ pNew = new SwTxtFld( static_cast(rNew), nStt, -+ rDoc.IsClipBoard() ); - break; - case RES_TXTATR_FLYCNT: - { --- -1.7.7.6 - diff --git a/0001-fdo-40378-compile-defined-names-that-had-unresolveds.patch b/0001-fdo-40378-compile-defined-names-that-had-unresolveds.patch deleted file mode 100644 index dbd0293..0000000 --- a/0001-fdo-40378-compile-defined-names-that-had-unresolveds.patch +++ /dev/null @@ -1,396 +0,0 @@ -From f270d113e354aa608a2efa641691167a504c6539 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Eike Rathke -Date: Wed, 8 Feb 2012 10:28:46 -0500 -Subject: [PATCH] fdo#40378 compile defined names that had unresolveds during - load -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------erAck-patch-parts" - -This is a multi-part message in MIME format. ---------------erAck-patch-parts -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -Dependencies of defined names must not depend on the order in which they -are inserted during file load. In a second step compile defined names -that had unresolved names during load, and only those. - -Signed-off-by: Kohei Yoshida ---- - sc/inc/compiler.hxx | 11 +++- - sc/inc/rangenam.hxx | 25 +++++-- - sc/source/core/data/document.cxx | 3 + - sc/source/core/data/table2.cxx | 3 + - sc/source/core/tool/compiler.cxx | 11 ++-- - sc/source/core/tool/rangenam.cxx | 131 ++++++++++++++++++++++++++------------ - sc/source/ui/view/viewfunc.cxx | 2 +- - 7 files changed, 129 insertions(+), 57 deletions(-) - - ---------------erAck-patch-parts -Content-Type: text/x-patch; name="0001-fdo-40378-compile-defined-names-that-had-unresolveds.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0001-fdo-40378-compile-defined-names-that-had-unresolveds.patch" - -diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx -index 5fcc6dc..6947460 100644 ---- a/sc/inc/compiler.hxx -+++ b/sc/inc/compiler.hxx -@@ -227,6 +227,13 @@ public: - ENCODE_NEVER, - }; - -+ enum ExtendedErrorDetection -+ { -+ EXTENDED_ERROR_DETECTION_NONE = 0, // no error on unknown symbols, default (interpreter handles it) -+ EXTENDED_ERROR_DETECTION_NAME_BREAK, // name error on unknown symbols and break, pCode incomplete -+ EXTENDED_ERROR_DETECTION_NAME_NO_BREAK // name error on unknown symbols, don't break, continue -+ }; -+ - struct Convention - { - const formula::FormulaGrammar::AddressConvention meConv; -@@ -327,8 +334,8 @@ private: - sal_Int32 mnRangeOpPosInSymbol; // if and where a range operator is in symbol - const Convention *pConv; - EncodeUrlMode meEncodeUrlMode; -+ ExtendedErrorDetection meExtendedErrorDetection; - bool mbCloseBrackets; // whether to close open brackets automatically, default TRUE -- bool mbExtendedErrorDetection; - bool mbRewind; // whether symbol is to be rewound to some step during lexical analysis - - sal_Bool NextNewToken(bool bInArray = false); -@@ -413,7 +420,7 @@ public: - - void CreateStringFromXMLTokenArray( String& rFormula, String& rFormulaNmsp ); - -- void SetExtendedErrorDetection( bool bVal ) { mbExtendedErrorDetection = bVal; } -+ void SetExtendedErrorDetection( ExtendedErrorDetection eVal ) { meExtendedErrorDetection = eVal; } - - sal_Bool IsCorrected() { return bCorrected; } - const String& GetCorrectedFormula() { return aCorrectedFormula; } -diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx -index 7417094..56c0544 100644 ---- a/sc/inc/rangenam.hxx -+++ b/sc/inc/rangenam.hxx -@@ -75,18 +75,22 @@ private: - String aName; - String aUpperName; // #i62977# for faster searching (aName is never modified after ctor) - ScTokenArray* pCode; -- ScAddress aPos; -- RangeType eType; -- ScDocument* pDoc; -- sal_uInt16 nIndex; -- sal_Bool bModified; // is set/cleared by UpdateReference -- -- // max row and column to use for wrapping of references. If -1 use the -+ ScAddress aPos; -+ RangeType eType; -+ ScDocument* pDoc; -+ formula::FormulaGrammar::Grammar eTempGrammar; // needed for unresolved XML compiles -+ sal_uInt16 nIndex; -+ sal_Bool bModified; // is set/cleared by UpdateReference -+ -+ // max row and column to use for wrapping of references. If -1 use the - // application's default. - SCROW mnMaxRow; - SCCOL mnMaxCol; - - ScRangeData( sal_uInt16 nIndex ); -+ -+ void CompileRangeData( const String& rSymbol, bool bSetError ); -+ - public: - typedef ::std::map IndexMap; - -@@ -161,6 +165,8 @@ public: - SCROW GetMaxRow() const; - SC_DLLPUBLIC void SetMaxCol(SCCOL nCol); - SCCOL GetMaxCol() const; -+ -+ void CompileUnresolvedXML(); - }; - - inline sal_Bool ScRangeData::HasType( RangeType nType ) const -@@ -211,6 +217,11 @@ public: - void UpdateTranspose(const ScRange& rSource, const ScAddress& rDest); - void UpdateGrow(const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY); - -+ /** Compile those names that couldn't be resolved during loading and -+ inserting because they may have referred a name that was inserted later. -+ */ -+ void CompileUnresolvedXML(); -+ - SC_DLLPUBLIC const_iterator begin() const; - SC_DLLPUBLIC const_iterator end() const; - SC_DLLPUBLIC iterator begin(); -diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx -index e85ba1f..6f3fec0 100644 ---- a/sc/source/core/data/document.cxx -+++ b/sc/source/core/data/document.cxx -@@ -3154,6 +3154,9 @@ void ScDocument::CompileXML() - DBG_ASSERT( !pAutoNameCache, "AutoNameCache already set" ); - pAutoNameCache = new ScAutoNameCache( this ); - -+ if (pRangeName) -+ pRangeName->CompileUnresolvedXML(); -+ - for (SCTAB i=0; i<=MAXTAB; i++) - if (pTab[i]) pTab[i]->CompileXML( aProgress ); - -diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx -index 7d7d554..b9c58ce 100644 ---- a/sc/source/core/data/table2.cxx -+++ b/sc/source/core/data/table2.cxx -@@ -1297,6 +1297,9 @@ void ScTable::CompileAll() - - void ScTable::CompileXML( ScProgress& rProgress ) - { -+ if (mpRangeName) -+ mpRangeName->CompileUnresolvedXML(); -+ - for (SCCOL i=0; i <= MAXCOL; i++) - { - aCol[i].CompileXML( rProgress ); -diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx -index 9f39358..a4938f1 100644 ---- a/sc/source/core/tool/compiler.cxx -+++ b/sc/source/core/tool/compiler.cxx -@@ -1741,8 +1741,8 @@ ScCompiler::ScCompiler( ScDocument* pDocument, const ScAddress& rPos,ScTokenArra - mnRangeOpPosInSymbol(-1), - pConv( pConvOOO_A1 ), - meEncodeUrlMode( ENCODE_BY_GRAMMAR ), -+ meExtendedErrorDetection( EXTENDED_ERROR_DETECTION_NONE ), - mbCloseBrackets( true ), -- mbExtendedErrorDetection( false ), - mbRewind( false ) - { - nMaxTab = pDoc ? pDoc->GetTableCount() - 1 : 0; -@@ -1757,8 +1757,8 @@ ScCompiler::ScCompiler( ScDocument* pDocument, const ScAddress& rPos) - mnRangeOpPosInSymbol(-1), - pConv( pConvOOO_A1 ), - meEncodeUrlMode( ENCODE_BY_GRAMMAR ), -+ meExtendedErrorDetection( EXTENDED_ERROR_DETECTION_NONE ), - mbCloseBrackets( true ), -- mbExtendedErrorDetection( false ), - mbRewind( false ) - { - nMaxTab = pDoc ? pDoc->GetTableCount() - 1 : 0; -@@ -3623,11 +3623,12 @@ sal_Bool ScCompiler::NextNewToken( bool bInArray ) - - } while (mbRewind); - -- if ( mbExtendedErrorDetection ) -+ if ( meExtendedErrorDetection != EXTENDED_ERROR_DETECTION_NONE ) - { -- // set an error and end compilation -+ // set an error - SetError( errNoName ); -- return false; -+ if (meExtendedErrorDetection == EXTENDED_ERROR_DETECTION_NAME_BREAK) -+ return false; // end compilation - } - - // Provide single token information and continue. Do not set an error, that -diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx -index b648d1a..2b9ca3b 100644 ---- a/sc/source/core/tool/rangenam.cxx -+++ b/sc/source/core/tool/rangenam.cxx -@@ -72,36 +72,19 @@ ScRangeData::ScRangeData( ScDocument* pDok, - aName ( rName ), - aUpperName ( ScGlobal::pCharClass->upper( rName ) ), - pCode ( NULL ), -- aPos ( rAddress ), -- eType ( nType ), -- pDoc ( pDok ), -- nIndex ( 0 ), -- bModified ( false ), -+ aPos ( rAddress ), -+ eType ( nType ), -+ pDoc ( pDok ), -+ eTempGrammar( eGrammar ), -+ nIndex ( 0 ), -+ bModified ( false ), - mnMaxRow (-1), - mnMaxCol (-1) - { - if (rSymbol.Len() > 0) -- { -- ScCompiler aComp( pDoc, aPos ); -- aComp.SetGrammar(eGrammar); -- pCode = aComp.CompileString( rSymbol ); -- if( !pCode->GetCodeError() ) -- { -- pCode->Reset(); -- FormulaToken* p = pCode->GetNextReference(); -- if( p )// genau eine Referenz als erstes -- { -- if( p->GetType() == svSingleRef ) -- eType = eType | RT_ABSPOS; -- else -- eType = eType | RT_ABSAREA; -- } -- // ggf. den Fehlercode wg. unvollstaendiger Formel setzen! -- // Dies ist fuer die manuelle Eingabe -- aComp.CompileTokenArray(); -- pCode->DelRPN(); -- } -- } -+ CompileRangeData( rSymbol, pDoc->IsImportingXML()); -+ // Let the compiler set an error on unknown names for a subsequent -+ // CompileUnresolvedXML(). - else - { - // #i63513#/#i65690# don't leave pCode as NULL. -@@ -120,11 +103,12 @@ ScRangeData::ScRangeData( ScDocument* pDok, - aName ( rName ), - aUpperName ( ScGlobal::pCharClass->upper( rName ) ), - pCode ( new ScTokenArray( rArr ) ), -- aPos ( rAddress ), -- eType ( nType ), -- pDoc ( pDok ), -- nIndex ( 0 ), -- bModified ( false ), -+ aPos ( rAddress ), -+ eType ( nType ), -+ pDoc ( pDok ), -+ eTempGrammar( FormulaGrammar::GRAM_UNSPECIFIED ), -+ nIndex ( 0 ), -+ bModified ( false ), - mnMaxRow (-1), - mnMaxCol (-1) - { -@@ -148,11 +132,12 @@ ScRangeData::ScRangeData( ScDocument* pDok, - aName ( rName ), - aUpperName ( ScGlobal::pCharClass->upper( rName ) ), - pCode ( new ScTokenArray() ), -- aPos ( rTarget ), -- eType ( RT_NAME ), -- pDoc ( pDok ), -- nIndex ( 0 ), -- bModified ( false ), -+ aPos ( rTarget ), -+ eType ( RT_NAME ), -+ pDoc ( pDok ), -+ eTempGrammar( FormulaGrammar::GRAM_UNSPECIFIED ), -+ nIndex ( 0 ), -+ bModified ( false ), - mnMaxRow (-1), - mnMaxCol (-1) - { -@@ -171,11 +156,12 @@ ScRangeData::ScRangeData(const ScRangeData& rScRangeData) : - aName (rScRangeData.aName), - aUpperName (rScRangeData.aUpperName), - pCode (rScRangeData.pCode ? rScRangeData.pCode->Clone() : new ScTokenArray()), // echte Kopie erzeugen (nicht copy-ctor) -- aPos (rScRangeData.aPos), -- eType (rScRangeData.eType), -- pDoc (rScRangeData.pDoc), -- nIndex (rScRangeData.nIndex), -- bModified (rScRangeData.bModified), -+ aPos (rScRangeData.aPos), -+ eType (rScRangeData.eType), -+ pDoc (rScRangeData.pDoc), -+ eTempGrammar(rScRangeData.eTempGrammar), -+ nIndex (rScRangeData.nIndex), -+ bModified (rScRangeData.bModified), - mnMaxRow (rScRangeData.mnMaxRow), - mnMaxCol (rScRangeData.mnMaxCol) - {} -@@ -185,9 +171,63 @@ ScRangeData::~ScRangeData() - delete pCode; - } - -+void ScRangeData::CompileRangeData( const String& rSymbol, bool bSetError ) -+{ -+ if (eTempGrammar == FormulaGrammar::GRAM_UNSPECIFIED) -+ { -+ OSL_FAIL( "ScRangeData::CompileRangeData: unspecified grammar"); -+ // Anything is almost as bad as this, but we might have the best choice -+ // if not loading documents. -+ eTempGrammar = FormulaGrammar::GRAM_NATIVE; -+ } -+ -+ ScCompiler aComp( pDoc, aPos ); -+ aComp.SetGrammar( eTempGrammar); -+ if (bSetError) -+ aComp.SetExtendedErrorDetection( ScCompiler::EXTENDED_ERROR_DETECTION_NAME_NO_BREAK); -+ ScTokenArray* pNewCode = aComp.CompileString( rSymbol ); -+ ::std::auto_ptr pOldCode( pCode); // old pCode will be deleted -+ pCode = pNewCode; -+ if( !pCode->GetCodeError() ) -+ { -+ pCode->Reset(); -+ FormulaToken* p = pCode->GetNextReference(); -+ if( p ) -+ { -+ // first token is a reference -+ /* FIXME: wouldn't that need a check if it's exactly one reference? */ -+ if( p->GetType() == svSingleRef ) -+ eType = eType | RT_ABSPOS; -+ else -+ eType = eType | RT_ABSAREA; -+ } -+ // For manual input set an error for an incomplete formula. -+ if (!pDoc->IsImportingXML()) -+ { -+ aComp.CompileTokenArray(); -+ pCode->DelRPN(); -+ } -+ } -+} -+ -+void ScRangeData::CompileUnresolvedXML() -+{ -+ if (pCode->GetCodeError() == errNoName) -+ { -+ // Reconstruct the symbol/formula and then recompile. -+ String aSymbol; -+ ScCompiler aComp( pDoc, aPos, *pCode); -+ aComp.SetGrammar( eTempGrammar); -+ aComp.CreateStringFromTokenArray( aSymbol); -+ // Don't let the compiler set an error for unknown names on final -+ // compile, errors are handled by the interpreter thereafter. -+ CompileRangeData( aSymbol, false); -+ } -+} -+ - void ScRangeData::GuessPosition() - { -- // setzt eine Position, mit der alle relative Referenzen bei CalcAbsIfRel -+ // setzt eine Position, mit der alle relative Referenzen bei CalcAbsIfRel - // ohne Fehler verabsolutiert werden koennen - - DBG_ASSERT(aPos == ScAddress(), "die Position geht jetzt verloren"); -@@ -802,6 +842,13 @@ void ScRangeName::UpdateGrow(const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY) - itr->UpdateGrow(rArea, nGrowX, nGrowY); - } - -+void ScRangeName::CompileUnresolvedXML() -+{ -+ DataType::iterator itr = maData.begin(), itrEnd = maData.end(); -+ for (; itr != itrEnd; ++itr) -+ itr->CompileUnresolvedXML(); -+} -+ - ScRangeName::const_iterator ScRangeName::begin() const - { - return maData.begin(); -diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx -index f0f05b1..2cb3fe0 100644 ---- a/sc/source/ui/view/viewfunc.cxx -+++ b/sc/source/ui/view/viewfunc.cxx -@@ -482,7 +482,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS - aComp.SetAutoCorrection( sal_True ); - if ( rString.GetChar(0) == '+' || rString.GetChar(0) == '-' ) - { -- aComp.SetExtendedErrorDetection( true ); -+ aComp.SetExtendedErrorDetection( ScCompiler::EXTENDED_ERROR_DETECTION_NAME_BREAK ); - } - String aFormula( rString ); - ScTokenArray* pArr; - ---------------erAck-patch-parts-- - - diff --git a/0001-fdo-41712-rename-members-to-track-down-assignments.patch b/0001-fdo-41712-rename-members-to-track-down-assignments.patch deleted file mode 100644 index aab101d..0000000 --- a/0001-fdo-41712-rename-members-to-track-down-assignments.patch +++ /dev/null @@ -1,183 +0,0 @@ -From e1dad1357ac57009483d232f2c8a9dccebbf69c3 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Mon, 13 Feb 2012 18:21:53 +0100 -Subject: [PATCH 1/3] fdo#41712: rename members to track down assignments -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Cédric Bosdonnat ---- - sw/source/core/inc/flowfrm.hxx | 23 ++++++++--------------- - sw/source/core/layout/flowfrm.cxx | 15 ++++++++++++--- - sw/source/core/layout/sectfrm.cxx | 2 +- - sw/source/core/text/frmform.cxx | 4 ++-- - sw/source/core/text/xmldump.cxx | 12 ++++++------ - 5 files changed, 29 insertions(+), 27 deletions(-) - -diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx -index bc9557a..1f9009d 100644 ---- a/sw/source/core/inc/flowfrm.hxx -+++ b/sw/source/core/inc/flowfrm.hxx -@@ -114,8 +114,8 @@ class SwFlowFrm - - protected: - -- SwFlowFrm *pFollow; -- SwFlowFrm *pPrecede; -+ SwFlowFrm *m_pFollow; -+ SwFlowFrm *m_pPrecede; - - sal_Bool bIsFollow :1; //Ist's ein Follow - sal_Bool bLockJoin :1; //Join (und damit deleten) verboten wenn sal_True! -@@ -166,16 +166,16 @@ public: - //neuen Parent Moven. - void MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling = 0 ); - -- sal_Bool HasFollow() const { return pFollow ? sal_True : sal_False; } -+ sal_Bool HasFollow() const { return m_pFollow ? sal_True : sal_False; } - sal_Bool IsFollow() const { return bIsFollow; } - inline void _SetIsFollow( sal_Bool bSet ) { bIsFollow = bSet; } -- const SwFlowFrm *GetFollow() const { return pFollow; } -- SwFlowFrm *GetFollow() { return pFollow; } -+ const SwFlowFrm *GetFollow() const { return m_pFollow; } -+ SwFlowFrm *GetFollow() { return m_pFollow; } - sal_Bool IsAnFollow( const SwFlowFrm *pFlow ) const; -- inline void SetFollow( SwFlowFrm *pNew ); -+ void SetFollow( SwFlowFrm *const pFollow ); - -- const SwFlowFrm *GetPrecede() const { return pPrecede; } -- SwFlowFrm *GetPrecede() { return pPrecede; } -+ const SwFlowFrm *GetPrecede() const { return m_pPrecede; } -+ SwFlowFrm *GetPrecede() { return m_pPrecede; } - - sal_Bool IsJoinLocked() const { return bLockJoin; } - sal_Bool IsAnyJoinLocked() const { return bLockJoin || HasLockedFollow(); } -@@ -253,13 +253,6 @@ inline sal_Bool SwFlowFrm::IsFwdMoveAllowed() - return rThis.GetIndPrev() != 0; - } - --inline void SwFlowFrm::SetFollow( SwFlowFrm *pNew ) --{ -- pFollow = pNew; -- if ( pFollow != NULL ) -- pFollow->pPrecede = this; --} -- - #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx -index 51cb49b..738c7e3 100644 ---- a/sw/source/core/layout/flowfrm.cxx -+++ b/sw/source/core/layout/flowfrm.cxx -@@ -81,14 +81,23 @@ sal_Bool SwFlowFrm::bMoveBwdJump = sal_False; - - SwFlowFrm::SwFlowFrm( SwFrm &rFrm ) : - rThis( rFrm ), -- pFollow( 0 ), -- pPrecede( 0 ) -+ m_pFollow( 0 ), -+ m_pPrecede( 0 ) - { - bLockJoin = bIsFollow = bCntntLock = bOwnFtnNum = - bFtnLock = bFlyLock = sal_False; - } - - -+void SwFlowFrm::SetFollow(SwFlowFrm *const pFollow) -+{ -+ m_pFollow = pFollow; -+ if (m_pFollow != NULL) -+ { -+ m_pFollow->m_pPrecede = this; -+ } -+} -+ - /************************************************************************* - |* - |* SwFlowFrm::IsFollowLocked() -@@ -215,7 +224,7 @@ sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldK - { - SwFrm *pNxt; - if( 0 != (pNxt = rThis.FindNextCnt()) && -- (!pFollow || pNxt != pFollow->GetFrm())) -+ (!m_pFollow || pNxt != m_pFollow->GetFrm())) - { - // --> FME 2006-05-15 #135914# - // The last row of a table only keeps with the next content -diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx -index 6f8bf2f..2b21733 100644 ---- a/sw/source/core/layout/sectfrm.cxx -+++ b/sw/source/core/layout/sectfrm.cxx -@@ -223,7 +223,7 @@ void SwSectionFrm::DelEmpty( sal_Bool bRemove ) - } - else if( HasFollow() ) - GetFollow()->bIsFollow = sal_False; -- pFollow = NULL; -+ m_pFollow = NULL; - if( pUp ) - { - Frm().Height( 0 ); -diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx -index c383c7e..619c700 100644 ---- a/sw/source/core/text/frmform.cxx -+++ b/sw/source/core/text/frmform.cxx -@@ -685,7 +685,7 @@ SwCntntFrm *SwTxtFrm::JoinFrm() - // <-- - pFoll->Cut(); - delete pFoll; -- pFollow = pNxt; -+ m_pFollow = pNxt; - return pNxt; - } - -@@ -2050,7 +2050,7 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat ) - return sal_False; - } - -- if( pFollow && nStart != ((SwTxtFrm*)pFollow)->GetOfst() ) -+ if( m_pFollow && nStart != (static_cast(m_pFollow))->GetOfst() ) - return sal_False; // kann z.B. durch Orphans auftreten (35083,35081) - - // Geschafft, wir sind durch ... -diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx -index 2d76660..5a65799 100644 ---- a/sw/source/core/text/xmldump.cxx -+++ b/sw/source/core/text/xmldump.cxx -@@ -314,8 +314,8 @@ void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) - if ( HasFollow() ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%p", GetFollow() ); - -- if ( pPrecede != NULL ) -- xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%p", (SwTxtFrm*)pPrecede ); -+ if ( m_pPrecede != NULL ) -+ xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%p", (SwTxtFrm*)m_pPrecede ); - } - - void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) -@@ -324,8 +324,8 @@ void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) - if ( HasFollow() ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%p", GetFollow() ); - -- if ( pPrecede != NULL ) -- xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%p", (SwSectionFrm*)pPrecede ); -+ if ( m_pPrecede != NULL ) -+ xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%p", (SwSectionFrm*)m_pPrecede ); - } - - void SwTabFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) -@@ -334,8 +334,8 @@ void SwTabFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) - if ( HasFollow() ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%p", GetFollow() ); - -- if ( pPrecede != NULL ) -- xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%p", (SwTabFrm*)pPrecede ); -+ if ( m_pPrecede != NULL ) -+ xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%p", (SwTabFrm*)m_pPrecede ); - } - - #endif --- -1.7.7.6 - diff --git a/0001-fdo-42771-Fix-crash-when-loading-an-invalid-.fodt.patch b/0001-fdo-42771-Fix-crash-when-loading-an-invalid-.fodt.patch deleted file mode 100644 index 443f08a..0000000 --- a/0001-fdo-42771-Fix-crash-when-loading-an-invalid-.fodt.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 15fe1596b265aff57264145c0e69d36607cc15a5 Mon Sep 17 00:00:00 2001 -From: Jan Holesovsky -Date: Fri, 10 Feb 2012 17:54:03 +0100 -Subject: [PATCH 1/2] fdo#42771: Fix crash when loading an invalid .fodt. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -createTextCursorByRange() likes to throw runtime exception, even though it -just means 'we were unable to create the cursor'. - -Signed-off-by: Michael Meeks -Signed-off-by: Caolán McNamara ---- - xmloff/source/text/txtparai.cxx | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx -index 3a73309..fb775a7 100644 ---- a/xmloff/source/text/txtparai.cxx -+++ b/xmloff/source/text/txtparai.cxx -@@ -2034,10 +2034,16 @@ XMLParaContext::~XMLParaContext() - xTxtImport->InsertControlCharacter( ControlCharacter::APPEND_PARAGRAPH ); - - // create a cursor that select the whole last paragraph -- Reference < XTextCursor > xAttrCursor( -- xTxtImport->GetText()->createTextCursorByRange( xStart )); -- if( !xAttrCursor.is() ) -- return; // Robust (defect file) -+ Reference < XTextCursor > xAttrCursor; -+ try { -+ xAttrCursor = xTxtImport->GetText()->createTextCursorByRange( xStart ); -+ if( !xAttrCursor.is() ) -+ return; // Robust (defect file) -+ } catch (uno::Exception &) { -+ // createTextCursorByRange() likes to throw runtime exception, even -+ // though it just means 'we were unable to create the cursor' -+ return; -+ } - xAttrCursor->gotoRange( xEnd, sal_True ); - - // xml:id for RDF metadata --- -1.7.7.6 - diff --git a/0001-fdo-43193-fix-rotation-of-shapes-in-imported-MS-docu.patch b/0001-fdo-43193-fix-rotation-of-shapes-in-imported-MS-docu.patch deleted file mode 100644 index cd54e92..0000000 --- a/0001-fdo-43193-fix-rotation-of-shapes-in-imported-MS-docu.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 3475d300ef29866542007e295569075e592bde66 Mon Sep 17 00:00:00 2001 -From: Ivan Timofeev -Date: Wed, 25 Jan 2012 20:54:27 +0100 -Subject: [PATCH] fdo#43193: fix rotation of shapes in imported MS documents - -Signed-off-by: Petr Mladek ---- - filter/source/msfilter/msdffimp.cxx | 20 +++++++++++++------- - 1 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx -index 5764c66..784b5a0 100644 ---- a/filter/source/msfilter/msdffimp.cxx -+++ b/filter/source/msfilter/msdffimp.cxx -@@ -4643,6 +4643,8 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r - rSt >> aRecHd; - if ( aRecHd.nRecType == DFF_msofbtSpContainer ) - { -+ sal_Int32 nGroupRotateAngle = 0; -+ sal_Int32 nSpFlags = 0; - mnFix16Angle = 0; - - aRecHd.SeekToBegOfRecord(rSt); -@@ -4650,15 +4652,19 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r - pRet = ImportObj( rSt, pClientData, rClientRect, rGlobalChildRect, nCalledByGroup + 1, pShapeId ); - if ( pRet ) - { -+ nSpFlags = nGroupShapeFlags; -+ nGroupRotateAngle = mnFix16Angle; -+ - Rectangle aClientRect( rClientRect ); -+ - Rectangle aGlobalChildRect; - if ( !nCalledByGroup || rGlobalChildRect.IsEmpty() ) - aGlobalChildRect = GetGlobalChildAnchor( rHd, rSt, aClientRect ); - else - aGlobalChildRect = rGlobalChildRect; - -- if ( ( mnFix16Angle > 4500 && mnFix16Angle <= 13500 ) -- || ( mnFix16Angle > 22500 && mnFix16Angle <= 31500 ) ) -+ if ( ( nGroupRotateAngle > 4500 && nGroupRotateAngle <= 13500 ) -+ || ( nGroupRotateAngle > 22500 && nGroupRotateAngle <= 31500 ) ) - { - sal_Int32 nHalfWidth = ( aClientRect.GetWidth() + 1 ) >> 1; - sal_Int32 nHalfHeight = ( aClientRect.GetHeight() + 1 ) >> 1; -@@ -4704,18 +4710,18 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r - aRecHd2.SeekToEndOfRecord( rSt ); - } - -- if ( mnFix16Angle ) -+ if ( nGroupRotateAngle ) - { -- double a = mnFix16Angle * nPi180; -- pRet->NbcRotate( aClientRect.Center(), mnFix16Angle, sin( a ), cos( a ) ); -+ double a = nGroupRotateAngle * nPi180; -+ pRet->NbcRotate( aClientRect.Center(), nGroupRotateAngle, sin( a ), cos( a ) ); - } -- if ( nGroupShapeFlags & SP_FFLIPV ) // Vertical flip? -+ if ( nSpFlags & SP_FFLIPV ) // Vertical flip? - { // BoundRect in aBoundRect - Point aLeft( aClientRect.Left(), ( aClientRect.Top() + aClientRect.Bottom() ) >> 1 ); - Point aRight( aLeft.X() + 1000, aLeft.Y() ); - pRet->NbcMirror( aLeft, aRight ); - } -- if ( nGroupShapeFlags & SP_FFLIPH ) // Horizontal flip? -+ if ( nSpFlags & SP_FFLIPH ) // Horizontal flip? - { // BoundRect in aBoundRect - Point aTop( ( aClientRect.Left() + aClientRect.Right() ) >> 1, aClientRect.Top() ); - Point aBottom( aTop.X(), aTop.Y() + 1000 ); --- -1.7.7.6 - diff --git a/0001-fdo-43399-hidden-radio-button-should-also-gets-unset.patch b/0001-fdo-43399-hidden-radio-button-should-also-gets-unset.patch deleted file mode 100644 index ce182ff..0000000 --- a/0001-fdo-43399-hidden-radio-button-should-also-gets-unset.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e5bbb64626106bdfceea47b7b7c580172d5ae420 Mon Sep 17 00:00:00 2001 -From: Lionel Elie Mamane -Date: Mon, 13 Feb 2012 17:36:23 +0100 -Subject: [PATCH 1/2] fdo#43399 hidden radio button should also gets unset - -Signed-off-by: Michael Meeks ---- - extensions/source/abpilot/typeselectionpage.cxx | 12 +++++------- - 1 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx -index f78878f..020e3a0 100644 ---- a/extensions/source/abpilot/typeselectionpage.cxx -+++ b/extensions/source/abpilot/typeselectionpage.cxx -@@ -112,9 +112,13 @@ namespace abp - m_aAllTypes.push_back( ButtonItem( &m_aOE, AST_OE, bWithMozilla && !bUnx ) ); - m_aAllTypes.push_back( ButtonItem( &m_aOther, AST_OTHER, true ) ); - -- bool bFirstVisible = true; - Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected ); - const Size aSpacing( LogicToPixel( Size( 0, 3 ), MAP_APPFONT ) ); -+ if ( ! m_aAllTypes.empty() ) -+ { -+ ButtonItem aItem = m_aAllTypes[0]; -+ aItem.m_pItem->SetStyle( aItem.m_pItem->GetStyle() | WB_GROUP ); -+ } - for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); - loop != m_aAllTypes.end(); ++loop ) - { -@@ -127,12 +131,6 @@ namespace abp - aTopLeft.Y() += aItemSize.Height() + aSpacing.Height(); - aItem.m_pItem->SetClickHdl( aTypeSelectionHandler ); - aItem.m_pItem->Show(); -- -- if ( bFirstVisible ) -- { -- aItem.m_pItem->SetStyle( aItem.m_pItem->GetStyle() | WB_GROUP ); -- bFirstVisible = false; -- } - } - } - } --- -1.7.7.6 - diff --git a/0001-fdo-44178-Align-dictionary-address-with-DICT_REPO_UR.patch b/0001-fdo-44178-Align-dictionary-address-with-DICT_REPO_UR.patch deleted file mode 100644 index 03af3d4..0000000 --- a/0001-fdo-44178-Align-dictionary-address-with-DICT_REPO_UR.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4073928dfd787ed805105f7ab2d5cfed5bb3393c Mon Sep 17 00:00:00 2001 -From: Lior Kaplan -Date: Thu, 29 Dec 2011 00:28:29 +0200 -Subject: [PATCH 1/2] fdo#44178: Align dictionary address with DICT_REPO_URL - in instsetoo_native/util/openoffice.lst - ---- - cui/source/options/optlingu.cxx | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx -index 66c2aee..e245e36 100644 ---- a/cui/source/options/optlingu.cxx -+++ b/cui/source/options/optlingu.cxx -@@ -1137,7 +1137,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, - != SvtExtendedSecurityOptions::OPEN_NEVER ) - { - aMoreDictsLink.SetURL( String( -- RTL_CONSTASCII_USTRINGPARAM( "http://extensions.libreoffice.org/dictionary/" ) ) ); -+ RTL_CONSTASCII_USTRINGPARAM( "http://extensions.libreoffice.org/dictionaries/" ) ) ); - aMoreDictsLink.SetClickHdl( LINK( this, SvxLinguTabPage, OpenURLHdl_Impl ) ); - } - else -@@ -2033,7 +2033,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) - != SvtExtendedSecurityOptions::OPEN_NEVER ) - { - aMoreDictsLink.SetURL( String( -- RTL_CONSTASCII_USTRINGPARAM( "http://extensions.libreoffice.org/dictionary/" ) ) ); -+ RTL_CONSTASCII_USTRINGPARAM( "http://extensions.libreoffice.org/dictionaries/" ) ) ); - aMoreDictsLink.SetClickHdl( LINK( this, SvxEditModulesDlg, OpenURLHdl_Impl ) ); - } - else --- -1.7.7.6 - diff --git a/0001-fdo-44813-don-t-replace-NULLs-given-by-the-database-.patch b/0001-fdo-44813-don-t-replace-NULLs-given-by-the-database-.patch deleted file mode 100644 index c51d783..0000000 --- a/0001-fdo-44813-don-t-replace-NULLs-given-by-the-database-.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 5885bf0a40b7e30d197216af5ba80568c36009cb Mon Sep 17 00:00:00 2001 -From: Lionel Elie Mamane -Date: Mon, 16 Jan 2012 19:38:01 +0100 -Subject: [PATCH 1/2] fdo#44813: don't replace NULLs given by the database by - type-default values - -It makes no sense, because non-nullable columns can have NULL value. -E.g. in "foo LEFT JOIN bar ON condition", the non-nullable columns of "bar" -when it has no row matching "condition". - -Even when we are about to insert/update a row, we should not put a -hard-coded value (that just happens to be the one constructed by the -C++ default constructor for that type) in non-nullable columns: there -is no guarantee that this value makes sense in that database's context. -The database may or may not have a default value set for that column. -If it has, we should leave it up to the database to set it automatically. -If it has not, an error *is* the right reaction. - -Another place where this substitution does damage is when we refresh a -row. We use the values we have read from the primary key to select the -row again. So we should not mangle those, else the select returns no -row and we mistakingly think the row has been deleted. - -Signed-off-by: Michael Meeks ---- - dbaccess/source/core/api/CacheSet.cxx | 2 +- - dbaccess/source/core/api/KeySet.cxx | 10 +++++----- - dbaccess/source/core/api/OptimisticSet.cxx | 2 +- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx -index ca3c4d1..7e18fa0 100644 ---- a/dbaccess/source/core/api/CacheSet.cxx -+++ b/dbaccess/source/core/api/CacheSet.cxx -@@ -429,7 +429,7 @@ void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) - for(sal_Int32 i=1;aIter != aEnd;++aIter,++i) - { - aIter->setSigned(m_aSignedFlags[i-1]); -- aIter->fill(i,m_aColumnTypes[i-1],m_aNullable[i-1],this); -+ aIter->fill(i, m_aColumnTypes[i-1], this); - } - } - -diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx -index 5ae3385..407b700 100644 ---- a/dbaccess/source/core/api/KeySet.cxx -+++ b/dbaccess/source/core/api/KeySet.cxx -@@ -758,7 +758,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString - #endif - SelectColumnsMetaData::iterator aFind = m_pKeyColumnNames->find(*aAutoIter); - if ( aFind != m_pKeyColumnNames->end() ) -- (_rInsertRow->get())[aFind->second.nPosition].fill(i,aFind->second.nType,aFind->second.bNullable,xRow); -+ (_rInsertRow->get())[aFind->second.nPosition].fill(i, aFind->second.nType, xRow); - } - bAutoValuesFetched = sal_True; - } -@@ -818,7 +818,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString - // we will only fetch values which are keycolumns - SelectColumnsMetaData::iterator aFind = m_pKeyColumnNames->find(*aAutoIter); - if ( aFind != aEnd ) -- (_rInsertRow->get())[aFind->second.nPosition].fill(i,aFind->second.nType,aFind->second.bNullable,xRow); -+ (_rInsertRow->get())[aFind->second.nPosition].fill(i, aFind->second.nType, xRow); - } - } - ::comphelper::disposeComponent(xStatement); -@@ -1335,13 +1335,13 @@ sal_Bool OKeySet::fetchRow() - { - ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >((*m_pKeyColumnNames).size() + m_pForeignColumnNames->size()); - connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = aKeyRow->get().begin(); -- // first fetch the values needed for the key column -+ // first fetch the values needed for the key columns - SelectColumnsMetaData::const_iterator aPosIter = (*m_pKeyColumnNames).begin(); - SelectColumnsMetaData::const_iterator aPosEnd = (*m_pKeyColumnNames).end(); - for(;aPosIter != aPosEnd;++aPosIter,++aIter) - { - const SelectColumnDescription& rColDesc = aPosIter->second; -- aIter->fill(rColDesc.nPosition,rColDesc.nType,rColDesc.bNullable,m_xDriverRow); -+ aIter->fill(rColDesc.nPosition, rColDesc.nType, m_xDriverRow); - } - // now fetch the values from the missing columns from other tables - aPosIter = (*m_pForeignColumnNames).begin(); -@@ -1349,7 +1349,7 @@ sal_Bool OKeySet::fetchRow() - for(;aPosIter != aPosEnd;++aPosIter,++aIter) - { - const SelectColumnDescription& rColDesc = aPosIter->second; -- aIter->fill(rColDesc.nPosition,rColDesc.nType,rColDesc.bNullable,m_xDriverRow); -+ aIter->fill(rColDesc.nPosition, rColDesc.nType, m_xDriverRow); - } - m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(m_aKeyMap.rbegin()->first+1,OKeySetValue(aKeyRow,::std::pair >(0,NULL)))).first; - } -diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx -index 38dba0e..a84eb9c 100644 ---- a/dbaccess/source/core/api/OptimisticSet.cxx -+++ b/dbaccess/source/core/api/OptimisticSet.cxx -@@ -722,7 +722,7 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const - { - if ( aColIter->second.sTableName == aSqlIter->first ) - { -- io_aRow[aColIter->second.nPosition].fill(i++,aColIter->second.nType,aColIter->second.bNullable,xRow); -+ io_aRow[aColIter->second.nPosition].fill(i++, aColIter->second.nType, xRow); - io_aRow[aColIter->second.nPosition].setModified(); - } - } --- -1.7.7.6 - diff --git a/0001-fdo-45115-SwXTextTable-fix-setting-borders.patch b/0001-fdo-45115-SwXTextTable-fix-setting-borders.patch deleted file mode 100644 index 6b0d6f4..0000000 --- a/0001-fdo-45115-SwXTextTable-fix-setting-borders.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ef9881001e4ddfa6bfbe7d83f482393bb76d926a Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Fri, 3 Feb 2012 18:49:56 +0100 -Subject: [PATCH 1/2] fdo#45115: SwXTextTable: fix setting borders - -This plus e549f52f16c4a519ed3eddb9c66c19bacc247590 fixes the problem. ---- - sw/source/core/unocore/unotbl.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx -index a928d15..9526160 100644 ---- a/sw/source/core/unocore/unotbl.cxx -+++ b/sw/source/core/unocore/unotbl.cxx -@@ -136,7 +136,7 @@ sal_Bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLi - { - rSvxLine.SetColor(Color(rLine.Color)); - -- rSvxLine.GuessLinesWidths( editeng::SvxBorderStyle(table::BorderLineStyle::SOLID), -+ rSvxLine.GuessLinesWidths( editeng::NO_STYLE, - MM100_TO_TWIP( rLine.OuterLineWidth ), - MM100_TO_TWIP( rLine.InnerLineWidth ), - MM100_TO_TWIP( rLine.LineDistance ) ); --- -1.7.7.6 - diff --git a/0001-fdo-45449-ODF-export-frames-invalid-min-width.patch b/0001-fdo-45449-ODF-export-frames-invalid-min-width.patch deleted file mode 100644 index c022778..0000000 --- a/0001-fdo-45449-ODF-export-frames-invalid-min-width.patch +++ /dev/null @@ -1,109 +0,0 @@ -From eb7c38705c03b12770d1d964f6e15c1d12719cc4 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Tue, 7 Feb 2012 10:48:59 +0000 -Subject: [PATCH 1/2] fdo#45449: ODF export: frames: invalid "min-width" - -XMLTextParagraphExport::addTextFrameAttributes: delay writing of the -fo:min-width and fo:min-height attributes so that they end up at the -draw:text-box element, and not at draw:frame where they are invalid. - -Testing reveals that the ODF import can already handle reading the -attributes from the draw:text-box elements, so there doesn't seem to be -a backward compatibility problem. - -Signed-off-by: Noel Power ---- - xmloff/inc/xmloff/txtparae.hxx | 3 ++- - xmloff/source/text/txtparae.cxx | 30 ++++++++++++++++++++++++------ - 2 files changed, 26 insertions(+), 7 deletions(-) - -diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx -index dcb2d6f..dbe865e 100644 ---- a/xmloff/inc/xmloff/txtparae.hxx -+++ b/xmloff/inc/xmloff/txtparae.hxx -@@ -266,7 +266,8 @@ protected: - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& rPropSet, - sal_Bool bShape, -- ::rtl::OUString *pMinHeightValue = 0 ); -+ ::rtl::OUString *pMinHeightValue = 0, -+ ::rtl::OUString *pMinWidthValue = 0 ); - - virtual void exportStyleAttributes( - const ::com::sun::star::uno::Reference< -diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx -index d5962ec..066266d 100644 ---- a/xmloff/source/text/txtparae.cxx -+++ b/xmloff/source/text/txtparae.cxx -@@ -2479,7 +2479,8 @@ sal_Bool lcl_txtpara_isBoundAsChar( - sal_Int32 XMLTextParagraphExport::addTextFrameAttributes( - const Reference < XPropertySet >& rPropSet, - sal_Bool bShape, -- OUString *pMinHeightValue ) -+ OUString *pMinHeightValue, -+ OUString *pMinWidthValue) - { - sal_Int32 nShapeFeatures = SEF_DEFAULT; - -@@ -2582,8 +2583,13 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes( - } - GetExport().GetMM100UnitConverter().convertMeasure( sValue, nWidth ); - if( SizeType::FIX != nWidthType ) -- GetExport().AddAttribute( XML_NAMESPACE_FO, XML_MIN_WIDTH, -- sValue.makeStringAndClear() ); -+ { -+ assert(pMinWidthValue); -+ if (pMinWidthValue) -+ { -+ *pMinWidthValue = sValue.makeStringAndClear(); -+ } -+ } - else - GetExport().AddAttribute( XML_NAMESPACE_SVG, XML_WIDTH, - sValue.makeStringAndClear() ); -@@ -2654,8 +2660,13 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes( - GetExport().GetMM100UnitConverter().convertPercent( sValue, - nRelHeight ); - if( SizeType::MIN == nSizeType ) -- GetExport().AddAttribute( XML_NAMESPACE_FO, XML_MIN_HEIGHT, -- sValue.makeStringAndClear() ); -+ { -+ assert(pMinHeightValue); -+ if (pMinHeightValue) -+ { -+ *pMinHeightValue = sValue.makeStringAndClear(); -+ } -+ } - else - GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_REL_HEIGHT, - sValue.makeStringAndClear() ); -@@ -2804,11 +2815,12 @@ void XMLTextParagraphExport::_exportTextFrame( - - OUString sAutoStyle( sStyle ); - OUString aMinHeightValue; -+ OUString sMinWidthValue; - sAutoStyle = Find( XML_STYLE_FAMILY_TEXT_FRAME, rPropSet, sStyle ); - if( sAutoStyle.getLength() ) - GetExport().AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE_NAME, - GetExport().EncodeStyleName( sAutoStyle ) ); -- addTextFrameAttributes( rPropSet, sal_False, &aMinHeightValue ); -+ addTextFrameAttributes(rPropSet, false, &aMinHeightValue, &sMinWidthValue); - - SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW, - XML_FRAME, sal_False, sal_True ); -@@ -2817,6 +2829,12 @@ void XMLTextParagraphExport::_exportTextFrame( - GetExport().AddAttribute( XML_NAMESPACE_FO, XML_MIN_HEIGHT, - aMinHeightValue ); - -+ if (!sMinWidthValue.isEmpty()) -+ { -+ GetExport().AddAttribute( XML_NAMESPACE_FO, XML_MIN_WIDTH, -+ sMinWidthValue ); -+ } -+ - // draw:chain-next-name - if( rPropSetInfo->hasPropertyByName( sChainNextName ) ) - { --- -1.7.7.6 - diff --git a/0001-fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch b/0001-fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch deleted file mode 100644 index b527d92..0000000 --- a/0001-fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b975e59e7d5213f99ff22138a1065eb0f0a9cb07 Mon Sep 17 00:00:00 2001 -From: Rene Engelhard -Date: Thu, 1 Mar 2012 08:45:13 +0100 -Subject: [PATCH] fix nsplugin to create correct - com.sun.star.ucb.SimpleFileAccess instance - -Signed-off-by: Stephan Bergmann -Signed-off-by: Michael Meeks -Signed-off-by: Tor Lillqvist ---- - extensions/source/nsplugin/source/so_instance.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx -index 658d73a..f14b7b3 100644 ---- a/extensions/source/nsplugin/source/so_instance.cxx -+++ b/extensions/source/nsplugin/source/so_instance.cxx -@@ -243,7 +243,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) - - //create stream for the document - Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess( -- mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccessw")) ), -+ mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ), - uno::UNO_QUERY ); - if(!xSimpleFileAccess.is()) - { --- -1.7.7.6 - diff --git a/0001-fix-support-for-embedded-images-for-basic-Dialogs-fd.patch b/0001-fix-support-for-embedded-images-for-basic-Dialogs-fd.patch deleted file mode 100644 index 2931663..0000000 --- a/0001-fix-support-for-embedded-images-for-basic-Dialogs-fd.patch +++ /dev/null @@ -1,248 +0,0 @@ -From 715b102a41eb89aff9cf5cc5e206e98d363274ee Mon Sep 17 00:00:00 2001 -From: Noel Power -Date: Wed, 15 Feb 2012 14:46:29 +0100 -Subject: [PATCH] fix support for embedded images for basic Dialogs ( - fdo#45992 ) - -Signed-off-by: Petr Mladek ---- - .../toolkit/controls/controlmodelcontainerbase.hxx | 1 - - toolkit/inc/toolkit/controls/dialogcontrol.hxx | 4 ++ - toolkit/inc/toolkit/controls/unocontrols.hxx | 13 ++++++ - .../source/controls/controlmodelcontainerbase.cxx | 25 ----------- - toolkit/source/controls/dialogcontrol.cxx | 35 ++++++++++++--- - toolkit/source/controls/unocontrols.cxx | 44 +++++++++++++++++++- - 6 files changed, 88 insertions(+), 34 deletions(-) - -diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx -index 673f4d6..c4d2dd5 100644 ---- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx -+++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx -@@ -233,7 +233,6 @@ protected: - virtual void ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl ); - void ImplUpdateResourceResolver(); - void ImplStartListingForResourceEvents(); -- ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > Impl_getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL ); - - ControlContainerBase(); - -diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx -index 78fc078..9620e65 100644 ---- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx -+++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include "toolkit/helper/servicenames.hxx" - #include "toolkit/helper/macros.hxx" - #include -@@ -47,8 +48,11 @@ - class UnoControlDialogModel : public ControlModelContainerBase - { - protected: -+ ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj; - ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); -+ // ::cppu::OPropertySetHelper -+ void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); - public: - UnoControlDialogModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory ); - UnoControlDialogModel( const UnoControlDialogModel& rModel ); -diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx -index 91b8e2a..3fffee3 100644 ---- a/toolkit/inc/toolkit/controls/unocontrols.hxx -+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx -@@ -72,6 +72,19 @@ - #define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:" - #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX "vnd.sun.star.Package:" - -+class ImageHelper -+{ -+public: -+ // The routine will always attempt to return a valid XGraphic for the -+ // passed _rURL, additionallly xOutGraphicObject will contain the -+ // associated XGraphicObject ( if url is valid for that ) and is set -+ // appropriately ( e.g. NULL if non GraphicObject scheme ) or a valid -+ // object if the rURL points to a valid object -+ static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicAndGraphicObjectFromURL_nothrow( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject >& xOutGraphicObject, const ::rtl::OUString& _rURL ); -+ static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL ); -+ -+}; -+ - // ---------------------------------------------------- - // class UnoControlEditModel - // ---------------------------------------------------- -diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx -index 2be6fa2..f2dd50a 100644 ---- a/toolkit/source/controls/controlmodelcontainerbase.cxx -+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx -@@ -1842,31 +1842,6 @@ void ControlContainerBase::ImplUpdateResourceResolver() - } - } - -- --uno::Reference< graphic::XGraphic > ControlContainerBase::Impl_getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL ) --{ -- uno::Reference< graphic::XGraphic > xGraphic; -- if ( !_rURL.getLength() ) -- return xGraphic; -- -- try -- { -- uno::Reference< graphic::XGraphicProvider > xProvider; -- if ( maContext.createComponent( "com.sun.star.graphic.GraphicProvider", xProvider ) ) -- { -- uno::Sequence< beans::PropertyValue > aMediaProperties(1); -- aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); -- aMediaProperties[0].Value <<= _rURL; -- xGraphic = xProvider->queryGraphic( aMediaProperties ); -- } -- } -- catch( const Exception& ) -- { -- DBG_UNHANDLED_EXCEPTION(); -- } -- -- return xGraphic; --} - //// ---------------------------------------------------- - //// Helper Method to convert relative url to physical location - //// ---------------------------------------------------- -diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx -index 4aece91..8d565dd 100644 ---- a/toolkit/source/controls/dialogcontrol.cxx -+++ b/toolkit/source/controls/dialogcontrol.cxx -@@ -62,6 +62,7 @@ - - #include - #include -+#include "toolkit/controls/unocontrols.hxx" - - using namespace ::com::sun::star; - using namespace ::com::sun::star::uno; -@@ -244,6 +245,23 @@ Reference< XPropertySetInfo > UnoControlDialogModel::getPropertySetInfo( ) thro - return xInfo; - } - -+void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) -+{ -+ ControlModelContainerBase::setFastPropertyValue_NoBroadcast( nHandle, rValue ); -+ try -+ { -+ if ( nHandle == BASEPROPERTY_IMAGEURL && ImplHasProperty( BASEPROPERTY_GRAPHIC ) ) -+ { -+ ::rtl::OUString sImageURL; -+ OSL_VERIFY( rValue >>= sImageURL ); -+ setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( mxGrfObj, sImageURL ) ) ); -+ } -+ } -+ catch( const ::com::sun::star::uno::Exception& ) -+ { -+ OSL_ENSURE( sal_False, "UnoControlDialogModel::setFastPropertyValue_NoBroadcast: caught an exception while setting ImageURL properties!" ); -+ } -+} - // ============================================================================ - // = class UnoDialogControl - // ============================================================================ -@@ -341,11 +359,12 @@ void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDes - if (( ImplGetPropertyValue( PROPERTY_IMAGEURL ) >>= aImageURL ) && - ( aImageURL.getLength() > 0 )) - { -- ::rtl::OUString absoluteUrl = -- getPhysicalLocation( ImplGetPropertyValue( PROPERTY_DIALOGSOURCEURL ), -- ImplGetPropertyValue( PROPERTY_IMAGEURL )); -+ ::rtl::OUString absoluteUrl = aImageURL; -+ if ( aImageURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) != 0 ) -+ absoluteUrl = getPhysicalLocation( ImplGetPropertyValue( PROPERTY_DIALOGSOURCEURL ), -+ uno::makeAny( aImageURL ) ); - -- xGraphic = ControlContainerBase::Impl_getGraphicFromURL_nothrow( absoluteUrl ); -+ xGraphic = ImageHelper::getGraphicFromURL_nothrow( absoluteUrl ); - ImplSetPropertyValue( PROPERTY_GRAPHIC, uno::makeAny( xGraphic ), sal_True ); - } - } -@@ -566,11 +585,13 @@ void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChang - if (( ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_IMAGEURL ) ) >>= aImageURL ) && - ( aImageURL.getLength() > 0 )) - { -- ::rtl::OUString absoluteUrl = -- getPhysicalLocation( ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DIALOGSOURCEURL )), -+ ::rtl::OUString absoluteUrl = aImageURL; -+ if ( aImageURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) != 0 ) -+ -+ absoluteUrl = getPhysicalLocation( ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DIALOGSOURCEURL )), - uno::makeAny(aImageURL)); - -- xGraphic = Impl_getGraphicFromURL_nothrow( absoluteUrl ); -+ xGraphic = ImageHelper::getGraphicFromURL_nothrow( absoluteUrl ); - } - ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC), uno::makeAny( xGraphic ), sal_True ); - break; -diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx -index 3fb2d18..7ee2193 100644 ---- a/toolkit/source/controls/unocontrols.cxx -+++ b/toolkit/source/controls/unocontrols.cxx -@@ -89,7 +89,49 @@ using namespace ::toolkit; - } \ - - -+uno::Reference< graphic::XGraphic > -+ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( uno::Reference< graphic::XGraphicObject >& xOutGraphicObj, const ::rtl::OUString& _rURL ) -+{ -+ if( ( _rURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 ) ) -+ { -+ // graphic manager uniqueid -+ rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ); -+ // get the DefaultContext -+ ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() ); -+ xOutGraphicObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID ); -+ } -+ else // linked -+ xOutGraphicObj = NULL; // release the GraphicObject -+ -+ return ImageHelper::getGraphicFromURL_nothrow( _rURL ); -+} - -+::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > -+ImageHelper::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL ) -+{ -+ uno::Reference< graphic::XGraphic > xGraphic; -+ if ( _rURL.isEmpty() ) -+ return xGraphic; -+ -+ try -+ { -+ uno::Reference< graphic::XGraphicProvider > xProvider; -+ ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() ); -+ if ( aContext.createComponent( "com.sun.star.graphic.GraphicProvider", xProvider ) ) -+ { -+ uno::Sequence< beans::PropertyValue > aMediaProperties(1); -+ aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); -+ aMediaProperties[0].Value <<= _rURL; -+ xGraphic = xProvider->queryGraphic( aMediaProperties ); -+ } -+ } -+ catch (const Exception&) -+ { -+ DBG_UNHANDLED_EXCEPTION(); -+ } -+ -+ return xGraphic; -+} - // ---------------------------------------------------- - // class UnoControlEditModel - // ---------------------------------------------------- -@@ -593,7 +635,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n - mbAdjustingGraphic = true; - ::rtl::OUString sImageURL; - OSL_VERIFY( rValue >>= sImageURL ); -- setDependentFastPropertyValue( BASEPROPERTY_GRAPHIC, uno::makeAny( getGraphicFromURL_nothrow( sImageURL ) ) ); -+ setDependentFastPropertyValue( BASEPROPERTY_GRAPHIC, uno::makeAny( ImageHelper::getGraphicFromURL_nothrow( sImageURL ) ) ); - mbAdjustingGraphic = false; - } - break; --- -1.7.7.6 - diff --git a/0001-fix-writing-of-strings-from-the-first-module.patch b/0001-fix-writing-of-strings-from-the-first-module.patch deleted file mode 100644 index 383bb23..0000000 --- a/0001-fix-writing-of-strings-from-the-first-module.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 196885980bbb51562264cb5aad9a3e01133d1d7d Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 11 Jan 2012 14:04:54 +0100 -Subject: [PATCH] fix writing of strings from the first module - ---- - l10ntools/scripts/fast_merge.pl | 21 +++++++++++++-------- - 1 files changed, 13 insertions(+), 8 deletions(-) - -diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl -index 5dc63cf..cc632e4 100644 ---- a/l10ntools/scripts/fast_merge.pl -+++ b/l10ntools/scripts/fast_merge.pl -@@ -89,11 +89,10 @@ while( hasLines() ) - } - write_lines(); - } --if( $#current+1 ne 0 ) -+# write content of the last localize.sdf file -+if( $#buffer ge 0 ) - { -- ( $path , $localize_file ) = make_paths(); -- add_to_buffer(); -- write_buffer( $path , $localize_file ); -+ write_buffer( $last_path , $last_localize_file ); - } - release_lock(); - exit( 0 ); -@@ -248,15 +247,14 @@ sub make_paths - - return ( $path , $localizeFile ); - } -+ - sub write_lines - { - if( $first_run ){ -- add_to_buffer(); - my( $path , $localize_file ) = make_paths(); - $last_path = $path; - $last_localize_file = $localize_file; -- mkpath $path; -- write_buffer( $path , $localize_file ); -+ add_to_buffer(); - $first_run = ''; - } - else -@@ -269,7 +267,6 @@ sub write_lines - } - else - { -- mkpath $path; - write_buffer( $last_path , $last_localize_file ); - add_to_buffer(); - $last_path = $path; -@@ -277,6 +274,11 @@ sub write_lines - } - } - } -+ -+# Adds all lines that contain strings from one source file from every input file. -+# TODO: Would it not be better to add lines for all files from a directory (i.e., replace -+# "$afile eq $elem->file" by "$adir eq $elem->dir")? We could get rid of the delayed -+# writing then. But maybe there is a reason for doing it this way... - sub add_to_buffer - { - my $plainline; -@@ -293,12 +295,15 @@ sub add_to_buffer - } while ( !$elem->endoffile && $amodule eq $elem->module && $afile eq $elem->file ); - } - } -+ -+# Writes the buffer to currently selected localize.sdf file. - sub write_buffer - { - my $path = shift; - my $localize_file = shift; - my $cnt = $#buffer+1; - print "Write to $path $cnt lines\n"; -+ mkpath $path; - open FILE , ">>$localize_file" or die "Can't open file '$localize_file'\n"; - foreach ( @buffer ) - { --- -1.7.7.5 - diff --git a/0001-resolved-fdo-38595-border-width-lost-in-ODF-import.patch b/0001-resolved-fdo-38595-border-width-lost-in-ODF-import.patch deleted file mode 100644 index c158556..0000000 --- a/0001-resolved-fdo-38595-border-width-lost-in-ODF-import.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 34315e7ec4062f9521cd19951b5f7f6ad9ce0d2e Mon Sep 17 00:00:00 2001 -From: Eike Rathke -Date: Thu, 26 Jan 2012 14:03:13 +0100 -Subject: [PATCH] resolved fdo#38595 border width lost in ODF import - ---- - sc/source/filter/xml/xmlstyli.cxx | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx -index 7691c4b..72155e6 100644 ---- a/sc/source/filter/xml/xmlstyli.cxx -+++ b/sc/source/filter/xml/xmlstyli.cxx -@@ -170,12 +170,14 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >& - pBorders[i]->maValue >>= aBorderLine; - if( pBorderWidths[i] ) - { -+ // Merge style:border-line-width values to fo:border values. Do -+ // not override fo:border line width or line style with an -+ // empty value! - table::BorderLine2 aBorderLineWidth; - pBorderWidths[i]->maValue >>= aBorderLineWidth; - aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth; - aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth; - aBorderLine.LineDistance = aBorderLineWidth.LineDistance; -- aBorderLine.LineWidth = aBorderLineWidth.LineWidth; - pBorders[i]->maValue <<= aBorderLine; - } - } -@@ -194,7 +196,6 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >& - aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth; - aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth; - aBorderLine.LineDistance = aBorderLineWidth.LineDistance; -- aBorderLine.LineWidth = aBorderLineWidth.LineWidth; - pDiagBorders[i]->maValue <<= aBorderLine; - if (pDiagBorderWidths[i]) - pDiagBorderWidths[i]->mnIndex = -1; --- -1.7.7.6 - diff --git a/0001-resolved-fdo-42784-BorderLine-with-only-InnerWidth-s.patch b/0001-resolved-fdo-42784-BorderLine-with-only-InnerWidth-s.patch deleted file mode 100644 index 7d3a388..0000000 --- a/0001-resolved-fdo-42784-BorderLine-with-only-InnerWidth-s.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e44b64d297293b83459fddda968923750e2f6a5b Mon Sep 17 00:00:00 2001 -From: Eike Rathke -Date: Thu, 2 Feb 2012 19:11:37 +0100 -Subject: [PATCH] resolved fdo#42784 BorderLine with only InnerWidth set does - not work (cherry picked from commit - 971f826a96f0938bfcfd8dfe26edd50d8e031bb4) - -Signed-off-by: Michael Stahl ---- - editeng/source/items/borderline.cxx | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx -index 61cecce..d15f53c 100644 ---- a/editeng/source/items/borderline.cxx -+++ b/editeng/source/items/borderline.cxx -@@ -300,6 +300,22 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa - else - { - SetStyle( nStyle ); -+ if (nOut == 0 && nIn > 0) -+ { -+ // If only inner width is given swap inner and outer widths for -+ // single line styles, otherwise GuessWidth() marks this as invalid -+ // and returns a 0 width. -+ switch (nStyle) -+ { -+ case SOLID: -+ case DOTTED: -+ case DASHED: -+ ::std::swap( nOut, nIn); -+ break; -+ default: -+ ; // nothing -+ } -+ } - m_nWidth = m_aWidthImpl.GuessWidth( nOut, nIn, nDist ); - } - } --- -1.7.7.6 - diff --git a/0001-rhbz-794679-use-proper-Indian-Rupee-currency-symbol.patch b/0001-rhbz-794679-use-proper-Indian-Rupee-currency-symbol.patch deleted file mode 100644 index 67da0ec..0000000 --- a/0001-rhbz-794679-use-proper-Indian-Rupee-currency-symbol.patch +++ /dev/null @@ -1,556 +0,0 @@ -From beefd1d27a8292a2fc12c5956400dedc0430e410 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Eike Rathke -Date: Mon, 20 Feb 2012 15:12:40 +0100 -Subject: [PATCH] resolved rhbz#794679 use proper Indian Rupee currency symbol - U+20B9 -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------erAck-patch-parts" - -This is a multi-part message in MIME format. ---------------erAck-patch-parts -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -Additionally fixes in gu-IN localization of day and month names contributed by -Ankitkumar Rameshchandra Patel - -Signed-off-by: Caolán McNamara ---- - i18npool/source/localedata/data/bn_IN.xml | 9 ++- - i18npool/source/localedata/data/en_IN.xml | 9 ++- - i18npool/source/localedata/data/gu_IN.xml | 103 +++++++++++++++------------- - i18npool/source/localedata/data/hi_IN.xml | 16 ++++- - i18npool/source/localedata/data/kn_IN.xml | 16 ++++- - i18npool/source/localedata/data/mai_IN.xml | 9 ++- - i18npool/source/localedata/data/ml_IN.xml | 9 ++- - i18npool/source/localedata/data/mr_IN.xml | 2 +- - i18npool/source/localedata/data/or_IN.xml | 9 ++- - i18npool/source/localedata/data/pa_IN.xml | 9 ++- - i18npool/source/localedata/data/ta_IN.xml | 16 ++++- - i18npool/source/localedata/data/te_IN.xml | 16 ++++- - 12 files changed, 164 insertions(+), 59 deletions(-) - - ---------------erAck-patch-parts -Content-Type: text/x-patch; name="0001-resolved-rhbz-794679-use-proper-Indian-Rupee-currenc.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0001-resolved-rhbz-794679-use-proper-Indian-Rupee-currenc.patch" - -diff --git a/i18npool/source/localedata/data/bn_IN.xml b/i18npool/source/localedata/data/bn_IN.xml -index 1dc7992..cf845ea 100644 ---- a/i18npool/source/localedata/data/bn_IN.xml -+++ b/i18npool/source/localedata/data/bn_IN.xml -@@ -34,7 +34,7 @@ - অপরাহ্ণ - metric - -- -+ - - Standard - -@@ -308,6 +308,13 @@ - - - INR -+ ₹ -+ INR -+ Rupee -+ 2 -+ -+ -+ INR - ৳ - INR - Rupee -diff --git a/i18npool/source/localedata/data/en_IN.xml b/i18npool/source/localedata/data/en_IN.xml -index 9c404f5..c802f64 100644 ---- a/i18npool/source/localedata/data/en_IN.xml -+++ b/i18npool/source/localedata/data/en_IN.xml -@@ -12,7 +12,7 @@ - - - -- -+ - - - -@@ -30,6 +30,13 @@ - - - INR -+ ₹ -+ INR -+ Rupee -+ 2 -+ -+ -+ INR - Rs. - INR - Indian Rupee -diff --git a/i18npool/source/localedata/data/gu_IN.xml b/i18npool/source/localedata/data/gu_IN.xml -index f5923a7..6097289 100644 ---- a/i18npool/source/localedata/data/gu_IN.xml -+++ b/i18npool/source/localedata/data/gu_IN.xml -@@ -12,7 +12,7 @@ - - - -- -+ - - - -@@ -21,112 +21,112 @@ - - - sun --ઋવિ. --ઋવિવાઋ -+રવિ -+રવિવાર - - - mon --સોમ. --સોમવાઋ્ -+સોમવાર -+સોમવાર - - - tue --મંગલ. --મંગલવાઋ -+મંગળ -+મંગળવાર - - - wed --બુધ. --બુધવાઋ -+બુધ -+બુધવાર - - - thu --ગુઋુ. --ગુઋુવાઋ -+ગુરુ -+ગુરુવાર - - - fri --શુક્ઋ. --શુક્ઋવાઋ -+શુક્ર -+શુક્રવાર - - - sat --શનિ. --શનિવાઋ -+શનિ -+શનિવાર - - - - - jan --જનવઋી. --જનવઋી -+જાન -+જાન્યુઆરી - - - feb --ફઋવઋી. --ફઋવઋી -+ફેબ -+ફેબ્રુઆરી - - - mar --માઋ્ચ. --માઋ્ચ -+માર્ચ -+માર્ચ - - - apr --અપ્ઋેલ. --અપ્ઋેલ -+એપ્રિલ -+એપ્રિલ - - - may --મઈ. --મઈ -+મે -+મે - - - jun --જૂન. -+જૂન - જૂન - - - jul --જુલાઇ. -+જુલ - જુલાઇ - - - aug --અગસ્ત. --અગસ્ત -+ઑગ -+ઑગસ્ટ - - - sep --સિતંબઋ. --સિતંબઋ -+સપ્ટ -+સપ્ટેમ્બર - - - oct --અક્તોબઋ. --અક્તોબઋ -+ઑક્ટ -+ઑક્ટોબર - - - nov --નવંબઋ. --નવંબઋ -+નવ -+નવેમ્બર - - - dec --ડિસધંબઋ. --ડિસંબઋ -+ડિસ -+ડિસેમ્બર - - - - - bc --ઈસાપૂઋ્વ.હ્ન --ઈસાપૂઋ્વ. -+ઈ.સ.પૂ. -+ઈસવીસનપૂર્વે - - - ad --સન. --સન. -+ઈ.સ. -+ઈસવીસન - - - -@@ -138,6 +138,13 @@ - - - INR -+₹ -+INR -+Rupee -+2 -+ -+ -+INR - ઋુ. - INR - Rupee -@@ -154,13 +161,13 @@ - - - --સહી --ગલત --પેહલા હંત 1 --ડૂસઋા હંત 2 --તીસઋા હંત 3 --ચૌતા હંત 4 --ઊપઋ -+ખરું -+ખોટું -+ચતુર્થાંશ૧ -+ચતુર્થાંશ૨ -+ચતુર્થાંશ૩ -+ચતુર્થાંશ૪ -+ઊપર - નીચે - Q1 - Q2 -diff --git a/i18npool/source/localedata/data/hi_IN.xml b/i18npool/source/localedata/data/hi_IN.xml -index cfca665..220cfc6 100644 ---- a/i18npool/source/localedata/data/hi_IN.xml -+++ b/i18npool/source/localedata/data/hi_IN.xml -@@ -34,7 +34,7 @@ - PM - Metric - -- -+ - - D-M-YY - -@@ -350,6 +350,20 @@ - - - INR -+₹ -+INR -+Rupee -+2 -+ -+ -+INR -+₹ -+INR -+Rupee -+2 -+ -+ -+INR - रु. - INR - Rupee -diff --git a/i18npool/source/localedata/data/kn_IN.xml b/i18npool/source/localedata/data/kn_IN.xml -index 00d5dcf..7c3d3de 100644 ---- a/i18npool/source/localedata/data/kn_IN.xml -+++ b/i18npool/source/localedata/data/kn_IN.xml -@@ -12,7 +12,7 @@ - - - -- -+ - - - -@@ -138,6 +138,20 @@ - - - INR -+₹ -+INR -+Rupee -+2 -+ -+ -+INR -+₹ -+INR -+Rupee -+2 -+ -+ -+INR - ರೂ. - INR - Rupee -diff --git a/i18npool/source/localedata/data/mai_IN.xml b/i18npool/source/localedata/data/mai_IN.xml -index 07c3d39..ee9fe69 100644 ---- a/i18npool/source/localedata/data/mai_IN.xml -+++ b/i18npool/source/localedata/data/mai_IN.xml -@@ -34,7 +34,7 @@ - अपराह्न - metric - -- -+ - - General - -@@ -315,6 +315,13 @@ - - - INR -+ ₹ -+ INR -+ Rupee -+ 2 -+ -+ -+ INR - रू. - INR - रुपया -diff --git a/i18npool/source/localedata/data/ml_IN.xml b/i18npool/source/localedata/data/ml_IN.xml -index 813e523..4adb8d4 100644 ---- a/i18npool/source/localedata/data/ml_IN.xml -+++ b/i18npool/source/localedata/data/ml_IN.xml -@@ -34,7 +34,7 @@ - PM - metric - -- -+ - - Standard - -@@ -306,6 +306,13 @@ - - - INR -+ ₹ -+ INR -+ Rupee -+ 2 -+ -+ -+ INR - ക. - INR - Rupee -diff --git a/i18npool/source/localedata/data/mr_IN.xml b/i18npool/source/localedata/data/mr_IN.xml -index efc238f..84aa6f9 100644 ---- a/i18npool/source/localedata/data/mr_IN.xml -+++ b/i18npool/source/localedata/data/mr_IN.xml -@@ -12,7 +12,7 @@ - - - -- -+ - - - -diff --git a/i18npool/source/localedata/data/or_IN.xml b/i18npool/source/localedata/data/or_IN.xml -index 2233345..b2f6415 100644 ---- a/i18npool/source/localedata/data/or_IN.xml -+++ b/i18npool/source/localedata/data/or_IN.xml -@@ -34,7 +34,7 @@ - ଅପରାହ୍ନ - metric - -- -+ - - General - -@@ -315,6 +315,13 @@ - - - INR -+ ₹ -+ INR -+ Rupee -+ 2 -+ -+ -+ INR - ଟ - INR - Indian Rupee -diff --git a/i18npool/source/localedata/data/pa_IN.xml b/i18npool/source/localedata/data/pa_IN.xml -index 8ca9444..a414fd9 100644 ---- a/i18npool/source/localedata/data/pa_IN.xml -+++ b/i18npool/source/localedata/data/pa_IN.xml -@@ -34,7 +34,7 @@ - ਸ਼ਾਮ - metric - -- -+ - - - -@@ -160,6 +160,13 @@ - - - INR -+ ₹ -+ INR -+ Rupee -+ 2 -+ -+ -+ INR - ਰੁ. - INR - Rupee -diff --git a/i18npool/source/localedata/data/ta_IN.xml b/i18npool/source/localedata/data/ta_IN.xml -index a06e374..8cbb5f6 100644 ---- a/i18npool/source/localedata/data/ta_IN.xml -+++ b/i18npool/source/localedata/data/ta_IN.xml -@@ -12,7 +12,7 @@ - - - -- -+ - - - -@@ -138,6 +138,20 @@ - - - INR -+₹ -+INR -+Rupee -+2 -+ -+ -+INR -+₹ -+INR -+Rupee -+2 -+ -+ -+INR - ரூ. - INR - Rupee -diff --git a/i18npool/source/localedata/data/te_IN.xml b/i18npool/source/localedata/data/te_IN.xml -index b753b34..d084fda 100644 ---- a/i18npool/source/localedata/data/te_IN.xml -+++ b/i18npool/source/localedata/data/te_IN.xml -@@ -12,7 +12,7 @@ - - - -- -+ - - - -@@ -137,6 +137,20 @@ - - - INR -+₹ -+INR -+Rupee -+2 -+ -+ -+INR -+₹ -+INR -+Rupee -+2 -+ -+ -+INR - రృ. - INR - Rupee - ---------------erAck-patch-parts-- - - diff --git a/0002-Resolves-fdo-43725-crash-on-saving-a-file.patch b/0002-Resolves-fdo-43725-crash-on-saving-a-file.patch deleted file mode 100644 index 631e364..0000000 --- a/0002-Resolves-fdo-43725-crash-on-saving-a-file.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 0a646ae118e0a376481fc3cbc945031702b26c1a Mon Sep 17 00:00:00 2001 -From: Eike Rathke -Date: Sat, 21 Jan 2012 01:15:02 +0100 -Subject: [PATCH 2/5] Resolves fdo#43725 crash on saving a file - -+ Checks out-of-bounds accesses in - ScFormatRangeStyles::GetStyleNameIndex() and - ScRowFormatRanges::AddRange() and prevents crashes. -- The real cause seems to be some style row/repeat miscalculation - elsewhere, further investigation would be necessary. - -Signed-off-by: Norbert Thiebaud ---- - sc/source/filter/xml/XMLStylesExportHelper.cxx | 87 ++++++++++++++++++++---- - 1 files changed, 74 insertions(+), 13 deletions(-) - -diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx -index 5ae0485..38d1523 100644 ---- a/sc/source/filter/xml/XMLStylesExportHelper.cxx -+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx -@@ -680,10 +680,35 @@ void ScRowFormatRanges::AddRange(ScMyRowFormatRange& rFormatRange, - const sal_Int32 nRow) - { - DBG_ASSERT(pRowDefaults, "no row defaults"); -+ if (!pRowDefaults) -+ return; - DBG_ASSERT(pColDefaults, "no column defaults"); -+ if (!pColDefaults) -+ return; -+ sal_Int32 nPrevIndex; -+ bool bPrevAutoStyle; -+ OSL_ENSURE( static_cast(nRow) < pRowDefaults->size(), "nRow out of bounds"); -+ if (!(static_cast(nRow) < pRowDefaults->size())) -+ { -+ /* This is only to prevent out-of-bounds accesses, once reached here -+ * there's something else going wrong, so FIXME there! */ -+ if (pRowDefaults->empty()) -+ { -+ nPrevIndex = -1; -+ bPrevAutoStyle = false; -+ } -+ else -+ { -+ nPrevIndex = (*pRowDefaults)[pRowDefaults->size()-1].nIndex; -+ bPrevAutoStyle = (*pRowDefaults)[pRowDefaults->size()-1].bIsAutoStyle; -+ } -+ } -+ else -+ { -+ nPrevIndex = (*pRowDefaults)[nRow].nIndex; -+ bPrevAutoStyle = (*pRowDefaults)[nRow].bIsAutoStyle; -+ } - sal_uInt32 nEnd (rFormatRange.nRepeatRows + nRow - 1); -- sal_Int32 nPrevIndex((*pRowDefaults)[nRow].nIndex); -- sal_Bool bPrevAutoStyle((*pRowDefaults)[nRow].bIsAutoStyle); - sal_uInt32 i(nRow + 1); - sal_Bool bReady(false); - while ((i < nEnd) && !bReady && (i < pRowDefaults->size())) -@@ -700,12 +725,34 @@ void ScRowFormatRanges::AddRange(ScMyRowFormatRange& rFormatRange, - rFormatRange.nRepeatRows = i - nRow + 1; - if (nPrevIndex == -1) - { -- nPrevIndex = (*pColDefaults)[rFormatRange.nStartColumn].nIndex; -- bPrevAutoStyle = (*pColDefaults)[rFormatRange.nStartColumn].bIsAutoStyle; - sal_uInt32 nPrevStartCol(rFormatRange.nStartColumn); -- sal_uInt32 nRepeat((*pColDefaults)[rFormatRange.nStartColumn].nRepeat); -- nEnd = rFormatRange.nStartColumn + rFormatRange.nRepeatColumns; -- for(i = nPrevStartCol + nRepeat; i < nEnd; i += (*pColDefaults)[i].nRepeat) -+ OSL_ENSURE( static_cast(nPrevStartCol) < pColDefaults->size(), "nPrevStartCol out of bounds"); -+ sal_uInt32 nRepeat; -+ if (static_cast(nPrevStartCol) < pColDefaults->size()) -+ { -+ nRepeat = (*pColDefaults)[nPrevStartCol].nRepeat; -+ nPrevIndex = (*pColDefaults)[nPrevStartCol].nIndex; -+ bPrevAutoStyle = (*pColDefaults)[nPrevStartCol].bIsAutoStyle; -+ } -+ else -+ { -+ /* Again, this is to prevent out-of-bounds accesses, so FIXME -+ * elsewhere! */ -+ if (pColDefaults->empty()) -+ { -+ nRepeat = 1; -+ nPrevIndex = -1; -+ bPrevAutoStyle = false; -+ } -+ else -+ { -+ nRepeat = (*pColDefaults)[pColDefaults->size()-1].nRepeat; -+ nPrevIndex = (*pColDefaults)[pColDefaults->size()-1].nIndex; -+ bPrevAutoStyle = (*pColDefaults)[pColDefaults->size()-1].bIsAutoStyle; -+ } -+ } -+ nEnd = nPrevStartCol + rFormatRange.nRepeatColumns; -+ for(i = nPrevStartCol + nRepeat; i < nEnd && i < pColDefaults->size(); i += (*pColDefaults)[i].nRepeat) - { - DBG_ASSERT(sal_uInt32(nPrevStartCol + nRepeat) <= nEnd, "something wents wrong"); - if ((nPrevIndex != (*pColDefaults)[i].nIndex) || -@@ -924,6 +971,8 @@ sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const sal_Int32 nTable, - const sal_Int32 nColumn, const sal_Int32 nRow, sal_Bool& bIsAutoStyle) const - { - DBG_ASSERT(static_cast(nTable) < aTables.size(), "wrong table"); -+ if (!(static_cast(nTable) < aTables.size())) -+ return -1; - ScMyFormatRangeAddresses* pFormatRanges(aTables[nTable]); - ScMyFormatRangeAddresses::iterator aItr(pFormatRanges->begin()); - ScMyFormatRangeAddresses::iterator aEndItr(pFormatRanges->end()); -@@ -947,6 +996,8 @@ sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const sal_Int32 nTable, const s - sal_Bool& bIsAutoStyle, sal_Int32& nValidationIndex, sal_Int32& nNumberFormat, const sal_Int32 nRemoveBeforeRow) - { - DBG_ASSERT(static_cast(nTable) < aTables.size(), "wrong table"); -+ if (!(static_cast(nTable) < aTables.size())) -+ return -1; - ScMyFormatRangeAddresses* pFormatRanges(aTables[nTable]); - ScMyFormatRangeAddresses::iterator aItr(pFormatRanges->begin()); - ScMyFormatRangeAddresses::iterator aEndItr(pFormatRanges->end()); -@@ -960,7 +1011,10 @@ sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const sal_Int32 nTable, const s - bIsAutoStyle = aItr->bIsAutoStyle; - nValidationIndex = aItr->nValidationIndex; - nNumberFormat = aItr->nNumberFormat; -- if (((*pRowDefaults)[nRow].nIndex != -1)) -+ /* out-of-bounds is an error elsewhere, so FIXME there! */ -+ OSL_ENSURE( static_cast(nRow) < pRowDefaults->size(), "nRow out of bounds"); -+ if (static_cast(nRow) < pRowDefaults->size() && -+ ((*pRowDefaults)[nRow].nIndex != -1)) - { - if (((*pRowDefaults)[nRow].nIndex == (*aItr).nStyleNameIndex) && - ((*pRowDefaults)[nRow].bIsAutoStyle == (*aItr).bIsAutoStyle)) -@@ -968,12 +1022,17 @@ sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const sal_Int32 nTable, const s - else - return (*aItr).nStyleNameIndex; - } -- else if (((*pColDefaults)[nColumn].nIndex != -1) && -- ((*pColDefaults)[nColumn].nIndex == (*aItr).nStyleNameIndex) && -- ((*pColDefaults)[nColumn].bIsAutoStyle == (*aItr).bIsAutoStyle)) -- return -1; - else -- return (*aItr).nStyleNameIndex; -+ { -+ OSL_ENSURE( static_cast(nColumn) < pColDefaults->size(), "nColumn out of bounds"); -+ if (static_cast(nColumn) < pColDefaults->size() && -+ ((*pColDefaults)[nColumn].nIndex != -1) && -+ ((*pColDefaults)[nColumn].nIndex == (*aItr).nStyleNameIndex) && -+ ((*pColDefaults)[nColumn].bIsAutoStyle == (*aItr).bIsAutoStyle)) -+ return -1; -+ else -+ return (*aItr).nStyleNameIndex; -+ } - } - else - { -@@ -991,6 +1050,8 @@ void ScFormatRangeStyles::GetFormatRanges(const sal_Int32 nStartColumn, const sa - { - sal_Int32 nTotalColumns(nEndColumn - nStartColumn + 1); - DBG_ASSERT(static_cast(nTable) < aTables.size(), "wrong table"); -+ if (!(static_cast(nTable) < aTables.size())) -+ return; - ScMyFormatRangeAddresses* pFormatRanges(aTables[nTable]); - ScMyFormatRangeAddresses::iterator aItr(pFormatRanges->begin()); - ScMyFormatRangeAddresses::iterator aEndItr(pFormatRanges->end()); --- -1.7.7.6 - diff --git a/0002-SvxBorderTabPage-the-minimal-border-width-is-1-twip.patch b/0002-SvxBorderTabPage-the-minimal-border-width-is-1-twip.patch deleted file mode 100644 index 0626081..0000000 --- a/0002-SvxBorderTabPage-the-minimal-border-width-is-1-twip.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 27e607c744bd8cbb26b8a6bdf42384eb4f77888c Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Fri, 27 Jan 2012 23:44:26 +0100 -Subject: [PATCH 2/2] SvxBorderTabPage: the minimal border width is 1 twip - -Signed-off-by: Noel Power ---- - cui/source/tabpages/border.src | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src -index 10599d5..d1372c3 100644 ---- a/cui/source/tabpages/border.src -+++ b/cui/source/tabpages/border.src -@@ -116,7 +116,7 @@ TabPage RID_SVXPAGE_BORDER - First = 25 ; - Last = 900 ; - Maximum = 900 ; -- Minimum = 25 ; -+ Minimum = 5 ; - DecimalDigits = 2 ; - Unit = FUNIT_POINT ; - }; --- -1.7.7.6 - diff --git a/0002-fdo-37024-SwView-SwView-fix-BROWSE_MODE-setting.patch b/0002-fdo-37024-SwView-SwView-fix-BROWSE_MODE-setting.patch deleted file mode 100644 index 1f4286d..0000000 --- a/0002-fdo-37024-SwView-SwView-fix-BROWSE_MODE-setting.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fe3ddc22e24a6815481c16e17cd1050bd91b5fe2 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Wed, 1 Feb 2012 15:49:16 +0100 -Subject: [PATCH 2/4] fdo#37024: SwView::SwView: fix BROWSE_MODE setting: - -Apparently there is a check in SwDoc::SetAllUniqueFlyNames so that when -frames with certain anchor types are in a document, then SetLoaded() -is never called. Checking this flag via IsLoaded() here seems -unnecessary. -This problem was introduced with ebc5777548dea42ed966a16c66d879b1485bbfb4, -from CWS swlayoutrefactoring. - -Signed-off-by: Noel Power ---- - sw/source/ui/uiview/view.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx -index f6912af..b2c920a 100644 ---- a/sw/source/ui/uiview/view.cxx -+++ b/sw/source/ui/uiview/view.cxx -@@ -835,7 +835,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) - - if( !bOldShellWasSrcView && pWebDShell && !bOldShellWasPagePreView ) - aUsrPref.setBrowseMode( sal_True ); -- else if( rDoc.IsLoaded() ) -+ else - aUsrPref.setBrowseMode( rDoc.get(IDocumentSettingAccess::BROWSE_MODE) ); - - //Fuer den BrowseMode wollen wir keinen Factor uebernehmen. --- -1.7.7.6 - diff --git a/0002-fdo-40261-Fix-crash-in-XML-Form-Document.patch b/0002-fdo-40261-Fix-crash-in-XML-Form-Document.patch deleted file mode 100644 index 85f24c6..0000000 --- a/0002-fdo-40261-Fix-crash-in-XML-Form-Document.patch +++ /dev/null @@ -1,389 +0,0 @@ -From af14dfc2b5cf9d46ff8e425fdf6dee0978b7c135 Mon Sep 17 00:00:00 2001 -From: Jan Holesovsky -Date: Fri, 10 Feb 2012 14:12:17 +0100 -Subject: [PATCH 2/2] fdo#40261: Fix crash in XML Form Document. - -The data structure holding the UI elements in the browser listbox was a -terrible mess - it held the items in an unordered_map, but then accessed -them via a vector containing iterators to this unordered_map. - -Fixed the problem (and cleaned all this up) by removing the vector of -iterators, and turning the unordered_map into a normal vector. When we need -access by name, we just go through all the items; it is always just a handful -of them anyway. - -Signed-off-by: Petr Mladek ---- - extensions/source/propctrlr/browserlistbox.cxx | 138 ++++++++++++------------ - extensions/source/propctrlr/browserlistbox.hxx | 23 +--- - 2 files changed, 73 insertions(+), 88 deletions(-) - -diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx -index b24bc99..7eb1fcf 100644 ---- a/extensions/source/propctrlr/browserlistbox.cxx -+++ b/extensions/source/propctrlr/browserlistbox.cxx -@@ -472,7 +472,7 @@ namespace pcr - - UpdateVScroll(); - -- sal_Bool bNeedScrollbar = m_aOrderedLines.size() > (sal_uInt32)CalcVisibleLines(); -+ sal_Bool bNeedScrollbar = m_aLines.size() > (sal_uInt32)CalcVisibleLines(); - if ( !bNeedScrollbar ) - { - if ( m_aVScroll.IsVisible() ) -@@ -495,7 +495,7 @@ namespace pcr - m_aVScroll.SetPosSizePixel( aVScrollPos, aVScrollSize ); - } - -- for ( sal_uInt16 i = 0; i < m_aOrderedLines.size(); ++i ) -+ for ( sal_uInt16 i = 0; i < m_aLines.size(); ++i ) - m_aOutOfDateLines.insert( i ); - - // repaint -@@ -597,15 +597,16 @@ namespace pcr - - aPos.Y() += _nIndex * m_nRowHeight; - -- if ( _nIndex < m_aOrderedLines.size() ) -+ if ( _nIndex < m_aLines.size() ) - { -- m_aOrderedLines[ _nIndex ]->second.pLine->SetPosSizePixel( aPos, aSize ); -+ BrowserLinePointer pLine = m_aLines[ _nIndex ].pLine; - -- m_aOrderedLines[ _nIndex ]->second.pLine->SetTitleWidth( m_nTheNameSize + 2 * FRAME_OFFSET ); -+ pLine->SetPosSizePixel( aPos, aSize ); -+ pLine->SetTitleWidth( m_nTheNameSize + 2 * FRAME_OFFSET ); - - // show the line if necessary -- if ( !m_aOrderedLines[ _nIndex ]->second.pLine->IsVisible() ) -- m_aOrderedLines[ _nIndex ]->second.pLine->Show(); -+ if ( !pLine->IsVisible() ) -+ pLine->Show(); - } - } - -@@ -617,8 +618,8 @@ namespace pcr - ++aLoop - ) - { -- DBG_ASSERT( *aLoop < m_aOrderedLines.size(), "OBrowserListBox::UpdatePosNSize: invalid line index!" ); -- if ( *aLoop < m_aOrderedLines.size() ) -+ DBG_ASSERT( *aLoop < m_aLines.size(), "OBrowserListBox::UpdatePosNSize: invalid line index!" ); -+ if ( *aLoop < m_aLines.size() ) - PositionLine( *aLoop ); - } - m_aOutOfDateLines.clear(); -@@ -631,10 +632,10 @@ namespace pcr - sal_Int32 nLines = CalcVisibleLines(); - - sal_uInt16 nEnd = (sal_uInt16)(nThumbPos + nLines); -- if (nEnd >= m_aOrderedLines.size()) -- nEnd = (sal_uInt16)m_aOrderedLines.size()-1; -+ if (nEnd >= m_aLines.size()) -+ nEnd = (sal_uInt16)m_aLines.size()-1; - -- if ( !m_aOrderedLines.empty() ) -+ if ( !m_aLines.empty() ) - { - for ( sal_uInt16 i = (sal_uInt16)nThumbPos; i <= nEnd; ++i ) - m_aOutOfDateLines.insert( i ); -@@ -664,18 +665,21 @@ namespace pcr - //------------------------------------------------------------------ - void OBrowserListBox::SetPropertyValue(const ::rtl::OUString& _rEntryName, const Any& _rValue, bool _bUnknownValue ) - { -- ListBoxLines::iterator line = m_aLines.find( _rEntryName ); -+ ListBoxLines::iterator line = m_aLines.begin(); -+ for ( ; line != m_aLines.end() && ( line->aName != _rEntryName ); ++line ) -+ ; -+ - if ( line != m_aLines.end() ) - { - if ( _bUnknownValue ) - { -- Reference< XPropertyControl > xControl( line->second.pLine->getControl() ); -+ Reference< XPropertyControl > xControl( line->pLine->getControl() ); - OSL_ENSURE( xControl.is(), "OBrowserListBox::SetPropertyValue: illegal control!" ); - if ( xControl.is() ) - xControl->setValue( Any() ); - } - else -- impl_setControlAsPropertyValue( line->second, _rValue ); -+ impl_setControlAsPropertyValue( *line, _rValue ); - } - } - -@@ -683,14 +687,14 @@ namespace pcr - sal_uInt16 OBrowserListBox::GetPropertyPos( const ::rtl::OUString& _rEntryName ) const - { - sal_uInt16 nRet = LISTBOX_ENTRY_NOTFOUND; -- for ( OrderedListBoxLines::const_iterator linePos = m_aOrderedLines.begin(); -- linePos != m_aOrderedLines.end(); -+ for ( ListBoxLines::const_iterator linePos = m_aLines.begin(); -+ linePos != m_aLines.end(); - ++linePos - ) - { -- if ( (*linePos)->first == _rEntryName ) -+ if ( linePos->aName == _rEntryName ) - { -- nRet = (sal_uInt16)( linePos - m_aOrderedLines.begin() ); -+ nRet = (sal_uInt16)( linePos - m_aLines.begin() ); - break; - } - } -@@ -701,9 +705,12 @@ namespace pcr - //------------------------------------------------------------------------ - bool OBrowserListBox::impl_getBrowserLineForName( const ::rtl::OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const - { -- ListBoxLines::const_iterator line = m_aLines.find( _rEntryName ); -+ ListBoxLines::const_iterator line = m_aLines.begin(); -+ for ( ; line != m_aLines.end() && ( line->aName != _rEntryName ); ++line ) -+ ; -+ - if ( line != m_aLines.end() ) -- _out_rpLine = line->second.pLine; -+ _out_rpLine = line->pLine; - else - _out_rpLine.reset(); - return ( NULL != _out_rpLine.get() ); -@@ -740,21 +747,21 @@ namespace pcr - // create a new line - BrowserLinePointer pBrowserLine( new OBrowserLine( _rPropertyData.sName, &m_aLinesPlayground ) ); - -- ListBoxLine aNewLine( pBrowserLine, _rPropertyData.xPropertyHandler ); -- ::std::pair< ListBoxLines::iterator, bool > insertPoint = -- m_aLines.insert( ListBoxLines::value_type( _rPropertyData.sName, aNewLine ) ); -- OSL_ENSURE( insertPoint.second, "OBrowserListBox::InsertEntry: already have another line for this name!" ); -+ // check that the name is unique -+ ListBoxLines::iterator it = m_aLines.begin(); -+ for ( ; it != m_aLines.end() && ( it->aName != _rPropertyData.sName ); ++it ) -+ ; -+ OSL_ENSURE( it == m_aLines.end(), "OBrowserListBox::InsertEntry: already have another line for this name!" ); - -+ ListBoxLine aNewLine( _rPropertyData.sName, pBrowserLine, _rPropertyData.xPropertyHandler ); - sal_uInt16 nInsertPos = _nPos; -- if ( nInsertPos > m_aOrderedLines.size() ) -- nInsertPos = EDITOR_LIST_APPEND; -- if ( EDITOR_LIST_APPEND == nInsertPos ) -+ if ( _nPos >= m_aLines.size() ) - { -- nInsertPos = (sal_uInt16)m_aOrderedLines.size(); -- m_aOrderedLines.push_back( insertPoint.first ); -+ nInsertPos = static_cast< sal_uInt16 >( m_aLines.size() ); -+ m_aLines.push_back( aNewLine ); - } - else -- m_aOrderedLines.insert( m_aOrderedLines.begin() + nInsertPos, insertPoint.first ); -+ m_aLines.insert( m_aLines.begin() + _nPos, aNewLine ); - - pBrowserLine->SetTitleWidth(m_nTheNameSize); - if (m_bUpdate) -@@ -768,7 +775,7 @@ namespace pcr - - // update the positions of possibly affected lines - sal_uInt16 nUpdatePos = nInsertPos; -- while ( nUpdatePos < m_aOrderedLines.size() ) -+ while ( nUpdatePos < m_aLines.size() ) - m_aOutOfDateLines.insert( nUpdatePos++ ); - UpdatePosNSize( ); - -@@ -801,7 +808,7 @@ namespace pcr - //------------------------------------------------------------------ - void OBrowserListBox::ShowEntry(sal_uInt16 _nPos) - { -- if ( _nPos < m_aOrderedLines.size() ) -+ if ( _nPos < m_aLines.size() ) - { - sal_Int32 nThumbPos = m_aVScroll.GetThumbPos(); - -@@ -968,12 +975,10 @@ namespace pcr - //------------------------------------------------------------------ - sal_uInt16 OBrowserListBox::impl_getControlPos( const Reference< XPropertyControl >& _rxControl ) const - { -- for ( OrderedListBoxLines::const_iterator search = m_aOrderedLines.begin(); -- search != m_aOrderedLines.end(); -- ++search -- ) -- if ( (*search)->second.pLine->getControl().get() == _rxControl.get() ) -- return sal_uInt16( search - m_aOrderedLines.begin() ); -+ for ( ListBoxLines::const_iterator search = m_aLines.begin(); search != m_aLines.end(); ++search ) -+ if ( search->pLine->getControl().get() == _rxControl.get() ) -+ return sal_uInt16( search - m_aLines.begin() ); -+ - OSL_FAIL( "OBrowserListBox::impl_getControlPos: invalid control - not part of any of our lines!" ); - return (sal_uInt16)-1; - } -@@ -1008,7 +1013,7 @@ namespace pcr - - if ( m_pLineListener ) - { -- const ListBoxLine& rLine = impl_getControlLine( _rxControl ); -+ const ListBoxLine& rLine = m_aLines[ impl_getControlPos( _rxControl ) ]; - m_pLineListener->Commit( - rLine.pLine->GetEntryName(), - impl_getControlAsPropertyValue( rLine ) -@@ -1025,18 +1030,16 @@ namespace pcr - - // cycle forwards, 'til we've the next control which can grab the focus - ++nLine; -- while ( (size_t)nLine < m_aOrderedLines.size() ) -+ while ( static_cast< size_t >( nLine ) < m_aLines.size() ) - { -- if ( m_aOrderedLines[nLine]->second.pLine->GrabFocus() ) -+ if ( m_aLines[nLine].pLine->GrabFocus() ) - break; - ++nLine; - } - -- if ( ( (size_t)nLine >= m_aOrderedLines.size() ) -- && ( m_aOrderedLines.size() > 0 ) -- ) -- // wrap around -- m_aOrderedLines[0]->second.pLine->GrabFocus(); -+ // wrap around? -+ if ( ( static_cast< size_t >( nLine ) >= m_aLines.size() ) && ( m_aLines.size() > 0 ) ) -+ m_aLines[0].pLine->GrabFocus(); - } - - //------------------------------------------------------------------ -@@ -1064,40 +1067,33 @@ namespace pcr - //------------------------------------------------------------------ - void OBrowserListBox::Clear() - { -- for ( ListBoxLines::iterator loop = m_aLines.begin(); -- loop != m_aLines.end(); -- ++loop -- ) -+ for ( ListBoxLines::iterator loop = m_aLines.begin(); loop != m_aLines.end(); ++loop ) - { - // hide the line -- loop->second.pLine->Hide(); -+ loop->pLine->Hide(); - // reset the listener -- lcl_implDisposeControl_nothrow( loop->second.pLine->getControl() ); -+ lcl_implDisposeControl_nothrow( loop->pLine->getControl() ); - } - - clearContainer( m_aLines ); -- clearContainer( m_aOrderedLines ); - } - - //------------------------------------------------------------------ - sal_Bool OBrowserListBox::RemoveEntry( const ::rtl::OUString& _rName ) - { -- sal_uInt16 nPos = GetPropertyPos( _rName ); -- if ( nPos == LISTBOX_ENTRY_NOTFOUND ) -- return sal_False; -+ sal_uInt16 nPos = 0; -+ ListBoxLines::iterator it = m_aLines.begin(); -+ for ( ; it != m_aLines.end() && ( it->aName != _rName ); ++it, ++nPos ) -+ ; - -- OrderedListBoxLines::iterator orderedPos = m_aOrderedLines.begin() + nPos; -- BrowserLinePointer pLine = (*orderedPos)->second.pLine; -- pLine->Hide(); -- lcl_implDisposeControl_nothrow( pLine->getControl() ); -+ if ( it == m_aLines.end() ) -+ return sal_False; - -- m_aLines.erase( *orderedPos ); -- m_aOrderedLines.erase( orderedPos ); -- m_aOutOfDateLines.erase( (sal_uInt16)m_aOrderedLines.size() ); -- // this index *may* have been out of date, which is obsoleted now by m_aOrderedLines shrinking -+ m_aLines.erase( it ); -+ m_aOutOfDateLines.erase( (sal_uInt16)m_aLines.size() ); - - // update the positions of possibly affected lines -- while ( nPos < m_aOrderedLines.size() ) -+ while ( nPos < m_aLines.size() ) - m_aOutOfDateLines.insert( nPos++ ); - UpdatePosNSize( ); - -@@ -1114,14 +1110,14 @@ namespace pcr - if ( nPos == EDITOR_LIST_REPLACE_EXISTING ) - nPos = GetPropertyPos( _rPropertyData.sName ); - -- if ( nPos < m_aOrderedLines.size() ) -+ if ( nPos < m_aLines.size() ) - { - Window* pRefWindow = NULL; - if ( nPos > 0 ) -- pRefWindow = m_aOrderedLines[nPos-1]->second.pLine->GetRefWindow(); -+ pRefWindow = m_aLines[nPos-1].pLine->GetRefWindow(); - - // the current line and control -- ListBoxLine& rLine = m_aOrderedLines[nPos]->second; -+ ListBoxLine& rLine = m_aLines[nPos]; - - // the old control and some data about it - Reference< XPropertyControl > xControl = rLine.pLine->getControl(); -@@ -1259,9 +1255,9 @@ namespace pcr - nFocusControlPos = (sal_uInt16)nNewThumbPos + CalcVisibleLines() - 1; - if ( nFocusControlPos ) - { -- if ( nFocusControlPos < m_aOrderedLines.size() ) -+ if ( nFocusControlPos < m_aLines.size() ) - { -- m_aOrderedLines[ nFocusControlPos ]->second.pLine->GrabFocus(); -+ m_aLines[ nFocusControlPos ].pLine->GrabFocus(); - } - else - OSL_FAIL( "OBrowserListBox::PreNotify: internal error, invalid focus control position!" ); -diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx -index 36a471f..f7558ce 100644 ---- a/extensions/source/propctrlr/browserlistbox.hxx -+++ b/extensions/source/propctrlr/browserlistbox.hxx -@@ -65,19 +65,19 @@ namespace pcr - typedef ::boost::shared_ptr< OBrowserLine > BrowserLinePointer; - struct ListBoxLine - { -+ ::rtl::OUString aName; - BrowserLinePointer pLine; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > - xHandler; - -- ListBoxLine() { } -- ListBoxLine( BrowserLinePointer _pLine, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxHandler ) -- :pLine( _pLine ) -- ,xHandler( _rxHandler ) -+ ListBoxLine( const ::rtl::OUString& rName, BrowserLinePointer _pLine, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxHandler ) -+ : aName( rName ), -+ pLine( _pLine ), -+ xHandler( _rxHandler ) - { - } - }; -- typedef ::boost::unordered_map< ::rtl::OUString, ListBoxLine, ::rtl::OUStringHash > ListBoxLines; -- typedef ::std::vector< ListBoxLines::iterator > OrderedListBoxLines; -+ typedef ::std::vector< ListBoxLine > ListBoxLines; - - //======================================================================== - //= IControlContext -@@ -106,7 +106,6 @@ namespace pcr - ::std::auto_ptr< InspectorHelpWindow > - m_pHelpWindow; - ListBoxLines m_aLines; -- OrderedListBoxLines m_aOrderedLines; - IPropertyLineListener* m_pLineListener; - IPropertyControlObserver* m_pControlObserver; - long m_nYOffset; -@@ -192,16 +191,6 @@ namespace pcr - */ - sal_uInt16 impl_getControlPos( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ) const; - -- /** retrieves (a reference to) the ->ListBoxLine for a given control -- @param _rxControl -- The control to lookup. Must denote a control of one of the lines in ->m_aLines -- */ -- inline const ListBoxLine& -- impl_getControlLine( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ) const -- { -- return m_aOrderedLines[ impl_getControlPos( _rxControl ) ]->second; -- } -- - /** sets the given property value at the given control, after converting it as necessary - @param _rLine - The line whose at which the value is to be set. --- -1.7.7.6 - diff --git a/0002-fdo-40438-force-calculating-layout-before-Activate-t.patch b/0002-fdo-40438-force-calculating-layout-before-Activate-t.patch deleted file mode 100644 index f3a604a..0000000 --- a/0002-fdo-40438-force-calculating-layout-before-Activate-t.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ec59889a80e9fd91fc94943a56173e27427ec4a5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= -Date: Fri, 13 Jan 2012 18:04:09 +0100 -Subject: [PATCH 2/4] fdo#40438: force calculating layout before Activate to - avoid crashes and loops - -(cherry picked from commit d83488f9795740857830aaf005e06e30d4e7d70c) - -Signed-off-by: Michael Stahl ---- - sw/source/ui/uiview/view1.cxx | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx -index d1fdb5f..5f2b7a4 100644 ---- a/sw/source/ui/uiview/view1.cxx -+++ b/sw/source/ui/uiview/view1.cxx -@@ -55,6 +55,10 @@ extern int bDocSzUpdated; - - void SwView::Activate(sal_Bool bMDIActivate) - { -+ // fdo#40438 Update the layout to make sure everything is correct before showing the content -+ pWrtShell->StartAction(); -+ pWrtShell->EndAction( sal_True ); -+ - // aktuelle View anmelden an der DocShell - // die View bleibt solange an der DocShell - // aktiv bis Sie zerstoert wird oder durch Activate eine --- -1.7.7.6 - diff --git a/0002-fdo-41712-sw-fix-crash-in-layout-frame-linked-lists.patch b/0002-fdo-41712-sw-fix-crash-in-layout-frame-linked-lists.patch deleted file mode 100644 index 141b2a4..0000000 --- a/0002-fdo-41712-sw-fix-crash-in-layout-frame-linked-lists.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 33e8891ea9d75519da56431073897a57ab251d6a Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Mon, 13 Feb 2012 18:27:59 +0100 -Subject: [PATCH 2/3] fdo#41712: sw: fix crash in layout frame linked lists: -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The pPrecede member is not maintained properly when setting the -corresponding pFollow member. -The change in SwTxtFrm::JoinFrm() fixes the crash, the other changes -are perhaps fixes for other crashes... -(regression from cc3d0d182cafef9649e45f4657233ac2221fdd0a) - -Signed-off-by: Cédric Bosdonnat ---- - sw/source/core/inc/flowfrm.hxx | 1 + - sw/source/core/layout/flowfrm.cxx | 21 +++++++++++++++++++++ - sw/source/core/layout/sectfrm.cxx | 2 +- - sw/source/core/text/frmform.cxx | 2 +- - 4 files changed, 24 insertions(+), 2 deletions(-) - -diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx -index 1f9009d..9617988 100644 ---- a/sw/source/core/inc/flowfrm.hxx -+++ b/sw/source/core/inc/flowfrm.hxx -@@ -150,6 +150,7 @@ protected: - - public: - SwFlowFrm( SwFrm &rFrm ); -+ virtual ~SwFlowFrm(); - - const SwFrm *GetFrm() const { return &rThis; } - SwFrm *GetFrm() { return &rThis; } -diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx -index 738c7e3..c5e083f 100644 ---- a/sw/source/core/layout/flowfrm.cxx -+++ b/sw/source/core/layout/flowfrm.cxx -@@ -88,12 +88,33 @@ SwFlowFrm::SwFlowFrm( SwFrm &rFrm ) : - bFtnLock = bFlyLock = sal_False; - } - -+SwFlowFrm::~SwFlowFrm() -+{ -+ if (m_pFollow) -+ { -+ m_pFollow->m_pPrecede = 0; -+ } -+ if (m_pPrecede) -+ { -+ m_pPrecede->m_pFollow = 0; -+ } -+} - - void SwFlowFrm::SetFollow(SwFlowFrm *const pFollow) - { -+ if (m_pFollow) -+ { -+ assert(this == m_pFollow->m_pPrecede); -+ m_pFollow->m_pPrecede = 0; -+ } - m_pFollow = pFollow; - if (m_pFollow != NULL) - { -+ if (m_pFollow->m_pPrecede) // re-chaining pFollow? -+ { -+ assert(m_pFollow == m_pFollow->m_pPrecede->m_pFollow); -+ m_pFollow->m_pPrecede->m_pFollow = 0; -+ } - m_pFollow->m_pPrecede = this; - } - } -diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx -index 2b21733..eee5a68 100644 ---- a/sw/source/core/layout/sectfrm.cxx -+++ b/sw/source/core/layout/sectfrm.cxx -@@ -223,7 +223,7 @@ void SwSectionFrm::DelEmpty( sal_Bool bRemove ) - } - else if( HasFollow() ) - GetFollow()->bIsFollow = sal_False; -- m_pFollow = NULL; -+ SetFollow(0); - if( pUp ) - { - Frm().Height( 0 ); -diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx -index 619c700..464eab7 100644 ---- a/sw/source/core/text/frmform.cxx -+++ b/sw/source/core/text/frmform.cxx -@@ -684,8 +684,8 @@ SwCntntFrm *SwTxtFrm::JoinFrm() - } - // <-- - pFoll->Cut(); -+ SetFollow(pNxt); - delete pFoll; -- m_pFollow = pNxt; - return pNxt; - } - --- -1.7.7.6 - diff --git a/0002-fdo-42073-sw-expand-all-text-fields-when-setting-pro.patch b/0002-fdo-42073-sw-expand-all-text-fields-when-setting-pro.patch deleted file mode 100644 index fa2f687..0000000 --- a/0002-fdo-42073-sw-expand-all-text-fields-when-setting-pro.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e3dfae0741aae8581cd3fc713ba1b4459bb22d88 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Fri, 2 Mar 2012 21:32:27 +0100 -Subject: [PATCH 2/2] fdo#42073: sw: expand all text fields when setting - properties: - -SwXTextField::setPropertyValue: call Expand() for all text fields -Fixes getPresentation returning stale values. -(regression from CWS sw34bf01, 8485708f3001fca132c3353c464fe7187ef62bed) -Also, without this the text formatting does not actually update and the new -content is not displayed until some other unrelated editing operation. ---- - sw/source/core/unocore/unofield.cxx | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx -index c12ac14..0cc0223 100644 ---- a/sw/source/core/unocore/unofield.cxx -+++ b/sw/source/core/unocore/unofield.cxx -@@ -1912,9 +1912,8 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An - const_cast(pFmtFld)->Broadcast(SwFmtFldHint( 0, SWFMTFLD_CHANGED )); - } - -- // changes of the expanded string have to be notified -- //#to the SwTxtFld -- if(RES_DBFLD == nWhich && pFmtFld->GetTxtFld()) -+ // fdo#42073 notify SwTxtFld about changes of the expanded string -+ if (pFmtFld->GetTxtFld()) - { - pFmtFld->GetTxtFld()->Expand(); - } --- -1.7.7.6 - diff --git a/0002-fdo-44813-make-the-refresh-query-filter-NULL-safe.patch b/0002-fdo-44813-make-the-refresh-query-filter-NULL-safe.patch deleted file mode 100644 index affd8a7..0000000 --- a/0002-fdo-44813-make-the-refresh-query-filter-NULL-safe.patch +++ /dev/null @@ -1,159 +0,0 @@ -From ee6e71cc5fcfda258ca2ce8e61544601e891eae6 Mon Sep 17 00:00:00 2001 -From: Lionel Elie Mamane -Date: Wed, 18 Jan 2012 12:30:36 +0100 -Subject: [PATCH 2/2] fdo#44813: make the refresh query filter NULL-safe - -Signed-off-by: Michael Meeks ---- - dbaccess/source/core/api/KeySet.cxx | 77 ++++++++++++++++++++++++---------- - dbaccess/source/core/api/KeySet.hxx | 5 ++ - 2 files changed, 59 insertions(+), 23 deletions(-) - -diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx -index 407b700..8c7f83a 100644 ---- a/dbaccess/source/core/api/KeySet.cxx -+++ b/dbaccess/source/core/api/KeySet.cxx -@@ -219,22 +219,56 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable, - m_aAutoColumns.push_back( keyColumn->first ); - } - } -+namespace -+{ -+ void appendOneKeyColumnClause( const ::rtl::OUString &tblName, const ::rtl::OUString &colName, ::rtl::OUStringBuffer &o_buf ) -+ { -+ static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); -+ static ::rtl::OUString s_sParam0(RTL_CONSTASCII_USTRINGPARAM(" ( 1 = ? AND ")); -+ static ::rtl::OUString s_sParam1(RTL_CONSTASCII_USTRINGPARAM(" = ? OR 1 = ? AND ")); -+ static ::rtl::OUString s_sParam2(RTL_CONSTASCII_USTRINGPARAM(" IS NULL ) ")); -+ o_buf.append(s_sParam0); -+ o_buf.append(tblName); -+ o_buf.append(s_sDot); -+ o_buf.append(colName); -+ o_buf.append(s_sParam1); -+ o_buf.append(tblName); -+ o_buf.append(s_sDot); -+ o_buf.append(colName); -+ o_buf.append(s_sParam2); -+ } -+} -+ -+void OKeySet::setOneKeyColumnParameter( sal_Int32 &nPos, const Reference< XParameters > &_xParameter, const connectivity::ORowSetValue &_rValue, sal_Int32 _nType, sal_Int32 _nScale ) const -+{ -+ if ( _rValue.isNull() ) -+ { -+ _xParameter->setByte( nPos++, 0 ); -+ // We do the full call so that the right sqlType is passed to setNull -+ setParameter( nPos++, _xParameter, _rValue, _nType, _nScale ); -+ _xParameter->setByte( nPos++, 1 ); -+ } -+ else -+ { -+ _xParameter->setByte( nPos++, 1 ); -+ setParameter( nPos++, _xParameter, _rValue, _nType, _nScale ); -+ _xParameter->setByte( nPos++, 0 ); -+ } -+} -+ - ::rtl::OUStringBuffer OKeySet::createKeyFilter() - { - static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); -- const ::rtl::OUString aQuote = getIdentifierQuoteString(); -+ const ::rtl::OUString aQuote = getIdentifierQuoteString(); - ::rtl::OUStringBuffer aFilter; -- static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); -- static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); - // create the where clause - Reference xMeta = m_xConnection->getMetaData(); - SelectColumnsMetaData::iterator aPosEnd = m_pKeyColumnNames->end(); - for(SelectColumnsMetaData::iterator aPosIter = m_pKeyColumnNames->begin();aPosIter != aPosEnd;) - { -- aFilter.append(::dbtools::quoteTableName( xMeta,aPosIter->second.sTableName,::dbtools::eInDataManipulation)); -- aFilter.append(s_sDot); -- aFilter.append(::dbtools::quoteName( aQuote,aPosIter->second.sRealName)); -- aFilter.append(s_sParam); -+ appendOneKeyColumnClause(::dbtools::quoteTableName( xMeta,aPosIter->second.sTableName,::dbtools::eInDataManipulation), -+ ::dbtools::quoteName( aQuote,aPosIter->second.sRealName), -+ aFilter); - ++aPosIter; - if(aPosIter != aPosEnd) - aFilter.append(aAnd); -@@ -272,8 +306,6 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O - { - static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); - const ::rtl::OUString aQuote = getIdentifierQuoteString(); -- static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); -- static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); - for(;pIter != pEnd;++pIter) -@@ -290,12 +322,11 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O - for(SelectColumnsMetaData::iterator aPosIter = (*m_pForeignColumnNames).begin();aPosIter != aPosEnd;++aPosIter) - { - // look for columns not in the source columns to use them as filter as well -- if ( aFilter.getLength() ) -- aFilter.append(aAnd); -- aFilter.append(::dbtools::quoteName( aQuote,sSelectTableName)); -- aFilter.append(s_sDot); -- aFilter.append(::dbtools::quoteName( aQuote,aPosIter->second.sRealName)); -- aFilter.append(s_sParam); -+ if ( aFilter.getLength() ) -+ aFilter.append(aAnd); -+ appendOneKeyColumnClause(::dbtools::quoteName( aQuote,sSelectTableName), -+ ::dbtools::quoteName( aQuote,aPosIter->second.sRealName), -+ aFilter); - } - break; - } -@@ -875,12 +906,12 @@ void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch) - connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aIter2 = m_aKeyIter->second.first->get().begin(); - SelectColumnsMetaData::const_iterator aPosIter = (*m_pKeyColumnNames).begin(); - SelectColumnsMetaData::const_iterator aPosEnd = (*m_pKeyColumnNames).end(); -- for(;aPosIter != aPosEnd;++aPosIter,++aIter2,++nPos) -- setParameter(nPos,xParameter,*aIter2,aPosIter->second.nType,aPosIter->second.nScale); -+ for(;aPosIter != aPosEnd;++aPosIter,++aIter2) -+ setOneKeyColumnParameter(nPos,xParameter,*aIter2,aPosIter->second.nType,aPosIter->second.nScale); - aPosIter = (*m_pForeignColumnNames).begin(); - aPosEnd = (*m_pForeignColumnNames).end(); -- for(;aPosIter != aPosEnd;++aPosIter,++aIter2,++nPos) -- setParameter(nPos,xParameter,*aIter2,aPosIter->second.nType,aPosIter->second.nScale); -+ for(;aPosIter != aPosEnd;++aPosIter,++aIter2) -+ setOneKeyColumnParameter(nPos,xParameter,*aIter2,aPosIter->second.nType,aPosIter->second.nScale); - - m_xSet = m_xStatement->executeQuery(); - OSL_ENSURE(m_xSet.is(),"No resultset form statement!"); -@@ -1308,12 +1339,12 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException) - connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aIter = m_aKeyIter->second.first->get().begin(); - SelectColumnsMetaData::const_iterator aPosIter = (*m_pKeyColumnNames).begin(); - SelectColumnsMetaData::const_iterator aPosEnd = (*m_pKeyColumnNames).end(); -- for(;aPosIter != aPosEnd;++aPosIter,++aIter,++nPos) -- setParameter(nPos,xParameter,*aIter,aPosIter->second.nType,aPosIter->second.nScale); -+ for(;aPosIter != aPosEnd;++aPosIter,++aIter) -+ setOneKeyColumnParameter(nPos,xParameter,*aIter,aPosIter->second.nType,aPosIter->second.nScale); - aPosIter = (*m_pForeignColumnNames).begin(); - aPosEnd = (*m_pForeignColumnNames).end(); -- for(;aPosIter != aPosEnd;++aPosIter,++aIter,++nPos) -- setParameter(nPos,xParameter,*aIter,aPosIter->second.nType,aPosIter->second.nScale); -+ for(;aPosIter != aPosEnd;++aPosIter,++aIter) -+ setOneKeyColumnParameter(nPos,xParameter,*aIter,aPosIter->second.nType,aPosIter->second.nScale); - - m_xSet = m_xStatement->executeQuery(); - OSL_ENSURE(m_xSet.is(),"No resultset form statement!"); -diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx -index 826ec1a..84781d4 100644 ---- a/dbaccess/source/core/api/KeySet.hxx -+++ b/dbaccess/source/core/api/KeySet.hxx -@@ -138,6 +138,11 @@ namespace dbaccess - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& i_xMeta, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns, - ::std::auto_ptr& o_pKeyColumnNames); -+ void setOneKeyColumnParameter( sal_Int32 &nPos, -+ const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > &_xParameter, -+ const connectivity::ORowSetValue &_rValue, -+ sal_Int32 _nType, -+ sal_Int32 _nScale ) const; - ::rtl::OUStringBuffer createKeyFilter(); - void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch); - void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,const ::std::vector& _aIndexColumnPositions = ::std::vector()); --- -1.7.7.6 - diff --git a/0002-fdo-45115-sc-fix-setting-borders.patch b/0002-fdo-45115-sc-fix-setting-borders.patch deleted file mode 100644 index 64f29f3..0000000 --- a/0002-fdo-45115-sc-fix-setting-borders.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 697743161a6047902ee880851b23c9aef1bfa392 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Fri, 3 Feb 2012 21:06:18 +0100 -Subject: [PATCH 2/2] fdo#45115: sc: fix setting borders - -Same problem in ScHelperFunctions::GetBorderLine. ---- - sc/source/ui/unoobj/cellsuno.cxx | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx -index 1bddc21..7844d9f 100644 ---- a/sc/source/ui/unoobj/cellsuno.cxx -+++ b/sc/source/ui/unoobj/cellsuno.cxx -@@ -953,8 +953,7 @@ ScSubTotalFunc lcl_SummaryToSubTotal( sheet::GeneralFunction eSummary ) - const ::editeng::SvxBorderLine* ScHelperFunctions::GetBorderLine( ::editeng::SvxBorderLine& rLine, const table::BorderLine& rStruct ) - { - // Calc needs Twips, and there are 1/100mm in the Uno structure -- rLine.SetStyle( ::editeng::SvxBorderStyle( table::BorderLineStyle::SOLID ) ); -- rLine.GuessLinesWidths( rLine.GetStyle(), -+ rLine.GuessLinesWidths( editeng::NO_STYLE, - (sal_uInt16)HMMToTwips( rStruct.OuterLineWidth ), - (sal_uInt16)HMMToTwips( rStruct.InnerLineWidth ), - (sal_uInt16)HMMToTwips( rStruct.LineDistance ) ); --- -1.7.7.6 - diff --git a/0002-fdo-45534-ODF-export-fix-draw-fit-to-size.patch b/0002-fdo-45534-ODF-export-fix-draw-fit-to-size.patch deleted file mode 100644 index caa5494..0000000 --- a/0002-fdo-45534-ODF-export-fix-draw-fit-to-size.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 2fb5f7cf09f33b7ae924b07dac45bf3e698da90c Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Tue, 7 Feb 2012 10:54:04 +0000 -Subject: [PATCH 2/2] fdo#45534: ODF export: fix draw:fit-to-size - -In ODF 1.1 and 1.2 this attribute is of type boolean, so only write the -new values if the extended format is selected. -(regression introduced with e479f47f7d48dbd0d701bf347b6a2d5121ba3d34) - -Signed-off-by: Noel Power ---- - xmloff/source/draw/sdpropls.cxx | 23 ++++++++++++++++++++++- - 1 files changed, 22 insertions(+), 1 deletions(-) - -diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx -index a87690d..4df1b01 100644 ---- a/xmloff/source/draw/sdpropls.cxx -+++ b/xmloff/source/draw/sdpropls.cxx -@@ -619,6 +619,15 @@ SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] = - { XML_TOKEN_INVALID, 0 } - }; - -+SvXMLEnumMapEntry const pXML_FitToSize_Enum_Odf12[] = -+{ -+ { XML_FALSE, drawing::TextFitToSizeType_NONE }, -+ { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL }, -+ { XML_TRUE, drawing::TextFitToSizeType_ALLLINES }, -+ { XML_TRUE, drawing::TextFitToSizeType_AUTOFIT }, -+ { XML_TOKEN_INVALID, 0 } -+}; -+ - SvXMLEnumMapEntry const pXML_FitToSize_Enum[] = - { - { XML_FALSE, drawing::TextFitToSizeType_NONE }, -@@ -1047,7 +1056,19 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy - pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, ::getCppuType((const com::sun::star::drawing::TextVerticalAdjust*)0) ); - break; - case XML_SD_TYPE_FITTOSIZE: -- pHdl = new XMLEnumPropertyHdl( pXML_FitToSize_Enum, ::getCppuType((const com::sun::star::drawing::TextFitToSizeType*)0) ); -+ { -+ if (mpExport && (mpExport->getDefaultVersion() -+ <= SvtSaveOptions::ODFVER_012)) -+ { -+ pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum_Odf12, -+ ::getCppuType(static_cast(0))); -+ } -+ else -+ { -+ pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum, -+ ::getCppuType(static_cast(0))); -+ } -+ } - break; - case XML_SD_TYPE_MEASURE_UNIT: - pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum, ::getCppuType((const sal_Int32*)0) ); --- -1.7.7.6 - diff --git a/0002-fix-crash-using-instances-dialog-of-dataform-navigat.patch b/0002-fix-crash-using-instances-dialog-of-dataform-navigat.patch deleted file mode 100644 index cbbe1bf..0000000 --- a/0002-fix-crash-using-instances-dialog-of-dataform-navigat.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0aaa35c6d3b07a273af6a1be2d26add4a9d537cd Mon Sep 17 00:00:00 2001 -From: Noel Power -Date: Thu, 1 Mar 2012 12:10:56 +0000 -Subject: [PATCH 2/2] fix crash using instances dialog of dataform navigator - fdo#44816 - -also silence a valgrind 'Conditional jump or move depends on uninitialised value(s)' where initial state of a checkbox was undefined -(cherry picked from commit 7b860d4970604f08ebd2e818bfd63891dd940804) - -Signed-off-by: Michael Stahl ---- - svx/source/form/datanavi.cxx | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx -index e2e0b17..6718cd1 100644 ---- a/svx/source/form/datanavi.cxx -+++ b/svx/source/form/datanavi.cxx -@@ -306,7 +306,8 @@ namespace svxform - m_pNaviWin ( _pNaviWin ), - m_bHasModel ( false ), - m_eGroup ( _eGroup ), -- m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) ) -+ m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) ), -+ m_bLinkOnce ( false ) - - { - FreeResource(); -@@ -1883,7 +1884,6 @@ namespace svxform - m_aTabCtrl.SetPageText( nId, sNewName ); - bIsDocModified = true; - } -- delete(pPage); - } - break; - } --- -1.7.7.6 - diff --git a/0002-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch b/0002-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch deleted file mode 100644 index 92bc321..0000000 --- a/0002-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch +++ /dev/null @@ -1,199 +0,0 @@ -From a61057eb182d680eefaa996c0b4cd13ba4bdfcc0 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Eike Rathke -Date: Wed, 8 Feb 2012 10:42:49 -0500 -Subject: [PATCH] fix fdo#40590 stop abusing regular string token for XML - import -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------erAck-patch-parts" - -This is a multi-part message in MIME format. ---------------erAck-patch-parts -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -During XML import formulas of defined names and conditional formatting -were remembered as regular svString tokens that then later were -retrieved without quotes for compilation. This didn't go along with the -new ScRangeData::CompileUnresolvedXML() that recreates the formula -string from an already tokenized form of the formula. - -Introduced FormulaToken::AddStringXML() with ocStringXML to sort those -out and removed the IsImportingXML() hack from -FormulaCompiler::AppendString(), the ocStringXML case is handled in -FormulaCompiler::CreateStringFromToken(). - -Signed-off-by: Kohei Yoshida ---- - formula/inc/formula/FormulaCompiler.hxx | 1 - - formula/inc/formula/compiler.hrc | 25 +++++++++++++------------ - formula/inc/formula/opcode.hxx | 9 +++++---- - formula/inc/formula/tokenarray.hxx | 1 + - formula/source/core/api/FormulaCompiler.cxx | 24 +++++++----------------- - formula/source/core/api/token.cxx | 7 +++++++ - 6 files changed, 33 insertions(+), 34 deletions(-) - - ---------------erAck-patch-parts -Content-Type: text/x-patch; name="0001-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0001-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch" - -diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx -index 166d522..cc5c070 100644 ---- a/formula/inc/formula/FormulaCompiler.hxx -+++ b/formula/inc/formula/FormulaCompiler.hxx -@@ -270,7 +270,6 @@ protected: - virtual void CreateStringFromMatrix(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); - virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); - virtual void LocalizeString( String& rName ); // modify rName - input: exact name -- virtual sal_Bool IsImportingXML() const; - - sal_Bool GetToken(); - OpCode NextToken(); -diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc -index c1a8117..1fef2e6 100755 ---- a/formula/inc/formula/compiler.hrc -+++ b/formula/inc/formula/compiler.hrc -@@ -44,18 +44,19 @@ - #define SC_OPCODE_SEP 10 - #define SC_OPCODE_MISSING 11 /* special OpCodes */ - #define SC_OPCODE_BAD 12 --#define SC_OPCODE_SPACES 13 --#define SC_OPCODE_MAT_REF 14 --#define SC_OPCODE_DB_AREA 15 /* additional access operators */ --#define SC_OPCODE_MACRO 16 --#define SC_OPCODE_COL_ROW_NAME 17 --#define SC_OPCODE_COL_ROW_NAME_AUTO 18 --#define SC_OPCODE_PERCENT_SIGN 19 /* operator _follows_ value */ --#define SC_OPCODE_ARRAY_OPEN 20 --#define SC_OPCODE_ARRAY_CLOSE 21 --#define SC_OPCODE_ARRAY_ROW_SEP 22 --#define SC_OPCODE_ARRAY_COL_SEP 23 /* some convs use sep != col_sep */ --#define SC_OPCODE_STOP_DIV 24 -+#define SC_OPCODE_STRINGXML 13 -+#define SC_OPCODE_SPACES 14 -+#define SC_OPCODE_MAT_REF 15 -+#define SC_OPCODE_DB_AREA 16 /* additional access operators */ -+#define SC_OPCODE_MACRO 17 -+#define SC_OPCODE_COL_ROW_NAME 18 -+#define SC_OPCODE_COL_ROW_NAME_AUTO 19 -+#define SC_OPCODE_PERCENT_SIGN 20 /* operator _follows_ value */ -+#define SC_OPCODE_ARRAY_OPEN 21 -+#define SC_OPCODE_ARRAY_CLOSE 22 -+#define SC_OPCODE_ARRAY_ROW_SEP 23 -+#define SC_OPCODE_ARRAY_COL_SEP 24 /* some convs use sep != col_sep */ -+#define SC_OPCODE_STOP_DIV 25 - - /*** error constants #... ***/ - #define SC_OPCODE_START_ERRORS 30 -diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx -index 03e86eb..f417e11 100644 ---- a/formula/inc/formula/opcode.hxx -+++ b/formula/inc/formula/opcode.hxx -@@ -53,10 +53,11 @@ enum OpCodeEnum - ocArrayRowSep = SC_OPCODE_ARRAY_ROW_SEP, - ocArrayColSep = SC_OPCODE_ARRAY_COL_SEP, - // Special OpCodes -- ocMissing = SC_OPCODE_MISSING, -- ocBad = SC_OPCODE_BAD, -- ocSpaces = SC_OPCODE_SPACES, -- ocMatRef = SC_OPCODE_MAT_REF, -+ ocMissing = SC_OPCODE_MISSING, -+ ocBad = SC_OPCODE_BAD, -+ ocStringXML = SC_OPCODE_STRINGXML, -+ ocSpaces = SC_OPCODE_SPACES, -+ ocMatRef = SC_OPCODE_MAT_REF, - // Access commands - ocDBArea = SC_OPCODE_DB_AREA, - ocMacro = SC_OPCODE_MACRO, -diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx -index 3c870de..cbbab00 100644 ---- a/formula/inc/formula/tokenarray.hxx -+++ b/formula/inc/formula/tokenarray.hxx -@@ -214,6 +214,7 @@ public: - FormulaToken* AddExternal( const String& rStr, OpCode eOp = ocExternal ); - FormulaToken* AddBad( const sal_Unicode* pStr ); /// ocBad with String - FormulaToken* AddBad( const String& rStr ); /// ocBad with String -+ FormulaToken* AddStringXML( const String& rStr ); /// ocStringXML with String, temporary during import - - virtual FormulaToken* MergeArray( ); - -diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx -index 8d0236d..3036b7a 100644 ---- a/formula/source/core/api/FormulaCompiler.cxx -+++ b/formula/source/core/api/FormulaCompiler.cxx -@@ -1599,7 +1599,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuff - break; - - case svString: -- if( eOp == ocBad ) -+ if( eOp == ocBad || eOp == ocStringXML ) - rBuffer.append(t->GetString()); - else - AppendString( rBuffer, t->GetString() ); -@@ -1683,28 +1683,18 @@ void FormulaCompiler::AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal ) - rBuffer.append( mxSymbols->getSymbol(static_cast(bVal ? ocTrue : ocFalse)) ); - } - // ----------------------------------------------------------------------------- --sal_Bool FormulaCompiler::IsImportingXML() const --{ -- return sal_False; --} --// ----------------------------------------------------------------------------- - void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String & rStr ) - { -- if (IsImportingXML()) -+ rBuffer.append(sal_Unicode('"')); -+ if ( lcl_UnicodeStrChr( rStr.GetBuffer(), '"' ) == NULL ) - rBuffer.append( rStr ); - else - { -- rBuffer.append(sal_Unicode('"')); -- if ( lcl_UnicodeStrChr( rStr.GetBuffer(), '"' ) == NULL ) -- rBuffer.append( rStr ); -- else -- { -- String aStr( rStr ); -- aStr.SearchAndReplaceAll( '"', String( RTL_CONSTASCII_USTRINGPARAM( "\"\""))); -- rBuffer.append(aStr); -- } -- rBuffer.append(sal_Unicode('"')); -+ String aStr( rStr ); -+ aStr.SearchAndReplaceAll( '"', String( RTL_CONSTASCII_USTRINGPARAM( "\"\""))); -+ rBuffer.append(aStr); - } -+ rBuffer.append(sal_Unicode('"')); - } - - void FormulaCompiler::UpdateSeparatorsNative( -diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx -index 0034466..cb9e783 100644 ---- a/formula/source/core/api/token.cxx -+++ b/formula/source/core/api/token.cxx -@@ -313,6 +313,8 @@ bool FormulaTokenArray::AddFormulaToken(const sheet::FormulaToken& _aToken,Exter - AddString( aStrVal ); - else if ( eOpCode == ocBad ) - AddBad( aStrVal ); -+ else if ( eOpCode == ocStringXML ) -+ AddStringXML( aStrVal ); - else if ( eOpCode == ocExternal || eOpCode == ocMacro ) - AddToken( formula::FormulaExternalToken( eOpCode, aStrVal ) ); - else -@@ -792,6 +794,11 @@ FormulaToken* FormulaTokenArray::AddBad( const String& rStr ) - return Add( new FormulaStringOpToken( ocBad, rStr ) ); - } - -+FormulaToken* FormulaTokenArray::AddStringXML( const String& rStr ) -+{ -+ return Add( new FormulaStringOpToken( ocStringXML, rStr ) ); -+} -+ - - - void FormulaTokenArray::AddRecalcMode( ScRecalcMode nBits ) - ---------------erAck-patch-parts-- - - diff --git a/0002-fix-getCellRangeByName-failure-for-named-range.patch b/0002-fix-getCellRangeByName-failure-for-named-range.patch deleted file mode 100644 index 4050bff..0000000 --- a/0002-fix-getCellRangeByName-failure-for-named-range.patch +++ /dev/null @@ -1,402 +0,0 @@ -From c27958201d269f65a4ba868b04907eb55928a4a5 Mon Sep 17 00:00:00 2001 -From: Noel Power -Date: Thu, 19 Jan 2012 09:29:35 +0000 -Subject: [PATCH 2/3] fix getCellRangeByName failure for named range - ---- - sc/inc/rangenam.hxx | 4 ++-- - sc/source/core/data/documen2.cxx | 2 +- - sc/source/core/data/document.cxx | 2 +- - sc/source/core/tool/interpr1.cxx | 2 +- - sc/source/core/tool/rangenam.cxx | 25 ------------------------- - sc/source/core/tool/rangeutl.cxx | 3 ++- - sc/source/filter/html/htmlimp.cxx | 4 ++-- - sc/source/filter/rtf/eeimpars.cxx | 2 +- - sc/source/filter/xml/xmlexprt.cxx | 2 +- - sc/source/filter/xml/xmlimprt.cxx | 2 +- - sc/source/ui/app/inputwin.cxx | 2 +- - sc/source/ui/docshell/arealink.cxx | 2 +- - sc/source/ui/docshell/docfunc.cxx | 2 +- - sc/source/ui/docshell/docsh4.cxx | 2 +- - sc/source/ui/docshell/impex.cxx | 2 +- - sc/source/ui/docshell/servobj.cxx | 2 +- - sc/source/ui/namedlg/namedlg.cxx | 6 +++--- - sc/source/ui/navipi/content.cxx | 2 +- - sc/source/ui/unoobj/nameuno.cxx | 10 +++++----- - sc/source/ui/vba/vbarange.cxx | 2 +- - sc/source/ui/view/viewfunc.cxx | 2 +- - 21 files changed, 29 insertions(+), 53 deletions(-) - -diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx -index fdff278..7417094 100644 ---- a/sc/inc/rangenam.hxx -+++ b/sc/inc/rangenam.hxx -@@ -202,8 +202,8 @@ public: - SC_DLLPUBLIC const ScRangeData* findByRange(const ScRange& rRange) const; - SC_DLLPUBLIC ScRangeData* findByName(const rtl::OUString& rName); - SC_DLLPUBLIC const ScRangeData* findByName(const rtl::OUString& rName) const; -- ScRangeData* findByUpperName(const rtl::OUString& rName); -- const ScRangeData* findByUpperName(const rtl::OUString& rName) const; -+ SC_DLLPUBLIC ScRangeData* findByUpperName(const rtl::OUString& rName); -+ SC_DLLPUBLIC const ScRangeData* findByUpperName(const rtl::OUString& rName) const; - SC_DLLPUBLIC ScRangeData* findByIndex(sal_uInt16 i); - void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange& rRange, - SCsCOL nDx, SCsROW nDy, SCsTAB nDz); -diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx -index 97292ca..5720e63 100644 ---- a/sc/source/core/data/documen2.cxx -+++ b/sc/source/core/data/documen2.cxx -@@ -991,7 +991,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, - bool bInUse = ( aUsedNames.find(nOldIndex) != aUsedNames.end() ); - if (bInUse) - { -- const ScRangeData* pExistingData = GetRangeName()->findByName(itr->GetName()); -+ const ScRangeData* pExistingData = GetRangeName()->findByUpperName(itr->GetUpperName()); - if (pExistingData) - { - // the name exists already in the destination document -diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx -index 48cf99b..e85ba1f 100644 ---- a/sc/source/core/data/document.cxx -+++ b/sc/source/core/data/document.cxx -@@ -1867,7 +1867,7 @@ void ScDocument::CopyRangeNamesFromClip(ScDocument* pClipDoc, ScClipRangeNameDat - A proper solution would ask the user how to proceed. - The adjustment of the indices in the formulas is done later. - */ -- const ScRangeData* pExistingData = GetRangeName()->findByName(itr->GetName()); -+ const ScRangeData* pExistingData = GetRangeName()->findByUpperName(itr->GetUpperName()); - if (pExistingData) - { - sal_uInt16 nOldIndex = itr->GetIndex(); -diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx -index 3614896..eb5ab56 100644 ---- a/sc/source/core/tool/interpr1.cxx -+++ b/sc/source/core/tool/interpr1.cxx -@@ -6628,7 +6628,7 @@ void ScInterpreter::ScIndirect() - if (!pNames) - break; - -- ScRangeData* pData = pNames->findByName(sRefStr); -+ ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->upper(sRefStr)); - if (!pData) - break; - -diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx -index 35c00dc..b648d1a 100644 ---- a/sc/source/core/tool/rangenam.cxx -+++ b/sc/source/core/tool/rangenam.cxx -@@ -682,17 +682,6 @@ public: - } - }; - --class MatchByName : public unary_function --{ -- const OUString& mrName; --public: -- MatchByName(const OUString& rName) : mrName(rName) {} -- bool operator() (const ScRangeData& r) const -- { -- return mrName.equals(r.GetName()); -- } --}; -- - class MatchByUpperName : public unary_function - { - const OUString& mrName; -@@ -760,20 +749,6 @@ const ScRangeData* ScRangeName::findByRange(const ScRange& rRange) const - return itr == maData.end() ? NULL : &(*itr); - } - --ScRangeData* ScRangeName::findByName(const OUString& rName) --{ -- DataType::iterator itr = std::find_if( -- maData.begin(), maData.end(), MatchByName(rName)); -- return itr == maData.end() ? NULL : &(*itr); --} -- --const ScRangeData* ScRangeName::findByName(const OUString& rName) const --{ -- DataType::const_iterator itr = std::find_if( -- maData.begin(), maData.end(), MatchByName(rName)); -- return itr == maData.end() ? NULL : &(*itr); --} -- - ScRangeData* ScRangeName::findByUpperName(const OUString& rName) - { - DataType::iterator itr = std::find_if( -diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx -index 72bd8d6..dca1413 100644 ---- a/sc/source/core/tool/rangeutl.cxx -+++ b/sc/source/core/tool/rangeutl.cxx -@@ -288,8 +288,9 @@ sal_Bool ScRangeUtil::MakeRangeFromName ( - - if( eScope==RUTL_NAMES ) - { -+ rtl::OUString aName(rName); - const ScRangeName& rRangeNames = *pDoc->GetRangeName(); -- const ScRangeData* pData = rRangeNames.findByName(rName); -+ const ScRangeData* pData = rRangeNames.findByUpperName(ScGlobal::pCharClass->upper(aName)); - if (pData) - { - String aStrArea; -diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx -index 7ebe5e1..b0e15d3 100644 ---- a/sc/source/filter/html/htmlimp.cxx -+++ b/sc/source/filter/html/htmlimp.cxx -@@ -209,7 +209,7 @@ void ScHTMLImport::WriteToDocument( - if( pTable->GetTableName().Len() ) - { - String aName( ScfTools::GetNameFromHTMLName( pTable->GetTableName() ) ); -- if (!mpDoc->GetRangeName()->findByName(aName)) -+ if (!mpDoc->GetRangeName()->findByUpperName(ScGlobal::pCharClass->upper(aName))) - InsertRangeName( mpDoc, aName, aNewRange ); - } - } -@@ -239,7 +239,7 @@ String ScHTMLImport::GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrig - while( bLoop ) - { - aToken = ScfTools::GetNameFromHTMLIndex( nIndex++ ); -- const ScRangeData* pRangeData = pRangeNames->findByName(aToken); -+ const ScRangeData* pRangeData = pRangeNames->findByUpperName(ScGlobal::pCharClass->upper(aToken)); - if (pRangeData) - { - ScRange aRange; -diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx -index f2baf3d..9b652b6 100644 ---- a/sc/source/filter/rtf/eeimpars.cxx -+++ b/sc/source/filter/rtf/eeimpars.cxx -@@ -404,7 +404,7 @@ void ScEEImport::WriteToDocument( sal_Bool bSizeColsRows, double nOutputFactor, - bHasGraphics |= GraphicSize( nCol, nRow, nTab, pE ); - if ( pE->pName ) - { // Anchor Name => RangeName -- if (!pRangeNames->findByName(*pE->pName)) -+ if (!pRangeNames->findByUpperName(ScGlobal::pCharClass->upper(*pE->pName))) - { - ScRangeData* pData = new ScRangeData( mpDoc, *pE->pName, - ScAddress( nCol, nRow, nTab ) ); -diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx -index 514e27a..90955d3 100644 ---- a/sc/source/filter/xml/xmlexprt.cxx -+++ b/sc/source/filter/xml/xmlexprt.cxx -@@ -3771,7 +3771,7 @@ void ScXMLExport::WriteNamedExpressions(const com::sun::star::uno::Reference getReferencePosition(), pDoc, FormulaGrammar::CONV_OOO, ' ', sal_False, SCA_ABS_3D ); - AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, sOUBaseCellAddress); - -- const ScRangeData* pNamedRange = pNamedRanges->findByName(sOUName); -+ const ScRangeData* pNamedRange = pNamedRanges->findByUpperName(ScGlobal::pCharClass->upper(sOUName) ); - String sContent; - pNamedRange->GetSymbol(sContent, pDoc->GetStorageGrammar()); - rtl::OUString sOUTempContent(sContent); -diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx -index 6d043fc..6d8cbbe 100644 ---- a/sc/source/filter/xml/xmlimprt.cxx -+++ b/sc/source/filter/xml/xmlimprt.cxx -@@ -2796,7 +2796,7 @@ public: - if ( nUnoType & sheet::NamedRangeFlag::ROW_HEADER ) nNewType |= RT_ROWHEADER; - - -- if (mpDoc && !mrRangeName.findByName(r.sName)) -+ if (mpDoc && !mrRangeName.findByUpperName(ScGlobal::pCharClass->upper(r.sName))) - { - // Insert a new name. - ScAddress aPos; -diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx -index 4f377ef..c516dc4 100644 ---- a/sc/source/ui/app/inputwin.cxx -+++ b/sc/source/ui/app/inputwin.cxx -@@ -1676,7 +1676,7 @@ void ScPosWnd::DoEnter() - { - ScRangeName* pNames = pDoc->GetRangeName(); - ScRange aSelection; -- if ( pNames && !pNames->findByName(aText) && -+ if ( pNames && !pNames->findByUpperName(ScGlobal::pCharClass->upper(aText)) && - (pViewData->GetSimpleArea( aSelection ) == SC_MARK_SIMPLE) ) - { - ScRangeName aNewRanges( *pNames ); -diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx -index e2be816..398a674 100644 ---- a/sc/source/ui/docshell/arealink.cxx -+++ b/sc/source/ui/docshell/arealink.cxx -@@ -210,7 +210,7 @@ sal_Bool ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const S - sal_uInt16 nPos; - if (pNames) // benannte Bereiche - { -- const ScRangeData* p = pNames->findByName(rAreaName); -+ const ScRangeData* p = pNames->findByUpperName(ScGlobal::pCharClass->upper(rAreaName)); - if (p && p->IsValidReference(rRange)) - bFound = true; - } -diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx -index 24e4517..c4df591 100644 ---- a/sc/source/ui/docshell/docfunc.cxx -+++ b/sc/source/ui/docshell/docfunc.cxx -@@ -4570,7 +4570,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList, - ScRange( nX1, nY1, nTab, nX2, nY2, nTab ).Format( aContent, SCR_ABS_3D, pDoc ); - - bool bInsert = false; -- ScRangeData* pOld = rList.findByName(aName); -+ ScRangeData* pOld = rList.findByUpperName(ScGlobal::pCharClass->upper(aName)); - if (pOld) - { - String aOldStr; -diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx -index 0d8ea68..c25b1d7 100644 ---- a/sc/source/ui/docshell/docsh4.cxx -+++ b/sc/source/ui/docshell/docsh4.cxx -@@ -2106,7 +2106,7 @@ long ScDocShell::DdeSetData( const String& rItem, - ScRangeName* pRange = aDocument.GetRangeName(); - if( pRange ) - { -- const ScRangeData* pData = pRange->findByName(aPos); -+ const ScRangeData* pData = pRange->findByUpperName(ScGlobal::pCharClass->upper(aPos)); - if (pData) - { - if( pData->HasType( RT_REFAREA ) -diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx -index 901810b..f6a51a9 100644 ---- a/sc/source/ui/docshell/impex.cxx -+++ b/sc/source/ui/docshell/impex.cxx -@@ -175,7 +175,7 @@ ScImportExport::ScImportExport( ScDocument* p, const String& rPos ) - ScRangeName* pRange = pDoc->GetRangeName(); - if( pRange ) - { -- const ScRangeData* pData = pRange->findByName(aPos); -+ const ScRangeData* pData = pRange->findByUpperName(ScGlobal::pCharClass->upper(aPos)); - if (pData) - { - if( pData->HasType( RT_REFAREA ) -diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx -index 066d8dc..4dd0771 100644 ---- a/sc/source/ui/docshell/servobj.cxx -+++ b/sc/source/ui/docshell/servobj.cxx -@@ -54,7 +54,7 @@ sal_Bool lcl_FillRangeFromName( ScRange& rRange, ScDocShell* pDocSh, const Strin - ScRangeName* pNames = pDoc->GetRangeName(); - if (pNames) - { -- const ScRangeData* pData = pNames->findByName(rName); -+ const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->upper(rName)); - if (pData) - { - if ( pData->IsValidReference( rRange ) ) -diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx -index 157c316..9bd5436 100644 ---- a/sc/source/ui/namedlg/namedlg.cxx -+++ b/sc/source/ui/namedlg/namedlg.cxx -@@ -246,7 +246,7 @@ void ScNameDlg::SetActive() - - void ScNameDlg::UpdateChecks() - { -- const ScRangeData* pData = mpCurRangeName->findByName(aEdName.GetText()); -+ const ScRangeData* pData = mpCurRangeName->findByUpperName(ScGlobal::pCharClass->upper(aEdName.GetText())); - if (pData) - { - aBtnCriteria .Check( pData->HasType( RT_CRITERIA ) ); -@@ -437,7 +437,7 @@ bool ScNameDlg::AddPushed() - void ScNameDlg::RemovePushed() - { - const String aStrEntry = aEdName.GetText(); -- ScRangeData* pData = mpCurRangeName->findByName(aStrEntry); -+ ScRangeData* pData = mpCurRangeName->findByUpperName(ScGlobal::pCharClass->upper(aStrEntry)); - if (pData) - { - String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY ); -@@ -482,7 +482,7 @@ void ScNameDlg::OKPushed() - - void ScNameDlg::NameSelected() - { -- ScRangeData* pData = mpCurRangeName->findByName(aEdName.GetText()); -+ ScRangeData* pData = mpCurRangeName->findByUpperName(ScGlobal::pCharClass->upper(aEdName.GetText())); - if (pData) - { - String aSymbol; -diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx -index 8fc3dca..5b8ee82 100644 ---- a/sc/source/ui/navipi/content.cxx -+++ b/sc/source/ui/navipi/content.cxx -@@ -1005,7 +1005,7 @@ sal_Bool lcl_GetRange( ScDocument* pDoc, sal_uInt16 nType, const String& rName, - ScRangeName* pList = pDoc->GetRangeName(); - if (pList) - { -- const ScRangeData* p = pList->findByName(rName); -+ const ScRangeData* p = pList->findByUpperName(ScGlobal::pCharClass->upper(rName)); - if (p && p->IsValidReference(rRange)) - bFound = true; - } -diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx -index baae085..aede0ad 100644 ---- a/sc/source/ui/unoobj/nameuno.cxx -+++ b/sc/source/ui/unoobj/nameuno.cxx -@@ -129,7 +129,7 @@ ScRangeData* ScNamedRangeObj::GetRangeData_Impl() - ScRangeName* pNames = pDocShell->GetDocument()->GetRangeName(); - if (pNames) - { -- pRet = pNames->findByName(aName); -+ pRet = pNames->findByUpperName(ScGlobal::pCharClass->upper(aName)); - if (pRet) - pRet->ValidateTabRefs(); // adjust relative tab refs to valid tables - } -@@ -151,7 +151,7 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* p - if (!pNames) - return; - -- const ScRangeData* pOld = pNames->findByName(aName); -+ const ScRangeData* pOld = pNames->findByUpperName(ScGlobal::pCharClass->upper(aName)); - if (!pOld) - return; - -@@ -563,7 +563,7 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName, - { - ScDocument* pDoc = pDocShell->GetDocument(); - ScRangeName* pNames = pDoc->GetRangeName(); -- if (pNames && !pNames->findByName(aName)) -+ if (pNames && !pNames->findByUpperName(ScGlobal::pCharClass->upper(aName))) - { - ScRangeName* pNewRanges = new ScRangeName( *pNames ); - // GRAM_PODF_A1 for API compatibility. -@@ -624,7 +624,7 @@ void SAL_CALL ScNamedRangesObj::removeByName( const rtl::OUString& aName ) - ScRangeName* pNames = pDocShell->GetDocument()->GetRangeName(); - if (pNames) - { -- const ScRangeData* pData = pNames->findByName(aName); -+ const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->upper(aName)); - if (pData && lcl_UserVisibleName(*pData)) - { - ScRangeName* pNewRanges = new ScRangeName(*pNames); -@@ -786,7 +786,7 @@ sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const rtl::OUString& aName ) - ScRangeName* pNames = pDocShell->GetDocument()->GetRangeName(); - if (pNames) - { -- const ScRangeData* pData = pNames->findByName(aName); -+ const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->upper(aName)); - if (pData && lcl_UserVisibleName(*pData)) - return sal_True; - } -diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx -index a5670d7..191f620 100644 ---- a/sc/source/ui/vba/vbarange.cxx -+++ b/sc/source/ui/vba/vbarange.cxx -@@ -1184,7 +1184,7 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S - ScRangeName* pRangeName = pDoc->GetRangeName(nCurTab); - if (pRangeName) - { -- bLocalName = pRangeName->findByName(sAddress) != NULL; -+ bLocalName = pRangeName->findByUpperName(ScGlobal::pCharClass->upper(sAddress)) != NULL; - // TODO: Handle local names correctly. - (void)bLocalName; - } -diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx -index 9a8587c..f0f05b1 100644 ---- a/sc/source/ui/view/viewfunc.cxx -+++ b/sc/source/ui/view/viewfunc.cxx -@@ -2937,7 +2937,7 @@ sal_Bool ScViewFunc::InsertName( const String& rName, const String& rSymbol, - pDoc->CompileNameFormula( sal_True ); // CreateFormulaString - - // Eintrag bereits vorhanden? Dann vorher entfernen (=Aendern) -- ScRangeData* pData = pList->findByName(rName); -+ ScRangeData* pData = pList->findByUpperName(ScGlobal::pCharClass->upper(rName)); - if (pData) - { // alten Index uebernehmen - pNewEntry->SetIndex(pData->GetIndex()); --- -1.7.7.6 - diff --git a/0002-odbc-64-bit-crash-correct-buffer-length-allocation-f.patch b/0002-odbc-64-bit-crash-correct-buffer-length-allocation-f.patch deleted file mode 100644 index 1ebf792..0000000 --- a/0002-odbc-64-bit-crash-correct-buffer-length-allocation-f.patch +++ /dev/null @@ -1,29 +0,0 @@ -From adb1ed5f13b4638690ca2966138eb2c61bdb1b53 Mon Sep 17 00:00:00 2001 -From: Lionel Elie Mamane -Date: Tue, 14 Feb 2012 14:54:03 +0100 -Subject: [PATCH 2/2] odbc 64 bit crash: correct buffer length allocation for - a SQLLEN - -(cherry picked from commit 84d21e4de26bd69f7ca5b10f2c72779f07e11347) - -Signed-off-by: Michael Stahl ---- - connectivity/source/inc/odbc/OBoundParam.hxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx -index 5817aac..b8856e9 100644 ---- a/connectivity/source/inc/odbc/OBoundParam.hxx -+++ b/connectivity/source/inc/odbc/OBoundParam.hxx -@@ -68,7 +68,7 @@ namespace connectivity - // to a Java sal_Int32. The jdbcodbc 'C' bridge provides an - // interface to do this. - -- paramLength = new sal_Int8[4]; -+ paramLength = new sal_Int8[sizeof(SQLLEN)]; - } - - //-------------------------------------------------------------------- --- -1.7.7.6 - diff --git a/0002-restore-special-DATE-handling-code-for-SbxValue-Comp.patch b/0002-restore-special-DATE-handling-code-for-SbxValue-Comp.patch deleted file mode 100644 index 40b1cac..0000000 --- a/0002-restore-special-DATE-handling-code-for-SbxValue-Comp.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 726344abbbec4beab5525c7890a360f9877d1ffa Mon Sep 17 00:00:00 2001 -From: Noel Power -Date: Thu, 12 Jan 2012 15:46:52 +0000 -Subject: [PATCH 2/8] restore special DATE handling code for SbxValue::Compute - fdo#44385 - -restore code that seemed to be erroneously moved as part of the currency enhancement feature ---- - basic/source/sbx/sbxvalue.cxx | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx -index e21234c..6d9d718 100644 ---- a/basic/source/sbx/sbxvalue.cxx -+++ b/basic/source/sbx/sbxvalue.cxx -@@ -1311,9 +1311,6 @@ Lbl_OpIsDouble: - else aL.nDouble /= aR.nDouble; break; - case SbxPLUS: - aL.nDouble += aR.nDouble; break; -- // #45465 Date needs with "+" a special handling: forces date type -- if( GetType() == SbxDATE || rOp.GetType() == SbxDATE ) -- aL.eType = SbxDATE; - case SbxMINUS: - aL.nDouble -= aR.nDouble; break; - case SbxNEG: -@@ -1321,6 +1318,9 @@ Lbl_OpIsDouble: - default: - SetError( SbxERR_NOTIMP ); - } -+ // #45465 Date needs with "+" a special handling: forces date type -+ if( Op == SbxPLUS && (GetType() == SbxDATE || rOp.GetType() == SbxDATE ) -+ aL.eType = SbxDATE; - - } - } --- -1.7.7.6 - diff --git a/0003-Fixed-apparent-typos.patch b/0003-Fixed-apparent-typos.patch deleted file mode 100644 index ee0031c..0000000 --- a/0003-Fixed-apparent-typos.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1a3533da32df2217e389c3f7c97cb642427d864b Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Fri, 13 Jan 2012 11:25:49 +0100 -Subject: [PATCH 3/8] Fixed apparent typos. - ---- - basic/source/sbx/sbxvalue.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx -index 6d9d718..6448158 100644 ---- a/basic/source/sbx/sbxvalue.cxx -+++ b/basic/source/sbx/sbxvalue.cxx -@@ -1319,7 +1319,7 @@ Lbl_OpIsDouble: - SetError( SbxERR_NOTIMP ); - } - // #45465 Date needs with "+" a special handling: forces date type -- if( Op == SbxPLUS && (GetType() == SbxDATE || rOp.GetType() == SbxDATE ) -+ if( eOp == SbxPLUS && (GetType() == SbxDATE || rOp.GetType() == SbxDATE ) ) - aL.eType = SbxDATE; - - } --- -1.7.7.6 - diff --git a/0003-fdo-35661-fix-sw.SwXViewSettings-com-sun-star-text-V.patch b/0003-fdo-35661-fix-sw.SwXViewSettings-com-sun-star-text-V.patch deleted file mode 100644 index 2ad61b9..0000000 --- a/0003-fdo-35661-fix-sw.SwXViewSettings-com-sun-star-text-V.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1f5f826f54684f8f19e69408cffa04cf25b5ad72 Mon Sep 17 00:00:00 2001 -From: Bjoern Michaelsen -Date: Tue, 7 Feb 2012 17:15:03 +0000 -Subject: [PATCH 3/4] fdo#35661: fix - sw.SwXViewSettings::com::sun::star::text::ViewSettings - -Signed-off-by: Noel Power ---- - sw/qa/unoapi/knownissues.xcl | 3 --- - sw/source/ui/uno/unomod.cxx | 2 ++ - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/sw/qa/unoapi/knownissues.xcl b/sw/qa/unoapi/knownissues.xcl -index 3cea081..a9315fe 100644 ---- a/sw/qa/unoapi/knownissues.xcl -+++ b/sw/qa/unoapi/knownissues.xcl -@@ -188,8 +188,5 @@ sw.SwXTextViewCursor::com::sun::star::view::XScreenCursor - ### fd#35660 ### - sw.DocumentSettings::com::sun::star::text::PrintSettings - --### fd#35661 ### --sw.SwXViewSettings::com::sun::star::text::ViewSettings -- - ### fd#35662 ### - sw.SwXPrintSettings::com::sun::star::text::PrintSettings -diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx -index 8139a07..fd32cc5 100644 ---- a/sw/source/ui/uno/unomod.cxx -+++ b/sw/source/ui/uno/unomod.cxx -@@ -748,6 +748,8 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c - aOpt.setBrowseMode( bVal ); - pView->GetWrtShell().ApplyViewOptions( aOpt ); - pView->RecheckBrowseMode(); -+ if(mpViewOption) -+ mpViewOption->setBrowseMode(bVal); - } - } - break; --- -1.7.7.6 - diff --git a/0003-fdo-38542-sw-ODF-import-divide-width-by-3-for-double.patch b/0003-fdo-38542-sw-ODF-import-divide-width-by-3-for-double.patch deleted file mode 100644 index 50c4529..0000000 --- a/0003-fdo-38542-sw-ODF-import-divide-width-by-3-for-double.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8e184c376ce77b3c27d7a2722b15b8f36de71ea5 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Wed, 25 Jan 2012 17:44:36 +0100 -Subject: [PATCH 3/4] fdo#38542: sw: ODF import: divide width by 3 for - "double" borders -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The problem is that the width from the fo:border{,-left,-right,-top,-bottom} -attributes is effectively tripled for "double" borders. - -Signed-off-by: Cédric Bosdonnat -Signed-off-by: Noel Power ---- - sw/source/filter/xml/xmlithlp.cxx | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx -index 6a50937..7946b81 100644 ---- a/sw/source/filter/xml/xmlithlp.cxx -+++ b/sw/source/filter/xml/xmlithlp.cxx -@@ -212,6 +212,10 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, - rpLine->GetOutWidth(); - - rpLine->SetWidth( nWidth ); -+ if (bDouble) -+ { // fdo#38542: divide width by 3 for outer line, gap, inner line -+ rpLine->ScaleMetrics(1, 3); -+ } - } - lcl_frmitems_setXMLBorderStyle( *rpLine, nStyle ); - } --- -1.7.7.6 - diff --git a/0003-fdo-41712-sw-remove-superfluous-flag.patch b/0003-fdo-41712-sw-remove-superfluous-flag.patch deleted file mode 100644 index fd9f9b1..0000000 --- a/0003-fdo-41712-sw-remove-superfluous-flag.patch +++ /dev/null @@ -1,176 +0,0 @@ -From 4c36086e3a8b546d906e0dd9f0472abd7013852e Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Mon, 13 Feb 2012 18:36:28 +0100 -Subject: [PATCH 3/3] fdo#41712: sw: remove superfluous flag: -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This removes SwFlowFrm::bIsFollow, which is pointless duplication of -m_pPrecede; this fixes lots of assertions (probably some real problem as -well). - -Signed-off-by: Cédric Bosdonnat ---- - sw/source/core/frmedt/tblsel.cxx | 2 +- - sw/source/core/inc/flowfrm.hxx | 4 +--- - sw/source/core/layout/flowfrm.cxx | 2 +- - sw/source/core/layout/laycache.cxx | 1 - - sw/source/core/layout/sectfrm.cxx | 9 --------- - sw/source/core/layout/ssfrm.cxx | 3 --- - sw/source/core/layout/tabfrm.cxx | 1 - - sw/source/core/text/frmform.cxx | 1 - - 8 files changed, 3 insertions(+), 20 deletions(-) - -diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx -index 34fd69d..4397073 100644 ---- a/sw/source/core/frmedt/tblsel.cxx -+++ b/sw/source/core/frmedt/tblsel.cxx -@@ -2250,7 +2250,7 @@ void _FndBox::SetTableLines( const SwTable &rTable ) - - inline void UnsetFollow( SwFlowFrm *pTab ) - { -- pTab->bIsFollow = sal_False; -+ pTab->m_pPrecede = 0; - } - - void _FndBox::DelFrms( SwTable &rTable ) -diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx -index 9617988..8facb39 100644 ---- a/sw/source/core/inc/flowfrm.hxx -+++ b/sw/source/core/inc/flowfrm.hxx -@@ -117,7 +117,6 @@ protected: - SwFlowFrm *m_pFollow; - SwFlowFrm *m_pPrecede; - -- sal_Bool bIsFollow :1; //Ist's ein Follow - sal_Bool bLockJoin :1; //Join (und damit deleten) verboten wenn sal_True! - sal_Bool bUndersized:1; // wir sind kleiner als gewuenscht - sal_Bool bFtnAtEnd :1; // For sectionfrms only: footnotes at the end of section -@@ -168,8 +167,7 @@ public: - void MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling = 0 ); - - sal_Bool HasFollow() const { return m_pFollow ? sal_True : sal_False; } -- sal_Bool IsFollow() const { return bIsFollow; } -- inline void _SetIsFollow( sal_Bool bSet ) { bIsFollow = bSet; } -+ sal_Bool IsFollow() const { return 0 != m_pPrecede; } - const SwFlowFrm *GetFollow() const { return m_pFollow; } - SwFlowFrm *GetFollow() { return m_pFollow; } - sal_Bool IsAnFollow( const SwFlowFrm *pFlow ) const; -diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx -index c5e083f..5b4a588 100644 ---- a/sw/source/core/layout/flowfrm.cxx -+++ b/sw/source/core/layout/flowfrm.cxx -@@ -84,7 +84,7 @@ SwFlowFrm::SwFlowFrm( SwFrm &rFrm ) : - m_pFollow( 0 ), - m_pPrecede( 0 ) - { -- bLockJoin = bIsFollow = bCntntLock = bOwnFtnNum = -+ bLockJoin = bCntntLock = bOwnFtnNum = - bFtnLock = bFlyLock = sal_False; - } - -diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx -index 850e38b..61b40ce 100644 ---- a/sw/source/core/layout/laycache.cxx -+++ b/sw/source/core/layout/laycache.cxx -@@ -934,7 +934,6 @@ sal_Bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex ) - { - SwTxtFrm *pNew = new SwTxtFrm( ((SwTxtFrm*)rpFrm)-> - GetTxtNode(), rpFrm ); -- pNew->_SetIsFollow( sal_True ); - pNew->ManipOfst( nOfst ); - pNew->SetFollow( ((SwTxtFrm*)rpFrm)->GetFollow() ); - ((SwTxtFrm*)rpFrm)->SetFollow( pNew ); -diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx -index eee5a68..60e6d2d 100644 ---- a/sw/source/core/layout/sectfrm.cxx -+++ b/sw/source/core/layout/sectfrm.cxx -@@ -102,15 +102,11 @@ SwSectionFrm::SwSectionFrm( SwSectionFrm &rSect, sal_Bool bMaster ) : - { - SwSectionFrm* pMaster = rSect.FindMaster(); - pMaster->SetFollow( this ); -- bIsFollow = sal_True; - } -- else -- rSect.bIsFollow = sal_True; - SetFollow( &rSect ); - } - else - { -- bIsFollow = sal_True; - SetFollow( rSect.GetFollow() ); - rSect.SetFollow( this ); - if( !GetFollow() ) -@@ -171,7 +167,6 @@ SwSectionFrm::~SwSectionFrm() - else if( HasFollow() ) - { - PROTOCOL( this, PROT_SECTION, ACT_DEL_MASTER, GetFollow() ) -- GetFollow()->bIsFollow = sal_False; - } - } - } -@@ -219,10 +214,7 @@ void SwSectionFrm::DelEmpty( sal_Bool bRemove ) - // freigeben, deshalb wird die Size des Masters invalidiert. - if( !GetFollow() && !pMaster->IsColLocked() ) - pMaster->InvalidateSize(); -- bIsFollow = sal_False; - } -- else if( HasFollow() ) -- GetFollow()->bIsFollow = sal_False; - SetFollow(0); - if( pUp ) - { -@@ -506,7 +498,6 @@ void SwSectionFrm::MergeNext( SwSectionFrm* pNxt ) - } - SetFollow( pNxt->GetFollow() ); - pNxt->SetFollow( NULL ); -- pNxt->bIsFollow = sal_False; - pNxt->Cut(); - delete pNxt; - InvalidateSize(); -diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx -index b2dc389..6ac8bc7 100644 ---- a/sw/source/core/layout/ssfrm.cxx -+++ b/sw/source/core/layout/ssfrm.cxx -@@ -523,13 +523,10 @@ void SwCntntFrm::DelFrms( const SwCntntNode& rNode ) - } - } - // <-- -- if( pFrm->HasFollow() ) -- pFrm->GetFollow()->_SetIsFollow( pFrm->IsFollow() ); - if( pFrm->IsFollow() ) - { - SwCntntFrm* pMaster = (SwTxtFrm*)pFrm->FindMaster(); - pMaster->SetFollow( pFrm->GetFollow() ); -- pFrm->_SetIsFollow( sal_False ); - } - pFrm->SetFollow( 0 );//Damit er nicht auf dumme Gedanken kommt. - //Andernfalls kann es sein, dass ein Follow -diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx -index aaa73ca..d8a2a02 100644 ---- a/sw/source/core/layout/tabfrm.cxx -+++ b/sw/source/core/layout/tabfrm.cxx -@@ -124,7 +124,6 @@ SwTabFrm::SwTabFrm( SwTabFrm &rTab ) : - SwFlowFrm( (SwFrm&)*this ), - pTable( rTab.GetTable() ) - { -- bIsFollow = sal_True; - bLockJoin = bComplete = bONECalcLowers = bCalcLowers = bLowersFormatted = bLockBackMove = - bResizeHTMLTable = bHasFollowFlowLine = bIsRebuildLastLine = - bRestrictTableGrowth = bRemoveFollowFlowLinePending = sal_False; -diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx -index 464eab7..dd5495f 100644 ---- a/sw/source/core/text/frmform.cxx -+++ b/sw/source/core/text/frmform.cxx -@@ -701,7 +701,6 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos ) - // Damit meine Daten nicht verschwinden, locke ich mich. - SwTxtFrmLocker aLock( this ); - SwTxtFrm *pNew = (SwTxtFrm *)(GetTxtNode()->MakeFrm( this )); -- pNew->bIsFollow = sal_True; - - pNew->SetFollow( GetFollow() ); - SetFollow( pNew ); --- -1.7.7.6 - diff --git a/0003-fdo-45450-sc-ODF-export-cell-styles.patch b/0003-fdo-45450-sc-ODF-export-cell-styles.patch deleted file mode 100644 index 8312055..0000000 --- a/0003-fdo-45450-sc-ODF-export-cell-styles.patch +++ /dev/null @@ -1,39 +0,0 @@ -From aa751a108b52eee3a26deb6940cc92b498f6251a Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Wed, 1 Feb 2012 21:32:14 +0100 -Subject: [PATCH 3/3] fdo#45450: sc: ODF export: cell styles: - -Only write "style:vertical-justify" and "css3t:text-justify" in ODF -extended mode. -(regression from 7da57d17b6179e71c8b6d7549ad89eaf3a4a28c6) - -Signed-off-by: Noel Power ---- - sc/source/filter/xml/xmlstyle.cxx | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx -index bf5d8ec..2a39cdc 100644 ---- a/sc/source/filter/xml/xmlstyle.cxx -+++ b/sc/source/filter/xml/xmlstyle.cxx -@@ -93,7 +93,7 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] = - MAP( "HoriJustify", XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_TYPE_PROP_PARAGRAPH|XML_SC_TYPE_HORIJUSTIFY|MID_FLAG_MERGE_PROPERTY, 0 ), - MAP( "HoriJustify", XML_NAMESPACE_STYLE, XML_TEXT_ALIGN_SOURCE, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_HORIJUSTIFYSOURCE|MID_FLAG_MERGE_PROPERTY, 0 ), - MAP( "HoriJustify", XML_NAMESPACE_STYLE, XML_REPEAT_CONTENT, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_HORIJUSTIFYREPEAT|MID_FLAG_MERGE_PROPERTY, 0 ), -- MAP( SC_UNONAME_CELLHJUS_METHOD, XML_NAMESPACE_CSS3TEXT, XML_TEXT_JUSTIFY, XML_TYPE_PROP_PARAGRAPH|XML_SC_TYPE_HORIJUSTIFY_METHOD, 0 ), -+ MAP_EXT( SC_UNONAME_CELLHJUS_METHOD, XML_NAMESPACE_CSS3TEXT, XML_TEXT_JUSTIFY, XML_TYPE_PROP_PARAGRAPH|XML_SC_TYPE_HORIJUSTIFY_METHOD, 0 ), - MAP( "IsCellBackgroundTransparent", XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_ISTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE, 0 ), - MAP( "IsTextWrapped", XML_NAMESPACE_FO, XML_WRAP_OPTION, XML_TYPE_PROP_TABLE_CELL|XML_SC_ISTEXTWRAPPED, 0 ), - MAP( "LeftBorder", XML_NAMESPACE_FO, XML_BORDER, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_ALLBORDER ), -@@ -120,7 +120,7 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] = - MAP( "UserDefinedAttributes", XML_NAMESPACE_TEXT, XML_XMLNS, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ), - MAP( "ValidationXML", XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BUILDIN_CMP_ONLY, CTF_SC_VALIDATION ), - MAP( "VertJustify", XML_NAMESPACE_STYLE, XML_VERTICAL_ALIGN, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY, 0), -- MAP( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_STYLE, XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 0 ), -+ MAP_EXT( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_STYLE, XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 0 ), - - MAP_END() - }; --- -1.7.7.6 - diff --git a/0003-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch b/0003-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch deleted file mode 100644 index f92a617..0000000 --- a/0003-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch +++ /dev/null @@ -1,119 +0,0 @@ -From e8a321db4419be43c693d5b5d06bfda25709d2f5 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Eike Rathke -Date: Wed, 8 Feb 2012 10:42:04 -0500 -Subject: [PATCH] fix fdo#40590 stop abusing regular string token for XML - import -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------erAck-patch-parts" - -This is a multi-part message in MIME format. ---------------erAck-patch-parts -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -During XML import formulas of defined names and conditional formatting -were remembered as regular svString tokens that then later were -retrieved without quotes for compilation. This didn't go along with the -new ScRangeData::CompileUnresolvedXML() that recreates the formula -string from an already tokenized form of the formula. - -Introduced FormulaToken::AddStringXML() with ocStringXML to sort those -out and removed the IsImportingXML() hack from -FormulaCompiler::AppendString(), the ocStringXML case is handled in -FormulaCompiler::CreateStringFromToken(). - -Signed-off-by: Kohei Yoshida ---- - sc/inc/compiler.hxx | 1 - - sc/source/core/data/conditio.cxx | 12 ++++++------ - sc/source/core/tool/compiler.cxx | 4 ---- - sc/source/ui/docshell/docfunc.cxx | 4 ++-- - 4 files changed, 8 insertions(+), 13 deletions(-) - - ---------------erAck-patch-parts -Content-Type: text/x-patch; name="0002-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0002-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch" - -diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx -index 6947460..d317150 100644 ---- a/sc/inc/compiler.hxx -+++ b/sc/inc/compiler.hxx -@@ -542,7 +542,6 @@ private: - virtual void CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer, formula::FormulaToken* _pTokenP); - virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); - virtual void LocalizeString( String& rName ); // modify rName - input: exact name -- virtual sal_Bool IsImportingXML() const; - - /// Access the CharTable flags - inline sal_uLong GetCharTableFlags( sal_Unicode c, sal_Unicode cLast ) -diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx -index 642c39b..f3571c5 100644 ---- a/sc/source/core/data/conditio.cxx -+++ b/sc/source/core/data/conditio.cxx -@@ -316,10 +316,10 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2, - aComp.SetGrammar( eGrammar1 ); - if ( pDoc->IsImportingXML() && !bTextToReal ) - { -- // temporary formula string as string tokens -- //! merge with lcl_ScDocFunc_CreateTokenArrayXML -+ // temporary formula string as string tokens -+ //! merge with lcl_ScDocFunc_CreateTokenArrayXML - pFormula1 = new ScTokenArray; -- pFormula1->AddString( rExpr1 ); -+ pFormula1->AddStringXML( rExpr1 ); - // bRelRef1 is set when the formula is compiled again (CompileXML) - } - else -@@ -353,10 +353,10 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2, - aComp.SetGrammar( eGrammar2 ); - if ( pDoc->IsImportingXML() && !bTextToReal ) - { -- // temporary formula string as string tokens -- //! merge with lcl_ScDocFunc_CreateTokenArrayXML -+ // temporary formula string as string tokens -+ //! merge with lcl_ScDocFunc_CreateTokenArrayXML - pFormula2 = new ScTokenArray; -- pFormula2->AddString( rExpr2 ); -+ pFormula2->AddStringXML( rExpr2 ); - // bRelRef2 is set when the formula is compiled again (CompileXML) - } - else -diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx -index a4938f1..542b1d0 100644 ---- a/sc/source/core/tool/compiler.cxx -+++ b/sc/source/core/tool/compiler.cxx -@@ -5123,10 +5123,6 @@ void ScCompiler::LocalizeString( String& rName ) - ScGlobal::GetAddInCollection()->LocalizeString( rName ); - } - // ----------------------------------------------------------------------------- --sal_Bool ScCompiler::IsImportingXML() const --{ -- return pDoc->IsImportingXML(); --} - - // Put quotes around string if non-alphanumeric characters are contained, - // quote characters contained within are escaped by '\\'. -diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx -index c4df591..9349da8 100644 ---- a/sc/source/ui/docshell/docfunc.cxx -+++ b/sc/source/ui/docshell/docfunc.cxx -@@ -1008,9 +1008,9 @@ sal_Bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngi - ScTokenArray* lcl_ScDocFunc_CreateTokenArrayXML( const String& rText, const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) - { - ScTokenArray* pCode = new ScTokenArray; -- pCode->AddString( rText ); -+ pCode->AddStringXML( rText ); - if( (eGrammar == formula::FormulaGrammar::GRAM_EXTERNAL) && (rFormulaNmsp.Len() > 0) ) -- pCode->AddString( rFormulaNmsp ); -+ pCode->AddStringXML( rFormulaNmsp ); - return pCode; - } - - ---------------erAck-patch-parts-- - - diff --git a/0003-resolved-fdo-45032-Calc-export-to-HTML-with-graphics.patch b/0003-resolved-fdo-45032-Calc-export-to-HTML-with-graphics.patch deleted file mode 100644 index 60da138..0000000 --- a/0003-resolved-fdo-45032-Calc-export-to-HTML-with-graphics.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 12f883d3601bb695e589ab8b570d81d789c4bf64 Mon Sep 17 00:00:00 2001 -From: Eike Rathke -Date: Sun, 22 Jan 2012 20:13:36 +0100 -Subject: [PATCH 3/5] resolved fdo#45032 Calc export to HTML with graphics - failed - -Fixed a misconception in transition from List to to ptr_vector of commit -db599f64e63a3141159b7f0e59783197c39b3e02, List::Next() returned NULL when at -end of list, mimic that. - -Signed-off-by: Kohei Yoshida ---- - sc/source/filter/html/htmlexp.cxx | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx -index 772b72b..34e994b 100644 ---- a/sc/source/filter/html/htmlexp.cxx -+++ b/sc/source/filter/html/htmlexp.cxx -@@ -829,11 +829,14 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) - size_t ListSize = aGraphList.size(); - for ( size_t i = 0; i < ListSize; ++i ) - { -- pGraphEntry = &aGraphList[ i ]; -- if ( pGraphEntry->bInCell && pGraphEntry->aRange.In( aPos ) ) -+ ScHTMLGraphEntry* pE = &aGraphList[ i ]; -+ if ( pE->bInCell && pE->aRange.In( aPos ) ) - { -- if ( pGraphEntry->aRange.aStart == aPos ) -+ if ( pE->aRange.aStart == aPos ) -+ { -+ pGraphEntry = pE; - break; // for -+ } - else - return ; // ist ein Col/RowSpan, Overlapped - } --- -1.7.7.6 - diff --git a/0004-WaE-signed-unsigned-error.patch b/0004-WaE-signed-unsigned-error.patch deleted file mode 100644 index 41a2cbf..0000000 --- a/0004-WaE-signed-unsigned-error.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1bdf3ff2b4499a08c62c43e7698038c07489a9d0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 22 Sep 2011 17:25:00 +0100 -Subject: [PATCH 4/5] WaE: signed/unsigned error - -Signed-off-by: Stephan Bergmann ---- - vcl/source/glyphs/graphite_layout.cxx | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx -index 5238609..4123414 100644 ---- a/vcl/source/glyphs/graphite_layout.cxx -+++ b/vcl/source/glyphs/graphite_layout.cxx -@@ -329,7 +329,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, ImplLayoutArgs &rArgs, float fSc - float leftBoundary = gr_slot_origin_X(clusterFirst); - float rightBoundary = (clusterAfter)? - gr_slot_origin_X(clusterAfter) : gr_seg_advance_X(pSegment); -- size_t bFirstChar = gr_cinfo_base(gr_seg_cinfo(pSegment, nFirstCharInCluster)); -+ int bFirstChar = gr_cinfo_base(gr_seg_cinfo(pSegment, nFirstCharInCluster)); - if (mnSegCharOffset + bFirstChar >= mnMinCharPos && - mnSegCharOffset + bFirstChar < mnEndCharPos) - { -@@ -339,7 +339,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, ImplLayoutArgs &rArgs, float fSc - { - for (int i = nFirstCharInCluster; i <= nLastCharInCluster; i++) - { -- size_t ibase = gr_cinfo_base(gr_seg_cinfo(pSegment, i)); -+ int ibase = gr_cinfo_base(gr_seg_cinfo(pSegment, i)); - if (mnSegCharOffset + ibase >= mnEndCharPos) - break; - // from the point of view of the dx array, the xpos is --- -1.7.7.6 - diff --git a/0004-connectivity-fdo-43479-fix-crash-on-DISTINCT.patch b/0004-connectivity-fdo-43479-fix-crash-on-DISTINCT.patch deleted file mode 100644 index a93f823..0000000 --- a/0004-connectivity-fdo-43479-fix-crash-on-DISTINCT.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 9cd5a1b11f2f5f69d674f0b0e44352d96518013e Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Thu, 19 Jan 2012 15:25:07 +0100 -Subject: [PATCH 4/8] connectivity: fdo#43479: fix crash on DISTINCT: - -Since commit f89f2b8bf506de0cc547ad596c75cbe1a0cf1ef1, -OResultSet::sortRows() works on the rows after SELECT, not on full rows. -So OResultSet::OpenImpl() has to be adapted to not use the mapping from -selected columns to entries rows in m_aColMapping any more; instead, -use the given ORDER BY clause for sorting. -But first extend the sort order to cover all columns, so it is no longer -necessary to call sortRows twice (this should be legal, because SQL says -the order of rows that are equal in ORDER BY columns is unspecified). - -Signed-off-by: Lionel Elie Mamane ---- - connectivity/source/drivers/file/FResultSet.cxx | 48 ++++++++--------------- - 1 files changed, 17 insertions(+), 31 deletions(-) - -diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx -index 71d2f3e..26baffe 100644 ---- a/connectivity/source/drivers/file/FResultSet.cxx -+++ b/connectivity/source/drivers/file/FResultSet.cxx -@@ -1441,26 +1441,29 @@ sal_Bool OResultSet::OpenImpl() - else - { - sal_Bool bDistinct = sal_False; -- sal_Bool bWasSorted = sal_False; - OSQLParseNode *pDistinct = m_pParseTree->getChild(1); -- ::std::vector aOrderbyColumnNumberSave; -- ::std::vector aOrderbyAscendingSave; - -+ assert(m_aOrderbyColumnNumber.size() == -+ m_aOrderbyAscending.size()); - if (pDistinct && pDistinct->getTokenID() == SQL_TOKEN_DISTINCT ) - { -- // Sort on all columns, saving original order for later -- if(IsSorted()) -+ // To eliminate duplicates we need to sort on all columns. -+ // This is not a problem because the SQL spec says that the -+ // order of columns that are not specified in ORDER BY -+ // clause is undefined, so it doesn't hurt to sort on -+ // these; pad the vectors to include them. -+ for (sal_Int32 i = 1; // 0: bookmark (see setBoundedColumns) -+ static_cast(i) < m_aColMapping.size(); ++i) - { -- aOrderbyColumnNumberSave = m_aOrderbyColumnNumber; -- m_aOrderbyColumnNumber.clear(); -- aOrderbyAscendingSave.assign(m_aOrderbyAscending.begin(), m_aOrderbyAscending.end()); -- bWasSorted = sal_True; -+ if (::std::find(m_aOrderbyColumnNumber.begin(), -+ m_aOrderbyColumnNumber.end(), i) -+ == m_aOrderbyColumnNumber.end()) -+ { -+ m_aOrderbyColumnNumber.push_back(i); -+ // ASC or DESC doesn't matter -+ m_aOrderbyAscending.push_back(SQL_ASC); -+ } - } -- -- // the first column is the bookmark column -- ::std::vector::iterator aColStart = (m_aColMapping.begin()+1); -- ::std::copy(aColStart, m_aColMapping.end(),::std::back_inserter(m_aOrderbyColumnNumber)); -- m_aOrderbyAscending.assign(m_aColMapping.size()-1, SQL_ASC); - bDistinct = sal_True; - } - -@@ -1542,23 +1545,6 @@ sal_Bool OResultSet::OpenImpl() - m_pFileSet->get().erase(::std::remove_if(m_pFileSet->get().begin(),m_pFileSet->get().end(), - ::std::bind2nd(::std::equal_to(),0)) - ,m_pFileSet->get().end()); -- -- if (bWasSorted) -- { -- // Re-sort on original requested order -- m_aOrderbyColumnNumber = aOrderbyColumnNumberSave; -- m_aOrderbyAscending.assign(aOrderbyAscendingSave.begin(), aOrderbyAscendingSave.end()); -- -- TIntVector aEvaluationKeySet(m_pFileSet->get()); -- m_pEvaluationKeySet = &aEvaluationKeySet; -- sortRows(); -- } -- else -- { -- m_aOrderbyColumnNumber.clear(); -- m_aOrderbyAscending.clear(); -- ::std::sort(m_pFileSet->get().begin(),m_pFileSet->get().end()); -- } - } - } - } --- -1.7.7.6 - diff --git a/0004-fdo-38542-sw-ODF-import-prevent-border-width-overrid.patch b/0004-fdo-38542-sw-ODF-import-prevent-border-width-overrid.patch deleted file mode 100644 index bb9481b..0000000 --- a/0004-fdo-38542-sw-ODF-import-prevent-border-width-overrid.patch +++ /dev/null @@ -1,72 +0,0 @@ -From fcdf6cde90c7f9f941a5664d4b0866adcfab5db9 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Wed, 25 Jan 2012 17:56:08 +0100 -Subject: [PATCH 4/4] fdo#38542: sw: ODF import: prevent border width - overriding: -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If there is a width in fo:border{,-left,-right,-top,-bottom}, then -it should not override the values from -style:border-line-width{,-left,-right,-top,-bottom}, which are more -specific in case of "double" borders. - -Signed-off-by: Cédric Bosdonnat -Signed-off-by: Noel Power ---- - sw/source/filter/xml/xmlithlp.cxx | 37 +++++++++++++++++++++---------------- - 1 files changed, 21 insertions(+), 16 deletions(-) - -diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx -index 7946b81..6fe9072 100644 ---- a/sw/source/filter/xml/xmlithlp.cxx -+++ b/sw/source/filter/xml/xmlithlp.cxx -@@ -198,23 +198,28 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, - sal_Bool bDouble = (bHasWidth && API_LINE_DOUBLE == nStyle ) || - rpLine->GetDistance(); - -- // The width has to be changed -- if( bHasWidth && USHRT_MAX != nNamedWidth ) -+ // fdo#38542: for double borders, do not override the width -+ // set via style:border-line-width{,-left,-right,-top,-bottom} -+ if (!bDouble || !rpLine->GetWidth()) - { -- if ( bDouble ) -- rpLine->SetStyle( ::editeng::DOUBLE ); -- rpLine->SetWidth( aBorderWidths[nNamedWidth] ); -- } -- else -- { -- if( !bHasWidth ) -- nWidth = rpLine->GetInWidth() + rpLine->GetDistance() + -- rpLine->GetOutWidth(); -- -- rpLine->SetWidth( nWidth ); -- if (bDouble) -- { // fdo#38542: divide width by 3 for outer line, gap, inner line -- rpLine->ScaleMetrics(1, 3); -+ // The width has to be changed -+ if (bHasWidth && USHRT_MAX != nNamedWidth) -+ { -+ if (bDouble) -+ rpLine->SetStyle( ::editeng::DOUBLE ); -+ rpLine->SetWidth( aBorderWidths[nNamedWidth] ); -+ } -+ else -+ { -+ if (!bHasWidth) -+ nWidth = rpLine->GetInWidth() + rpLine->GetDistance() + -+ rpLine->GetOutWidth(); -+ -+ rpLine->SetWidth( nWidth ); -+ if (bDouble) -+ { // fdo#38542: divide width by 3 for outer line, gap, inner line -+ rpLine->ScaleMetrics(1, 3); -+ } - } - } - lcl_frmitems_setXMLBorderStyle( *rpLine, nStyle ); --- -1.7.7.6 - diff --git a/0004-fs34b-i117545-patch-provided-by-mathias.bauer-oracle.patch b/0004-fs34b-i117545-patch-provided-by-mathias.bauer-oracle.patch deleted file mode 100644 index 33a1bfe..0000000 --- a/0004-fs34b-i117545-patch-provided-by-mathias.bauer-oracle.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7fcb1bb88d0809c64ac4be2aa95a96a883e55af8 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Mon, 12 Sep 2011 12:19:54 +0200 -Subject: [PATCH 4/4] fs34b: #i117545# (patch provided by - mathias.bauer@oracle.com) - -Signed-off-by: Noel Power ---- - sw/source/ui/uno/unomod.cxx | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx -index fd32cc5..ff33fcf 100644 ---- a/sw/source/ui/uno/unomod.cxx -+++ b/sw/source/ui/uno/unomod.cxx -@@ -748,8 +748,13 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c - aOpt.setBrowseMode( bVal ); - pView->GetWrtShell().ApplyViewOptions( aOpt ); - pView->RecheckBrowseMode(); -+ -+ // must be set in mpViewOption as this will overwrite settings in _post! - if(mpViewOption) - mpViewOption->setBrowseMode(bVal); -+ -+ // disable multiple layout -+ pView->GetDocShell()->ToggleBrowserMode(bVal, pView ); - } - } - break; --- -1.7.7.6 - diff --git a/0004-resolved-rhbz-783556-crash-in-ScMatrix-GetDimensons-.patch b/0004-resolved-rhbz-783556-crash-in-ScMatrix-GetDimensons-.patch deleted file mode 100644 index 0311f7d..0000000 --- a/0004-resolved-rhbz-783556-crash-in-ScMatrix-GetDimensons-.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9faf077b85098436ac29b9369bfc7d8a9286fbd3 Mon Sep 17 00:00:00 2001 -From: Eike Rathke -Date: Mon, 23 Jan 2012 15:43:50 +0100 -Subject: [PATCH 4/5] resolved rhbz#783556 crash in ScMatrix::GetDimensons() - from ScInterpreter - -* Interpreter tried to access a nonexistent matrix for external reference. -* In ScInterpreter::PopExternalDoubleRef(ScMatrixRef& rMat) set error for - unexpected conditions. In caller or descendants check for error or presence - of ScMatrix. ---- - sc/source/core/tool/interpr4.cxx | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx -index 07ff54b..424c713 100644 ---- a/sc/source/core/tool/interpr4.cxx -+++ b/sc/source/core/tool/interpr4.cxx -@@ -1285,6 +1285,8 @@ ScDBRangeBase* ScInterpreter::PopDBDoubleRef() - pMat = PopMatrix(); - else - PopExternalDoubleRef(pMat); -+ if (nGlobalError) -+ break; - return new ScDBExternalRange(pDok, pMat); - } - default: -@@ -1535,7 +1537,14 @@ void ScInterpreter::PopExternalDoubleRef(ScMatrixRef& rMat) - // references, which means the array should only contain a - // single matrix token. - ScToken* p = static_cast(pArray->First()); -- rMat = p->GetMatrix(); -+ if (!p || p->GetType() != svMatrix) -+ SetError( errIllegalParameter); -+ else -+ { -+ rMat = p->GetMatrix(); -+ if (!rMat) -+ SetError( errUnknownVariable); -+ } - } - - void ScInterpreter::GetExternalDoubleRef( --- -1.7.7.6 - diff --git a/0005-clone-token-in-ScFormulaResult-copy-ctor-instead-of-.patch b/0005-clone-token-in-ScFormulaResult-copy-ctor-instead-of-.patch deleted file mode 100644 index 2f11bd5..0000000 --- a/0005-clone-token-in-ScFormulaResult-copy-ctor-instead-of-.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 23ca5386808ace4ed73aeabadea44e96d696742b Mon Sep 17 00:00:00 2001 -From: Eike Rathke -Date: Tue, 31 Jan 2012 20:40:47 +0100 -Subject: [PATCH 5/5] clone token in ScFormulaResult copy-ctor instead of - referring - -Replaces commit e2b11f4fd79dce4116badb0ecf6477546ca5d0d4 - -Prevent excessive references to single token instance during fill. - -Because if not, we may run out of the 16-bit integer space to -store reference count. - -Signed-off-by: Kohei Yoshida ---- - sc/inc/formularesult.hxx | 23 ++++++++++++++++++++--- - 1 files changed, 20 insertions(+), 3 deletions(-) - -diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx -index bd68e52..454753b 100644 ---- a/sc/inc/formularesult.hxx -+++ b/sc/inc/formularesult.hxx -@@ -41,6 +41,20 @@ class ScFormulaResult - static const Multiline MULTILINE_FALSE = 1; - static const Multiline MULTILINE_TRUE = 2; - -+ // Clone token if the 16-bit only reference counter is nearing it's -+ // capacity during fill or copy&paste, leaving 4k for temporary passing -+ // around. (That should be enough for all times (TM) ;-) -+ static const sal_uInt16 MAX_TOKENREF_COUNT = 0xf000; -+ static void IncrementTokenRef( const formula::FormulaToken* & rp ) -+ { -+ if (rp) -+ { -+ if (rp->GetRef() >= MAX_TOKENREF_COUNT) -+ rp = rp->Clone(); -+ rp->IncRef(); -+ } -+ } -+ - union - { - double mfValue; // double result direct for performance and memory consumption -@@ -94,8 +108,12 @@ public: - const ScMatrixFormulaCellToken* pMatFormula = - r.GetMatrixFormulaCellToken(); - if (pMatFormula) -+ { - mpToken = new ScMatrixFormulaCellToken( *pMatFormula); -- mpToken->IncRef(); -+ mpToken->IncRef(); -+ } -+ else -+ IncrementTokenRef( mpToken); - } - } - else -@@ -308,8 +326,7 @@ inline void ScFormulaResult::Assign( const ScFormulaResult & r ) - inline void ScFormulaResult::SetToken( const formula::FormulaToken* p ) - { - ResetToDefaults(); -- if (p) -- p->IncRef(); -+ IncrementTokenRef( p); - // Handle a result obtained from the interpreter to be assigned to a matrix - // formula cell's ScMatrixFormulaCellToken. - ScMatrixFormulaCellToken* pMatFormula = GetMatrixFormulaCellTokenNonConst(); --- -1.7.7.6 - diff --git a/0005-country-code-IN-is-not-in-use-for-these-locales-fdo-.patch b/0005-country-code-IN-is-not-in-use-for-these-locales-fdo-.patch deleted file mode 100644 index e20bcf6..0000000 --- a/0005-country-code-IN-is-not-in-use-for-these-locales-fdo-.patch +++ /dev/null @@ -1,120 +0,0 @@ -From a899ab36646ae0b8d078c510725d014332294099 Mon Sep 17 00:00:00 2001 -From: Andras Timar -Date: Tue, 24 Jan 2012 14:56:35 +0100 -Subject: [PATCH 5/8] country code 'IN' is not in use for these locales - fdo#44208, fdo#45107 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Caolán McNamara ---- - officecfg/registry/data/org/openoffice/VCL.xcu | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu -index 6f52cb7..4dfdc23 100644 ---- a/officecfg/registry/data/org/openoffice/VCL.xcu -+++ b/officecfg/registry/data/org/openoffice/VCL.xcu -@@ -839,7 +839,7 @@ - Lohit Nepali;Kalimati;Samanata;Sans - - -- -+ - - Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU - -@@ -859,7 +859,7 @@ - Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS - - -- -+ - - Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU - -@@ -879,7 +879,7 @@ - Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS - - -- -+ - - Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU - -@@ -899,7 +899,7 @@ - Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode MS - - -- -+ - - Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU - -@@ -919,7 +919,7 @@ - Lohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode MS - - -- -+ - - Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU - -@@ -939,7 +939,7 @@ - Lohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode MS - - -- -+ - - Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU - -@@ -959,7 +959,7 @@ - Lohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS - - -- -+ - - AnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU - -@@ -979,7 +979,7 @@ - AnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS - - -- -+ - - Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU - -@@ -999,7 +999,7 @@ - Lohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS - - -- -+ - - utkal;Kalinga;Lohit Oriya;Samyak Oriya;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU - -@@ -1039,7 +1039,7 @@ - Raavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS - - -- -+ - - Lohit Tamil;Latha;Sans Serif - -@@ -1059,7 +1059,7 @@ - Lohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode MS - - -- -+ - - Lohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU - --- -1.7.7.6 - diff --git a/0005-svtools-LineListBox-fix-handling-of-none-style.patch b/0005-svtools-LineListBox-fix-handling-of-none-style.patch deleted file mode 100644 index c70fd03..0000000 --- a/0005-svtools-LineListBox-fix-handling-of-none-style.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c59ecb9a758cb61f1b146d8a844030fcd085eb65 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Fri, 27 Jan 2012 23:45:53 +0100 -Subject: [PATCH 5/5] svtools: LineListBox: fix handling of "none" style - -This was erroneously mapped to SOLID, thus effectively preventing the -removal of borders via the list box. - -Signed-off-by: Noel Power ---- - svtools/inc/svtools/ctrlbox.hxx | 4 ++++ - svtools/source/control/ctrlbox.cxx | 2 +- - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx -index 267a104..8813820 100644 ---- a/svtools/inc/svtools/ctrlbox.hxx -+++ b/svtools/inc/svtools/ctrlbox.hxx -@@ -47,9 +47,13 @@ typedef ::std::vector< ImplColorListData* > ImpColorList; - typedef ::std::vector< ImpLineListData* > ImpLineList; - typedef ::std::vector< ImplFontNameListData* > ImplFontList; - -+// FIXME: STYLE_* duplicate values from editeng::SvxBorderStyle, -+// which in turn duplicates values from com::sun::star::table::BorderLineStyle: -+// this needs cleaning up on master - #define STYLE_SOLID ( ( sal_uInt16 ) 0 ) - #define STYLE_DOTTED ( ( sal_uInt16 ) 1 ) - #define STYLE_DASHED ( ( sal_uInt16 ) 2 ) -+#define STYLE_NONE ( ( sal_uInt16 ) -1) - - #define CHANGE_LINE1 ( ( sal_uInt16 ) 1 ) - #define CHANGE_LINE2 ( ( sal_uInt16 ) 2 ) -diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx -index 70a040e..68047af 100644 ---- a/svtools/source/control/ctrlbox.cxx -+++ b/svtools/source/control/ctrlbox.cxx -@@ -866,7 +866,7 @@ long LineListBox::GetEntryDistance( sal_uInt16 nPos ) const - sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const - { - ImpLineListData* pData = (nPos < pLineList->size()) ? (*pLineList)[ nPos ] : NULL; -- return ( pData ) ? pData->GetStyle() : STYLE_SOLID; -+ return ( pData ) ? pData->GetStyle() : STYLE_NONE; - } - - // ----------------------------------------------------------------------- --- -1.7.7.6 - diff --git a/0006-Fix-build-dupplicate-node-prop-VCL-DefaultFonts-bn.patch b/0006-Fix-build-dupplicate-node-prop-VCL-DefaultFonts-bn.patch deleted file mode 100644 index 9750eb4..0000000 --- a/0006-Fix-build-dupplicate-node-prop-VCL-DefaultFonts-bn.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 91fa56cb98f21207e4bd559d0a821fc0b6e12526 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Tue, 24 Jan 2012 16:22:15 +0100 -Subject: [PATCH 6/8] Fix build: dupplicate node/prop /VCL/DefaultFonts/bn -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Caolán McNamara ---- - officecfg/registry/data/org/openoffice/VCL.xcu | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu -index 4dfdc23..55135cb 100644 ---- a/officecfg/registry/data/org/openoffice/VCL.xcu -+++ b/officecfg/registry/data/org/openoffice/VCL.xcu -@@ -859,7 +859,7 @@ - Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS - - -- -+ - - Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU - --- -1.7.7.6 - diff --git a/0007-remove-bn-IN-node-we-have-bn.patch b/0007-remove-bn-IN-node-we-have-bn.patch deleted file mode 100644 index 08014da..0000000 --- a/0007-remove-bn-IN-node-we-have-bn.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 756045dcffcdf2da3bc4d0c7bf0a55e5fc75106e Mon Sep 17 00:00:00 2001 -From: Andras Timar -Date: Tue, 24 Jan 2012 19:01:44 +0100 -Subject: [PATCH 7/8] remove bn-IN node, we have bn -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Caolán McNamara ---- - officecfg/registry/data/org/openoffice/VCL.xcu | 20 -------------------- - 1 files changed, 0 insertions(+), 20 deletions(-) - -diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu -index 55135cb..26d631b 100644 ---- a/officecfg/registry/data/org/openoffice/VCL.xcu -+++ b/officecfg/registry/data/org/openoffice/VCL.xcu -@@ -859,26 +859,6 @@ - Lohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS - - -- -- -- Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU -- -- -- Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS -- -- -- Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS -- -- -- Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS -- -- -- Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS -- -- -- Lohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode MS -- -- - - - Lohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU --- -1.7.7.6 - diff --git a/0008-fdo-38542-SvxBorderLine-GuessLinesWidths.patch b/0008-fdo-38542-SvxBorderLine-GuessLinesWidths.patch deleted file mode 100644 index f24a032..0000000 --- a/0008-fdo-38542-SvxBorderLine-GuessLinesWidths.patch +++ /dev/null @@ -1,70 +0,0 @@ -From ed41167d5ffae11efdd9cb43b2d88a8147e6d13f Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Wed, 25 Jan 2012 22:43:39 +0100 -Subject: [PATCH 8/8] fdo#38542: SvxBorderLine::GuessLinesWidths: -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Importing style:border-line-width="0.002cm 0.088cm 0.141cm" (which older -OOo/LO apparently could write) fails, because GuessLinesWidths can't find -a matching style (result: standard "double" border, 3 equal width parts). -Try to create a custom BorderWidthImpl of type DOUBLE instead, that -preserves the individual widths. - -Signed-off-by: Cédric Bosdonnat -Signed-off-by: Noel Power ---- - editeng/qa/items/borderline_test.cxx | 2 +- - editeng/source/items/borderline.cxx | 21 ++++++++++++++++++--- - 2 files changed, 19 insertions(+), 4 deletions(-) - -diff --git a/editeng/qa/items/borderline_test.cxx b/editeng/qa/items/borderline_test.cxx -index 5d67b62..05172d6 100644 ---- a/editeng/qa/items/borderline_test.cxx -+++ b/editeng/qa/items/borderline_test.cxx -@@ -85,7 +85,7 @@ void BorderLineTest::testGuessWidthNoMatch() - line.GuessLinesWidths( DOUBLE, - TEST_WIDTH + 1, TEST_WIDTH + 2, TEST_WIDTH + 3 ); - CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetStyle() ); -- CPPUNIT_ASSERT_EQUAL( long( 0 ), line.GetWidth() ); -+ CPPUNIT_ASSERT_EQUAL( long( (3 * TEST_WIDTH) + 6 ), line.GetWidth() ); - } - - void BorderLineTest::testGuessWidthThinthickSmallgap() -diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx -index de24284..88adf29 100644 ---- a/editeng/source/items/borderline.cxx -+++ b/editeng/source/items/borderline.cxx -@@ -279,10 +279,25 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa - - // If anything matched, then set it - if ( nWidth > 0 ) -+ { - nStyle = nTestStyle; -- -- SetStyle( nStyle ); -- m_nWidth = nWidth; -+ SetStyle( nStyle ); -+ m_nWidth = nWidth; -+ } -+ else -+ { -+ // fdo#38542: not a known double, default to something custom... -+ SetStyle( nStyle ); -+ m_nWidth = nOut + nIn + nDist; -+ if (nOut + nIn + nDist) -+ { -+ m_aWidthImpl = BorderWidthImpl( -+ CHANGE_LINE1 | CHANGE_LINE2 | CHANGE_DIST, -+ static_cast(nOut ) / static_cast(m_nWidth), -+ static_cast(nIn ) / static_cast(m_nWidth), -+ static_cast(nDist) / static_cast(m_nWidth)); -+ } -+ } - } - else - { --- -1.7.7.6 - diff --git a/libreoffice.spec b/libreoffice.spec index 2ab1a7e..f5d08b3 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,4 +1,4 @@ -%define libo_version 3.4.5 +%define libo_version 3.4.6 # rhbz#715152 state vendor %if 0%{?rhel} %define vendoroption --with-vendor="Red Hat, Inc." @@ -33,7 +33,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 9%{?dist} +Release: 1%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain and ASL 2.0 and Artistic Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -150,99 +150,35 @@ Patch30: 0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch Patch31: 0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch Patch32: 0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch Patch33: 0001-smath-does-not-handle-accents-in-MathML.patch -Patch34: 0001-fix-writing-of-strings-from-the-first-module.patch -Patch35: 0001-Confine-JDBC-driver-to-thread-affine-apartment-for-J.patch +Patch34: 0001-Confine-JDBC-driver-to-thread-affine-apartment-for-J.patch %if %{defined rhel} && 0%{?rhel} < 7 -Patch36: libreoffice-libwpd08-1.patch -Patch37: libreoffice-libwpd08-2.patch -Patch38: 0001-wpsimport-writerperfect.diff-WPS-Import-filter-core-.patch -Patch39: libreoffice-gcj.patch -Patch40: libreoffice-rhel6poppler.patch -Patch41: libreoffice-rhel6langs.patch +Patch35: libreoffice-libwpd08-1.patch +Patch36: libreoffice-libwpd08-2.patch +Patch37: 0001-wpsimport-writerperfect.diff-WPS-Import-filter-core-.patch +Patch38: libreoffice-gcj.patch +Patch39: libreoffice-rhel6poppler.patch +Patch40: libreoffice-rhel6langs.patch %endif -Patch42: solenv.fix.mk.inheritance.patch -Patch43: 0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch -Patch44: 0001-Resolves-fdo-44078-fix-unfortunate-name-alias-mixups.patch -Patch45: libreoffice-ppc64.patch -Patch46: 0001-Fix-fdo-44040-VIEWING-Crash-when-page-preview-after-.patch -Patch47: 0001-fdo-39118-Fixed-chart-listener-registration-during-O.patch -Patch48: 0002-Resolves-fdo-43725-crash-on-saving-a-file.patch -Patch49: 0003-resolved-fdo-45032-Calc-export-to-HTML-with-graphics.patch -Patch50: 0004-resolved-rhbz-783556-crash-in-ScMatrix-GetDimensons-.patch -Patch51: 0005-clone-token-in-ScFormulaResult-copy-ctor-instead-of-.patch -Patch52: 0001-fdo-44178-Align-dictionary-address-with-DICT_REPO_UR.patch -Patch53: 0002-SvxBorderTabPage-the-minimal-border-width-is-1-twip.patch -Patch54: 0001-fdo-43193-fix-rotation-of-shapes-in-imported-MS-docu.patch -Patch55: 0001-Fix-fdo-44065.patch -Patch56: 0002-restore-special-DATE-handling-code-for-SbxValue-Comp.patch -Patch57: 0003-Fixed-apparent-typos.patch -Patch58: 0004-connectivity-fdo-43479-fix-crash-on-DISTINCT.patch -Patch59: 0005-country-code-IN-is-not-in-use-for-these-locales-fdo-.patch -Patch60: 0006-Fix-build-dupplicate-node-prop-VCL-DefaultFonts-bn.patch -Patch61: 0007-remove-bn-IN-node-we-have-bn.patch -Patch62: 0008-fdo-38542-SvxBorderLine-GuessLinesWidths.patch -Patch63: 0004-WaE-signed-unsigned-error.patch -Patch64: 0005-svtools-LineListBox-fix-handling-of-none-style.patch -Patch65: 0001-fdo-38515-Fixed-crasher-in-dialog-destructor.patch -Patch66: 0002-fdo-40438-force-calculating-layout-before-Activate-t.patch -Patch67: 0003-fdo-38542-sw-ODF-import-divide-width-by-3-for-double.patch -Patch68: 0004-fdo-38542-sw-ODF-import-prevent-border-width-overrid.patch -Patch69: 0001-rhbz-746174-also-export-list-restart-for-non-root-li.patch -Patch70: 0001-resolved-fdo-42784-BorderLine-with-only-InnerWidth-s.patch -Patch71: 0001-Do-not-pass-the-request-for-command-line-help-to-oos.patch -Patch72: 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch -Patch73: 0001-cast-from-BorderLine-to-BorderLine2-is-not-valid.patch -Patch74: 0002-fix-getCellRangeByName-failure-for-named-range.patch -Patch75: 0003-fdo-45450-sc-ODF-export-cell-styles.patch -Patch76: 0001-fdo-45449-ODF-export-frames-invalid-min-width.patch -Patch77: 0002-fdo-45534-ODF-export-fix-draw-fit-to-size.patch -Patch78: 0001-fdo-38745-fix-hilariously-stupid-stack-guards.patch -Patch79: 0002-fdo-37024-SwView-SwView-fix-BROWSE_MODE-setting.patch -Patch80: 0003-fdo-35661-fix-sw.SwXViewSettings-com-sun-star-text-V.patch -Patch81: 0004-fs34b-i117545-patch-provided-by-mathias.bauer-oracle.patch -Patch82: 0001-fdo-45115-SwXTextTable-fix-setting-borders.patch -Patch83: 0002-fdo-45115-sc-fix-setting-borders.patch -Patch84: 0001-rhbz-701152-ignore-hidden-objects.patch -Patch85: 0001-fdo-45446-officecfg-turn-off-SaveBackwardCompatibleO.patch -Patch86: 0001-resolved-fdo-38595-border-width-lost-in-ODF-import.patch -Patch87: 0001-fdo-40378-compile-defined-names-that-had-unresolveds.patch -Patch88: 0002-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch -Patch89: 0003-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch -Patch90: libreoffice-ensure-non-broken-xml-tree.patch -Patch91: 0001-preserve-timestamps-for-.py-files.patch -Patch92: 0001-fdo-36109-in-INDIRECT-make-a-non-existing-sheet-prod.patch -Patch93: 0001-fdo-41712-rename-members-to-track-down-assignments.patch -Patch94: 0002-fdo-41712-sw-fix-crash-in-layout-frame-linked-lists.patch -Patch95: 0003-fdo-41712-sw-remove-superfluous-flag.patch -Patch96: 0001-fdo-42771-Fix-crash-when-loading-an-invalid-.fodt.patch -Patch97: 0002-odbc-64-bit-crash-correct-buffer-length-allocation-f.patch -Patch98: 0001-fdo-44813-don-t-replace-NULLs-given-by-the-database-.patch -Patch99: 0002-fdo-44813-make-the-refresh-query-filter-NULL-safe.patch -Patch100: 0001-fdo-43399-hidden-radio-button-should-also-gets-unset.patch -Patch101: 0002-fdo-40261-Fix-crash-in-XML-Form-Document.patch -Patch102: 0001-fix-support-for-embedded-images-for-basic-Dialogs-fd.patch -Patch103: 0001-fdo-39510-fix-yet-more-layout-crashes-in-SwRootFrm.patch -Patch104: 0001-fdo-39657-fix-crash-when-parsing-XML-signatures.patch -Patch105: 0001-rhbz-794679-use-proper-Indian-Rupee-currency-symbol.patch -Patch106: 0001-fdo-31966-do-not-create-an-empty-slide-when-printing.patch -Patch107: 0001-Correctly-calculate-leap-year.patch -Patch108: 0001-fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch -Patch109: 0001-SwRootFrm-SwRootFrm-refactor.patch -Patch110: 0001-default-shortcut-for-.uno-SearchDialog-should-be-Ctr.patch -Patch111: 0002-fix-crash-using-instances-dialog-of-dataform-navigat.patch -Patch112: 0001-fix-up-endianness-of-lowhanging-QuickReads.patch -Patch113: 0001-fix-up-endianness-of-higher-hanging-QuickReads.patch -Patch114: 0001-fdo-39694-SwTxtFld-do-expand-the-field-in-the-ctor.patch -Patch115: 0002-fdo-42073-sw-expand-all-text-fields-when-setting-pro.patch -Patch116: 0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch -Patch117: 0001-silence-SolarMutex-not-locked-spew.patch -Patch118: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch -Patch119: 0001-Disable-problematic-reading-of-external-entities-in-.patch -Patch120: 0001-Splash-screen-fix-for-multi-head-on-Linux-fdo-33214.patch -Patch121: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch -Patch122: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch -Patch123: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch -Patch124: 0001-rhbz-789022-SwNodes-fix-inconsistent-outline-check.patch +Patch41: solenv.fix.mk.inheritance.patch +Patch42: 0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch +Patch43: libreoffice-ppc64.patch +Patch44: 0001-rhbz-746174-also-export-list-restart-for-non-root-li.patch +Patch45: 0001-Do-not-pass-the-request-for-command-line-help-to-oos.patch +Patch46: 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch +Patch47: 0001-rhbz-701152-ignore-hidden-objects.patch +Patch48: 0001-fdo-45446-officecfg-turn-off-SaveBackwardCompatibleO.patch +Patch49: libreoffice-ensure-non-broken-xml-tree.patch +Patch50: 0001-preserve-timestamps-for-.py-files.patch +Patch51: 0001-fix-up-endianness-of-lowhanging-QuickReads.patch +Patch52: 0001-fix-up-endianness-of-higher-hanging-QuickReads.patch +Patch53: 0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch +Patch54: 0001-silence-SolarMutex-not-locked-spew.patch +Patch55: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch +Patch56: 0001-Splash-screen-fix-for-multi-head-on-Linux-fdo-33214.patch +Patch57: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch +Patch58: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch +Patch59: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch +Patch60: 0001-rhbz-789022-SwNodes-fix-inconsistent-outline-check.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -1077,99 +1013,35 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch31 -p1 -b .rhbz761009-IFSD_Equal-is-asymmetrical.patch %patch32 -p1 -b .rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch %patch33 -p1 -b .smath-does-not-handle-accents-in-MathML.patch -%patch34 -p1 -b .fix-writing-of-strings-from-the-first-module.patch -%patch35 -p1 -b .Confine-JDBC-driver-to-thread-affine-apartment-for-J.patch +%patch34 -p1 -b .Confine-JDBC-driver-to-thread-affine-apartment-for-J.patch %if %{defined rhel} && 0%{?rhel} < 7 -%patch36 -p1 -b .libwpd08-1.patch -%patch37 -p1 -R -b .libreoffice-libwpd08-2.patch -%patch38 -p1 -R -b .wpsimport -%patch39 -p1 -b .gcj.patch -%patch40 -p0 -b .rhel6poppler.patch -%patch41 -p0 -b .rhel6langs.patch +%patch35 -p1 -b .libwpd08-1.patch +%patch36 -p1 -R -b .libreoffice-libwpd08-2.patch +%patch37 -p1 -R -b .wpsimport +%patch38 -p1 -b .gcj.patch +%patch39 -p0 -b .rhel6poppler.patch +%patch40 -p0 -b .rhel6langs.patch %endif -%patch42 -p1 -b .solenv.fix.mk.inheritance.patch -%patch43 -p1 -b .rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch -%patch44 -p1 -b .fdo44078-fix-unfortunate-name-alias-mixups.patch -%patch45 -p1 -b .libreoffice-ppc64.patch -%patch46 -p1 -b .Fix-fdo-44040-VIEWING-Crash-when-page-preview-after-.patch -%patch47 -p1 -b .fdo-39118-Fixed-chart-listener-registration-during-O.patch -%patch48 -p1 -b .Resolves-fdo-43725-crash-on-saving-a-file.patch -%patch49 -p1 -b .resolved-fdo-45032-Calc-export-to-HTML-with-graphics.patch -%patch50 -p1 -b .resolved-rhbz-783556-crash-in-ScMatrix-GetDimensons-.patch -%patch51 -p1 -b .clone-token-in-ScFormulaResult-copy-ctor-instead-of-.patch -%patch52 -p1 -b .fdo-44178-Align-dictionary-address-with-DICT_REPO_UR.patch -%patch53 -p1 -b .SvxBorderTabPage-the-minimal-border-width-is-1-twip.patch -%patch54 -p1 -b .fdo-43193-fix-rotation-of-shapes-in-imported-MS-docu.patch -%patch55 -p1 -b .Fix-fdo-44065.patch -%patch56 -p1 -b .restore-special-DATE-handling-code-for-SbxValue-Comp.patch -%patch57 -p1 -b .Fixed-apparent-typos.patch -%patch58 -p1 -b .connectivity-fdo-43479-fix-crash-on-DISTINCT.patch -%patch59 -p1 -b .country-code-IN-is-not-in-use-for-these-locales-fdo-.patch -%patch60 -p1 -b .Fix-build-dupplicate-node-prop-VCL-DefaultFonts-bn.patch -%patch61 -p1 -b .remove-bn-IN-node-we-have-bn.patch -%patch62 -p1 -b .fdo-38542-SvxBorderLine-GuessLinesWidths.patch -%patch63 -p1 -b .WaE-signed-unsigned-error.patch -%patch64 -p1 -b .svtools-LineListBox-fix-handling-of-none-style.patch -%patch65 -p1 -b .fdo-38515-Fixed-crasher-in-dialog-destructor.patch -%patch66 -p1 -b .fdo-40438-force-calculating-layout-before-Activate-t.patch -%patch67 -p1 -b .fdo-38542-sw-ODF-import-divide-width-by-3-for-double.patch -%patch68 -p1 -b .fdo-38542-sw-ODF-import-prevent-border-width-overrid.patch -%patch69 -p1 -b .rhbz746174-also-export-list-restart-for-non-root-li.patch -%patch70 -p1 -b .resolved-fdo-42784-BorderLine-with-only-InnerWidth-s.patch -%patch71 -p1 -b .Do-not-pass-the-request-for-command-line-help-to-oos.patch -%patch72 -p1 -b .rhbz788042-skip-splashscreen-with-quicksta.patch -%patch73 -p1 -b .cast-from-BorderLine-to-BorderLine2-is-not-valid.patch -%patch74 -p1 -b .fix-getCellRangeByName-failure-for-named-range.patch -%patch75 -p1 -b .fdo-45450-sc-ODF-export-cell-styles.patch -%patch76 -p1 -b .fdo-45449-ODF-export-frames-invalid-min-width.patch -%patch77 -p1 -b .fdo-45534-ODF-export-fix-draw-fit-to-size.patch -%patch78 -p1 -b .fdo-38745-fix-hilariously-stupid-stack-guards.patch -%patch79 -p1 -b .fdo-37024-SwView-SwView-fix-BROWSE_MODE-setting.patch -%patch80 -p1 -b .fdo-35661-fix-sw.SwXViewSettings-com-sun-star-text-V.patch -%patch81 -p1 -b .fs34b-i117545-patch-provided-by-mathias.bauer-oracle.patch -%patch82 -p1 -b .fdo-45115-SwXTextTable-fix-setting-borders.patch -%patch83 -p1 -b .fdo-45115-sc-fix-setting-borders.patch -%patch84 -p1 -b .rhbz-701152-ignore-hidden-objects.patch -%patch85 -p1 -b .fdo-45446-officecfg-turn-off-SaveBackwardCompatibleO.patch -%patch86 -p1 -b .resolved-fdo-38595-border-width-lost-in-ODF-import.patch -%patch87 -p1 -b .fdo-40378-compile-defined-names-that-had-unresolveds.patch -%patch88 -p1 -b .1fix-fdo-40590-stop-abusing-regular-string-token-for-.patch -%patch89 -p1 -b .2fix-fdo-40590-stop-abusing-regular-string-token-for-.patch -%patch90 -p1 -b .ensure-non-broken-xml-tree.patch -%patch91 -p1 -b .preserve-timestamps-for-.py-files.patch -%patch92 -p1 -b .fdo-36109-in-INDIRECT-make-a-non-existing-sheet-prod.patch -%patch93 -p1 -b .fdo-41712-rename-members-to-track-down-assignments.patch -%patch94 -p1 -b .fdo-41712-sw-fix-crash-in-layout-frame-linked-lists.patch -%patch95 -p1 -b .fdo-41712-sw-remove-superfluous-flag.patch -%patch96 -p1 -b .fdo-42771-Fix-crash-when-loading-an-invalid-.fodt.patch -%patch97 -p1 -b .odbc-64-bit-crash-correct-buffer-length-allocation-f.patch -%patch98 -p1 -b .fdo-44813-don-t-replace-NULLs-given-by-the-database-.patch -%patch99 -p1 -b .fdo-44813-make-the-refresh-query-filter-NULL-safe.patch -%patch100 -p1 -b .fdo-43399-hidden-radio-button-should-also-gets-unset.patch -%patch101 -p1 -b .fdo-40261-Fix-crash-in-XML-Form-Document.patch -%patch102 -p1 -b .fix-support-for-embedded-images-for-basic-Dialogs-fd.patch -%patch103 -p1 -b .fdo-39510-fix-yet-more-layout-crashes-in-SwRootFrm.patch -%patch104 -p1 -b .fdo-39657-fix-crash-when-parsing-XML-signatures.patch -%patch105 -p1 -b .rhbz-794679-use-proper-Indian-Rupee-currency-symbol.patch -%patch106 -p1 -b .fdo-31966-do-not-create-an-empty-slide-when-printing.patch -%patch107 -p1 -b .Correctly-calculate-leap-year.patch -%patch108 -p1 -b .fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch -%patch109 -p1 -b .SwRootFrm-SwRootFrm-refactor.patch -%patch110 -p1 -b .default-shortcut-for-.uno-SearchDialog-should-be-Ctr.patch -%patch111 -p1 -b .fix-crash-using-instances-dialog-of-dataform-navigat.patch -%patch112 -p1 -b .fix-up-endianness-of-lowhanging-QuickReads.patch -%patch113 -p1 -b .fix-up-endianness-of-higher-hanging-QuickReads.patch -%patch114 -p1 -b .fdo-39694-SwTxtFld-do-expand-the-field-in-the-ctor.patch -%patch115 -p1 -b .fdo-42073-sw-expand-all-text-fields-when-setting-pro.patch -%patch116 -p1 -b .rhbz-799628-crash-with-chewing-IM-with-g3g.patch -%patch117 -p1 -b .silence-SolarMutex-not-locked-spew.patch -%patch118 -p1 -b .rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch -%patch119 -p1 -b .Disable-problematic-reading-of-external-entities-in-.patch -%patch120 -p1 -b .Splash-screen-fix-for-multi-head-on-Linux-fdo-33214.patch -%patch121 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch -%patch122 -p1 -b .desktop-do-not-complain-about-soffice-command-line-o.patch -%patch123 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch -%patch124 -p1 -b .rhbz-789022-SwNodes-fix-inconsistent-outline-check.patch +%patch41 -p1 -b .solenv.fix.mk.inheritance.patch +%patch42 -p1 -b .rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch +%patch43 -p1 -b .libreoffice-ppc64.patch +%patch44 -p1 -b .rhbz746174-also-export-list-restart-for-non-root-li.patch +%patch45 -p1 -b .Do-not-pass-the-request-for-command-line-help-to-oos.patch +%patch46 -p1 -b .rhbz788042-skip-splashscreen-with-quicksta.patch +%patch47 -p1 -b .rhbz-701152-ignore-hidden-objects.patch +%patch48 -p1 -b .fdo-45446-officecfg-turn-off-SaveBackwardCompatibleO.patch +%patch49 -p1 -b .ensure-non-broken-xml-tree.patch +%patch50 -p1 -b .preserve-timestamps-for-.py-files.patch +%patch51 -p1 -b .fix-up-endianness-of-lowhanging-QuickReads.patch +%patch52 -p1 -b .fix-up-endianness-of-higher-hanging-QuickReads.patch +%patch53 -p1 -b .rhbz-799628-crash-with-chewing-IM-with-g3g.patch +%patch54 -p1 -b .silence-SolarMutex-not-locked-spew.patch +%patch55 -p1 -b .rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch +%patch56 -p1 -b .Splash-screen-fix-for-multi-head-on-Linux-fdo-33214.patch +%patch57 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch +%patch58 -p1 -b .desktop-do-not-complain-about-soffice-command-line-o.patch +%patch59 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch +%patch60 -p1 -b .rhbz-789022-SwNodes-fix-inconsistent-outline-check.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -2489,7 +2361,72 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Tue Mar 14 2012 Caolán McNamara - 3.4.5.2-9.UNBUILT +* Sun Mar 25 2012 David Tardon - 3.4.6.2-1 +- new upstream version 3.4.6 +- drop intergrated 0001-fix-writing-of-strings-from-the-first-module.patch +- drop intergrated 0001-Resolves-fdo-44078-fix-unfortunate-name-alias-mixups.patch +- drop intergrated 0001-Fix-fdo-44040-VIEWING-Crash-when-page-preview-after-.patch +- drop intergrated 0001-fdo-39118-Fixed-chart-listener-registration-during-O.patch +- drop intergrated 0002-Resolves-fdo-43725-crash-on-saving-a-file.patch +- drop intergrated 0003-resolved-fdo-45032-Calc-export-to-HTML-with-graphics.patch +- drop intergrated 0004-resolved-rhbz-783556-crash-in-ScMatrix-GetDimensons-.patch +- drop intergrated 0005-clone-token-in-ScFormulaResult-copy-ctor-instead-of-.patch +- drop intergrated 0001-fdo-44178-Align-dictionary-address-with-DICT_REPO_UR.patch +- drop intergrated 0002-SvxBorderTabPage-the-minimal-border-width-is-1-twip.patch +- drop intergrated 0001-fdo-43193-fix-rotation-of-shapes-in-imported-MS-docu.patch +- drop intergrated 0001-Fix-fdo-44065.patch +- drop intergrated 0002-restore-special-DATE-handling-code-for-SbxValue-Comp.patch +- drop intergrated 0003-Fixed-apparent-typos.patch +- drop intergrated 0004-connectivity-fdo-43479-fix-crash-on-DISTINCT.patch +- drop intergrated 0005-country-code-IN-is-not-in-use-for-these-locales-fdo-.patch +- drop intergrated 0006-Fix-build-dupplicate-node-prop-VCL-DefaultFonts-bn.patch +- drop intergrated 0007-remove-bn-IN-node-we-have-bn.patch +- drop intergrated 0008-fdo-38542-SvxBorderLine-GuessLinesWidths.patch +- drop intergrated 0004-WaE-signed-unsigned-error.patch +- drop intergrated 0005-svtools-LineListBox-fix-handling-of-none-style.patch +- drop intergrated 0001-fdo-38515-Fixed-crasher-in-dialog-destructor.patch +- drop intergrated 0002-fdo-40438-force-calculating-layout-before-Activate-t.patch +- drop intergrated 0003-fdo-38542-sw-ODF-import-divide-width-by-3-for-double.patch +- drop intergrated 0004-fdo-38542-sw-ODF-import-prevent-border-width-overrid.patch +- drop intergrated 0001-resolved-fdo-42784-BorderLine-with-only-InnerWidth-s.patch +- drop intergrated 0001-cast-from-BorderLine-to-BorderLine2-is-not-valid.patch +- drop intergrated 0002-fix-getCellRangeByName-failure-for-named-range.patch +- drop intergrated 0003-fdo-45450-sc-ODF-export-cell-styles.patch +- drop intergrated 0001-fdo-45449-ODF-export-frames-invalid-min-width.patch +- drop intergrated 0002-fdo-45534-ODF-export-fix-draw-fit-to-size.patch +- drop intergrated 0001-fdo-38745-fix-hilariously-stupid-stack-guards.patch +- drop intergrated 0002-fdo-37024-SwView-SwView-fix-BROWSE_MODE-setting.patch +- drop intergrated 0003-fdo-35661-fix-sw.SwXViewSettings-com-sun-star-text-V.patch +- drop intergrated 0004-fs34b-i117545-patch-provided-by-mathias.bauer-oracle.patch +- drop intergrated 0001-fdo-45115-SwXTextTable-fix-setting-borders.patch +- drop intergrated 0002-fdo-45115-sc-fix-setting-borders.patch +- drop intergrated 0001-resolved-fdo-38595-border-width-lost-in-ODF-import.patch +- drop intergrated 0001-fdo-40378-compile-defined-names-that-had-unresolveds.patch +- drop intergrated 0002-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch +- drop intergrated 0003-fix-fdo-40590-stop-abusing-regular-string-token-for-.patch +- drop intergrated 0001-fdo-36109-in-INDIRECT-make-a-non-existing-sheet-prod.patch +- drop intergrated 0001-fdo-41712-rename-members-to-track-down-assignments.patch +- drop intergrated 0002-fdo-41712-sw-fix-crash-in-layout-frame-linked-lists.patch +- drop intergrated 0003-fdo-41712-sw-remove-superfluous-flag.patch +- drop intergrated 0001-fdo-42771-Fix-crash-when-loading-an-invalid-.fodt.patch +- drop intergrated 0002-odbc-64-bit-crash-correct-buffer-length-allocation-f.patch +- drop intergrated 0001-fdo-44813-don-t-replace-NULLs-given-by-the-database-.patch +- drop intergrated 0002-fdo-44813-make-the-refresh-query-filter-NULL-safe.patch +- drop intergrated 0001-fdo-43399-hidden-radio-button-should-also-gets-unset.patch +- drop intergrated 0002-fdo-40261-Fix-crash-in-XML-Form-Document.patch +- drop intergrated 0001-fix-support-for-embedded-images-for-basic-Dialogs-fd.patch +- drop intergrated 0001-fdo-39510-fix-yet-more-layout-crashes-in-SwRootFrm.patch +- drop intergrated 0001-fdo-39657-fix-crash-when-parsing-XML-signatures.patch +- drop intergrated 0001-rhbz-794679-use-proper-Indian-Rupee-currency-symbol.patch +- drop intergrated 0001-fdo-31966-do-not-create-an-empty-slide-when-printing.patch +- drop intergrated 0001-Correctly-calculate-leap-year.patch +- drop intergrated 0001-fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch +- drop intergrated 0001-SwRootFrm-SwRootFrm-refactor.patch +- drop intergrated 0001-default-shortcut-for-.uno-SearchDialog-should-be-Ctr.patch +- drop intergrated 0002-fix-crash-using-instances-dialog-of-dataform-navigat.patch +- drop intergrated 0001-fdo-39694-SwTxtFld-do-expand-the-field-in-the-ctor.patch +- drop intergrated 0002-fdo-42073-sw-expand-all-text-fields-when-setting-pro.patch +- drop intergrated 0001-Disable-problematic-reading-of-external-entities-in-.patch - Resolves: rhbz#770209 can't change paper tray setting while printing - Resolves: rhbz#789022 SwNodes: fix inconsistent outline check diff --git a/sources b/sources index 3d56a17..ed8a939 100644 --- a/sources +++ b/sources @@ -1,16 +1,3 @@ -a75d7d4ebefb4c9a4bb256acf866fa81 libreoffice-artwork-3.4.5.2.tar.bz2 -c1e2dabdf4cfcd5957779014a7f9787e libreoffice-base-3.4.5.2.tar.bz2 -a9af488ef92ad4442eafba874249c529 libreoffice-libs-core-3.4.5.2.tar.bz2 -db6a67c96a9090bc5e21b64e202a984e libreoffice-libs-extern-3.4.5.2.tar.bz2 -e00187ae0840e1f6a00fa3290cacf0d1 libreoffice-libs-extern-sys-3.4.5.2.tar.bz2 -20fbf6cffd2b06e90a52105b75a57828 libreoffice-libs-gui-3.4.5.2.tar.bz2 -4af055f590732ec19a2534b2278ac49c libreoffice-postprocess-3.4.5.2.tar.bz2 -c84693796d2b1d9c8269425b1fa53aef libreoffice-sdk-3.4.5.2.tar.bz2 -d4926dc27b6884656feec6753f4fdf22 libreoffice-testing-3.4.5.2.tar.bz2 -770678ca19cca0f7985c1c82b2dccf48 libreoffice-ure-3.4.5.2.tar.bz2 -97a1e3de430b124faf35bf334248ad53 libreoffice-writer-3.4.5.2.tar.bz2 -12afa34b3045a1bc91cfe84d86211919 libreoffice-translations-3.4.5.2.tar.bz2 -79c9c7fc208e7f56af09f284f261a7da libreoffice-bootstrap-3.4.5.2.tar.bz2 185d60944ea767075d27247c3162b3bc 185d60944ea767075d27247c3162b3bc-unowinreg.dll 03c019658ec49050c8103ba0f10b5067 redhat-langpacks.tar.gz 74939c9ea525374776f09bf972ede99f libreoffice-multiliblauncher.sh @@ -21,12 +8,25 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 35c94d2df8893241173de1d16b6034c0 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ada24d37d8d638b3d8a9985e80bc2978 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 18f577b374d60b3c760a3a3350407632 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz -c83a8a374d3d5cc83c6ac3b5ff613e46 libreoffice-calc-3.4.5.2.tar.bz2 17410483b5b5f267aa18b7e00b65e6e0 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip b4cae0700aa1c2aef7eb7f345365e6f1 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 -fa64799ebad8cbd2c160ac2f87bd5599 libreoffice-components-3.4.5.2.tar.bz2 -b24fba57aa4185934e86a0a8db4a3433 libreoffice-extensions-3.4.5.2.tar.bz2 -4f98020088ab9b597fc21b617121bd47 libreoffice-extras-3.4.5.2.tar.bz2 -3c3be7c5f923339c90b0d1d6ecad0243 libreoffice-filters-3.4.5.2.tar.bz2 -3a0bb4bb096b7488533ed2ee466a2bc9 libreoffice-help-3.4.5.2.tar.bz2 -f2b180aa1eff3884b4ca81c048f1e327 libreoffice-impress-3.4.5.2.tar.bz2 +6261547140017a5f0b177f1a95a0b30b libreoffice-artwork-3.4.6.2.tar.bz2 +a7321d23f202a589ee78635d9408a40c libreoffice-base-3.4.6.2.tar.bz2 +5f3fba4e3ac2e2b4d8c75c0b64cc9b2d libreoffice-bootstrap-3.4.6.2.tar.bz2 +bc88fafb27fb1de6fa24ba71763d4cb4 libreoffice-calc-3.4.6.2.tar.bz2 +43190313a3415881fdca8ada77c9b7c8 libreoffice-components-3.4.6.2.tar.bz2 +50647ba3d30168e0d0aaedb7932617af libreoffice-extensions-3.4.6.2.tar.bz2 +4863cdfd587dc02dddea73e1f873b78f libreoffice-extras-3.4.6.2.tar.bz2 +bc8e9f3be12c211fc30e7e67a3b6d64e libreoffice-filters-3.4.6.2.tar.bz2 +7e33b097bc4ec69aff81fbfddeb49c6f libreoffice-help-3.4.6.2.tar.bz2 +1a5717aa104e94fa0e5f63265e509b77 libreoffice-impress-3.4.6.2.tar.bz2 +7e3bfbddbc245ca94a49bc2d7afec9e6 libreoffice-libs-core-3.4.6.2.tar.bz2 +8c997e902031628566add0006b1063c2 libreoffice-libs-extern-3.4.6.2.tar.bz2 +12d13e1e675e3760a13c86f69234c721 libreoffice-libs-extern-sys-3.4.6.2.tar.bz2 +931bbb39c75f804f8839d89057c89854 libreoffice-libs-gui-3.4.6.2.tar.bz2 +e45a4b7a402ba91ab7d687dae6b42544 libreoffice-postprocess-3.4.6.2.tar.bz2 +872ac5ead9c0ae3bbb09debf9cbe5bf2 libreoffice-sdk-3.4.6.2.tar.bz2 +e00396665818e7ec6e10bdff51882e86 libreoffice-testing-3.4.6.2.tar.bz2 +8c1d80206f37dd5b2f1f30b6ed590ee9 libreoffice-translations-3.4.6.2.tar.bz2 +92a2430b36114f849c0a0847ee20bca2 libreoffice-ure-3.4.6.2.tar.bz2 +88e270bcb82e42a172367993dd8e7f43 libreoffice-writer-3.4.6.2.tar.bz2