Re: rtf filter detection order

[Wols Lists]

On 28/07/14 15:11, Kohei Yoshida wrote:
> On Mon, 2014-07-28 at 10:14 +0200, Marina Latini wrote:
>> Hi All,
>> Can someone point out some informations about the rtf filter detection order?
>> I know that Calc has its own rtf filter 
>> (https://bugs.freedesktop.org/show_bug.cgi?id=65017#c19).
>>
>> Steps to reproduce:
>>
>> 1)  Start LibreOffice
>> 2)  open a rtf document test.rtf
>> 2a) create a test.rtf document with Writer
>> 3)  close the document
>> 4)  open a new blank spreadsheet
>> 5)  now open the same test.rtf from File > Open
>>
>> test.rtf is opened with Calc
> 
> Yes, As Maxim already pointed out, it's intentional.  Generic formats
> such as text, html and rtf are opened in the app it was opened from.  It
> was a change made in LibreOffice as a feature.
> 
>> This is our bug or our feature?
> 
> It's our (proud) feature, though as with any other features, some users
> may find it an annoying showstopper breaking their workflow yada yada
> yada, but we are not responsible for that. :-)
> 
I'll just add this presumably fixes an embarrassing (for OO) problem I
came across many moons ago, where I was forced to use Excel to recover a
corrupt Calc spreadsheet!

Probably didn't go about it the right way, but the document wouldn't
open so I broke open the zip archive, extracted the component that was
the spreadsheet data and tried to open it in Calc. Would it do it?
EVERYTHING I tried just dumped it into Writer. As I say, I was forced to
use Excel and save it as an xls to get it back into Calc.

imho this is a simple case of fixing OO's attitude of second-guessing
the user and thinking it knows best. If I try to open a document using
Calc, it is reasonable to assume I want it in Calc, not something else.

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

Re: rtf filter detection order

[Wols Lists]

On 29/07/14 19:25, Michael Stahl wrote:
> On 29/07/14 20:20, Anthonys Lists wrote:
>> On 29/07/2014 16:46, Michael Stahl wrote:
> It should be possible, for ANY LO document that is stored that way, to
> break out the content.xml, read it back into the original application,
> and recover at least the basic original document.
>>> i suspect you could get it loaded with the Flat ODF filters, just need
>>> to change the root element of content.xml to 
>>
>> Hmmm. Nice and simple.
>>
>> If you agree, Kohei, do you think it's a good idea to open a 
>> bug/enhancement and make that change to all documents? imho it's crazy 
>> it doesn't work that way, and if it's that easy to fix ...
> 
> i don't understand, where is the bug here?
> 
Okay, maybe it's an enhancement, but if Impress cannot recognise and
read a document THAT WAS CREATED BY IMPRESS, then at minimum it is a
"feature" aka "does something stupid by design".

If the user is struggling to retrieve a damaged document, the last thing
they want is brain-damaged design breaking an "obvious" fix.

I regularly saw people bragging about how they used OOo to recover
damaged MS-Office documents. It was heart-breaking back then to be
forced to use Excel to recover a damaged OOo Calc document :-(

Cheers,
Wol

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

Re: Sort and copy results

[Wols Lists]

On 06/06/14 12:27, Kohei Yoshida wrote:
> Good.  Now I have someone real I can ask.
> 
> Can I ask in what use case this feature is used?  Why does your use case
> require that copying and sorting have to be done in one step, rather
> than in two separate steps?

Why can't LibreOffice treat it as two separate steps, INCLUDING for
things like undo? Treat the copy as one operation, then the sort as a
second operation, and if you need to undo it then it's two , not
one?

That's one of my moans (maybe it's been fixed) about LO spellcheck! It's
too long ago to remember the details, and it was in a cell (can't
remember whether it was a Writer table or Calc). Anyways, I filled the
cell and tabbed away. The AutoCorrupt kicked in. And  reversed
the ENTIRE operation, deleting the text I'd typed! I just *could* *not*
work out how to get LO to accept what I'd typed without insisting on
corrupting it.

So it makes a lot of sense, in many circumstances, for a user's input to
be treated as multiple steps requiring multiple undos, even when it's
just one user action that triggers it.

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

Re: Sort and copy results

[Wols Lists]

On 27/06/14 17:22, Kohei Yoshida wrote:
> On Fri, 2014-06-06 at 12:42 +0100, Wols Lists wrote:
>> Why can't LibreOffice treat it as two separate steps, INCLUDING for
>> things like undo? Treat the copy as one operation, then the sort as a
>> second operation, and if you need to undo it then it's two ,
>> not one?
> 
> I'll take this idea.  I hope nobody will object to this.
> 
Word does it (not that I consider Word a good example to copy from :-)
If Word's autocorrect kicks in, that's considered a separate action from
what the user did, so if I mis-type then Word autocorrupts, the first
ctrl-z reverses the autocorrupt, and I need a second ctrl-z to undo what
I did.

Cheers,
Wol

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

Re: LiMux student "kick-off"

[Wols Lists]

On 17/09/14 13:45, Ptyl Dragon wrote:
> ok, then we'll use GL2.1. we'll make sure we use only API used in ES 2 too.
> We need simple thing. after all, we are not making a First Person
> Shooter. For starters we are just making a 2d rendering engine

Just bear in mind, iirc you can't get hardware 2d rendering any more.

I seem to remember, from quite a while back too, that all modern video
cards render 3d by default, and 2d is now a software layer on top.

So basically, what I'm saying is don't choose 2d over 3d because you
think it will be faster/more efficient. Because actually, it's the other
way round.

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

Re: [Libreoffice] Fwd: Re: [PATCH] Use a generic unxgcc.mk

[Wols Lists]

On 17/11/10 16:18, René Kjellerup wrote:
>
> sent from my phone
>
> -- Forwarded message --
> From: "René Kjellerup"  >
> Date: Nov 17, 2010 5:17 PM
> Subject: Re: [Libreoffice] [PATCH] Use a generic unxgcc.mk
> 
> To: "Caolán McNamara" mailto:caol...@redhat.com>>
>
> Why the oracle copyright notice in the new file too?
> Shouldn't they have a TDF notice instead ?
>

The whole point of a copyright notice is to say who *OWNS* the
copyright, and the date of that ownership.

Just because TDF has forked OOo doesn't mean we now legally own it.
>
> Just asking
>

Doing as you suggest (removing the Oracle notice) is actually
*illegal*!!! (unless we remove all the Oracle-owned code at the same
time :-) If you don't know what you're doing, you should NEVER alter a
copyright notice - just add a new one claiming your own copyright on the
code you yourself wrote and added.

Whoops - just noticed what you said about "new" file. If it truly is
new, then no it shouldn't have an Oracle notice. However, I get the
impression that it's actually just a rename, so no, legally it isn't new.
>
> Regards
> René
>
>
Cheers,
Wol
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Disable GCC optimizations when building with --enable-symbols

[Wols Lists]

On 17/11/10 18:50, Santiago Bosio wrote:
> Hi!
>
> When LibO is built using --enable-symbols, it still uses -O2
> optimizations, making hard to debug execution with GDB.
>
> So, I think that it should default to -O2 on a normal build, and to
> -O0 when using --enable-symbols. Don't see the point of using
> optimizations when building a version for debugging purposes. 
What if it's the optimisation that introduces the bug? Completely
different product (MS VB :-) but I know of a very nasty bug that only
crops up in compiled mode - you prove the code is correct in interpreted
mode, compile it, and the executable fails ...

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

[Libreoffice] [PATCH] minor fixes for Base

[Wols Lists]

Cheers,
Wol
>From 63291f58afa08fadd35f736b6ade308b9d85d66e Mon Sep 17 00:00:00 2001
From: Wol 
Date: Thu, 18 Nov 2010 13:17:46 +
Subject: [PATCH] Comment fixes - dead code and spelling mistakes

---
 dbaccess/source/ui/control/ColumnControlWindow.cxx |2 --
 dbaccess/source/ui/control/FieldDescControl.cxx|8 +++-
 dbaccess/source/ui/control/dbtreelistbox.cxx   |6 +++---
 dbaccess/source/ui/control/marktree.cxx|8 
 dbaccess/source/ui/control/tabletree.cxx   |4 ++--
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx 
b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 8dc0b41..5786aa2 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -73,7 +73,6 @@ void OColumnControlWindow::ActivateAggregate( EControlType 
eType )
 {
 case tpFormat:
 case tpDefault:
-// case tpAutoIncrement:
 case tpColumnName:
 break;
 default:
@@ -87,7 +86,6 @@ void OColumnControlWindow::DeactivateAggregate( EControlType 
eType )
 {
 case tpFormat:
 case tpDefault:
-// case tpAutoIncrement:
 case tpColumnName:
 break;
 default:
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx 
b/dbaccess/source/ui/control/FieldDescControl.cxx
index a7fa752..f85af16 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -410,7 +410,6 @@ void OFieldDescControl::CheckScrollBars()
 {
 m_pVertScroll->Show();
 m_pVertScroll->SetRangeMax(nActive - nLastVisible);
-// m_pVertScroll->SetThumbPos(0);
 
 m_pVertScroll->SetPosSizePixel( Point(nNewHWidth, 0), 
Size(nVScrollWidth, szOverallSize.Height()) );
 }
@@ -425,7 +424,6 @@ void OFieldDescControl::CheckScrollBars()
 {
 m_pHorzScroll->Show();
 m_pHorzScroll->SetRangeMax((lMaxXPosition - lMaxXAvailable + 
HSCROLL_STEP - 1 )/HSCROLL_STEP);
-// m_pHorzScroll->SetThumbPos(0);
 
 m_pHorzScroll->SetPosSizePixel( Point(0, nNewVHeight), 
Size(bNeedVScrollBar ? nNewHWidth : szOverallSize.Width(), nHScrollHeight) );
 }
@@ -516,7 +514,7 @@ sal_Int32 OFieldDescControl::GetMaxControlHeight() const
 const Size aTemp( 
ppAggregates[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) );
 if ( aTemp.Height() > aHeight.Height() )
 aHeight.Height() = aTemp.Height();
-} // if ( ppAggregates[i] )
+}
 }
 
 return aHeight.Height();
@@ -1194,7 +1192,7 @@ void OFieldDescControl::SetPosSize( Control** ppControl, 
long nRow, sal_uInt16 n
 case 4:
 aSize.Width()  = CONTROL_WIDTH_4;
 break;
-} // switch( nCol )
+}
 }
 
 
@@ -1710,7 +1708,7 @@ void OFieldDescControl::SaveData( OFieldDescription* 
pFieldDescr )
 catch(const Exception&)
 {
 }
-} // if ( sDefault.getLength() )
+}
 else
 pFieldDescr->SetControlDefault(Any());
 
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx 
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 1ddba15..8251442 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -515,7 +515,7 @@ namespace
 {
 lcl_adjustMenuItemIDs( *pPopup, _rCommandController );
 continue;
-} // if ( pPopup )
+}
 
 const USHORT nCommandId = _rCommandController.registerCommandURL( 
aCommand );
 _rMenu.InsertItem( nCommandId, _rMenu.GetItemText( nId ), 
_rMenu.GetItemImage( nId ),
@@ -551,7 +551,7 @@ namespace
 {
 lcl_insertMenuItemImages( *pPopup, _rCommandController );
 continue;
-} // if ( pPopup )
+}
 
 if ( xFrame.is() )
 
_rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,FALSE));
@@ -692,7 +692,7 @@ PopupMenu* DBTreeListBox::CreateContextMenu( void )
 // the interceptors only know command URLs, but our menus primarily 
work
 // with IDs -> we need to translate the commands to IDs
 lcl_adjustMenuItemIDs( *pModifiedMenu, 
m_pContextMenuProvider->getCommandController() );
-} // if ( bModifiedMenu )
+}
 
 return pContextMenu.release();
 }
diff --git a/dbaccess/source/ui/control/marktree.cxx 
b/dbaccess/source/ui/control/marktree.cxx
index bca4ebe..e001a60 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -152,8 +152,8 @@ SvButtonState 
OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry)
 // we did not finish the loop because at least one of the children is 
in tristate
 eState = SV_BUTTON_TRISTATE;
 
-// but this means that we d

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

[Wols Lists]

On 19/11/10 08:11, Kevin Hunter wrote:
> Hullo List,
>
> It must be something simple, but I'm having a devil of a time
> recovering from a bad merge.  Given my transcript below, how do I
> recover?
>
> It usually happens after I've committed a change to my local
> repository, that I then sent in as a patch.  That patch got applied
> with a slight modification, and then the conflict.
>
> -
> 
> -
>
> Any pointers for the uninitiated would be awesome.
>
> Thanks!
>
As a git newbie myself ...

Firstly, I'm slightly surprised no-one suggested merely reverting your
patch. You'll need to look at how to do it - someone pointed me to this
link - http://book.git-scm.com/4_interactive_rebasing.html - which might
help you do that, though this page probably isn't quite the right one.

But I'm guessing all you want to do is get rid of your patch and replace
it with the "official" one - so just dropping your version should do
what you want?


The other thing, I noticed it said "not currently on any branch". Are
you using branches? I forget sometimes, but what I do is checkout a
branch, make a bunch of changes, and submit the patch. Another set of
changes - do another branch. When my changes are merged, bin the branch
I made them on because they're now in master. Unless you're really
beginning to do a load of developing so you can't create each patch-set
on their own branch, that workflow should work well.

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

Re: [Libreoffice] [PUSHED] Re: [PATCH 02/12] RTL_CONSTASCII_USTRINGPARAM in components cui options

[Wols Lists]

On 18/11/10 13:36, Kevin Hunter wrote:
> As I assume you're using a regex, you might consider catching this by
> doing the search and replace in series.  Here's an example:
>
> 1. Catch the 'OUString +?= ...createFromAscii...' case and replace
> with 'OUString var( RTL...)'
>
> search: OUString\s*\w+\s*\+?=\s*\S*createFromAscii\(\s*"([^"]*)"\s*\)
> replace: $1 $2( RTL_CONSTASCII_USTRINGPARAM( "$4" ))
>
> 2. Then go back for a second pass with something like this:
>
> search: ::createFromAscii\(\s*"([^"]*)"\s*\)
> replace: $1 $2( RTL_CONSTASCII_USTRINGPARAM( "$4" ))
>
> The solution isn't perfect, as it still misses certain edge cases, but
> should at least help a little bit.
>
Forgive what might be a stupid question, but I've seen

String::createFromAscii

Will version 2 find those, and should they be replaced?

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

Re: [Libreoffice] [PATCH] Impress

[Wols Lists]

On 22/11/10 15:11, Joseph Powers wrote:
> Please disregard my Friday patch for Impress.
>
> Removing the Global High Contrast flag is going to require more work then the 
> simple remove HC icons project is going to allow. We hard code too many UI 
> items (text fonts, background color, border color, ...) which have to be 
> modified when in HC mode. The correct fix for this would be:
>
> 1. Find all colors
> 2. Sort and standardize use.
> 3. Fix the Color Editor to include all the codes.
> 4. Replace all the hard coded entries to take values from the color chart.
> 5. Ship a HC and Normal color theme
> 6. Bonus points for getting the above to work with all the system color 
> themes...
>
> I'm going to revert most of the Impress patch and then resubmit with only the 
> Icon related changes.
>
> Joe P.
>
> PS: Removing the global flag did find a few odd cases of where Icon related 
> code was hiding so it wasn't a complete loss.
>
> PS: In master, the text labels for the HC colors are missing. I'm going to 
> see if I did that and see about getting the labels back in. I may end up 
> asking someone with better GIT skills then me to help find the patch and see 
> about getting it fixed. If I can't find it in GIT, I'll check the 3.3 branch 
> and see if it has the labels and then just copy the code back into master.
>
Is this the patch header? With commit number etc?

>From e24ca90c227d74300f6b168cbe601404d37ab850 Mon Sep 17 00:00:00 2001
From: Joseph Powers 
Date: Fri, 19 Nov 2010 19:17:37 -0800
Subject: [PATCH] Removing GetHighContrast() from Impress


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

Re: [Libreoffice] [PUSHED] Re: [PATCH 02/12] RTL_CONSTASCII_USTRINGPARAM in components cui options

[Wols Lists]

On 23/11/10 19:00, Jan Holesovsky wrote:
> Hi Wol, Kevin, all,
>
> On 2010-11-21 at 23:48 -0500, Kevin Hunter wrote:
>
>>> Forgive what might be a stupid question, but I've seen
>>>
>>> String::createFromAscii
>>>
>>> Will version 2 find those, and should they be replaced?
>> Not a stupid question at all.  Regular expressions aren't the most 
>> transparent of creatures.
>>
>> As I wrote the regex, round 2 /will/ find those.  Since I don't know if 
>> those should be replaced, I assume that they shouldn't be, making this 
>> "an edge case".  The correct procedure then would be a "Replace and 
>> Find" as opposed to "Replace All".  This way one inspects every change 
>> rather than blindly updating every occurrence.
> Yes, even String::createFromAscii() usage should be replaced the similar
> way, the UniString class (that is the class aliased as String) has the
> appropriate constructor, ie.
>
>  String aFoo = String::createFromAscii( "Something" )
>
> should be replaced, with
>
>  String aFoo( RTL_CONSTASCII_USTRINGPARAM( "Something" ) )
>
> Regards,
> Kendy
Fine. Fixes in base will appear as I spot them :-) Just one important
little point - the reason I asked is that I think the strings might
actually be being passed to a non-OOo library - will this break a
third-party library? (My C++-foo isn't good enough to answer this
question for myself :-)

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

[Libreoffice] [PATCH] dead code removal etc from Base

[Wols Lists]

Cheers,
Wol
>From a06e3e0072e38b6c4fb01e00bc9239236f39e3ae Mon Sep 17 00:00:00 2001
From: Wol 
Date: Tue, 23 Nov 2010 23:33:20 +
Subject: [PATCH] Dead code, translations.

---
 dbaccess/source/ui/misc/DExport.cxx |7 +--
 dbaccess/source/ui/misc/HtmlReader.cxx  |3 +-
 dbaccess/source/ui/misc/RtfReader.cxx   |2 -
 dbaccess/source/ui/misc/TokenWriter.cxx |   60 ++-
 dbaccess/source/ui/misc/UITools.cxx |   13 +
 dbaccess/source/ui/misc/WColumnSelect.cxx   |1 -
 dbaccess/source/ui/misc/WCopyTable.cxx  |6 +-
 dbaccess/source/ui/misc/WNameMatch.cxx  |1 -
 dbaccess/source/ui/misc/controllerframe.cxx |5 --
 dbaccess/source/ui/misc/indexcollection.cxx |6 --
 dbaccess/source/ui/misc/linkeddocuments.cxx |1 -
 dbaccess/source/ui/misc/singledoccontroller.cxx |9 +---
 12 files changed, 14 insertions(+), 100 deletions(-)

diff --git a/dbaccess/source/ui/misc/DExport.cxx 
b/dbaccess/source/ui/misc/DExport.cxx
index ce0e28f..cd9704d 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -290,7 +290,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& 
_rxConnection,
 break;
 }
 }
-} // if(xSet.is())
+}
 if ( !m_pTypeInfo )
 m_pTypeInfo= TOTypeInfoSP(new OTypeInfo());
 SetColumnTypes(pList,_pInfoMap);
@@ -326,9 +326,6 @@ void ODatabaseExport::insertValueIntoColumn()
 sal_Int32 nPos = m_vColumns[nNewPos].first;
 if ( nPos != COLUMN_POSITION_NOT_FOUND )
 {
-//  if(m_nDefToken != LANGUAGE_DONTKNOW) // falls Sprache 
anders als Systemsprache
-//  m_pNF->ChangeIntl((LanguageType)m_nDefToken);
-
 if ( !m_sTextToken.Len() && pField->IsNullable() )
 m_pUpdateHelper->updateNull(nPos,pField->GetType());
 else
@@ -790,7 +787,7 @@ void ODatabaseExport::showErrorDialog(const 
::com::sun::star::sdbc::SQLException
 m_bDontAskAgain = TRUE;
 else
 m_bError = TRUE;
-} // if(!m_bDontAskAgain)
+}
 }
 // 
-
 void ODatabaseExport::adjustFormat()
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx 
b/dbaccess/source/ui/misc/HtmlReader.cxx
index 0ddc53d..a3b0692 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -337,7 +337,6 @@ void OHTMLReader::fetchOptions()
 case HTML_O_SDVAL:
 {
 m_sValToken = pOption->GetString();
-//m_sTextToken = pOption->GetString();
 m_bSDNum = sal_True;
 }
 break;
@@ -446,7 +445,7 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption* 
pOption )
 {
 if ( rOptVal.Search('*') != STRING_NOTFOUND )
 {  // relativ zu was?!?
-//2do: ColArray aller relativen Werte sammeln und dann MakeCol
+//TODO: ColArray aller relativen Werte sammeln und dann MakeCol
 return 0;
 }
 else
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx 
b/dbaccess/source/ui/misc/RtfReader.cxx
index 725b822..b9e57c3 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -315,8 +315,6 @@ sal_Bool ORTFReader::CreateTable(int nToken)
 }
 break;
 case RTF_CF:
-// if(nTokenValue < m_vecColor.size())
-// 
m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,makeAny(m_vecColor[nTokenValue]));
 break;
 case RTF_B:
 aFont.Weight = ::com::sun::star::awt::FontWeight::BOLD;
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx 
b/dbaccess/source/ui/misc/TokenWriter.cxx
index aa26061..800394f 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -201,8 +201,6 @@ void SAL_CALL ODatabaseImportExport::disposing( const 
EventObject& Source ) thro
 m_xConnection.clear();
 dispose();
 m_bNeedToReInitialize = true;
-//if(!m_bInInitialize)
-// initialize();
 }
 }
 // 
-
@@ -369,7 +367,7 @@ BOOL ODatabaseImportExport::Write()
 {
 if ( !m_bInInitialize )
 initialize();
-} // if ( m_bNeedToReInitialize )
+}
 return TRUE;
 }
 // 
-
@@ -379,7 +377,7 @@ BOOL ODatabaseImportExport::Read()
 {
 if ( !m_bInInitialize )
 initialize();
-} // if ( m_bNeedToReInitialize )
+}
 return TRUE;
 }
 // 
-
@@ -404,54 +402,6 @@ BOOL OR

[Libreoffice] [PATCH] dead code, spelling mistakes in Base

[Wols Lists]

Another one...

Cheers,
Wol
>From b8f2f5fe713747a109f5fc26ab7460341aaf0b93 Mon Sep 17 00:00:00 2001
From: Wol 
Date: Tue, 23 Nov 2010 23:41:49 +
Subject: [PATCH 2/2] Dead code, spelling mistakes

---
 .../ui/relationdesign/RTableConnectionData.cxx |6 +---
 .../ui/relationdesign/RelationController.cxx   |   12 
 .../source/ui/relationdesign/RelationTableView.cxx |   28 +--
 3 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx 
b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index 86a1dcd..e31abba 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -424,8 +424,6 @@ xKey.clear();
 ::dbtools::throwGenericSQLException(sError,NULL);
 }
 
-// OSL_ENSURE(xKey.is(),"No key found have insertion!");
-
 // The fields the relation marks may not be the same as our LineDatas mark 
after the relation has been updated
 if ( xColSup.is() )
 {
@@ -454,8 +452,8 @@ xKey.clear();
 m_vConnLineData.push_back(pNewData);
 }
 }
-} // if ( xColSup.is() )
-// NOTE : the caller is resposible for updating any other objects 
referencing the old LineDatas (for instance a ConnLine)
+}
+// NOTE : the caller is responsible for updating any other objects 
referencing the old LineDatas (for instance a ConnLine)
 
 
 // Kardinalitaet bestimmen
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx 
b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 3721d32..f38aedb 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -348,7 +348,7 @@ namespace
 {
 ::comphelper::disposeComponent(xResult);
 loadTableData(m_xTables->getByName(*pIter));
-} // if ( xResult.is() && xResult->next() )
+}
 }
 catch( const Exception& )
 {
@@ -410,7 +410,7 @@ namespace
 }
 else
 continue; // table name could not be found so we 
do not show this table releation
-} // if ( aFind == m_aTableData.end() )
+}
 TTableWindowData::value_type pReferencedTable = 
aRefFind->second;
 
 ::rtl::OUString sKeyName;
@@ -454,7 +454,7 @@ namespace
 pTabConnData->SetCardinality();
 }
 }
-} // if ( xKeys.is() )
+}
 }
 }
 
@@ -478,7 +478,7 @@ void ORelationController::mergeData(const 
TTableConnectionData& _aConnectionData
 {
 m_vTableData.push_back((*aConnDataIter)->getReferencedTable());
 }
-} // for(;aConnDataIter != aConnDataEnd;++aConnDataIter)
+}
 if ( m_nThreadEvent )
 {
 --m_nThreadEvent;
@@ -535,8 +535,8 @@ void ORelationController::loadData()
 nStart = nEnd;
 nEnd += nMaxElements;
 nEnd = ::std::min(nEnd,nCount);
-} // for(;pIter != pEnd;++pIter)
-} // if ( aMeta.supportsThreads() )
+}
+}
 else
 {
 RelationLoader* pThread = new 
RelationLoader(this,xMetaData,m_xTables,aNames,0,nCount);
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx 
b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index ed62b88..9260882 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -180,7 +180,7 @@ void ORelationTableView::ReSync()
 pTabConnDataList->erase( 
::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end()
 );
 continue;
 }
-} // if ( !arrInvalidTables.empty() )
+}
 
 addConnection( new ORelationTableConnection(this, *aConIter), 
sal_False ); // don't add the data again
 }
@@ -385,30 +385,6 @@ void ORelationTableView::RemoveTabWin( OTableWindow* 
pTabWin )
 }
 }
 // 
-
-//namespace
-//{
-//class OReleationAskDialog : public ButtonDialog
-//{
-//FixedImage   m_aInfoImage;
-//FixedTextm_aTitle;
-// FixedText   m_aMessage;
-//public:
-//OReleationDialog(Window* _pParent) : ButtonDialog(_pParent,WB_HORZ | 
WB_STDDIALOG)
-//,m_aInfoImage(this)
-//,m_aTitle(this,WB_WORDBREAK | WB_LEFT)
-// ,m_aMessage(this,WB_WORDBREAK | WB_LEFT)
-//{
-//m_aMessage.SetText(ModuleRes(STR_QUERY_REL_EDIT_RELATION));
-//   

[Libreoffice] [PATCH] Another dead code removal for Base

[Wols Lists]

Cheers,
Wol
>From a62ec669b4f383a27d645673ae936d073320b1fd Mon Sep 17 00:00:00 2001
From: Wol 
Date: Tue, 23 Nov 2010 23:56:34 +
Subject: [PATCH 3/3] Dead code removal

---
 dbaccess/source/ui/uno/ColumnModel.cxx |2 --
 dbaccess/source/ui/uno/copytablewizard.cxx |2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx 
b/dbaccess/source/ui/uno/ColumnModel.cxx
index 3700fc1..c66d80d 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -105,8 +105,6 @@ void OColumnControlModel::registerProperties()
 &m_xConnection, ::getCppuType( &m_xConnection ) );
 Any a;
 a <<= m_xColumn;
-// registerMayBeVoidProperty( PROPERTY_COLUMN, PROPERTY_ID_COLUMN, 
PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND| 
PropertyAttribute::MAYBEVOID,
-// &a, ::getCppuType( &m_xColumn ) );
 registerProperty( PROPERTY_COLUMN, PROPERTY_ID_COLUMN, 
PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND,
 &m_xColumn, ::getCppuType( &m_xColumn ) );
 
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx 
b/dbaccess/source/ui/uno/copytablewizard.cxx
index 083acbf..360e2ca 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1502,7 +1502,7 @@ void CopyTableWizard::impl_doCopy_nothrow()
 sColumns.append(aDestColumnNames[aPosIter->second - 1]);
 sColumns.append(sQuote);
 }
-} // for ( ; aPosIter != aColumnMapping.end() ; ++aPosIter )
+}
 ::rtl::OUStringBuffer sSql;
 sSql.appendAscii("INSERT INTO ");
 const ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( 
xDestMetaData, _xTable, ::dbtools::eInDataManipulation, false, false, true );
-- 
1.7.2.2

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

[Libreoffice] [PATCH] More dead code and spelling mistakes for Base

[Wols Lists]

Cheers,
Wol
>From c283a346e58711f6d8967d8684eab775cbd3ffd6 Mon Sep 17 00:00:00 2001
From: Wol 
Date: Wed, 24 Nov 2010 01:07:16 +
Subject: [PATCH 4/4] Dead code and spelling mistakes

---
 dbaccess/source/ui/browser/brwctrlr.cxx  |   36 ++
 dbaccess/source/ui/browser/dsEntriesNoExp.cxx|2 +-
 dbaccess/source/ui/browser/exsrcbrw.cxx  |4 +-
 dbaccess/source/ui/browser/genericcontroller.cxx |   12 ++-
 dbaccess/source/ui/browser/sbagrid.cxx   |   42 ++
 dbaccess/source/ui/browser/unodatbr.cxx  |   11 ++
 6 files changed, 25 insertions(+), 82 deletions(-)

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx 
b/dbaccess/source/ui/browser/brwctrlr.cxx
index 5fb791d..bfa82e3 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1209,31 +1209,17 @@ void SbaXDataBrowserController::propertyChange(const 
PropertyChangeEvent& evt) t
 // the filter or the sort criterias have changed ? -> update our parser
 if (evt.PropertyName.equals(PROPERTY_ACTIVECOMMAND))
 {
-  //  if (m_xParser.is())
-//DO_SAFE( 
m_xParser->setElementaryQuery(::comphelper::getString(evt.NewValue)), 
"SbaXDataBrowserController::propertyChange : could not forward the new query to 
my parser !" );
 }
 else if (evt.PropertyName.equals(PROPERTY_FILTER))
 {
-  //  if ( m_xParser.is() && m_xParser->getFilter() != 
::comphelper::getString(evt.NewValue))
-//{
-// DO_SAFE( 
m_xParser->setFilter(::comphelper::getString(evt.NewValue)), 
"SbaXDataBrowserController::propertyChange : could not forward the new filter 
to my parser !" );
-//}
 InvalidateFeature(ID_BROWSER_REMOVEFILTER);
 }
 else if (evt.PropertyName.equals(PROPERTY_HAVING_CLAUSE))
 {
-//if ( m_xParser.is() && m_xParser->getHavingClause() != 
::comphelper::getString(evt.NewValue))
-//{
-// DO_SAFE( 
m_xParser->setHavingClause(::comphelper::getString(evt.NewValue)), 
"SbaXDataBrowserController::propertyChange : could not forward the new filter 
to my parser !" );
-//}
 InvalidateFeature(ID_BROWSER_REMOVEFILTER);
 }
 else if (evt.PropertyName.equals(PROPERTY_ORDER))
 {
-//if ( m_xParser.is() && m_xParser->getOrder() != 
::comphelper::getString(evt.NewValue))
-//{
-// DO_SAFE( 
m_xParser->setOrder(::comphelper::getString(evt.NewValue)), 
"SbaXDataBrowserController::propertyChange : could not forward the new order to 
my parser !" );
-//}
 InvalidateFeature(ID_BROWSER_REMOVEFILTER);
 }
 
@@ -1806,7 +1792,6 @@ void SbaXDataBrowserController::applyParserOrder(const 
::rtl::OUString& _rOldOrd
 if (!bSuccess)
 {
 xFormSet->setPropertyValue(PROPERTY_ORDER, makeAny(_rOldOrder));
-//DO_SAFE( _xParser->setOrder(_rOldOrder), 
"SbaXDataBrowserController::applyParserOrder: could not restore the old order 
of my parser !" );
 
 try
 {
@@ -1914,8 +1899,6 @@ void 
SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter)
 String aFilter;
 if(!aDlg.Execute())
 {
-//m_xParser->setFilter(sOldVal);
-//m_xParser->setHavingClause(sOldHaving);
 return; // if so we don't need to actualize the grid
 }
 aDlg.BuildWherePart();
@@ -1926,7 +1909,6 @@ void 
SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter)
 String aOrder;
 if(!aDlg.Execute())
 {
-//m_xParser->setOrder(sOldVal);
 return; // if so we don't need to actualize the grid
 }
 aDlg.BuildOrderPart();
@@ -2535,7 +2517,7 @@ IMPL_LINK(SbaXDataBrowserController, 
OnSearchContextRequest, FmSearchContext*, p
 if (!xCurrentColumn.is())
 continue;
 
-// can we use this column control fo searching ?
+// can we use this column control for searching ?
 if (!IsSearchableControl(xCurrentColumn))
 continue;
 
@@ -2621,7 +2603,7 @@ IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound, 
FmFoundRecordInformatio
 
 try
 {
-// let the grid snyc it's display with the cursor
+// let the grid snyc its display with the cursor
 Reference< XPropertySet >  xModelSet(getControlModel(), UNO_QUERY);
 DBG_ASSERT(xModelSet.is(), 
"SbaXDataBrowserController::OnCanceledNotFound : no model set ?!");
 Any aOld = 
xModelSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayIsSynchron")));
@@ -2739,21 +2721,11 @@ void SbaXDataBrowserController::unloaded(const 
EventObject& /*aEvent*/) throw( R
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "ocke.jans...@sun.com", 
"SbaXDataBrowserController::unloaded" );
 m_xParser.clear();
 InvalidateAll();
-// do this asynchron, there are o

[Libreoffice] [PATCH] More spelling mistakes and dead code removal for Base

[Wols Lists]

Cheers,
Wol
>From f50ae7db959563618b0d8288bb7537939c6f2195 Mon Sep 17 00:00:00 2001
From: Wol 
Date: Wed, 24 Nov 2010 01:50:15 +
Subject: [PATCH 5/5] Spelling mistakes and dead code

---
 dbaccess/source/ui/dlg/CollectionView.cxx |1 -
 dbaccess/source/ui/dlg/ConnectionHelper.cxx   |6 +++---
 dbaccess/source/ui/dlg/ConnectionPage.cxx |2 +-
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |   14 ++
 dbaccess/source/ui/dlg/DbAdminImpl.cxx|2 --
 dbaccess/source/ui/dlg/ExtensionNotPresent.cxx|   13 -
 dbaccess/source/ui/dlg/adtabdlg.cxx   |2 +-
 dbaccess/source/ui/dlg/dbadmin.cxx|2 --
 dbaccess/source/ui/dlg/dbwizsetup.cxx |6 ++
 dbaccess/source/ui/dlg/dlgattr.cxx|4 
 dbaccess/source/ui/dlg/generalpage.cxx|3 +--
 dbaccess/source/ui/dlg/indexdialog.cxx|   12 
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx |1 -
 dbaccess/source/ui/dlg/queryfilter.cxx|5 +
 14 files changed, 11 insertions(+), 62 deletions(-)

diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx 
b/dbaccess/source/ui/dlg/CollectionView.cxx
index 6eccad4..2b8ab81 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -211,7 +211,6 @@ IMPL_LINK( OCollectionView, Save_Click, PushButton*, 
EMPTYARG )
 QueryBox aBox( this, WB_YES_NO, ModuleRes( 
STR_ALREADYEXISTOVERWRITE ) );
 if ( aBox.Execute() != RET_YES )
 return 0;
-// xNameContainer->removeByName(sName);
 }
 m_aName.SetText(sName);
 EndDialog( TRUE );
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx 
b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 36c3979..a21dff0 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -446,7 +446,7 @@ DBG_NAME(OConnectionHelper)
 {
 if ( m_pCollection->isFileSystemBased( m_eType ) )
 {
-// get the tow parts: prefix and file URL
+// get the two parts: prefix and file URL
 String sTypePrefix, sFileURLEncoded;
 if ( _bPrefix )
 {
@@ -492,7 +492,7 @@ DBG_NAME(OConnectionHelper)
 {
 if ( m_pCollection->isFileSystemBased( m_eType ) )
 {
-// get the tow parts: prefix and file URL
+// get the two parts: prefix and file URL
 String sTypePrefix, sFileURLDecoded;
 if ( _bPrefix )
 {
@@ -742,7 +742,7 @@ DBG_NAME(OConnectionHelper)
 return 1L; // handled
 }
 break;
-} // switch (_rNEvt.GetType())
+}
 }
 
 return OGenericAdministrationPage::PreNotify( _rNEvt );
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx 
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index af1745c..7293cce 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -268,7 +268,7 @@ namespace dbaui
 m_aJavaDriver.SetText(sDefaultJdbcDriverName);
 m_aJavaDriver.SetModifyFlag();
 }
-} // if ( !pJdbcDrvItem->GetValue().Len() )
+}
 else
 m_aJavaDriver.SetText(pJdbcDrvItem->GetValue());
 
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx 
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 75c0bdd..2bc0954 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -73,14 +73,6 @@ namespace dbaui
 {
 //.
 using namespace ::com::sun::star;
-// using namespace ::com::sun::star::ucb;
-// using namespace ::com::sun::star::ui::dialogs;
-// using namespace ::com::sun::star::sdbc;
-// using namespace ::com::sun::star::beans;
-// using namespace ::com::sun::star::lang;
-// using namespace ::com::sun::star::container;
-// using namespace ::dbtools;
-// using namespace ::svt;
 
 OGenericAdministrationPage*
OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& 
_rAttrSet )
 {
@@ -218,7 +210,6 @@ DBG_NAME(OTextConnectionPageSetup)
 bChangedSomething = sal_True;
 }
 
-// fillString(_rSet,&m_aETHostServer, DSID_CONNECTURL, 
bChangedSomething);
 fillBool(_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething);
 return bChangedSomething;
 }
@@ -664,8 +655,8 @@ DBG_NAME(OMySQLIntroPageSetup)
 {
 m_aETDriverClass.SetText(sDefaultJdbcDriverName);
 m_aETDriverClass.SetModifyFlag

Re: [Libreoffice] Git question again

[Wols Lists]

On 24/11/10 21:42, Julien Nabet wrote:
> Hello,
>
> I'm a little lost with git again now.
> Yesterday, i made first patches by using :
> git commit -a
>
> git format-patch HEAD~1
>
>
> Now i do :
> bin/g pull -r
>
> and i got this :
> = components =
> usage: git merge-base [-a|--all]  ...
>
> -a, --all outputs all common ancestors
>
> usage: git merge-base [-a|--all]  ...
>
> -a, --all outputs all common ancestors
> ...
>
> You are not currently on a branch, so I cannot use any
> 'branch..merge' in your configuration file.
> Please specify which remote branch you want to use on the command
> line and try again (e.g. 'git pull  ').
> See git-pull(1) for details.
>
>
> I don't understand why it talks about "branch". I don't want to merge
> anything, i just want to fetch the last version of the main repository.

You should be on the "master" branch. Sounds like something's gone
wrong. Type "git branch" where you are, to see what's going on.
>
> Could anybody help me ?

Does that help a bit? To fix things further, you shouldn't be doing your
changes on master - it makes life a little difficult :-)

Go to http://wiki.documentfoundation.org/Development and look at
"Managing git branches". Do *all* your development on a feature branch,
they're incredibly cheap performance-wise, and they make it so much
easier when  you're faffing about with patches. And if you mess up,
they're so much easier to throw away! :-) You don't need to wipe your
development directory and re-pull the entire thing :-)

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

Re: [Libreoffice] Git question again

[Wols Lists]

On 24/11/10 22:07, Julien Nabet wrote:
> Le 24/11/2010 23:03, Miklos Vajna a écrit :
>> On Wed, Nov 24, 2010 at 10:42:58PM +0100, Julien
>> Nabet  wrote:
>>   
>>> Now i do :
>>> bin/g pull -r
>>>
>>> and i got this :
>>> = components =
>>> usage: git merge-base [-a|--all]  ...
>>>
>>>   -a, --all outputs all common ancestors
>>>
>>> usage: git merge-base [-a|--all]  ...
>>>
>>>   -a, --all outputs all common ancestors
>>> ...
>>>
>>> You are not currently on a branch, so I cannot use any
>>>  
>> It's not obvious for me, either. Maybe you did something else as well
>> what you forgot to mention. :) What is the output of git branch in
>> 'rawbuild/components'? if it's not "* master", then use 'git checkout
>> master' to switch to master, then g pull -r should work.
>>
> Here what i've got :
> ser...@serval:~/libreoffice-source/build/clone$ git branch
> * master
> ser...@serval:~/libreoffice-source/build/clone$ cd components/
> ser...@serval:~/libreoffice-source/build/clone/components$ git branch
> * (no branch)
>   master
> ser...@serval:~/libreoffice-source/build/clone/components$ cd cui/
> ser...@serval:~/libreoffice-source/build/clone/components/cui$ git branch
> * (no branch)
>   master
> ser...@serval:~/libreoffice-source/build/clone/components/cui$ cd source/
> ser...@serval:~/libreoffice-source/build/clone/components/cui/source$
> git branch
> * (no branch)
>   master
> ser...@serval:~/libreoffice-source/build/clone/components/cui/source$
> cd customize/
> ser...@serval:~/libreoffice-source/build/clone/components/cui/source/customize$
> git branch
> * (no branch)
>   master

Rather than cd'ing into each branch you can "bin/g branch" and it'll
list all the branches for all the subdirectories.

Fix your current problem with "bin/g checkout master". Just be careful,
because you could easily lose any changes you've made to your "no
branch" branch :-)
>
> I call git branch on the different subdirectories because i don't know
> if you can have "master" at the top level and  at
> another level

I do. Whether it's a good idea or not, I don't know, but when working in
a subdirectory I will happily do a "git checkout -b newbranch". But when
I'm resync'ing with upstream I *always* do a "bin/g checkout master" to
make sure all subdirectories are reset to master. Then I'll recheckout
my newbranch in just that subdirectory to carry on working.

btw, you do know how to use "git --help"? eg "git branch --help" will
tell you all about the git branch command?

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

[Libreoffice] [PATCH] Another Base spelling, dead code patch

[Wols Lists]

Cheers,
Wol
>From 024ac9b3bd2c83d8cec89edd3aa5149c8e031261 Mon Sep 17 00:00:00 2001
From: Wol 
Date: Thu, 25 Nov 2010 01:16:20 +
Subject: [PATCH 2/2] Spelling, dead code removal

---
 .../source/ui/querydesign/ConnectionLineAccess.cxx |1 -
 dbaccess/source/ui/querydesign/JoinDesignView.cxx  |1 -
 dbaccess/source/ui/querydesign/JoinTableView.cxx   |   10 
 .../source/ui/querydesign/QTableConnection.cxx |6 -
 .../source/ui/querydesign/QTableConnectionData.cxx |3 --
 dbaccess/source/ui/querydesign/QTableWindow.cxx|5 +---
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |   20 +---
 .../source/ui/querydesign/QueryTabWinUndoAct.cxx   |4 ---
 dbaccess/source/ui/querydesign/QueryTableView.cxx  |7 +-
 dbaccess/source/ui/querydesign/QueryTextView.cxx   |1 -
 .../source/ui/querydesign/SelectionBrowseBox.cxx   |   23 +++-
 .../source/ui/querydesign/TableConnectionData.cxx  |1 -
 dbaccess/source/ui/querydesign/TableWindow.cxx |2 +-
 .../source/ui/querydesign/TableWindowAccess.cxx|1 -
 .../source/ui/querydesign/TableWindowListBox.cxx   |4 ---
 .../source/ui/querydesign/TableWindowTitle.cxx |   12 --
 .../source/ui/querydesign/querycontainerwindow.cxx |   11 -
 dbaccess/source/ui/querydesign/querycontroller.cxx |   14 ++-
 dbaccess/source/ui/querydesign/querydlg.cxx|2 -
 19 files changed, 21 insertions(+), 107 deletions(-)

diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx 
b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 0a0419c..8cdf8a6 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -46,7 +46,6 @@ namespace dbaui
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
-// using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star;
 
 OConnectionLineAccess::OConnectionLineAccess(OTableConnection* _pLine)
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx 
b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 17ad8bd..86545a6 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -95,7 +95,6 @@ void OJoinDesignView::Construct()
 // 
-
 void OJoinDesignView::initialize()
 {
-// getAddTableDialog()->Update();
 }
 // -
 void OJoinDesignView::resizeDocumentView(Rectangle& _rPlayground)
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx 
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 1437a57..3a9552e 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -171,8 +171,6 @@ void OScrollWindowHelper::Resize()
 // class OJoinTableView
 //==
 
-//const long WINDOW_WIDTH = 1000;
-//const long WINDOW_HEIGHT = 1000;
 DBG_NAME(OJoinTableView);
 
//--
 OJoinTableView::OJoinTableView( Window* pParent, OJoinDesignView* pView )
@@ -466,7 +464,6 @@ namespace
 Point aUpperLeft = _rPoint;
 // normalize with respect to visibility
 aUpperLeft -= _pView->GetScrollOffset();
-// aUpperLeft.Y() -= _pView->GetScrollOffset().Y();
 Point aLowerRight(aUpperLeft.X() + _rSize.Width(), aUpperLeft.Y() + 
_rSize.Height());
 
 // data about ourself
@@ -485,7 +482,6 @@ namespace
 _nScrollX = aLowerRight.X() - aSize.Width() + 
TABWIN_SPACING_X;
 
 // ensure the visibility of the left border (higher priority)
-// if ( (aUpperLeft.X() - _nScrollX) < 0 )
 if ( aUpperLeft.X() < 0 )
 _nScrollX = aUpperLeft.X() - TABWIN_SPACING_X;
 }
@@ -496,7 +492,6 @@ namespace
 if ( aLowerRight.Y() > aSize.Height() )
 _nScrollY = aLowerRight.Y() - aSize.Height() + 
TABWIN_SPACING_Y;
 // upper border
-// if ( (aUpperLeft.Y() - _nScrollY) < 0 )
 if ( aUpperLeft.Y() < 0 )
 _nScrollY = aUpperLeft.Y() - TABWIN_SPACING_Y;
 }
@@ -534,7 +529,6 @@ void OJoinTableView::EnsureVisible(const OTableWindow* 
_pWin)
 {
 // data about the tab win
 TTableWindowData::value_type pData = _pWin->GetData();
-// Point aUpperLeft = pData->GetPosition();
 EnsureVisible( pData->GetPosition() , pData->GetSize());
 Invalidate(INVALIDATE_NOCHILDREN);
 }
@@ -1228,10 +1222,6 @@ BOOL OJoinTableView::IsAddAllowed()
 return FALSE;
 }
 
-// nicht wenn keine Joins moeglich
-// if

Re: [Libreoffice] Are ISC/BSD-licensed contributions acceptable?

[Wols Lists]

On 23/11/10 15:15, Sebastian Spaeth wrote:
> While I personally don't mind BSD licenses, I don't think this helps
> your goal. The code is bound to be merged, overwritten, copied, moved
> and edited. Tracking which line of code is licensed under which license
> combo is a job for lawyer detectives that nobody wants to pay in the
> end. And most probably they could not give you definitive answers anyway
> as that case has never been tested in court in $LEGAL_DISTRICT. Pfeew.

But that's the point of using something like git :-)

> Can't we just bite our tongues and stick to as simple (ie dual license
> although I still don't see the use case for the MPL here) licensing
> scheme? For historical reasons we cannot go BSD, so we should go for the
> next best thing and use the very liberal LGPL consistently IMHO. Adding
> in bits of even more liberal license pieces isn't going to help the
> whole legal clarity and ease of sharing argument here.

Provided we have a policy that says "the project licence is X, all
contributions must be compatible" I don't see that it matters WHAT
licence contributors use. If the project policy is LGPL3+, then I don't
think it actually makes a blind bit of difference what other licences
people use.

It's tricky, but imho the rule should be if you make a major
contribution to a file then you add your copyright notice. In general,
patches, fixes, etc shouldn't. And possibly we add a line that says
"copyright assorted contributors - see git history for details".

BUT. As far as my contributions so far are concerned I don't even know
if they are significant enough to be worthy of copyright! If I was asked
to assign a licence I would say BSD but even that's overkill for what I
think they're worth :-)

> Sorry, could not resist
> Sebastian
We want to get it right. If not, we could be storing up legal trouble
down the line. But at the end of the day, if the consensus is that we
want to be an LGPL project, then simply saying "all contributions must
be LGPL3+ compatible" keeps us out of trouble. If contributors want to
use BSD etc why should we care? And if third parties want to extract
said BSD code, why should we make their life easy (or hard :-) ? If they
want the code, it's their problem :-)

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

[Libreoffice] [PATCH] Another Base cleanup

[Wols Lists]

Cheers,
Wol
>From 6642a11fbcfa7f2f4f35f5535ffe8c33fa856309 Mon Sep 17 00:00:00 2001
From: Wol 
Date: Thu, 25 Nov 2010 13:04:08 +
Subject: [PATCH 4/4] Dead code deletion

---
 dbaccess/source/ui/querydesign/JoinDesignView.cxx  |1 -
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |1 -
 dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx |9 -
 .../source/ui/tabledesign/TableFieldControl.cxx|3 ---
 .../source/ui/tabledesign/TableFieldDescWin.cxx|1 -
 dbaccess/source/ui/tabledesign/TableRow.cxx|4 +---
 .../source/ui/tabledesign/TableRowExchange.cxx |7 ---
 dbaccess/source/ui/tabledesign/TableUndo.cxx   |3 ---
 8 files changed, 1 insertions(+), 28 deletions(-)

diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx 
b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 86545a6..f917f00 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -49,7 +49,6 @@
 #include 
 #include "UITools.hxx"
 #include "JoinTableView.hxx"
-// #include 
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx 
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 920fb54..1e1aa76 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -375,7 +375,6 @@ namespace
 {
 ::rtl::OUString aDBName(pEntryTab->GetComposedName());
 
-// Reference< XConnection> xConnection = 
static_cast(_pView->getController()).getConnection();
 if( _xConnection.is() )
 {
 try
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx 
b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index 05384fd..b0fc9c5 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -110,11 +110,6 @@ OTableEditorCtrl* OFieldDescGenWin::GetEditorCtrl()
 }
 #endif
 
//--
-//short OFieldDescGenWin::GetFormatCategory(OFieldDescription* pFieldDescr)
-//{
-// return m_pFieldControl->GetFormatCategory(pFieldDescr);
-//}
-//--
 void OFieldDescGenWin::SaveData( OFieldDescription* pFieldDescr )
 {
 DBG_CHKTHIS(OFieldDescGenWin,NULL);
@@ -184,8 +179,4 @@ void OFieldDescGenWin::paste()
 }
 // 
-
 
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx 
b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index 60cc7ea..65b0dfc 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -153,7 +153,4 @@ sal_Bool OTableFieldControl::isAutoIncrementValueEnabled() 
const
 }
 // 
-
 
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx 
b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index d5dab97..bf506d1 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -317,5 +317,4 @@ long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt )
 return bHandled ? 1L : TabPage::PreNotify(rNEvt);
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx 
b/dbaccess/source/ui/tabledesign/TableRow.cxx
index 568e7c3..1ca7d53 100644
--- a/dbaccess/source/ui/tabledesign/TableRow.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRow.cxx
@@ -156,7 +156,7 @@ namespace dbaui
 _rStr << sal_Int32(pFieldDesc->IsAutoIncrement() ? 1 : 0);
 _rStr << sal_Int32(pFieldDesc->IsPrimaryKey() ? 1 : 0);
 _rStr << sal_Int32(pFieldDesc->IsCurrency() ? 1 : 0);
-} // if(pFieldDesc)
+}
 else
 _rStr << (sal_Int32)0;
 return _rStr;
@@ -226,6 +226,4 @@ namespace dbaui
 // 
-
 }
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx 
b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index 6eabff9..249698c 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -81,11 +81,4 @@ namespace dbaui
 // 
-
 }
 
-
-
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx 
b/dbaccess/source/ui/tabledesign/TableUndo.cxx
ind

Re: [Libreoffice] Are ISC/BSD-licensed contributions acceptable?

[Wols Lists]

On 25/11/10 14:47, Sebastian Spaeth wrote:
> Because it makes lifes more complex, see above? Do you really want
> file.cxx to start like this? 
>
> /** 45 lines of this code come from Wol, who licensed them under the
>  * BSD. But when you are reading this, it has been merged with 10 lines
>  * contributed under the Apache license, which is probably be moot 
>  * because 5 lines of those had their variables renamed by a guy who 
>  * happened to like the WTFPL. 
>  * Parts of these things were perhaps copied into file2.cxx during 
>  * refactoring by someone contributing under the lzlib
>  * artistic license/CC-0 dual licensing. Have a nice day.  **/
>
I hadn't thought of refactoring ... :-)

But I think the basics should be that (a) it has to be LGPL-compatible,
and (b) unless it is a major alteration/addition you don't get to monkey
with the licence on the file.

I like playing with legalese, although we'd need a proper lawyer to go
over it. That said, I've found plenty mistakes checking a lawyer's work :-)

Have we got a standard LibreOffice header to go into new files? If not,
I'm quite happy to craft one, along with a policy that tells people what
to do and how we expect them to claim any relevant copyrights. And yes,
I would very much take into considerations concerns about keeping the
list of people low, we don't want too many names in the files or too
many licences in the licence file. Basically, minor changes you have to
look at git, licences mustn't explicitly name a copyright holder.

Would you like me to have a go?

Cheers,
Wol

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

Re: [Libreoffice] Are ISC/BSD-licensed contributions acceptable?

[Wols Lists]

On 25/11/10 16:44, Michael Meeks wrote:
> Hi Wols,
>
> On Thu, 2010-11-25 at 16:31 +0000, Wols Lists wrote:
>> Have we got a standard LibreOffice header to go into new files ?
>   Yes COPYING.NEWFILES in the toplevel has the stock header.

With no place for people who make MAJOR alterations to the file to add
their own copyright ... :-)

That just doesn't feel quite right to me. Oh well.
>>  If not, I'm quite happy to craft one, along with a policy that tells people 
>> what
>> to do and how we expect them to claim any relevant copyrights. And yes,
>> I would very much take into considerations concerns about keeping the
>> list of people low, we don't want too many names in the files or too
>> many licences in the licence file. Basically, minor changes you have to
>> look at git, licences mustn't explicitly name a copyright holder.
>   Really; not mixing licenses within the same file is much to be
> preferred; and if people insist on XYZ crazy-license, to have LGPLv3
> +/MPL/ as a triple would be best.
>   
:-)

Couple of other points - reading COPYING.NEWFILES it comes over as the
main licence is MPL1.1, yet there's no COPYING.MPL file. Should that be
added? Plus I get the impression the main licence is meant to be LGPL :-)

Personally, I also find putting the licence in the COPYING file a bit
weird, but lilypond does exactly the same, so I guess that's normal
practice :-)

Lilypond also has a LICENCE file which actually grants the licence
(without it saying somewhere that it actually applies to the code,
there's no point having a COPYING file containing the GPL or whatever -
yes I know it's in the individual files :-) - shouldn't we also have a
LICENCE file saying that those three licences apply to the entire project?



And I didn't know about COPYING.NEWFILES until you pointed me at it
(yes, I know, I should have done a top level ls and investigated :-) but
there's nothing I can see to say that it's meant to be used for new
files ... given that COPYING files contain licence text, it doesn't
compute that COPYING.NEWFILES contains a template licence grant :-)

I know that in the "old days" all this stuff didn't matter, because
Sun/Oracle required a copyright assignment, but I would have thought
having some form of written policy in place as soon as possible makes
sense. Should I try and codify it as a copyright section on
http://www.documentfoundation.org/develop/ and in a HACKING file, or
would you rather I just went away and left this topic alone? (I don't
want to dive into something that is bound to be contentious without some
backing by others, but this is an itch I'd happily scratch :-).

My ideas basically are:
(a) is the main licence LGPL or MPL - that needs to be made clear -
Oracle's code is LGPL so are we trying to move to MPL or just adding it
as an option?
(b) clarify that only major contributions should merit a copyright
mention in the source files
(c) clarify that git is the primary/definitive source of copyright info
(d) provide guidelines on how to edit the copyright header - for example
what happens if you're doing a major refactor of Oracle and new source ...

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

Re: [Libreoffice] Are ISC/BSD-licensed contributions acceptable?

[Wols Lists]

On 26/11/10 10:43, Michael Meeks wrote:
>> Should I try and codify it as a copyright section on
>> > http://www.documentfoundation.org/develop/ and in a HACKING file, or
>> > would you rather I just went away and left this topic alone? (I don't
>> > want to dive into something that is bound to be contentious without some
>> > backing by others, but this is an itch I'd happily scratch :-).
>   http://lwn.net/Articles/370157/ cf. points 5. and 8. :-)

Okay. I have read that article :-) Point well taken. But I'll also bear
in mind point 3! I mentioned lilypond - I've got a significant change to
the functionality of a module waiting to go in (I don't want to do it
until 2.14 is out) and I had a bit of a shock as to how they handled
copyright. Okay, I'm still putting the stuff in anyway, but I think
they've done several stupid things that could be asking for trouble and
I didn't appreciate getting a post-facto shock!

>   Anyhow - there is some merit in writing something clearer about this;
> please can you write it up, and mail it to me; and we'll get the tech
> steering group to review / edit / approve it.
>
I read Groklaw a lot, which is why I think we should actively try to be
both up-front and correct, but don't worry - as a European I think PJ's
standing advice to (-: ask an attorney before you blow your nose :-) is
rather OTT.

I'll try and do something this weekend (and sorry for not responding
this morning - I don't know whether you do this stuff out-of-hours and
won't see this til Monday) but my internet has been out all day :-(

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

Re: [Libreoffice] Are ISC/BSD-licensed contributions acceptable?

[Wols Lists]

On 26/11/10 09:05, David Tardon wrote:
> I think that's not possible, because some of the filters (like
> WordprocessorML) use XSLT 2.0, which is not supported by libxslt (wasn't
> supported the last time I looked, at least). So either we throw
> out (or rewrite to XSLT 1.0) all XSLT 2.0 filters and declare that we
> only support XSLT 1.0 or we're stuck with saxon (and java).
>
Just throwing an idea out ...

There's a lexer/parser project called Antlr that creates either Java or
C++ back ends. They may (or may not) already have an XSLT 2 parser etc.

Is that worth investigating? If they've got it, it'll give us a tree
"for free" that we'll then have to analyse ourselves.

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

[Libreoffice] [PATCH] More dead code removal for base

[Wols Lists]

Cheers,
Wol
>From a894597c0e3814677d83db3dc64588953a6dadd3 Mon Sep 17 00:00:00 2001
From: Wol 
Date: Sun, 28 Nov 2010 15:52:28 +
Subject: [PATCH 5/5] Remove dead code

---
 reportdesign/source/core/api/FixedLine.cxx |1 -
 reportdesign/source/core/api/FixedText.cxx |4 +-
 reportdesign/source/core/api/FormattedField.cxx|1 -
 reportdesign/source/core/api/Functions.cxx |2 +-
 reportdesign/source/core/api/Group.cxx |   11 +---
 reportdesign/source/core/api/Groups.cxx|4 +-
 reportdesign/source/core/api/ImageControl.cxx  |1 -
 reportdesign/source/core/api/ReportComponent.cxx   |1 -
 .../source/core/api/ReportControlModel.cxx |1 -
 reportdesign/source/core/api/ReportDefinition.cxx  |   70 
 reportdesign/source/core/api/ReportEngineJFree.cxx |4 +-
 reportdesign/source/core/api/Section.cxx   |   28 +---
 reportdesign/source/core/api/Shape.cxx |9 +--
 13 files changed, 24 insertions(+), 113 deletions(-)

diff --git a/reportdesign/source/core/api/FixedLine.cxx 
b/reportdesign/source/core/api/FixedLine.cxx
index 3085c27..522e3c3 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -198,7 +198,6 @@ OFixedLine::~OFixedLine()
 DBG_DTOR(rpt_OFixedLine,NULL);
 }
 // 
-
-//IMPLEMENT_FORWARD_XINTERFACE2(OFixedLine,FixedLineBase,FixedLinePropertySet)
 IMPLEMENT_FORWARD_REFCOUNT( OFixedLine, FixedLineBase )
 // 

 uno::Any SAL_CALL OFixedLine::queryInterface( const uno::Type& _rType ) throw 
(uno::RuntimeException)
diff --git a/reportdesign/source/core/api/FixedText.cxx 
b/reportdesign/source/core/api/FixedText.cxx
index fbc6dce..42dedcc 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -97,7 +97,6 @@ uno::Any SAL_CALL OFixedText::queryInterface( const 
uno::Type& _rType ) throw (u
 return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? 
m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn);
 }
 
-//IMPLEMENT_FORWARD_XINTERFACE2(OFixedText,FixedTextBase,FixedTextPropertySet)
 // 
-
 void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException) 
 {
@@ -119,9 +118,8 @@ void SAL_CALL OFixedText::dispose() 
throw(uno::RuntimeException)
 //--
 uno::Sequence< ::rtl::OUString > OFixedText::getSupportedServiceNames_Static(  
) throw(uno::RuntimeException)
 {
-uno::Sequence< ::rtl::OUString > aServices(1);//2);
+uno::Sequence< ::rtl::OUString > aServices(1);
 aServices.getArray()[0] = SERVICE_FIXEDTEXT;
-//aServices.getArray()[1] = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"));
 
 return aServices;
 }
diff --git a/reportdesign/source/core/api/FormattedField.cxx 
b/reportdesign/source/core/api/FormattedField.cxx
index b8096ca..69c8517 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -91,7 +91,6 @@ OFormattedField::~OFormattedField()
 DBG_DTOR( rpt_OFormattedField,NULL);
 }
 // 
-
-//IMPLEMENT_FORWARD_XINTERFACE2(OFormattedField,FormattedFieldBase,FormattedFieldPropertySet)
 IMPLEMENT_FORWARD_REFCOUNT( OFormattedField, FormattedFieldBase )
 // 

 uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType ) 
throw (uno::RuntimeException)
diff --git a/reportdesign/source/core/api/Functions.cxx 
b/reportdesign/source/core/api/Functions.cxx
index bce09bf..4386db6 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -111,7 +111,7 @@ void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index 
) throw (lang::IndexO
 {
 uno::Reference< report::XFunction > xFunction;
 {
-::osl::MutexGuard aGuard(m_aMutex);
+::osl::MutexGuard aGuard(m_aMutex);
 checkIndex(Index);
 TFunctions::iterator aPos = m_aFunctions.begin();
 ::std::advance(aPos,Index);
diff --git a/reportdesign/source/core/api/Group.cxx 
b/reportdesign/source/core/api/Group.cxx
index f572484..0cdf87c 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -76,13 +76,13 @@ void OGroup::copyGroup(const uno::Reference< report::XGroup 
>& _xSource)
 {
 setHeaderOn(sal_True);
 OSection::lcl_copySection(_xSource->getHeader(),m_xHeader);
-} // if ( _xSource->getHeaderOn() )
+}
 
 if ( _xSource->getFooterOn() )
 

[Libreoffice] [PATCH] yet more dead code in Base ...

[Wols Lists]

Cheers,
Wol
>From a97c72c28cf1a8ddd23f8236dc1a33fa8c1bf3cc Mon Sep 17 00:00:00 2001
From: Wol 
Date: Sun, 28 Nov 2010 16:15:13 +
Subject: [PATCH 3/3] Dead code deletion again

---
 reportdesign/source/core/sdr/PropertyForward.cxx   |2 +-
 reportdesign/source/core/sdr/ReportDrawPage.cxx|1 -
 reportdesign/source/core/sdr/ReportUndoFactory.cxx |1 -
 reportdesign/source/core/sdr/RptModel.cxx  |   11 --
 reportdesign/source/core/sdr/RptObject.cxx |   22 +++
 reportdesign/source/core/sdr/RptObjectListener.cxx |7 --
 reportdesign/source/core/sdr/UndoEnv.cxx   |3 --
 7 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx 
b/reportdesign/source/core/sdr/PropertyForward.cxx
index 7cef3bf..30f8200 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -94,7 +94,7 @@ OPropertyMediator::OPropertyMediator(const Reference< 
XPropertySet>& _xSource
 DBG_UNHANDLED_EXCEPTION();
 (void)e;
 }
-} // if ( m_xDest.is() && m_xSource.is() )
+}
 osl_decrementInterlockedCount(&m_refCount);
 }
 // 
-
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx 
b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index 31c977b..3126c35 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -134,7 +134,6 @@ uno::Reference< drawing::XShape >  
OReportDrawPage::_CreateShape( SdrObject *pOb
 SvxOle2Shape* pShape = new SvxOle2Shape( pObj );
 xShape.set(*pShape,uno::UNO_QUERY);
 pShape->setShapeKind(pObj->GetObjIdentifier());
-//xShape = new SvxOle2Shape( pOle2Obj );
 }
 
 if ( !xShape.is() )
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx 
b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index 0f2fbce..2c77948 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -96,7 +96,6 @@ SdrUndoAction* OReportUndoFactory::CreateUndoInsertObject( 
SdrObject& rObject, b
 SdrUndoAction* OReportUndoFactory::CreateUndoDeleteObject( SdrObject& rObject, 
bool /*bOrdNumDirect*/ )
 {
 return lcl_createUndo(rObject,rptui::Removed,RID_STR_UNDO_DELETE_CONTROL);
-//return m_pUndoFactory->CreateUndoDeleteObject( rObject, bOrdNumDirect ? 
TRUE : FALSE );
 }
 
 SdrUndoAction* OReportUndoFactory::CreateUndoNewObject( SdrObject& rObject, 
bool /*bOrdNumDirect*/ )
diff --git a/reportdesign/source/core/sdr/RptModel.cxx 
b/reportdesign/source/core/sdr/RptModel.cxx
index 689ecd9..3be333a 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -71,13 +71,6 @@ 
OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition
 m_pUndoEnv = new OXUndoEnvironment(*this);
 m_pUndoEnv->acquire();
 SetSdrUndoFactory(new OReportUndoFactory);
-
- //   SvxFontNameToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONT);
-//SvxFontHeightToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT);
-//SvxFontColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR);
-//SvxFontColorExtToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR2);
-
//SvxFontColorExtToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR_BACKGROUND);
-//SvxColorToolBoxControl::RegisterControl(SID_BACKGROUND_COLOR);
 }
 
 //
@@ -134,10 +127,6 @@ void OReportModel::SetModified(sal_Bool _bModified)
 SdrPage* OReportModel::RemovePage(USHORT nPgNum)
 {
 OReportPage* pPage = 
dynamic_cast(SdrModel::RemovePage(nPgNum));
-//if ( pPage )
-//{
-//m_pUndoEnv->RemoveSection(pPage);
-//}
 return pPage;
 }
 // 
-
diff --git a/reportdesign/source/core/sdr/RptObject.cxx 
b/reportdesign/source/core/sdr/RptObject.cxx
index 3f622a4..2552da8 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -230,7 +230,7 @@ namespace
 default:
 OSL_ENSURE(0,"Illegal text alignment value!");
 break;
-} // switch(eParagraphAdjust)
+}
 aRet <<= nTextAlign;
 }
 return aRet;
@@ -251,7 +251,6 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 
_nObjectId)
 
s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter)));
 
s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter)));
  

[Libreoffice] [PATCH] Dead code in Base again ...

[Wols Lists]

 Cheers,
Wol
>From 921e5ca9caf4c8c6212d67c534debc2d93516e7b Mon Sep 17 00:00:00 2001
From: Wol 
Date: Sun, 28 Nov 2010 16:44:32 +
Subject: [PATCH 4/4] More dead code removal

---
 reportdesign/source/filter/xml/dbloader2.cxx   |2 +-
 reportdesign/source/filter/xml/xmlExport.cxx   |   82 +++
 .../source/filter/xml/xmlExportDocumentHandler.cxx |5 +-
 reportdesign/source/filter/xml/xmlHelper.cxx   |   16 
 .../source/filter/xml/xmlImportDocumentHandler.cxx |8 +-
 reportdesign/source/filter/xml/xmlStyleImport.cxx  |1 -
 reportdesign/source/filter/xml/xmlSubDocument.cxx  |5 +-
 reportdesign/source/filter/xml/xmlTable.cxx|4 +-
 reportdesign/source/filter/xml/xmlfilter.cxx   |   34 ++---
 9 files changed, 28 insertions(+), 129 deletions(-)

diff --git a/reportdesign/source/filter/xml/dbloader2.cxx 
b/reportdesign/source/filter/xml/dbloader2.cxx
index 8cfac9f..eb6c253 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -77,7 +77,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< 
XComponentContext > const & xCon
 if ( 
sMediaType.equalsAscii(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII) )
 return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport"));
 ::comphelper::disposeComponent(xProp);
-} // if ( xProp.is() )
+}
 } 
 catch(Exception&)
 {
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index 8c49955..f9186b9 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -284,7 +284,6 @@ ORptExport::ORptExport(const Reference< 
XMultiServiceFactory >& _rxMSF,sal_uInt1
 
xTableStylesPropertySetMapper1->AddMapperEntry(xTableStylesPropertySetMapper2);
 
 m_xTableStylesExportPropertySetMapper = new 
SvXMLExportPropertyMapper(xTableStylesPropertySetMapper1);
-
//m_xTableStylesExportPropertySetMapper->ChainExportMapper(xTableStylesPropertySetMapper2);
 
 m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylePropertyMap();
 m_xCellStylesExportPropertySetMapper = new 
OSpecialHanldeXMLExportPropertyMapper(m_xCellStylesPropertySetMapper);
@@ -298,7 +297,6 @@ ORptExport::ORptExport(const Reference< 
XMultiServiceFactory >& _rxMSF,sal_uInt1
 
 UniReference < XMLPropertySetMapper > xPropMapper(new 
XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA ));
 m_xParaPropMapper = new OSpecialHanldeXMLExportPropertyMapper( 
xPropMapper);
-// 
m_xParaPropMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(*this));
 
 ::rtl::OUString sFamily( GetXMLToken(XML_PARAGRAPH) );
 ::rtl::OUString aPrefix( String( 'P' ) );
@@ -405,13 +403,12 @@ void ORptExport::exportReport(const 
Reference& _xReportDefini
 {
 exportFunctions(_xReportDefinition->getFunctions().get());
 exportGroupsExpressionAsFunction(_xReportDefinition->getGroups());
-//exportMasterDetailFields(_xReportDefinition.get());
 
 if ( _xReportDefinition->getReportHeaderOn() )
 {
 SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, 
XML_REPORT_HEADER, sal_True, sal_True);
 exportSection(_xReportDefinition->getReportHeader());
-} // if ( _xReportDefinition->getReportHeaderOn() )
+}
 if ( _xReportDefinition->getPageHeaderOn() )
 {
 ::rtl::OUStringBuffer sValue;
@@ -422,7 +419,7 @@ void ORptExport::exportReport(const 
Reference& _xReportDefini
 
 SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, 
XML_PAGE_HEADER, sal_True, sal_True);
 exportSection(_xReportDefinition->getPageHeader(),true);
-} // if ( _xReportDefinition->getPageHeaderOn() )
+}
 
 exportGroup(_xReportDefinition,0);
 
@@ -435,13 +432,13 @@ void ORptExport::exportReport(const 
Reference& _xReportDefini
 AddAttribute(XML_NAMESPACE_REPORT, 
XML_PAGE_PRINT_OPTION,sValue.makeStringAndClear());
 SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, 
XML_PAGE_FOOTER, sal_True, sal_True);
 exportSection(_xReportDefinition->getPageFooter(),true);
-} // if ( _xReportDefinition->getPageFooterOn() )
+}
 if ( _xReportDefinition->getReportFooterOn() )
 {
 SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, 
XML_REPORT_FOOTER, sal_True, sal_True);
 exportSection(_xReportDefinition->getReportFooter());
-} // if ( _xReportDefinition->getReportFooterOn() )
-}  
+}
+}
 }
 // 
-
 void ORptExport::exportComponent(const Reference& 
_xReportComponent)
@@ -472,7 +469,7 @@ void ORptExport::exportFormatCondi

[Libreoffice] [PATCH] More dead code removed

[Wols Lists]

 Cheers,
Wol
>From 7b9d332d03d4e3db163303f243b17ac2737b9da8 Mon Sep 17 00:00:00 2001
From: Wol 
Date: Sun, 28 Nov 2010 21:00:43 +
Subject: [PATCH 5/5] More dead code deletion

---
 reportdesign/source/ui/dlg/Condition.cxx |7 +++
 reportdesign/source/ui/dlg/DateTime.cxx  |2 --
 reportdesign/source/ui/dlg/Formula.cxx   |4 ++--
 reportdesign/source/ui/dlg/GroupsSorting.cxx |   15 +--
 reportdesign/source/ui/dlg/Navigator.cxx |2 +-
 reportdesign/source/ui/dlg/dlgpage.cxx   |4 
 6 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/reportdesign/source/ui/dlg/Condition.cxx 
b/reportdesign/source/ui/dlg/Condition.cxx
index 2fae51b..b52d8d8 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -106,7 +106,7 @@ IMPL_LINK( ConditionField, OnFormula, Button*, 
/*_pClickedButton*/ )
 {
 ReportFormula aFormula( sFormula );
 sFormula = aFormula.getCompleteFormula();
-} // if ( nLen )
+}
 uno::Reference< awt::XWindow> xInspectorWindow = 
VCLUnoHelper::GetInterface(this);
 uno::Reference< beans::XPropertySet> 
xProp(m_pParent->getController().getRowSet(),uno::UNO_QUERY);
 if ( rptui::openDialogFormula_nothrow( sFormula, 
m_pParent->getController().getContext(),xInspectorWindow,xProp ) )
@@ -212,7 +212,7 @@ void OColorPopup::SetSlotId(USHORT _nSlotId)
 {
 m_aColorSet.SetStyle( m_aColorSet.GetStyle() | WB_NONEFIELD );
 m_aColorSet.SetText( String(ModuleRes( STR_TRANSPARENT )) );
-} // if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || 
SID_BACKGROUND_COLOR == theSlotId )
+}
 }
 // 
-
 IMPL_LINK( OColorPopup, SelectHdl, void *, EMPTYARG )
@@ -343,7 +343,7 @@ IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ 
)
 break;
 default:
 break;
-} // switch(nId)
+}
 if ( nTextId )
 m_pColorFloat->SetText(String(ModuleRes(nTextId)));
 m_pColorFloat->SetSlotId(nId);
@@ -427,7 +427,6 @@ void Condition::StateChanged( StateChangedType nType )
 {
 // The physical toolbar changed its outlook and shows another logical 
toolbar!
 // We have to set the correct high contrast mode on the new tbx 
manager.
-//  pMgr->SetHiContrast( IsHiContrastMode() );
 checkImageList();
 }
 }
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx 
b/reportdesign/source/ui/dlg/DateTime.cxx
index f6d24cc..44ef206 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -241,12 +241,10 @@ sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) 
const
 sal_Int32 nFormatKey;
 if ( _bDate )
 {
- //nFormat = m_aDateF1.IsChecked() ? 
i18n::NumberFormatIndex::DATE_SYSTEM_LONG : (m_aDateF2.IsChecked() ? 
i18n::NumberFormatIndex::DATE_SYS_DMMM : 
i18n::NumberFormatIndex::DATE_SYSTEM_SHORT);
  nFormatKey = 
static_cast(reinterpret_cast(m_aDateListBox.GetEntryData(
 m_aDateListBox.GetSelectEntryPos() )));
 }
 else
 {
-// nFormat = m_aTimeF1.IsChecked() ? 
i18n::NumberFormatIndex::TIME_HHMMSS : (m_aTimeF2.IsChecked() ? 
i18n::NumberFormatIndex::TIME_HHMMSSAMPM : i18n::NumberFormatIndex::TIME_HHMM);
  nFormatKey = 
static_cast(reinterpret_cast(m_aTimeListBox.GetEntryData(
 m_aTimeListBox.GetSelectEntryPos() )));
 }
 return nFormatKey;
diff --git a/reportdesign/source/ui/dlg/Formula.cxx 
b/reportdesign/source/ui/dlg/Formula.cxx
index d18105d..7dcd550 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -218,7 +218,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, 
RefButton* _pButton)
 }
 
 m_pAddField->Update();
-} // if ( !m_pAddField )
+}
 RefInputStartAfter( aPair.second, aPair.first );
 m_pAddField->Show();
 
@@ -240,7 +240,7 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* 
,_pAddFieldDlg)
 sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("[")) + sName 
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
 m_pEdit->SetText(sName);
 }
-} // if ( m_pEdit && aArgs.getLength() )
+}
 m_pEdit = NULL;
 _pAddFieldDlg->Hide();
 RefInputDoneAfter( TRUE );
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx 
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index aff0b4f..992cb77 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -341,11 +341,11 @@ void OFieldExpressionControl::moveGroups(const 
uno::Sequence& _aGroups
 
m_pParent->m_pController->executeChecked(SID_GROUP_APPEND,aArgs);
 ++nRow;
 }
-} // for(;pIter != pEnd;++pIter)
+}
 }
 m_bIgnoreEvent = false;
 Invalidate();
-   

[Libreoffice] [PATCH] And yet more dead code gone ...

[Wols Lists]

Cheers,
Wol
>From 80e48ddcd8d78241849f5e3bdb767477c7c6c9b3 Mon Sep 17 00:00:00 2001
From: Wol 
Date: Sun, 28 Nov 2010 21:16:29 +
Subject: [PATCH 6/6] More dead code deleted

---
 .../source/ui/inspection/DataProviderHandler.cxx   |   14 +++---
 .../source/ui/inspection/GeometryHandler.cxx   |4 ++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx 
b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index d1756b1..b8475fb 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -169,13 +169,6 @@ void SAL_CALL DataProviderHandler::inspect(const 
uno::Reference< uno::XInterface
 
 m_xMasterDetails = new OPropertyMediator( m_xDataProvider.get(), 
m_xReportComponent.get(), aPropertyMediation,sal_True );
 }
-
-//const ::rtl::OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet"));
-//if ( xNameCont->hasByName(sRowSet) )
-//{
-//uno::Reference 
xProp(m_xFormComponentHandler,uno::UNO_QUERY);
-//xProp->setPropertyValue(sRowSet,xNameCont->getByName(sRowSet));
-//}
 }
 catch(uno::Exception)
 {
@@ -271,7 +264,7 @@ void DataProviderHandler::impl_updateChartTitle_throw(const 
uno::Any& _aValue)
 aArgs[0] = xFormatted;
 xTitle->setText(aArgs);
 }
-} // if ( xTitled.is() )
+}
 }
 
 beans::PropertyState SAL_CALL DataProviderHandler::getPropertyState(const 
::rtl::OUString & PropertyName) throw (uno::RuntimeException, 
beans::UnknownPropertyException)
@@ -396,7 +389,6 @@ uno::Sequence< beans::Property > SAL_CALL 
DataProviderHandler::getSupportedPrope
 ,PROPERTY_MASTERFIELDS
 ,PROPERTY_DETAILFIELDS
 ,PROPERTY_PREVIEW_COUNT
-//,PROPERTY_TITLE
 };
 
 for (size_t nPos = 0; nPos < SAL_N_ELEMENTS(s_pProperties) ;++nPos )
@@ -480,9 +472,9 @@ void SAL_CALL 
DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUStrin
 xReceiver->setArguments( aArgs.getPropertyValues() );
 if ( !bModified )
 xReport->setModified(sal_False);
-} // if ( NewValue != OldValue )
+}
 
m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, 
NewValue, OldValue, InspectorUI, FirstTimeInit);
-} // if ( ActuatingPropertyName == PROPERTY_COMMAND )
+}
 else if ( ActuatingPropertyName == PROPERTY_TITLE )
 {
 if ( NewValue != OldValue )
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx 
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 8b293a7..1d76432 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -133,11 +133,11 @@ struct PropertyCompare : public ::std::binary_function< 
beans::Property, ::rtl::
 {
 bool operator() (const beans::Property& x, const ::rtl::OUString& y) const
 {
-return x.Name.equals(y);// ? true : false;
+return x.Name.equals(y);
 }
 bool operator() (const ::rtl::OUString& x,const beans::Property& y) const
 {
-return x.equals(y.Name);// ? true : false;
+return x.equals(y.Name);/
 }
 };
 
-- 
1.7.2.2

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

[Libreoffice] [PATCH] Another one for Base

[Wols Lists]

Cheers,
Wol
>From 804f503777bff780d82226f37843f3b614a5d5f7 Mon Sep 17 00:00:00 2001
From: Wol 
Date: Mon, 29 Nov 2010 15:10:42 +
Subject: [PATCH] More deleted comments

../../../dbaccess/source/core/misc/0001-More-translations-and-comment-deletion-for-Base.patch

---
 reportdesign/source/ui/misc/FunctionHelper.cxx |   11 ++
 reportdesign/source/ui/misc/UITools.cxx|   36 ++--
 reportdesign/source/ui/misc/Undo.cxx   |2 +-
 .../source/ui/misc/statusbarcontroller.cxx |4 +-
 4 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx 
b/reportdesign/source/ui/misc/FunctionHelper.cxx
index d653ef9..b1535d6 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -58,7 +58,7 @@ sal_Unicode FunctionManager::getSingleToken(const 
formula::IFunctionManager::ETo
 return sal_Unicode('{');
 case eArrayClose:
 return sal_Unicode('}');
-} // switch(_eToken)
+}
 return 0;
 }
 // 
-
@@ -93,11 +93,6 @@ const formula::IFunctionDescription* 
FunctionManager::getFunctionByName(const ::
 // 
-
 void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const 
formula::IFunctionDescription*>& /*_rLastRUFunctions*/) const
 {
-//const sal_uInt32 nCount = getCount();
-//for(sal_uInt32 i = 0 ; i < nCount ; ++i)
-//{
-//const formula::IFunctionCategory* pCategory = getCategory(
-//}
 }
 // 
-
 ::boost::shared_ptr< FunctionDescription > FunctionManager::get(const 
uno::Reference< report::meta::XFunctionDescription>& _xFunctionDescription) 
const
@@ -118,9 +113,9 @@ void 
FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula
 m_aCategoryIndex.push_back( aCategoryFind );
 }
 aFunctionFind = 
m_aFunctions.insert(TFunctionsMap::value_type(sFunctionName,::boost::shared_ptr(new
 
FunctionDescription(aCategoryFind->second.get(),_xFunctionDescription.first;
-} // if ( aFind == m_aFunctions.end() )
+}
 pDesc = aFunctionFind->second;
-} // if ( _xFunctionDescription.is() )
+}
 return pDesc;
 }
 // 
-
diff --git a/reportdesign/source/ui/misc/UITools.cxx 
b/reportdesign/source/ui/misc/UITools.cxx
index ba963d9..ae81de8 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -175,14 +175,14 @@ void adjustSectionName(const uno::Reference< 
report::XGroup >& _xGroup,sal_Int32
 ::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPHEADER));
 sName += ::rtl::OUString::valueOf(_nPos);
 _xGroup->getHeader()->setName(sName);
-} // if ( _xGroup->getHeaderOn() )
+}
 
 if ( _xGroup->getFooterOn() && 
!_xGroup->getFooter()->getName().getLength()  )
 {
 ::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPFOOTER));
 sName += ::rtl::OUString::valueOf(_nPos);
 _xGroup->getFooter()->setName(sName);
-} // if ( _xGroup->getHeaderOn() )
+}
 }
 // 
-
 ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> 
addStyleListener(const uno::Reference< report::XReportDefinition >& 
_xReportDefinition,::comphelper::OPropertyChangeListener* _pListener)
@@ -261,7 +261,7 @@ namespace
 case COMPLEX:
 aLocale = _rxReportControlFormat->getCharLocaleComplex();
 break;
-} // switch(_nWhich)
+}
 
 
_rItemSet.Put(SvxLanguageItem(MsLangId::convertLocaleToLanguageWithFallback(aLocale),_nLanguage));
 
@@ -288,7 +288,7 @@ namespace
 pClone->PutValue(_xShape->getPropertyValue(aIt->sName), 
aIt->nMemberId);
 _rItemSet.Put(*pClone, aIt->nWID);
 }
-} // if ( xInfo->hasPropertyByName(sPropertyName) )
+}
 ++aIt;
 }
 }
@@ -319,11 +319,11 @@ namespace
 catch(uno::Exception&)
 { // shapes have a bug so we ignore this one.
 }
-} // if ( pItem )
+}
 }
 }
 ++aIt;
-} // while ( pPropertyMap->pName )
+}
 }
 // 
-
 void lcl_CharPropertiesToItems( const 
uno::Reference& _rxReportControlFormat,
@@ -353,7 +353,6 @@ namespace
 _rItemSet.Put(aUnderLineItem);
 
_rItemSet.Put(SvxKerningItem(_rxReportControlFormat->getCharKerning

[Libreoffice] [PATCH] And another one

[Wols Lists]

Cheers,
Wol
>From fa312399900437d13fabc456c851be6f971ab3d1 Mon Sep 17 00:00:00 2001
From: Wol 
Date: Mon, 29 Nov 2010 15:47:37 +
Subject: [PATCH 2/2] More comment deletions

---
 reportdesign/source/ui/report/DesignView.cxx   |4 
 reportdesign/source/ui/report/ReportController.cxx |4 ++--
 reportdesign/source/ui/report/dlgedfunc.cxx|2 --
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/reportdesign/source/ui/report/DesignView.cxx 
b/reportdesign/source/ui/report/DesignView.cxx
index c404c53..968154d 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -466,11 +466,7 @@ void ODesignView::GetFocus()
 // 
-
 void ODesignView::ImplInitSettings()
 {
-//#if OSL_DEBUG_LEVEL > 0
-//SetBackground( Wallpaper( COL_RED ));
-//#else
 SetBackground( Wallpaper( 
Application::GetSettings().GetStyleSettings().GetFaceColor() ));
-//#endif
 SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() 
);
 SetTextFillColor( 
Application::GetSettings().GetStyleSettings().GetFaceColor() );
 }
diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index 584ac3e..e2db54f 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1481,7 +1481,7 @@ void OReportController::Execute(sal_uInt16 _nId, const 
Sequence< PropertyValue >
 {
 const String 
sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT));
 pListAction.reset(new 
UndoManagerListAction(m_aUndoManager,sUndoAction));
-} // if ( !pListAction.get() )
+}
 uno::Reference< report::XReportControlFormat> 
xReportControlFormat(*aIter,uno::UNO_QUERY);
 lcl_setFontWPU_nothrow(xReportControlFormat,_nId);
 }
@@ -3749,7 +3749,7 @@ void OReportController::listen(const bool _bAdd)
 xGroups->addContainerListener(static_cast(this));
 
m_xReportDefinition->addModifyListener(static_cast(this));
 }
-else /* ! _bAdd */
+else
 {
 rObserver.RemoveSection(m_xReportDefinition->getDetail());
 
xGroups->removeContainerListener(static_cast(this));
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx 
b/reportdesign/source/ui/report/dlgedfunc.cxx
index 6b53a22..221c9b2 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -680,8 +680,6 @@ BOOL DlgEdFuncInsert::MouseButtonDown( const MouseEvent& 
rMEvt )
 
 const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, 
aVEvt);
 
-// eHit == SDRHIT_UNMARKEDOBJECT under the mouse cursor is a unmarked object
-
 if (eHit == SDRHIT_UNMARKEDOBJECT &&
 nId != OBJ_CUSTOMSHAPE)
 {
-- 
1.7.2.2

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

Re: [Libreoffice] [PUSHED] Re: [PATCH] And another one

[Wols Lists]

On 29/11/10 16:14, Caolán McNamara wrote:
> On Mon, 2010-11-29 at 15:48 +0000, Wols Lists wrote:
>> Cheers,
> Looks good, pushed, thanks for that.
>
> C.
>
That's all of base scanned. Unless I've missed something (and I've
deliberately skipped a few bits, eg that marked with TODO), there
shouldn't be any dead code or end-of-if/end-of-switch type comments left
there.

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

[Libreoffice] new download - checking for rpm

[Wols Lists]

Have we lost a patch somewhere? Just trashed my old development
directory by mistake :-) so I'm trying to follow the new download and
build instructions. ./autogen.sh bombs as follows ...

checking whether to enable EPM for packing... yes
checking for epm... no
EPM will be built.
checking which package format to use... rpm
checking for rpm... configure: error: not found
anth...@ashdown ~/gitstuff/loffice $

I thought we'd hit this problem before but I can't find it in my email
archive.

As an aside, I thought autogen retrieved its old arguments from
config.log if you didn't give it any. Does this happen now? I cheated
and copied my old config.log across but it didn't seem to use it ...

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

Re: [Libreoffice] new download - checking for rpm

[Wols Lists]

On 01/12/10 19:13, Wols Lists wrote:
> Have we lost a patch somewhere? Just trashed my old development
> directory by mistake :-) so I'm trying to follow the new download and
> build instructions. ./autogen.sh bombs as follows ...
>
> checking whether to enable EPM for packing... yes
> checking for epm... no
> EPM will be built.
> checking which package format to use... rpm
> checking for rpm... configure: error: not found
> anth...@ashdown ~/gitstuff/loffice $
>
> I thought we'd hit this problem before but I can't find it in my email
> archive.
>
> As an aside, I thought autogen retrieved its old arguments from
> config.log if you didn't give it any. Does this happen now? I cheated
> and copied my old config.log across but it didn't seem to use it ...
>
> Cheers,
> Wol
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
I'm now well stuffed :-( Tried to follow the instructions for upgrading
my old development directory and that's now stuck in a loop of "the
build process has changed. You need to run autogen.sh and download". So
I do, run make, and "the build process has changed ..." Argh!

Anyways, for a new download ... this is obviously the code in configure
that is kicking me out. I just don't understand what it's doing ...

And just before there's some comment about gentoo - of course - I'm
running gentoo!

(And as an aside, yes it does seem to be reusing the old arguments :-)

Cheers,
Wol

  for a in "$RPM" rpmbuild rpm; do
 $a --usage >/dev/null 2> /dev/null
 if test $? -eq 0; then
RPM=$a
break
 else
$a --version >/dev/null 2> /dev/null
if test $? -eq 0; then
   RPM=$a
   break
fi
 fi
   done
   if test -z "$RPM" ; then
  as_fn_error "not found" "$LINENO" 5
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] new download - checking for rpm

[Wols Lists]

On 01/12/10 21:45, Rene Engelhard wrote:
> On Wed, Dec 01, 2010 at 07:13:36PM +0000, Wols Lists wrote:
>> Have we lost a patch somewhere? Just trashed my old development
>> directory by mistake :-) so I'm trying to follow the new download and
>> build instructions. ./autogen.sh bombs as follows ...
>>
>> checking whether to enable EPM for packing... yes
>   ^^
>
> This is the point.
>
> The "old" system had --disable-epm in the standard flags. We don't need it
> because we run make_installer.pl on our own anyway.
>
So all I need to do is specify --disable-epm. Okay.

>> checking for epm... no
>> EPM will be built.
>> checking which package format to use... rpm
>> checking for rpm... configure: error: not found
> And because you didn't specify an other format, and don't use a Debian-based
> system it defaults to rpm...

OW! So what's the best way to fix that?

Otherwise that's gentoo broken, probably slackware, and I dunno what
else ...

> Grüße/Regards,
>
> René
Cheers,
Wol
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] Is ant a pre-requisite for java support?

[Wols Lists]

On the old build system I always had to do --without-junit, implying
that I had --with-java.

On the new system I need --without-java or it bombs with "can't find ant"

Sorry - I should have backed up my old devel directory so I could go
back and find out ...

Cheers,
Wol

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

Re: [Libreoffice] Is ant a pre-requisite for java support?

[Wols Lists]

On 02/12/10 11:21, Jonathan Aquilina wrote:
> Is this when you run the autogen.sh? if it is, i had an issue with it
> bombing on junit. can you try and change in the autogen.sh from
> /bin/sh at the top to /bin/bash. that fixed my issue. if thats the
> case, not sure where else to turn to isolate this bug..

Yes it is. I'll try changing it to /bin/bash - I'm on gentoo so it
should be bash anyways, but never mind. I did try --without-junit, but
that didn't work either. I don't have junit or junit4, and I think the
new system is meant to autodetect and use what you have available. So it
should detect ant is missing and switch it off, not bomb because it's
not there ...

Cheers,
Wol
>
> On 12/02/2010 12:10 PM, Wols Lists wrote:
>> On the old build system I always had to do --without-junit, implying
>> that I had --with-java.
>>
>> On the new system I need --without-java or it bombs with "can't find
>> ant"
>>
>> Sorry - I should have backed up my old devel directory so I could go
>> back and find out ...
>>
>> 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

Re: [Libreoffice] Is ant a pre-requisite for java support?

[Wols Lists]

On 02/12/10 11:41, Jonathan Aquilina wrote:
> also might want to pull the latest as it seems from talking to kendy
> on irc that he pushed some things to fix it. might want to keep it as
> is and pull latest and try with that.

No luck. Just done a fresh git clone - whether sh or bash makes no
difference, with default settings it bombs with


checking for jakarta-ant... no
checking for ant... no
checking for ant.sh... no
checking for ant.bat... no
checking for ant.cmd... no
configure: error: Ant not found - Make sure it's in the path or use
--with-ant-home
anth...@ashdown ~/gitstuff/lotest $

Cheers,
Wol

>
>
> On 12/02/2010 12:37 PM, Wols Lists wrote:
>> On 02/12/10 11:21, Jonathan Aquilina wrote:
>>> Is this when you run the autogen.sh? if it is, i had an issue with it
>>> bombing on junit. can you try and change in the autogen.sh from
>>> /bin/sh at the top to /bin/bash. that fixed my issue. if thats the
>>> case, not sure where else to turn to isolate this bug..
>> Yes it is. I'll try changing it to /bin/bash - I'm on gentoo so it
>> should be bash anyways, but never mind. I did try --without-junit, but
>> that didn't work either. I don't have junit or junit4, and I think the
>> new system is meant to autodetect and use what you have available. So it
>> should detect ant is missing and switch it off, not bomb because it's
>> not there ...
>>
>> Cheers,
>> Wol
>>> On 12/02/2010 12:10 PM, Wols Lists wrote:
>>>> On the old build system I always had to do --without-junit, implying
>>>> that I had --with-java.
>>>>
>>>> On the new system I need --without-java or it bombs with "can't find
>>>> ant"
>>>>
>>>> Sorry - I should have backed up my old devel directory so I could go
>>>> back and find out ...
>>>>
>>>> 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 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 download - checking for rpm

[Wols Lists]

On 02/12/10 11:45, Miklos Vajna wrote:
> On Thu, Dec 02, 2010 at 11:31:53AM +, Michael Meeks 
>  wrote:
>>  Right - good point; I notice a number of these changes - so I'm working
>> through build/distro-config/LibreOfficeLinuxDevel.conf - to switch the
>> polarity of the default arguments to match that.
> Great. :) I think the only remaining issue _here_ is that
> --with-java-target-version=1.5 has to be used manually.

Not so sure ... see my email about ant.

Just done a completely fresh clone, and the rpm problem has gone but
it's still bombing because it can't find ant. I'm guessing that because
it found java it assumes ant will be there and it isn't. --without-java
fixes the problem, but shouldn't be needed?

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

Re: [Libreoffice] bootstrap / configure defaults ...

[Wols Lists]

On 02/12/10 12:12, Michael Meeks wrote:
>   --with-ant-home=$BUILDDIR/$APACHE_ANT
>   + and have to have a system ant now [ should that be the
> default ? ]
Mmmm... dunno.

There's probably a lot of people like me - not Java developers - who
neither need nor want java as part of their normal life - it's pulled in
as a dependency of other stuff. If I read you right, you're saying I
need to explicitly install ant now?

imho if ant is needed, it should be pulled in as a dependency like it
was before - was that easily done? could it be easily done again?

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

Re: [Libreoffice] Is ant a pre-requisite for java support?

[Wols Lists]

On 02/12/10 14:09, Christian Lohmaier wrote:
> Hi Wols, *,
>
> On Thu, Dec 2, 2010 at 12:10 PM, Wols Lists  wrote:
>> On the old build system I always had to do --without-junit, implying
>> that I had --with-java.
>>
>> On the new system I need --without-java or it bombs with "can't find ant"
> Ant is required to build some java-stuff, and was so before.
>
> junit is not required for building, but for running tests after the build.
>
> So given you have ant installed, as you could build before, the
> interesting question is: Why can't configure find it.

Because it ISN'T installed :-) I've checked. I don't even think java is
*explicitly* installed on my system, it just got pulled by something else.

> Or even: As ant can be downloaded as part of download: Why isn't it
> falling back to that?
>
It seems like that is no longer the case. Can we go back to that?


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

Re: [Libreoffice] bootstrap / configure defaults ...

[Wols Lists]

On 02/12/10 15:04, Michael Meeks wrote:
> On Thu, 2010-12-02 at 12:44 +0000, Wols Lists wrote:
>> There's probably a lot of people like me - not Java developers - who
>> neither need nor want java as part of their normal life
>   Quite - I'll add an easy hack to remove Java from the build :-)
> for some value of 'Easy' ... [ at least, I suspect there is still some
> deep / gut-wrenching dependency ]

Sorry - I didn't make myself that clear ... we've got the --without-java
flag that removes java. That's not the problem.

The problem is that if the build detects java, it then *assumes* that
ant is *also* there, and blows up.

I was just trying to make the point that if LO wants java to be there, I
have no problem at all with that. If java gets pulled on to my system,
that's fine. What isn't fine is if (a) I didn't ask for it, and (b) its
presence causes things to blow up (like here).

On the old build, the presence of java pulled a copy of ant if it wasn't
already there - to get that behaviour back would be best imho.

(And seeing as my latest little project is testing a java shim - thanks
Caolan :-) - I need to get ant onto my system somehow - I'd prefer it to
be automagic rather than explicit.)

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

Re: [Libreoffice] defaulting to --without-java ... (?)

[Wols Lists]

On 02/12/10 19:31, Christian Lohmaier wrote:
> Hi Sebastian, *;
>
> On Thu, Dec 2, 2010 at 8:22 PM, Sebastian Spaeth  wrote:
>> On Thu, 2 Dec 2010 17:45:17 +0100, Christian Lohmaier wrote:
>would anyone scream if we defaulted configure to --without-java ?
>>> I would.
>> I would not.
> I hope not for the wrong reasons.
>
> [ this is primarily for developers ], should make it easier to build
>>> Come on, what is hard about installing a JDK?
>> My LibO build failed with the included openjdk, gcj, and sun-jre
>> installed, I had to remove openjdk, and then I had to remove the gcj
>> java stuff, and *only* when I had the sun stuff left, would LibO
>> actually build without screaming about not being able to detect
>> Java. (when I actually had java installed and in my path).
> Then this is a regression, a bug that needs to be fixed, and not
> circumvented by just closing your eyes and pretending the problem
> would not exist. OpenJDK definitely is supported, gcj should still be,
> but nowadays is less used.
>

I would agree with this. This is my problem with ant - I have java but
not ant installed, it worked for me on the old system, and it now fails.

>> I spent about 3 hours to get the right stuff installed. During
>> configure time (which I run often), I am always annoyed as the "checking
>> for ant..." part takes longest.
> Well - "my breaks don't work, so I demand a louder horn on my car..."
>
> Even when you got so much trouble getting it to work, you could have
> deviated from the default and have specified --without-java

Except that's no use for me :-) I want to work on Base. No java, no Base!

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

Re: [Libreoffice] defaulting to --without-java ... (?)

[Wols Lists]

On 02/12/10 23:07, Rene Engelhard wrote:
> On Thu, Dec 02, 2010 at 10:32:15PM +0000, Wols Lists wrote:
>> I would agree with this. This is my problem with ant - I have java but
>> not ant installed, it worked for me on the old system, and it now fails.
> Then install it?

That's what I may well do. But imho it's rather stupid to have ant as a
specific install in my world file, and not java.

Spock: "it does not compute"

And as others have said, we want the build system to be newbie-friendly.
It always *used* to download its own ant, so it's a regression. A lot of
systems will have java runtime installed. It shouldn't assume that just
because the runtime is there, the development setup is also there. (And
imho it shouldn't force developers to install the development system
system-wide either - as I said why should ant be an explicit install
when java isn't?)

> Grüße/Regards,
>
> René
Cheers,
Wol
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] Deleting Java from Base

[Wols Lists]

On 03/12/10 02:26, Kevin Hunter wrote:
> I'm absolutely for this, especially in terms of getting any/all
> necessaries rewritten in C++ ... but not right now.  As others have
> stated, like it not, the current product uses Java (e.g. Base) and I
> believe it would be foolhardy to default to a build that is not likely
> to be deployed to end-users.  When (if?) the code has been gutted of
> Java, it might be time to revisit this motion, but now is not that time.
>
> If the conversion to C++ is an important goal (and long-term, I do
> believe it is), I think it would be better put on the wiki as a
> not-so-easy/short hack. 

Where do I start :-)

Seeing as Base is where I want to work, this seems an obvious thing to
do. I'm guessing that building without Java, then running some tests
(smoketest? what?) and seeing what breaks is a good idea.

If someone can guide me where to go, I'll try and get started (homelife
permitting :-)

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

Re: [Libreoffice] Deleting Java from Base

[Wols Lists]

On 03/12/10 10:48, Caolán McNamara wrote:
> On Fri, 2010-12-03 at 10:28 +0000, Wols Lists wrote:
>> Where do I start :-)
>>
>> Seeing as Base is where I want to work, this seems an obvious thing to
>> do. I'm guessing that building without Java, then running some tests
>> (smoketest? what?) and seeing what breaks is a good idea.
> I think the typical thoughts around this are to either change the
> default backend for base to be sqlite instead of hsqldb (which is where
> the java dependency comes in) or come up with a new backend written in 
> C++ which can manipulate existing hsqldb format databases. 
>
> If you dig around for "sqlite-sdbc-driver" or something like that you
> should find various examples at dba.openoffice.org of various backends
> to play with and get a feel for what needs to be implemented in one.
>
Thanks. I'll have a dig around.

That's actually getting in a bit deeper and quicker than I planned but
hey ho - the best way to learn is to jump in the deep end :-)

My long term plan was to implement an NF2 back end, but if I get sqlite
working that'll be good preparation.

(If you want to get me started on the failings of relational, expect a
LONG rant !!! :-)

Okay, here goes ...

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

Re: [Libreoffice] Script to find undocumented classes

[Wols Lists]

On 03/12/10 12:11, Miklos Vajna wrote:
> On Fri, Dec 03, 2010 at 11:14:54AM +0100, Thorsten Behrens 
>  wrote:
>> I find it surprising me actually saying this, but - for the while, I
>> think this would be crossing the line of solving a social problem
>> by technical means. ;)
> Additionally I'm not aware of a method to tell doxygen to check just a
> part of a file. And issuing a warning about 'class Foo is not
> documented' just because someone touched class Bar in the same file is
> indeed incorrect. ;)
>
I keep seeing all this stuff about Doxygen :-) I'm a bit of a newbie at
this :-) so might it not be a good idea, on the wiki under development,
to put a very basic page about doxygen with pointers to more detailed stuff?

That way, people like me have a handle to get started. I know I can
google for it, but a very basic "in libreoffice we do this" guide in the
wiki would be a big help.

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

[Libreoffice] New bootstrap: another stop

[Wols Lists]

Just trying to build *another* fresh download, with java ... I've
installed ant ...

autogen --with-java --without-junit --without-epm

make

and it bombs with this (up to date x86-64 gentoo)

Cheers,
Wol


*
*   Running the post download checks.
*

checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking target system type... x86_64-unknown-linux-gnu
found wget: wget
found md5sum: md5sum

*
*   Running the post download checks.
*

checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking target system type... x86_64-unknown-linux-gnu
build -- version: 275224
make: *** [all] Error 141
Fri Dec  3 16:12:12 GMT 2010
anth...@ashdown ~/gitstuff/lojava $

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

Re: [Libreoffice] New bootstrap: another stop

[Wols Lists]

Replying to myself, if I redo the make, I get


anth...@ashdown ~/gitstuff/lojava $ make
build -- version: 275224

Fetching dependencies for module l10n from solver... failed

=
Building module testautomation
=
make: *** [all] Error 141
anth...@ashdown ~/gitstuff/lojava $


I'm not explicitly using en_GB, but has the l10n problem been fixed live
yet?

Cheers,
Wol


On 03/12/10 16:27, Wols Lists wrote:
> Just trying to build *another* fresh download, with java ... I've
> installed ant ...
>
> autogen --with-java --without-junit --without-epm
>
> make
>
> and it bombs with this (up to date x86-64 gentoo)
>
> Cheers,
> Wol
>
> 
> *
> *   Running the post download checks.
> *
> 
> checking build system type... x86_64-unknown-linux-gnu
> checking host system type... x86_64-unknown-linux-gnu
> checking target system type... x86_64-unknown-linux-gnu
> found wget: wget
> found md5sum: md5sum
> 
> *
> *   Running the post download checks.
> *
> 
> checking build system type... x86_64-unknown-linux-gnu
> checking host system type... x86_64-unknown-linux-gnu
> checking target system type... x86_64-unknown-linux-gnu
> build -- version: 275224
> make: *** [all] Error 141
> Fri Dec  3 16:12:12 GMT 2010
> anth...@ashdown ~/gitstuff/lojava $
>
> ___
> 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: another stop

[Wols Lists]

Replying to myself again ...

And it appears to be a java problem ... changing the autogen arguments
to --without-java and it's gone away ...

Cheers,
Wol

On 03/12/10 17:43, Wols Lists wrote:
> Replying to myself, if I redo the make, I get
>
>
> anth...@ashdown ~/gitstuff/lojava $ make
> build -- version: 275224
>
> Fetching dependencies for module l10n from solver... failed
>
> =
> Building module testautomation
> =
> make: *** [all] Error 141
> anth...@ashdown ~/gitstuff/lojava $
>
>
> I'm not explicitly using en_GB, but has the l10n problem been fixed live
> yet?
>
> Cheers,
> Wol
>
>
> On 03/12/10 16:27, Wols Lists wrote:
>> Just trying to build *another* fresh download, with java ... I've
>> installed ant ...
>>
>> autogen --with-java --without-junit --without-epm
>>
>> make
>>
>> and it bombs with this (up to date x86-64 gentoo)
>>
>> Cheers,
>> Wol
>>
>> 
>> *
>> *   Running the post download checks.
>> *
>> 
>> checking build system type... x86_64-unknown-linux-gnu
>> checking host system type... x86_64-unknown-linux-gnu
>> checking target system type... x86_64-unknown-linux-gnu
>> found wget: wget
>> found md5sum: md5sum
>> 
>> *
>> *   Running the post download checks.
>> *
>> 
>> checking build system type... x86_64-unknown-linux-gnu
>> checking host system type... x86_64-unknown-linux-gnu
>> checking target system type... x86_64-unknown-linux-gnu
>> build -- version: 275224
>> make: *** [all] Error 141
>> Fri Dec  3 16:12:12 GMT 2010
>> anth...@ashdown ~/gitstuff/lojava $
>>
>> ___
>> 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] get/setNanos

[Wols Lists]

PLEASE NOTE - I've hardly tested this patch, because I've trashed my
devel directory and as you can see from my other mails, I'm having great
difficulty getting a working --with-java setup again :-) Oh well ...

But, having dug as deep as I can, these two functions seem to be mere
shims to call the equivalent java functions, and seem to have been added
either for code that is now obsolete, or (more likely) in readiness for
future use. Either way, I can't find anywhere they are actually used.

Is anyone willing to do a quick test and push? I'm emailing it now
because I've been sitting on it a couple of days and don't want to lose
it by accident as I try and get a new working directory :-)

Cheers,
Wol


>From 983fe7249a994e881714943446b03a12e008a7b8 Mon Sep 17 00:00:00 2001
From: Wol 
Date: Wed, 1 Dec 2010 18:20:58 +
Subject: [PATCH] Remove get/setNanos

---
 connectivity/source/drivers/jdbc/Timestamp.cxx |   25 +++
 connectivity/source/inc/java/sql/Timestamp.hxx |8 ++
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx 
b/connectivity/source/drivers/jdbc/Timestamp.cxx
index 6474e9c..0eee1d5 100644
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -46,13 +46,13 @@ java_sql_Date::java_sql_Date( const 
::com::sun::star::util::Date& _rOut ) : java
 if( !t.pEnv )
 return;
 jvalue args[1];
-// Parameter konvertieren
+// Convert parameters
 ::rtl::OUString sDateStr;
 sDateStr = ::dbtools::DBTypeConversion::toDateString(_rOut);
 args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr);
 
 // Java-Call fuer den Konstruktor absetzen
-// temporaere Variable initialisieren
+// initialise temporary variables
 static const char * cSignature = "(Ljava/lang/String;)Ljava/sql/Date;";
 jobject tempObj;
 static jmethodID mID(NULL);
@@ -111,13 +111,13 @@ java_sql_Time::java_sql_Time( const 
::com::sun::star::util::Time& _rOut ): java_
 if( !t.pEnv )
 return;
 jvalue args[1];
-// Parameter konvertieren
+// Convert parameters
 ::rtl::OUString sDateStr;
 sDateStr = ::dbtools::DBTypeConversion::toTimeString(_rOut);
 args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr);
 
 // Java-Call fuer den Konstruktor absetzen
-// temporaere Variable initialisieren
+// intialise temporary variables
 static const char * cSignature = "(Ljava/lang/String;)Ljava/sql/Time;";
 jobject tempObj;
 static jmethodID mID(NULL);
@@ -147,6 +147,7 @@ jclass java_sql_Timestamp::getMyClass() const
 {
 return st_getMyClass();
 }
+
 jclass java_sql_Timestamp::st_getMyClass()
 {
 // die Klasse muss nur einmal geholt werden, daher statisch
@@ -154,6 +155,7 @@ jclass java_sql_Timestamp::st_getMyClass()
 theClass = findMyClass("java/sql/Timestamp");
 return theClass;
 }
+
 java_sql_Timestamp::java_sql_Timestamp(const ::com::sun::star::util::DateTime& 
_rOut)
:java_util_Date( NULL, (jobject)NULL )
 {
@@ -161,14 +163,14 @@ java_sql_Timestamp::java_sql_Timestamp(const 
::com::sun::star::util::DateTime& _
 if( !t.pEnv )
 return;
 jvalue args[1];
-// Parameter konvertieren
+// Convert parameters
 ::rtl::OUString sDateStr;
 sDateStr = ::dbtools::DBTypeConversion::toDateTimeString(_rOut);
 
 args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr);
 
 // Java-Call fuer den Konstruktor absetzen
-// temporaere Variable initialisieren
+// initialise temporary variables
 static const char * cSignature = 
"(Ljava/lang/String;)Ljava/sql/Timestamp;";
 jobject tempObj;
 static jmethodID mID(NULL);
@@ -181,17 +183,6 @@ java_sql_Timestamp::java_sql_Timestamp(const 
::com::sun::star::util::DateTime& _
 // und aufraeumen
 }
 
-sal_Int32 java_sql_Timestamp::getNanos()
-{
-static jmethodID mID(NULL);
-return callIntMethod("getNanos",mID);
-}
-
-void java_sql_Timestamp::setNanos( sal_Int32 _par0 )
-{
-static jmethodID mID(NULL);
-callVoidMethodWithIntArg("setNanos",mID,_par0);
-}
 // 
-
 java_sql_Timestamp::operator ::com::sun::star::util::DateTime()
 {
diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx 
b/connectivity/source/inc/java/sql/Timestamp.hxx
index ce3908f..b9780c3 100644
--- a/connectivity/source/inc/java/sql/Timestamp.hxx
+++ b/connectivity/source/inc/java/sql/Timestamp.hxx
@@ -42,7 +42,7 @@ namespace connectivity
 class java_sql_Date : public java_util_Date
 {
 protected:
-// statische Daten fuer die Klasse
+// static data for the class
 static jclass theClass;
 public:
 virtual jclass getMyClass() const;
@@ -63,7 +63,7 @@ namespace connectivity
 class java_sql_Time : public java_util_Date
 {
 protected:
-// statische Daten fuer die Klasse
+// st

[Libreoffice] Another failed setup ...

[Wols Lists]

I wonder. Is the download script flakey?

My internet has been a little bit iffey these last few days (we're not
used to half an inch of snow over here :-) and it looks as though it's
fallen over. Notice the "Read error" below - at which point downloading
seems to have stopped instantly, and post-install checks run. Is this
why l10n then fails?

And when I try and re-run - nothing happens. ./download doesn't load
anything, re-running make doesn't try to download anything still missing.

If most people have got a clean internet link, that could explain an
intermittent problem ...

(btw, is there a reason it's downloading .dll's on linux?)

Cheers,
Wol



2010-12-03 18:17:07
URL:http://download.go-oo.org/src/9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2
[306902/306902] ->
"9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2" [1]
185d60944ea767075d27247c3162b3bc-unowinreg.dll
2010-12-03 18:17:07
URL:http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
[12288/12288] -> "185d60944ea767075d27247c3162b3bc-unowinreg.dll" [1]
c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip
Read error (Connection timed out) in headers.
mv: cannot stat
`c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip': No such
file or directory

*
*   Running the post download checks.
*

checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking target system type... x86_64-unknown-linux-gnu
found wget: wget
found md5sum: md5sum
c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip
Read error (Connection timed out) in headers.
2010-12-03 19:01:46
URL:http://www.numbertext.org/linux/c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip
[3880704/3880704] ->
"c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip" [13]

*
*   Running the post download checks.
*

checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking target system type... x86_64-unknown-linux-gnu
build -- version: 275224

Fetching dependencies for module l10n from solver... failed

=
Building module testautomation
=
make: *** [all] Error 141
anth...@ashdown ~/gitstuff/lonew $
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Another failed setup ...

[Wols Lists]

Just redone. No obvious error - same crash :-(

Cheers,
Wol

On 03/12/10 20:12, Wols Lists wrote:
> I wonder. Is the download script flakey?
>
> My internet has been a little bit iffey these last few days (we're not
> used to half an inch of snow over here :-) and it looks as though it's
> fallen over. Notice the "Read error" below - at which point downloading
> seems to have stopped instantly, and post-install checks run. Is this
> why l10n then fails?
>
> And when I try and re-run - nothing happens. ./download doesn't load
> anything, re-running make doesn't try to download anything still missing.
>
> If most people have got a clean internet link, that could explain an
> intermittent problem ...
>
> (btw, is there a reason it's downloading .dll's on linux?)
>
> Cheers,
> Wol
>
>
>
> 2010-12-03 18:17:07
> URL:http://download.go-oo.org/src/9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2
> [306902/306902] ->
> "9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2" [1]
> 185d60944ea767075d27247c3162b3bc-unowinreg.dll
> 2010-12-03 18:17:07
> URL:http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
> [12288/12288] -> "185d60944ea767075d27247c3162b3bc-unowinreg.dll" [1]
> c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip
> Read error (Connection timed out) in headers.
> mv: cannot stat
> `c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip': No such
> file or directory
> 
> *
> *   Running the post download checks.
> *
> 
> checking build system type... x86_64-unknown-linux-gnu
> checking host system type... x86_64-unknown-linux-gnu
> checking target system type... x86_64-unknown-linux-gnu
> found wget: wget
> found md5sum: md5sum
> c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip
> Read error (Connection timed out) in headers.
> 2010-12-03 19:01:46
> URL:http://www.numbertext.org/linux/c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip
> [3880704/3880704] ->
> "c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip" [13]
> 
> *
> *   Running the post download checks.
> *
> 
> checking build system type... x86_64-unknown-linux-gnu
> checking host system type... x86_64-unknown-linux-gnu
> checking target system type... x86_64-unknown-linux-gnu
> build -- version: 275224
>
> Fetching dependencies for module l10n from solver... failed
>
> =
> Building module testautomation
> =
> make: *** [all] Error 141
> anth...@ashdown ~/gitstuff/lonew $
> ___
> 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] Another failed setup ...

[Wols Lists]

On 03/12/10 21:17, Joost Eekhoorn wrote:
> Cheers,
> Good to see that I am not the only one.
>
> Before my building on cppunit.
> Now I have exact the same problem as you. I can not find a way out.
> Hope that someone comes with an idea.
> I think it has to do with i10n and en_US.UTF8, but that is only a guess.
>
> Michael advised "strace -f -e file make" to get more information.
>
> On what type of system are you running (Ubuntu, Fedora, OpenSuse,
> Slackware?).
Gentoo x86_64

I'll try Michael's suggestion.

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

Re: [Libreoffice] Another failed setup ...

[Wols Lists]

On 03/12/10 21:17, Joost Eekhoorn wrote:
> Cheers,
> Good to see that I am not the only one.
>
> Before my building on cppunit.
> Now I have exact the same problem as you. I can not find a way out.
> Hope that someone comes with an idea.
> I think it has to do with i10n and en_US.UTF8, but that is only a guess.
>
> Michael advised "strace -f -e file make" to get more information.
Just tried this. It bombs. Make doesn't even run ... :-(

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

Re: [Libreoffice] New bootstrap: another stop

[Wols Lists]

On 04/12/10 00:05, Christian Lohmaier wrote:
> Hi Wols, *,
>
> On Fri, Dec 3, 2010 at 6:47 PM, Wols Lists  wrote:
>> Replying to myself again ...
>>
>> And it appears to be a java problem ... changing the autogen arguments
>> to --without-java and it's gone away ...
> Sure that this is the reason, or rather specifying any argument to
> autogen disables reusing previous switches?

Yes it is .. switches that work - --without-epm --without-java
switches that fail - --without-epm --with-java

Note that I need without-epm, and as I don't know what's happened to the
java default, I'm playing safe by being explicit either way. Problem is,
I want to work on Base so I really need with-java to work.

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

[Libreoffice] More java fun

[Wols Lists]

Hoping this'll give a bit more info to the build guys, but I tried the
following ...

autogen'd without java, make, then autogen'd with and make again ...

I got an l10n problem at the start, but then it bombed out with this ...
note the undefined reference ...

Cheers,
Wol


Making:all_javavm.uno.dpslo
Making:javaloader.uno.lib
Compiling: stoc/unxlngx6.pro/misc/javavm.uno_version.c
Making:javaloader.uno.so
Compiling: stoc/source/javavm/javavm.cxx
Making:all_javaloader.uno.dpslo
Compiling: bridges/source/jni_uno/jni_uno2java.cxx
Compiling: bridges/source/jni_uno/jni_java2uno.cxx
Compiling: bridges/source/jni_uno/jni_bridge.cxx
Compiling: bridges/source/jni_uno/nativethreadpool.cxx
Making:java_uno.lib
Making:libjava_uno.so
../../unxlngx6.pro/slo/nativethreadpool.o: In function
`Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_create':
nativethreadpool.cxx:(.text+0x56c): undefined reference to
`jvmaccess::VirtualMachine::VirtualMachine(_Jv_JavaVM*, int, bool,
_Jv_JNIEnv*)'
collect2: ld returned 1 exit status
dmake:  Error code 1, while making '../../unxlngx6.pro/lib/libjava_uno.so'

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

Re: [Libreoffice] Enable build of ure and extension

[Wols Lists]

On 04/12/10 12:57, Gert Faller wrote:
> Hi,
>
> Still working on the 'RTL_CONSTASCII_USTRINGPARAM' task and I have some
> problems.
>
> I've some changes left in : 'clone/ure', 'clone/extension',
> 'clone/filters/binfilter/bf_sd', 'clone/filters/binfilter/bf_svx' and
> 'clone/filters/binfilter/bf_xmloff'

binfilter.

Is that disabled by default now?

> The problem is that, build is disabled in those directories, and I can not 
> test
> hand-made changes.
> (I've pushed some patches without compilation and one of them was bad, so no
> doubt
> compilation test is important for me).
>
> I don't find any '--with-*' or '--enable-*' that applies in 'configure'.

try the -binfilter option.

> Could someone give me an hint please.
>
> Thank you very much.
>
Cheers,
Wol
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] More java fun

[Wols Lists]

On 04/12/10 14:13, Caolán McNamara wrote:
> On Sat, 2010-12-04 at 12:04 +0000, Wols Lists wrote:
>> ../../unxlngx6.pro/slo/nativethreadpool.o: In function
>> `Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_create':
>> nativethreadpool.cxx:(.text+0x56c): undefined reference to
>> `jvmaccess::VirtualMachine::VirtualMachine(_Jv_JavaVM*, int, bool,
>> _Jv_JNIEnv*)'
>> collect2: ld returned 1 exit status
>> dmake:  Error code 1, while making '../../unxlngx6.pro/lib/libjava_uno.so'
> More than likely this is just because the dependency tracking is cunning
> enough to know that toggled configure options require it to throw away
> certain libs/object files and force rebuilding them.
>
Thanks. That looks like it - deleting unxlngx6.pro seems to fix it ...

Obviously the dependency stuff isn't clever enough to cope with
switching from --without-java to --with-java, but I doubt any sane
person would normally do that :-)

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

Re: [Libreoffice] More java fun

[Wols Lists]

On 04/12/10 15:44, Wols Lists wrote:
> On 04/12/10 14:13, Caolán McNamara wrote:
>> On Sat, 2010-12-04 at 12:04 +0000, Wols Lists wrote:
>>> ../../unxlngx6.pro/slo/nativethreadpool.o: In function
>>> `Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_create':
>>> nativethreadpool.cxx:(.text+0x56c): undefined reference to
>>> `jvmaccess::VirtualMachine::VirtualMachine(_Jv_JavaVM*, int, bool,
>>> _Jv_JNIEnv*)'
>>> collect2: ld returned 1 exit status
>>> dmake:  Error code 1, while making '../../unxlngx6.pro/lib/libjava_uno.so'
>> More than likely this is just because the dependency tracking is cunning
>> enough to know that toggled configure options require it to throw away
>> certain libs/object files and force rebuilding them.
>>
> Thanks. That looks like it - deleting unxlngx6.pro seems to fix it ...

Whoops - I spoke too soon - still bombs :-(

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

[Libreoffice] Java build problem identified?

[Wols Lists]

Dunno how to fix it, but I think I've found out what's wrong with my
build ... the following is output from autogen

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

so it's clearly found the jdk, but it can't identify where it is. It's a
standard gentoo install and presumably had no problem finding it before
on the old build system. I've installed virtual/jdk-1.6.0. I'm guessing
icedtea is a jdk? Which is installed in /opt/icedtea6-bin-1.9.1. So the
build system ought to pick it up ...

However, I've now installed the Oracle jdk and pointed jdk-home at that,
and it seems (touch wood) to be building okay...

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

Re: [Libreoffice] [UX] LO status bar annoyances

[Wols Lists]

On 30/11/10 16:25, Kohei Yoshida wrote:
> I too think that the title bar would be the most logical place to put
> this info if we were to find a replacement location.  But I'm not sure
> if it can be easily identified by those users who currently rely on the
> save icon status.  The save icon is big and obvious, whereas an '*' in
> the title bar is not as equally obvious.  Also, not all Windows apps
> follow this practice, the most significant one being MS Office, though
> in MS Office's case, it doesn't show document modified status *at all*,
> anywhere.
Is that because Word's idea of a modified document is not mine?

I open a document, close it, and Word says "this document is modified.
Save?"  I haven't done ANYTHING!

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

Re: [Libreoffice] [UX] LO status bar annoyances

[Wols Lists]

On 30/11/10 15:24, Kohei Yoshida wrote:
> On Tue, 2010-11-30 at 16:11 +0100, Thorsten Behrens wrote:
>> Kohei Yoshida wrote:
   b) We warn when closing a modified doc anyway, so there is no need to
  always warn me and use up precious space. I propose to just do away
  with it.
>>> Sorry I have to disagree there.  I'm the one who put that icon there,
>>> and the reason for that was to have a visually obvious way to tell
>>> whether or not the document is currently modified.
>>>
>> Hi Kohei,
>>
>> ok, but maybe there are other means to get that info across?
> Sure, if you have any good suggestions.
>
Copy the way WordPerfect does it?
>> The
>> status bar, generally, uses up precious horizontal screen real
>> estate, for very little benefit.
> Well, status bar contains info about status, and document modified
> "status" fits the bill, no? ;-)
>
>> -- Thorsten, who likes the '*' prefix on the window title bar
> Indeed, but just to put this in prospective, I've received tons of angry
> emails from users when I suggested to always enable the save icon.  They
> also said that things like a small '*' in the title bar would not be
> obvious enough.

Would the word "unmodified" do it?

Pretty much all the *Perfect suite display the document name in the
title bar, and then if it's unmodified they put "(unmodified)" after the
document name. I don't normally give a monkeys about the document
status, but that uses space that otherwise wouldn't be used for anything
and, if done across writer, calc, basically all the components :-) would
provide a neat way of passing the information to the user, at no cost of
valuable currently-used screen estate.

> Obviously many users feel very *emotional* about this issue, and I found
> it out the hard way.
>
> Kohei
>
Cheers,
Wol
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Java build problem identified?

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

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

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

[Wols Lists]

On 05/12/10 16:08, Caolán McNamara wrote:
> On Sun, 2010-12-05 at 14:28 +0000, 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?

[Wols Lists]

On 05/12/10 16:08, Caolán McNamara wrote:
> On Sun, 2010-12-05 at 14:28 +0000, 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?

[Wols Lists]

On 05/12/10 16:54, Caolán McNamara wrote:
> On Sun, 2010-12-05 at 16:35 +0000, 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] Java build problem identified | findhome | MacOSX location ?

[Wols Lists]

On 05/12/10 20:40, Caolán McNamara wrote:
> On Sun, 2010-12-05 at 17:24 +0000, 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

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

[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

Re: [Libreoffice] [PUSHED] Re: occured occurred

[Wols Lists]

On 06/12/10 09:53, Takeshi Abe wrote:
>> I'm not adverse to changing that API, but its something we should plan
>> > for and bundle a whole set of changes together for.
> One possible way to gracefully diverge the APIs is providing new API/ABI
> with old obsolete ones in the meanwhile, that allow users to spell both
> variants as they like.
>
Rename the functions, and provide a #define in the .h? (Or doesn't that
work well with C++?)

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

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

[Wols Lists]

On 06/12/10 12:57, Norbert Thiebaud wrote:
>> Hmm - but the result of the IRC-discussion was to use (for Mac)
>> > /usr/libexec/java_home where available (10.5 and newer), and the
>> > hardcoded fallbackpath of either
>> > /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
>> > or /Library/Java/Home (which in the end points to the
>> > /System/Library. one.
>> >
>> > http://developer.apple.com/library/mac/#qa/qa2001/qa1170.html
>> > wasn't it?
>> >
> Yes indeed.
>
> Which is not what the result is. since the readlink cruf is still
> attempted before that... I'll have a pass at it to re-order these.
>
> Norbert
>
Sorry - that's my fault, but I was a bit out of my depth and it was late.

The problem as I saw it was making sure Mac still went through the old
path first, because findhome is successful but returns a dud path.

And it was the trap the comments said was for mac that was the trap that
made gentoo bomb.

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

Re: [Libreoffice] Comments on RC1

[Wols Lists]

On 06/12/10 18:49, Rene Engelhard wrote:
> Is that really a argument now that most people use broadband? Should we
> really care about those wo don't (and downlaod a new version every few
> months?)
What about those people who *C*an't use broadband?

Okay, I wouldn't call 2Mb slow, but we still have plenty of people in
Britain who either can't get broadband or are on basic old ADSL. I
regularly pick up on people in the American boondocks who moan that they
can't get broadband. etc etc.

I'm not in favour of us restricting ourselves "for the sake of those
without broadband", but if we *consider* them, we are likely to end up
with a better product. You know, bloat bloat bloat ... being efficient
for the sake of efficiency really *does* have something going for it :-)

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

Re: [Libreoffice] new bootstrap: How do the devellop[ install?

[Wols Lists]

On 07/12/10 09:39, Joost Eekhoorn wrote:
> Hi Sebastian,
>
> bin/ooinstall is not mentioned on the new webpage.
>
> Can you mention "make dev-install" on the webpage?
> Can you also mention it in the bash, when the build is ready?

Is there an autogen option to tell it where to install? I'm sure there
is, but this would be a good place to mention it.

Cheers,
Wol

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

[Libreoffice] Base - sqlite - licence grief

[Wols Lists]

I've downloaded the old sqlite driver, which is copyright Sun LGPL 2.1.

I was going to try and get that working, and teach myself C++ in the
process, but on trying to commit it to my local repo the first thing I
get is "you are adding tabs to these files" (no I'm not but never mind :-)

So I fix that, then I get "Your change introduces old licences". Where
do I go from here? I could unilaterally change all the files to GPL3+
(as permitted by the LGPL) but I don't yet have the skill to rewrite the
files. Or is there a contact at Oracle I can ask to upgrade the licence
to LGPL3?

Will LO accept a GPL3+ - only licenced new file?

NB - "Please check with the author(s) that they agree with upgrading the
license to LGPL3, and change the license accondingly."
c/accondingly/accordingly/ :-)

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

Re: [Libreoffice] Base - sqlite - licence grief

[Wols Lists]

On 09/12/10 19:26, Michael Meeks wrote:
> Hi Wols,
>
> On Thu, 2010-12-09 at 19:07 +0000, Wols Lists wrote:
>> I've downloaded the old sqlite driver, which is copyright Sun LGPL 2.1.
>   Oh - shame :-) I wonder if there is a newer copy of it in the repos.

I just followed the links, and that's where I ended up. I guess they
stopped maintaining it when they decided to go with hsqldb :-(
>
>> NB - "Please check with the author(s) that they agree with upgrading the
>> license to LGPL3, and change the license accondingly."
>> c/accondingly/accordingly/ :-)
>   Well - we already have LGPLv2.1 code included in the form of libwpd
> etc. so I don't think this is a huge issue.
>
>   I would fix the tabs, (and also remove space at end of lines), and
> force commit it (personally). We should check that the LGPLv2.1 is
> included in the LICENSE.odt / LICENSE files in readlicense_oo as well.
>   
Is that just a -f option on the commit, or is there more to it? I
suspect it's a hook interfering with the commit, and I don't know my way
round git well enough to know for certain how to override it :-)

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

Re: [Libreoffice] Comments on RC1

[Wols Lists]

On 09/12/10 22:21, Marc Paré wrote:
> I can see how a USB stick would be a more elegant way of distributing
> the distro. The price would seem to be the only problem that I can
> see. Framakey (Framasoft) is offering a 4gig stick for 19Euro and 4Eu
> shipping. A smaller and less expensive stick could be offered with
> just the LO distro on the stick. The cost would have to be kept as low
> as possible.  Framasoft carries the portable OOo, I imagine that they
> will eventually carry the portable LibreOffice as well. I am not sure
> if he has pronounced himself on this. 

imho, if we're not running a commercial enterprise (or even if we are)
this is actually quite expensive. Okay, I bought SD cards not USB
sticks, but I've just paid £9 for 2x2Gb, retail. Dunno how easy it is to
copy in bulk onto SD chips but I would have thought it would be easy to
get "card plus reader" for under £5 each in bulk. What's the
Euro/sterling exchange rate? Last I heard I thought they were close to
parity :-(

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

Re: [Libreoffice] Base - sqlite - licence grief

[Wols Lists]

On 10/12/10 10:16, Alexander Thurgood wrote:
> Hi,
>
>
> Le 09/12/10 20:07, Wols Lists a écrit :
>> I've downloaded the old sqlite driver, which is copyright Sun LGPL 2.1.
>>
>> I was going to try and get that working, and teach myself C++ in the
>> process, but on trying to commit it to my local repo the first thing I
>> get is "you are adding tabs to these files" (no I'm not but never mind :-)
>>
>> So I fix that, then I get "Your change introduces old licences". Where
>> do I go from here? I could unilaterally change all the files to GPL3+
>> (as permitted by the LGPL) but I don't yet have the skill to rewrite the
>> files. Or is there a contact at Oracle I can ask to upgrade the licence
>> to LGPL3?
>>
> Why not ask Christian Werner, the guy who wrote it in the first place ?
> mailto:c...@ch-werner.de

Because he's not the copyright holder?
> From what I can see of the licence terms for the ODBC SQLite driver, his
> terms are actually quite liberal :
>
> http://www.ch-werner.de/sqliteodbc/html/index.html
>
> As far as I can tell, his intention was the same for the SDBC driver
> too, but you  would be better off asking him I guess.
>
>
Unfortunately, the files all claim to be copyright Sun. So,
unfortunately, if this is true then what the author wants is irrelevant :-(

I'll investigate that route, thanks, but going by the evidence in front
of me it's likely to be futile.

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

Re: [Libreoffice] LO status bar annoyances

[Wols Lists]

On 10/12/10 21:18, Friedrich Strohmaier wrote:
>> All I am going to add is: "which user prefers single-clicks for some
>> > status bar items and double-clicks on others, while some are not
>> > clickable at all?".
> One who has been told / has learned to do so and doesn't bother on any
> theory of userfriendly UI :o))..
>
>> > "Which user wants to launch dialogs when clicking
>> > on apparently empty areas in the statusbar?"
> see above..
>
>> > and finally "which user wants 2 separators between icon areas that are
>> > really empty?"
> One who has learned to (double-)click the fourth area will be confused
> what to do now.
>
>> > "which user wants exclamation marks for default situations rather than
>> > suitably subtle icons that show modified doc status?" :-)
> Again: see above. ("You told me to click the exclamation mark - where
> should I click now?").
>
Unfortunately, this then plays havoc with the next bunch of users - who
have at least partially learnt how to use the interface. One thing the
normal user (one step above the "blindly follow the cheat sheet" monkey)
values, is a *consistent* interface.

And I know there's no such thing as "intuitive", but I still compare
Word and WordPerfect ... I moved to WordPerfect from my previous word
processors from choice, I didn't have to learn WordPerfect, it was just
"obvious". I *still* (despite using it for many years) don't know how to
use Word properly.

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

Re: [Libreoffice] Base - sqlite - licence grief

[Wols Lists]

On 13/12/10 11:34, Michael Meeks wrote:
> On Fri, 2010-12-10 at 12:27 +0100, Alexander Thurgood wrote:
>> So you see, it might not be entirely hopeless after all.
>   Oh - exactly ! :-) and it would be good to remove that hostile junk
> header with apparent Sun ownership claim anyway. Good stuff.
>
>   So - please do poke him (gently) :-)

I've had a reply from him. Sadly he didn't (didn't even say if he could)
relicence it, but he said it was abandonware. It was last worked on
about the time OOo went to 3.0, and sqlite went to 3.0 too. Christian
moved on to the JDBC and ODBC drivers, abandoning the SDBC one. It seems
to be about half v2, half v3 - take your pick of GPL, OOo or sqlite :-)

So by the time I've finished with it, it'll probably have been heavily
rewritten anyway :-) When I first tried to compile it, it blew up all
over the place. Good learning curve trying to fix that :-)

So I think the current roadmap is get it to compile, then commit the
patch. Then get the build system to build and include it as an
experimental extra. And finally get it debugged and live :-)

I've seen a couple of things about sqlite *2* that implies it's not a
particularly friendly database. 3 may well be an improvement. But
anyways, once we've got sqlite in place I'm then going to try and write
an engine for LO. That'll be a job-and-a-half! :-)
>   Thanks,
>
>   Michael.
>
Cheers,
Wol
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] LibreOffice WikiHelp discussion

[Wols Lists]

On 13/12/10 10:57, David Nelson wrote:
> Personally, I like the idea of editing the help on the wiki rather than 
> offline.
> But could the problem be solved by creating a user group on the wiki and
> only allowing editing rights for that group's users? Then we could add 
> selected
> devs, i10n and docs people to that group?
Am I right, most of this stuff is going to be reviewed anyway?

So lock all the main pages, but have the discussion pages freely
editable. They might get spammed :-( but the reviewers can be notified
regularly of new discussion pages, then they read the discussion, edit
anything suitable into the master page, and delete the discussion.

That way, contribution is open to all, the master quality is maintained,
and we have an automated workflow of sorts where the maintainers are
automatically appraised of new content.

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

Re: [Libreoffice] Base - sqlite - licence grief

[Wols Lists]

On 13/12/10 14:17, Alexander Thurgood wrote:
>> I've seen a couple of things about sqlite *2* that implies it's not a
>> > particularly friendly database. 3 may well be an improvement. But
>> > anyways, once we've got sqlite in place I'm then going to try and write
>> > an engine for LO. That'll be a job-and-a-half! :-)
> You might to try and trawl around in the OOo dba-dev mailing lists as to
> why it was decided at the time not to use SQLite. Check out Frank
> Schönheit's or Ocke Janssen's comments. I seem to recall it had
> something to do with not SQLite not lending itself easily to being able
> to keep everything in memory and then write an IO stream into and ODF
> compatible container. Of course, that was back in the days of SQLite 2
> so maybe things have got better :-) Good luck !!!
Can we put a hsqldb database in an odf container? The stuff I saw about
sqlite 2 was things like "you can't modify a table". It's a very basic
engine without a lot of the user-friendly padding.

Anyways, in the first instance, I'm treating this as a "teach yourself
C++" exercise - rather a "jump in the deep end" version :-)

And as for the other bits - ummm ... - are you serious!?!? :-) I
wouldn't even DREAM of attempting to keep a database in RAM! But then,
maybe that's because I'm used to a serious database that kicks seven
bells out of relational! I heard a war story about a year or two ago
about a company not far from me (200 miles north). Oracle consultants
spent SIX MONTHS trying to get their twin Xeon 800 machine to go faster
than the machine it was replacing. What was it replacing? A PENTIUM
NINETY! And most people who know the other database, on hearing this
sort of story, just smile and say "yeah, that sounds about right :-)".

I'm quite happy to try and stick my database files in a odf container,
but seriously, I think that is a triumph of ideology over reality. It'd
actually be dead easy to dump to XML, but I think the load and save
times would kill any user-friendliness, even if the database itself was
cuddly-lamb-friendly.

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

Re: [Libreoffice] [PATCH] nuke obsolete use of String

[Wols Lists]

On 13/12/10 14:52, Takeshi Abe wrote:
>> p.s. I think we should have a wiki page to list the old String methods
>> > and the new OUString equivalents side-by-side with snags listed. (Some
>> > of the String methods are sort of OUStringBuffer equivalents, and some
>> > are hard to do with OUStrings, and might have workarounds in
>> > comphelper). Maybe you, or someone else, could start a page in the wiki
>> > and just start with the methods used in this example
> It sounds great, so I created a table at the end of
> http://wiki.documentfoundation.org/Development/String_Classes
> which now contains only some functions but will be added more.
>
Something along those lines I've been thinking of ... can we add an
"acronym-pedia" too - I've got SDBC, I don't know what OU stands for,
there's things like SAL ...

If someone doesn't beat me to it, I'll add what I know when I get back
to my computer, but I'm sure it'll help newbies to be able to look this
up :-)

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

Re: [Libreoffice] hsqldb update

[Wols Lists]

On 14/12/10 22:13, Denny wrote:
> Hi there,
>
> is somebody out there working on an hsqldb upgrade?

Not that I know of ...

> Version 2.0 has been out there for quite some time, 2.0.1 is well on the way 
> and as the website 
> states, the new version is much improved on various ends.

It'll probably end up being me. Thanks for the heads-up. BUT.

At the moment I'm working on trying to get sqlite working as an
alternative to hsqldb. And the aim is to remove java from LO (which
implies removing hsqldb).

And I want to work on creating LO's own db engine :-)

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

Re: [Libreoffice] Base - sqlite - licence grief

[Wols Lists]

On 15/12/10 20:33, Andrés Domínguez wrote:
> 2010/12/13 Wols Lists :
>> Can we put a hsqldb database in an odf container? The stuff I saw about
>> sqlite 2 was things like "you can't modify a table". It's a very basic
>> engine without a lot of the user-friendly padding.
>>
>> Anyways, in the first instance, I'm treating this as a "teach yourself
>> C++" exercise - rather a "jump in the deep end" version :-)
> Hi Wol,
>
> I'm also looking to fix sqlite3 driver for LibO. I didn't reply before
> because I joined the list two days ago. I'm learning about libo and
> sqlite3 driver source code, hope we can cooperate. I will tell you
> as soon I do notable progress.
>
Good good good. I've committed the driver into my source tree, and I'm
now trying to get it to compile. A quick hint - adding a "3" to a lot of
the names will get you quite far quite quickly (unless you've got a
different driver to me?). Mine's the sqlite 2 driver, updated to draft
3, so it's still got all the old names in it.

I'm hoping to get time to plough on, but family and christmas are
getting in the way. Chat off-list if you like and we'll see how far we
get :-)

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

Re: [Libreoffice] Base - sqlite - licence grief

[Wols Lists]

On 16/12/10 09:58, Michael Meeks wrote:
> Hi Wols,
>
> On Thu, 2010-12-16 at 01:18 +0000, Wols Lists wrote:
>> I'm hoping to get time to plough on, but family and christmas are
>> getting in the way. Chat off-list if you like and we'll see how far we
>> get :-)
>   Perhaps the best thing to do is to create a feature branch, and push it
> there: do you have commit access to do so ? if not, can you request it
> cf. http://freedesktop.org/wiki/AccountRequests
>   
Will do, thanks, but I'm sort-of wanting to get to the "compiles
successfully" stage on my own. Not good, I know, but that's me.

It'll get there ...

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

Re: [Libreoffice] sw: numbering misbehaviour

[Wols Lists]

On 17/12/10 20:28, Caolán McNamara wrote:
> Btw, if you were interested in fixing that numbering problem, You might
> be interested in this similar bug, e.g.
>
> 1) Type some text, select it, change the formatting, e.g. font size to 18.
> Now press end to deselect the text and move to the end of the line. 
>
> 2) Now click on the bullet icon, 
>
> 3) Type some text. The text will be the default formatting, not that of
> the previous text. 
>
> However, if you e.g. press x, get the normal size 12 x, press undo, and
> then redo, then the x is size 18 as it should have been the first time.
> Most annoying.
>
> C.
>
That sounds to me like Word-style thinking!

Note that I'm not used to bullets etc BUT. In WordPerfect when you
select text and format it it puts on/off markers round the text. Hitting
"end" takes you PAST those markers. So you *have* just told it to go
back to the defaults!

What effect clicking on the bullet icon would have I don't know. As I
said, I don't use bullet points in the normal course of events. But I
would typically EXPECT (3), and have been known to get infuriated at
Word because I can't work out how to get *past* the formatting of the
previous paragraph, and back to default formatting (that said,
WordPerfect is now copying Word more and more and I've cursed Word-like
behaviour there! :-( Trying to get the new versions of WordPerfect to 
behave like WordPerfect can be an absolute nightmare :-(

You are probably thinking in Word mode where formatting is stored in the
"end of paragraph" marker? So if you go to the end of the line (or if
there's no end-of-paragraph marker to move past), you're stuffed as far
as reverting to the default goes :-(

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

Re: [Libreoffice] sw: numbering misbehaviour

[Wols Lists]

On 21/12/10 19:16, Octavio Alvarez wrote:
> On Mon, 20 Dec 2010 02:06:01 -0800, Caolán McNamara 
> wrote:
>
>> On Sun, 2010-12-19 at 01:16 +0000, Wols Lists wrote:
>>> Note that I'm not used to bullets etc BUT. In WordPerfect when you
>>> select text and format it it puts on/off markers round the text.
>>> Hitting
>>> "end" takes you PAST those markers. So you *have* just told it to go
>>> back to the defaults!
>>
>> The equivalent in writer was originally to press the right arrow when
>> you are already at the end of the line. I see that this is still
>> documented as such in help, but was changed long ago to be ctrl+shift+x
>
> Technically, that doesn't make it "move past the ending marker", but
> "removes the direct character formatting" (at least according to
> Tools » Customize)
>
> To move past the last ending marker (there might be more than one) we
> need to set the current character style to "Default" instead of simply
> removing hard format.
>
> I would have expected this to break after commit 985b180a2 on
> libreoffice/writer, but looks like it detects it and it actually applies
> Default instead if the cursor is at the end of the paragraph.
>
> Interestingly enough, this does not happen at the beginning of the
> paragraph. Should it? (Even if you manually set Default, it doesn't
> work.)

I'm not expecting anybody to take this and run with it, but ...

My main reason originally for being interested with LibreOffice was "can
I add an editing window like WordPerfect Reveal Codes?". Because without
*that* you will find it very hard to win over the WordPerfect fanatics.
Seeing as LO is based on XML as the document format it should be easy -
all "reveal codes" is is a window with text and all the markup visible.
But the crucial point is that it is an *editing* window. I remember
talking with someone (can't remember his name) on LWN a fair bit about
WordPerfect, and he thought emulating reveal codes would be simple
*until* I said "without the edit functionality it's a waste of space".
Microsoft made that mistake.

And of course, with that, all these particular problems would
"disappear" :-)

But I've got interested in Base now, so I suspect that itch won't get
scratched by me now. Pity :-(

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

Re: [Libreoffice] format inspector (Was : Re: sw: numbering misbehaviour)

[Wols Lists]

On 22/12/10 22:02, Cor Nouws wrote:
> I do not so much believe in the old WP-style of 'reveal formatting'
> since I know OOo.
> As a style addict, and knowing where to find Ctrl-M, it's easy to
> tackle most...
> Said that, indeed a (new style) pop-up to show
>  - para style
>  - char. style
>  - direct (hard) formatting
> would be useful, at least for many users. 

"Since I know OOo".

That is a MAJOR point. One of my biggest problems with Word (and Writer,
but less so) is "what the hell happened!?"

Given *someone* *else* screwing up, with WordPerfect and Reveal Codes,
it takes me moments to find out what happened, and not much longer to
fix it. That's even when they've managed to use WordPerfect in ways I
know nothing about.

The whole point of Reveal Codes, is it tells me *what* WP is doing,
*and* *why*. I have major problems doing that in Word. I haven't used
Writer enough to come to that conclusion, but I find Word and Writer far
too similar for comfort ... at least Writer is less inclined ime to "do
its own thing".

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

Re: [Libreoffice] format inspector (Was : Re: sw: numbering misbehaviour)

[Wols Lists]

On 23/12/10 00:07, Philipp Weissenbacher wrote:
> May I point you to the crazy idea "Add WordPerfect features like
> RevealCodes and HiddenText" [1]

Actually, it was me that added that to the wiki page :-)

> Also see the therein referenced OOo bug. It's been requested in 2002
> and always dismissed with the answer "learn to use styles" *sigh*.

But I didn't know about that OOo bug. I'll need to learn styles, but
yes, *me* learning styles is totally useless when it's *someone* *else*
who's messed up *their* document (and expects me to fix it for them).

Plus, I expect I may well soon be teaching people to word process. I
shall almost certainly be running WordPerfect under Wine, and making
them use reveal codes. Yep - WordPerfect 6.1 for Win 3.1, but imho the
pre-Corel-rewrite versions of WP are pretty much the best word processor
ever :-)

> Just my 2 cents.

And my tuppence.

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

Re: [Libreoffice] Suggestions

[Wols Lists]

On 23/12/10 23:44, Olivier Hallot wrote:
> Hi
>
> Em 23-12-2010 18:36, Michel Basilieres escreveu:
>> Hi
>>
>> There are two big areas which I feel need to be addressed - although I'm
>> sure I'm not the only one to mention them. First, and most important, MS
>> Office compatibility. Frankly, in OO this is crap. The transfer from OO
>> (I know it's not LO, but as far as I know, no one has said this is an
>> issue for LO) to Word and back again is so bad I finally had to migrate
>> to Word.
>
> The easiest way to fix Microsoft compatibility issues in your
> workplace is to buy Microsoft licences. LibreOffice will never do
> better than Microsoft. Not even Microsoft do better than Microsoft.
> And frankly, do we want to be tied to Microsoft rules forever? 

Microsoft has a WELL DOCUMENTED history of DELIBERATELY BREAKING
compatibility with other programs. If you want compatibility between
LO/OOo and Word, you will need to stop MS breaking it.

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

Re: [Libreoffice] Better wording for 'Update links' question

[Wols Lists]

On 22/12/10 22:39, Christoph Noack wrote:
>>> Would it be possible to have the prompt remain as it is, with a "Help" 
>>> > > or "More" button that leads to some expanded explanation?
> Given the fact that the "More" button might only show some few lines of
> text - what does that additional click help?
Responding rather late ...

But having hit this exact same dialog box in WordPerfect ...

It was very uninformative, confusing, and unsuppressable. Add to that,
to the best of my knowledge the document *couldn't* contain any external
links because I'd created it, hadn't linked it anywhere, and didn't know
what a link was or how to find it.

So in this circumstance an extra link would be great - maybe make it
respond to F1 and take you to the relevant help page?

(How the link appeared was, I guess, yet another usability issue. I'm
finding that as more and more "helpful" shortcuts appear, programs are
doing more and more things that I don't want and didn't ask for, and can
only guess that a thick-fingered typist is triggering unknown and
unknowable short cuts !!! :-(

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

Re: [Libreoffice] format inspector (Was : Re: sw: numbering misbehaviour)

[Wols Lists]

On 28/12/10 12:54, Philipp Weissenbacher wrote:
>> But I didn't know about that OOo bug. I'll need to learn styles, but yes,
>> > *me* learning styles is totally useless when it's *someone* *else* who's
>> > messed up *their* document (and expects me to fix it for them).
> I think that's *exactly* *the* use case: fixing broken formatting.
>
Actually, no it isn't. It's a very useful use case, when I'm helping
other people ...

But when *I* am creating a document in WordPerfect I nearly always have
reveal codes switched on. I *think* in markup mode, and the whole point
of reveal codes is it is a markup window that shows me what's going on.
As has been said, it keeps me in touch with what formatting is active
(is the cursor *in*side or *out*side the style selection for example :-)
I actually use reveal codes as my main working window, not the wysiwyg
one. (And whether reveal codes is active actually affects the
functioning of the wysiwyg window :-)

My wife is making calendars with pictures and tables - I find it
incredibly useful to keep track of the anchors that hold the pictures ...

Oh - and something Word can't do, dunno about Writer ... what on earth
do you do when you have two formatting objects one on top of the other?
How do you "click on the object"? It's easy to get like that with text
over/under a picture or stuff like that, but I said something Word
couldn't do ... WordPerfect has the "advance" typesetting command which
places the cursor anywhere you like on the *current* page - so you can
type a load of text then move the cursor back and overtype. Word has
allegedly the same, but it only moves downwards so if you tell it to
move up it will move to that position on the next page. And while I
don't use the feature very much, I use it for letters. Place my address
top right, then go back to left margin, place cursor two inches down the
page, and start typing the recipient's address. Yes there are other ways
of doing it but that's exactly the way the makes sense to a typist.

The other use case I've mentioned is teaching. Showing people what's
going on "under the bonnet".

But I think the problem you have is that you think differently.
WordPerfect was aimed at the expert typist. Word was aimed at the
two-fingered hunt-n-peck'er. A lot of people hated reveal codes, but a
lot of people loved it. And until you have a EDITing markup window, you
won't get the WordPerfect fanatics to move across. Because the
Word/Writer way of thinking is just plain *ALIEN* to people like me ...
:-) I *HATE* the Word interface. And Writer (although I don't know it
that well) seems too similar for comfort :-(

Oh - that reminds me of something I came across ages ago when someone
was comparing Word and WordPerfect - they said "in WordPerfect, you tell
it what formatting you want as you go, and it comes out pretty much as
you want. In Word, you type the text in and then go back and lay it out."

I would say, though, if all you know of WordPerfect is from v9/2000
onwards, that got rewritten as a Windows program by Corel and is badly
corrupted by the Windows/Word way of thinking :-(

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

Re: [Libreoffice] Request for review & push to libreoffice-3-3

[Wols Lists]

On 29/12/10 17:46, Rene Engelhard wrote:
> English is de facto a thing everyone should know, even more so if
> they are going to read the license. (And I would even
> argue the preamble of the license belongs to the license itself, 
> and thus shouldn't be translated anyways).

Actually, as a native English speaker (that's English, not American :-)
I'm pretty appalled by the fact we expect everyone else to speak our
language, so I wouldn't agree "English is something everyone should
know". Oh - and if we're going by European first languages at least,
then the dominant native tongue is "some variant of latin". Making Latin
the standard language of Europe would make a lot of sense :-) English is
very much an also-ran in those stakes...

> I also have to live with the fact that en_US iś "english", whereas
> that's deserved by en_GB because that's the original english. I don't
> add this as stopper either.
>
And again, no, en_GB is not the "original english". It is the language
of the English nation, true (who are Saxons, not Angles :-), but
American is actually a lot closer to historical English than is Modern
English.

(btw, the Angles speak Scots :-)

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

Re: [Libreoffice] Formula cursor : bug or feature ?

[Wols Lists]

On 29/12/10 19:06, Jonas Finnemann Jensen wrote:
> Hi Regina,
>
>> > It is only difficult for people, who do not get a starting instruction.
> True... I would assume that most users are not given an introduction course...
> In most schools students are given an introduction to MS Word and MathType.
> If an introduction is given, it's quite often assume that people can use 
> word...
>
> But we need to find a balance between easy-to-learn and fast-to-use.
> At the moment it requires quite a lot of effort to learn it...
> Hench my reference to vim/emacs... I mean it would be faster to write
> the text in LibreOffice if it had a vim-mode. But LibreOffice don't
> have a vim-mode because of the learning curve.
>
This is exactly my thing with WordPerfect ... it was aimed at TRAINED
typists! You know, those people who type at 120 words per minute WITHOUT
LOOKING AT THE TYPEWRITER. (Which is why I hate Word - if you *do* know
what you're doing, all these "enhancements" are like Bob, a bl**dy pain!)

We need to plan towards an expert mode with NO popups, NO distractions,
NOTHING that gets in the way of a fast typist bashing in the text.

I'm not saying the WordPerfect way is best, but again, something I
remember hearing said about it, it presented the user with a blank
screen, like a blank piece of paper, but all the power of the menus,
drop downs, etc was easily accessible if required.

It shouldn't be that hard to fix things so we have a "learning" mode for
the two-fingered hunt-n-peck people, and an expert mode for the
experienced typists ... and if it IS difficult, then there's something
wrong with LO!

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

Re: [Libreoffice] [UX] Formula cursor proposals

[Wols Lists]

On 04/01/11 23:43, Christoph Noack wrote:
> The main issue is, that we do have two different input methods (one
> being WYSIWYG, the other one being the formula syntax) that have to be
> synced somehow. The content itself isn't the main problem, but things
> like cursor position and selection. We can only have one, because this
> corresponds with the current focus that is visualized for the user.
> 
> So here is some initial idea that might serve as some input to solve
> that issue. It already implies some step-by-step approach to achieve
> reasonable maturity:

Diving in as usual (and possibly missing the point.. :-) Have you played
with WordPerfect which - iiuc - has EXACTLY this issue syncing the
wysiwyg and reveal-codes windows.

A mouse click in the wysiwyg window places the cursor at that point and
makes that the active window. A mouse click in the rc window places the
mouse cursor at that point and makes that the active window. Bear in
mind the rc window has extra "characters", ie the formatting codes. If
the rc window is active the cursor keys move in that window, updating
the wysiwyg window if appropriate. If wysiwyg is active, the cursor keys
move in that window, jumping multiple "characters" in rc if appropriate.

This obviously all depends on the two windows being able to update each
other in sync (I gather that would be a nightmare in Writer :-(, but if
it's possible, then imho that would be the perfect way to do it - the
mouse swaps focus between windows - the active window eats and processes
the keyboard - and the inactive window is updated in real time by the
active one.

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

Re: [Libreoffice] Bug triaging - bugs in OOo code base

[Wols Lists]

On 07/01/11 18:09, Alexander Thurgood wrote:
> Hi,
> A question to the developers, which will inevitably become more
> important as things push on with LibO and the code base starts to separate :
> 
> - what is the current approach, with regard to bug triaging, to bugs
> caused by the OOo code base ?
> 
> What I mean is that do we consider them to be our own bugs, or not ?
> 
> From the bug triager's point of view, it is easy to tell someone that
> this is "NOTOURBUG", however, I have my doubts about that

Well, if it's in the code we're shipping then it is our bug ...

 because
> ultimately, someone who knows nothing about OOo and who has only ever
> used LibO, is not likely to understand the underpinning between the code
> bases and therefore not be entirely satisfied with the bug being
> classified as someone else's when in fact substantially the same code
> base is used. Of course, there are people who file reports knowing that
> the bug exists in the OOo codebase and hoping that the LibO devs will
> sort it out - this is a kind of catch 22 for the bug triager ? - to
> clear out or not to clear out ?
> 
imho it should be classified as UPSTREAM.
> 
> I would appreciate your thoughts on the matter, as it will help me to
> better sort through the bug reports.
> 
It seems highly likely we are going to diverge from OOo, and that the
discrepancies will steadily grow, so this is simply YAI (yet another
instance).

Then the bug-fixers can decide whether to fix it themselves or wait for
OOo to fix it. And your "someone who knows nothing about OOo" can be
assured that we know about the bug, and it will (hopefully) be dealt
with. Plus, if we've got a load of bugs marked "UPSTREAM" it makes it a
lot easier for the OOo devs to scan our bug database and find stuff that
interests them. (Or our bugfixers can assign the patch to OOo.)
> 
> Alex
> 
But all this is my personal imho, so don't take this as a guideline
unless nobody else chips in with a more definitive statement ...

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