ok, so I reverted in part that merge-commit. I kept anything that touched wizard/* but reverted everything else...
That may or may not correct from a wizard/* point of view, but at least master build again after that Norbert On Sun, Aug 21, 2011 at 5:21 PM, Norbert Thiebaud <nthieb...@gmail.com> wrote: > that merge commit ( 57b992c0b57daba5f44b5c4cdb08e817f355ea01 ) is > messed-up.... > please revert, and redo it carefully... there should not be a bunch of > change in completely unrelated part of the code like braking dep for > cui and few other place... not to mention removing files frim > xmlsecurity and all in all messing with it (I'm not talking about > spaces/tab changes only here) > > Norbert > > On Sun, Aug 21, 2011 at 3:44 PM, nthieb...@gmail.com > <nthieb...@gmail.com> wrote: >> Hi folks, >> >> One of you broke the build of LibreOffice with your commit :-( >> Please commit and push a fix ASAP! >> >> Full log available at http://tinderbox.libreoffice.org/MASTER/status.html >> >> Tinderbox info: >> >> Box name: MacOSX 10.6.7 Intel no-moz >> Machine: Darwin tpamac.local 10.7.0 Darwin Kernel Version 10.7.0: Sat Jan >> 29 15:17:16 PST 2011; root:xnu-1504.9.37~1/RELEASE_I386 i386 >> Configured with: --with-distro=LibreOfficeMacOSX >> --with-max-jobs=8 >> --with-num-cpus=6 >> --disable-mozilla >> --enable-werror >> --enable-epm >> --disable-systray >> >> Commits since the last success: >> >> ==== core ==== >> 57b992c Merge branch 'master' of >> git://anongit.freedesktop.org/libreoffice/core >> 6c76e4d Merge branch 'master' into feature/gsoc2011_wizards >> e9440fb Implement partly the 5th step >> 9e5ad1e Implement add button >> 1723ba1 Forgotten file >> 7735b1c Forgot the launcher >> 9ad8244 first attempt to create the web wizard >> 3f92e27 Unused file >> 3c7d254 I forgot to add this file >> 304055f more cleaning >> 1a77dde Let's delete it for now >> b46e5dd Fix a scroll problem >> 927ba7d Write the agendaitems in the proper table >> 85a72b6 clean it up >> 8ea5703 Fix buttons behavior >> 1a8ba1fe Fix cursorUp and cursorDown >> 5d14de7 add focus, scroll and key listeners >> cddebf4 add listeners to the agenda items >> b87820c Don't break the wizard if there's an exception >> a1fd3a9 Make agenda items editable >> 98318dd Fix setEnable >> 628e2b7 Load the proper template >> 873b9a1 go to the last step when finish >> dfb62d8 I don't think we'll need it >> dd8c75a Show AgendaItems properly >> d6ea6c1 Fix Show/Hide tables >> 93f1ded Show the date properly >> ba5f79d Add Textfield listeners and fix a bug found in the java wizard >> 316490a Add checkbox listener >> f601dd9 Remove duplicate code, clean imports and fix a problem >> 5cf673d Remove unused method >> b54c2c1 Fix problem in Letter Wizard >> 449defd Fix problem with listboxes >> 7cfbea7 Let's do it this way >> 5886597 Some refactoring and formatting >> f55b6fb Fix Finish Button >> 80486c8 Fix the ListBox >> 89b7d1a First attempt to create the Agenda Wizard >> 80fc1ff Replace xrange(len(x)) >> db0e2da Clean up >> 2f5083e method unused >> b12ad00 fdo#37290: migrate Basic to new resource service >> d9db338 Move methods from component_getImplementationEnviron to >> component_getFactory >> efc0313 callcatcher: remove unused TpBorderRGBColor >> 583e72a callcatcher: remove unused xmlchar_to_ous >> 3439007 Remove unused test/sax >> 0234a75 Mark this as TODO >> 69ed76f Duplicate code >> 4cd9b66 Show wizard dialog on top >> 326324d ByteString::CreateFromInt32->rtl::OString::valueOf >> d331878 Remove an unused platform list. >> 1cf8feb Remove preload library related code >> 2707abd create file when it doesn't exist >> 7bd4055 Replace ByteString with rtl::OString >> 57272ea Merge commit 'f9d40c2b591215b57ece4ba6e623b7808a7ae717' into >> feature/gsoc2011_wizards >> 1df024d Handle the letterhead layouts properly >> 7f9e1d0 apply python style and fix some minor things >> 580c95a small changes >> a779d08 save RadioButtons too >> 128b472 unused functions >> 85a798b Cancel button works now >> dc85bef First attempt to create the letter wizard >> deea0a2 Remember last template and clean ui/event/ >> f9bb17f I forgot to delete it >> cc1feca Save Configuration >> 97dbc80 we won't need it >> 793e0fb Load preview configuration >> dcc6328 Remove deprecated method >> a96b6a5 Show warning: Do you want to overwrite the file? >> ad37b2d Remove deprecated method >> 439dd36 Add an import I deleted by mistake >> 6ac14d3 Sort listboxes properly >> bd1be4c Replace some uno.invoke(now it loads faster) >> 33cc40c Fix message, salutation and grettings textbox >> 11849c7 Footer checkbox works correctly now. >> aaecc07 a bit of optimitation >> 0469424 Avoid crashing after finnish button is clicked >> 1a6abb3 Remove imports >> e2d159e Set current data to the file >> 4834bac First attempt to create the document >> 7a3171c Let's delete it for now and see if we need it in the future >> 8fa2b59 Remove unused class >> bbdda7a Add listeners and optimize. >> 0df4a8e Line length <= 80 >> 68b50ac add some more listeners >> b94147a Remove unused file >> 62d7535 some changes here and there. >> f7f13da initial commit with migration of wizards to python >> 2963474 fdo#37290: migrate Java to new resource service >> cddf81d fdo#37290: allow also access to StringList resources >> e0b64d9 remove broken VclStringResourceLoader, add >> ResourceStringIndexAccess >> ==== binfilter ==== >> ==== dictionaries ==== >> ==== help ==== >> >> The error is: >> >> build failed - error is:: >> ====== >> >> >> > _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
