[Libreoffice] newish to git: howto recover from bad merge?

2010-11-19 Thread Kevin Hunter
Hullo List, It must be something simple, but I'm having a devil of a time recovering from a bad merge. Given my transcript below, how do I recover? It usually happens after I've committed a change to my local repository, that I then sent in as a patch. That patch got applied with a slight

[Libreoffice] [PUSHED] Re: tools/ RTL easy hack

2010-11-19 Thread Caolán McNamara
On Thu, 2010-11-18 at 17:43 -0500, Kevin Hunter wrote: Hiya List, Here's an RTL easy hack for tools/ . Looks good, all pushed. Thanks for this. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org

[Libreoffice] [PUSHED] Re: EasyHack: svtools/ RTL macro conversion

2010-11-19 Thread Caolán McNamara
On Thu, 2010-11-18 at 18:50 -0500, Kevin Hunter wrote: Hullo List, An easy hack for RTL conversion strings, against svtools/ . Excellent, looks good. Pushed this. I simplified the syntax of a few of the constructor here and there on the way. C.

[Libreoffice] [PUSHED] Re: Easy hack: removed commented-out code

2010-11-19 Thread Caolán McNamara
On Thu, 2010-11-18 at 18:06 -0500, Kevin Hunter wrote: Hullo List, Another easy hack of cluttering comments removal. Looks good to me, pushed. Thanks for this. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org

[Libreoffice] [PUSHED] Re: RTL easy hack, look over please

2010-11-19 Thread Caolán McNamara
On Thu, 2010-11-18 at 17:49 -0500, Kevin Hunter wrote: Hi List, Here's an RTL easy hack, that affects a macro. I believe it okay because it affects strings created like this: string = prefix Something else; but through a macro. Please look over. Yeah, the original would only work if

Re: [Libreoffice] use dbglevel=1 for --enable-debug builds?

2010-11-19 Thread Noel Power
On Thu, 2010-11-18 at 13:01 +0100, David Tardon wrote: Hi all, currently, configuring with --enable-debug means that dbglevel is set to 2, which in turns means that OSL_DEBUG_LEVEL is set to 2. This enables all the OSL_ debugging stuff there is (well, maybe there is some really rare stuff

Re: [Libreoffice] feature/rip-build-repo - branch for removal of the need of the 'build' repo

2010-11-19 Thread Jan Holesovsky
Hi Sebastian, On 2010-11-19 at 08:41 +0100, Sebastian Spaeth wrote: In case you are interested to try to build without the 'build' repo (the rawbuild/ way), you can try to get the feature/rip-build-repo branch which I hope is going to become the 'official' way of building soon ;-) git

Re: [Libreoffice] newish to git: howto recover from bad merge?

2010-11-19 Thread Takeshi Abe
Hi, On Fri, 19 Nov 2010 03:11:51 -0500, Kevin Hunter hunt...@earlham.edu wrote: $ git commit # Not currently on any branch. nothing to commit (working directory clean) $ git rebase --continue Applying: EasyHack: RTL macro from createFromAscii No changes - did you forget to use 'git add'?

[Libreoffice] installation and package for Linux SYS distro sucessful

2010-11-19 Thread werner
I reclaimed about problems with the installer. Meanwhile, after many work by hand, I get it installed (the most complete installation I got, was with 'make install', not with 'bin/ooinstall'). The build program needs to be improved very. libreoffice runs nice on my computer, appearently

Re: [Libreoffice] installation and package for Linux SYS distro sucessful

2010-11-19 Thread Sebastian Spaeth
On Fri, 19 Nov 2010 07:04:56 -0400, werner wrote: I reclaimed about problems with the installer. Meanwhile, after many work by hand, I get it installed (the most complete installation I got, was with 'make install', not with 'bin/ooinstall'). The build program needs to be improved

Re: [Libreoffice] installation and package for Linux SYS distro sucessful

2010-11-19 Thread Caolán McNamara
On Fri, 2010-11-19 at 07:04 -0400, werner wrote: I dont get it compiled with the --with-lang option, because of the error what I reclaimed earlier today. If you use --with-lang after configuring once without it you need to do the ./download step again (because download pulls down the i10n

Re: [Libreoffice] [PUSHED] More clean code at writer [source/core/{docnode, draw, edit}]

2010-11-19 Thread David Tardon
On Thu, Nov 18, 2010 at 12:12:41PM -0800, Kayo Hamid wrote: Sorry ;-) Hello, sending this for review. I think that cleaniness is better than the previous. revol_ Pushed. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org

Re: [Libreoffice] [PATCH] Install to the correct directory based on PREFIX

2010-11-19 Thread Petr Mladek
Hi Robert, thanks for the patch. It is committed as http://cgit.freedesktop.org/libreoffice/build/commit/?id=0cf0c0db05295aa1cc1b7728183b9cbc57e37408 Also I have cherry picked it for the libreoffice-3-3 branch. Note that I added back the $OODESTDIR. It is needed when you build RPMs. In this

Re: [Libreoffice] 5 times LGPL installed

2010-11-19 Thread Michael Meeks
On Wed, 2010-11-17 at 16:18 +0100, Robert Nagy wrote: Well remove it from the menu then. It needs to be there; go read the LGPLv3 :-) Personally, I love the LGPL - so, having it five times could be a feature ;-) Having said that it does seem somewhat excessive. Having

Re: [Libreoffice] newish to git: howto recover from bad merge?

2010-11-19 Thread Michael Meeks
Hi Kevin, On Fri, 2010-11-19 at 03:11 -0500, Kevin Hunter wrote: It usually happens after I've committed a change to my local repository, that I then sent in as a patch. That patch got applied with a slight modification, and then the conflict. Grief - what a pain; sorry about that

Re: [Libreoffice] newish to git: howto recover from bad merge?

2010-11-19 Thread Norbert Thiebaud
On Nov 19, 2010, at 0:11, Kevin Hunter hunt...@earlham.edu wrote: Hullo List, It must be something simple, but I'm having a devil of a time recovering from a bad merge. Given my transcript below, how do I recover? It usually happens after I've committed a change to my local

Re: [Libreoffice] Fwd: Re: cppcheck : snprintf size is out of bounds

2010-11-19 Thread Michael Meeks
Hi Julien, On Thu, 2010-11-18 at 22:44 +0100, Julien Nabet wrote: The bug on cppcheck has been fixed : https://github.com/danmar/cppcheck/commit/66c2825b2309d21474b22eb4e73e75a4b4ee150f Nice work :-) great to see the cleanup of LibO's twistedness having a positive effect on shared

Re: [Libreoffice] setting ulimit before running soffice

2010-11-19 Thread Michael Meeks
On Wed, 2010-11-17 at 10:57 -0500, Kevin Hunter wrote: What's the story with the ulimit set in 'ooenv' right before running a freshly built LO: As Caolan says - without this, your app will simply not dump core. Of course, mostly people can run under gdb just fine, and core files can

Re: [Libreoffice] Git server-side hooks

2010-11-19 Thread Miklos Vajna
On Fri, Nov 19, 2010 at 12:31:14PM +, Michael Meeks michael.me...@novell.com wrote: We should be using 'git merge' unless it is for a purely local branch that we are rebasing - surely ? at least - encouraging wider use of re-base is likely to burn time and motivation - that thing

Re: [Libreoffice] Git server-side hooks

2010-11-19 Thread Kohei Yoshida
On Fri, 2010-11-19 at 12:31 +, Michael Meeks wrote: On Thu, 2010-11-18 at 08:28 -0500, Kohei Yoshida wrote: Now that we promote the concept of feature branches, I hope we can revert this. We should be using 'git merge' unless it is for a purely local branch that we are rebasing

Re: [Libreoffice] [PUSHED] Re: EasyHack: svtools/ RTL macro conversion

2010-11-19 Thread Kevin Hunter
At 4:59am -0500 Fri, 19 Nov 2010, Caolán Mcnamara wrote: On Thu, 2010-11-18 at 18:50 -0500, Kevin Hunter wrote: An easy hack for RTL conversion strings, against svtools/ . Excellent, looks good. Pushed this. I simplified the syntax of a few of the constructor here and there on the way. Och,

Re: [Libreoffice] setting ulimit before running soffice

2010-11-19 Thread Kevin Hunter
At 7:59am -0500 Fri, 19 Nov 2010, Michael Meeks wrote: On Wed, 2010-11-17 at 10:57 -0500, Kevin Hunter wrote: What's the story with the ulimit set in 'ooenv' right before running a freshly built LO: As Caolan says - without this, your app will simply not dump core. Of course, mostly people

[Libreoffice] [PATCH] update URLs

2010-11-19 Thread Takeshi Abe
Hi, Found a couple of links outdated in README. Cheers, -- Takeshi Abe From e2fbb2ca9e15d0e32db79e46e6cbc49f12be86a8 Mon Sep 17 00:00:00 2001 From: Takeshi Abe t...@fixedpoint.jp Date: Fri, 19 Nov 2010 23:24:30 +0900 Subject: [PATCH] update URLs --- README |4 ++-- 1 files changed, 2

Re: [Libreoffice] RFE: abolish memory settings

2010-11-19 Thread Michael Meeks
Hi there, On Fri, 2010-11-19 at 09:30 +0100, Sebastian Spaeth wrote: I hate the options dialog in general :), but one thing that has always confused the heck out of me is the memory settings and I propose that could be a nice project for someone: :-) Sounds good to me. HOW am I

[Libreoffice] RTL easy hack against bridges/

2010-11-19 Thread Kevin Hunter
Hullo List, A simple one against but test cases, but, as I said in the commit message, they were in my (grep) road! Kevin 0001-EasyHack-RTL_CONST-macro-from-createFromAscii.patch.xz Description: application/xz ___ LibreOffice mailing list

Re: [Libreoffice] [PATCH] [PUSHED] update URLs

2010-11-19 Thread Kohei Yoshida
On Fri, 2010-11-19 at 23:35 +0900, Takeshi Abe wrote: Hi, Found a couple of links outdated in README. Thanks a lot! Pushed. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc kyosh...@novell.com ___ LibreOffice mailing list

[Libreoffice] quick starter applet/systray defaults and various confusion

2010-11-19 Thread Caolán McNamara
There is something of a mess going on at the moment I think. a) If you look at desktop/source/app/app.cxx see DoRestartActionsIfNecessary If there is no ~/.libreoffice dir, then on first start we register the extensions, this triggers a restart of the app. Simply because there is no explict

Re: [Libreoffice] 5 times LGPL installed

2010-11-19 Thread Michael Meeks
Hi there, On Fri, 2010-11-19 at 13:53 +0100, Sebastian Spaeth wrote: - Module readlicense_oo needs to be modified to not produce them. Patch is in git (and reverted again). oh - shame - why reverted ? - Module scp2 needs to be modified to not copy them. Patch is in git (and reverted

Re: [Libreoffice] Git server-side hooks

2010-11-19 Thread Kohei Yoshida
On Fri, 2010-11-19 at 12:31 +, Michael Meeks wrote: We should be using 'git merge' So, part of the problem was that I was always using git pull, even where git merge would've been appropriate. To be honest, I didn't even know of 'git merge' until now. I always thought pull was

Re: [Libreoffice] Contributing test cases

2010-11-19 Thread Caolán McNamara
On Fri, 2010-11-19 at 01:32 +0100, Miklos Vajna wrote: Is 3) about cppunit as well? If yes, what about just having 3) in the tree as well, and then it could be invoked with a 'make check' or similar that would run all those tests. I'm asking because I guess the more complex to run it, the

Re: [Libreoffice] quick starter applet/systray defaults and various confusion

2010-11-19 Thread Andrew
On 19/11/10 15:37, Caolán McNamara wrote: There is something of a mess going on at the moment I think. a) If you look at desktop/source/app/app.cxx see DoRestartActionsIfNecessary If there is no ~/.libreoffice dir, then on first start we register the extensions, this triggers a restart

[Libreoffice] Git detached HEAD (no branch) was: newish to git: howto recover from bad merge?

2010-11-19 Thread Kohei Yoshida
On Fri, 2010-11-19 at 19:53 +0900, Takeshi Abe wrote: $ git branch * (no branch) master So, I'd like to expand on this mysterious detached HEAD thingie in git, since I just learned about this yesterday and it might help other people understand what the heck is going on when you are

Re: [Libreoffice] crash report and Oracle url

2010-11-19 Thread Andrew
On 19/11/10 08:21, Thorsten Behrens wrote: Jean-Baptiste Faure wrote: Yesterday I got the crash report in LibO after a test of docking the navigator on the right edge of the LibO window. It contained a link to the privacy policy of Oracle. I did not sent the crash report because it was no

[Libreoffice] git via http ...

2010-11-19 Thread Michael Meeks
Hi Marc, On Wed, 2010-11-03 at 10:16 +0100, Thorsten Behrens wrote: sorry, freedesktop git is only available via native git protocol - So - we now have a public http version (thanks to Tollef) - and it is here: git clone http://anongit.freedesktop.org/git/libreoffice/build.git/

Re: [Libreoffice] crash report and Oracle url

2010-11-19 Thread Michael Meeks
On Fri, 2010-11-19 at 16:33 +, Andrew wrote: I might have a go if you can give me some way to invoke the crash report detector - so I can see what it looks like. We need more crashes ! [ there's an app for that ;-]. You could (I guess) try killing soffice.bin thusly: pkill

Re: [Libreoffice] crash report and Oracle url

2010-11-19 Thread Andrew
On 19/11/10 17:39, Michael Meeks wrote: On Fri, 2010-11-19 at 16:33 +, Andrew wrote: I might have a go if you can give me some way to invoke the crash report detector - so I can see what it looks like. We need more crashes ! [ there's an app for that ;-]. You could (I guess) try

Re: [Libreoffice] Presenter Console

2010-11-19 Thread Andrew
Hi Everyone. As part of a bit of polishing of the UI of the PresenterConsole extension I wish to undertake, I want to improve the icons used at the bottom. Could you give me your opinion, as to which is best? 1st - As it currently is 2nd - Smaller font, no use of bold, 'filled' icons 3rd -

Re: [Libreoffice] Presenter Console

2010-11-19 Thread Jonathan Aquilina
I like number 2 but i think the text needs to be a bit lighter. i feel its a bit on the dark side imho. On Fri, Nov 19, 2010 at 7:19 PM, Andrew rugby...@gmail.com wrote: Hi Everyone. As part of a bit of polishing of the UI of the PresenterConsole extension I wish to undertake, I want to

[Libreoffice] [PATCH] remove unused SvXMLNumFmtDefaults methods

2010-11-19 Thread Joachim Trémouroux
Hi Everybody, My first mail on this liste :-) I was grepping for some dead code using 'grep #if 0' and I have found a bunch of unused method in xmloff package. I have attached 2 patches for review. Regards, Joachim. From a545c47c769e1b380d8670093bfdc6bc19243d1d Mon Sep 17 00:00:00 2001 From:

Re: [Libreoffice] Presenter Console

2010-11-19 Thread Kevin Hunter
At 1:19pm -0500 Fri, 19 Nov 2010, Andrew wrote: Could you give me your opinion, as to which is best? 1st - As it currently is 2nd - Smaller font, no use of bold, 'filled' icons 3rd - Smaller font, no use of bold, 'line drawing' icons I like the icons from 1, and the lighter colors. However,

Re: [Libreoffice] High Contrast Cleanup

2010-11-19 Thread Michael Meeks
Hi there, On Sun, 2010-11-14 at 23:46 +0100, Sebastian Spaeth wrote: Copying them over would mean, our download tarballs qould bloat by another 10 MB or so only transiently, until we remove the duplicates. ( I guess git would be able to handle that efficiently though). Sure,

[Libreoffice] [PATCH] RTL_CONSTASCII_USTRINGPARAM for libs-core/connectivity/drivers

2010-11-19 Thread Julien Nabet
Hello, Here's patch for the last changes to do that I've seen in libs-core/connectivity/drivers Julien. (LGPLv3+ / MPL) connectivity_source_drivers.txt.bz2 Description: application/bzip ___ LibreOffice mailing list

Re: [Libreoffice] git via http ...

2010-11-19 Thread Miklos Vajna
On Fri, Nov 19, 2010 at 05:34:34PM +, Michael Meeks michael.me...@novell.com wrote: not available. I added this as an easy hack: http://wiki.documentfoundation.org/Development/Easy_Hacks#Make_download_fall-back_to_http It would be wonderful if you, or someone else, could help out

Re: [Libreoffice] Git server-side hooks

2010-11-19 Thread Miklos Vajna
On Fri, Nov 19, 2010 at 11:03:21AM -0500, Kohei Yoshida kyosh...@novell.com wrote: So, part of the problem was that I was always using git pull, even where git merge would've been appropriate. To be honest, I didn't even know of 'git merge' until now. I always thought pull was merge in git

[Libreoffice] [PATCH] binfilter/ : remove dead code

2010-11-19 Thread Kevin Hunter
Hullo List, Removing some dead/non-compiled code in binfilter. Did some drive by comment translation, and minor tab removals. Cheers, Kevin 0001-EasyHacks-kill-dead-code-translate-formatting.patch.bz Description: application/bzip ___ LibreOffice

[Libreoffice] [PATCH] try to correct some timers in sc + question

2010-11-19 Thread Julien Nabet
Hello, Here's a try to correct some timers in scmod.cxx. Here's what I did and why. 1) In IMPL_LINK( ScModule, SpellTimerHdl, Timer*, EMPTYARG ) I just added aSpellTimer.Stop() when there's neither input from keyboard nor ContinueOnlineSpelling. + I changed the function to have 1 return only.

[Libreoffice] LibreOffice Beta 3

2010-11-19 Thread David Burleigh
I am running LibreOffice Beta 3 under Ubuntu 10.10 (64-bit) and it seems to gradually bog down with use, so that I have to exit and restart it several times a day. It gets so that cursor movement is very slow. This was also a problem with Beta 2, and I was hoping that Beta 3 would fix it, but not

Re: [Libreoffice] Git detached HEAD (no branch) was: newish to git: howto recover from bad merge?

2010-11-19 Thread Christian Lohmaier
Hi *, On Fri, Nov 19, 2010 at 5:31 PM, Kohei Yoshida kyosh...@novell.com wrote: On Fri, 2010-11-19 at 19:53 +0900, Takeshi Abe wrote: $ git branch * (no branch)   master So, I'd like to expand on this mysterious detached HEAD thingie in git, [...] I'll add to that: Just never ever thing

[Libreoffice] [PATCH] Removal of obsolete option --with-unstable-wp

2010-11-19 Thread Niko Rönkkö
MPL 1.1 / GPLv3+ / LGPLv3+ see: http://cgit.freedesktop.org/libreoffice/build/commit/?id=9e0f4d66e7b219baa142fe86f2167e37d8f8e6f7 From dc6697dec2cd2ad3ba9e1b21bd4f73699bb80b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= ron...@iki.fi Date: Tue, 16 Nov 2010 16:50:30 +0200

Re: [Libreoffice] Problem building sw (writer) in debug mode under Linux

2010-11-19 Thread Giuseppe Castagno
David Tardon wrote: On Tue, Nov 16, 2010 at 10:34:41AM +0100, Giuseppe Castagno wrote: Hi all, per subject, with a pull -r from this morning (CET), compiling sw with: build -P2 debug=true Try pull again; commit f19fb8630f6dbf4b525bdd4ba775f05bb9d7e1a0 should fix this. ok that fixed, but

Re: [Libreoffice] [Patch][EasyHacks] Replace ScfRef with boost::shared_ptr in calc filter code

2010-11-19 Thread Kohei Yoshida
Hi Nigel, On Fri, 2010-11-19 at 18:29 +, Nigel Hawkins wrote: Hi, Attacking another item on the easy hacks page. The attached patches should remove ScfRef (which was used more than I thought it would be) and replace it with boost::shared_ptr. Great work! I've applied all your

[Libreoffice] Discuss Easy_Hacks: Remove Sheet F rom File?

2010-11-19 Thread Joe Smith
Is this the place to discuss this proposal? I don't see any discussion on the wiki page itself. http://wiki.documentfoundation.org/Development/Easy_Hacks#Remove_.27Sheet_From_File27_menu_item_from_Calc I, for one, find Insert Sheet From File a useful shortcut for importing data from a text

Re: [Libreoffice] More links inherited from OOo

2010-11-19 Thread Sophie Gautier
Hi Thorsten, all, On 16/11/2010 08:14, Thorsten Behrens wrote: Hi folks, after some more grepping, also adapted the readmes to only reference documentfoundation/libreoffice links. File is attached, would be cool if you could review it for correctness, language - and whether the links as such