Re: Soft hyphen in Laure's entry on Developers
On 11/26/2013 08:26 AM, Tae Wong wrote: There's a soft hyphen (SHY) in Laure's entry on the Developers page: Linde, Laure García Thanks for spotting. Fixed that now. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx | 161 chart2/qa/extras/data/ods/trendline.ods |binary 2 files changed, 161 insertions(+) New commits: commit 2ead27dc7026fc4789323f8849f43c5cafcec2fe Author: Tomaž Vajngerl Date: Tue Nov 26 08:28:29 2013 +0100 Test trendline properties using an emport -> ixport cycle Added a test which checks the preservation of properties for trendlines / regression curves in an export -> import cycle using different file formats - ODS, XLS and XLSX. Change-Id: I59fe6c045f7f503ee074e6a2741fa017756b3018 diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 3a6cd81..f46ab1a 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -10,6 +10,8 @@ #include "charttest.hxx" #include +#include +#include using uno::Reference; using beans::XPropertySet; @@ -19,10 +21,12 @@ class Chart2ExportTest : public ChartTest public: void test(); void testErrorBarXLSX(); +void testTrendline(); CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(test); CPPUNIT_TEST(testErrorBarXLSX); +CPPUNIT_TEST(testTrendline); CPPUNIT_TEST_SUITE_END(); private: @@ -54,6 +58,142 @@ void testErrorBar( Reference< XPropertySet > xErrorBar ) CPPUNIT_ASSERT_DOUBLES_EQUAL(nVal, 10.0, 1e-10); } +void checkCommonTrendline( +Reference xCurve, +double aExpectedExtrapolateForward, double aExpectedExtrapolateBackward, +sal_Bool aExpectedForceIntercept, double aExpectedInterceptValue, +sal_Bool aExpectedShowEquation, sal_Bool aExpectedR2) +{ +Reference xProperties( xCurve , uno::UNO_QUERY ); +CPPUNIT_ASSERT(xProperties.is()); + +double aExtrapolateForward = 0.0; +CPPUNIT_ASSERT(xProperties->getPropertyValue("ExtrapolateForward") >>= aExtrapolateForward); +CPPUNIT_ASSERT_EQUAL(aExpectedExtrapolateForward, aExtrapolateForward); + +double aExtrapolateBackward = 0.0; +CPPUNIT_ASSERT(xProperties->getPropertyValue("ExtrapolateBackward") >>= aExtrapolateBackward); +CPPUNIT_ASSERT_EQUAL(aExpectedExtrapolateBackward, aExtrapolateBackward); + +sal_Bool aForceIntercept = false; +CPPUNIT_ASSERT(xProperties->getPropertyValue("ForceIntercept") >>= aForceIntercept); +CPPUNIT_ASSERT_EQUAL(aExpectedForceIntercept, aForceIntercept); + +if (aForceIntercept) +{ +double aInterceptValue = 0.0; +CPPUNIT_ASSERT(xProperties->getPropertyValue("InterceptValue") >>= aInterceptValue); +CPPUNIT_ASSERT_EQUAL(aExpectedInterceptValue, aInterceptValue); +} + +Reference< XPropertySet > xEquationProperties( xCurve->getEquationProperties() ); +CPPUNIT_ASSERT(xEquationProperties.is()); + +sal_Bool aShowEquation = false; +CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowEquation") >>= aShowEquation); +CPPUNIT_ASSERT_EQUAL(aExpectedShowEquation, aShowEquation); + +sal_Bool aShowCorrelationCoefficient = false; + CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowCorrelationCoefficient") >>= aShowCorrelationCoefficient); +CPPUNIT_ASSERT_EQUAL(aExpectedR2, aShowCorrelationCoefficient); +} + +void checkNameAndType(Reference xProperties, OUString aExpectedName, OUString aExpectedServiceName) +{ +OUString aService; +Reference< lang::XServiceName > xServiceName( xProperties, UNO_QUERY ); +CPPUNIT_ASSERT(xServiceName.is()); + +OUString aServiceName = xServiceName->getServiceName(); +CPPUNIT_ASSERT_EQUAL(aExpectedServiceName, aServiceName); + +OUString aCurveName; +CPPUNIT_ASSERT(xProperties->getPropertyValue("CurveName") >>= aCurveName); +CPPUNIT_ASSERT_EQUAL(aExpectedName, aCurveName); +} + +void checkLinearTrendline( +Reference xCurve, OUString aExpectedName, +double aExpectedExtrapolateForward, double aExpectedExtrapolateBackward, +sal_Bool aExpectedForceIntercept, double aExpectedInterceptValue, +sal_Bool aExpectedShowEquation, sal_Bool aExpectedR2) +{ +Reference xProperties( xCurve , uno::UNO_QUERY ); +CPPUNIT_ASSERT(xProperties.is()); + +checkNameAndType(xProperties, aExpectedName, "com.sun.star.chart2.LinearRegressionCurve"); + +checkCommonTrendline( +xCurve, +aExpectedExtrapolateForward, aExpectedExtrapolateBackward, +aExpectedForceIntercept, aExpectedInterceptValue, +aExpectedShowEquation, aExpectedR2); +} + +void checkPolynomialTrendline( +Reference xCurve, OUString aExpectedName, +sal_Int32 aExpectedDegree, +double aExpectedExtrapolateForward, double aExpectedExtrapolateBackward, +sal_Bool aExpectedForceIntercept, double aExpectedInterceptValue, +sal_Bool aExpectedShowEquation, sal_Bool aExpectedR2) +{ +Reference xProperties( xCurve , uno::UNO_QUERY ); +CPPUNIT_ASSERT(xProperties.is()); + +checkNameAndType(xProperties, aExpectedName, "co
Soft hyphen in Laure's entry on Developers
There's a soft hyphen (SHY) in Laure's entry on the Developers page: Linde, Laure García The wiki.documentfoundation.org server can be slow to load. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2013-11-26
Moin! * Open changes on master for project core changed in the last 25 hours: + fdo#60698: Merge hatchwindowfactory into svt in https://gerrit.libreoffice.org/6811 from Marcos Souza + Mailmerge shows wrong number of emails to be sent in https://gerrit.libreoffice.org/6810 from Rodolfo Ribeiro Gomes + VCL : Remove usage of DBG_CTOR and DBG_DTOR. in https://gerrit.libreoffice.org/6805 from Arnaud Versini * Merged changes on master for project core changed in the last 25 hours: + Add missing keyboard shortcut to dialog in https://gerrit.libreoffice.org/6795 from Olivier Hallot + Fixed for libreoffice crashes while opening file. in https://gerrit.libreoffice.org/6760 from Priyanka Gaikwad + winaccessibility: replace CoCreateInstance with direct instantiation in https://gerrit.libreoffice.org/6792 from Michael Stahl + fdo#40315 Improve UI for moving average trendline in https://gerrit.libreoffice.org/6796 from Laurent BP * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#69407 in https://gerrit.libreoffice.org/6316 from matthieu gay + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej J.R. Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice DRAW - Flowcharting automation with scripting language
Le Tue, 26 Nov 2013 01:08:40 +0100, Robinson Tryon a écrit: On Mon, Nov 25, 2013 at 6:51 PM, - wrote: Flowcharting automation process in Draw (creating flowcharts automatically, without effort) Scripting language ... THE PROBLEM: When you want to create a flowchart, basically you have to ... [HEAD BEGIN: geometry: Rectangle, color: blue, rotation: 0, radious: 0, angle: 0, connector: normal, geometry-thickness: 2pt, connector-thickness: 2pt, shadow orientation:right-down, shadow color: grey, font-type-size: Calibri, 2pt, font-alignment: center, center] Differential geometry > differential calculus Differential geometry > integral calculus Differential geometry > linear algebra Differential geometry > multilinear algebra [:HEAD END] Have you looked at the DOT language? https://en.wikipedia.org/wiki/DOT_(graph_description_language) digraph graphname { a -> b -> c; b -> d; } There are a few others: https://en.wikipedia.org/wiki/Category:Graph_description_languages Hello DOT is handled by graphviz, which can export to SVG, that could be imported into Draw. Job's done ! :) yEd handles TGF and can also export to SVG. So basically, what is needed here is find a suitable Graph language (please don't create another one), make it create an SVG, then import in draw. Or use Dia, which does not seem to read graph langs, but has a nice interface to play with flowcharts Under professional Windows, I use mostly Visio to do flows and copy/paste into impress^W powerpoint. You can do the same with Dia & Impress. IMHO, creating a new import module for a graph lang to dia is more valuable, but being able to draw flows in Draw could be fun as well. My 5 cents :) Mat ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice DRAW - Flowcharting automation with scripting language
Meanwhile the extension http://extensions.libreoffice.org/extension-center/smart can be helpful. Miguel Ángel. -- View this message in context: http://nabble.documentfoundation.org/LibreOffice-DRAW-Flowcharting-automation-with-scripting-language-tp4084967p4084970.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/search/textsearch.cxx | 24 1 file changed, 20 insertions(+), 4 deletions(-) New commits: commit b32651febdaad5939250fb04f721d88952f54732 Author: Eike Rathke Date: Tue Nov 26 01:07:38 2013 +0100 encapsulate pRegexMatcher->find() to be able to monitor UErrorCode Change-Id: I73359a4e2c36ffeca71210971ba9be670e0a12ae diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index ec7ce3c..593483c 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -766,6 +766,7 @@ void TextSearch::RESrchPrepare( const ::com::sun::star::util::SearchOptions& rOp pRegexMatcher = new RegexMatcher( aIcuSearchPatStr, nIcuSearchFlags, nIcuErr); if (nIcuErr) { +SAL_INFO( "i18npool", "TextSearch::RESrchPrepare UErrorCode " << nIcuErr); delete pRegexMatcher; pRegexMatcher = NULL; } @@ -792,6 +793,21 @@ void TextSearch::RESrchPrepare( const ::com::sun::star::util::SearchOptions& rOp //--- +static bool lcl_findRegex( RegexMatcher * pRegexMatcher, sal_Int32 nStartPos, UErrorCode & rIcuErr ) +{ +if (!pRegexMatcher->find( nStartPos, rIcuErr)) +{ +/* TODO: future versions could pass the UErrorCode or translations + * thereof to the caller, for example to inform the user of + * U_REGEX_TIME_OUT. The strange thing though is that an error is set + * only after the second call that returns immediately and not if + * timeout occurred on the first call?!? */ +SAL_INFO( "i18npool", "lcl_findRegex UErrorCode " << rIcuErr); +return false; +} +return true; +} + SearchResult TextSearch::RESrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) throw(RuntimeException) @@ -811,7 +827,7 @@ SearchResult TextSearch::RESrchFrwrd( const OUString& searchStr, // search until there is a valid match for(;;) { -if( !pRegexMatcher->find( startPos, nIcuErr)) +if (!lcl_findRegex( pRegexMatcher, startPos, nIcuErr)) return aRet; // #i118887# ignore zero-length matches e.g. "a*" in "bc" @@ -863,7 +879,7 @@ SearchResult TextSearch::RESrchBkwrd( const OUString& searchStr, UErrorCode nIcuErr = U_ZERO_ERROR; const IcuUniString aSearchTargetStr( (const UChar*)searchStr.getStr(), startPos); pRegexMatcher->reset( aSearchTargetStr); -if( !pRegexMatcher->find( endPos, nIcuErr)) +if (!lcl_findRegex( pRegexMatcher, endPos, nIcuErr)) return aRet; // find the last match @@ -885,7 +901,7 @@ SearchResult TextSearch::RESrchBkwrd( const OUString& searchStr, bFirst = false; if( nFoundEnd == nLastPos) ++nFoundEnd; -} while( pRegexMatcher->find( nFoundEnd, nIcuErr)); +} while( lcl_findRegex( pRegexMatcher, nFoundEnd, nIcuErr)); // Ignore all zero-length matches except "$" anchor on first match. if (nGoodPos == nGoodEnd) @@ -897,7 +913,7 @@ SearchResult TextSearch::RESrchBkwrd( const OUString& searchStr, } // find last match again to get its details -pRegexMatcher->find( nGoodPos, nIcuErr); +lcl_findRegex( pRegexMatcher, nGoodPos, nIcuErr); // fill in the details of the last match const int nGroupCount = pRegexMatcher->groupCount(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice DRAW - Flowcharting automation with scripting language
On Mon, Nov 25, 2013 at 6:51 PM, - wrote: > Flowcharting automation process in Draw (creating flowcharts automatically, > without effort) Scripting language > ... > THE PROBLEM: When you want to create a flowchart, basically you have to > spend time drawing boxes, and connecting them. That happen when you are > planning your flowchart, but many times people don't have time. They need a > "magic solution" that create the flowchart automatically. This idea allows > you to create flow chart automatically in seconds. > ... > [HEAD BEGIN: geometry: Rectangle, color: blue, rotation: 0, radious: 0, > angle: 0, connector: normal, geometry-thickness: 2pt, connector-thickness: > 2pt, shadow orientation:right-down, shadow color: grey, font-type-size: > Calibri, 2pt, font-alignment: center, center] > > // This lines is the commentaries line, if you read the head [ ], it connect > the text "Differential geometry" creating boxes of blue color, the boxes are > rectangles, they have 0 rotatio, 0 radious, 0 angle, the connector of the > boxes is normal, the thickness of the boxes is 2 points, the the thickness > of the connector is also 2 points, shawdow orientation of the boxes is right > down, the shadow color is grey and the font type is Calibri, size is 2 > point, and it is aligned at the center horizontally and also to the center > vertically // > > Differential geometry > differential calculus > Differential geometry > integral calculus > Differential geometry > linear algebra > Differential geometry > multilinear algebra > > > [:HEAD END] Have you looked at the DOT language? https://en.wikipedia.org/wiki/DOT_(graph_description_language) digraph graphname { a -> b -> c; b -> d; } There are a few others: https://en.wikipedia.org/wiki/Category:Graph_description_languages Cheers, --R ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice DRAW - Flowcharting automation with scripting language
We are submitting an idea / proposal to the LibreOffice developer's list, regarding a feature we think it could be important and never was developed before. We wrote an email to i...@documentfoundation.org and they suggest us to post a message in the LibreOffice Developer's List and also the Design Mailing List. In our university we are working a lot with technical documents about physics and maths. Recently we had an idea that we consider it could improve dramatically the Draw performance, allowing it to automate the flowcharting process. We describe the idea as follows: *Flowcharting automation process in Draw (creating flowcharts automatically, without effort) Scripting language* This is a new feature never developed in the software industry. This idea help extensively to academic professionals, researches and companies. *THE PROBLEM:* When you want to create a flowchart, basically you have to spend time drawing boxes, and connecting them. That happen when you are planning your flowchart, but many times people don't have time. They need a "magic solution" that create the flowchart automatically. This idea allows you to create flow chart automatically in seconds. *HOW THE FLOWCHARTING AUTOMATION PROCESS WORKS:* It works with a simple language of tags. I wouldn't call it language, I'd say it is a very easy script. *SIMPLE LANGUAGE OF TAGS* To explain how this works, the best thing is to show an example. Let's imagine we want to connect theories in math. Differential geometry, is related to many things in maths. Okay, let's imagine I want to create a flow chart showing all the stuff in which differential geometry have a relationship. What should I do? Open Draw, creating the boxes, applying the format... generating the connection Okay... what about if we do the same with a simple language? extremely easy to understand, in which you don't need to know anything about programming. *[HEAD BEGIN: geometry: Rectangle, color: blue, rotation: 0, radious: 0, angle: 0, connector: normal, geometry-thickness: 2pt, connector-thickness: 2pt, shadow orientation:right-down, shadow color: grey, font-type-size: Calibri, 2pt, font-alignment: center, center]* // This lines is the commentaries line, if you read the head [ ], it connect the text "Differential geometry" creating boxes of blue color, the boxes are rectangles, they have 0 rotatio, 0 radious, 0 angle, the connector of the boxes is normal, the thickness of the boxes is 2 points, the the thickness of the connector is also 2 points, shawdow orientation of the boxes is right down, the shadow color is grey and the font type is Calibri, size is 2 point, and it is aligned at the center horizontally and also to the center vertically // Differential geometry > differential calculus Differential geometry > integral calculus Differential geometry > linear algebra Differential geometry > multilinear algebra *[:HEAD END]* With that simple code, you only have to type te head to define the properties, place all the stuff you want to connect... and then [HEAD END:]. You save that in a TXT file, and you're done! Open that file in Draw, and Draw will create that flowchart in seconds !!! Basically you only define the properties in the head, then you put all the stuff you want to connect, and it is connected. Let's analyze another piece of code. *[HEAD BEGIN: begin, geometry: Rectangle, color: blue, rotation: 0, radious: 0, angle: 0, connector: normal, geometry-thickness: 2pt, connector-thickness: 2pt, shadow orientation:right-down, shadow color: grey, font-type-size: Calibri, 2pt, font-alignment: center, center]* Differential geometry > differential calculus > integral calculus > Differential geometry *[:HEAD END]* Okay, that connect differential geometry WITH differential calculus WITH integral calculus WITH Differential geometry. So basically you can connect a box with a new box, or also, with an already existing box. In the head you define the properties [ ] and then you define the head's end [HEAD END:] And that is all. You can set up geometry, properties, color, etc. etc. etc. You place all the text you want to connect with > And... everything is connected, represented and flowcharted in seconds !!! Without this simple scripting language, you have to spend hours drawing boxes and doing it all. Having a simple TXT file with the stuff you want to connect, allows you to edit it in Writer, add things, remove things, and do stuff, then you save it, load it in Draw and bingo! here you have the full flowchart in seconds. Imagine how easy would be to organize members in a list. It would be a question of seconds generating flowcharts. We can do something so simple, that even wouldn't be necessary control structures as FOR, WHILE, DO, REPEAT etc. *EASY TO UNDERSTAND, AND EASY TO USE. That is the idea behind this.* ___
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - i18npool/source
i18npool/source/search/textsearch.cxx | 26 -- 1 file changed, 24 insertions(+), 2 deletions(-) New commits: commit 12ebbb7e471d851eec940a47e6737c7c89d0f7f8 Author: Eike Rathke Date: Tue Nov 26 00:18:46 2013 +0100 set a 23 enigma timeout at RegexMatcher, fdo#70627 Change-Id: I390bfec0d36dcc9529785e97994dad2b0704dc80 (cherry picked from commit d838ea200e7d6060d4a759616f9e1fcbf3c36c8e) diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 6953377..ec7ce3c 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -764,8 +764,30 @@ void TextSearch::RESrchPrepare( const ::com::sun::star::util::SearchOptions& rOp aChevronMatcherE.reset(); #endif pRegexMatcher = new RegexMatcher( aIcuSearchPatStr, nIcuSearchFlags, nIcuErr); -if( nIcuErr) -{ delete pRegexMatcher; pRegexMatcher = NULL;} +if (nIcuErr) +{ +delete pRegexMatcher; +pRegexMatcher = NULL; +} +else +{ +// Pathological patterns may result in exponential run time making the +// application appear to be frozen. Limit that. Documentation for this +// call says +// https://ssl.icu-project.org/apiref/icu4c/classicu_1_1RegexMatcher.html#a6ebcfcab4fe6a38678c0291643a03a00 +// "The units of the limit are steps of the match engine. +// Correspondence with actual processor time will depend on the speed +// of the processor and the details of the specific pattern, but will +// typically be on the order of milliseconds." +// Just what is a good value? 42 is always an answer ... the 23 enigma +// as well.. which on the dev's machine is roughly 50 seconds with the +// pattern of fdo#70627. +/* TODO: make this a configuration settable value and possibly take + * complexity of expression into account and maybe even length of text + * to be matched; currently (2013-11-25) that is at most one 64k + * paragraph per RESrchFrwrd()/RESrchBkwrd() call. */ +pRegexMatcher->setTimeLimit( 23*1000, nIcuErr); +} } //--- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/search/textsearch.cxx | 26 -- 1 file changed, 24 insertions(+), 2 deletions(-) New commits: commit d838ea200e7d6060d4a759616f9e1fcbf3c36c8e Author: Eike Rathke Date: Tue Nov 26 00:18:46 2013 +0100 set a 23 enigma timeout at RegexMatcher, fdo#70627 Change-Id: I390bfec0d36dcc9529785e97994dad2b0704dc80 diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 6953377..ec7ce3c 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -764,8 +764,30 @@ void TextSearch::RESrchPrepare( const ::com::sun::star::util::SearchOptions& rOp aChevronMatcherE.reset(); #endif pRegexMatcher = new RegexMatcher( aIcuSearchPatStr, nIcuSearchFlags, nIcuErr); -if( nIcuErr) -{ delete pRegexMatcher; pRegexMatcher = NULL;} +if (nIcuErr) +{ +delete pRegexMatcher; +pRegexMatcher = NULL; +} +else +{ +// Pathological patterns may result in exponential run time making the +// application appear to be frozen. Limit that. Documentation for this +// call says +// https://ssl.icu-project.org/apiref/icu4c/classicu_1_1RegexMatcher.html#a6ebcfcab4fe6a38678c0291643a03a00 +// "The units of the limit are steps of the match engine. +// Correspondence with actual processor time will depend on the speed +// of the processor and the details of the specific pattern, but will +// typically be on the order of milliseconds." +// Just what is a good value? 42 is always an answer ... the 23 enigma +// as well.. which on the dev's machine is roughly 50 seconds with the +// pattern of fdo#70627. +/* TODO: make this a configuration settable value and possibly take + * complexity of expression into account and maybe even length of text + * to be matched; currently (2013-11-25) that is at most one 64k + * paragraph per RESrchFrwrd()/RESrchBkwrd() call. */ +pRegexMatcher->setTimeLimit( 23*1000, nIcuErr); +} } //--- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/create-tags |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 0dd15b4428743cae560c2a433dea10dc471fc587 Author: Eike Rathke Date: Mon Nov 25 23:23:43 2013 +0100 append udkapi and offapi; .hdl are c++ Change-Id: I7c1bde6ce654f1cceffdb77c9903c8d9e67cf189 diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags index 739c7d0..a9f2622 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -8,7 +8,14 @@ # omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q" -ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \ + +ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $omnicppoptions \ --languages=-HTML,Java,JavaScript \ -R --exclude=instdir --exclude=workdir \ --exclude=clone --totals=yes * + +ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $omnicppoptions \ + --languages=-HTML,Java,JavaScript \ + -R --append=yes --totals=yes \ + workdir/UnoApiHeadersTarget/udkapi/normal \ + workdir/UnoApiHeadersTarget/offapi/normal ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source framework/source include/sfx2 reportdesign/source uui/source xmloff/source
dbaccess/source/ui/querydesign/JoinTableView.cxx |2 - framework/source/classes/resource.src|4 +-- include/sfx2/sidebar/ResourceDefinitions.hrc |4 +-- reportdesign/source/ui/dlg/CondFormat.hrc|8 +++--- reportdesign/source/ui/dlg/CondFormat.src|2 - uui/source/nameclashdlg.src | 30 +++ xmloff/source/draw/XMLImageMapContext.cxx|6 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) New commits: commit f74149bc2102b2d2e3066f5a7a3430aa3dc1755f Author: Julien Nabet Date: Mon Nov 25 23:01:00 2013 +0100 Fix some typos for "height" Change-Id: Ibe1fdd7a63ff09097cfe053279d779592d389539 diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 79ef08d..d3c341b 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -521,7 +521,7 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin ) { DBG_CHKTHIS(OJoinTableView,NULL); // determine position: -// the window is divided into lines with height TABWIN_SPACING_Y+TABWIN_HEIGTH_STD. +// the window is divided into lines with height TABWIN_SPACING_Y+TABWIN_HEIGHT_STD. // Then for each line is checked, if there is space for another window. // If there is no space, the next line is checked. Size aOutSize = GetSizePixel(); diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 8b1587a..54e3cc4 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -141,7 +141,7 @@ String STR_TOOLBAR_TITLE_ADDON #define LICENSE_ROW_5 (LICENSE_ROW_4 + FT_HEIGHT+ OFFSET ) #define LICENSE_ROW_6 (LICENSE_ROW_5 + 2*OFFSET ) -#define LICENSE_DIALOG_HEIGTH (LICENSE_ROW_6 + + PB_HEIGHT + 7) +#define LICENSE_DIALOG_HEIGHT (LICENSE_ROW_6 + + PB_HEIGHT + 7) #define LICENSE_COL_2 (LICENSE_COL_1 + OFFSET_IMG) #define LICENSE_COL_3 (LICENSE_COL_2 + COL2_WIDTH +1) @@ -159,7 +159,7 @@ ModalDialog DLG_LICENSE OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; -Size = MAP_APPFONT ( LICENSE_DIALOG_WIDTH , LICENSE_DIALOG_HEIGTH ) ; +Size = MAP_APPFONT ( LICENSE_DIALOG_WIDTH , LICENSE_DIALOG_HEIGHT ) ; Text [ en-US ] = "License Agreement"; MultiLineEdit ML_LICENSE diff --git a/include/sfx2/sidebar/ResourceDefinitions.hrc b/include/sfx2/sidebar/ResourceDefinitions.hrc index b603d79..5c31112 100644 --- a/include/sfx2/sidebar/ResourceDefinitions.hrc +++ b/include/sfx2/sidebar/ResourceDefinitions.hrc @@ -70,9 +70,9 @@ #define TITLEBAR_CONTROL_SPACING_HORIZONTAL 3 #define FI_EXPANSION_INDICATOR_WIDTH6 -#define FI_EXPANSION_INDICATOR_HEIGTH 6 +#define FI_EXPANSION_INDICATOR_HEIGHT 6 #define FI_EXPANSION_INDICATOR_XTITLEBAR_MARGIN_HORIZONTAL -#define FI_EXPANSION_INDICATOR_Y(TITLEBAR_HEIGHT - FI_EXPANSION_INDICATOR_HEIGTH)/2 +#define FI_EXPANSION_INDICATOR_Y(TITLEBAR_HEIGHT - FI_EXPANSION_INDICATOR_HEIGHT)/2 #define FT_TITLE_WIDTH 85 #define FT_TITLE_HEIGHT 10 diff --git a/reportdesign/source/ui/dlg/CondFormat.hrc b/reportdesign/source/ui/dlg/CondFormat.hrc index 5513a81..7978ab7 100644 --- a/reportdesign/source/ui/dlg/CondFormat.hrc +++ b/reportdesign/source/ui/dlg/CondFormat.hrc @@ -57,10 +57,10 @@ #define BTN_REMOVE_CONDITION23 #define ROW_0_POS ( RELATED_CONTROLS ) -#define ROW_0_HEIGTH( FIXEDTEXT_HEIGHT ) -#define ROW_1_POS ( ROW_0_POS + ROW_0_HEIGTH + UNRELATED_CONTROLS ) -#define ROW_1_HEIGTH( EDIT_HEIGHT ) -#define ROW_2_POS ( ROW_1_POS + ROW_1_HEIGTH + UNRELATED_CONTROLS ) +#define ROW_0_HEIGHT( FIXEDTEXT_HEIGHT ) +#define ROW_1_POS ( ROW_0_POS + ROW_0_HEIGHT + UNRELATED_CONTROLS ) +#define ROW_1_HEIGHT( EDIT_HEIGHT ) +#define ROW_2_POS ( ROW_1_POS + ROW_1_HEIGHT + UNRELATED_CONTROLS ) #define ROW_2_HEIGHT( 3 * FIXEDTEXT_HEIGHT ) #define ROW_3_POS ( ROW_2_POS + ROW_2_HEIGHT + RELATED_CONTROLS ) #define ROW_3_HEIGHT( IMAGE_BUTTON_HEIGHT ) diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src index 47f9173..11fff9b 100644 --- a/reportdesign/source/ui/dlg/CondFormat.src +++ b/reportdesign/source/ui/dlg/CondFormat.src @@ -32,7 +32,7 @@ Control WIN_CONDITION FixedLine FL_CONDITION_HEADER { Pos = MAP_APPFONT ( RELATED_CONTROLS, ROW_0_POS ) ; -Size = MAP_APPFONT ( CONDITION_WIDTH - 2 * RELATED_CONTROLS, ROW_0_HEIGTH ) ; +Size = MAP_APPFONT ( CONDITION_WIDTH - 2 * RELATED_CONTROLS, ROW_0_HEIGHT ) ; }; ListBox LB_COND_TYPE diff --git a/uui/source/nameclashdlg.src b/uui/source/nameclashdlg.src index def662b..79e23fd 100644 --- a/uui/source/nameclashdlg.src +++ b/uui/source/nameclashdlg.src @@ -23,25 +23,25 @@ #include "nameclashdlg.hrc" #define DLG_WIDTH
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6e98b8e35d5237eee04419ddd9b42c75d56af180 Author: Michael Stahl Date: Mon Nov 25 22:35:27 2013 +0100 writerfilter: std::map::erase(const_iterator) is C++11 only Change-Id: I3959fe8341b053116e8c3d898da02c82f4118203 diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 1a9ad2d..a098472 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -763,7 +763,7 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties() if( aRowIter->get()->find(PROP_IS_SPLIT_ALLOWED) == aRowIter->get()->end()) aRowIter->get()->Insert( PROP_IS_SPLIT_ALLOWED, uno::makeAny(sal_True ) ); // tblHeader is only our property, remove before the property map hits UNO -PropertyMap::const_iterator aIter = aRowIter->get()->find(PROP_TBL_HEADER); +PropertyMap::iterator const aIter = aRowIter->get()->find(PROP_TBL_HEADER); if (aIter != aRowIter->get()->end()) aRowIter->get()->erase(aIter); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx | 67 - 1 file changed, 45 insertions(+), 22 deletions(-) New commits: commit d77483f0ab1a7f97ec41adfac66d98696adeef70 Author: Caolán McNamara Date: Fri Nov 22 13:20:12 2013 + Related: fdo#41169 fix GTK non-Latin keyboard layout with Latin shortcuts See also rhbz#958300 Change-Id: I5c3cf9652adb7b1c9ec53a32ed39f231a09ae1d7 (cherry picked from commit 8cef6c7ec67aec88b339ca647e784afbabf190f8) Reviewed-on: https://gerrit.libreoffice.org/6759 Reviewed-by: Khaled Hosny Tested-by: Khaled Hosny diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index fef8407..7db5649 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -323,6 +323,14 @@ static sal_uInt16 GetKeyCode( guint keyval ) return nCode; } +static guint GetKeyValFor(GdkKeymap* pKeyMap, guint16 hardware_keycode, guint8 group) +{ +guint updated_keyval = 0; +gdk_keymap_translate_keyboard_state(pKeyMap, hardware_keycode, +(GdkModifierType)0, group, &updated_keyval, NULL, NULL, NULL); +return updated_keyval; +} + // F10 means either KEY_F10 or KEY_MENU, which has to be decided // in the independent part. struct KeyAlternate @@ -373,7 +381,7 @@ struct DamageTracker : public basebmp::IBitmapDeviceDamageTracker void GtkSalFrame::doKeyCallback( guint state, guint keyval, guint16 hardware_keycode, - guint8 /*group*/, + guint8 group, guint32 time, sal_Unicode aOrigCode, bool bDown, @@ -405,33 +413,48 @@ void GtkSalFrame::doKeyCallback( guint state, } #endif -/* #i42122# translate all keys with Ctrl and/or Alt to group 0 -* else shortcuts (e.g. Ctrl-o) will not work but be inserted by -* the application -*/ -/* #i52338# do this for all keys that the independent part has no key code for -*/ +/* + * #i42122# translate all keys with Ctrl and/or Alt to group 0 else + * shortcuts (e.g. Ctrl-o) will not work but be inserted by the + * application + * + * #i52338# do this for all keys that the independent part has no key code + * for + * + * fdo#41169 rather than use group 0, detect if there is a group which can + * be used to input Latin text and use that if possible + */ aEvent.mnCode = GetKeyCode( keyval ); if( aEvent.mnCode == 0 ) { -// check other mapping -gint eff_group, level; -GdkModifierType consumed; -guint updated_keyval = 0; -// use gdk_keymap_get_default instead of NULL; -// workaround a crahs fixed in gtk 2.4 -if( gdk_keymap_translate_keyboard_state( gdk_keymap_get_default(), - hardware_keycode, - (GdkModifierType)0, - 0, - &updated_keyval, - &eff_group, - &level, - &consumed ) ) +gint best_group = SAL_MAX_INT32; + +// Try and find Latin layout +GdkKeymap* keymap = gdk_keymap_get_default(); +GdkKeymapKey *keys; +gint n_keys; +if (gdk_keymap_get_entries_for_keyval(keymap, GDK_A, &keys, &n_keys)) { -aEvent.mnCode = GetKeyCode( updated_keyval ); +// Find the lowest group that supports Latin layout +for (gint i = 0; i < n_keys; ++i) +{ +if (keys[i].level != 0 && keys[i].level != 1) +continue; +best_group = std::min(best_group, keys[i].group); +if (best_group == 0) +break; +} +g_free(keys); } + +//Unavailable, go with original group then I suppose +if (best_group == SAL_MAX_INT32) +best_group = group; + +guint updated_keyval = GetKeyValFor(keymap, hardware_keycode, best_group); +aEvent.mnCode = GetKeyCode(updated_keyval); } + aEvent.mnCode |= GetKeyModCode( state ); if( bDown ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/osl starmath/inc starmath/source
include/osl/security.h|2 +- include/osl/security_decl.hxx |2 +- starmath/inc/dialog.hxx |2 +- starmath/source/dialog.cxx|4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 80a1fb03e3915acf670f27c755dcd2d6870fd782 Author: Julien Nabet Date: Mon Nov 25 22:36:15 2013 +0100 Fix some typos for "Right" Change-Id: I6bcdb57ab45d5571bde53a6c43fe104551197086 diff --git a/include/osl/security.h b/include/osl/security.h index bacf679..a8c3779 100644 --- a/include/osl/security.h +++ b/include/osl/security.h @@ -88,7 +88,7 @@ SAL_DLLPUBLIC oslSecurityError SAL_CALL osl_loginUserOnFileServer( oslSecurity *pSecurity ); -/** Query if the user who is denotes by this security has administrator rigths. +/** Query if the user who is denotes by this security has administrator rights. @param[in] Security the security handle for th user. @return True, if the user has adminsitrator rights, otherwise false. */ diff --git a/include/osl/security_decl.hxx b/include/osl/security_decl.hxx index 5ea3cb1..95785cd 100644 --- a/include/osl/security_decl.hxx +++ b/include/osl/security_decl.hxx @@ -92,7 +92,7 @@ public: */ inline sal_Bool SAL_CALL getConfigDir( rtl::OUString & strDirectory) const; -/** Query if the user who is logged inhas administrator rigths. +/** Query if the user who is logged inhas administrator rights. @return True, if the user has administrator rights, otherwise false. */ inline sal_Bool SAL_CALL isAdministrator() const; diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 8b3aae2..fb5f64c 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -416,7 +416,7 @@ class SmSymDefineDialog : public ModalDialog PushButton aChangeBtn; PushButton aDeleteBtn; FixedImage aRightArrow; -Image aRigthArrow_Im; +Image aRightArrow_Im; SmSymbolManager aSymbolMgrCopy, &rSymbolMgr; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 73d93ab..564fccc 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1994,7 +1994,7 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent, aChangeBtn (this, SmResId(2)), aDeleteBtn (this, SmResId(3)), aRightArrow (this, SmResId(1)), -aRigthArrow_Im (SmResId(1)), +aRightArrow_Im (SmResId(1)), rSymbolMgr (rMgr), pSubsetMap (NULL), pFontList (NULL) @@ -2073,7 +2073,7 @@ void SmSymDefineDialog::InitColor_Impl() aSymbolDisplay .SetBackground( aWall ); aSymbolDisplay .SetTextColor( aTxtColor ); -const Image &rArrowRight = aRigthArrow_Im; +const Image &rArrowRight = aRightArrow_Im; aRightArrow.SetImage( rArrowRight ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - offapi/com sc/inc sc/source
offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl | 11 sc/inc/docuno.hxx |6 sc/inc/formulagroup.hxx |2 - sc/source/core/opencl/formulagroupcl.cxx |5 ++- sc/source/core/opencl/openclwrapper.cxx |4 +-- sc/source/core/opencl/openclwrapper.hxx |3 +- sc/source/core/tool/formulagroup.cxx | 10 +++ sc/source/ui/unoobj/docuno.cxx| 23 ++ 8 files changed, 53 insertions(+), 11 deletions(-) New commits: commit c53e0845e79ec234448ace26c6e225bea4541d9e Author: Markus Mohrhard Date: Mon Nov 25 22:13:32 2013 +0100 add methods to enable and disable automatic device selection Change-Id: I7136ad48ad3f20c60b77838225ce6c927514acff diff --git a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl index 26ab328..994867e 100644 --- a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl +++ b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl @@ -25,6 +25,17 @@ interface XOpenCLSelection : com::sun::star::uno::XInterface void enableOpenCL( [in] boolean enable ); /** + * Enables automatic OpenCL Device Selection + * @param force forces a new evaluation of the best device + */ +void enableAutomaticDeviceSelection( [in] boolean force ); + +/** + * Disbales automatic OpenCL Device Selection + */ +void disableAutomaticDeviceSelection(); + +/** * Set the OpenCL device with the platform ID and device ID * Uses the ID of the platform and the device */ diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 1228afe..a8b6b26 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -326,6 +326,12 @@ public: virtual void SAL_CALL enableOpenCL(sal_Bool bEnable) throw(::com::sun::star::uno::RuntimeException); +virtual void SAL_CALL enableAutomaticDeviceSelection(sal_Bool bForce) +throw(::com::sun::star::uno::RuntimeException); + +virtual void SAL_CALL disableAutomaticDeviceSelection() +throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectOpenCLDevice( sal_Int32 platform, sal_Int32 device ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx index 17f00d1..3834e49 100644 --- a/sc/inc/formulagroup.hxx +++ b/sc/inc/formulagroup.hxx @@ -95,7 +95,7 @@ class SC_DLLPUBLIC FormulaGroupInterpreter public: static FormulaGroupInterpreter *getStatic(); static void fillOpenCLInfo(std::vector& rPlatforms); -static bool switchOpenCLDevice(const OUString& rDeviceId, bool bAutoSelect); +static bool switchOpenCLDevice(const OUString& rDeviceId, bool bAutoSelect, bool bForceEvaluation = false); static void enableOpenCL(bool bEnable); static void getOpenCLDeviceInfo(sal_Int32& rDeviceId, sal_Int32& rPlatformId); diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 8e4c5be..c87badc 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -2889,9 +2889,10 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL fillOpenCLInfo( } SAL_DLLPUBLIC_EXPORT bool SAL_CALL switchOpenClDevice( - const OUString* pDeviceId, bool bAutoSelect) + const OUString* pDeviceId, bool bAutoSelect, + bool bForceEvaluation) { -return sc::opencl::switchOpenclDevice(pDeviceId, bAutoSelect); +return sc::opencl::switchOpenclDevice(pDeviceId, bAutoSelect, bForceEvaluation); } SAL_DLLPUBLIC_EXPORT void SAL_CALL getOpenCLDeviceInfo(size_t* pDeviceId, size_t* pPlatformId) diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx index 54d997d..cf74a4be 100644 --- a/sc/source/core/opencl/openclwrapper.cxx +++ b/sc/source/core/opencl/openclwrapper.cxx @@ -920,7 +920,7 @@ void findDeviceInfoFromDeviceId(cl_device_id aDeviceId, size_t& rDeviceId, size_ } -bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect) +bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEvaluation) { cl_device_id pDeviceId = NULL; if(pDevice) @@ -937,7 +937,7 @@ bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect) OUString path; osl::FileBase::getSystemPathFromFileURL(url,path); OString dsFileName = rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8); -ds_device pSelectedDevice = sc::OpenCLDevice::getDeviceSelection(dsFileName.getStr()); +ds_device pSelectedDevice = sc::OpenCLDevice::getDeviceSelection(dsFileName.getStr(), bForceEvaluation); pDeviceId = pSelectedDevice.oclDevic
[Libreoffice-commits] core.git: offapi/com sc/inc sc/source
offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl | 11 sc/inc/docuno.hxx |6 sc/inc/formulagroup.hxx |2 - sc/source/core/opencl/formulagroupcl.cxx |5 ++- sc/source/core/opencl/openclwrapper.cxx |4 +-- sc/source/core/opencl/openclwrapper.hxx |3 +- sc/source/core/tool/formulagroup.cxx | 10 +++ sc/source/ui/unoobj/docuno.cxx| 23 ++ 8 files changed, 53 insertions(+), 11 deletions(-) New commits: commit b5d4d946e0355d2c2496d61625a9abb06dab6929 Author: Markus Mohrhard Date: Mon Nov 25 22:13:32 2013 +0100 add methods to enable and disable automatic device selection Change-Id: I7136ad48ad3f20c60b77838225ce6c927514acff diff --git a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl index 26ab328..994867e 100644 --- a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl +++ b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl @@ -25,6 +25,17 @@ interface XOpenCLSelection : com::sun::star::uno::XInterface void enableOpenCL( [in] boolean enable ); /** + * Enables automatic OpenCL Device Selection + * @param force forces a new evaluation of the best device + */ +void enableAutomaticDeviceSelection( [in] boolean force ); + +/** + * Disbales automatic OpenCL Device Selection + */ +void disableAutomaticDeviceSelection(); + +/** * Set the OpenCL device with the platform ID and device ID * Uses the ID of the platform and the device */ diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 1228afe..a8b6b26 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -326,6 +326,12 @@ public: virtual void SAL_CALL enableOpenCL(sal_Bool bEnable) throw(::com::sun::star::uno::RuntimeException); +virtual void SAL_CALL enableAutomaticDeviceSelection(sal_Bool bForce) +throw(::com::sun::star::uno::RuntimeException); + +virtual void SAL_CALL disableAutomaticDeviceSelection() +throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectOpenCLDevice( sal_Int32 platform, sal_Int32 device ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx index 17f00d1..3834e49 100644 --- a/sc/inc/formulagroup.hxx +++ b/sc/inc/formulagroup.hxx @@ -95,7 +95,7 @@ class SC_DLLPUBLIC FormulaGroupInterpreter public: static FormulaGroupInterpreter *getStatic(); static void fillOpenCLInfo(std::vector& rPlatforms); -static bool switchOpenCLDevice(const OUString& rDeviceId, bool bAutoSelect); +static bool switchOpenCLDevice(const OUString& rDeviceId, bool bAutoSelect, bool bForceEvaluation = false); static void enableOpenCL(bool bEnable); static void getOpenCLDeviceInfo(sal_Int32& rDeviceId, sal_Int32& rPlatformId); diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 8e4c5be..c87badc 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -2889,9 +2889,10 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL fillOpenCLInfo( } SAL_DLLPUBLIC_EXPORT bool SAL_CALL switchOpenClDevice( - const OUString* pDeviceId, bool bAutoSelect) + const OUString* pDeviceId, bool bAutoSelect, + bool bForceEvaluation) { -return sc::opencl::switchOpenclDevice(pDeviceId, bAutoSelect); +return sc::opencl::switchOpenclDevice(pDeviceId, bAutoSelect, bForceEvaluation); } SAL_DLLPUBLIC_EXPORT void SAL_CALL getOpenCLDeviceInfo(size_t* pDeviceId, size_t* pPlatformId) diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx index 54d997d..cf74a4be 100644 --- a/sc/source/core/opencl/openclwrapper.cxx +++ b/sc/source/core/opencl/openclwrapper.cxx @@ -920,7 +920,7 @@ void findDeviceInfoFromDeviceId(cl_device_id aDeviceId, size_t& rDeviceId, size_ } -bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect) +bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEvaluation) { cl_device_id pDeviceId = NULL; if(pDevice) @@ -937,7 +937,7 @@ bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect) OUString path; osl::FileBase::getSystemPathFromFileURL(url,path); OString dsFileName = rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8); -ds_device pSelectedDevice = sc::OpenCLDevice::getDeviceSelection(dsFileName.getStr()); +ds_device pSelectedDevice = sc::OpenCLDevice::getDeviceSelection(dsFileName.getStr(), bForceEvaluation); pDeviceId = pSelectedDevice.oclDevic
[Libreoffice-commits] core.git: 2 commits - cppcanvas/source
cppcanvas/source/inc/implrenderer.hxx|7 + cppcanvas/source/mtfrenderer/emfplus.cxx | 191 +-- 2 files changed, 164 insertions(+), 34 deletions(-) New commits: commit ad8875e2a007d918636e1e1a2f6214b0fdf0da04 Author: Jan Holesovsky Date: Mon Nov 25 22:09:48 2013 +0100 EMF+: Set the stroke attributes on the custom line caps. This finally makes the rendering of the custom line caps nice & complete. Change-Id: If35ef1c44f34f5d5e6c50789c907105d03e96fca diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 2fa121f0..4907b6f 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -37,8 +37,10 @@ #include #include -#include +#include +#include #include +#include #include #include @@ -103,6 +105,16 @@ const sal_uInt32 EmfPlusCustomLineCapDataTypeAdjustableArrow = 0x0001; const sal_uInt32 EmfPlusCustomLineCapDataFillPath = 0x0001; const sal_uInt32 EmfPlusCustomLineCapDataLinePath = 0x0002; +const sal_uInt32 EmfPlusLineCapTypeFlat = 0x; +const sal_uInt32 EmfPlusLineCapTypeSquare = 0x0001; +const sal_uInt32 EmfPlusLineCapTypeRound = 0x0002; +const sal_uInt32 EmfPlusLineCapTypeTriangle = 0x0003; + +const sal_uInt32 EmfPlusLineJoinTypeMiter = 0x; +const sal_uInt32 EmfPlusLineJoinTypeBevel = 0x0001; +const sal_uInt32 EmfPlusLineJoinTypeRound = 0x0002; +const sal_uInt32 EmfPlusLineJoinTypeMiterClipped = 0x0003; + using namespace ::com::sun::star; using namespace ::basegfx; @@ -594,9 +606,25 @@ namespace cppcanvas } }; +/// Convert stroke caps between EMF+ and rendering API +sal_Int8 lcl_convertStrokeCap(sal_uInt32 nEmfStroke) +{ +switch (nEmfStroke) +{ +case EmfPlusLineCapTypeSquare: return rendering::PathCapType::SQUARE; +case EmfPlusLineCapTypeRound: return rendering::PathCapType::ROUND; +} + +// we have no mapping for EmfPlusLineCapTypeTriangle, so return +// BUTT always +return rendering::PathCapType::BUTT; +} + struct EMFPCustomLineCap : public EMFPObject { sal_uInt32 type; +sal_uInt32 strokeStartCap, strokeEndCap, strokeJoin; +float miterLimit; basegfx::B2DPolyPolygon polygon; public: @@ -608,6 +636,22 @@ namespace cppcanvas { } +void SetAttributes(rendering::StrokeAttributes& aAttributes) +{ +aAttributes.StartCapType = lcl_convertStrokeCap(strokeStartCap); +aAttributes.EndCapType = lcl_convertStrokeCap(strokeEndCap); + +switch (strokeJoin) +{ +case EmfPlusLineJoinTypeMiter:// fall-through +case EmfPlusLineJoinTypeMiterClipped: aAttributes.JoinType = rendering::PathJoinType::MITER; break; +case EmfPlusLineJoinTypeBevel:aAttributes.JoinType = rendering::PathJoinType::BEVEL; break; +case EmfPlusLineJoinTypeRound:aAttributes.JoinType = rendering::PathJoinType::ROUND; break; +} + +aAttributes.MiterLimit = miterLimit; +} + void ReadPath(SvStream& s, ImplRenderer& rR, bool bClosed) { sal_Int32 pathLength; @@ -648,13 +692,12 @@ namespace cppcanvas { sal_uInt32 customLineCapDataFlags, baseCap; float baseInset; -sal_uInt32 strokeStartCap, strokeEndCap, strokeJoin; -float strokeMiterLimit, widthScale; +float widthScale; float fillHotSpotX, fillHotSpotY, strokeHotSpotX, strokeHotSpotY; s >> customLineCapDataFlags >> baseCap >> baseInset >> strokeStartCap >> strokeEndCap >> strokeJoin - >> strokeMiterLimit >> widthScale + >> miterLimit >> widthScale >> fillHotSpotX >> fillHotSpotY >> strokeHotSpotX >> strokeHotSpotY; SAL_INFO("cppcanvas.emf", "EMF+\t\tcustomLineCapDataFlags: 0x" << std::hex << customLineCapDataFlags); @@ -663,7 +706,7 @@ namespace cppcanvas SAL_INFO("cppcanvas.emf", "EMF+\t\tstrokeStartCap: 0x" << std::hex << strokeStartCap); SAL_INFO("cppcanvas.emf", "EMF+\t\tstrokeEndCap: 0x" << std::hex << strokeEndCap); SAL_INFO("cppcanvas.emf", "EMF+\t\tstrokeJoin: 0x" << std::hex << strokeJoin); -SAL_INFO("cppcanvas.emf", "EMF+\t\tstrokeMiterLimit: " << strokeMiterLimit); +SAL_INFO("cppcanvas.emf", "EMF+\t\tmiterLimit: " << miterLimit); SAL_IN
[Libreoffice-commits] core.git: pyuno/source sfx2/source solenv/gcc-wrappers wizards/com writerfilter/source
pyuno/source/module/pyuno_runtime.cxx|2 +- sfx2/source/control/objface.cxx |2 +- solenv/gcc-wrappers/wrapper.cxx |2 +- wizards/com/sun/star/wizards/web/AbstractErrorHandler.py |6 +++--- wizards/com/sun/star/wizards/web/FTPDialog.py|8 writerfilter/source/doctok/resources.xmi |4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 983e0332737c9bdb114ca2132f4c90d33428dbba Author: Julien Nabet Date: Mon Nov 25 22:05:13 2013 +0100 Fix different typos for "unknown" Change-Id: Ib2ee00d4e9f4c6c05d090adfcd5fb791fcbca72c diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index bb7cb8e..5f85ca0 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -566,7 +566,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const default: { OUStringBuffer buf; -buf.appendAscii( "Unknonwn UNO type class " ); +buf.appendAscii( "Unknown UNO type class " ); buf.append( (sal_Int32 ) a.getValueTypeClass() ); throw RuntimeException(buf.makeStringAndClear( ), Reference< XInterface > () ); } diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 2778b39..9242e94 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -366,7 +366,7 @@ const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const { if(pGenoType) return pGenoType->GetRealSlot(nSlotId); -OSL_FAIL("unkonown Slot"); +OSL_FAIL("unknown Slot"); return 0; } diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx index 42ead2f..a3bd84a 100644 --- a/solenv/gcc-wrappers/wrapper.cxx +++ b/solenv/gcc-wrappers/wrapper.cxx @@ -108,7 +108,7 @@ string processccargs(vector rawargs) { } else { -cerr << "unknonwn -o argument - please adapt gcc-wrapper for \"" +cerr << "unknown -o argument - please adapt gcc-wrapper for \"" << (*i) << "\""; exit(1); } diff --git a/wizards/com/sun/star/wizards/web/AbstractErrorHandler.py b/wizards/com/sun/star/wizards/web/AbstractErrorHandler.py index 3f9a102..52fb229 100644 --- a/wizards/com/sun/star/wizards/web/AbstractErrorHandler.py +++ b/wizards/com/sun/star/wizards/web/AbstractErrorHandler.py @@ -109,7 +109,7 @@ class AbstractErrorHandler(ErrorHandler): return 2 elif (errorType in (ErrorHandler.ERROR_WARNING, ErrorHandler.ERROR_MESSAGE)): return 1 -raise ValueError("unkonown error type") +raise ValueError("unknown error type") # @param errorType @@ -136,7 +136,7 @@ class AbstractErrorHandler(ErrorHandler): return OK elif (errorType == ErrorHandler.ERROR_MESSAGE): return OK -raise ValueError("unkonown error type") +raise ValueError("unknown error type") # @deprecated # @param errorType @@ -163,7 +163,7 @@ class AbstractErrorHandler(ErrorHandler): return "warningbox" elif (errorType == ErrorHandler.ERROR_MESSAGE): return "infobox" -raise ValueError("unkonown error type") +raise ValueError("unknown error type") # renders the error # @param ex the exception diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.py b/wizards/com/sun/star/wizards/web/FTPDialog.py index 17d8690..5507ada 100644 --- a/wizards/com/sun/star/wizards/web/FTPDialog.py +++ b/wizards/com/sun/star/wizards/web/FTPDialog.py @@ -60,7 +60,7 @@ class FTPDialog(UnoDialog2, UIConsts): # A Constant used for the setLabel(int) method to change the # status-display. "unknown" is the status when the user first # opens the dialog, or changes the servername/username/password. -STATUS_UNKONWN = 0 +STATUS_UNKNOWN = 0 # A Constant used for the setLabel(int) method to change the # status-display. (connection established) STATUS_OK = 1 @@ -216,7 +216,7 @@ class FTPDialog(UnoDialog2, UIConsts): self.username = "" if (self.publish.cp_Username == None) else self.publish.cp_Username self.password = "" if (self.publish.password == None) else self.publish.password self.folder = self.extractDir(self.publish.cp_URL) -self.setLabel(self.STATUS_UNKONWN) +self.setLabel(self.STATUS_UNKNOWN) self.enableTestButton() self.updateUI() @@ -365,14 +365,14 @@ class FTPDialog(UnoDialog2, UIConsts): self.enableTestButton() self.setEnabled(self.btnOK, False) self.setEnabled(self.btnDir, False) -self.setLabel(self.STATUS_UNKONWN) +self.setLabel(self.STATUS_UNKNOWN) # changes the status la
[Libreoffice-commits] core.git: svtools/source
svtools/source/control/vclxaccessibleheaderbaritem.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 396dd770eb8e12b89865b2e2b899b801e4e6bd34 Author: Tor Lillqvist Date: Mon Nov 25 22:56:38 2013 +0200 WaE: unused variables Change-Id: I65fdfbba7e56d16554790f001bda818dd9f1d335 diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx index 293bba6..d331265 100644 --- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx +++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx @@ -85,7 +85,6 @@ IMPL_LINK( VCLXAccessibleHeaderBarItem, WindowEventListener, VclSimpleEvent*, pE void VCLXAccessibleHeaderBarItem::ProcessWindowEvent( const VclWindowEvent& ) { -Any aOldValue, aNewValue; } // - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/w32/signal.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d6421cf8468487e43185717b00f7135a77b37b33 Author: Tor Lillqvist Date: Mon Nov 25 22:52:08 2013 +0200 WaE: C4100: 'pExcPtrs' : unreferenced formal parameter Change-Id: Ic580c625c78802087a32f8669feec91fe79672cd diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx index 657ac96..a63e692 100644 --- a/sal/osl/w32/signal.cxx +++ b/sal/osl/w32/signal.cxx @@ -401,7 +401,7 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 UserSignal, void* UserData) /* osl_setErrorReporting */ /*/ -void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* pExcPtrs) +void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* /* pExcPtrs */) { const char* pSEHName = NULL; switch( nSEHCode) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |1 writerfilter/source/doctok/WW8Table.cxx | 128 --- writerfilter/source/doctok/resources.xmi | 36 3 files changed, 165 deletions(-) New commits: commit 4944da6a5475c3c9c25ea684077f94348fddd2e5 Author: Miklos Vajna Date: Mon Nov 25 21:38:18 2013 +0100 writerfilter: remove unused WW8Table in doctok Change-Id: I388339da81247c56aa70bd370c8ffb1fdcaf2de6 diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 47133ff..7306cec 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -129,7 +129,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/doctok/WW8PropertySetImpl \ writerfilter/source/doctok/WW8ResourceModelImpl \ writerfilter/source/doctok/WW8StructBase \ -writerfilter/source/doctok/WW8Table \ writerfilter/source/filter/ImportFilter \ writerfilter/source/filter/RtfFilter \ writerfilter/source/filter/WriterFilter \ diff --git a/writerfilter/source/doctok/WW8Table.cxx b/writerfilter/source/doctok/WW8Table.cxx deleted file mode 100644 index abc3cb4..000 --- a/writerfilter/source/doctok/WW8Table.cxx +++ /dev/null @@ -1,128 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -namespace writerfilter { -namespace doctok { - -/* WW8sprmTDefTable */ - -sal_uInt32 WW8sprmTDefTable::get_cellx_count() -{ -return getU8(0x4) + 1; -} - -sal_uInt16 WW8sprmTDefTable::get_cellx(sal_uInt32 nIndex) -{ -return getU16(0x5 + nIndex * 2); -} - -sal_uInt32 WW8sprmTDefTable::get_tc_count() -{ -return get_cellx_count() - 1; -} - -writerfilter::Reference::Pointer_t -WW8sprmTDefTable::get_tc(sal_uInt32 pos) -{ -return writerfilter::Reference::Pointer_t -(new WW8TC(this, - 0x5 + get_cellx_count() * 2 + pos * WW8TC::getSize())); -} - -/* WW8sprmTTableBorders */ - -sal_uInt32 WW8sprmTTableBorders::get_rgbbrc_count() -{ -return 6; -} - -writerfilter::Reference::Pointer_t -WW8sprmTTableBorders::get_rgbbrc(sal_uInt32 pos) -{ -return writerfilter::Reference::Pointer_t -(new WW8BRC(*this, 0x3 + pos * WW8BRC::getSize())); -} - -/* WW8sprmTCellBottomColor */ - -sal_uInt32 WW8sprmTCellBottomColor::get_cellBottomColor_count() -{ -return getU8(0x2) / 4; -} - -sal_uInt32 WW8sprmTCellBottomColor::get_cellBottomColor(sal_uInt32 pos) -{ -return getU32(0x3 + 4 * pos); -} - -/* WW8sprmTCellLeftColor */ - -sal_uInt32 WW8sprmTCellLeftColor::get_cellLeftColor_count() -{ -return getU8(0x2) / 4; -} - -sal_uInt32 WW8sprmTCellLeftColor::get_cellLeftColor(sal_uInt32 pos) -{ -return getU32(0x3 + 4 * pos); -} - -/* WW8sprmTCellTopColor */ - -sal_uInt32 WW8sprmTCellTopColor::get_cellTopColor_count() -{ -return getU8(0x2) / 4; -} - -sal_uInt32 WW8sprmTCellTopColor::get_cellTopColor(sal_uInt32 pos) -{ -return getU32(0x3 + 4 * pos); -} - -/* WW8sprmTCellRightColor */ - -sal_uInt32 WW8sprmTCellRightColor::get_cellRightColor_count() -{ -return getU8(0x2) / 4; -} - -sal_uInt32 WW8sprmTCellRightColor::get_cellRightColor(sal_uInt32 pos) -{ -return getU32(0x3 + 4 * pos); -} - -/* WW8sprmTDefTableShd */ - -sal_uInt32 WW8sprmTDefTableShd::get_shd_count() -{ -return getU8(0x2) / WW8SHD::getSize(); -} - -writerfilter::Reference::Pointer_t -WW8sprmTDefTableShd::get_shd(sal_uInt32 pos) -{ -return writerfilter::Reference::Pointer_t -(new WW8SHD(*this, 0x3 + pos * WW8SHD::getSize())); -} - -}} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 1d21370..52c3d01 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -36193,9 +36193,6 @@ - - - 0xD605 @@ -36319,9 +36316,6 @@ - - -
[Libreoffice-commits] core.git: sc/source
sc/source/filter/oox/workbookfragment.cxx | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) New commits: commit 0ef799a1fd4cb9ffa5488b218239a4c9d0137b42 Author: Kohei Yoshida Date: Mon Nov 25 15:09:10 2013 -0500 Really disable multi-threaded sheet parsing. It will be removed later. Change-Id: Ia6c2711169cd45056cbf85bc8028627d6f57b44b diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 81eb2ed..f8b5ef7 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -58,6 +58,8 @@ #include #include +#define MULTI_THREAD_SHEET_PARSING 0 + #include "oox/ole/vbaproject.hxx" namespace oox { @@ -203,10 +205,12 @@ const RecordInfo* WorkbookFragment::getRecordInfos() const namespace { -class WorkerThread; - typedef std::pair SheetFragmentHandler; typedef std::vector SheetFragmentVector; + +#if MULTI_THREAD_SHEET_PARSING + +class WorkerThread; typedef rtl::Reference WorkerThreadRef; struct WorkerThreadData @@ -311,9 +315,11 @@ public: } }; +#endif + void importSheetFragments( WorkbookFragment& rWorkbookHandler, SheetFragmentVector& rSheets ) { -#if 0 // threaded version +#if MULTI_THREAD_SHEET_PARSING // threaded version size_t nThreadCount = 3; if (nThreadCount > rSheets.size()) nThreadCount = rSheets.size(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - sc/source
sc/source/filter/oox/workbookfragment.cxx | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) New commits: commit 512119c67caa0e87f52e26096074a3d768b40ec1 Author: Kohei Yoshida Date: Mon Nov 25 15:09:10 2013 -0500 Really disable multi-threaded sheet parsing. It will be removed later. Change-Id: Ia6c2711169cd45056cbf85bc8028627d6f57b44b diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 81eb2ed..f8b5ef7 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -58,6 +58,8 @@ #include #include +#define MULTI_THREAD_SHEET_PARSING 0 + #include "oox/ole/vbaproject.hxx" namespace oox { @@ -203,10 +205,12 @@ const RecordInfo* WorkbookFragment::getRecordInfos() const namespace { -class WorkerThread; - typedef std::pair SheetFragmentHandler; typedef std::vector SheetFragmentVector; + +#if MULTI_THREAD_SHEET_PARSING + +class WorkerThread; typedef rtl::Reference WorkerThreadRef; struct WorkerThreadData @@ -311,9 +315,11 @@ public: } }; +#endif + void importSheetFragments( WorkbookFragment& rWorkbookHandler, SheetFragmentVector& rSheets ) { -#if 0 // threaded version +#if MULTI_THREAD_SHEET_PARSING // threaded version size_t nThreadCount = 3; if (nThreadCount > rSheets.size()) nThreadCount = rSheets.size(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - offapi/com offapi/UnoApi_offapi.mk sc/inc sc/source
offapi/UnoApi_offapi.mk |7 + offapi/com/sun/star/sheet/opencl/OpenCLDevice.idl | 37 +++ offapi/com/sun/star/sheet/opencl/OpenCLPlatform.idl | 33 ++ offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl | 52 +++ sc/inc/docuno.hxx | 25 + sc/inc/formulagroup.hxx |1 sc/source/core/opencl/formulagroupcl.cxx |5 + sc/source/core/opencl/openclwrapper.cxx | 39 sc/source/core/opencl/openclwrapper.hxx |2 sc/source/core/tool/formulagroup.cxx | 33 ++ sc/source/ui/unoobj/docuno.cxx| 85 +- 11 files changed, 317 insertions(+), 2 deletions(-) New commits: commit ff7ae53efbe9847eb24feaa96d5ca5e4f49ca272 Author: Markus Mohrhard Date: Sat Nov 23 20:02:26 2013 +0100 add API to retrieve all available OpenCL platforms and devices Change-Id: I2475961ae315ee7193ca2cedd5943b663bfee7a0 diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index e7c52f2..a1ad831 100755 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -3327,6 +3327,8 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/security,\ )) $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/sheet/opencl,\ + OpenCLDevice \ + OpenCLPlatform \ XOpenCLSelection \ )) diff --git a/offapi/com/sun/star/sheet/opencl/OpenCLDevice.idl b/offapi/com/sun/star/sheet/opencl/OpenCLDevice.idl new file mode 100644 index 000..7cf795f --- /dev/null +++ b/offapi/com/sun/star/sheet/opencl/OpenCLDevice.idl @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef __com_sun_star_sheet_opencl_OpenCLDevice_idl__ +#define __com_sun_star_sheet_opencl_OpenCLDevice_idl__ + +module com { module sun { module star { module sheet { module opencl { + +struct OpenCLDevice +{ +/** + * The name of the device as returned by OpenCL + */ +string Name; + +/** + * The vendor of the device as returned by OpenCL + */ +string Vendor; + +/** + * The driver version as returned by OpenCL + */ +string Driver; +}; + +}; }; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/sheet/opencl/OpenCLPlatform.idl b/offapi/com/sun/star/sheet/opencl/OpenCLPlatform.idl new file mode 100644 index 000..bb8a683 --- /dev/null +++ b/offapi/com/sun/star/sheet/opencl/OpenCLPlatform.idl @@ -0,0 +1,33 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef __com_sun_star_sheet_opencl_OpenCLPlatform_idl__ +#define __com_sun_star_sheet_opencl_OpenCLPlatform_idl__ + +#include + +module com { module sun { module star { module sheet { module opencl { + +struct OpenCLPlatform +{ +/** + * The name of the platform as returned by OpenCL + */ +string Name; + +string Vendor; + +sequence< OpenCLDevice > Devices; +}; + +}; }; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl index c6e18cf..26ab328 100644 --- a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl +++ b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl @@ -7,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + module com { module sun { module star { module sheet { module opencl { interface XOpenCLSelection : com::sun::star::uno::XInterface @@ -38,6 +40,11 @@ interface XOpenCLSelection : com::sun::star::uno::XInterface */ long getDeviceID(); +/** + * lists all OpenCL devices and platforms + */ +sequence< OpenCLPlatform > getOpenCLPlatforms(); + }; }; }; }; }; }; diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index a3b7680..1228afe 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -333,6 +334,10 @@ public: virtual sal_Int32 SAL_CALL getDeviceID() throw(::com::sun::star::uno::RuntimeException); + +virtual com::sun::star::uno::Sequence< com::sun::star::sheet::opencl::OpenCLPlatform > +SAL_CALL getOpenCLPlatforms() +
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source
filter/source/flash/swfdialog.cxx |4 +--- filter/source/flash/swfdialog.hxx |1 - 2 files changed, 1 insertion(+), 4 deletions(-) New commits: commit eff099b9083ed5a5f83b45162d45c55e5c6d714a Author: Michael Stahl Date: Mon Nov 25 20:36:30 2013 +0100 filter: un-break the SWF export dialog The mpResMgr is no longer initialized but still checked. (regression from 191dc43f97ed8bec78ee540676a91815cad71104) Change-Id: I8330a74e9209eaca1fee70e7b8ba332482fa0c1d (cherry picked from commit 6e4a4af525923eb6c2b24f6ac0c9936efe827ca3) diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index 152aba4..b63604f 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -91,14 +91,12 @@ Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMul SWFDialog::SWFDialog( const Reference< XComponentContext> &rxContext ) : OGenericUnoDialog( rxContext ) { -mpResMgr = ResMgr::CreateResMgr( "flash", Application::GetSettings().GetUILanguageTag() ); } // - SWFDialog::~SWFDialog() { -delete mpResMgr; } // - @@ -162,7 +160,7 @@ Dialog* SWFDialog::createDialog( Window* pParent ) { Dialog* pRet = NULL; -if( mpResMgr && mxSrcDoc.is() ) +if (mxSrcDoc.is()) { /* TODO: From the controler we may get information what page is visible and what shapes are selected, if we optionaly want to limit output to that diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index a74559e..b4fe8b4 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -39,7 +39,6 @@ class SWFDialog : public ::svt::OGenericUnoDialog, { private: -ResMgr* mpResMgr; com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maMediaDescriptor; com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maFilterData; com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxSrcDoc; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - offapi/com offapi/UnoApi_offapi.mk sc/inc sc/source
offapi/UnoApi_offapi.mk |7 + offapi/com/sun/star/sheet/opencl/OpenCLDevice.idl | 37 +++ offapi/com/sun/star/sheet/opencl/OpenCLPlatform.idl | 33 ++ offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl | 52 +++ sc/inc/docuno.hxx | 25 + sc/inc/formulagroup.hxx |1 sc/source/core/opencl/formulagroupcl.cxx |5 + sc/source/core/opencl/openclwrapper.cxx | 39 sc/source/core/opencl/openclwrapper.hxx |2 sc/source/core/tool/formulagroup.cxx | 33 ++ sc/source/ui/unoobj/docuno.cxx| 85 +- 11 files changed, 317 insertions(+), 2 deletions(-) New commits: commit 4e736a8b8ce4d69c5be924b77bb07bd19b1e4d73 Author: Markus Mohrhard Date: Sat Nov 23 20:02:26 2013 +0100 add API to retrieve all available OpenCL platforms and devices Change-Id: I2475961ae315ee7193ca2cedd5943b663bfee7a0 diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index e7c52f2..a1ad831 100755 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -3327,6 +3327,8 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/security,\ )) $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/sheet/opencl,\ + OpenCLDevice \ + OpenCLPlatform \ XOpenCLSelection \ )) diff --git a/offapi/com/sun/star/sheet/opencl/OpenCLDevice.idl b/offapi/com/sun/star/sheet/opencl/OpenCLDevice.idl new file mode 100644 index 000..7cf795f --- /dev/null +++ b/offapi/com/sun/star/sheet/opencl/OpenCLDevice.idl @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef __com_sun_star_sheet_opencl_OpenCLDevice_idl__ +#define __com_sun_star_sheet_opencl_OpenCLDevice_idl__ + +module com { module sun { module star { module sheet { module opencl { + +struct OpenCLDevice +{ +/** + * The name of the device as returned by OpenCL + */ +string Name; + +/** + * The vendor of the device as returned by OpenCL + */ +string Vendor; + +/** + * The driver version as returned by OpenCL + */ +string Driver; +}; + +}; }; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/sheet/opencl/OpenCLPlatform.idl b/offapi/com/sun/star/sheet/opencl/OpenCLPlatform.idl new file mode 100644 index 000..bb8a683 --- /dev/null +++ b/offapi/com/sun/star/sheet/opencl/OpenCLPlatform.idl @@ -0,0 +1,33 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef __com_sun_star_sheet_opencl_OpenCLPlatform_idl__ +#define __com_sun_star_sheet_opencl_OpenCLPlatform_idl__ + +#include + +module com { module sun { module star { module sheet { module opencl { + +struct OpenCLPlatform +{ +/** + * The name of the platform as returned by OpenCL + */ +string Name; + +string Vendor; + +sequence< OpenCLDevice > Devices; +}; + +}; }; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl index c6e18cf..26ab328 100644 --- a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl +++ b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl @@ -7,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include + module com { module sun { module star { module sheet { module opencl { interface XOpenCLSelection : com::sun::star::uno::XInterface @@ -38,6 +40,11 @@ interface XOpenCLSelection : com::sun::star::uno::XInterface */ long getDeviceID(); +/** + * lists all OpenCL devices and platforms + */ +sequence< OpenCLPlatform > getOpenCLPlatforms(); + }; }; }; }; }; }; diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index a3b7680..1228afe 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -333,6 +334,10 @@ public: virtual sal_Int32 SAL_CALL getDeviceID() throw(::com::sun::star::uno::RuntimeException); + +virtual com::sun::star::uno::Sequence< com::sun::star::sheet::opencl::OpenCLPlatform > +SAL_CALL getOpenCLPlatforms() +
[Libreoffice-commits] core.git: filter/source
filter/source/flash/swfdialog.cxx |4 +--- filter/source/flash/swfdialog.hxx |1 - 2 files changed, 1 insertion(+), 4 deletions(-) New commits: commit 6e4a4af525923eb6c2b24f6ac0c9936efe827ca3 Author: Michael Stahl Date: Mon Nov 25 20:36:30 2013 +0100 filter: un-break the SWF export dialog The mpResMgr is no longer initialized but still checked. (regression from 191dc43f97ed8bec78ee540676a91815cad71104) Change-Id: I8330a74e9209eaca1fee70e7b8ba332482fa0c1d diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index 152aba4..b63604f 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -91,14 +91,12 @@ Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMul SWFDialog::SWFDialog( const Reference< XComponentContext> &rxContext ) : OGenericUnoDialog( rxContext ) { -mpResMgr = ResMgr::CreateResMgr( "flash", Application::GetSettings().GetUILanguageTag() ); } // - SWFDialog::~SWFDialog() { -delete mpResMgr; } // - @@ -162,7 +160,7 @@ Dialog* SWFDialog::createDialog( Window* pParent ) { Dialog* pRet = NULL; -if( mpResMgr && mxSrcDoc.is() ) +if (mxSrcDoc.is()) { /* TODO: From the controler we may get information what page is visible and what shapes are selected, if we optionaly want to limit output to that diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index a74559e..b4fe8b4 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -39,7 +39,6 @@ class SWFDialog : public ::svt::OGenericUnoDialog, { private: -ResMgr* mpResMgr; com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maMediaDescriptor; com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maFilterData; com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxSrcDoc; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [LATE FEATURE] Regression curve / trendline custom name
Hi, On Mon, Nov 25, 2013 at 5:54 PM, Markus Mohrhard wrote: > Hey Tomaz, > > It looks good to me so you have already 1 review. Great, thanks. > However I would like to ask you to add an import test for XLS/XLSX and ODF as > a help for the future. OK, I will look into this next... > Regards, > Markus Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - filter/source
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx |7 --- 1 file changed, 7 deletions(-) New commits: commit 2d4d092090df57ba274e1c46fcc409a68cfe68ca Author: Stephan Bergmann Date: Mon Nov 25 18:01:22 2013 +0100 rhbz#1030009 Remove global XModel ref ...that is apparently effectively unused since 2627bdaddc6f694dc7fc6ba347a305af0f88ee2c "INTEGRATION: CWS fwk02ea: #i28639# always used supplied status indicator" anyway but causes crashes during exit when it holds an SwXTextDocument ref. Change-Id: I542545c793855b41731de72650bf07d5748fcb9f (cherry picked from commit a7464edb0a4368db02b1298b5710cf98b17e282b) Reviewed-on: https://gerrit.libreoffice.org/6804 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index c0b017c..a486cdf 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -66,8 +65,6 @@ using namespace ::com::sun::star::task; #define MAP_LEN(x) x, sizeof(x) - 1 -Reference< com::sun::star::frame::XModel > xModel; - sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (RuntimeException) { @@ -341,9 +338,6 @@ void SAL_CALL XmlFilterAdaptor::setSourceDocument( const Reference< ::com::sun:: { meType = FILTER_EXPORT; mxDoc = xDoc; -com::sun::star::uno::Reference< com::sun::star::frame::XModel >rModel ( com::sun::star::uno::Reference< com::sun::star::frame::XModel >::query( xDoc ) ); -xModel=rModel; - } // XImporter @@ -352,7 +346,6 @@ void SAL_CALL XmlFilterAdaptor::setTargetDocument( const Reference< ::com::sun:: { meType = FILTER_IMPORT; mxDoc = xDoc; -//xModel = uno::Reference< frame::XModel >::query( xDoc ); } // XInitialization void SAL_CALL XmlFilterAdaptor::initialize( const Sequence< Any >& aArguments ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx |7 --- 1 file changed, 7 deletions(-) New commits: commit c3d0095d8d98faf2e9fea525722c046f732b4bab Author: Stephan Bergmann Date: Mon Nov 25 18:01:22 2013 +0100 rhbz#1030009 Remove global XModel ref ...that is apparently effectively unused since 2627bdaddc6f694dc7fc6ba347a305af0f88ee2c "INTEGRATION: CWS fwk02ea: #i28639# always used supplied status indicator" anyway but causes crashes during exit when it holds an SwXTextDocument ref. Change-Id: I542545c793855b41731de72650bf07d5748fcb9f (cherry picked from commit a7464edb0a4368db02b1298b5710cf98b17e282b) diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 492407a..5ad8a22 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -67,8 +66,6 @@ using namespace ::com::sun::star::task; #define MAP_LEN(x) x, sizeof(x) - 1 -Reference< com::sun::star::frame::XModel > xModel; - sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (RuntimeException) { @@ -329,9 +326,6 @@ void SAL_CALL XmlFilterAdaptor::setSourceDocument( const Reference< ::com::sun:: { meType = FILTER_EXPORT; mxDoc = xDoc; -com::sun::star::uno::Reference< com::sun::star::frame::XModel >rModel ( com::sun::star::uno::Reference< com::sun::star::frame::XModel >::query( xDoc ) ); -xModel=rModel; - } // XImporter @@ -340,7 +334,6 @@ void SAL_CALL XmlFilterAdaptor::setTargetDocument( const Reference< ::com::sun:: { meType = FILTER_IMPORT; mxDoc = xDoc; -//xModel = uno::Reference< frame::XModel >::query( xDoc ); } // XInitialization void SAL_CALL XmlFilterAdaptor::initialize( const Sequence< Any >& aArguments ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx |7 --- 1 file changed, 7 deletions(-) New commits: commit a7464edb0a4368db02b1298b5710cf98b17e282b Author: Stephan Bergmann Date: Mon Nov 25 18:01:22 2013 +0100 rhbz#1030009 Remove global XModel ref ...that is apparently effectively unused since 2627bdaddc6f694dc7fc6ba347a305af0f88ee2c "INTEGRATION: CWS fwk02ea: #i28639# always used supplied status indicator" anyway but causes crashes during exit when it holds an SwXTextDocument ref. Change-Id: I542545c793855b41731de72650bf07d5748fcb9f diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 492407a..5ad8a22 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -67,8 +66,6 @@ using namespace ::com::sun::star::task; #define MAP_LEN(x) x, sizeof(x) - 1 -Reference< com::sun::star::frame::XModel > xModel; - sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (RuntimeException) { @@ -329,9 +326,6 @@ void SAL_CALL XmlFilterAdaptor::setSourceDocument( const Reference< ::com::sun:: { meType = FILTER_EXPORT; mxDoc = xDoc; -com::sun::star::uno::Reference< com::sun::star::frame::XModel >rModel ( com::sun::star::uno::Reference< com::sun::star::frame::XModel >::query( xDoc ) ); -xModel=rModel; - } // XImporter @@ -340,7 +334,6 @@ void SAL_CALL XmlFilterAdaptor::setTargetDocument( const Reference< ::com::sun:: { meType = FILTER_IMPORT; mxDoc = xDoc; -//xModel = uno::Reference< frame::XModel >::query( xDoc ); } // XInitialization void SAL_CALL XmlFilterAdaptor::initialize( const Sequence< Any >& aArguments ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/w32/signal.cxx | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) New commits: commit 063976538bed02d68856f05feaa816011d8db49e Author: Herbert Dürr Date: Mon Nov 25 14:38:26 2013 + Related: #i123747# ignore single step and breakpoint SEH events (cherry picked from commit 2a0a1e41bcca97caaf3fdfb375f5cebb330a0fcc) Change-Id: I107a73ad001647eeb25b44e521251ef9543cc83a diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx index 51e08bc..657ac96 100644 --- a/sal/osl/w32/signal.cxx +++ b/sal/osl/w32/signal.cxx @@ -404,11 +404,12 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 UserSignal, void* UserData) void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* pExcPtrs) { const char* pSEHName = NULL; -switch( nSEHCode) { +switch( nSEHCode) +{ case EXCEPTION_ACCESS_VIOLATION: pSEHName = "SEH Exception: ACCESS VIOLATION"; break; case EXCEPTION_DATATYPE_MISALIGNMENT:pSEHName = "SEH Exception: DATATYPE MISALIGNMENT"; break; -// case EXCEPTION_BREAKPOINT: pSEHName = "SEH Exception: BREAKPOINT"; break; -// case EXCEPTION_SINGLE_STEP: pSEHName = "SEH Exception: SINGLE STEP"; break; +case EXCEPTION_BREAKPOINT: /*pSEHName = "SEH Exception: BREAKPOINT";*/ break; +case EXCEPTION_SINGLE_STEP: /*pSEHName = "SEH Exception: SINGLE STEP";*/ break; case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:pSEHName = "SEH Exception: ARRAY BOUNDS EXCEEDED"; break; case EXCEPTION_FLT_DENORMAL_OPERAND: pSEHName = "SEH Exception: DENORMAL FLOAT OPERAND"; break; case EXCEPTION_FLT_DIVIDE_BY_ZERO: pSEHName = "SEH Exception: FLOAT DIVIDE_BY_ZERO"; break; @@ -430,7 +431,9 @@ void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* pExcPtrs) // case EXCEPTION_POSSIBLE_DEADLOCK:pSEHName = "SEH Exception: POSSIBLE DEADLOCK"; break; default: pSEHName = "Unknown SEH Exception"; break; } -throw std::runtime_error( pSEHName); + +if( pSEHName) +throw std::runtime_error( pSEHName); } sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2a/0a1e41bcca97caaf3fdfb375f5cebb330a0fcc
2a/0a1e41bcca97caaf3fdfb375f5cebb330a0fcc |1 + 1 file changed, 1 insertion(+) New commits: commit 3a0061c3095481f571c89835bcd21c7e9a4e6c8d Author: Caolán McNamara Date: Mon Nov 25 16:54:51 2013 + Notes added by 'git notes add' diff --git a/2a/0a1e41bcca97caaf3fdfb375f5cebb330a0fcc b/2a/0a1e41bcca97caaf3fdfb375f5cebb330a0fcc new file mode 100644 index 000..f70bf96 --- /dev/null +++ b/2a/0a1e41bcca97caaf3fdfb375f5cebb330a0fcc @@ -0,0 +1 @@ +merged as: 063976538bed02d68856f05feaa816011d8db49e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [LATE FEATURE] Regression curve / trendline custom name
Hey Tomaz, 2013/11/25 Tomaž Vajngerl > Hi, > > I have implemented applying custom names to trendlines / regression > curves (show in legend) for charts in master. I would also like this > for LO 4.2 but I didn't make until feature freeze. > > This is important for 2 reasons: > - old MS binary format and OOXML support this already, so this is an > compatibility improvement. > - in LO 4.2, the ODF format has been extended with additional > properties for regression curves and this change also needs a new > property. It would be easier if all the changes would be released in > one LO release as all the changes will also be together in the > specification proposal to OASIS. > > Relevant commits are: > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=3af08dd27d45302d162974e671f50af8a11a9cea > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=f58e03e7bb0016c1ca789f7e7b35933c95378121 > for dry cleanup > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=6f62f3f0af9ae8c1b00d0d620f306cae914a3861 > main implementation > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=2b243ba51e786b0993e66232144fd6a6ee9ef724 > ODF import/export > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=c86aed38b67ee5d1b842a7765e363015aea22fcc > OOXML import/export > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=288719571eb617613ba9724f394a257a17d43a81 > MS binary 2000/XP/2003 import/export > > It looks good to me so you have already 1 review. However I would like to ask you to add an import test for XLS/XLSX and ODF as a help for the future. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 88/3e5a34129cae10e063ed9adce431af4f3f1519
88/3e5a34129cae10e063ed9adce431af4f3f1519 |1 + 1 file changed, 1 insertion(+) New commits: commit 15640672a423beb4cb4dea1f1fd838893bf0192a Author: Caolán McNamara Date: Mon Nov 25 16:53:26 2013 + Notes added by 'git notes add' diff --git a/88/3e5a34129cae10e063ed9adce431af4f3f1519 b/88/3e5a34129cae10e063ed9adce431af4f3f1519 new file mode 100644 index 000..403addb --- /dev/null +++ b/88/3e5a34129cae10e063ed9adce431af4f3f1519 @@ -0,0 +1 @@ +ignore: OS/2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 31/693b557864139a32e5297423c1245ac5002e7c
31/693b557864139a32e5297423c1245ac5002e7c |1 + 1 file changed, 1 insertion(+) New commits: commit 65d1a30356fc44e4aa3015f0b44dcd6489355d43 Author: Caolán McNamara Date: Mon Nov 25 16:53:43 2013 + Notes added by 'git notes add' diff --git a/31/693b557864139a32e5297423c1245ac5002e7c b/31/693b557864139a32e5297423c1245ac5002e7c new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/31/693b557864139a32e5297423c1245ac5002e7c @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ec/5f72659e478cf6eed9155a344a3777886000fd
ec/5f72659e478cf6eed9155a344a3777886000fd |1 + 1 file changed, 1 insertion(+) New commits: commit f8d0af75c89ea8847172591f64ae7f02633c3cb4 Author: Caolán McNamara Date: Mon Nov 25 16:44:33 2013 + Notes added by 'git notes add' diff --git a/ec/5f72659e478cf6eed9155a344a3777886000fd b/ec/5f72659e478cf6eed9155a344a3777886000fd new file mode 100644 index 000..4a0a138 --- /dev/null +++ b/ec/5f72659e478cf6eed9155a344a3777886000fd @@ -0,0 +1 @@ +prefer: e5618f1707626a8c096ea2ca8da3cbe2c5f3db16 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10 +++--- writerfilter/source/dmapper/DomainMapperTableHandler.cxx |8 writerfilter/source/dmapper/DomainMapperTableManager.cxx |7 +++ writerfilter/source/dmapper/PropertyIds.cxx |1 + writerfilter/source/dmapper/PropertyIds.hxx |1 + 5 files changed, 24 insertions(+), 3 deletions(-) New commits: commit 74bf915fb48c660bd1e3a04bec6c3a20c754b6af Author: Miklos Vajna Date: Mon Nov 25 16:59:56 2013 +0100 DOCX import: tblHeader implies firstRow If a table row is marked as tblHeader, then the firstRow section of the table style should be applied, even if that row is in fact not the first row. Change-Id: I10605f404160e72c620e9204503203fea1c6d6d8 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 42f250c..5a3a554 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1395,6 +1395,9 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar2, "calendar2.docx") uno::Reference xTable(getParagraphOrTable(1), uno::UNO_QUERY); uno::Reference xCell(xTable->getCellByName("A1"), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(style::CaseMap::UPPERCASE, getProperty(getRun(getParagraphOfText(1, xCell->getText()), 1), "CharCaseMap")); +// Font size in the second row was 11. +xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(16.f, getProperty(getRun(getParagraphOfText(1, xCell->getText()), 1), "CharHeight")); // This paragraph property was missing in table style. xmlDocPtr pXmlStyles = parseExport("word/styles.xml"); diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index a8e51b0..1a9ad2d 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -562,6 +562,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl //it's a uno::Sequence< beans::PropertyValues >* RowPropertyValuesSeq_t* pCellProperties = aCellProperties.getArray(); +PropertyMapVector1::const_iterator aRowIter = m_aRowProperties.begin(); while( aRowOfCellsIterator != aRowOfCellsIteratorEnd ) { //aRowOfCellsIterator points to a vector of PropertyMapPtr @@ -580,6 +581,8 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl if(rInfo.nTblLook&0x40) nRowStyleMask |= CNF_LAST_ROW; // last row style used } +else if (aRowIter->get() && aRowIter->get()->find(PROP_TBL_HEADER) != aRowIter->get()->end()) +nRowStyleMask |= CNF_FIRST_ROW; // table header implies first row if(!nRowStyleMask) // if no row style used yet { // banding used only if not first and or last row style used @@ -729,6 +732,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl #endif ++nRow; ++aRowOfCellsIterator; +++aRowIter; } #ifdef DEBUG_DMAPPER_TABLE_HANDLER @@ -758,6 +762,10 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties() //set default to 'break across pages" if( aRowIter->get()->find(PROP_IS_SPLIT_ALLOWED) == aRowIter->get()->end()) aRowIter->get()->Insert( PROP_IS_SPLIT_ALLOWED, uno::makeAny(sal_True ) ); +// tblHeader is only our property, remove before the property map hits UNO +PropertyMap::const_iterator aIter = aRowIter->get()->find(PROP_TBL_HEADER); +if (aIter != aRowIter->get()->end()) +aRowIter->get()->erase(aIter); aRowProperties[nRow] = (*aRowIter)->GetPropertyValues(); #ifdef DEBUG_DMAPPER_TABLE_HANDLER diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index ac75e07..7db941d 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -201,6 +201,13 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) } else m_nHeaderRepeat = -1; +if (nIntValue) +{ +// Store the info that this is a header, we'll need that when we apply table styles. +TablePropertyMapPtr pPropMap( new TablePropertyMap ); +pPropMap->Insert( PROP_TBL_HEADER, uno::makeAny(nIntValue)); +insertRowProps(pPropMap); +} break; case 0xd608: // TDefTable { diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index b284855..4b05efa 1
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - idlc/test unoidl/CustomTarget_unoidl-write_test.mk unoidl/Module_unoidl.mk unoidl/source
idlc/test/parser/methodoverload.tests| 62 +++ unoidl/CustomTarget_unoidl-write_test.mk | 91 + unoidl/Module_unoidl.mk |1 unoidl/source/sourceprovider-parser.y| 551 +++ unoidl/source/sourceprovider-scanner.hxx | 78 +++- 5 files changed, 700 insertions(+), 83 deletions(-) New commits: commit f16aa10d1a0f8ae69fdd617f054e6bfe2a063517 Author: Stephan Bergmann Date: Mon Nov 25 17:25:08 2013 +0100 Fix unoidl sourceprovider interface base and member checks ...and enable tests shared with idlc Change-Id: I422b16c9b2636835d276cc2085cb640073894c97 (cherry picked from commit 454f3f72c5d7a6f92debb4e4756e330397d507e6) diff --git a/idlc/test/parser/methodoverload.tests b/idlc/test/parser/methodoverload.tests index b6ce276..9a07a4b 100644 --- a/idlc/test/parser/methodoverload.tests +++ b/idlc/test/parser/methodoverload.tests @@ -113,3 +113,65 @@ interface Derived { [optional] interface Base1; [optional] interface Base2; }; + + +EXPECT FAILURE "methodoverload.tests 10": +interface I { +[attribute] long a; +[attribute] short a; +}; + + +EXPECT FAILURE "methodoverload.tests 11": +interface I1 { +[attribute] long a; +}; +interface I2 { +[attribute] short a; +interface I1; +}; + + +EXPECT FAILURE "methodoverload.tests 12": +interface I { +[attribute] long a; +void a(); +}; + + +EXPECT FAILURE "methodoverload.tests 13": +interface I1 { +[attribute] long a; +} +interface I2 { +void a(); +interface I1; +}; + + +EXPECT FAILURE "methodoverload.tests 14": +interface I1 { +void a(); +} +interface I2 { +[attribute] long a; +interface I1; +}; + + +EXPECT SUCCESS "methodoverload.tests 15": +interface I { +[attribute] long a; +void geta(); +void seta(); +}; + + +EXPECT SUCCESS "methodoverload.tests 16": +interface I1 { +[attribute] long a; +}; +interface I2: I1 { +void geta(); +void seta(); +}; diff --git a/unoidl/CustomTarget_unoidl-write_test.mk b/unoidl/CustomTarget_unoidl-write_test.mk new file mode 100644 index 000..22c25b0 --- /dev/null +++ b/unoidl/CustomTarget_unoidl-write_test.mk @@ -0,0 +1,91 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CustomTarget_CustomTarget,unoidl/unoidl-write_test)) + +# this target is phony to run it every time +.PHONY : $(call gb_CustomTarget_get_target,unoidl/unoidl-write_test) + +$(call gb_CustomTarget_get_target,unoidl/unoidl-write_test) : \ +$(call gb_Executable_get_runtime_dependencies,unoidl-write) \ +$(SRCDIR)/solenv/bin/exectest.pl \ +$(SRCDIR)/idlc/test/parser/attribute.tests \ +$(SRCDIR)/idlc/test/parser/constant.tests \ +$(SRCDIR)/idlc/test/parser/constructor.tests \ +$(SRCDIR)/idlc/test/parser/interfaceinheritance.tests \ +$(SRCDIR)/idlc/test/parser/methodoverload.tests \ +$(SRCDIR)/idlc/test/parser/polystruct.tests \ +$(SRCDIR)/idlc/test/parser/published.tests \ +$(SRCDIR)/idlc/test/parser/struct.tests \ +$(SRCDIR)/idlc/test/parser/typedef.tests \ +| $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/.dir + $(call gb_Helper_abbreviate_dirs,( \ +$(PERL) $(SRCDIR)/solenv/bin/exectest.pl \ +$(SRCDIR)/idlc/test/parser/attribute.tests \ +$(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \ +1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \ +{} \ +$(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \ +&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \ +$(SRCDIR)/idlc/test/parser/constant.tests \ +$(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \ +1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \ +{} \ +$(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \ +&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \ +$(SRCDIR)/idlc/test/parser/constructor.tests \ +$(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \ +1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \ +{} \ +$(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \ +&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \ +$(SRCDIR)/idlc/test/parser/interfaceinheritance.tests \ +$(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \ +1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \ +{} \ +$(c
[Libreoffice-commits] core.git: 2 commits - idlc/inc idlc/test unoidl/CustomTarget_unoidl-write_test.mk unoidl/Module_unoidl.mk unoidl/source
idlc/inc/idlc/astinterface.hxx |2 idlc/test/parser/methodoverload.tests| 62 +++ unoidl/CustomTarget_unoidl-write_test.mk | 91 + unoidl/Module_unoidl.mk |1 unoidl/source/sourceprovider-parser.y| 551 +++ unoidl/source/sourceprovider-scanner.hxx | 78 +++- 6 files changed, 701 insertions(+), 84 deletions(-) New commits: commit 1366e61fcbdd63bb87a9709338ad66bd0fd525ab Author: Stephan Bergmann Date: Mon Nov 25 17:26:08 2013 +0100 Fix fn declaration parameter names to match fn definition Change-Id: I733cd478caabc6337af9705a57ebbaeedfb92bb0 diff --git a/idlc/inc/idlc/astinterface.hxx b/idlc/inc/idlc/astinterface.hxx index d4a05a0..fe7415d 100644 --- a/idlc/inc/idlc/astinterface.hxx +++ b/idlc/inc/idlc/astinterface.hxx @@ -109,7 +109,7 @@ private: void checkInheritedInterfaceClashes( DoubleDeclarations & doubleDeclarations, std::set< OString > & seenInterfaces, AstInterface const * ifc, -bool optional, bool direct, bool mainOptional) const; +bool direct, bool optional, bool mainOptional) const; void checkMemberClashes( DoubleMemberDeclarations & doubleMembers, AstDeclaration const * member, commit 454f3f72c5d7a6f92debb4e4756e330397d507e6 Author: Stephan Bergmann Date: Mon Nov 25 17:25:08 2013 +0100 Fix unoidl sourceprovider interface base and member checks ...and enable tests shared with idlc Change-Id: I422b16c9b2636835d276cc2085cb640073894c97 diff --git a/idlc/test/parser/methodoverload.tests b/idlc/test/parser/methodoverload.tests index b6ce276..9a07a4b 100644 --- a/idlc/test/parser/methodoverload.tests +++ b/idlc/test/parser/methodoverload.tests @@ -113,3 +113,65 @@ interface Derived { [optional] interface Base1; [optional] interface Base2; }; + + +EXPECT FAILURE "methodoverload.tests 10": +interface I { +[attribute] long a; +[attribute] short a; +}; + + +EXPECT FAILURE "methodoverload.tests 11": +interface I1 { +[attribute] long a; +}; +interface I2 { +[attribute] short a; +interface I1; +}; + + +EXPECT FAILURE "methodoverload.tests 12": +interface I { +[attribute] long a; +void a(); +}; + + +EXPECT FAILURE "methodoverload.tests 13": +interface I1 { +[attribute] long a; +} +interface I2 { +void a(); +interface I1; +}; + + +EXPECT FAILURE "methodoverload.tests 14": +interface I1 { +void a(); +} +interface I2 { +[attribute] long a; +interface I1; +}; + + +EXPECT SUCCESS "methodoverload.tests 15": +interface I { +[attribute] long a; +void geta(); +void seta(); +}; + + +EXPECT SUCCESS "methodoverload.tests 16": +interface I1 { +[attribute] long a; +}; +interface I2: I1 { +void geta(); +void seta(); +}; diff --git a/unoidl/CustomTarget_unoidl-write_test.mk b/unoidl/CustomTarget_unoidl-write_test.mk new file mode 100644 index 000..22c25b0 --- /dev/null +++ b/unoidl/CustomTarget_unoidl-write_test.mk @@ -0,0 +1,91 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CustomTarget_CustomTarget,unoidl/unoidl-write_test)) + +# this target is phony to run it every time +.PHONY : $(call gb_CustomTarget_get_target,unoidl/unoidl-write_test) + +$(call gb_CustomTarget_get_target,unoidl/unoidl-write_test) : \ +$(call gb_Executable_get_runtime_dependencies,unoidl-write) \ +$(SRCDIR)/solenv/bin/exectest.pl \ +$(SRCDIR)/idlc/test/parser/attribute.tests \ +$(SRCDIR)/idlc/test/parser/constant.tests \ +$(SRCDIR)/idlc/test/parser/constructor.tests \ +$(SRCDIR)/idlc/test/parser/interfaceinheritance.tests \ +$(SRCDIR)/idlc/test/parser/methodoverload.tests \ +$(SRCDIR)/idlc/test/parser/polystruct.tests \ +$(SRCDIR)/idlc/test/parser/published.tests \ +$(SRCDIR)/idlc/test/parser/struct.tests \ +$(SRCDIR)/idlc/test/parser/typedef.tests \ +| $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/.dir + $(call gb_Helper_abbreviate_dirs,( \ +$(PERL) $(SRCDIR)/solenv/bin/exectest.pl \ +$(SRCDIR)/idlc/test/parser/attribute.tests \ +$(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \ +1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \ +{} \ +$(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \ +&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \ +$(SRCDIR)/idlc/test/parser/constant.tests \ +$(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \ +1 $(call gb_Executable_get_command,unoidl-wri
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sal/osl sal/rtl scp2/source solenv/bin
sal/osl/w32/signal.cxx | 11 ++- sal/rtl/source/alloc_arena.c | 15 +--- scp2/source/ooo/registryitem_ooo.scp | 72 --- solenv/bin/modules/installer/windows/registry.pm | 11 --- 4 files changed, 11 insertions(+), 98 deletions(-) New commits: commit 883e5a34129cae10e063ed9adce431af4f3f1519 Author: Yuri Dario Date: Mon Nov 25 15:00:24 2013 + i118923 - OS/2 port: use libc memory allocator to reduce fragmentation. diff --git a/sal/rtl/source/alloc_arena.c b/sal/rtl/source/alloc_arena.c index 790220d..571926c 100644 --- a/sal/rtl/source/alloc_arena.c +++ b/sal/rtl/source/alloc_arena.c @@ -1212,16 +1212,9 @@ SAL_CALL rtl_machdep_alloc ( #elif defined(SAL_W32) addr = VirtualAlloc (NULL, (SIZE_T)(size), MEM_COMMIT, PAGE_READWRITE); #elif defined(SAL_OS2) -{ -APIRET rc; -addr = 0; -// Use DosAlloc* to get a 4KB page aligned address. -rc = DosAllocMem( &addr, size, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY); -if (rc) { -fprintf( stderr, "sal3::DosAllocMem failed rc=%d\n", rc); -addr = 0; -} -} +/* Use valloc() to use libc 16MB chunks when allocating high memory, to reduce + virtual address fragmentation. */ +addr = valloc( size); #endif /* (SAL_UNX || SAL_W32 || SAL_OS2) */ if (addr != MAP_FAILED) @@ -1256,7 +1249,7 @@ SAL_CALL rtl_machdep_free ( #elif defined(SAL_W32) (void) VirtualFree ((LPVOID)(pAddr), (SIZE_T)(0), MEM_RELEASE); #elif defined(SAL_OS2) -(void) DosFreeMem( pAddr); +free(pAddr); #endif /* (SAL_UNX || SAL_W32) */ } commit 2a0a1e41bcca97caaf3fdfb375f5cebb330a0fcc Author: Herbert Dürr Date: Mon Nov 25 14:38:26 2013 + #i123747# ignore single step and breakpoint SEH events diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx index 5e3c3ec..57031ce 100644 --- a/sal/osl/w32/signal.cxx +++ b/sal/osl/w32/signal.cxx @@ -429,11 +429,12 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 UserSignal, void* UserData) void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* pExcPtrs) { const char* pSEHName = NULL; -switch( nSEHCode) { +switch( nSEHCode) +{ case EXCEPTION_ACCESS_VIOLATION: pSEHName = "SEH Exception: ACCESS VIOLATION"; break; case EXCEPTION_DATATYPE_MISALIGNMENT:pSEHName = "SEH Exception: DATATYPE MISALIGNMENT"; break; -// case EXCEPTION_BREAKPOINT: pSEHName = "SEH Exception: BREAKPOINT"; break; -// case EXCEPTION_SINGLE_STEP: pSEHName = "SEH Exception: SINGLE STEP"; break; +case EXCEPTION_BREAKPOINT: /*pSEHName = "SEH Exception: BREAKPOINT";*/ break; +case EXCEPTION_SINGLE_STEP: /*pSEHName = "SEH Exception: SINGLE STEP";*/ break; case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:pSEHName = "SEH Exception: ARRAY BOUNDS EXCEEDED"; break; case EXCEPTION_FLT_DENORMAL_OPERAND: pSEHName = "SEH Exception: DENORMAL FLOAT OPERAND"; break; case EXCEPTION_FLT_DIVIDE_BY_ZERO: pSEHName = "SEH Exception: FLOAT DIVIDE_BY_ZERO"; break; @@ -455,7 +456,9 @@ void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* pExcPtrs) // case EXCEPTION_POSSIBLE_DEADLOCK:pSEHName = "SEH Exception: POSSIBLE DEADLOCK"; break; default: pSEHName = "Unknown SEH Exception"; break; } -throw std::runtime_error( pSEHName); + +if( pSEHName) +throw std::runtime_error( pSEHName); } sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable ) commit 31693b557864139a32e5297423c1245ac5002e7c Author: Andre Fischer Date: Mon Nov 25 14:32:18 2013 + 123729: Removed support for unused scp style LAYERE_REGISTRY and last uses (already commented out). diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index b36c6b9..67c2a49 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -325,78 +325,6 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall Styles = (ALWAYS_REQUIRED); End -//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall -// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; -// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE"; -// ModuleID = gid_Module_Root; -// Name = "BASISINSTALLLOCATION"; -// Value = "[INSTALLLOCATION]Basis\\"; -// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); -//End - -//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall -// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; -// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE"; -// ModuleID = gid_Module_Root; -// Name = "BASISINSTALLLOCATION"; -// Value = "[INST
[Libreoffice-commits] core.git: 4 commits - include/oox oox/source sc/source
include/oox/core/xmlfilterbase.hxx|8 - oox/source/core/xmlfilterbase.cxx | 173 - sc/source/filter/inc/workbookhelper.hxx |6 sc/source/filter/oox/workbookfragment.cxx | 202 -- sc/source/filter/oox/workbookhelper.cxx |7 - 5 files changed, 297 insertions(+), 99 deletions(-) New commits: commit e00562d9835bd82d74ef0301ea7425ff769915df Author: Kohei Yoshida Date: Fri Nov 22 20:57:40 2013 -0500 Allow worker threads to use their own FastParser instances. To prevent deadlock during threaded sheet stream parsing. It now deadlocks at a different place. Change-Id: I0ba0f2c9a257e71b0a340ab14e369b06d5fd8829 diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 87234fb..76eb091 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -56,8 +56,7 @@ namespace oox { namespace core { class FragmentHandler; - -// +class FastParser; struct TextField { com::sun::star::uno::Reference< com::sun::star::text::XText > xText; @@ -107,7 +106,8 @@ public: @return True, if the fragment could be imported. */ -boolimportFragment( const ::rtl::Reference< FragmentHandler >& rxHandler ); +bool importFragment( const rtl::Reference& rxHandler ); +bool importFragment( const rtl::Reference& rxHandler, FastParser& rParser ); /** Imports a fragment into an xml::dom::XDocument. @@ -231,6 +231,8 @@ public: void importDocumentProperties(); +FastParser* createParser() const; + protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const; diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index dddc29c..30f3848 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -143,6 +143,13 @@ struct NamespaceIds: public rtl::StaticWithInit< } }; +void registerNamespaces( FastParser& rParser ) +{ +const Sequence< beans::Pair > ids = NamespaceIds::get(); +for (sal_Int32 i = 0; i < ids.getLength(); ++i) +rParser.registerNamespace(ids[i].Second); +} + } // namespace struct XmlFilterBaseImpl @@ -164,10 +171,7 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxCo maVmlSuffix( ".vml" ) { // register XML namespaces -const Sequence< beans::Pair< OUString, sal_Int32 > > ids= -NamespaceIds::get(); -for( sal_Int32 i=0; i& rxContext ) throw( RuntimeException ) : @@ -203,13 +207,25 @@ void XmlFilterBase::importDocumentProperties() xImporter->importProperties( xDocumentStorage, xPropSupplier->getDocumentProperties() ); } +FastParser* XmlFilterBase::createParser() const +{ +FastParser* pParser = new FastParser(getComponentContext()); +registerNamespaces(*pParser); +return pParser; +} + OUString XmlFilterBase::getFragmentPathFromFirstType( const OUString& rType ) { // importRelations() caches the relations map for subsequence calls return importRelations( OUString() )->getFragmentPathFromFirstType( rType ); } -bool XmlFilterBase::importFragment( const ::rtl::Reference< FragmentHandler >& rxHandler ) +bool XmlFilterBase::importFragment( const rtl::Reference& rxHandler ) +{ +return importFragment(rxHandler, mxImpl->maFastParser); +} + +bool XmlFilterBase::importFragment( const rtl::Reference& rxHandler, FastParser& rParser ) { OSL_ENSURE( rxHandler.is(), "XmlFilterBase::importFragment - missing fragment handler" ); if( !rxHandler.is() ) @@ -263,8 +279,8 @@ bool XmlFilterBase::importFragment( const ::rtl::Reference< FragmentHandler >& r // own try/catch block for showing parser failure assertion with fragment path if( xInStrm.is() ) try { -mxImpl->maFastParser.setDocumentHandler( xDocHandler ); -mxImpl->maFastParser.parseStream( xInStrm, aFragmentPath ); +rParser.setDocumentHandler(xDocHandler); +rParser.parseStream(xInStrm, aFragmentPath); return true; } catch( Exception& ) diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index abafb20..1f472c3 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -53,6 +53,7 @@ namespace oox { namespace core { class FilterBase; class FragmentHandler; class XmlFilterBase; +class FastParser; } } class ScDocument; @@ -269,7 +270,10 @@ public: /** Imports a fragment using the passed fragment handler, which contains the full path to the fragment stream. */ -boolimportOoxFragment( const ::rtl::Reference< ::oox::core::FragmentHand
Re: mso-dumper: utf16 conversion
Thorsten Behrens writes: > For consolidation there, would you give us the two patches under our > standard LibreOffice project license, which is MPL/LGPLv3+ ? > > You can find license statements of other people linked from this page: > > https://wiki.documentfoundation.org/Developers > > Cheers, > > -- Thorsten Hi, I license my past and future contributions to LibreOffice under the terms of MPL/LGPLv3+ Cheers, Jean-François Dockes ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 592ad650350d5a7dda2b0729f109c0cfbaf98e6e Author: Stanislav Horacek Date: Mon Nov 25 13:45:04 2013 +0100 Updated core Project: help f0bcc8f9d2501082e367eb9c93f7efb4ec0e8089 add location of PrettyPrinting property in Expert Config it is hard to find it without location or searching Change-Id: I8b8b4b0bc7e0be601ba53c8c21ccb982ad745452 Reviewed-on: https://gerrit.libreoffice.org/6800 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/helpcontent2 b/helpcontent2 index 2486dba..f0bcc8f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2486dbab9bbbd99ddeda7379762cb1e290f4c2b8 +Subproject commit f0bcc8f9d2501082e367eb9c93f7efb4ec0e8089 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-4-2' - source/text
source/text/shared/00/0021.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f0bcc8f9d2501082e367eb9c93f7efb4ec0e8089 Author: Stanislav Horacek Date: Mon Nov 25 13:45:04 2013 +0100 add location of PrettyPrinting property in Expert Config it is hard to find it without location or searching Change-Id: I8b8b4b0bc7e0be601ba53c8c21ccb982ad745452 Reviewed-on: https://gerrit.libreoffice.org/6800 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/source/text/shared/00/0021.xhp b/source/text/shared/00/0021.xhp index a85b95e..7ce3468 100644 --- a/source/text/shared/00/0021.xhp +++ b/source/text/shared/00/0021.xhp @@ -238,7 +238,7 @@ The text content of the document is located in content.xml. -By default, content.xml is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the %PRODUCTNAME - PreferencesTools - Options - $[officename] - Expert Config tab page you can activate the use of indentations and line breaks by setting the property PrettyPrinting to true. +By default, content.xml is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the %PRODUCTNAME - PreferencesTools - Options - $[officename] - Expert Config tab page you can activate the use of indentations and line breaks by setting the property /org.openoffice.Office.Common/Save/Document PrettyPrinting to true. The file meta.xml contains the meta information of the document, which you can enter under File - Properties. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: src/lib
src/lib/MSPUBCollector.cpp |8 src/lib/MSPUBDocument.cpp |2 +- src/lib/MSPUBParser.cpp| 16 src/lib/MSPUBParser2k.cpp |4 ++-- src/lib/PolygonUtils.cpp | 14 +++--- src/lib/PolygonUtils.h |2 +- 6 files changed, 23 insertions(+), 23 deletions(-) New commits: commit dc74c1d6918ad6531daf6c1bd8e0c3fcd84b7155 Author: Fridrich Å trba Date: Mon Nov 25 16:27:54 2013 +0100 astyle -HU -A1 -k3 -y -n -s2 -r \*.cpp \*.h Change-Id: I58b1148474af8440672d623385440cfee275f472 diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp index 8ab12a9..ff16298 100644 --- a/src/lib/MSPUBCollector.cpp +++ b/src/lib/MSPUBCollector.cpp @@ -803,7 +803,7 @@ boost::function libmspub::MSPUBCollector::paintShape(const ShapeInfo props.insert("fo:padding-top", (double)margins.m_top / EMUS_IN_INCH); props.insert("fo:padding-right", (double)margins.m_right / EMUS_IN_INCH); props.insert("fo:padding-bottom", (double)margins.m_bottom / EMUS_IN_INCH); -if(!!info.m_verticalAlign) +if (!!info.m_verticalAlign) { switch (info.m_verticalAlign.get()) { @@ -1043,9 +1043,9 @@ double libmspub::MSPUBCollector::getCalculationValue(const ShapeInfo &info, unsi case 8: return atan2(valTwo, valOne) / (M_PI / 180); case 9: -return valOne * sin(valTwo * (M_PI / 180) ); +return valOne * sin(valTwo * (M_PI / 180)); case 10: -return valOne * cos(valTwo * (M_PI / 180) ); +return valOne * cos(valTwo * (M_PI / 180)); case 11: return valOne * cos(atan2(valThree, valTwo)); case 12: @@ -1104,7 +1104,7 @@ void libmspub::MSPUBCollector::addDefaultParagraphStyle(const ParagraphStyle &st bool libmspub::MSPUBCollector::addPage(unsigned seqNum) { - if (! (m_widthSet && m_heightSet) ) + if (!(m_widthSet && m_heightSet)) { return false; } diff --git a/src/lib/MSPUBDocument.cpp b/src/lib/MSPUBDocument.cpp index 6ee6108..0371b00 100644 --- a/src/lib/MSPUBDocument.cpp +++ b/src/lib/MSPUBDocument.cpp @@ -69,7 +69,7 @@ MSPUBVersion getVersion(librevenge::RVNGInputStream *input) return MSPUB_UNKNOWN_VERSION; MSPUBVersion version = MSPUB_UNKNOWN_VERSION; -switch(magicVersionByte) +switch (magicVersionByte) { case 0x2C: version = MSPUB_2K2; diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp index d6cc2c7..5a3ed8a 100644 --- a/src/lib/MSPUBParser.cpp +++ b/src/lib/MSPUBParser.cpp @@ -85,7 +85,7 @@ unsigned libmspub::MSPUBParser::getColorIndexByQuillEntry(unsigned entry) short libmspub::MSPUBParser::getBlockDataLength(unsigned type) // -1 for variable-length block with the data length as the first DWORD { - switch(type) + switch (type) { case DUMMY: case 0x5: @@ -247,7 +247,7 @@ int libmspub::MSPUBParser::getStartOffset(ImgType type, unsigned short initial) bool libmspub::MSPUBParser::parseEscherDelay(librevenge::RVNGInputStream *input) { - while (stillReading (input, (unsigned long)-1)) + while (stillReading(input, (unsigned long)-1)) { EscherContainerInfo info = parseEscherContainer(input); const ImgType imgType = imgTypeByBlipType(info.type); @@ -704,7 +704,7 @@ bool libmspub::MSPUBParser::parseShape(librevenge::RVNGInputStream *input, unsigned columnFirstOffset = 0; input->seek(rcao, librevenge::RVNG_SEEK_SET); unsigned arrayLength = readU32(input); - while(stillReading(input, rcao + arrayLength)) + while (stillReading(input, rcao + arrayLength)) { MSPUBBlockInfo info = parseBlock(input, true); if (info.id == 0) @@ -1176,7 +1176,7 @@ libmspub::ParagraphStyle libmspub::MSPUBParser::getParagraphStyle(librevenge::RV while (stillReading(input, offset + len)) { MSPUBBlockInfo info = parseBlock(input, true); -switch(info.id) +switch (info.id) { case PARAGRAPH_ALIGNMENT: ret.m_align = (Alignment)(info.data & 0xFF); // Is this correct? @@ -1219,7 +1219,7 @@ libmspub::ParagraphStyle libmspub::MSPUBParser::getParagraphStyle(librevenge::RV break; case PARAGRAPH_TABS: input->seek(info.dataOffset + 4, librevenge::RVNG_SEEK_SET); - while(stillReading(input, info.dataOffset + info.dataLength)) + while (stillReading(input, info.dataOffset + info.dataLength)) { MSPUBBlockInfo tabArrayInfo = parseBlock(input, true); if (tabArrayInfo.id == TAB_ARRAY) @@ -1409,7 +1409,7 @@ bool libmspub::MSPUBParser::parseEscher(librevenge::RVNGInputStream *input) { unsigned begin = input->tell(); input->seek(begin + 10, librevenge::RVNG_SEEK_SET); -if (! (readU32(input) == 0 && readU32(input) == 0 && readU32(input) == 0 && readU32(input) == 0)) +if (!(readU32(input) == 0 && readU32(input) == 0 && readU32(input) == 0 && readU32(input) == 0)) { m_escherDelayIndices.push_back(currentDelayIndex++); } @@ -2080,7 +2080,7
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDContentCollector.cpp | 20 ++-- src/lib/VSDContentCollector.h|2 +- src/lib/VSDOutputElementList.cpp |4 ++-- src/lib/VSDParser.cpp|2 +- src/lib/VSDXMLHelper.cpp |2 +- src/lib/VSDXMLParserBase.cpp | 12 ++-- src/lib/VSDXMLTokenMap.cpp |2 +- src/lib/VisioDocument.cpp|2 +- 8 files changed, 23 insertions(+), 23 deletions(-) New commits: commit a2638ebb7168596ec0dd352669b094c503c43f5f Author: Fridrich Å trba Date: Mon Nov 25 16:26:23 2013 +0100 astyle -HU -A1 -k3 -y -n -s2 -r \*.cpp \*.h Change-Id: I44eae8df69b2153f777c08332380ee9d5b386b50 diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp index d0553d9..c3889aa 100644 --- a/src/lib/VSDContentCollector.cpp +++ b/src/lib/VSDContentCollector.cpp @@ -461,7 +461,7 @@ void libvisio::VSDContentCollector::_flushText() if (m_paraFormats.empty()) m_paraFormats.push_back(m_defaultParaStyle); - unsigned numCharsInText = (unsigned)(m_textFormat == VSD_TEXT_UTF16 ? m_textStream.size() / 2 : m_textStream.size()); + unsigned numCharsInText = (unsigned)(m_textFormat == VSD_TEXT_UTF16 ? m_textStream.size() / 2 : m_textStream.size()); for (unsigned iChar = 0; iChar < m_charFormats.size(); iChar++) { @@ -471,7 +471,7 @@ void libvisio::VSDContentCollector::_flushText() m_charFormats[iChar].charCount = numCharsInText; } - numCharsInText = (unsigned)(m_textFormat == VSD_TEXT_UTF16 ? m_textStream.size() / 2 : m_textStream.size()); + numCharsInText = (unsigned)(m_textFormat == VSD_TEXT_UTF16 ? m_textStream.size() / 2 : m_textStream.size()); for (unsigned iPara = 0; iPara < m_paraFormats.size(); iPara++) { @@ -1130,7 +1130,7 @@ void libvisio::VSDContentCollector::_handleForeignData(const librevenge::RVNGBin if (m_foreignType == 1) { - switch(m_foreignFormat) + switch (m_foreignFormat) { case 0: case 255: @@ -1170,7 +1170,7 @@ void libvisio::VSDContentCollector::_handleForeignData(const librevenge::RVNGBin librevenge::RVNGString filename; if (m_foreignType == 1) { -switch(m_foreignFormat) +switch (m_foreignFormat) { case 0: case 255: @@ -1193,7 +1193,7 @@ void libvisio::VSDContentCollector::_handleForeignData(const librevenge::RVNGBin break; } } - else if (m_foreignType == 0 || m_foreignType == 4) + else if (m_foreignType == 0 || m_foreignType == 4) { const unsigned char *tmpBinData = m_currentForeignData.getDataBuffer(); // Check for EMF signature @@ -1577,7 +1577,7 @@ void libvisio::VSDContentCollector::collectNURBSTo(unsigned /* id */, unsigned l // Let knotVector run from 0 to 1 double firstKnot = knotVector[0]; double lastKnot = knotVector.back()-knotVector[0]; - for(std::vector::iterator knot = knotVector.begin(); knot != knotVector.end(); ++knot) + for (std::vector::iterator knot = knotVector.begin(); knot != knotVector.end(); ++knot) { *knot -= firstKnot; *knot /= lastKnot; @@ -2526,7 +2526,7 @@ void libvisio::VSDContentCollector::_fillAndShadowProperties(const VSDFillStyle styleProps.insert("librevenge:end-opacity", 1, librevenge::RVNG_PERCENT); styleProps.insert("draw:border", 0, librevenge::RVNG_PERCENT); -switch(style.pattern) +switch (style.pattern) { case 25: styleProps.insert("draw:angle", 270); @@ -2591,7 +2591,7 @@ void libvisio::VSDContentCollector::_fillAndShadowProperties(const VSDFillStyle styleProps.insert("librevenge:end-opacity", 1, librevenge::RVNG_PERCENT); styleProps.insert("draw:border", 0, librevenge::RVNG_PERCENT); -switch(style.pattern) +switch (style.pattern) { case 36: styleProps.insert("svg:cx", 0, librevenge::RVNG_PERCENT); @@ -2778,7 +2778,7 @@ void libvisio::VSDContentCollector::endPages() m_pages.draw(m_painter); } -bool libvisio::VSDContentCollector::parseFormatId( const char *formatString, unsigned short &result ) +bool libvisio::VSDContentCollector::parseFormatId(const char *formatString, unsigned short &result) { using namespace ::boost::spirit::classic; @@ -2801,7 +2801,7 @@ bool libvisio::VSDContentCollector::parseFormatId( const char *formatString, uns ) )>> end_p, // End grammar -space_p).full ) +space_p).full) { return true; } diff --git a/src/lib/VSDContentCollector.h b/src/lib/VSDContentCollector.h index 504747b..e56bb2d 100644 --- a/src/lib/VSDContentCollector.h +++ b/src/lib/VSDContentCollector.h @@ -216,7 +216,7 @@ private: void appendCharacters(librevenge::RVNGString &text, const std::vector &characters, TextFormat format); void appendCharacters(librevenge::RVNGString &text, const std::vector &characters); void _convertDataToString(librevenge::RVNGString &result, const librevenge::RVNGBinaryData &data, TextFormat forma
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRCollector.cpp |2 +- src/lib/CDROutputElementList.cpp |4 ++-- src/lib/CDRParser.cpp|8 src/lib/CDRPath.cpp | 22 +++--- src/lib/CommonParser.cpp |2 +- 5 files changed, 19 insertions(+), 19 deletions(-) New commits: commit 5c5d18e14ca19ef90d42a71cb1dab4fa060689dd Author: Fridrich Å trba Date: Mon Nov 25 16:27:07 2013 +0100 astyle -HU -A1 -k3 -y -n -s2 -r \*.cpp \*.h Change-Id: Iadd40c708ad1cf74843dda3a6ee6f7d374766f68 diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp index 266f1d6..eabfd35 100644 --- a/src/lib/CDRCollector.cpp +++ b/src/lib/CDRCollector.cpp @@ -454,7 +454,7 @@ unsigned libcdr::CDRParserState::_getRGBColor(const CDRColor &color) if (hue < 120) { - satRed = (double)(120 - hue) / 60.0; + satRed = (double)(120 - hue) / 60.0; satGreen = (double)hue/60.0; satBlue = 0.0; } diff --git a/src/lib/CDROutputElementList.cpp b/src/lib/CDROutputElementList.cpp index 6a2ecd3..0491b8f 100644 --- a/src/lib/CDROutputElementList.cpp +++ b/src/lib/CDROutputElementList.cpp @@ -343,7 +343,7 @@ libcdr::CDROutputElementList::CDROutputElementList(const libcdr::CDROutputElemen libcdr::CDROutputElementList &libcdr::CDROutputElementList::operator=(const libcdr::CDROutputElementList &elementList) { for (std::vector::iterator iter = m_elements.begin(); iter != m_elements.end(); ++iter) -delete (*iter); +delete(*iter); m_elements.clear(); @@ -356,7 +356,7 @@ libcdr::CDROutputElementList &libcdr::CDROutputElementList::operator=(const libc libcdr::CDROutputElementList::~CDROutputElementList() { for (std::vector::iterator iter = m_elements.begin(); iter != m_elements.end(); ++iter) -delete (*iter); +delete(*iter); m_elements.clear(); } diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp index f73e54f..e3cbbb9 100644 --- a/src/lib/CDRParser.cpp +++ b/src/lib/CDRParser.cpp @@ -158,7 +158,7 @@ static int parseColourString(const char *colourString, libcdr::CDRColor &colour, space_p).full; } - if( !bRes ) + if (!bRes) return -1; if (colourModel == "CMYK") @@ -1099,7 +1099,7 @@ libcdr::CDRColor libcdr::CDRParser::readColor(librevenge::RVNGInputStream *input colorModel = 0x05; // RGB unsigned red = (unsigned)tint * (unsigned)r + 255 * (100 - tint); unsigned green = (unsigned)tint * (unsigned)g + 255 * (100 - tint); -unsigned blue = (unsigned )tint * (unsigned)b + 255 * (100 - tint); +unsigned blue = (unsigned)tint * (unsigned)b + 255 * (100 - tint); red /= 100; green /= 100; blue /= 100; @@ -2575,7 +2575,7 @@ void libcdr::CDRParser::readFont(librevenge::RVNGInputStream *input, unsigned le else { unsigned char character = 0; -while(true) +while (true) { character = readU8(input); if (character) @@ -,7 +,7 @@ void libcdr::CDRParser::readStyd(librevenge::RVNGInputStream *input) { input->seek(startPosition+argOffsets[i], librevenge::RVNG_SEEK_SET); CDR_DEBUG_MSG(("Styd: argument type: 0x%x\n", argTypes[i])); -switch(argTypes[i]) +switch (argTypes[i]) { case STYD_NAME: break; diff --git a/src/lib/CDRPath.cpp b/src/lib/CDRPath.cpp index 16cac55..01b5907 100644 --- a/src/lib/CDRPath.cpp +++ b/src/lib/CDRPath.cpp @@ -45,7 +45,7 @@ namespace static inline double getAngle(double bx, double by) { - return fmod(2*M_PI + (by > 0.0 ? 1.0 : -1.0) * acos( bx / sqrt(bx * bx + by * by) ), 2*M_PI); + return fmod(2*M_PI + (by > 0.0 ? 1.0 : -1.0) * acos(bx / sqrt(bx * bx + by * by)), 2*M_PI); } static void getEllipticalArcBBox(double x0, double y0, @@ -126,7 +126,7 @@ static void getEllipticalArcBBox(double x0, double y0, else { txmin = -atan(ry*tan(phi)/rx); -txmax = M_PI - atan (ry*tan(phi)/rx); +txmax = M_PI - atan(ry*tan(phi)/rx); xmin = cx + rx*cos(txmin)*cos(phi) - ry*sin(txmin)*sin(phi); xmax = cx + rx*cos(txmax)*cos(phi) - ry*sin(txmax)*sin(phi); double tmpY = cy + rx*cos(txmin)*sin(phi) + ry*sin(txmin)*cos(phi); @@ -198,7 +198,7 @@ static void getQuadraticBezierBBox(double x0, double y0, double x1, double y1, d ymax = y0 > y ? y0 : y; double t = quadraticDerivative(x0, x1, x); - if(t>=0 && t<=1) + if (t>=0 && t<=1) { double tmpx = quadraticExtreme(t, x0, x1, x); xmin = tmpx < xmin ? tmpx : xmin; @@ -206,7 +206,7 @@ static void getQuadraticBezierBBox(double x0, double y0, double x1, double y1, d } t = quadraticDerivative(y0, y1, y); - if(t>=0 && t<=1) + if (t>=0 && t<=1) { double tmpy = quadraticExtreme(t, y0, y1, y); ymin = tmpy < ymin ? tmpy : ymin; @@ -704,10 +704,10 @@ void libcdr::CDRPath::writeOut(librevenge::RVNGString &path, librevenge::RVNGStr { librevenge::RVNGPropertyListVector vec; writeOut(vec); - if(vec.count() == 0) +
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 82ebfa31c3a821f3624e06958ec706769e2b6f1c Author: Jan Holesovsky Date: Tue Nov 19 10:02:12 2013 +0100 EMF+: Stroke size is always supposed to be absolute. Change-Id: I7221311e5dee6384dc2d1c071bf6f1c61811895a diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 2f48b9b..be2bfbd 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -625,7 +625,7 @@ namespace cppcanvas SAL_INFO ("cppcanvas.emf", "TODO: pen with zero width - using minimal which might not be correct\n"); } #endif -rStrokeAttributes.StrokeWidth = (rState.mapModeTransform * rR.MapSize (width == 0.0 ? 0.05 : width, 0)).getX (); +rStrokeAttributes.StrokeWidth = fabs((rState.mapModeTransform * rR.MapSize (width == 0.0 ? 0.05 : width, 0)).getX()); } void Read (SvStream& s, ImplRenderer& rR, sal_Int32, sal_Int32 ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 3 commits - vcl/source
vcl/source/filter/wmf/winmtf.cxx | 33 + vcl/source/filter/wmf/winmtf.hxx |3 --- vcl/source/filter/wmf/winwmf.cxx |1 - 3 files changed, 1 insertion(+), 36 deletions(-) New commits: commit ec27d36b2adea77201c03ae88ee71ac259e847be Author: Jan Holesovsky Date: Thu Nov 21 16:28:32 2013 +0100 fdo#61272: Do the mapping correctly both for WMF and EMF. Turns out that for the WMF, we already had everything set up correctly, we were just overwriting the right settings with default data again :-) - fix that. Change-Id: I14b0c12b10f58eb7031f9da712dee76344c75159 diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index 74aed1d..9120b26 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -2006,7 +2006,7 @@ void WinMtfOutput::SetRefMill( const Size& rSize ) void WinMtfOutput::SetMapMode( sal_uInt32 nMapMode ) { mnMapMode = nMapMode; -if ( nMapMode == MM_TEXT ) +if ( nMapMode == MM_TEXT && !mbIsMapWinSet ) { mnWinExtX = mnDevWidth; mnWinExtY = mnDevHeight; commit cca0ae43e58f875116fd922c2b70ef6c89305fcf Author: Jan Holesovsky Date: Wed Nov 20 21:17:50 2013 +0100 Related fdo#61272: Revert "wmf-mm-text.diff: Fix WMF rendering, n#417818" This approach to WMF breaks EMF reading, need to revert it, and fix a different way. This reverts commit db1b08d217ebbdd1b0296e1da260bf314a77acf5. Conflicts: vcl/source/filter/wmf/winmtf.cxx vcl/source/filter/wmf/winmtf.hxx Change-Id: I8f779791153f2e1faa086c91b82b3e8b93304f3b diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index 2ffde89..74aed1d 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -374,14 +374,6 @@ Point WinMtfOutput::ImplMap( const Point& rPt ) { switch( mnMapMode ) { -case MM_TEXT: -fX2 -= mnWinOrgX; -fY2 -= mnWinOrgY; -fX2 *= 2540.0/mnUnitsPerInch; -fY2 *= 2540.0/mnUnitsPerInch; -fX2 += mnDevOrgX; -fY2 += mnDevOrgY; -break; case MM_LOENGLISH : { fX2 -= mnWinOrgX; @@ -467,10 +459,6 @@ Size WinMtfOutput::ImplMap( const Size& rSz ) { switch( mnMapMode ) { -case MM_TEXT: -fWidth *= 2540.0/mnUnitsPerInch; -fHeight*= 2540.0/mnUnitsPerInch; -break; case MM_LOENGLISH : { fWidth *= HUNDREDTH_MILLIMETERS_PER_MILLIINCH*10; @@ -907,7 +895,6 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) : mbComplexClip ( false ), mnGfxMode ( GM_COMPATIBLE ), mnMapMode ( MM_TEXT ), -mnUnitsPerInch ( 96 ), mnDevOrgX ( 0 ), mnDevOrgY ( 0 ), mnDevWidth ( 1 ), @@ -2033,14 +2020,6 @@ void WinMtfOutput::SetMapMode( sal_uInt32 nMapMode ) -void WinMtfOutput::SetUnitsPerInch( sal_uInt16 nUnitsPerInch ) -{ -if( nUnitsPerInch != 0 ) -mnUnitsPerInch = nUnitsPerInch; -} - - - void WinMtfOutput::SetWorldTransform( const XForm& rXForm ) { maXForm.eM11 = rXForm.eM11; diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 14def6d..46cc80a 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -589,7 +589,6 @@ struct GDIObj class WinMtfOutput { - WinMtfPathObj aPathObj; WinMtfClipPath aClipPath; @@ -626,7 +625,6 @@ class WinMtfOutput sal_uInt32 mnGfxMode; sal_uInt32 mnMapMode; -sal_uInt16 mnUnitsPerInch; XForm maXForm; sal_Int32 mnDevOrgX, mnDevOrgY; @@ -680,7 +678,6 @@ public: sal_uInt32 GetMapMode() const { return mnMapMode; }; voidSetMapMode( sal_uInt32 mnMapMode ); -voidSetUnitsPerInch( sal_uInt16 nUnitsPerInch ); voidSetWorldTransform( const XForm& rXForm ); const XForm&GetWorldTransform() const { return maXForm; } voidModifyWorldTransform( const XForm& rXForm, sal_uInt32 nMode ); diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index ff97d10..f3cfaf2 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -1109,7 +1109,6 @@ sal_Bool WMFReader::ReadHeader() } } -pOut->SetUnitsPerInch( nUnitsPerInch ); pOut->SetWinOrg( aPlaceableBound.TopLeft() ); Size aWMFSize( labs( aPlaceableBound.GetWidth() ), labs( aPlaceableBound.GetHeight() ) ); pOut->SetWinExt( aWMFSize ); commit 8614fbc8e68aae5790b7ee06021393ea95e92
[Libreoffice-commits] core.git: desktop/source sal/osl
desktop/source/app/app.cxx |7 ++- sal/osl/w32/signal.cxx | 41 + 2 files changed, 43 insertions(+), 5 deletions(-) New commits: commit e79af02bb0e8de14c881f5071a519f6fadedc828 Author: Herbert Dürr Date: Mon Nov 25 13:29:47 2013 + Resolves: #i123747# allow treating Window's SEH events as C++ exceptions The crash reporter facility can provide much better details about crashes. But if that facility is disabled then handling SEH events such as div-by-zero as C++ exceptions is a worthwhile alternative. It can provide a few interesting details and it allows a graceful shutdown of the application. (cherry picked from commit c9d10b167b37a9cb0bb310cafc8e80b6cce8ea7a) Conflicts: sal/osl/w32/signal.cxx Change-Id: I25324d6e02ab8acd8fd2b036b77039aac87cf262 diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index ee3b4d5..79fdc50 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1488,11 +1488,8 @@ int Desktop::Main() // set static variable to enabled/disable crash reporter retrieveCrashReporterState(); -if ( !isCrashReporterEnabled() ) -{ -osl_setErrorReporting( sal_False ); -// disable stack trace feature -} +const bool bCrashReporterEnabled = isCrashReporterEnabled(); +osl_setErrorReporting( !bCrashReporterEnabled ); // create title string LanguageTag aLocale( LANGUAGE_SYSTEM); diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx index f13a78a..51e08bc 100644 --- a/sal/osl/w32/signal.cxx +++ b/sal/osl/w32/signal.cxx @@ -33,6 +33,8 @@ #include #include #include +#include +#include typedef struct _oslSignalHandlerImpl { @@ -398,11 +400,50 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 UserSignal, void* UserData) /*/ /* osl_setErrorReporting */ /*/ + +void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* pExcPtrs) +{ +const char* pSEHName = NULL; +switch( nSEHCode) { +case EXCEPTION_ACCESS_VIOLATION: pSEHName = "SEH Exception: ACCESS VIOLATION"; break; +case EXCEPTION_DATATYPE_MISALIGNMENT:pSEHName = "SEH Exception: DATATYPE MISALIGNMENT"; break; +// case EXCEPTION_BREAKPOINT: pSEHName = "SEH Exception: BREAKPOINT"; break; +// case EXCEPTION_SINGLE_STEP: pSEHName = "SEH Exception: SINGLE STEP"; break; +case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:pSEHName = "SEH Exception: ARRAY BOUNDS EXCEEDED"; break; +case EXCEPTION_FLT_DENORMAL_OPERAND: pSEHName = "SEH Exception: DENORMAL FLOAT OPERAND"; break; +case EXCEPTION_FLT_DIVIDE_BY_ZERO: pSEHName = "SEH Exception: FLOAT DIVIDE_BY_ZERO"; break; +case EXCEPTION_FLT_INEXACT_RESULT: pSEHName = "SEH Exception: FLOAT INEXACT RESULT"; break; +case EXCEPTION_FLT_INVALID_OPERATION:pSEHName = "SEH Exception: INVALID FLOAT OPERATION"; break; +case EXCEPTION_FLT_OVERFLOW: pSEHName = "SEH Exception: FLOAT OVERFLOW"; break; +case EXCEPTION_FLT_STACK_CHECK: pSEHName = "SEH Exception: FLOAT STACK_CHECK"; break; +case EXCEPTION_FLT_UNDERFLOW:pSEHName = "SEH Exception: FLOAT UNDERFLOW"; break; +case EXCEPTION_INT_DIVIDE_BY_ZERO: pSEHName = "SEH Exception: INTEGER DIVIDE_BY_ZERO"; break; +case EXCEPTION_INT_OVERFLOW: pSEHName = "SEH Exception: INTEGER OVERFLOW"; break; +case EXCEPTION_PRIV_INSTRUCTION: pSEHName = "SEH Exception: PRIVILEDGED INSTRUCTION"; break; +case EXCEPTION_IN_PAGE_ERROR:pSEHName = "SEH Exception: IN_PAGE_ERROR"; break; +case EXCEPTION_ILLEGAL_INSTRUCTION: pSEHName = "SEH Exception: ILLEGAL INSTRUCTION"; break; +case EXCEPTION_NONCONTINUABLE_EXCEPTION: pSEHName = "SEH Exception: NONCONTINUABLE EXCEPTION"; break; +case EXCEPTION_STACK_OVERFLOW: pSEHName = "SEH Exception: STACK OVERFLOW"; break; +case EXCEPTION_INVALID_DISPOSITION: pSEHName = "SEH Exception: INVALID DISPOSITION"; break; +case EXCEPTION_GUARD_PAGE: pSEHName = "SEH Exception: GUARD PAGE"; break; +case EXCEPTION_INVALID_HANDLE: pSEHName = "SEH Exception: INVALID HANDLE"; break; +// case EXCEPTION_POSSIBLE_DEADLOCK:pSEHName = "SEH Exception: POSSIBLE DEADLOCK"; break; +default: pSEHName = "Unknown SEH Exception"; break; +} +throw std::runtime_error( pSEHName); +} + sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable ) { sal_Bool bOld = bErrorReportingEnabled; bErrorReportingEnabled = bEnable; +if( !bEn
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - distro-configs/CPLinux.conf
distro-configs/CPLinux.conf |3 --- 1 file changed, 3 deletions(-) New commits: commit e88d373ce0e2b65308e56a8312c9b297aad61d0b Author: Andras Timar Date: Mon Nov 25 15:35:46 2013 +0100 dung out unrecognized configure options Change-Id: I2760dfe82b8c77924dea49d89d092791ee38e9e4 diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf index 14d9a17..731aa02 100644 --- a/distro-configs/CPLinux.conf +++ b/distro-configs/CPLinux.conf @@ -1,10 +1,8 @@ --with-vendor=Collabora --with-system-dicts ---without-unix-wrapper --without-system-zlib --without-system-poppler --without-system-openssl ---without-system-mozilla --without-system-mesa-headers --without-system-libpng --without-system-libxml @@ -37,7 +35,6 @@ --enable-ext-languagetool --enable-epm --enable-python=internal ---disable-unix-qstart-libpng --disable-randr-link --disable-kde4 --with-package-format=deb rpm ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c9/d10b167b37a9cb0bb310cafc8e80b6cce8ea7a
c9/d10b167b37a9cb0bb310cafc8e80b6cce8ea7a |1 + 1 file changed, 1 insertion(+) New commits: commit 9aed1293f1a24fcb6dba6d37a33ea06892e91c66 Author: Caolán McNamara Date: Mon Nov 25 14:23:31 2013 + Notes added by 'git notes add' diff --git a/c9/d10b167b37a9cb0bb310cafc8e80b6cce8ea7a b/c9/d10b167b37a9cb0bb310cafc8e80b6cce8ea7a new file mode 100644 index 000..0e634e8 --- /dev/null +++ b/c9/d10b167b37a9cb0bb310cafc8e80b6cce8ea7a @@ -0,0 +1 @@ +merged as: e79af02bb0e8de14c881f5071a519f6fadedc828 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: psprint_config/configuration
psprint_config/configuration/ppds/SGENPRT.PS |1 + 1 file changed, 1 insertion(+) New commits: commit 871d8e0f278dab646e1877a505577edc730a26cf Author: Caolán McNamara Date: Mon Nov 25 14:13:40 2013 + Resolves: rhbz#188467 default to Type42 Change-Id: Ifea55c532784accd218ad359349708f48aee7bb5 diff --git a/psprint_config/configuration/ppds/SGENPRT.PS b/psprint_config/configuration/ppds/SGENPRT.PS index 0446757..177e2c4 100644 --- a/psprint_config/configuration/ppds/SGENPRT.PS +++ b/psprint_config/configuration/ppds/SGENPRT.PS @@ -42,6 +42,7 @@ *ColorDevice: True *DefaultColorSpace: RGB *LanguageLevel: "2" +*TTRasterizer: Type42 *% --- For None Color or old PostScript(R) printers use following lines --- *% *ColorDevice: False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/inc vcl/source
include/vcl/combobox.hxx|5 ++-- include/vcl/lstbox.hxx |4 ++- include/vcl/menu.hxx|9 +++ vcl/inc/ilstbox.hxx | 14 ++- vcl/source/control/combobox.cxx | 12 +- vcl/source/control/edit.cxx | 31 - vcl/source/control/ilstbox.cxx | 21 + vcl/source/control/lstbox.cxx | 33 +++ vcl/source/control/morebtn.cxx |5 +--- vcl/source/control/tabctrl.cxx |3 -- vcl/source/window/btndlg.cxx|7 + vcl/source/window/dlgctrl.cxx | 10 ++-- vcl/source/window/menu.cxx | 48 +++- vcl/source/window/toolbox.cxx |5 +++- vcl/source/window/toolbox2.cxx |3 +- 15 files changed, 177 insertions(+), 33 deletions(-) New commits: commit 79c0027c88fb64ffa7bbefcab2e291852733c223 Author: Steve Yin Date: Mon Nov 25 13:15:27 2013 + Integrate branch of IAccessible2 Change-Id: I8c2fea0367ebfa53ce5e109ef48fd661cbfb78b3 diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 6f9c534..76533ab 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -74,6 +74,7 @@ private: DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* ); DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent* ); DECL_DLLPRIVATE_LINK( ImplAutocompleteHdl, Edit* ); +DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* ); protected: using Window::ImplInit; @@ -178,8 +179,8 @@ public: voidSetMRUEntries( const OUString& rEntries, sal_Unicode cSep = ';' ); OUStringGetMRUEntries( sal_Unicode cSep = ';' ) const; voidSetMaxMRUCount( sal_uInt16 n ); -sal_uInt16 GetMaxMRUCount() const; - +sal_uInt16 GetMaxMRUCount() const; +sal_uInt16 GetMRUCount() const; voidSetEntryData( sal_uInt16 nPos, void* pNewData ); void* GetEntryData( sal_uInt16 nPos ) const; diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 6b3ab8c..cc63c2f 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -63,7 +63,8 @@ private: DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* ); DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* ); DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent* ); - +DECL_DLLPRIVATE_LINK( ImplFocusHdl, void* ); +DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl, void* ); protected: using Window::ImplInit; SAL_DLLPRIVATE voidImplInit( Window* pParent, WinBits nStyle ); @@ -198,6 +199,7 @@ public: SizeCalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; voidGetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; +sal_uInt16 GetMRUCount() const; sal_uInt16 GetDisplayLineCount() const; voidEnableMirroring(); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 637c701..5131872 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -134,6 +134,8 @@ private: sal_uInt16 nDefaultItem; // Id of default item sal_uInt16 nSelectedId; +sal_uInt16 nHighlightedItem; + // for output: sal_uInt16 nImgOrChkPos; sal_uInt16 nTextPos; @@ -234,6 +236,13 @@ public: sal_uInt16 GetCurItemId() const; OString GetCurItemIdent() const; +voidSetHightlightItem(sal_uInt16 nHighlightedItem); +sal_uInt16 GetHighlightItem() const; + +OUStringGetItemAccKeyStrFromPos(sal_uInt16 nPos) const; + +sal_BoolIsTemporaryItemFromPos(sal_uInt16 nPos) const; + voidSetDefaultItem( sal_uInt16 nItemId ){ nDefaultItem = nItemId; } sal_uInt16 GetDefaultItem() const { return nDefaultItem; } diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 315f4ce..18dfee8 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -253,6 +253,8 @@ private: LinkmaDoubleClickHdl; LinkmaUserDrawHdl; LinkmaMRUChangedHdl; +LinkmaFocusHdl; +LinkmaListItemSelectHdl; ::vcl::QuickSelectionEngine maQuickSelectionEngine; @@ -266,7 +268,7 @@ protected: virtual voidGetFocus(); virtual voidLoseFocus(); -sal_BoolSelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False ); +sal_BoolSelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False, sal_Bool bSelectPosChange = sal_False ); voidImplPaint( sal_uInt16 nPos, sal_Bool bErase = sal_False, bool bLayout = false ); voidImplDoPaint( const Rectangle& rRect, bool bLayout =
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/source sal/osl
desktop/source/app/app.cxx |7 ++- sal/osl/w32/signal.cxx | 41 + 2 files changed, 43 insertions(+), 5 deletions(-) New commits: commit c9d10b167b37a9cb0bb310cafc8e80b6cce8ea7a Author: Herbert Dürr Date: Mon Nov 25 13:29:47 2013 + #i123747# allow treating Window's SEH events as C++ exceptions The crash reporter facility can provide much better details about crashes. But if that facility is disabled then handling SEH events such as div-by-zero as C++ exceptions is a worthwhile alternative. It can provide a few interesting details and it allows a graceful shutdown of the application. diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 6689f04..17ccb9f 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1935,11 +1935,8 @@ void Desktop::Main() // set static variable to enabled/disable crash reporter retrieveCrashReporterState(); -if ( !isCrashReporterEnabled() ) -{ -osl_setErrorReporting( sal_False ); -// disable stack trace feature -} +const bool bCrashReporterEnabled = isCrashReporterEnabled(); +osl_setErrorReporting( !bCrashReporterEnabled ); // create title string sal_Bool bCheckOk = sal_False; diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx index 1b71796..5e3c3ec 100644 --- a/sal/osl/w32/signal.cxx +++ b/sal/osl/w32/signal.cxx @@ -36,6 +36,8 @@ #endif #include #include +#include +#include typedef struct _oslSignalHandlerImpl { @@ -423,10 +425,49 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32 UserSignal, void* UserData) /*/ /* osl_setErrorReporting */ /*/ + +void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* pExcPtrs) +{ +const char* pSEHName = NULL; +switch( nSEHCode) { +case EXCEPTION_ACCESS_VIOLATION: pSEHName = "SEH Exception: ACCESS VIOLATION"; break; +case EXCEPTION_DATATYPE_MISALIGNMENT:pSEHName = "SEH Exception: DATATYPE MISALIGNMENT"; break; +// case EXCEPTION_BREAKPOINT: pSEHName = "SEH Exception: BREAKPOINT"; break; +// case EXCEPTION_SINGLE_STEP: pSEHName = "SEH Exception: SINGLE STEP"; break; +case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:pSEHName = "SEH Exception: ARRAY BOUNDS EXCEEDED"; break; +case EXCEPTION_FLT_DENORMAL_OPERAND: pSEHName = "SEH Exception: DENORMAL FLOAT OPERAND"; break; +case EXCEPTION_FLT_DIVIDE_BY_ZERO: pSEHName = "SEH Exception: FLOAT DIVIDE_BY_ZERO"; break; +case EXCEPTION_FLT_INEXACT_RESULT: pSEHName = "SEH Exception: FLOAT INEXACT RESULT"; break; +case EXCEPTION_FLT_INVALID_OPERATION:pSEHName = "SEH Exception: INVALID FLOAT OPERATION"; break; +case EXCEPTION_FLT_OVERFLOW: pSEHName = "SEH Exception: FLOAT OVERFLOW"; break; +case EXCEPTION_FLT_STACK_CHECK: pSEHName = "SEH Exception: FLOAT STACK_CHECK"; break; +case EXCEPTION_FLT_UNDERFLOW:pSEHName = "SEH Exception: FLOAT UNDERFLOW"; break; +case EXCEPTION_INT_DIVIDE_BY_ZERO: pSEHName = "SEH Exception: INTEGER DIVIDE_BY_ZERO"; break; +case EXCEPTION_INT_OVERFLOW: pSEHName = "SEH Exception: INTEGER OVERFLOW"; break; +case EXCEPTION_PRIV_INSTRUCTION: pSEHName = "SEH Exception: PRIVILEDGED INSTRUCTION"; break; +case EXCEPTION_IN_PAGE_ERROR:pSEHName = "SEH Exception: IN_PAGE_ERROR"; break; +case EXCEPTION_ILLEGAL_INSTRUCTION: pSEHName = "SEH Exception: ILLEGAL INSTRUCTION"; break; +case EXCEPTION_NONCONTINUABLE_EXCEPTION: pSEHName = "SEH Exception: NONCONTINUABLE EXCEPTION"; break; +case EXCEPTION_STACK_OVERFLOW: pSEHName = "SEH Exception: STACK OVERFLOW"; break; +case EXCEPTION_INVALID_DISPOSITION: pSEHName = "SEH Exception: INVALID DISPOSITION"; break; +case EXCEPTION_GUARD_PAGE: pSEHName = "SEH Exception: GUARD PAGE"; break; +case EXCEPTION_INVALID_HANDLE: pSEHName = "SEH Exception: INVALID HANDLE"; break; +// case EXCEPTION_POSSIBLE_DEADLOCK:pSEHName = "SEH Exception: POSSIBLE DEADLOCK"; break; +default: pSEHName = "Unknown SEH Exception"; break; +} +throw std::runtime_error( pSEHName); +} + sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable ) { sal_Bool bOld = bErrorReportingEnabled; bErrorReportingEnabled = bEnable; +if( !bEnable) // if the crash reporter is disabled +{ +// fall back to handle Window's SEH events as C++ exceptions +_set_se_translator( win_seh_translator); +} + return bOld; } ___
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dbaccess/source
dbaccess/source/core/dataaccess/datasource.cxx |3 ++- dbaccess/source/core/resource/strings.src |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit ae0d2d2eccacc298c0967feb0b434993aae70c05 Author: Michael Stahl Date: Mon Nov 25 15:00:21 2013 +0100 dbaccess: improve exception message when no driver found Change-Id: I1734034e05324eb0d66fd52444b0521d4143bc12 (cherry picked from commit 7ad1c4356bfde3bf37830fa8e4b3267212473f79) diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 83bb45e..cd349b7 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -735,7 +735,8 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString if ( !xReturn.is() ) { -OUString sMessage = DBACORE_RESSTRING( nExceptionMessageId ); +OUString sMessage = DBACORE_RESSTRING( nExceptionMessageId ) +.replaceAll("$name$", m_pImpl->m_sConnectURL); SQLContext aContext; aContext.Message = DBACORE_RESSTRING(RID_STR_CONNECTION_REQUEST). diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src index a6eb1fe..a2099c1 100644 --- a/dbaccess/source/core/resource/strings.src +++ b/dbaccess/source/core/resource/strings.src @@ -47,7 +47,7 @@ String RID_STR_COULDNOTCONNECT_UNSPECIFIED String RID_STR_COULDNOTCONNECT_NODRIVER { -Text [ en-US ] = "The connection to the external data source could not be established. No SDBC driver was found for the given URL."; +Text [ en-US ] = "The connection to the external data source could not be established. No SDBC driver was found for the URL '$name$'."; }; String RID_STR_COULDNOTLOAD_MANAGER ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/dataaccess/datasource.cxx |3 ++- dbaccess/source/core/resource/strings.src |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 7ad1c4356bfde3bf37830fa8e4b3267212473f79 Author: Michael Stahl Date: Mon Nov 25 15:00:21 2013 +0100 dbaccess: improve exception message when no driver found Change-Id: I1734034e05324eb0d66fd52444b0521d4143bc12 diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 83bb45e..cd349b7 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -735,7 +735,8 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString if ( !xReturn.is() ) { -OUString sMessage = DBACORE_RESSTRING( nExceptionMessageId ); +OUString sMessage = DBACORE_RESSTRING( nExceptionMessageId ) +.replaceAll("$name$", m_pImpl->m_sConnectURL); SQLContext aContext; aContext.Message = DBACORE_RESSTRING(RID_STR_CONNECTION_REQUEST). diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src index a6eb1fe..a2099c1 100644 --- a/dbaccess/source/core/resource/strings.src +++ b/dbaccess/source/core/resource/strings.src @@ -47,7 +47,7 @@ String RID_STR_COULDNOTCONNECT_UNSPECIFIED String RID_STR_COULDNOTCONNECT_NODRIVER { -Text [ en-US ] = "The connection to the external data source could not be established. No SDBC driver was found for the given URL."; +Text [ en-US ] = "The connection to the external data source could not be established. No SDBC driver was found for the URL '$name$'."; }; String RID_STR_COULDNOTLOAD_MANAGER ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/data/ppt/fdo68594.ppt |binary sd/qa/unit/import-tests.cxx | 23 +++ 2 files changed, 23 insertions(+) New commits: commit 32f700a683b7faa17c58e6d1aad85915ebd40a1a Author: Muthu Subramanian Date: Mon Nov 25 19:39:20 2013 +0530 fdo#68594: Adding unit test. diff --git a/sd/qa/unit/data/ppt/fdo68594.ppt b/sd/qa/unit/data/ppt/fdo68594.ppt new file mode 100644 index 000..83a95cd Binary files /dev/null and b/sd/qa/unit/data/ppt/fdo68594.ppt differ diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 23ddec3..bd65a30 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include @@ -47,6 +49,7 @@ public: void testFdo64512(); void testFdo71075(); void testN828390(); +void testFdo68594(); CPPUNIT_TEST_SUITE(SdFiltersTest); CPPUNIT_TEST(testDocumentLayout); @@ -56,6 +59,7 @@ public: CPPUNIT_TEST(testFdo64512); CPPUNIT_TEST(testFdo71075); CPPUNIT_TEST(testN828390); +CPPUNIT_TEST(testFdo68594); CPPUNIT_TEST_SUITE_END(); }; @@ -240,6 +244,25 @@ void SdFiltersTest::testN778859() } } +void SdFiltersTest::testFdo68594() +{ +::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/ppt/fdo68594.ppt")); +CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() ); +CPPUNIT_ASSERT_MESSAGE( "not in destruction", !xDocShRef->IsInDestruction() ); + +SdDrawDocument *pDoc = xDocShRef->GetDoc(); +CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL ); +const SdrPage *pPage = &(pDoc->GetPage (1)->TRG_GetMasterPage()); +CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL ); +SdrObject *pObj = pPage->GetObj(1); +SdrTextObj *pTxtObj = dynamic_cast( pObj ); +CPPUNIT_ASSERT_MESSAGE( "no text object", pTxtObj != NULL); +const SvxColorItem *pC = dynamic_cast(&pTxtObj->GetMergedItem(EE_CHAR_COLOR)); +CPPUNIT_ASSERT_MESSAGE( "no color item", pC != NULL); +// Color should be black +CPPUNIT_ASSERT_MESSAGE( "Placeholder color mismatch", pC->GetValue().GetColor() == 0); +} + void SdFiltersTest::testFdo64512() { ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/fdo64512.odp")); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Lao / Thai / Khmer Bundled Fonts
On 25/11/13 13:04, Robert M Campbell wrote: Phetsarath OT has no license (public domain?), looking into the font file reveals: Phetsarath OT - font for the Laotian language of Laos. Copyright 2005 ICT project for development of STEA/UNDP of Lao PDR. This font is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.? See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this font; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or visit http://www.gnu.org/licenses/lgpl.html greetings, Martin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/core/text/itrcrsr.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 509f1f456d6a7d3ec3aca6620a8a3c1302045c6b Author: Julien Nabet Date: Sun Nov 17 17:48:31 2013 +0100 Resolves: fdo#67263 CRASH when deleting applied bulleted paragraph style Change-Id: I70dc18363480e6c07577a93279ddd083631f6cc3 Reviewed-on: https://gerrit.libreoffice.org/6702 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 899c5ea9dc3c34892edfde642510514779132910) Reviewed-on: https://gerrit.libreoffice.org/6755 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 3befea2..3891390 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -139,7 +139,7 @@ namespace { { bool bRet( false ); -if ( rTxtNode.AreListLevelIndentsApplicable() ) +if ( rTxtNode.GetNumRule() && rTxtNode.AreListLevelIndentsApplicable() ) { const SwNumFmt& rNumFmt = rTxtNode.GetNumRule()->Get( static_cast(rTxtNode.GetActualListLevel()) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9c/f2b1706af6ad55ec80ba3148e5a3738c4d33c6
9c/f2b1706af6ad55ec80ba3148e5a3738c4d33c6 |1 + 1 file changed, 1 insertion(+) New commits: commit 9cb67cddd28596b2d8980b8ed43ea169a642df2c Author: Caolán McNamara Date: Mon Nov 25 13:46:16 2013 + Notes added by 'git notes add' diff --git a/9c/f2b1706af6ad55ec80ba3148e5a3738c4d33c6 b/9c/f2b1706af6ad55ec80ba3148e5a3738c4d33c6 new file mode 100644 index 000..4c1894c --- /dev/null +++ b/9c/f2b1706af6ad55ec80ba3148e5a3738c4d33c6 @@ -0,0 +1 @@ +prefer: c2405f80af8b61fa9b9088420afdb79584adf7c0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sfx2/source
sfx2/source/doc/docfile.cxx | 21 + 1 file changed, 17 insertions(+), 4 deletions(-) New commits: commit 01fc9d77764e49583be626d0955ccf872f9b4117 Author: matt_51 Date: Tue Nov 5 11:40:56 2013 +0100 fdo#70345 Reuse XStream for Windows platform create a new one for others. Reviewed-on: https://gerrit.libreoffice.org/6580 Reviewed-by: Michael Stahl Tested-by: Michael Stahl (cherry picked from commit 3d12549335229aca1a6a57575292111274709992) Change-Id: I911c24b82b55445c6f95e14be29759e2fe3d9dfd Reviewed-on: https://gerrit.libreoffice.org/6761 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index c1ad603..06d7a4b 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -641,13 +641,26 @@ SvStream* SfxMedium::GetOutStream() if ( pImp->pTempFile ) { -// don't try to re-use XOutStream from xStream if that exists; +// On windows we try to re-use XOutStream from xStream if that exists; +// because opening new SvFileStream in this situation may fail with ERROR_SHARING_VIOLATION +#ifdef WNT +if (pImp->xStream.is()) +{ +assert(pImp->xStream->getOutputStream().is()); // need that... +pImp->m_pOutStream = utl::UcbStreamHelper::CreateStream( +pImp->xStream, false); +} +else +{ +pImp->m_pOutStream = new SvFileStream( +pImp->m_aName, STREAM_STD_READWRITE); +} +// On Unix don't try to re-use XOutStream from xStream if that exists; // it causes fdo#59022 (fails opening files via SMB on Linux) -// OTOH opening new SvFileStream in this situation may fail on -// Windows with ERROR_SHARING_VIOLATION... but that is apparently -// not a problem in practice currently +#else pImp->m_pOutStream = new SvFileStream( pImp->m_aName, STREAM_STD_READWRITE); +#endif CloseStorage(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a4/9de20398b27aba210e8f4b3a0bd7207853b90b
a4/9de20398b27aba210e8f4b3a0bd7207853b90b |1 + 1 file changed, 1 insertion(+) New commits: commit ea1f22cbe239517f571603e37f772afbca1ca768 Author: Caolán McNamara Date: Mon Nov 25 13:45:13 2013 + Notes added by 'git notes add' diff --git a/a4/9de20398b27aba210e8f4b3a0bd7207853b90b b/a4/9de20398b27aba210e8f4b3a0bd7207853b90b new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/a4/9de20398b27aba210e8f4b3a0bd7207853b90b @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f1/390100e005cece4fdc93a7c760c79929153a4d
f1/390100e005cece4fdc93a7c760c79929153a4d |1 + 1 file changed, 1 insertion(+) New commits: commit 2ec2a9163e5ee44eb528cf6a6dfcf563ab42b33e Author: Caolán McNamara Date: Mon Nov 25 13:45:33 2013 + Notes added by 'git notes add' diff --git a/f1/390100e005cece4fdc93a7c760c79929153a4d b/f1/390100e005cece4fdc93a7c760c79929153a4d new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/f1/390100e005cece4fdc93a7c760c79929153a4d @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a5/c4ddcf8ed5344d9bceeffd7431cd6895a407ca
a5/c4ddcf8ed5344d9bceeffd7431cd6895a407ca |1 + 1 file changed, 1 insertion(+) New commits: commit 168363f065f608ec4f336fc826f4caeb0939e59f Author: Caolán McNamara Date: Mon Nov 25 13:44:24 2013 + Notes added by 'git notes add' diff --git a/a5/c4ddcf8ed5344d9bceeffd7431cd6895a407ca b/a5/c4ddcf8ed5344d9bceeffd7431cd6895a407ca new file mode 100644 index 000..a662b9e --- /dev/null +++ b/a5/c4ddcf8ed5344d9bceeffd7431cd6895a407ca @@ -0,0 +1 @@ +merged as: c2405f80af8b61fa9b9088420afdb79584adf7c0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e9/ca732f8aeba1a9bb2e1d9f4e95047675490d79
e9/ca732f8aeba1a9bb2e1d9f4e95047675490d79 |1 + 1 file changed, 1 insertion(+) New commits: commit 510afcb5e53cba0efc1230c5e1f4de659e378535 Author: Caolán McNamara Date: Mon Nov 25 13:44:48 2013 + Notes added by 'git notes add' diff --git a/e9/ca732f8aeba1a9bb2e1d9f4e95047675490d79 b/e9/ca732f8aeba1a9bb2e1d9f4e95047675490d79 new file mode 100644 index 000..4c1894c --- /dev/null +++ b/e9/ca732f8aeba1a9bb2e1d9f4e95047675490d79 @@ -0,0 +1 @@ +prefer: c2405f80af8b61fa9b9088420afdb79584adf7c0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 61272, which changed state. Bug 61272 Summary: Incorrect EMF pictures visualization https://bugs.freedesktop.org/show_bug.cgi?id=61272 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 8 commits - cppcanvas/source vcl/source
cppcanvas/source/inc/implrenderer.hxx|2 cppcanvas/source/mtfrenderer/emfplus.cxx | 230 ++- vcl/source/filter/wmf/enhwmf.cxx | 102 ++--- vcl/source/filter/wmf/winmtf.cxx | 67 - vcl/source/filter/wmf/winmtf.hxx | 17 -- vcl/source/filter/wmf/winwmf.cxx |1 6 files changed, 249 insertions(+), 170 deletions(-) New commits: commit 20f9413f17d397c7b097809d8c168a0a78e6c084 Author: Jan Holesovsky Date: Mon Nov 25 11:45:05 2013 +0100 EMF+: Parse custom line cap data for start and end line caps. Change-Id: I3a5f79e22500f53c3c61c173e0827c250b2a8fd0 diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index ec5e739..69568d3 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -97,6 +97,12 @@ const sal_Int32 EmfPlusLineStyleDashDot = 0x0003; const sal_Int32 EmfPlusLineStyleDashDotDot = 0x0004; const sal_Int32 EmfPlusLineStyleCustom = 0x0005; +const sal_uInt32 EmfPlusCustomLineCapDataTypeDefault = 0x; +const sal_uInt32 EmfPlusCustomLineCapDataTypeAdjustableArrow = 0x0001; + +const sal_uInt32 EmfPlusCustomLineCapDataFillPath = 0x0001; +const sal_uInt32 EmfPlusCustomLineCapDataLinePath = 0x0002; + using namespace ::com::sun::star; using namespace ::basegfx; @@ -588,6 +594,94 @@ namespace cppcanvas } }; +struct EMFPCustomLineCap : public EMFPObject +{ +sal_uInt32 type; + +public: +EMFPCustomLineCap() : EMFPObject() +{ +} + +~EMFPCustomLineCap() +{ +} + +void Read (SvStream& s, ImplRenderer& rR) +{ +sal_uInt32 header; + +s >> header >> type; + +SAL_INFO("cppcanvas.emf", "EMF+\t\tcustom cap"); +SAL_INFO("cppcanvas.emf", "EMF+\t\theader: 0x" << std::hex << header << " type: " << type << std::dec); + +if (type == EmfPlusCustomLineCapDataTypeDefault) +{ +sal_Int32 customLineCapDataFlags, baseCap, baseInset; +sal_Int32 strokeStartCap, strokeEndCap, strokeJoin; +sal_Int32 strokeMiterLimit, widthScale; +float fillHotSpotX, fillHotSpotY, strokeHotSpotX, strokeHotSpotY; + +s >> customLineCapDataFlags >> baseCap >> baseInset + >> strokeStartCap >> strokeEndCap >> strokeJoin + >> strokeMiterLimit >> widthScale + >> fillHotSpotX >> fillHotSpotY >> strokeHotSpotX >> strokeHotSpotY; + +SAL_INFO("cppcanvas.emf", "EMF+\t\tcustomLinCapDataFlags: 0x" << std::hex << customLineCapDataFlags); + +if (customLineCapDataFlags & EmfPlusCustomLineCapDataFillPath) +{ +sal_Int32 pathLength; +s >> pathLength; +SAL_INFO("cppcanvas.emf", "EMF+\t\tpath length: " << pathLength); + +sal_uInt32 pathHeader; +sal_Int32 pathPoints, pathFlags; +s >> pathHeader >> pathPoints >> pathFlags; + +SAL_INFO("cppcanvas.emf", "EMF+\t\tpath (custom cap fill path)"); +SAL_INFO("cppcanvas.emf", "EMF+\t\theader: 0x" << std::hex << pathHeader << " points: " << std::dec << pathPoints << " additional flags: 0x" << std::hex << pathFlags << std::dec ); + +EMFPPath path(pathPoints); +path.Read(s, pathFlags, rR); +} + +if (customLineCapDataFlags & EmfPlusCustomLineCapDataLinePath) +{ +sal_Int32 pathLength; +s >> pathLength; +SAL_INFO("cppcanvas.emf", "EMF+\t\tpath length: " << pathLength); + +sal_uInt32 pathHeader; +sal_Int32 pathPoints, pathFlags; +s >> pathHeader >> pathPoints >> pathFlags; + +SAL_INFO("cppcanvas.emf", "EMF+\t\tpath (custom cap line path)"); +SAL_INFO("cppcanvas.emf", "EMF+\t\theader: 0x" << std::hex << pathHeader << " points: " << std::dec << pathPoints << " additional flags: 0x" << std::hex << pathFlags << std::dec ); + +EMFPPath path(pathPoints); +path.Read(s, pathFlags, rR); +} +} +else if (type == EmfPlusCustomLineCapDataTypeAdjustableArrow) +{ +// TODO only reads the data, does not use them [I've had +// no test document to be able to implement it] + +sal_Int32 width, heigh
Re: footnotes (Replacing one DLL from official build)
Hello Kendy, Dne 19.11.2013 18:14, Jan Holesovsky napsal(a): I'd be most interested to see the document that triggers the wrong behavior - is there any in the bugzilla? Or can you please produce a minimal one? I filed the bug #71984. A test document is attached. For the behavior that is different in LibreOffice and MSO, if there is no possibility to make both happy, we have the concept of compatibility options; if there is no other way, this will make it, I'm sure :-) An example of a compatibility option: http://cgit.freedesktop.org/libreoffice/core/commit/?id=bdfc6363d66aa079512cc8008996b633f693fed1 Do you think this would help your case? Perfect, thanks :-) Though I would still need to add the new compatibility option to user registry and probably to the UI too, for an user to be able to use modified formatting for .odt files too. Regarding the mentioned commit, I wonder for which file formats is SwXMLImport::SetConfigurationSettings called? I tried to open a MS Word 2003 XML file and the method was not called. All the best, Pavel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[LATE FEATURE] Regression curve / trendline custom name
Hi, I have implemented applying custom names to trendlines / regression curves (show in legend) for charts in master. I would also like this for LO 4.2 but I didn't make until feature freeze. This is important for 2 reasons: - old MS binary format and OOXML support this already, so this is an compatibility improvement. - in LO 4.2, the ODF format has been extended with additional properties for regression curves and this change also needs a new property. It would be easier if all the changes would be released in one LO release as all the changes will also be together in the specification proposal to OASIS. Relevant commits are: http://cgit.freedesktop.org/libreoffice/core/commit/?id=3af08dd27d45302d162974e671f50af8a11a9cea http://cgit.freedesktop.org/libreoffice/core/commit/?id=f58e03e7bb0016c1ca789f7e7b35933c95378121 for dry cleanup http://cgit.freedesktop.org/libreoffice/core/commit/?id=6f62f3f0af9ae8c1b00d0d620f306cae914a3861 main implementation http://cgit.freedesktop.org/libreoffice/core/commit/?id=2b243ba51e786b0993e66232144fd6a6ee9ef724 ODF import/export http://cgit.freedesktop.org/libreoffice/core/commit/?id=c86aed38b67ee5d1b842a7765e363015aea22fcc OOXML import/export http://cgit.freedesktop.org/libreoffice/core/commit/?id=288719571eb617613ba9724f394a257a17d43a81 MS binary 2000/XP/2003 import/export Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - instsetoo_native/util
instsetoo_native/util/openoffice.lst.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit 3bfac473a1b1dfb2210ec07245e649697679bd83 Author: Christian Lohmaier Date: Mon Nov 25 13:41:09 2013 +0100 --with-lang=ALL build exceeds maximum # of files in CAB so don't limit the installer to one single file, but use 2 instead Change-Id: I6fb22d217e1afe71143f0b3a5999e54eec190ddd diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 0b07ebd..92da96a 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -71,6 +71,7 @@ LibreOffice STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 +CABFILENUMBER 2 } active 1 compression 5 @@ -124,6 +125,7 @@ LibreOffice_Dev STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 +CABFILENUMBER 2 } active 1 compression 5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/util
instsetoo_native/util/openoffice.lst.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit 3251450cbdc515cc2e14bfea06a57f75feb7d05c Author: Christian Lohmaier Date: Mon Nov 25 13:41:09 2013 +0100 --with-lang=ALL build exceeds maximum # of files in CAB so don't limit the installer to one single file, but use 2 instead Change-Id: I6fb22d217e1afe71143f0b3a5999e54eec190ddd diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 0b2344d..0e323a7 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -71,6 +71,7 @@ LibreOffice STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 +CABFILENUMBER 2 } active 1 compression 5 @@ -124,6 +125,7 @@ LibreOffice_Dev STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 +CABFILENUMBER 2 } active 1 compression 5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 5 commits - editeng/source sc/source vcl/generic
editeng/source/misc/svxacorr.cxx|5 + sc/source/filter/inc/formulaparser.hxx |2 +- sc/source/filter/oox/formulaparser.cxx | 15 --- vcl/generic/fontmanager/fontmanager.cxx | 14 -- vcl/generic/print/genpspgraphics.cxx|2 +- vcl/generic/print/glyphset.cxx | 12 +--- 6 files changed, 24 insertions(+), 26 deletions(-) New commits: commit 1166c0f8f3b06f7676a77bfd4d9fe75108e52bcb Author: Laurent Balland-Poirier Date: Tue Nov 19 19:55:55 2013 +0100 fdo#67742 Avoid autocorr of "--" before "-" LibO 4.1 now uses '-' as word separator for AutoCorrection Then the sequence "---" is detected as word "--" and autocorrect as "â". This avoids autocorrection of "---", as word or as border This commit detects the sequence "---" and report autocorrection. Modified for LibO 4.1 (OUString => String) Change-Id: I1342c2ff83dd42683e683b3bb27280d61179b9a2 Reviewed-on: https://gerrit.libreoffice.org/6747 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index cc61b5e..a5e2279 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1330,6 +1330,11 @@ SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, sal_Bool bChgWord = rDoc.ChgAutoCorrWord( nCapLttrPos, nInsPos, *this, ppPara ); +// since LibO 4.1, '-' is a word separator +// fdo#67742 avoid "--" to be replaced by "â" if next is "-" +if( rTxt.Len() >= 3 && +rTxt.Equals( String("---"), rTxt.Len()-3, 3 ) ) +break; if( !bChgWord ) { xub_StrLen nCapLttrPos1 = nCapLttrPos, nInsPos1 = nInsPos; commit aca8dee99023af551a935d1b87befdfbdacac10f Author: Khaled Hosny Date: Thu Nov 21 22:59:06 2013 +0200 fdo#67802: Fix PS printing of non-CTL text with ligatures The GlyphSet::AddGlyphID() was messing with glyphs of characters that can be converted to Windows-1252 encoding, discarding whatever glyph it was asked to use and using a random glyph that is supposed to belong to the converted character. For ligatures this means the ligature glyphs was discarded and the glyphs for its component was used, but this broken for just any glyph substitution. The code makes no sense at all, apart from the fact that it is verbatim copy of GlyphSet::AddCharID() since 9754ad8d979557ea03cbfe04708b62b698d1276c and just happened to work because we did not enable ligatures and other typographic features for non-CTL text before. Change-Id: I764f0b40f8acf61eae38a9038b0666d711c04a9d Reviewed-on: https://gerrit.libreoffice.org/6762 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx index d22d2c8..bb43ef5 100644 --- a/vcl/generic/print/glyphset.cxx +++ b/vcl/generic/print/glyphset.cxx @@ -275,16 +275,14 @@ GlyphSet::AddGlyphID ( sal_Int32* nOutGlyphSetID ) { -sal_uChar nMappedChar; +sal_uChar nMappedChar = 0; // XXX important: avoid to reencode type1 symbol fonts if (mnBaseEncoding == RTL_TEXTENCODING_SYMBOL) nMappedChar = GetSymbolMapping (nUnicode); -else -nMappedChar = GetAnsiMapping (nUnicode); -// create an empty glyphmap that is reserved for iso1252 encoded glyphs -// (or -- unencoded -- symbol glyphs) and a second map that takes any other +// create an empty glyphmap that is reserved for unencoded symbol glyphs, +// and a second map that takes any other if (maGlyphList.empty()) { glyph_map_t aMap, aMapp; @@ -302,7 +300,7 @@ GlyphSet::AddGlyphID ( // insert a new glyph in the font subset if (nMappedChar) { -// always put iso1252 chars into the first map, map them on itself +// always put symbol glyphs into the first map, map them on itself glyph_map_t& aGlyphSet = maGlyphList.front(); AddNotdef (aGlyphSet); @@ -312,7 +310,7 @@ GlyphSet::AddGlyphID ( } else { -// other chars are just appended to the list +// other glyphs are just appended to the list glyph_map_t& aGlyphSet = maGlyphList.back(); AddNotdef (aGlyphSet); commit 8cabbc340397bd92f1c3bd34c4e35364715da30b Author: Khaled Hosny Date: Sat Nov 23 13:40:50 2013 +0200 Correctly check getFileURLFromSystemPath() success Change-Id: Iadc34171235fec2d6aafd601f62a0bff8ed5b3ee Reviewed-on: https://gerrit.libreoffice.org/6770 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 10af660..993d8d5 100
Lao / Thai / Khmer Bundled Fonts
I was just curious, when does LibreOffice choose to bundle fonts? When is there a good reason to bundle them? I ask this because LibreOffice has a Burmese font, but no Thai, Lao, or Khmer fonts that I can tell. Droid Sans includes Thai support. Khmer OS provides Khmer support. And SIL's Mittaphab and Lao Government's Phetsarath OT are possible options for Lao, but the most widely used Lao font in Laos is Saysettha Lao. The government wants everyone to use Phetsarath OT (which is their standard). Windows 8 ships with Dok Champa, which I know little about... And SIL is working on a graphite font Mittaphap. I know Mittaphap is OFL, Phetsarath OT has no license (public domain?), so those are fair open options. Saysettha is not open source, nor is Dok Champa, to my understanding. But the real question is whether or not LibreOffice will want to include fonts for language coverage in the first place? Possible benefits I see: * Consistent look and feel for users of those languages across platforms and systems * Provides native access for people without reliable Internet (sometimes a problem in Laos) Possible problems I see: * Makes LibreOffice bigger * Could get out of hand if everyone wants to submit their favorite font * People might complain because it doesn't have their favorite Saysettha font What do you all think? -- Respectfully, *Robert M Campbell* IT Specialist for ADRA Laos & Open Source Advocate Lao Cell: +856 207 616 7299 US Phone: +1 270 681 0399 robert.rcampb...@gmail.com rcampb...@adralaos.org Visit ADRA Lao's Facebook Page at facebook.com/ADRALaos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source
filter/source/msfilter/svdfppt.cxx |8 1 file changed, 8 deletions(-) New commits: commit fbfb164bb4447f5a78aff9829df828b9cbde120c Author: Muthu Subramanian Date: Fri Nov 22 19:46:58 2013 +0530 fdo#68594: Revert bnc#758621 commit. Reverting: 55c63ccfd460895af22e91979967cec15d80b72d Seems some other fix, fixes the bug as well. diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index ade3f1f..750316a 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2291,14 +2291,6 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* } pPortion->ApplyTo( aPortionAttribs, (SdrPowerPointImport&)*this, nDestinationInstance, pTextObj ); rOutliner.QuickSetAttribs( aPortionAttribs, aSelection ); - -// set the attribs for the entire paragraph, if it is a placeholder -if ( pTextObj->GetOEPlaceHolderAtom() && aSelection.nStartPos == aSelection.nEndPos ) -{ -SfxItemSet& rItemSet = rOutliner.GetStyleSheet( nParaIndex )->GetItemSet(); -pPortion->ApplyTo( rItemSet, (SdrPowerPointImport&)*this, nDestinationInstance, pTextObj ); -} - aSelection.nStartPos = aSelection.nEndPos; } boost::optional< sal_Int16 > oStartNumbering; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - filter/source include/filter sd/qa sd/source
filter/source/msfilter/svdfppt.cxx | 147 ++-- include/filter/msfilter/svdfppt.hxx |3 sd/qa/unit/data/xml/fdo64586_0.xml |4 sd/qa/unit/data/xml/n758621_0.xml |8 - sd/qa/unit/data/xml/n758621_1.xml |8 - sd/source/filter/ppt/pptin.cxx | 14 +++ 6 files changed, 166 insertions(+), 18 deletions(-) New commits: commit cca882ded7dd4a2e3f829dc757050859c8954656 Author: Sun Ying Date: Fri Aug 17 07:56:17 2012 + Resolves: #i119866# ppt default outline area bullet lost Reported by: Li Feng Wang Patch by: Ying Sun Review by: Jian Yuan Li (cherry picked from commit 8d04823a6038d32f6ac9821925616da7c5cc44c9) Conflicts: filter/inc/filter/msfilter/svdfppt.hxx sd/source/filter/ppt/pptin.cxx Change-Id: I222003a9e8d474ebc4dd9bc83cdcceded88a79f4 diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 8b4e95a..fd66e79 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2334,6 +2334,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj sal_BoolbVertical = sal_False; if ( ( pTextObj->GetShapeType() == mso_sptRectangle ) || ( pTextObj->GetShapeType() == mso_sptTextBox ) ) { +//if a placeholder with some custom attribute,the pTextObj will keep those attr,whose text size is zero, +//so sdPage should renew a PresObj to process placeholder. bEmptyPresObj = ( pTextObj->Count() == 0 ) || ( pTextObj->Count() == 1 && pTextObj->First()->GetTextSize() == 0 ); switch ( nPlaceholderId ) { @@ -2395,6 +2397,16 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj ApplyAttributes( rStCtrl, aSet ); pPresObj->SetLogicRect(pText->GetLogicRect()); ApplyTextAnchorAttributes( *pTextObj, aSet ); +//set custom font attribute of the placeholder +if ( pTextObj->Count() == 1 ) +{ +PPTParagraphObj* pPara = pTextObj->First(); +PPTPortionObj* pPor = NULL; +if ( pPara && pPara->GetTextSize() == 0 && (pPor = pPara->First())) +{ +pPor->ApplyTo(aSet, (SdrPowerPointImport&)*this, pTextObj->GetDestinationInstance()); +} +} pPresObj->SetMergedItemSet(aSet); if ( ( eAktPageKind != PPT_NOTEPAGE ) && ( nPlacementId != 0x ) ) commit 5aafe591a7901a1a1f6f52a7fead8a97a97cb5c0 Author: Caolán McNamara Date: Sat May 25 11:48:09 2013 +0100 Resolves: #i119874 Fixed text alignment in RTL layout This reverts commit 979def88090633bfee0e0445b1a1dac71ed4, this time manually confirmed that the import layout does change, but that it appears to be all desirable changes Change-Id: Iee5e5ebd16989f65569b02f8b4f6570985157dfc diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 8e1e1d9..0f5dd22 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7610,4 +7610,143 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab return pRet; } +sal_Bool SdrPowerPointImport::IsVerticalText() const +{ +sal_Bool bVerticalText = sal_False; +if ( IsProperty( DFF_Prop_txflTextFlow ) ) +{ +MSO_TextFlow eTextFlow = (MSO_TextFlow)( GetPropertyValue( DFF_Prop_txflTextFlow ) & 0x ); +switch( eTextFlow ) +{ +case mso_txflTtoBA :// Top to Bottom @-font, above -> below +case mso_txflTtoBN :// Top to Bottom non-@, above -> below +case mso_txflVertN :// Vertical, non-@, above -> below +bVerticalText = !bVerticalText; +break; +default: break; +} +} + +return bVerticalText; +} + +voidSdrPowerPointImport::ApplyTextAnchorAttributes( PPTTextObj& rTextObj, SfxItemSet& rSet ) const +{ +SdrTextVertAdjust eTVA; +SdrTextHorzAdjust eTHA; + +sal_uInt32 nTextFlags = rTextObj.GetTextFlags(); + +nTextFlags &= PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT +| PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK; + +if ( IsVerticalText() ) +{ +eTVA = SDRTEXTVERTADJUST_BLOCK; +eTHA = SDRTEXTHORZADJUST_CENTER; + +// Textverankerung lesen +MSO_Anchor eTextA
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 6 commits - winaccessibility/inc winaccessibility/source
winaccessibility/inc/AccObjectWinManager.hxx|1 winaccessibility/source/UAccCOM/AccTable.cxx| 34 ++-- winaccessibility/source/UAccCOM/MAccessible.cxx | 128 winaccessibility/source/UAccCOM/MAccessible.h | 11 - winaccessibility/source/UAccCOM/UAccCOM.cxx |4 winaccessibility/source/service/AccObjectWinManager.cxx | 10 - winaccessibility/source/service/msaaservice_impl.cxx|8 + 7 files changed, 104 insertions(+), 92 deletions(-) New commits: commit c0a500b9f1b47ee1beea3c22ff029a03e657cb8a Author: Michael Stahl Date: Sun Nov 24 00:23:44 2013 +0100 winaccessibility: let CoCreateInstance calls find the components The COM services are not found because they are not registered in the registry via regsvr32 (doing that is unnecessary since the components are only instantiated by winaccessibility code and undesirable since that would likely register the IAccessible2 types too, breaking A11y tools) and the special manifest resource #97 that ActivateActContext() tries to load does not exist in UAccCOM.dll; this would need to be a XML manifest, the *.rgs and *.tlb that are already included as individual resources won't work. After reading ATL headers for hours it is immediately obvious that the COM components can simply be registered by a call to CComModule::RegisterClassObjects() from DllMain; this just requires actually loading the UAccCOM library from somewhere so the DllMain runs. Change-Id: Id58b754835cd2f1bcada37e5639a6b6042a42fd5 (cherry picked from commit 732ec36edfd09d2091d70c4d71b5f182fe279c45) diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx index 1f7eab4..851464f 100644 --- a/winaccessibility/source/UAccCOM/UAccCOM.cxx +++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx @@ -66,10 +66,14 @@ extern "C" if (dwReason == DLL_PROCESS_ATTACH) { _Module.Init(ObjectMap, hInstance, &LIBID_UACCCOMLib); +_Module.RegisterClassObjects(CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE); DisableThreadLibraryCalls(hInstance); } else if (dwReason == DLL_PROCESS_DETACH) +{ +_Module.RevokeClassObjects(); _Module.Term(); +} return TRUE;// ok } diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx index e5e1231..5f3d5fc 100644 --- a/winaccessibility/source/service/msaaservice_impl.cxx +++ b/winaccessibility/source/service/msaaservice_impl.cxx @@ -267,6 +267,14 @@ Reference< XInterface > SAL_CALL create_MSAAServiceImpl( Reference< XComponentCo } } +// load UAccCOM library so its DllMain can register its COM components +static HMODULE h = LoadLibrary("UAccCOM.dll"); +if (!h) +{ +assert(false); +return 0; +} + Reference< XMSAAService > xAccMgr( new MSAAServiceImpl() ); AccessBridgeUpdateOldTopWindows( xAccMgr ); commit fd7cb4b05c1ac336f2430e05864bf98afe3030da Author: Michael Stahl Date: Sun Nov 24 00:43:06 2013 +0100 winaccessibility: fix some error handling in CAccTable Change-Id: I3c8bc6a476a6254a4ddc3a7cb0585544f3f78431 (cherry picked from commit d04c970e8f33109a1ef5c52f922a48a0ff62adb0) diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx index e7935b2..f3a1558 100644 --- a/winaccessibility/source/UAccCOM/AccTable.cxx +++ b/winaccessibility/source/UAccCOM/AccTable.cxx @@ -213,22 +213,23 @@ STDMETHODIMP CAccTable::get_columnHeader(IAccessibleTable __RPC_FAR *__RPC_FAR * } *startingRowIndex = 0 ; -IAccessible* m_pIMacc = NULL; +IMAccessible* pIMacc = NULL; ActivateActContext(); HRESULT hr = CoCreateInstance( CLSID_MAccessible, NULL, CLSCTX_ALL , IID_IMAccessible, -(void **)&m_pIMacc +(void **)&pIMacc ); DeactivateActContext(); -((CMAccessible*)m_pIMacc)->SetXAccessible( -reinterpret_cast(pRXColumnHeader.get())); -m_pIMacc->QueryInterface(IID_IAccessibleTable,(void **)accessibleTable); -if( SUCCEEDED(hr) ) + +if (!SUCCEEDED(hr)) { -return S_OK; +return E_FAIL; } +pIMacc->SetXAccessible( +reinterpret_cast(pRXColumnHeader.get())); +pIMacc->QueryInterface(IID_IAccessibleTable,(void **)accessibleTable); -return E_FAIL; +return S_OK; LEAVE_PROTECTED_BLOCK } @@ -446,22 +447,23 @@ STDMETHODIMP CAccTable::get_rowHeader(IAccessibleTable __RPC_FAR *__RPC_FAR *acc } *startingColumnIndex = 0 ; -IAccessible* m_pIMacc = NULL; +IMAccessible* pIMacc = NULL; ActivateActContext(); HRESULT hr = CoCreateInstance( CLSID_MAccessible, NULL, CLSCTX_ALL ,
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 ++ writerfilter/source/dmapper/DomainMapper.cxx |5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) New commits: commit a6fe1a5b2806b40edf0d06c8543d35abe5249412 Author: Miklos Vajna Date: Mon Nov 25 11:55:57 2013 +0100 DOCX import: handle NS_sprm::LN_CFSmallCaps == 0 after NS_sprm::LN_CFCaps "caps and no smallcaps" means style::CaseMap::UPPERCASE, not style::CaseMap::NONE. Different XML elements in DOCX, single UNO property. Change-Id: I8cbc719f2c307d5d2cbd4af93ea61e35b640ad1d diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 06bedcc..78b1256 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -1389,6 +1390,11 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar1, "calendar1.docx") DECLARE_OOXMLEXPORT_TEST(testCalendar2, "calendar2.docx") { +// Problem was that CharCaseMap was style::CaseMap::NONE. +uno::Reference xTable(getParagraphOrTable(1), uno::UNO_QUERY); +uno::Reference xCell(xTable->getCellByName("A1"), uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(style::CaseMap::UPPERCASE, getProperty(getRun(getParagraphOfText(1, xCell->getText()), 1), "CharCaseMap")); + // This paragraph property was missing in table style. xmlDocPtr pXmlStyles = parseExport("word/styles.xml"); if (!pXmlStyles) diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index ae81ad5..9edb914 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2225,8 +2225,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? true : false )); break; case NS_sprm::LN_CFSmallCaps: /*sprmCFSmallCaps*/ -rContext->Insert(ePropertyId, - uno::makeAny( nIntValue ? style::CaseMap::SMALLCAPS : style::CaseMap::NONE)); +// If smallcaps would be just disabled and an other casemap is already inserted, don't do anything. +if (nIntValue || rContext->find(ePropertyId) == rContext->end()) +rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? style::CaseMap::SMALLCAPS : style::CaseMap::NONE)); m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "smallCaps", OUString::number(nIntValue)); break; case NS_sprm::LN_CFCaps: /*sprmCFCaps*/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 41169, which changed state. Bug 41169 Summary: All hotkeys are language dependent, don't work in non-Latin keyboard layout. https://bugs.freedesktop.org/show_bug.cgi?id=41169 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - editeng/source
editeng/source/misc/svxacorr.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 0299cfaca263b1cc635980fdd8497346d5cb8513 Author: Laurent Balland-Poirier Date: Tue Nov 19 19:55:55 2013 +0100 fdo#67742 Avoid autocorr of "--" before "-" LibO 4.1 now uses '-' as word separator for AutoCorrection Then the sequence "---" is detected as word "--" and autocorrect as "â". This avoids autocorrection of "---", as word or as border This commit detects the sequence "---" and report autocorrection. Modified for LibO 4.1 (OUString => String) Change-Id: I1342c2ff83dd42683e683b3bb27280d61179b9a2 Reviewed-on: https://gerrit.libreoffice.org/6747 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index cc61b5e..a5e2279 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1330,6 +1330,11 @@ SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, sal_Bool bChgWord = rDoc.ChgAutoCorrWord( nCapLttrPos, nInsPos, *this, ppPara ); +// since LibO 4.1, '-' is a word separator +// fdo#67742 avoid "--" to be replaced by "â" if next is "-" +if( rTxt.Len() >= 3 && +rTxt.Equals( String("---"), rTxt.Len()-3, 3 ) ) +break; if( !bChgWord ) { xub_StrLen nCapLttrPos1 = nCapLttrPos, nInsPos1 = nInsPos; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/generic
vcl/generic/print/glyphset.cxx | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) New commits: commit cfcd8112c0cb459646ea8c17bd889c945e75f3a5 Author: Khaled Hosny Date: Thu Nov 21 22:59:06 2013 +0200 fdo#67802: Fix PS printing of non-CTL text with ligatures The GlyphSet::AddGlyphID() was messing with glyphs of characters that can be converted to Windows-1252 encoding, discarding whatever glyph it was asked to use and using a random glyph that is supposed to belong to the converted character. For ligatures this means the ligature glyphs was discarded and the glyphs for its component was used, but this broken for just any glyph substitution. The code makes no sense at all, apart from the fact that it is verbatim copy of GlyphSet::AddCharID() since 9754ad8d979557ea03cbfe04708b62b698d1276c and just happened to work because we did not enable ligatures and other typographic features for non-CTL text before. Change-Id: I764f0b40f8acf61eae38a9038b0666d711c04a9d Reviewed-on: https://gerrit.libreoffice.org/6762 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx index d22d2c8..bb43ef5 100644 --- a/vcl/generic/print/glyphset.cxx +++ b/vcl/generic/print/glyphset.cxx @@ -275,16 +275,14 @@ GlyphSet::AddGlyphID ( sal_Int32* nOutGlyphSetID ) { -sal_uChar nMappedChar; +sal_uChar nMappedChar = 0; // XXX important: avoid to reencode type1 symbol fonts if (mnBaseEncoding == RTL_TEXTENCODING_SYMBOL) nMappedChar = GetSymbolMapping (nUnicode); -else -nMappedChar = GetAnsiMapping (nUnicode); -// create an empty glyphmap that is reserved for iso1252 encoded glyphs -// (or -- unencoded -- symbol glyphs) and a second map that takes any other +// create an empty glyphmap that is reserved for unencoded symbol glyphs, +// and a second map that takes any other if (maGlyphList.empty()) { glyph_map_t aMap, aMapp; @@ -302,7 +300,7 @@ GlyphSet::AddGlyphID ( // insert a new glyph in the font subset if (nMappedChar) { -// always put iso1252 chars into the first map, map them on itself +// always put symbol glyphs into the first map, map them on itself glyph_map_t& aGlyphSet = maGlyphList.front(); AddNotdef (aGlyphSet); @@ -312,7 +310,7 @@ GlyphSet::AddGlyphID ( } else { -// other chars are just appended to the list +// other glyphs are just appended to the list glyph_map_t& aGlyphSet = maGlyphList.back(); AddNotdef (aGlyphSet); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/generic
vcl/generic/print/genpspgraphics.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8b6f67c676d15a3178d268ff9974155d6e130205 Author: Khaled Hosny Date: Sat Nov 23 13:40:50 2013 +0200 Correctly check getFileURLFromSystemPath() success Change-Id: Iadc34171235fec2d6aafd601f62a0bff8ed5b3ee Reviewed-on: https://gerrit.libreoffice.org/6770 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 10af660..993d8d5 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -1390,7 +1390,7 @@ const void* GenPspGraphics::DoGetEmbedFontData( psp::fontID aFont, const sal_Ucs #else // FIXME: test me ! ... OUString aURL; -if( !osl::File::getFileURLFromSystemPath( OStringToOUString( aSysPath, osl_getThreadTextEncoding() ), aURL ) ) +if( osl::File::getFileURLFromSystemPath( OStringToOUString( aSysPath, osl_getThreadTextEncoding() ), aURL ) != osl::File::E_None ) return NULL; osl::File aFile( aURL ); if( aFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_NoLock ) != osl::File::E_None ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/generic
vcl/generic/fontmanager/fontmanager.cxx | 14 -- 1 file changed, 4 insertions(+), 10 deletions(-) New commits: commit 4d174557c04a48efa5661c5e6e2c1295b68f3681 Author: Khaled Hosny Date: Sat Nov 23 13:12:59 2013 +0200 Make TTC fonts work again osl::File::getFileURLFromSystemPath() does not return a boolean. I wonder how this worked before, if it worked at all. Change-Id: Iadc0e06236f43c24cbcd42e4fd79ac9116a58c13 Reviewed-on: https://gerrit.libreoffice.org/6769 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 418f480..5e92170 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -1176,20 +1176,14 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, :: fprintf( stderr, "ttc: %s contains %d fonts\n", aFullPath.getStr(), nLength ); #endif -sal_uInt64 fileSize; +sal_uInt64 fileSize = 0; OUString aURL; -if (!osl::File::getFileURLFromSystemPath(OStringToOUString(aFullPath, osl_getThreadTextEncoding()), -aURL)) -{ -fileSize = 0; -} -else +if (osl::File::getFileURLFromSystemPath(OStringToOUString(aFullPath, osl_getThreadTextEncoding()), +aURL) == osl::File::E_None) { osl::File aFile(aURL); -if (aFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_NoLock) != osl::File::E_None) -fileSize = 0; -else +if (aFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_NoLock) == osl::File::E_None) { osl::DirectoryItem aItem; osl::DirectoryItem::get( aURL, aItem ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/uiconfig
cui/uiconfig/ui/swpossizepage.ui |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit a515a8393b0790c4d2020b791484e925850329d0 Author: Olivier Hallot Date: Sun Nov 24 11:30:53 2013 -0200 Add missing keyboard shortcut to dialog Add missing keyboard shortcut to dialog swpossizepage.ui Change-Id: Ie1e499af05e2a08432dd7649c0ffbe9ea0a12bf2 Reviewed-on: https://gerrit.libreoffice.org/6795 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit f336d8f8e9e9fdc1cf04c43ab2dbdc74706a3bf5) diff --git a/cui/uiconfig/ui/swpossizepage.ui b/cui/uiconfig/ui/swpossizepage.ui index e491f71..ced2de6 100644 --- a/cui/uiconfig/ui/swpossizepage.ui +++ b/cui/uiconfig/ui/swpossizepage.ui @@ -401,7 +401,7 @@ True False 0 -by +_by True byvert:0.00cm @@ -568,7 +568,7 @@ -Follow text flow +Follow te_xt flow True True False @@ -626,7 +626,7 @@ True -Position +Positio_n True True False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 70499, which changed state. Bug 70499 Summary: FILEOPEN Cannot select unprotected cells in XSLX sheet with worksheet protection https://bugs.freedesktop.org/show_bug.cgi?id=70499 What|Removed |Added Status|RESOLVED|REOPENED Resolution|DUPLICATE |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/swpossizepage.ui |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit f336d8f8e9e9fdc1cf04c43ab2dbdc74706a3bf5 Author: Olivier Hallot Date: Sun Nov 24 11:30:53 2013 -0200 Add missing keyboard shortcut to dialog Add missing keyboard shortcut to dialog swpossizepage.ui Change-Id: Ie1e499af05e2a08432dd7649c0ffbe9ea0a12bf2 Reviewed-on: https://gerrit.libreoffice.org/6795 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/uiconfig/ui/swpossizepage.ui b/cui/uiconfig/ui/swpossizepage.ui index e491f71..ced2de6 100644 --- a/cui/uiconfig/ui/swpossizepage.ui +++ b/cui/uiconfig/ui/swpossizepage.ui @@ -401,7 +401,7 @@ True False 0 -by +_by True byvert:0.00cm @@ -568,7 +568,7 @@ -Follow text flow +Follow te_xt flow True True False @@ -626,7 +626,7 @@ True -Position +Positio_n True True False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/subsequent_export-test.cxx |4 +-- sc/source/filter/excel/excrecds.cxx| 30 ++--- sc/source/filter/oox/worksheetsettings.cxx | 30 ++--- 3 files changed, 32 insertions(+), 32 deletions(-) New commits: commit 5728a56b20e01d6c9e86a23f20af64a1b68ad604 Author: Noel Power Date: Thu Nov 21 18:12:50 2013 + fdo#70499 selectn of lock/unlocked cells with worksheet protection reversed The ooxml spec documentation is rather confusing ( for me at least ) and the sense of the of the sheetProtection attributes as described seems reversed to how I read it ( or maybe it is the equivelant option in ScTableProtection that operates with the reverse sense ) In anycase the import ( and export ) have been adjusted to take that into consideration, also the export now actually deals with the defaults correctly. Change-Id: Ia69567b8898b39c9d171486cfa800e1748c5814b diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 0e8ff65..ad2e2ee 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -800,8 +800,8 @@ void ScExportTest::testSheetProtectionXLSX() CPPUNIT_ASSERT( (sal_uInt8)aHash[1] == 61 ); } // we could flesh out this check I guess -CPPUNIT_ASSERT ( pTabProtect->isOptionEnabled( ScTableProtection::OBJECTS ) ); -CPPUNIT_ASSERT ( pTabProtect->isOptionEnabled( ScTableProtection::SCENARIOS ) ); +CPPUNIT_ASSERT ( !pTabProtect->isOptionEnabled( ScTableProtection::OBJECTS ) ); +CPPUNIT_ASSERT ( !pTabProtect->isOptionEnabled( ScTableProtection::SCENARIOS ) ); } xDocSh->DoClose(); } diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 232371b..01b2432a 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -520,21 +520,21 @@ void XclExpSheetProtection::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->singleElement( XML_sheetProtection, XML_sheet, XclXmlUtils::ToPsz( true ), XML_password, sHash.getStr(), -XML_objects, pTabProtect->isOptionEnabled( ScTableProtection::OBJECTS ) ? XclXmlUtils::ToPsz( true ) : NULL, -XML_scenarios, pTabProtect->isOptionEnabled( ScTableProtection::SCENARIOS ) ? XclXmlUtils::ToPsz( true ) : NULL, -XML_formatCells, pTabProtect->isOptionEnabled( ScTableProtection::FORMAT_CELLS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_formatColumns, pTabProtect->isOptionEnabled( ScTableProtection::FORMAT_COLUMNS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_formatRows, pTabProtect->isOptionEnabled( ScTableProtection::FORMAT_ROWS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_insertColumns, pTabProtect->isOptionEnabled( ScTableProtection::INSERT_COLUMNS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_insertRows, pTabProtect->isOptionEnabled( ScTableProtection::INSERT_ROWS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_insertHyperlinks, pTabProtect->isOptionEnabled( ScTableProtection::INSERT_HYPERLINKS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_deleteColumns, pTabProtect->isOptionEnabled( ScTableProtection::DELETE_COLUMNS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_deleteRows, pTabProtect->isOptionEnabled( ScTableProtection::DELETE_ROWS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_selectLockedCells, pTabProtect->isOptionEnabled( ScTableProtection::SELECT_LOCKED_CELLS ) ? XclXmlUtils::ToPsz( true ) : NULL, -XML_sort, pTabProtect->isOptionEnabled( ScTableProtection::SORT ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_autoFilter, pTabProtect->isOptionEnabled( ScTableProtection::AUTOFILTER ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_pivotTables, pTabProtect->isOptionEnabled( ScTableProtection::PIVOT_TABLES ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_selectUnlockedCells, pTabProtect->isOptionEnabled( ScTableProtection::SELECT_UNLOCKED_CELLS ) ? XclXmlUtils::ToPsz( true ) : NULL, +XML_objects, pTabProtect->isOptionEnabled( ScTableProtection::OBJECTS ) ? NULL : XclXmlUtils::ToPsz( true ), +XML_scenarios, pTabProtect->isOptionEnabled( ScTableProtection::SCENARIOS ) ? NULL : XclXmlUtils::ToPsz( true ), +XML_formatCells, pTabProtect->isOptionEnabled( ScTableProtection::FORMAT_CELLS ) ? XclXmlUtils::ToPsz( false ) : NULL, +XML_formatColumns, pTabProtect->isOptionEnabled( ScTableProtection::FORMAT_COLUMNS ) ? XclXmlUtils::ToPsz( false ) : NULL, +XML_formatRows, pTabProtect->isOptionEnabled( ScTableProtection::FORMAT_ROWS ) ? XclXmlUtils::ToPsz( false ) : NULL, +XML_insertColumns, pTabProtect->isOptionEnabled( ScTableProtection::INSERT_COLUMNS ) ? XclXmlUtils::ToPsz( false ) : NU
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa sw/source
sw/qa/extras/ooxmlimport/data/file_crash.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx |5 + sw/source/core/doc/doctxm.cxx |2 +- 3 files changed, 6 insertions(+), 1 deletion(-) New commits: commit 247edcf4fe8e7c624fda74b9e9d1658da2785a34 Author: PriyankaGaikwad Date: Fri Nov 22 19:05:32 2013 +0530 Fixed for libreoffice crashes while opening file. Change-Id: I85a16e4ef8d75f19250115d5522046a968d5fc91 Reviewed-on: https://gerrit.libreoffice.org/6760 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit c6e333e73b811a65526628effb21636f4f420cc5) diff --git a/sw/qa/extras/ooxmlimport/data/file_crash.docx b/sw/qa/extras/ooxmlimport/data/file_crash.docx new file mode 100644 index 000..7a233ab Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/file_crash.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index d8ca06f..d957b98 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1540,6 +1540,11 @@ DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx") CPPUNIT_ASSERT_EQUAL(sal_Int32(4500), getProperty(getShape(1), "RotateAngle")); } +DECLARE_OOXMLIMPORT_TEST(testLOCrash,"file_crash.docx") +{ +//The problem was libreoffice crash while opening the file. +getParagraph(1,"Contents"); +} #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index e28617d..bece385 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -1616,7 +1616,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, case TOKEN_ENTRY_TEXT: { -SwIndex aIdx( pTOXNd, rTxt.getLength() ); +SwIndex aIdx( pTOXNd, std::min(pTOXNd->GetTxt().getLength(),rTxt.getLength()) ); rBase.FillText( *pTOXNd, aIdx ); rTxt = lcl_RemoveLineBreaks(rTxt); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlimport/data/file_crash.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx |5 + sw/source/core/doc/doctxm.cxx |2 +- 3 files changed, 6 insertions(+), 1 deletion(-) New commits: commit c6e333e73b811a65526628effb21636f4f420cc5 Author: PriyankaGaikwad Date: Fri Nov 22 19:05:32 2013 +0530 Fixed for libreoffice crashes while opening file. Change-Id: I85a16e4ef8d75f19250115d5522046a968d5fc91 Reviewed-on: https://gerrit.libreoffice.org/6760 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/qa/extras/ooxmlimport/data/file_crash.docx b/sw/qa/extras/ooxmlimport/data/file_crash.docx new file mode 100644 index 000..7a233ab Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/file_crash.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index ea6f8e6..8f6e931 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1555,6 +1555,11 @@ DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx") CPPUNIT_ASSERT_EQUAL(sal_Int32(4500), getProperty(getShape(1), "RotateAngle")); } +DECLARE_OOXMLIMPORT_TEST(testLOCrash,"file_crash.docx") +{ +//The problem was libreoffice crash while opening the file. +getParagraph(1,"Contents"); +} #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index e28617d..bece385 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -1616,7 +1616,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, case TOKEN_ENTRY_TEXT: { -SwIndex aIdx( pTOXNd, rTxt.getLength() ); +SwIndex aIdx( pTOXNd, std::min(pTOXNd->GetTxt().getLength(),rTxt.getLength()) ); rBase.FillText( *pTOXNd, aIdx ); rTxt = lcl_RemoveLineBreaks(rTxt); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/window/salframeview.mm | 37 + 1 file changed, 37 insertions(+) New commits: commit 82b5172954261e030a42bd6b3f4acc99807d0ee5 Author: Caolán McNamara Date: Mon Nov 25 11:04:41 2013 + Resolves: fdo#41169 fix MacOSX non-Latin keyboard layout with Latin shortcuts Change-Id: I168de52d6185d5df9c41fd2d7a68c0ff3f733852 diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index 31b87e2..4bb1dfde 100644 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -113,6 +113,38 @@ static sal_uInt16 ImplMapCharCode( sal_Unicode aCode ) return nKeyCode; } +static sal_uInt16 ImplMapKeyCode(sal_uInt16 nKeyCode) +{ +/* + http://stackoverflow.com/questions/2080312/where-can-i-find-a-list-of-key-codes-for-use-with-cocoas-nsevent-class/2080324#2080324 + /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/Headers/Events.h + */ + +static sal_uInt16 aKeyCodeMap[ 0x80 ] = +{ +KEY_A, KEY_S, KEY_D,KEY_F, KEY_H, KEY_G,KEY_Z, KEY_X, +KEY_C, KEY_V, 0,KEY_B, KEY_Q, KEY_W,KEY_E, KEY_R, +KEY_Y, KEY_T, KEY_1,KEY_2, KEY_3, KEY_4,KEY_6, KEY_5, +KEY_EQUAL, KEY_9, KEY_7, KEY_SUBTRACT, KEY_8, KEY_0, KEY_BRACKETRIGHT, KEY_0, +KEY_U, KEY_BRACKETLEFT, KEY_I,KEY_P, KEY_RETURN, KEY_L,KEY_J, KEY_QUOTELEFT, +KEY_K, KEY_SEMICOLON, 0,KEY_COMMA, KEY_DIVIDE, KEY_N,KEY_M, KEY_POINT, +KEY_TAB, KEY_SPACE, KEY_TILDE, KEY_DELETE, 0, KEY_ESCAPE,0, 0, + 0, KEY_CAPSLOCK, 0,0, 0, 0,0, 0, +KEY_F17, KEY_DECIMAL, 0, KEY_MULTIPLY, 0, KEY_ADD, 0, 0, + 0, 0, 0, KEY_DIVIDE, KEY_RETURN, 0, KEY_SUBTRACT, KEY_F18, +KEY_F19, KEY_EQUAL, 0,0, 0, 0,0, 0, + 0, 0, KEY_F20,0, 0, 0,0, 0, + KEY_F5,KEY_F6,KEY_F7, KEY_F3, KEY_F8, KEY_F9,0, KEY_F11, + 0, KEY_F13, KEY_F16, KEY_F14, 0, KEY_F10,0, KEY_F12, + 0, KEY_F15, KEY_HELP, KEY_HOME, KEY_PAGEUP, KEY_DELETE, KEY_F4, KEY_END, + KEY_F2, KEY_PAGEDOWN,KEY_F1, KEY_LEFT, KEY_RIGHT, KEY_DOWN, KEY_UP,0 +}; + +if (nKeyCode < SAL_N_ELEMENTS(aKeyCodeMap)) +return aKeyCodeMap[nKeyCode]; +return 0; +} + // store the frame the mouse last entered static AquaSalFrame* s_pMouseFrame = NULL; // store the last pressed button for enter/exit events @@ -1490,6 +1522,11 @@ private: { unichar keyChar = [pUnmodifiedString characterAtIndex: 0]; sal_uInt16 nKeyCode = ImplMapCharCode( keyChar ); +if (nKeyCode == 0) +{ +sal_uInt16 nOtherKeyCode = [pEvent keyCode]; +nKeyCode = ImplMapKeyCode(nOtherKeyCode); +} if( nKeyCode != 0 ) { // don't send unicodes in the private use area ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a987ac4a3af53c4c8bac7485f8fab6d2153840e7 Author: Andras Timar Date: Mon Nov 25 11:25:28 2013 +0100 Updated core Project: translations e128db6759de734c9f8e1172c128d7741744eafd diff --git a/translations b/translations index 4963cc1..e128db6 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 4963cc11e88df24caa555250646d243a11e0fc29 +Subproject commit e128db6759de734c9f8e1172c128d7741744eafd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/datastreams' - sc/source
sc/source/ui/docshell/datastream.cxx | 17 - sc/source/ui/inc/datastream.hxx |3 +++ 2 files changed, 15 insertions(+), 5 deletions(-) New commits: commit 93098819ccbc4cf7448b429e13d36c170f38ac39 Author: Matúš Kukan Date: Mon Nov 25 10:44:08 2013 +0100 datastreams: do not hang when closing the link Change-Id: Ib38472849d7b56bf3013f65d84f1b4cfbd91b2d0 diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 8064bc8..79d637c 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -54,9 +54,9 @@ private: TimeValue const aTime = {0, 10}; maStart.wait(); maStart.reset(); -if (!mbTerminate) -while (mpDataStream->ImportData()) -wait(aTime); +while (!mbTerminate && mpDataStream->ImportData()) +wait(aTime); +mpDataStream->maMakeSureTheThreadStopped.set(); }; } }; @@ -238,8 +238,7 @@ DataStream::DataStream(ScDocShell *pShell, const OUString& rURL, const ScRange& DataStream::~DataStream() { -if (mbRunning) -Stop(); +Stop(); mxThread->mbTerminate = true; mxThread->maStart.set(); mxThread->join(); @@ -309,6 +308,8 @@ void DataStream::Stop() if (!mbRunning) return; mbRunning = false; +SolarMutexReleaser aAllowTheThreadToStop; +maMakeSureTheThreadStopped.wait(); mpScDocument->EnableUndo(mbIsUndoEnabled); } @@ -397,6 +398,12 @@ bool DataStream::ImportData() return mbRunning; } +void DataStream::Closed() +{ +Stop(); +SvBaseLink::Closed(); +} + sfx2::SvBaseLink::UpdateResult DataStream::DataChanged( const OUString& , const css::uno::Any& ) { diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index 9dd7cb7..ec355fa 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -9,6 +9,7 @@ #include +#include #include #include #include @@ -37,6 +38,7 @@ class DataStream : boost::noncopyable, public sfx2::SvBaseLink public: enum MoveEnum { NO_MOVE, RANGE_DOWN, MOVE_DOWN, MOVE_UP }; enum { SCRIPT_STREAM = 1, VALUES_IN_LINE = 2 }; +osl::Condition maMakeSureTheThreadStopped; static void MakeToolbarVisible(ScDocShell *pShell); static void Set(ScDocShell *pShell, const OUString& rURL, const OUString& rRange, @@ -45,6 +47,7 @@ public: DataStream(ScDocShell *pShell, const OUString& rURL, const ScRange& rRange, sal_Int32 nLimit, const OUString& rMove, sal_uInt32 nSettings); virtual ~DataStream() SAL_OVERRIDE; +virtual void Closed() SAL_OVERRIDE; virtual sfx2::SvBaseLink::UpdateResult DataChanged( const OUString& , const css::uno::Any& ) SAL_OVERRIDE; virtual void Edit(Window* , const Link& ) SAL_OVERRIDE; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Questions about Domain Mapper
Hi Adam, On Sun, Nov 24, 2013 at 06:06:06PM +0200, Adam Fyne wrote: > I think I was misunderstood. > I think you thought I was asking : "I need to add each property like > bold\italic\underline separatly to the RedlineParams". > What I actually meant to ask was: > Currently there are a lot of XML nodes that might appear under 'rPr' node > (that is under the 'rPrChange'). > For example: 'bold', 'boldbidi', 'italic', 'italicbidi', language, etc. > Currently each of these XML nodes is handled by different code in the > 'DomainMapper.cxx' file > (here is some of it: > http://opengrok.libreoffice.org/xref/core/writerfilter/source/dmapper/DomainMapper.cxx#2100 > ) > > So I am asking - do I have to go node-by-node and add it to the > 'property-list' that will be in the 'RedlineParams'? > Or is there any smart way of turning on some flag when the 'rPrChange->rPr' > tag is entered, > and checking at the end of the 'rPrChange->rPr' tag which properties were > inserted to the 'rContext' and add those properties to the 'RedlineParams'. Yes, that should be possible. Either when you expand the token of "rPrChange", then you can do something like: - turn flag on - resolve children - turn flag off (DomainMapper.cxx:3039 has examples of that, the interop-grab-bag reading of table styles use this technique) or in case that doesn't work, you can still generate tokens when you start or leave a context. If you search for tblStart/tblEnd in model.xml, you'll find examples for this as well. > *And some more elaboration on that:* > I just checked a simple DOCX that had some text in 'bold' and 'italic'. I > then turned ON the 'track changes' and removed the 'bold' and 'italic'. > When I round-tripped the DOCX through LO - the outputted file *had* the > 'bold' and 'italic' turned on. > This means that the nodes that were inside the 'r->rPrChange->rPr' were > treated as if they were simply inside the 'r'->'rPr' (which is wrong). Right, that's quite possible. > This ephasises the need to detect when 'r->rPrChange->rPr' are being > analyzed in the importer - and to *not* analyze them normally on the run > itself, but to store them in the 'RedlineParams' somehow. Agreed, that makes sense. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: winaccessibility/inc winaccessibility/Library_uacccom.mk winaccessibility/Library_winaccessibility.mk winaccessibility/source
winaccessibility/Library_uacccom.mk |1 winaccessibility/Library_winaccessibility.mk |1 winaccessibility/inc/UAccCOMdllapi.h | 24 +++ winaccessibility/inc/accHelper.hxx |4 + winaccessibility/source/UAccCOM/AccHypertext.cxx |8 -- winaccessibility/source/UAccCOM/AccTable.cxx | 16 - winaccessibility/source/UAccCOM/EnumVariant.cxx |5 - winaccessibility/source/UAccCOM/MAccessible.cxx | 73 ++- winaccessibility/source/UAccCOM/UAccCOM.cxx |9 ++ winaccessibility/source/UAccCOM/acccommon.h |6 + winaccessibility/source/service/AccObject.cxx| 18 + 11 files changed, 114 insertions(+), 51 deletions(-) New commits: commit 3b86569fcba210eb6570fabef7ff8abf6aff91f0 Author: Michael Stahl Date: Sun Nov 24 00:52:12 2013 +0100 winaccessibility: replace CoCreateInstance with direct instantiation This is an alternative (to 732ec36edfd09d2091d70c4d71b5f182fe279c45) solution to the "CoCreateInstance does not work" problem: replace all CoCreateInstance calls with equivalent calls to create the components directly. Since the only reason why this COM stuff needs to be registered at all is that AccObject uses CoCreateInstance() to create its COM objects, another possible solution appears to be to simply link the libraries and instantiate the COM objects directly, without COM. The only difference appears to be that CoCreateInstance would automatically add proxy objects in case the COM objects reside in a single-threaded appartment; not sure if that is relevant here. Change-Id: I8ffb8af501f6084f3145fa4d4f53366a070e1691 Reviewed-on: https://gerrit.libreoffice.org/6792 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/winaccessibility/Library_uacccom.mk b/winaccessibility/Library_uacccom.mk index f481b40..1592804 100644 --- a/winaccessibility/Library_uacccom.mk +++ b/winaccessibility/Library_uacccom.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Library_set_include,UAccCOM,\ )) $(eval $(call gb_Library_add_defs,UAccCOM,\ + -DUACCCOM_DLLIMPLEMENTATION \ -D_UNICODE=1 \ )) diff --git a/winaccessibility/Library_winaccessibility.mk b/winaccessibility/Library_winaccessibility.mk index 55057c3..45a86f3 100644 --- a/winaccessibility/Library_winaccessibility.mk +++ b/winaccessibility/Library_winaccessibility.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_externals,winaccessibility,\ )) $(eval $(call gb_Library_use_libraries,winaccessibility,\ + UAccCOM \ cppu \ cppuhelper \ vcl \ diff --git a/winaccessibility/inc/UAccCOMdllapi.h b/winaccessibility/inc/UAccCOMdllapi.h new file mode 100644 index 000..aca29b6 --- /dev/null +++ b/winaccessibility/inc/UAccCOMdllapi.h @@ -0,0 +1,24 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_UACCCOM_UACCCOMDLLAPI_H +#define INCLUDED_UACCCOM_UACCCOMDLLAPI_H + +#include + +#if defined(UACCCOM_DLLIMPLEMENTATION) +#define UACCCOM_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define UACCCOM_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define UACCCOM_DLLPRIVATE SAL_DLLPRIVATE + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/inc/accHelper.hxx b/winaccessibility/inc/accHelper.hxx index 772393a..f0dd29b 100644 --- a/winaccessibility/inc/accHelper.hxx +++ b/winaccessibility/inc/accHelper.hxx @@ -20,6 +20,8 @@ #ifndef __ACCHELPER_HXX #define __ACCHELPER_HXX +#include + enum DIRECTION { FIRST_CHILD=0, @@ -30,6 +32,8 @@ enum DIRECTION #define UNO_MSAA_UNMAPPING 0x +struct IMAccessible; +UACCCOM_DLLPUBLIC IMAccessible * UAccCOMCreateInstance(); #endif diff --git a/winaccessibility/source/UAccCOM/AccHypertext.cxx b/winaccessibility/source/UAccCOM/AccHypertext.cxx index ae9e86a..4679440 100644 --- a/winaccessibility/source/UAccCOM/AccHypertext.cxx +++ b/winaccessibility/source/UAccCOM/AccHypertext.cxx @@ -20,6 +20,8 @@ #include "stdafx.h" #include "UAccCOM.h" #include "AccHypertext.h" +#include "AccHyperLink.h" +#include "acccommon.h" #include "act.hxx" @@ -325,11 +327,7 @@ STDMETHODIMP CAccHypertext::get_hyperlink(long index,IAccessibleHyperlink **hype } IAccessibleHyperlink* plink = NULL; -ActivateActContext(); -HRESULT hr = CoCreateInstance( CLSID_AccHyperLink, NULL, CLSCTX_SERVER , - IID_IAccessibleHyperlink, - (void **)&plink); -DeactivateActContext(); +HRESULT hr = createInstance(IID_IAccessibleHyperlink, &plink); if( SUCCEED