LibreOffice Gerrit News for core on 2013-10-28
Moin! * Open changes on master for project core changed in the last 25 hours: + fdo#54938: Convert to use cppu::supportsService in https://gerrit.libreoffice.org/6458 from José Guilherme Vanz + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + fdo#68903 Import .tsv and .xls plain text files in Calc by default in https://gerrit.libreoffice.org/6448 from Maxim Monastirsky + COMPHELPER: Specific unit test for empty comments in SyntaxHighlight in https://gerrit.libreoffice.org/6452 from Arnaud Versini + Fix for Chart Series Names in https://gerrit.libreoffice.org/6350 from vinaya mandke + Kill servlet-api and tomcat in https://gerrit.libreoffice.org/6454 from David Ostrovsky + fdo#70049 Expert Config page cannot save boolean in https://gerrit.libreoffice.org/6457 from Efe Gürkan Yalaman + fdo#54938: Convert package, writerfilter and writerperfect in https://gerrit.libreoffice.org/6456 from Marcos Souza + fdo#54938: Convert svx to use cppu::supportsService in https://gerrit.libreoffice.org/6455 from Marcos Souza + Set up tool chain to install LO artifacts in Maven repositories in https://gerrit.libreoffice.org/6453 from David Ostrovsky + Generate configure before calling ./configure --help in https://gerrit.libreoffice.org/6291 from Arnaud Versini + Access2Base : Reference to documentation added in every module in https://gerrit.libreoffice.org/6449 from Jean-Pierre ledure * Merged changes on master for project core changed in the last 25 hours: + fdo#70100 Detect single stream excel files with BOF ID 5 in https://gerrit.libreoffice.org/6447 from Maxim Monastirsky + Remove trailing whitespaces in https://gerrit.libreoffice.org/6446 from Roi Illouz + No more lib dir. Linking to original files in https://gerrit.libreoffice.org/6445 from Roi Illouz + FIREBIRD: SQL_INT64 should be 8 bytes in https://gerrit.libreoffice.org/6451 from Arnaud Versini + COMPHELPER: Allow empty comments in SyntaxHighlight in https://gerrit.libreoffice.org/6450 from Arnaud Versini * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/matus/rowdefaults' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - sw/source
sw/source/core/view/viewsh.cxx | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) New commits: commit f13e30c4fbb669f2885c99a676c5905f1356891e Author: Ptyl Dragon p...@cloudon.com Date: Mon Oct 28 09:24:57 2013 +0200 iOS uses virtual device too Change-Id: I468b41268f97af444974e05bc38fa5ca975a9d31 diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index cf313f5..e2a8bd6 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1784,13 +1784,16 @@ void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int // TODO create a VirtualDevice based on SystemGraphicsData instead so // that we get direct rendering; something like: // -// SystemGraphicsData aData; -// [setup the aData] -// VirtualDevice aDevice(aData, [color depth]); -//VirtualDevice aDevice; -//aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight)); -pViewShell-PaintTile(pViewShell-GetOut(), Rectangle(tilePosX, tilePosY, tileWidth, tileHeight)); -Bitmap aBitmap(pViewShell-GetOut()-GetBitmap(Point(0,0), pViewShell-GetOut()-PixelToLogic(Size(contextWidth, contextHeight; +VirtualDevice aDevice; +MapMode aMapMode(aDevice.GetMapMode()); +aMapMode.SetMapUnit(MAP_TWIP); +aMapMode.SetOrigin(Point(-tilePosX, -tilePosY)); +aDevice.SetMapMode(aMapMode); +aDevice.SetOutputSizePixel(aDevice.PixelToLogic(Size(contextWidth, contextHeight))); +// draw +pViewShell-PaintTile(aDevice, Rectangle(Point(tilePosX, tilePosY), Size(tileWidth, tileHeight))); +// copy the aDevice content to mpImage +Bitmap aBitmap(aDevice.GetBitmap(aDevice.PixelToLogic(Point(0,0)), aDevice.PixelToLogic(Size(contextWidth, contextHeight; BitmapReadAccess * readAccess = aBitmap.AcquireReadAccess(); touch_lo_copy_buffer((void *) readAccess-GetBuffer(), tileWidth, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/Application.xba |7 +++- wizards/source/access2base/Collect.xba |7 +++- wizards/source/access2base/Compatible.xba|7 +++- wizards/source/access2base/Control.xba |9 - wizards/source/access2base/DataDef.xba |7 +++- wizards/source/access2base/Database.xba |9 - wizards/source/access2base/Dialog.xba|7 +++- wizards/source/access2base/DoCmd.xba | 22 +++--- wizards/source/access2base/Event.xba |7 +++- wizards/source/access2base/Field.xba |7 +++- wizards/source/access2base/Form.xba | 41 +++ wizards/source/access2base/L10N.xba |7 +++- wizards/source/access2base/Methods.xba |7 +++- wizards/source/access2base/OptionGroup.xba |7 +++- wizards/source/access2base/PropertiesGet.xba |7 +++- wizards/source/access2base/PropertiesSet.xba |7 +++- wizards/source/access2base/Property.xba |7 +++- wizards/source/access2base/Recordset.xba |9 - wizards/source/access2base/SubForm.xba |7 +++- wizards/source/access2base/Trace.xba |7 +++- wizards/source/access2base/Utils.xba |7 +++- wizards/source/access2base/_License.xba | 10 +++--- wizards/source/access2base/acConstants.xba |7 +++- wizards/source/access2base/dlgTrace.xdl | 19 ++-- 24 files changed, 186 insertions(+), 52 deletions(-) New commits: commit 0bb042d4427b746b547c31c25e6594ec5c064116 Author: Jean-Pierre Ledure j...@ledure.be Date: Sun Oct 27 15:05:18 2013 +0100 Access2Base : Reference to documentation added in every module + workaround for setPosSize issue (LO 4.1) + Sidebar argument for RunCommand + Trace dialog layout revisit for cleaner display in Linux Change-Id: I0d5c4da5681ab1649d062a7133d507163163343e Reviewed-on: https://gerrit.libreoffice.org/6449 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba index 680c546..3497669 100644 --- a/wizards/source/access2base/Application.xba +++ b/wizards/source/access2base/Application.xba @@ -1,6 +1,11 @@ ?xml version=1.0 encoding=UTF-8? !DOCTYPE script:module PUBLIC -//OpenOffice.org//DTD OfficeDocument 1.0//EN module.dtd -script:module xmlns:script=http://openoffice.org/2000/script; script:name=Application script:language=StarBasicOption Explicit +script:module xmlns:script=http://openoffice.org/2000/script; script:name=Application script:language=StarBasicREM === +REM ===The Access2Base library is a part of the LibreOffice project. === +REM ===Full documentation is available on http://www.access2base.com === +REM === + +Option Explicit apos;DATABASE apos; Name property diff --git a/wizards/source/access2base/Collect.xba b/wizards/source/access2base/Collect.xba index 43cd91a..34abbfb 100644 --- a/wizards/source/access2base/Collect.xba +++ b/wizards/source/access2base/Collect.xba @@ -1,6 +1,11 @@ ?xml version=1.0 encoding=UTF-8? !DOCTYPE script:module PUBLIC -//OpenOffice.org//DTD OfficeDocument 1.0//EN module.dtd -script:module xmlns:script=http://openoffice.org/2000/script; script:name=Collect script:language=StarBasicOption Compatible +script:module xmlns:script=http://openoffice.org/2000/script; script:name=Collect script:language=StarBasicREM === +REM ===The Access2Base library is a part of the LibreOffice project. === +REM ===Full documentation is available on http://www.access2base.com === +REM === + +Option Compatible Option ClassModule Option Explicit diff --git a/wizards/source/access2base/Compatible.xba b/wizards/source/access2base/Compatible.xba index 1e26300..f3d3ad9 100644 --- a/wizards/source/access2base/Compatible.xba +++ b/wizards/source/access2base/Compatible.xba @@ -1,6 +1,11 @@ ?xml version=1.0 encoding=UTF-8? !DOCTYPE script:module PUBLIC -//OpenOffice.org//DTD OfficeDocument 1.0//EN module.dtd
tinderbox - gerrit-buildbot integration: passing build specific configuration options
As Markus pointed out in comment on that change[1] it is useless and annoying to schedule a build on something that is not get verified during the build, because the configuration options aren't activated. I wonder how hard would it be to accept configure options during build scheduling? With new upcoming major Gerrit release 2.8 the Plugin API was extended, so we could add a Schedule button and even a popup dialog and gather additional user input, like optional platforms to build and optional configuration option to activate during the build. In example above, the following option could be passed: --enable-extension-integration --enable-ext-wiki-publisher (Assuming that Java is installed and --with-java is activated on all tb). Check screen shots from the WIP plugin to see a button placed from a plugin with optional popup dialog [2]. [1] https://gerrit.libreoffice.org/6454 [2] https://github.com/davido/gerrit-wip-plugin --David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
build broken
Hi, I suffer (since last Wednessday/Thursday) with a broken build on both my development machines. The code bse is up to date and clean of my own code changes. make check reports an assertion in Cppunittess_sd_import_test. Markus (moggi) helped me dig a little deeper and the stack in gdb shows the following: (5 x up) i18npool/source/breakiterator/breakiterator_th.cxx:122 print Text: (const rtl::OUString ) @0xbfff4428: {pData = 0x4c13f228} print nStartPos: 18 (4xup) vcl/generic/glyphs/gcach_layout.cxx:437 print i: 17 print nRunGlyphCount: 18 (2xup) vcl/source/gdi/outdev3.cxx:5845 Markus said something about pretty printers not being installed because make isn't finished yet, but I can't print the content of OUStrings. Anyone having a clue of what might be wrong? I'm willing to provide extra information if you tell me which. Thanks, Winfried (using openSUSE 12.3) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - ios/experimental sw/source vcl/headless vcl/source
ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj |4 ++ ios/experimental/LibreOffice/LibreOffice/AppDelegate.m |7 +--- ios/experimental/LibreOffice/LibreOffice/View.h|1 ios/experimental/LibreOffice/LibreOffice/View.m|8 - sw/source/core/crsr/crsrsh.cxx | 16 +- vcl/headless/svpframe.cxx |6 +++ vcl/source/window/cursor.cxx |2 + 7 files changed, 23 insertions(+), 21 deletions(-) New commits: commit a027fa423876a3c9a4f3edfcd3a35ae1e83b068f Author: Tor Lillqvist t...@collabora.com Date: Mon Oct 28 11:32:55 2013 +0200 Try a different way to not show the keyboard initially on iOS Change-Id: I978cfcb52297ace7e3916a63ce3dc9f179a6a208 diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index ec932e3..8bb540a 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2521,14 +2521,14 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell rShell, Window *pInitWin ) m_bGCAttr = m_bIgnoreReadonly = m_bSelTblCells = m_bBasicHideCrsr = m_bOverwriteCrsr = sal_False; m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = sal_True; -#if defined(ANDROID) || defined(IOS) m_bSVCrsrVis = touch_ui_keyboard_visible(); -#else -m_bSVCrsrVis = sal_True; -#endif m_bSetCrsrInReadOnly = sal_True; m_pVisCrsr = new SwVisCrsr( this ); m_bMacroExecAllowed = rShell.IsMacroExecAllowed(); + +#if defined(ANDROID) || defined(IOS) +HideCrsr(); +#endif } /// default constructor @@ -2558,15 +2558,15 @@ SwCrsrShell::SwCrsrShell( SwDoc rDoc, Window *pInitWin, m_bGCAttr = m_bIgnoreReadonly = m_bSelTblCells = m_bBasicHideCrsr = m_bOverwriteCrsr = sal_False; m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = sal_True; -#if defined(ANDROID) || defined(IOS) -m_bSVCrsrVis = touch_ui_keyboard_visible(); -#else m_bSVCrsrVis = sal_True; -#endif m_bSetCrsrInReadOnly = sal_True; m_pVisCrsr = new SwVisCrsr( this ); m_bMacroExecAllowed = true; + +#if defined(ANDROID) || defined(IOS) +HideCrsr(); +#endif } SwCrsrShell::~SwCrsrShell() commit f0fb30e7d0e8cf0c62b45bc3deb2e35faeaccd1b Author: Tor Lillqvist t...@collabora.com Date: Mon Oct 28 11:28:18 2013 +0200 Get rid of some crack Change-Id: I9806eb87e8d679c3b37de9cf7b87e26c3d4b5387 diff --git a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m index 4940165..11d4642 100644 --- a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m +++ b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m @@ -51,9 +51,6 @@ static BOOL keyboardShows; vc.view = self.view; theView = self.view; -// This is baaad -theView-applicationFrame = applicationFrame; - self.view-textView = [[UITextView alloc] initWithFrame: r]; self.view-textView.autocapitalizationType = UITextAutocapitalizationTypeNone; self.view-textView.alpha = 0; @@ -71,9 +68,9 @@ static BOOL keyboardShows; NSLog(@statusBarOrientation: %ld, (long) [[UIApplication sharedApplication] statusBarOrientation]); if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation])) -touch_lo_set_view_size(applicationFrame.size.height, applicationFrame.size.width); +touch_lo_set_view_size(r.size.height, r.size.width); else -touch_lo_set_view_size(applicationFrame.size.width, applicationFrame.size.height); +touch_lo_set_view_size(r.size.width, r.size.height); [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardDidHide:) name:UIKeyboardDidHideNotification object:nil]; diff --git a/ios/experimental/LibreOffice/LibreOffice/View.h b/ios/experimental/LibreOffice/LibreOffice/View.h index 61c8169..aecc606 100644 --- a/ios/experimental/LibreOffice/LibreOffice/View.h +++ b/ios/experimental/LibreOffice/LibreOffice/View.h @@ -15,7 +15,6 @@ { @public UITextView* textView; -CGRect applicationFrame; } - (void)drawRect:(CGRect)rect; - (void)tapGesture:(UITapGestureRecognizer *)gestureRecognizer; diff --git a/ios/experimental/LibreOffice/LibreOffice/View.m b/ios/experimental/LibreOffice/LibreOffice/View.m index f4fec1d..48ec11a 100644 --- a/ios/experimental/LibreOffice/LibreOffice/View.m +++ b/ios/experimental/LibreOffice/LibreOffice/View.m @@ -128,13 +128,7 @@ switch ([[UIApplication sharedApplication] statusBarOrientation]) { case UIInterfaceOrientationPortrait: -// No idea why I need to do this ugly subtraction of -// applicationFrame.origin.y here. The handling of View frame -// and
[Libreoffice-commits] core.git: 3 commits - comphelper/qa comphelper/source
comphelper/qa/unit/syntaxhighlighttest.cxx | 89 +++-- comphelper/source/misc/syntaxhighlight.cxx | 19 +++--- 2 files changed, 95 insertions(+), 13 deletions(-) New commits: commit 0827aba84e1adec902c4d704651a1027b01c5335 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 28 10:44:28 2013 +0100 Correctly fix Terminating NUL fix 1cbe2313edda8a04f0fe233b4a29ef4e2485f557 Terminating NUL at end of its buffer is not considered part of OUString was a thinko that cut the last character off the last reported HighlightPortion on a line. Change-Id: Idbe74676e85749cd93854293c6f49c7581414562 diff --git a/comphelper/qa/unit/syntaxhighlighttest.cxx b/comphelper/qa/unit/syntaxhighlighttest.cxx index c576f7b..294db3e 100644 --- a/comphelper/qa/unit/syntaxhighlighttest.cxx +++ b/comphelper/qa/unit/syntaxhighlighttest.cxx @@ -21,13 +21,94 @@ class SyntaxHighlightTest : public CppUnit::TestFixture { public: void testBasicString(); +void testBasicComment(); +void testBasicCommentNewline(); +void testBasicEmptyComment(); +void testBasicEmptyCommentNewline(); +void testBasic(); CPPUNIT_TEST_SUITE(SyntaxHighlightTest); CPPUNIT_TEST(testBasicString); +CPPUNIT_TEST(testBasicComment); +CPPUNIT_TEST(testBasicCommentNewline); +CPPUNIT_TEST(testBasicEmptyComment); +CPPUNIT_TEST(testBasicEmptyCommentNewline); +CPPUNIT_TEST(testBasic); CPPUNIT_TEST_SUITE_END(); }; -void SyntaxHighlightTest::testBasicString() +void SyntaxHighlightTest::testBasicString() { +SyntaxHighlighter h; +h.initialize(HIGHLIGHT_BASIC); +OUString s(\foo\); +std::vectorHighlightPortion ps; +h.getHighlightPortions(0, s, ps); +CPPUNIT_ASSERT_EQUAL( +static_caststd::vectorHighlightPortion::size_type(1), ps.size()); +CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin); +CPPUNIT_ASSERT_EQUAL(5, ps[0].nEnd); +CPPUNIT_ASSERT_EQUAL(TT_STRING, ps[0].tokenType); +} + +void SyntaxHighlightTest::testBasicComment() { +SyntaxHighlighter h; +h.initialize(HIGHLIGHT_BASIC); +OUString s(' foo); +std::vectorHighlightPortion ps; +h.getHighlightPortions(0, s, ps); +CPPUNIT_ASSERT_EQUAL( +static_caststd::vectorHighlightPortion::size_type(1), ps.size()); +CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin); +CPPUNIT_ASSERT_EQUAL(5, ps[0].nEnd); +CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType); +} + +void SyntaxHighlightTest::testBasicCommentNewline() { +SyntaxHighlighter h; +h.initialize(HIGHLIGHT_BASIC); +OUString s(' foo\n); +std::vectorHighlightPortion ps; +h.getHighlightPortions(0, s, ps); +CPPUNIT_ASSERT_EQUAL( +static_caststd::vectorHighlightPortion::size_type(2), ps.size()); +CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin); +CPPUNIT_ASSERT_EQUAL(5, ps[0].nEnd); +CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType); +CPPUNIT_ASSERT_EQUAL(5, ps[1].nBegin); +CPPUNIT_ASSERT_EQUAL(6, ps[1].nEnd); +CPPUNIT_ASSERT_EQUAL(TT_EOL, ps[1].tokenType); +} + +void SyntaxHighlightTest::testBasicEmptyComment() { +SyntaxHighlighter h; +h.initialize(HIGHLIGHT_BASIC); +OUString s('); +std::vectorHighlightPortion ps; +h.getHighlightPortions(0, s, ps); +CPPUNIT_ASSERT_EQUAL( +static_caststd::vectorHighlightPortion::size_type(1), ps.size()); +CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin); +CPPUNIT_ASSERT_EQUAL(1, ps[0].nEnd); +CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType); +} + +void SyntaxHighlightTest::testBasicEmptyCommentNewline() { +SyntaxHighlighter h; +h.initialize(HIGHLIGHT_BASIC); +OUString s('\n); +std::vectorHighlightPortion ps; +h.getHighlightPortions(0, s, ps); +CPPUNIT_ASSERT_EQUAL( +static_caststd::vectorHighlightPortion::size_type(2), ps.size()); +CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin); +CPPUNIT_ASSERT_EQUAL(1, ps[0].nEnd); +CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType); +CPPUNIT_ASSERT_EQUAL(1, ps[1].nBegin); +CPPUNIT_ASSERT_EQUAL(2, ps[1].nEnd); +CPPUNIT_ASSERT_EQUAL(TT_EOL, ps[1].tokenType); +} + +void SyntaxHighlightTest::testBasic() { OUString aBasicString(if Mid(sText,iRun,1 ) \ \ then Mid( sText ,iRun, 1, Chr( 1 + Asc( Mid(sText,iRun,1 )) ) '); @@ -46,13 +127,6 @@ void SyntaxHighlightTest::testBasicString() prevEnd = itr-nEnd; } CPPUNIT_ASSERT_EQUAL(aBasicString.getLength(), prevEnd); - -// The last portion is an empty comment consisting just of the leading -// apostrophe: -assert(!aPortions.empty()); -CPPUNIT_ASSERT_EQUAL(98, aPortions.back().nBegin); -CPPUNIT_ASSERT_EQUAL(99, aPortions.back().nEnd); -CPPUNIT_ASSERT_EQUAL(TT_COMMENT, aPortions.back().tokenType); } CPPUNIT_TEST_SUITE_REGISTRATION(SyntaxHighlightTest); diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index 83bcb59..ca3207d 100644 ---
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/crsrsh.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 85289911a3d568ac4cb2ecb5b6ec7d11c2d8ab28 Author: Tor Lillqvist t...@collabora.com Date: Mon Oct 28 11:45:32 2013 +0200 Fingers slipped Change-Id: Ic8a11c9857c04533ff96f523f1b29b1518bb89c0 diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 8bb540a..8bf37b1 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2521,7 +2521,7 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell rShell, Window *pInitWin ) m_bGCAttr = m_bIgnoreReadonly = m_bSelTblCells = m_bBasicHideCrsr = m_bOverwriteCrsr = sal_False; m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = sal_True; -m_bSVCrsrVis = touch_ui_keyboard_visible(); +m_bSVCrsrVis = sal_True; m_bSetCrsrInReadOnly = sal_True; m_pVisCrsr = new SwVisCrsr( this ); m_bMacroExecAllowed = rShell.IsMacroExecAllowed(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2 librelogo/source
helpcontent2|2 +- librelogo/source/LibreLogo/LibreLogo.py |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 850871e04e247262242836180d8a5cf59b2f95ef Author: László Németh nem...@numbertext.org Date: Mon Oct 28 11:48:33 2013 +0100 fdo#70951 librelogo: fix parsing problem of functions Change-Id: I2e85a795064ee9e58f3389aec94c942f6ae77612 diff --git a/helpcontent2 b/helpcontent2 index 35ad87c..0d8b37c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 35ad87caa5923b90d8ef5e7d951059fa60d6ced8 +Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index e030fc8..33fe172 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1595,7 +1595,7 @@ def __compil__(s): (?:[^\n]*(?!\b(%(END)s))\n)* # 0 or more lines (not END) [^\n]*\b(?:%(OUTPUT)s)\b[^\n]*\n # line with OUTPUT (functions = procedures with OUTPUT) (?:[^\n]*(?!\b(?:%(END)s))\n)* # 0 or more lines (not END) -(?:%(END)s)\b % __l12n__(_.lng), s, re.X) ] # final END (XXX multiple names of END doesn't supported) +[ \t]*\b(?:%(END)s)\b % __l12n__(_.lng), s, re.X) ] # final END (XXX multiple names of END doesn't supported) # add line breaks before procedure calls procedures = set(subnames) - set(functions) if len(procedures) 0: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/Module_sw.mk sw/qa sw/source
sw/Module_sw.mk |2 +- sw/qa/extras/uiwriter/data/fdo69893.odt |binary sw/qa/extras/uiwriter/uiwriter.cxx | 28 +++- sw/source/ui/wrtsh/select.cxx |6 ++ 4 files changed, 30 insertions(+), 6 deletions(-) New commits: commit e6f87a6f38e9c5ae9e0e089c4d2897b15ae9aac7 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Oct 28 11:53:17 2013 +0100 sw: make the uiwriter testcase a slowcheck The uiwriter test is similar to filter tests, except that the asserts are filter-independent. Those are slowchecks already, move this one there as well. This speeds up 'make sw' a bit, which is slow enough already. Change-Id: I566bf94938c3de6267705a7720bf093bfe4ef7c7 diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 7401742..020049f 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -46,7 +46,6 @@ endif $(eval $(call gb_Module_add_check_targets,sw,\ CppunitTest_sw_uwriter \ -CppunitTest_sw_uiwriter \ )) $(eval $(call gb_Module_add_slowcheck_targets,sw,\ @@ -60,6 +59,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_rtfimport \ CppunitTest_sw_odfexport \ CppunitTest_sw_odfimport \ +CppunitTest_sw_uiwriter \ )) ifneq ($(DISABLE_CVE_TESTS),TRUE) commit d1eb536c7e410d40fd94c76b157bbd4ed7944d4c Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Oct 28 11:15:43 2013 +0100 fdo#69893 fix SwWrtShell::SelAll() to work with empty table at doc start In theory, it was a problem to have the table cursor around when having the selection outside the table; but it didn't cause a problem so far. However, when the table has one or more empty cells, we really need to leave table mode, otherwise only the table gets selected. Change-Id: I766903ed624b9338f0612697b4c03f44de1d2e41 diff --git a/sw/qa/extras/uiwriter/data/fdo69893.odt b/sw/qa/extras/uiwriter/data/fdo69893.odt new file mode 100644 index 000..a2f7aa7 Binary files /dev/null and b/sw/qa/extras/uiwriter/data/fdo69893.odt differ diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index fa0bb14..8fd9947 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -8,6 +8,7 @@ #include swmodeltestbase.hxx #include ndtxt.hxx +#include wrtsh.hxx #include UndoManager.hxx @@ -21,10 +22,12 @@ public: //Regression test of fdo#70143 //EDITING: undo searchreplace corrupt text when searching backward void testReplaceBackward(); +void testFdo69893(); CPPUNIT_TEST_SUITE(SwUiWriterTest); CPPUNIT_TEST(testReplaceForward); CPPUNIT_TEST(testReplaceBackward); +CPPUNIT_TEST(testFdo69893); CPPUNIT_TEST_SUITE_END(); private: @@ -97,6 +100,19 @@ void SwUiWriterTest::testReplaceBackward() CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTxtNode-GetTxt()); } +void SwUiWriterTest::testFdo69893() +{ +SwDoc* pDoc = createDoc(fdo69893.odt); +SwWrtShell* pWrtShell = pDoc-GetDocShell()-GetWrtShell(); + +pWrtShell-SelAll(); + +SwShellCrsr* pShellCrsr = pWrtShell-getShellCrsr(false); +SwTxtNode rEnd = dynamic_castSwTxtNode(pShellCrsr-End()-nNode.GetNode()); +// Selection did not include the para after table, this was B1. +CPPUNIT_ASSERT_EQUAL(OUString(Para after table.), rEnd.GetTxt()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index 8eb0d6a..972e3ef 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -162,7 +162,13 @@ long SwWrtShell::SelAll() bool bStartsWithTable = StartsWithTable(); if (bStartsWithTable) +{ +// Disable table cursor to make sure getShellCrsr() returns m_pCurCrsr, not m_pTblCrsr. +if (IsTableMode()) +TblCrsrToCursor(); +// Do the extended select all on m_pCurCrsr. ExtendedSelectAll(/*bFootnotes =*/ false); +} if( pStartPos ) { commit ed2790435f74d6eaa28fcc758d2db9e1c77b5170 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Oct 28 11:45:47 2013 +0100 SwUiWriterTest: allow loading a custom bugdoc Change-Id: I5578e462c21c023d8c9a269f2ca254e20c1a617e diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index f9e37f6..fa0bb14 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -28,12 +28,14 @@ public: CPPUNIT_TEST_SUITE_END(); private: -SwDoc* createEmptyDoc(); +SwDoc* createDoc(const char* pName = 0); }; -SwDoc* SwUiWriterTest::createEmptyDoc() +SwDoc* SwUiWriterTest::createDoc(const char* pName) { -load(DATA_DIRECTORY, empty.odt); +if (!pName) +pName = empty.odt; +load(DATA_DIRECTORY, pName); SwXTextDocument*
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sw/source
sw/source/ui/wrtsh/select.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 3ce5507dfd91983555eaf9f96703e6b318e16201 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Oct 28 11:15:43 2013 +0100 bnc#825891 fdo#69893 fix SwWrtShell::SelAll() to work with empty table at doc start In theory, it was a problem to have the table cursor around when having the selection outside the table; but it didn't cause a problem so far. However, when the table has one or more empty cells, we really need to leave table mode, otherwise only the table gets selected. (cherry picked from commit d1eb536c7e410d40fd94c76b157bbd4ed7944d4c) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: I766903ed624b9338f0612697b4c03f44de1d2e41 diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index 1e9262f..bc74165 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -162,7 +162,13 @@ long SwWrtShell::SelAll() bool bStartsWithTable = StartsWithTable(); if (bStartsWithTable) +{ +// Disable table cursor to make sure getShellCrsr() returns m_pCurCrsr, not m_pTblCrsr. +if (IsTableMode()) +TblCrsrToCursor(); +// Do the extended select all on m_pCurCrsr. ExtendedSelectAll(/*bFootnotes =*/ false); +} if( pStartPos ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source
oox/source/drawingml/chart/typegroupconverter.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 82bd538a76493eaa325b768d22e2486b072d6950 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Oct 28 12:29:48 2013 +0100 oox: fix build OUString::number() - OUString::valueOf() diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index 164abb0..ab43614 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -297,7 +297,7 @@ Reference XLabeledDataSequence TypeGroupConverter::createCategorySequence() DataSourceModel aSrc = aModel.maSources.create( SeriesModel::CATEGORIES ); DataSequenceModel aSeq = aSrc.mxDataSeq.create(); for( sal_Int32 i = 0; i nMaxValues; i++ ) -aSeq.maData[ i ] = OUString::number( i + 1 ); +aSeq.maData[ i ] = OUString::valueOf( i + 1 ); SeriesConverter aSeriesConv( *this, aModel ); xLabeledSeq = aSeriesConv.createCategorySequence( categories ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - sw/source
sw/source/core/view/viewsh.cxx | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) New commits: commit 9c9fb5116e80b431a92a57b829d9e90ec538f78f Author: Ptyl Dragon p...@cloudon.com Date: Mon Oct 28 13:50:50 2013 +0200 in progress tile rendering Change-Id: Ie49fc47700287c3c21f234e3fece2b3afd272d24 diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index e2a8bd6..fdf7577 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -162,7 +162,9 @@ void ViewShell::DLPrePaint2(const Region rRegion) if(mpTargetPaintWindow-GetPreRenderDevice()) { mpBufferedOut = mpOut; +#ifndef IOS mpOut = (mpTargetPaintWindow-GetTargetOutputDevice()); +#endif } // remember original paint MapMode for wrapped FlyFrame paints @@ -192,11 +194,13 @@ void ViewShell::DLPostPaint2(bool bPaintFormLayer) mPrePostPaintRegions.pop(); // clear if(0 != mpTargetPaintWindow) { +#ifndef IOS // #i74769# restore buffered OutDev if(mpTargetPaintWindow-GetPreRenderDevice()) { mpOut = mpBufferedOut; } +#endif // #i74769# use SdrPaintWindow now direct Imp()-GetDrawView()-EndDrawLayers(*mpTargetPaintWindow, bPaintFormLayer); @@ -1788,16 +1792,22 @@ void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int MapMode aMapMode(aDevice.GetMapMode()); aMapMode.SetMapUnit(MAP_TWIP); aMapMode.SetOrigin(Point(-tilePosX, -tilePosY)); +// scaling +Fraction scaleX(contextWidth,tileWidth); +Fraction scaleY(contextHeight,tileHeight); +aMapMode.SetScaleX(scaleX); +aMapMode.SetScaleY(scaleY); aDevice.SetMapMode(aMapMode); -aDevice.SetOutputSizePixel(aDevice.PixelToLogic(Size(contextWidth, contextHeight))); +// resizes the virtual device so to contain the entrie context +aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight)); // draw pViewShell-PaintTile(aDevice, Rectangle(Point(tilePosX, tilePosY), Size(tileWidth, tileHeight))); // copy the aDevice content to mpImage Bitmap aBitmap(aDevice.GetBitmap(aDevice.PixelToLogic(Point(0,0)), aDevice.PixelToLogic(Size(contextWidth, contextHeight; BitmapReadAccess * readAccess = aBitmap.AcquireReadAccess(); touch_lo_copy_buffer((void *) readAccess-GetBuffer(), - tileWidth, - tileHeight, + contextWidth, + contextHeight, readAccess- GetScanlineSize(), context, contextWidth, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 3 commits - sw/inc sw/qa sw/source
sw/inc/crsrsh.hxx|4 +-- sw/qa/extras/odfimport/data/fdo69862.odt |binary sw/qa/extras/odfimport/data/fdo69979.odt |binary sw/qa/extras/odfimport/odfimport.cxx | 36 +++ sw/source/core/crsr/crsrsh.cxx | 12 +- sw/source/core/edit/eddel.cxx|2 - sw/source/core/edit/edglss.cxx |2 - sw/source/ui/wrtsh/select.cxx|8 ++ 8 files changed, 53 insertions(+), 11 deletions(-) New commits: commit 445ecfa7d9bf8a1779224ad53e9b14b9f571b10b Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Oct 28 11:15:43 2013 +0100 bnc#825891 fdo#69893 fix SwWrtShell::SelAll() to work with empty table at doc start In theory, it was a problem to have the table cursor around when having the selection outside the table; but it didn't cause a problem so far. However, when the table has one or more empty cells, we really need to leave table mode, otherwise only the table gets selected. Change-Id: I766903ed624b9338f0612697b4c03f44de1d2e41 (cherry picked from commit d1eb536c7e410d40fd94c76b157bbd4ed7944d4c) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index 3923fe3..feb47e3 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -162,7 +162,13 @@ long SwWrtShell::SelAll() bool bStartsWithTable = StartsWithTable(); if (bStartsWithTable) +{ +// Disable table cursor to make sure getShellCrsr() returns m_pCurCrsr, not m_pTblCrsr. +if (IsTableMode()) +TblCrsrToCursor(); +// Do the extended select all on m_pCurCrsr. ExtendedSelectAll(/*bFootnotes =*/ false); +} if( pStartPos ) { commit d9124b3f30de8693da0e9d4f5ccc3cf815996e38 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Oct 2 11:19:18 2013 +0200 bnc#825891 fdo#69979 SwCrsrShell::ExtendedSelectAll: exclude headers, too It turns out, normal Ctrl-A doesn't select headers, footers and fly content, either (just like not selecting footnotes). So do the same when in the doc starts with table special mode. Change-Id: Ib9bc397944a4d07ea03bc326f1536733c57f42e6 (cherry picked from commit 232df42b8dc0b4f7a335d2931fc0f29e73b8bca0) Conflicts: sw/qa/extras/odfimport/odfimport.cxx sw/source/core/crsr/crsrsh.cxx diff --git a/sw/qa/extras/odfimport/data/fdo69979.odt b/sw/qa/extras/odfimport/data/fdo69979.odt new file mode 100644 index 000..8f7d77e Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo69979.odt differ diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index 6a1240e..eb8a819 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -49,6 +49,7 @@ public: void testFdo37606(); void testFdo37606Copy(); void testFdo69862(); +void testFdo69979(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -70,6 +71,7 @@ void Test::run() {fdo37606.odt, Test::testFdo37606}, {fdo37606.odt, Test::testFdo37606Copy}, {fdo69862.odt, Test::testFdo69862}, +{fdo69979.odt, Test::testFdo69979}, }; for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) { @@ -371,7 +373,22 @@ void Test::testFdo69862() SwTxtNode rEnd = dynamic_castSwTxtNode(pShellCrsr-End()-nNode.GetNode()); CPPUNIT_ASSERT_EQUAL(String(H \x01 ello.), rEnd.GetTxt()); +} + +void Test::testFdo69979() +{ +// The test doc is special in that it starts with a table and it also has a header. +SwXTextDocument* pTxtDoc = dynamic_castSwXTextDocument *(mxComponent.get()); +SwWrtShell* pWrtShell = pTxtDoc-GetDocShell()-GetWrtShell(); +SwShellCrsr* pShellCrsr = pWrtShell-getShellCrsr(false); +pWrtShell-SelAll(); +SwTxtNode rStart = dynamic_castSwTxtNode(pShellCrsr-Start()-nNode.GetNode()); +// This was , as Ctrl-A also selected headers, but it should not. +CPPUNIT_ASSERT_EQUAL(String(A1), rStart.GetTxt()); + +SwTxtNode rEnd = dynamic_castSwTxtNode(pShellCrsr-End()-nNode.GetNode()); +CPPUNIT_ASSERT_EQUAL(String(Hello.), rEnd.GetTxt()); } CPPUNIT_TEST_SUITE_REGISTRATION(Test); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 357e9c9..2b02fa1 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -539,7 +539,7 @@ void SwCrsrShell::ExtendedSelectAll(bool bFootnotes) { SwNodes rNodes = GetDoc()-GetNodes(); SwPosition* pPos = pCurCrsr-GetPoint(); -pPos-nNode = bFootnotes ? rNodes.GetEndOfPostIts() : rNodes.GetEndOfInserts(); +pPos-nNode = bFootnotes ? rNodes.GetEndOfPostIts() : rNodes.GetEndOfAutotext(); pPos-nContent.Assign( rNodes.GoNext( pPos-nNode ), 0 );
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - basegfx/source sal/inc sal/osl
basegfx/source/polygon/b2dsvgpolypolygon.cxx | 10 ++ sal/inc/sal/main.h | 18 + sal/osl/os2/salinit.cxx | 92 +++ sal/osl/os2/thread.c | 12 +++ 4 files changed, 49 insertions(+), 83 deletions(-) New commits: commit 697d89b1dda760a39cd8e7e28f386dbec1aaff61 Author: Armin Le Grand a...@apache.org Date: Mon Oct 28 11:31:11 2013 + i123465 no longer correct svg:d imports diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx index 1ac1258..5af90b7 100644 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx +++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx @@ -320,7 +320,10 @@ namespace basegfx // add current polygon if(bIsClosed) { -closeWithGeometryChange(aCurrPoly); +// #123465# no need to do the old closeWithGeometryChange +// corerection on SVG polygons; this even may lead to wrong +// results e.g. for marker processing +aCurrPoly.setClosed(true); } o_rPolyPolygon.append(aCurrPoly); @@ -841,7 +844,10 @@ namespace basegfx // end-process last poly if(bIsClosed) { -closeWithGeometryChange(aCurrPoly); +// #123465# no need to do the old closeWithGeometryChange +// corerection on SVG polygons; this even may lead to wrong +// results e.g. for marker processing +aCurrPoly.setClosed(true); } o_rPolyPolygon.append(aCurrPoly); commit 89ded41db1f9884eec75097206a64df1b1c7f72a Author: Yuri Dario yda...@apache.org Date: Mon Oct 28 11:07:01 2013 + i118923 - OS/2 port: make use of system ExceptQ exception handler. diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h index c695a04..51ceea5 100644 --- a/sal/inc/sal/main.h +++ b/sal/inc/sal/main.h @@ -33,6 +33,24 @@ extern C { void SAL_CALL sal_detail_initialize(int argc, char ** argv); void SAL_CALL sal_detail_deinitialize(); +#ifdef SAL_OS2 +#include string.h + +#define INCL_DOSPROCESS +#define INCL_DOSEXCEPTIONS +#define INCL_DOSMODULEMGR +#include os2.h +#define INCL_LOADEXCEPTQ +#include exceptq.h + +#define sal_detail_initialize(a,b) \ +EXCEPTIONREGISTRATIONRECORD exRegRec = {0}; \ +LoadExceptq(exRegRec, NULL, NULL); \ +osl_setCommandArgs(argc, argv); +#define sal_detail_deinitialize() \ +UninstallExceptq(exRegRec); +#endif // SAL_OS2 + #define SAL_MAIN_WITH_ARGS_IMPL \ int SAL_CALL main(int argc, char ** argv) \ { \ diff --git a/sal/osl/os2/salinit.cxx b/sal/osl/os2/salinit.cxx index 0412f93..ebafddb 100644 --- a/sal/osl/os2/salinit.cxx +++ b/sal/osl/os2/salinit.cxx @@ -19,99 +19,29 @@ * */ +#include stdio.h - -#define INCL_DOS -#include os2.h - -#include precompiled_sal.hxx -#include sal/config.h - -#include osl/process.h -#include sal/main.h #include sal/types.h -// for exception logging -#include stdio.h -#include string.h -#include setjmp.h - +#ifdef __cplusplus extern C { +#endif /**/ -static CHARszOOoExe[CCHMAXPATH]; - -static FILE* APIENTRY _oslExceptOpenLogFile(VOID) -{ - FILE*file; - DATETIMEDT; - PPIBpib; - PSZ slash; - - // get executable fullpath - DosGetInfoBlocks(NULL, pib); - DosQueryModuleName(pib-pib_hmte, sizeof(szOOoExe), szOOoExe); - // truncate to exe name - slash = (PSZ)strrchr( szOOoExe, '.'); - *slash = '\0'; - // make log path - strcat( szOOoExe, .log); - - file = fopen( szOOoExe, a); - if (!file) { // e.g. readonly drive - // try again, usually C exist and is writable - file = fopen( c:\\OOo.log, a); - } - if (file) { -DosGetDateTime(DT); -fprintf(file, \nTrap message -- Date: %04d-%02d-%02d, Time: %02d:%02d:%02d\n, -DT.year, DT.month, DT.day, -DT.hours, DT.minutes, DT.seconds); -fprintf(file, ---\n - \nAn internal error occurred (Built __DATE__ - __TIME__ ).\n); - - } - - // ok, return handle - return (file); -} - -/**/ - -#if 0 // until exceptions restored OSL_DEBUG_LEVEL == 0 -static EXCEPTSTRUCT g_excptstruct = {0}; -#endif - +// replaced by macros in sal/main.h void SAL_CALL sal_detail_initialize(int argc, char ** argv) { -APIRET rc = -1; - -#if 0 // until exceptions
Re: HttpClient - HttpComponents
[looks like this was accidentally sent only to me, adding list in CC:] On 27/10/13 09:41, Fernand Vanrie wrote: Michael, julien Having a proper working http connection tool would be a advantage, for working with external calendar' translators like Google API stuff we need a Http connection tool. that is a valid point but currently we don't make a HTTP UNO API available based on commons-httpclient so removing it has no impact there. we also bundle various C++ libraries like curl and neon that should make a better basis for a HTTP API if somebody wanted to implement that. For now i use a Window COM object CreateObject(WinHttp.WinHttpRequest.5.1) to make constructions like below. guess there is no better workaround for BASIC programmers currently; presumably Python and Java and CLR have HTTP libraries easily available. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 48314b5d529d449e10f4bf9cf40ed4fb587b027f Author: Andras Timar andras.ti...@collabora.com Date: Mon Oct 28 13:16:44 2013 +0100 Updated core Project: help 27623e809f6dc1f7e5aea9484cff1c294b2673b7 diff --git a/helpcontent2 b/helpcontent2 index 0d8b37c..27623e8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e +Subproject commit 27623e809f6dc1f7e5aea9484cff1c294b2673b7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: git_submodules_suck
0 files changed New commits: commit 27623e809f6dc1f7e5aea9484cff1c294b2673b7 Author: Andras Timar andras.ti...@collabora.com Date: Mon Oct 28 13:16:44 2013 +0100 reset submodule master head again Change-Id: Id8cd35486427a5717ab095839571d9dc5589c861 diff --git a/git_submodules_suck b/git_submodules_suck deleted file mode 100644 index e69de29..000 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/textfilterdetect/filterdetect.cxx |4 1 file changed, 4 insertions(+) New commits: commit 8a201be240b6d408d15166be7ffc576b9e123634 Author: Maxim Monastirsky momonas...@gmail.com Date: Sun Oct 27 13:26:39 2013 +0200 fdo#68903 Import .tsv and .xls plain text files in Calc by default Change-Id: I14115542d7f0401f4fa8face9f255b4512fc0ac3 Reviewed-on: https://gerrit.libreoffice.org/6448 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index ef1a1d6..360d8d4 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -87,6 +87,10 @@ OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequencebeans::PropertyVal setPropValue(lDescriptor, nFilter, FilterName, OUString(WRITER_TEXT_FILTER)); else if (aExt == csv) setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); +else if (aExt == tsv) +setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); +else if (aExt == xls) +setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); else if (aExt == txt) setPropValue(lDescriptor, nFilter, FilterName, OUString(WRITER_TEXT_FILTER)); else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - basctl/source comphelper/qa comphelper/source helpcompiler/source include/comphelper include/svtools svtools/source
basctl/source/basicide/baside2.hxx|1 basctl/source/basicide/baside2b.cxx | 26 --- comphelper/qa/unit/syntaxhighlighttest.cxx| 26 --- comphelper/source/misc/syntaxhighlight.cxx| 225 -- helpcompiler/source/BasCodeTagger.cxx |7 include/comphelper/syntaxhighlight.hxx| 86 + include/svtools/svmedit.hxx |1 svtools/source/edit/editsyntaxhighlighter.cxx |7 8 files changed, 137 insertions(+), 242 deletions(-) New commits: commit a2f9c446b79d50d808bdc6e3487d230459f81260 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 28 12:56:23 2013 +0100 Some clean-up Change-Id: I8ef80b7ae952428a62cc1cea8b03219b77a83e99 diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index bdf9d43..c9bac08 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -257,7 +257,6 @@ namespace class SyntaxHighlighter::Tokenizer { -HighlighterLanguage aLanguage; // Character information tables sal_uInt16 aCharTypeTab[256]; @@ -272,7 +271,9 @@ class SyntaxHighlighter::Tokenizer sal_uInt16 nKeyWordCount; public: -Tokenizer( HighlighterLanguage aLang = HIGHLIGHT_BASIC ); +HighlighterLanguage const aLanguage; + +Tokenizer( HighlighterLanguage aLang ); ~Tokenizer( void ); void getHighlightPortions( const OUString rLine, @@ -710,4 +711,9 @@ void SyntaxHighlighter::getHighlightPortions( const OUString rLine, m_tokenizer-getHighlightPortions( rLine, portions ); } +HighlighterLanguage SyntaxHighlighter::GetLanguage() +{ +return m_tokenizer-aLanguage; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx index ec0bf7c..081be1d 100644 --- a/include/comphelper/syntaxhighlight.hxx +++ b/include/comphelper/syntaxhighlight.hxx @@ -80,8 +80,9 @@ public: void getHighlightPortions( const OUString rLine, std::vectorHighlightPortion pPortions ); -HighlighterLanguage GetLanguage() { return eLanguage;} +HighlighterLanguage GetLanguage(); }; + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 176ac1e61610579ba8ac202c16d7aa0c0991af89 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 28 12:51:52 2013 +0100 Remove unnecessary SyntaxHighlighter::Tokenizer statefulness ...which reveals that SyntaxHighlighter::notifyChange does nothing, so remove it. Change-Id: I49834af29081ee703d9e62e182e3c1f8ce7e212e diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 1b3ad3f..d9316fe 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1189,8 +1189,6 @@ void EditorWindow::ImpDoHighlight( sal_uLong nLine ) if ( bDoSyntaxHighlight ) { OUString aLine( pEditEngine-GetText( nLine ) ); -aHighlighter.notifyChange( aLine, 1 ); - bool const bWasModified = pEditEngine-IsModified(); pEditEngine-RemoveAttribs( nLine, true ); std::vectorHighlightPortion aPortions; @@ -1326,12 +1324,6 @@ void EditorWindow::ParagraphInsertedDeleted( sal_uLong nPara, bool bInserted ) GetOutputSizePixel().Height() - 2 * DWBORDER); rModulWindow.GetLineNumberWindow().SetPosSizePixel(Point(DWBORDER + 19, DWBORDER), aLnSz); rModulWindow.GetLineNumberWindow().Invalidate(); - -if ( bDoSyntaxHighlight ) -{ -OUString aDummy; -aHighlighter.notifyChange( aDummy, 1 ); -} } } diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index fa5afc1..bdf9d43 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -261,17 +261,11 @@ class SyntaxHighlighter::Tokenizer // Character information tables sal_uInt16 aCharTypeTab[256]; -const sal_Unicode* mpStringBegin; -const sal_Unicode* mpActualPos; - -sal_Unicode peekChar( void ){ return *mpActualPos; } -sal_Unicode getChar( void ) { return *mpActualPos++; } - // Auxiliary function: testing of the character flags sal_Bool testCharFlags( sal_Unicode c, sal_uInt16 nTestFlags ); // Get new token, EmptyString == nothing more over there -sal_Bool getNextToken( /*out*/TokenTypes reType, +sal_Bool getNextToken( const sal_Unicode* pos, /*out*/TokenTypes reType, /*out*/const sal_Unicode* rpStartPos, /*out*/const sal_Unicode* rpEndPos ); const char** ppListKeyWords; @@ -281,7 +275,6 @@ public: Tokenizer( HighlighterLanguage aLang = HIGHLIGHT_BASIC ); ~Tokenizer( void ); -sal_uInt16 parseLine( const OUString* aSource ); void getHighlightPortions( const OUString
[Libreoffice-commits] core.git: 7 commits - cli_ure/CliNativeLibrary_cli_cppuhelper.mk cli_ure/Executable_climaker.mk cli_ure/Library_cli_cppuhelper_native.mk cli_ure/Library_cli_uno.mk cli_ure/Module
Makefile.in |2 Repository.mk |2 cli_ure/CliNativeLibrary_cli_cppuhelper.mk| 12 +- cli_ure/Executable_climaker.mk|2 cli_ure/Library_cli_cppuhelper_native.mk |2 cli_ure/Library_cli_uno.mk|2 cli_ure/Module_cli_ure.mk |1 cli_ure/Package_cli_basetypes_copy.mk |4 cli_ure/Package_config.mk | 17 --- cli_ure/source/climaker/climaker.exe.config | 10 - odk/Package_cli.mk| 12 +- solenv/gbuild/CliAssembly.mk |4 solenv/gbuild/CliLibrary.mk | 131 ++ solenv/gbuild/CliNativeLibrary.mk | 105 +++- solenv/gbuild/CliUnoApi.mk| 125 +++- solenv/gbuild/TargetLocations.mk | 21 +--- testtools/CustomTarget_bridgetest_climaker.mk |4 unoil/CliUnoApi_oootypes.mk | 29 + unoil/CustomTarget_climaker.mk| 57 --- unoil/Module_unoil.mk |3 unoil/Package_climaker.mk | 16 --- 21 files changed, 172 insertions(+), 389 deletions(-) New commits: commit 3af414b48b2882636de3ab8c84ab4c514daf6235 Author: Michael Stahl mst...@redhat.com Date: Mon Oct 28 12:54:49 2013 +0100 gbuild: deliver CLI config and policy files to INSTDIR Change-Id: I93aaf87b53c17fb143e6e6ae0bca60777dbb3eb5 diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index f8c6fdb..7c6e3b7 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -148,9 +148,11 @@ $(call gb_CliAssembly_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),CLA,3) rm -f $(call gb_CliAssembly_get_target,$*) +# call gb_CliAssembly_CliAssembly,dllname,dlltarget define gb_CliAssembly_CliAssembly $(call gb_CliAssemblyTarget_CliAssemblyTarget,$(1)) $(call gb_Package_Package_internal,$(1)_assembly,$(WORKDIR)) +$(call gb_Package_set_outdir,$(1)_assembly,$(dir $(2))) $(call gb_CliAssembly_get_target,$(1)) : $(call gb_CliAssemblyTarget_get_target,$(1)) $(call gb_CliAssembly_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_assembly) @@ -160,7 +162,7 @@ $(call gb_CliAssembly_get_clean_target,$(1)) : $(call gb_Package_get_clean_targe endef define gb_CliAssembly__add_file -$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2))) +$(call gb_Package_add_file,$(1)_assembly,$(notdir $(2)),$(subst $(WORKDIR)/,,$(2))) endef diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index bdfdf54..3883e7f 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -61,7 +61,7 @@ $(call gb_CliLibrary_get_clean_target,%) : # # gb_CliLibrary_CliLibrary target define gb_CliLibrary_CliLibrary -$(call gb_CliAssembly_CliAssembly,$(1)) +$(call gb_CliAssembly_CliAssembly,$(1),$(call gb_CliLibrary_get_target,$(1))) $(call gb_CliLibrary_get_target,$(1)) : CLI_ASSEMBLIES := $(call gb_CliLibrary_get_target,$(1)) : CLI_SOURCES := diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk index 84c19c1..be28621 100644 --- a/solenv/gbuild/CliNativeLibrary.mk +++ b/solenv/gbuild/CliNativeLibrary.mk @@ -39,7 +39,7 @@ $(call gb_CliNativeLibrary_get_clean_target,%) : # # CliNativeLibrary target define gb_CliNativeLibrary_CliNativeLibrary -$(call gb_CliAssembly_CliAssembly,$(1)) +$(call gb_CliAssembly_CliAssembly,$(1),$(call gb_CliNativeLibrary_get_target,$(1))) $(call gb_CliNativeLibrary_get_target,$(1)) : CLI_NATIVE_ASSEMBLIES := $(gb_Helper_MISCDUMMY) $(call gb_CliNativeLibrary_get_target,$(1)) : CLI_NATIVE_KEYFILE := diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk index 1ce3844..16f331b 100644 --- a/solenv/gbuild/CliUnoApi.mk +++ b/solenv/gbuild/CliUnoApi.mk @@ -43,7 +43,7 @@ $(call gb_CliUnoApi_get_clean_target,%) : # # gb_CliUnoApi_CliUnoApi target define gb_CliUnoApi_CliUnoApi -$(call gb_CliAssembly_CliAssembly,$(1)) +$(call gb_CliAssembly_CliAssembly,$(1),$(call gb_CliUnoApi_get_target,$(1))) $(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_API := $(call gb_CliUnoApi_get_target,$(1)) : CLI_UNOAPI_ASSEMBLIES := commit e5eac916e89d064fa2bb48b17e121e35da1141fc Author: Michael Stahl mst...@redhat.com Date: Mon Oct 28 12:41:00 2013 +0100 cli_ure: remove Package_config - cliuno.snk is used from SRCDIR - climaker.exe.config is not packaged and appears unnecessary Change-Id: Ia0e364bd3b488841aeb8ae75c26aa0cd4ff86012 diff --git a/cli_ure/Module_cli_ure.mk b/cli_ure/Module_cli_ure.mk index 0c2e9da..0bd1093 100644 --- a/cli_ure/Module_cli_ure.mk +++ b/cli_ure/Module_cli_ure.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Module_add_targets,cli_ure,\ Executable_climaker \
[Libreoffice-commits] core.git: comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk
comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk |4 1 file changed, 4 insertions(+) New commits: commit 033830b3b020d63a1b77459ab30497aeecc856bb Author: Michael Stahl mst...@redhat.com Date: Mon Oct 28 14:11:00 2013 +0100 comphelper: use boost_headers in unit test Change-Id: I3858dd3d176757743a39d6a8d9c5328dd5ff34df diff --git a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk index 3c9960c..73ab199 100644 --- a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk +++ b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk @@ -13,6 +13,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_syntaxhighlight_te comphelper/qa/unit/syntaxhighlighttest \ )) +$(eval $(call gb_CppunitTest_use_externals,comphelper_syntaxhighlight_test,\ + boost_headers \ +)) + $(eval $(call gb_CppunitTest_use_api,comphelper_syntaxhighlight_test, \ udkapi \ offapi \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/qa
comphelper/qa/unit/syntaxhighlighttest.cxx | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit 2c6b6ba446868dc549f39b12c27cbd73f7eff572 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 28 14:31:16 2013 +0100 Disambiguate CPPUNIT_ASSERT_EQUAL arguments Change-Id: Ib32d59522f33bcd2608401b4f3d3529d9dee5642 diff --git a/comphelper/qa/unit/syntaxhighlighttest.cxx b/comphelper/qa/unit/syntaxhighlighttest.cxx index cf13cbb..61449f9 100644 --- a/comphelper/qa/unit/syntaxhighlighttest.cxx +++ b/comphelper/qa/unit/syntaxhighlighttest.cxx @@ -43,8 +43,8 @@ void SyntaxHighlightTest::testBasicString() { SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps); CPPUNIT_ASSERT_EQUAL( static_caststd::vectorHighlightPortion::size_type(1), ps.size()); -CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin); -CPPUNIT_ASSERT_EQUAL(5, ps[0].nEnd); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin); +CPPUNIT_ASSERT_EQUAL(sal_Int32(5), ps[0].nEnd); CPPUNIT_ASSERT_EQUAL(TT_STRING, ps[0].tokenType); } @@ -54,8 +54,8 @@ void SyntaxHighlightTest::testBasicComment() { SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps); CPPUNIT_ASSERT_EQUAL( static_caststd::vectorHighlightPortion::size_type(1), ps.size()); -CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin); -CPPUNIT_ASSERT_EQUAL(5, ps[0].nEnd); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin); +CPPUNIT_ASSERT_EQUAL(sal_Int32(5), ps[0].nEnd); CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType); } @@ -65,11 +65,11 @@ void SyntaxHighlightTest::testBasicCommentNewline() { SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps); CPPUNIT_ASSERT_EQUAL( static_caststd::vectorHighlightPortion::size_type(2), ps.size()); -CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin); -CPPUNIT_ASSERT_EQUAL(5, ps[0].nEnd); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin); +CPPUNIT_ASSERT_EQUAL(sal_Int32(5), ps[0].nEnd); CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType); -CPPUNIT_ASSERT_EQUAL(5, ps[1].nBegin); -CPPUNIT_ASSERT_EQUAL(6, ps[1].nEnd); +CPPUNIT_ASSERT_EQUAL(sal_Int32(5), ps[1].nBegin); +CPPUNIT_ASSERT_EQUAL(sal_Int32(6), ps[1].nEnd); CPPUNIT_ASSERT_EQUAL(TT_EOL, ps[1].tokenType); } @@ -79,8 +79,8 @@ void SyntaxHighlightTest::testBasicEmptyComment() { SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps); CPPUNIT_ASSERT_EQUAL( static_caststd::vectorHighlightPortion::size_type(1), ps.size()); -CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin); -CPPUNIT_ASSERT_EQUAL(1, ps[0].nEnd); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin); +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), ps[0].nEnd); CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType); } @@ -90,11 +90,11 @@ void SyntaxHighlightTest::testBasicEmptyCommentNewline() { SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps); CPPUNIT_ASSERT_EQUAL( static_caststd::vectorHighlightPortion::size_type(2), ps.size()); -CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin); -CPPUNIT_ASSERT_EQUAL(1, ps[0].nEnd); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin); +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), ps[0].nEnd); CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType); -CPPUNIT_ASSERT_EQUAL(1, ps[1].nBegin); -CPPUNIT_ASSERT_EQUAL(2, ps[1].nEnd); +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), ps[1].nBegin); +CPPUNIT_ASSERT_EQUAL(sal_Int32(2), ps[1].nEnd); CPPUNIT_ASSERT_EQUAL(TT_EOL, ps[1].tokenType); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 24 solenv/inc/minor.mk |4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) New commits: commit 8d73d7021c85117390580f980f25071cc1c3310d Author: Andras Timar andras.ti...@collabora.com Date: Mon Oct 28 06:34:44 2013 -0700 Bump for 4.0-20 Change-Id: I2ced784f302ab7011f496470cfa19e67e6f8ed3e diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index cf4f66c..34b3e05 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -33,7 +33,7 @@ Globals CREATE_MSP_INSTALLSET 1 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt -WINDOWSPATCHLEVEL 19 +WINDOWSPATCHLEVEL 20 OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 BUILDIDCWS {buildidcws} @@ -50,13 +50,13 @@ LibreOffice { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -19 +PRODUCTEXTENSION -20 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-319 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-320 BASEPRODUCTVERSION 4.0 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -100,14 +100,14 @@ LibreOffice_Dev { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION -19 +PRODUCTEXTENSION -20 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-319 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-320 BASEPRODUCTVERSION 4.0 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -161,7 +161,7 @@ URE PRODUCTVERSION 4.0 PACKAGEVERSION 4.0 PACKAGEREVISION 1 -PRODUCTEXTENSION -19 +PRODUCTEXTENSION -20 BRANDPACKAGEVERSION 4.0 LICENSENAME LGPL NOVERSIONINDIRNAME 1 @@ -192,7 +192,7 @@ LibreOffice_SDK { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -19 +PRODUCTEXTENSION -20 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 4.0 @@ -231,7 +231,7 @@ LibreOffice_Dev_SDK { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION -19 +PRODUCTEXTENSION -20 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -276,7 +276,7 @@ LibreOffice_Test { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -19 +PRODUCTEXTENSION -20 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 4.0 @@ -315,7 +315,7 @@ LibreOffice_Dev_Test { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION -19 +PRODUCTEXTENSION -20 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -359,13 +359,13 @@ OxygenOffice { PRODUCTNAME OxygenOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -19 +PRODUCTEXTENSION -20 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-319 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-320 BASEPRODUCTVERSION 4.0 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/check.php diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 62f7379..9073bee 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,6 +1,6 @@ RSCVERSION=400 -RSCREVISION=400m1(Build:319) -BUILD=319 +RSCREVISION=400m1(Build:320) +BUILD=320 LAST_MINOR=m0 SOURCEVERSION=OOO400 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] LibreOffice 4.1.3 RC2 available
Dear Community, The Document Foundation is pleased to announce the second release candidate of LibreOffice 4.1.3. The upcoming 4.1.3 will be the third in a sequence of frequent bugfix releases for our feature-packed 4.1 line. Please be aware that LibreOffice 4.1.3 RC2 is not been flagged as ready for production use yet, you should continue to use LibreOffice 4.1.2 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.1.3 RC2 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.1.3/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/ui/unoobj/exceldetect.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 942aeb23bfdd7322ad9e239f19115ec9ceac6020 Author: Maxim Monastirsky momonas...@gmail.com Date: Sun Oct 27 13:01:12 2013 +0200 fdo#70100 Detect single stream excel files with BOF ID 5 Change-Id: I321b7a08e0436a9c33878acd1ce2f98c497040b5 Reviewed-on: https://gerrit.libreoffice.org/6447 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com (cherry picked from commit 71882916f617528a6d6fcc54450674dc3f630319) Reviewed-on: https://gerrit.libreoffice.org/6464 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx index fb15a3c..e87d27a 100644 --- a/sc/source/ui/unoobj/exceldetect.cxx +++ b/sc/source/ui/unoobj/exceldetect.cxx @@ -102,6 +102,7 @@ bool isExcel40(const uno::Referenceio::XInputStream xInStream) case 0x0009: // Excel 2.1 worksheet (BIFF 2) case 0x0209: // Excel 3.0 worksheet (BIFF 3) case 0x0409: // Excel 4.0 worksheet (BIFF 4) +case 0x0809: // Excel 5.0 worksheet (BIFF 5), some apps create such files (fdo#70100) break; default: return false; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - filter/source
filter/source/textfilterdetect/filterdetect.cxx |4 1 file changed, 4 insertions(+) New commits: commit e08785bc0a5bf75d4866a23ee62c591611d475c5 Author: Maxim Monastirsky momonas...@gmail.com Date: Sun Oct 27 13:26:39 2013 +0200 fdo#68903 Import .tsv and .xls plain text files in Calc by default Change-Id: I14115542d7f0401f4fa8face9f255b4512fc0ac3 Reviewed-on: https://gerrit.libreoffice.org/6448 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us (cherry picked from commit 8a201be240b6d408d15166be7ffc576b9e123634) Reviewed-on: https://gerrit.libreoffice.org/6465 diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index ef1a1d6..360d8d4 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -87,6 +87,10 @@ OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequencebeans::PropertyVal setPropValue(lDescriptor, nFilter, FilterName, OUString(WRITER_TEXT_FILTER)); else if (aExt == csv) setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); +else if (aExt == tsv) +setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); +else if (aExt == xls) +setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); else if (aExt == txt) setPropValue(lDescriptor, nFilter, FilterName, OUString(WRITER_TEXT_FILTER)); else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 03/fa6020a862b1b6faf69f33274022cb871e8f4b
03/fa6020a862b1b6faf69f33274022cb871e8f4b |1 + 1 file changed, 1 insertion(+) New commits: commit 62e403c3443e571bab3ef9ea3d99a2307e04897a Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 28 14:08:27 2013 + Notes added by 'git notes add' diff --git a/03/fa6020a862b1b6faf69f33274022cb871e8f4b b/03/fa6020a862b1b6faf69f33274022cb871e8f4b new file mode 100644 index 000..038a5a1 --- /dev/null +++ b/03/fa6020a862b1b6faf69f33274022cb871e8f4b @@ -0,0 +1 @@ +merged as: 518d3592e69aee30f19cd8cbdfef73131cb43c22 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/tpbitmap.cxx |7 +-- cui/source/tabpages/tpcolor.cxx | 10 ++ cui/source/tabpages/tplneend.cxx | 24 +--- 3 files changed, 28 insertions(+), 13 deletions(-) New commits: commit 518d3592e69aee30f19cd8cbdfef73131cb43c22 Author: Armin Le Grand a...@apache.org Date: Fri Oct 25 16:22:15 2013 + Resolves: #i123497# corrected modify implementations for bitmap... lineend and color (cherry picked from commit 03fa6020a862b1b6faf69f33274022cb871e8f4b) Conflicts: cui/source/tabpages/tpbitmap.cxx cui/source/tabpages/tpcolor.cxx cui/source/tabpages/tplneend.cxx Change-Id: Ib99e8f0a59fb611972133bab1e864d59d019457b diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 6aff2bc..17e89cb 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -685,9 +685,12 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) bLoop = sal_False; const BitmapEx aBitmapEx(m_pBitmapCtl-GetBitmapEx()); -const XBitmapEntry aEntry(Graphic(aBitmapEx), aName); -m_pLbBitmaps-Modify( rStyleSettings.GetListBoxPreviewDefaultPixelSize(), aEntry, nPos ); +// #i123497# Need to replace the existing entry with a new one (old returned needs to be deleted) +XBitmapEntry* pEntry = new XBitmapEntry(Graphic(aBitmapEx), aName); +delete pBitmapList-Replace(pEntry, nPos); + +m_pLbBitmaps-Modify( rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry, nPos ); m_pLbBitmaps-SelectEntryPos( nPos ); *pnBitmapListState |= CT_MODIFIED; diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index bdb78a2..379e3da 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -794,13 +794,15 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl) if (eCM != CM_RGB) ConvertColorValues (aTmpColor, CM_RGB); -const XColorEntry aEntry(aTmpColor, aName); +// #123497# Need to replace the existing entry with a new one (old returned needs to be deleted) +XColorEntry* pEntry = new XColorEntry(aTmpColor, aName); +delete pColorList-Replace(pEntry, nPos); -m_pLbColor-Modify( aEntry, nPos ); +m_pLbColor-Modify( *pEntry, nPos ); m_pLbColor-SelectEntryPos( nPos ); -m_pValSetColorList-SetItemColor( nPos + 1, aEntry.GetColor() ); -m_pValSetColorList-SetItemText( nPos + 1, aEntry.GetName() ); +m_pValSetColorList-SetItemColor( nPos + 1, pEntry-GetColor() ); +m_pValSetColorList-SetItemText( nPos + 1, pEntry-GetName() ); m_pEdtName-SetText( aName ); m_pCtlPreviewOld-Invalidate(); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 570eca9..ecaae0a 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -358,18 +358,28 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl) // if not existing, enter the entry if( bDifferent ) { -const XLineEndEntry* pEntry = pLineEndList-GetLineEnd( nPos ); +const XLineEndEntry* pOldEntry = pLineEndList-GetLineEnd( nPos ); -m_pEdtName-SetText( aName ); +if(pOldEntry) +{ +// #123497# Need to replace the existing entry with a new one (old returned needs to be deleted) +XLineEndEntry* pEntry = new XLineEndEntry(pOldEntry-GetLineEnd(), aName); +delete pLineEndList-Replace(pEntry, nPos); -const XLineEndEntry aEntry(pEntry-GetLineEnd(), aName); +m_pEdtName-SetText( aName ); -m_pLbLineEnds-Modify( aEntry, nPos, pLineEndList-GetUiBitmap( nPos ) ); -m_pLbLineEnds-SelectEntryPos( nPos ); +m_pLbLineEnds-Modify( *pEntry, nPos, pLineEndList-GetUiBitmap( nPos ) ); +m_pLbLineEnds-SelectEntryPos( nPos ); -*pnLineEndListState |= CT_MODIFIED; +// Flag fuer modifiziert setzen +*pnLineEndListState |= CT_MODIFIED; -*pPageType = 3; +*pPageType = 3; +} +else +{ +OSL_ENSURE(false, LineEnd to be modified not existing (!)); +} } } return( 0L ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 89/ded41db1f9884eec75097206a64df1b1c7f72a
89/ded41db1f9884eec75097206a64df1b1c7f72a |1 + 1 file changed, 1 insertion(+) New commits: commit 9aea13be22a21446a5618d6197fb39abed76b1c4 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 28 14:09:06 2013 + Notes added by 'git notes add' diff --git a/89/ded41db1f9884eec75097206a64df1b1c7f72a b/89/ded41db1f9884eec75097206a64df1b1c7f72a new file mode 100644 index 000..403addb --- /dev/null +++ b/89/ded41db1f9884eec75097206a64df1b1c7f72a @@ -0,0 +1 @@ +ignore: OS/2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/polygon/b2dsvgpolypolygon.cxx | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit c07016b79e95f157f6342a1cb9dca51bb77e1f6c Author: Armin Le Grand a...@apache.org Date: Mon Oct 28 11:31:11 2013 + Resolves: #i123465# no longer correct svg:d imports (cherry picked from commit 697d89b1dda760a39cd8e7e28f386dbec1aaff61) Change-Id: Id1819f695eac7a6dc4346708c7504f8df7e57c56 diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx index d9b869b..6a1dffa 100644 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx +++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx @@ -262,7 +262,10 @@ namespace basegfx // add current polygon if(bIsClosed) { -closeWithGeometryChange(aCurrPoly); +// #i123465# no need to do the old closeWithGeometryChange +// corerection on SVG polygons; this even may lead to wrong +// results e.g. for marker processing +aCurrPoly.setClosed(true); } o_rPolyPolygon.append(aCurrPoly); @@ -771,7 +774,10 @@ namespace basegfx // end-process last poly if(bIsClosed) { -closeWithGeometryChange(aCurrPoly); +// #i123465# no need to do the old closeWithGeometryChange +// corerection on SVG polygons; this even may lead to wrong +// results e.g. for marker processing +aCurrPoly.setClosed(true); } o_rPolyPolygon.append(aCurrPoly); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 69/7d89b1dda760a39cd8e7e28f386dbec1aaff61
69/7d89b1dda760a39cd8e7e28f386dbec1aaff61 |1 + 1 file changed, 1 insertion(+) New commits: commit 581a7d4eaef0092f2d1602a8c473115e9e8e942c Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 28 14:11:26 2013 + Notes added by 'git notes add' diff --git a/69/7d89b1dda760a39cd8e7e28f386dbec1aaff61 b/69/7d89b1dda760a39cd8e7e28f386dbec1aaff61 new file mode 100644 index 000..121caa5 --- /dev/null +++ b/69/7d89b1dda760a39cd8e7e28f386dbec1aaff61 @@ -0,0 +1 @@ +merged as: c07016b79e95f157f6342a1cb9dca51bb77e1f6c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit bb13b922b66d14f40a0be16bc380e462a1ea6432 Author: Michael Stahl mst...@redhat.com Date: Mon Oct 28 15:21:34 2013 +0100 fpicker: warning C4018: '': signed/unsigned mismatch Change-Id: I51652d573f59e6ca3b00385790bf14d478f03074 diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 1e5f9cd..2494e15 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -901,7 +901,8 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef rRequest) hResult = iDialog-GetFileTypeIndex(nFileType); if ( SUCCEEDED(hResult) nFileType 0 ) { -::sal_Int32 nRealIndex = (nFileType-1); // COM dialog base on 1 ... filter container on 0 .-) +// COM dialog base on 1 ... filter container on 0 .-) +::size_t nRealIndex = (nFileType-1); ::std::vector COMDLG_FILTERSPEC lFilters = lcl_buildFilterList(m_lFilters); if ( nRealIndex lFilters.size() ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared sw/source
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m | 12 +- sw/source/core/view/viewsh.cxx |8 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) New commits: commit deaee517c69ee7026a70b71867d7ca476e582987 Author: Ptyl Dragon p...@cloudon.com Date: Mon Oct 28 16:54:21 2013 +0200 for tor Change-Id: I1565450c763e4f0bf1a724978b5550163d627482 diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m index be2e144..acd00c1 100644 --- a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m +++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m @@ -39,12 +39,12 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f; } -(void)initParams{ -self.params = @[[self createParam:@contextWidth extractor:^(CGFloat value){self.contextWidth = value;} value:300], -[self createParam:@contextHeight extractor:^(CGFloat value){self.contextHeight = value;} value:300], -[self createParam:@tilePosX extractor:^(CGFloat value){self.tilePosX = value;} value:0], -[self createParam:@tilePosY extractor:^(CGFloat value){self.tilePosY = value;} value:0], -[self createParam:@tileWidth extractor:^(CGFloat value){self.tileWidth = value;} value:300], -[self createParam:@tileHeight extractor:^(CGFloat value){self.tileHeight = value;} value:300] +self.params = @[[self createParam:@contextWidth extractor:^(CGFloat value){self.contextWidth = value;} value:600], +[self createParam:@contextHeight extractor:^(CGFloat value){self.contextHeight = value;} value:600], +[self createParam:@tilePosX extractor:^(CGFloat value){self.tilePosX = value;} value:600], +[self createParam:@tilePosY extractor:^(CGFloat value){self.tilePosY = value;} value:600], +[self createParam:@tileWidth extractor:^(CGFloat value){self.tileWidth = value;} value:1000], +[self createParam:@tileHeight extractor:^(CGFloat value){self.tileHeight = value;} value:1000] ]; } diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index fdf7577..d64e1fa 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1792,15 +1792,15 @@ void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int MapMode aMapMode(aDevice.GetMapMode()); aMapMode.SetMapUnit(MAP_TWIP); aMapMode.SetOrigin(Point(-tilePosX, -tilePosY)); -// scaling -Fraction scaleX(contextWidth,tileWidth); -Fraction scaleY(contextHeight,tileHeight); +// scaling +Fraction scaleX(tileWidth,contextWidth); +Fraction scaleY(tileHeight,contextHeight); aMapMode.SetScaleX(scaleX); aMapMode.SetScaleY(scaleY); aDevice.SetMapMode(aMapMode); // resizes the virtual device so to contain the entrie context aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight)); -// draw +// draw - works in logic coordinates pViewShell-PaintTile(aDevice, Rectangle(Point(tilePosX, tilePosY), Size(tileWidth, tileHeight))); // copy the aDevice content to mpImage Bitmap aBitmap(aDevice.GetBitmap(aDevice.PixelToLogic(Point(0,0)), aDevice.PixelToLogic(Size(contextWidth, contextHeight; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - instsetoo_native/CustomTarget_setup.mk instsetoo_native/Package_setup.mk jvmfwk/source
instsetoo_native/CustomTarget_setup.mk |9 + instsetoo_native/Package_setup.mk |2 ++ jvmfwk/source/fwkbase.cxx | 23 +-- 3 files changed, 20 insertions(+), 14 deletions(-) New commits: commit f924cf3c2203be22631e6a3c631f712558fd8161 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 28 16:08:30 2013 +0100 Related fdo#70919 Missing instdir redirect ini-file ...makes javaldx re-scan on every start. Change-Id: Icffc58bbcbc453e6257e57669c73bfbeb31fc07b diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 6f2c647..47a52f1 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -14,6 +14,8 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\ $(call gb_Helper_get_rcfile,fundamental) \ $(if $(ENABLE_OOENV),ooenv) \ $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \ + $(call gb_Helper_get_rcfile,redirect))) \ $(call gb_Helper_get_rcfile,uno) \ $(call gb_Helper_get_rcfile,version) \ )) @@ -101,6 +103,13 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ '$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) ' \ ) $@ +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,redirect) : + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + ( \ + echo '[Bootstrap]' \ +echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \ + ) $@ + $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index 8985f87..24ebae8 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -16,6 +16,8 @@ $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\ $(call gb_Helper_get_rcfile,fundamental) \ $(if $(ENABLE_OOENV),ooenv) \ $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \ + $(call gb_Helper_get_rcfile,redirect))) \ $(call gb_Helper_get_rcfile,uno) \ $(call gb_Helper_get_rcfile,version) \ )) commit 658e88c59d2e5303e6388037dcd99a8f218a6960 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 28 16:06:43 2013 +0100 Improve debug output (and some clean up) Change-Id: Ibce90b4eeab679d526f0e0b1e9a8ab3b14255622 diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 1b4cf3c..0b9535e 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -40,8 +40,6 @@ using namespace osl; #define UNO_JAVA_JFW_ENV_CLASSPATH UNO_JAVA_JFW_ENV_CLASSPATH #define UNO_JAVA_JFW_CLASSPATH_URLS UNO_JAVA_JFW_CLASSPATH_URLS #define UNO_JAVA_JFW_VENDOR_SETTINGS UNO_JAVA_JFW_VENDOR_SETTINGS -#define UNO_JAVA_JFW_USER_DATA UNO_JAVA_JFW_USER_DATA -#define UNO_JAVA_JFW_SHARED_DATA UNO_JAVA_JFW_SHARED_DATA namespace jfw { @@ -65,21 +63,18 @@ OString getVendorSettingsPath(OUString const sURL) return osSystemPathSettings; } -OUString getParam(const char * name) +OUString getParam(OUString const name) { OUString retVal; -if (Bootstrap::get()-getFrom(OUString::createFromAscii(name), retVal)) -{ -#if OSL_DEBUG_LEVEL =2 -OString sValue = OUStringToOString(retVal, osl_getThreadTextEncoding()); -fprintf(stderr,[Java framework] Using bootstrap parameter %s = %s.\n, -name, sValue.getStr()); -#endif -} +bool b = Bootstrap::get()-getFrom(name, retVal); +SAL_INFO( +jfw, +Using bootstrap parameter name = \ retVal \ + (b ? : (undefined))); return retVal; } -OUString getParamFirstUrl(const char * name) +OUString getParamFirstUrl(OUString const name) { // Some parameters can consist of multiple URLs (separated by space // characters, although trim() harmlessly also removes other white-space), @@ -343,12 +338,12 @@ OUString VendorSettings::getPluginLibrary(const OUString sVendor) OUString BootParams::getUserData() { -return getParamFirstUrl(UNO_JAVA_JFW_USER_DATA); +return getParamFirstUrl(UNO_JAVA_JFW_USER_DATA); } OUString BootParams::getSharedData() { -return getParamFirstUrl(UNO_JAVA_JFW_SHARED_DATA); +return getParamFirstUrl(UNO_JAVA_JFW_SHARED_DATA); } OString BootParams::getClasspath()
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-20'
Tag 'suse-4.0-20' created by Andras Timar andras.ti...@collabora.com at 2013-10-28 16:20 -0700 suse-4.0-20 Changes since libreoffice-4.0.2.2-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-20'
Tag 'suse-4.0-20' created by Andras Timar andras.ti...@collabora.com at 2013-10-28 16:20 -0700 suse-4.0-20 Changes since suse-4.0-19-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-20'
Tag 'suse-4.0-20' created by Andras Timar andras.ti...@collabora.com at 2013-10-28 16:20 -0700 suse-4.0-20 Changes since libreoffice-4.0.2.2: Petr Mladek (1): Branch suse-4.0 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-20'
Tag 'suse-4.0-20' created by Andras Timar andras.ti...@collabora.com at 2013-10-28 16:20 -0700 suse-4.0-20 Changes since libreoffice-4.0.2.2-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Why typing in Writer instantiates the JVM on Mac OS X
On 10/27/2013 04:59 PM, Jean-Baptiste Faure wrote: Le 24/10/2013 19:02, Stephan Bergmann a écrit : With problems popping up for users after upgrading to Mac OS X Mavericks (which replaces a previously installed Java with a download and install stub), I discovered the odd fact that indeed at least since LO 4.1.2 (but probably even earlier already, just had no time to verify), and on Mac OS X only, thanks to the bundled WikiPublisher extension we instantiate a JVM as soon as you start soffice --writer and type x. We have a behavior that seems the same to me in the master under Linux. It leads to a crash if I set the virtual memory limit at 3 Go. I filed the bug https://bugs.freedesktop.org/show_bug.cgi?id=70919 That was completely unrelated, see the issue for details. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - i18npool/qa i18npool/source sal/rtl sc/source
i18npool/qa/cppunit/test_characterclassification.cxx | 26 + i18npool/source/characterclassification/cclass_unicode.cxx | 12 -- sal/rtl/ustring.cxx| 12 +++--- sc/source/core/tool/interpr1.cxx |4 +- 4 files changed, 43 insertions(+), 11 deletions(-) New commits: commit 9d5b07b9085f97edfff5d4ac474e9711036bb0c4 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 28 15:47:04 2013 + Related: fdo#69641 add a regression test Change-Id: Icf3324a224d02425acd679a286f3c4a0b7e3ed1c diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx b/i18npool/qa/cppunit/test_characterclassification.cxx index a683c3a..92066c7 100644 --- a/i18npool/qa/cppunit/test_characterclassification.cxx +++ b/i18npool/qa/cppunit/test_characterclassification.cxx @@ -27,9 +27,11 @@ public: virtual void tearDown(); void testTitleCase(); +void testStringType(); CPPUNIT_TEST_SUITE(TestCharacterClassification); CPPUNIT_TEST(testTitleCase); +CPPUNIT_TEST(testStringType); CPPUNIT_TEST_SUITE_END(); private: uno::Referencei18n::XCharacterClassification m_xCC; @@ -68,6 +70,30 @@ void TestCharacterClassification::testTitleCase() } } +//https://bugs.freedesktop.org/show_bug.cgi?id=69641 +void TestCharacterClassification::testStringType() +{ +lang::Locale aLocale; +aLocale.Language = OUString(en); +aLocale.Country = OUString(US); + +{ +//simple case +OUString sTest(Some text); +sal_Int32 nResult = m_xCC-getStringType(sTest, 0, sTest.getLength(), aLocale); +CPPUNIT_ASSERT_EQUAL(nResult, sal_Int32(230)); +} + +{ +//tricky case +const sal_Unicode MATHEMATICAL_ITALIC_SMALL_THETA[] = { 0xD835, 0xDF03 }; +OUString sTest(MATHEMATICAL_ITALIC_SMALL_THETA, SAL_N_ELEMENTS(MATHEMATICAL_ITALIC_SMALL_THETA)); +sal_Int32 nResult = m_xCC-getStringType(sTest, 0, sTest.getLength(), aLocale); +CPPUNIT_ASSERT_EQUAL(nResult, sal_Int32(228)); +} + +} + void TestCharacterClassification::setUp() { BootstrapFixtureBase::setUp(); commit 507e627d83dbfb6a35677450a3fc42d10c79a82e Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 28 15:40:01 2013 + Related: fdo#69641 double iterateCodePoints doesn't make sense to me This came in with 04212c3015cd4ab118a0aec2bb04bc153a64af41 but the bug number of #i86439# appears to be the wrong id. It doesn't make sense to me. Rework cclass_Unicode::getStringType to iterate safely over the codepoints of the requested range. Perhaps that was the reason for the original commit. Change-Id: Ice4287eb6f9fc6a9705845c0cf995263815de2e7 diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx index 045de39..5655059 100644 --- a/i18npool/source/characterclassification/cclass_unicode.cxx +++ b/i18npool/source/characterclassification/cclass_unicode.cxx @@ -132,7 +132,6 @@ cclass_Unicode::getCharType( const OUString Text, sal_Int32* nPos, sal_Int32 in using namespace ::com::sun::star::i18n::KCharacterType; sal_uInt32 ch = Text.iterateCodePoints(nPos, increment); -if (increment 0) ch = Text.iterateCodePoints(nPos, 0); switch ( u_charType(ch) ) { // Upper case U_UPPERCASE_LETTER : @@ -204,9 +203,16 @@ sal_Int32 SAL_CALL cclass_Unicode::getStringType( const OUString Text, sal_Int32 nPos, sal_Int32 nCount, const Locale /*rLocale*/ ) throw(RuntimeException) { if ( nPos 0 || Text.getLength() = nPos ) return 0; -sal_Int32 result = getCharType(Text, nPos, 0); -for (sal_Int32 i = 1; i nCount nPos Text.getLength(); i++) +sal_Int32 result = 0; + +while (nCount nPos Text.getLength()) +{ +sal_Int32 nOrigPos = nPos; result |= getCharType(Text, nPos, 1); +sal_Int32 nUtf16Units = nPos - nOrigPos; +nCount -= nUtf16Units; +} + return result; } commit 08b7af126e546bdbd175023429f544baa9861dba Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 28 15:39:20 2013 + Related: fdo#69641 check index against length before iterateCodePoints Change-Id: I71346b12fcfe3e02015038c3c78db574ada873d6 diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 04c484f..d1e008a 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -3190,11 +3190,11 @@ void ScInterpreter::ScNumberValue() { OUString aTemporary( nDecSep = 0 ? aInputString.copy( 0, nDecSep ) : aInputString ); sal_Int32 nIndex = 0; -do +while (nIndex aGroupSeparator.getLength()) { sal_uInt32 nChar = aGroupSeparator.iterateCodePoints( nIndex ); aTemporary = aTemporary.replaceAll( OUString( nChar, 1 ), ); -} while ( nIndex
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|2 ++ sw/source/filter/ww8/docxattributeoutput.cxx| 10 +- writerfilter/source/dmapper/StyleSheetTable.cxx |8 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) New commits: commit 95e2a96f02512943eaa796facd238667de4bd964 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Oct 28 16:32:34 2013 +0100 DOCX filter: roundtrip semiHidden and unhideWhenUsed for table styles Change-Id: Ie7073a6346553650741a1631096342318d650890 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index d3dcf42..9db8db8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1454,6 +1454,8 @@ void Test::testStyleInheritance() // Table style wasn't roundtripped. assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='TableNormal']/w:tblPr/w:tblCellMar/w:left, w, 108); +assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='TableNormal']/w:semiHidden, 1); +assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='TableNormal']/w:unhideWhenUsed, 1); } void Test::testCalendar1() diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 3fafa96..089f735 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2811,7 +2811,7 @@ void lcl_TableStyleTcPr(sax_fastparser::FSHelperPtr pSerializer, uno::Sequenceb void DocxAttributeOutput::TableStyle(uno::Sequencebeans::PropertyValue rStyle) { -bool bDefault = false, bCustomStyle = false, bQFormat = false; +bool bDefault = false, bCustomStyle = false, bQFormat = false, bSemiHidden = false, bUnhideWhenUsed = false; OUString aStyleId, aName, aBasedOn; sal_Int32 nUiPriority = 0, nRsid = 0; uno::Sequencebeans::PropertyValue aTblPr, aTcPr; @@ -2831,6 +2831,10 @@ void DocxAttributeOutput::TableStyle(uno::Sequencebeans::PropertyValue rStyle nUiPriority = rStyle[i].Value.getsal_Int32(); else if (rStyle[i].Name == qFormat) bQFormat = true; +else if (rStyle[i].Name == semiHidden) +bSemiHidden = true; +else if (rStyle[i].Name == unhideWhenUsed) +bUnhideWhenUsed = true; else if (rStyle[i].Name == rsid) nRsid = rStyle[i].Value.getsal_Int32(); else if (rStyle[i].Name == tblPr) @@ -2863,6 +2867,10 @@ void DocxAttributeOutput::TableStyle(uno::Sequencebeans::PropertyValue rStyle FSEND); if (bQFormat) m_pSerializer-singleElementNS(XML_w, XML_qFormat, FSEND); +if (bSemiHidden) +m_pSerializer-singleElementNS(XML_w, XML_semiHidden, FSEND); +if (bUnhideWhenUsed) +m_pSerializer-singleElementNS(XML_w, XML_unhideWhenUsed, FSEND); if (nRsid) { // We want the rsid as a hex string, but always with the length of 8. diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 3a5127f..b3a3cd7 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -584,8 +584,6 @@ void StyleSheetTable::lcl_sprm(Sprm rSprm) case NS_ooxml::LN_CT_Style_link: case NS_ooxml::LN_CT_Style_autoRedefine: case NS_ooxml::LN_CT_Style_hidden: -case NS_ooxml::LN_CT_Style_semiHidden: -case NS_ooxml::LN_CT_Style_unhideWhenUsed: case NS_ooxml::LN_CT_Style_locked: case NS_ooxml::LN_CT_Style_personal: case NS_ooxml::LN_CT_Style_personalCompose: @@ -608,6 +606,8 @@ void StyleSheetTable::lcl_sprm(Sprm rSprm) break; case NS_ooxml::LN_CT_Style_rsid: case NS_ooxml::LN_CT_Style_qFormat: +case NS_ooxml::LN_CT_Style_semiHidden: +case NS_ooxml::LN_CT_Style_unhideWhenUsed: case NS_ooxml::LN_CT_Style_uiPriority: if(m_pImpl-m_pCurrentEntry-nStyleTypeCode == STYLE_TYPE_TABLE) { @@ -620,6 +620,10 @@ void StyleSheetTable::lcl_sprm(Sprm rSprm) } else if (nSprmId == NS_ooxml::LN_CT_Style_qFormat) aValue.Name = qFormat; +else if (nSprmId == NS_ooxml::LN_CT_Style_semiHidden) +aValue.Name = semiHidden; +else if (nSprmId == NS_ooxml::LN_CT_Style_unhideWhenUsed) +aValue.Name = unhideWhenUsed; else { aValue.Name = uiPriority; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build broken
On 10/28/2013 09:25 AM, Winfried Donkers wrote: I suffer (since last Wednessday/Thursday) with a broken build on both my development machines. The code bse is up to date and clean of my own code changes. make check reports an assertion in Cppunittess_sd_import_test. Do you mean a failed CppUnit assertion, or a failed C/C++ assert? What is the output of make CppunitTest_sd_import_tests? If it reports an abort due to a failed C/C++ assert but does not print a backtrace, please retry after ulimit -c unlimited (assuming you are on Linux). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18npool/Library_localedata_others.mk i18npool/source
i18npool/Library_localedata_others.mk |2 i18npool/source/localedata/data/ha_GH.xml | 388 i18npool/source/localedata/data/ha_Latn_GH.xml | 389 + i18npool/source/localedata/localedata.cxx |2 4 files changed, 391 insertions(+), 390 deletions(-) New commits: commit 634837d9226375292242ee093099563f2a546e9a Author: Eike Rathke er...@redhat.com Date: Mon Oct 28 16:52:50 2013 +0100 ha-GH is now ha-Latn-GH Change-Id: I9d7d2a0c4a6029e983689884d3daec3e9cab291b diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index 444b7d2..fc7b94f 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\ CustomTarget/i18npool/localedata/localedata_gu_IN \ CustomTarget/i18npool/localedata/localedata_gug_PY \ CustomTarget/i18npool/localedata/localedata_haw_US \ - CustomTarget/i18npool/localedata/localedata_ha_GH \ + CustomTarget/i18npool/localedata/localedata_ha_Latn_GH \ CustomTarget/i18npool/localedata/localedata_he_IL \ CustomTarget/i18npool/localedata/localedata_hi_IN \ CustomTarget/i18npool/localedata/localedata_hil_PH \ diff --git a/i18npool/source/localedata/data/ha_GH.xml b/i18npool/source/localedata/data/ha_Latn_GH.xml similarity index 99% rename from i18npool/source/localedata/data/ha_GH.xml rename to i18npool/source/localedata/data/ha_Latn_GH.xml index 92c3f49..91e525f 100644 --- a/i18npool/source/localedata/data/ha_GH.xml +++ b/i18npool/source/localedata/data/ha_Latn_GH.xml @@ -20,13 +20,14 @@ Locale versionDTD=2.0.3 allowUpdateFromCLDR=no version=1.1 LC_INFO Language - LangIDha/LangID + LangIDqlt/LangID DefaultNameHausa/DefaultName /Language Country CountryIDGH/CountryID DefaultNameGhana/DefaultName /Country +Variantha-Latn-GH/Variant /LC_INFO LC_CTYPE unoid=generic Separators diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 9d53686..06e8940 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -229,7 +229,7 @@ static const struct { { ky_KG, lcl_DATA_OTHERS }, { kk_KZ, lcl_DATA_OTHERS }, { fa_IR, lcl_DATA_OTHERS }, -{ ha_GH, lcl_DATA_OTHERS }, +{ ha_Latn_GH, lcl_DATA_OTHERS }, { ee_GH, lcl_DATA_OTHERS }, { sg_CF, lcl_DATA_OTHERS }, { lg_UG, lcl_DATA_OTHERS }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70667] Notify libreoffice user list of API changes and motivate user to test extensions on dailies/beta
https://bugs.freedesktop.org/show_bug.cgi?id=70667 t...@tim-passingham.co.uk changed: What|Removed |Added CC||t...@tim-passingham.co.uk --- Comment #7 from t...@tim-passingham.co.uk --- Please bear in mind it isn't just fairly technical developers of 'extensions' that can be affected. End-users with application developments of their own can also be affected. The details of many of the commit messages are incomprehensible to such as myself. However, I well understand that changing a data type in a form control could affect my code. I do understand it's difficult to please everyone, but I'm just trying to clarify some of the characteristics of your potential audience. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/breakiterator/breakiterator_th.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit b2ad9eecf1cda725b1d7fcabd1ebd06895843d20 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 28 18:03:47 2013 +0100 Do not access nextCellIndex (nor Text) past the end At least for Winfried CppunitTest_sd_import_tests aborts with triggering the assert in OUString::operator[] at (presumably past-the-end) index 18 from com::sun::star::i18n::BreakIterator_th::makeIndex (this=0x2b775adf9440, Text=..., nStartPos=18) at i18npool/source/breakiterator/breakiterator_th.cxx:122 com::sun::star::i18n::BreakIterator_CTL::previousCharacters (this=0x2b775adf9440, Text=..., nStartPos=18, rLocale=..., nCharacterIteratorMode=1, nCount=1, nDone=@0x7fff9a84a8fc: 0) at i18npool/source/breakiterator/breakiterator_ctl.cxx:62 com::sun::star::i18n::BreakIteratorImpl::previousCharacters (this=0x2b775ae00a98, Text=..., nStartPos=18, rLocale=..., nCharacterIteratorMode=1, nCount=1, nDone=@0x7fff9a84a8fc: 0) at i18npool/source/breakiterator/breakiteratorImpl.cxx:65 ServerFontLayout::setNeedFallback (this=0xfba5d0, rArgs=..., nCharPos=17, bRightToLeft=false) at vcl/generic/glyphs/gcach_layout.cxx:114 HbLayoutEngine::layout (this=0xfba670, rLayout=..., rArgs=...) at vcl/generic/glyphs/gcach_layout.cxx:437 ... and from the preceding if block in BreakIterator_th::makeIndex it indeed looks like the invariant is that nextCellIndex need not be larger than cellIndexSize which needs not be larger than Text (ake cachedText) getLength(). Change-Id: Ib92a76020b2bb3902c5e58aa2e6c4e679e51b94a diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx index 2e34af3..82d7b53 100644 --- a/i18npool/source/breakiterator/breakiterator_th.cxx +++ b/i18npool/source/breakiterator/breakiterator_th.cxx @@ -119,7 +119,8 @@ void SAL_CALL BreakIterator_th::makeIndex(const OUString Text, sal_Int32 nStart // reset nextCell for new Text memset(nextCellIndex, 0, cellIndexSize * sizeof(sal_Int32)); } -else if (nextCellIndex[nStartPos] 0 || ! is_Thai(Text[nStartPos])) +else if (nStartPos = Text.getLength() || nextCellIndex[nStartPos] 0 + || !is_Thai(Text[nStartPos])) return; const sal_Unicode* str = cachedText.getStr(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build broken
On 10/28/2013 05:00 PM, Winfried Donkers wrote: I get a backtrace: cppunittester: /home/winfried/git/libo/include/rtl/ustring.hxx:420: sal_Unicode rtl::OUString::operator[](sal_Int32) const: Assertion `index = 0 index getLength()' failed. Should be fixed now with http://cgit.freedesktop.org/libreoffice/core/commit/?id=b2ad9eecf1cda725b1d7fcabd1ebd06895843d20 Do not access nextCellIndex (nor Text) past the end. Requested backport to libreoffice-4-1 at https://gerrit.libreoffice.org/#/c/6467/. No idea why it only hits some (winfried, matus, tml, at least, but not me), maybe it's related to what fonts are installed in the system? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/source
writerfilter/inc/dmapper/DomainMapper.hxx |5 +++ writerfilter/source/dmapper/DomainMapper.cxx | 31 ++ writerfilter/source/dmapper/DomainMapper_Impl.cxx | 27 +++ writerfilter/source/dmapper/DomainMapper_Impl.hxx | 13 + writerfilter/source/dmapper/StyleSheetTable.cxx | 13 + 5 files changed, 89 insertions(+) New commits: commit af70016923b42940715c618caf01c78e892aa797 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Oct 28 18:05:15 2013 +0100 DOCX import: store table style's pPr in InteropGrabBag Change-Id: I0cecdc23053c0c03866ad808038d99a3bea3256e diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx index a879115..d6b5d37 100644 --- a/writerfilter/inc/dmapper/DomainMapper.hxx +++ b/writerfilter/inc/dmapper/DomainMapper.hxx @@ -122,6 +122,11 @@ public: const std::map sal_Int32, com::sun::star::uno::Any deferredCharacterProperties ); void setInTableStyleRunProps(bool bInTableStyleRunProps); +/// Enable storing of seen tokens in a named grab bag. +void enableInteropGrabBag(OUString aName); +/// Get the stored tokens and clear the internal storage. +beans::PropertyValue getInteropGrabBag(); + private: // Stream virtual void lcl_startSectionGroup(); diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index ad74662..9760403 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -977,6 +977,7 @@ void DomainMapper::lcl_attribute(Id nName, Value val) case NS_ooxml::LN_CT_Spacing_beforeLines: break; case NS_ooxml::LN_CT_Spacing_after: +m_pImpl-appendGrabBag(m_pImpl-m_aSubInteropGrabBag, after, OUString::number(nIntValue)); if (m_pImpl-GetTopContext()) // Don't overwrite NS_ooxml::LN_CT_Spacing_afterAutospacing. m_pImpl-GetTopContext()-Insert(PROP_PARA_BOTTOM_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) ), false); @@ -1008,6 +1009,7 @@ void DomainMapper::lcl_attribute(Id nName, Value val) } if( nName == NS_ooxml::LN_CT_Spacing_line ) { +m_pImpl-appendGrabBag(m_pImpl-m_aSubInteropGrabBag, line, OUString::number(nIntValue)); //now set the value depending on the Mode if( aSpacing.Mode == style::LineSpacingMode::PROP ) aSpacing.Height = sal_Int16(sal_Int32(nIntValue) * 100 / SINGLE_LINE_SPACING ); @@ -1019,14 +1021,21 @@ void DomainMapper::lcl_attribute(Id nName, Value val) // exactly, atLeast, auto if( sal::static_int_castId(nIntValue) == NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_auto) { +m_pImpl-appendGrabBag(m_pImpl-m_aSubInteropGrabBag, lineRule, auto); aSpacing.Mode = style::LineSpacingMode::PROP; //reinterpret the already set value aSpacing.Height = sal_Int16( aSpacing.Height * 100 / ConversionHelper::convertTwipToMM100( SINGLE_LINE_SPACING )); } else if( sal::static_int_castId(nIntValue) == NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_atLeast) +{ +m_pImpl-appendGrabBag(m_pImpl-m_aSubInteropGrabBag, lineRule, atLeast); aSpacing.Mode = style::LineSpacingMode::MINIMUM; +} else // NS_ooxml::LN_Value_wordprocessingml_ST_LineSpacingRule_exact +{ +m_pImpl-appendGrabBag(m_pImpl-m_aSubInteropGrabBag, lineRule, exact); aSpacing.Mode = style::LineSpacingMode::FIX; +} } if (pTopContext) pTopContext-Insert(PROP_PARA_LINE_SPACING, uno::makeAny( aSpacing )); @@ -2987,6 +2996,8 @@ void DomainMapper::sprmWithProps( Sprm rSprm, PropertyMapPtr rContext, SprmType if (nSprmId == NS_ooxml::LN_CT_PPr_sectPr) m_pImpl-SetParaSectpr(true); resolveSprmProps(*this, rSprm); +if (nSprmId == NS_ooxml::LN_CT_PPrBase_spacing) +m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, spacing, m_pImpl-m_aSubInteropGrabBag); break; case NS_ooxml::LN_EG_SectPrContents_footnotePr: case NS_ooxml::LN_EG_SectPrContents_endnotePr: @@ -4204,6 +4215,26 @@ bool DomainMapper::IsInHeaderFooter() const return m_pImpl-IsInHeaderFooter(); } +void DomainMapper::enableInteropGrabBag(OUString aName) +{ +m_pImpl-m_aInteropGrabBagName = aName; +} + +beans::PropertyValue DomainMapper::getInteropGrabBag() +{ +beans::PropertyValue aRet; +aRet.Name = m_pImpl-m_aInteropGrabBagName; + +
[Bug 70667] Notify libreoffice user list of API changes and motivate user to test extensions on dailies/beta
https://bugs.freedesktop.org/show_bug.cgi?id=70667 --- Comment #8 from Björn Michaelsen bjoern.michael...@canonical.com --- (In reply to comment #7) Please bear in mind it isn't just fairly technical developers of 'extensions' that can be affected. End-users with application developments of their own can also be affected. The details of many of the commit messages are incomprehensible to such as myself. However, I well understand that changing a data type in a form control could affect my code. The Good Thing is: You dont need to completely understand the commit message to test a daily build. Actually its a Good Thing if the tester isnt _too_ confident in completely understanding the commit message, as it can lead to the reader thinking: ah, this cant possibly break my stuff, so Im not testing ... (see also: http://www.youtube.com/watch?v=4XpnKHJAok8feature=player_detailpage#t=1399s ). This is not what we want for three reasons: - if the reader tests the change, he/she is not only testing the specific scenario, but also other stuff - if the reader is confident in understanding the message, but misunderstands, there is less testing, which is not what we want - the the reader is confident and understands the message right, the message might still be wrong or incomplete. Again, testing would help the case here. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - filter/source sc/source
filter/source/textfilterdetect/filterdetect.cxx |4 sc/source/ui/unoobj/exceldetect.cxx |1 + 2 files changed, 5 insertions(+) New commits: commit 3750fbfca3c7a9f546abc88cd262f55c0348a76e Author: Maxim Monastirsky momonas...@gmail.com Date: Sun Oct 27 13:26:39 2013 +0200 fdo#68903 Import .tsv and .xls plain text files in Calc by default Change-Id: I14115542d7f0401f4fa8face9f255b4512fc0ac3 Reviewed-on: https://gerrit.libreoffice.org/6448 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us (cherry picked from commit 8a201be240b6d408d15166be7ffc576b9e123634) Reviewed-on: https://gerrit.libreoffice.org/6465 diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index ef1a1d6..360d8d4 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -87,6 +87,10 @@ OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequencebeans::PropertyVal setPropValue(lDescriptor, nFilter, FilterName, OUString(WRITER_TEXT_FILTER)); else if (aExt == csv) setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); +else if (aExt == tsv) +setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); +else if (aExt == xls) +setPropValue(lDescriptor, nFilter, FilterName, OUString(CALC_TEXT_FILTER)); else if (aExt == txt) setPropValue(lDescriptor, nFilter, FilterName, OUString(WRITER_TEXT_FILTER)); else commit 9bf1f12471511ae4bb2e4186ed55f61276fff5ef Author: Maxim Monastirsky momonas...@gmail.com Date: Sun Oct 27 13:01:12 2013 +0200 fdo#70100 Detect single stream excel files with BOF ID 5 Change-Id: I321b7a08e0436a9c33878acd1ce2f98c497040b5 Reviewed-on: https://gerrit.libreoffice.org/6447 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com (cherry picked from commit 71882916f617528a6d6fcc54450674dc3f630319) Reviewed-on: https://gerrit.libreoffice.org/6464 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx index fb15a3c..e87d27a 100644 --- a/sc/source/ui/unoobj/exceldetect.cxx +++ b/sc/source/ui/unoobj/exceldetect.cxx @@ -102,6 +102,7 @@ bool isExcel40(const uno::Referenceio::XInputStream xInStream) case 0x0009: // Excel 2.1 worksheet (BIFF 2) case 0x0209: // Excel 3.0 worksheet (BIFF 3) case 0x0409: // Excel 4.0 worksheet (BIFF 4) +case 0x0809: // Excel 5.0 worksheet (BIFF 5), some apps create such files (fdo#70100) break; default: return false; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - sfx2/source ucb/source
sfx2/source/doc/objxtor.cxx | 15 +++ ucb/source/ucp/webdav-neon/NeonLockStore.cxx | 36 +-- ucb/source/ucp/webdav-neon/NeonLockStore.hxx |2 + ucb/source/ucp/webdav-neon/NeonSession.cxx | 11 ucb/source/ucp/webdav-neon/NeonSession.hxx |3 +- 5 files changed, 58 insertions(+), 9 deletions(-) New commits: commit be51484b6b16bb11f3e03f446b35ed57680f0815 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu May 30 09:15:10 2013 +0300 Unfortunately mstahl's fix for the webdav-neon deadlock was not sufficient Even if stopTicker() now by itself is OK, it is called from removeLock(), which already has acquired the same mutex that stopTicker() now carefully makes sure to not hold when calling join() on the ticker thread. (Remember, our mutexes are recursive.) So we still easily get a deadlock. So for now, just don't bother with the micro-optimisation of stopping the ticker thread if there are no WebDAV locks to refresh. diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx index b4bbaec..e89da12 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx @@ -197,9 +197,6 @@ void NeonLockStore::removeLock( NeonLock * pLock ) m_aLockInfoMap.erase( pLock ); ne_lockstore_remove( m_pNeonLockStore, pLock ); - -if ( m_aLockInfoMap.empty() ) -stopTicker(); } void NeonLockStore::unlockLock( NeonLock * pLock ) commit d051654df39b63bbfe23c995e85f4d708c09e629 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu May 30 06:48:39 2013 +0200 bnc#805901: Lock WebDAV document that is opened for potential modification Really horrible fix, breaking all rules of proper abstraction etc. Basically, two parts: 1) When opening a document over WebDAV, in Content::execute(), lock it too. This is simple. With just this change, the WebDAV resource gets locked but it stays locked for the rest of the soffice.bin lifetime, even if the document is closed much earlier. This also means you can't re-open it without re-starting LibreOffice... The NeonLockStore (which is effectively a singleton, as the only object of this type that exists is the static NeonSession::m_aNeonLockStore field) destructor takes care of blowing awway the locks when the process exists. So obviously that is not good enough. Thus a second part is needed: 2) Then closing a document, over in SfxObjectShell::Close(), do a horrible trick: look up the ucpdav1 module, and if it is loaded, look up the NeonSessionUnlockByUri() function in it, and call it, passing the document's URI. That function, in NeonSession.cxx, looks up the NeonLock for the URI, and if it exists, unlocks it, and removs the lock from the NeonLockStore. Conflicts: ucb/source/ucp/webdav-neon/NeonLockStore.cxx ucb/source/ucp/webdav-neon/webdavcontent.cxx Change-Id: If9af1f8b5d3a89cdea34ccd0b751d5f671ba diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index e606c44..a7fe41f 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -22,6 +22,8 @@ #include arrdecl.hxx #include map +#include osl/module.h + #include cppuhelper/implbase1.hxx #include com/sun/star/util/XCloseable.hpp @@ -473,6 +475,19 @@ sal_Bool SfxObjectShell::Close() if ( it != rDocs.end() ) rDocs.erase( it ); pImp-bInList = sal_False; + +if (pMedium !pMedium-GetOrigURL().isEmpty()) +{ +oslModule aUcpDav1; +if (osl_getModuleHandle(OUString(SAL_MODULENAME(ucpdav1)).pData, aUcpDav1)) +{ +void (*pNeonSessionUnlockByUri)(rtl::OUString uri) = +(void (*)(rtl::OUString)) osl_getAsciiFunctionSymbol(aUcpDav1, NeonSessionUnlockByUri); +if (pNeonSessionUnlockByUri) +pNeonSessionUnlockByUri(pMedium-GetOrigURL()); +} +} + } } diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx index 043ea7d..b4bbaec 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx @@ -202,6 +202,22 @@ void NeonLockStore::removeLock( NeonLock * pLock ) stopTicker(); } +void NeonLockStore::unlockLock( NeonLock * pLock ) +{ +osl::MutexGuard aGuard( m_aMutex ); + +LockInfoMap::const_iterator it( m_aLockInfoMap.begin() ); +const LockInfoMap::const_iterator end( m_aLockInfoMap.end() ); +while ( it != end ) +{ +NeonLock * pLockIt = (*it).first; +if (pLockIt == pLock) +(*it).second.xSession-UNLOCK( pLock ); +++it; +} + } + +//
[Libreoffice-commits] core.git: Changes to 'private/kohei/calc-group-interpreter-4-dynamic-kernels-reviewed'
New branch 'private/kohei/calc-group-interpreter-4-dynamic-kernels-reviewed' available with the following commits: commit 46ea7471512afb31fb00f25a6d1ac76e2ddc0304 Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Sun Oct 27 19:15:08 2013 -0500 Throw exceptions for unhandled functions in GPU group interpreter. Throw exceptions when seeing unhandled opcode and OpenCL failures, instead of assertion failure in the GPU Calc group interpreter to allow graceful falling-back to SW interpreter. Change-Id: Ie19c1a300ae5db9bdbf90eb8a9dbca3f2611b770 commit 201706631a479c30a0a42f46cc2524a8744cfbec Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Sun Oct 27 18:30:57 2013 -0500 Re-enable testcases Change-Id: Ic70f436b5238a4d9df27599f0a93ca8223a63e15 commit 0c733b5039e8a5fa6dcb6a035eefc7fbb8ea0443 Author: I-Jui (Ray) Sung r...@multicorewareinc.com Date: Sun Oct 27 18:13:54 2013 -0500 Rebase to calc-group-interpreter-4 Change-Id: I4d98e88c4fcdf8c6e5ecbf31bc181dd186a85c9b commit 63b3ba0d494b850919f979a5f4e9f0be0d3a0f59 Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 20:38:04 2013 +0800 Fix NAN argumetn in ground_water, stock_history, sum_ex Change-Id: I10eae800889cd25e819720861a30e6b5edaca88b Signed-off-by: Wei Wei wei...@multicorewareinc.com commit 2cdb116a3b2a0f88ed8e0eb25404254ac0a36190 Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 20:26:51 2013 +0800 Fix bugs for SLN in GPU Calc Change-Id: I78e42b0d5322abc15549d3e101a221774d3297e6 Signed-off-by: Wei Wei wei...@multicorewareinc.com commit 70bb32fa24f350f72913150781e6332b75f5a63e Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 20:20:19 2013 +0800 Fix bugs for SLN not cal by GPU Change-Id: I3365942ae633763f5ef551ecb29a4f341604f991 Signed-off-by: Wei Wei wei...@multicorewareinc.com commit 52e5154536a45ff13586d3f6c131f82071a7669f Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 17:27:22 2013 +0800 Implement fix for bug of NAN argument in some finacial functions Change-Id: I2a755ffd3b4455d3be7fab49ebbc9ecaa469b14b Signed-off-by: Wei Wei wei...@multicorewareinc.com commit a84afa26d351cefa85a84cdce4148b575aaaff3f Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 12:44:43 2013 +0800 Implement fix for CSC in GPU Calc Change-Id: I075f9951c07088a9b6346a7ffad6fb7e3284ea8a Signed-off-by: Wei Wei wei...@multicorewareinc.com commit 8a43a2534c76fca18744d057df0d3552ce5ea3b0 Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 12:38:59 2013 +0800 Testcases for CSC in GPU Calc Change-Id: Ie2d85b5566a3f87224707a2e28b14fba0b75ad46 Signed-off-by: Wei Wei wei...@multicorewareinc.com commit 84ceedc2b2be60a17a0796b5b50ba159e1132c66 Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 12:24:51 2013 +0800 Fix release of CSC-COTH in GPU Calc Change-Id: I4be62550127f88c3dce28fd8b27059d10980efa4 Signed-off-by: Wei Wei wei...@multicorewareinc.com commit 8380699a647a9b78bad959fe177d0a5a335fcc70 Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 11:15:51 2013 +0800 Implement fix for RSQ in GPU Calc Change-Id: I15c12ea18541bbad23f17349acd1f7c1bcca69bc Signed-off-by: Wei Wei wei...@multicorewareinc.com commit ed14e7e6efe4d05dc63e66015c6b5744dc942a44 Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 11:05:42 2013 +0800 Testcases for RSQ in GPU Calc Change-Id: I5e70883fa61da2afbe7254ecb448fcfd0abb41a3 Signed-off-by: Wei Wei wei...@multicorewareinc.com commit 24cbf05182e7e26c9ca1f0d1417c2f55e83cd55c Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 10:53:21 2013 +0800 Implement fix for PEARSON in GPU Calc Change-Id: I16aeba7c889677119995939a35be6ccad2517725 Signed-off-by: Wei Wei wei...@multicorewareinc.com commit b05a38e4fd1ed8004296863f10f8df3762999703 Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 10:44:38 2013 +0800 Testcases for PEARSON in GPU Calc Change-Id: Ife42fa3dba9e1ced92fd2465558bdc12c3ab5a9b Signed-off-by: Wei Wei wei...@multicorewareinc.com commit 8985669eeffb955c3028e90f24219084d95a77f0 Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 10:36:05 2013 +0800 Implement fix for NEGBINOMDIST in GPU Calc Change-Id: I327737e899b88448a195f6d990a9a6552346a74c Signed-off-by: Wei Wei wei...@multicorewareinc.com commit 99857b4ae8f117f92db8d970a6feb90ffa7fa31b Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 10:21:39 2013 +0800 Testcases for NEGBINOMDIST in GPU Calc Change-Id: I19d3a98e8356600ead7d6a380159f1331c75b071 Signed-off-by: Wei Wei wei...@multicorewareinc.com commit a79289e6eda152af35a5a5187705b0303c79df7b Author: haochen
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/source
sc/source/ui/vba/vbapagebreaks.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 8919e09416b2a8561c60edcaa99147bd5c55ce08 Author: Noel Power noel.po...@suse.com Date: Mon Apr 22 19:29:22 2013 +0100 fix another instance where the index is broken for pagebreaks Conflicts: sc/source/ui/vba/vbapagebreaks.cxx Change-Id: I5c3215373c0a63c2831d7be5005f1b04a0645e99 diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 09100e2..38db4f3 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -148,10 +148,9 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI { aTablePageBreakData = aTablePageBreakDataList[i]; sal_Int32 nPos = aTablePageBreakData.Position; -if( nPos = nUsedStart ) -index++; -if( nPos nUsedEnd ) +if( nPos nUsedEnd + 1 ) DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); +index++; if( index == nAPIItemIndex ) return aTablePageBreakData; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/vba/vbapagebreaks.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit fadbb2e75c2eeeb932db1f6baf1e32360f675abc Author: Noel Power noel.po...@suse.com Date: Mon Apr 22 19:29:22 2013 +0100 fix another instance where the index is broken for pagebreaks Conflicts: sc/source/ui/vba/vbapagebreaks.cxx Change-Id: I5c3215373c0a63c2831d7be5005f1b04a0645e99 diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 6456cdb..a67a3b5 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -148,10 +148,9 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI { aTablePageBreakData = aTablePageBreakDataList[i]; sal_Int32 nPos = aTablePageBreakData.Position; -if( nPos = nUsedStart ) -index++; -if( nPos nUsedEnd ) +if( nPos nUsedEnd + 1 ) DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); +index++; if( index == nAPIItemIndex ) return aTablePageBreakData; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/breakiterator/breakiterator_th.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit e629b148afaa161acbad76a90851bb2f481817c8 Author: Khaled Hosny khaledho...@eglug.org Date: Mon Oct 28 20:06:50 2013 +0200 Fix indentation Change-Id: I2bef2334392dba63f86b24917a50bf1eb0df98dc diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx index 82d7b53..3e9babb 100644 --- a/i18npool/source/breakiterator/breakiterator_th.cxx +++ b/i18npool/source/breakiterator/breakiterator_th.cxx @@ -86,9 +86,9 @@ static sal_uInt16 SAL_CALL getCombState(const sal_Unicode *text, sal_Int32 pos) if (text[pos+1] == SARA_AM) { if ((1 ch1) is_ST_COM) -return ST_COM; +return ST_COM; else -ch2 = CT_AD1; +ch2 = CT_AD1; } return thaiCompRel[ch1][ch2]; @@ -137,9 +137,9 @@ void SAL_CALL BreakIterator_th::makeIndex(const OUString Text, sal_Int32 nStart while (pos endPos) { end += getACell(str, start, endPos); while (pos end) { -nextCellIndex[pos] = end; -previousCellIndex[pos] = start; -pos++; +nextCellIndex[pos] = end; +previousCellIndex[pos] = start; +pos++; } start = end; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/source
sc/source/filter/excel/xecontent.cxx |8 ++-- sc/source/filter/inc/xecontent.hxx |9 + 2 files changed, 11 insertions(+), 6 deletions(-) New commits: commit 3c032c59b3a5b128dfc86bbd2e0325f3459e949a Author: Noel Power noel.po...@suse.com Date: Fri Jun 21 15:46:08 2013 +0100 write display attr of hyperlink only if value is different from stringtable Conflicts: sc/source/filter/inc/xecontent.hxx Change-Id: Iff6f16d6cdb539ad80ef01e91db51613e95053d1 diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 7287fe7..706f24c 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -332,7 +332,8 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot rRoot, const SvxURLField rU XclExpRecord( EXC_ID_HLINK ), maScPos( rScPos ), mxVarData( new SvMemoryStream ), -mnFlags( 0 ) +mnFlags( 0 ), +mbSetDisplay( true ) { const String rUrl = rUrlField.GetURL(); const String rRepr = rUrlField.GetRepresentation(); @@ -498,6 +499,7 @@ void XclExpHyperlink::WriteEmbeddedData( XclExpStream rStrm ) void XclExpHyperlink::SaveXml( XclExpXmlStream rStrm ) { +OString sTmp = XclXmlUtils::ToOString( maScPos ); OUString sId = !msTarget.isEmpty() ? rStrm.addRelation( rStrm.GetCurrentStream()-getOutputStream(), XclXmlUtils::ToOUString( http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink; ), msTarget, true ) : OUString(); @@ -510,7 +512,9 @@ void XclExpHyperlink::SaveXml( XclExpXmlStream rStrm ) ? XclXmlUtils::ToOString( *mxTextMark ).getStr() : NULL, // OOXTODO: XML_tooltip,from record HLinkTooltip 800h wzTooltip -XML_display,XclXmlUtils::ToOString( *mxRepr ).getStr(), +XML_display,mbSetDisplay + ? XclXmlUtils::ToOString( *mxRepr ).getStr() + : NULL, FSEND ); } diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index b972da4..3b95302 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -109,6 +109,7 @@ public: virtual voidSaveXml( XclExpXmlStream rStrm ); virtual voidWriteEmbeddedData( XclExpStream rStrm ); +voidSetDisplay( bool bDisplay ) { mbSetDisplay = bDisplay; } private: /** Builds file name from the passed file URL. Tries to convert to relative file name. @param rnLevel (out-param) The parent directory level. @@ -119,7 +120,6 @@ private: /** Writes the body of the HLINK record. */ virtual voidWriteBody( XclExpStream rStrm ); - private: typedef boost::scoped_ptr StringStringPtr; typedef boost::scoped_ptr SvStream SvStreamPtr; @@ -129,7 +129,8 @@ private: SvStreamPtr mxVarData; /// Buffer stream with variable data. sal_uInt32 mnFlags;/// Option flags. XclExpStringRef mxTextMark; /// Location within mxRepr -OUString msTarget; /// Target URL +OUStringmsTarget; /// Target URL +boolmbSetDisplay; /// True if display attribute it written }; typedef XclExpRecordList XclExpHyperlink XclExpHyperlinkList; @@ -349,9 +350,9 @@ private: XclExpStringmaErrorText;/// The error text. XclExpStringRef mxString1; /// String for first condition formula. XclTokenArrayRefmxTokArr1; /// Formula for first condition. -OUString msFormula1; /// OOXML Formula for first condition. +OUStringmsFormula1; /// OOXML Formula for first condition. XclTokenArrayRefmxTokArr2; /// Formula for second condition. -OUString msFormula2; /// OOXML Formula for second condition. +OUStringmsFormula2; /// OOXML Formula for second condition. sal_uInt32 mnFlags;/// Miscellaneous flags. sal_uLong mnScHandle; /// The core handle for quick list search. }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/filter/excel/xecontent.cxx |8 ++-- sc/source/filter/inc/xecontent.hxx |8 +--- sc/source/ui/vba/vbapagesetup.cxx|2 -- 3 files changed, 11 insertions(+), 7 deletions(-) New commits: commit 057beb5d95fc8704f5b98377d909856aa3b32bf6 Author: Noel Power noel.po...@suse.com Date: Wed Apr 24 10:13:53 2013 +0100 follow fix for bnc#813528 Conflicts: sc/source/ui/vba/vbapagesetup.cxx Change-Id: Id6c9cd01bc68e13b87c845d9272c7b85756987c5 diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index 19fa2e3..f0b801e 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -512,8 +512,6 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) throw (css::uno::RuntimeException) { -if( firstPageNumber 0 ) -DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); if( firstPageNumber == excel::Constants::xlAutomatic ) firstPageNumber = 0; commit c8468d6b0a11782bdd16e9ad575009903581ded6 Author: Noel Power noel.po...@suse.com Date: Fri Jun 21 15:46:08 2013 +0100 write display attr of hyperlink only if value is different from stringtable Conflicts: sc/source/filter/inc/xecontent.hxx Conflicts: sc/source/filter/excel/xecontent.cxx sc/source/filter/inc/xecontent.hxx Change-Id: Iff6f16d6cdb539ad80ef01e91db51613e95053d1 diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 35ad9b2..7278763 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -332,7 +332,8 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot rRoot, const SvxURLField rU XclExpRecord( EXC_ID_HLINK ), maScPos( rScPos ), mxVarData( new SvMemoryStream ), -mnFlags( 0 ) +mnFlags( 0 ), +mbSetDisplay( true ) { const OUString rUrl = rUrlField.GetURL(); const OUString rRepr = rUrlField.GetRepresentation(); @@ -501,6 +502,7 @@ void XclExpHyperlink::WriteEmbeddedData( XclExpStream rStrm ) void XclExpHyperlink::SaveXml( XclExpXmlStream rStrm ) { +OString sTmp = XclXmlUtils::ToOString( maScPos ); OUString sId = !msTarget.isEmpty() ? rStrm.addRelation( rStrm.GetCurrentStream()-getOutputStream(), XclXmlUtils::ToOUString( http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink; ), msTarget, true ) : OUString(); @@ -513,7 +515,9 @@ void XclExpHyperlink::SaveXml( XclExpXmlStream rStrm ) ? XclXmlUtils::ToOString( *mxTextMark ).getStr() : NULL, // OOXTODO: XML_tooltip,from record HLinkTooltip 800h wzTooltip -XML_display,XclXmlUtils::ToOString(m_Repr).getStr(), +XML_display,mbSetDisplay + ? XclXmlUtils::ToOString(m_Repr).getStr() + : NULL, FSEND ); } diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 81ed8e8..64b98f6 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -109,6 +109,7 @@ public: virtual voidSaveXml( XclExpXmlStream rStrm ); virtual voidWriteEmbeddedData( XclExpStream rStrm ); +voidSetDisplay( bool bDisplay ) { mbSetDisplay = bDisplay; } private: /** Builds file name from the passed file URL. Tries to convert to relative file name. @param rnLevel (out-param) The parent directory level. @@ -128,7 +129,8 @@ private: SvStreamPtr mxVarData; /// Buffer stream with variable data. sal_uInt32 mnFlags;/// Option flags. XclExpStringRef mxTextMark; /// Location within m_Repr -OUString msTarget; /// Target URL +OUStringmsTarget; /// Target URL +boolmbSetDisplay; /// True if display attribute it written }; typedef XclExpRecordList XclExpHyperlink XclExpHyperlinkList; @@ -348,9 +350,9 @@ private: XclExpStringmaErrorText;/// The error text. XclExpStringRef mxString1; /// String for first condition formula. XclTokenArrayRefmxTokArr1; /// Formula for first condition. -OUString msFormula1; /// OOXML Formula for first condition. +OUStringmsFormula1; /// OOXML Formula for first condition. XclTokenArrayRefmxTokArr2; /// Formula for second condition. -OUString msFormula2; /// OOXML Formula for second condition. +OUStringmsFormula2; /// OOXML Formula for second condition. sal_uInt32 mnFlags;/// Miscellaneous
[Libreoffice-commits] core.git: 3 commits - sc/Library_scqahelper.mk sc/qa
sc/Library_scqahelper.mk |3 sc/qa/unit/data/contentCSV/numberFormat.csv |1 sc/qa/unit/data/contentCSV/text-functions.csv |2 sc/qa/unit/data/ods/formats.ods |binary sc/qa/unit/data/ods/functions.ods |binary sc/qa/unit/helper/qahelper.cxx| 120 +++ sc/qa/unit/helper/qahelper.hxx|2 sc/qa/unit/subsequent_export-test.cxx | 17 +++ sc/qa/unit/subsequent_filters-test.cxx| 135 +- 9 files changed, 153 insertions(+), 127 deletions(-) New commits: commit 17d8e1f9eacb10654f2feb31df2fe0638af2b370 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Oct 28 22:44:56 2013 +0100 add test for fdo#70275 Change-Id: Ibdbb4880878f6bb40344e1c274c586cd587cf924 diff --git a/sc/qa/unit/data/contentCSV/numberFormat.csv b/sc/qa/unit/data/contentCSV/numberFormat.csv index 001d70f..83cbbab 100644 --- a/sc/qa/unit/data/contentCSV/numberFormat.csv +++ b/sc/qa/unit/data/contentCSV/numberFormat.csv @@ -4,3 +4,4 @@ 2.59E+005,-2.35E+03 25 31/82 FALSE,TRUE +/ diff --git a/sc/qa/unit/data/ods/formats.ods b/sc/qa/unit/data/ods/formats.ods index cfe3bc8..1837529 100644 Binary files a/sc/qa/unit/data/ods/formats.ods and b/sc/qa/unit/data/ods/formats.ods differ diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 4d1fd60..853187c 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -26,9 +26,6 @@ #include editeng/postitem.hxx #include editeng/udlnitem.hxx #include editeng/editobj.hxx -#include editeng/brushitem.hxx -#include editeng/brushitem.hxx -#include editeng/justifyitem.hxx #include editeng/borderline.hxx #include editeng/flditem.hxx #include dbdata.hxx commit 487db9ce89d53391cf45578cc42f6e7f3e67536c Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Oct 28 22:36:57 2013 +0100 add ODS export test for formattings Change-Id: I62ede554994c4448c6dff8f1a9e2ecb3075fdb46 diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk index f0be599..4ea1f92 100644 --- a/sc/Library_scqahelper.mk +++ b/sc/Library_scqahelper.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,scqahelper,\ cppuhelper \ for \ sal \ + sc \ sfx \ sot \ svl \ @@ -45,9 +46,9 @@ $(eval $(call gb_Library_use_libraries,scqahelper,\ tl \ unotest \ utl \ - sc \ ucbhelper \ unotest \ + vcl \ $(gb_UWINAPI) \ )) diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index 0de8b6b..b212846 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -11,9 +11,13 @@ #include csv_handler.hxx #include drwlayer.hxx #include compiler.hxx +#include conditio.hxx +#include stlsheet.hxx #include formulacell.hxx #include svx/svdpage.hxx #include svx/svdoole2.hxx +#include editeng/brushitem.hxx +#include editeng/justifyitem.hxx #include config_orcus.h @@ -161,6 +165,122 @@ void testCondFile(OUString, ScDocument*, SCTAB) {} #endif +void testFormats(ScBootstrapFixture* pTest, ScDocument* pDoc, sal_Int32 nFormat) +{ +//test Sheet1 with csv file +OUString aCSVFileName; +pTest-createCSVPath(OUString(numberFormat.), aCSVFileName); +testFile(aCSVFileName, pDoc, 0, PureString); +//need to test the color of B3 +//it's not a font color! +//formatting for B5: # ??/100 gets lost during import + +//test Sheet2 +const ScPatternAttr* pPattern = NULL; +pPattern = pDoc-GetPattern(0,0,1); +Font aFont; +pPattern-GetFont(aFont,SC_AUTOCOL_RAW); +CPPUNIT_ASSERT_EQUAL_MESSAGE(font size should be 10, 200l, aFont.GetSize().getHeight()); +CPPUNIT_ASSERT_EQUAL_MESSAGE(font color should be black, COL_AUTO, aFont.GetColor().GetColor()); +pPattern = pDoc-GetPattern(0,1,1); +pPattern-GetFont(aFont, SC_AUTOCOL_RAW); +CPPUNIT_ASSERT_EQUAL_MESSAGE(font size should be 12, 240l, aFont.GetSize().getHeight()); +pPattern = pDoc-GetPattern(0,2,1); +pPattern-GetFont(aFont, SC_AUTOCOL_RAW); +CPPUNIT_ASSERT_EQUAL_MESSAGE(font should be italic, ITALIC_NORMAL, aFont.GetItalic()); +pPattern = pDoc-GetPattern(0,4,1); +pPattern-GetFont(aFont, SC_AUTOCOL_RAW); +CPPUNIT_ASSERT_EQUAL_MESSAGE(font should be bold, WEIGHT_BOLD, aFont.GetWeight()); +pPattern = pDoc-GetPattern(1,0,1); +pPattern-GetFont(aFont, SC_AUTOCOL_RAW); +CPPUNIT_ASSERT_EQUAL_MESSAGE(font should be blue, COL_BLUE, aFont.GetColor().GetColor()); +pPattern = pDoc-GetPattern(1,1,1); +pPattern-GetFont(aFont, SC_AUTOCOL_RAW); +CPPUNIT_ASSERT_EQUAL_MESSAGE(font should be striked out with a single line, STRIKEOUT_SINGLE, aFont.GetStrikeout()); +//some tests on sheet2 only for ods +if (nFormat == ODS) +{ +pPattern =
[Libreoffice-commits] core.git: sc/Library_scfilt.mk sc/source sc/util
sc/Library_scfilt.mk |1 sc/source/filter/inc/ooxformulaparser.hxx | 110 sc/source/filter/oox/ooxformulaparser.cxx | 196 ++ sc/source/filter/services.cxx | 10 - sc/util/scfilt.component |3 5 files changed, 316 insertions(+), 4 deletions(-) New commits: commit 20e0afa76087e20f95247406d265a122263a8c6f Author: Eike Rathke er...@redhat.com Date: Mon Oct 28 22:46:01 2013 +0100 resolved fdo#56209 reviving FilterFormulaParser First it was moved from oox to sc without carrying over the component factory bits, then subsequent commits removed the remaining bits in steps as it appeared to be unused: 8ada1cd2846e5e60ad63250c68ddea3a9356546f 887d7945addeb823e0d3f783609c4e79d92ad4a7 effda59a12cedd3cf200d2e9f5186a623b0855bb f2fd2a66ee827024b31a310d67804cb7cb18d2da Change-Id: I445b11c95daff6f30b3654936d0f22a113158f97 diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 279ffea..c23af3d 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -191,6 +191,7 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\ sc/source/filter/oox/formulabuffer \ sc/source/filter/oox/formulaparser \ sc/source/filter/oox/numberformatsbuffer \ + sc/source/filter/oox/ooxformulaparser \ sc/source/filter/oox/pagesettings \ sc/source/filter/oox/pivotcachebuffer \ sc/source/filter/oox/pivotcachefragment \ diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx new file mode 100644 index 000..e6c5797 --- /dev/null +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -0,0 +1,110 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the License); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef OOX_XLS_OOXFORMULAPARSER_HXX +#define OOX_XLS_OOXFORMULAPARSER_HXX + +#include boost/shared_ptr.hpp +#include com/sun/star/lang/XComponent.hpp +#include com/sun/star/uno/XComponentContext.hpp +#include com/sun/star/lang/XInitialization.hpp +#include com/sun/star/lang/XServiceInfo.hpp +#include com/sun/star/sheet/XFilterFormulaParser.hpp +#include cppuhelper/implbase3.hxx + +namespace oox { +namespace xls { + +class OOXMLFormulaParserImpl; + +// + +typedef ::cppu::WeakImplHelper3 +::com::sun::star::lang::XServiceInfo, +::com::sun::star::lang::XInitialization, +::com::sun::star::sheet::XFilterFormulaParser OOXMLFormulaParser_BASE; + +/** OOXML formula parser/compiler service for usage in ODF filters. */ +class OOXMLFormulaParser : public OOXMLFormulaParser_BASE +{ +public: +explicitOOXMLFormulaParser(); +virtual ~OOXMLFormulaParser(); + +// com.sun.star.lang.XServiceInfo interface --- + +virtual ::rtl::OUString SAL_CALL +getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + +virtual sal_Bool SAL_CALL +supportsService( const ::rtl::OUString rService ) +throw( ::com::sun::star::uno::RuntimeException ); + +virtual ::com::sun::star::uno::Sequence ::rtl::OUString SAL_CALL +getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + +// com.sun.star.lang.XInitialization interface + +virtual void SAL_CALL initialize( +const ::com::sun::star::uno::Sequence ::com::sun::star::uno::Any rArgs ) +throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); + +// com.sun.star.sheet.XFilterFormulaParser interface -- + +virtual ::rtl::OUString SAL_CALL +getSupportedNamespace() +throw( ::com::sun::star::uno::RuntimeException ); + +// com.sun.star.sheet.XFormulaParser interface + +virtual ::com::sun::star::uno::Sequence ::com::sun::star::sheet::FormulaToken
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/LocaleNode.cxx | 24 ++-- 1 file changed, 14 insertions(+), 10 deletions(-) New commits: commit 2830bf9af9a640e1c484b959ee2dcbe1aeabb0f6 Author: Eike Rathke er...@redhat.com Date: Tue Oct 29 00:50:46 2013 +0100 iterateCodePoints() on empty string is no good anymore Change-Id: Id2ddbbff90f3cd32c03c7623af6d458717c7e8a8 diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index 905df2e..b71e769 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -1217,19 +1217,23 @@ void LCFormatNode::generateCode (const OFileWriter of) const } // Rudimentary check if a pattern interferes with decimal number. -nIndex = 0; -sal_uInt32 cDecSep = aDecSep.iterateCodePoints( nIndex); -for (vectorOUString::const_iterator aIt = theDateAcceptancePatterns.begin(); -aIt != theDateAcceptancePatterns.end(); ++aIt) +// But only if not inherited in which case we don't have aDecSep here. +if (!aDecSep.isEmpty()) { -if ((*aIt).getLength() == (cDecSep = 0x ? 3 : 4)) +nIndex = 0; +sal_uInt32 cDecSep = aDecSep.iterateCodePoints( nIndex); +for (vectorOUString::const_iterator aIt = theDateAcceptancePatterns.begin(); +aIt != theDateAcceptancePatterns.end(); ++aIt) { -nIndex = 1; -if ((*aIt).iterateCodePoints( nIndex) == cDecSep) +if ((*aIt).getLength() == (cDecSep = 0x ? 3 : 4)) { -++nError; -fprintf( stderr, Error: Date acceptance pattern '%s' matches decimal number '#%s#'\n, -OSTR( *aIt), OSTR( aDecSep)); +nIndex = 1; +if ((*aIt).iterateCodePoints( nIndex) == cDecSep) +{ +++nError; +fprintf( stderr, Error: Date acceptance pattern '%s' matches decimal number '#%s#'\n, +OSTR( *aIt), OSTR( aDecSep)); +} } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 56209, which changed state. Bug 56209 Summary: FILEOPEN: opening a .ods file saved in Excel (pre-ODF1.2) damages all formula https://bugs.freedesktop.org/show_bug.cgi?id=56209 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/source
sc/source/ui/vba/vbapagesetup.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit e4ca6c93edfe2c81756d35e13bbca4466e30fdac Author: Noel Power noel.po...@suse.com Date: Wed Apr 24 10:13:53 2013 +0100 follow fix for bnc#813528 Conflicts: sc/source/ui/vba/vbapagesetup.cxx Change-Id: Id6c9cd01bc68e13b87c845d9272c7b85756987c5 diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index 465467d..bc8def9 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -512,8 +512,6 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) throw (css::uno::RuntimeException) { -if( firstPageNumber 0 ) -DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); if( firstPageNumber == excel::Constants::xlAutomatic ) firstPageNumber = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 70275, which changed state. Bug 70275 Summary: Incorrect import of custom text cell format https://bugs.freedesktop.org/show_bug.cgi?id=70275 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sc/source
sc/source/core/tool/interpr1.cxx | 48 +-- 1 file changed, 26 insertions(+), 22 deletions(-) New commits: commit ad36b0b9553f3903bddff0355dd878459bea8fae Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Oct 28 20:05:47 2013 +0100 kill a few xub_StrLen in ScInterpreter Change-Id: I08fbd6de92b152b94cf5cf40f0cf0c6566c617ff diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index ad1e720..952e50c 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -3237,7 +3237,7 @@ static inline bool lcl_ScInterpreter_IsPrintable( sal_Unicode c ) void ScInterpreter::ScClean() { OUString aStr = GetString().getString(); -for ( xub_StrLen i = 0; i aStr.getLength(); i++ ) +for ( sal_Int32 i = 0; i aStr.getLength(); i++ ) { if ( !lcl_ScInterpreter_IsPrintable( aStr[i] ) ) aStr = aStr.replaceAt(i,1,); @@ -7181,7 +7181,7 @@ void ScInterpreter::ScAddressFunc() if (eConv == FormulaGrammar::CONV_OOO) { // Isolate Tab from 'Doc'#Tab -xub_StrLen nPos = ScCompiler::GetDocTabPos( sTabStr); +sal_Int32 nPos = ScCompiler::GetDocTabPos( sTabStr); if (nPos != STRING_NOTFOUND) { if (sTabStr[nPos+1] == '$') @@ -7682,9 +7682,9 @@ void ScInterpreter::ScReplace() PushIllegalArgument(); else { -xub_StrLen nCount = static_castxub_StrLen(fCount); -xub_StrLen nPos = static_castxub_StrLen(fPos); -xub_StrLen nLen = aOldStr.getLength(); +sal_Int32 nCount = static_castsal_Int32(fCount); +sal_Int32 nPos = static_castsal_Int32(fPos); +sal_Int32 nLen = aOldStr.getLength(); if (nPos nLen + 1) nPos = nLen + 1; if (nCount nLen - nPos + 1) @@ -7916,7 +7916,7 @@ void ScInterpreter::ScRightB() return ; } else -n = (xub_StrLen) nVal; +n = (sal_Int32) nVal; } else n = 1; @@ -7967,7 +7967,7 @@ void ScInterpreter::ScLeftB() return ; } else -n = (xub_StrLen) nVal; +n = (sal_Int32) nVal; } else n = 1; @@ -7987,8 +7987,8 @@ void ScInterpreter::ScMidB() else { -aStr = lcl_LeftB(aStr, (xub_StrLen)fAnfang + (xub_StrLen)fAnz - 1); -sal_Int32 nCnt = getLengthB(aStr) - (xub_StrLen)fAnfang + 1; +aStr = lcl_LeftB(aStr, (sal_Int32)fAnfang + (sal_Int32)fAnz - 1); +sal_Int32 nCnt = getLengthB(aStr) - (sal_Int32)fAnfang + 1; aStr = lcl_RightB(aStr, nCnt0 ? nCnt:0); PushString(aStr); } @@ -8000,7 +8000,7 @@ void ScInterpreter::ScRight() sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { -xub_StrLen n; +sal_Int32 n; if (nParamCount == 2) { double nVal = ::rtl::math::approxFloor(GetDouble()); @@ -8010,7 +8010,7 @@ void ScInterpreter::ScRight() return ; } else -n = (xub_StrLen) nVal; +n = (sal_Int32) nVal; } else n = 1; @@ -8159,7 +8159,7 @@ void ScInterpreter::ScSubstitute() sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 3, 4 ) ) { -xub_StrLen nAnz; +sal_Int32 nAnz; if (nParamCount == 4) { double fAnz = ::rtl::math::approxFloor(GetDouble()); @@ -8169,7 +8169,7 @@ void ScInterpreter::ScSubstitute() return; } else -nAnz = (xub_StrLen) fAnz; +nAnz = (sal_Int32) fAnz; } else nAnz = 0; @@ -8177,9 +8177,9 @@ void ScInterpreter::ScSubstitute() OUString sOldStr = GetString().getString(); OUString sStr= GetString().getString(); sal_Int32 nPos = 0; -xub_StrLen nCount = 0; -xub_StrLen nNewLen = sNewStr.getLength(); -xub_StrLen nOldLen = sOldStr.getLength(); +sal_Int32 nCount = 0; +sal_Int32 nNewLen = sNewStr.getLength(); +sal_Int32 nOldLen = sOldStr.getLength(); while( true ) { nPos = sStr.indexOf( sOldStr, nPos ); @@ -8192,7 +8192,7 @@ void ScInterpreter::ScSubstitute() if ( CheckStringResultLen( sStr, sNewStr ) ) { sStr = sStr.replaceAt(nPos, 0, sNewStr); -nPos = sal::static_int_castxub_StrLen( nPos + nNewLen ); +nPos = sal::static_int_castsal_Int32( nPos + nNewLen ); } else break;
[Libreoffice-commits] core.git: 5 commits - crashrep/CustomTarget_crashrep_res.mk external/liblangtag include/unotest shell/CustomTarget_shlxthdl_res.mk solenv/gbuild test/Package_unittest.mk unotest/
crashrep/CustomTarget_crashrep_res.mk |1 external/liblangtag/ExternalPackage_langtag_data.mk | 30 external/liblangtag/Module_liblangtag.mk|1 include/unotest/bootstrapfixturebase.hxx|2 - shell/CustomTarget_shlxthdl_res.mk |2 - solenv/gbuild/AllLangResTarget.mk |8 - solenv/gbuild/CppunitTest.mk| 21 ++ solenv/gbuild/Gallery.mk|2 - solenv/gbuild/TargetLocations.mk|6 test/Package_unittest.mk|7 unotest/source/cpp/bootstrapfixturebase.cxx |5 --- 11 files changed, 10 insertions(+), 75 deletions(-) New commits: commit 18c702a8e14ae5a5335b78647d3bccbe6067858d Author: Michael Stahl mst...@redhat.com Date: Tue Oct 29 00:12:52 2013 +0100 gbuild: move unittest mock profile to WORKDIR Change-Id: Idd6420a855fec8b44fce6c0694b491d5f1eec95e diff --git a/include/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx index 556204b..cd4cff4 100644 --- a/include/unotest/bootstrapfixturebase.hxx +++ b/include/unotest/bootstrapfixturebase.hxx @@ -36,8 +36,6 @@ class OOO_DLLPUBLIC_UNOTEST BootstrapFixtureBase : public CppUnit::TestFixture protected: OUString m_aSrcRootURL; OUString m_aSrcRootPath; - OUString m_aSolverRootURL; - OUString m_aSolverRootPath; OUString m_aWorkdirRootURL; OUString m_aWorkdirRootPath; diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 87c5cec..5fe8e95 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -293,10 +293,10 @@ $(call gb_CppunitTest_get_target,$(1)) : HEADLESS= endef -# Use configuration in $(OUTDIR)/unittest/registry. +# Use configuration in $(WORKDIR)/unittest/registry. define gb_CppunitTest_use_unittest_configuration $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,test_unittest) -$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(OUTDIR)/unittest/registry) +$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(WORKDIR)/unittest/registry) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 704cf80..0025f30 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -31,7 +31,7 @@ gb_PackagePart_get_destinations = \ $(OUTDIR)/pck \ $(OUTDIR)/res \ $(OUTDIR)/share \ - $(OUTDIR)/unittest \ + $(WORKDIR)/unittest \ gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT) # kind of lame but with just 3 of these why bother with registration etc. diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk index 8cead93..a21388a 100644 --- a/test/Package_unittest.mk +++ b/test/Package_unittest.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,test_unittest,$(SRCDIR)/test/user-template)) -$(eval $(call gb_Package_set_outdir,test_unittest,$(OUTDIR))) +$(eval $(call gb_Package_set_outdir,test_unittest,$(WORKDIR))) $(eval $(call gb_Package_add_file,test_unittest,unittest/registry/modifications.xcd,registry/modifications.xcd)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/sl.dic,user/wordbook/sl.dic)) diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index fff21d4..5b6f9d3 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -57,9 +57,6 @@ test::BootstrapFixtureBase::BootstrapFixtureBase() m_aSrcRootPath = OUString::createFromAscii( pSrcRoot ); m_aSrcRootURL = getFileURLFromSystemPath(m_aSrcRootPath); -m_aSolverRootPath = OUString::createFromAscii( pSolverRoot ); -m_aSolverRootURL = getFileURLFromSystemPath(m_aSolverRootPath); - m_aWorkdirRootPath = OUString::createFromAscii( pWorkdirRoot ); m_aWorkdirRootURL = getFileURLFromSystemPath(m_aWorkdirRootPath); @@ -94,7 +91,7 @@ void test::BootstrapFixtureBase::setUp() { // set UserInstallation to user profile dir in test/user-template rtl::Bootstrap aDefaultVars; -OUString sUserInstallURL = m_aSolverRootURL + OUString(/unittest); +OUString sUserInstallURL = m_aWorkdirRootURL + OUString(/unittest); aDefaultVars.set(OUString(UserInstallation), sUserInstallURL); m_xContext = comphelper::getProcessComponentContext(); commit a50682cd93589ad3242beae2ba14a655ab4c867f Author: Michael Stahl mst...@redhat.com Date: Mon Oct 28 23:31:06 2013 +0100 gbuild: remove gb_CppunitTestFakeExecutable_get_target ... use the real Executable instead Change-Id: I46b8374e921b9165a6bb71fba6f6f3459dd18c67 diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index e108fbc..87c5cec 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -301,20 +301,7 @@
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/source
sc/source/filter/oox/numberformatsbuffer.cxx |2 +- sc/source/filter/oox/stylesbuffer.cxx| 25 +++-- 2 files changed, 12 insertions(+), 15 deletions(-) New commits: commit 60829d21bff6797320caf9c8fbbefee1f3f3a700 Author: Noel Power noel.po...@suse.com Date: Wed May 22 10:00:34 2013 +0100 fix for bnc#819865 itemstate in parent style incorrectly reported as set Problem occurs because attrs set with default values are reported as set when queried Change-Id: I89d6c3b09312fb78052d87ff20aa12c6fbe7bc98 (cherry picked from commit bf8e9b29aaebcbdd8f2f06b42ac97b8d9f8f4503) diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index d512e3e..5b3a98c 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -2053,7 +2053,7 @@ void NumberFormatsBuffer::insertBuiltinFormats() { // do not put the current system locale for default table Locale aLocale; -if( (*aVIt)-mpcLocale[ 0 ] != '\0' ) +if( (*aVIt)-mpcParent[ 0 ] != '\0' ) aLocale = aSysLocale; for( const BuiltinFormat* pBuiltin = (*aVIt)-mpFormats; pBuiltin (pBuiltin-mnNumFmtId = 0); ++pBuiltin ) { diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 96333d6..8614730 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2260,7 +2260,6 @@ void Xf::finalizeImport() // alignment and protection maAlignment.finalizeImport(); maProtection.finalizeImport(); -createPattern(); } FontRef Xf::getFont() const @@ -2421,8 +2420,12 @@ Xf::createPattern( bool bSkipPoolDefs ) StylesBuffer rStyles = getStyles(); const Xf* pStyleXf = isCellXf() ? rStyles.getStyleXf( maModel.mnStyleXfId ).get() : 0; -if( pStyleXf ) +if( pStyleXf !mpStyleSheet ) { +rStyles.createCellStyle( maModel.mnStyleXfId ); +mpStyleSheet = rStyles.getCellStyleSheet( maModel.mnStyleXfId ); +OSL_ENSURE( mpStyleSheet, Xf::createPattern - no parentStyle created ); + const XfModel rStyleData = pStyleXf-maModel; if( !maModel.mbFontUsed ) maModel.mbFontUsed = !rStyleData.mbFontUsed || (maModel.mnFontId != rStyleData.mnFontId); @@ -2786,8 +2789,13 @@ void CellStyle::createCellStyle() { // #i1624# #i1768# ignore unnamed user styles +bool bDefStyle = maModel.isDefaultStyle(); if( !mbCreated ) +{ +if ( bDefStyle maFinalName.isEmpty() ) +maFinalName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD ); mbCreated = maFinalName.isEmpty(); +} if( !mbCreated !mpStyleSheet ) { @@ -2795,12 +2803,11 @@ void CellStyle::createCellStyle() Xf* pXF = getStyles().getStyleXf( maModel.mnXfId ).get(); ::ScDocument rDoc = getScDocument(); -bool bDefStyle = maModel.isDefaultStyle(); if( bDefStyle ) { // use existing Default style sheet mpStyleSheet = static_cast ScStyleSheet* ( static_cast ScStyleSheetPool* ( rDoc.GetStyleSheetPool() )-Find( -getStyles().getDefaultStyleName(), SFX_STYLE_FAMILY_PARA ) ); +ScGlobal::GetRscString( STR_STYLENAME_STANDARD ), SFX_STYLE_FAMILY_PARA ) ); OSL_ENSURE( mpStyleSheet, CellStyle::createStyle - Default style not found ); bCreatePattern = true; } @@ -2936,16 +2943,6 @@ void CellStyleBuffer::finalizeImport() // set final names and create user-defined and modified built-in cell styles aCellStyles.forEachMemWithKey( CellStyle::finalizeImport ); - -if (mxDefStyle) -{ -ReferenceXNameAccess xNA(getStyleFamily(false), UNO_QUERY_THROW); -if (xNA-hasByName(Default)) -{ -PropertySet aPropSet(xNA-getByName(Default)); -getStyles().writeStyleXfToPropertySet(aPropSet, mxDefStyle-getModel().mnXfId); -} -} } sal_Int32 CellStyleBuffer::getDefaultXfId() const ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: oox service mess
Hi, On Friday, 2013-05-31 13:41:20 +0200, Michael Stahl wrote: On 31/05/13 13:32, Noel Power wrote: Seems there is only one ( the oox one ) which takes care of namespace http://schemas.microsoft.com/office/excel/formula; Is it possible then that we can have microsoft formula saved in ods ? But.. the ScParserFactoryMap/Pool stuff seems to provide some extensible way of mapping specific parsers, no idea if this is really needed or not ( I guess Eike/Kohei ) would know. the MSO ODF 1.1 filter saves formulas as OOXML, not in the legacy non-standard OpenOffice.org way that every other ODF 1.1 implementation understands, because that way they can claim to implement ODF while carefully avoiding actual real-world interoperability. Darn, I now know how that FilterFormulaParser was used.. reviving it for https://bugs.freedesktop.org/show_bug.cgi?id=56209 Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp2niOEF4v3w.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sdext/source
sdext/source/minimizer/informationdialog.hxx |1 - sdext/source/minimizer/pppoptimizeruno.cxx|1 - sdext/source/pdfimport/pdfparse/pdfentries.cxx|1 - sdext/source/pdfimport/tree/imagecontainer.hxx|1 - sdext/source/pdfimport/wrapper/wrapper.cxx|2 -- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |1 - 6 files changed, 7 deletions(-) New commits: commit 943a03a4ee593699ae3ca3dc405c4e271ad949e9 Author: Takeshi Abe t...@fixedpoint.jp Date: Tue Oct 29 09:24:42 2013 +0900 Drop unnecessary #include Change-Id: I20448aebfae86c097413660e9ec836a786507a85 diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index 1ee8b11..f8b 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -19,7 +19,6 @@ #ifndef INFORMATIONDIALOG_HXX #define INFORMATIONDIALOG_HXX -#include vector #include unodialog.hxx #include configurationaccess.hxx #include pppoptimizertoken.hxx diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx index c4cd828..97c72ec 100644 --- a/sdext/source/minimizer/pppoptimizeruno.cxx +++ b/sdext/source/minimizer/pppoptimizeruno.cxx @@ -18,7 +18,6 @@ */ -#include stdio.h #include osl/mutex.hxx #include osl/thread.h #include cppuhelper/factory.hxx diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 52117d3..66804ff 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -32,7 +32,6 @@ #include math.h #include map -#include stdio.h #include string.h diff --git a/sdext/source/pdfimport/tree/imagecontainer.hxx b/sdext/source/pdfimport/tree/imagecontainer.hxx index 0728bbc..8b46720e 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.hxx +++ b/sdext/source/pdfimport/tree/imagecontainer.hxx @@ -28,7 +28,6 @@ #include com/sun/star/awt/XBitmap.hpp #include vector -#include boost/unordered_map.hpp namespace pdfi { diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index f2e9dc2..84eed9b 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -65,8 +65,6 @@ #include rtl/bootstrap.h -#include string.h - using namespace com::sun::star; namespace pdfi diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index a840f03..b4b66a3 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -24,7 +24,6 @@ #include stdio.h #include assert.h #include math.h -#include vector #include boost/shared_array.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - editeng/source
editeng/source/editeng/impedit2.cxx |2 +- editeng/source/editeng/impedit4.cxx |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit f046aec9ea6bfe1f1fe2c5b2ecebe05d15a5176e Author: Caolán McNamara caol...@redhat.com Date: Fri Oct 18 15:36:28 2013 +0100 Related: rhbz#1020712 wrong default font shown in editengine Only in editengine could we have this fiasco. There are two ImpEditEngine::GetScriptType's a) sal_uInt16 ImpEditEngine::GetScriptType(const EditPaM rPaM, sal_uInt16* pEndPos) const this one returns i18n::ScriptType b) sal_uInt16 ImpEditEngine::GetScriptType(const EditSelection rSel) const this one returns SCRIPTTYPE Could there be a better way to ensure that mistakes will be made. Anyway, within variant b, with an empty edit engine ImpEditEngine::GetScriptType calls GetI18NScriptTypeOfLanguage but *that* returns i18n::ScriptType's not SCRIPTTYPEs but when there is content then a SCRIPTTYPE is truly returned. Change-Id: I3a4a7c8746728e0fdfb25d961004c8339a24c93d (cherry picked from commit e63a0d5657c7b9c7431525ba669b3edab0e56af3) Related: rhbz#1020712 more i18n::ScriptType being compared against SCRIPTTYPE Change-Id: I5da9114a3fd8330df2b63dc9187323765d305791 (cherry picked from commit b57ffef61afd61b57087150b1a9245e21079e15b) Reviewed-on: https://gerrit.libreoffice.org/6363 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 4bc6d70..c613e8d 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -1813,7 +1813,7 @@ sal_uInt16 ImpEditEngine::GetScriptType( const EditSelection rSel ) const } } } -return nScriptType ? nScriptType : GetI18NScriptTypeOfLanguage( GetDefaultLanguage() ); +return nScriptType ? nScriptType : SvtLanguageOptions::GetScriptTypeOfLanguage( GetDefaultLanguage() ); } sal_Bool ImpEditEngine::IsScriptChange( const EditPaM rPaM ) const diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 39e8156..5e0fa09 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -2124,7 +2124,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView rEditView, rEditView.pImpEditView-SetEditSelection( aCurrentOldPosition-Max() ); } -sal_uInt16 nScriptType = GetI18NScriptTypeOfLanguage( aCurrentNewPortion-eLanguage ); +sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( aCurrentNewPortion-eLanguage ); sal_uInt16 nLangWhichId = EE_CHAR_LANGUAGE; switch(nScriptType) { @@ -2171,7 +2171,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView rEditView, LanguageType eCurLanguage = GetLanguage( aCurrentPaM ); if(eCurLanguage != aCurrentNewPortion-eLanguage) { -sal_uInt16 nScriptType = GetI18NScriptTypeOfLanguage( aCurrentNewPortion-eLanguage ); +sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( aCurrentNewPortion-eLanguage ); sal_uInt16 nLangWhichId = EE_CHAR_LANGUAGE; switch(nScriptType) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/colrowba.hxx | 18 +-- sc/source/ui/inc/hdrcont.hxx | 31 +-- sc/source/ui/view/colrowba.cxx | 18 +-- sc/source/ui/view/hdrcont.cxx | 66 - 4 files changed, 66 insertions(+), 67 deletions(-) New commits: commit 8a82cacc668268be2fd5471fe4357d52c4372241 Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com Date: Mon Oct 28 21:15:56 2013 -0200 sal_Bool to bool in ScHeaderControl Change-Id: I8f5b9207f5634e3ff2c55d7cf9372c8caad0ed23 Reviewed-on: https://gerrit.libreoffice.org/6471 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index a9b2b14..2a0e976 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.hxx @@ -44,21 +44,21 @@ public: virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ); virtual OUStringGetEntryText( SCCOLROW nEntryNo ); -virtual sal_BoolIsLayoutRTL(); // only for columns +virtual boolIsLayoutRTL(); // only for columns virtual voidSetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ); virtual voidHideEntries( SCCOLROW nStart, SCCOLROW nEnd ); -virtual voidSetMarking( sal_Bool bSet ); +virtual voidSetMarking( bool bSet ); virtual voidSelectWindow(); -virtual sal_BoolIsDisabled(); -virtual sal_BoolResizeAllowed(); +virtual boolIsDisabled(); +virtual boolResizeAllowed(); virtual voidDrawInvert( long nDragPos ); virtual OUStringGetDragHelp( long nVal ); -sal_BoolUseNumericHeader() const; +boolUseNumericHeader() const; }; @@ -77,16 +77,16 @@ public: virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ); virtual OUStringGetEntryText( SCCOLROW nEntryNo ); -virtual sal_BoolIsMirrored(); // only for columns +virtual boolIsMirrored(); // only for columns virtual SCROW GetHiddenCount( SCROW nEntryNo ); // only for columns virtual voidSetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ); virtual voidHideEntries( SCCOLROW nStart, SCCOLROW nEnd ); -virtual voidSetMarking( sal_Bool bSet ); +virtual voidSetMarking( bool bSet ); virtual voidSelectWindow(); -virtual sal_BoolIsDisabled(); -virtual sal_BoolResizeAllowed(); +virtual boolIsDisabled(); +virtual boolResizeAllowed(); virtual voidDrawInvert( long nDragPos ); diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index 31a4bf6..3846cf8 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -26,8 +26,7 @@ #define HDR_SIZE_OPTIMUM0x - -// Size of the sliders +// Size of the sliders #define HDR_SLIDERSIZE 2 class ScHeaderControl : public Window @@ -36,9 +35,9 @@ private: SelectionEngine*pSelEngine; FontaNormFont; FontaBoldFont; -sal_BoolbBoldSet; +boolbBoldSet; -sal_BoolbVertical; // Vertical = Row header +boolbVertical; // Vertical = Row header longnWidth; longnSmallWidth; @@ -48,18 +47,18 @@ private: SCCOLROWnMarkStart; SCCOLROWnMarkEnd; -sal_BoolbMarkRange; +boolbMarkRange; -sal_BoolbDragging; // Change size +boolbDragging; // Change size SCCOLROWnDragNo; longnDragStart; longnDragPos; -sal_BoolbDragMoved; +boolbDragMoved; -sal_BoolbIgnoreMove; +boolbIgnoreMove; longGetScrPos( SCCOLROW nEntryNo ); -SCCOLROWGetMousePos( const MouseEvent rMEvt, sal_Bool rBorder ); +SCCOLROWGetMousePos( const MouseEvent rMEvt, bool rBorder ); boolIsSelectionAllowed(SCCOLROW nPos) const; voidShowDragHelp(); @@ -86,16 +85,16 @@ protected: virtual OUString GetEntryText( SCCOLROW nEntryNo ) = 0; virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo ); -virtual sal_BoolIsLayoutRTL(); -virtual sal_BoolIsMirrored(); +virtual bool IsLayoutRTL(); +virtual bool IsMirrored(); virtual voidSetEntrySize( SCCOLROW nPos, sal_uInt16 nNewWidth ) = 0; virtual voidHideEntries( SCCOLROW nStart, SCCOLROW nEnd ) = 0; -virtual voidSetMarking( sal_Bool bSet ); +virtual voidSetMarking( bool
[Libreoffice-commits] core.git: i18nlangtag/qa i18nlangtag/source
i18nlangtag/qa/cppunit/test_languagetag.cxx |2 ++ i18nlangtag/source/isolang/isolang.cxx |6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) New commits: commit 5dc2e3a10a5711253085f38fbba4c75535448302 Author: Eike Rathke er...@redhat.com Date: Fri Oct 25 20:49:44 2013 +0200 assume 'ha-*' was indeed used as 'ha-Latn-*' Change-Id: I5675bf4ee3d255725c1fda2bdd223d7c9d821ab3 diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 0d6f130..17217fd 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -623,6 +623,8 @@ static bool checkMapping( const OUString rStr1, const OUString rStr2 ) if (rStr1 == sr-Cyrl ) return rStr2 == sr; if (rStr1 == yi-Hebr-US ) return rStr2 == yi-US; if (rStr1 == yi-Hebr-IL ) return rStr2 == yi-IL; +if (rStr1 == ha-NG ) return rStr2 == ha-Latn-NG; +if (rStr1 == ha-GH ) return rStr2 == ha-Latn-GH; return rStr1 == rStr2; } diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 28bb773..9664abf 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -429,8 +429,8 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_FULFULDE_NIGERIA, fuv, NG, 0 }, { LANGUAGE_FULFULDE_NIGERIA,ff, NG, kSAME },// macrolanguage code { LANGUAGE_FULFULDE_SENEGAL,ff, SN, 0 },// macrolanguage code -{ LANGUAGE_HAUSA_NIGERIA, ha, NG, 0 }, -{ LANGUAGE_USER_HAUSA_GHANA,ha, GH, 0 }, +{ LANGUAGE_HAUSA_NIGERIA, ha, NG, kSAME }, +{ LANGUAGE_USER_HAUSA_GHANA,ha, GH, kSAME }, { LANGUAGE_IGBO_NIGERIA,ig, NG, 0 }, { LANGUAGE_KANURI_NIGERIA, kr, NG, 0 }, { LANGUAGE_YORUBA, yo, NG, 0 }, @@ -690,7 +690,7 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] = { LANGUAGE_KASHMIRI_INDIA, ks-Deva, IN, 0 }, // MS { LANGUAGE_KASHMIRI,ks-Arab, , 0 }, // MS, Kashmiri in Jammu and Kashmir ... no ISO3166 code for that { LANGUAGE_HAUSA_NIGERIA, ha-Latn, NG, 0 }, // MS -{ LANGUAGE_USER_HAUSA_GHANA,ha-Latn, GH, 0 }, // MS +{ LANGUAGE_USER_HAUSA_GHANA,ha-Latn, GH, 0 }, { LANGUAGE_HAUSA_LATIN_LSO, ha-Latn, , 0 }, { LANGUAGE_LATIN_LSO, la-Latn, , kSAME }, // MS, though Latn is suppress-script { LANGUAGE_TAI_NUA_CHINA, tdd-Tale, CN, 0 }, // MS reserved ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 50050] Make LE (Link End) Index/Table Entry component character style match LS (Link Start) by default
https://bugs.freedesktop.org/show_bug.cgi?id=50050 Qubit qu...@runcibility.com changed: What|Removed |Added Whiteboard|easyhack|EasyHack CC||qu...@runcibility.com --- Comment #3 from Qubit qu...@runcibility.com --- whiteboard: standardize spelling 'easyhack' - 'EasyHack' -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-group-interpreter-4-dynamic-kernels-reviewed' - 5 commits - sc/source
sc/source/core/opencl/OPBase.hxx | 11 +++ sc/source/core/opencl/OP_Statistical.cxx | 13 ++- sc/source/core/opencl/OP_database.cxx | 13 +++ sc/source/core/opencl/OP_finacial.cxx | 11 +++ sc/source/core/opencl/OP_math.cxx | 13 +++ sc/source/core/opencl/formulagroupcl.cxx | 80 -- sc/source/core/opencl/formulagroupcl_finacial.hxx | 25 +- sc/source/core/opencl/formulagroupcl_public.hxx | 18 8 files changed, 139 insertions(+), 45 deletions(-) New commits: commit 1a92083144a704fd2214671c4083373f57bec7aa Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Oct 29 00:01:05 2013 -0400 Add missing boilerplates. Change-Id: Iec0e62d650c81e5c8382b8db8946ac5f982fefe5 diff --git a/sc/source/core/opencl/OPBase.hxx b/sc/source/core/opencl/OPBase.hxx index 119fe76..42ca8e6 100644 --- a/sc/source/core/opencl/OPBase.hxx +++ b/sc/source/core/opencl/OPBase.hxx @@ -1,3 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #ifndef OPBASE #define OPBASE #include formulagroup.hxx @@ -184,3 +193,5 @@ public: }} #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/opencl/OP_Statistical.cxx b/sc/source/core/opencl/OP_Statistical.cxx index 729b0a7..9dc233b 100644 --- a/sc/source/core/opencl/OP_Statistical.cxx +++ b/sc/source/core/opencl/OP_Statistical.cxx @@ -1,3 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #ifndef OP_STATISTICAL #define OP_STATISTICAL #include formulagroup.hxx @@ -726,3 +735,4 @@ class OpRsq:public Normal{ }} #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/opencl/OP_database.cxx b/sc/source/core/opencl/OP_database.cxx index d7f6309..e553933 100644 --- a/sc/source/core/opencl/OP_database.cxx +++ b/sc/source/core/opencl/OP_database.cxx @@ -1,3 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #ifndef OP_DATABASE #define OP_DATABASE #include formulagroup.hxx @@ -18,4 +27,6 @@ using namespace formula; namespace sc { namespace opencl { }} -#endif \ No newline at end of file +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/opencl/OP_finacial.cxx b/sc/source/core/opencl/OP_finacial.cxx index a5ec76d..e752528 100644 --- a/sc/source/core/opencl/OP_finacial.cxx +++ b/sc/source/core/opencl/OP_finacial.cxx @@ -1,3 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #ifndef OP_FINACIAL #define OP_FINACIAL #include formulagroup.hxx @@ -2903,3 +2912,5 @@ class OpMIRR: public MIRR{ } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/opencl/OP_math.cxx b/sc/source/core/opencl/OP_math.cxx index 486df5a..c22a838 100644 --- a/sc/source/core/opencl/OP_math.cxx +++ b/sc/source/core/opencl/OP_math.cxx @@ -1,3 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #ifndef OP_MATH #define OP_MATH #include formulagroup.hxx @@ -84,4 +93,6 @@ public: virtual std::string BinFuncName(void) const { return Csc; } }; }} -#endif \ No newline at end of file +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/opencl/formulagroupcl_finacial.hxx b/sc/source/core/opencl/formulagroupcl_finacial.hxx index 338a38d..a8db8e9 100644 --- a/sc/source/core/opencl/formulagroupcl_finacial.hxx +++ b/sc/source/core/opencl/formulagroupcl_finacial.hxx @@ -1,3 +1,15 @@
Re: [Libreoffice-qa] How to report double used and/or not working as expected mnemonics?
Hi Thomas, Thomas Hackert wrote (28-10-13 04:54) As far as I know, there are mnemonics that are added in the code and ones that are auto-generated. O.K. For the first ones, I would make an issue for those that are in the same menu or window combined. But how do I know, if they were added in the code or were auto- generated? Hmm, I think most default buttons work like that and part of the menu's But it can be seen in the source of course. Unless you know who is working on that area, then an issue may be superfluous? I have not the faintest idea, sorry ... :( Me neither most of the time. Thus just ask on irc or the list, I would say. (Also, since regular localisers are working in this erea too, there must be some among them that have experience, I would expect.) Cheers, Cor -- - Cor Nouws - http://nl.libreoffice.org - The Document Foundation Membership Committee Member ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] How to report double used and/or not working as expected mnemonics?
Hello Cor, *, On Montag, 28. Oktober 2013 09:37 Cor Nouws wrote: Thomas Hackert wrote (28-10-13 04:54) [mnemonics auto-generated or added by code?] But how do I know, if they were added in the code or were auto- generated? Hmm, I think most default buttons work like that and part of the menu's But it can be seen in the source of course. But only, /if/ you can read the code ... ;) And I cannot, sorry ... :( Unless you know who is working on that area, then an issue may be superfluous? I have not the faintest idea, sorry ... :( Me neither most of the time. Thus just ask on irc or the list, I would say. O.K. Maybe someone else here on the list can tell me/us ... ;) (Also, since regular localisers are working in this erea too, there must be some among them that have experience, I would expect.) O.K. Thank you for your answer Thomas. -- NP: Soul in Sadness – Irritation ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [ANN] LibreOffice 4.1.3 RC2 available
Dear Community, The Document Foundation is pleased to announce the second release candidate of LibreOffice 4.1.3. The upcoming 4.1.3 will be the third in a sequence of frequent bugfix releases for our feature-packed 4.1 line. Please be aware that LibreOffice 4.1.3 RC2 is not been flagged as ready for production use yet, you should continue to use LibreOffice 4.1.2 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.1.3 RC2 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.1.3/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] How to report double used and/or not working as expected mnemonics?
Hi Thomas, *, Am 28.10.2013 05:13 schrieb Thomas Hackert thack...@nexgo.de: Good morning Cor, *, On Sonntag, 27. Oktober 2013 18:37 Cor Nouws wrote: Thomas Hackert wrote (18-10-13 10:10) […] Is there a possibility to report this as fast and easy as possible? Fastest one would be to skip the bug report and instead push a patch to gerrit. Should I open a new bug for every found one? No, that doesn't make sense. You would need to create a list of the menu items to decide what entry will get the most natural one and what entries get second choice or autogenerated one. From my POV it is also important to keep familiar keystrokes intact, so newly added items should get an automatically assigned one unless there is a reason not to. Finding the place in the source code is not different from finding bad mnemonics in a translation. Look up the entry in pootle and there you have the reference. Or grep in the sources. Search in opengrok might also be possible, but not sure whether you need to escape the mnemonic marker/whether it includes the character in the search index. Ciao Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] The garbage into the dev-builds.libreoffice.org
Hi Thorsten, Florian R. Thorsten Behrens wrote So feel free to poke me (one of the tinderbox admins) in the future. Poke :) Could you please rename the binaries in the Master branch so that they are named master~2013-10-27_23.53.26_LibreOfficeDev_4.2.0.0.alpha0_Win_x86.msi like the other tinderboxes? (i.e. remove the libo- prefix which is redundant?) Currently your tinderbox is the only one producing daily binaries from the Master branch for the Windows platform, so thank you for listening (and for fixing the capital X in the TB name) I don't know if this is deliberate but when doing a Custom install most of the components don't show up? (the user can only change the Optional Components) (For Florian Reisinger) In addition, a parallel install will not work (under Windows XP Pro x86 SP3) because of a missing MSVCR110.dll Probably the installer doesn't go through that step when doing a parallel install? Best regards, Pedro -- View this message in context: http://nabble.documentfoundation.org/The-garbage-into-the-dev-builds-libreoffice-org-tp4074218p4080208.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] How to report double used and/or not working as expected mnemonics?
Hi Thomas, Le 28/10/2013 16:19, Christian Lohmaier a écrit : Hi Thomas, *, Am 28.10.2013 05:13 schrieb Thomas Hackert thack...@nexgo.de: Good morning Cor, *, On Sonntag, 27. Oktober 2013 18:37 Cor Nouws wrote: Thomas Hackert wrote (18-10-13 10:10) […] Is there a possibility to report this as fast and easy as possible? Fastest one would be to skip the bug report and instead push a patch to gerrit. Should I open a new bug for every found one? No, that doesn't make sense. You would need to create a list of the menu items to decide what entry will get the most natural one and what entries get second choice or autogenerated one. From my POV it is also important to keep familiar keystrokes intact, so newly added items should get an automatically assigned one unless there is a reason not to. Finding the place in the source code is not different from finding bad mnemonics in a translation. Look up the entry in pootle and there you have the reference. Or grep in the sources. Search in opengrok might also be possible, but not sure whether you need to escape the mnemonic marker/whether it includes the character in the search index. If you grep, just be aware that now there is two kinds of mnemonics: [~] for the previous dialogs, [_] for the ported to .ui dialogs. AFAIK, only the main menus are scripted, the others are placed by the dialog creator or the translators. Kind regards Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] How to report double used and/or not working as expected mnemonics?
Hi Christian, *, On Montag, 28. Oktober 2013 16:19 Christian Lohmaier wrote: Am 28.10.2013 05:13 schrieb Thomas Hackert thack...@nexgo.de: On Sonntag, 27. Oktober 2013 18:37 Cor Nouws wrote: Thomas Hackert wrote (18-10-13 10:10) […] Is there a possibility to report this as fast and easy as possible? Fastest one would be to skip the bug report and instead push a patch to gerrit. do I not need commit rights to do it ;? The other prob is, that I have no programming experience, so I am not really sure, if I am able to help ... :( Should I open a new bug for every found one? No, that doesn't make sense. O.K. You would need to create a list of the menu items to decide what entry will get the most natural one and what entries get second choice or autogenerated one. But how should I know, which one will get the most natural one? And again, how should I know, which one are autogenerated and which one are coded? From my POV it is also important to keep familiar keystrokes intact, so newly added items should get an automatically assigned one unless there is a reason not to. O.K. Finding the place in the source code is not different from finding bad mnemonics in a translation. Look up the entry in pootle and there you have the reference. Or grep in the sources. Search in opengrok might also be possible, but not sure whether you need to escape the mnemonic marker/whether it includes the character in the search index. Do I remember it right, that there are two different mnemonics? ~ and _? Or are there more, which I do not know yet? Have a nice evening Thomas. -- We have ears, earther...FOUR OF THEM! ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] The garbage into the dev-builds.libreoffice.org
On 28/10/13 17:44, Pedro wrote: (For Florian Reisinger) In addition, a parallel install will not work (under Windows XP Pro x86 SP3) because of a missing MSVCR110.dll Probably the installer doesn't go through that step when doing a parallel install? iirc the MSVC runtime DLLs are installed into C:/Windows, and that does of course not happen when doing an administrative installation with MSI since that does not change C:/Windows. you can download the Visual Studio 2012 Redistributable (x86) from Microsoft and just install that. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] The garbage into the dev-builds.libreoffice.org
(For Florian Reisinger) In addition, a parallel install will not work (under Windows XP Pro x86 SP3) because of a missing MSVCR110.dll -- Install the MS_VCR_ 2012_x86 in your system. -- View this message in context: http://nabble.documentfoundation.org/The-garbage-into-the-dev-builds-libreoffice-org-tp4074218p4080225.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] The garbage into the dev-builds.libreoffice.org
Pedro wrote: Could you please rename the binaries in the Master branch so that they are named master~2013-10-27_23.53.26_LibreOfficeDev_4.2.0.0.alpha0_Win_x86.msi like the other tinderboxes? (i.e. remove the libo- prefix which is redundant?) Can look into that - out of curiosity, why does that matter? Currently your tinderbox is the only one producing daily binaries from the Master branch for the Windows platform, so thank you for listening (and for fixing the capital X in the TB name) No prob - but I see up-to-date binaries in http://dev-builds.libreoffice.org/daily/master/Win-x86@42/current/ as well? I don't know if this is deliberate but when doing a Custom install most of the components don't show up? (the user can only change the Optional Components) No idea, but it may well be due to the fact the box is _not_ doing release builds, but rather ~minimal developer builds. Happy to tweak configure options (the very first line in the body part of the tinderbox detailed log), if there's consensus it is worthwhile. Thanks for the update! Cheers, -- Thorsten signature.asc Description: Digital signature ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] The garbage into the dev-builds.libreoffice.org
Hi Thorsten Thorsten Behrens wrote Can look into that - out of curiosity, why does that matter? Firstly it makes it easier to automate download/installation using tools such as Florian's SI GUI and secondly because when the user is browsing for the Master installers (files are usually sorted by name), all other builds are under M and yours are under L, which is obviously not a big problem, just annoying :) One other request: your Tinderbox is not creating the txt files with the build info. Unfortunately this is the only element that allows QA to know from which TB each binary came from (before installing, obviously) so it is quite important that it is generated with the binary... Ex: http://dev-builds.libreoffice.org/daily/master/Windows-x86@47-TDF/2013-10-15_13.31.21/ Thorsten Behrens wrote Currently your tinderbox is the only one producing daily binaries from the Master branch for the Windows platform, so thank you for listening (and for fixing the capital X in the TB name) No prob - but I see up-to-date binaries in http://dev-builds.libreoffice.org/daily/master/Win-x86@42/current/ as well? Ehr... Tinderbox #42 IS your tinderbox... And current is a virtual folder pointing at the latest successful build :) I don't see any other recent Windows Master builds in the other tinderboxes... Thorsten Behrens wrote I don't know if this is deliberate but when doing a Custom install most of the components don't show up? (the user can only change the Optional Components) No idea, but it may well be due to the fact the box is _not_ doing release builds, but rather ~minimal developer builds. Happy to tweak configure options (the very first line in the body part of the tinderbox detailed log), if there's consensus it is worthwhile. Yes, but all previous minimal builds before the Optional Components allowed the user to select LibreOfficeDev Program Modules... I'm just mentioning this because it seems like a regression. If this won't affect the release build installer then just forget I mentioned it ;) Cheers, Pedro -- View this message in context: http://nabble.documentfoundation.org/The-garbage-into-the-dev-builds-libreoffice-org-tp4074218p4080245.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] The garbage into the dev-builds.libreoffice.org
Hi Michael, ape Michael Stahl-2 wrote iirc the MSVC runtime DLLs are installed into C:/Windows, and that does of course not happen when doing an administrative installation with MSI since that does not change C:/Windows. That is what I figured. This means that parallel instals under Windows XP will not work from now on unless the user previously installed MSVCR 2012... Michael Stahl-2 wrote you can download the Visual Studio 2012 Redistributable (x86) from Microsoft and just install that. Yes, I know that. I was just warning Florian Reisinger about this limitation. Maybe SI GUI needs to have a warning or run some system check? It probably makes sense to also add a warning to the Wiki page on Parallel install? Cheers, Pedro -- View this message in context: http://nabble.documentfoundation.org/The-garbage-into-the-dev-builds-libreoffice-org-tp4074218p4080246.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] The garbage into the dev-builds.libreoffice.org
Pedro wrote One other request: your Tinderbox is not creating the txt files with the build info. Unfortunately this is the only element that allows QA to know from which TB each binary came from (before installing, obviously) so it is quite important that it is generated with the binary... Not really a problem... just inconvenient. Fortunately it is trivial to obtain the build details from the Tinderbox Status Page -- either the Summary log or the Full log of each build. To locate, you only need to adjust from local time stamp to its UTC time stamp to locate the correct log. Unfortunately that currently gives just a 48 hour rolling window showing just the recent builds. Once beyond that window and posted to the corresponding TB directory on http://dev-builds.libreoffice.org/daily/master/ without the build text for each msi package, there is no way to know what commit signature to use to locate the build via cgit query -- http://cgit.freedesktop.org/libreoffice/core/log/?qt=rangeq= And at that point, it is only when installed that the Dev build is tagged with the final commit signature--viewable in the Help -- About as the Build ID. It might be helpful to extend to sliding window for the TB, maybe out to 7 days. Alternatively, it has always seemed unfortunate that the Build ID commit signature is not exposed within the Windows MSI installer package. Not sure how difficult that would be to implement, but it would eliminate dependence on the external logs and reinforce use of Git resources. -- View this message in context: http://nabble.documentfoundation.org/The-garbage-into-the-dev-builds-libreoffice-org-tp4074218p4080247.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] How to report double used and/or not working as expected mnemonics?
sophi wrote If you grep, just be aware that now there is two kinds of mnemonics: [~] for the previous dialogs, [_] for the ported to .ui dialogs. AFAIK, only the main menus are scripted, the others are placed by the dialog creator or the translators. Yes that is correct. Unfortunately the legacy assignments with ~ pulled from the various .xcu configurations are not being fully ported to their _ counter part for .ui configurations. That currently leaves things in a bit of a mess. Frankly, we no longer are maintaining HIG and accelerators/shortcuts long established from OOo and our LibreOffice practices. The template manager and start center are two examples of things breaking as we've implemented GTK based UI. The current documented short-cuts and accelerators are published to Wiki help, some UX-advise and Dev discipline is now needed to see that we reestablish our published norms under the .ui configurations--or republish user guides that match the new implementations (what ever those evolve into). Also, a gentle reminder that accelerator/short-cut implementation really should be consistent cross platform. Also, getting this right has considerable impact on Accessibility and Assistive Technology support. So, please review these published guides and consider the issue in that context. https://help.libreoffice.org/Common/General_Shortcut_Keys_in https://help.libreoffice.org/Common/Shortcuts_Accessibility https://help.libreoffice.org/Writer/Shortcut_Keys_for_Writer https://help.libreoffice.org/Writer/Navigating_and_Selecting_With_the_Keyboard -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-How-to-report-double-used-and-or-not-working-as-expected-mnemonics-tp4078583p4080253.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 70729] Can't see pull down menus unless I move the window, then it displays but only until I click on a menu item.
https://bugs.freedesktop.org/show_bug.cgi?id=70729 Jean-Baptiste Faure jbf.fa...@sud-ouest.org changed: What|Removed |Added CC||jbf.fa...@sud-ouest.org --- Comment #3 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- Perhaps a problem with the version provided by your distribution. You should try with the generic Linux version provided by LibreOffice wbsite. Best regards. JBF -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70488] Other: Offer LO nightly builds for OS X to speed up triaging and QA
https://bugs.freedesktop.org/show_bug.cgi?id=70488 --- Comment #4 from Foss f...@openmailbox.org --- Hi Christian, is there any news already? I'm missing my every day bug triage run. ;) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69745] FORMATTING: optimal-row-height is ignored if there are some leading covered cells
https://bugs.freedesktop.org/show_bug.cgi?id=69745 --- Comment #9 from brigitte.roschew...@hksinformatik.de --- Please look at the lines with use-optimal-row-height: e.g. style:style style:name=ro0 style:family=table-rowstyle:table-row-properties style:row-height=4.53mm style:use-optimal-row-height=true fo:break-before=auto//style:style style:style style:name=ro35_KST_094500_5 style:family=table-rowstyle:table-row-properties style:row-height=16.933mm style:use-optimal-row-height=true fo:break-before=auto//style:style -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70938] outline, inconsistent display
https://bugs.freedesktop.org/show_bug.cgi?id=70938 --- Comment #1 from Dominique Boutry dominique.bout...@laposte.net --- This is the right behaviour (and the same in AOO, Powerpoint). Let me explain : - The outline tab requires a continuous linear flow of text, through the whole presentation ; specific additionnal pieces of text drawn with the Text drawing feature, can't find their place in this flow (try to imagine a promote, demote or split if these texts were present in the outline), - the ability to change lay-out requires that a text part (the official part, as I named it ; at least the title) of the diapo in its initial state be moved to a predefined place on the final state of the diapo ; not all text can be moved such a way, only the official one ; the remaining text remains in place - for all these reasons, there are 2 kinds of text in a diapo : 1/ the official in the provided area, and 2/ the additionnal graphic text. Should you switch of lay-out, text can fall from 1/ to 2/ qualification, but never the opposite, - and only the official text is present on the outline tab. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 34171] Bad user reported when file is locked
https://bugs.freedesktop.org/show_bug.cgi?id=34171 Foss f...@openmailbox.org changed: What|Removed |Added Status|NEW |NEEDINFO CC|spa...@gmx.net |f...@openmailbox.org --- Comment #8 from Foss f...@openmailbox.org --- No feedback for 2 months. Setting to NEEDINFO. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69818] FORMATTING: artistic edges
https://bugs.freedesktop.org/show_bug.cgi?id=69818 Jean-Baptiste Faure jbf.fa...@sud-ouest.org changed: What|Removed |Added Hardware|Other |All OS|Windows (All) |All Status|UNCONFIRMED |RESOLVED Resolution|--- |INVALID Severity|normal |enhancement CC||jbf.fa...@sud-ouest.org --- Comment #1 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- You do not provide any information on what you mean by artistic edge. Closed as INVALID. Please feel free to reopen if you can provide useful information. Best regards. JBF -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70814] FILEOPEN: xlsx file opens as an empty file
https://bugs.freedesktop.org/show_bug.cgi?id=70814 GerardF gerard.farg...@orange.fr changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||gerard.farg...@orange.fr Ever confirmed|0 |1 --- Comment #10 from GerardF gerard.farg...@orange.fr --- May be you don't have Calibri font on your OS...(Calibri is a windows proprietary font). Try with changing the font, directly from toolbar or in the replacement table (Tools Options Fonts. https://help.libreoffice.org/Scalc/CUI_HID_OFA_FONT_SUBST_CLB#bm_id3150360 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70947] New: Incompatible changes in LO behaviour between versions
https://bugs.freedesktop.org/show_bug.cgi?id=70947 Priority: medium Bug ID: 70947 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Incompatible changes in LO behaviour between versions Severity: enhancement Classification: Unclassified OS: All Reporter: t...@tim-passingham.co.uk Hardware: All Status: UNCONFIRMED Version: unspecified Component: Libreoffice Product: LibreOffice A recent change in LO, version 4.1.1, is incompatible with previous versions, and with OO. Anyone using macros in Basic (or presumably other languages) will have to make changes to take account of this. There will be applications that need to run on both older and newer versions of LO. Rather than have two different versions one would want to have one application that changes its behaviour depending on the LO version. Some changes, such as the one in 4.1.1, can be detected by checking on the type of a data item (in this case the Date changed from a Long to a Struct in controls on forms in BASE). Other changes may be less obvious. There should therefore be functions to obtain information about the version, such as GetOfficeVersion and GetOfficeName and GetOfficeVendor. People can then write code that works on the different versions. For changes to behaviour based on types of data items there should also be simple functions to find out what the data type of an item in a control is. This isn't as easy as it seems, since many items are Variant/Empty when uninitialised and there is no difference in data type until one tries to set the contents. A GetDataType function which works in such cases is required (the Basic vartype function does not suffice). I have been given a lot of help from Lionel Mamane in overcoming the compatibility problems between LO 4.1.1 and previous versions, but a more generic set of facilities should be put in place so that application developers do not need to bother your own developers about such issues. He has worked out ways of detecting the data type change, and the LO version, but there are quite difficult, and very obscure. All such incompatible changes need to be flagged in advance and facilities provided for application developers to make appropriate adjustments. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65717] FILEOPEN: DOCX import - picture with 'Square' wrapping style is rendered incorrectly
https://bugs.freedesktop.org/show_bug.cgi?id=65717 Foss f...@openmailbox.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |NOTABUG --- Comment #15 from Foss f...@openmailbox.org --- NOTABUG as of comment 12 and 14. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70925] Advanced filter: case sensitive criterium produces no result
https://bugs.freedesktop.org/show_bug.cgi?id=70925 --- Comment #2 from Dominique Boutry dominique.bout...@laposte.net --- Reproduced with LibO 4.1.2.3 on Win7 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70645] : Sudden erasure of partially completed letter
https://bugs.freedesktop.org/show_bug.cgi?id=70645 --- Comment #1 from Dominique Boutry dominique.bout...@laposte.net --- Are the files sufficiently anonymous to be posted as attachments, so that we can have a glance ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70914] Terribly low performance of selecting/moving/resizing tables and text frames
https://bugs.freedesktop.org/show_bug.cgi?id=70914 --- Comment #1 from Piotr Kołaczkowski pkola...@gmail.com --- Today I noticed another interesting thing. The performance depends on the size of the Impress main window. If I keep it maximized (2560x1600), the performance is terrible like described. If I keep it much smaller, e.g. 1/2 of the full size - it gets acceptable. Still far from responsive, but at least usable. This let me come to an idea of checking what top shows during the process of moving the table. It turned out, Xorg is taking 99% of CPU (when moving table in LO) while LO itself is fine with only about 5-15%. So I guess LO must be doing some heavy refreshing or repainting or some other heavy calls to the graphics pipeline, even though the operation of moving/selecting 2D objects is extremely simple. My slides are nothing fancy, no heavy images, no videos, no embedded objects, mostly academic-style black text on white and a few small tables. Even if you needed to repaint the whole slide in the loop, performance for that kind of complexity should be in thousands FPS, not 0.2 FPS. BTW: I'm neither noticing any performance problems like that with other applications that involve dragging 2D objects or even drawing lots of moving elements games. Ubuntu Unity flies on this hardware and both 2D and 3D acceleration is awesome. glmark2 benchmark results: === glmark2 2012.08 === OpenGL Information GL_VENDOR: NVIDIA Corporation GL_RENDERER: Quadro 1000M/PCIe/SSE2 GL_VERSION:4.3.0 NVIDIA 319.32 === [build] use-vbo=false: FPS: 2259 FrameTime: 0.443 ms [build] use-vbo=true: FPS: 2572 FrameTime: 0.389 ms [texture] texture-filter=nearest: FPS: 2294 FrameTime: 0.436 ms [texture] texture-filter=linear: FPS: 2269 FrameTime: 0.441 ms [texture] texture-filter=mipmap: FPS: 2393 FrameTime: 0.418 ms [shading] shading=gouraud: FPS: 1998 FrameTime: 0.501 ms [shading] shading=blinn-phong-inf: FPS: 2123 FrameTime: 0.471 ms [shading] shading=phong: FPS: 1864 FrameTime: 0.536 ms [bump] bump-render=high-poly: FPS: 1191 FrameTime: 0.840 ms [bump] bump-render=normals: FPS: 2664 FrameTime: 0.375 ms [bump] bump-render=height: FPS: 2584 FrameTime: 0.387 ms [effect2d] kernel=0,1,0;1,-4,1;0,1,0;: FPS: 1102 FrameTime: 0.907 ms [effect2d] kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;: FPS: 462 FrameTime: 2.165 ms [pulsar] light=false:quads=5:texture=false: FPS: 1823 FrameTime: 0.549 ms [desktop] blur-radius=5:effect=blur:passes=1:separable=true:windows=4: FPS: 536 FrameTime: 1.866 ms [desktop] effect=shadow:windows=4: FPS: 1063 FrameTime: 0.941 ms [buffer] columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=map: FPS: 901 FrameTime: 1.110 ms [buffer] columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=subdata: FPS: 1099 FrameTime: 0.910 ms [buffer] columns=200:interleave=true:update-dispersion=0.9:update-fraction=0.5:update-method=map: FPS: 871 FrameTime: 1.148 ms [ideas] speed=duration: FPS: 1591 FrameTime: 0.629 ms [jellyfish] default: FPS: 1058 FrameTime: 0.945 ms [terrain] default: FPS: 117 FrameTime: 8.547 ms [conditionals] fragment-steps=0:vertex-steps=0: FPS: 2094 FrameTime: 0.478 ms [conditionals] fragment-steps=5:vertex-steps=0: FPS: 1564 FrameTime: 0.639 ms [conditionals] fragment-steps=0:vertex-steps=5: FPS: 2117 FrameTime: 0.472 ms [function] fragment-complexity=low:fragment-steps=5: FPS: 2078 FrameTime: 0.481 ms [function] fragment-complexity=medium:fragment-steps=5: FPS: 1902 FrameTime: 0.526 ms [loop] fragment-loop=false:fragment-steps=5:vertex-steps=5: FPS: 2096 FrameTime: 0.477 ms [loop] fragment-steps=5:fragment-uniform=false:vertex-steps=5: FPS: 2109 FrameTime: 0.474 ms [loop] fragment-steps=5:fragment-uniform=true:vertex-steps=5: FPS: 1886 FrameTime: 0.530 ms === glmark2 Score: 1689 === -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs