Re: test infrastructure ideas appreciated ...
$ curl -OL https://llvm.org/svn/llvm-project/openmp/trunk/runtime/tools/check-depends.pl $ curl -OL https://llvm.org/svn/llvm-project/openmp/trunk/runtime/tools/lib/tools.pm $ curl -OL https://llvm.org/svn/llvm-project/openmp/trunk/runtime/tools/lib/Platform.pm $ curl -OL https://llvm.org/svn/llvm-project/openmp/trunk/runtime/tools/lib/Uname.pm $ chmod +x check-depends.pl $ ./check-depends.pl /Applications/LibreOfficeDev.app/Contents/Frameworks/libwpd-0.10.10.dylib check-depends.pl: (x) Fail to parse otool output: check-depends.pl: (x) /Applications/LibreOfficeDev.app/Contents/Frameworks/libwpd-0.10.10.dylib: check-depends.pl: (x) >>> /usr/local/lib/libwpd-0.10.10.dylib (compatibility version 11.0.0, current version 11.0.0) check-depends.pl: (x) /@.__OOO/lib/librevenge-0.0.0.dylib (compatibility version 1.0.0, current version 1.2.0) check-depends.pl: (x) /usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 120.0.0) check-depends.pl: (x) /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1213.0.0) check-depends.pl: (x) (eof) 2015-06-04 21:04 GMT+02:00 Michael Stahl : > On 04.06.2015 18:32, Michael Meeks wrote: > > Hi Robert, > > > > On Wed, 2015-06-03 at 15:44 +0200, Robert Antoni Buj i Gelonch wrote: > >> We could add an automatic validation test for checking the discovery > >> of dynamic library dependencies on OS X & Linux. > >> * OS X: otool -L file > >> * Linux: ldd file > > > > Sounds interesting - the concern would be having added new > > dependencies ? or what could we check with that ? > > that's actually a good idea, as the recent bibisect Linux 5.0 accident > has demonstrated, see also commit > f4844a9abebcb0451161625c42a1e2b48796102d > > we could have a test that runs something like readelf -d | grep > "(NEEDED)", filter out our own libraries, and then filters against a > whilelist of known-good system libraries; anything outside the whitelist > shouldn't be required. > > it might even be useful on Mac OS X: while you do have a proper SDK > there and not a random collection of -devel packages, it might still be > possible that some bundled library's crazy configure script finds some > random stuff installed via Fink/MacPorts/etc., which would cause the > same issues. > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: help needed: hsqldb shutdown race condition, how to fix without deadlock
Hi Lionel, If you considered this, or if I'm wrong, please excuse me. ;-) Regards, Robert 2015-06-03 19:19 GMT+02:00 Robert Antoni Buj i Gelonch : > Hi Lionel, > > I'm not sure if HSQLDB is not using reflection and, the concern code is > not synchronized. > Did you have that in mind? > > Regards, > Robert > > -- > http://about.me/rbuj > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: help needed: hsqldb shutdown race condition, how to fix without deadlock
Hi Lionel, I'm not sure if HSQLDB is not using reflection and, the concern code is not synchronized. Did you have that in mind? Regards, Robert -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: test infrastructure ideas appreciated ...
We could add an automatic validation test for checking the discovery of dynamic library dependencies on OS X & Linux. - OS X: otool -L file - Linux: ldd file 2015-06-03 15:33 GMT+02:00 Michael Meeks : > Hi guys, > > The ESC are interested in improving unit (and other automated) > testing > and are interested in concrete ideas for implementing new automated > tests to prevent regressions. We hope to turn this into a proposal for > the Board, which if approved -could- turn into a tender to fund more > work in this area. Having said that writing unit tests is every > developers' responsibility where feasible - so this ask focuses on new > infrastructure. > > It is noticeable that where there are existing tests & > infrastructure, > new tests are easier to create and often there are more of them - so are > there places where we should work to create infrastructure ? > > Is there something we can improve by throwing hardware at it ? as > we > have done for the crash-testing; if so what hardware is needed ? > > Is there a large area of code that is completely un-tested or > under-tested that you'd love us to invest in making test-able ? > > Is there a test that currently only runs in an obscure setup / > corner-case that we can invest in standardizing and making more easy to > use ? > > Constructive thoughts appreciated in reply here. > > ATB, > > Michael. > > -- > michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About skip SkipImages unit test on MacOs
I attach the bt, if someone is interested I can print the variables of a specific frame. make CppunitTest_sw_globalfilter (lldb) breakpoint set --file /Volumes/Master/lo/core/sw/qa/extras/globalfilter/globalfilter.cxx --line 663 (lldb) run (lldb) breakpoint set --file /Volumes/Master/lo/core/vcl/source/outdev/map.cxx --line 382 --condition "n==9223372036854755805" (lldb) c (lldb) list 386n64 *= nMapNum; 387n64 *= nDPI; 388if( nMapDenom == 1 ) 389 n = (long)n64; 390else 391{ 392 n = (long)(2 * n64 / nMapDenom); (lldb) bt * thread #1: tid = 0x2e6349, 0x000105d3354a libvcllo.dylib`ImplLogicToPixel(n=9223372036854755805, nDPI=72, nMapNum=1, nMapDenom=1600, nThres=64051194700380381) + 170 at map.cxx:382, queue = 'com.apple.main-thread', stop reason = breakpoint 2.1 * frame #0: 0x000105d3354a libvcllo.dylib`ImplLogicToPixel(n=9223372036854755805, nDPI=72, nMapNum=1, nMapDenom=1600, nThres=64051194700380381) + 170 at map.cxx:382 frame #1: 0x000105d37338 libvcllo.dylib`OutputDevice::LogicToPixel(this=0x0001029947f0, rLogicRect=0x7fff5fbecd58) const + 184 at map.cxx:998 frame #2: 0x00010cc8cf27 libswlo.dylib`SwAlignRect(rRect=0x7fff5fbed2d8, pSh=0x000121f06300) + 231 at paintfrm.cxx:1254 frame #3: 0x00010cca874d libswlo.dylib`lcl_CalcBorderRect(rRect=0x7fff5fbed2d8, pFrm=0x000121f085f0, rAttrs=0x00011a10bf18, bShadow=false, properties=0x00010dca4e10) + 3005 at paintfrm.cxx:1512 frame #4: 0x00010cca3d18 libswlo.dylib`SwFrm::GetBackgroundBrush(this=0x000121f085f0, rFillAttributes=0x7fff5fbed2c8, rpBrush=0x7fff5fbed300, rpCol=0x7fff5fbed2f8, rOrigRect=0x7fff5fbed2d8, bLowerMode=false) const + 1736 at paintfrm.cxx:7596 frame #5: 0x00010cca333e libswlo.dylib`SwFlyFrm::IsBackgroundTransparent(this=0x000121f085f0) const + 238 at paintfrm.cxx:3973 frame #6: 0x00010ccb6c65 libswlo.dylib`lcl_RefreshLine(pLay=0x000121f07040, pPage=0x00011a10a000, rP1=0x7fff5fbed838, rP2=0x7fff5fbed808, nSubColor='\x10', pSubsLines=0x00011ebcb7a0) + 1221 at paintfrm.cxx:6858 frame #7: 0x00010ccb620f libswlo.dylib`SwLayoutFrm::PaintSubsidiaryLines(this=0x000121f07040, pPage=0x00011a10a000, rRect=0x7fff5fbede90) const + 1391 at paintfrm.cxx:7175 frame #8: 0x00010cca750d libswlo.dylib`SwLayoutFrm::RefreshLaySubsidiary(this=0x000121f07040, pPage=0x00011a10a000, rRect=0x7fff5fbede90) const + 205 at paintfrm.cxx:6750 frame #9: 0x00010cca572a libswlo.dylib`SwFlyFrm::Paint(this=0x000121f07040, rRect=0x000121f070a0, (null)=0x) const + 5018 at paintfrm.cxx:4333 frame #10: 0x00010ca7be6e libswlo.dylib`SwVirtFlyDrawObj::wrap_DoPaintObject(this=0x000121f07250, rViewInformation=0x0001251e4be8) const + 366 at dflyobj.cxx:486 frame #11: 0x00010ca7bcd7 libswlo.dylib`drawinglayer::primitive2d::SwVirtFlyDrawObjPrimitive::get2DDecomposition(this=0x000102a251f0, rViewInformation=0x0001251e4be8) const + 55 at dflyobj.cxx:240 frame #12: 0x000111ff0e1f libdrawinglayerlo.dylib`drawinglayer::processor2d::VclPixelProcessor2D::processBasePrimitive2D(this=0x0001251e4be0, rCandidate=0x000102a251f0) + 14383 at vclpixelprocessor2d.cxx:1242 frame #13: 0x000111fc4506 libdrawinglayerlo.dylib`drawinglayer::processor2d::BaseProcessor2D::process(this=0x0001251e4be0, rSource=0x7fff5fbef088) + 310 at baseprocessor2d.cxx:64 frame #14: 0x000114a50982 libsvxcorelo.dylib`sdr::contact::ObjectContactOfPageView::DoProcessDisplay(this=0x00010289ade0, rDisplayInfo=0x7fff5fbef2d0) + 2322 at objectcontactofpageview.cxx:301 frame #15: 0x000114a50015 libsvxcorelo.dylib`sdr::contact::ObjectContactOfPageView::ProcessDisplay(this=0x00010289ade0, rDisplayInfo=0x7fff5fbef2d0) + 133 at objectcontactofpageview.cxx:122 frame #16: 0x000114ab1e4a libsvxcorelo.dylib`SdrPageWindow::RedrawLayer(this=0x00012051b1f0, pId=0x7fff5fbef587, pRedirector=0x7fff5fbefeb0) + 618 at sdrpagewindow.cxx:403 frame #17: 0x000114cb693b libsvxcorelo.dylib`SdrPageView::DrawLayer(this=0x000121f10f70, nID='\x01', pGivenTarget=0x0001029947f0, pRedirector=0x7fff5fbefeb0, rRect=0x7fff5fbef678) + 715 at svdpagv.cxx:367 frame #18: 0x00010d302d80 libswlo.dylib`SwViewShellImp::PaintLayer(this=0x000121f06640, _nLayerID='\x01', pPrintData=0x, aPaintRect=0x00011a10a060, _pPageBackgrdColor=0x7fff5fbefd98, _bIsPageRightToLeft=false, pRedirector=0x7fff5fbefeb0) + 1072 at vdraw.cxx:140 frame #19: 0x00010cc98b2c libswlo.dylib`SwRootFrm::Paint(this=0x000121f06700, rRect=0x7fff5fbf0370, pPrintData=0x) const + 6508 at paintfrm.cxx:3417 frame #20: 0x00010d3118ce libswlo.dylib`SwViewShell::Paint(this=0x000121f06300, rRenderContext=0x0001
Re: About skip SkipImages unit test on MacOs
Thanks Markus, I saw that n=9223372036854755805 before to fail. Now, I'm going to examine where it comes from. * thread #1: tid = 0x2c7680, 0x0001064bb54a libvcllo.dylib`ImplLogicToPixel(n=9223372036854755805, nDPI=72, nMapNum=1, nMapDenom=1600, nThres=64051194700380381) + 170 at map.cxx:382, queue = 'com.apple.main-thread', stop reason = breakpoint 2.1 frame #0: 0x0001064bb54a libvcllo.dylib`ImplLogicToPixel(n=9223372036854755805, nDPI=72, nMapNum=1, nMapDenom=1600, nThres=64051194700380381) + 170 at map.cxx:382 379 #else 380 assert(nMapNum >= 0); 381 assert(nDPI > 0); -> 382 assert(nMapNum == 0 || std::abs(n) < std::numeric_limits::max() / nMapNum / nDPI); //detect overflows 383 #endif 384 { 385sal_Int64 n64 = n; (lldb) Process 13744 resuming Assertion failed: (nMapNum == 0 || std::abs(n) < std::numeric_limits::max() / nMapNum / nDPI), function ImplLogicToPixel, file /Volumes/Master/lo/core/vcl/source/outdev/map.cxx, line 382. Process 13744 stopped * thread #1: tid = 0x2c7680, 0x7fff88a53286 libsystem_kernel.dylib`__pthread_kill + 10, queue = 'com.apple.main-thread', stop reason = signal SIGABRT frame #0: 0x7fff88a53286 libsystem_kernel.dylib`__pthread_kill + 10 libsystem_kernel.dylib`__pthread_kill: -> 0x7fff88a53286 <+10>: jae0x7fff88a53290; <+20> 0x7fff88a53288 <+12>: movq %rax, %rdi 0x7fff88a5328b <+15>: jmp0x7fff88a4ec53; cerror_nocancel 0x7fff88a53290 <+20>: retq 2015-06-02 22:53 GMT+02:00 Markus Mohrhard : > Hey, > > On Tue, Jun 2, 2015 at 10:46 PM, Robert Antoni Buj i Gelonch < > robert@gmail.com> wrote: > >> Hi, I can move forward until aEnv.startLoading() >> >> Process 13147 stopped >> * thread #1: tid = 0x2c50ef, 0x0001173583dc >> libfwklo.dylib`framework::LoadEnv::loadComponentFromURL(xLoader=0x7fff5fbf3758, >> xContext=0x0001087913d0, sURL=0x7fff5fbf4b00, >> sTarget=0x7fff5fbf40b8, nFlags=0, lArgs=0x7fff5fbf40b0) + 268 at >> loadenv.cxx:164, queue = 'com.apple.main-thread', stop reason = step over >> frame #0: 0x0001173583dc >> libfwklo.dylib`framework::LoadEnv::loadComponentFromURL(xLoader=0x7fff5fbf3758, >> xContext=0x0001087913d0, sURL=0x7fff5fbf4b00, >> sTarget=0x7fff5fbf40b8, nFlags=0, lArgs=0x7fff5fbf40b0) + 268 at >> loadenv.cxx:164 >>161sTarget, >>162nFlags, >>163LoadEnv::E_NO_FEATURE); >> -> 164 aEnv.startLoading(); >>165 aEnv.waitWhileLoading(); // wait for ever! >>166 >>167 xComponent = aEnv.getTargetComponent(); >> (lldb) n >> warn:legacy.osl:13147:1:oox/source/helper/graphichelper.cxx:117: >> GraphicHelper::GraphicHelper - cannot get target frame >> warn:vcl.window:13147:1:vcl/source/window/window.cxx:3353: ignoring >> DeploymentException "component context fails to supply service >> 'com.sun.star.datatransfer.clipboard.SystemClipboard' of type >> 'com.sun.star.datatransfer.clipboard.XSystemClipboard'" >> warn:sfx.sidebar:13147:1:sfx2/source/sidebar/SidebarController.cxx:743: >> Cannot create panel: >> Assertion failed: (nMapNum == 0 || std::abs(n) < >> std::numeric_limits::max() / nMapNum / nDPI), function >> ImplLogicToPixel, file /Volumes/Master/lo/core/vcl/source/outdev/map.cxx, >> line 382. >> Process 13147 stopped >> * thread #1: tid = 0x2c50ef, 0x7fff88a53286 >> libsystem_kernel.dylib`__pthread_kill + 10, queue = >> 'com.apple.main-thread', stop reason = signal SIGABRT >> frame #0: 0x00007fff88a53286 libsystem_kernel.dylib`__pthread_kill + >> 10 >> libsystem_kernel.dylib`__pthread_kill: >> -> 0x7fff88a53286 <+10>: jae0x7fff88a53290; <+20> >> 0x7fff88a53288 <+12>: movq %rax, %rdi >> 0x7fff88a5328b <+15>: jmp0x7fff88a4ec53; >> cerror_nocancel >> 0x7fff88a53290 <+20>: retq >> >> >> 2015-06-02 20:16 GMT+02:00 Robert Antoni Buj i Gelonch < >> robert@gmail.com>: >> >>> >>> so this smells like the issue discussed in < >>>> https://bugs.documentfoundation.org/show_bug.cgi?id=90502> "CRASH - >>>> failed assertion in unittest sw_globalfilter in master build OSX," and the >>>> working hypothesis would be that your tb's failure symptoms are the >>>> non-debug manifestation of the same underlying problem that manifests as >>>> tdf#9
Re: About skip SkipImages unit test on MacOs
Hi, I can move forward until aEnv.startLoading() Process 13147 stopped * thread #1: tid = 0x2c50ef, 0x0001173583dc libfwklo.dylib`framework::LoadEnv::loadComponentFromURL(xLoader=0x7fff5fbf3758, xContext=0x0001087913d0, sURL=0x7fff5fbf4b00, sTarget=0x7fff5fbf40b8, nFlags=0, lArgs=0x7fff5fbf40b0) + 268 at loadenv.cxx:164, queue = 'com.apple.main-thread', stop reason = step over frame #0: 0x0001173583dc libfwklo.dylib`framework::LoadEnv::loadComponentFromURL(xLoader=0x7fff5fbf3758, xContext=0x0001087913d0, sURL=0x7fff5fbf4b00, sTarget=0x7fff5fbf40b8, nFlags=0, lArgs=0x7fff5fbf40b0) + 268 at loadenv.cxx:164 161sTarget, 162nFlags, 163LoadEnv::E_NO_FEATURE); -> 164 aEnv.startLoading(); 165 aEnv.waitWhileLoading(); // wait for ever! 166 167 xComponent = aEnv.getTargetComponent(); (lldb) n warn:legacy.osl:13147:1:oox/source/helper/graphichelper.cxx:117: GraphicHelper::GraphicHelper - cannot get target frame warn:vcl.window:13147:1:vcl/source/window/window.cxx:3353: ignoring DeploymentException "component context fails to supply service 'com.sun.star.datatransfer.clipboard.SystemClipboard' of type 'com.sun.star.datatransfer.clipboard.XSystemClipboard'" warn:sfx.sidebar:13147:1:sfx2/source/sidebar/SidebarController.cxx:743: Cannot create panel: Assertion failed: (nMapNum == 0 || std::abs(n) < std::numeric_limits::max() / nMapNum / nDPI), function ImplLogicToPixel, file /Volumes/Master/lo/core/vcl/source/outdev/map.cxx, line 382. Process 13147 stopped * thread #1: tid = 0x2c50ef, 0x7fff88a53286 libsystem_kernel.dylib`__pthread_kill + 10, queue = 'com.apple.main-thread', stop reason = signal SIGABRT frame #0: 0x7fff88a53286 libsystem_kernel.dylib`__pthread_kill + 10 libsystem_kernel.dylib`__pthread_kill: -> 0x7fff88a53286 <+10>: jae0x7fff88a53290; <+20> 0x7fff88a53288 <+12>: movq %rax, %rdi 0x7fff88a5328b <+15>: jmp0x7fff88a4ec53 ; cerror_nocancel 0x7fff88a53290 <+20>: retq 2015-06-02 20:16 GMT+02:00 Robert Antoni Buj i Gelonch : > > so this smells like the issue discussed in < >> https://bugs.documentfoundation.org/show_bug.cgi?id=90502> "CRASH - >> failed assertion in unittest sw_globalfilter in master build OSX," and the >> working hypothesis would be that your tb's failure symptoms are the >> non-debug manifestation of the same underlying problem that manifests as >> tdf#90502 in some people's debug/dbgutil builds > > > (lldb) breakpoint set --file > /Volumes/Master/lo/core/sw/qa/extras/globalfilter/globalfilter.cxx --line > 663 > Breakpoint 1: no locations (pending). > WARNING: Unable to resolve breakpoint to any actual locations. > (lldb) run > Process 11213 launched: > '/Volumes/Master/lo/core/workdir/LinkTarget/Executable/cppunittester' > (x86_64) > 1 location added to breakpoint 1 > ... > Process 11213 stopped* thread #1: tid = 0x2be3ac, 0x00010b9e83e6 > libtest_sw_globalfilter.dylib`Test::testSkipImages() at string:2053, queue > = 'com.apple.main-thread', stop reason = breakpoint 1.1 > frame #0: 0x00010b9e83e6 > libtest_sw_globalfilter.dylib`Test::testSkipImages() at string:2053 >2050 basic_string<_CharT, _Traits, _Allocator>::basic_string(const > value_type* __s) >2051 { >2052_LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*) > detected nullptr"); > -> 2053__init(__s, traits_type::length(__s)); >2054 #if _LIBCPP_DEBUG_LEVEL >= 2 >2055__get_db()->__insert_c(this); >2056 #endif > (lldb) n > Process 11213 stopped > * thread #1: tid = 0x2be3ac, 0x00010b9e83fb > libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0) > + 75 at globalfilter.cxx:668, queue = 'com.apple.main-thread', stop reason > = step over > frame #0: 0x00010b9e83fb > libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0) > + 75 at globalfilter.cxx:668 >665 // Check how LO skips image loading (but not texts of > textboxes and custom shapes) >666 // during DOC and DOCX import, using the "SkipImages" > FilterOptions. >667 > -> 668 const char* aFilterNames[][2] = { >669 { "/sw/qa/extras/globalfilter/data/skipimages.doc", NULL }, >670 { "/sw/qa/extras/globalfilter/data/skipimages.doc", > "SkipImages" }, >671 { "/sw/qa/extras/globalfilter/data/skipimages.docx", NULL > }, > (lldb) n > Process 11213 stopped > * thread #1: tid = 0x
Re: About skip SkipImages unit test on MacOs
> so this smells like the issue discussed in < > https://bugs.documentfoundation.org/show_bug.cgi?id=90502> "CRASH - > failed assertion in unittest sw_globalfilter in master build OSX," and the > working hypothesis would be that your tb's failure symptoms are the > non-debug manifestation of the same underlying problem that manifests as > tdf#90502 in some people's debug/dbgutil builds (lldb) breakpoint set --file /Volumes/Master/lo/core/sw/qa/extras/globalfilter/globalfilter.cxx --line 663 Breakpoint 1: no locations (pending). WARNING: Unable to resolve breakpoint to any actual locations. (lldb) run Process 11213 launched: '/Volumes/Master/lo/core/workdir/LinkTarget/Executable/cppunittester' (x86_64) 1 location added to breakpoint 1 ... Process 11213 stopped* thread #1: tid = 0x2be3ac, 0x00010b9e83e6 libtest_sw_globalfilter.dylib`Test::testSkipImages() at string:2053, queue = 'com.apple.main-thread', stop reason = breakpoint 1.1 frame #0: 0x00010b9e83e6 libtest_sw_globalfilter.dylib`Test::testSkipImages() at string:2053 2050 basic_string<_CharT, _Traits, _Allocator>::basic_string(const value_type* __s) 2051 { 2052_LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*) detected nullptr"); -> 2053__init(__s, traits_type::length(__s)); 2054 #if _LIBCPP_DEBUG_LEVEL >= 2 2055__get_db()->__insert_c(this); 2056 #endif (lldb) n Process 11213 stopped * thread #1: tid = 0x2be3ac, 0x00010b9e83fb libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0) + 75 at globalfilter.cxx:668, queue = 'com.apple.main-thread', stop reason = step over frame #0: 0x00010b9e83fb libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0) + 75 at globalfilter.cxx:668 665 // Check how LO skips image loading (but not texts of textboxes and custom shapes) 666 // during DOC and DOCX import, using the "SkipImages" FilterOptions. 667 -> 668 const char* aFilterNames[][2] = { 669 { "/sw/qa/extras/globalfilter/data/skipimages.doc", NULL }, 670 { "/sw/qa/extras/globalfilter/data/skipimages.doc", "SkipImages" }, 671 { "/sw/qa/extras/globalfilter/data/skipimages.docx", NULL }, (lldb) n Process 11213 stopped * thread #1: tid = 0x2be3ac, 0x00010b9e844f libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0) + 159 at globalfilter.cxx:675, queue = 'com.apple.main-thread', stop reason = step over frame #0: 0x00010b9e844f libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0) + 159 at globalfilter.cxx:675 672 { "/sw/qa/extras/globalfilter/data/skipimages.docx", "SkipImages" } 673 }; 674 -> 675 for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames); ++nFilter ) 676 { 677 bool bSkipImages = aFilterNames[nFilter][1] != NULL; 678 OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter][0]; (lldb) n Process 11213 stopped * thread #1: tid = 0x2be3ac, 0x00010b9e846b libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0) + 187 at globalfilter.cxx:677, queue = 'com.apple.main-thread', stop reason = step over frame #0: 0x00010b9e846b libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0) + 187 at globalfilter.cxx:677 674 675 for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames); ++nFilter ) 676 { -> 677 bool bSkipImages = aFilterNames[nFilter][1] != NULL; 678 OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter][0]; 679 680 if (mxComponent.is()) (lldb) n Process 11213 stopped * thread #1: tid = 0x2be3ac, 0x00010b9e8485 libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0) + 213 at globalfilter.cxx:678, queue = 'com.apple.main-thread', stop reason = step over frame #0: 0x00010b9e8485 libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0) + 213 at globalfilter.cxx:678 675 for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames); ++nFilter ) 676 { 677 bool bSkipImages = aFilterNames[nFilter][1] != NULL; -> 678 OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter][0]; 679 680 if (mxComponent.is()) 681 mxComponent->dispose(); (lldb) n Process 11213 stopped * thread #1: tid = 0x2be3ac, 0x00010b9e84ff libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0) + 335 at globalfilter.cxx:680, queue = 'com.apple.main-thread', stop reason = step over frame #0: 0x00010b9e84ff libtest_sw_globalfilter.dylib`Test::testSkipImages(this=0x000108bb73b0) + 335 at globalfilter.cxx:680 677 bool bSkipImages = aFilterNames[nFilter][1] != NULL; 678 OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter][0]; 679 -> 680 if (mxComponent.is
Re: About skip SkipImages unit test on MacOs
Ok, thanks for the info. 2015-06-02 14:06 GMT+02:00 julien2412 : > Robert Antoni wrote > > OK, I'm going to build a debug build from scratch. > > Just for information, you may encounter > https://bugs.documentfoundation.org/show_bug.cgi?id=90502 which has > prevented me to build a full "enable-dbg-util build" on MacOs since weeks. > However, if it's the case, you may also disable this test temporarily > > Julien > > > > > -- > View this message in context: > http://nabble.documentfoundation.org/About-skip-SkipImages-unit-test-on-MacOs-tp4149788p4150306.html > Sent from the Dev mailing list archive at Nabble.com. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About skip SkipImages unit test on MacOs
OK, I'm going to build a debug build from scratch. make distclean ./autogen.sh --enable-debug \ --with-vendor="Robert Buj Gelonch" \ --with-macosx-sdk=10.10 \ --with-macosx-version-min-required=10.10 \ --disable-gtk \ --enable-firebird-sdbc \ --enable-extension-integration \ --enable-ext-nlpsolver \ --enable-ext-wiki-publisher \ --with-help \ --with-myspell-dicts \ --enable-python=internal \ --enable-epm \ --with-package-format=dmg \ --with-external-tar=/Volumes/Data/Users/tb/external_tar \ --srcdir=/Volumes/Master/lo/core \ --enable-verbose \ --enable-dependency-tracking \ --disable-ccache \ --with-parallelism=2 \ --enable-bogus-pkg-config \ --disable-cve-tests \ --enable-odk \ --disable-online-update \ --without-system-odbc make 2015-06-02 11:44 GMT+02:00 Stephan Bergmann : > On 06/02/2015 11:36 AM, Robert Antoni Buj i Gelonch wrote: > >> (lldb) run >> > > Just doing "run" in the debugger is not helpful here; rather, you need to > break where the loadComponentFromURL call is made and step into that and > hope you find the reason why it returns null before you get lost. (Or, > alternatively, use a debug or dbgutil build and hope that there are some > enlightening SAL_WARNs emitted along the way.) > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About skip SkipImages unit test on MacOs
By running "/Volumes/Master/lo/core/instdir/LibreOfficeDev.app/Contents/MacOS/soffice /Volumes/Master/lo/core//sw/qa/extras/globalfilter/data/skipimages.docx", EMF+ image is not displayed, however LO is able to open skipimages.docx. make CppunitTest_sw_globalfilter /Applications/Xcode.app/Contents/Developer/usr/bin/make -j 2 -r -f /Volumes/Master/lo/core/Makefile.gbuild CppunitTest_sw_globalfilter [build CXX] unotest/source/cpp/macros_test.cxx S=/Volumes/Master/lo/core && I=$S/instdir && W=$S/workdir && mkdir -p $W/CxxObject/unotest/source/cpp/ $W/Dep/CxxObject/unotest/source/cpp/ && cd /Volumes/Master/lo/core && /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -m64 -stdlib=libc++ -mmacosx-version-min=10.10 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -DCPPU_ENV=gcc3 -DMACOSX -DMACOSX_SDK_VERSION=101000 -DMAC_OS_X_VERSION_MAX_ALLOWED=101000 -DMAC_OS_X_VERSION_MIN_REQUIRED=101000 -DNDEBUG -DNO_PTHREAD_PRIORITY -DOPTIMIZE -DOSL_DEBUG_LEVEL=0 -DUNIX -DUNX -DX86_64 -D_PTHREADS -D_REENTRANT -DOOO_DLLIMPLEMENTATION_UNOTEST -DHAVE_GCC_VISIBILITY_FEATURE -fvisibility=hidden -Wall -Wno-missing-braces -Wnon-virtual-dtor -Wendif-labels -Wextra -Wundef -Wunused-macros -fmessage-length=0 -fno-common -pipe -fvisibility-inlines-hidden -fstack-protector-strong -fPIC -Woverloaded-virtual -Wshadow -Wno-ctor-dtor-privacy -fno-strict-aliasing -fsigned-char -std=gnu++11 -DEXCEPTIONS_ON -fexceptions -O2 -DLIBO_INTERNAL_ONLY -c $S/unotest/source/cpp/macros_test.cxx -o $W/CxxObject/unotest/source/cpp/macros_test.o -MMD -MT $W/CxxObject/unotest/source/cpp/macros_test.o -MP -MF $W/Dep/CxxObject/unotest/source/cpp/macros_test.d_ -I$S/unotest/source/cpp/ -I$W/UnpackedTarball/cppunit/include -I$W/UnpackedTarball/boost -I$S/include -I/Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/include -I/Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/include/darwin -I$S/config_host -I$W/UnoApiHeadersTarget/udkapi/normal -I$W/UnoApiHeadersTarget/offapi/normal&& mv $W/Dep/CxxObject/unotest/source/cpp/macros_test.d_ $W/Dep/CxxObject/unotest/source/cpp/macros_test.d [build DEP] LNK:Library/libunotest.dylib [build LNK] Library/libunotest.dylib S=/Volumes/Master/lo/core && I=$S/instdir && W=$S/workdir && mkdir -p $W/Dep/LinkTarget/Library/ && RESPONSEFILE=/var/folders/ln/gk5trbq569981lsbt6t3lgq4gr/T/gbuild..GsoBj3fu && DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}"$I/LibreOfficeDev.app/Contents/Frameworks:$I/LibreOfficeDev.app/Contents/Frameworks" $W/LinkTarget/Executable/concat-deps ${RESPONSEFILE} > $W/Dep/LinkTarget/Library/libunotest.dylib.d.tmp && rm -f ${RESPONSEFILE} mv /Volumes/Master/lo/core/workdir/Dep/LinkTarget/Library/libunotest.dylib.d.tmp /Volumes/Master/lo/core/workdir/Dep/LinkTarget/Library/libunotest.dylib.d S=/Volumes/Master/lo/core && I=$S/instdir && W=$S/workdir && /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -m64 -stdlib=libc++ -mmacosx-version-min=10.10 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -dynamiclib -single_module -install_name '@__NONE/libunotest.dylib' -fstack-protector-strong -L$W/LinkTarget/StaticLibrary -L$W/LinkTarget/Library -L$I/LibreOfficeDev.app/Contents/Frameworks -L$I/LibreOfficeDev.app/Contents/Frameworks -L$W/LinkTarget/Library -lcomphelper -luno_cppor-strong -L$W/LinkTarget/StaticLibrary -L$W/LinkTarget/Library -L$I/LibreOfficeDev.app/Contents/Frameworks -L$I/LibreOfficeDev.app/Contents/Frameworks -L$W/LinkTarget/Library -lcomphelper -luno_cpprotector-strong -L$W/LinkTarget/StaticLibrary -L$W/LinkTarget/Library -L$I/LibreOfficeDev.app/Contents/Frameworks -L$I/LibreOfficeDev.app/Contents/Frameworks -L$W/LinkTarget/Library -lcomphelper -luno_cppu -luno_cppuhelpergcc3 -luno_sal -lsblo $W/CxxObject/unotest/source/cpp/bootstrapfixturebase.o $W/CxxObject/unotest/source/cpp/filters-test.o $W/CxxObject/unotest/source/cpp/getargument.o $W/CxxObject/unotest/source/cpp/gettestargument.o $W/CxxObject/unotest/source/cpp/macros_test.o $W/CxxObject/unotest/source/cpp/officeconnection.o $W/CxxObject/unotest/source/cpp/toabsolutefileurl.o $W/CxxObject/unotest/source/cpp/uniquepipename.o -L$W/UnpackedTarball/cppunit/src/cppunit/.libs -lcppunit -o $W/LinkTarget/Library/libunotest.dylib && : && /usr/bin/perl $S/solenv/bin/macosx-change-install-names.pl shl NONE $W/LinkTarget/Library/libunotest.dylib && otool -l $W/LinkTarget/Library/libunotest.dylib | grep -A 5 LC_ID_DYLIB > $W/LinkTarget/Library/libunotest.dylib.exports.tmp && /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm -g -P $W/LinkTarget/Library/libunotest.dylib | cut -d' ' -f1-2 | grep -v U$ >> $W/LinkTarget/Library/libunotest.dylib.exports.tmp && if cmp -s $W/LinkTarge
Re: About skip SkipImages unit test on MacOs
Hi Julien, I think that the packaging issue, it's related with the system cache which is periodically purged by OS, or something similar. I didn't do anything to solve booth issues: I executed "make distclean". Next, I rebooted the machine, and I executed these commands: diskutil erasevolume HFS+ 'RamDisk' `hdiutil attach -nomount ram://16777216` ln -s /Volumes/RamDisk /Volumes/Master/lo/core/workdir ~/buildbot/tb/tb -v Regards, Robert 2015-05-29 10:47 GMT+02:00 julien2412 : > Robert Antoni wrote > > I shut down the tb61 yesterday, I'm going to put it up and running again. > > ... > > Hi Robert, > > Your TB is now up and ok. Good thing! : ) > > Just for curiosity, did you change something on it? (hardware/soft, runned > a > make clean ...) > Indeed, there was this pb: > ERROR: ERROR: Found an error in the logfile. Packaging failed. at > /Volumes/Master/lo/core/solenv/bin/modules/installer/worker.pm line 165. > and I didn't see (perhaps missed) a commit which could have fix this. > > The goal of my questions is to know if it's possible to reenable SkipImages > unit test on MacOs. > > Julien > > > > -- > View this message in context: > http://nabble.documentfoundation.org/About-skip-SkipImages-unit-test-on-MacOs-tp4149788p4149865.html > Sent from the Dev mailing list archive at Nabble.com. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About skip SkipImages unit test on MacOs
Hi, I shut down the tb61 yesterday, I'm going to put it up and running again. If there is someone who wants that I shut it down, please reply this thread. Regards, Robert 2015-05-28 19:09 GMT+02:00 julien2412 : > Hi, > > I just wanted to communicate about the patch > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=be01d68420086fc36ecf26b5f597ba7c6b29b369 > to make it more visible (because I dislike hiding a bug): > > As I indicated, it concerns only 1 TB in Mac, for the record here is the > error reported: > 901 [build LNK] CppunitTest/libtest_sc_filters_test.dylib > 902 > > /Volumes/Master/lo/core/unotest/source/cpp/macros_test.cxx:52:Test::testSkipImages > 903 NEXTassertion failed > 904 - Expression: xComponent.is() > 905 NEXT- loading failed: > > file:///Volumes/Master/lo/core//sw/qa/extras/globalfilter/data/skipimages.docx > 906 > 907 unknown:0:Test::testSkipImages > 908 NEXTtearDown() failed > 909 NEXT- An uncaught exception of type > com.sun.star.lang.DisposedException > 910 - > 911 > 912 NEXT > /Volumes/Master/lo/core/unotest/source/cpp/macros_test.cxx:52: > Assertion > 913 Test name: Test::testSkipImages > 914 NEXTassertion failed > 915 - Expression: xComponent.is() > 916 NEXT- loading failed: > > file:///Volumes/Master/lo/core//sw/qa/extras/globalfilter/data/skipimages.docx > 917 > 918 NEXT##Failure Location unknown## : Error > 919 Test name: Test::testSkipImages > 920 NEXTtearDown() failed > 921 NEXT- An uncaught exception of type > com.sun.star.lang.DisposedException > 922 - > 923 > 924 Failures !!! > 925 Run: 8 Failure total: 2 Failures: 1 Errors: 1 > 926 2015-05-26 18:53:02.338 cppunittester[1430:650077] *** > -[NSAutoreleasePool release]: This pool has already been released, do not > drain it (double release). > As I indicated in the comment: > "If someone wants to revert it go ahead but in this case, please either fix > the problem or disable this TB for the moment, thank you" > > Now there's another error in this TB but that's another story. > > Julien > > > > -- > View this message in context: > http://nabble.documentfoundation.org/About-skip-SkipImages-unit-test-on-MacOs-tp4149788.html > Sent from the Dev mailing list archive at Nabble.com. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Package building reduces the lifetime of the SSD drives
First, I'm going to do manually; PHASE 1: Inital Ram Disk 1.- Create Ram Disk & symlink to workdir $ diskutil erasevolume HFS+ 'RAM Disk' `hdiutil attach -nomount ram://1200` $ ln -s /Volumes/RAM\ Disk /path_to_git_folder/workdir 2.- Build 3.- Backup Ramdisk => dmg file $ mount . . . /dev/{device number} on /Volumes/RAM Disk (hfs, local, nodev, nosuid, noowners, mounted by tb) $ sudo hdiutil create /path_to_dmg_file/RAM\ Disk.dmg -srcdevice /dev/{device number} 4.- Delete Ram Disk: $ umount -f /Volumes/RAM\ Disk $ hdiutl detach /Volumes/RAM\ Disk PHASE 2 5.- Do [1] 6.- Restore dmg file => RAM\ Disk Volume $ sudo asr restore -source /path_to_dmg_file/RAM\ Disk.dmg --target /Volumes/RAM\ Disk -noprompt -noverify -erase 7.- Repeat [2] 8.- Do [3] 2015-02-23 22:55 GMT+01:00 Norbert Thiebaud : > On Mon, Feb 23, 2015 at 3:44 PM, Robert Antoni Buj i Gelonch > wrote: > > Does we still use [1] for OS X tinderboxes? > > nope.. not for 3 years or so... > > but its replacement 'tb' is quite flexible and I have used the > possibilities to customize the different 'phases' to indeed use a > ramdisk (or do pretty much anything you fancy really) > > I also use a massive ramdisk (23GB) to build release version for the > 32 bits release... not for fear of harming my ssd, but because > localization build where horrendously slow without it (14 hours build > => 2 hours build), due to HFS sucking very hard. > > Norbert > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Package building reduces the lifetime of the SSD drives
We can use tempfs in Linux (mount -o size=1G -t tmpfs none /mnt/tmpfs) 2015-02-23 11:31 GMT+01:00 Jonathan Aquilina : > In terms of a ram disk I have that done in particular when compiling from > source on gentoo. I think the biggest OS to ask how to do that on is > Windows. > > On Mon, Feb 23, 2015 at 11:22 AM, Noel Grandin > wrote: > >> >> >> On 2015-02-23 12:14 PM, Robert Antoni Buj i Gelonch wrote: >> >>> There are a lot of copy operations before to package LO. I propose you >>> copy the files to package into a temporary ramdisk. >>> >>> Creation of 1GB ramdisk in OS X: >>> >> >> And how do you propose to that under Windows and Linux? >> ___ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/libreoffice >> > > > > -- > Jonathan Aquilina > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Package building reduces the lifetime of the SSD drives
There are a lot of copy operations before to package LO. I propose you copy the files to package into a temporary ramdisk. Creation of 1GB ramdisk in OS X: $ diskutil erasevolume HFS+ 'LORAMDisk' `hdiutil attach -nomount ram://2097152` Deletion: umount -f /Volumes/LORAMDisk hdiutl detach /Volumes/LORAMDisk Regards, Robert -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/python3
external/python3/ExternalProject_python3.mk |4 1 file changed, 4 insertions(+) New commits: commit 40432ac6caa478474d73786f95b808c14e106ff2 Author: Robert Antoni Buj i Gelonch Date: Sun Nov 2 16:42:47 2014 +0100 pyhon: add lib-dynload libs to fixinstallnames (OS X) Change-Id: Iab76060952ae8c1b64d3ff32e5ae8f5212e016b0 Signed-off-by: Stephan Bergmann diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 045892e..12a88c1 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -128,6 +128,10 @@ $(call gb_ExternalProject_get_state_target,python3,fixinstallnames) : $(call gb_ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ @executable_path/../../../../LibreOfficePython \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython + for file in $(shell find $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload -name "*.so") ; do \ + $(INSTALL_NAME_TOOL) -change \ + $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ + @loader_path/../../../LibreOfficePython $$file ; done touch $@ # also delete binaries that are symlinked in scp2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/coinmp
external/coinmp/UnpackedTarball_coinmp.mk |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit b943150fe84a0158546b6a00ee330ea503c02359 Author: Robert Antoni Buj i Gelonch Date: Sun Oct 19 16:27:58 2014 +0200 coinmp: conditional patch Change-Id: I33927632173d422d04771f550721dba1767cded5 Reviewed-on: https://gerrit.libreoffice.org/12040 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk index ef70c5c..95e40e7 100644 --- a/external/coinmp/UnpackedTarball_coinmp.mk +++ b/external/coinmp/UnpackedTarball_coinmp.mk @@ -21,9 +21,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\ external/coinmp/werror-format-security.patch.0 \ external/coinmp/werror-undef.patch.0 \ external/coinmp/coinmp-msvc-disable-sse2.patch.1 \ - $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \ + $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1 \ + $(if $(filter 120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1) \ + ) \ $(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \ - $(if $(filter MSC,$(COM)),$(if $(filter 120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1)) \ )) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/apache-commons
external/apache-commons/ExternalProject_apache_commons_codec.mk | 11 +++--- 1 file changed, 8 insertions(+), 3 deletions(-) New commits: commit 04d4b703a0cad67ddbb149303e73bc722cd06884 Author: Robert Antoni Buj i Gelonch Date: Mon Oct 27 19:52:51 2014 +0100 Apache Commons Codec 1.9 at least requires Java 1.6 and non debug version Change-Id: Ie7834a908c8b19cfa46d71ff6fd712e10bbe8fbb Reviewed-on: https://gerrit.libreoffice.org/12115 Tested-by: LibreOffice gerrit bot Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/external/apache-commons/ExternalProject_apache_commons_codec.mk b/external/apache-commons/ExternalProject_apache_commons_codec.mk index 2135cb4..aedda04 100644 --- a/external/apache-commons/ExternalProject_apache_commons_codec.mk +++ b/external/apache-commons/ExternalProject_apache_commons_codec.mk @@ -22,10 +22,15 @@ $(call gb_ExternalProject_get_state_target,apache_commons_codec,build) : -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ - ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ - -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ,$(if $(filter TRUE,$(HAVE_JAVA6)) \ + ,-Dcompile.source=1.6 -Dcompile.target=1.6 \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ ) \ - $(if $(debug),-Dbuild.debug="on") \ + $(if $(filter TRUE,$(HAVE_JAVA6)) \ + ,$(if $(debug),-Dcompile.debug="true",-Dcompile.debug="false") \ + ,$(if $(debug),-Dbuild.debug="on") \ +) \ jar \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/apache-commons
external/apache-commons/ExternalProject_apache_commons_logging.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c17f215c613d9da9c0cd30d6597fefcfa37be76e Author: Robert Antoni Buj i Gelonch Date: Tue Oct 28 10:53:41 2014 +0100 Apache Commons Logging 1.2 - re-enable the non debug version. Change-Id: Ib0f3b3a650b7f72c7942f8b72420e33743ff9c44 Reviewed-on: https://gerrit.libreoffice.org/12123 Tested-by: LibreOffice gerrit bot Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/external/apache-commons/ExternalProject_apache_commons_logging.mk b/external/apache-commons/ExternalProject_apache_commons_logging.mk index afb2f01..ed9e536 100644 --- a/external/apache-commons/ExternalProject_apache_commons_logging.mk +++ b/external/apache-commons/ExternalProject_apache_commons_logging.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) : ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.target=$(JAVA_TARGET_VER) \ ) \ - $(if $(debug),-Dbuild.debug="on") \ + $(if $(debug),-Dcompile.debug="true",-Dcompile.debug="false") \ compile build-jar \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/apache-commons
external/apache-commons/ExternalProject_apache_commons_lang.mk | 11 +++--- external/apache-commons/UnpackedTarball_apache_commons_lang.mk |6 + external/apache-commons/patches/lang.patch | 11 ++ 3 files changed, 25 insertions(+), 3 deletions(-) New commits: commit 89db5b5b88508e55bce50240d248dd26053f4e09 Author: Robert Antoni Buj i Gelonch Date: Mon Oct 27 21:33:11 2014 +0100 Apache Commons Lang 3.3.1 at least requires Java 1.6 and non debug version Change-Id: If6526a9170f90227fff6b148f24a0dc99ff42941 Reviewed-on: https://gerrit.libreoffice.org/12116 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/external/apache-commons/ExternalProject_apache_commons_lang.mk b/external/apache-commons/ExternalProject_apache_commons_lang.mk index aadd733..c180a89 100644 --- a/external/apache-commons/ExternalProject_apache_commons_lang.mk +++ b/external/apache-commons/ExternalProject_apache_commons_lang.mk @@ -22,10 +22,15 @@ $(call gb_ExternalProject_get_state_target,apache_commons_lang,build) : -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ - ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ - -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ,$(if $(filter TRUE,$(HAVE_JAVA6)) \ +,-Dcompile.source=1.6 -Dcompile.target=1.6 \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ ) \ - $(if $(debug),-Dbuild.debug="on") \ + $(if $(filter TRUE,$(HAVE_JAVA6)) \ + ,$(if $(debug),-Dcompile.debug="true") \ + ,$(if $(debug),-Dbuild.debug="on") \ +) \ jar \ ) diff --git a/external/apache-commons/UnpackedTarball_apache_commons_lang.mk b/external/apache-commons/UnpackedTarball_apache_commons_lang.mk index 9b9f077..7d227ac 100644 --- a/external/apache-commons/UnpackedTarball_apache_commons_lang.mk +++ b/external/apache-commons/UnpackedTarball_apache_commons_lang.mk @@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_lang)) $(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_lang,$(APACHE_COMMONS_LANG_TARBALL),,apache-commons)) +$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_lang,\ +$(if $(filter TRUE,$(HAVE_JAVA6)) \ + ,external/apache-commons/patches/lang.patch \ + ) \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/apache-commons/patches/lang.patch b/external/apache-commons/patches/lang.patch new file mode 100644 index 000..3e5d442 --- /dev/null +++ b/external/apache-commons/patches/lang.patch @@ -0,0 +1,11 @@ +--- misc/commons-lang3-src/default.properties 2014-03-15 13:47:48.0 +0100 misc/build/commons-lang3-src/default.properties2014-10-30 17:57:53.0 +0100 +@@ -60,7 +60,7 @@ + test.home = src/test/java + + # Should Java compilations set the 'debug' compiler option? +-compile.debug = true ++compile.debug = false + + # Should Java compilations set the 'deprecation' compiler option? + compile.deprecation = true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: master build fails on units-tests on MAC OS-X
In OS X, some unit tests may fail unless you have a windowing session open to the machine, either on the physical console or through Screen Sharing. In order to avoid another possible fail, you have to access to "Energy Saver" in "System Preferences" and deselect "Automatic Graphics Switching", "Put hard disks to sleep when possible" options, and set "computer sleep" to "Never". Regards, Robert On Sun, Nov 9, 2014 at 12:37 PM, julien2412 wrote: > On MacOs 10.9.5, I've got this with master sources updated 2 days ago: > warn:sw.uno:88580:1:sw/source/core/unocore/unotext.cxx:2275: Exception when > setting property: CharInteropGrabBag. Message: > warn:sw.core:88580:1:sw/source/core/table/swnewtable.cxx:2166: Line width > differs from table width: 65535 current [0]: 65530 > warn:sw.core:88580:1:sw/source/core/table/swnewtable.cxx:2166: Line width > differs from table width: 65535 current [0]: 65530 > warn:legacy.osl:88580:1:oox/source/helper/storagebase.cxx:66: > StorageBase::StorageBase - missing base input stream > warn:vcl.window:88580:1:vcl/source/window/window.cxx:3326: ignoring > DeploymentException "component context fails to supply service > 'com.sun.star.datatransfer.clipboard.SystemClipboard' of type > 'com.sun.star.datatransfer.clipboard.XSystemClipboard'" > > Error: a unit test failed, please do one of: > > export DEBUGCPPUNIT=TRUE# for exception catching > export CPPUNITTRACE="gdb --args"# for interactive debugging on Linux > export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for > interactive debugging in Visual Studio > export VALGRIND=memcheck# for memory checking > > and retry using: make CppunitTest_sw_ooxmlimport > > Julien > > > > -- > View this message in context: > http://nabble.documentfoundation.org/master-build-fails-on-units-tests-on-MAC-OS-X-tp4128484p4128496.html > Sent from the Dev mailing list archive at Nabble.com. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8
The file /Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Info.plist contains only CommandLine string for JVMCapabilities key, for this reason OS X doesn't detect a full java runtime installation. Regards, Robert On Sat, Nov 1, 2014 at 11:32 PM, Robert Antoni Buj i Gelonch < robert@gmail.com> wrote: > Not yet solved. No Java runtime present, requesting install. > > On Sat, Nov 1, 2014 at 8:41 PM, Robert Antoni Buj i Gelonch < > robert@gmail.com> wrote: > >> I think that the following command can solve the issue with Oracle's JDKs. >> >> sudo curl -o /Library/Java/Extensions/javaee-api-7.0.jar -O#L >> http://central.maven.org/maven2/javax/javaee-api/7.0/javaee-api-7.0.jar >> >> >> Regards, >> >> Robert >> >> On Sat, Nov 1, 2014 at 8:19 PM, Robert Antoni Buj i Gelonch < >> robert@gmail.com> wrote: >> >>> HSQLDB requires some J2EE libs that aren't bundled within a standard JDK >>> (javax.servlet). >>> >>> source files: >>> >>> ./workdir/UnpackedTarball/hsqldb/src/hsqlServlet.java >>> >>> ./workdir/UnpackedTarball/hsqldb/src/org/hsqldb/Servlet.java >>> >>> >>> build: >>> >>> ./workdir/UnpackedTarball/hsqldb/classes/hsqlServlet.class >>> >>> ./workdir/UnpackedTarball/hsqldb/classes/org/hsqldb/Servlet.class >>> >>> >>> Regards, >>> >>> Robert >>> >>> On Tue, Oct 28, 2014 at 11:22 AM, Stephan Bergmann >>> wrote: >>> >>>> On 10/20/2014 01:48 PM, Alexander Thurgood wrote: >>>> >>>>> I encountrered this very same problem, and solved it by installing the >>>>> appropriate JavaforOSX2014-001.dmg, which allowed my build to complete >>>>> the debug tests, but this apparently also has consequences for use of >>>>> third party jdbc drivers that rely on JDK 1.8 >>>>> >>>> >>>> In how far? >>>> >>>> >>>> ___ >>>> LibreOffice mailing list >>>> LibreOffice@lists.freedesktop.org >>>> http://lists.freedesktop.org/mailman/listinfo/libreoffice >>>> >>> >>> >>> >>> -- >>> http://about.me/rbuj >>> >> >> >> >> -- >> http://about.me/rbuj >> > > > > -- > http://about.me/rbuj > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 10.10 tinderbox builds crashes on opening any file
I've sent a patch proposal, https://gerrit.libreoffice.org/#/c/12200/ Regards, Robert On Sun, Nov 2, 2014 at 12:32 PM, Robert Antoni Buj i Gelonch < robert@gmail.com> wrote: > The following command also fixes the issue and you don't need to create > any link to LibreOfficePython.framework: > > # find > /Applications/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework/Versions/3.3/lib/python3.3/lib-dynload > -name "*.so" -exec install_name_tool -change > /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO/LibreOfficePython.framework/Versions/3.3/LibreOfficePython > @loader_path/../../../LibreOfficePython '{}' \; > > > Regards, > > Robert > > On Sun, Nov 2, 2014 at 3:19 AM, Robert Antoni Buj i Gelonch < > robert@gmail.com> wrote: > >> It's an issue related with LibreOfficePython.framework and >> install_name_tool: >> >> 1 - create the folder where LibreOfficePython.framework was installed in >> the tinderbox: >> >> $: sudo mkdir -p >> /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO >> >> 2 - create a symbolic link to LibreOfficePython.framework: >> >> $: sudo ln -s >> /Applications/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework >> /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO/LibreOfficePython.framework >> >> 3 - Launch LibreOffice: >> >> $: /Applications/LibreOfficeDev.app/Contents/MacOS/soffice >> >> >> Regards, >> >> Robert >> >> On Sat, Nov 1, 2014 at 10:40 AM, Robert Antoni Buj i Gelonch wrote: >> >>> Doing a clean build seems that doesn't solve the issue, so I'm going to >>> install the development environment from scratch. >>> >>> On Fri, Oct 31, 2014 at 11:16 AM, Christian Lohmaier wrote: >>> >>>> Hi Robert, >>>> >>>> there have been reports on IRC that the daily builds of your tinderbox >>>> (@64) crashes when opening any file. >>>> >>>> Those crashes don't occur with the daily builds from my bot (@49), >>>> that also compiles on Mac OSX 10.10 (although with the default >>>> min-version. >>>> >>>> As your bot does incremental builds: could you try a make clean to see >>>> whether the problem is caused by some incompatible changes that >>>> weren't picked up properly by the incremental build? >>>> >>>> The user who reported it often hangs out in the #libreoffice-qa >>>> channel (nich steve-_-2) >>>> >>>> Thanks a lot, >>>> >>>> ciao >>>> Christian >>>> >>> >>> >>> >>> -- >>> http://about.me/rbuj >>> >> >> >> >> -- >> http://about.me/rbuj >> > > > > -- > http://about.me/rbuj > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 10.10 tinderbox builds crashes on opening any file
The following command also fixes the issue and you don't need to create any link to LibreOfficePython.framework: # find /Applications/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework/Versions/3.3/lib/python3.3/lib-dynload -name "*.so" -exec install_name_tool -change /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO/LibreOfficePython.framework/Versions/3.3/LibreOfficePython @loader_path/../../../LibreOfficePython '{}' \; Regards, Robert On Sun, Nov 2, 2014 at 3:19 AM, Robert Antoni Buj i Gelonch < robert@gmail.com> wrote: > It's an issue related with LibreOfficePython.framework and > install_name_tool: > > 1 - create the folder where LibreOfficePython.framework was installed in > the tinderbox: > > $: sudo mkdir -p > /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO > > 2 - create a symbolic link to LibreOfficePython.framework: > > $: sudo ln -s > /Applications/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework > /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO/LibreOfficePython.framework > > 3 - Launch LibreOffice: > > $: /Applications/LibreOfficeDev.app/Contents/MacOS/soffice > > > Regards, > > Robert > > On Sat, Nov 1, 2014 at 10:40 AM, Robert Antoni Buj i Gelonch wrote: > >> Doing a clean build seems that doesn't solve the issue, so I'm going to >> install the development environment from scratch. >> >> On Fri, Oct 31, 2014 at 11:16 AM, Christian Lohmaier wrote: >> >>> Hi Robert, >>> >>> there have been reports on IRC that the daily builds of your tinderbox >>> (@64) crashes when opening any file. >>> >>> Those crashes don't occur with the daily builds from my bot (@49), >>> that also compiles on Mac OSX 10.10 (although with the default >>> min-version. >>> >>> As your bot does incremental builds: could you try a make clean to see >>> whether the problem is caused by some incompatible changes that >>> weren't picked up properly by the incremental build? >>> >>> The user who reported it often hangs out in the #libreoffice-qa >>> channel (nich steve-_-2) >>> >>> Thanks a lot, >>> >>> ciao >>> Christian >>> >> >> >> >> -- >> http://about.me/rbuj >> > > > > -- > http://about.me/rbuj > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 10.10 tinderbox builds crashes on opening any file
It's an issue related with LibreOfficePython.framework and install_name_tool: 1 - create the folder where LibreOfficePython.framework was installed in the tinderbox: $: sudo mkdir -p /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO 2 - create a symbolic link to LibreOfficePython.framework: $: sudo ln -s /Applications/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework /Volumes/Master/lo/core/workdir/UnpackedTarball/python3/python-inst/@__OOO/LibreOfficePython.framework 3 - Launch LibreOffice: $: /Applications/LibreOfficeDev.app/Contents/MacOS/soffice Regards, Robert On Sat, Nov 1, 2014 at 10:40 AM, Robert Antoni Buj i Gelonch wrote: > Doing a clean build seems that doesn't solve the issue, so I'm going to > install the development environment from scratch. > > On Fri, Oct 31, 2014 at 11:16 AM, Christian Lohmaier wrote: > >> Hi Robert, >> >> there have been reports on IRC that the daily builds of your tinderbox >> (@64) crashes when opening any file. >> >> Those crashes don't occur with the daily builds from my bot (@49), >> that also compiles on Mac OSX 10.10 (although with the default >> min-version. >> >> As your bot does incremental builds: could you try a make clean to see >> whether the problem is caused by some incompatible changes that >> weren't picked up properly by the incremental build? >> >> The user who reported it often hangs out in the #libreoffice-qa >> channel (nich steve-_-2) >> >> Thanks a lot, >> >> ciao >> Christian >> > > > > -- > http://about.me/rbuj > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8
Not yet solved. No Java runtime present, requesting install. On Sat, Nov 1, 2014 at 8:41 PM, Robert Antoni Buj i Gelonch < robert@gmail.com> wrote: > I think that the following command can solve the issue with Oracle's JDKs. > > sudo curl -o /Library/Java/Extensions/javaee-api-7.0.jar -O#L > http://central.maven.org/maven2/javax/javaee-api/7.0/javaee-api-7.0.jar > > > Regards, > > Robert > > On Sat, Nov 1, 2014 at 8:19 PM, Robert Antoni Buj i Gelonch < > robert@gmail.com> wrote: > >> HSQLDB requires some J2EE libs that aren't bundled within a standard JDK >> (javax.servlet). >> >> source files: >> >> ./workdir/UnpackedTarball/hsqldb/src/hsqlServlet.java >> >> ./workdir/UnpackedTarball/hsqldb/src/org/hsqldb/Servlet.java >> >> >> build: >> >> ./workdir/UnpackedTarball/hsqldb/classes/hsqlServlet.class >> >> ./workdir/UnpackedTarball/hsqldb/classes/org/hsqldb/Servlet.class >> >> >> Regards, >> >> Robert >> >> On Tue, Oct 28, 2014 at 11:22 AM, Stephan Bergmann >> wrote: >> >>> On 10/20/2014 01:48 PM, Alexander Thurgood wrote: >>> >>>> I encountrered this very same problem, and solved it by installing the >>>> appropriate JavaforOSX2014-001.dmg, which allowed my build to complete >>>> the debug tests, but this apparently also has consequences for use of >>>> third party jdbc drivers that rely on JDK 1.8 >>>> >>> >>> In how far? >>> >>> >>> ___ >>> LibreOffice mailing list >>> LibreOffice@lists.freedesktop.org >>> http://lists.freedesktop.org/mailman/listinfo/libreoffice >>> >> >> >> >> -- >> http://about.me/rbuj >> > > > > -- > http://about.me/rbuj > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8
I think that the following command can solve the issue with Oracle's JDKs. sudo curl -o /Library/Java/Extensions/javaee-api-7.0.jar -O#L http://central.maven.org/maven2/javax/javaee-api/7.0/javaee-api-7.0.jar Regards, Robert On Sat, Nov 1, 2014 at 8:19 PM, Robert Antoni Buj i Gelonch < robert@gmail.com> wrote: > HSQLDB requires some J2EE libs that aren't bundled within a standard JDK > (javax.servlet). > > source files: > > ./workdir/UnpackedTarball/hsqldb/src/hsqlServlet.java > > ./workdir/UnpackedTarball/hsqldb/src/org/hsqldb/Servlet.java > > > build: > > ./workdir/UnpackedTarball/hsqldb/classes/hsqlServlet.class > > ./workdir/UnpackedTarball/hsqldb/classes/org/hsqldb/Servlet.class > > > Regards, > > Robert > > On Tue, Oct 28, 2014 at 11:22 AM, Stephan Bergmann > wrote: > >> On 10/20/2014 01:48 PM, Alexander Thurgood wrote: >> >>> I encountrered this very same problem, and solved it by installing the >>> appropriate JavaforOSX2014-001.dmg, which allowed my build to complete >>> the debug tests, but this apparently also has consequences for use of >>> third party jdbc drivers that rely on JDK 1.8 >>> >> >> In how far? >> >> >> ___ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/libreoffice >> > > > > -- > http://about.me/rbuj > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8
HSQLDB requires some J2EE libs that aren't bundled within a standard JDK (javax.servlet). source files: ./workdir/UnpackedTarball/hsqldb/src/hsqlServlet.java ./workdir/UnpackedTarball/hsqldb/src/org/hsqldb/Servlet.java build: ./workdir/UnpackedTarball/hsqldb/classes/hsqlServlet.class ./workdir/UnpackedTarball/hsqldb/classes/org/hsqldb/Servlet.class Regards, Robert On Tue, Oct 28, 2014 at 11:22 AM, Stephan Bergmann wrote: > On 10/20/2014 01:48 PM, Alexander Thurgood wrote: > >> I encountrered this very same problem, and solved it by installing the >> appropriate JavaforOSX2014-001.dmg, which allowed my build to complete >> the debug tests, but this apparently also has consequences for use of >> third party jdbc drivers that rely on JDK 1.8 >> > > In how far? > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: forms/qa
forms/qa/integration/forms/BooleanValidator.java |4 --- forms/qa/integration/forms/DateValidator.java |4 --- forms/qa/integration/forms/FormComponent.java | 20 - forms/qa/integration/forms/ListSelectionValidator.java |4 --- forms/qa/integration/forms/NumericValidator.java |4 --- forms/qa/integration/forms/TextValidator.java | 11 ++--- forms/qa/integration/forms/TimeValidator.java |4 --- 7 files changed, 13 insertions(+), 38 deletions(-) New commits: commit 1e48bfafdd25d595a2265a5bc66230f3681e96b5 Author: Robert Antoni Buj i Gelonch Date: Tue Sep 30 13:05:54 2014 +0200 forms: The if statement is redundant Change-Id: I1d339ea6052e648acf4405d2d40795c82ee043ca Reviewed-on: https://gerrit.libreoffice.org/11713 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/forms/qa/integration/forms/BooleanValidator.java b/forms/qa/integration/forms/BooleanValidator.java index 730c45f..8201fe9 100644 --- a/forms/qa/integration/forms/BooleanValidator.java +++ b/forms/qa/integration/forms/BooleanValidator.java @@ -61,9 +61,7 @@ public class BooleanValidator extends integration.forms.ControlValidator return false; boolean value = ((Boolean)Value).booleanValue(); -if ( m_preventChecked && ( value ) ) -return false; -return true; +return !(m_preventChecked && ( value )); } catch( java.lang.Exception e ) { diff --git a/forms/qa/integration/forms/DateValidator.java b/forms/qa/integration/forms/DateValidator.java index 055e779..255ec6f 100644 --- a/forms/qa/integration/forms/DateValidator.java +++ b/forms/qa/integration/forms/DateValidator.java @@ -54,9 +54,7 @@ public class DateValidator extends integration.forms.ControlValidator if ( isDedicatedInvalidDate( dateValue ) ) return false; -if ( !isNextMonthsDate( dateValue ) ) -return false; -return true; +return isNextMonthsDate( dateValue ); } catch( java.lang.Exception e ) { diff --git a/forms/qa/integration/forms/FormComponent.java b/forms/qa/integration/forms/FormComponent.java index 89b8f91..eb7467a 100644 --- a/forms/qa/integration/forms/FormComponent.java +++ b/forms/qa/integration/forms/FormComponent.java @@ -103,9 +103,7 @@ public class FormComponent /* -- */ public String[] getElementNames() { -if ( m_nameAccess != null ) -return m_nameAccess.getElementNames(); -return new String[]{}; +return ( m_nameAccess != null ) ? m_nameAccess.getElementNames() : new String[]{}; } @@ -113,9 +111,7 @@ public class FormComponent /* -- */ public int getCount() { -if ( m_indexAccess != null ) -return m_indexAccess.getCount(); -return 0; +return ( m_indexAccess != null ) ? m_indexAccess.getCount() : 0; } /* -- */ @@ -149,17 +145,13 @@ public class FormComponent /* -- */ public FormComponent getParent() { -if ( m_child != null ) -return new FormComponent( m_child.getParent() ); -return new FormComponent(); +return ( m_child != null ) ? new FormComponent( m_child.getParent() ) : new FormComponent(); } /* -- */ public String getName() { -if ( m_named != null ) -return m_named.getName(); -return ""; +return ( m_named != null ) ? m_named.getName() : ""; } /* -- */ @@ -167,8 +159,6 @@ public class FormComponent { XServiceInfo si = UnoRuntime.queryInterface( XServiceInfo.class, m_component ); -if ( si != null ) -return si.getImplementationName(); -return ""; +return ( si != null ) ? si.getImplementationName() : ""; } } diff --git a/forms/qa/integration/forms/ListSelectionValidator.java b/forms/qa/integration/forms/ListSelectionValidator.java index ce94a1e..164110d 100644 --- a/forms/qa/integration/forms/ListSelectionValidator.java +++ b/forms/qa/integration/forms/ListSelectionValidator.java @@ -40,9 +40,7 @@ public class ListSelectionValidator extends integration.forms.ControlValidator try { short[] selectionIndexes = (short[])Value; -if ( selectionIndexes.length > 2 ) -return false; -re
[Libreoffice-commits] core.git: toolkit/test
toolkit/test/accessibility/AccessibleComponentHandler.java |4 ++-- toolkit/test/accessibility/AccessibleExtendedComponentHandler.java |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 6412ebe5dd05eade0d09fe736d6d485d8d285ed7 Author: Robert Antoni Buj i Gelonch Date: Wed Oct 29 23:43:12 2014 +0100 accessibility: shift by zero Change-Id: I4e25b0a6929cc88aa2ec1d213b8f1115de6be607 Reviewed-on: https://gerrit.libreoffice.org/12146 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/toolkit/test/accessibility/AccessibleComponentHandler.java b/toolkit/test/accessibility/AccessibleComponentHandler.java index 23125fd..01a86c8 100644 --- a/toolkit/test/accessibility/AccessibleComponentHandler.java +++ b/toolkit/test/accessibility/AccessibleComponentHandler.java @@ -92,7 +92,7 @@ class AccessibleComponentHandler aChild = new StringNode ("Foreground color: R" + (nColor>>16&0xff) + "G" + (nColor>>8&0xff) -+ "B" + (nColor>>0&0xff) ++ "B" + (nColor&0xff) + "A" + (nColor>>24&0xff), aParent); break; @@ -101,7 +101,7 @@ class AccessibleComponentHandler aChild = new StringNode ("Background color: R" + (nColor>>16&0xff) + "G" + (nColor>>8&0xff) -+ "B" + (nColor>>0&0xff) ++ "B" + (nColor&0xff) + "A" + (nColor>>24&0xff), aParent); break; diff --git a/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java b/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java index 4adb627..3cdf1d4 100644 --- a/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java +++ b/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java @@ -72,7 +72,7 @@ class AccessibleExtendedComponentHandler aChild = new StringNode ("Deprecated Foreground color: R" + (nColor>>16&0xff) + "G" + (nColor>>8&0xff) -+ "B" + (nColor>>0&0xff) ++ "B" + (nColor&0xff) + "A" + (nColor>>24&0xff), aParent); break; @@ -81,7 +81,7 @@ class AccessibleExtendedComponentHandler aChild = new StringNode ("Deprecated Background color: R" + (nColor>>16&0xff) + "G" + (nColor>>8&0xff) -+ "B" + (nColor>>0&0xff) ++ "B" + (nColor&0xff) + "A" + (nColor>>24&0xff), aParent); break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportbuilder/java toolkit/test wizards/com
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java |5 toolkit/test/accessibility/EventListener.java |6 - wizards/com/sun/star/wizards/common/NumericalHelper.java | 16 -- wizards/com/sun/star/wizards/db/FieldColumn.java | 35 -- wizards/com/sun/star/wizards/db/RecordParser.java | 55 +- wizards/com/sun/star/wizards/ui/FieldSelection.java | 15 -- wizards/com/sun/star/wizards/ui/FilterComponent.java | 11 -- 7 files changed, 15 insertions(+), 128 deletions(-) New commits: commit 5d8ecad569fd7a254902da154ed8057ec61f3a83 Author: Robert Antoni Buj i Gelonch Date: Wed Oct 29 17:34:18 2014 +0100 java: Method uses the same code for two switch clauses Change-Id: Ied82b0a39ff9dc9c7cc9539dec2b963059f3d4a5 Reviewed-on: https://gerrit.libreoffice.org/12139 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java index e0e4d2d..08285f6 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java @@ -703,11 +703,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget break; } case OfficeDocumentReportTarget.STATE_IN_SECTION: -{ - states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_OTHER)); -startOther(attrs); -break; -} case OfficeDocumentReportTarget.STATE_IN_OTHER: { states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_OTHER)); diff --git a/toolkit/test/accessibility/EventListener.java b/toolkit/test/accessibility/EventListener.java index 8d7efd5..d4d1227 100644 --- a/toolkit/test/accessibility/EventListener.java +++ b/toolkit/test/accessibility/EventListener.java @@ -80,13 +80,7 @@ public class EventListener break; case AccessibleEventId.ACTION_CHANGED: -aHandler = new EventHandler (aEvent, maTreeModel); -break; - case AccessibleEventId.HYPERTEXT_CHANGED: -aHandler = new EventHandler (aEvent, maTreeModel); -break; - case AccessibleEventId.ACTIVE_DESCENDANT_CHANGED: case AccessibleEventId.CARET_CHANGED: case AccessibleEventId.TEXT_CHANGED: diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index 1d5e483..2c93b0c 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -608,32 +608,18 @@ public class NumericalHelper switch (aTypeObject.iType) { case BYTE_TYPE: -retValue = aTypeObject.aValue.toString(); -break; case CHAR_TYPE: -retValue = aTypeObject.aValue.toString(); -break; case SHORT_TYPE: -retValue = aTypeObject.aValue.toString(); -break; case INT_TYPE: -retValue = aTypeObject.aValue.toString(); -break; case LONG_TYPE: -retValue = aTypeObject.aValue.toString(); -break; case FLOAT_TYPE: -retValue = aTypeObject.aValue.toString(); -break; case DOUBLE_TYPE: +case BOOLEAN_TYPE: retValue = aTypeObject.aValue.toString(); break; case STRING_TYPE: retValue = (String) aTypeObject.aValue; break; -case BOOLEAN_TYPE: -retValue = aTypeObject.aValue.toString(); -break; case SEQUENCE_TYPE: retValue = new String(toByteArray((aValue))); break; diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java b/wizards/com/sun/star/wizards/db/FieldColumn.java index 409af6e..c792514 100644 --- a/wizards/com/sun/star/wizards/db/FieldColumn.java +++ b/wizards/com/sun/star/wizards/db/FieldColumn.java @@ -256,11 +256,6 @@ public class FieldColumn break; case DataType.TINYINT: // == -6; -StandardFormatKey = iNumberFormatKey; -FieldWidth = 5
[Libreoffice-commits] core.git: qadevOOo/runner wizards/com
qadevOOo/runner/util/XMLTools.java | 3 ++- wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 9eabc1fc3b2efa3303860d33013f39582861 Author: Robert Antoni Buj i Gelonch Date: Wed Oct 29 17:11:50 2014 +0100 java: Questionable use of non-short-circuit logic Change-Id: Ied831cb5d6645e2696ff2d3d57843fc7a1f82f7e Reviewed-on: https://gerrit.libreoffice.org/12137 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index 7dea190..64330a1 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -424,7 +424,8 @@ public class XMLTools { * all necessary tags and character data was found. */ public boolean checkTags() { -allOK &= isWellFormed() ; +if (!isWellFormed()) +allOK = false ; Iterator badTags = tags.keySet().iterator() ; Iterator badChars = chars.keySet().iterator() ; diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java index 00319ce..fb1687a 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java @@ -118,7 +118,7 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns aRectFields = insertFormattedField(xSection, sFieldName, aRectFields, nFieldWidth, aSOTextField); nLastHeight = Math.max(nLastHeight, aRectFields.Height); int nNextX = aRectFields.X + nFieldWidth; -if (nNextX > (getPageWidth() - getRightPageIndent()) & nCount > 1) +if ((nNextX > (getPageWidth() - getRightPageIndent())) && nCount > 1) { int nHeight = (aSOLabel.getHeight(LayoutConstants.LabelHeight) + Math.max(aSOTextField.getHeight(LayoutConstants.FormattedFieldHeight), nLastHeight)); nLastHeight = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/helper/APIDescGetter.java | 22 +- 1 file changed, 13 insertions(+), 9 deletions(-) New commits: commit 1e7382cb45759908cd3d639c839dcd5633dbadd1 Author: Robert Antoni Buj i Gelonch Date: Wed Oct 29 16:48:00 2014 +0100 runner: Dereference of the result of readLine() without nullcheck Change-Id: I3d02436446a79137ce42b1a190c9e3985fbb9246 Reviewed-on: https://gerrit.libreoffice.org/12135 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java index 4171dc2..71c8981 100644 --- a/qadevOOo/runner/helper/APIDescGetter.java +++ b/qadevOOo/runner/helper/APIDescGetter.java @@ -595,16 +595,20 @@ public class APIDescGetter extends DescGetter { String entry = buf.readLine(); -if (entry.endsWith(sEndsWithCSVName)) +if (entry != null) { -System.out.println("FOUND "); -InputStream input = this.getClass().getResourceAsStream("/objdsc/" + -module + -"/" + -entry); -csvFile = new BufferedReader( -new InputStreamReader(input)); -found = true; +if (entry.endsWith(sEndsWithCSVName)) +{ +System.out.println("FOUND "); +InputStream input = +this.getClass().getResourceAsStream("/objdsc/" + +module + +"/" + +entry); +csvFile = +new BufferedReader(new InputStreamReader(input)); +found = true; +} } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/nss
external/nss/ExternalProject_nss.mk |1 + 1 file changed, 1 insertion(+) New commits: commit ae064ec005f157cb76fedb8ae5482f38c56704ad Author: Robert Antoni Buj i Gelonch Date: Thu Oct 23 23:18:52 2014 +0200 nss: add libnsspem.dylib to macosx-change-install-names.pl call Change-Id: If457f9e090a4ef3a5b2b8e4f09ce0b5e3b3d04ec Signed-off-by: Stephan Bergmann diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index f518bb4..17ea6f1 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -87,6 +87,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnss3.dylib \ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssckbi.dylib \ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssdbm3.dylib \ + $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnsspem.dylib \ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssutil3.dylib \ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplc4.dylib \ $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplds4.dylib \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: OS X: coinmp is not using install_name_tool
In fact, macosx-change-install-names.pl doesn't change the id of the library, and it maintains the temporally prefix. On Sat, Oct 25, 2014 at 3:42 PM, Robert Antoni Buj i Gelonch < robert@gmail.com> wrote: > I wonder if we can do it easer using @rpath prefix and passing possible > library locations in ld flags. > > https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/RunpathDependentLibraries.html > > On Mon, Oct 20, 2014 at 10:21 AM, Stephan Bergmann > wrote: > >> On 10/19/2014 05:22 PM, Robert Antoni Buj i Gelonch wrote: >> >>> The previous message was for the master branch, the next output was >>> obtained in 4.3 branch: >>> >> >> There are two situations to consider: >> >> 1 Genuine LO code links against an external dylib A. A's install name >> needs to contain a special filepath segment denoting where A is located in >> the installset, see the comment at the top of solenv/bin/macosx-change- >> install-names.pl and e.g. >> >> $(if $(filter MACOSX,$(OS)),--prefix=/@. >>> __OOO) \ >>> >> >> in external/cairo/ExternalProject_cairo.mk. >> >> 2 An external dylib B links against another external dylib A (from the >> same or another external project). A needs to be set up according to (1). >> The ExternalProject_*.mk for B needs to explicitly call >> macosx-change-install-names on B, see e.g. >> >> $(if $(filter MACOSX,$(OS)),&& $(PERL) \ >>> $(SRCDIR)/solenv/bin/macosx- >>> change-install-names.pl shl OOO \ >>> $(gb_Package_SOURCEDIR_icu)/ >>> source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION) \ >>> $(gb_Package_SOURCEDIR_icu)/ >>> source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \ >>> $(gb_Package_SOURCEDIR_icu)/ >>> source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)) \ >>> >> >> in external/icu/ExternalProject_icu.mk. >> >> Stephan >> ___ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/libreoffice >> > > > > -- > http://about.me/rbuj > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: OS X: coinmp is not using install_name_tool
I wonder if we can do it easer using @rpath prefix and passing possible library locations in ld flags. https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/RunpathDependentLibraries.html On Mon, Oct 20, 2014 at 10:21 AM, Stephan Bergmann wrote: > On 10/19/2014 05:22 PM, Robert Antoni Buj i Gelonch wrote: > >> The previous message was for the master branch, the next output was >> obtained in 4.3 branch: >> > > There are two situations to consider: > > 1 Genuine LO code links against an external dylib A. A's install name > needs to contain a special filepath segment denoting where A is located in > the installset, see the comment at the top of solenv/bin/macosx-change- > install-names.pl and e.g. > > $(if $(filter MACOSX,$(OS)),--prefix=/@. >> __OOO) \ >> > > in external/cairo/ExternalProject_cairo.mk. > > 2 An external dylib B links against another external dylib A (from the > same or another external project). A needs to be set up according to (1). > The ExternalProject_*.mk for B needs to explicitly call > macosx-change-install-names on B, see e.g. > > $(if $(filter MACOSX,$(OS)),&& $(PERL) \ >> $(SRCDIR)/solenv/bin/macosx- >> change-install-names.pl shl OOO \ >> $(gb_Package_SOURCEDIR_icu)/ >> source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION) \ >> $(gb_Package_SOURCEDIR_icu)/ >> source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \ >> $(gb_Package_SOURCEDIR_icu)/ >> source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)) \ >> > > in external/icu/ExternalProject_icu.mk. > > Stephan > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bean/com connectivity/qa qadevOOo/runner
bean/com/sun/star/comp/beans/LocalOfficeConnection.java|2 - connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java | 18 +- qadevOOo/runner/convwatch/SimpleFileSemaphore.java |2 - qadevOOo/runner/convwatch/TimeHelper.java |2 - qadevOOo/runner/graphical/TimeHelper.java |2 - qadevOOo/runner/helper/OfficeProvider.java |2 - qadevOOo/runner/helper/ProcessHandler.java |2 - 7 files changed, 15 insertions(+), 15 deletions(-) New commits: commit e61c4b5f06241dd248cfe28b29cb658ea47bd72e Author: Robert Antoni Buj i Gelonch Date: Thu Oct 16 18:58:13 2014 +0200 java: prevent overflow by using 'long int' arithmetic in multiplication Change-Id: I8dda8f4621f265208c713c9edcfe725f1c9c5998 Reviewed-on: https://gerrit.libreoffice.org/12001 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index da86510..7174dca 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -318,7 +318,7 @@ public class LocalOfficeConnection aSOffice.startupService(); // wait until soffice is started -long nMaxMillis = System.currentTimeMillis() + 1000*aSOffice.getStartupTime(); +long nMaxMillis = System.currentTimeMillis() + 1000L*aSOffice.getStartupTime(); while ( aInitialObject == null ) { try diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java index 57ce3f9..ecca4fd 100644 --- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java +++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java @@ -335,7 +335,7 @@ public class TestCacheSize { System.out.println("Total insert: " + i); System.out.println("Insert time: " + sw.elapsedTime() + " rps: " - + (i * 1000 / (sw.elapsedTime() + 1))); + + (1000L * i / (sw.elapsedTime() + 1))); } private void fillUpMultiTable(String filler, @@ -388,7 +388,7 @@ public class TestCacheSize { System.out.println("Multi Key Total insert: " + i); System.out.println("Insert time: " + sw.elapsedTime() + " rps: " - + (i * 1000 / (sw.elapsedTime() + 1))); + + (1000L * i / (sw.elapsedTime() + 1))); } public void tearDown() {} @@ -478,7 +478,7 @@ public class TestCacheSize { || (slow && (i + 1) % 100 == 0)) { System.out.println("Select " + (i + 1) + " : " + sw.elapsedTime() + " rps: " - + (i * 1000 / (sw.elapsedTime() + 1))); + + (1000L * i / (sw.elapsedTime() + 1))); } } } catch (SQLException e) { @@ -487,7 +487,7 @@ public class TestCacheSize { System.out.println("Select random zip " + i + " rows : " + sw.elapsedTime() + " rps: " - + (i * 1000 / (sw.elapsedTime() + 1))); + + (1000L * i / (sw.elapsedTime() + 1))); sw.zero(); try { @@ -511,7 +511,7 @@ public class TestCacheSize { System.out.println("Select random id " + i + " rows : " + sw.elapsedTime() + " rps: " - + (i * 1000 / (sw.elapsedTime() + 1))); + + (1000L * i / (sw.elapsedTime() + 1))); sw.zero(); try { @@ -535,7 +535,7 @@ public class TestCacheSize { System.out.println("Select random zip from zip table " + i + " rows : " + sw.elapsedTime() + " rps: " - + (i * 1000 / (sw.elapsedTime() + 1))); + + (1000L * i / (sw.elapsedTime() + 1))); } private void checkUpdates() { @@ -570,7 +570,7 @@ public class TestCacheSize { System.out.println("Update with random zip " + i + " UPDATE commands, " + count + " rows : " + sw.elapsedTime() + " rps: " - + (count * 1000 / (sw.elapsedTime() + 1))); + + (1000L * count / (sw.elapsedTime() + 1))); sw.zero(); try { @@ -588,7 +588,7 @@ public class TestCacheSize {
OS X: coinmp is not using install_name_tool
otool -L /Applications/LibreOfficeDev.app/Contents/Frameworks/*.dylib | grep coinmp /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbc.3.dylib (compatibility version 12.0.0, current version 12.8.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib (compatibility version 10.0.0, current version 10.5.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib (compatibility version 13.0.0, current version 13.5.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib (compatibility version 13.0.0, current version 13.11.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbcSolver.3.dylib (compatibility version 12.0.0, current version 12.8.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib (compatibility version 10.0.0, current version 10.5.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib (compatibility version 13.0.0, current version 13.5.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib (compatibility version 13.0.0, current version 13.11.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbc.3.dylib (compatibility version 12.0.0, current version 12.8.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib (compatibility version 10.0.0, current version 10.5.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib (compatibility version 13.0.0, current version 13.5.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib (compatibility version 13.0.0, current version 13.11.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib (compatibility version 13.0.0, current version 13.11.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinMP.1.dylib (compatibility version 9.0.0, current version 9.6.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbcSolver.3.dylib (compatibility version 12.0.0, current version 12.8.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbc.3.dylib (compatibility version 12.0.0, current version 12.8.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib (compatibility version 10.0.0, current version 10.5.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib (compatibility version 13.0.0, current version 13.5.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib (compatibility version 13.0.0, current version 13.11.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib (compatibility version 13.0.0, current version 13.11.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib (compatibility version 13.0.0, current version 13.5.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib (compatibility version 13.0.0, current version 13.11.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib (compatibility version 13.0.0, current version 13.5.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib (compatibility version 13.0.0, current version 13.11.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbc.3.dylib (compatibility version 12.0.0, current version 12.8.0) /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbcSolver.3.dylib (compatibility version 12.0.0, current version 12.8.0) /Volumes/Maste
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/helper/OfficeProvider.java |4 1 file changed, 4 deletions(-) New commits: commit ab06f67ee26e730f209a3ff8c4717901f70765fe Author: Robert Antoni Buj i Gelonch Date: Sun Oct 12 11:38:58 2014 +0200 runner: code will never be executed Change-Id: I0484a11b3511c1d7f70e9ae8407eb7d19bcc852d Reviewed-on: https://gerrit.libreoffice.org/11929 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java index 58fdd01..cfb2e232 100644 --- a/qadevOOo/runner/helper/OfficeProvider.java +++ b/qadevOOo/runner/helper/OfficeProvider.java @@ -297,10 +297,6 @@ public class OfficeProvider implements AppProvider { System.out.println("Could not connect an Office and cannot start one.\n".concat("please start an office with following parameter:\n"). concat("\nsoffice --accept=").concat((String) param.get("ConnectionString")).concat(";urp;\n")); -if (bAppExecutionHasWarning) -{ -System.out.println(errorMessage); -} } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/test
toolkit/test/accessibility/AccessibilityTree.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 581234b21368311d865fd1600c7ca62422ebb186 Author: Robert Antoni Buj i Gelonch Date: Sat Oct 11 19:26:08 2014 +0200 accessibility: Calling String.toString() Change-Id: I125d2c337df606c6388ddbd41030e51a558ad054 Reviewed-on: https://gerrit.libreoffice.org/11920 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/toolkit/test/accessibility/AccessibilityTree.java b/toolkit/test/accessibility/AccessibilityTree.java index b21249a..6f94847 100644 --- a/toolkit/test/accessibility/AccessibilityTree.java +++ b/toolkit/test/accessibility/AccessibilityTree.java @@ -265,7 +265,7 @@ public class AccessibilityTree for( int i = 0; i < aActions.size(); i++ ) { aMenu.add( new NodeAction( - aActions.get(i).toString(), + aActions.get(i), aNode, i ) ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/qa
connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1210ad69d8536da6506d945b6f4ebd0fd33d Author: Robert Antoni Buj i Gelonch Date: Mon Oct 13 00:50:25 2014 +0200 connectivity: the value of Math.asin(0.0) is zero Change-Id: Ic72750fcea93edf3457ccea4a357e9d2929a646c Reviewed-on: https://gerrit.libreoffice.org/11941 Reviewed-by: Matthew Francis Tested-by: Matthew Francis diff --git a/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java index f18b35c..4006910 100644 --- a/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java +++ b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java @@ -359,7 +359,7 @@ public class DBaseNumericFunctions extends SubTestCase private void asin(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException { final XRow row = execute(xRowRes, "ASIN(0) "); -assure("ASIN(0) failed!", (float) row.getDouble(1) == (float) Math.asin(0.0)); +assure("ASIN(0) failed!", (float) row.getDouble(1) == 0.0); } private void atan(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8
FIX: Oracle doesn’t bundle JAVA_HOME/../../../../../Frameworks/JavaVM.framework/JavaVM, it comes with JAVA_HOME/jre/lib/server/libjvm.dylib. (note that Apple installs under /System/Library, Oracle installs under /Library) On Tue, Oct 21, 2014 at 10:21 AM, Robert Antoni Buj i Gelonch < robert@gmail.com> wrote: > Oracle doesn’t bundle /Library/Internet > Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/../../../../../Frameworks/JavaVM.framework/JavaVM, > it comes with /Library/Internet > Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/../lib/server/libjvm.dylib. > > I've upload the patch https://gerrit.libreoffice.org/#/c/12057/. > > > Regards, > > Robert > > On Mon, Oct 20, 2014 at 4:12 PM, Tor Lillqvist wrote: > >> (Forwarding to the development list.) >> >> On 20 October 2014 16:39, Robert Antoni Buj i Gelonch < >> robert@gmail.com> wrote: >> >>> Xcode doesn't include the java framework. >>> >>> jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx: >>> "/../../../../../Frameworks/*JavaVM*.framework/*JavaVM*" //as of >>> 1.6.0_22 >>> >> You mean that that line used to end up referring to something that came >> with an Xcode installation, but was otherwise not present? I do have >> a /System/Library/Frameworks/JavaVM.framework. Probably that is what the >> above entry was supposed to point to, but as the location of the java >> binary changed at some point, that relative path does not work any longer? >> Maybe using a relative path here is pointless even? This code is >> over-complicated, patches to simplify it are more than welcome;) >> >> > We also have the tool "/usr/libexec/java_home" and work with the >> output of "/usr/libexec/java_home -V" or something similar. >> >> Yep. It is used in configure.ac to set up a JAVA_HOME environment >> variable for *build-time* use. Whether that is strictly necessary or not, I >> have no idea. (IMHO it might be cleaner if at build-time the same automated >> mechanism was used to find the JVM to use as at LibreOffice run-time.) >> >> --tml >> >> >> >> ___ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/libreoffice >> >> > > > -- > http://about.me/rbuj > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8
Oracle doesn’t bundle /Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/../../../../../Frameworks/JavaVM.framework/JavaVM, it comes with /Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/../lib/server/libjvm.dylib. I've upload the patch https://gerrit.libreoffice.org/#/c/12057/. Regards, Robert On Mon, Oct 20, 2014 at 4:12 PM, Tor Lillqvist wrote: > (Forwarding to the development list.) > > On 20 October 2014 16:39, Robert Antoni Buj i Gelonch < > robert@gmail.com> wrote: > >> Xcode doesn't include the java framework. >> >> jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx: >> "/../../../../../Frameworks/*JavaVM*.framework/*JavaVM*" //as of >> 1.6.0_22 >> > You mean that that line used to end up referring to something that came > with an Xcode installation, but was otherwise not present? I do have > a /System/Library/Frameworks/JavaVM.framework. Probably that is what the > above entry was supposed to point to, but as the location of the java > binary changed at some point, that relative path does not work any longer? > Maybe using a relative path here is pointless even? This code is > over-complicated, patches to simplify it are more than welcome;) > > > We also have the tool "/usr/libexec/java_home" and work with the output > of "/usr/libexec/java_home -V" or something similar. > > Yep. It is used in configure.ac to set up a JAVA_HOME environment > variable for *build-time* use. Whether that is strictly necessary or not, I > have no idea. (IMHO it might be cleaner if at build-time the same automated > mechanism was used to find the JVM to use as at LibreOffice run-time.) > > --tml > > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'feature/opengl-vcl'
New branch 'feature/opengl-vcl' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: OS X: coinmp is not using install_name_tool
version 12.0.0, current version 12.8.0) /Volumes/Fresh/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib (compatibility version 10.0.0, current version 10.5.0) /Volumes/Fresh/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Fresh/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib (compatibility version 14.0.0, current version 14.6.0) /Volumes/Fresh/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinMP.1.dylib (compatibility version 9.0.0, current version 9.6.0) /Volumes/Fresh/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib (compatibility version 13.0.0, current version 13.11.0) /Volumes/Fresh/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib (compatibility version 13.0.0, current version 13.5.0) On Sun, Oct 19, 2014 at 5:03 PM, Robert Antoni Buj i Gelonch < robert@gmail.com> wrote: > otool -L /Applications/LibreOfficeDev.app/Contents/Frameworks/*.dylib | > grep coinmp > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbc.3.dylib > (compatibility version 12.0.0, current version 12.8.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib > (compatibility version 10.0.0, current version 10.5.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib > (compatibility version 14.0.0, current version 14.6.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib > (compatibility version 14.0.0, current version 14.6.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib > (compatibility version 13.0.0, current version 13.5.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib > (compatibility version 13.0.0, current version 13.11.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbcSolver.3.dylib > (compatibility version 12.0.0, current version 12.8.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib > (compatibility version 10.0.0, current version 10.5.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib > (compatibility version 14.0.0, current version 14.6.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib > (compatibility version 14.0.0, current version 14.6.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib > (compatibility version 13.0.0, current version 13.5.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib > (compatibility version 13.0.0, current version 13.11.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbc.3.dylib > (compatibility version 12.0.0, current version 12.8.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib > (compatibility version 10.0.0, current version 10.5.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib > (compatibility version 14.0.0, current version 14.6.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib > (compatibility version 14.0.0, current version 14.6.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib > (compatibility version 13.0.0, current version 13.5.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib > (compatibility version 13.0.0, current version 13.11.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib > (compatibility version 14.0.0, current version 14.6.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinUtils.3.dylib > (compatibility version 13.0.0, current version 13.11.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCoinMP.1.dylib > (compatibility version 9.0.0, current version 9.6.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbcSolver.3.dylib > (compatibility version 12.0.0, current version 12.8.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCbc.3.dylib > (compatibility version 12.0.0, current version 12.8.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libCgl.1.dylib > (compatibility version 10.0.0, current version 10.5.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsiClp.1.dylib > (compatibility version 14.0.0, current version 14.6.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libClp.1.dylib > (compatibility version 14.0.0, current version 14.6.0) > > /Volumes/Master/lo/core/workdir/UnpackedTarball/coinmp/lib/libOsi.1.dylib > (compatibility version 13.0.0, current version 13.5.0) > > /Volumes/Master/lo/core/workdir
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java | 15 -- 1 file changed, 6 insertions(+), 9 deletions(-) New commits: commit 68a18a6249dc9d8842a72413f3cd6f39ecf416e3 Author: Robert Antoni Buj i Gelonch Date: Thu Oct 9 20:10:09 2014 +0200 accessibility: The if statement is redundant Change-Id: I70dd50d8d588c71d391936195bb13ccb767470be Reviewed-on: https://gerrit.libreoffice.org/11890 Reviewed-by: David Ostrovsky Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java index c46115b..18ee618 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java @@ -23,6 +23,7 @@ import com.sun.star.awt.Rectangle; import com.sun.star.awt.PosSize; import com.sun.star.awt.XWindow; import com.sun.star.accessibility.AccessibleEventObject; +import com.sun.star.accessibility.AccessibleStateType; import com.sun.star.accessibility.XAccessible; import com.sun.star.accessibility.XAccessibleEventBroadcaster; import com.sun.star.accessibility.XAccessibleEventListener; @@ -172,15 +173,11 @@ public class _XAccessibleEventBroadcaster { private static boolean chkTransient(Object Testcase) { XAccessibleContext accCon = UnoRuntime.queryInterface(XAccessibleContext.class, Testcase); -if (accCon.getAccessibleStateSet().contains( -com.sun.star.accessibility.AccessibleStateType.TRANSIENT)){ -if (!accCon.getAccessibleParent().getAccessibleContext().getAccessibleStateSet().contains( - com.sun.star.accessibility.AccessibleStateType.MANAGES_DESCENDANTS)) { -return false; -} -return true; -} -return false; +return accCon.getAccessibleStateSet().contains( +AccessibleStateType.TRANSIENT) +&& accCon.getAccessibleParent().getAccessibleContext() +.getAccessibleStateSet().contains( +AccessibleStateType.MANAGES_DESCENDANTS); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/java
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java |6 +++--- scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java |4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 2a0569b53d87cf5f0971d87a537e275ea5271d8c Author: Robert Antoni Buj i Gelonch Date: Wed Oct 8 16:55:54 2014 +0200 scripting: redundant cast to String Change-Id: I5e048964cc7885a32c59ff8a9eb1fc5b9523e843 Reviewed-on: https://gerrit.libreoffice.org/11859 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java index 59004f0..424c259 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java @@ -331,8 +331,8 @@ class ScriptImpl implements XScript { new StringTokenizer(full.substring(index), ":"); if (tokenizer.countTokens() > 2) { -LogUtils.DEBUG("First token = " + (String)tokenizer.nextElement()); -wrappedException = (String)tokenizer.nextElement(); +LogUtils.DEBUG("First token = " + tokenizer.nextToken()); +wrappedException = tokenizer.nextToken(); LogUtils.DEBUG("wrapped exception = = " + wrappedException); } } @@ -364,4 +364,4 @@ class ScriptImpl implements XScript { } } -} \ No newline at end of file +} diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java index 9d45332..1ca7cb5 100644 --- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java @@ -86,8 +86,8 @@ public class ScriptDescriptor { public void setClasspath(String classpath) { StringTokenizer stk = new StringTokenizer(classpath, ":"); -while (stk.hasMoreElements()) { -this.m_classpath.add((String) stk.nextElement()); +while (stk.hasMoreTokens()) { +this.m_classpath.add(stk.nextToken()); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/helper/CfgParser.java | 19 +++ qadevOOo/runner/org/openoffice/Runner.java | 10 +- qadevOOo/runner/stats/SQLExecution.java| 10 +- 3 files changed, 21 insertions(+), 18 deletions(-) New commits: commit a8e723ed3eed44a85714abf1cb04b74178d2424f Author: Robert Antoni Buj i Gelonch Date: Sat Oct 11 17:08:23 2014 +0200 runner: Iterate over each Entry in a Map Change-Id: I48de54ea88e7fd9f2d903c172eb2b6e1a5b73edd Reviewed-on: https://gerrit.libreoffice.org/11918 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/helper/CfgParser.java b/qadevOOo/runner/helper/CfgParser.java index 6c77461..d6cf0e6 100644 --- a/qadevOOo/runner/helper/CfgParser.java +++ b/qadevOOo/runner/helper/CfgParser.java @@ -18,8 +18,11 @@ package helper; import java.io.FileInputStream; + import java.util.Enumeration; +import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import java.util.Properties; import lib.TestParameters; @@ -102,20 +105,20 @@ public class CfgParser if (os != null && os.length() > 1) { -//found something that could be a prefix -//check all parameters for this -Iterator keys = param.keySet().iterator(); -while (keys.hasNext()) +Map aux = new HashMap(); +for (Iterator> it = param.entrySet().iterator(); it.hasNext();) { -String key = keys.next(); +Map.Entry entry = it.next(); +String key = entry.getKey(); if (key.startsWith(os)) { -Object oldValue = param.get(key); +Object oldValue = entry.getValue(); String newKey = key.substring(os.length() + 1); -param.remove(key); -param.put(newKey, oldValue); +it.remove(); +aux.put(newKey, oldValue); } } +param.putAll(aux); } } diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java index d833a4f..ff1bff4 100644 --- a/qadevOOo/runner/org/openoffice/Runner.java +++ b/qadevOOo/runner/org/openoffice/Runner.java @@ -22,6 +22,7 @@ import helper.ClParser; import java.util.Enumeration; import java.util.Iterator; +import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; @@ -116,13 +117,12 @@ public class Runner bEmergencyStop |= checkPathVariable("sun.boot.class.path", sDelim); // - check all TestParameters - -Iterator aIter = _aParams.keySet().iterator(); -while (aIter.hasNext()) +for (Map.Entry entry : _aParams.entrySet()) { -String sKey = aIter.next(); -if (_aParams.get(sKey) instanceof String) +String sKey = entry.getKey(); +if (entry.getValue() instanceof String) { -String sValue = (String) _aParams.get(sKey); +String sValue = (String) entry.getValue(); if (checkVariableForCygwin(sValue)) { diff --git a/qadevOOo/runner/stats/SQLExecution.java b/qadevOOo/runner/stats/SQLExecution.java index bb50dce..34f8949 100644 --- a/qadevOOo/runner/stats/SQLExecution.java +++ b/qadevOOo/runner/stats/SQLExecution.java @@ -22,9 +22,10 @@ import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.Statement; + import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; +import java.util.Map; import java.util.StringTokenizer; /** @@ -229,10 +230,9 @@ public class SQLExecution { execute(sqlCommand.get(i), sqlOutput, update); // merge output with input if (!update && mergeOutputIntoInput) { -Iterator keys = sqlOutput.keySet().iterator(); -while(keys.hasNext()) { -String key = keys.next(); -String[]val = sqlOutput.get(key); +for (Map.Entry entry : sqlOutput.entrySet()) { +String key = entry.getKey(); +String[] val = entry.getValue(); if (val != null && val.length != 0) { if (val.length == 1) sqlInput.put(key, val[0]); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java | 68 ++ 1 file changed, 16 insertions(+), 52 deletions(-) New commits: commit 9e207520a697dd63ee8ef4de5b2b55df2952b34b Author: Robert Antoni Buj i Gelonch Date: Thu Oct 16 14:39:11 2014 +0200 xmerge: use java.nio.ByteBuffer (JDK 1.4+) Change-Id: I6072bb4699c9cd361e0cfe0a12b46cfc1abfe368 Reviewed-on: https://gerrit.libreoffice.org/11998 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java index 352be2b..a796806 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java @@ -18,6 +18,9 @@ package org.openoffice.xmerge.util; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; + /** * Helper class providing static methods to convert data to/from Network Byte * Order (Big Endian). @@ -38,12 +41,8 @@ public class EndianConverter { * @return Two element {@code byte} array containing the converted value. */ public static byte[] writeShort (short value) { -byte[] leShort = new byte[2]; - -leShort[0] = (byte) value; -leShort[1] = (byte) (value >>> 8); - -return leShort; +return ByteBuffer.allocate(2).order(ByteOrder.LITTLE_ENDIAN) +.putShort(value).array(); } /** @@ -54,14 +53,8 @@ public class EndianConverter { * @return Four element {@code byte} array containing the converted value. */ public static byte[] writeInt (int value) { -byte[] leInt = new byte[4]; - -leInt[0] = (byte) value; -leInt[1] = (byte) (value >>> 8); -leInt[2] = (byte) (value >>> 16); -leInt[3] = (byte) (value >>> 24); - -return leInt; +return ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN) +.putInt(value).array(); } /** @@ -77,20 +70,8 @@ public class EndianConverter { * IEEE-754 float. */ public static byte[] writeDouble(double value) { - -long myDouble = Double.doubleToLongBits(value); -byte[] leDouble = new byte[8]; - -leDouble[0] = (byte) (myDouble >>> 0); -leDouble[1] = (byte) (myDouble >>> 8); -leDouble[2] = (byte) (myDouble >>> 16); -leDouble[3] = (byte) (myDouble >>> 24); -leDouble[4] = (byte) (myDouble >>> 32); -leDouble[5] = (byte) (myDouble >>> 40); -leDouble[6] = (byte) (myDouble >>> 48); -leDouble[7] = (byte) (myDouble >>> 56); - -return leDouble; +return ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN).putLong( +Double.doubleToLongBits(value)).array(); } /** @@ -106,12 +87,8 @@ public class EndianConverter { * @return {@code short} containing the converted value. */ public static short readShort (byte[] value) { -int high, low; - -high = value[1] & 0xFF; -low = value[0] & 0xFF; - -return (short)(high << 8 | low); +return ByteBuffer.allocate(2).order(ByteOrder.LITTLE_ENDIAN) +.put(value).getShort(0); } /** @@ -127,13 +104,8 @@ public class EndianConverter { * @return {@code int} containing the converted value. */ public static int readInt(byte[] value) { -int number = 0; - -for (int i = 0; i < 4; i++) { -number |= (value[i] & 0xFF) << ( i * 8); -} - -return number; +return ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN) +.put(value).getInt(0); } /** @@ -149,16 +121,8 @@ public class EndianConverter { * @return {@code double} containing the converted value. */ public static double readDouble(byte[] value) { - -long lvalue = ( ((long)(value[7]) << 56) + -((long)(value[6]&0xFF) << 48) + -((long)(value[5]&0xFF) << 40) + -((long)(value[4]&0xFF) << 32) + -((long)(value[3]&0xFF) << 24) + -((long)(value[2]&0xFF) << 16) + -((long)(value[1]&0xFF) << 8) + - (value[0]&0xFF)); - -return Double.longBitsToDouble(lvalue); +return Double.longBitsToDouble( +ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN).put(value) +.getLong(0)); } } \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner reportbuilder/java
qadevOOo/runner/convwatch/BorderRemover.java |2 +- reportbuilder/java/org/libreoffice/report/SOImageService.java |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit d807cba9ee60cb1404b54addf9cd3e54de89f331 Author: Robert Antoni Buj i Gelonch Date: Thu Oct 16 17:50:50 2014 +0200 java: loss of precission Change-Id: I0563a76b1d2c838e6301bf7a9ed154c77a98c0d9 Reviewed-on: https://gerrit.libreoffice.org/12000 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java index 09cc785..87ba90a 100644 --- a/qadevOOo/runner/convwatch/BorderRemover.java +++ b/qadevOOo/runner/convwatch/BorderRemover.java @@ -77,7 +77,7 @@ class BorderRemover } // calculate tolerance halve -double nTolerable = (_nTolerance * 256 / 100); +int nTolerable = (int) (_nTolerance * 256.0 / 100.0); if (nTolerable < 0) { nTolerable = 0; diff --git a/reportbuilder/java/org/libreoffice/report/SOImageService.java b/reportbuilder/java/org/libreoffice/report/SOImageService.java index 1979c4f..7070038 100644 --- a/reportbuilder/java/org/libreoffice/report/SOImageService.java +++ b/reportbuilder/java/org/libreoffice/report/SOImageService.java @@ -103,7 +103,7 @@ public class SOImageService implements ImageService { final Size imageSize = (Size) xImage.getPropertyValue("SizePixel"); final int dpi = java.awt.Toolkit.getDefaultToolkit().getScreenResolution(); -final double fac = 2540 / dpi; +final double fac = 2540.0 / dpi; dim.Width = (int) (imageSize.Width * fac); dim.Height = (int) (imageSize.Height * fac); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit eb6c538424b2d44f24cbd029c17afbdf19eaf11d Author: Robert Antoni Buj i Gelonch Date: Thu Oct 16 12:41:50 2014 +0200 javaunohelper: remove unused import Change-Id: Ibee790a50e35219a8427b7037331943b778292a2 Reviewed-on: https://gerrit.libreoffice.org/11997 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java index c51475e..a61edc0 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java @@ -17,10 +17,11 @@ */ package com.sun.star.lib.uno.helper; + import java.util.Iterator; import java.util.ListIterator; -import java.util.NoSuchElementException; import java.util.Collection; + import com.sun.star.lang.EventObject; import com.sun.star.lang.XEventListener; import com.sun.star.uno.UnoRuntime; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java | 26 ++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java | 26 ++ 2 files changed, 14 insertions(+), 38 deletions(-) New commits: commit 96e3718e5ae4e74084f537ae64a2999eb93fa8fb Author: Robert Antoni Buj i Gelonch Date: Thu Oct 16 10:47:34 2014 +0200 xmerge: use String.format http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html#format(java.lang.String, java.lang.Object...) Change-Id: I98b7fca9dee870c9a1d0f9842cbb009a13537967 Reviewed-on: https://gerrit.libreoffice.org/11995 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java index 0d61b1a..20ccd6e 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java @@ -151,19 +151,18 @@ public class TextStyle extends Style implements Cloneable { * @return The {@code Color} associated the value. */ private Color parseColorString(String value) { -// Assume color value is of form #rrggbb -String r = value.substring(1, 3); -String g = value.substring(3, 5); -String b = value.substring(5, 7); int red = 0; int green = 0; int blue = 0; try { -red = Integer.parseInt(r, 16); -green = Integer.parseInt(g, 16); -blue = Integer.parseInt(b, 16); +// Assume color value is of form #rrggbb +red = Integer.parseInt(value.substring(1, 3), 16); +green = Integer.parseInt(value.substring(3, 5), 16); +blue = Integer.parseInt(value.substring(5, 7), 16); } catch (NumberFormatException e) { Debug.log(Debug.ERROR, "Problem parsing a color string", e); +} catch (IndexOutOfBoundsException e) { +Debug.log(Debug.ERROR, "Problem parsing a color string", e); } return new Color(red, green, blue); } @@ -545,18 +544,7 @@ public class TextStyle extends Style implements Cloneable { * @return The {@code Color} value in the form {@literal #rrggbb}. */ private String buildColorString(Color c) { -int v[] = new int[3]; -v[0] = c.getRed(); -v[1] = c.getGreen(); -v[2] = c.getBlue(); -String colorString = "#"; -for (int i = 0; i <= 2; i++) { -String xx = Integer.toHexString(v[i]); -if (xx.length() < 2) -xx = "0" + xx; -colorString += xx; -} -return colorString; +return String.format("#%06X", c.getRGB() & 0x00FF); } private static String[] ignored = { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java index 644d91e..1628f19 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java @@ -118,19 +118,18 @@ public class CellStyle extends Style implements Cloneable { * @return The {@code Color} associated the value. */ private Color parseColorString(String value) { -// Assume color value is of form #rrggbb -String r = value.substring(1, 3); -String g = value.substring(3, 5); -String b = value.substring(5, 7); int red = 0; int green = 0; int blue = 0; try { -red = Integer.parseInt(r, 16); -green = Integer.parseInt(g, 16); -blue = Integer.parseInt(b, 16); +// Assume color value is of form #rrggbb +red = Integer.parseInt(value.substring(1, 3), 16); +green = Integer.parseInt(value.substring(3, 5), 16); +blue = Integer.parseInt(value.substring(5, 7), 16); } catch (NumberFormatException e) { Debug.log(Debug.ERROR, "Problem parsing a color string", e); +} catch (IndexOutOfBoundsException e) { +Debug.log(Debug.ERROR, "Problem parsing a color string", e); } return new Color(red, green, blue, 0); } @@ -438,18 +437,7 @@ public class CellStyle extends Style implements Cloneable { * @return The {@code Color} value in the form {@literal #rrggbb}. */ private String buildColorString(Color c) { -int v[] = new int[3]; -v[0] = c.getRed(); -v[1] = c.getGreen(); -v[2] = c.getBlue(); -String colorString = "#"; -for (int i = 0; i <= 2; i++) { -St
[Libreoffice-commits] core.git: forms/qa xmerge/source
forms/qa/integration/forms/FormControlTest.java| 14 +- xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java | 61 +- xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java| 48 --- 3 files changed, 70 insertions(+), 53 deletions(-) New commits: commit bbd5a304112c57ac1b1357c93ba7bd8ed8973cfa Author: Robert Antoni Buj i Gelonch Date: Wed Oct 15 21:48:19 2014 +0200 java: ensure that the stream is cleaned up before the method returns Change-Id: Id3efeda2fd66173ba2f5662eaacb3629da54573d Reviewed-on: https://gerrit.libreoffice.org/11991 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java index d574640..b7dacb7 100644 --- a/forms/qa/integration/forms/FormControlTest.java +++ b/forms/qa/integration/forms/FormControlTest.java @@ -868,9 +868,17 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE { m_sImageURL = util.utils.getOfficeTempDir( m_orb ) + "image.gif"; -FileOutputStream aFile = new FileOutputStream( m_sImageURL ); -aFile.write( getSamplePicture() ); -aFile.close(); +FileOutputStream aFile = null; +try +{ +aFile = new FileOutputStream( m_sImageURL ); +aFile.write( getSamplePicture() ); +} +finally +{ +if ( aFile != null ) +aFile.close(); +} log.println( "created temporary image file: " + m_sImageURL ); // for later setting the url at the imaghe control, we need a real URL, no system path diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java index e10702a..8299632 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java @@ -21,11 +21,15 @@ package org.openoffice.xmerge.util; import java.io.File; import java.io.FileOutputStream; import java.io.FileInputStream; +import java.io.IOException; + import java.util.StringTokenizer; +import java.util.NoSuchElementException; import org.openoffice.xmerge.Convert; import org.openoffice.xmerge.Document; import org.openoffice.xmerge.ConvertData; +import org.openoffice.xmerge.ConvertException; import org.openoffice.xmerge.ConverterFactory; import org.openoffice.xmerge.util.registry.ConverterInfoMgr; import org.openoffice.xmerge.util.registry.ConverterInfoReader; @@ -103,36 +107,37 @@ public class ActiveSyncDriver { } // Everything is registered so do the conversion -FileInputStream fis = new FileInputStream(srcFile); -FileOutputStream fos = new FileOutputStream(dstFile); - -conv.addInputStream(srcFile, fis); - -ConvertData dataOut; +boolean bOK = true; +FileInputStream fis = null; +FileOutputStream fos = null; try { -dataOut = conv.convert(); -} -catch (Exception e) { -fos.close(); -return false; -} - -if (dataOut == null) { -fos.close(); -return false; -} - -// Get the document and write it out. -Document doc = (Document)dataOut.getDocumentEnumeration().next(); -if (doc == null) { -fos.close(); -return false; +fis = new FileInputStream(srcFile); +conv.addInputStream(srcFile, fis); +try { +fos = new FileOutputStream(dstFile); +ConvertData dataOut = conv.convert(); + +// Get the document and write it out. +Document doc = (Document)dataOut.getDocumentEnumeration().next(); +doc.write(fos); +fos.flush(); +} finally { +if (fos != null) +fos.close(); +} +} catch (IOException e) { +bOK = false; +} catch (NullPointerException e) { +bOK = false; +} catch (ConvertException e) { +bOK = false; +} catch (NoSuchElementException e) { +bOK = false; +} finally { +if (fis != null) +fis.close(); } -doc.write(fos); -fos.flush(); -fos.close(); - -return true; +return bOK; } } \ No newline at end of file diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java index fe0429e..50a34b2 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java @@ -53
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/convwatch/GraphicalTestArguments.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3a6987beaf85876e1061d553cdc134d40c54597e Author: Robert Antoni Buj i Gelonch Date: Wed Oct 15 18:34:53 2014 +0200 runner: if .. else if .. else Change-Id: If9c07074b60b14d0f4e947754d4bf34e4f2f9676 Reviewed-on: https://gerrit.libreoffice.org/11990 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index 5fc4bed..e4dd7c0 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -218,7 +218,7 @@ public class GraphicalTestArguments // m_tWithBorderMove = TriState.UNSET; m_tWithBorderMove = TriState.FALSE; } -if (sWithBorderMove.equalsIgnoreCase("yes") || +else if (sWithBorderMove.equalsIgnoreCase("yes") || sWithBorderMove.equalsIgnoreCase("true")) { m_tWithBorderMove = TriState.TRUE; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/util/XMLTools.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b11968e8bfcc1c4560427a9ca1d9e20a1075eb1b Author: Robert Antoni Buj i Gelonch Date: Tue Oct 14 15:23:57 2014 +0200 runner: replace '.size() == 0' with '.isEmpty()' (collections) http://docs.oracle.com/javase/1.5.0/docs/api/java/util/ArrayList.html#isEmpty() Change-Id: I9a8f4feab9120d2d9fbf845f305380cda9b263bb Reviewed-on: https://gerrit.libreoffice.org/11968 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index ce15982..7dea190 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -718,7 +718,7 @@ public class XMLTools { if (!isWellFormed()) log.println("!!! Some errors were found in XML structure") ; -boolean result = tags.isEmpty() && chars.size() == 0 && isWellFormed(); +boolean result = tags.isEmpty() && chars.isEmpty() && isWellFormed(); reset(); return result; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/ui/UIConsts.java | 56 +- wizards/com/sun/star/wizards/ui/event/EventNames.java | 31 - 2 files changed, 43 insertions(+), 44 deletions(-) New commits: commit cdecac849b2aaf8314f3cb2046f70b3b436519a7 Author: Robert Antoni Buj i Gelonch Date: Tue Oct 14 16:08:30 2014 +0200 rm âpublic static finalâ modifiers from field declarations within interfaces Change-Id: I2154052f89787b6fe17edb2f6e6ea132347b3d13 Reviewed-on: https://gerrit.libreoffice.org/11971 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java index 9c4d77c..0d2e956 100644 --- a/wizards/com/sun/star/wizards/ui/UIConsts.java +++ b/wizards/com/sun/star/wizards/ui/UIConsts.java @@ -21,41 +21,41 @@ package com.sun.star.wizards.ui; public interface UIConsts { -public static final int RID_COMMON = 500; -public static final int RID_DB_COMMON = 1000; -public static final int RID_FORM = 2200; -public static final int RID_QUERY = 2300; -public static final int RID_REPORT = 2400; -public static final int RID_TABLE = 2600; -public static final int RID_IMG_REPORT = 1000; -public static final int RID_IMG_FORM = 1100; -public static final int RID_IMG_WEB = 1200; -public static final Integer INVISIBLESTEP = 99; -public static final String INFOIMAGEURL = "private:resource/dbu/image/19205"; -public static final String INFOIMAGEURL_HC = "private:resource/dbu/image/19230"; +int RID_COMMON = 500; +int RID_DB_COMMON = 1000; +int RID_FORM = 2200; +int RID_QUERY = 2300; +int RID_REPORT = 2400; +int RID_TABLE = 2600; +int RID_IMG_REPORT = 1000; +int RID_IMG_FORM = 1100; +int RID_IMG_WEB = 1200; +Integer INVISIBLESTEP = 99; +String INFOIMAGEURL = "private:resource/dbu/image/19205"; +String INFOIMAGEURL_HC = "private:resource/dbu/image/19230"; /** * The tabindex of the navigation buttons in a wizard must be assigned a very * high tabindex because on every step their taborder must appear at the end */ -public static final short SOFIRSTWIZARDNAVITABINDEX = 3; -public static final Integer INTEGER_8 = 8; -public static final Integer INTEGER_12 = 12; -public static final Integer INTEGER_14 = 14; -public static final Integer INTEGER_16 = 16; -public static final Integer INTEGER_40 = 40; -public static final Integer INTEGER_50 = 50; +short SOFIRSTWIZARDNAVITABINDEX = 3; +Integer INTEGER_8 = 8; +Integer INTEGER_12 = 12; +Integer INTEGER_14 = 14; +Integer INTEGER_16 = 16; +Integer INTEGER_40 = 40; +Integer INTEGER_50 = 50; /**Steps of the QueryWizard * */ -public static final int SOFIELDSELECTIONPAGE = 1; -public static final int SOSORTINGPAGE = 2; -public static final int SOFILTERPAGE = 3; -public static final int SOAGGREGATEPAGE = 4; -public static final int SOGROUPSELECTIONPAGE = 5; -public static final int SOGROUPFILTERPAGE = 6; -public static final int SOTITLESPAGE = 7; -public static final int SOSUMMARYPAGE = 8; -public static final Integer[] INTEGERS = new Integer[] +int SOFIELDSELECTIONPAGE = 1; +int SOSORTINGPAGE = 2; +int SOFILTERPAGE = 3; +int SOAGGREGATEPAGE = 4; +int SOGROUPSELECTIONPAGE = 5; +int SOGROUPFILTERPAGE = 6; +int SOTITLESPAGE = 7; +int SOSUMMARYPAGE = 8; +Integer[] INTEGERS = new Integer[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }; diff --git a/wizards/com/sun/star/wizards/ui/event/EventNames.java b/wizards/com/sun/star/wizards/ui/event/EventNames.java index fbb733f..e49ee30 100644 --- a/wizards/com/sun/star/wizards/ui/event/EventNames.java +++ b/wizards/com/sun/star/wizards/ui/event/EventNames.java @@ -19,21 +19,20 @@ package com.sun.star.wizards.ui.event; public interface EventNames { - //common listener events -public static final String EVENT_ACTION_PERFORMED = "APR"; -public static final String EVENT_ITEM_CHANGED = "ICH"; -public static final String EVENT_TEXT_CHANGED = "TCH";//window events (XWindow) -public static final String EVENT_WINDOW_RESIZED = "WRE"; -public static final String EVENT_WINDOW_MOVED = "WMO"; -public static final String EVENT_WINDOW_SHOWN = "WSH"; -public static final String EVENT_WINDOW_HIDDEN = "WHI";//focus events (XWindow) -public static final String EVENT_FOCUS_GAINED = "FGA"; -public static final String EVENT_FOCUS_LOST = "FLO";//keyboard events -public static final String EVENT_KEY_PRESSED = "KPR"; -public static final String EVENT_KEY_RELEASED = "KRE";//mouse events -public static final String EVENT_MOUSE_P
[Libreoffice-commits] core.git: scripting/java
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java | 2 +- scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 0fdba36ab6aa1eef3e147371153b7c5d12c11cae Author: Robert Antoni Buj i Gelonch Date: Tue Oct 14 12:32:15 2014 +0200 scripting: replace '.size() == 0' with '.isEmpty()' (collections) http://docs.oracle.com/javase/1.5.0/docs/api/java/util/Map.html#isEmpty() http://docs.oracle.com/javase/1.5.0/docs/api/java/util/ArrayList.html#isEmpty() Change-Id: I76d8d8be2794655cb27ab121759494d7084b4744 Reviewed-on: https://gerrit.libreoffice.org/11967 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java index 14ebb24..f8b5d0d 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java @@ -352,7 +352,7 @@ public class ParcelDescriptor { item.setAttribute("value", script.getLanguageName()); root.appendChild(item); -if (languagedepprops != null && languagedepprops.size() != 0) { +if (languagedepprops != null && !languagedepprops.isEmpty()) { String key; item = document.createElement("languagedepprops"); diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index cc4094d..d19928f 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -212,7 +212,7 @@ public class ScriptMetaData extends ScriptEntry { } -if (classPathVec.size() == 0) { +if (classPathVec.isEmpty()) { URL url = createURL(parcelPath); if (url != null) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/java
scripting/java/com/sun/star/script/framework/container/ParcelContainer.java |5 + scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java |4 ++-- scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java |3 ++- scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java |6 ++ scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java |6 ++ 5 files changed, 9 insertions(+), 15 deletions(-) New commits: commit 791ed2c654509c8e20af473d5413e8031bceddc0 Author: Robert Antoni Buj i Gelonch Date: Tue Oct 14 11:57:25 2014 +0200 scripting: use new exception constructors Change-Id: I7eeece85d4e462bf2df010ee29c062941a677759 Reviewed-on: https://gerrit.libreoffice.org/11966 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java index be72d78..b641cd0 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java @@ -193,10 +193,7 @@ public class ParcelContainer implements XNameAccess { name = decodedUrl.substring(indexOfSlash + 1); } } catch (UnsupportedEncodingException e) { -com.sun.star.uno.RuntimeException e2 = -new com.sun.star.uno.RuntimeException(); -e2.initCause(e); -throw e2; +throw new com.sun.star.uno.RuntimeException(e); } } else { name = "document"; diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index db30afb..cc4094d 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -218,9 +218,9 @@ public class ScriptMetaData extends ScriptEntry { if (url != null) { classPathVec.add(url); } - } +} - return classPathVec.toArray(new URL[classPathVec.size()]); +return classPathVec.toArray(new URL[classPathVec.size()]); } catch (Exception e) { LogUtils.DEBUG("Failed to build class path " + e.toString()); LogUtils.DEBUG(LogUtils.getTrace(e)); diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java index 05384a7..79f933c 100644 --- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java +++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java @@ -117,7 +117,8 @@ public class UCBStreamHandler extends URLStreamHandler { try { String sUrl = url.toString(); -if ( sUrl.lastIndexOf(separator) != -1 ) { + +if (sUrl.lastIndexOf(separator) != -1) { String path = sUrl.substring(0, sUrl.lastIndexOf(separator)); if (m_xSimpleFileAccess.isReadOnly(path)) { diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java index 8daf836..497b073 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -131,10 +131,8 @@ public abstract class ScriptProvider implements } catch (Exception e) { LogUtils.DEBUG(LogUtils.getTrace(e)); -com.sun.star.uno.RuntimeException e2 = new com.sun.star.uno.RuntimeException( -"Error constructing ScriptProvider: " + e); -e2.initCause(e); -throw e2; +throw new com.sun.star.uno.RuntimeException( +e, "Error constructing ScriptProvider: " + e); } LogUtils.DEBUG("ScriptProvider: constructor - finished."); diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java index bc896cb..881ae81 100644 --- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java @@ -147,10 +147,8 @@ class ScriptImpl implements XScript { this.m_xMultiComponentFactory = m_xContext.getServiceManager(); } catch (Exception e)
[Libreoffice-commits] core.git: jurt/com
jurt/com/sun/star/lib/connections/socket/SocketConnection.java |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 530f060e41aa28634c133dab2e606907010d3cc3 Author: Robert Antoni Buj i Gelonch Date: Tue Oct 14 11:25:26 2014 +0200 jurt: print an array with java.util.Arrays.toString Change-Id: I76431b67f9f6fdde2906d6d8082457ef0847108e Reviewed-on: https://gerrit.libreoffice.org/11964 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java index f7ad911..6f2a548 100644 --- a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java +++ b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java @@ -23,8 +23,11 @@ import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import java.net.Socket; + import java.util.ArrayList; +import java.util.Arrays; import com.sun.star.connection.XConnection; import com.sun.star.connection.XConnectionBroadcaster; @@ -154,7 +157,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster { throw unoIOException; } -if (DEBUG) System.err.println("# " + getClass().getName() + " - read byte:" + read_bytes + " " + bytes[0]); +if (DEBUG) System.err.println("# " + getClass().getName() + " - read byte:" + read_bytes + " " + Arrays.toString(bytes[0])); return read_bytes; } @@ -176,7 +179,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster { throw unoIOException; } -if (DEBUG) System.err.println("# " + getClass().getName() + " - written bytes:" + aData + " " + aData.length); +if (DEBUG) System.err.println("# " + getClass().getName() + " - written bytes:" + Arrays.toString(aData) + " " + aData.length); } /** ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/util/AccessibilityTools.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 23e4eb6aeb77c74f5ff8a6a70f7adbe52e1c34e7 Author: Robert Antoni Buj i Gelonch Date: Sat Oct 11 20:27:09 2014 +0200 runner: Null pointer dereference Change-Id: Id38a9e0bddbf3c9038abbc5de7137ee5d3f39db6 Reviewed-on: https://gerrit.libreoffice.org/11924 Reviewed-by: Matthew Francis Tested-by: Matthew Francis diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java index 76136e6..a0f1612 100644 --- a/qadevOOo/runner/util/AccessibilityTools.java +++ b/qadevOOo/runner/util/AccessibilityTools.java @@ -65,13 +65,13 @@ public class AccessibilityTools { if (xFrame == null) { System.out.println("can't get frame from controller"); +} else { +if (containerWindow) +xWindow = xFrame.getContainerWindow(); +else +xWindow = xFrame.getComponentWindow(); } -if (containerWindow) -xWindow = xFrame.getContainerWindow(); -else -xWindow = xFrame.getComponentWindow(); - if (xWindow == null) { System.out.println("can't get window from frame"); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/convwatch/DB.java| 78 - qadevOOo/runner/convwatch/DBHelper.java | 18 qadevOOo/runner/convwatch/FileHelper.java| 30 qadevOOo/runner/convwatch/MSOfficePrint.java | 710 +++ qadevOOo/runner/convwatch/OfficePrint.java | 66 - qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 476 +- qadevOOo/runner/helper/FileTools.java| 28 qadevOOo/runner/stats/FileLogWriter.java | 13 qadevOOo/runner/stats/SQLExecution.java | 86 - qadevOOo/runner/stats/SimpleFileOutProducer.java | 64 - qadevOOo/runner/util/DBTools.java| 32 11 files changed, 873 insertions(+), 728 deletions(-) New commits: commit a2c481457cd2d03263054a5fefe80da316e09a44 Author: Robert Antoni Buj i Gelonch Date: Mon Oct 13 13:20:47 2014 +0200 runner: finally block to ensure that a resource is closed (Prior to Java SE 7) http://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html Change-Id: I5ecefd3e5bf84fea2a8735a44236ed4c86b440c4 Reviewed-on: https://gerrit.libreoffice.org/11950 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/convwatch/DB.java b/qadevOOo/runner/convwatch/DB.java index 70a2559..8b4c4ff 100644 --- a/qadevOOo/runner/convwatch/DB.java +++ b/qadevOOo/runner/convwatch/DB.java @@ -215,49 +215,65 @@ public class DB extends DBHelper ArrayList aResultList = new ArrayList(); try { -oStmt = _aCon.createStatement(); - -java.sql.ResultSet aResultSet = oStmt.executeQuery(_sSQL); -java.sql.ResultSetMetaData aResultSetMetaData = aResultSet.getMetaData(); - -int nColumnCount = aResultSetMetaData.getColumnCount(); // java sql starts with '1' - -while( aResultSet.next() ) +try { -StringBuffer aResult = new StringBuffer(); +oStmt = _aCon.createStatement(); +java.sql.ResultSet aResultSet = null; try { -aResult.append("sqlresult: "); -for (int i=1;i<=nColumnCount;i++) +aResultSet = oStmt.executeQuery(_sSQL); +java.sql.ResultSetMetaData aResultSetMetaData = aResultSet.getMetaData(); + +int nColumnCount = aResultSetMetaData.getColumnCount(); // java sql starts with '1' + +while( aResultSet.next() ) { -String sColumnName = aResultSetMetaData.getColumnName(i); -aResult.append(sColumnName).append("="); -String sValue; -int nSQLType = aResultSetMetaData.getColumnType(i); -switch(nSQLType) +StringBuffer aResult = new StringBuffer(); +try { -case java.sql.Types.VARCHAR: -sValue = "'" + aResultSet.getString(i) + "'"; -break; -case java.sql.Types.INTEGER: -{ -int nValue = aResultSet.getInt(i); -sValue = String.valueOf(nValue); -break; +aResult.append("sqlresult: "); +for (int i=1;i<=nColumnCount;i++) +{ +String sColumnName = aResultSetMetaData.getColumnName(i); +aResult.append(sColumnName).append("="); +String sValue; +int nSQLType = aResultSetMetaData.getColumnType(i); +switch(nSQLType) +{ +case java.sql.Types.VARCHAR: +sValue = "'" + aResultSet.getString(i) + "'"; +break; +case java.sql.Types.INTEGER: +{ +int nValue = aResultSet.getInt(i); +sValue = String.valueOf(nValue); +break; +} + +default: +
[Libreoffice-commits] core.git: scripting/java
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b862f6e92357f8d4a8d88072ce5caf44bd6f1c6d Author: Robert Antoni Buj i Gelonch Date: Sat Oct 11 20:10:51 2014 +0200 scripting: Null pointer dereference Change-Id: I0d72ef34945065f68e9af8b0957dc440a74c14ce Reviewed-on: https://gerrit.libreoffice.org/11923 Reviewed-by: Matthew Francis Tested-by: Matthew Francis diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java index bcef577..8daf836 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -171,7 +171,7 @@ public abstract class ScriptProvider implements } else { // otherwise, check whether it's an XModel m_xModel = -UnoRuntime.queryInterface(XModel.class, m_xInvocContext.getScriptContainer()); +UnoRuntime.queryInterface(XModel.class, aArguments[0]); } if (m_xModel == null) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner toolkit/test
qadevOOo/runner/graphical/IniFile.java |7 +++ qadevOOo/runner/share/DescGetter.java |7 +++ toolkit/test/accessibility/AccTreeNode.java |6 ++ 3 files changed, 8 insertions(+), 12 deletions(-) New commits: commit d0be30e8eec9d982501e8727df05962572c7acc6 Author: Robert Antoni Buj i Gelonch Date: Mon Oct 13 16:05:18 2014 +0200 java: Collections.addAll for adding an array of elements to a Collection Change-Id: I4689aa73e1e261c6461e04b9e814ffefa5817c09 Reviewed-on: https://gerrit.libreoffice.org/11953 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index f6b371f..fe2df6e 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -19,7 +19,9 @@ package graphical; import java.io.File; import java.io.RandomAccessFile; + import java.util.ArrayList; +import java.util.Arrays; import java.util.Enumeration; /** @@ -55,10 +57,7 @@ public class IniFile implements Enumeration if (m_aList.isEmpty()) { // can only insert if there is nothing else already in the ini file -for (int i = 0; i < _aList.length; i++) -{ -m_aList.add(_aList[i]); -} +m_aList.addAll(Arrays.asList(_aList)); } } diff --git a/qadevOOo/runner/share/DescGetter.java b/qadevOOo/runner/share/DescGetter.java index 53e0f93..892a33d 100644 --- a/qadevOOo/runner/share/DescGetter.java +++ b/qadevOOo/runner/share/DescGetter.java @@ -19,7 +19,9 @@ package share; import java.io.BufferedReader; import java.io.FileReader; + import java.util.ArrayList; +import java.util.Arrays; import java.util.StringTokenizer; /** @@ -108,10 +110,7 @@ public abstract class DescGetter line.length()).trim(), descPath, debug); -for (int i = 0; i < subs.length; i++) -{ -entryList.add(subs[i]); -} +entryList.addAll(Arrays.asList(subs)); } else if (line.startsWith("-p")) { diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java index 136f872..73fa129 100644 --- a/toolkit/test/accessibility/AccTreeNode.java +++ b/toolkit/test/accessibility/AccTreeNode.java @@ -17,6 +17,7 @@ */ import java.util.ArrayList; +import java.util.Arrays; import com.sun.star.accessibility.XAccessible; import com.sun.star.accessibility.XAccessibleComponent; @@ -299,10 +300,7 @@ class AccTreeNode HandlerDescriptor aDescriptor = getHandlerDescriptor (i); NodeHandler aHandler = aDescriptor.maHandler; String[] aHandlerActions = aHandler.getActions (this); -for(int j = 0; j < aHandlerActions.length; j++ ) -{ -aActions.add( aHandlerActions[j] ); -} +aActions.addAll(Arrays.asList(aHandlerActions)); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/test jurt/com qadevOOo/runner wizards/com xmerge/source
javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java | 1 - jurt/com/sun/star/uno/WeakReference.java | 5 - qadevOOo/runner/lib/TestCase.java | 1 - qadevOOo/runner/util/InstCreator.java | 2 -- wizards/com/sun/star/wizards/common/ParaStyled.java| 1 - wizards/com/sun/star/wizards/common/PlaceholderTextElement.java| 2 -- wizards/com/sun/star/wizards/common/TextElement.java | 2 -- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java | 2 -- 8 files changed, 16 deletions(-) New commits: commit f6388e15bf95326d2a712453dc2c17b010801533 Author: Robert Antoni Buj i Gelonch Date: Mon Oct 13 16:36:02 2014 +0200 java: import from the same package Change-Id: I1bb0999783f365e20b682c3707e73c65724265c9 Reviewed-on: https://gerrit.libreoffice.org/11955 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java index 092c9fc..bb0a605 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java @@ -30,7 +30,6 @@ import com.sun.star.registry.XSimpleRegistry; import com.sun.star.registry.XImplementationRegistration; import com.sun.star.container.XSet; -import com.sun.star.lib.uno.helper.Factory; import com.sun.star.comp.helper.RegistryServiceFactory; import com.sun.star.uno.UnoRuntime; diff --git a/jurt/com/sun/star/uno/WeakReference.java b/jurt/com/sun/star/uno/WeakReference.java index 3691c0f..261bc1a 100644 --- a/jurt/com/sun/star/uno/WeakReference.java +++ b/jurt/com/sun/star/uno/WeakReference.java @@ -18,11 +18,6 @@ package com.sun.star.uno; -import com.sun.star.uno.XWeak; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XAdapter; -import com.sun.star.uno.XReference; - /** * This class holds weak reference to an object. * diff --git a/qadevOOo/runner/lib/TestCase.java b/qadevOOo/runner/lib/TestCase.java index a4895f1..ebe175d 100644 --- a/qadevOOo/runner/lib/TestCase.java +++ b/qadevOOo/runner/lib/TestCase.java @@ -19,7 +19,6 @@ package lib; import java.io.PrintWriter; -import lib.TestParameters; /** * TestCase represent a factory for TestEnvironments diff --git a/qadevOOo/runner/util/InstCreator.java b/qadevOOo/runner/util/InstCreator.java index 5259b43..e1eb8c8 100644 --- a/qadevOOo/runner/util/InstCreator.java +++ b/qadevOOo/runner/util/InstCreator.java @@ -18,8 +18,6 @@ package util; -import util.XInstCreator; - import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; diff --git a/wizards/com/sun/star/wizards/common/ParaStyled.java b/wizards/com/sun/star/wizards/common/ParaStyled.java index e1eedfd..0a80f45 100644 --- a/wizards/com/sun/star/wizards/common/ParaStyled.java +++ b/wizards/com/sun/star/wizards/common/ParaStyled.java @@ -17,7 +17,6 @@ */ package com.sun.star.wizards.common; -import com.sun.star.wizards.common.TemplateElement; import com.sun.star.uno.UnoRuntime; import com.sun.star.text.*; diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java index a6e69da..3b943e0 100644 --- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java +++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java @@ -17,14 +17,12 @@ */ package com.sun.star.wizards.common; -import com.sun.star.wizards.common.TextElement; import com.sun.star.uno.Exception; import com.sun.star.uno.UnoRuntime; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.text.*; import com.sun.star.wizards.text.*; -import com.sun.star.wizards.common.PlaceholderTextElement; public class PlaceholderTextElement extends TextElement { diff --git a/wizards/com/sun/star/wizards/common/TextElement.java b/wizards/com/sun/star/wizards/common/TextElement.java index 3830891..4549a9f 100644 --- a/wizards/com/sun/star/wizards/common/TextElement.java +++ b/wizards/com/sun/star/wizards/common/TextElement.java @@ -17,11 +17,9 @@ */ package com.sun.star.wizards.common; -import com.sun.star.wizards.common.ParaStyled; import com.sun.star.uno.UnoRuntime; import com.sun.star.text.*; -import com.sun.star.wizards.common.TextElement; public class TextElement extends ParaStyled { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java index f74a999..11e337b 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge
[Libreoffice-commits] core.git: reportbuilder/java
reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java |2 -- 1 file changed, 2 deletions(-) New commits: commit a667840368d0299c695c3565da06d31f6fde4c02 Author: Robert Antoni Buj i Gelonch Date: Mon Oct 13 16:52:02 2014 +0200 reportbuilder: import from java.lang package Change-Id: I039f7cf28dddede48627c3c624c87741ee9de0ed Reviewed-on: https://gerrit.libreoffice.org/11956 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java index 0a8586b..a054794 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java @@ -40,8 +40,6 @@ import org.libreoffice.report.pentaho.output.text.TextRawReportProcessor; import java.io.IOException; -import java.lang.Integer; - import java.util.ArrayList; import java.util.List; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/convwatch/OfficePrint.java |2 +- qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 5233d9b8e57aebbfda22a2edcf67e87282ebc66d Author: Robert Antoni Buj i Gelonch Date: Sat Oct 11 19:44:58 2014 +0200 runner: Object comparison Change-Id: I41b245f20652187dc36b4639272d0ddbc602afda Reviewed-on: https://gerrit.libreoffice.org/11921 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java index 75f117e..24eb0b0 100644 --- a/qadevOOo/runner/convwatch/OfficePrint.java +++ b/qadevOOo/runner/convwatch/OfficePrint.java @@ -570,7 +570,7 @@ public class OfficePrint { { nPropIndex++; } -isBusy = (aPrinterProps[nPropIndex].Value == Boolean.TRUE); +isBusy = aPrinterProps[nPropIndex].Value.equals(Boolean.TRUE); TimeHelper.waitInSeconds(1, "is print ready?"); nPrintCount++; if (nPrintCount > 3600) diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index 2ab3910..0e827b3 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -528,7 +528,7 @@ public class OpenOfficePostscriptCreator implements IOffice { nPropIndex++; } -isBusy = (aPrinterProps[nPropIndex].Value == Boolean.TRUE); +isBusy = aPrinterProps[nPropIndex].Value.equals(Boolean.TRUE); TimeHelper.waitInSeconds(1, "is print ready?"); nPrintCount++; if (nPrintCount > 3600) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - nlpsolver/ThirdParty xmerge/source
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java | 29 ++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java |7 ++ 2 files changed, 27 insertions(+), 9 deletions(-) New commits: commit 88bfc90de9bf03c8dbce9f26de079a9fd1d83146 Author: Robert Antoni Buj i Gelonch Date: Mon Oct 13 00:11:59 2014 +0200 nlpsolver: ensure that the stream is cleaned up before the method returns Change-Id: I081194d802bd835285bdc37fbef55f229f1185dc Reviewed-on: https://gerrit.libreoffice.org/11940 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java index 36e4ebb..913ee64 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java @@ -87,9 +87,14 @@ public class GlobalFile { */ public static void saveStringToFile(String inStr, String fileStr) throws Exception{ new File(new File(fileStr).getParent()).mkdirs(); -FileOutputStream pspOutputStream = new FileOutputStream(new File(fileStr)); -pspOutputStream.write(inStr.getBytes()); -pspOutputStream.close(); +FileOutputStream pspOutputStream = null; +try { +pspOutputStream = new FileOutputStream(new File(fileStr)); +pspOutputStream.write(inStr.getBytes()); +} finally { +if (pspOutputStream != null) +pspOutputStream.close(); +} } /** @@ -100,12 +105,18 @@ public class GlobalFile { */ public static String getStringFromFile(String fileStr) throws Exception { String getStr = null; -FileInputStream pspInputStream = new FileInputStream(fileStr); -byte[] pspFileBuffer = new byte[pspInputStream.available()]; -pspInputStream.read(pspFileBuffer); -pspInputStream.close(); -getStr = new String(pspFileBuffer); -return(getStr); +FileInputStream pspInputStream = null; +try { +pspInputStream = new FileInputStream(fileStr); +byte[] pspFileBuffer = new byte[pspInputStream.available()]; +pspInputStream.read(pspFileBuffer); + +getStr = new String(pspFileBuffer); +} finally { +if (pspInputStream != null) +pspInputStream.close(); +} +return getStr; } /** commit e77235e87ef8554ba38ce4454f2f99bd62dd5824 Author: Robert Antoni Buj i Gelonch Date: Sun Oct 12 22:17:53 2014 +0200 xmerge: ensure that the stream is cleaned up before the method returns Change-Id: I377ae1a7b71c207313ad3468a51b1ab06b9fffd5 Reviewed-on: https://gerrit.libreoffice.org/11939 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java index c89fb72..cae4e76 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java @@ -147,6 +147,13 @@ public final class PluginFactoryImpl extends PluginFactory } catch (Exception e) { // It is okay for the property file to not exist. +} finally { +try { +if (is != null) { +is.close(); +} +} catch (IOException ex) { +} } return ext; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/test
toolkit/test/accessibility/Options.java | 35 1 file changed, 31 insertions(+), 4 deletions(-) New commits: commit 3c27e31628c49b927d2026176cac5a085bf0fe39 Author: Robert Antoni Buj i Gelonch Date: Sun Oct 12 22:00:41 2014 +0200 accessibility: ensure that the stream is cleaned up before the method returns Change-Id: Ib46d24be831b5c9bda0582bd7064f34528e1d609 Reviewed-on: https://gerrit.libreoffice.org/11938 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/toolkit/test/accessibility/Options.java b/toolkit/test/accessibility/Options.java index 5651928..3b9e537 100644 --- a/toolkit/test/accessibility/Options.java +++ b/toolkit/test/accessibility/Options.java @@ -19,6 +19,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.IOException; import java.util.Properties; /** Load from and save options into a file. @@ -69,24 +70,50 @@ class Options public void Load (String sBaseName) { +FileInputStream fis = null; try { -load (new FileInputStream (ProvideFile(sBaseName))); +fis = new FileInputStream (ProvideFile(sBaseName)); +load (fis); } -catch (java.io.IOException e) +catch (IOException e) { // Ignore a non-existing options file. } +finally +{ +try +{ +if (fis != null) +fis.close(); +} +catch (IOException ex) +{ +} +} } public void Save (String sBaseName) { +FileOutputStream fos = null; try { -store (new FileOutputStream (ProvideFile(sBaseName)), null); +fos = new FileOutputStream (ProvideFile(sBaseName)); +store (fos, null); +} +catch (IOException e) +{ } -catch (java.io.IOException e) +finally { +try +{ +if (fos != null) +fos.close(); +} +catch (IOException ex) +{ +} } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/util/UITools.java | 27 --- 1 file changed, 4 insertions(+), 23 deletions(-) New commits: commit 881c030fc1e69cffc99b2360c986f516e61f01ab Author: Robert Antoni Buj i Gelonch Date: Sun Oct 12 12:08:44 2014 +0200 runner: Concatenating null strings in Java (JDK 1.5+) JLS, Section 15.18.1.1: If the reference is null, it is converted to the string "null". http://docs.oracle.com/javase/specs/jls/se5.0/html/expressions.html#15.18.1.1 Change-Id: Idae09c02b24da38ec6f3475fd0af35ef48a2405b Reviewed-on: https://gerrit.libreoffice.org/11930 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java index 3f4701b..dfff835 100644 --- a/qadevOOo/runner/util/UITools.java +++ b/qadevOOo/runner/util/UITools.java @@ -28,14 +28,15 @@ import com.sun.star.accessibility.XAccessibleContext; import com.sun.star.accessibility.XAccessibleEditableText; import com.sun.star.accessibility.XAccessibleText; import com.sun.star.accessibility.XAccessibleValue; + import com.sun.star.awt.XWindow; import com.sun.star.frame.XModel; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.text.XTextDocument; + import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; - /** * This class supports some functions to handle easily accessible objects */ @@ -69,7 +70,6 @@ public class UITools { return AccessibilityTools.getAccessibleObject(xWindow); } - private static String getString(XInterface xInt) { XAccessibleText oText = UnoRuntime.queryInterface(XAccessibleText.class, xInt); @@ -128,7 +128,6 @@ public class UITools { * @param buttonName is name name of the button to click * @throws java.lang.Exception if something fail */ - public void clickButton(String buttonName) throws java.lang.Exception { @@ -148,15 +147,12 @@ public class UITools { } } - - /** * Helper method: returns the entry manes of a List-Box * @param ListBoxName the name of the listbox * @return the listbox entry names * @throws java.lang.Exception if something fail */ - public String[] getListBoxItems(String ListBoxName) throws java.lang.Exception { @@ -209,7 +205,6 @@ public class UITools { return Items.toArray(ret); } - /** * set a value to a named check box * @param CheckBoxName the name of the check box @@ -236,8 +231,6 @@ public class UITools { } } - - /** * returns the message of a Basic-MessageBox * @return the message of a Basic-MessageBox @@ -246,30 +239,18 @@ public class UITools { public String getMsgBoxText() throws java.lang.Exception { -String cMessage = null; try{ XAccessibleContext xMessage =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.LABEL); XInterface xMessageInterface = UnoRuntime.queryInterface(XInterface.class, xMessage); -cMessage += (getString(xMessageInterface)); - -return cMessage; +return getString(xMessageInterface); } catch (Exception e) { throw new Exception("Could not get message from Basic-MessageBox:", e); } } - - - - - - - - - /** * Prints the accessible tree to the logWriter only if debugIsActive * is set to true @@ -280,4 +261,4 @@ public class UITools { AccessibilityTools.printAccessibleTree(log, mXRoot, debugIsActive); } -} +} \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - qadevOOo/runner
qadevOOo/runner/util/DrawTools.java|1 - qadevOOo/runner/util/WriterTools.java |8 +--- qadevOOo/runner/util/compare/DocComparatorFactory.java |1 - qadevOOo/runner/util/compare/GraphicalComparator.java |2 -- qadevOOo/runner/util/compare/PDFComparator.java|2 -- qadevOOo/runner/util/utils.java|1 - 6 files changed, 5 insertions(+), 10 deletions(-) New commits: commit d1c1c4e4616555df4efb55ae6ba381c26888683d Author: Robert Antoni Buj i Gelonch Date: Sun Oct 12 13:32:18 2014 +0200 runner: remove import from same package Change-Id: I4aeb7f58034f8808325639d07aa2dc55959d97a8 Reviewed-on: https://gerrit.libreoffice.org/11932 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/util/DrawTools.java b/qadevOOo/runner/util/DrawTools.java index 43c9e51..5a37f4d 100644 --- a/qadevOOo/runner/util/DrawTools.java +++ b/qadevOOo/runner/util/DrawTools.java @@ -28,7 +28,6 @@ import com.sun.star.drawing.XDrawPages; import com.sun.star.drawing.XDrawPagesSupplier; import com.sun.star.drawing.XDrawPage; import com.sun.star.drawing.XShapes; -import util.DesktopTools; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.Type; diff --git a/qadevOOo/runner/util/WriterTools.java b/qadevOOo/runner/util/WriterTools.java index d1445cd..e7189eb 100644 --- a/qadevOOo/runner/util/WriterTools.java +++ b/qadevOOo/runner/util/WriterTools.java @@ -19,19 +19,21 @@ package util; import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertySet; + import com.sun.star.container.XNamed; + import com.sun.star.drawing.XDrawPage; import com.sun.star.drawing.XDrawPageSupplier; + import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; + import com.sun.star.text.XText; import com.sun.star.text.XTextContent; import com.sun.star.text.XTextCursor; import com.sun.star.text.XTextDocument; -import com.sun.star.uno.UnoRuntime; - -import util.DesktopTools; +import com.sun.star.uno.UnoRuntime; public class WriterTools { public static XTextDocument createTextDoc(XMultiServiceFactory xMSF) { diff --git a/qadevOOo/runner/util/compare/DocComparatorFactory.java b/qadevOOo/runner/util/compare/DocComparatorFactory.java index 9b6413c..470cb03 100644 --- a/qadevOOo/runner/util/compare/DocComparatorFactory.java +++ b/qadevOOo/runner/util/compare/DocComparatorFactory.java @@ -19,7 +19,6 @@ package util.compare; import lib.TestParameters; -import util.compare.GraphicalComparator; public class DocComparatorFactory { diff --git a/qadevOOo/runner/util/compare/GraphicalComparator.java b/qadevOOo/runner/util/compare/GraphicalComparator.java index 05cc842..af0492d 100644 --- a/qadevOOo/runner/util/compare/GraphicalComparator.java +++ b/qadevOOo/runner/util/compare/GraphicalComparator.java @@ -25,10 +25,8 @@ import convwatch.FileHelper; import lib.TestParameters; import java.io.IOException; -import util.compare.DocComparator; import convwatch.ConvWatchException; - class GraphicalComparator implements DocComparator { private GraphicalTestArguments m_aArguments; diff --git a/qadevOOo/runner/util/compare/PDFComparator.java b/qadevOOo/runner/util/compare/PDFComparator.java index 76eff50..edd7e7e 100644 --- a/qadevOOo/runner/util/compare/PDFComparator.java +++ b/qadevOOo/runner/util/compare/PDFComparator.java @@ -18,9 +18,7 @@ package util.compare; -import util.compare.DocComparator; import lib.TestParameters; -import util.compare.GraphicalComparator; class PDFComparator extends GraphicalComparator { commit 1610356e79516711b1db98778b4c6a18bda49104 Author: Robert Antoni Buj i Gelonch Date: Sun Oct 12 13:34:41 2014 +0200 runner: remove import from java.lang Package Change-Id: Iedad24dfbdd60a05a09888f699f2467960f5cbe9 Reviewed-on: https://gerrit.libreoffice.org/11933 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java index 775ed23..3fe4f2b 100644 --- a/qadevOOo/runner/util/utils.java +++ b/qadevOOo/runner/util/utils.java @@ -22,7 +22,6 @@ import com.sun.star.frame.XDispatch; import com.sun.star.frame.XDispatchProvider; import com.sun.star.frame.XModel; import com.sun.star.lang.XComponent; -import java.lang.System; import java.util.StringTokenizer; import java.io.*; import java.util.ArrayList; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/util/BookmarkDsc.java |4 ++-- qadevOOo/runner/util/ControlDsc.java |2 +- qadevOOo/runner/util/FootnoteDsc.java |4 ++-- qadevOOo/runner/util/FrameDsc.java |4 ++-- qadevOOo/runner/util/ParagraphDsc.java |4 ++-- qadevOOo/runner/util/ReferenceMarkDsc.java |4 ++-- qadevOOo/runner/util/ShapeDsc.java |2 +- qadevOOo/runner/util/StyleFamilyDsc.java |6 +++--- qadevOOo/runner/util/TableDsc.java |4 ++-- qadevOOo/runner/util/TextSectionDsc.java |4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) New commits: commit 268f4d179c50bc0c1fb09cdb3ce048da1f575dbc Author: Robert Antoni Buj i Gelonch Date: Sun Oct 12 13:25:05 2014 +0200 runner: 'static final' to declare constants when it isn't an interface Change-Id: Iea1e672e5468b66fd1ba5389bd781f03d0c7f419 Reviewed-on: https://gerrit.libreoffice.org/11931 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/util/BookmarkDsc.java b/qadevOOo/runner/util/BookmarkDsc.java index 6772f1c..3f4b894 100644 --- a/qadevOOo/runner/util/BookmarkDsc.java +++ b/qadevOOo/runner/util/BookmarkDsc.java @@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent; */ public class BookmarkDsc extends InstDescr { -private final String service = "com.sun.star.text.Bookmark"; -private String ifcName = "com.sun.star.text.XTextContent"; +private static final String service = "com.sun.star.text.Bookmark"; +private static final String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/ControlDsc.java b/qadevOOo/runner/util/ControlDsc.java index 8a99b70..e5eb0d2 100644 --- a/qadevOOo/runner/util/ControlDsc.java +++ b/qadevOOo/runner/util/ControlDsc.java @@ -29,7 +29,7 @@ import com.sun.star.uno.UnoRuntime; public class ControlDsc extends InstDescr { private String name = null; -final String ifcName = "com.sun.star.form.XFormComponent"; +static final String ifcName = "com.sun.star.form.XFormComponent"; String service = "com.sun.star.form.component.CommandButton"; public ControlDsc( String kind ) { diff --git a/qadevOOo/runner/util/FootnoteDsc.java b/qadevOOo/runner/util/FootnoteDsc.java index 7ff9f6b..dc05741 100644 --- a/qadevOOo/runner/util/FootnoteDsc.java +++ b/qadevOOo/runner/util/FootnoteDsc.java @@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent; */ public class FootnoteDsc extends InstDescr { -private final String service = "com.sun.star.text.Footnote"; -private String ifcName = "com.sun.star.text.XTextContent"; +private static final String service = "com.sun.star.text.Footnote"; +private static final String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/FrameDsc.java b/qadevOOo/runner/util/FrameDsc.java index c65738e..348cc8d 100644 --- a/qadevOOo/runner/util/FrameDsc.java +++ b/qadevOOo/runner/util/FrameDsc.java @@ -34,8 +34,8 @@ public class FrameDsc extends InstDescr { private int height = 2000; private int width = 2000; private String name = null; -private final String ifcName = "com.sun.star.text.XTextFrame"; -private final String service = "com.sun.star.text.TextFrame"; +private static final String ifcName = "com.sun.star.text.XTextFrame"; +private static final String service = "com.sun.star.text.TextFrame"; public FrameDsc() { initFrame(); diff --git a/qadevOOo/runner/util/ParagraphDsc.java b/qadevOOo/runner/util/ParagraphDsc.java index 1650883..318ada2 100644 --- a/qadevOOo/runner/util/ParagraphDsc.java +++ b/qadevOOo/runner/util/ParagraphDsc.java @@ -28,8 +28,8 @@ import com.sun.star.text.XTextContent; */ public class ParagraphDsc extends InstDescr { -private final String service = "com.sun.star.text.Paragraph"; -private String ifcName = "com.sun.star.text.XTextContent"; +private static final String service = "com.sun.star.text.Paragraph"; +private static final String ifcName = "com.sun.star.text.XTextContent"; private String name = null; diff --git a/qadevOOo/runner/util/ReferenceMarkDsc.java b/qadevOOo/runner/util/ReferenceMarkDsc.java index 8185bd9..82f8c3f 100644 --- a/qadevOOo/runner/util/ReferenceMarkDsc.java +++ b/qadevOOo/runner/util/ReferenceMarkDsc.java @@ -27,8 +27,8 @@ import com.sun.star.text.XTextContent; */ public class ReferenceMarkDsc extends InstDescr { -private final String service = "com.sun.star.text.ReferenceMark"; -private String ifcName = "com.sun.star.text.XTextContent"; +private static final String service = "com.sun.star.text.ReferenceMark"; +priv
[Libreoffice-commits] core.git: bean/com
bean/com/sun/star/comp/beans/OOoBean.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0c48deb59ffb67ac0ddd315ba58872cbf978bc74 Author: Robert Antoni Buj i Gelonch Date: Sat Oct 11 19:58:11 2014 +0200 bean: String comparison Change-Id: Id2449ac887c92f87deb3b871b178ac16d3d6b4b8 Reviewed-on: https://gerrit.libreoffice.org/11922 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 0d1e34e..d874386 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -1330,7 +1330,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); // is new argument already set? for ( int n = 0; n < nNumArgs; ++n ) { -if ( aArguments[n].Name == aArgument.Name ) +if ( aArguments[n].Name.equals(aArgument.Name) ) { // substitute this argument aArguments[n] = aArgument; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner wizards/com
qadevOOo/runner/convwatch/DBHelper.java |4 ++-- wizards/com/sun/star/wizards/common/FileAccess.java |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit d860ea91d75568e2e63b0b2c84e50523d562be24 Author: Robert Antoni Buj i Gelonch Date: Sat Oct 11 19:15:44 2014 +0200 It is more efficient to use the integer implementations of String.indexOf() Change-Id: Idb1e4945088b8443e9b507826e5289ee758a2bd2 Reviewed-on: https://gerrit.libreoffice.org/11919 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java index 26be888..aaf6497 100644 --- a/qadevOOo/runner/convwatch/DBHelper.java +++ b/qadevOOo/runner/convwatch/DBHelper.java @@ -187,8 +187,8 @@ public class DBHelper public String Quote(String _sToQuote) { -String ts = "'"; -String ds = "\""; +char ts = '\''; +char ds = '"'; int nQuote = _sToQuote.indexOf(ts); if (nQuote >= 0) { diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java index a44c786..3424860 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.java +++ b/wizards/com/sun/star/wizards/common/FileAccess.java @@ -1063,7 +1063,7 @@ public class FileAccess { if (path.startsWith("/")) { // unix -int nextSlash = path.indexOf("/", 1) + 1; +int nextSlash = path.indexOf('/', 1) + 1; firstPart = Math.min(nextSlash, (maxLength - 3) / 2); } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/qa
connectivity/qa/connectivity/tools/HsqlDatabase.java | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) New commits: commit 0bc6ea3637e279fa2807d8ee649fb33f1ae6da47 Author: Robert Antoni Buj i Gelonch Date: Sat Oct 11 16:16:09 2014 +0200 connectivity: Iterate over each Entry in a Map & Enhanced for-loops Change-Id: Id4a340584fc727058f6e37c1f0d3c5887e931417 Reviewed-on: https://gerrit.libreoffice.org/11917 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java index b5a7e21..13b0f32 100644 --- a/connectivity/qa/connectivity/tools/HsqlDatabase.java +++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java @@ -30,10 +30,9 @@ import com.sun.star.sdbcx.XTablesSupplier; import com.sun.star.uno.UnoRuntime; import helper.URLHelper; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Set; import java.io.File; +import java.util.HashMap; +import java.util.Map; public class HsqlDatabase extends AbstractDatabase { @@ -162,14 +161,12 @@ public class HsqlDatabase extends AbstractDatabase createStatement.append(')'); } -final Set foreignKeyTables = foreignKeys.keySet(); -for (final Iterator foreignKey = foreignKeyTables.iterator(); -foreignKey.hasNext();) +for (Map.Entry foreignKey : foreignKeys.entrySet()) { -final String foreignTable = foreignKey.next(); +final String foreignTable = foreignKey.getKey(); createStatement.append(", FOREIGN KEY ("); -createStatement.append(foreignKeys.get(foreignTable)); +createStatement.append(foreignKey.getValue()); createStatement.append(") REFERENCES \""); createStatement.append(foreignTable); createStatement.append("\"("); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unittest fails building on OS X 10.9
Hi Stephan, I've added a subsection which explains how to install multiple copies of MacPorts. Regards, Robert On Fri, Oct 10, 2014 at 10:04 AM, Stephan Bergmann wrote: > On 10/10/2014 09:35 AM, Tor Lillqvist wrote: > >> >> I've added the section "Minimal Setup with MacPorts for external >> dependencies" [1] which can be very helpful to build LO easily. >> >> >> So that is then now our documented and thus "official" way to build on >> Mac? If it works, I don't oppose... even if it totally contrary to what >> has been the collective wisdom so far. >> > > I assume the sanity of a MacPorts-in-PATH based build env depends on what > other stuff you have installed in your MacPorts installation, so I would > not generally suggest that route to the uninitiated. > > Stephan > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java |5 + xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java |5 + xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java | 10 ++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java |5 + xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java |6 +- xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java |6 +- 6 files changed, 7 insertions(+), 30 deletions(-) New commits: commit 6d848b2aaf4eb814dba90a3db8e5494530dc0ada Author: Robert Antoni Buj i Gelonch Date: Thu Oct 9 21:25:08 2014 +0200 xmerge: The if statement is redundant Change-Id: I56c5727470c4dba9ffa7c298fb6ccea5be750f33 Reviewed-on: https://gerrit.libreoffice.org/11894 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java index 48c84ef..644d91e 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java @@ -352,10 +352,7 @@ public class CellStyle extends Style implements Cloneable { Format rhs = tStyle.getFormat(); -if(!fmt.isSubset(rhs)) -return false; - -return true; +return fmt.isSubset(rhs); } /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java index 68c689f..3b88008 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java @@ -225,10 +225,7 @@ public class ColumnStyle extends Style implements Cloneable { return false; ColumnStyle tStyle = (ColumnStyle)style; -if(colWidth!=tStyle.getColWidth()) -return false; - -return true; +return colWidth == tStyle.getColWidth(); } /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java index 27f87f0..84514be 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java @@ -388,10 +388,7 @@ public class Format implements Cloneable { if (rhs.align!= align) return false; -if (rhs.vertAlign!= vertAlign) -return false; - -return true; +return rhs.vertAlign == vertAlign; } /** @@ -426,9 +423,6 @@ public class Format implements Cloneable { if (rhs.align!= align) return false; -if (rhs.vertAlign!= vertAlign) -return false; - -return true; +return rhs.vertAlign == vertAlign; } } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java index 3f8075c..6639ce1 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java @@ -224,10 +224,7 @@ public class RowStyle extends Style implements Cloneable { return false; RowStyle tStyle = (RowStyle)style; -if(rowHeight!=tStyle.getRowHeight()) -return false; - -return true; +return rowHeight == tStyle.getRowHeight(); } /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java index c90e5ea..7ca174a 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java @@ -292,10 +292,6 @@ public final class Driver { private boolean isZip(String zipName) { String str = zipName.toLowerCase(); -if (str.endsWith("sxw") || zipName.endsWith("sxc")) { -return true; -} - -return false; +return str.endsWith("sxw") || zipName.endsWith("sxc"); } } \ No newline at end of file diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java index 7254ed0..aefb3f9 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerg
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/convwatch/EnhancedComplexTestCase.java |8 -- qadevOOo/runner/convwatch/FileHelper.java|6 - qadevOOo/runner/convwatch/FilenameHelper.java|6 - qadevOOo/runner/convwatch/GraphicalTestArguments.java| 46 +++ qadevOOo/runner/convwatch/IniFile.java | 10 --- qadevOOo/runner/convwatch/MSOfficePrint.java | 16 + qadevOOo/runner/graphical/IniFile.java | 31 +- qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 22 +-- qadevOOo/runner/graphical/ParameterHelper.java | 15 qadevOOo/runner/helper/OSHelper.java | 45 +++--- qadevOOo/runner/org/openoffice/Runner.java |6 - qadevOOo/runner/org/openoffice/RunnerService.java|4 - 12 files changed, 48 insertions(+), 167 deletions(-) New commits: commit 110ae4e498a55bd50ca0afe558126e9e029f68cd Author: Robert Antoni Buj i Gelonch Date: Thu Oct 9 21:51:37 2014 +0200 runner: The if statement is redundant Change-Id: Ida40034bdfe6a44a936db1243ad6c71616caada3 Reviewed-on: https://gerrit.libreoffice.org/11895 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java index 47e23fc..52587c6 100644 --- a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java +++ b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java @@ -79,12 +79,8 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase { sNEEDCHECK = "false"; } -if (sNEEDCHECK.equalsIgnoreCase("yes") || -sNEEDCHECK.equalsIgnoreCase("true")) -{ -return true; -} -return false; +return sNEEDCHECK.equalsIgnoreCase("yes") || +sNEEDCHECK.equalsIgnoreCase("true"); } diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java index e9f97ef..ba4e4c3 100644 --- a/qadevOOo/runner/convwatch/FileHelper.java +++ b/qadevOOo/runner/convwatch/FileHelper.java @@ -44,11 +44,7 @@ public class FileHelper if (_sFile == null) return false; File aFile = new File(_sFile); -if (aFile.exists()) -{ -return true; -} -return false; +return aFile.exists(); } public static boolean isDir(String _sDir) diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java index 19b9eea..56a3b5dd 100644 --- a/qadevOOo/runner/convwatch/FilenameHelper.java +++ b/qadevOOo/runner/convwatch/FilenameHelper.java @@ -246,11 +246,7 @@ abstract class FilenameHelper_impl implements Filenamer { String sPath = createAbsoluteFilename(); String sPathOther = _aOtherFN.createAbsoluteFilename(); -if (sPath.equals(sPathOther)) -{ -return true; -} -return false; +return sPath.equals(sPathOther); } } diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index 49fb1e0..5fc4bed 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -196,15 +196,9 @@ public class GraphicalTestArguments { sREUSE_OFFICE = "false"; } -if (sREUSE_OFFICE.equalsIgnoreCase("yes") || -sREUSE_OFFICE.equalsIgnoreCase("true")) -{ -m_bResuseOffice = true; -} -else -{ -m_bResuseOffice = false; -} +m_bResuseOffice = +sREUSE_OFFICE.equalsIgnoreCase("yes") || +sREUSE_OFFICE.equalsIgnoreCase("true"); String sHTMLOutputPrefix = (String)param.get( PropertyName.DOC_COMPARATOR_HTML_OUTPUT_PREFIX); @@ -276,15 +270,9 @@ public class GraphicalTestArguments String sCreateDefault = (String)param.get(PropertyName.CREATE_DEFAULT); if (sCreateDefault != null) { -if (sCreateDefault.equalsIgnoreCase("yes") || -sCreateDefault.equalsIgnoreCase("true")) -{ -m_bCreateDefaultReference = true; -} -else -{ -m_bCreateDefaultReference = false; -} +m_bCreateDefaultReference = +sCreateDefault.equalsIgnoreCase("yes") || +
[Libreoffice-commits] core.git: toolkit/test
toolkit/test/accessibility/ov/ObjectViewContainer.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d802b6d2424cf87a9c3780565625a53fe184b790 Author: Robert Antoni Buj i Gelonch Date: Thu Oct 9 15:51:57 2014 +0200 unchecked call to getDeclaredMethod(String,Class...) http://docs.oracle.com/javase/tutorial/reflect/class/classTrouble.html Change-Id: I293e7ad3ace1a8876c34d7ffd070b49807a8b0a6 Reviewed-on: https://gerrit.libreoffice.org/11882 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/toolkit/test/accessibility/ov/ObjectViewContainer.java b/toolkit/test/accessibility/ov/ObjectViewContainer.java index e8d6272..a22d61e 100644 --- a/toolkit/test/accessibility/ov/ObjectViewContainer.java +++ b/toolkit/test/accessibility/ov/ObjectViewContainer.java @@ -69,7 +69,7 @@ public class ObjectViewContainer { try { -Class aViewClass = maViewTemplates.get (i); +Class aViewClass = maViewTemplates.get(i); Method aCreateMethod = aViewClass.getDeclaredMethod ( "Create", new Class[] { ObjectViewContainer.class, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jurt/com
jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java |5 --- jurt/com/sun/star/comp/loader/JavaLoader.java | 20 ++ jurt/com/sun/star/comp/servicemanager/ServiceManager.java |6 3 files changed, 6 insertions(+), 25 deletions(-) New commits: commit 7afbb8275667ca8157be5449536e671bbac9f988 Author: Robert Antoni Buj i Gelonch Date: Thu Oct 9 20:53:02 2014 +0200 jurt: use new exception constructors Change-Id: I58e7ebdd5c48094142f93f47271bcc0cc8b97981 Reviewed-on: https://gerrit.libreoffice.org/11892 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java index 7e370a9..7dd6fcf 100644 --- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java +++ b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java @@ -124,10 +124,7 @@ public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ { xBridge = UnoRuntime.queryInterface(XBridge.class, iBridge); } catch (Exception e) { -com.sun.star.lang.IllegalArgumentException e2 = -new com.sun.star.lang.IllegalArgumentException(e.getMessage()); -e2.initCause(e); -throw e2; +throw new com.sun.star.lang.IllegalArgumentException(e, e.getMessage()); } if(DEBUG) System.err.println("# " + getClass().getName() + ".createBridge:" + sName + " " + sProtocol + " " + aConnection + " " + anInstanceProvider + " " + xBridge); diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/jurt/com/sun/star/comp/loader/JavaLoader.java index 7649d10..fb7c6d8 100644 --- a/jurt/com/sun/star/comp/loader/JavaLoader.java +++ b/jurt/com/sun/star/comp/loader/JavaLoader.java @@ -279,20 +279,11 @@ public class JavaLoader implements XImplementationLoader, } } } catch (java.net.MalformedURLException e) { -CannotActivateFactoryException cae = new CannotActivateFactoryException( -"Can not activate factory because " + e ); -cae.initCause(e); -throw cae; +throw new CannotActivateFactoryException(e, "Can not activate factory because " + e); } catch (java.io.IOException e) { -CannotActivateFactoryException cae = new CannotActivateFactoryException( -"Can not activate factory because " + e ); -cae.initCause(e); -throw cae; +throw new CannotActivateFactoryException(e, "Can not activate factory because " + e); } catch (java.lang.ClassNotFoundException e) { -CannotActivateFactoryException cae = new CannotActivateFactoryException( -"Can not activate factory because " + e ); -cae.initCause(e); -throw cae; +throw new CannotActivateFactoryException(e, "Can not activate factory because " + e); } Class[] paramTypes = {String.class, XMultiServiceFactory.class, XRegistryKey.class}; @@ -400,10 +391,7 @@ public class JavaLoader implements XImplementationLoader, if ( (oRet != null) && (oRet instanceof Boolean) ) success = ((Boolean) oRet).booleanValue(); } catch (Exception e) { -CannotRegisterImplementationException e2 = -new CannotRegisterImplementationException(e.toString()); -e2.initCause(e); -throw e2; +throw new CannotRegisterImplementationException(e, e.toString()); } return success; diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java index 729fda5..85f69fd 100644 --- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java +++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java @@ -652,11 +652,7 @@ public class ServiceManager implements XMultiServiceFactory, try { return enumeration.next(); } catch (java.util.NoSuchElementException e) { -com.sun.star.container.NoSuchElementException ex = -new com.sun.star.container.NoSuchElementException( -e.toString()); -ex.initCause(e); -throw ex; +throw new com.sun.star.container.NoSuchElementException(e, e.toString()); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bean/com
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 12 +++- 1 file changed, 3 insertions(+), 9 deletions(-) New commits: commit 017ea9eb0f80ba750f0cf917033052c75e622c0a Author: Robert Antoni Buj i Gelonch Date: Thu Oct 9 20:00:10 2014 +0200 bean: Use com.sun.star.uno.RuntimeException(Throwable thrwbl) Change-Id: I6677072c349fc8c1997030b78fa38a5d78aec361 Reviewed-on: https://gerrit.libreoffice.org/11889 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index ac260fe..52cef3c 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -134,15 +134,11 @@ public class LocalOfficeConnection } catch ( java.net.MalformedURLException e ) { -com.sun.star.uno.RuntimeException e2 = new com.sun.star.uno.RuntimeException(); -e2.initCause(e); -throw e2; +throw new com.sun.star.uno.RuntimeException(e); } catch ( UnsupportedEncodingException e) { -com.sun.star.uno.RuntimeException e2 = new com.sun.star.uno.RuntimeException(); -e2.initCause(e); -throw e2; +throw new com.sun.star.uno.RuntimeException(e); } } @@ -672,9 +668,7 @@ public class LocalOfficeConnection } catch (UnsupportedEncodingException e) { -com.sun.star.uno.RuntimeException e2 = new com.sun.star.uno.RuntimeException(); -e2.initCause(e); -throw e2; +throw new com.sun.star.uno.RuntimeException(e); } return identifier; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unittest fails building on OS X 10.9
Hi, I've added the section "Minimal Setup with MacPorts for external dependencies" [1] which can be very helpful to build LO easily. [1] https://wiki.documentfoundation.org/Development/BuildingOnMac#Minimal_Setup_with_MacPorts_for_external_dependencies Regards, Robert On Thu, Oct 9, 2014 at 9:38 PM, Joost Eekhoorn wrote: > Build has succeeded. > I saw in this that --disable-cve-test is needed on OS X Mavericks > > Still I had to do 2 little, dirty hacks: > - Moved away 4 CVE-test file from > ~/lo/core/writerfilter/qa/cppunittest/data/pass/ > (CVE-2010-333-1.rtf, CVE-2014-1761-1.rtf, CVE-2014-1761-2.rtf and > CVS-pseudo-2009-0238-1.rtf) > - Edited ~/lo/core/sw/qa/extras/rtfimport/rtfimport.cxx > (skipping testN192129) > > Beside that, this is what I have done: > > Install Ant (OS X Mavericks does not have that anymore) > > ./autogen.sh > --with-ant-home="/usr/local/bin/apache-ant" > --wiithout-junit > --enable-python=internal > --disable-cve-tests > > I could not found instdir/program/soffice to start the program, but used: > instdir/LibreOfficeDev.app/Contents/MacOS/soffice > > It would be nice if someone would review my information and update the > building instructions for Mac: > https://wiki.documentfoundation.org/Development/BuildingOnMac > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: toolkit/test
toolkit/test/accessibility/AccessibleSelectionHandler.java |3 ++- toolkit/test/accessibility/AccessibleTextHandler.java |4 ++-- toolkit/test/accessibility/SelectionDialog.java|2 +- 3 files changed, 5 insertions(+), 4 deletions(-) New commits: commit 14cccfab8111c61bf6707eef423abe79e95f5572 Author: Robert Antoni Buj i Gelonch Date: Thu Oct 9 13:02:21 2014 +0200 As of JDK version 1.5, show() and hide() in Dialog have been deprecated Change-Id: If96e40ebe2c59f31ca4e2b81c6583eb7f8d5ec81 Reviewed-on: https://gerrit.libreoffice.org/11873 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/toolkit/test/accessibility/AccessibleSelectionHandler.java b/toolkit/test/accessibility/AccessibleSelectionHandler.java index 546bd69..2d4f64f 100644 --- a/toolkit/test/accessibility/AccessibleSelectionHandler.java +++ b/toolkit/test/accessibility/AccessibleSelectionHandler.java @@ -140,6 +140,7 @@ class AccessibleSelectionHandler @Override public void performAction (AccessibleTreeNode aNode, int nIndex) { -new SelectionDialog( (AccTreeNode)aNode ).show(); +SelectionDialog selectionDialog = new SelectionDialog( (AccTreeNode)aNode ); +selectionDialog.setVisible(true); } } diff --git a/toolkit/test/accessibility/AccessibleTextHandler.java b/toolkit/test/accessibility/AccessibleTextHandler.java index 2190253..d29eefd 100644 --- a/toolkit/test/accessibility/AccessibleTextHandler.java +++ b/toolkit/test/accessibility/AccessibleTextHandler.java @@ -480,7 +480,7 @@ class AccessibleTextHandler extends NodeHandler } if( aDialog != null ) -aDialog.show(); +aDialog.setVisible(true); } } @@ -550,7 +550,7 @@ abstract class TextActionDialog extends JDialog void cancel() { -hide(); +setVisible(false); dispose(); } diff --git a/toolkit/test/accessibility/SelectionDialog.java b/toolkit/test/accessibility/SelectionDialog.java index 5ca8ca8..10d8413 100644 --- a/toolkit/test/accessibility/SelectionDialog.java +++ b/toolkit/test/accessibility/SelectionDialog.java @@ -134,7 +134,7 @@ class SelectionDialog extends JDialog void close () { -hide(); +setVisible(false); dispose(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 22248b89c07533e28026dea66c5cb73d023293c6 Author: Robert Antoni Buj i Gelonch Date: Wed Oct 8 22:27:34 2014 +0200 complex: Use 'import com.sun.star.beans.UnknownPropertyException;' Change-Id: Ib42baf6f18fd407a879313c042efd74c8f724aa4 Reviewed-on: https://gerrit.libreoffice.org/11864 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java index 4d54ef1..56d072c 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java @@ -236,7 +236,7 @@ public class _XAccessibleText { } catch(com.sun.star.lang.IndexOutOfBoundsException e) { System.out.println("Expected exception"); res &= true; -} catch(com.sun.star.beans.UnknownPropertyException e) { +} catch(UnknownPropertyException e) { System.out.println("unexpected exception => FAILED"); res &= false; } @@ -249,7 +249,7 @@ public class _XAccessibleText { } catch(com.sun.star.lang.IndexOutOfBoundsException e) { System.out.println("Expected exception"); res &= true; -} catch(com.sun.star.beans.UnknownPropertyException e) { +} catch(UnknownPropertyException e) { System.out.println("unexpected exception => FAILED"); res &= false; } @@ -264,7 +264,7 @@ public class _XAccessibleText { System.out.println("Unexpected exception"); e.printStackTrace(); res &= false; -} catch(com.sun.star.beans.UnknownPropertyException e) { +} catch(UnknownPropertyException e) { System.out.println("unexpected exception => FAILED"); res &= false; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jurt/com
jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java |1 - 1 file changed, 1 deletion(-) New commits: commit c2b5affc135a3dd202b8d9ca3a4317a1d05203cd Author: Robert Antoni Buj i Gelonch Date: Wed Oct 8 22:24:19 2014 +0200 jurt: remove unused import Change-Id: I597dac3cae7eafef75982789ab1b0d3d8d6999d2 Reviewed-on: https://gerrit.libreoffice.org/11863 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java b/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java index 8a42b4a..c226e3a 100644 --- a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java +++ b/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java @@ -31,7 +31,6 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutput; import java.io.DataOutputStream; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/java
scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 1df9d5767b3222cace051a75259dea5d951cbfaf Author: Robert Antoni Buj i Gelonch Date: Wed Oct 8 18:22:16 2014 +0200 scripting: as of release 5, 'enum' is a keyword Change-Id: Ia45890892f3a0fa89b4c1f97a4c169de5e25c593 Reviewed-on: https://gerrit.libreoffice.org/11860 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java index 1caa883..4a91798 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java @@ -52,11 +52,11 @@ public class OfficeSettings extends SystemOption { SVersionRCFile sversion = SVersionRCFile.createInstance(); try { -Enumeration enum = sversion.getVersions(); +Enumeration enumeration = sversion.getVersions(); OfficeInstallation oi; -while (enum.hasMoreElements()) { -oi = (OfficeInstallation)enum.nextElement(); +while (enumeration.hasMoreElements()) { +oi = (OfficeInstallation)enumeration.nextElement(); setOfficeDirectory(oi); return; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java |9 +++-- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java |2 +- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java |7 --- 3 files changed, 8 insertions(+), 10 deletions(-) New commits: commit 5b0e6aea60ece93d72f4d256817da67df7150519 Author: Robert Antoni Buj i Gelonch Date: Tue Oct 7 11:14:34 2014 +0200 xmerge: reuse the value of node.getNodeName() and remove duplicated constants Change-Id: Ia835139496ab8e5230a09df2caf23637a5559ba4 Reviewed-on: https://gerrit.libreoffice.org/11836 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java index 2a1b4d2..b04 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java @@ -38,10 +38,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants; */ public final class ParaNodeIterator extends NodeIterator { -// can be expanded to an array in the future, not necessary right now -private static final String SUPPORTED_TAG1 = OfficeConstants.TAG_PARAGRAPH; -private static final String SUPPORTED_TAG2 = OfficeConstants.TAG_HEADING; - /** * Standard constructor. * @@ -65,8 +61,9 @@ public final class ParaNodeIterator extends NodeIterator { protected boolean nodeSupported(Node node) { // can use an array later to check all possible tags for // future expansion +String nodeName = node.getNodeName(); return node.getNodeType() == Node.ELEMENT_NODE && -(node.getNodeName().equals(SUPPORTED_TAG1) || -node.getNodeName().equals(SUPPORTED_TAG2)); +(nodeName.equals(OfficeConstants.TAG_PARAGRAPH) || +nodeName.equals(OfficeConstants.TAG_HEADING)); } } \ No newline at end of file diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java index 7d84f7a..972e388 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java @@ -61,6 +61,6 @@ public final class RowIterator extends NodeIterator { // can use an array later to check all possible tags for // future expansion return node.getNodeType() == Node.ELEMENT_NODE && -node.getNodeName().equals(OfficeConstants.TAG_TABLE_ROW); +node.getNodeName().equals(OfficeConstants.TAG_TABLE_ROW); } } \ No newline at end of file diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java index fa7c608..8c480cf 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java @@ -60,9 +60,10 @@ public final class TextNodeIterator extends NodeIterator { protected boolean nodeSupported(Node node) { // can use an array later to check all possible tags for // future expansion +String nodeName = node.getNodeName(); return node.getNodeType() == Node.TEXT_NODE || -node.getNodeName().equals(OfficeConstants.TAG_SPACE) || -node.getNodeName().equals(OfficeConstants.TAG_TAB_STOP) || -node.getNodeName().equals(OfficeConstants.TAG_LINE_BREAK); +nodeName.equals(OfficeConstants.TAG_SPACE) || +nodeName.equals(OfficeConstants.TAG_TAB_STOP) || +nodeName.equals(OfficeConstants.TAG_LINE_BREAK); } } \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/java
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java | 246 ++ scripting/java/com/sun/star/script/framework/browse/DialogFactory.java | 95 ++- scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java | 86 +-- scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java |6 scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java | 70 +- scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java | 114 ++-- scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java |8 scripting/java/com/sun/star/script/framework/container/Parcel.java | 63 +- scripting/java/com/sun/star/script/framework/container/ParcelContainer.java | 177 --- scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java | 15 scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java |3 scripting/java/com/sun/star/script/framework/container/ScriptEntry.java |9 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 52 +- scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java | 100 ++-- scripting/java/com/sun/star/script/framework/container/XMLParser.java |2 scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java | 55 +- scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java | 47 + scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java | 19 scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java |4 scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java | 24 scripting/java/com/sun/star/script/framework/io/XStorageHelper.java | 53 +- scripting/java/com/sun/star/script/framework/log/LogUtils.java |2 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java |5 scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java | 16 scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException.java |5 scripting/java/com/sun/star/script/framework/provider/PathUtils.java | 10 scripting/java/com/sun/star/script/framework/provider/ScriptContext.java | 24 scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java |2 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 239 - scripting/java/com/sun/star/script/framework/provider/SwingInvocation.java |3 scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java |6 scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java | 26 - scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java | 116 ++-- scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java |3 scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java |2 scripting/java/com/sun/star/script/framework/provider/java/Resolver.java | 10 scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java | 20 scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java | 124 ++--- scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java | 14 scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java | 33 - scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java | 24 scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java | 79 +-- scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java |8 43 files changed, 1136 insertions(+), 883 deletions(-) New commits: commit e41597eade24f04893752a4339112b13419fefdd Author: Robert Antoni Buj i Gelonch Date: Fri Oct 3 17:07:28 2014 +0200 scripting: line break (code formatting) Change-Id
[Libreoffice-commits] core.git: scripting/java
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java | 22 +- scripting/java/com/sun/star/script/framework/browse/DialogFactory.java | 21 +- scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java | 35 ++-- scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java |8 - scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java | 30 ++- scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java | 43 +++-- scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java |8 - scripting/java/com/sun/star/script/framework/container/Parcel.java | 19 +- scripting/java/com/sun/star/script/framework/container/ParcelContainer.java | 36 +++- scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java |1 scripting/java/com/sun/star/script/framework/container/ScriptEntry.java |4 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 20 +- scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java | 23 +- scripting/java/com/sun/star/script/framework/container/XMLParser.java |3 scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java |9 - scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java | 25 ++- scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java |4 scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java |3 scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java |3 scripting/java/com/sun/star/script/framework/io/XStorageHelper.java | 33 ++-- scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java |7 scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java | 10 - scripting/java/com/sun/star/script/framework/provider/PathUtils.java |6 scripting/java/com/sun/star/script/framework/provider/ScriptContext.java | 16 +- scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java |2 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 77 -- scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java | 16 +- scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java | 28 +-- scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java | 38 ++-- scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java |6 scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java |2 scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java | 29 ++- scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java |2 scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java |4 scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java | 26 +-- scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java | 33 ++-- 36 files changed, 370 insertions(+), 282 deletions(-) New commits: commit 4a0fc2fb026ee46f7ef8e75135e2ae9b411ae134 Author: Robert Antoni Buj i Gelonch Date: Thu Oct 2 17:38:29 2014 +0200 scripting: organize imports Change-Id: I26a1164d44f464a44ed7deb93ac39465feb0541c Reviewed-on: https://gerrit.libreoffice.org/11768 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java index adcde1f..3a4f413 100644 --- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java +++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java @@ -23,32 +23,38 @@ import com.sun.star.awt.ItemEvent; import com.sun.star.awt.XButton; import com.sun.star.awt.XCheckBox; import com.sun.star.awt.XControl; -import com.sun.star.awt.XControlModel; import
[Libreoffice-commits] core.git: scripting/java
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java |5 + scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java |6 ++ scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java |7 ++- scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java |6 +- 4 files changed, 6 insertions(+), 18 deletions(-) New commits: commit 4959ff5fef4381b7d09650fa62e8cda649ba7676 Author: Robert Antoni Buj i Gelonch Date: Thu Oct 2 19:51:11 2014 +0200 scripting: The if statement is redundant Change-Id: Ia6186be4ed48fd75d1063eed233a88e09b675bf1 Reviewed-on: https://gerrit.libreoffice.org/11774 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java index e789d86..adcde1f 100644 --- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java +++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java @@ -210,10 +210,7 @@ public class SecurityDialog extends WeakBase implements XComponent, // XServiceInfo public boolean supportsService(/*IN*/String serviceName) { -if (serviceName.equals(__serviceName)) -return true; - -return false; +return serviceName.equals(__serviceName); } // XServiceInfo diff --git a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java index 178d449..25ce356 100644 --- a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java +++ b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java @@ -33,11 +33,9 @@ public class ExceptParcelFilter implements FileFilter { public static ExceptParcelFilter getInstance() { return filter; } -public boolean validate(String name) { -if (name.startsWith(ExceptParcelFilter.parcelName)) -return true; -return false; +public boolean validate(String name) { +return name.startsWith(ExceptParcelFilter.parcelName); } @Override diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java index 6f9f48b..e662fae 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java @@ -215,14 +215,11 @@ public class DeployParcelAction extends CookieAction implements chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); chooser.setFileFilter(new FileFilter() { public boolean accept(File file) { -if (file.isDirectory() || +return file.isDirectory() || file.getName().endsWith(".sxw") || file.getName().endsWith(".sxc") || file.getName().endsWith(".sxd") || -file.getName().endsWith(".sxi")) -return true; - -return false; +file.getName().endsWith(".sxi"); } public String getDescription() { diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java index a9f0456..8d27555 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java @@ -284,11 +284,7 @@ public class ParcelFolder extends DataFolder { private class ParcelFolderFilter implements DataFilter { public boolean acceptDataObject(DataObject dobj) { String name = dobj.getPrimaryFile().getNameExt(); - -if (name.equals(ParcelZipper.PARCEL_DESCRIPTOR_XML)) -return false; - -return true; +return !name.equals(ParcelZipper.PARCEL_DESCRIPTOR_XML); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/examples scripting/java scripting/workben
/installer/Final.java | 82 - scripting/workben/installer/IdeFinal.java | 64 - scripting/workben/installer/IdeUpdater.java | 77 - scripting/workben/installer/IdeVersion.java | 147 +- scripting/workben/installer/IdeWelcome.java | 16 scripting/workben/installer/InstUtil.java | 248 ++-- scripting/workben/installer/InstallListener.java |3 scripting/workben/installer/InstallWizard.java | 235 +-- scripting/workben/installer/InstallationEvent.java | 12 scripting/workben/installer/LogStream.java | 44 scripting/workben/installer/NavPanel.java | 29 scripting/workben/installer/Register.java | 83 - scripting/workben/installer/Version.java | 122 + scripting/workben/installer/Welcome.java | 25 scripting/workben/installer/XmlUpdater.java | 238 +-- scripting/workben/installer/ZipData.java | 19 scripting/workben/mod/_scripting/Dispatch.java | 35 scripting/workben/mod/_scripting/Function.java | 27 scripting/workben/mod/_scripting/FunctionProvider.java | 21 scripting/workben/mod/_scripting/ScriptInfo.java | 56 scripting/workben/mod/_scripting/ScriptRuntimeManager.java | 12 scripting/workben/mod/_scripting/ScriptStorage.java | 50 scripting/workben/mod/_scripting/ScriptStorageManager.java | 26 scripting/workben/mod/_scripting/TestDataLoader.java | 11 156 files changed, 6399 insertions(+), 6950 deletions(-) New commits: commit 6f42a714399f4d0c46dad95c7c11bcd513c27eaa Author: Robert Antoni Buj i Gelonch Date: Thu Sep 25 19:41:12 2014 +0200 scripting: Format_java_code.sh initial run Conflicts: scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java Change-Id: I09b94d8c96dfbaf498bd93a0088feb80a9e4afb6 diff --git a/scripting/examples/java/HelloWorld/HelloWorld.java b/scripting/examples/java/HelloWorld/HelloWorld.java index 3f117a2..1c960da 100644 --- a/scripting/examples/java/HelloWorld/HelloWorld.java +++ b/scripting/examples/java/HelloWorld/HelloWorld.java @@ -28,15 +28,15 @@ import com.sun.star.text.XText; * */ public class HelloWorld { - public static void printHW(XScriptContext xSc) { +public static void printHW(XScriptContext xSc) { -// getting the text document object -XTextDocument xtextdocument = (XTextDocument) UnoRuntime.queryInterface( -XTextDocument.class, xSc.getDocument()); -XText xText = xtextdocument.getText(); -XTextRange xTextRange = xText.getEnd(); -xTextRange.setString( "Hello World (in Java)" ); +// getting the text document object +XTextDocument xtextdocument = (XTextDocument) UnoRuntime.queryInterface( + XTextDocument.class, xSc.getDocument()); +XText xText = xtextdocument.getText(); +XTextRange xTextRange = xText.getEnd(); +xTextRange.setString("Hello World (in Java)"); - }// printHW +}// printHW } diff --git a/scripting/examples/java/Highlight/HighlightText.java b/scripting/examples/java/Highlight/HighlightText.java index 46c6f73..f39ccbf 100644 --- a/scripting/examples/java/Highlight/HighlightText.java +++ b/scripting/examples/java/Highlight/HighlightText.java @@ -54,65 +54,63 @@ public class HighlightText implements com.sun.star.awt.XActionListener { args[0] = context.getDocument(); Object obj; + try { obj = xmcf.createInstanceWithArgumentsAndContext( -"com.sun.star.awt.DialogProvider", args, -context.getComponentContext()); -} -catch (com.sun.star.uno.Exception e) { + "com
[Libreoffice-commits] core.git: javaunohelper/test
javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java | 14 +++--- 1 file changed, 5 insertions(+), 9 deletions(-) New commits: commit 18ceb207ddd8e9065a8e0bd4a64163a3a2a0a0ce Author: Robert Antoni Buj i Gelonch Date: Thu Oct 2 11:19:12 2014 +0200 javaunohelper: More robust way to wait for finalization Change-Id: I09fa2462d8131381f380574b8a9aeaf080211b2b Reviewed-on: https://gerrit.libreoffice.org/11759 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java index ef9fdbf..07200b6 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java @@ -34,6 +34,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import org.junit.Test; +import util.WaitUnreachable; public class WeakBase_Test { @@ -81,12 +82,9 @@ public class WeakBase_Test adapter.addReference(aRef2); assertSame(adapter.queryAdapted(), comp); +WaitUnreachable u = new WaitUnreachable(comp); comp= null; -logger.log(Level.FINE, "Wait 51ms (-XX:MaxGCPauseMillis=50)"); -System.gc(); -System.runFinalization(); -Thread.sleep(51); - +u.waitUnreachable(); assertEquals(aRef1.nDisposeCalled, 1); assertEquals(aRef2.nDisposeCalled, 1); assertNull(adapter.queryAdapted()); @@ -102,11 +100,9 @@ public class WeakBase_Test adapter.addReference(aRef2); adapter.removeReference(aRef1); -logger.log(Level.FINE, "Wait 51ms (-XX:MaxGCPauseMillis=50)"); +u = new WaitUnreachable(comp); comp= null; -System.gc(); -System.runFinalization(); -Thread.sleep(51); +u.waitUnreachable(); assertEquals(aRef1.nDisposeCalled, 0); assertEquals(aRef2.nDisposeCalled, 1); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java | 13 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java | 14 xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java | 29 -- 3 files changed, 27 insertions(+), 29 deletions(-) New commits: commit ca7899d64d8fc8b6902af33d50a2b50ca3c841ac Author: Robert Antoni Buj i Gelonch Date: Wed Oct 1 19:41:50 2014 +0200 xmerge: reuse the value of value.indexOf and remove duplicated code Change-Id: I44d72f7d9f8c58436657ea1517d8eb76332abb4b Reviewed-on: https://gerrit.libreoffice.org/11747 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java index bd33a30..68c689f 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java @@ -125,18 +125,7 @@ public class ColumnStyle extends Style implements Cloneable { * @return The twips equivalent. */ private int parseColWidth(String value) { - -int width = 255;// Default value - -if(value.indexOf("cm")!=-1) { -float widthCM = Float.parseFloat(value.substring(0,value.indexOf('c'))); -width = TwipsConverter.cm2twips(widthCM); -} else if(value.indexOf("inch")!=-1) { -float widthInch = Float.parseFloat(value.substring(0,value.indexOf('i'))); -width = TwipsConverter.inches2twips(widthInch); -} - -return (width); +return TwipsConverter.convert2twips(value, 255); } /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java index e8cd0e0..3f8075c 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java @@ -124,19 +124,7 @@ public class RowStyle extends Style implements Cloneable { * @return The twips equivalent. */ private int parseRowHeight(String value) { - -int height = 255; // Default value - -if(value.indexOf("cm")!=-1) { -float heightCM = Float.parseFloat(value.substring(0,value.indexOf('c'))); -height = TwipsConverter.cm2twips(heightCM); -} else if(value.indexOf("inch")!=-1) { -float heightInch = Float.parseFloat(value.substring(0,value.indexOf('i'))); -height = TwipsConverter.inches2twips(heightInch); -} - -return (height); - +return TwipsConverter.convert2twips(value, 255); } /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java index 5ae1139..8ab83be 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java @@ -39,8 +39,7 @@ public class TwipsConverter { /** * Convert from cm's to twips. * - * @param value {@code byte} array containing the LE representation of - * the value. + * @param value {@code float} containing the representation of the value. * * @return {@code int} containing the converted value. */ @@ -52,12 +51,34 @@ public class TwipsConverter { /** * Convert from cm's to twips. * - * @param value {@code byte} array containing the LE representation of - * the value. + * @param value {@code float} containing the representation of the value. * * @return {@code int} containing the converted value. */ public static int inches2twips(float value) { return (int) (value*1440); } + +/** + * Convert {@code String} to twips. + * + * @param value{@code String} in the form {@literal "1.234cm"} or + * {@literal "1.234inch"}. + * @param defaultValue the default value. + * @return the converted value if {@code value} is a well-formatted {@code + * String}, {@code defaultValue} otherwise. + */ +public static int convert2twips(String value, int defaultValue) { +int posi; + +if ((posi = value.indexOf("cm")) != -1) { +float cm = Float.parseFloat(value.substring(0,posi)); +return cm2twips(cm); +} else if ((posi = value.indexOf("inch")) != -1) { +
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit dbff5f5c6b66ed6c5c9b77245fd294800cd6c4b6 Author: Robert Antoni Buj i Gelonch Date: Wed Oct 1 20:18:25 2014 +0200 xmerge: Converting ArrayList to Array Change-Id: I67c70ce05d35c8f40bea153499820e7e52c2ff08 Reviewed-on: https://gerrit.libreoffice.org/11748 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java index d2385bc..980e01e 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java @@ -116,9 +116,7 @@ public class OfficeUtil implements OfficeConstants { } // Now create and populate an array to return the nodes in. -Node nodes[] = new Node[nodeVec.size()]; -for (int i = 0; i < nodeVec.size(); i++) -nodes[i] = nodeVec.get(i); +Node nodes[] = nodeVec.toArray(new Node[nodeVec.size()]); return nodes; } } \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/helper/APIDescGetter.java | 17 ++--- qadevOOo/runner/helper/ComplexDescGetter.java |3 +-- qadevOOo/runner/helper/PropertyHelper.java|2 +- 3 files changed, 4 insertions(+), 18 deletions(-) New commits: commit 30e2cb020b3492b879404072748960bc46d6e221 Author: Robert Antoni Buj i Gelonch Date: Thu Oct 2 01:56:04 2014 +0200 runner: Converting ArrayList to Array Change-Id: Ifd5fe63cb00dd5b3987035201554731075d3bc00 Reviewed-on: https://gerrit.libreoffice.org/11755 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java index 7d83ef3..978af46 100644 --- a/qadevOOo/runner/helper/APIDescGetter.java +++ b/qadevOOo/runner/helper/APIDescGetter.java @@ -820,16 +820,9 @@ public class APIDescGetter extends DescGetter } } -String[] scenario = new String[componentList.size()]; Collections.sort(componentList); - -for (int i = 0; i < componentList.size(); i++) -{ -scenario[i] = componentList.get(i); -} - +String[] scenario = componentList.toArray(new String[componentList.size()]); return scenario; - } private String[] getScenarioFromClassPath(String job) @@ -892,14 +885,8 @@ public class APIDescGetter extends DescGetter e.printStackTrace(); } -String[] scenario = new String[scenarioList.size()]; Collections.sort(scenarioList); - -for (int i = 0; i < scenarioList.size(); i++) -{ -scenario[i] = scenarioList.get(i); -} - +String[] scenario = scenarioList.toArray(new String[scenarioList.size()]); return scenario; } diff --git a/qadevOOo/runner/helper/ComplexDescGetter.java b/qadevOOo/runner/helper/ComplexDescGetter.java index af288a5..1c2099c 100644 --- a/qadevOOo/runner/helper/ComplexDescGetter.java +++ b/qadevOOo/runner/helper/ComplexDescGetter.java @@ -103,8 +103,7 @@ public class ComplexDescGetter extends DescGetter methods.add(meth); } -methodNames = new String[methods.size()]; -methodNames = methods.toArray(methodNames); +methodNames = methods.toArray(new String[methods.size()]); } // create an instance diff --git a/qadevOOo/runner/helper/PropertyHelper.java b/qadevOOo/runner/helper/PropertyHelper.java index 7472024..b5391cd 100644 --- a/qadevOOo/runner/helper/PropertyHelper.java +++ b/qadevOOo/runner/helper/PropertyHelper.java @@ -30,7 +30,7 @@ public class PropertyHelper public static PropertyValue[] createPropertyValueArrayFormArrayList(ArrayList _aPropertyList) { // copy the whole PropertyValue List to an PropertyValue Array -PropertyValue[] aSaveProperties = null; +PropertyValue[] aSaveProperties; if (_aPropertyList == null) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unotest/source
unotest/source/java/org/openoffice/test/OfficeConnection.java |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 2d1e026e7a148761d30db77c57f36cceff3d327d Author: Robert Antoni Buj i Gelonch Date: Wed Oct 1 17:17:58 2014 +0200 unotest: the assigned value is never used Change-Id: I73c4945dec1db4c206948f27ba3d19fa08eedd46 Reviewed-on: https://gerrit.libreoffice.org/11742 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java b/unotest/source/java/org/openoffice/test/OfficeConnection.java index 0c6ed32..6cc00d1 100644 --- a/unotest/source/java/org/openoffice/test/OfficeConnection.java +++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java @@ -106,7 +106,6 @@ public final class OfficeConnection { boolean cleanTermination = false; int code = 0; try { -boolean desktopTerminated = true; if (process != null) { if (context != null) { XDesktop desktop = null; @@ -125,7 +124,7 @@ public final class OfficeConnection { context = null; if (desktop != null) { try { -desktopTerminated = desktop.terminate(); +boolean desktopTerminated = desktop.terminate(); if (!desktopTerminated) { // in case terminate() fails we would wait // forever for the process to die, so kill it ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/qa
connectivity/qa/complex/connectivity/HsqlDriverTest.java | 13 +++--- connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java |6 +--- 2 files changed, 7 insertions(+), 12 deletions(-) New commits: commit a30022e17cbf5b378c1074ce587b3ff40ac6f92c Author: Robert Antoni Buj i Gelonch Date: Wed Oct 1 16:12:26 2014 +0200 connectivity: the assigned value is never used Change-Id: I6e4d2fc6563f0ff1a65e114d018675c314a04fd6 Reviewed-on: https://gerrit.libreoffice.org/11741 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/connectivity/qa/complex/connectivity/HsqlDriverTest.java b/connectivity/qa/complex/connectivity/HsqlDriverTest.java index a0ff160..5a399a2 100644 --- a/connectivity/qa/complex/connectivity/HsqlDriverTest.java +++ b/connectivity/qa/complex/connectivity/HsqlDriverTest.java @@ -88,17 +88,15 @@ public class HsqlDriverTest extends ComplexTestCase { xComp.dispose(); } catch(Exception e){} -com.sun.star.beans.PropertyValue[] info = null; -XDriver drv = null; try{ XDocumentSubStorageSupplier doc = UnoRuntime.queryInterface(XDocumentSubStorageSupplier.class,ds); XModel mod = UnoRuntime.queryInterface(XModel.class,ds); XStorage stor = doc.getDocumentSubStorage("database",4); -info = new com.sun.star.beans.PropertyValue[]{ +com.sun.star.beans.PropertyValue[] info = new com.sun.star.beans.PropertyValue[]{ new com.sun.star.beans.PropertyValue("Storage",0,stor,PropertyState.DIRECT_VALUE) ,new com.sun.star.beans.PropertyValue("URL",0,mod.getURL(),PropertyState.DIRECT_VALUE) }; -drv = UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance("com.sun.star.sdbcx.comp.hsqldb.Driver")); +XDriver drv = UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance("com.sun.star.sdbcx.comp.hsqldb.Driver")); TestCacheSize test = new TestCacheSize((param.getMSF()),info,drv); @@ -119,17 +117,16 @@ public class HsqlDriverTest extends ComplexTestCase { } catch(Exception e){} }catch(Exception e){} } + public void test2(){ System.gc(); -com.sun.star.beans.PropertyValue[] info = null; -XDriver drv = null; try{ -info = new com.sun.star.beans.PropertyValue[]{ +com.sun.star.beans.PropertyValue[] info = new com.sun.star.beans.PropertyValue[]{ new com.sun.star.beans.PropertyValue("JavaDriverClass",0,"org.hsqldb.jdbcDriver",PropertyState.DIRECT_VALUE) ,new com.sun.star.beans.PropertyValue("ParameterNameSubstitution",0, false,PropertyState.DIRECT_VALUE) }; -drv = UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance("com.sun.star.comp.sdbc.JDBCDriver")); +XDriver drv = UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance("com.sun.star.comp.sdbc.JDBCDriver")); TestCacheSize test = new TestCacheSize((param.getMSF()),info,drv); test.setURL("jdbc:hsqldb:g:\\hsql\\db"); diff --git a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java index 9b82752..a44f1b9 100644 --- a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java +++ b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java @@ -58,7 +58,6 @@ public class JdbcLongVarCharTest extends ComplexTestCase System.out.println("== Start testing =="); String url = "jdbc:mysql://localhost:3306/mysql?user=root"; -com.sun.star.sdbc.XConnection xConnection = null; com.sun.star.beans.PropertyValue prop[] = new PropertyValue[1]; prop[0] = new PropertyValue("JavaDriverClass", 0, "com.mysql.jdbc.Driver", PropertyState.DIRECT_VALUE); @@ -67,7 +66,7 @@ public class JdbcLongVarCharTest extends ComplexTestCase Object x = xServiceManager.createInstance("com.sun.star.sdbc.DriverManager"); com.sun.star.sdbc.XDriverAccess xDriverAccess = UnoRuntime.queryInterface(XDriverAccess.class, x); com.sun.star.sdbc.XDriver xDriver = xDriverAccess.getDriverByURL(url); -xConnection = xDriver.connect(url, prop); +com.sun.star.sdbc.XConnection xConnection = xDriver.connect(url, prop); Object prepStmnt = xConnection.prepareStatement("SELECT * FROM i90114 WHERE i90114.c1 = ?"); UnoRuntime.queryInterface(XParameters.class, prepStmnt).clearParameters(); @@ -91,8 +90,7 @@ public class JdbcLongVarCharTest extends ComplexTestCase { String str = &quo
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/base/java_fat_service.java | 35 +++-- 1 file changed, 14 insertions(+), 21 deletions(-) New commits: commit 58d07a1e9574c1ecdd09e924357caaebc82cac62 Author: Robert Antoni Buj i Gelonch Date: Wed Oct 1 21:12:34 2014 +0200 runner: Avoid a possible NullPointerException with tCase Object Change-Id: Ie1202b7fa89306ea2a99031b9347b657039b839e Reviewed-on: https://gerrit.libreoffice.org/11750 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/qadevOOo/runner/base/java_fat_service.java b/qadevOOo/runner/base/java_fat_service.java index f9eefaa..27ae90a 100644 --- a/qadevOOo/runner/base/java_fat_service.java +++ b/qadevOOo/runner/base/java_fat_service.java @@ -217,32 +217,25 @@ public class java_fat_service implements TestBase { log = (LogWriter)dcl.getInstance((String)param.get("LogWriter")); param.getMSF(); -TestCase tCase = null; +TestEnvironment tEnv = null; -try -{ -tCase = (TestCase) dcl.getInstance("mod._"+entry.entryName); -} -catch (java.lang.IllegalArgumentException ie) -{ +try { +TestCase tCase = (TestCase) dcl.getInstance("mod._"+entry.entryName); +log.println("Creating: " + tCase.getObjectName()); +log.initialize(entry, true); +entry.UserDefinedParams = param; +tCase.setLogWriter((PrintWriter) log); +try { +tCase.initializeTestCase(param); +tEnv = tCase.getTestEnvironment(param); +} catch (com.sun.star.lang.DisposedException de) { +log.println("Office disposed"); +} +} catch (java.lang.IllegalArgumentException ie) { entry.ErrorMsg=ie.getMessage(); entry.hasErrorMsg=true; } -log.println("Creating: "+tCase.getObjectName()); -log.initialize(entry,true); -entry.UserDefinedParams = param; -tCase.setLogWriter((PrintWriter) log); -TestEnvironment tEnv = null; -try -{ -tCase.initializeTestCase(param); -tEnv = tCase.getTestEnvironment(param); -} -catch (com.sun.star.lang.DisposedException de) -{ -log.println("Office disposed"); -} return tEnv; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/qa
forms/qa/complex/forms/CheckOGroupBoxModel.java |8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) New commits: commit 4173bc5f7e1849a706c7cb9dcb34f7edfa9e7d1f Author: Robert Antoni Buj i Gelonch Date: Tue Sep 30 16:58:51 2014 +0200 forms: enhanced for loop Change-Id: I0c83d6fce9440f5d8b23e5f1bfca71d8f61d056b Reviewed-on: https://gerrit.libreoffice.org/11719 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java b/forms/qa/complex/forms/CheckOGroupBoxModel.java index b76cda3..03eb496 100644 --- a/forms/qa/complex/forms/CheckOGroupBoxModel.java +++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java @@ -129,11 +129,8 @@ public class CheckOGroupBoxModel Property[] properties = m_xPropSet.getPropertySetInfo().getProperties(); ArrayList tNames = new ArrayList(); -for (int i = 0; i < properties.length; i++) +for (Property property : properties) { - -Property property = properties[i]; -String name = property.Name; boolean isWritable = ((property.Attributes & PropertyAttribute.READONLY) == 0); boolean isNotNull = ((property.Attributes @@ -143,9 +140,8 @@ public class CheckOGroupBoxModel if (isWritable && isNotNull && isBound) { -tNames.add(name); +tNames.add(property.Name); } - } // endfor //get a array of bound properties ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - forms/qa
forms/qa/integration/forms/ListBox.java |6 +++--- forms/qa/integration/forms/RadioButtons.java | 12 ++-- 2 files changed, 5 insertions(+), 13 deletions(-) New commits: commit 4badca074088b1f1a70b340d53fc464ec11e3d29 Author: Robert Antoni Buj i Gelonch Date: Tue Sep 30 17:20:31 2014 +0200 forms: use Arrays.toString in integration.forms.RadioButtons Change-Id: I797692857c874d879192ca9a4ff73b98ed5ebd86 Reviewed-on: https://gerrit.libreoffice.org/11721 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/forms/qa/integration/forms/RadioButtons.java b/forms/qa/integration/forms/RadioButtons.java index efcca58..4b6e5de 100644 --- a/forms/qa/integration/forms/RadioButtons.java +++ b/forms/qa/integration/forms/RadioButtons.java @@ -23,6 +23,7 @@ import com.sun.star.lang.*; import com.sun.star.container.*; import com.sun.star.beans.*; import com.sun.star.awt.XRadioButton; +import java.util.Arrays; public class RadioButtons extends complexlib.ComplexTestCase { @@ -306,15 +307,6 @@ public class RadioButtons extends complexlib.ComplexTestCase } /* -- */ -private String stateString( short[] states ) -{ -StringBuilder buf = new StringBuilder(); -for ( int i=0; i Date: Tue Sep 30 17:05:09 2014 +0200 forms: replace StringBuffer with StringBuilder Change-Id: Iee1b7ea214e5ed2fdd8bd5fe93dc16fbaaf312a8 Reviewed-on: https://gerrit.libreoffice.org/11720 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/forms/qa/integration/forms/ListBox.java b/forms/qa/integration/forms/ListBox.java index b4412a09..a6e5326 100644 --- a/forms/qa/integration/forms/ListBox.java +++ b/forms/qa/integration/forms/ListBox.java @@ -85,7 +85,7 @@ public class ListBox extends TestCase formOperations.execute( FormFeature.MoveToFirst ); for ( int row=0; row<2; ++row ) { -StringBuffer failedFieldTypes = new StringBuffer(); +StringBuilder failedFieldTypes = new StringBuilder(); for ( int i=0; i foreignKeyValues = new ArrayList< String[] >(); -StringBuffer foreignKeyInsertSQL = new StringBuffer(); +StringBuilder foreignKeyInsertSQL = new StringBuilder(); foreignKeyInsertSQL.append( "INSERT INTO \"" + m_foreignKeyTableName + "\" VALUES (?" ); final String[] displayValues = impl_getDisplayValues(); @@ -203,7 +203,7 @@ public class ListBox extends TestCase ) ); // insert a few rows -StringBuffer sql = new StringBuffer(); +StringBuilder sql = new StringBuilder(); sql.append( "INSERT INTO \"" ); sql.append( tableName ); sql.append( "\" VALUES (?, ?)"); diff --git a/forms/qa/integration/forms/RadioButtons.java b/forms/qa/integration/forms/RadioButtons.java index 0156e00..efcca58 100644 --- a/forms/qa/integration/forms/RadioButtons.java +++ b/forms/qa/integration/forms/RadioButtons.java @@ -308,7 +308,7 @@ public class RadioButtons extends complexlib.ComplexTestCase /* -- */ private String stateString( short[] states ) { -StringBuffer buf = new StringBuffer(); +StringBuilder buf = new StringBuilder(); for ( int i=0; ihttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits