Re: [Libreoffice] Enable build of ure and extension
Hi, thank you very much for checking them. Well, after a good night of sleep, I have just realized that since the change to the new build system my root directory is a real mess. For sure, I did not do it the right way and then focussed on the patches ready before the upgrade. Thanks for your patience. Regards. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Java build problem identified?
On Sat, 2010-12-04 at 16:07 -0600, Norbert Thiebaud wrote: I had to add --with-jdk-home=/opt/sun-jdk-1.6.0.20 to my gentoo build. Hmm, I wonder. If you go to configure.in and change if test x$with_jdk_home = x -a $_gij_longver -ge 40200; then to if test x$with_jdk_home = x; then and re-run configure without any --with-jdk-home does it then work. And if it does not work, there should at least now be a findhome.class generated by configure. What's the output of java findhome in that case ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] bad value (atom) for -mtune= switch on boostrap build
On Sat, 2010-12-04 at 16:52 -0600, Norbert Thiebaud wrote: apparently -mtune=atom require gcc 4.5. uh huh, fair enough. I've tweaked things to try and use the version number as the default ARCH_FLAGS for this now. Does that break things again, or continue to work ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] FOSDEM foo ...
HI Michael, On Thu, Dec 2, 2010 at 5:53 PM, Michael Meeks michael.me...@novell.com wrote: Hi Suren, e more time for the patch to mature ? Wow - it's always the right time to apply for a FOSDEM paper :-) just whack your name in the wiki, and encourage your friends to come. ... Incidentally; the wiki page is here: http://wiki.documentfoundation.org/Marketing/Events/Fosdem2011 I have made my proposal now :) Hope its alright :) Thanks for the encouraging words :D -- regards Suren Learning Doing Learn By doing. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] RC1 Help
Hi, can someone please urgently check https://bugs.freedesktop.org/show_bug.cgi?id=32108 ? Best regards Rainer Bielefeld ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] http://libreoffice.boldandbusted.com/ cppcheck report server problem
Just a note to state that the top entry in the cppcheck report list is basically a false positive. Standlone example now logged as https://sourceforge.net/apps/trac/cppcheck/ticket/2279 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Java build problem identified?
On 05/12/10 14:28, Wols Lists wrote: On 05/12/10 11:26, Caolán McNamara wrote: On Sat, 2010-12-04 at 16:07 -0600, Norbert Thiebaud wrote: I had to add --with-jdk-home=/opt/sun-jdk-1.6.0.20 to my gentoo build. Hmm, I wonder. If you go to configure.in and change if test x$with_jdk_home = x -a $_gij_longver -ge 40200; then to if test x$with_jdk_home = x; then and re-run configure without any --with-jdk-home does it then work. And if it does not work, there should at least now be a findhome.class generated by configure. What's the output of java findhome in that case ? No luck, it's not working. And what's findhome.class supposed to be? A file in the directory? Not there, I'm afraid :-( Anyways, I now have some more clues to start digging harder :-) SOLAR_JAVA is TRUE ... anth...@ashdown ~/gitstuff/lotest $ whereis javac javac: /usr/bin/javac /opt/icedtea6-bin-1.9.1/bin/javac anth...@ashdown ~/gitstuff/lotest $ I'll see what I can come up with, if anyone else can dig too :-) $JDK = sun, so of course there's no findhome.class, it's bounded by if $JDK = gcj I've got as far as $JAVA_HOME = /usr, which it doesn't like, so I'm now debugging the sanity check, because I'm guessing this wipes JAVA_HOME without finding it where it really should ... Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Java build problem identified?
On Sun, 2010-12-05 at 14:28 +, Wols Lists wrote: No luck, it's not working. And what's findhome.class supposed to be? A file in the directory? Not there, I'm afraid :-( Look into the configure.in itself, and search for findhome. Looks like that all the other (incredibly dodgy) hackery to set JAVA_HOME disables dumping out that piece of java code which (IMO) is likely the best approach to finding JAVA_HOME automatically. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Java build problem identified?
On 05/12/10 16:08, Caolán McNamara wrote: On Sun, 2010-12-05 at 14:28 +, Wols Lists wrote: No luck, it's not working. And what's findhome.class supposed to be? A file in the directory? Not there, I'm afraid :-( Look into the configure.in itself, and search for findhome. Looks like that all the other (incredibly dodgy) hackery to set JAVA_HOME disables dumping out that piece of java code which (IMO) is likely the best approach to finding JAVA_HOME automatically. I've found out what's blowing up ... elif readlink $JAVACOMPILER /dev/null 2/dev/null; then # maybe only one level of symlink (e.g. on Mac) JAVA_HOME=$(readlink $JAVACOMPILER) else $JAVACOMPILER is set to /usr/bin/javac (which is as expected ...) BUT on gentoo, that's a symlink to run-java-tool. What's expected is a symlink to /opt/icedtea/bin/javac, I think :-) I'm still digging :-) Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Java build problem identified?
On 05/12/10 16:08, Caolán McNamara wrote: On Sun, 2010-12-05 at 14:28 +, Wols Lists wrote: No luck, it's not working. And what's findhome.class supposed to be? A file in the directory? Not there, I'm afraid :-( Look into the configure.in itself, and search for findhome. Looks like that all the other (incredibly dodgy) hackery to set JAVA_HOME disables dumping out that piece of java code which (IMO) is likely the best approach to finding JAVA_HOME automatically. Nope. That code is looking for $JDK=gcj. On my system $JDK=sun, so it never gets near it ... Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED] Re: [PATCH] Remove dead codes from sd
On Sun, 2010-12-05 at 22:43 +0900, Takeshi Abe wrote: Hi, Removing dead codes from sd. Looks good to me, pushed now. Thanks for this. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] libreoffice-3-3, problem building sw
Title: Szalai Kálmán Hi, DO you have idea what went wrong? Entering /home/kami/git/libreoffice-3-3/build/build/libreoffice-3.3.0.1/sw/uiconfig/layout Entering /home/kami/git/libreoffice-3-3/build/build/libreoffice-3.3.0.1/sw/util Making: libswli.so ../unxlngi6.pro/slo/cellfml.o: In function `lcl_ConvertWWFormula(String const)': cellfml.cxx:(.text+0x2b00): undefined reference to `ixion::formula_lexer::swap_tokens(boost::ptr_vectorixion::lexer_token_base, boost::heap_clone_allocator, _STL::allocatorvoid* )' cellfml.cxx:(.text+0x2b67): undefined reference to `ixion::formula_parser::formula_parser(boost::ptr_vectorixion::lexer_token_base, boost::heap_clone_allocator, _STL::allocatorvoid* const, boost::ptr_map_STL::basic_stringchar, _STL::char_traitschar, _STL::allocatorchar , ixion::base_cell, _STL::less_STL::basic_stringchar, _STL::char_traitschar, _STL::allocatorchar , boost::heap_clone_allocator, _STL::allocator_STL::pair_STL::basic_stringchar, _STL::char_traitschar, _STL::allocatorchar const, void* *, bool)' collect2: ld returned 1 exit status dmake: Error code 1, while making '../unxlngi6.pro/lib/libswli.so' Thank you in advance! -- Best regards, Kálmán „KAMI” Szalai | 神 | kami911 [at] gmail [dot] com My favorite projects: OxygenOffice Professional - office suite - for everybody | Magyarul - In Hungarian Blog | Support Follow me, if you can signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Java build problem identified?
On 05/12/10 16:54, Caolán McNamara wrote: On Sun, 2010-12-05 at 16:35 +, Wols Lists wrote: On 05/12/10 16:08, Caolán McNamara wrote: On Sun, 2010-12-05 at 14:28 +, Wols Lists wrote: No luck, it's not working. And what's findhome.class supposed to be? A file in the directory? Not there, I'm afraid :-( Look into the configure.in itself, and search for findhome. Looks like that all the other (incredibly dodgy) hackery to set JAVA_HOME disables dumping out that piece of java code which (IMO) is likely the best approach to finding JAVA_HOME automatically. Nope. That code is looking for $JDK=gcj. On my system $JDK=sun, so it never gets near it ... Yes. That's what I'm saying. It has always looked to me that all the other dodgy hackery to set JAVA_HOME is horribly fragile. AND IMO the right way is to try and run findhome which has some chance of giving the right result. Well, assuming that findhome gives the right results. So, humour me, and cut and paste the contents of findhome.java out of configure into something called findhome.java, run javac findhome and java findhome and what output does it give. i.e. does it give the same output as what you had to pass to --with-jdk-home manually Yup. findhome found the right place (or I assume it did). /opt/icedtea6-bin-1.9.1 The other thing I tried (which I presume is not guaranteed to work everywhere :-( is whereis, which found it fine, too. Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Release criteria
On 26/11/2010 Petr Mladek wrote: http://wiki.documentfoundation.org/Release_Criteria Feel free to update it or propose improvements. Especially, I am not sure about bugs in localizations. So a major change with respect to the OpenOffice.org release process would be that no explicit approval is needed for localized versions. This is probably related to the multi-language build model, where you don't want to wait for 20 or so explicit approvals in order to release the English version, but still distributing possibly untested software does not seem very good to me: I did see cases at OpenOffice.org where only one localized version would not start, or would have blocking issues. If you need very recent examples, in the OOo 3.3 release cycle at least two localization-specific stoppers were found and fixed upstream in OpenOffice.org and thus ported to LibreOffice too: http://qa.openoffice.org/issues/show_bug.cgi?id=115232 [IT only] http://qa.openoffice.org/issues/show_bug.cgi?id=115774 [FR only] Regards, Andrea Pescetti. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] List of Mirrors
Hi Rainer, *, On Sun, Dec 5, 2010 at 2:28 PM, Rainer Bielefeld libreoff...@bielefeldundbuss.de wrote: any volunteers to complete http://wiki.documentfoundation.org/Mirrors ? Does it make sense to have a manually maintained page when we're using mirrorbrain anyway? You can get a listing of mirrors that have the file by appending .mirrorlist to the URL http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc1/win/x86/BrOffice_3.3.0rc1_Win_x86_install_multi.exe.mirrorlist That will not list all mirrors, but only those somewhat in your region, but now even offers a map with the mirror locations.. So I wonder what the purpose of that list is. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] binfilter and features...
On 12/05/2010 12:39 PM, Caolán McNamara wrote: All true. It was just a note that it might be easier, if you have an interest in binfilter, to just take the conservative approach and silence warnings with e.g converting I was thinking of taking a 2 steps approach: first silent warning in a conservative way (this is also less risk to introduce bugs) and then to down-size the module just keeping the needed part. In my opinion, the needed part would be, for the next releases, just the read capability of (older?) binary format build in within LibO. But if the decision is to drop it anyway for the next release, does not bring a lot I did not found any inputs about it within mailing lists. Has the point been discussed somewhere? Is this to be handle by the steering committee? Is there a technical steering committee for this kind of decision, where we could propose / give reasons for thinking this or that? Currently, as said, I am doing conservative warning fixes, but to start something more intrusive, would like to have first a kind of direction decision. regards ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH 01/16] warning variable unused fix in binfilter bf_sw attr
Hi,
here some patches to suppress warnings within binfilter.
I took a - sometimes too - conservative approach for doing this. Hope I
did not harm this module
regards
From 3c2cd665fe8a344626265f6c8a2a3b195556441d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Sat, 4 Dec 2010 10:18:51 +0100
Subject: [PATCH 01/16] warning variable unused fix in binfilter bf_sw attr
---
binfilter/bf_sw/source/core/attr/sw_format.cxx |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/binfilter/bf_sw/source/core/attr/sw_format.cxx b/binfilter/bf_sw/source/core/attr/sw_format.cxx
index fdc874a..c424aa3 100644
--- a/binfilter/bf_sw/source/core/attr/sw_format.cxx
+++ b/binfilter/bf_sw/source/core/attr/sw_format.cxx
@@ -213,7 +213,6 @@ namespace binfilter {
/*N*/ void SwFmt::CopyAttrs( const SwFmt rFmt, BOOL bReplace )
/*N*/ {
/*N*/ // kopiere nur das Attribut-Delta Array
-/*N*/ register SwCharFmt* pDropCharFmt = 0;
/*N*/
/*N*/ if ( IsInCache() )
/*N*/ {
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH 02/16] warning fix unused variable in binfilter bf_sw bastyp
regards
From a03ec223cf70c17a1cd6bbf397dc954c8d9d13fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Sat, 4 Dec 2010 10:25:53 +0100
Subject: [PATCH 02/16] warning fix unused variable in binfilter bf_sw bastyp
---
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx|2 +-
binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index 7cee1dd..76e7026 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -454,7 +454,7 @@ static int
-/*N*/ String SwCalc::GetStrResult( double nValue, BOOL bRound )
+/*N*/ String SwCalc::GetStrResult( double nValue, BOOL /*bRound*/ )
/*N*/ {
/*N*/ if( nValue = DBL_MAX )
/*N*/ switch( eError )
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx b/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx
index 198f2a8..60965eb 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx
@@ -127,9 +127,9 @@ IMPL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos, 20, 20 )
/*N*/ }
-/*N*/ Locale CreateLocale( LanguageType eLanguage )
+/*N*/ Locale CreateLocale( LanguageType /*eLanguage*/ )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, STRIP); Locale temp; return temp;//STRIP001 String aLangStr, aCtryStr;
+/*?*/ DBG_BF_ASSERT(0, STRIP); Locale temp; return temp;
/*N*/ }
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH 03/16] fix warning unused var in binfilter bf_sw crsr
regards
From fe0b41fe4378e18478263caf8d09af1f3adafa28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Sat, 4 Dec 2010 11:12:21 +0100
Subject: [PATCH 03/16] fix warning unused var in binfilter bf_sw crsr
this is fixing warning, not optimizing. This means, some functions call
have be left, even if it is possible they are not needed any more
---
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 34 ++---
binfilter/bf_sw/source/core/crsr/sw_findattr.cxx | 16 ++
binfilter/bf_sw/source/core/crsr/sw_findcoll.cxx | 17 +++
binfilter/bf_sw/source/core/crsr/sw_findtxt.cxx | 23 ---
binfilter/bf_sw/source/core/crsr/sw_pam.cxx | 19 +---
binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx | 32 ++--
binfilter/bf_sw/source/core/crsr/sw_trvlreg.cxx | 16 +-
binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx | 14
binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx | 19 +---
9 files changed, 65 insertions(+), 125 deletions(-)
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 17da949..dd19e9b 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -117,11 +117,11 @@ using namespace ::com::sun::star::util;
// gebe den aktuellen zurueck
-/*N*/ SwPaM* SwCrsrShell::GetCrsr( bool bMakeTblCrsr ) const
+/*N*/ SwPaM* SwCrsrShell::GetCrsr( bool /*bMakeTblCrsr*/ ) const
/*N*/ {
/*N*/ if( pTblCrsr )
/*N*/ {
-DBG_BF_ASSERT(0, STRIP); //STRIP001 /*?*/ if( bMakeTblCrsr pTblCrsr-IsCrsrMovedUpdt() )
+DBG_BF_ASSERT(0, STRIP);
/*N*/ }
/*N*/ return pCurCrsr;
/*N*/ }
@@ -148,19 +148,7 @@ DBG_BF_ASSERT(0, STRIP); //STRIP001 /*?*/ if( bMakeTblCrsr pTblCrsr-IsC
/*N*/ void SwCrsrShell::EndAction( const BOOL bIdleEnd )
/*N*/ {
-/*
-//OS: Wird z.B. eine Basic-Action im Hintergrund ausgefuehrt, geht es so nicht
-if( !bHasFocus )
-{
-// hat die Shell nicht den Focus, dann nur das EndAction an
-// die ViewShell weitergeben.
-ViewShell::EndAction( bIdleEnd );
-return;
-}
-*/
-
/*N*/ bool bVis = bSVCrsrVis;
-
// Idle-Formatierung ?
/*N*/ if( bIdleEnd Imp()-GetRegion() )
/*N*/ {
@@ -209,7 +197,7 @@ DBG_BF_ASSERT(0, STRIP); //STRIP001 /*?*/ if( bMakeTblCrsr pTblCrsr-IsC
/*?*/ //der Cursor geupdatet werden; um z.B. den
/*?*/ //TabellenCursor zu erzeugen. Im UpdateCrsr wird
/*?*/ //das jetzt beruecksichtigt!
-DBG_BF_ASSERT(0, STRIP); //STRIP001 /*?*/ UpdateCrsr( SwCrsrShell::CHKRANGE, bIdleEnd );
+DBG_BF_ASSERT(0, STRIP);
/*N*/ }
/*N*/ return;
/*N*/ }
@@ -294,7 +282,6 @@ DBG_BF_ASSERT(0, STRIP); //STRIP001 /*?*/ UpdateCrsr( SwCrsrShell::CHKRANG
/*M*/
/*M*/ // erfrage den Count fuer die Start-/End-Actions und ob die Shell
/*M*/ // ueberhaupt den Focus hat
-/*M*/ // if( ActionPend() /*|| !bHasFocus*/ )
/*M*/ //JP 12.01.98: Bug #46496# - es muss innerhalb einer BasicAction der
/*M*/ //Cursor geupdatet werden; um z.B. den TabellenCursor zu
/*M*/ //erzeugen. Im EndAction wird jetzt das UpdateCrsr gerufen!
@@ -324,8 +311,7 @@ DBG_BF_ASSERT(0, STRIP); //STRIP001 /*?*/ UpdateCrsr( SwCrsrShell::CHKRANG
/*M*/ pDoc-IsIdxInTbl( pTstCrsr-GetPoint()-nNode )
/*M*/ ( pTblCrsr ||
/*M*/ pTstCrsr-GetNode( TRUE )-FindStartNode() !=
-/*M*/ pTstCrsr-GetNode( FALSE )-FindStartNode() ))
-/*M*/ /*|| ( !pTblCrsr lcl_IsInValueBox( *pTstCrsr, *this ) )*/ )
+/*M*/ pTstCrsr-GetNode( FALSE )-FindStartNode() )) )
/*M*/ {DBG_BF_ASSERT(0, STRIP); //STRIP001
/*M*/ }
/*M*/
@@ -557,12 +543,8 @@ DBG_BF_ASSERT(0, STRIP); //STRIP001 /*?*/ UpdateCrsr( SwCrsrShell::CHKRANG
/*M*/ pVisCrsr-Show(); // wieder anzeigen
/*M*/ }
-
-
// erzeuge eine Kopie vom Cursor und speicher diese im Stack
-
-
/*
* Loescht einen Cursor (gesteuert durch bOldCrsr)
* - vom Stack oder( bOldCrsr = TRUE )
@@ -572,18 +554,12 @@ DBG_BF_ASSERT(0, STRIP); //STRIP001 /*?*/ UpdateCrsr( SwCrsrShell::CHKRANG
*/
-
/*
* Verbinde zwei Cursor miteinander.
* Loesche vom Stack den obersten und setzen dessen GetMark im Aktuellen.
*/
-
-
-
-
-
/*N*/ void SwCrsrShell::ShowCrsrs( BOOL bCrsrVis )
/*N*/ {
/*N*/ if( !bHasFocus || bAllProtect || bBasicHideCrsr )
@@ -797,8 +773,6 @@ DBG_BF_ASSERT(0, STRIP); //STRIP001 /*?*/ UpdateCrsr( SwCrsrShell::CHKRANG
#if defined(DBG_UTIL) || defined(WIN)
-
-
/*N*/ SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTblCrsr ) const
/*N*/ {
/*N*/ return (SwCursor*)GetCrsr( bMakeTblCrsr );
diff --git a/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx b/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
index 03d2972..24d7af4 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
@@ -53,16
[Libreoffice] [PATCH 05/16] warning fix unused var in binfilter bf_sw docnode
regards
From dafaabb2c38990bf4141c6074e15f0ca35d7e160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Sat, 4 Dec 2010 15:19:44 +0100
Subject: [PATCH 05/16] warning fix unused var in binfilter bf_sw docnode
only warning removal, not code optimization, hence some function calls that
may not be needed anymore left behind.
---
binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx |5 ++---
binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx |1 -
binfilter/bf_sw/source/core/docnode/sw_node.cxx|2 +-
binfilter/bf_sw/source/core/docnode/sw_section.cxx |4 ++--
.../bf_sw/source/core/docnode/sw_swbaslnk.cxx |2 +-
5 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
index 9612c0d..441f3ca 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
@@ -437,7 +437,7 @@ namespace binfilter {
/*N*/ SwSection* pSection = pFmt-GetSection();
/*N*/ /// OD 04.10.2002 #102894#
/*N*/ /// remember hidden condition flag of SwSection before changes
-/*N*/ bool bOldCondHidden = pSection-IsCondHidden() ? true : false;
+/*N*/ pSection-IsCondHidden() ? true : false;
/*N*/
/*N*/ if( *pSection == rSect )
/*N*/ {
@@ -649,7 +649,6 @@ namespace binfilter {
/*N*/ else
/*?*/ new SwTxtNode( aInsPos, (SwTxtFmtColl*)GetDoc()-GetDfltTxtFmtColl() );
/*N*/ }
-/*N*/ SwEndNode* pEndNd = new SwEndNode( aInsPos, *pSectNd );
/*N*/
/*N*/ pSectNd-GetSection() = rSection;
/*N*/ SwSectionFmt* pSectFmt = pSectNd-GetSection().GetFmt();
@@ -778,7 +777,7 @@ namespace binfilter {
/*N*/ pLast = aIter++;
/*N*/ }
/*N*/ }
-/*N*/ SwDoc* pDoc = GetDoc();
+/*N*/ GetDoc();
/*N*/
/*N*/ SwSectionFmt* pFmt = pSection-GetFmt();
/*N*/ if( pFmt )
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
index 62293df..4a0616b 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
@@ -227,7 +227,6 @@ static bool lcl_IsItemSet(const SwCntntNode rNode, USHORT which)
SwStartNode* pSttNd = new SwStartNode( aEndIdx, ND_STARTNODE,
SwTableBoxStartNode );
pSttNd-pStartOfSection = pTblNd;
-SwEndNode* pEndNd = new SwEndNode( aEndIdx, *pSttNd );
pPrvBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
diff --git a/binfilter/bf_sw/source/core/docnode/sw_node.cxx b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
index b25a262..531f27a 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_node.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
@@ -1144,7 +1144,7 @@ using namespace ::com::sun::star::i18n;
// in pIdx kann die 2. Position returnt werden.
/*N*/ int SwCntntNode::CanJoinPrev( SwNodeIndex* pIdx ) const
/*N*/ {
-/*N*/ const SwNodes rNds = GetNodes();
+/*N*/ GetNodes();
/*N*/ BYTE nNdType = GetNodeType();
/*N*/ SwNodeIndex aIdx( *this, -1 );
/*N*/
diff --git a/binfilter/bf_sw/source/core/docnode/sw_section.cxx b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
index 30052bf..26b8d11 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_section.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
@@ -115,7 +115,7 @@ namespace binfilter {
/*N*/ SwSectionPtr pParentSect = GetParent();
/*N*/ if( pParentSect )
/*N*/ {
-/*N*/ bool bPHFlag = pParentSect-IsHiddenFlag();
+/*N*/ pParentSect-IsHiddenFlag();
/*N*/ if( pParentSect-IsHiddenFlag() )
/*?*/ SetHidden( TRUE );
/*N*/
@@ -1132,7 +1132,7 @@ void SwSectionFmt::MakeFrms()
-/*N*/ BOOL SwIntrnlSectRefLink::IsInRange( ULONG nSttNd, ULONG nEndNd, xub_StrLen nStt, xub_StrLen /*nEnd */) const
+/*N*/ BOOL SwIntrnlSectRefLink::IsInRange( ULONG nSttNd, ULONG nEndNd, xub_StrLen /*nStt*/, xub_StrLen /*nEnd */) const
/*N*/ {
/*N*/ SwStartNode* pSttNd = rSectFmt.GetSectionNode( FALSE );
/*N*/ return pSttNd
diff --git a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
index 920f809..75f098d 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
@@ -368,7 +368,7 @@ namespace binfilter {
/*?*/ 0 != (pANd = pDoc-GetNodes()[pAPos-nNode])
/*?*/ 0 != (pTblNd = pANd-FindTableNode()) )
/*?*/ {
-/*?*/ BOOL bLastGrf = !pTblNd-GetTable().DecGrfsThatResize();
+/*?*/ pTblNd-GetTable().DecGrfsThatResize();
/*?*/ SwHTMLTableLayout *pLayout =
/*?*/ pTblNd-GetTable().GetHTMLTableLayout();
/*?*/ if( pLayout )
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH 06/16] warning fix unused var in binfilter bf_sw draw
regards
From eac219396edebdf58deba912b02edac9a7999554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Sat, 4 Dec 2010 15:30:11 +0100
Subject: [PATCH 06/16] warning fix unused var in binfilter bf_sw draw
---
binfilter/bf_sw/source/core/draw/sw_dcontact.cxx | 75 +++---
1 files changed, 9 insertions(+), 66 deletions(-)
diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index 67d2f4a..18b3149 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -221,7 +221,7 @@ namespace binfilter {
|*
|*/
-/*N*/ SwFlyDrawContact::SwFlyDrawContact( SwFlyFrmFmt *pToRegisterIn, SdrModel *pMod ) :
+/*N*/ SwFlyDrawContact::SwFlyDrawContact( SwFlyFrmFmt *pToRegisterIn, SdrModel* /*pMod*/ ) :
/*N*/ SwContact( pToRegisterIn )
/*N*/ {
/*N*/ SetMaster( new SwFlyDrawObj() );
@@ -266,7 +266,7 @@ namespace binfilter {
|*
|*/
-/*N*/ void SwFlyDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
+/*N*/ void SwFlyDrawContact::Modify( SfxPoolItem* /*pOld*/, SfxPoolItem* /*pNew*/ )
/*N*/ {
/*N*/ }
@@ -628,7 +628,7 @@ namespace binfilter {
|*
|*/
-/*N*/ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
+/*N*/ void SwDrawContact::Modify( SfxPoolItem* /*pOld*/, SfxPoolItem* pNew )
/*N*/ {
/*N*/ //Es kommen immer Sets herein.
/*N*/ //MA 03. Dec. 95: Falsch es kommen nicht immer Sets herein
@@ -984,63 +984,6 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
}
}
break;
-/*
-case FLY_AT_FLY:
-{
-if( pAnch-GetCntntAnchor() ) // LAYER_IMPL
-{
-SwFrm *pAnchor = 0;
-//Erst einmal ueber den Inhalt suchen, weil konstant schnell. Kann
-//Bei verketteten Rahmen aber auch schief gehen, weil dann evtl.
-//niemals ein Frame zu dem Inhalt existiert. Dann muss leider noch
-//die Suche vom StartNode zum FrameFormat sein.
-SwNodeIndex aIdx( pAnch-GetCntntAnchor()-nNode );
-SwCntntNode *pCNd = pFmt-GetDoc()-GetNodes().GoNext( aIdx );
-if ( pCNd 0 != (pAnchor = pCNd-GetFrm( 0, 0, FALSE ) ) )
-pAnchor = pAnchor-FindFlyFrm();
-else
-{
-const SwNodeIndex rIdx = pAnch-GetCntntAnchor()-nNode;
-SwSpzFrmFmts rFmts = *pFmt-GetDoc()-GetSpzFrmFmts();
-for( USHORT i = 0; i rFmts.Count(); ++i )
-{
-SwFrmFmt *pFmt = rFmts[i];
-SwFlyFrmFmt* pFlyFmt;
-if( 0 != (pFlyFmt = PTR_CAST( SwFlyFrmFmt, pFmt ))
-pFlyFmt-GetCntnt().GetCntntIdx() //#57390#, Reader
-rIdx == *pFlyFmt-GetCntnt().GetCntntIdx() )
-{
-pAnchor = pFlyFmt-GetFrm( 0, FALSE );
-break;
-}
-}
-}
-if ( pAnchor ) //Kann sein, dass der Anker noch nicht existiert
-{
-pAnchor-FindFlyFrm()-AppendDrawObj( this );
-bSetAnchorPos = false;
-}
-}
-}
-break;
-*/
-/*
-case FLY_IN_CNTNT:
-{
-ClrContourCache( GetMaster() );
-SwCntntNode *pNode = GetFmt()-GetDoc()-
-GetNodes()[pAnch-GetCntntAnchor()-nNode]-GetCntntNode();
-SwCntntFrm *pCntnt = pNode-GetFrm( 0, 0, FALSE );
-if ( pCntnt )
-{
-//Kann sein, dass der Anker noch nicht existiert
-pCntnt-AppendDrawObj( this );
-pCntnt-InvalidatePrt();
-}
-bSetAnchorPos = false;
-}
-break;
-*/
#ifdef DBG_UTIL
default: ASSERT( FALSE, Unknown Anchor. );
#endif
@@ -1195,7 +1138,7 @@ const Point SwDrawVirtObj::GetOffset() const
return maOffset;
}
-void SwDrawVirtObj::operator=( const SdrObject rObj )
+void SwDrawVirtObj::operator=( const SdrObject /*rObj*/ )
{
DBG_BF_ASSERT(0, STRIP);//STRIP001
}
@@ -1334,7 +1277,7 @@ void SwDrawVirtObj::RecalcBoundRect()
bool SwDrawVirtObj::Paint(ExtOutputDevice rOut, const SdrPaintInfoRec rInfoRec) const
{
-bool bRet;
+bool bRet = FALSE;
Point
[Libreoffice] [PATCH 07/16] fix warning unused var in binfilter bf_sw fields
regards
From 0049d6aa3dd25887c742b51a764776103e67daf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Sat, 4 Dec 2010 15:44:52 +0100
Subject: [PATCH 07/16] fix warning unused var in binfilter bf_sw fields
still only fixes, no optimization has been done. On purpose, avoid
introducing new bugs...
---
binfilter/bf_sw/source/core/fields/sw_authfld.cxx |2 +-
binfilter/bf_sw/source/core/fields/sw_dbfld.cxx |2 +-
binfilter/bf_sw/source/core/fields/sw_docufld.cxx |4 ++--
binfilter/bf_sw/source/core/fields/sw_fldbas.cxx |6 +++---
binfilter/bf_sw/source/core/fields/sw_usrfld.cxx |2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/binfilter/bf_sw/source/core/fields/sw_authfld.cxx b/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
index 4a1bf01..289ca69 100644
--- a/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
@@ -402,7 +402,7 @@ USHORT SwAuthorityFieldType::GetSequencePos(long nHandle)
//body the directly available text node will be used
if(!pTxtNode)
pTxtNode = rFldTxtNode;
-ULONG nPos = pTxtNode-GetIndex();
+pTxtNode-GetIndex();
if( pTxtNode-GetTxt().Len() pTxtNode-GetFrm()
pTxtNode-GetNodes().IsDocNodes() )
{
diff --git a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
index 435500c..62950a9 100644
--- a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
@@ -573,7 +573,7 @@ BOOL SwDBNameInfField::PutValue( const ::com::sun::star::uno::Any rAny, BYTE nM
/*N*/ SwDBNextSetField::SwDBNextSetField(SwDBNextSetFieldType* pTyp,
/*N*/ const String rCond,
-/*N*/ const String rDummy,
+/*N*/ const String /*rDummy*/ ,
/*N*/ const SwDBData rDBData) :
/*N*/ SwDBNameInfField(pTyp, rDBData), aCond(rCond), bCondValid(TRUE)
/*N*/ {}
diff --git a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
index 0318cae..e2f0090 100644
--- a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
@@ -1254,7 +1254,7 @@ BOOL SwDocInfoField::PutValue( const uno::Any rAny, BYTE nMId )
/*N*/
/*N*/ if( TYP_CONDTXTFLD == nSubType )
/*N*/ {
-/*N*/ SwNewDBMgr* pMgr = pDoc-GetNewDBMgr();
+/*N*/ pDoc-GetNewDBMgr();
/*N*/
/*N*/ bValid = sal_False;
/*N*/ String sTmpName;
@@ -1686,7 +1686,7 @@ BOOL SwPostItField::PutValue( const uno::Any rAny, BYTE nMId )
/* ---
---*/
-/*N*/ String SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 nFormat) const
+/*N*/ String SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 /*nFormat*/) const
/*N*/ {
/*N*/ SvxAddressItem aAdr;
/*N*/ String aRet( aEmptyStr );
diff --git a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
index 5bc383c..96fda38 100644
--- a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
@@ -203,10 +203,10 @@ using namespace ::com::sun::star;
/*N*/ return GetPar2();
/*N*/ }
-void SwField::SetPar1(const String rStr)
+void SwField::SetPar1(const String /*rStr*/)
{}
-void SwField::SetPar2(const String rStr)
+void SwField::SetPar2(const String /*rStr*/)
{}
/*N*/ USHORT SwField::GetSubType() const
@@ -215,7 +215,7 @@ void SwField::SetPar2(const String rStr)
/*N*/ return 0;
/*N*/ }
-void SwField::SetSubType(USHORT nType)
+void SwField::SetSubType(USHORT /*nType*/)
{
// ASSERT(0, Sorry Not implemented);
}
diff --git a/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx b/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
index f7862a8..8198a19 100644
--- a/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
@@ -298,7 +298,7 @@ void SwUserField::SetPar2(const String rStr)
/*N*/ if( GetDoc()-GetDrawModel() GetDepends() )
/*?*/ {DBG_BF_ASSERT(0, STRIP); }//STRIP001 ((SwDPage*)GetDoc()-GetDrawModel()-GetPage( 0 ))-
/*N*/
-/*N*/ sal_Bool bModified = GetDoc()-IsModified();
+/*N*/ GetDoc()-IsModified();
/*N*/ GetDoc()-SetModified();
/*N*/ }
/*N*/ }
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH 10/16] fix warning unused var in binfilter bf_sw sw3io
regards
From 18b052aa37f4adb95f3250de4967b739bd14be11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Sat, 4 Dec 2010 20:07:52 +0100
Subject: [PATCH 10/16] fix warning unused var in binfilter bf_sw sw3io
---
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx |2 +-
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx |3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index e014201..fb043ad 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -2303,7 +2303,7 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp rIo )
ASSERT( !rIo.IsSw31Export(),
Wer will denn da ein Script-Feld exportieren );
-BYTE cFlags = ((SwScriptField*)pFld)-IsCodeURL() ? 0x01 : 0x00;
+((SwScriptField*)pFld)-IsCodeURL() ? 0x01 : 0x00;
String aCode;
if( ((SwScriptField*)pFld)-IsCodeURL() )
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 0bed171..d1cb2dc 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -424,7 +424,7 @@ public:
/*N*/ {
/*N*/ if( pDoc-GetDrawModel() )
/*N*/ {
-/*N*/ SdrPage *pPage = pDoc-GetDrawModel()-GetPage( 0 );
+/*N*/ pDoc-GetDrawModel()-GetPage( 0 );
/*N*/ SwHiddenDrawObjList_Impl::const_iterator aIter = pHiddenDrawObjs-begin();
/*N*/ while( aIter != pHiddenDrawObjs-end() )
/*N*/ {
@@ -1747,7 +1747,6 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ // Autoformate in dieser Liste muessen mit einer
/*N*/ // Extension versehen werden!
/*N*/ sal_uInt16 nFmtId = 0;
-/*N*/ const String rName = rFmt.GetName();
/*N*/ // TODO: unicode: correct?
/*N*/ if( rFmt.IsAuto() ) // Autoformat
/*N*/ nFmtId = Count()+1; //++nId;
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH 11/16] fix warning unused var in binfilter bf_sw swg
regards
From c8861cfc5de23428356c1a5cf6aaed6d2a0eced3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Sat, 4 Dec 2010 20:13:44 +0100
Subject: [PATCH 11/16] fix warning unused var in binfilter bf_sw swg
---
binfilter/bf_sw/source/core/swg/sw_rdflds.cxx |2 +-
binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx b/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx
index 4db68bb..fc13bd3 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx
@@ -541,7 +541,7 @@ static SwField* In_SwDocInfoField( SwSwgReader rPar, SwDocInfoFieldType* pType,
return new SwDocInfoField( pType, (USHORT)nType | nSubType );
}
-static SwField* In_SwTemplNameField( SwSwgReader rPar, SwTemplNameFieldType* pType )
+static SwField* In_SwTemplNameField( SwSwgReader /*rPar*/, SwTemplNameFieldType* pType )
{
return new SwTemplNameField( pType, nNewFldFmt );
}
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx b/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx
index e3650e6..27f4857 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx
@@ -340,7 +340,7 @@ static USHORT InSWG_SwNoHyphenHere
}
static USHORT InSWG_SwSoftHyphen
-( SwSwgReader rPar, SfxItemSet* pSet, SwTxtNode* pNd, xub_StrLen nBgn, xub_StrLen nEnd )
+( SwSwgReader /*rPar*/, SfxItemSet* pSet, SwTxtNode* pNd, xub_StrLen nBgn, xub_StrLen /*nEnd*/ )
{
if( !pSet )
pNd-Insert( CHAR_SOFTHYPHEN, SwIndex( pNd, nBgn ));
@@ -348,7 +348,7 @@ static USHORT InSWG_SwSoftHyphen
}
static USHORT InSWG_SwHardBlank
-( SwSwgReader rPar, SfxItemSet* pSet, SwTxtNode* pNd, xub_StrLen nBgn, xub_StrLen nEnd )
+( SwSwgReader /*rPar*/, SfxItemSet* pSet, SwTxtNode* pNd, xub_StrLen nBgn, xub_StrLen /*nEnd*/ )
{
if( !pSet )
pNd-Insert( CHAR_HARDBLANK, SwIndex( pNd, nBgn ));
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH 12/16] fix warning unused var binfilter bf_sw text
regards
From 22f6a25fcbba5eb41b73436f36a9542b2f898ef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Sat, 4 Dec 2010 20:38:53 +0100
Subject: [PATCH 12/16] fix warning unused var binfilter bf_sw text
---
binfilter/bf_sw/source/core/text/sw_atrstck.cxx |5 ++---
binfilter/bf_sw/source/core/text/sw_frmform.cxx |6 +-
binfilter/bf_sw/source/core/text/sw_itrform2.cxx |4 ++--
binfilter/bf_sw/source/core/text/sw_itrtxt.cxx |4
binfilter/bf_sw/source/core/text/sw_porexp.cxx |2 +-
binfilter/bf_sw/source/core/text/sw_porfld.cxx |5 ++---
binfilter/bf_sw/source/core/text/sw_porlin.cxx |6 +++---
binfilter/bf_sw/source/core/text/sw_porrst.cxx |6 +++---
binfilter/bf_sw/source/core/text/sw_portxt.cxx |2 +-
binfilter/bf_sw/source/core/text/sw_txtfld.cxx |2 +-
binfilter/bf_sw/source/core/text/sw_txtfly.cxx |2 +-
binfilter/bf_sw/source/core/text/sw_txtftn.cxx | 15 +++
binfilter/bf_sw/source/core/text/sw_txthyph.cxx |2 +-
13 files changed, 25 insertions(+), 36 deletions(-)
diff --git a/binfilter/bf_sw/source/core/text/sw_atrstck.cxx b/binfilter/bf_sw/source/core/text/sw_atrstck.cxx
index 91eeaec..4c678ac 100644
--- a/binfilter/bf_sw/source/core/text/sw_atrstck.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_atrstck.cxx
@@ -376,7 +376,7 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = {
* SwAttrHandler::Push()
*/
-/*M*/ sal_Bool SwAttrHandler::Push( const SwTxtAttr rAttr, const SfxPoolItem rItem, SwFont rFnt )
+/*M*/ sal_Bool SwAttrHandler::Push( const SwTxtAttr rAttr, const SfxPoolItem rItem, SwFont /*rFnt*/ )
/*M*/ {
/*M*/ ASSERT( rItem.Which() RES_TXTATR_WITHEND_END ||
/*M*/ RES_UNKNOWNATR_CONTAINER == rItem.Which() ,
@@ -692,12 +692,11 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = {
/*M*/ break;
/*M*/
/*M*/ USHORT nRotateStack = StackPos[ RES_CHRATR_ROTATE ];
-/*M*/ const SfxPoolItem* pRotateItem = 0;
/*M*/ const SwTxtAttr* pRotateAttr = aAttrStack[ nRotateStack ].Top();
/*M*/
/*M*/ if ( pRotateAttr )
/*M*/ {
-/*?*/DBG_BF_ASSERT(0, STRIP); //STRIP001 pRotateItem = lcl_GetItem( *pRotateAttr, RES_CHRATR_ROTATE );
+/*?*/DBG_BF_ASSERT(0, STRIP);
/*M*/ }
/*M*/ else
/*M*/ rFnt.SetVertical(
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index a373014..afa7067 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -606,8 +606,6 @@ MSHORT FormatLevel::nLevel = 0;
/*?*/ const SwpHints *pHints = pFoll-GetTxtNode()-GetpSwpHints();
/*?*/ if( pHints )
/*?*/ {
-/*?*/ SwFtnBossFrm *pFtnBoss = 0;
-/*?*/ SwFtnBossFrm *pEndBoss = 0;
/*?*/ for( MSHORT i = 0; i pHints-Count(); ++i )
/*?*/ {
/*?*/ const SwTxtAttr *pHt = (*pHints)[i];
@@ -662,8 +660,6 @@ MSHORT FormatLevel::nLevel = 0;
/*?*/ const SwpHints *pHints = GetTxtNode()-GetpSwpHints();
/*?*/ if( pHints )
/*?*/ {
-/*?*/ SwFtnBossFrm *pFtnBoss = 0;
-/*?*/ SwFtnBossFrm *pEndBoss = 0;
/*?*/ for( MSHORT i = 0; i pHints-Count(); ++i )
/*?*/ {
/*?*/ const SwTxtAttr *pHt = (*pHints)[i];
@@ -991,7 +987,7 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ { // Wenn wir Zeilen abgeben, darf kein Join auf den Folows gerufen werden,
/*N*/ // im Gegenteil, es muss ggf. sogar ein Follow erzeugt werden.
/*N*/ // Dies muss auch geschehen, wenn die Textmasse komplett im Master
-/*N*/ // bleibt, denn es könnte ja ein harter Zeilenumbruch noch eine weitere
+/*N*/ // bleibt, denn es k�nnte ja ein harter Zeilenumbruch noch eine weitere
/*N*/ // Zeile (ohne Textmassse) notwendig machen!
/*N*/ nEnd = rLine.GetEnd();
/*N*/ if( GetFollow() )
diff --git a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
index 2a974cc..9465c2e 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
@@ -1445,7 +1445,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion rPor, const SwFont rFnt
/*M*/ xub_StrLen nNewStart = nStart + pCurr-GetLen();
/*M*/
/*M*/ // adjust text if kana compression is enabled
-/*M*/ const SwScriptInfo rSI = GetInfo().GetParaPortion()-GetScriptInfo();
+/*M*/ GetInfo().GetParaPortion()-GetScriptInfo();
/*M*/
/*M*/ if ( GetInfo().CompressLine() )
/*M*/ {
@@ -1535,7 +1535,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion rPor, const SwFont rFnt
/*N*/
/*N*/ // Das Dummyflag besitzen Zeilen, die nur Flyportions enthalten, diese
/*N*/ // sollten kein Register etc. beachten.
[Libreoffice] [PATCH 15/16] fix warning unused var in binfilter - bf_sw unocore
regards
From 151194c8a68754f9521bd485a9124f6e08f36239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Sat, 4 Dec 2010 21:58:35 +0100
Subject: [PATCH 15/16] fix warning unused var in binfilter - bf_sw unocore
trying to stay on the safe side, means not always removing the function
call that initialized the parameter. So if this function call changed the
parameter, no issue.
---
.../bf_sw/source/core/unocore/sw_unocrsrhelper.cxx |2 --
binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx |3 ---
.../bf_sw/source/core/unocore/sw_unoframe.cxx |6 ++
binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx |1 -
binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx |7 +++
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx |2 +-
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx |1 -
.../bf_sw/source/core/unocore/sw_unoparagraph.cxx |4 ++--
binfilter/bf_sw/source/core/unocore/sw_unoport.cxx |2 +-
.../bf_sw/source/core/unocore/sw_unoportenum.cxx |5 ++---
binfilter/bf_sw/source/core/unocore/sw_unosect.cxx |3 ---
binfilter/bf_sw/source/core/unocore/sw_unosett.cxx |4 +---
.../bf_sw/source/core/unocore/sw_unostyle.cxx | 10 --
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 11 ---
14 files changed, 20 insertions(+), 41 deletions(-)
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx b/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx
index 2f431f2..2969570 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx
@@ -295,7 +295,6 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertyMap* pMap
{
const SwTableNode* pTblNode = pSttNode-FindTableNode();
SwFrmFmt* pTableFmt = (SwFrmFmt*)pTblNode-GetTable().GetFrmFmt();
-SwTable rTable = ((SwTableNode*)pSttNode)-GetTable();
if(FN_UNO_TEXT_TABLE == pMap-nWID)
{
Reference XTextTable xTable = SwXTextTables::GetObject(*pTableFmt);
@@ -402,7 +401,6 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertyMap* pMap
nPaMEnd = nTmp;
}
Sequence ::rtl::OUString aCharStyles;
-USHORT nCharStylesFound = 0;
SwpHints* pHints = pTxtNode-GetpSwpHints();
for(USHORT nAttr = 0; nAttr pHints-GetStartCount(); nAttr++ )
{
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
index 37cb25e..48fcfa9 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
@@ -1541,7 +1541,6 @@ void SwXGroupShape::add( const Reference XShape xShape ) throw (RuntimeExcep
SwFrmFmt* pFmt = GetFrmFmt();
if(pSvxShape pFmt)
{
-sal_Bool bOk = FALSE;
ReferenceXShapes xShapes;
if( xShapeAgg.is() )
{
@@ -1594,7 +1593,6 @@ void SwXGroupShape::add( const Reference XShape xShape ) throw (RuntimeExcep
void SwXGroupShape::remove( const Reference XShape xShape ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
-sal_Bool bOk = FALSE;
ReferenceXShapes xShapes;
if( xShapeAgg.is() )
{
@@ -1610,7 +1608,6 @@ void SwXGroupShape::remove( const Reference XShape xShape ) throw (RuntimeEx
sal_Int32 SwXGroupShape::getCount(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
-sal_Int32 nRet = 0;
ReferenceXIndexAccess xAcc;
if( xShapeAgg.is() )
{
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
index 4d1fdbb..b8f2fc8 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
@@ -1570,7 +1570,7 @@ void SwXFrame::setPropertyToDefault( const OUString rPropertyName )
SwFrmFmt* pFmt = GetFrmFmt();
if(pFmt)
{
-const SwAttrSet rFmtSet = pFmt-GetAttrSet();
+pFmt-GetAttrSet();
const SfxItemPropertyMap* pCur = SfxItemPropertyMap::GetByName(_pMap, rPropertyName);
if (!pCur)
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( Unknown property: ) ) + rPropertyName, static_cast cppu::OWeakObject * ( this ) );
@@ -1910,7 +1910,6 @@ void SwXFrame::attachToRange(const uno::Reference XTextRange xTextRange)
SvInPlaceObjectRef xIPObj;
if( (*pCLSID) = aCLSID )
{
-sal_Bool bInternal = sal_True;
if( !aClassName.MakeId( aCLSID ) )
{
IllegalArgumentException aExcept;
@@ -2192,7 +2191,7 @@ uno::Reference XTextCursor SwXTextFrame::createTextCursor(void) throw( Runti
SwXTextCursor*
[Libreoffice] [PATCH 16/16] removing code due to endless loop
regards
From 6551d69a5fbc85f3af92cada84bf543a083d4453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Sat, 4 Dec 2010 22:05:10 +0100
Subject: [PATCH 16/16] removing code due to endless loop
these part of code have been removed. The While(true) loop
means either that the if statement is never taken, or that
the program hangs there. The second case is not safe, the first
case means that this code is not needed.
---
binfilter/bf_sw/source/core/txtnode/sw_thints.cxx | 23 -
1 files changed, 0 insertions(+), 23 deletions(-)
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
index 06b91e2..1ad 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
@@ -923,16 +923,6 @@ using namespace ::com::sun::star::i18n;
/*N*/
/*N*/ if( pNd == this )
/*N*/ {
-/*?*/ if( aThisSet.Count() )
-/*?*/ {
-/*?*/ SfxItemIter aIter( aThisSet );
-/*?*/ const SfxPoolItem* pItem = aIter.GetCurItem();
-/*?*/ while( TRUE )
-/*?*/ {
-DBG_BF_ASSERT(0, STRIP); //STRIP001 /*?*/ if( lcl_IsNewAttrInSet( *pSwpHints, *pItem, GetTxt().Len() ) )
-/*?*/ }
-/*?*/ }
-/*N*/
/*N*/ }
/*N*/ else
/*N*/ {
@@ -947,19 +937,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, STRIP); //STRIP001 SfxItemIter aIter( aThisSet );
/*N*/ }
-/*N*/
-/*N*/ if( aNdSet.Count() )
-/*N*/ {
-/*?*/ SfxItemIter aIter( aNdSet );
-/*?*/ const SfxPoolItem* pItem = aIter.GetCurItem();
-/*?*/ while( TRUE )
-/*?*/ {
-DBG_BF_ASSERT(0, STRIP); //STRIP001 /*?*/ if( lcl_IsNewAttrInSet( *pNd-pSwpHints, *pItem, pNd-GetTxt().Len() ) )
-/*?*/ }
-/*?*/
-/*?*/ SwFmtChg aTmp1( pNd-GetFmtColl() );
-/*?*/ pNd-SwModify::Modify( aTmp1, aTmp1 );
-/*N*/ }
/*N*/ }
/*N*/
/*N*/ if( pNd-pSwpHints-CanBeDeleted() )
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Java build problem identified | findhome | MacOSX location ?
On 05/12/10 20:40, Caolán McNamara wrote: On Sun, 2010-12-05 at 17:24 +, Wols Lists wrote: Yup. findhome found the right place (or I assume it did). /opt/icedtea6-bin-1.9.1 Yeah, so what I'd like to see is that findhome (or something like it) is the normal way to get the jdk home when one is not set via the --with-jdk-home. And if that fails for some reason then fall back to the get the path to java and cut bits off it and hope for the best route rather than trying that first. IIRC I tried this before, and there was some cockup under MacOSX, so if someone on MacOSX could see what findhome says and if its correct/wrong vs what works correctly there, that'd be helpful. HMMM!!! It's the MacOS test that's messing up gentoo ...! So what someone (me? you?) might do is just put the findhome test in regardless, or put it at the start with a wrapper if OS != mac. ( I'd actually rather it tried whereis first, but I don't think that's always there, and my sed-awk-whatsit-fu isn't up to that... anth...@ashdown ~/gitstuff/lotest $ whereis javac javac: /usr/bin/javac /opt/icedtea6-bin-1.9.1/bin/javac anth...@ashdown ~/gitstuff/lotest $ It seems so simple - take the last entry and strip the last two bits off - bet there's a snag ... ) Let's wait til tomorrow night to see if anyone on a mac bites, and if they don't we can try and do this and get it in the build. Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Patch for i115495: import problem with centered rtl tables from word
Hi, Can any one look at the small patch attached to http://www.openoffice.org/issues/show_bug.cgi?id=115495 It would be nice to have this fixed in LibO 3.3, as this annoys a lot of users of the the RTL languages. Thanks Kaplan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Pushed 01-16] [PATCH 01/16] warning variable unused fix in binfilter bf_sw attr
2010/12/5 Pierre-André Jacquod pjacq...@alumni.ethz.ch: Hi, here some patches to suppress warnings within binfilter. I took a - sometimes too - conservative approach for doing this. Hope I did not harm this module regards Thnaks, I pushed the whole series... Norbert ___ 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] de-emphasisig java ... - summary so far ...
On 03/12/2010 Michael Meeks wrote: We cannot bundle the JRE (as Oracle do) Wouldn't it be possible to bundle a free Java implementation? I haven't followed the status of the ongoing efforts toward a free Java recently, but if it is stable enough and cross-platform (I heard a Mac OS X version started to be developed last month) it could be considered. and if the user goes to download it, they have OpenOffice.org advertised to them. And this should be no problem. LibreOffice should not be afraid of an OpenOffice.org banner. And anyway most of the early adopters will likely already know, and in many cases use, OpenOffice.org. Regards, Andrea. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] new bootstrap: quick stop
On Sun, Dec 5, 2010 at 7:03 PM, Thomas Klausner w...@netbsd.org wrote: I found the simplest fix for it: diff --git a/Makefile.in b/Makefile.in index 9e05c70..4fbbf4a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ # @configure_input@ # FIXME: create 'install' and 'check' target -SHELL=/bin/sh +SHELL=/bin/bash all: dmake/dm...@exeext@ fetch �...@. ./*[Ee]nv.[Ss]et.sh \ Seems the problems are caused by some difference between /bin/sh (NetBSD's /bin/sh) and bash. Ok to push? (Or is SHELL=env bash or something like this preferred?) /usr/bin/env bash that is what we use for shebang Thomas ___ 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] de-emphasisig java ... - summary so far ...
Christian Lohmaier wrote: But it is more than clear that those users will then get the This function requires a JRE notification. This hasn't been a problem in OOo-land, so why should it be a problem for LO? Because the default OOo install does include a JRE. Otherwise, I'm rather indifferent about all of this. TBH I tend to disable as much as possible on my dev builds for speed (but we've tinderboxen anyways, to make sure certain setups stay buildable). Cheers, -- Thorsten pgp3uMbd64Zdi.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Java build problem identified | findhome | MacOSX location ?
On Sun, Dec 5, 2010 at 9:39 PM, Thorsten Behrens t...@documentfoundation.org wrote: Caolan McNamara wrote: IIRC I tried this before, and there was some cockup under MacOSX, so if someone on MacOSX could see what findhome says and if its correct/wrong vs what works correctly there, that'd be helpful. About 4k miles away from my MacBook currently - Norbert, Cloph, any chance to give this a try? Cloph, Wol and me have been working on it on IRC, resulting in bootstrap:474e4b60fec1f859bc16f268d6340d7850c7874e Norbert Cheers, -- Thorsten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Remove __FAR_DATA [PATCH]
Michael, under which name do you want this to be commited ? ( --author=Michael calla...@xmission.com ) Norbert On Sun, Dec 5, 2010 at 5:53 PM, calla...@xmission.com wrote: Here are patches to the various git repositories to remove the empty __FAR_DATA macro from solar.h. Changes are under LGPLv3+ / MPL as requested (Although I'm not sure you technically need a license for code removal?) Michael ___ 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
