date:20101205

Re: [Libreoffice] Enable build of ure and extension

2010-12-05 Thread Gert Faller

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] binfilter and features...

2010-12-05 Thread Pierre-André Jacquod

On 12/04/2010 09:49 PM, Caolán McNamara wrote:

> I wouldn't like to see too much effort spent on binfilter though.
I understand the point. On the other side, leting it behind generate a
lot of - not very useful - job when wanting to do global changes, like
the RTL_CONST... macro, or getting ride of old type /  classes,... ?

> at http://people.redhat.com/caolanm/callcatcher/DEV300_m86/ (I cleared
I will have a look at it.

> "desktop" myself recently, I should generate up-to-date lists for
> LibreOffice master)
would be great

>> Which make me think: as new feature, for the next LibO release after
>> 3.3, could it be that StarOffice file format are not supported any more,

>> Or do you intend to drop this in a quicker way?
> 
> A lot of people are of the view to delete the whole thing. I'd prefer to
> move it out of LibreOffice entirely into a standalone project that

As user, I would prefer to still be able to read the file "natively",
even if I can't write / save it anymore. Nothing more boring than having
to search for an add-on... First you have to know it exits, find it,
install it... Far above the average user expectation. I have see a lot
of people getting confused, not able to read a file anymore, simply
going back to the older version, or using afterward another product, not
always noticing they are reading in one format and saving in another one!
regards
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Java build problem identified?

2010-12-05 Thread Caolán McNamara

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

2010-12-05 Thread Caolán McNamara

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] binfilter and features...

2010-12-05 Thread Caolán McNamara

On Sun, 2010-12-05 at 10:59 +0100, Pierre-André Jacquod wrote:
> On 12/04/2010 09:49 PM, Caolán McNamara wrote:
> 
> > I wouldn't like to see too much effort spent on binfilter though.
> I understand the point. On the other side, leting it behind generate a
> lot of - not very useful - job when wanting to do global changes, like
> the RTL_CONST... macro, or getting ride of old type /  classes,... ?

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

foo(int unused)
{
}

to just

foo(int /*unused*/)
{
}

rather than have to go digging to see if removing arguments, or removing
methods, would cause a different method from a superclass to be used
instead.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] FOSDEM foo ...

2010-12-05 Thread surensp...@gmail.com

HI Michael,

On Thu, Dec 2, 2010 at 5:53 PM, Michael Meeks  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] [PUSHED] Re: commented out code in sd

2010-12-05 Thread Caolán McNamara

On Sat, 2010-12-04 at 17:32 -0800, Kayo Hamid wrote:
> Covering sd/source/{filter,helper}.

Looks ok, now pushed. Thanks for this.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PUSHED] Re: Impress and draw cleanup session

2010-12-05 Thread Caolán McNamara

On Sun, 2010-12-05 at 00:26 +0200, Roth Robert wrote:
> Patch co-licensed as usual under LGPLv3+, GPLv3+ and MPL licenses.
> Patch made for sd repository, I hope it's not a problem.

Looks good to me. Pushed, thanks for this. 

I did drop one tiny little bit that has a "TODO" on it. Probably
pointless to hold onto it. But some current active devs use this as a
placeholder for future work, so might has well keep it to be consistent.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PATCH] Remove dead codes from sd

2010-12-05 Thread Takeshi Abe

Hi,

Removing dead codes from sd.

Cheers,
-- Takeshi Abe
>From 11834378cb34a21be9e80740718d74251725717b Mon Sep 17 00:00:00 2001
From: Takeshi Abe 
Date: Sun, 5 Dec 2010 22:42:19 +0900
Subject: [PATCH] Remove dead codes from sd

---
 sd/source/filter/eppt/pptx-epptooxml.cxx   |4 ---
 sd/source/ui/annotations/annotationwindow.cxx  |   25 
 sd/source/ui/dlg/animobjs.cxx  |9 ---
 sd/source/ui/dlg/dlgass.cxx|4 ---
 sd/source/ui/dlg/sdpreslt.cxx  |9 ---
 sd/source/ui/dlg/tpoption.cxx  |7 -
 .../ui/framework/factories/BasicPaneFactory.cxx|7 -
 sd/source/ui/func/fuconstr.cxx |4 ---
 sd/source/ui/func/fuinsert.cxx |4 ---
 .../controller/SlideSorterController.cxx   |3 --
 sd/source/ui/view/ViewShellBase.cxx|   15 
 sd/source/ui/view/WindowUpdater.cxx|8 --
 12 files changed, 0 insertions(+), 99 deletions(-)

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 541c6dc..ff85aac 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -288,10 +288,6 @@ void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropert
 if ( ImplGetPropertyValue( rXPropSet, S( "FillStyle" ) ) )
 mAny >>= aFillStyle;
 
-if( aFillStyle == FillStyle_BITMAP ) {
-
-}
-
 if( aFillStyle == FillStyle_NONE ||
 aFillStyle == FillStyle_GRADIENT ||
 aFillStyle == FillStyle_HATCH )
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 7295e71..6294209 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -243,9 +243,6 @@ void AnnotationTextWindow::GetFocus()
 
 void AnnotationTextWindow::LoseFocus()
 {
-//if ( mpAnnotationWindow )
-//mpAnnotationWindow->UpdateAnnotation();
-
 Window::LoseFocus();
 }
 
@@ -324,9 +321,6 @@ void AnnotationWindow::InitControls()
 mpMeta->AlwaysDisableInput(true);
 mpMeta->SetCallHandlersOnInputDisabled(true);
 
-//	mpMeta->AddEventListener( LINK( mpPostItTxt, PostItTxt, WindowEventListener ) );
-//	AddEventListener( LINK( mpTextWindow, PostItTxt, WindowEventListener ) );
-
 // we should leave this setting alone, but for this we need a better layout algo
 // with variable meta size height
 AllSettings aSettings = mpMeta->GetSettings();
@@ -353,10 +347,6 @@ void AnnotationWindow::InitControls()
 mpTextWindow->SetOutlinerView(mpOutlinerView);
 mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) );
 
-//	SfxItemSet item(DocShell()->GetPool());
-//	item.Put(SvxFontHeightItem(352,100,EE_CHAR_FONTHEIGHT));
-//	mpOutlinerView->SetAttribs(item);
-
 // TODO: ??
 EEHorizontalTextDirection aDefHoriTextDir = Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R;
 mpOutliner->SetDefaultHorizontalTextDirection( aDefHoriTextDir );
@@ -367,22 +357,10 @@ void AnnotationWindow::InitControls()
 mpVScrollbar->EnableRTL( false );
 mpVScrollbar->SetScrollHdl(LINK(this, AnnotationWindow, ScrollHdl));
 mpVScrollbar->EnableDrag();
-//	mpVScrollbar->AddEventListener( LINK( this, AnnotationWindow, WindowEventListener ) );
 
 ULONG nCntrl = mpOutliner->GetControlWord();
 nCntrl |= EE_CNTRL_PASTESPECIAL | EE_CNTRL_AUTOCORRECT  | EV_CNTRL_AUTOSCROLL | EE_CNTRL_NOCOLORS;
-/*
-if (pVOpt->IsFieldShadings())
-nCntrl |= EE_CNTRL_MARKFIELDS;
-else
-nCntrl &= ~EE_CNTRL_MARKFIELDS;
-if (pVOpt->IsOnlineSpell())
-nCntrl |= EE_CNTRL_ONLINESPELLING;
-else
-nCntrl &= ~EE_CNTRL_ONLINESPELLING;
-*/
 mpOutliner->SetControlWord(nCntrl);
-//	mpOutliner->SetFlatMode( TRUE );
 
 Engine()->SetModifyHdl( Link() );
 Engine()->EnableUndo( FALSE );
@@ -411,8 +389,6 @@ void AnnotationWindow::Rescale()
 {
 MapMode aMode(MAP_100TH_MM);
 aMode.SetOrigin( Point() );
-//aMode.SetScaleX( aMode.GetScaleX() * Fraction( 8, 10 ) );
-//aMode.SetScaleY( aMode.GetScaleY() * Fraction( 8, 10 ) );
 mpOutliner->SetRefMapMode( aMode );
 SetMapMode( aMode );
 mpTextWindow->SetMapMode( aMode );
@@ -552,7 +528,6 @@ IMPL_LINK(AnnotationWindow, ModifyHdl, void*, EMPTYARG)
 sal_Int32 AnnotationWindow::GetScrollbarWidth()
 {
 return 16;
-//	return mpView->GetWrtShell().GetViewOptions()->GetZoom() / 10;
 }
 
 SvxLanguageItem AnnotationWindow::GetLanguage(void)
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 7033b21..aaa5b36 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -116,7 +116,6 @@ void SdDisplay::Paint( const Rectangle& )
 aPt.Y() = ( aSize.Height() - aBmpSize.Height() ) / 2;
 
 aB

[Libreoffice] RC1 Help

2010-12-05 Thread Rainer Bielefeld


Hi,

can someone please urgently check
 ?

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

2010-12-05 Thread Caolán McNamara

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

[Libreoffice] List of Mirrors

2010-12-05 Thread Rainer Bielefeld


Hi

any volunteers to complete
 ?

Thanks

Rainer Bielefeld

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PATCH] Use GtkStatusIcon instead of libegg

2010-12-05 Thread Christopher Backhouse


Hi,

This is item 3.17 in the easy hacks list.
Seems to work fine here. I can turn the quickstarter on and off and 
launch things from it.


The code is simplified a little from the libegg version (partially 
because I removed a few what now seem to be be unnecessary hacks).
Hints on removing libegg from the tree entirely are welcome. I'm not 
great with build stuff.


I'm happy for these changes to be committed under the LGPLv3+ / MPL.
Let me know if you spot any mistakes, the diff isn't formatted right, or 
I've made some other procedural mistake.


Thanks - Chris
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index db0f232..ee5979a 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -8,7 +8,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -39,7 +38,7 @@ using namespace ::rtl;
 using namespace ::osl;
 
 static ResMgr *pVCLResMgr;
-static EggTrayIcon *pTrayIcon;
+static GtkStatusIcon* pTrayIcon;
 static GtkWidget *pExitMenuItem = NULL;
 static GtkWidget *pOpenMenuItem = NULL;
 static GtkWidget *pDisableMenuItem = NULL;
@@ -75,7 +74,6 @@ static void exit_quickstarter_cb( GtkWidget * )
 {
 if (pTrayIcon)
 {
-egg_tray_icon_cancel_message (pTrayIcon, 1 );
 plugin_shutdown_sys_tray();
 //terminate may cause this .so to be unloaded. So we must be hands off
 //all calls into this .so after this call
@@ -305,30 +303,6 @@ static void refresh_menu( GtkWidget *pMenu )
 gtk_widget_set_sensitive( pDisableMenuItem, !bModal);
 }
 
-extern "C" {
-static void
-layout_menu( GtkMenu *menu,
- gint *x, gint *y, gboolean *push_in,
- gpointer )
-{
-GtkRequisition req;
-GtkWidget *ebox = GTK_BIN( pTrayIcon )->child;
-
-gtk_widget_size_request( GTK_WIDGET( menu ), &req );
-gdk_window_get_origin( ebox->window, x, y );
-
-(*x) += ebox->allocation.x;
-(*y) += ebox->allocation.y;
-
-if (*y >= gdk_screen_get_height (gtk_widget_get_screen (ebox)) / 2)
-(*y) -= req.height;
-else
-(*y) += ebox->allocation.height;
-
-*push_in = TRUE;
-}
-}
-
 static gboolean display_menu_cb( GtkWidget *,
  GdkEventButton *event, GtkWidget *pMenu )
 {
@@ -350,21 +324,12 @@ static gboolean display_menu_cb( GtkWidget *,
 refresh_menu( pMenu );
 
 gtk_menu_popup( GTK_MENU( pMenu ), NULL, NULL,
-layout_menu, NULL, 0, event->time );
+gtk_status_icon_position_menu, pTrayIcon,
+0, event->time );
 
 return TRUE;
 }
 
-extern "C" {
-static gboolean
-show_at_idle( gpointer )
-{
-::SolarMutexGuard aGuard;
-gtk_widget_show_all( GTK_WIDGET( pTrayIcon ) );
-return FALSE;
-}
-}
-
 #ifdef ENABLE_GIO
 /*
  * See rhbz#610103. If the quickstarter is running, then LibreOffice is
@@ -377,7 +342,7 @@ static void notify_file_changed(GFileMonitor * /*gfilemonitor*/, GFile * /*arg1*
 GFile * /*arg2*/, GFileMonitorEvent event_type, gpointer /*user_data*/)
 {
 if (event_type == G_FILE_MONITOR_EVENT_DELETED)
-exit_quickstarter_cb(GTK_WIDGET(pTrayIcon));
+exit_quickstarter_cb(NULL);
 }
 #endif
 
@@ -395,38 +360,25 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
 pShutdownIcon->GetResString( STR_QUICKSTART_TIP ),
 RTL_TEXTENCODING_UTF8 );
 
-pTrayIcon = egg_tray_icon_new( aLabel );
-
-GtkWidget *pParent = gtk_event_box_new();
-GtkTooltips *pTooltips = gtk_tooltips_new();
-gtk_tooltips_set_tip( GTK_TOOLTIPS( pTooltips ), pParent, aLabel, NULL );
-
-GtkWidget *pIconImage = gtk_image_new();
-gtk_container_add( GTK_CONTAINER( pParent ), pIconImage );
-
 pVCLResMgr = CREATEVERSIONRESMGR( vcl );
 
 GdkPixbuf *pPixbuf = ResIdToPixbuf( SV_ICON_ID_OFFICE );
-gtk_image_set_from_pixbuf( GTK_IMAGE( pIconImage ), pPixbuf );
+pTrayIcon = gtk_status_icon_new_from_pixbuf(pPixbuf);
 g_object_unref( pPixbuf );
 
+gtk_status_icon_set_title(pTrayIcon, aLabel);
+gtk_status_icon_set_tooltip_text(pTrayIcon, aLabel);
+
 GtkWidget *pMenu = gtk_menu_new();
 g_signal_connect (pMenu, "deactivate",
   G_CALLBACK (menu_deactivate_cb), NULL);
-g_signal_connect( pParent, "button_press_event",
-  G_CALLBACK( display_menu_cb ), pMenu );
-gtk_container_add( GTK_CONTAINER( pTrayIcon ), pParent );
-
-// Show at idle to avoid artefacts at startup
-g_idle_add (show_at_idle, (gpointer) pTrayIcon);
+g_signal_connect(pTrayIcon,  "button_press_event",
+ G_CALLBACK(display_menu_cb), pMenu);
 
 // disable shutdown
 pShutdownIcon->SetVeto( true );
 pShutdownIcon->addTerminateListener();
 
-g_signal_connect(GTK_WIDGET(pTrayIcon), "destroy",
-G_CALLBACK(exit_quickstarter_cb), NULL);
-
 #ifdef ENABLE_GIO
 GFile* pFile = NULL;
 rtl::OUStrin

Re: [Libreoffice] Java build problem identified?

2010-12-05 Thread Wols Lists

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 :-)

Cheers,
Wol


checking which memory allocator to use... internal
checking whether to add custom build version... no
checking whether to build with Java support... yes
checking for java... /usr/bin/java
checking the installed JDK... checked (JDK 1.6.0_20)
checking for target java bytecode version... 1.6
checking for javac... /usr/bin/javac
checking for javadoc... /usr/bin/javadoc
configure: WARNING: JAVA_HOME was not explicitly informed with
--with-jdk-home. the configure script
configure: WARNING: attempted to find JAVA_HOME automatically, but
apparently it failed
configure: WARNING: in case JAVA_HOME is incorrectly set, some projects
with not be built correctly
checking for jawt lib name... -ljawt
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Java build problem identified?

2010-12-05 Thread Wols Lists

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?

2010-12-05 Thread Caolán McNamara

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?

2010-12-05 Thread Wols Lists

On 04/12/10 22:07, Norbert Thiebaud wrote:
> I had to add --with-jdk-home=/opt/sun-jdk-1.6.0.20
> to my gentoo build.
Can you please do a 'ls -al /usr/bin/javac' (assuming java was installed
by your distro).

I'm guessing it points to a symlink. And if that's a symlink, can you do
a -al on that, too?

Cheers,
Wol
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Java build problem identified?

2010-12-05 Thread Wols Lists

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?

2010-12-05 Thread Wols Lists

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

Re: [Libreoffice] Java build problem identified?

2010-12-05 Thread Caolán McNamara

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

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PUSHED] Re: [PATCH] Remove dead codes from sd

2010-12-05 Thread Caolán McNamara

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

2010-12-05 Thread Kálmán „KAMI” Szalai

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_vector
>&)'
cellfml.cxx:(.text+0x2b67): undefined reference to
`ixion::formula_parser::formula_parser(boost::ptr_vector >
const&, boost::ptr_map<_STL::basic_string, _STL::allocator >,
ixion::base_cell, _STL::less<_STL::basic_string, _STL::allocator >
>, boost::heap_clone_allocator,
_STL::allocator<_STL::pair<_STL::basic_string, _STL::allocator >
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?

2010-12-05 Thread Wols Lists

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

2010-12-05 Thread Andrea Pescetti

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] Release criteria

2010-12-05 Thread Sophie Gautier


Hi Andrea, all,
On 05/12/2010 20:39, Andrea Pescetti wrote:

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.


Imho, this should still be needed. Manuals tests are currently developed 
on the wiki and they should be run on each language for approval of the 
build to be elected as stable.


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.


I agree and this is why the non tested build were left on RC state. We 
should not change this or we will miss some quality.


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]


Kind regards
Sophie
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] occured occurred

2010-12-05 Thread Caolán McNamara

On Sat, 2010-12-04 at 14:35 +0900, Takeshi Abe wrote:

I'm reading through these at the moment and applying them.

So far so good, will have to skip the ones that change the external API
in offapi however I think. Hmm.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] List of Mirrors

2010-12-05 Thread Christian Lohmaier

Hi Rainer, *,

On Sun, Dec 5, 2010 at 2:28 PM, Rainer Bielefeld
 wrote:
>
> any volunteers to complete
>  ?

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...

2010-12-05 Thread Pierre-André Jacquod

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

2010-12-05 Thread Pierre-André Jacquod

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?= 
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

2010-12-05 Thread Pierre-André Jacquod

regards
>From a03ec223cf70c17a1cd6bbf397dc954c8d9d13fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
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

2010-12-05 Thread Pierre-André Jacquod

regards
>From fe0b41fe4378e18478263caf8d09af1f3adafa28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
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_

[Libreoffice] [PATCH 04/16] warning fix for unused var in binfilter bf_sw doc

2010-12-05 Thread Pierre-André Jacquod

regards
>From 76026a3ef610c3b348f2fa514591e452eff3cd8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
Date: Sat, 4 Dec 2010 14:56:23 +0100
Subject: [PATCH 04/16] warning fix for unused var in binfilter bf_sw doc

This is warning removing, not code optimization => minimum risks have
been taken and some function calls left behind are probably not usefull
anymore. But goal is not to produce new bugs. Once all warnings removed,
if needed we can do code optimization
---
 binfilter/bf_sw/source/core/doc/sw_docbm.cxx|7 ++--
 binfilter/bf_sw/source/core/doc/sw_doccorr.cxx  |8 ++---
 binfilter/bf_sw/source/core/doc/sw_docdesc.cxx  |   19 ---
 binfilter/bf_sw/source/core/doc/sw_docedt.cxx   |   10 +-
 binfilter/bf_sw/source/core/doc/sw_docfld.cxx   |   15 +++--
 binfilter/bf_sw/source/core/doc/sw_docfly.cxx   |   23 +++--
 binfilter/bf_sw/source/core/doc/sw_docfmt.cxx   |   29 +
 binfilter/bf_sw/source/core/doc/sw_docftn.cxx   |   18 +-
 binfilter/bf_sw/source/core/doc/sw_doclay.cxx   |4 +-
 binfilter/bf_sw/source/core/doc/sw_docnum.cxx   |   39 +--
 binfilter/bf_sw/source/core/doc/sw_docredln.cxx |   17 +-
 binfilter/bf_sw/source/core/doc/sw_doctxm.cxx   |4 +--
 binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx  |2 +-
 13 files changed, 43 insertions(+), 152 deletions(-)

diff --git a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
index f0ce7bb..fa28dea 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
@@ -165,13 +165,13 @@ namespace binfilter {
 /*N*/{
 /*?*/	if( bBkmrk )
 /*?*/	{
-/*?*/		USHORT nCount = pBookmarkTbl->Count();
+/*?*/		pBookmarkTbl->Count();
 /*?*/		USHORT i = 0;
 /*?*/		do {
 /*?*/			if(!(*pBookmarkTbl)[i]->IsBookMark())
-/*?*/nPos++;
+/*?*/++nPos;
 /*?*/
-/*?*/			i++;
+/*?*/			++i;
 /*?*/		}
 /*?*/		while( i < nPos || !(*pBookmarkTbl)[nPos]->IsBookMark() );
 /*?*/	}
@@ -324,7 +324,6 @@ namespace binfilter {
 /*N*/ 	for( nCnt = 0; nCnt < rTbl.Count(); ++nCnt )
 /*N*/ 	{
 /*N*/ 		// liegt auf der Position ??
-/*N*/ 		int eType = BKMK_POS_NONE;
 /*N*/ 		SwRedline* pRedl = rTbl[ nCnt ];
 /*N*/
 /*N*/ 		SwPosition *pRStt = &pRedl->GetBound(TRUE),
diff --git a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
index ff0e123..da64d57 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
@@ -146,12 +146,11 @@ namespace binfilter {
 /*N*/ 	 const xub_StrLen nOffset,
 /*N*/ 	 BOOL bMoveCrsr )
 /*N*/ {
-/*N*/ 	const SwNode* pOldNode = &rOldNode.GetNode();
+/*N*/ 	&rOldNode.GetNode();
 /*N*/ 	SwPosition aNewPos( rNewPos );
 /*N*/ 
 /*N*/ 	{ // erstmal die Bookmark korrigieren
 /*N*/ 		register SwBookmarks& rBkmks = *pBookmarkTbl;
-/*N*/ 		register SwBookmark* pBkmk;
 /*N*/ 		for( USHORT n = 0; n < rBkmks.Count(); ++n )
 /*N*/ 		{
 /*?*/ 			DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // liegt auf der Position ??
@@ -282,11 +281,10 @@ namespace binfilter {
 /*N*/ 	 const SwPosition& rNewPos,
 /*N*/ 	 BOOL bMoveCrsr )
 /*N*/ {
-/*N*/ 	const ULONG nSttNode = rStartNode.GetIndex();
-/*N*/ 	const ULONG nEndNode = rEndNode.GetIndex();
+/*N*/ 	rStartNode.GetIndex();
+/*N*/ 	rEndNode.GetIndex();
 /*N*/ 	SwPosition aNewPos( rNewPos );
 /*N*/ 
-/*N*/ //	if( !DoesUndo() )
 /*N*/ 		// erstmal die Bookmarks/Redlines korrigieren
 /*N*/ 		_DelBookmarks( rStartNode, rEndNode );
 /*N*/ 
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
index 3f2db13..2d509f6 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
@@ -838,25 +838,6 @@ extern SvPtrarr *pGlobalOLEExcludeList;
 /*N*/
 /*N*/ }
 
-/*
- *	Kleiner Hack;
- *
-const SwPageDesc& SwDoc::GetPageDesc( USHORT i ) const
-{
-if( !i && !aPageDescs.Count() )// noch keiner vorhanden?
-((SwDoc*)this)->InitPageDescs();		//Default PageDescriptor
-return *aPageDescs[i];
-}
-
-SwPageDesc& SwDoc::_GetPageDesc( USHORT i ) const
-{
-if( !i && !aPageDescs.Count() )			// noch keiner vorhanden?
-((SwDoc*)this)->InitPageDescs();		//Default PageDescriptor
-return *aPageDescs[i];
-}
-*/
-
-
 
 /*N*/ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, pTimer )
 /*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
index 0a19f58..84de4dc 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
@@ -132,11 +132,6 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
 /*N*/ }
 
 
-
-
-
-// 
-
 /*N*/ _SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx )
 /*N*/ 	: pSavArr( 0 ), pSavIdx( 0 )
 /*N*/

[Libreoffice] [PATCH 05/16] warning fix unused var in binfilter bf_sw docnode

2010-12-05 Thread Pierre-André Jacquod

regards
>From dafaabb2c38990bf4141c6074e15f0ca35d7e160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
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

2010-12-05 Thread Pierre-André Jacquod

regards
>From eac219396edebdf58deba912b02edac9a7999554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
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;

[Libreoffice] [PATCH 07/16] fix warning unused var in binfilter bf_sw fields

2010-12-05 Thread Pierre-André Jacquod

regards
>From 0049d6aa3dd25887c742b51a764776103e67daf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
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 08/16] fix warning unused var in binfilter bf_sw layout

2010-12-05 Thread Pierre-André Jacquod

regards
>From 86062da5291cc62d4f378fb8adb366d696ee11b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
Date: Sat, 4 Dec 2010 17:32:49 +0100
Subject: [PATCH 08/16] fix warning unused var in binfilter bf_sw layout

---
 binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx   |   22 ++--
 binfilter/bf_sw/source/core/layout/sw_findfrm.cxx  |2 +-
 binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx  |6 ++--
 binfilter/bf_sw/source/core/layout/sw_fly.cxx  |3 +-
 binfilter/bf_sw/source/core/layout/sw_flycnt.cxx   |8 ++--
 binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx |2 +-
 binfilter/bf_sw/source/core/layout/sw_flylay.cxx   |   36 ++--
 binfilter/bf_sw/source/core/layout/sw_frmtool.cxx  |2 +-
 binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx   |   10 +++---
 binfilter/bf_sw/source/core/layout/sw_hffrm.cxx|2 +-
 binfilter/bf_sw/source/core/layout/sw_layact.cxx   |6 ++--
 binfilter/bf_sw/source/core/layout/sw_layouter.cxx |2 +-
 binfilter/bf_sw/source/core/layout/sw_pagechg.cxx  |6 ++--
 binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx  |   10 +++---
 binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx|3 +-
 binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx   |4 +-
 binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx  |2 +-
 binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx|1 -
 18 files changed, 47 insertions(+), 80 deletions(-)

diff --git a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
index bd7b593..7f3ff8c 100644
--- a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
@@ -1661,7 +1661,7 @@ int SwFmtURL::operator==( const SfxPoolItem &rAttr ) const
 return bRet;
 }
 
-SfxPoolItem* SwFmtURL::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtURL::Clone( SfxItemPool* /*pPool*/ ) const
 {
 return new SwFmtURL( *this );
 }
@@ -1787,21 +1787,21 @@ bool SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 // class SwNoReadOnly
 
-SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* /*pPool*/ ) const
 {
 return new SwFmtEditInReadonly( Which(), GetValue() );
 }
 
 // class SwFmtLayoutSplit
 
-SfxPoolItem* SwFmtLayoutSplit::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtLayoutSplit::Clone( SfxItemPool* /*pPool*/ ) const
 {
 return new SwFmtLayoutSplit( GetValue() );
 }
 
 // class SwFmtNoBalancedColumns
 
-SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* /*pPool*/ ) const
 {
 return new SwFmtNoBalancedColumns( GetValue() );
 }
@@ -1938,7 +1938,7 @@ bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 // class SwFmtFtnAtTxtEnd
 
-SfxPoolItem* SwFmtFtnAtTxtEnd::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtFtnAtTxtEnd::Clone( SfxItemPool* /*pPool*/ ) const
 {
 SwFmtFtnAtTxtEnd* pNew = new SwFmtFtnAtTxtEnd;
 *pNew = *this;
@@ -1947,7 +1947,7 @@ SfxPoolItem* SwFmtFtnAtTxtEnd::Clone( SfxItemPool* pPool ) const
 
 // class SwFmtEndAtTxtEnd
 
-SfxPoolItem* SwFmtEndAtTxtEnd::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtEndAtTxtEnd::Clone( SfxItemPool* /*pPool*/ ) const
 {
 SwFmtEndAtTxtEnd* pNew = new SwFmtEndAtTxtEnd;
 *pNew = *this;
@@ -1972,7 +1972,7 @@ SwFmtChain::SwFmtChain( const SwFmtChain &rCpy ) :
 SetNext( rCpy.GetNext() );
 }
 
-SfxPoolItem* SwFmtChain::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtChain::Clone( SfxItemPool* /*pPool*/ ) const
 {
 SwFmtChain *pRet = new SwFmtChain;
 pRet->SetPrev( GetPrev() );
@@ -2044,7 +2044,7 @@ int SwFmtLineNumber::operator==( const SfxPoolItem &rAttr ) const
 bCountLines  == ((SwFmtLineNumber&)rAttr).IsCount();
 }
 
-SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* /*pPool*/ ) const
 {
 return new SwFmtLineNumber( *this );
 }
@@ -2126,7 +2126,7 @@ int SwTextGridItem::operator==( const SfxPoolItem& rAttr ) const
 aColor == ((SwTextGridItem&)rAttr).GetColor();
 }
 
-SfxPoolItem* SwTextGridItem::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwTextGridItem::Clone( SfxItemPool* /*pPool*/ ) const
 {
 return new SwTextGridItem( *this );
 }
@@ -2286,7 +2286,7 @@ bool SwTextGridItem::PutValue( const ::com::sun::star::uno::Any& rVal,
 
 // class SwHeaderAndFooterEatSpacingItem
 
-SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* /*pPool*/ ) const
 {
 return new SwHeaderAndFooterEatSpacingItem( Which(), GetValue() );
 }
@@ -2372,7 +2372,7 @@ SwRect SwFrmFmt::FindLayoutRect( const sal_Bool bPrtArea, const Point* pPoint,
 if( pFrm && pFrm->GetRegisteredIn() != this )
 {
 // die Section hat ke

[Libreoffice] [PATCH 09/16] fix warning unused var in binfilter bf_sw ole

2010-12-05 Thread Pierre-André Jacquod

regards
>From 5a619e9399713a488eeadc484617e630ed9d06ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
Date: Sat, 4 Dec 2010 20:02:57 +0100
Subject: [PATCH 09/16] fix warning unused var in binfilter bf_sw ole

---
 binfilter/bf_sw/source/core/ole/sw_ndole.cxx |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
index 111943e..8a1a31b 100644
--- a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
+++ b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
@@ -85,7 +85,7 @@ public:
 };
 
 void SwOLELRUCache::Commit() {}
-void SwOLELRUCache::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ) {}
+void SwOLELRUCache::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& /*aPropertyNames*/ ) {}
 
 SwOLELRUCache* SwOLEObj::pOLELRU_Cache = 0;
 
-- 
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

2010-12-05 Thread Pierre-André Jacquod

regards
>From 18b052aa37f4adb95f3250de4967b739bd14be11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
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

2010-12-05 Thread Pierre-André Jacquod

regards
>From c8861cfc5de23428356c1a5cf6aaed6d2a0eced3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
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

2010-12-05 Thread Pierre-André Jacquod

regards
>From 22f6a25fcbba5eb41b73436f36a9542b2f898ef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
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 13/16] fix warning in binfilter bf_sw tox

2010-12-05 Thread Pierre-André Jacquod

regards
>From 239641e4b675424de81e45cb455e66b8127f9ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
Date: Sat, 4 Dec 2010 21:01:39 +0100
Subject: [PATCH 13/16] fix warning in binfilter bf_sw tox

---
 binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx b/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx
index 660a206..a3e9876 100644
--- a/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx
+++ b/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx
@@ -413,7 +413,7 @@ USHORT SwTOXAuthority::GetLevel() const
 /*-- 15.09.99 14:28:08---
 
   ---*/
-void SwTOXAuthority::_GetText( String& rTxt, String& rTxtReading )
+void SwTOXAuthority::_GetText( String& rTxt, String& /*rTxtReading*/ )
 {
 //
 rTxt = m_rField.GetFld()->Expand();
-- 
1.7.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PATCH 14/16] fix warning unused param in binfilter bf_sw txtnode

2010-12-05 Thread Pierre-André Jacquod

regards
>From 1a50712d282fd282ab53deb2fd7fb2e5acfa3807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
Date: Sat, 4 Dec 2010 21:23:38 +0100
Subject: [PATCH 14/16] fix warning unused param in binfilter bf_sw txtnode

---
 binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx  |4 ++--
 .../bf_sw/source/core/txtnode/sw_atrflyin.cxx  |4 ++--
 binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx  |4 ++--
 binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx  |4 ++--
 binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx |3 ++-
 .../bf_sw/source/core/txtnode/sw_fntcache.cxx  |4 ++--
 binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx  |2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx
index e0f6696..ac6a86b 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx
@@ -115,9 +115,9 @@ namespace binfilter {
 /*N*/ 	}
 /*N*/ }
 
-int SwFmtFld::operator==( const SfxPoolItem& rAttr ) const
+int SwFmtFld::operator==( const SfxPoolItem& /*rAttr*/ ) const
 {
-DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+DBG_BF_ASSERT(0, "STRIP"); return 0;
 }
 
 /*N*/ SfxPoolItem* SwFmtFld::Clone( SfxItemPool* ) const
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx
index 791a7ed..b93a5f2 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx
@@ -54,9 +54,9 @@ namespace binfilter {
 /*N*/ {
 /*N*/ }
 
-int __EXPORT SwFmtFlyCnt::operator==( const SfxPoolItem& rAttr ) const
+int __EXPORT SwFmtFlyCnt::operator==( const SfxPoolItem& /*rAttr*/ ) const
 {
-DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+DBG_BF_ASSERT(0, "STRIP"); return 0; 
 }
 
 /*N*/ SfxPoolItem* __EXPORT SwFmtFlyCnt::Clone( SfxItemPool* ) const
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx
index 0043556..a5a4dd8 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx
@@ -71,9 +71,9 @@ namespace binfilter {
 /*N*/ }
 
 
-int SwFmtFtn::operator==( const SfxPoolItem& rAttr ) const
+int SwFmtFtn::operator==( const SfxPoolItem& /*rAttr*/ ) const
 {
-{DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+{DBG_BF_ASSERT(0, "STRIP");} return 0;
 }
 
 
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx
index efb6704..fbb2824 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx
@@ -60,9 +60,9 @@ namespace binfilter {
 /*N*/ {
 /*N*/ }
 
-int SwFmtRefMark::operator==( const SfxPoolItem& rAttr ) const
+int SwFmtRefMark::operator==( const SfxPoolItem& /*rAttr*/ ) const
 {
-{DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001 	ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+{DBG_BF_ASSERT(0, "STRIP");} return 0;
 }
 
 /*N*/ SfxPoolItem* SwFmtRefMark::Clone( SfxItemPool* ) const
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx
index 5f8c188..3ecfea9 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx
@@ -113,7 +113,8 @@ using namespace ::rtl;
 /*N*/ {
 /*N*/ 	return pTxtAttr ? pTxtAttr->GetInfo( rInfo ) : FALSE;
 /*N*/ }
-/*N*/ bool SwFmtCharFmt::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+
+/*N*/ bool SwFmtCharFmt::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
 /*N*/ {
 /*N*/ 	String sCharFmtName;
 /*N*/ 	if(GetCharFmt())
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
index 6412152..aa008d8 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
@@ -236,7 +236,7 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
  *
  */
 
-/*N*/ void SwFntObj::CreateScrFont( const ViewShell *pSh, const OutputDevice& rOut )
+/*N*/ void SwFntObj::CreateScrFont( const ViewShell* /*pSh*/, const OutputDevice& /*rOut*/ )
 /*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 
 /*N*/ }
 
@@ -377,7 +377,7 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
  */
 
 
-/*N*/ sal_Bool lcl_IsMonoSpaceFont( const OutputDevice* pOut )
+/*N*/ sal_Bool lcl_IsMonoSpac

[Libreoffice] [PATCH 15/16] fix warning unused var in binfilter - bf_sw unocore

2010-12-05 Thread Pierre-André Jacquod

regards
>From 151194c8a68754f9521bd485a9124f6e08f36239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
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;
 Reference 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;
 Reference 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;
 Reference 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* pXCrsr = new

[Libreoffice] [PATCH 16/16] removing code due to endless loop

2010-12-05 Thread Pierre-André Jacquod

regards
>From 6551d69a5fbc85f3af92cada84bf543a083d4453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= 
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 ?

2010-12-05 Thread Caolán McNamara

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.

C.

___
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

2010-12-05 Thread Pierre-André Jacquod

Hello again,
can't figure where the first patch is, currently only 2 -> 16 are on the
list. Here again the first one. But if this is as last time, tomorrow
you will have this mail twice..
regards


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?= 
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

Re: [Libreoffice] Java build problem identified | findhome | MacOSX location ?

2010-12-05 Thread Wols Lists

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

2010-12-05 Thread Lior Kaplan

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-05 Thread Norbert Thiebaud

2010/12/5 Pierre-André Jacquod :
> 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] configure.in for shm_get

2010-12-05 Thread Norbert Thiebaud

the following patch worked for MacOS


diff --git a/configure.in b/configure.in
index d875950..ea6bea1 100644
--- a/configure.in
+++ b/configure.in
@@ -3674,8 +3674,8 @@ fi

 if test "$SOLAR_JAVA" != ""; then
 dnl first check if we have been asked to autodetect JAVA_HOME
with a recent gij
-if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
-  if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
+if test "$JAVA_HOME" = "/usr" -o -z "$JAVA_HOME"; then
+  if test "x$with_jdk_home" = "x"; then
 cat > findhome.java <<_ACEOF
 [import java.io.File;

@@ -3703,6 +3703,9 @@ _ACEOF
 AC_MSG_CHECKING([if gij knows its java.home])
 JAVA_HOME=`$JAVAINTERPRETER findhome`
 if test $? = 0 && test "$JAVA_HOME" != "" ; then
+  if test "$_os" = "Darwin" ; then
+ JAVA_HOME="$JAVA_HOME/Home"
+  fi
   AC_MSG_RESULT([$JAVA_HOME])
 else
   echo "configure: java test failed" >&5


On Sun, Dec 5, 2010 at 4:17 PM, Wols Lists  wrote:
> On 05/12/10 20:50, Wols Lists wrote:
>> 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 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] [PATCH] Clean code at impress

2010-12-05 Thread Kayo Hamid

Sending for review, cover sd/slideshow/*

revol_



  

cleancode-impress.slideshow.diff
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] de-emphasisig java ... - summary so far ...

2010-12-05 Thread Andrea Pescetti

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] configure.in patch for testing ...

2010-12-05 Thread Wols Lists

On 05/12/10 23:05, Wols Lists wrote:
> Another configure to test ...
>
Cheers,
Wol
>From 456c58cc44c68978facbdbc57e680758705a337c Mon Sep 17 00:00:00 2001
From: Wol 
Date: Mon, 6 Dec 2010 00:27:16 +
Subject: [PATCH] Fix configure to work on gentoo

---
 configure.in |   79 +-
 1 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/configure.in b/configure.in
index d875950..09b7135 100644
--- a/configure.in
+++ b/configure.in
@@ -3673,9 +3673,51 @@ if test "$SOLAR_JAVA" != ""; then
 fi
 
 if test "$SOLAR_JAVA" != ""; then
-dnl first check if we have been asked to autodetect JAVA_HOME with a 
recent gij
-if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
-  if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
+
+echo '$JAVA_HOME '$JAVA_HOME
+
+  # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
+  if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
+
+ if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 
2>/dev/null; then
+  # try to recover first by looking whether we have a alternatives
+  # system as in Debian or newer SuSEs where following /usr/bin/javac
+  # over /etc/alternatives/javac leads to the right bindir where we
+  # just need to strip a bit away to get a valid JAVA_HOME
+JAVA_HOME=$(readlink $(readlink $JAVACOMPILER))
+ elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
+# maybe only one level of symlink (e.g. on Mac)
+JAVA_HOME=$(readlink $JAVACOMPILER)
+if test "$(dirname $JAVA_HOME)" = "."; then
+  # we've got no path to trim back
+  JAVA_HOME=""
+fi
+ else
+  # else warn
+  AC_MSG_WARN([JAVA_HOME is set to /usr - this is very likely to be 
incorrect])
+  AC_MSG_WARN([if this is the case, please inform the correct 
JAVA_HOME with --with-jdk-home])
+  echo "JAVA_HOME is set to /usr - this is very likely to be 
incorrect" >> warn
+  echo "if this is the case, please inform the correct JAVA_HOME with 
--with-jdk-home" >> warn
+  fi
+ dnl now that we have the path to the real javac, make a JAVA_HOME out 
of it..
+ if test "$JAVA_HOME" != "/usr"; then
+if test "$_os" = "Darwin"; then
+   dnl Leopard returns a non-suitable path with readlink - points 
to "Current" only
+   JAVA_HOME=$(echo $JAVA_HOME | $SED -e 
s,/Current/Commands/javac$,/CurrentJDK/Home,)
+   dnl Tiger already returns a JDK path..
+   JAVA_HOME=$(echo $JAVA_HOME | $SED -e 
s,/CurrentJDK/Commands/javac$,/CurrentJDK/Home,)
+else
+   JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/bin/javac$,,)
+fi
+ fi
+  fi
+  # as we drop out of this, JAVA_HOME may have been set to the empty 
string by readlink
+
+#dnl first check if we have been asked to autodetect JAVA_HOME with a 
recent gij
+echo '$JAVA_HOME '$JAVA_HOME
+dnl now if JAVA_HOME has been set to empty, then call findhome to find it
+if test -z "$JAVA_HOME"; then
+  if test "x$with_jdk_home" = "x"; then
 cat > findhome.java <<_ACEOF
 [import java.io.File;
 
@@ -3716,37 +3758,6 @@ _ACEOF
 
 dnl second sanity check JAVA_HOME if possible
 if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
-  # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
-  if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
-
- if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 
2>/dev/null; then
-  # try to recover first by looking whether we have a alternatives
-  # system as in Debian or newer SuSEs where following /usr/bin/javac
-  # over /etc/alternatives/javac leads to the right bindir where we
-  # just need to strip a bit away to get a valid JAVA_HOME
-JAVA_HOME=$(readlink $(readlink $JAVACOMPILER))
- elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
-# maybe only one level of symlink (e.g. on Mac)
-JAVA_HOME=$(readlink $JAVACOMPILER)
- else
-  # else warn
-  AC_MSG_WARN([JAVA_HOME is set to /usr - this is very likely to be 
incorrect])
-  AC_MSG_WARN([if this is the case, please inform the correct 
JAVA_HOME with --with-jdk-home])
-  echo "JAVA_HOME is set to /usr - this is very likely to be 
incorrect" >> warn
-  echo "if this is the case, please inform the correct JAVA_HOME with 
--with-jdk-home" >> warn
-  fi
- dnl now that we have the path to the real javac, make a JAVA_HOME out 
of it..
- if test "$JAVA_HOME" != "/usr"; then
-if test "$_os" = "Darwin"; then
-   dnl Leopard returns a non-suitable path with readlink - points 
to "Current" only
-   JAVA_HOME=$(echo

Re: [Libreoffice] new bootstrap: quick stop

2010-12-05 Thread Thomas Klausner

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?)
 Thomas
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [Pushed] configure.in patch for testing ...

2010-12-05 Thread Norbert Thiebaud

On Sun, Dec 5, 2010 at 6:30 PM, Wols Lists  wrote:
> On 05/12/10 23:05, Wols Lists wrote:
>> Another configure to test ...

I tweaked a bit the display.

Pushed

Norbert

>>
> Cheers,
> Wol
>
> ___
> 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] new bootstrap: quick stop

2010-12-05 Thread Norbert Thiebaud

On Sun, Dec 5, 2010 at 7:03 PM, Thomas Klausner  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 ...

2010-12-05 Thread Thorsten Behrens

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 ?

2010-12-05 Thread Thorsten Behrens

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?

Cheers,

-- Thorsten


pgpdiK3NtDHFG.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PUSHED] more SAL_N_ELEMENTS

2010-12-05 Thread David Tardon

On Fri, Dec 03, 2010 at 02:09:35AM +0100, Kenneth Venken wrote:
> hey,
> 
> more use of the SAL_N_ELEMENTS macro like replacing the
> STATIC_TABLE_SIZE macro.
> 
> -- Kenneth

Noel pushed it, thanks.

D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Deleting Java from Base

2010-12-05 Thread David Tardon

On Fri, Dec 03, 2010 at 02:40:07PM +0100, Christian Lohmaier wrote:
> Hi Jonathan, *,
> 
> On Fri, Dec 3, 2010 at 2:32 PM, Jonathan Aquilina
>  wrote:
> > i was talking to kendy this morning on irc and i was told that java is
> > eventually going to be phased out its a matter of porting the code from java
> > to c++. What i would be flustered with is where to begin in my honest
> > opinion
> 
> Start with stuff that /any/ user would see.
> My list would start with:
> Fulltext search in Help (i.e. ) - that uses lucene and requires java
> 
> After that, the wizards (Fax, Letter, ... wizards/autopilots)
> 
> Then the xslt based filters (that are using saxxon)
> 

As I mentioned elsewhere, some of the filters (at least the Microsoft
Office 2003 ones) use XSLT 2.0 and saxon is AFAIK the only available
XSLT processor that can process it. So, until this changes, we are stuck
with saxon (and java).

D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Deleting Java from Base

2010-12-05 Thread Jonathan Aquilina

Not necessarily. If there is a dev whose willing to do a port of said 
filters I would say have fun. I think porting the filters would be a 
great asset to this project as well as many other office related open 
source projects.


On 12/6/10 6:50 AM, David Tardon wrote:

On Fri, Dec 03, 2010 at 02:40:07PM +0100, Christian Lohmaier wrote:

Hi Jonathan, *,

On Fri, Dec 3, 2010 at 2:32 PM, Jonathan Aquilina
  wrote:

i was talking to kendy this morning on irc and i was told that java is
eventually going to be phased out its a matter of porting the code from java
to c++. What i would be flustered with is where to begin in my honest
opinion

Start with stuff that /any/ user would see.
My list would start with:
Fulltext search in Help (i.e.) - that uses lucene and requires java

After that, the wizards (Fax, Letter, ... wizards/autopilots)

Then the xslt based filters (that are using saxxon)


As I mentioned elsewhere, some of the filters (at least the Microsoft
Office 2003 ones) use XSLT 2.0 and saxon is AFAIK the only available
XSLT processor that can process it. So, until this changes, we are stuck
with saxon (and java).

D.
___
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] new bootstrap: quick stop

2010-12-05 Thread Jonathan Aquilina

I had an issue with /bin/sh as the shebang. Kendy seems to have fixed 
that issue for me. What i have been informed as to why /bin/sh is being 
used is for portability.


On 12/6/10 2:17 AM, Norbert Thiebaud wrote:

On Sun, Dec 5, 2010 at 7:03 PM, Thomas Klausner  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


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Java build problem identified | findhome | MacOSX location ?

2010-12-05 Thread Norbert Thiebaud

On Sun, Dec 5, 2010 at 9:39 PM, Thorsten Behrens
 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] [PATCH] Use GtkStatusIcon instead of libegg

2010-12-05 Thread David Tardon

On Sun, Dec 05, 2010 at 02:09:05PM +, Christopher Backhouse wrote:
> Hi,
> 
> This is item 3.17 in the easy hacks list.
> Seems to work fine here. I can turn the quickstarter on and off and
> launch things from it.
> 
> The code is simplified a little from the libegg version (partially
> because I removed a few what now seem to be be unnecessary hacks).
> Hints on removing libegg from the tree entirely are welcome. I'm not
> great with build stuff.
> 

The current impl. shutdowns LibO when desktop session is ended. Unless
I'm missing something obvious, the new impl. cannot do that...

D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Remove __FAR_DATA [PATCH]

2010-12-05 Thread Norbert Thiebaud

Michael,

under which name do you want this to be commited ?
( --author="Michael  " )

Norbert

On Sun, Dec 5, 2010 at 5:53 PM,   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

65 matches

Mail list logo