[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.4.2'
Tag 'libreoffice-3.5.4.2' created by Petr Mladek pmla...@suse.cz at 2012-05-22 13:48 -0700 Tag 3.5.4.2 (3.5.4-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPu4siAAoJEPQ0oe+v7q6jYH4QAMLtFgZr9bEDPmvmDGh8pCxz glY5eTjJHbMlClO038j+R8qTZ2xjT9sFi/cPhlBuAqiFfqCPhLjx9ClLrBSe3Xui yY4C77jHsceFiyRwdHe6ekXSF2LgUbS/HCCECKnigi7h/qDAZxkoEHPLVoulCxbc n8vmXIWzIsD4dNES0nojHW1qHjRg7uDLJy/qT8RSZ3H5s6JGOFxe9s+YTxd5t8EF tAJCvu6+RPthg3P6XMyopVMe+P6pXQxK7qA989q2DZ1JUhC0MbVI7XJOKFf8IvxE 9EsBO6PC/jGbQKf2vUjSP7aKQRXB1BQG9FXldqg3PjBX5BGQq0Wd52FdJuxNOgdd jnWL6vf0pC+zFAM1ThWbeKRx6dDiyRFGbtZJomMDfsWxOcJZHt9b/PN/uRaTsPPY +4DILI7gs0KnxHrvjDZ7nJqZjkws321q+E0KVxgraYP7k5lt6UQCZnKa3zIifwxq djVohwtjTJMQmeKUudCeoZbELuqkWmSBm0YLrtH6zggPlohzbHk7kjdsRe8Vwedw TCI5cvv5PvSYpOEP8G3or7One0sIIDSvzo+TZr2PFYGprcFYTGkP0guJTGTYNEOa 8QWiHwYwFmKk/eZKnWa1PuwaWImlH+uWR7ZhCw+VKTR4EaYoh0LrwhR30Du8Jtlz Zw8G5iu8HtVdwjWoGL43 =VI7B -END PGP SIGNATURE- Changes since libreoffice-3.5.0.1-4: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.4.2'
Tag 'libreoffice-3.5.4.2' created by Petr Mladek pmla...@suse.cz at 2012-05-22 13:48 -0700 Tag 3.5.4.2 (3.5.4-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPu4siAAoJEPQ0oe+v7q6jlmgP/1BV47qSzMv8SC2jI4Xju2BA 4Uo7fCKNLoqGEF4abkwmnLu9oH/ZJVJzgGjadQ3n2KQveJ/1fzKWWMbPuwQ1yjy+ bSu70anTY7gHcnAOQxvRWk1LPHqRx3kZeJrbWNeE/5lKc8bERKnwgGxCnfi0CQ6Z IURvc/mciCV/mP61MqGT5Auz7dYCfqTmhnji5wmV3PgCfIhL3WRFBhdHLk1zwTb3 scAMVF/iegc7fk0i22hnxZFrU001QOVIhgkAdrYGhp4K6e0kPemqxkz4e5Am5e8r VuXok0hZrDFvdOBcfzXCc2o+xi19dpave2gvrVR8bebX5Q3o+egutLWKU5czclAx Q2eLcT17TQzCq7b3mqRoiZDkCOzcwtnUeRg4KqPszsascRe45bqBUsP7mGh7apN4 ZjOI0RUBvAmeYclPO88SmBgBOSKNIReDz7Dl26nGpQR4yfWu0g+9p87e4sgIka/p IR+4PCc8R7bKTbJZx/fVqz6hRO0ZFCBRfiS/Lm4BthS6M82zevtL2mgEqe3HKddI fj+9ee2C03PZj6L9u9ETdPMVAoV7fUxL6sGHUplu73C9fxs6Y3KnvsaBRMtaIfYh 84pteeE8969s4hKLhAx7Jt74xmmeQuqHuNdT45Pitq2MdYD2CIVMmwzeQvHo6vwY Tws8bDJ1VytTBS0AKSIe =Ag4W -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-32: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-4'
New branch 'libreoffice-3-5-4' available with the following commits: commit af728267597327d41f9fc7bc722fbadb457ead62 Author: Petr Mladek pmla...@suse.cz Date: Tue May 15 16:18:58 2012 +0200 Branch libreoffice-3-5-4 This is 'libreoffice-3-5-4' - the stable branch for the 3.5.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ic9f58606ea0c0bb4b11ac7f39b2c205285e63462 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-4'
New branch 'libreoffice-3-5-4' available with the following commits: commit c178dd9a79335cf60dc3dda9f63dc57319778dac Author: Petr Mladek pmla...@suse.cz Date: Tue May 15 16:18:58 2012 +0200 Branch libreoffice-3-5-4 This is 'libreoffice-3-5-4' - the stable branch for the 3.5.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I4a44061085779584908c1d021735ef3c3e9ea7a4 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.4.1'
Tag 'libreoffice-3.5.4.1' created by Petr Mladek pmla...@suse.cz at 2012-05-15 15:30 -0700 Tag 3.5.4.1 (3.5.4-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPsmhyAAoJEPQ0oe+v7q6j9UYP/27HaAa0IVR30veVMgfN/5Xc WN4w3MJo1CyCL/64U03NDDu8et7m2/5Xro/7Y3D7+MRTQn1kG1pgZOycLbh3yr4y e0NqGOMNpDI2UdsN8dGqw5kNiGXabodOYqgaXsvfFq3pOh0KHGpLJPQlBqMuk42B zRts3P7baue464R3kZkTsOb2aHbmoIrfNTZn5+9q2kD69TU2NN4Ng7ofClfNbHAV PfENBYLx/gocZj9nBwmqKq2u6NbJqLbY66q1gQfY/EbsiUaXHb4s7YUm8k3hiZGd v9QI2RyQuLb6o7EwnwY/cBa9rjkjWXfkUm6fUEXFbEpScOjMHBcGtPAtM8gLm+Ba su+YEtHe2gonqp5g3+YMi5CINGqMt+Xbup3ThKLPBzukNVI6WfYru73awvYaS77d QTnSo2F+EWUvV19AyYH1f6kPVfM5iqPfhTQ4S9eRa/xwLG9Fd/zoZMj3gHwhS6L2 PsUzwFTIuL3AJ31WrFaRLbHy0h0JxCgkwGxz7eHeEBNYJjbPJfLL2CN0nytgT1CF 1e2oESoSS5/dmL60tGhnVg9WpztTJmcDgDRo7W7gNvEAKneWBWJixxTs3eezsO84 W/PA8QXnk1WqTVBeojKkuOadnLjJy23mKrpBxytsG5YaYQK08iBm1t7qSLR8jty1 OPeJxrXtITmV7EbOqWUK =CerO -END PGP SIGNATURE- Changes since libreoffice-3.5.0.1-4: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.4.1'
Tag 'libreoffice-3.5.4.1' created by Petr Mladek pmla...@suse.cz at 2012-05-15 15:30 -0700 Tag 3.5.4.1 (3.5.4-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPsmhzAAoJEPQ0oe+v7q6jY+EP/1gGwI+33IprlIgbrebdiN0N 0a9Unh6lBRJy7ou2SZegE0ekQd8YwkZOymTYjatI8D32MQBhz5J481WOTzxK/98V kCojfUU9QMd5FVAAgJ+74SIKwav10rTPEDLPsiMnmEr+780eoUzqc0JJJSVjfCHv EsFbJtbcXihSj5zXbqu39rsWaBwPH8cBA1oKEzwFDV4anqy6QEv8TLi3+/amZP3K evsGIB8sZarFznNTA7a+2cB/2UWa9bcOu8dtZiQ9Pqy3bc7Bq4eqOzdI4bIpKHjf T5TWh9/Y6/xx2jP03Vcb8iAw5/B/sZqRiLEIO9WSNIjseAQs1Hi2ka3GEYZwgjMs 19UlwH+kQcxZjvTKVYjn7aKaUlhL4I9FVjlUfDMhRgjM7cxc2XPQornK3BbhSL/H IztcQ4kIYiqyxMMH/dfP45zBS6AX0FJTYhSyi9vkDBKa8sFrafFYrpBVfp+iE34/ mpgqw8OWZeQyJ9a5fx4OW5HMiMhtfGE1LPlvVvUkVAXPV7hJJcDqxuDLGkWFOHoZ Zxmahmb7WwpczSsZ44LIofWe6eEzfZ5Sr4pOseqsDOivw0aBmB2JzmWq3z0n9znF 8Fb+M4JBz3luLpQ1VjZ0Sh4vPyQMPBq7APowC2oy4B41Lbhi5mO+1iI8rEnWOmnu zqM4rNViIO5qFtLdo3Y8 =orlh -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-32: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bug/bug.xhtml
bug/bug.xhtml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 388a604f5715d2ce713e57b0b9553ff7d232805b Author: Daniel Neel dneel...@gmail.com Date: Mon Jan 2 14:26:32 2012 -0500 Fix for bug 44404 diff --git a/bug/bug.xhtml b/bug/bug.xhtml index cc780e9..254731a 100644 --- a/bug/bug.xhtml +++ b/bug/bug.xhtml @@ -57,7 +57,7 @@ divAssistant/div /div div class=submission - Thank you for using LibreOffice, we regret that you seem to have found a problem in our software, so that you decided to report a bug. This assistant will lead you step by step through the bug report process. + Thank you for using LibreOffice. We regret that you seem to have found a bug in our software, but we are glad that you decided to report it. This assistant will lead you step by step through the bug reporting process. /div /div div class=content ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-3' - vcl/source
vcl/source/gdi/pngread.cxx | 27 +++ 1 file changed, 19 insertions(+), 8 deletions(-) New commits: commit c4088ad4ef53284af8136cca5eab7714307ce152 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 19 20:46:59 2012 +0100 fail earlier on oversized images Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Michael Meeks michael.me...@suse.com Signed-off-by: Miklos Vajna vmik...@frugalware.org diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 1c590b5..2302e33 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -620,14 +620,6 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size rPreviewSizeHint ) mnScansize = static_cast sal_uInt32 ( nScansize64 ); -// TODO: switch between both scanlines instead of copying -mpInflateInBuf = new (std::nothrow) sal_uInt8[ mnScansize ]; -mpScanCurrent = mpInflateInBuf; -mpScanPrior = new (std::nothrow) sal_uInt8[ mnScansize ]; - -if ( !mpInflateInBuf || !mpScanPrior ) -return sal_False; - // calculate target size from original size and the preview hint if( rPreviewSizeHint.Width() || rPreviewSizeHint.Height() ) { @@ -662,6 +654,25 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size rPreviewSizeHint ) maTargetSize.Width() = (maOrigSize.Width() + mnPreviewMask) mnPreviewShift; maTargetSize.Height() = (maOrigSize.Height() + mnPreviewMask) mnPreviewShift; +//round bits up to nearest multiple of 8 and divide by 8 to get num of bytes per pixel +int nBytesPerPixel = ((mnTargetDepth + 7) ~7)/8; + +//stupidly big, forget about it +if (maTargetSize.Width() = SAL_MAX_INT32 / nBytesPerPixel / maTargetSize.Height()) +{ +SAL_WARN( vcl, overlarge png dimensions: +maTargetSize.Width() x maTargetSize.Height() depth: mnTargetDepth); +return sal_False; +} + +// TODO: switch between both scanlines instead of copying +mpInflateInBuf = new (std::nothrow) sal_uInt8[ mnScansize ]; +mpScanCurrent = mpInflateInBuf; +mpScanPrior = new (std::nothrow) sal_uInt8[ mnScansize ]; + +if ( !mpInflateInBuf || !mpScanPrior ) +return sal_False; + mpBmp = new Bitmap( maTargetSize, mnTargetDepth ); mpAcc = mpBmp-AcquireWriteAccess(); if( !mpAcc ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-3' - officecfg/registry
officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 60e4db7aa959133fdae5e9536c8c6e0ae9ab447b Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Apr 24 12:06:43 2012 +0200 default to Office 2007/2010 filter for ooxml export, fdo#48941 (cherry picked from commit f3d7d6ece96d74e55dc92babfd12812dfe1a4793) Signed-off-by: Michael Stahl mst...@redhat.com Signed-off-by: Lubos Lunak l.lu...@suse.cz Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu index 4593983..e0d569d 100644 --- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu +++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu @@ -30,7 +30,7 @@ node oor:name=ModuleDependendFilterOrder node oor:name=com.sun.star.sheet.SpreadsheetDocument oor:op=replace install:module=calc prop oor:name=SortedFilterList -value oor:separator=;calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;Calc Office Open XML;Calc Office Open XML Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery/value +value oor:separator=;calc8;calc8_template;StarOffice XML (Calc);calc_StarOffice_XML_Calc_Template;OpenDocument Spreadsheet Flat XML;UOF spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;StarCalc 5.0;StarCalc 5.0 Vorlage/Template;StarCalc 4.0;StarCalc 4.0 Vorlage/Template;StarCalc 3.0;StarCalc 3.0 Vorlage/Template;StarCalc 1.0;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery;Calc Office Open XML;Calc Office Open XML Template/value /prop /node node oor:name=com.sun.star.drawing.DrawingDocument oor:op=replace install:module=draw @@ -40,7 +40,7 @@ /node node oor:name=com.sun.star.presentation.PresentationDocument oor:op=replace install:module=impress prop oor:name=SortedFilterList -value oor:separator=;impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage;CGM - Computer Graphics Metafile/value +value oor:separator=;impress8;impress8_template;impress8_draw;StarOffice XML (Impress);impress_StarOffice_XML_Impress_Template;impress_StarOffice_XML_Draw;OpenDocument Presentation Flat XML;UOF presentation;Impress MS PowerPoint 2007 XML;Impress MS PowerPoint 2007 XML AutoPlay;Impress MS PowerPoint 2007 XML Template;MS PowerPoint 97;MS PowerPoint 97 AutoPlay;MS PowerPoint 97 Vorlage;StarDraw 5.0 (StarImpress);StarDraw 3.0 (StarImpress);StarImpress 5.0;StarImpress 5.0 Vorlage;StarImpress 5.0 (packed);StarImpress 4.0;StarImpress 4.0 Vorlage;CGM - Computer Graphics Metafile;Impress Office Open XML;Impress Office Open XML AutoPlay;Impress Office Open XML Template/value /prop /node node oor:name=com.sun.star.formula.FormulaProperties oor:op=replace install:module=math @@ -55,7 +55,7 @@ /node node oor:name=com.sun.star.text.TextDocument oor:op=replace install:module=writer prop oor:name=SortedFilterList -value oor:separator=;writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;Office Open XML Text;Office Open XML Text Template;OpenDocument Text Flat XML;UOF text;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;MS Word 97;MS Word 97 Vorlage;MS
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.3.2'
Tag 'libreoffice-3.5.3.2' created by Petr Mladek pmla...@suse.cz at 2012-04-24 15:08 -0700 Tag 3.5.3.2 (3.5.3-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPlrPRAAoJEPQ0oe+v7q6jSFcP/33N0oYAfvKQINor0c5bLmSQ nDGJ+47Jtht+AYHcpuGFkBGE/4zcGJiEd4Ear7eaFFrN7c9mPUVBy/wihjKI1qmK u8rc2gfLPLvUWfy8TP98t6+dqFvHXt7QcPQHN7WgmF61khk+Q09jRbYo7TluO/Vb d8/g8ka0LUpnz68R8fCCcLtf2wqGzce/cpcY6fCn1905jDbVutIxGbGks00bQjfu 9X7UyppgJCf+/VZABTclnREO8e8pfZgmZdK3cdjrsqtyuvw7otbkmY9GXGaXioNH qXm7aRvk6aWwVui7CZjqUrASdjS5siTu9pazUfGWTXLsOJCjzIOOOAVBqMLEXDr6 KRi2/5F4BObxEW1piOVo3F7H13KFabu55jGDkynfII4Xzi7Q2E6aiCObZCfTcM6y I5SXPMWCoVcMcxhnfCAbaan1tz+o5417+5Is+JOeU6x7qaJxgWeda6w3bxKCmRJB S/J2nrj8gMjcrleLmzBIvJ/hrnEyYoMnUYu+iB3Efwz8wcVg3T3coBZIZDqW6u4S 4Yhmw4nTZ05rzAHD+1Q7+nhNO7V1oee9MY0Mrb5hVajBlD/Ql9d0EzKh6urV2VDF 2zyx95i1S1qKEgSUI9OkhsoOnpCmiP25QDG4YsS/BunRUSZQfIaH0rC6nal9iuSL 4XdsOFCEmg/F2Bh0U9vt =KjJu -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-1089: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.3.2'
Tag 'libreoffice-3.5.3.2' created by Petr Mladek pmla...@suse.cz at 2012-04-24 15:08 -0700 Tag 3.5.3.2 (3.5.3-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPlrPRAAoJEPQ0oe+v7q6jW64P/2HFosztvstIwt8bjjKsYFVU WnGqghglZCTDqtNgc7RLEII8RI1c4kC4ops2bTopPwubtcuOm4qcNjYn/MH+gVcr urwTxlt+okrkNmXuqW9QVMFsR9uFQQ5GhBEi3T/ywtmaQbtK7r93InaAxKOkULrN aXat4D4mdMDKCZut2kp0dqwEBZZKTDfkcMVCLFsnD4UF9YN1e3AwcrxFyt8LwgcM 3u7nT5ZpJLlz9agkjtPKtqzvNGiNo89mtc3Dy25lR2GHrUa12XH7r6b8QcEwxUW+ snJGoKSlRxjYGTtajd1o9EPTqPsnfRJEB2Bn3ZP8btkdSR3En2YbWdWom+xonECr jxi9WyFBCCJBKhIi+4kQAXspZvpPveLNnnLVtZiz9TAAA7PgV1xULy6NmU2P9WrW 1grleq1aH5uJAtCjNSpNwPNWp8TPm+57qYqhkTlVqigC3wtp6kpRM2BlPl2SxxUo ph/PUTGrEVVZOXxGdBMZfvDkqUtKnk7LgYEjVn4T+1nYVSpmieyDcey9PSZGsrUf YOXaVU0PSAZUV1igR3bCCP3sRldqkHqhcdklvkBYm95Q/x8OOQBHu/m1Tf3RLE2a zvoW1FqZSn7vVuqkS9hkrN94kbe2DkGIbjfsR5p6KgDcB5JtSXIGRPONOCKtq+QJ XWzcA4WXmcKcbpqp1P/D =rmR7 -END PGP SIGNATURE- Changes since libreoffice-3.5.0.1-4: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.3.2'
Tag 'libreoffice-3.5.3.2' created by Petr Mladek pmla...@suse.cz at 2012-04-24 15:08 -0700 Tag 3.5.3.2 (3.5.3-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPlrPRAAoJEPQ0oe+v7q6jS2sP/0RZvJ4byGFcuBBD3BTkYI9P RzjBXk3oSq1nBdwrqI3KUkNKt1eH3v877SeFW3M4O2J05UVa1kT52C/H3QVe0mfB mbNGlTermuVPJV7qgVj65JV2J9AejOdQbmu948PCVXVifRP93x0OewZsMC57fELE dJAIyCnO9c45hvugIQOfjALDIYI26lW7B7OqGIEWj+YXy3XizofTRkNBUhgoLVt4 SARSCuqP9+VGprWvlyQoh4gE9fmZeAMXADyVY1AP7aq77KbJocAdVBrDCOCzmoaM fWmEeJdXT0PSEOlIsthhpzQ2DqTIX2593t0tye/ZCayNDzRc8yDgOTh7SH6icdXW 6VD/1PazwLZDhBiV7mnVIlyE/rdguXJDKGSYF7O1u34XldYz2R/hpow9NtxisPRx LdCIIwVB+5GD9brPPH+/dBPXFQr3Al8N+BxXF8cOsT8krzYKnTdYNuQ7+koI5GRb 9aeKlFOnfHPtBWhvfsGklKoP1cZsS3ZVGE/0OGwuMKc4QNjFRnJlBtWahR8hg26J 3VeTuAF5ZWEmaFEAmR3d4OMvGqqDgfxo5bQkU3yyJr54I1B3MPrBXysXwJMIBijr mwxCmISc2JSlW318mp1TZebnAH89auK88i/j4aarLrFPLUNwINk9nioPd39NHJ2J 60D3fmaenq/56AhxzB55 =SG58 -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-31: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ooo.lst.in openssl/makefile.mk openssl/openssl-asm-fix.patch openssl/opensslios.patch openssl/openssllnx.patch openssl/opensslmacosx.patch openssl/opensslmingw.patch openssl/o
ooo.lst.in|2 +- openssl/makefile.mk | 16 openssl/openssl-asm-fix.patch |4 ++-- openssl/openssl.patch | 24 openssl/opensslios.patch |4 ++-- openssl/openssllnx.patch | 28 ++-- openssl/opensslmacosx.patch | 12 ++-- openssl/opensslmingw.patch| 16 openssl/opensslsol.patch | 28 ++-- openssl/version.mk|4 ++-- 10 files changed, 69 insertions(+), 69 deletions(-) New commits: commit 957cb927a77a1e19d2a1d4804cbbe9816150654b Author: Petr Mladek pmla...@suse.cz Date: Mon Apr 23 11:26:12 2012 +0200 update internal openssl to version 0.9.8v including important bug fixes diff --git a/ooo.lst.in b/ooo.lst.in index 1d6bfde..04dfa6b 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -1,6 +1,6 @@ http://dev-www.libreoffice.org/src 86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz -63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz +51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 226e86c..04a8683 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -46,10 +46,10 @@ TARGET=openssl @echo openssl disabled .ENDIF -OPENSSL_NAME=openssl-0.9.8o +OPENSSL_NAME=openssl-0.9.8v TARFILE_NAME=$(OPENSSL_NAME) -TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4 +TARFILE_MD5=51a40a81b3b7abe8a5c33670bd3da0ce PATCH_FILES=openssl-asm-fix.patch CONFIGURE_DIR=. @@ -86,8 +86,8 @@ UNAME=$(shell uname) .IF $(OS) == LINUX || $(OS) == FREEBSD || $(OS) == ANDROID PATCH_FILES+=openssllnx.patch ADDITIONAL_FILES:= \ -libcrypto_OOo_0_9_8o.map \ -libssl_OOo_0_9_8o.map +libcrypto_OOo_0_9_8v.map \ +libssl_OOo_0_9_8v.map .IF $(CPU) == I .IF $(UNAME) == GNU/kFreeBSD CONFIGURE_ACTION=Configure debian-kfreebsd-i386 @@ -104,15 +104,15 @@ UNAME=$(shell uname) CONFIGURE_ACTION=Configure linux-generic32 .ENDIF # if you build openssl as shared library you have to patch the Makefile.Shared LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \ -#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map' +#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8v.map' .ENDIF .IF $(OS) == SOLARIS PATCH_FILES+=opensslsol.patch ADDITIONAL_FILES:= \ -libcrypto_OOo_0_9_8o.map \ -libssl_OOo_0_9_8o.map -#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib(SHLIBDIRS)_OOo_0_9_8e.map' +libcrypto_OOo_0_9_8v.map \ +libssl_OOo_0_9_8v.map +#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib(SHLIBDIRS)_OOo_0_9_8v.map' # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary diff --git a/openssl/openssl-asm-fix.patch b/openssl/openssl-asm-fix.patch index bb722be..76013eb 100644 --- a/openssl/openssl-asm-fix.patch +++ b/openssl/openssl-asm-fix.patch @@ -1,5 +1,5 @@ misc/build/openssl-0.9.8o/crypto/md32_common.h.sav 2010-03-29 13:23:11.0 +0200 -+++ misc/build/openssl-0.9.8o/crypto/md32_common.h 2012-03-16 12:39:14.986941958 +0100 +--- misc/build/openssl-0.9.8v/crypto/md32_common.h.sav 2010-03-29 13:23:11.0 +0200 misc/build/openssl-0.9.8v/crypto/md32_common.h 2012-03-16 12:39:14.986941958 +0100 @@ -165,7 +165,7 @@ asm ( \ roll %1,%0\ diff --git a/openssl/openssl.patch b/openssl/openssl.patch index 88f7088..538b2c1 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -1,5 +1,5 @@ misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 +0100 -+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 +0100 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (rich...@levitte.org) @@ -9,8 +9,8 @@ * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c2004-12-28 01:21:33.0 +0100 -+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8v/crypto/x509v3/v3_pcia.c2004-12-28 01:21:33.0 +0100 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (rich
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source
vcl/source/gdi/pngread.cxx | 27 +++ 1 file changed, 19 insertions(+), 8 deletions(-) New commits: commit 15afc7ab406141983f8b64fca116586e3c1cb581 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 19 20:46:59 2012 +0100 fail earlier on oversized images Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 1c590b5..2302e33 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -620,14 +620,6 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size rPreviewSizeHint ) mnScansize = static_cast sal_uInt32 ( nScansize64 ); -// TODO: switch between both scanlines instead of copying -mpInflateInBuf = new (std::nothrow) sal_uInt8[ mnScansize ]; -mpScanCurrent = mpInflateInBuf; -mpScanPrior = new (std::nothrow) sal_uInt8[ mnScansize ]; - -if ( !mpInflateInBuf || !mpScanPrior ) -return sal_False; - // calculate target size from original size and the preview hint if( rPreviewSizeHint.Width() || rPreviewSizeHint.Height() ) { @@ -662,6 +654,25 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size rPreviewSizeHint ) maTargetSize.Width() = (maOrigSize.Width() + mnPreviewMask) mnPreviewShift; maTargetSize.Height() = (maOrigSize.Height() + mnPreviewMask) mnPreviewShift; +//round bits up to nearest multiple of 8 and divide by 8 to get num of bytes per pixel +int nBytesPerPixel = ((mnTargetDepth + 7) ~7)/8; + +//stupidly big, forget about it +if (maTargetSize.Width() = SAL_MAX_INT32 / nBytesPerPixel / maTargetSize.Height()) +{ +SAL_WARN( vcl, overlarge png dimensions: +maTargetSize.Width() x maTargetSize.Height() depth: mnTargetDepth); +return sal_False; +} + +// TODO: switch between both scanlines instead of copying +mpInflateInBuf = new (std::nothrow) sal_uInt8[ mnScansize ]; +mpScanCurrent = mpInflateInBuf; +mpScanPrior = new (std::nothrow) sal_uInt8[ mnScansize ]; + +if ( !mpInflateInBuf || !mpScanPrior ) +return sal_False; + mpBmp = new Bitmap( maTargetSize, mnTargetDepth ); mpAcc = mpBmp-AcquireWriteAccess(); if( !mpAcc ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - ooo.lst.in openssl/makefile.mk openssl/opensslios.patch openssl/openssllnx.patch openssl/opensslmacosx.patch openssl/opensslmingw.patch openssl/open
ooo.lst.in |2 +- openssl/makefile.mk | 16 openssl/openssl.patch | 24 openssl/opensslios.patch|4 ++-- openssl/openssllnx.patch| 28 ++-- openssl/opensslmacosx.patch | 12 ++-- openssl/opensslmingw.patch | 16 openssl/opensslsol.patch| 28 ++-- openssl/version.mk |4 ++-- 9 files changed, 67 insertions(+), 67 deletions(-) New commits: commit 696bd00021e3e959ed8b4854611799cda96f187d Author: Petr Mladek pmla...@suse.cz Date: Mon Apr 23 10:37:37 2012 +0200 update internal openssl to version 0.9.8v including important bug fixes Signed-off-by: Fridrich Strba fridrich.st...@graduateinstitute.ch diff --git a/ooo.lst.in b/ooo.lst.in index 0e493e2..408e0ee 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -1,6 +1,6 @@ http://dev-www.libreoffice.org/src 48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz -63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz +51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz db5ffcd50064421176e8afb7b85fd1a7-pixman-0.24.0.tar.bz2 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 diff --git a/openssl/makefile.mk b/openssl/makefile.mk index f537838..eb4f455 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -46,10 +46,10 @@ TARGET=openssl @echo openssl disabled .ENDIF -OPENSSL_NAME=openssl-0.9.8o +OPENSSL_NAME=openssl-0.9.8v TARFILE_NAME=$(OPENSSL_NAME) -TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4 +TARFILE_MD5=51a40a81b3b7abe8a5c33670bd3da0ce CONFIGURE_DIR=. CONFIGURE_ACTION=config @@ -75,8 +75,8 @@ UNAME=$(shell uname) .IF $(OS) == LINUX || $(OS) == FREEBSD || $(OS) == ANDROID PATCH_FILES=openssllnx.patch ADDITIONAL_FILES:= \ -libcrypto_OOo_0_9_8o.map \ -libssl_OOo_0_9_8o.map +libcrypto_OOo_0_9_8v.map \ +libssl_OOo_0_9_8v.map .IF $(CPU) == I .IF $(UNAME) == GNU/kFreeBSD CONFIGURE_ACTION=Configure debian-kfreebsd-i386 @@ -93,15 +93,15 @@ UNAME=$(shell uname) CONFIGURE_ACTION=Configure linux-generic32 .ENDIF # if you build openssl as shared library you have to patch the Makefile.Shared LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \ -#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map' +#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8v.map' .ENDIF .IF $(OS) == SOLARIS PATCH_FILES=opensslsol.patch ADDITIONAL_FILES:= \ -libcrypto_OOo_0_9_8o.map \ -libssl_OOo_0_9_8o.map -#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib(SHLIBDIRS)_OOo_0_9_8e.map' +libcrypto_OOo_0_9_8v.map \ +libssl_OOo_0_9_8v.map +#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib(SHLIBDIRS)_OOo_0_9_8v.map' # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary diff --git a/openssl/openssl.patch b/openssl/openssl.patch index 88f7088..538b2c1 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -1,5 +1,5 @@ misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 +0100 -+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.0 +0100 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (rich...@levitte.org) @@ -9,8 +9,8 @@ * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c2004-12-28 01:21:33.0 +0100 -+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 +--- misc/openssl-0.9.8v/crypto/x509v3/v3_pcia.c2004-12-28 01:21:33.0 +0100 misc/build/openssl-0.9.8v/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100 @@ -2,7 +2,7 @@ /* Contributed to the OpenSSL Project 2004 * by Richard Levitte (rich...@levitte.org) @@ -20,8 +20,8 @@ * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * misc/openssl-0.9.8o/ms/do_ms.bat 2009-07-28 14:51:19.0 +0200 -+++ misc/build/openssl-0.9.8o/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100 +--- misc/openssl-0.9.8v/ms/do_ms.bat 2009-07-28 14:51:19.0 +0200 misc/build/openssl-0.9.8v/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100 @@ -1,11 +1,11 @@ -perl util\mkfiles.pl MINFO @@ -43,8 +43,8 @@ -perl util\mkdef.pl 32 ssleay ms\ssleay32.def +%1 util\mkdef.pl 32 libeay ms\libeay32.def +%1 util\mkdef.pl 32 ssleay ms\ssleay32.def misc/openssl-0.9.8o/util/mk1mf.pl 2009-09-20
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/table6.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4bd76b74c0145635ef69caa94e3235f6ce3ab5de Author: David Tardon dtar...@redhat.com Date: Wed Apr 18 09:44:19 2012 +0200 fdo#44861 make Replace All work with REs Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index 55ac066..44c5ecc 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -207,13 +207,13 @@ bool ScTable::SearchCell(const SvxSearchItem rSearchItem, SCCOL nCol, SCROW nRo else if (bDoBack) { xub_StrLen nTemp=nStart; nStart=nEnd; nEnd=nTemp; -bRepeat = ((bool)(pSearchText-SearchBkwrd(aString, nStart, nEnd))); +bRepeat = ((bool)(pSearchText-SearchBkwrd(aString, nStart, nEnd, aSearchResult))); // change results to definition before 614: --nEnd; } else { -bRepeat = ((bool)(pSearchText-SearchFrwrd(aString, nStart, nEnd))); +bRepeat = ((bool)(pSearchText-SearchFrwrd(aString, nStart, nEnd, aSearchResult))); // change results to definition before 614: --nEnd; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3d2333d362a7f02eef4c0d826ae17581e84ec479 Author: Rene Engelhard r...@debian.org Date: Tue Apr 17 17:46:03 2012 +0200 add 5.3 into the db check for-loop Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/configure.in b/configure.in index ea9dee1..d01e82f 100644 --- a/configure.in +++ b/configure.in @@ -5110,7 +5110,7 @@ if test $with_system_db = yes; then AC_MSG_RESULT([external]) db_header= -for dbver in 5.1 5.0 5 4.8 4.7 4; do +for dbver in 5.3 5.1 5.0 5 4.8 4.7 4; do for dash in - ''; do AC_CHECK_HEADER([db$dash$dbver/db.h], [ db_header=db$dash$dbver/db.h; break 2 ]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/view/viewsh.cxx | 32 ++-- 1 file changed, 18 insertions(+), 14 deletions(-) New commits: commit 43b48f05e5aa3359a0227550b9a5c88851a582d2 Author: Caolán McNamara caol...@redhat.com Date: Sat Apr 14 07:56:45 2012 +0100 optimize: traverse children with WINDOW_FIRSTCHILD/WINDOW_NEXT Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 0413382..f0dd635 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -368,25 +368,29 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) if ( GetWin() ) { Window rWindow = *(GetWin()); -if(rWindow.IsChildTransparentModeEnabled() rWindow.GetChildCount()) +if (rWindow.IsChildTransparentModeEnabled()) { -const Rectangle aRectanglePixel(rWindow.LogicToPixel(aRect.SVRect())); - -for ( sal_uInt16 a(0); a rWindow.GetChildCount(); a++ ) +Window* pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD ); +if (pCandidate) { -Window* pCandidate = rWindow.GetChild(a); +const Rectangle aRectanglePixel(rWindow.LogicToPixel(aRect.SVRect())); -if ( pCandidate pCandidate-IsPaintTransparent() ) +while (pCandidate) { -const Rectangle aCandidatePosSizePixel( -pCandidate-GetPosPixel(), - pCandidate-GetSizePixel()); - -if ( aCandidatePosSizePixel.IsOver(aRectanglePixel) ) +if ( pCandidate-IsPaintTransparent() ) { -pCandidate-Invalidate( INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN ); -pCandidate-Update(); -} +const Rectangle aCandidatePosSizePixel( + pCandidate-GetPosPixel(), + pCandidate-GetSizePixel()); + +if ( aCandidatePosSizePixel.IsOver(aRectanglePixel) ) +{ +pCandidate-Invalidate( INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN ); +pCandidate-Update(); +} +} + +pCandidate = pCandidate-GetWindow( WINDOW_NEXT ); } } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-3'
New branch 'libreoffice-3-5-3' available with the following commits: commit a80a06d26458f01f3de4d9a8f60af00a7f4a68c2 Author: Petr Mladek pmla...@suse.cz Date: Wed Apr 18 15:59:39 2012 +0200 Branch libreoffice-3-5-3 This is 'libreoffice-3-5-3' - the stable branch for the 3.5.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-3'
New branch 'libreoffice-3-5-3' available with the following commits: commit 7ba13690c46cda44abb2d5e92f48b275d9512597 Author: Petr Mladek pmla...@suse.cz Date: Wed Apr 18 15:59:40 2012 +0200 Branch libreoffice-3-5-3 This is 'libreoffice-3-5-3' - the stable branch for the 3.5.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-3'
New branch 'libreoffice-3-5-3' available with the following commits: commit 22e3d745c190c792c6a4d332192d4a9099628a72 Author: Petr Mladek pmla...@suse.cz Date: Wed Apr 18 15:59:40 2012 +0200 Branch libreoffice-3-5-3 This is 'libreoffice-3-5-3' - the stable branch for the 3.5.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.3.1'
Tag 'libreoffice-3.5.3.1' created by Petr Mladek pmla...@suse.cz at 2012-04-18 15:12 -0700 Tag 3.5.3.1 (3.5.3-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPjsvUAAoJEPQ0oe+v7q6jW30P/3bcYpGy94/M6Pn9/Lv33hVI dkjNRHaxLv2e2YbqmbT18HTX1AoKDcRE92Aremp6ruroCDy0IndNw+spbQBUsF28 HVaRcH6uKZpX9VfBaoPrdTk8tgsFSSnMgUwStP5GCH6vW0aT3RPdW4+cVsbKI/1/ 9lqdp262qnlfCBQv4tPQRjCXPiuGOYErYAAnxqaHSRij41s+QQakHCCuNd8PPO+Q ug+jb2M0o6Aw4dXkT9+CCHAR+biySV+szsIZLSvUCaL5JemeaW5nn2drP9YzyXn6 OAaOtg3fLxiDbZ8Z+y3MLUco29KsjH2dc8tAxHP6VbML3suFmwkJ/y80HCba9vwS bA0CNUaMGt9JcAD0j+0nTOJBfT/jjEAfiltMZymTUrz1/Bzg5sRPAx37OSoTe22W sV6AWlDjpJeYYjv9RJyEOttGx01N46ZmHUxFFOpV3rJ3jQX6BVB7kpxPMm4slHJD 58J7D7YGN+2ItKKZJPFzHWZAjyfep+a6oVoZoajWlCgrpXF5AxYvRXgJ7AtTkE0c xPEl32RldFoyJ0v9cinVNdQFo1OsaiP2dq1RhMqd5QsbSPJXnsZjuNMfHQjrDc3v ifqKsKl5ex7XMxUALLA/DVsjDtTVh4pkHQH1nDkf2xZ3sFc43xCHd6VHlyEelxFx 7yn0LJS9ZrDMr/99p2r+ =wFSA -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-1074: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.3.1'
Tag 'libreoffice-3.5.3.1' created by Petr Mladek pmla...@suse.cz at 2012-04-18 15:12 -0700 Tag 3.5.3.1 (3.5.3-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPjsvUAAoJEPQ0oe+v7q6jnwMP/0B4qc0bCWy7h8/QUZfuDoBa nsSWgr0hpN0eGdRE04h9KKPZ28HtGJliECc6tXsIaNgPYFDybEn/m0PT3IKP4I+s iQNQj73p585LmcYdJ256VDLQQa1AOlzoNI+jGwxGFfh8cQvTEKWWQwKVzAYLBf6E XCtqgnSRhTwIzoRn1ffczlhVwELhlNwziccj1x8AknYgINCdgpfqksc+P6jHxu/q HhcJlI0mNAtfl9JPJS5dxrhh+ae8AjTNqRRN/4HnZbdltZz7f1RQN/nd/XUMBVcX ik01MIa4UXyfDQOPOaQIy6SOM3htdf8mpcv0gfNLQgJ4p4DShpeKQvV1UtzBhApm yjonQT0ZzMG2k2ZzZtiZvOr41jQpNsQBN7gzYwwmp6Z3alCVVno5+8i0A/oABc0O zaoCuo6HIcMgq5RDPc0FdSFto3NFlyVl+x5z8jGhEmk8Fsw8E55G4yYbVxGGKfON +h+9YRK7Ler4hJrH2KdqEA7xbAjavZKwVlwARHjLxiysESoA1RqKHvcuP4+n06Qc MKRarjrJCQPpYm2ns6eJn6aEHOt0KlCgGYxO1AS0+MBBBD87c208S/WQUpA/kTVb pyQ00G3CzriMkI0FDjFx05Osfc6btjtBuRIMv35oZqoH+sHrjIh2gkfMMXbxi3XX R6wtRTrSnhzhx+TW+vb2 =hF5K -END PGP SIGNATURE- Changes since libreoffice-3.5.0.1-4: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-3' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 30 +++--- solenv/inc/minor.mk |4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) New commits: commit eb4f812b4bc685bdbda7401aaa5add49fd691736 Author: Petr Mladek pmla...@suse.cz Date: Wed Apr 18 20:20:15 2012 +0200 bump product version to 3.5.3-rc1+, release number to 1 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 8fdbcf3..c5d82f2 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -53,13 +53,13 @@ LibreOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.3 - ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -112,13 +112,13 @@ LibreOffice_wJRE PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.3 - ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 UPDATEURL http://update.libreoffice.org/check.php ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst @@ -170,14 +170,14 @@ LibreOffice_Dev PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.3 - ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -240,7 +240,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3.5 LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -275,7 +275,7 @@ LibreOffice_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.5 @@ -318,7 +318,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -367,7 +367,7 @@ LibreOffice_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.5 @@ -410,7 +410,7 @@ LibreOffice_Dev_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -458,13 +458,13 @@ OxygenOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 30 +++--- solenv/inc/minor.mk |2 +- 2 files changed, 16 insertions(+), 16 deletions(-) New commits: commit 314f65c6c879bddbc656b21ce478efaa20453fa8 Author: Petr Mladek pmla...@suse.cz Date: Wed Apr 18 20:23:27 2012 +0200 bump product version to 3.5.4-rc0+ diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 8fdbcf3..9b37041 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -4,7 +4,7 @@ Globals { variables { - UREPACKAGEVERSION 3.5.3 + UREPACKAGEVERSION 3.5.4 URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 3.4 UNIXBASISROOTNAME libreoffice3.5 @@ -58,7 +58,7 @@ LibreOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.5.3 + ABOUTBOXPRODUCTVERSION 3.5.4 ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ BASEPRODUCTVERSION 3.5 PCPFILENAME libreoffice.pcp @@ -70,7 +70,7 @@ LibreOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.5.3 + PACKAGEVERSION 3.5.4 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -117,7 +117,7 @@ LibreOffice_wJRE POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.5.3 + ABOUTBOXPRODUCTVERSION 3.5.4 ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ BASEPRODUCTVERSION 3.5 UPDATEURL http://update.libreoffice.org/check.php @@ -128,7 +128,7 @@ LibreOffice_wJRE FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.5.3 + PACKAGEVERSION 3.5.4 PACKAGEREVISION {buildid} LICENSENAME LGPL WITHJREPRODUCT 1 @@ -176,7 +176,7 @@ LibreOffice_Dev POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.5.3 + ABOUTBOXPRODUCTVERSION 3.5.4 ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ BASEPRODUCTVERSION 3.5 DEVELOPMENTPRODUCT 1 @@ -192,7 +192,7 @@ LibreOffice_Dev FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.5.3 + PACKAGEVERSION 3.5.4 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -279,7 +279,7 @@ LibreOffice_SDK POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.5 -PACKAGEVERSION 3.5.3 +PACKAGEVERSION 3.5.4 PACKAGEREVISION {buildid} PACK_INSTALLED 1 POOLPRODUCT 0 @@ -323,7 +323,7 @@ LibreOffice_Dev_SDK POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.5 -PACKAGEVERSION 3.5.3 +PACKAGEVERSION 3.5.4 PACKAGEREVISION {buildid} BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX lodev @@ -371,7 +371,7 @@ LibreOffice_Test POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.5 -PACKAGEVERSION 3.5.3 +PACKAGEVERSION 3.5.4 PACKAGEREVISION {buildid} PACK_INSTALLED 1 POOLPRODUCT 0 @@ -415,7 +415,7 @@ LibreOffice_Dev_Test POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.5 -PACKAGEVERSION 3.5.3 +PACKAGEVERSION 3.5.4 PACKAGEREVISION {buildid} BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX lodev @@ -463,7 +463,7 @@ OxygenOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/inc/output.hxx |2 - sc/source/ui/view/output2.cxx | 59 -- 2 files changed, 35 insertions(+), 26 deletions(-) New commits: commit 7a028f6c1e7fb80a22002ad6fed1604dab327e36 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Apr 16 22:02:12 2012 -0400 fdo#48431: More reliable way to check for RTL text. This is probably more reliable way to fix fdo#32530 such that it won't cause the regression in rendering Thai texts as reported in fdo#48431. Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 9a81555..5bdb101 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -102,12 +102,12 @@ private: longmnPosX; longmnPosY; longmnInitPosX; -sal_uInt8 mnScript; boolmbBreak; boolmbCellIsValue; boolmbAsianVertical; boolmbPixelToLogic; boolmbHyphenatorSet; +boolmbRTL; ScFieldEditEngine* mpEngine; ScBaseCell* mpCell; const ScPatternAttr*mpPattern; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 82a9905..7f9a9eb 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -70,10 +70,14 @@ #include scmod.hxx #include fillinfo.hxx +#include com/sun/star/i18n/DirectionProperty.hpp + #include boost/ptr_container/ptr_vector.hpp #include math.h +using namespace com::sun::star; + //! Autofilter-Breite mit column.cxx zusammenfassen #define DROPDOWN_BITMAP_SIZE18 @@ -1330,6 +1334,29 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY rParam.maClipRect.Justify(); } +namespace { + +bool beginsWithRTLCharacter(const rtl::OUString rStr) +{ +if (rStr.isEmpty()) +return false; + +switch (ScGlobal::pCharClass-getCharacterDirection(rStr, 0)) +{ +case i18n::DirectionProperty_RIGHT_TO_LEFT: +case i18n::DirectionProperty_RIGHT_TO_LEFT_ARABIC: +case i18n::DirectionProperty_RIGHT_TO_LEFT_EMBEDDING: +case i18n::DirectionProperty_RIGHT_TO_LEFT_OVERRIDE: +return true; +default: +; +} + +return false; +} + +} + void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) { OSL_ENSURE( pDev == pRefDevice || @@ -1564,18 +1591,8 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) if (aVars.GetHorJust() == SVX_HOR_JUSTIFY_STANDARD) { // fdo#32530: Default alignment depends on value vs -// string, and the script type of the 1st letter. -sal_uInt8 nScript1st = 0; -rtl::OUString aStr = aVars.GetString(); -if (!aStr.isEmpty()) -{ -aStr = aStr.copy(0, 1); -nScript1st = pDoc-GetStringScriptType(aStr); -if (!nScript1st) -nScript1st = ScGlobal::GetDefaultScriptType(); -} - -if (nScript1st == SCRIPTTYPE_COMPLEX) +// string, and the direction of the 1st letter. +if (beginsWithRTLCharacter(aVars.GetString())) eOutHorJust = bCellIsValue ? SVX_HOR_JUSTIFY_LEFT : SVX_HOR_JUSTIFY_RIGHT; else eOutHorJust = bCellIsValue ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT; @@ -2155,12 +2172,12 @@ ScOutputData::DrawEditParam::DrawEditParam(const ScPatternAttr* pPattern, const mnArrY(0), mnX(0), mnY(0), mnCellX(0), mnCellY(0), mnPosX(0), mnPosY(0), mnInitPosX(0), -mnScript(0), mbBreak( (meHorJust == SVX_HOR_JUSTIFY_BLOCK) || lcl_GetBoolValue(*pPattern, ATTR_LINEBREAK, pCondSet) ), mbCellIsValue(bCellIsValue), mbAsianVertical(false), mbPixelToLogic(false), mbHyphenatorSet(false), +mbRTL(false), mpEngine(NULL), mpCell(NULL), mpPattern(pPattern), @@ -2590,8 +2607,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam rParam) if (eOutHorJust == SVX_HOR_JUSTIFY_STANDARD) { // fdo#32530: Default alignment depends on value vs string, and the -// script type of the 1st letter. -if (rParam.mnScript == SCRIPTTYPE_COMPLEX) +// direction of the 1st letter. +if (rParam.mbRTL) eOutHorJust = rParam.mbCellIsValue ? SVX_HOR_JUSTIFY_LEFT : SVX_HOR_JUSTIFY_RIGHT; else eOutHorJust = rParam.mbCellIsValue ? SVX_HOR_JUSTIFY_RIGHT
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - python/makefile.mk
python/makefile.mk |7 +++ 1 file changed, 7 insertions(+) New commits: commit 35f7233f498785904f37968ee2dedfc59a64e992 Author: Laurent Godard lgodard.li...@laposte.net Date: Tue Apr 10 16:07:47 2012 +0100 to find the headers and (static) library of our internal openssl Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/python/makefile.mk b/python/makefile.mk index 4f50ed3..1af56e5 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -65,6 +65,13 @@ CONFIGURE_DIR= BUILD_DIR= MYCWD=$(shell @pwd)/$(INPATH)/misc/build +.IF $(SYSTEM_OPENSSL) != YES +#we want to be sure we use our internal openssl if +#that's enabled +CC+:=-I$(SOLARINCDIR)$/external +python_LDFLAGS+=-L$(SOLARLIBDIR) +.ENDIF + # CLFLAGS get overwritten in Makefile.pre.in .IF $(SYSBASE)!= CC+:=-I$(SYSBASE)$/usr$/include ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - drawinglayer/source
drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 513ae531ccd3080fa1089d2d9d7dc829e96267cf Author: Thorsten Behrens tbehr...@suse.com Date: Sun Apr 15 03:38:40 2012 +0200 Fix fdo#33591 - edge-case trans gradients came out empty Gradients with start==end got us zero steps, thus no fill at all. Funnily this was wrong since pre-3.0 or somesuch. Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx index b2f1bb5..a16783d 100644 --- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx @@ -72,6 +72,8 @@ namespace drawinglayer nSteps = nMaxSteps; } +nSteps = std::max(sal_uInt32(1), nSteps); + switch(getFillGradient().getStyle()) { case attribute::GRADIENTSTYLE_LINEAR: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/layout/pagechg.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 2d7ce65af37195343ff74b9e01c60f4b86eb6ebe Author: Andreas Schierl openoff...@schierla.de Date: Mon Jan 30 23:34:56 2012 +0100 ClrContourCache for SwAnchoredDrawObjects (fdo#45376) call it only for contour wrapped drawing objects Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 79d7d1b..ef0d1c8 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -39,6 +39,7 @@ #include fmtfordr.hxx #include fmtfld.hxx #include fmtornt.hxx +#include fmtsrnd.hxx #include ftninfo.hxx #include tgrditem.hxx #include viewopt.hxx @@ -2035,6 +2036,10 @@ void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point rOffset ) const Point aNewAnchorPos( ( aCurrAnchorPos + rOffset ) ); pAnchoredDrawObj-DrawObj()-SetAnchorPos( aNewAnchorPos ); pAnchoredDrawObj-SetLastObjRect( pAnchoredDrawObj-GetObjRect().SVRect() ); + +// clear contour cache +if ( pAnchoredDrawObj-GetFrmFmt().GetSurround().IsContour() ) +ClrContourCache( pAnchoredDrawObj-GetDrawObj() ); } // #i92511# // cache for object rectangle inclusive spaces has to be invalidated. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 8475d4e14ce068b5eae155aa26f40f79ebadc0e2 Author: Thorsten Behrens tbehr...@suse.com Date: Tue Apr 17 17:12:09 2012 +0200 Fix fdo#47484 - use older ODF encryption by default As recently discussed, 3.5.x will use the older, more backwards- compatible encryption methods, as a way to transition people over. Starting with 3.6, the stronger AES will be the default. In all versions, this is configurable though. Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index c74e508..0f2918d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2705,17 +2705,17 @@ authorMAV/author descSpecifies whether SHA1 algorithm instead of SHA256 should be used in ODF12 for StartKey and Checksum generation during -encryption./desc +encryption. If true, compatible with older OOo/LibO versions./desc /info - valuefalse/value + valuetrue/value /prop prop oor:name=UseBlowfishInODF12 oor:type=xs:boolean info authorMAV/author descSpecifies whether Blowfish algorithm instead of AES should be -used in ODF12 for encryption./desc +used in ODF12 for encryption. If true, compatible with older OOo/LibO versions./desc /info - valuefalse/value + valuetrue/value /prop /group /group ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 08a54e148d56542cdb3603234dc72f2620969a4f Author: Miklos Vajna vmik...@suse.cz Date: Tue Apr 10 15:42:23 2012 +0200 fdo#47802 fix crash on RTF import of shapes inside tables We already ignore textframes inside tables, the same should be done with textboxes till they can be handled properly. Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 84e2b48..9633176 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1164,7 +1164,11 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) m_aStates.top().nDestinationState = DESTINATION_SHAPE; break; case RTF_SHPINST: -m_aStates.top().nDestinationState = DESTINATION_SHAPEINSTRUCTION; +// Don't try to support shapes inside tables for now. +if (m_pCurrentBuffer != m_aTableBuffer) +m_aStates.top().nDestinationState = DESTINATION_SHAPEINSTRUCTION; +else +m_aStates.top().nDestinationState = DESTINATION_SKIP; break; case RTF_NESTTABLEPROPS: m_aStates.top().nDestinationState = DESTINATION_NESTEDTABLEPROPERTIES; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bin/unpack-sources download
bin/unpack-sources | 17 + download | 14 +++--- 2 files changed, 16 insertions(+), 15 deletions(-) New commits: commit f780859b76263638b9227122e465b0c629c7ca3e Author: Petr Mladek pmla...@suse.cz Date: Fri Apr 13 16:20:55 2012 +0200 unpack-sources, download: update for .xz source tarballs diff --git a/bin/unpack-sources b/bin/unpack-sources index 130c9a2..271a5e3 100755 --- a/bin/unpack-sources +++ b/bin/unpack-sources @@ -73,13 +73,13 @@ if test -z $start_dir ; then echo Error: Please, define where to unpack sources, try --help fi -if ! test -d $start_dir/src -a -f $start_dir/solenv/inc/target.mk ; then -echo Error: $start_dir is not a valid bootstrap directory +if ! test -f $start_dir/Repository.mk -a -f $start_dir/solenv/inc/target.mk ; then +echo Error: $start_dir is not a valid LibreOffice core source directory exit 1; fi -if test ! -f $start_dir/bootstrap.ver -o -d $start_dir/.git ; then -echo Warning: bootstrap sources are from git and not from tarball +if test ! -f $start_dir/core.ver -o -d $start_dir/.git ; then +echo Warning: core sources are from git and not from tarball echo Do nothing. exit 0; fi @@ -89,17 +89,18 @@ lo_src_dir=$start_dir/src mkdir -p $lo_src_dir for tarball in $tarballs ; do -tarname=`basename $tarball | sed -e s/.tar.bz2//` +tarname=`basename $tarball | sed -e s/\.tar\..*//` if test -d $lo_src_dir/$tarname ; then echo Warning: $lo_src_dir/$tarname already exists = skipping continue; fi echo Unpacking $tarname... -tar -xjf $tarball -C $lo_src_dir +echo tar -xf $tarball -C $lo_src_dir +tar -xf $tarball -C $lo_src_dir -# create symlinks -for dir in `find $lo_src_dir/$tarname -mindepth 1 -maxdepth 1 -type d -printf $tarname/%f\n` ; do +# create symlinks for module directories; ignore git-hooks directory +for dir in `find $lo_src_dir/$tarname -mindepth 1 -maxdepth 1 -type d -path $lo_src_dir/$tarname/git-hooks -o -printf $tarname/%f\n` ; do ln -sf src/$dir $start_dir done done diff --git a/download b/download index e5aad88..4476fef 100755 --- a/download +++ b/download @@ -183,17 +183,17 @@ if [ $COM = MSC ]; then downloaditem http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/; WindowsXP-KB975337-x86-ENU.exe 946d00d87e4094f3a6e425e2d538eadd fi -if [ -f $start_dir/bootstrap.ver -a ! -d $start_dir/.git ] ; then -# bootstrap is from sources, so get the other source tarballs -. $start_dir/bootstrap.ver +if [ -f $start_dir/core.ver -a ! -d $start_dir/.git ] ; then +# core is from sources, so get the other source tarballs +. $start_dir/core.ver lo_src_dir=$start_dir/src mkdir -p $lo_src_dir for piece in `cat $start_dir/bin/repo-list` ; do -tarname=libreoffice-$piece-$lo_bootstrap_ver -if [ ! -f $TARFILE_LOCATION/$tarname.tar.bz2 ] ; then - downloaditem http://download.documentfoundation.org/libreoffice/src/; $tarname.tar.bz2 +tarname=libreoffice-$piece-$lo_core_ver +if [ ! -f $TARFILE_LOCATION/$tarname.tar.xz ] ; then + downloaditem http://download.documentfoundation.org/libreoffice/src/; $tarname.tar.xz fi - $start_dir/bin/unpack-sources $start_dir $TARFILE_LOCATION/$tarname.tar.bz2 + $start_dir/bin/unpack-sources $start_dir $TARFILE_LOCATION/$tarname.tar.xz done fi ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bin/distro-install-file-lists
bin/distro-install-file-lists |1 + 1 file changed, 1 insertion(+) New commits: commit d04e30c94a0d041ecd3d68b5fcf7e7c9ba1df735 Author: Petr Mladek pmla...@suse.cz Date: Fri Apr 13 16:25:46 2012 +0200 distro-install-file-lists: mark javasettingsunopkginstall.xml as %config diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index 0f6e60a..de32ddc 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -541,6 +541,7 @@ if test z$RPM_CONFIG_FILE_TAGS != z ; then -e s|^($INSTALLDIR/program/[a-zA-Z0-9_\.]*rc)\$|$RPM_CONFIG_FILE_TAGS \\1|; \ -e s|^($INSTALLDIR/program/.*\.xsl)\$|$RPM_CONFIG_FILE_TAGS \\1|; \ -e s|^($INSTALLDIR/share/config/[a-zA-Z0-9]*rc)\$|$RPM_CONFIG_FILE_TAGS \\1|; \ + -e s|^($INSTALLDIR/share/config/javasettingsunopkginstall.xml)\$|$RPM_CONFIG_FILE_TAGS \\1|; \ -e s|^($INSTALLDIR/share/dict/ooo/.*\.lst)\$|$RPM_CONFIG_FILE_TAGS \\1|; \ -e s|^($INSTALLDIR/share/psprint/.*\.conf)\$|$RPM_CONFIG_FILE_TAGS \\1|; \ -e s|^($INSTALLDIR/share/registry/.*\.xcu)\$|$RPM_CONFIG_FILE_TAGS \\1|; \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source shell/source
connectivity/source/drivers/kab/makefile.mk |4 ++-- shell/source/backends/kdebe/makefile.mk |5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) New commits: commit f6eba1a27a4ffac50ab06a733e6eee1f5c7800ca Author: Petr Mladek pmla...@suse.cz Date: Fri Apr 13 16:52:59 2012 +0200 fix library link order to work with link --as-needed diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk index c7f7b9a..9494037 100644 --- a/connectivity/source/drivers/kab/makefile.mk +++ b/connectivity/source/drivers/kab/makefile.mk @@ -111,14 +111,14 @@ SHL2VERSIONMAP=$(TARGET2).map SHL2TARGET= $(TARGET2)$(KAB_MAJOR) SHL2OBJS=$(SLO2FILES) -SHL2LINKFLAGS+=$(KAB_LIB) SHL2STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB)\ $(SALLIB) \ $(SALHELPERLIB) \ $(DBTOOLSLIB) \ -$(COMPHELPERLIB) +$(COMPHELPERLIB)\ +$(KAB_LIB) SHL2DEPN= SHL2IMPLIB= i$(TARGET2) diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk index b1b12ad..265a3b6 100644 --- a/shell/source/backends/kdebe/makefile.mk +++ b/shell/source/backends/kdebe/makefile.mk @@ -63,11 +63,12 @@ SHL1OBJS=$(SLOFILES) SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1IMPLIB=i$(SHL1TARGET) -SHL1LINKFLAGS+=$(KDE_LIBS) -lkio SHL1STDLIBS=\ $(CPPUHELPERLIB) \ $(CPPULIB) \ -$(SALLIB) +$(SALLIB) \ +$(KDE_LIBS) \ +-lkio SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bin/distro-install-file-lists
bin/distro-install-file-lists | 30 +- 1 file changed, 17 insertions(+), 13 deletions(-) New commits: commit fc09ed737cef00baa7c5e0b206efac0cb36c1f7c Author: Petr Mladek pmla...@suse.cz Date: Fri Apr 13 16:58:40 2012 +0200 distro-install-file-lists: handle new file lists that appeared for LO-3.5 Process the newly added file lists: + Script_Provider_For_Javascript + Script_Provider_For_Beanshell + PostgresqlSdbc + Files_Images diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index de32ddc..014769c 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -80,7 +80,6 @@ if test z$OOO_VENDOR != zDebian ; then rm -f common_list.txt for module in gid_Module_Root gid_Module_Root_Brand \ -gid_Module_Root_Files_Images \ gid_Module_Root_Files_[0-9] \ gid_Module_Root_Hack \ gid_Module_Oo_Linguistic \ @@ -88,6 +87,9 @@ if test z$OOO_VENDOR != zDebian ; then merge_flists $module $FILELISTSDIR/common_list.txt done +# it is not a real extension; it used to be in the main package... +merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Javascript $FILELISTSDIR/common_list.txt + if test $SPLIT_APP_MODULES = YES ; then merge_flists gid_Module_Prg_Base_Bin $FILELISTSDIR/base_list.txt merge_flists gid_Module_Prg_Calc_Bin $FILELISTSDIR/calc_list.txt @@ -120,6 +122,15 @@ if test z$OOO_VENDOR != zDebian ; then merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt fi +if test $SPLIT_APP_MODULES = YES -a $OOO_VENDOR = Novell, Inc. ; then +# move the prebuilt icons into a hacky temporary package +# we want to repack them into a noarch package as soon as possible +# without the build dependency on the huge devel package +merge_flists gid_Module_Root_Files_Images $FILELISTSDIR/icon_themes_prebuilt.txt +else +merge_flists gid_Module_Root_Files_Images $FILELISTSDIR/common_list.txt +fi + if test $SPLIT_OPT_FEATURES = YES ; then if test z$OOO_VENDOR = zMandriva ; then merge_flists gid_Module_Optional_Binfilter $FILELISTSDIR/filter-binfilter_list.txt @@ -238,6 +249,9 @@ if test z$OOO_VENDOR != zDebian ; then add_used_directories mono_list.txt common_list.txt # add the files from GAC if it was installed test -f mono_gac cat mono_gac mono_list.txt + +# postgresql subpackage +test -f $DESTDIR/gid_Module_Optional_PostgresqlSdbc cp $DESTDIR/gid_Module_Optional_PostgresqlSdbc postgresql_list.txt || : # mailmerge if test $SPLIT_OPT_FEATURES = YES ; then @@ -250,8 +264,9 @@ if test z$OOO_VENDOR != zDebian ; then add_used_directories $flist common_list.txt fi -if test z$OOO_VENDOR = zNovell ; then +if test z$OOO_VENDOR = zNovell, Inc. ; then # officebean subpackage +test -f $DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell cp $DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell officebean_list.txt || : mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/program/classes/officebean.jar mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/program/libofficebean.so add_used_directories officebean_list.txt common_list.txt @@ -270,17 +285,6 @@ if test z$OOO_VENDOR != zDebian ; then add_used_directories sdk_doc_list.txt sdk_list.txt fi -if test $OOO_VENDOR = Novell, Inc. -a $SPLIT_APP_MODULES = YES ; then -# move the prebuilt icons into a hacky temporary package -# we want to repack them into a noarch package as soon as possible -# without the build dependency on the huge devel package -mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_classic8.zip -mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_crystal.zip -mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_hicontrast.zip -mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_industrial.zip -mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_tango.zip -mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images.zip -fi # Mandriva packaging if test $OOO_VENDOR = Mandriva; then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: setup_native/source solenv/bin
setup_native/source/packinfo/spellchecker_selection.txt |1 + solenv/bin/modules/installer/worker.pm |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 030c4269cb14ed429e4a1f0314eba7a783816ac1 Author: Petr Mladek pmla...@suse.cz Date: Thu Apr 12 09:45:32 2012 +0200 pack en dictionary only with en langpacks it is in the main installation tarball anyway; it was put in langpacks that did not have its own dictionary from some strange reason diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index 8a866a2..a2e10bb 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -21,6 +21,7 @@ de = de,fr,it el = el en-US = en,es,fr en-GB = en,es,fr +en-ZA = en,es,fr es = an,es,fr,pt et = et fr = fr,es diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index dd0c339..bd740a7 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -2438,7 +2438,7 @@ sub set_spellcheckerlanguages { my $languagelist = ; if ( exists($spellcheckhash{$lang}) ) { $languagelist = $spellcheckhash{$lang}; } -else { $languagelist = $spellcheckhash{'en-US'}; } # defaulting to English +else { $languagelist = ; } # no dictionary unless defined in SPELLCHECKERFILE my $langlisthash = installer::converter::convert_stringlist_into_hash(\$languagelist, ,); foreach my $onelang ( keys %{$langlisthash} ) { $installer::globals::spellcheckerlanguagehash{$onelang} = 1; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - setup_native/source solenv/bin
setup_native/source/packinfo/spellchecker_selection.txt |1 + solenv/bin/modules/installer/worker.pm |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 78c43c0b9963038f3b23980ae0eea3a6128c412c Author: Petr Mladek pmla...@suse.cz Date: Thu Apr 12 09:45:32 2012 +0200 pack en dictionary only with en langpacks it is in the main installation tarball anyway; it was put in langpacks that did not have its own dictionary from some strange reason Signed-off-by: Tomáš Chvátal tchva...@suse.cz diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index 8a866a2..a2e10bb 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -21,6 +21,7 @@ de = de,fr,it el = el en-US = en,es,fr en-GB = en,es,fr +en-ZA = en,es,fr es = an,es,fr,pt et = et fr = fr,es diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index a7da80f..83c8cd8 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -2811,7 +2811,7 @@ sub set_spellcheckerlanguages { my $languagelist = ; if ( exists($spellcheckhash{$lang}) ) { $languagelist = $spellcheckhash{$lang}; } -else { $languagelist = $spellcheckhash{'en-US'}; } # defaulting to English +else { $languagelist = ; } # no dictionary unless defined in SPELLCHECKERFILE my $langlisthash = installer::converter::convert_stringlist_into_hash(\$languagelist, ,); foreach my $onelang ( keys %{$langlisthash} ) { $installer::globals::spellcheckerlanguagehash{$onelang} = 1; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/productversion.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 4045e770193ae632aca7075105dda89686c597d6 Author: Petr Mladek pmla...@suse.cz Date: Tue Apr 10 16:25:19 2012 +0200 use x.y.z version also for desktop integration packages (fdo#47840) This version scheme is used for other packages as well. It is important for the desktop integration packages now because we started reseting buildid for each bugfix release (fdo#47840). This value is used also for the release number of Linux packages. diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 398241d..5a186bc 100755 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -45,7 +45,8 @@ PKGDIR=$(BIN) .INCLUDE : productversion.mk -PKGVERSION = $(PRODUCTVERSION) +PKGVERSION = $(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONMICRO) + # gnome-vfs treats everything behind the last '.' as an icon extension, # even though the icon_filename in '.keys' is specified as filename # without extension. Since it also does not know how to handle 2-writer ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - sw/source
sw/source/core/layout/paintfrm.cxx | 44 + 1 file changed, 11 insertions(+), 33 deletions(-) New commits: commit 47ef805d8ab2f2a41be058ab5f7e0fe061ffe7a0 Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 27 10:04:38 2012 +0200 Revert fdo#42750: delay painting borders until after subsidiary lines It still causes some regressions and it is more safe to be on the state of 3.5.1. This reverts commit c7524ab32f801910673da5c9c68669ada7c98769. Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Michael Stahl mst...@redhat.com Signed-off-by: Cedric Bosdonnat cbosdon...@suse.com diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 3a93e47..4de8650 100755 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -119,7 +119,6 @@ #include drawinglayer/primitive2d/textlayoutdevice.hxx #include svx/sdr/contact/objectcontacttools.hxx #include svx/unoapi.hxx -#include comphelper/sequenceasvector.hxx #include basegfx/matrix/b2dhommatrix.hxx #include basegfx/matrix/b2dhommatrixtools.hxx #include basegfx/polygon/b2dpolygon.hxx @@ -221,22 +220,6 @@ public: inline void Ins( const SwRect rRect, const sal_uInt8 nSCol ); }; -class BorderLines -{ -::comphelper::SequenceAsVector - ::drawinglayer::primitive2d::Primitive2DReference m_Lines; -public: -void AddBorderLine( -::drawinglayer::primitive2d::Primitive2DReference const xLine) -{ -m_Lines.push_back(xLine); -} -drawinglayer::primitive2d::Primitive2DSequence GetBorderLines() const -{ -return m_Lines.getAsConstList(); -} -}; - //- End of classes for border lines -- static ViewShell *pGlobalShell = 0; @@ -270,7 +253,6 @@ static double aEdgeScale = 0.5; // be compared with pLines before the work in order to avoid help lines // to hide borders. // bTablines is sal_True during the Paint of a table. -static BorderLines *g_pBorderLines = 0; static SwLineRects *pLines = 0; static SwSubsRects *pSubsLines = 0; // global variable for sub-lines of body, header, footer, section and footnote frames. @@ -353,7 +335,6 @@ class SwSavePaintStatics SwFlyFrm *pSRetoucheFly, *pSRetoucheFly2, *pSFlyOnlyDraw; -BorderLines*pBLines; SwLineRects*pSLines; SwSubsRects*pSSubsLines; SwSubsRects*pSSpecSubsLines; @@ -379,7 +360,6 @@ SwSavePaintStatics::SwSavePaintStatics() : pSRetoucheFly ( pRetoucheFly ), pSRetoucheFly2 ( pRetoucheFly2 ), pSFlyOnlyDraw ( pFlyOnlyDraw ), -pBLines ( g_pBorderLines), pSLines ( pLines), pSSubsLines ( pSubsLines), pSSpecSubsLines ( pSpecSubsLines), @@ -404,7 +384,6 @@ SwSavePaintStatics::SwSavePaintStatics() : aScaleX = aScaleY = 1.0; aMinDistScale = 0.73; aEdgeScale = 0.5; -g_pBorderLines = 0; pLines = 0; pSubsLines = 0; pSpecSubsLines = 0L; @@ -419,7 +398,6 @@ SwSavePaintStatics::~SwSavePaintStatics() pRetoucheFly = pSRetoucheFly; pRetoucheFly2 = pSRetoucheFly2; pFlyOnlyDraw = pSFlyOnlyDraw; -g_pBorderLines = pBLines; pLines = pSLines; pSubsLines = pSSubsLines; pSpecSubsLines = pSSpecSubsLines; @@ -2910,7 +2888,6 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData const*const pPrintData) const pSubsLines = new SwSubsRects; pSpecSubsLines = new SwSubsRects; } -g_pBorderLines = new BorderLines; aPaintRect._Intersection( aRect ); @@ -3024,9 +3001,6 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData const*const pPrintData) const DELETEZ( pSubsLines ); DELETEZ( pSpecSubsLines ); } -// fdo#42750: delay painting these until after subsidiary lines -ProcessPrimitives(g_pBorderLines-GetBorderLines()); -DELETEZ(g_pBorderLines); pVout-Leave(); // #i68597# @@ -4535,8 +4509,11 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft, ::lcl_SubTopBottom( aRect, rBox, _rAttrs, _rFrm, _rRectFn, bPrtOutputDev ); } +// TODO Postpone the processing of the primitives if ( lcl_GetLineWidth( pLeftRightBorder ) 0 ) { +drawinglayer::primitive2d::Primitive2DSequence aSequence( 1 ); + double nExtentIS = lcl_GetExtent( pTopBorder, NULL ); double nExtentIE = lcl_GetExtent( pBottomBorder, NULL ); double nExtentOS = lcl_GetExtent( NULL, pTopBorder ); @@ -4558,22 +4535,21 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft, Color aLeftColor = _bLeft
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - sw/source
sw/source/core/edit/edundo.cxx |4 1 file changed, 4 insertions(+) New commits: commit 66603450eb12eed9f3d1e9b4210210c9630f64e1 Author: Michael Stahl mst...@redhat.com Date: Thu Mar 22 23:03:05 2012 +0100 fdo#39003: fix autoformat Undo cursors: SwEditShell::Undo: Because the Undo actions nowadays create new shell cursors directly (while previously they worked on a SwUndoIter), it is necessary to remove the shell cursor ring before Pop() because Pop(false) only restores the current cursor from the stack, not the rest of the ring. (regression from CWS undoapi, 1ba0c1878116ada5dc4ebdecdb1e0a3da9758547) (cherry picked from commit f24153cded54954da7f0d80941707715c78e4627) Signed-off-by: Caolán McNamara caol...@redhat.com Signed-off-by: Cedric Bosdonnat cbosdon...@suse.com Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx index 7b2ae83..118b3f9 100644 --- a/sw/source/core/edit/edundo.cxx +++ b/sw/source/core/edit/edundo.cxx @@ -142,6 +142,10 @@ bool SwEditShell::Undo(sal_uInt16 const nCount) .getStr()); } +if (bRestoreCrsr) +{ // fdo#39003 Pop does not touch the rest of the cursor ring +KillPams(); // so call this first to get rid of unwanted cursors +} Pop( !bRestoreCrsr ); GetDoc()-SetRedlineMode( eOld ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.2.2'
Tag 'libreoffice-3.5.2.2' created by Petr Mladek pmla...@suse.cz at 2012-03-27 17:22 -0700 Tag 3.5.2.2 (3.5.2-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPcelyAAoJEPQ0oe+v7q6jnWsP/3TEaK34GjNqAxqGZDIx8ft7 cR/BjgsO1lCWlgbR5Ya3mx49ja+OJO4PHQxAMEYWYdnRtXXCiEpJAi/jsPeWIHeN jbs06C9V8h4+WuwoheUCvURoHIrGTPg5p3PSuhWZQ3AqbYxoN2oK0+QktMCrVUsP A/IKJ/tjAYIxEgF/E5efR444U2nsEacqTI4n7B6MqgE90qaDUND9UyaWi4kVjdsC +mLtOZTUumiZEonSf6zVun5IHtTygzGqIy0lCmQW69tmvNyqI0yHv+vJzTdb5Dy6 YTYEVnfc9gOeJUSEawEBIx4NK/HXprHeWp4/++Xo759QxDmj2VW75uvA+DgBOhNh PFHQnKonvh+ipG+z8sgTKgbju33/2hxUDZJA/zji3B5haM+gd9J3AgwVoKSc5uVJ 0jrEmLyGNw6MkwoFhADdR/W5qd7bMl5hOtoBEe6H/Ni2k4BSbhVDpzylffQne6sG lz3b/Jb0UN8JeemWa14UL05HlS3jR6m23ESHn2djJziQdeiupL5Za0nPdk8r7q+I oiFAL5Ezz5NElBXI54GUnvGZORb0mFIJkeTmLOxIrd3FXLGWQGny53LVdISW5yiA EuS6oqfefYC6Ohuk2rSMerbpyGkpYVd2dGZpdU1MchiyY/YmydNPvFEulR5bgV9S hgJB8BvbXKXPdDat0Vvd =A5bL -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-976: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.2.2'
Tag 'libreoffice-3.5.2.2' created by Petr Mladek pmla...@suse.cz at 2012-03-27 17:23 -0700 Tag 3.5.2.2 (3.5.2-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPcelyAAoJEPQ0oe+v7q6jlvwP/jEUAJ1QwQ3QKdVSAYoIU42u 1Fu2R7EfqslE9bZlGFdobMieu9Jia1GEJqWD2g4BsYEuJNKeitjFZ1IbF1SPCD/w mOY0Rh0XGrYB7F5ZLyWhfvFDdkcDPj4E3XujnYISBSIkwOsMIXsMydAVIgRGrjx0 AdepcY9Kytj7sPorrfw9R4HtQXNwW0PzBHTtYJfBKNfpaanVTtwA/Xy/FfURkBpD dAzqbtFbYK7AMeX/IONjYmJGePMIqC1wnFO6D8c9BfSE9u5xBwgsUjqFlJfxxwMw GspFAocTR3gLqK/sfRxXB4c2qx6fvmEPN8c5clU3Ea1GNgghsgzy8wh3MAY7ERIK I67/T3tTLFBPd3LjHz4Wx6CRrkf+8DIpVL6bMB5TaITEYn4G3UEVXqF366ng7917 /nbrojDRP+SGjXlSr5x1OMvRLvEPt/2NRK5EPghVpT4/pZVbYBRK6W2PxZX2ruhR PprS47Mx18ObSnawLk9q247gpdfORQnX3LVlheabspliWTVROQ42xRRpPznQlmaJ GCAerZdaz2aTjuaa1q4IbBCuz6skK4ApZW0oiw9q5W9mp2zsXMGdSuQkRxarVhJ1 xItUQVUAJJKrBN3W5Ge6Klg/x+p5Aco/u13cfo7+Xoo6zlSMU1qmh7gA/AUg8n0b rS4y1VYi9xos2pl/KoW2 =pJQ5 -END PGP SIGNATURE- Changes since libreoffice-3.5.0.1-4: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.2.2'
Tag 'libreoffice-3.5.2.2' created by Petr Mladek pmla...@suse.cz at 2012-03-27 17:23 -0700 Tag 3.5.2.2 (3.5.2-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPcelyAAoJEPQ0oe+v7q6jfIIP/3uiaVsXuYvKgMrqU4L9n7Xb niTT2UYZlZ6c4XTwNRZWgGIijNf8sgOpp/8Ts6+6PssoMzhcMvF5g7NKKunB9vER y4hdyN7ayKAe3Sh01mxjnMs6qYiAVuJRBwJaamliEQ7zoIeR/9Ea3mDP7FvXKBXg 8petEVnTH8y7xhVXXueiipkcs6AzZgYzqxELMtm8i3LmySLhbwDCTN/WkU1ONma2 DM5pw23cjdpEG+4x7cJ9z9636BR60IR5wsB58kh5yzmv3KX2bpQNdiriikUwErrX yZ7DWCC+6OuzQsmrDxClixe0MwwRqO98Cg+EvJ5GAxQb8ozIWmNV6ngvpPQ4HHwe ew9fh5Pw1aUR6o4vGGCYRId0uKSQh+zzKabhosjp0pg+KbJsC8nfzBjVcGBnizFe 0fEWQJdKY2el3YKc2dI1o3L9mI3P4YMmFvRG3v0MYVNi/mrqxroHt/88cVulACMv Nh6S3MqEYxmcm/0lH8K0UWezdsjeOEQDTFjxGf7GI2PJPz0Lp381SPSmmq8UwLip 1fu94YGVqHA1w2Aqu69Avb/RJEZtlzwQbbKEnod1P0tBNXtfDqUY1TQc7JEKwsJU K35GpL2N5vNRElOKMtGKRmz8XTT9saudrrogaBQp40jv49/Qf8tOzYkUQpHuwPP3 xcY/6XKpuNcgBl495KFC =kxDH -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-31: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - dictionaries/an_ES
dictionaries/an_ES/dictionaries.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 976d287905accda35651052959cd85da073b9b24 Author: Andras Timar ati...@suse.com Date: Fri Mar 23 14:36:47 2012 +0100 fdo#47736 typo (cherry picked from commit 6299bf66e3004cb8db805b360070762d0870cf50) Signed-off-by: Caolán McNamara caol...@redhat.com Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/dictionaries/an_ES/dictionaries.xcu b/dictionaries/an_ES/dictionaries.xcu index 56f973a..73e4c71 100644 --- a/dictionaries/an_ES/dictionaries.xcu +++ b/dictionaries/an_ES/dictionaries.xcu @@ -10,7 +10,7 @@ valueDICT_SPELL/value /prop prop oor:name=Locales oor:type=oor:string-list -valuean an_ES/value +valuean an-ES/value /prop /node /node ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - 2 commits - basegfx/inc basegfx/source xmloff/inc xmloff/source
basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx |7 - basegfx/source/polygon/b2dsvgpolypolygon.cxx|4 +-- xmloff/inc/xexptran.hxx |3 +- xmloff/source/draw/xexptran.cxx | 25 ++-- xmloff/source/draw/ximp3dobject.cxx |3 -- xmloff/source/draw/ximpshap.cxx |6 +--- xmloff/source/style/MarkerStyle.cxx |3 -- xmloff/source/text/XMLTextFrameContext.cxx |3 -- 8 files changed, 38 insertions(+), 16 deletions(-) New commits: commit befb1c7e26b79ae97d802659f3386882d4044251 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Mar 26 12:55:44 2012 +0200 Compatibility option for incorrect relative moves after closePath (fdo#47406) Signed-off-by: Thorsten Behrens tbehr...@suse.com Signed-off-by: Michael Meeks michael.me...@suse.com Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx index 37d2cb5..5a59c3a 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx @@ -131,10 +131,15 @@ namespace basegfx @param rSvgDAttribute A valid SVG-D attribute string +@param rWrongPositionAfterZ +Indicates wheter the generator interprets wrongly +the position in the path after Z or z elements +https://bugs.freedesktop.org/show_bug.cgi?id=47406 + @return true, if the string was successfully parsed */ BASEGFX_DLLPUBLIC bool importFromSvgD( B2DPolyPolygon o_rPolyPoly, - const ::rtl::OUString rSvgDAttribute ); + const ::rtl::OUString rSvgDAttribute, bool bWrongPositionAfterZ = false ); /** Read poly-polygon from SVG. diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx index 863adf5..2928364 100644 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx +++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx @@ -210,7 +210,7 @@ namespace basegfx } } -bool importFromSvgD(B2DPolyPolygon o_rPolyPolygon, const ::rtl::OUString rSvgDStatement) +bool importFromSvgD(B2DPolyPolygon o_rPolyPolygon, const ::rtl::OUString rSvgDStatement, bool bWrongPositionAfterZ) { o_rPolyPolygon.clear(); const sal_Int32 nLen(rSvgDStatement.getLength()); @@ -241,7 +241,7 @@ namespace basegfx bIsClosed = true; // update current point - we're back at the start -if( aCurrPoly.count() ) +if( aCurrPoly.count() !bWrongPositionAfterZ) { const B2DPoint aFirst( aCurrPoly.getB2DPoint(0) ); nLastX = aFirst.getX(); diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx index 814ad2a..86883cf 100644 --- a/xmloff/inc/xexptran.hxx +++ b/xmloff/inc/xexptran.hxx @@ -36,6 +36,7 @@ #include com/sun/star/awt/Size.hpp #include com/sun/star/drawing/HomogenMatrix.hpp #include tools/mapunit.hxx +#include xmloff/xmlimp.hxx #include vector @@ -171,7 +172,7 @@ public: const SdXMLImExViewBox rViewBox, const com::sun::star::awt::Point rObjectPos, const com::sun::star::awt::Size rObjectSize, -const SvXMLUnitConverter rConv); +const SvXMLImport rImport); void AddPolygon( com::sun::star::drawing::PointSequence* pPoints, diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index a2c46fe..e49d971 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -2122,7 +2122,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString rNew, const SdXMLImExViewBox rViewBox, const awt::Point rObjectPos, const awt::Size rObjectSize, -const SvXMLUnitConverter /*rConv*/) +const SvXMLImport rImport) : msString( rNew ), mrViewBox( rViewBox ), mbIsClosed( false ), @@ -2131,9 +2131,20 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString rNew, mnLastY( 0L ), maPoly() { +bool bWrongPositionAfterZ( false ); + sal_Int32 nUPD( 0 ); + sal_Int32 nBuildId( 0 ); + if ( rImport.getBuildIds( nUPD, nBuildId ) + ( ( nUPD == 641 ) || ( nUPD == 645 ) || ( nUPD == 680 ) || ( nUPD == 300 ) || + ( nUPD == 310 ) || ( nUPD == 320 ) || ( nUPD == 330 ) || ( nUPD == 340 ) || + ( nUPD == 350 nBuildId 202 ) ) ) +{ +bWrongPositionAfterZ = true; +} + // convert string to polygon basegfx::B2DPolyPolygon aPoly; -basegfx::tools::importFromSvgD(aPoly,msString); +basegfx::tools::importFromSvgD(aPoly,msString
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - sw/inc sw/source
sw/inc/swtable.hxx|2 ++ sw/source/core/table/swtable.cxx |7 +++ sw/source/filter/ww8/WW8TableInfo.cxx |3 +-- 3 files changed, 10 insertions(+), 2 deletions(-) New commits: commit c646eaa216842443bb9bf88caf22f1805006dcc9 Author: Caolán McNamara caol...@redhat.com Date: Wed Mar 21 17:15:06 2012 +0100 fdo#45522: WW8TableInfo::processSwTable: check that table has layout (cherry picked from commit 5c3dd5af41bc801ee6023513399c01c632dc7779) Signed-off-by: Michael Stahl mst...@redhat.com Signed-off-by: Miklos Vajna vmik...@suse.cz Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index fb1d253..73df08c 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -326,6 +326,8 @@ public: #ifdef DBG_UTIL void CheckConsistency() const; #endif + +bool HasLayout() const; }; class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrmFmt. diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index ae36c31..d961289 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -2804,6 +2804,13 @@ void SwTable::RegisterToFormat( SwFmt rFmt ) rFmt.Add( this ); } +bool SwTable::HasLayout() const +{ +const SwFrmFmt* pFrmFmt = GetFrmFmt(); +//a table in a clipboard document doesn't have any layout information +return pFrmFmt SwIteratorSwTabFrm,SwFmt::FirstElement(*pFrmFmt); +} + void SwTableLine::RegisterToFormat( SwFmt rFmt ) { rFmt.Add( this ); diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 6171430..095c94b 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -631,8 +631,7 @@ void WW8TableInfo::processSwTable(const SwTable * pTable) WW8TableNodeInfo * pPrev = NULL; -SwFrmFmt * pFrmFmt = pTable-GetFrmFmt(); -if (pFrmFmt != NULL pTable-IsTblComplex()) +if (pTable-IsTblComplex() pTable-HasLayout()) { pPrev = processSwTableByLayout(pTable); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - ucb/source
ucb/source/ucp/gvfs/gvfs_content.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c946784f3b58d357eb15d699e1376df0d6f938ac Author: Daniel Mihalyi amidab...@gmail.com Date: Mon Feb 6 18:04:37 2012 +0100 In the current glib version only the main glib.h can be included directly. Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx index 990ea9f..5c8e7aa 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.hxx +++ b/ucb/source/ucp/gvfs/gvfs_content.hxx @@ -35,7 +35,7 @@ #include com/sun/star/ucb/XContentCreator.hpp #include ucbhelper/contenthelper.hxx -#include glib/gthread.h +#include glib.h #include libgnomevfs/gnome-vfs-ops.h #include libgnomevfs/gnome-vfs-directory.h ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - ucb/source
ucb/source/ucp/gvfs/gvfs_content.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5ba91e8f3ccd90a2e957885d3d0654dc48eed0b6 Author: Daniel Mihalyi amidab...@gmail.com Date: Mon Feb 6 18:04:37 2012 +0100 In the current glib version only the main glib.h can be included directly. Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Michael Stahl mst...@redhat.com Signed-off-by: Fridrich Strba fridrich.st...@graduateinstitute.ch diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx index 990ea9f..5c8e7aa 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.hxx +++ b/ucb/source/ucp/gvfs/gvfs_content.hxx @@ -35,7 +35,7 @@ #include com/sun/star/ucb/XContentCreator.hpp #include ucbhelper/contenthelper.hxx -#include glib/gthread.h +#include glib.h #include libgnomevfs/gnome-vfs-ops.h #include libgnomevfs/gnome-vfs-directory.h ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - sc/source
sc/source/ui/cctrl/checklistmenu.cxx |2 ++ sc/source/ui/namedlg/namemgrtable.cxx |2 ++ 2 files changed, 4 insertions(+) New commits: commit 208d129b7214eaedfc3dd22f78330c099d680dd3 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Mar 26 04:58:47 2012 +0200 prevent update during init in new autofilter dlg, fdo#45679 Signed-off-by: Michael Meeks michael.me...@suse.com Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 9b23197..d269333 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1164,6 +1164,7 @@ void ScCheckListMenuWindow::initMembers() { size_t n = maMembers.size(); size_t nVisMemCount = 0; +maChecks.SetUpdateMode(false); for (size_t i = 0; i n; ++i) { maChecks.InsertEntry(maMembers[i].maName); @@ -1188,6 +1189,7 @@ void ScCheckListMenuWindow::initMembers() maChkToggleAll.SetState(STATE_DONTKNOW); mePrevToggleAllState = STATE_DONTKNOW; } +maChecks.SetUpdateMode(true); } void ScCheckListMenuWindow::setConfig(const Config rConfig) diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index b9164d3..5a02130 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -127,6 +127,7 @@ void ScRangeManagerTable::GetLine(ScRangeNameLine rLine, SvLBoxEntry* pEntry) void ScRangeManagerTable::Init() { +SetUpdateMode(false); Clear(); for (boost::ptr_maprtl::OUString, ScRangeName::const_iterator itr = mrRangeMap.begin(); itr != mrRangeMap.end(); ++itr) @@ -147,6 +148,7 @@ void ScRangeManagerTable::Init() } } } +SetUpdateMode(true); } const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine rLine) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svx/source
svx/source/items/algitem.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 85c6043d0d339d3df6a4037eedce78df38272ea6 Author: Julien Nabet serval2...@yahoo.fr Date: Sun Mar 18 16:36:54 2012 +0100 Fix redundant assignment of nAngle in switch Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index ff93abb..5fa6d82 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -180,8 +180,8 @@ sal_Int32 SvxOrientationItem::GetRotation( sal_Int32 nStdAngle ) const sal_Int32 nAngle = nStdAngle; switch( static_cast SvxCellOrientation ( GetValue() ) ) { -case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000; -case SVX_ORIENTATION_TOPBOTTOM: nAngle = 27000; +case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000;break; +case SVX_ORIENTATION_TOPBOTTOM: nAngle = 27000;break; default: ; //prevent warning } return nAngle; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 73a5ef4cb245acb120f02d487ba7c3aeb40f4fad Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Mar 15 11:22:32 2012 +0100 fdo#46843 look for order by clause as fifth child of select_statement Since commit 33b9b857ea6cb5a6f731de68f58e532242c43d30 (dba34c: #i20306# support for window function and limit fetch first, ... added), order by is the fifth child. It was the fourth one before. Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 3f500b7..c9c6092 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2318,9 +2318,9 @@ namespace const ::connectivity::OSQLParseNode* pParseRoot ) { SqlParseError eErrorCode = eOk; -if (!pParseRoot-getChild(3)-getChild(4)-isLeaf()) +if (!pParseRoot-getChild(3)-getChild(ORDER_BY_CHILD_POS)-isLeaf()) { -::connectivity::OSQLParseNode* pNode = pParseRoot-getChild(3)-getChild(4)-getChild(2); +::connectivity::OSQLParseNode* pNode = pParseRoot-getChild(3)-getChild(ORDER_BY_CHILD_POS)-getChild(2); ::connectivity::OSQLParseNode* pParamRef = NULL; OQueryController rController = static_castOQueryController(_pView-getController()); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/documen5.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f24545a72cf43d0852c4f8edae0b3a9919120cdd Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Mar 19 20:59:01 2012 +0100 check for negative sheet number here too, fdo#47503 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index f19a067..7b83b53 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -636,7 +636,7 @@ void ScDocument::SetChartRangeList( const rtl::OUString rChartName, bool ScDocument::HasData( SCCOL nCol, SCROW nRow, SCTAB nTab ) { -if (nTab static_castSCTAB(maTabs.size()) maTabs[nTab]) +if ( VALIDTAB(nTab) nTab static_castSCTAB(maTabs.size()) maTabs[nTab]) return maTabs[nTab]-HasData( nCol, nRow ); else return false; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/glyphs/graphite_layout.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3a878d3dbfdb11cf2f0cce9dbf28a408c130d556 Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 20 11:35:13 2012 +0100 vcl: better check in GraphiteLayout::expandOrCondense: Improves the commit d066f7e4afb3c9e395932ba7bf8715ad0770bcdd that fixed crash when printing the bugdoc from i#103958 diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 1ec9650..93c1bc5 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -847,7 +847,7 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs rArgs) assert(nCharIndex -1); mvCharDxs[nCharIndex-mnMinCharPos] += nOffset; // adjust char dxs for rest of characters in cluster -while (++nCharIndex static_castint(mvChar2BaseGlyph.size())) +while (++nCharIndex - mnMinCharPos static_castint(mvChar2BaseGlyph.size())) { int nChar2Base = mvChar2BaseGlyph[nCharIndex-mnMinCharPos]; if (nChar2Base == -1 || nChar2Base == static_castint(i)) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source
vcl/source/glyphs/graphite_layout.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 39a7666cc0ac056bb682c89163a8d2155f57b775 Author: Michael Stahl mst...@redhat.com Date: Wed Feb 22 23:48:52 2012 +0100 vcl: crash in GraphiteLayout::expandOrCondense: When printing the bugdoc from i#103958: error: attempt to subscript container with out-of-bounds index 5, but container only holds 5 elements. Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Martin Hosken martin_hos...@sil.org diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index d39c292..e0898b2 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -843,7 +843,7 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs rArgs) assert(nCharIndex -1); mvCharDxs[nCharIndex-mnMinCharPos] += nOffset; // adjust char dxs for rest of characters in cluster -while (++nCharIndex static_castint(mvGlyph2Char.size())) +while (++nCharIndex - mnMinCharPos static_castint(mvChar2BaseGlyph.size())) { int nChar2Base = mvChar2BaseGlyph[nCharIndex-mnMinCharPos]; if (nChar2Base == -1 || nChar2Base == static_castint(i)) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx|2 +- dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 12 ++-- dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx |1 + 3 files changed, 12 insertions(+), 3 deletions(-) New commits: commit 1523e93bfc9a5d96fa519c801e904aab82a2b4d4 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Mar 20 11:03:08 2012 +0100 fdo#47560 properly separate each new sorting column Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index c9c6092..1a18286 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2325,9 +2325,9 @@ namespace OQueryController rController = static_castOQueryController(_pView-getController()); EOrderDir eOrderDir; -OTableFieldDescRef aDragLeft = new OTableFieldDesc(); for( sal_uInt32 i=0 ; ipNode-count() ; i++ ) { +OTableFieldDescRef aDragLeft = new OTableFieldDesc(); eOrderDir = ORDER_ASC; ::connectivity::OSQLParseNode* pChild = pNode-getChild( i ); commit 7e0be5ebd688a5e8c2faa8f097f104c89139efeb Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Mar 20 11:01:12 2012 +0100 fdo#47370 properly duplicate (invisible) out-of-order sort columns Keep track of position of previous sorting column and use it to decide whether to duplicate invisible new sort column Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index d13d5f9..177313c 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -68,6 +68,7 @@ const String g_strZero = String::CreateFromAscii(0); #define CHECKBOX_SIZE 10 #define HANDLE_ID0 #define HANDLE_COLUMN_WITDH 70 +#define SORT_COLUMN_NONE0x // - namespace @@ -113,6 +114,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) BROWSER_HIDECURSOR | BROWSER_HLINESFULL | BROWSER_VLINESFULL ) ,m_aFunctionStrings(ModuleRes(STR_QUERY_FUNCTIONS)) ,m_nVisibleCount(0) + ,m_nLastSortColumn(SORT_COLUMN_NONE) ,m_bOrderByUnRelated(sal_True) ,m_bGroupByUnRelated(sal_True) ,m_bStopTimer(sal_False) @@ -418,6 +420,7 @@ void OSelectionBrowseBox::ClearAll() aIter = getFields().rbegin(); } } +m_nLastSortColumn = SORT_COLUMN_NONE; SetUpdateMode(sal_True); } //-- @@ -1873,11 +1876,14 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef rInfo, const S //-- void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef rInfo, const EOrderDir eDir, sal_uInt32 _nCurrentPos) { +if (_nCurrentPos == 0) +m_nLastSortColumn = SORT_COLUMN_NONE; + Reference XConnection xConnection = static_castOQueryController(getDesignView()-getController()).getConnection(); if(!xConnection.is()) return; DBG_CHKTHIS(OSelectionBrowseBox,NULL); -OSL_ENSURE(!rInfo-IsEmpty(),AddOrder:: OTableFieldDescRef sollte nicht Empty sein!); +OSL_ENSURE(!rInfo-IsEmpty(),AddOrder:: OTableFieldDescRef should not be Empty!); OTableFieldDescRef pEntry; ReferenceXDatabaseMetaData xMeta = xConnection-getMetaData(); ::comphelper::UStringMixEqual bCase(xMeta.is() xMeta-supportsMixedCaseQuotedIdentifiers()); @@ -1896,7 +1902,7 @@ void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef rInfo, const EOrde bCase(aAlias,rInfo-GetAlias())) { sal_uInt32 nPos = aIter - rFields.begin(); -bAppend = _nCurrentPos nPos; +bAppend = (m_nLastSortColumn != SORT_COLUMN_NONE) (nPos = m_nLastSortColumn); if ( bAppend ) aIter = rFields.end(); else @@ -1904,6 +1910,7 @@ void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef rInfo, const EOrde if ( !m_bOrderByUnRelated ) pEntry-SetVisible(sal_True); pEntry-SetOrderDir( eDir ); +m_nLastSortColumn = nPos; } break; } @@ -1914,6 +1921,7 @@ void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef rInfo, const EOrde OTableFieldDescRef pTmp = InsertField(rInfo, BROWSER_INVALIDID, sal_False, sal_False ); if(pTmp.is
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) New commits: commit 9876424a32439fb81a93f97900dda078c659c5e1 Author: David Bolen db3l@gmail.com Date: Tue Mar 20 12:46:21 2012 +0100 Missing sub-menu arrows with 3.5.x and GTK 2.15 Signed-off-by: Michael Meeks michael.me...@suse.com Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 686c784..75e3c94 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1052,13 +1052,21 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, gint arrow_size; gint arrow_extent; guint horizontal_padding; -gfloat arrow_scaling; +gfloat arrow_scaling = 0.4; // Default for early GTK versions gtk_widget_style_get( widget, horizontal-padding, horizontal_padding, - arrow-scaling, arrow_scaling, NULL ); +// Use arrow-scaling property if available (2.15+), avoid warning otherwise +if ( gtk_widget_class_find_style_property( GTK_WIDGET_GET_CLASS( widget ), + arrow-scaling ) ) +{ +gtk_widget_style_get( widget, + arrow-scaling, arrow_scaling, + NULL ); +} + child = GTK_BIN( widget )-child; context = gtk_widget_get_pango_context( child ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sdext/source
sdext/source/minimizer/optimizerdialog.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9481eb32e76568fc675982479cc07c57c6a7cb39 Author: Julien Nabet serval2...@yahoo.fr Date: Tue Mar 20 14:21:22 2012 +0100 cppcheck report: logical disjunction always evaluates to true diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index a7076a0..78afa98 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -273,7 +273,7 @@ sal_Bool OptimizerDialog::execute() void OptimizerDialog::SwitchPage( sal_Int16 nNewStep ) { -if ( ( nNewStep != mnCurrentStep ) ( ( nNewStep = MAX_STEP ) || ( nNewStep = 0 ) ) ) +if ( ( nNewStep != mnCurrentStep ) ( nNewStep = MAX_STEP ) ( nNewStep = 0 ) ) { sal_Int16 nOldStep = mnCurrentStep; if ( nNewStep == 0 ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - libcroco/makefile.mk librsvg/makefile.mk redland/rasqal redland/redland
libcroco/makefile.mk|2 +- librsvg/makefile.mk | 16 +--- redland/rasqal/makefile.mk |4 redland/redland/makefile.mk |4 4 files changed, 22 insertions(+), 4 deletions(-) New commits: commit de01d3c6d3f9a617d0a7d5b95305c7c3b68d39d6 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 27 10:52:50 2012 +0100 Make redland build on Mac with internal libxml Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 45dbba6..6f356db 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -116,6 +116,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # $(SYSBASE)!= +.IF $(OS)==MACOSX $(SYSTEM_LIBXML) != YES +LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 0ce48c4..4644611 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -118,6 +118,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .IF $(OS)==MACOSX LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib +.IF $(SYSTEM_LIBXML) != YES +LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + .ENDIF CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) commit dae9dd4cff2659abb51d0de14c5bb5a734a20aa1 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 27 09:24:42 2012 +0100 Make librsvg link with internal libxml Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index 1348a04..2383167 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -57,14 +57,24 @@ PATCH_FILES=librsvg-2.32.1.patch LIBXML_LIBS=-lxml2 .ENDIF +.IF $(SYSTEM_LIBXML) == YES +my_libxml2_cflags=$(LIBXML_CFLAGS) +my_libxml2_libs=$(LIBXML_LIBS) +my_dylib_file= +.ELSE +my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml +my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2 +my_dylib_file=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + CONFIGURE_LDFLAGS=-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL)) CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \ --prefix=/@.__$(EXTRPATH) CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ --disable-pixbuf-loader --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \ - LIBRSVG_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(LIBXML_CFLAGS) \ - LIBRSVG_LIBS=-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl \ + LIBRSVG_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(my_libxml2_cflags) \ + LIBRSVG_LIBS=-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(my_libxml2_libs) -lcairo -lintl \ GDK_PIXBUF_CFLAGS=-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 \ GDK_PIXBUF_LIBS=-lgdk_pixbuf-2.0 \ GTHREAD_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 \ @@ -72,7 +82,7 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ LIBCROCO_CFLAGS=-I$(SOLARINCDIR)/external/libcroco-0.6 \ LIBCROCO_LIBS=-lcroco-0.6 \ CFLAGS=$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo \ - LDFLAGS=$(CONFIGURE_LDFLAGS) + LDFLAGS=$(CONFIGURE_LDFLAGS) $(my_dylib_file) CONFIGURE_FLAGS+= CPPFLAGS=$(ARCH_FLAGS) $(EXTRA_CDEFS) commit baeb77da20b7f9df7153b42f08f5aec57f72 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Sun Feb 26 00:02:28 2012 +0100 Fix libcroco build against internal libxml2 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index 40586d5..36aba58 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -55,7 +55,7 @@ CONFIGURE_DIR= my_libxml2_cflags=$(LIBXML_CFLAGS) my_libxml2_libs=$(LIBXML_LIBS) .ELSE -my_libxml2_cflags=-I
[Libreoffice-commits] Changes to 'libreoffice-3-5-2'
New branch 'libreoffice-3-5-2' available with the following commits: commit eb08ded29064669f1d9d5d5285e56cd30e9300fb Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 20 15:08:23 2012 +0100 Branch libreoffice-3-5-2 This is 'libreoffice-3-5-2' - the stable branch for the 3.5.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-2'
New branch 'libreoffice-3-5-2' available with the following commits: commit 5b29dc26e78c12bc0f8cfa155c60174207d73d3f Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 20 15:08:23 2012 +0100 Branch libreoffice-3-5-2 This is 'libreoffice-3-5-2' - the stable branch for the 3.5.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-2'
New branch 'libreoffice-3-5-2' available with the following commits: commit 659e8738becf567ee2aa867f3dd5e32978885261 Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 20 15:08:23 2012 +0100 Branch libreoffice-3-5-2 This is 'libreoffice-3-5-2' - the stable branch for the 3.5.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 30 +++--- solenv/inc/minor.mk |4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) New commits: commit fb03509d32f79a668622961c7d8d5347f1c4bb0f Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 20 15:12:48 2012 +0100 bump product version to 3.5.3-rc0+, release number to 300 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 2d32336..8fdbcf3 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -4,7 +4,7 @@ Globals { variables { - UREPACKAGEVERSION 3.5.2 + UREPACKAGEVERSION 3.5.3 URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 3.4 UNIXBASISROOTNAME libreoffice3.5 @@ -58,7 +58,7 @@ LibreOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.5.2 + ABOUTBOXPRODUCTVERSION 3.5.3 ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ BASEPRODUCTVERSION 3.5 PCPFILENAME libreoffice.pcp @@ -70,7 +70,7 @@ LibreOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.5.2 + PACKAGEVERSION 3.5.3 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -117,7 +117,7 @@ LibreOffice_wJRE POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.5.2 + ABOUTBOXPRODUCTVERSION 3.5.3 ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ BASEPRODUCTVERSION 3.5 UPDATEURL http://update.libreoffice.org/check.php @@ -128,7 +128,7 @@ LibreOffice_wJRE FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.5.2 + PACKAGEVERSION 3.5.3 PACKAGEREVISION {buildid} LICENSENAME LGPL WITHJREPRODUCT 1 @@ -176,7 +176,7 @@ LibreOffice_Dev POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.5.2 + ABOUTBOXPRODUCTVERSION 3.5.3 ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ BASEPRODUCTVERSION 3.5 DEVELOPMENTPRODUCT 1 @@ -192,7 +192,7 @@ LibreOffice_Dev FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.5.2 + PACKAGEVERSION 3.5.3 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -279,7 +279,7 @@ LibreOffice_SDK POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.5 -PACKAGEVERSION 3.5.2 +PACKAGEVERSION 3.5.3 PACKAGEREVISION {buildid} PACK_INSTALLED 1 POOLPRODUCT 0 @@ -323,7 +323,7 @@ LibreOffice_Dev_SDK POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.5 -PACKAGEVERSION 3.5.2 +PACKAGEVERSION 3.5.3 PACKAGEREVISION {buildid} BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX lodev @@ -371,7 +371,7 @@ LibreOffice_Test POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.5 -PACKAGEVERSION 3.5.2 +PACKAGEVERSION 3.5.3 PACKAGEREVISION {buildid} PACK_INSTALLED 1 POOLPRODUCT 0 @@ -415,7 +415,7 @@ LibreOffice_Dev_Test POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.5 -PACKAGEVERSION 3.5.2 +PACKAGEVERSION 3.5.3 PACKAGEREVISION {buildid} BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX lodev @@ -463,7 +463,7 @@ OxygenOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.2.1'
Tag 'libreoffice-3.5.2.1' created by Petr Mladek pmla...@suse.cz at 2012-03-20 17:02 -0700 Tag 3.5.2.1 (3.5.2-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPaKopAAoJEPQ0oe+v7q6jPxUQAK2yNw6rAkQZ+d8Q+GbVtM/B q5Q13K+Ph5Z2j9lkBbLMMhquU5IWHqD0/eMatvOWU7qFKXKpg9LbPbyor4CVVG5h J9HppKsti+N0t4SW/lqMxsfY5wa9kMU0iAmMcXDXrnh5HVl4op68txiI1ZnhaNq+ jF632q957VQ1bUxNpVHIoPC5wVB5oLzN0kkbbZUDu7qoPITebeBoXLPQc624kVb4 QwNBujjhBx5V1IBTuRm2WnjllSUWFQhFLqfofl4Zs5mMm+rFuTa8/sc1UVn7n34x ntkxY0CFWiVzuRDE0HnQrSUFh0VToDDQP3NFBWJz6Aj1lDqQ8XUyHMcejz3JuOPu WEnXYZ53ZHXY7CzkxiUos24QMPCALfAU6fBsWJSGKwayF0s+OVQVSf6MRyV3gglI MP/4dJSFjxL5p2q0HLXcp0YrrSK1/yck0i+8RRRV7ccLzFi3gZ8zvGCH9RkBUzCC AhNCyW15AQhyP+m6xGPmTabG1u7WRaO9VItRrWxf0dmqet1TBNWOyq2UZusEEe9i 8c21MIZk5D33eVl48sc73eL9WdOTTyQxMNWL4WfiogWXlA7L1BB4EIYL3kFWwO37 KptmFjah+6dZCMnv3EqCY3VGfquxLJ6sfW0m2s7hEEaP6goSkfqELOlTrHWNe3Ve uHfD4XdGQBwU3TJICzrK =4ylb -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-963: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.2.1'
Tag 'libreoffice-3.5.2.1' created by Petr Mladek pmla...@suse.cz at 2012-03-20 17:02 -0700 Tag 3.5.2.1 (3.5.2-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPaKoqAAoJEPQ0oe+v7q6jlaIP/R7SEa4UKvhkaD5ymwUxDYGb eTSYXU/vRSkjG9L4fAibVqyS7J6I8M0qoMAd1uuswyESZZlxVgCEon6pRuKrizda WcD4OxH4fERyYfa+4lPRJ0Adp4R4EruI75HzE15rjgbJLa3T/fzfiB6SMz7WuLqR 6bRnbgoiklMMips/UFHSGcQ2n1GgJX6WbcoW4OGZWEgBWUNEN6cBQvjsS9eENUtb e+7iTctStXE2VUOxQ9Rtb3DN9vf06dP8spPG7CFvHWbwqey8YynVASwcZ7WvHrmy hYPBeQvgdfc+BDe2mOaUQv2w9Nvnd722Megg/MnACP2IY5bRY9gApwL8LDX2Z7D6 wmubUEX+Aje+odcQLHdW+PokX69nS0XOpp8rbCbwfytDSAMtaMqxqZhoJ39qwMbB zVMDEPqWTwxZk4jExwQSqLuOcf7t7Go9e5sq7d/cFMSmHiWjH8KPA/cftMKQ6f3q BaFyIzUYqS+sQYxTVY9vDi7FOCsVZRNS++exD6u02I0xzGMHoUizqkkDapNOx06J VH43non/hcDVXteDOufuh+sT/Oy6vOhh/VoJgxrrs9N0H+aAxd3h9l4Dny2U9E0l 84L0zeFfKZJn+VAFa79yK7byxVi34AiP9RP7DbtkS1/CpYZs09xDyEvNRK+ZUMgr Iwa6pi4GKem4aJyhUj3E =7sTS -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-30: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 30 +++--- solenv/inc/minor.mk |4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) New commits: commit 61f951c1fac78cfdf7da7b1e05d02ff7a584fc25 Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 20 18:02:14 2012 +0100 bump product version to 3.5.2-rc1+, release number to 201 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 2d32336..4636aad 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -53,13 +53,13 @@ LibreOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.2 - ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -112,13 +112,13 @@ LibreOffice_wJRE PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.2 - ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 UPDATEURL http://update.libreoffice.org/check.php ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst @@ -170,14 +170,14 @@ LibreOffice_Dev PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.2 - ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -240,7 +240,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3.5 LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -275,7 +275,7 @@ LibreOffice_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.5 @@ -318,7 +318,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -367,7 +367,7 @@ LibreOffice_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.5 @@ -410,7 +410,7 @@ LibreOffice_Dev_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -458,13 +458,13 @@ OxygenOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - writerfilter/source
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) New commits: commit c88d73bc050357eb4bb26f20e1599bd451bfca4b Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 12 15:19:14 2012 +0200 Fix crash with document from bnc#693238 Signed-off-by: Cedric Bosdonnat cbosdon...@suse.com diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx index 488b77c..61fc027 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx @@ -424,10 +424,15 @@ OOXMLPropertySetImpl::~OOXMLPropertySetImpl() void OOXMLPropertySetImpl::resolve(Properties rHandler) { -OOXMLProperties_t::iterator aIt = begin(); -while (aIt != end()) +size_t nIt = 0; + +// The pProp-resolve(rHandler) call below can cause elements to +// be appended to mProperties. I don't think it can cause elements +// to be deleted. But let's check with here just to be safe that +// the indexing below works. +while (nIt mProperties.size()) { -OOXMLProperty::Pointer_t pProp = *aIt; +OOXMLProperty::Pointer_t pProp = mProperties[nIt]; if (pProp.get() != NULL) pProp-resolve(rHandler); @@ -440,7 +445,7 @@ void OOXMLPropertySetImpl::resolve(Properties rHandler) } #endif -++aIt; +++nIt; } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) New commits: commit 75fce8a65679a9383b139f3f9866a43ac7bda803 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Mar 12 15:19:14 2012 +0200 Fix crash with document from bnc#693238 Signed-off-by: Cedric Bosdonnat cbosdon...@suse.com diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx index 52dd4b7..5353d84 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx @@ -424,10 +424,15 @@ OOXMLPropertySetImpl::~OOXMLPropertySetImpl() void OOXMLPropertySetImpl::resolve(Properties rHandler) { -OOXMLProperties_t::iterator aIt = begin(); -while (aIt != end()) +size_t nIt = 0; + +// The pProp-resolve(rHandler) call below can cause elements to +// be appended to mProperties. I don't think it can cause elements +// to be deleted. But let's check with here just to be safe that +// the indexing below works. +while (nIt mProperties.size()) { -OOXMLProperty::Pointer_t pProp = *aIt; +OOXMLProperty::Pointer_t pProp = mProperties[nIt]; if (pProp.get() != NULL) pProp-resolve(rHandler); @@ -440,7 +445,7 @@ void OOXMLPropertySetImpl::resolve(Properties rHandler) } #endif -++aIt; +++nIt; } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4-6' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit bcc1b51cfe3bdd8289ac8f2b9803428d052d6d2a Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Jan 9 15:51:10 2012 +0100 fdo#46337: don't use an invalidated iterator (cherry picked from commit 2df1c40b4b7cb3107a68984db644f10097f04c3c) Signed-off-by: Michael Stahl mst...@redhat.com Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 5dfb281..a8d29cb 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -515,7 +515,7 @@ void DocxAttributeOutput::StartRun( const SwRedlineData* pRedlineData ) void DocxAttributeOutput::EndRun() { // Write field starts -for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt != m_Fields.end(); ++pIt ) +for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt != m_Fields.end(); ) { // Add the fields starts for all but hyperlinks and TOCs if ( pIt-bOpen pIt-pField ) @@ -526,10 +526,11 @@ void DocxAttributeOutput::EndRun() // Unknown fields sould be removed too if ( !pIt-bClose || ( pIt-eType == ww::eUNKNOWN ) ) { -m_Fields.erase( pIt ); ---pIt; +pIt = m_Fields.erase( pIt ); +continue; } } +++pIt; } // write the run properties + the text, already in the correct order ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1ytAAoJEPQ0oe+v7q6j3tcQAL19Kz7s2XbBYPgW0cT2+FGq //WuCZX8RESTB9XiTWecZfLLyXEsif3PE9+7QCnA1f/3LIew3zUv5i1HtwYxJ4Qw o/9oPIS/dkktCvciTIVXjdd9w+jsCsqUcz3ZVVQbmGyHkxTraYO3bnjyqpB7ZRkg 6L5WmgqK26kghZp699CBkRxTjVtX9Sg1Pz9DEaVyEUWxBeoVeRmZoMalVtrY5FfI Ax393jihVnMrvkR9mgtpguBkVZTyeDsjMtAw8/eboyVqqMyxu1rWoquHIw5JvzeQ l1a9ceB2L2g9aLJKgJqMiPIJN+9zkZ+mmpeXmG+PPcliJvJPowMIBfpa/Te10gsn 5qZt0c8ODZEW4NtNshkQv6LGuVkwcfdA4M28KDL3RXbmCuJeLLDetUhaPQb3n5Ja gp82M5FoDnQsaK3fvncL4OwsVTW7uSHR7f4Z5H72V1Y7Y5G9QaOUj+MZBWoI+/Vp uWtQndGwR/GzAfZ2ZUewefHkFeKeqzkz0boUv8O3IQHfNMD/SGfNd92p5CWfTo6f Sxf+ldCWOCniWcIoLkn5GCDSTChugmfmmD9Am/uoqGrgzA+9TyUMJl6lexKkV+VH dwsdJEAJ4tAJLfEQu8hVXxHDlE13W3H8dVA3G0qfjvFpNs0GLb5LGckL3/WPjRr6 nmWypqKvlfRl+y+4Tt1R =KZP/ -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-12: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1ytAAoJEPQ0oe+v7q6j99IP/2CaY1Ak7djSPk7xbRQ/D4i3 0n1zc7/jbn0cgkeKXCJHQZwnw2HZAeSF8+jpljM0PL/1bPLeuHNcUnH9NemMPXae Fke6mtzVshthcNkLhXTURHxCVBBx/EvgdOrQNP31eZayN9QpKKlyjnJqf4DVvEl/ lasSlGoVTFkGTVOmtZTAeUBVIfwPTP4anEx2QQJ3DvQsHItCv/UXr6kb4w8eoOPd xUC58nZxtOSWfaJrUBlCJ1S2MD26Zx5sUkecJ4OoLJBKELifzc80v9ab+YqPm1hW Wz0pbzjSolo4Rns0iRG+yc+M1NS8KfbeKIINzrcTZ8sP3jrXOwO3QgAeh4QqybMG Z+WBvPSdFRNz+0s1PycaMbE48JRIj3pOoYBH5ZC0SFNK6HSexXyZ8y72fsF4Thbw iAqnoUsVLmgfluLobvzYrxU+XZFmo2LHZt7Ag/FL1GIQQF3LR8K540WCe3x2i4ZQ eg8Af99mT6t1D2s9D09lqf+bf/7pvnyfL8f92S/mYNQqYjRLqV6bXTP/8heIA4oG CpVokz4L2mixMeu+Rh9Gozuf1DQeCNu0XO6fzIXARPxrUBsWlEOZVmNHM6SztD4h 3kZdFRnXVg35V5/Vqnt9JGqtYH4mOy1+yir0Qbtamh2IpGN2LoJfH2xDHu58A8P0 Wm6qakkY4Hz0p6qaeBLf =7bab -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-1: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1ytAAoJEPQ0oe+v7q6jFkcQAKz5MoQ/06UV7XACynBWJ+ok 5d0w/Ro9hyJ6IVtV2W0pj+KMNoKLvXXl/hjhXGmnQLCgn+CdZqgE04LJNKcDAlRm Gfc4XmlGuRKtANq/kwie0J7xcrPS8v8PenLajSypjwBi46N6+xE40cqTElfi8W5u oedYDlVn9JNsOefym6+/0x69G1rzb2ZnVBi8h0sARYJiIC2BKzvyP49JDGc9B0hY pnIFE6aGMhxuj2GepHdgNpUhc1iZ+XEL+VpkXlbqJtj/AZYGBjWoCZ8I8tyID+F+ rH2NaZH1ZtbTM+gn3vEuDQnqUH6tiHCu/TInfjGGQY5xzWtE5vCLMgjg68bRIeBh PCv9x6FcQwJoPcWGVuzgW7xsBp5q10HER7+tXA2Xl85+uuXfZ7sFk6tpUth06tpw bhkQY2onlExPO4jXlc3QsoEUD7LDbb4sF/mJ1Fi/5TtfiBAb1YO6O3EWUYuKfCF2 H8FKIHFduUMxi0FhDI304bTrM7pZauThg2vjj+S8Go7FFFiGfTCa+DF+hyNfu110 mrP8xP3GVMmp9/1VbcxSaJqAScrCLBqtWoSYgHN1GlPakgCB70vGXXA2PcwjEsPY MKWR01izaQpBl+gtPhSuZntR81cBDdoZH7bJDVaXomi+FpnAuuW3KikXVzXWzkAj BC0Ge9/OGtUiZl7RNrIx =Ukju -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-7: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1ytAAoJEPQ0oe+v7q6jj4oQAJZj0c1yxz0fGnR/M5XI/WdH Lka5Cb5Gmr/XWRWM0WERzHKZa7wCKloSPAoTYkoVbrrpmjcsSpOUMIl0tC1KL3ys G0c7MVTVySqGYt0HJqEfexgFgIe5XiuMkqEn45YBVQq4keVt4tWSychsFn4utlJo kUnUL9UNBNKt3bLWe/EwFNuJFBcQ4vWM56mT+mWWFLlFVb35CjWPKBeBMZocONW/ obTYCz/81I7HnlLR6oF2VXQyRaju+rFgWaDiNQATWALdJDwzpwC9mAsgqJnIQsnL YbWaZFcssUGme/mJ0G/K8O63G9Lr9i6mA5nryz7LTOxSKedGPXeg1kmP1xcmL7Hv PYAhZNZIPePw6r/KUsPBtm55MDCIUSFamnRmb+L8/N4i6arZvV890XqQ99LNIpTf h+q+aI7gIxf43UC0hQE10hUAqM6fUjL3Gwt/xc+XrvVY/5DSEMQsDlGy20MmIO9n W7W+cLxPCNaEoJLSsXZM6VuJOMGXh1x6ZX4sBWfcRvPd0rP6feQEN3H/bS6BkdbH 2riU98Ium/Tu6tl1d+LcShpq6/dN1wonNG7uo+AtwPJdu6gaTtEz10lRmIiGSWA3 4mW+biUQBPxPFQkWuTYkyOt8PX0MAWUZzvjYHLsdG5qQQS2NmEstlFLXkanxVUOF C8pbz1UMzfKvi1lXcCwN =CIbr -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-24: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1ytAAoJEPQ0oe+v7q6jQw8QAIeg2EwG1O0Z+pPRQhOYeGmJ lwt30wFMG/gE6Zp6i4Rt94PfUiHN7lPchROxt28/pTUaUGUeRF3R6Cmxm13pe/fN hOXv4n+DNTX7nEfaeQCBZiJv07+R21TEYQG135ei6rDdUuaVAoSvc4n3j/0u9dXa r13SDth/sMzHZOagfMrzRlSrIAKQ/jne0TM5GYTe4yIJypV8U8n7JmGphGeOkQDJ 4LPXtwKlzujC/lvOzyciUA+JRNX/5D+dgxbE2awq7xEBjBtQVpjtg7JgWS+DcOG8 lH8NZbOgwNoDpRZ6vlQs4CgD5Cz6kJbA7vjJVchut4Op9S65v4Ja6IpMrtqJ0N+e MPwfOFf9Ms8sFROzHiV3Re1xjBZ/z6hyhsmJa/cOfEekvHTtY2JhOKGlAe3Jd70V 9qAjwaKKm953Ut5kHxkz8Kytr4hyVLNUuhF+QLiSB7H3ErBsv68RgLe6KHwzZNPp J64kD7xgi6A2P5dSo6rv8wiveVadCUvPELKps8Q0ryyawUKKffwV2KBrRRZ/5T16 sCnilz1t083gakpeWxpuCFBVBwFqY7QMb2QovlnfNngkj6kLTOV6YLHQCc2vdhgK NdVx37rnaLeEFmTc12oyNljoa49Q9k+tB2peTynYvbvqs6fdNTgF3Q+BwiQw6pzi 9mKXCwoFoDchPCkJvYnK =VJ65 -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-15: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1ytAAoJEPQ0oe+v7q6jpxsQAKZtA7oE4akPIM7aYEv59X8p 0/MbzyXsmzL7FKiI6inDqi36ZNjIV9DNrK6C2qUySzla04UtNgoVn1+14MBXFJ+y Le54TKvxfUGRDzBGLKtumIdXwHxymFJg/ID/vvY6oWTMvc6GWwOXcGisH6D9/VvN NQcCPWzRdOMuyi7oEsgGaIBCn6xeAvGyc/qR7kAbEvfZC4XUVLtF6eCRZ+jP1nJt Tv96zZ+WIsEGYK/cIIw/hJv/+R7y0p6TOr3y3tlNLlyobYrnIFrokz0F7RcErRtN uMUYhNbnuA4fL9+ZxT2wWg+X5kbKU5JxP3UkC2pFfhOAloY2Oxj3FJ2KuFYJB6uP TjQJfOZMijzZPwFZnw2TKNOzUlCFul0azl8iicJvw9KPAri7vhnPBahpXKY7mlZJ qqvVOp/rAUrT0y5yhFNeWjVudShSkdcF9wDeoAGxABCO959gwVYeJIKhcsHZ7UO3 BlbZ8eeFNHagFqooM0ZMvm5XTzaJ6c4DWO2xJOKz36qxnNZbV4ZaKynSSVdUcrCC /orNtSFIz/TkjTQ5IAXIYIiWkwFn3aTsc1ImullWcy4o8QRGIT/QyRdjsS+hvBt0 GDkKJiNv60/PWfQxFWoPMqOXSatoWXtjO0QdKD/jRI1gKFRArUSCVy0qycYX9NEM 9VuXhRQDsMLtgoGZOuo+ =wp0d -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-4: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1yuAAoJEPQ0oe+v7q6jtcYP/0iLDpFN4dGgCExLMhOrYIxf bBKpWONVloXVoRO/jvSFqBcTS6iK+87yUUfnXSYCLs/qkrTl/7VrQ/8R0pGLP0OP wnZd+9igdiU2OGBQufnNApz7mF1iU9wgI1qlKXVMTVWMWOg8sX6ujIW37Vz1obDD HCk/X+nSzpk3kQSwM4R9o01G5m28aRQvC06iBIi/rxJv9UNOyo8qlgXesQeLnAT/ rxquoSKy7Fv2cXocMBhhmU0ceOWB3VQQ077PnNB1MoRf65qgNjhxPfJNP7qmrFkx WpTRwrmPBho9/goQrY28y0YdPHcMNN3k3M1/g559NOHjqnNVrorayON/H7Exil4c lHUlYt3IN8dzVsylhs6YBJsl+TawOsY8vDuUWS/yy1SAA50iTpQ8BHmk6BHNXjvO En7pkqnTU2auMg+mAaPQabcwGMdmIj2/5bx1ZTVzEQ1uucKM1Ysv5AScmP/rfdiq mnUyGeGt13ltlMK+Wdk6GUNRDhiiw9BZy+e/clHKXfli+fMm3eEg6Bq3G1bmm3J/ 2Z11hHdaFjoG7pVZLiQzoXAaz3vwuk0jSFl8eaOwO4NObwrt1EafxdiqO14UaA8y svloIcB3rUSErDqDQ+JnQ6jaD9DUsg3vVVEMOSafGt3Ch5UwhoHnf2mvkYKxRuZK beBKWn+ooQTK7cbIAeC9 =zYfI -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-8: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1yuAAoJEPQ0oe+v7q6j1VEQAL5eYeXvPDeROhrdaHz04fJN ueOpf5SnIxZ7iNsxIAp/DFk9MdaOEHLcK3+ock861zzSzxPr3s00qg0kcN0iFeyA 9qDLp9cBw1yMP08wsWT/1CABaiCiKiyzaZTob/sJlWsvQfssmbp+S6NcX/UubBK4 zyIp70MjwbkjNz8MYaQ22Og5XR3zGgUcuaW+QkiOIniLpxVazI72JnLP/xIbLd54 W90dL2/Qpmuht4RPpQIWa93Nxf6zn9Rcg8GKiX+zvp6mQ7SXsMsZLR6XUss3wsfG py7JkXUxLPZf2oCJWQRNxUdfe7gyz6u0ZNFXqPRIbmOVeDiLnokTuNleAEAwWK0o fQqH2S99j2dKUWfP6CU7vt9g9xywiagCmI4HQUzrgFddnkZlm1lz6X/FTqBGw0YD di877CleI6KmOXFWKcmyVeRuJxHrpfODR+rIkr2n1fayKIafsJQJi3V5/ue2JgCQ c0BA+c9TcbCnow3EQYcYzojo8vGD+nNHgPUwq9rEBy3fjrCitPSuQ0FIJ8WsOlzv B006raCmrq5yAHXMnB9mxvD/5KfCA3s97y6pgyk6gMrjioNnqV1W+yAojlDZsVga ZnOTijY5Ke/mBpi1Ilg+YswhRyFbRr0AC5A8AuYPM2PbbdbdmzJEpwke0SBKqBbw mUDP+BTwdKWVyRUwINZE =0kbu -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-4: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1yuAAoJEPQ0oe+v7q6jHTsQAKyFTO9WyCXZvuN4NbVK4IWG z4nB0HK7TEVNrj80h55pwp7V/2SLssv0nH6Qs+1+j5lDm6InUttPtOvFTJHD2Yrr bCORtJuota7/unvyj55YjVh9fNY362JIsDF2DFQyWcQWYWvwaMLpf0+pWx6vqhLS 4fknvIC/ksYw5ohXzVDMdiFSjts2liVGBXSrNks4swaZeyWu0USjXqZzDCiayPXC Rd+JOm0AJGe014b2xMy+fAJRLSm3sEz42wakjwEOaVzYUE4uLopBemvFdbBL2ANZ rIqUyj2zV/HaKB5HIbT8PX9oB7VIBw6yCvJ0z6agmcL1XeINrFD+rLzxF2wQuElV Gf7dlZU0xGk21ajBVkGz+g/vZ7HspwiF0Z87dvJGfnx4P/3jhBAnfm9Tu9vaaGow SVvS8e+NQsIh25y9+dXeGnosHiUsJUXIr4ZNu0j23+VBag9hsUQ+tccL5JbRgVQc wyPMPwZEK89dSC1s/RbdCvoEgoovoo8YGWS2sdXKY1XuzZFargjIhL0b3MU/AXSi 16kk20LmLG8JRl4i85zIaXd9J6x5MxE3DHVWKHG2knwcJ/S/H5e+MXA5NST00rKr r+gG5fmMvdwL5JZkRs3w2WBLPnsAXVuFgBqsXclvfiWLyu0moFQ3hcRcs602/WaP eOela3kS832dr0RDYrT1 =uN32 -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-29: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1yuAAoJEPQ0oe+v7q6jCwYP/R4M6MqDTAPA5ufBUtdEBc9a Z38FkmcCLwewwkWy0cCWZSX4W4BcsgXttL3JI1OwcAX6mnUb0H7gK1gPa+CpSzuL uBPQXzILLW7sjZKsDUG6SRSDzEKd2LnFeayLH537eIfgnmZNpQnhp7hkafY2lqkH y0sbCF596297HXJqjnEQDeTu1Imxbe3duRo8i67q3ETtjCPrB1gqdkPcL8KtVFnP w692k2YXTtcZr2Juczm/HizJZ7l9Y/Uz9gCDyTw1gN5+UdyqZadrsEuOSnBmjN5h 2NUE19hBPia+qWG/pctHHqyaju9bB2DmNPw0EF2OlhYmuWm0rbQ7Mb0JZt49Wbv9 WJpbF6w6FVpwQZW0E0QNy4W41bSHi15USkUmzM2pvmSQBBoTtYZg7xmOtZ1B4VIG nj7+m0PrAWJyx+nf8wwwalZUJcaYpM4cFlkvjBqsO98h39o7m0CLClchC+sGztty 6aY42clURVEL8/wbEIAL6/LkzxDEYqbLpB4Rr16xXWeofUbsnPSj1vwRsI/jdXYO T6B6RpLI+L3BiRo9LB9uf7d/+XsLs7eNqLebWwtA1Ml090Smu9JEJxT/X6ssjwEM rtu4+CNIMIUFwFnIM19zj2L5i/qjTwkPYQSScURk6a4lE0CCF/7jCkyxVuOH0FLK u7qrltTdaAEiD8zs+fdM =4q0e -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-3: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1yvAAoJEPQ0oe+v7q6jvSoP/1W7ZrGslcCU5ySfPF8IURYh AJ02CGW8VlytTM+wa8Y7kMP0/PlsWDUlTd7hTQOorg+45mCrfvIMzohgW0ynCt9j Tg+fxXxjiAfLQ7GVIGiz39k/TLh4mYQx6oAOn9uG1tlA+A1aiNS/vkfVxOuKwGVu yy3wGYI9H5Dv1qBvE1k0/WweHXphqU86l139Kj7ny//kN7Vuq1VWzDSy3osWZEBA 3eMgBG+4z4CNrQdZn3DV5lRuXqVs7iUTdaRQamrxH2qbHsWZ2/UoNm64uG9F04uL d9Q0/7wkqXswAQm5UODJy+o6uMn9zHwt8ZhTRaJm4VdpDbAp9h6GEljBpD+Z1pb7 CgAAlKqh47DlBCm5vzFqvHKl+owLIuJ+JE91Wf173Yy91o1B4A1qda7cD2PK5089 n39LoSezZ8p6WWocVdFJRvTed/IIe4zDJiEUcwMCn8sn2/BQEOf3CFOL3zvyX0ye 92diZCC0gH0YVztNxJs+0Kkdb5/PVY9bjgGgUeD/c2EXPjaXKXvcf+GSUWWirwiD Nd54Pc/ziUM2mv/0lKx73M9JAu4jbF/P8uaSP4PUZTQsJCzFjzbCFqbey/B8fMP/ vifN8F/dHxy7gz9orxCAVoGyjYN2YIrXVCRftCJxhdCUJV1JIyyTbg6vQZhISErb CRbMpUacMq1xZi0D77VV =B+pT -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-17: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1yvAAoJEPQ0oe+v7q6jSYEQAIsHwc9WFKfAFEFBHioqzmdW dsQtVMScRuUyYhSOGqDhH69b24fshykb3rIP5u98BP904yOd27waIPaT+HSb8vSC g5dVE2qYllLpqtQzJkWb23dNsz3HNmx3PhBxYKlMVGmfdpNNXmvLc2lMKmyDjb9l L8cjh5UbzHM04+HEvsncRssjFqR1mMuC/q87EHDUO5359TmXTX8VXB2ZfzuCTz7v hzWZj5vj/nzzgG4lYg7wPXQ+v70hEI3k/lh5fy9miMtSKRfkvJRmfyrq37h2DvnU 0pXpE5+UGdCXzqQTB5dMx27PRG3cok8RcWZeoB0tQ2rhALeWLS7ZZWSBsICVxZTl xUBJIf7g+KTjjltS2Kp9F7X97+w6eVx+/g58a9vaAfTdOaeJY7o4qyQBgsE7oGtl iJj5TQQKcLktroIJaw5xVVer8lApyrzMvvgX4QPizJTZux873KKv1mpconq/6GCt uzcyt72WQNDRK26A//10l7kK7oa9VhgTCIUKUhrF5tBNfp8h2X5aa9CeUOZBYsdT 8F5uxQ8sPolHm1Y1cE1VQXlUjZvVJcZ/zD59gu3ZX0CvZACLoWh0PHh3SclMrDJl 5zJ6ohm0PtiL1ZMucn/6jk5/AKFJJQjVXX2WUOKQzJq/LPPUOL+rmulkWl4EYNpn wn5E2Zcv1t/OTucS5N/e =a/cG -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-2: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1yvAAoJEPQ0oe+v7q6jzt8P/04UElWrzw/OJ1nEU+SGN0jK EgDbky45OpCMaxkUvPI7QWxMheJPXScysG2jn1XfqwY9tRfg/ZGqmMzlf9aKVXGs vPTtmsoCyxS/pr7wzONXS6fd2mXEHItvldqYjL2r8IbwbPANuL/7FCY6/PIoB7kJ CdAvRXpBo0yMPo0p2E6Q1L00zXzK2QLo8vPnpBdDgiapXrzgAZ85Kqp/HGrCc84i 63y9r5ftYNGPYvjGelYIjNwmPtd9Y85xKmjgf7fhW0hNLxmOETrnUXOGa3nLZtoy czMdv4NSQEXOibZMs2CBfL122XtBEwzxwagJRHvJxf9jPdgyjPpCJHWZdtIzdi/w 76ZNpaPv/If+YCPMQhByrrfPib+p947G3jZ81IvStNiJHZvIo61xJCY/GFVIvYQZ ilbM33MYEMhb20weKzU5HaRoVWzgDBYBtveWCshnv2x4pPWrraCMjQA+kJNjLytt XlIRW2OyQQvFLRMICuDKzLyWUSbMy+ej9IFdRNZxDDH3G4usYRK6vV2LxsCklgY4 JO9elilgeoLsmFpi5wD3BLXBN72JRb3ooc7VYWB4rtF1pBfigkBeHDkPH/Up4a+3 9nVpuT1Hh0z0t0DNtpyR4h1uXf3hgnUMPQ721ZRGtMCvSj3VtGJ9FCtm7G0WMphu 6bmWkGHytq/DwEmDua51 =qVMO -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-1: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1ywAAoJEPQ0oe+v7q6jz38P/i3mbTboWl1RJ+uz2nOEWHRE R9+ot4z9Mw6zIVXXg/ZZf65G2aeorlU35c2DYpfYtla1ds5kmk+yHQQ7EaUSzngo JjBZ15zILVe7FQppailwxzMC+ue6KOECgXNc/hipmrEAE43zGKaISmYcxGDfVFoi pk0nU62OgbCEfCV0Je3N+7fYDXfN65AIUy8Io/bfDKlcjznT0NG7lwyHyGcpYYag mBmAzazmb7IEZkx8DB7vE8iWei1BYyUjDRmaMjbxmt3kJ1+KusBcOP4CtWmTIQZo pjfvIv4Cl3QbfgN/XdOTHV4IMDois0PZOUJ/AipOhnmM0OI1N2xz/umo7huyUMbP XQaH4W+nA93wkch4jdbCC6OP/OXB3mX42nITULPpXH6uo59vnUYX2rqM1sJxf3jK gWe334eruvhfx17GITh5p7st7V2bKVs5LSczvG/BAFm/QxQBqNVsWG+UkHv6dsAI zYAkB5Yts4vQiTQJQwEc70OEK++O/crJpW2+5E5gYHYfWin08Kd78Qy1oG88LfpR 9VfUZZrR1BCko6B2ljwW4sIO5ymXmE73pncwEMpoGesC/tu6DaU6WzaJQo+60FIy 5i26Pg4DRbfuERQuGcRfDZ7Tj9pJ1kxoZdVNAM8+FfDhCDglNTAcHVMcB4Zpzo6Y LZwkag4UHSPG5XBMMeuX =1Hsh -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-6: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.6.2'
Tag 'libreoffice-3.4.6.2' created by Petr Mladek pmla...@suse.cz at 2012-03-13 15:41 -0700 Tag 3.4.6.2 (3.4.6-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPX1ywAAoJEPQ0oe+v7q6jLDMP/ArEGQynhm4SartFp1PC7qHq /prGBGBifxCo/6MwgZ6RYZKC6DfmoyL9VNTEZ5894dbsKAiaugELLyPGHlF6X4Fg 0Offr+ps8Ru2baXJlOzwpA2rWKvQ6aGhDklL1Pjtyqv4icINnObnGCXINKohSTgZ E4+zP23INZMOGW38cuq7PE1US39s1gapQNGXUlRagoZvc/gOshsCwy4lSLbvnWEG LrLwAPglyE1yrCZ7lmAUnDvKn/AwolpBlxhEHtrEBQLb4/oY4w3VhbEDr+sXid8j 1mtAnS4TgEGVY74b6AoQSMqaMFiXni2S5Qxb9G8uEhBcObrQ6srS9iLVSI8fLTFM mbmDYXbs12QclXSYNCLhYf64MN1cr7Wo2FEl2dk+49WcHT64Vg4iNVoRD5D0V5dv Z0ip4C2Sh68bzkHkZXwqGgY6mAWzr0oD8p8ibbltRjjENZw7agR6I7aMB/asY7AN 0Pgeb/Z3zwcNjtO478/INxCoCamtBDWOFgEuh99yt2bBRQ6GtsU6CnSlzG1gMIo1 KC+fCB8jyWtqBKzefDm2C3CJwan3IXgI01JH2I6fiH15uzLXr6vtl6NgkTgpim3x KQVQEoU8xCULtUwYEgbKr5raYw9PSnxRm41RR8fVzmd69obRcG4PE6yLrynZSw8A v9iusg0iZorl/+HxXZ9s =/5ZF -END PGP SIGNATURE- Changes since libreoffice-3.4.4.1-27: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 44 +-- solenv/inc/minor.mk |4 +-- 2 files changed, 24 insertions(+), 24 deletions(-) New commits: commit 59601189dba1ddc572a214cc752108568733eb7e Author: Petr Mladek pmla...@suse.cz Date: Thu Mar 8 10:20:57 2012 +0100 bump product version to 3.4.7-rc0, release number to 700 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index f34f689..852a226 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -5,8 +5,8 @@ Globals variables { OOOBASEVERSION 3.4 - OOOPACKAGEVERSION 3.4.5 - UREPACKAGEVERSION 3.4.5 + OOOPACKAGEVERSION 3.4.7 + UREPACKAGEVERSION 3.4.7 URELAYERVERSION 1 BASISROOTNAME LibreOffice UNIXBASISROOTNAME libreoffice3.4 @@ -57,12 +57,12 @@ LibreOffice PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.4.5 + ABOUTBOXPRODUCTVERSION 3.4.7 BASEPRODUCTVERSION 3.4 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update @@ -74,7 +74,7 @@ LibreOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.4.5 + PACKAGEVERSION 3.4.7 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -125,12 +125,12 @@ LibreOffice_wJRE PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.4.5 + ABOUTBOXPRODUCTVERSION 3.4.7 BASEPRODUCTVERSION 3.4 UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF @@ -141,7 +141,7 @@ LibreOffice_wJRE FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.4.5 + PACKAGEVERSION 3.4.7 PACKAGEREVISION {buildid} LICENSENAME LGPL WITHJREPRODUCT 1 @@ -189,14 +189,14 @@ LibreOffice_Dev PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc0 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.4.5 + ABOUTBOXPRODUCTVERSION 3.4.7 BASEPRODUCTVERSION 3.4 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX libobasis-dev @@ -211,7 +211,7 @@ LibreOffice_Dev FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.4.5 + PACKAGEVERSION 3.4.7 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -266,7 +266,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3.4 LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc1 +SHORT_PRODUCTEXTENSION rc0 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -305,11 +305,11
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit 0367342f860ef06185b12fdf18e6f2880e78c62d Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:43 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit dbd1ca631ba84faaa66adf029762027238bdd73b Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:44 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit e6ce381123627136ca9460c8e1830dac8d9a16ff Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:44 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit a9bd676104466e378da9061fd0dff2866c2528c3 Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:44 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit 06ff5cc1609d35d8feabcc33c7dc8b31e08a3f3e Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:45 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit 842361935ccdf8c27eccdcd8d870f99ce8b87fe6 Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:46 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit 9d5397e04c1b05472f0cd12f9a3329ccec4bbf3a Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:46 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit 11f2237564e7de17f3982b985bb258dfc76b4b02 Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:47 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit ff95876187efd078f069a9c4a803cb2696ede384 Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:47 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit b1a7c2b706fa147a19b0064870d0ffd857ac41cf Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:47 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit 396d6e4a05de6f875073e32050fde81e750a2a0c Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:48 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit c931682e6a29854fb358a88080bf9dce2e6498a3 Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:48 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit 456077e05fb535b2158dbb058ad72afa9bfde037 Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:49 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit 125e5a1569209614631a0f3c7d07ae5e57b2ea8e Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:50 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-4-6'
New branch 'libreoffice-3-4-6' available with the following commits: commit 26c910621485f18a99ade340ab178f85cb27d3f8 Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:01:51 2012 +0100 Branch libreoffice-3-4-6 This is 'libreoffice-3-4-6' - the stable branch for the 3.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.4.x release, please use the 'libreoffice-3-4' branch. Well, this is most likely the last 3.4.x bugfix release, so it probably does not make much sense. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4-6' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 28 ++-- solenv/inc/minor.mk |4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) New commits: commit cc4f7c0599d859149433ec8f2a97b31ce1fd2b71 Author: Petr Mladek pmla...@suse.cz Date: Wed Mar 7 15:25:33 2012 +0100 bump product version to 3.4.6-rc1, release number to 601 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index f34f689..9109cc5 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -5,8 +5,8 @@ Globals variables { OOOBASEVERSION 3.4 - OOOPACKAGEVERSION 3.4.5 - UREPACKAGEVERSION 3.4.5 + OOOPACKAGEVERSION 3.4.6 + UREPACKAGEVERSION 3.4.6 URELAYERVERSION 1 BASISROOTNAME LibreOffice UNIXBASISROOTNAME libreoffice3.4 @@ -62,7 +62,7 @@ LibreOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.4.5 + ABOUTBOXPRODUCTVERSION 3.4.6 BASEPRODUCTVERSION 3.4 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update @@ -74,7 +74,7 @@ LibreOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.4.5 + PACKAGEVERSION 3.4.6 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -130,7 +130,7 @@ LibreOffice_wJRE POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.4.5 + ABOUTBOXPRODUCTVERSION 3.4.6 BASEPRODUCTVERSION 3.4 UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF @@ -141,7 +141,7 @@ LibreOffice_wJRE FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.4.5 + PACKAGEVERSION 3.4.6 PACKAGEREVISION {buildid} LICENSENAME LGPL WITHJREPRODUCT 1 @@ -196,7 +196,7 @@ LibreOffice_Dev POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.4.5 + ABOUTBOXPRODUCTVERSION 3.4.6 BASEPRODUCTVERSION 3.4 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX libobasis-dev @@ -211,7 +211,7 @@ LibreOffice_Dev FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.4.5 + PACKAGEVERSION 3.4.6 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -309,7 +309,7 @@ LibreOffice_SDK POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.4 -PACKAGEVERSION 3.4.5 +PACKAGEVERSION 3.4.6 PACKAGEREVISION {buildid} PACK_INSTALLED 1 POOLPRODUCT 0 @@ -357,7 +357,7 @@ LibreOffice_Dev_SDK POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.4 -PACKAGEVERSION 3.4.5 +PACKAGEVERSION 3.4.6 PACKAGEREVISION {buildid} BASISPACKAGEPREFIX libobasis-dev UREPACKAGEPREFIX lodev @@ -408,7 +408,7 @@ OxygenOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.4 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.4.5 + ABOUTBOXPRODUCTVERSION 3.4.6 BASEPRODUCTVERSION 3.4 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update @@ -420,7 +420,7 @@ OxygenOffice FILEFORMATNAME OpenOffice.org