Re: [Libreoffice] Mac OS X 10.6.4 Build
Joseph Powers wrote: Ok, I got a build that seams to work... Hi Joseph, cool - thanks for the perseverance, I admit the OSX build experience could be better - There are the following resources around Mac building around already: http://www.freedesktop.org/wiki/Software/LibreOffice/HowToBuild#OnMacOSX10.5.8.2BAC8-10.6.4.28withgitandwget.29.3A http://wiki.services.openoffice.org/wiki/Building_ooo-build_on_Mac_OS_X http://wiki.services.openoffice.org/wiki/AquaBuild I really recommend using MacPorts (http://www.macports.org/), since it saves you from most of the pain when in need of additional packages. Maybe you could merge your findings into the http://www.freedesktop.org/wiki/Software/LibreOffice/HowToBuild#OnMacOSX10.5.8.2BAC8-10.6.4.28withgitandwget.29.3A page (or, if that gets too large, move that to a new HowToBuildOnMac one)? 2. instsetoo_native fails due to a missing libjpipe. I'll look into that one today PS: We need to do something about the ICON's. Quite. Cheers, -- Thorsten pgpsar95N46Om.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [SCRIPT, EASYHACK] add-modelines, a script to add modelines to source files
On 2010-10-12, some...@boldandbusted.com wrote: Sweet! Glad I could help. A couple questions: Well, it isn't checked in yet :-). And I am not one with commit access (neither do I plan to get it). * What shell environment were you running the script under which gave you the -z option sadness? /bin/sh is a symlink to /bin/dash under debian/ubuntu. * Did you commit my original unchanged version to git, then commit your changes, or only commit the version with your changes (awk removal, etc.) and not the original I posted? (I'd like to know that my original version, warts and all, was committed for posterity. :) ) If you look at the gist link, you'll see 2 revisions. The first is your original v0.7 as you posted, the second one is the version that I used in the end. I thought gist.github would automatically show the diffs, but it seems it doesn't. Just one note, I did not commit your script to any libO repository (I don't have the rights, nor would I know where this should go). I just posted it to the gist thingie to allow others to access the version I used (and spot the flaws that I am sure to have introduced ;-) ). * Yah, sorry about the extra spaces. I actually meant to remove that. I had that in so I could be sure that I wasn't damaging other data. No problem, * If you see that set -o posix thing again, just remove it to run under /bin/sh. The set -o posix actually makes Bash behave like /bin/sh. I didn't know that /bin/sh would barf on it, so I'll consider this command a debugging command. As I said, /bin/sh is dash really, and I know it isn't as complete as bash (which is the whole meaning of the thing). Sebastian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Croatian translation of LO-3.2.99.2
Hi all, I prepaired Croatian translation and gsicgeck of LO-3.2.99.2. You can get sdf on http://www.roby.hr/libreoffice/ Robert Sedak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] LibO Tirderbox: where to find doc?
Hi Thorsten, Thorsten Behrens wrote: Giuseppe Castagno wrote: More specifically: Is there documentation on Tinderbox for LibO? Or if there aren't Tibox as of now, what is it needed to implement them? Question coming from someone who has no idea how to implement one... Hi Giuseppe, there's a script inside the libreoffice-build repo, namely bin/tinbuild, that does monitor the repo rebuilds if new commits arrive - optionally, it can send mails to committers who broke a build. tinbuild -h at least gives a bit of help. Just checkout a separate tree, configure it to your preferences, make sure it builds - and then fire up tinbuild. It will reuse your configuration shout when it's broken. tnx, I'll check into it. beppec56. -- Kind Regards, Giuseppe Castagno Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu beppec56 at openoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Error Building, vcl segmentation fault
On Tue, 2010-10-12 at 22:30 +0200, julien wrote: Thread 1 (Thread 0xb7d276d0 (LWP 7585)): #0 0xb68061db in _STL::locale::locale() () from /usr/lib/libstlport_gcc.so.4.6 #1 0xb67d1414 in _STL::ios_base::ios_base() () from /usr/lib/libstlport_gcc.so.4.6 #2 0xb67e3a41 in _STL::ios_base::_S_initialize() () from /usr/lib/libstlport_gcc.so.4.6 #3 0xb67e3f17 in _STL::ios_base::Init::Init() () from /usr/lib/libstlport_gcc.so.4.6 #4 0xb61e57a1 in global constructors keyed to cascade_mapping.cxx () from /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/lib/libuno_cppu.so.3 Hmm, this is using /usr/lib/libstlport_gcc.so.4.6 and not the libstlport_gcc in the solver dir as I'd expect it to by default. Adding a echo LD_LIBRARY_PATH is $LD_LIBRARY_PATH above $checkdll $@ in solenv/bin/checkdll.sh I get... ../unxlngx6.pro/lib:/home/caolan/.../libreoffice-3.2.99.2/solver/330/unxlngx6.pro/lib which is what I expect to see. So, how did you configure your build ?, did you select a --with-system-stlport option ?, and/or what's the output of echo $LD_LIBRARY_PATH As an aside including iostream forces this global constructor to exist. If iostreams isn't needed in a file it shouldn't be included. In the cascade_mapping.cxx case I see its only needed for logging, so when logging is disabled I've made the change that iostream isn't included, which as a side effect *might* make a difference to your problem. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] The Next Decade Manifesto - translation?
Hi, Seung Soo, Ha wrote on 2010-10-13 13.56: Are there any plans for translating the *The Next Decade Manifesto *pdf? I propose asking on our website@ mailing list - however, I guess the wiki is the best idea ;) Florian -- Florian Effenberger flo...@documentfoundation.org Steering Committee and Founding Member of The Document Foundation Tel: +49 8341 99660880 Fax: +49 8341 99660889 Mobile: +49 151 14424108 Skype: floeff | Twitter/Identi.ca: @floeff ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH 1/1] Cleanup: remove bogus comments from inc directory
Hello Prashant, Thanks for the patch, I just pushed it. -- Cedric On Wed, 2010-10-13 at 10:32 +0530, Prashant Shah wrote: This patch removes bogus comments found in the inc directory including empty Beschreibung (translation: description) statements Signed-off-by: Prashant Shah pshah.mum...@gmail.com --- sw/source/ui/inc/DropDownFieldDialog.hxx |1 - sw/source/ui/inc/actctrl.hxx |2 +- sw/source/ui/inc/bmpwin.hxx |1 - sw/source/ui/inc/cfgdesc.hxx |1 - sw/source/ui/inc/cfgitems.hxx |9 +++-- sw/source/ui/inc/changedb.hxx |1 - sw/source/ui/inc/colex.hxx| 12 +--- sw/source/ui/inc/colmgr.hxx | 11 ++- sw/source/ui/inc/column.hxx |7 --- sw/source/ui/inc/condedit.hxx | 20 sw/source/ui/inc/dialmgr.hxx |2 +- sw/source/ui/inc/docstdlg.hxx |1 - sw/source/ui/inc/envimg.hxx |5 + sw/source/ui/inc/envlop.hxx |5 - sw/source/ui/inc/fldedt.hxx |5 - sw/source/ui/inc/fldmgr.hxx |4 +--- sw/source/ui/inc/fldtdlg.hxx |4 sw/source/ui/inc/fldwrap.hxx |3 +-- sw/source/ui/inc/formedt.hxx |1 - sw/source/ui/inc/frmdlg.hxx |2 -- sw/source/ui/inc/frmpage.hxx |7 --- sw/source/ui/inc/glosbib.hxx |5 + sw/source/ui/inc/idxmrk.hxx |7 --- sw/source/ui/inc/labimg.hxx |4 +--- sw/source/ui/inc/linenum.hxx |4 sw/source/ui/inc/mailconfigpage.hxx |6 -- sw/source/ui/inc/mailmergechildwindow.hxx |8 +--- sw/source/ui/inc/mailmergehelper.hxx | 24 ++-- sw/source/ui/inc/mailmrge.hxx |9 ++--- sw/source/ui/inc/mmconfigitem.hxx |7 +++ sw/source/ui/inc/navicfg.hxx |3 +-- sw/source/ui/inc/navipi.hxx |4 +--- sw/source/ui/inc/optcomp.hxx |2 -- sw/source/ui/inc/optload.hxx | 16 sw/source/ui/inc/optpage.hxx | 20 ++-- sw/source/ui/inc/outline.hxx |8 ++-- sw/source/ui/inc/pgfnote.hxx |1 - sw/source/ui/inc/pggrid.hxx |2 +- sw/source/ui/inc/pview.hxx|4 sw/source/ui/inc/regionsw.hxx | 17 + sw/source/ui/inc/srcview.hxx | 26 -- sw/source/ui/inc/swlbox.hxx |3 +-- sw/source/ui/inc/swrenamexnameddlg.hxx|5 - sw/source/ui/inc/swuicnttab.hxx | 17 ++--- sw/source/ui/inc/swuiidxmrk.hxx | 15 ++- sw/source/ui/inc/tmpdlg.hxx |3 --- sw/source/ui/inc/tmplctrl.hxx |5 - sw/source/ui/inc/toxmgr.hxx |6 +- sw/source/ui/inc/uiitems.hxx |7 --- sw/source/ui/inc/uinums.hxx |6 -- sw/source/ui/inc/uivwimp.hxx | 10 +- sw/source/ui/inc/unotools.hxx | 10 ++ sw/source/ui/inc/unotxvw.hxx | 10 +- sw/source/ui/inc/usrpref.hxx | 15 +-- sw/source/ui/inc/view.hxx |6 -- sw/source/ui/inc/viewlayoutctrl.hxx |3 --- sw/source/ui/inc/wview.hxx|4 57 files changed, 48 insertions(+), 358 deletions(-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH 1/2] Cleanup: remove bogus comments from unocore direcotry
Pushed that one too, thanks for it! On Wed, 2010-10-13 at 16:04 +0530, Prashant Shah wrote: This patch removes bogus comments found in the unocore direcotry including empty Beschreibung (translation: description) statements Signed-off-by: Prashant Shah pshah.mum...@gmail.com --- sw/source/core/unocore/unoevtlstnr.cxx | 16 - sw/source/core/unocore/unofield.cxx| 208 + sw/source/core/unocore/unoobj2.cxx | 115 +--- sw/source/core/unocore/unoportenum.cxx | 54 sw/source/core/unocore/unoredline.cxx | 77 +- sw/source/core/unocore/unorefmk.cxx| 74 +- sw/source/core/unocore/unosect.cxx | 96 +-- sw/source/core/unocore/unostyle.cxx| 318 +--- sw/source/core/unocore/unotbl.cxx | 511 ++- 9 files changed, 66 insertions(+), 1403 deletions(-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH 2/2] Cleanup: remove bogus comments from unocore directory
Pushed that one as well, many thanks! On Wed, 2010-10-13 at 16:05 +0530, Prashant Shah wrote: This patch removes bogus comments found in the unocore directory including empty Beschreibung (translation: description) statements Signed-off-by: Prashant Shah pshah.mum...@gmail.com --- sw/source/core/unocore/TextCursorHelper.cxx |6 - sw/source/core/unocore/unochart.cxx | 108 +-- sw/source/core/unocore/unocrsrhelper.cxx| 36 +--- sw/source/core/unocore/unodraw.cxx | 184 ++-- sw/source/core/unocore/unoframe.cxx | 304 ++- sw/source/core/unocore/unoftn.cxx | 83 +--- sw/source/core/unocore/unoparagraph.cxx | 135 + sw/source/core/unocore/unoredlines.cxx | 39 sw/source/core/unocore/unosrch.cxx | 79 --- 9 files changed, 50 insertions(+), 924 deletions(-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] A later change in download packets name.
Hi Giuseppe,
The patch looks good to me, I pushed it. Thanks for your help.
On Mon, 2010-10-11 at 19:57 +0200, Giuseppe Castagno wrote:
Hi,
the attached patch change the default name of downloadable packages,
e.g. the one is used should a correct product name missing.
See solenv/bin/modules/installer/download.pm file for details, in
bootstrap repository.
Patch released according to LGPLv3+ license.
beppec56
differences between files attachment
(0001-Changed-one-more-of-the-dowload-package-names.patch)
From 624e5fdaab5e2e85b5d9b783f4caee8e30af4b27 Mon Sep 17 00:00:00 2001
From: Giuseppe Castagno be...@dsklnx.host.local
Date: Mon, 11 Oct 2010 18:38:37 +0200
Subject: [PATCH] Changed one more of the dowload package names.
---
solenv/bin/modules/installer/download.pm |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 738a360..0bc616f 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -467,7 +467,7 @@ sub get_downloadname_productname
{
my ($allvariables) = @_;
-my $start = LO;
+my $start = LibO;
if ( $allvariables-{'PRODUCTNAME'} eq LibreOffice ) { $start =
LibO; }
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
--
Cédric Bosdonnat
LibreOffice hacker
http://documentfoundation.org
OOo Eclipse Integration developer
http://cedric.bosdonnat.free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Ure - Remove redundant #include, #define comments
Hi Graeme, On Tue, 2010-10-12 at 23:44 +0100, jgraeme wrote: A patch to remove commented out #includes #defines. Many thanks for the patch! I just pushed it. -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] The Next Decade Manifesto - translation?
On 2010-10-13, Florian Effenberger wrote: I propose asking on our website@ mailing list - however, I guess the wiki is the best idea ;) While talking about that manifesto. It would make sense to add some blurb on who created it and when and if it was blessed by the steering committee. Right now it looks like any random wiki page that any psychopath could have created. Also a small blurb about how to go about to modify/amend to this manifesto would be good IMHO. Sebastian pgp3vrE15IjVD.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] The Next Decade Manifesto - translation?
Hi, Sebastian Spaeth wrote on 2010-10-13 14.23: While talking about that manifesto. It would make sense to add some blurb on who created it and when and if it was blessed by the steering committee. Right now it looks like any random wiki page that any psychopath could have created. Also a small blurb about how to go about to modify/amend to this manifesto would be good IMHO. it's official. See our home page where it is also listed. :) Has been sent out to the announcement list today as well. Florian -- Florian Effenberger flo...@documentfoundation.org Steering Committee and Founding Member of The Document Foundation Tel: +49 8341 99660880 Fax: +49 8341 99660889 Mobile: +49 151 14424108 Skype: floeff | Twitter/Identi.ca: @floeff ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Slowness on UNC path
Dear LibO devs, A little x-post (sorry) in case some of yous don't read ooo-dev. I haven't tested it yet with LibO, but I'm afraid it misbehaves the same way. ( I would be delighted to be wrong, though) I think the issue is quite serious and might be a real blocker for corporate deployment. I'd like to have your opinion on the issue 105283. http://www.openoffice.org/issues/show_bug.cgi?id=105283 In a nutshell, when working with a file using a UNC path, OOo sends a request on port 80 and waits for an answer (at the opening and closing of the file). A problem occurs when the port is in stealth mode, OOo waits till the timeout, which means the application is frozen for 30 seconds or so, which is not acceptable from a user pov. I became aware of the problem when one of our client switched his servers to Win 2008 server, where stealth mode is set by default. So I imagine that the problem will spread quickly. Are you already aware of this? (the issue is not confirmed at the moment) Could any of yous give me a rough estimate of the efforts to fix that? If you can also quickly explain why OOo behaves this way, that would also help. Thanks, Camille ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Improving the build experience in rawbuild
Hi fellow developers, We improved our build process a lot since the LibreOffice creation, but there is still something I'ld like to improve. Developers should build in rawbuild in order to create patches (or commit directly) easily. The current build procedure described on the wiki and TDF website builds in build/libreoffice*. In order to change that, I'ld like to do the following: * Change the rawbuild/configure.in to have the defaults matching the options defined in distros-config/LibreOfficeLinux.conf.in * Hack bin/g to have bin/g clone download all the repos at the appropriate place and create the rawbuild folder. This way, all that would need to be done for a new developper building on Linux would be: git clone .../build cd build bin/g clone cd rawbuild ./autogen.sh make make dev-install Do you have any strong opinion against that? -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Improving the build experience in rawbuild
On Wed, 2010-10-13 at 15:33 +0200, Cedric Bosdonnat wrote: Do you have any strong opinion against that? Nope. I support this initiative. :-) Kohei -- Kohei Yoshida, LibreOffice hacker, Calc kyosh...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Slowness on UNC path
On Wed, 13 Oct 2010 15:25:27 +0200 (CEST), camille.mou...@free.fr wrote: Not knowing anything about that issue, can you sniff the traffic to port 80? What is it trying to do? Sebastian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Slowness on UNC path
- Sebastian Spaeth sebast...@sspaeth.de a écrit : On Wed, 13 Oct 2010 15:25:27 +0200 (CEST), camille.mou...@free.fr wrote: Not knowing anything about that issue, can you sniff the traffic to port 80? Not at the moment. What is it trying to do? According to http://www.openoffice.org/issues/show_bug.cgi?id=110878 and http://user.services.openoffice.org/en/forum/viewtopic.php?f=15t=18862 he's just trying to guess the protocol to use according to the presence/absence of a web server on port 80. I'm no expert but I feel the might be a better way. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] ww8graf.cxx: Translate German comments
While I was reading that function anyway to find a crasher.
Signed-off-by: Sebastian Spaeth sebast...@sspaeth.de
---
sw/source/filter/ww8/ww8graf.cxx | 40 -
1 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 282c0e2..4d71bb5 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -3004,18 +3004,15 @@ SwFlyFrmFmt*
SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* rpObject,
long nStartCp;
long nEndCp;
-// Pruefen, ob in dieser Textbox-Kette denn Text enthalten ist. (
-// Umwandeln einer leeren Kette in Rahmen waere Unsinn. )
+// Check if this textbox chain contains text as conversion of an empty
+// chain would not make sense.
if ( TxbxChainContainsRealText(pRecord-aTextId.nTxBxS,nStartCp,nEndCp) )
{
-// Der Text wird nicht in das SdrTextObj eingelesen! Stattdessen wird
-// ein Rahmen eingefuegt und der Text von nStartCp bis nEndCp dort
-// hinein gelesen.
+// The Text is not read into SdrTextObj! Rather insert a frame and
+// insert the text from nStartCp to nEndCp.
//
-// Vorteil: im Rahmen sind viel mehr Attribute moeglich als in der
-// Edit-Enging, und es koennen auch Felder, OLEs oder Grafiken darin
-// sein...
-
+// More attributes can be used in a frame compared to the
+// Edit-Enging, and it can contain field, OLEs or graphics...
Rectangle aInnerDist(pRecord-nDxTextLeft, pRecord-nDyTextTop,
pRecord-nDxTextRight, pRecord-nDyTextBottom);
@@ -3035,18 +3032,17 @@ SwFlyFrmFmt*
SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* rpObject,
ASSERT(pRetFrmFmt-GetAnchor().GetAnchorId() == eAnchor,
Not the anchor type requested!);
-// falls alles Ok, Zeiger auf neues Objekt ermitteln und Z-Order-Liste
-// entsprechend korrigieren (oder Eintrag loeschen)
+// if everything is OK, find pointer on new object and correct
+// Z-order list (oder delete entry)
rpOurNewObject = CreateContactObject(pRetFrmFmt);
-// altes Objekt aus der Z-Order-Liste entfernen
+// remove old object from the Z-Order list
pMSDffManager-RemoveFromShapeOrder( rpObject );
-// und das Objekt loeschen
+// and delete the object
SdrObject::Free( rpObject );
/*
-Achtung: ab jetzt nur noch pOrgShapeObject
-abfragen!
+NB: only query pOrgShapeObject starting here!
*/
if (rpOurNewObject)
@@ -3067,23 +3063,21 @@ SwFlyFrmFmt*
SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* rpObject,
(((ULONG)pRecord-aTextId.nTxBxS) 16) +
pRecord-aTextId.nSequence, 0, pRetFrmFmt);
-// Das Kontakt-Objekt MUSS in die Draw-Page gesetzt werden, damit
-// in SwWW8ImplReader::LoadDoc1() die Z-Order festgelegt werden
-// kann !!!
+// The Kontakt object has to be inserted into the draw page, so
+// SwWW8ImplReader::LoadDoc1() can determine the z-order.
if (!rpOurNewObject-IsInserted())
{
-// -- OD 2004-12-13 #117915# - pass information, if object
+// 2004-12-13 #117915# - pass information, if object
// is in page header|footer to method.
pWWZOrder-InsertEscherObject( rpOurNewObject, pF-nSpId,
bIsHeader || bIsFooter );
-// --
}
}
-// Box-0 erhaelt den Text fuer die ganze Kette!
+// Box-0 receives the text for the whole chain!
if( !pRecord-aTextId.nSequence )
{
-// rette Flags u.ae. und setze sie zurueck
+// save flags etc and reset them
WW8ReaderSave aSave( this );
MoveInsideFly(pRetFrmFmt);
@@ -3092,7 +3086,7 @@ SwFlyFrmFmt*
SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* rpObject,
pWWZOrder-InsideEscher(pF-nSpId);
-// lies den Text ein
+// read in the text
bTxbxFlySection = true;
bool bJoined = ReadText(nStartCp, (nEndCp-nStartCp),
MAN_MAINTEXT == pPlcxMan-GetManType() ?
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] C{,PP}FLAGS ignored in sal
Hi! I'm building LO with: ./autogen.sh --with-git --with-system-libs --with-system-headers --with-system-zlib --with-system-jpeg --with-system-libxslt --with-system-libxml --with-system-mesa-headers --with-system-cairo --with-system-mozilla=mozilla --with-system-saxon --with-system-lucene --with-system-openssl CFLAGS=-I/usr/pkg/include -I/usr/X11R7/include CPPFLAGS=-I/usr/pkg/include LDFLAGS=-L/usr/pkg/lib -Wl,-R/usr/pkg/lib QTDIR=/usr/pkg/qt4 --with-jdk-home=/usr/pkg/java/openjdk7 --with-max-jobs=1 --with-num-cpus=1 --disable-kde --disable-kde4 --with-system-mdds=no --with-system-altlinuxhyph=no --with-openldap --without-junit --with-system-mythes=no The build fails with: Compiling: sal/osl/all/debugbase.cxx g++ -fmessage-length=0 -c -O1 -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0 -D_FILE_OFFSET_BITS=no -I. -I../../unxbsdx3.pro/inc/oslall -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxbsdx3.pro/inc -I. -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/stl -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/external -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/unxbsdx3/inc -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/inc -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/res -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/stl -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/inc/Xp31 -I/usr/pkg/java/openjdk7/include -I/usr/pkg/java/openjdk7/include/netbsd -I/usr/pkg/java/openjdk7/include/native_threads/include -I/ usr/X11R7/include -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/offuh -I. -I../../res -I. -pipe -Wno-ctor-dtor-privacy-DNETBSD -DUNX -DVCL -DGCC -DC341 -DX86_64 -DX86_64 -pthread -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/include/g++ -DSUPD=330 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DGSTREAMER -DCUI -DSOLAR_JAVA -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON -o ../../unxbsdx3.pro/obj/debugbase.o /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/sal/osl/all/debugbase.cxx /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/sal/osl/all/debugbase.cxx:36:26: error: boost/bind.hpp: No such file or directory /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/sal/osl/all/debugbase.cxx: In function 'bool osl_detail_ObjectRegistry_storeAddresses(const char*)': /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/sal/osl/all/debugbase.cxx:104: error: 'boost' has not been declared /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/sal/osl/all/debugbase.cxx:104: error: '_1' was not declared in this scope dmake: Error code 1, while making '../../unxbsdx3.pro/obj/debugbase.obj' I don't see my CFLAGS nor CPPFLAGS, which would make it find boost, in the gcc arguments. How can I make them used in this part of the build? Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Merged ooo/OOO330_m10
Hi, As there were no objections on the IRC, I have merged OOO330_m10 into master of the repositories. Unfortunately I forgot to check the buildability with the patches applied - I apologize for that; I checked only the buildability of master without patches applied. Can anybody of you update the patches in patches/*, please? Thank you, and sorry, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Improving the build experience in rawbuild
On Wed, Oct 13, 2010 at 8:33 AM, Cedric Bosdonnat cedric.bosdonnat@free.fr wrote: Hi fellow developers, We improved our build process a lot since the LibreOffice creation, but there is still something I'ld like to improve. Developers should build in rawbuild in order to create patches (or commit directly) easily. The current build procedure described on the wiki and TDF website builds in build/libreoffice*. In order to change that, I'ld like to do the following: * Change the rawbuild/configure.in to have the defaults matching the options defined in distros-config/LibreOfficeLinux.conf.in * Hack bin/g to have bin/g clone download all the repos at the appropriate place and create the rawbuild folder. This way, all that would need to be done for a new developper building on Linux would be: git clone .../build cd build bin/g clone cd rawbuild ./autogen.sh make make dev-install Do you have any strong opinion against that? That's how I already build it, so I'm all for it. Norbert -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Improving the build experience in rawbuild
+1, if at all my opinion matters ;-) On Wed, Oct 13, 2010 at 10:25 PM, Norbert Thiebaud nthieb...@gmail.comwrote: On Wed, Oct 13, 2010 at 8:33 AM, Cedric Bosdonnat cedric.bosdonnat@free.fr wrote: Hi fellow developers, We improved our build process a lot since the LibreOffice creation, but there is still something I'ld like to improve. Developers should build in rawbuild in order to create patches (or commit directly) easily. The current build procedure described on the wiki and TDF website builds in build/libreoffice*. In order to change that, I'ld like to do the following: * Change the rawbuild/configure.in to have the defaults matching the options defined in distros-config/LibreOfficeLinux.conf.in * Hack bin/g to have bin/g clone download all the repos at the appropriate place and create the rawbuild folder. This way, all that would need to be done for a new developper building on Linux would be: git clone .../build cd build bin/g clone cd rawbuild ./autogen.sh make make dev-install Do you have any strong opinion against that? That's how I already build it, so I'm all for it. Norbert -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- --Krishnan Parthasarathi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Error Building, vcl segmentation fault
Le 12/10/2010 22:30, julien a écrit : Le 12/10/2010 10:44, Michael Meeks a écrit : On Tue, 2010-10-12 at 08:26 +0200, David Tardon wrote: There is the problem: this line should be gdb --args $checkdll $@ Urk - my problem; you almost got there manually with: On Mon, 2010-10-11 at 23:08 +0200, julien wrote: (gdb) run -s ../unxlngi6.pro/lib/check_libvclplug_kdeli.so Starting program: /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/bin/checkdll -s ../unxlngi6.pro/lib/check_libvclplug_kdeli.so [Thread debugging using libthread_db enabled] Program received signal SIGSEGV, Segmentation fault. 0xb68061db in _STL::locale::locale() () from /usr/lib/libstlport_gcc.so.4.6 How tantelising ! :-) this is the crasher - but we really need more symbols :-) - if you had run backtrace at this point we could have got a lot further I think. Having said that - it looks like this may be some horrendous compatibility problem between the internal stlport and the system version - but we'll need to chase that down. Possibly we simply can't use our own stlport if we link KDE, unclear - Lubos: thoughts ? Our internal stlport patches seem to be somewhat insubstantial anyway: mostly portability renames - and a load of SUNPRO stuff that we don't need to care about I think, with a few OS/2 build fixes ;-) Thanks, Michael. Hi, here are the stdout once i replaced $checkdll $@ by gdb --args $checkdll $@ Entering /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/vcl/aqua/source/gdi Nothing to build for GUIBASE unx Entering /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/vcl/util Making:libvclplug_kdeli.so g++ -L/usr/lib -L/usr/lib -lkdeui -lkdecore -lqt-mt -Wl,-z,noexecstack -Wl,-z,combreloc -Wl,-z,defs -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -Wl,--hash-style=both -Wl,-rpath,'$ORIGIN:$ORIGIN/../ure-link/lib' -shared -L../unxlngi6.pro/lib -L../lib -L/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solenv/unxlngi6/lib -L/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/lib -L/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solenv/unxlngi6/lib -L/usr/lib/jvm/java-6-sun/lib -L/usr/lib/jvm/java-6-sun/jre/lib/i386 -L/usr/lib/jvm/java-6-sun/jre/lib/i386/client -L/usr/lib/jvm/java-6-sun/jre/lib/i386/native_threads -L/usr/lib ../unxlngi6.pro/slo/vclplug_kde_dflt_version.o -o ../unxlngi6.pro/lib/libvclplug_kdeli.so ../unxlngi6.pro/slo/kdedata.o ../unxlngi6.pro/slo/salnativewidgets-kde.o -lvclplug_genli -lvclli -ltlli -lvos3gcc3 -luno_sal -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed -Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed -Wl,-Bdynamic -lstlport_gcc rm -f ../unxlngi6.pro/lib/check_libvclplug_kdeli.so mv ../unxlngi6.pro/lib/libvclplug_kdeli.so ../unxlngi6.pro/lib/check_libvclplug_kdeli.so /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solenv/bin/checkdll.sh -L../unxlngi6.pro/lib -L/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/lib ../unxlngi6.pro/lib/check_libvclplug_kdeli.so GNU gdb (GDB) 7.0.1-debian Copyright (C) 2009 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type show copying and show warranty for details. This GDB was configured as i486-linux-gnu. For bug reporting instructions, please see: http://www.gnu.org/software/gdb/bugs/... Reading symbols from /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/bin/checkdll...(no debugging symbols found)...done. (gdb) run Starting program: /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/bin/checkdll ../unxlngi6.pro/lib/check_libvclplug_kdeli.so [Thread debugging using libthread_db enabled] Checking DLL ../unxlngi6.pro/lib/check_libvclplug_kdeli.so ... Program received signal SIGSEGV, Segmentation fault. 0xb68061db in _STL::locale::locale() () from /usr/lib/libstlport_gcc.so.4.6 (gdb) thread apply all backtrace Thread 1 (Thread 0xb7d276d0 (LWP 7585)): #0 0xb68061db in _STL::locale::locale() () from /usr/lib/libstlport_gcc.so.4.6 #1 0xb67d1414 in _STL::ios_base::ios_base() () from /usr/lib/libstlport_gcc.so.4.6 #2 0xb67e3a41 in _STL::ios_base::_S_initialize() () from /usr/lib/libstlport_gcc.so.4.6 #3 0xb67e3f17 in _STL::ios_base::Init::Init() () from /usr/lib/libstlport_gcc.so.4.6 #4 0xb61e57a1 in global constructors keyed to cascade_mapping.cxx () from /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/lib/libuno_cppu.so.3 #5 0xb61ecd8d in __do_global_ctors_aux () from
Re: [Libreoffice] Error Building, vcl segmentation fault
On Tue, Oct 12, 2010 at 12:13:15PM +0200, Lubos Lunak wrote: On Tuesday 12 of October 2010, Michael Meeks wrote: Having said that - it looks like this may be some horrendous compatibility problem between the internal stlport and the system version - but we'll need to chase that down. Possibly we simply can't use our own stlport if we link KDE, unclear - Lubos: thoughts ? I don't see the point of using stlport if the system is capable of building KDE, in which case I'd expect the compiler to provide an adequate STL implementation itself. ABI compatibility to OOo C++ extensions is one. (Though happily only for i386 on Linux) Grüße/Regards, René ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] unable to create 'refs/heads/master.lock' in libs-extern-sys
So, messages are... [libs-extern-sys]$ git push Counting objects: 75, done. Delta compression using up to 8 threads. Compressing objects: 100% (50/50), done. Writing objects: 100% (50/50), 14.41 KiB, done. Total 50 (delta 31), reused 0 (delta 0) fatal: unable to create 'refs/heads/master.lock': File exists fatal: The remote end hung up unexpectedly the other repos I can push, just not this one, google suggests that the problem is at the server side, not my side ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Removing comments
Hi
This patch removes some useless comments. To be continued
Thanks
From c40b374c2df939fb57531562f4438fa8fe70920b Mon Sep 17 00:00:00 2001
From: Arnaud Versini arnaud.vers...@gmail.com
Date: Wed, 13 Oct 2010 21:36:02 +0200
Subject: [PATCH] Removing some useless comments.
---
sw/source/ui/dialog/abstract.cxx| 15 ---
sw/source/ui/dialog/addrdlg.cxx | 10 --
sw/source/ui/dialog/docstdlg.cxx| 15 ---
sw/source/ui/dialog/swdlgfact.cxx | 178 +--
sw/source/ui/dialog/wordcountdialog.cxx |9 --
5 files changed, 49 insertions(+), 178 deletions(-)
diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx
index a265d03..c7c4921 100644
--- a/sw/source/ui/dialog/abstract.cxx
+++ b/sw/source/ui/dialog/abstract.cxx
@@ -41,10 +41,6 @@
#include abstract.hrc
-/*-22.02.97 15.32---
-
---*/
-
SwInsertAbstractDlg::SwInsertAbstractDlg( Window* pParent ) :
SfxModalDialog(pParent, SW_RES(DLG_INSERT_ABSTRACT)),
aFL (this, SW_RES(FL_1 )),
@@ -60,25 +56,14 @@ SwInsertAbstractDlg::SwInsertAbstractDlg( Window* pParent ) :
FreeResource();
}
-/*-22.02.97 15.32---
-
---*/
-
SwInsertAbstractDlg::~SwInsertAbstractDlg()
{
}
-/*-22.02.97 15.34---
-
---*/
-
BYTE SwInsertAbstractDlg::GetLevel() const
{
return static_cast BYTE (aLevelNF.GetValue() - 1);
}
-/*-22.02.97 15.34---
-
---*/
BYTE SwInsertAbstractDlg::GetPara() const
{
diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx
index 4fe00e8..a5083a0 100644
--- a/sw/source/ui/dialog/addrdlg.cxx
+++ b/sw/source/ui/dialog/addrdlg.cxx
@@ -36,11 +36,6 @@
#include svx/svxdlg.hxx
#include sfx2/sfx.hrc
-/
-Ctor
-/
-
-
SwAddrDlg::SwAddrDlg(Window* pParent, const SfxItemSet rSet ) :
SfxSingleTabDialog(pParent, rSet, 0)
@@ -57,11 +52,6 @@ SwAddrDlg::SwAddrDlg(Window* pParent, const SfxItemSet rSet ) :
}
}
-/
-Dtor
-/
-
-
__EXPORT SwAddrDlg::~SwAddrDlg()
{
}
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index 977a08b..ce44626 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -52,21 +52,11 @@
#include docstdlg.hrc
-/*
-Beschreibung: Create
- */
-
-
SfxTabPage * SwDocStatPage::Create(Window *pParent, const SfxItemSet rSet)
{
return new SwDocStatPage(pParent, rSet);
}
-/*
-Beschreibung: Ctor
- */
-
-
SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet rSet) :
SfxTabPage (pParent, SW_RES(TP_DOC_STAT), rSet),
@@ -120,11 +110,6 @@ BOOL SwDocStatPage::FillItemSet(SfxItemSet /*rSet*/)
return FALSE;
}
-/*
-Beschreibung:
- */
-
-
void SwDocStatPage::Reset(const SfxItemSet /*rSet*/)
{
}
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index a2b7a5f..655a4ca 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -143,7 +143,6 @@ IMPL_ABSTDLG_BASE(AbstractInsertSectionTabDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractIndexMarkFloatDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractAuthMarkFloatDlg_Impl);
-// AbstractTabDialog_Impl begin
void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
{
pDlg-SetCurPageId( nId );
@@ -163,33 +162,32 @@ void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
{
pDlg-SetInputSet( pInSet );
}
+
//From class Window.
void AbstractTabDialog_Impl::SetText( const XubString rStr )
{
pDlg-SetText( rStr );
}
+
String AbstractTabDialog_Impl::GetText() const
{
return pDlg-GetText();
}
-//add for AbstractTabDialog_Impl end
-
voidAbstractSwWordCountDialog_Impl::SetValues(const SwDocStat rCurrent, const SwDocStat rDoc)
{
pDlg-SetValues(rCurrent, rDoc);
}
-//add for SwInsertAbstractDlg begin
BYTE AbstractSwInsertAbstractDlg_Impl::GetLevel() const
{
return pDlg-GetLevel();
}
+
BYTE AbstractSwInsertAbstractDlg_Impl::GetPara() const
{
Re: [Libreoffice] [PATCH] ww8graf.cxx: Translate German comments
On Wed, 2010-10-13 at 17:24 +0200, Sebastian Spaeth wrote: While I was reading that function anyway to find a crasher. Pushed, your crasher is fixed too. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Removing comments
Next part
2010/10/13 Arnaud VERSINI arnaud.vers...@gmail.com
Hi
This patch removes some useless comments. To be continued
Thanks
From 2d26d75ed11c81625e47025c7e118da6ad18eca6 Mon Sep 17 00:00:00 2001
From: Arnaud Versini arnaud.vers...@gmail.com
Date: Wed, 13 Oct 2010 21:51:46 +0200
Subject: [PATCH 1/2] Removing commented source in macassgn.cxx.
---
sw/source/ui/dialog/macassgn.cxx | 30 --
1 files changed, 0 insertions(+), 30 deletions(-)
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 9bbe10d..8d2a9b9 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -162,33 +162,3 @@ BOOL SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell rSh,
return bRet;
}
-/*
-SvStringsDtor* __EXPORT _GetRangeHdl( _SfxMacroTabPage* , const String rLanguage )
-{
-SvStringsDtor* pNew = new SvStringsDtor;
-
-SfxApplication* pSfxApp = SFX_APP();
-if ( !rLanguage.EqualsAscii(SVX_MACRO_LANGUAGE_JAVASCRIPT) )
-{
-pSfxApp-EnterBasicCall();
-
-String* pNewEntry = new String( pSfxApp-GetName() );
-pNew-Insert( pNewEntry, pNew-Count() );
-
-TypeId aType( TYPE( SwDocShell ));
-SfxObjectShell* pDoc = SfxObjectShell::GetFirst( aType );
-while( pDoc )
-{
-pNewEntry = new String( pDoc-GetTitle() );
-pNew-Insert( pNewEntry, pNew-Count() );
-pDoc = SfxObjectShell::GetNext( *pDoc, aType );
-}
-pSfxApp-LeaveBasicCall();
-}
-
-return pNew;
-}
-*/
-
-
-
--
1.7.1
From 502831ce8a581c30083655578004e0a0b4bb805a Mon Sep 17 00:00:00 2001
From: Arnaud Versini arnaud.vers...@gmail.com
Date: Wed, 13 Oct 2010 21:58:42 +0200
Subject: [PATCH 2/2] Removing some useeless comments.
---
sw/source/ui/dialog/SwSpellDialogChildWindow.cxx | 40 +
sw/source/ui/dialog/regionsw.cxx |9 -
2 files changed, 2 insertions(+), 47 deletions(-)
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
index 892bf51..0987465 100644
--- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
@@ -144,9 +144,7 @@ struct SpellState
pOtherCursor = 0;
}
};
-/*-- 30.10.2003 14:33:26---
- ---*/
void lcl_LeaveDrawText(SwWrtShell rSh)
{
if(rSh.GetDrawView())
@@ -159,9 +157,7 @@ void lcl_LeaveDrawText(SwWrtShell rSh)
rSh.GetView().AttrChangedNotify(rSh);
}
}
-/*-- 09.09.2003 10:39:22---
- ---*/
SwSpellDialogChildWindow::SwSpellDialogChildWindow (
Window* _pParent,
USHORT nId,
@@ -175,9 +171,7 @@ SwSpellDialogChildWindow::SwSpellDialogChildWindow (
String aPropName( String::CreateFromAscii(UPN_IS_GRAMMAR_INTERACTIVE ) );
SvtLinguConfig().GetProperty( aPropName ) = m_bIsGrammarCheckingOn;
}
-/*-- 09.09.2003 10:39:22---
- ---*/
SwSpellDialogChildWindow::~SwSpellDialogChildWindow ()
{
SwWrtShell* pWrtShell = GetWrtShell_Impl();
@@ -186,9 +180,7 @@ SwSpellDialogChildWindow::~SwSpellDialogChildWindow ()
delete m_pSpellState;
}
-/*-- 09.09.2003 12:40:07---
- ---*/
SfxChildWinInfo SwSpellDialogChildWindow::GetInfo (void) const
{
SfxChildWinInfo aInfo = svx::SpellDialogChildWindow::GetInfo();
@@ -196,10 +188,7 @@ SfxChildWinInfo SwSpellDialogChildWindow::GetInfo (void) const
return aInfo;
}
-/*-- 09.09.2003 10:39:40---
-
- ---*/
svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
{
svx::SpellPortions aRet;
@@ -457,9 +446,7 @@ The code below would only be part of the solution.
return aRet;
}
-/*-- 09.09.2003 10:39:40---
- ---*/
void SwSpellDialogChildWindow::ApplyChangedSentence(const svx::SpellPortions rChanged, bool bRecheck)
{
SwWrtShell* pWrtShell = GetWrtShell_Impl();
@@ -489,39 +476,29 @@ void SwSpellDialogChildWindow::ApplyChangedSentence(const svx::SpellPortions rC
}
}
}
-/*-- 21.10.2003 09:33:57---
- ---*/
void SwSpellDialogChildWindow::AddAutoCorrection(
const String rOld,
Re: [Libreoffice] Removing comments
Hi Arnaud, On Wed, 2010-10-13 at 22:00 +0200, Arnaud VERSINI wrote: Next part 2010/10/13 Arnaud VERSINI arnaud.vers...@gmail.com Hi This patch removes some useless comments. To be continued Thanks for your patches, I just pushed all three of them. Keep them coming. -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Error Building, vcl segmentation fault
Le 12/10/2010 10:44, Michael Meeks a écrit : On Tue, 2010-10-12 at 08:26 +0200, David Tardon wrote: There is the problem: this line should be gdb --args $checkdll $@ Urk - my problem; you almost got there manually with: On Mon, 2010-10-11 at 23:08 +0200, julien wrote: (gdb) run -s ../unxlngi6.pro/lib/check_libvclplug_kdeli.so Starting program: /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/bin/checkdll -s ../unxlngi6.pro/lib/check_libvclplug_kdeli.so [Thread debugging using libthread_db enabled] Program received signal SIGSEGV, Segmentation fault. 0xb68061db in _STL::locale::locale() () from /usr/lib/libstlport_gcc.so.4.6 How tantelising ! :-) this is the crasher - but we really need more symbols :-) - if you had run backtrace at this point we could have got a lot further I think. Having said that - it looks like this may be some horrendous compatibility problem between the internal stlport and the system version - but we'll need to chase that down. Possibly we simply can't use our own stlport if we link KDE, unclear - Lubos: thoughts ? Our internal stlport patches seem to be somewhat insubstantial anyway: mostly portability renames - and a load of SUNPRO stuff that we don't need to care about I think, with a few OS/2 build fixes ;-) Thanks, Michael. I did the whole process from scratch to be sure : rm -rf /home/serval/libreoffice/build git clone git://anongit.freedesktop.org/git/libreoffice/build |./autogen.sh --with-git ||./download| |make | then the change of /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solenv/bin/checkdll.sh echo LD_LIBRARY_PATH is $LD_LIBRARY_PATH gdb --args $checkdll $@ when i arrive in gdb : - run then - thread apply all backtrace | and it seems the same : Entering /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/vcl/util Making:libvclplug_kdeli.so g++ -L/usr/lib -L/usr/lib -lkdeui -lkdecore -lqt-mt -Wl,-z,noexecstack -Wl,-z,combreloc -Wl,-z,defs -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -Wl,--hash-style=both -Wl,-rpath,'$ORIGIN:$ORIGIN/../ure-link/lib' -shared -L../unxlngi6.pro/lib -L../lib -L/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solenv/unxlngi6/lib -L/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/lib -L/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solenv/unxlngi6/lib -L/usr/lib/jvm/java-6-sun/lib -L/usr/lib/jvm/java-6-sun/jre/lib/i386 -L/usr/lib/jvm/java-6-sun/jre/lib/i386/client -L/usr/lib/jvm/java-6-sun/jre/lib/i386/native_threads -L/usr/lib ../unxlngi6.pro/slo/vclplug_kde_dflt_version.o -o ../unxlngi6.pro/lib/libvclplug_kdeli.so ../unxlngi6.pro/slo/kdedata.o ../unxlngi6.pro/slo/salnativewidgets-kde.o -lvclplug_genli -lvclli -ltlli -lvos3gcc3 -luno_sal -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed -Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed -Wl,-Bdynamic -lstlport_gcc rm -f ../unxlngi6.pro/lib/check_libvclplug_kdeli.so mv ../unxlngi6.pro/lib/libvclplug_kdeli.so ../unxlngi6.pro/lib/check_libvclplug_kdeli.so /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solenv/bin/checkdll.sh -L../unxlngi6.pro/lib -L/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/lib ../unxlngi6.pro/lib/check_libvclplug_kdeli.so LD_LIBRARY_PATH is ../unxlngi6.pro/lib:/home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/lib GNU gdb (GDB) 7.0.1-debian Copyright (C) 2009 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or laterhttp://gnu.org/licenses/gpl.html This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type show copying and show warranty for details. This GDB was configured as i486-linux-gnu. For bug reporting instructions, please see: http://www.gnu.org/software/gdb/bugs/... Reading symbols from /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/bin/checkdll...(no debugging symbols found)...done. (gdb) run Starting program: /home/serval/libreoffice-source/build/build/libreoffice-3.2.99.2/solver/330/unxlngi6.pro/bin/checkdll ../unxlngi6.pro/lib/check_libvclplug_kdeli.so [Thread debugging using libthread_db enabled] Checking DLL ../unxlngi6.pro/lib/check_libvclplug_kdeli.so ... Program received signal SIGSEGV, Segmentation fault. 0xb68061db in _STL::locale::locale() () from /usr/lib/libstlport_gcc.so.4.6 (gdb) thread apply all backtrace Thread 1 (Thread 0xb7d276d0 (LWP 15195)): #0 0xb68061db in _STL::locale::locale() () from /usr/lib/libstlport_gcc.so.4.6 #1 0xb67d1414 in _STL::ios_base::ios_base() () from /usr/lib/libstlport_gcc.so.4.6 #2 0xb67e3a41 in _STL::ios_base::_S_initialize() () from /usr/lib/libstlport_gcc.so.4.6 #3
Re: [Libreoffice] [PATCH] Filters - Remove redundant include directives comments
On Wed, 2010-10-13 at 18:17 +0100, jgraeme wrote: Patch to remove more #includes comments. Thanks Graeme for your patch, I just pushed it. -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] LibreOffice config migration
On Tue, 2010-10-12 at 15:07 +0100, Michael Meeks wrote: Would it be possible to add a non-modal / floating / dialog to prompt users to migrate / import their macros from an old version if it hasn't been previously imported, and we know that they have really been editing / changing their macros ? a reasonably rare case I suspect. I don't exactly get what you mean, the migration purely takes place first time libreoffice is run ( e.g. your config profile doesn't exist and you have no macros ) so I dont understand the 'previously imported' bit Later on if you want to suck in macros from somewhere else I guess that's a different story, there already exists some ( poor ) import capability from the IDE ( we could definitely improve that if necessary ) Anyway I pushed the change to Setup.xcu to add Openoffice.org 3.x as a supported versio to migrate data from. If there are any objections let me know and of course I can back that out Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [LibreOffice][Patch] Replace ASSERT and DBG_ASSERT with OSL_ENSURE + some translations, comment removal
Hi Jacek, I removed a hunk that wasn't valid, but otherwise, the patch looks good to me. I've pushed it. Many thanks for your help! -- Cedric On Wed, 2010-10-13 at 22:34 +0200, Jacek Wolszczak wrote: Hi, As in the topic. I replaced some assert items with OSL equivalents. I also replaced #ifdef DBG_UTIL with #if OSL_DEBUG_LEVEL 1 in accordance with some findings in opengrok and http://wiki.services.openoffice.org/wiki/Debug_Levels. Some additional questions. What should I replace DBG_ERROR with? Should RTL_LOGFILE_CONTEXT_AUTHOR as in http://bit.ly/buiBlA be updated somehow as it contains a lot of hardcoded e-mail addresses? Regards, Jacek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Script used to change the product codes
Hello, good people,
I was thinking that it would be nice to document the script that I used
to change the product IDs of libreoffice so that we don't uninstall
OpenOffice.org on Windows.
The script was generated once using the old codes in by this command:
(echo #!/bin/sh; for i in `grep -i -E
'[0-9a-z]{8}-([0-9a-z]{4}-){3}[0-9a-z]{12}'
inc_ooolangpack/windows/msi_templates/codes*.txt
inc_openoffice/windows/msi_templates/codes*.txt
inc_sdkoo/windows/msi_templates/codes.txt
inc_ure/windows/msi_templates/codes.txt | awk '{ print $3}' | sort |
uniq | sed 's#\{##g' | sed 's#}\##g'`; do echo perl -pi -e 's#
$i#`uuidgen | tr [:lower:] [:upper:]`#g' \\...@\;
done )change-guids.sh
*This generation should not be done anymore.* I committed the resulting
script here:
http://cgit.freedesktop.org/libreoffice/build/plain/bin/change-guids.sh
I run the script on the relevant code*.txt files in instsetoo_native and
I reverted all stuff that concerns BrOffice back, since its product code
was distinct from OOo product code. Should it be desirable to change the
BrOffice codes, it is enough to run that script anew and commit the
changed files. Since the IDs are unique, the already changed IDs will
not be modified.
Now, there is a little hurdle for those that merge into LibreOffice tree
the relevant OOo changes:
If you see a new GUID in those files, please do following:
1) Just merge them at the place where they were added despite the fact
that they will have quite different context (due to the change of all
GUIDs)
2) Run the script on those files that were modified.
3) If the GUID that was added will not be changed by this script, amend
the script by adding a line
perl -pi -e 's#old_guid#new_guid#g' $@
generating a new GUID using uuidgen | tr [:lower:] [:upper:]
4) Run the amended script again and don't forget to commit the changes
to it too
This will regenerate a new GUID and also take care of situation where
some of the GUIDs in those files might be not unique (i.e. linking one
product to another by their product IDs).
Sorry for such a strict instruction, but I don't see another way to
ensure that we will not accidentally produce two versions of LibO that
will be not having the same product code in some element.
Cheers
Fridrich
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] The Windows installer
Hello guys, just some comments and question about the Windows installer from a user and a Win2000 tester. Today i wanted to download LO-3.3.0-beta2 for Windows and i left speechless in front of the download size: 318 MB! More than 2 times than beta1. I see that it's an installer that includes all the languages but i wonder if it is really necessary and if the languages are the only cause. Unpacking the installer i see that it's all due to libreoffice1.cab: about 465 MB. Unpacking them too, i obtain 20401 file, totaling more than 1 GB. Even if the installed size is about 500 MB, isn't the installer too big? I wonder what's the planned direction about it. I were really happy to see a beta1 installer sensibly smaller than the official OOo... To me were more smart the go-oo approach: an english installer + the interested language pack. The only thing that i wish it were different is an installed language pack integrated with the main application, with one entry in the control panel, so that when i have to uninstall it i have only to do it once. The language pack shouldn't be something that the user need to remove so frequently to deserve an entry in the control panel. Libreoffice is a really promising project. I really hope that it will follow an unbloating process like did the Mozilla project in the past. Keep up the good work. Cesare. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH]Remove death code and comments
Hi,
See attached a small patch that removes death code and comments on
writer/sw/source
Cheers,
--
gil forcada
[ca] guifi.net - una xarxa lliure que no para de créixer
[en] guifi.net - a non-stopping free network
bloc: http://gil.badall.net
planet: http://planet.guifi.net
From 026e9fbabf85be410a38488600705dcf40761c2b Mon Sep 17 00:00:00 2001
From: Gil Forcada gforc...@gnome.org
Date: Thu, 14 Oct 2010 02:07:25 +0200
Subject: [PATCH] Removed death code and comments
---
sw/source/core/text/porlay.cxx|1 -
sw/source/core/txtnode/ndtxt.cxx | 229 -
sw/source/filter/html/svxcss1.cxx |2 -
sw/source/filter/ww8/wrtww8.cxx | 52 -
sw/source/ui/index/cntex.cxx | 22
sw/source/ui/ribbar/workctrl.src | 28 -
6 files changed, 20 insertions(+), 314 deletions(-)
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 34dbba9..93d461f 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -71,7 +71,6 @@
using namespace ::com::sun::star;
using namespace i18n::ScriptType;
-//#ifdef BIDI
#include unicode/ubidi.h
#include i18nutil/unicode.hxx //unicode::getUnicodeScriptType
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 4046cbc..56bce35 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -34,9 +34,7 @@
#include editeng/brkitem.hxx
#include editeng/escpitem.hxx
#include editeng/lrspitem.hxx
-// -- OD 2008-01-17 #newlistlevelattrs#
#include editeng/tstpitem.hxx
-// --
#include svl/urihelper.hxx
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_ULONGS
@@ -88,16 +86,12 @@
#include SwStyleNameMapper.hxx
#include numrule.hxx
-//-- #outlinelevel added by zhaojianwei
#include svl/intitem.hxx
-//--end
#include swtable.hxx
#include docsh.hxx
#include SwNodeNum.hxx
-// -- OD 2008-02-25 #refactorlists#
#include svl/intitem.hxx
#include list.hxx
-// --
SV_DECL_PTRARR( TmpHints, SwTxtAttr*, 0, 4 )
@@ -126,24 +120,14 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex rWhere,
SwNodeIndex aIdx( *pNode );
-// -- OD 2005-11-03 #125329#
+// #125329#
// call method UpdateOutlineNode(..) only for the document nodes array
if ( IsDocNodes() )
{
-//if ( pColl NO_NUMBERING != pColl-GetOutlineLevel() ) //#outline level,removed by zhaojianwei
-//{
-// UpdateOutlineNode( *pNode, NO_NUMBERING, pColl-GetOutlineLevel() );
-//}
-//if ( pColl 0 != pColl-GetAttrOutlineLevel() )//#outline level,added by zhaojianwei
-//{
-//UpdateOutlineNode( *pNode, 0, pColl-GetAttrOutlineLevel() );
-//}//--end
-//else
{
UpdateOutlineNode(*pNode);
}
}
-// --
//Wenn es noch kein Layout gibt oder in einer versteckten Section
// stehen, brauchen wir uns um das MakeFrms nicht bemuehen.
@@ -231,13 +215,10 @@ SwTxtNode::SwTxtNode( const SwNodeIndex rWhere,
mpNodeNum( 0 ),
m_bLastOutlineState( false ),
m_bNotifiable( false ),
- // -- OD 2008-11-19 #i70748#
+ // #i70748#
mbEmptyListStyleSetDueToSetOutlineLevelAttr( false ),
- // --
- // -- OD 2008-05-06 #refactorlists#
mbInSetOrResetAttr( false ),
mpList( 0 )
- // --
{
InitSwParaStatistics( true );
@@ -245,11 +226,10 @@ SwTxtNode::SwTxtNode( const SwNodeIndex rWhere,
if( pAutoAttr )
SetAttr( *pAutoAttr );
-// -- OD 2008-03-13 #refactorlists# - no longed needed
//SyncNumberAndNumRule();
if ( !IsInList() GetNumRule() GetListId().Len() 0 )
{
-// -- OD 2009-08-27 #i101516#
+// #i101516#
// apply paragraph style's assigned outline style list level as
// list level of the paragraph, if it has none set already.
if ( !HasAttrListLevel()
@@ -257,10 +237,8 @@ SwTxtNode::SwTxtNode( const SwNodeIndex rWhere,
{
SetAttrListLevel( pTxtColl-GetAssignedOutlineStyleLevel() );
}
-// --
AddToList();
}
-// --
GetNodes().UpdateOutlineNode(*this);
m_bNotifiable = true;
@@ -287,15 +265,7 @@ SwTxtNode::~SwTxtNode()
delete pTmpHints;
}
-// -- OD 2008-03-13 #refactorlists#
-//if ( mpNodeNum )
-//{
-//mpNodeNum-RemoveMe();
-//delete mpNodeNum;
-//mpNodeNum = 0L;
-//}
RemoveFromList();
-// --
InitSwParaStatistics( false );
}
@@ -360,7 +330,7 @@ void lcl_ChangeFtnRef( SwTxtNode rNode )
{
while( pFtn-GetMaster() )
pFtn = pFtn-GetMaster();
-// OD 07.11.2002 #104840# - remember footnote frame
+// #104840# - remember footnote frame
pFirstFtnOfNode = pFtn;
while ( pFtn )
{
@@
[Libreoffice] LibO Beta2 Crashes when inserting a caption into a frame
LibO Beta2 Crashes when inserting a caption into a frame.
Verified on:
Linux
o Ubuntu 32 64bit
$ cat /opt/libreoffice3/program/versionrc
[Version]
AllLanguages=en-US
buildid=330m9(Build:1)
ExtensionUpdateURL=http://updateexte.services.openoffice.org/ExtensionUpdateService/check.Update
OOOBaseVersion=3.3
ProductBuildid=1
ProductMajor=330
ProductMinor=9
ProductSource=OOO330
UpdateID=LibreOffice_3_en-US
UpdateURL=
UpdateUserAgent=PRODUCT (${buildid}; ${_OS}; ${_ARCH};
BundledLanguages=${AllLanguages})
Windows
o WinXPPro
LibreOffice 3.3.0
OOO330m9 (Build:1)
libreoffice-build 3.2.992
No crash info available.
Does not crash on Beta1 on any of the above.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH 2/3] Delete commented out code in ure/cppuhelper
Signed-off-by: Laurent Charrière lcharri...@gmail.com
---
cppuhelper/inc/cppuhelper/interfacecontainer.hxx |1 -
cppuhelper/source/factory.cxx|2 --
cppuhelper/source/interfacecontainer.cxx |1 -
cppuhelper/source/weak.cxx | 10 --
4 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
index 4b34e92..a933547 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
@@ -157,7 +157,6 @@ void OMultiTypeInterfaceContainerHelperVar key , hashImpl
, equalImpl ::dispos
{
typedef OInterfaceContainerHelper* ppp;
ppListenerContainers = new ppp[nSize];
-//ppListenerContainers = new (ListenerContainer*)[nSize];
typename InterfaceMap::iterator iter = m_pMap-begin();
typename InterfaceMap::iterator end = m_pMap-end();
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 6d1942e..d46e305 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -1084,8 +1084,6 @@ ReferenceXSingleServiceFactory SAL_CALL
createOneInstanceFactory(
{
return new OFactoryComponentHelper(
rServiceManager, rImplementationName, pCreateFunction, 0,
rServiceNames, pModCount, sal_True );
-// return new OFactoryUnloadableComponentHelper(
-// rServiceManager, rImplementationName, pCreateFunction, 0,
rServiceNames, pModCount, sal_True );
}
// global function
diff --git a/cppuhelper/source/interfacecontainer.cxx
b/cppuhelper/source/interfacecontainer.cxx
index afd3d09..ca6a1e2 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -686,7 +686,6 @@ void
OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject
{
typedef OInterfaceContainerHelper* ppp;
ppListenerContainers = new ppp[nSize];
-//ppListenerContainers = new (ListenerContainer*)[nSize];
t_long2ptr::iterator iter = pMap-begin();
t_long2ptr::iterator end = pMap-end();
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 1c24f48..750981b 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -289,16 +289,6 @@ Any OWeakAggObject::queryInterface( const Type rType )
throw(::com::sun::star:
{
Reference XInterface x( xDelegator ); // harden ref
return (x.is() ? x-queryInterface( rType ) : queryAggregation( rType ));
-
-// // set rOut to zero, if failed
-// if( !xDelegator.queryHardRef( aUik, rOut ) )
-// {
-// XInterfaceRef x;
-// if( !xDelegator.queryHardRef( ((XInterface*)0)-getSmartUik(),
x ) )
-// // reference is not valid
-// queryAggregation( aUik, rOut );
-// }
-// return rOut.is();
}
// XAggregation
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
