[Libreoffice] Voreppe Win32 Tinderbox

2011-02-25 Thread Fridrich Strba
As you can see here , we 
have now a working Windows tinderbox. It finished tonight its first 
successful build of master branch and will send you nagging e-mails for 
any breakages from now on. It is our hope that this tinderbox will help 
us to keep LibreOffice buildable on Windows much easier. So, please take 
the Voreppe Win32 Tinderbox' messages seriously :)


This tinderbox is running Windows Server 2008 R2 Service Pack 1 with 
Visual Studio 2008 Service Pack 1 and Windows SDK 7.1. The server was 
graciously given at the disposition of the LibreOffice community by the 
French town of Voreppe  through the association 
La Mouette . I want to personally thank 
Laurent Godard , a 
long-time community member and contributor who was more then 
instrumental in this transaction.


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


[Libreoffice] [PATCH] remove using namespace rtl

2011-02-25 Thread Kevin Hunter

Hullo List,

A simpleton patch to convert the more sane using ::rtl::* syntax.

Kevin


0001-Remove-using-namespace-rtl.patch.xz
Description: application/xz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice] Java extension chrashes LibreOffice

2011-02-25 Thread Kálmán „KAMI” Szalai
Hi,

Can someone review this bug:
https://bugs.freedesktop.org/show_bug.cgi?id=34711

KAMI



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] Tools - Media Player

2011-02-25 Thread Kálmán „KAMI” Szalai
Title: Szalai Kálmán


  
  
Hi,

But why we remove possibilities from a submenu?


KAMI


2011-02-25 12:40 keltezéssel, Thomas Arnhold írta:

  Hi,

On 02/25/2011 12:07 PM, Fernand Vanrie wrote:

  
Please consider: We are living and working in a Multi Media world:
Not only who is working with Impress needs a media player, all content
can have  mixed content and LO must be the "one stop" place to handle
all  multi media stuff.

  
  
I partially reverted the changes for writer. The background calls are
there again, so anybody who needs Media Player could add this by
customizing the menu. And I've enabled Media Player for web by default
as this make really sense.

Fernand, only for my personal interest: are you using videos in odt
files? Maybe I'm not knowing what's possible with this ;)

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



-- 
  
  
  Best regards,

Kálmán „KAMI” Szalai | 神 | kami911 [at] gmail [dot] com


My favorite projects:

OxygenOffice Professional - office suite - for everybody | Magyarul - In Hungarian

Blog | Support 

Follow me, if you can



  



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] Comment-translation of writer/sw/source/ui/dbui

2011-02-25 Thread Martin Kepplinger
Am 25.02.2011 23:20, schrieb Christina Roßmanith:
> Pushed - thank you
> 
> Christina
> 

Thanks Christina,

By the way, "git am" works perfectly fine with tunderbird! Just "ctrl-s"
(save as -> "file") and _then_ choose the raw email format in the
saving-dialog.
It's really simply "git am " inside of the git tree.
whitespace warning can savely be ignored I guess.

thanks again,
Martin


> Am 25.02.2011 00:19, schrieb Martin Kepplinger:
>> Hi,
>>
>> This translates all german code comments in writer/sw/source/ui/dbui to
>> english.
>>
>> thanks,
>> Martin
>>
>> ___
>> 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] Nonsense comments?

2011-02-25 Thread Pierre-André Jacquod
On 02/25/2011 09:46 PM, Caolán McNamara wrote:

> po files can have translator-comments in them to help translators
> about ambiguous terms/words, while the .src/.sdf format doesn't though,
translation with gettext would support this with comment using key-words
/ tags. Key words are configurable, maybe a convention has been set with
### as marker...

> right ? I recall a problem with trying to get the Spanish translation of
> an obscure paper size (8.5" x 13" ) set as "Oficio" given that this

with gettext, it would be roughly something like
coding in file.cxx:
/* TRANSLATORS paper size (8.5" x 13" ) */
printf("Long Bond");

with xgettext --add-comments TRANSLATORS
the po-file for this language would then looks (after translation) like

#. paper size (8.5" x 13" )
#src: file.cxx 123
msgid "Long Bond"
msgstr "Oficio"


in crazy idea to go to gettext, when really time available : -)
regards
Pierre-André
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] Comment-translation of writer/sw/source/ui/dbui

2011-02-25 Thread Christina Roßmanith

Pushed - thank you

Christina

Am 25.02.2011 00:19, schrieb Martin Kepplinger:

Hi,

This translates all german code comments in writer/sw/source/ui/dbui to
english.

thanks,
Martin

___
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] bits ...

2011-02-25 Thread Michael Meeks
Hi Zongbo,

On Thu, 2011-02-24 at 23:24 +0100, Zongbo Zhang wrote:
> Big thanks goes to Michael Meeks, finally a real good person
> here is willing to answer my question! :)

Honestly - many are willing - but many are busy; we have exciting
scaling problems, and struggle to review all the good work flowing in so
sweetly.

> dmake:  Error code 3, while making 'test'
> Retrying /home/zzh/git/libo/svl/qa/unit
> 
> Making:qa_unit.dll

So - you are building on Windows - ah ! I didn't notice that :-)
indeed, this makes you brave as a lion, and treading a path where there
are many bears in need of correction :-) As/when the tinderbox and
windows builds are rock-solid, hopefully the day-to-day quality of the
Windows build will improve: but it is a pitiful platform - hard to build
for, slow to compile, which is why most developers use and fix for
Linux. So, welcome, there is plenty of useful work to do there,
reporting and helping to fix problems.

Thanks,

Michael.

-- 
 michael.me...@novell.com  <><, Pseudo Engineer, itinerant idiot


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


[Libreoffice] [PATCH] renamed MACASSGN_TEXTBAUST -> MACASSGN_AUTOTEXT

2011-02-25 Thread Christina Roßmanith

Hi,

the "Textbaustein" (German) feature is "auto text" in LibreOffice. I 
renamed the constant accordingly. Build of sw was successful.


Submitted under LGPLv3+ / MPL

Christina Rossmanith
>From c0e1f78f6e87f554bb8e8d38a1e81fa0a3b9bceb Mon Sep 17 00:00:00 2001
From: Christina Rossmanith 
Date: Fri, 25 Feb 2011 21:49:07 +0100
Subject: [PATCH] renamed MACASSGN_TEXTBAUST -> MACASSGN_AUTOTEXT

---
 sw/source/ui/dialog/macassgn.cxx |2 +-
 sw/source/ui/inc/macassgn.hxx|2 +-
 sw/source/ui/misc/glossary.cxx   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 85dbb53..6daac06 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -70,7 +70,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
 
 switch( eType )
 {
-case MACASSGN_TEXTBAUST:			// text building blocks
+case MACASSGN_AUTOTEXT:
 aItem.AddEvent( String( SW_RES(STR_EVENT_START_INS_GLOSSARY) ), String(),
 SW_EVENT_START_INS_GLOSSARY );
 aItem.AddEvent( String( SW_RES(STR_EVENT_END_INS_GLOSSARY) ), String(), 
diff --git a/sw/source/ui/inc/macassgn.hxx b/sw/source/ui/inc/macassgn.hxx
index 1872e53..c2be6cb 100644
--- a/sw/source/ui/inc/macassgn.hxx
+++ b/sw/source/ui/inc/macassgn.hxx
@@ -35,7 +35,7 @@ class SvxMacroItem;
 
 enum DlgEventType
 {
-MACASSGN_TEXTBAUST,
+MACASSGN_AUTOTEXT,
 MACASSGN_GRAPHIC,
 MACASSGN_OLE,
 MACASSGN_FRMURL,
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 990406d..0c708a8 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -590,7 +590,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
 aItem.SetMacro( SW_EVENT_END_INS_GLOSSARY, aEnd );
 
 aSet.Put( aItem );
-aSet.Put( SwMacroAssignDlg::AddEvents( MACASSGN_TEXTBAUST ) );
+aSet.Put( SwMacroAssignDlg::AddEvents( MACASSGN_AUTOTEXT ) );
 
 const SfxPoolItem* pItem;
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-- 
1.7.0.4

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


Re: [Libreoffice] Nonsense comments?

2011-02-25 Thread Caolán McNamara
On Fri, 2011-02-25 at 20:37 +0100, Christina Roßmanith wrote:
> I'd suggest to remove the comments. It always follows the pattern

Seems reasonable, though this reminds me...

timar: po files can have translator-comments in them to help translators
about ambiguous terms/words, while the .src/.sdf format doesn't though,
right ? I recall a problem with trying to get the Spanish translation of
an obscure paper size (8.5" x 13" ) set as "Oficio" given that this
paper size is known as that in the handful of Latin American nations
that use it, rather than some literal Spanish translation of "Long Bond"
as the size is known in e.g. the Philippines. Would it be helpful to
have a medium-level hack to add translator-comment support to the
translation tools to help flag that sort of thing ?

> One of these messages is "Subpoints per level" which should be subitems. 

FWIW, this connects to file->send->create autoabstract/autoabstract to
presentation. e.g. source document of "heading 1", followed by three
paragraph of "foo", file->send->autoabstract to presentation, 1 subpoint
per level ends up with "heading 1" with the first "foo" turned into a
subpoint of the heading 1. "Subitems" doesn't really grab me, while
subpoint sort of fits the output presentation. Don't really have an
opinion, but at least this is the dialog it appears in.

C.

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


[Libreoffice] Nonsense comments?

2011-02-25 Thread Christina Roßmanith

Hi,

while reviewing a patch I came across a lot of comments like

CheckBox CB_USE_PASSWD
{
/* ### ATTENTION: New text in resource? ~password : ~password */
Text [ en-US ] = "~Password" ;
};

String STR_LINKEDIT_TEXT
{
/* ### ATTENTION: New text in resource? edit links : edit links */
Text [ en-US ] = "Edit links" ;
};

The message doesn't sound very exciting - so why all those ATTENTION? 
I'd suggest to remove the comments. It always follows the pattern


/* ### ATTENTION: New text in resource?  :  */
Text [ en-US ] = "" ;


One of these messages is "Subpoints per level" which should be subitems. 
May I change this (sw/source/ui/dialog/abstract.src)?


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


[Libreoffice] [PATCH] [PUSHED] Comment translation of writer/sw/source/ui/dialog

2011-02-25 Thread Christina Roßmanith

Pushed - thank you.

Christina


Am 25.02.2011 11:18, schrieb Martin Kepplinger:

This translates all code comments in this directory from german to english.

This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.

thanks,
martin
---
  sw/source/ui/dialog/abstract.src   |8 +--
  sw/source/ui/dialog/ascfldlg.cxx   |2 +-
  sw/source/ui/dialog/dialog.src |4 +-
  sw/source/ui/dialog/docstdlg.cxx   |8 ++--
  sw/source/ui/dialog/macassgn.cxx   |   16 
  sw/source/ui/dialog/regionsw.cxx   |6 +-
  sw/source/ui/dialog/regionsw.src   |4 +-
  sw/source/ui/dialog/uiregionsw.cxx |   76 ++--
  8 files changed, 61 insertions(+), 63 deletions(-)

diff --git a/sw/source/ui/dialog/abstract.src b/sw/source/ui/dialog/abstract.src
index ab5a863..ebb9082 100644
--- a/sw/source/ui/dialog/abstract.src
+++ b/sw/source/ui/dialog/abstract.src
@@ -34,9 +34,7 @@ ModalDialog DLG_INSERT_ABSTRACT
  OutputSize = TRUE ;
  SVLook = TRUE ;
  Size = MAP_APPFONT ( 239 , 68 ) ;
-/* ### ACHTUNG: Neuer Text in Resource? AutoAbstract erzeugen : 
AutoAbstrakt erzeugen */
-/* ### ACHTUNG: Neuer Text in Resource? AutoAbstract erzeugen : 
AutoAbstrakt erzeugen */
-/* ### ACHTUNG: Neuer Text in Resource? AutoAbstract erzeugen : 
AutoAbstrakt erzeugen */
+/* ### ATTENTION: New text in resource? create AutoAbstract : create 
AutoAbstract */
  Moveable = TRUE ;
  FixedLine FL_1
  {
@@ -70,7 +68,7 @@ ModalDialog DLG_INSERT_ABSTRACT
  {
  Pos = MAP_APPFONT ( 12 , 27 ) ;
  Size = MAP_APPFONT ( 120 , 8 ) ;
-/* ### ACHTUNG: Neuer Text in Resource? Absätze je Kapitel : Absõtze 
je Kapitel */
+/* ### ATTENTION: New text in resource? paragraphs per chapter : 
paragraphs per chapter */
  Text [ en-US ] = "Subpoints per level" ;
  };
  NumericField NF_PARA
@@ -92,7 +90,7 @@ ModalDialog DLG_INSERT_ABSTRACT
  {
  Pos = MAP_APPFONT ( 12 , 43 ) ;
  Size = MAP_APPFONT ( 165 , 16 ) ;
-/* ### ACHTUNG: Neuer Text in Resource? Im Abstrakt erscheint die 
ausgewählte Anzahl von Absätzen aus den einbezogenen Kapitelebenen. : Im 
Abstrakt erscheint die ausgewõhlte Anzahl von Absõtzen aus den einbezogenen 
Kapitelebenen. */
+/* ### ATTENTION: New text in resource? The selected number of 
paragraphs from the included outline levels appears in the abstract. : The 
selected number of paragraphs from the included outline levels appears in the 
abstract. */
  WordBreak = TRUE ;
  Text [ en-US ] = "The abstract contains the selected number of paragraphs 
from the included outline levels." ;
  };
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 893263d..745524c 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -266,7 +266,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, 
SwDocShell&  rDocSh,
  SetSizePixel( aSize );
  }

-// initialisiere Zeichensatz
+// initialise character set
  aCharSetLB.FillFromTextEncodingTable( pStream != NULL );
  aCharSetLB.SelectTextEncoding( aOpt.GetCharSet()  );

diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src
index f3df744..55860f6 100644
--- a/sw/source/ui/dialog/dialog.src
+++ b/sw/source/ui/dialog/dialog.src
@@ -28,7 +28,7 @@

  CheckBox CB_USE_PASSWD
  {
-/* ### ACHTUNG: Neuer Text in Resource? ~Paßwort : ~Pa?wort */
+/* ### ATTENTION: New text in resource? ~password : ~password */
  Text [ en-US ] = "~Password" ;
  };
  CheckBox CB_READ_ONLY
@@ -37,7 +37,7 @@ CheckBox CB_READ_ONLY
  };
  String STR_LINKEDIT_TEXT
  {
-/* ### ACHTUNG: Neuer Text in Resource? Verknüpfungen bearbeiten : 
Verkn³pfungen bearbeiten */
+/* ### ATTENTION: New text in resource? edit links : edit links */
  Text [ en-US ] = "Edit links" ;
  };
  String STR_PATH_NOT_FOUND
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index bd2711b..5b88900 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -102,7 +102,7 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const 
SfxItemSet&rSet) :
  }

  /*
-Beschreibung:  ItemSet fuellen bei Aenderung
+Description:   fill ItemSet when changed
   */


@@ -115,7 +115,7 @@ void  SwDocStatPage::Reset(const SfxItemSet&/*rSet*/)
  {
  }
  /*
- Beschreibung: Aktualisieren / Setzen der Daten
+ Description:  update / set data
  */


@@ -131,7 +131,7 @@ void SwDocStatPage::SetData(const SwDocStat&rStat)
  }

  /*

[Libreoffice] [PATCH] [PUSHED] removed BMP_FEHLT

2011-02-25 Thread Christina Roßmanith
Commented it first, then treated it as commented code, removed it and 
interpreted Thomas Arnold's reply "Why don't you commit this by your 
self?" as the license to push it on my own...any objections :-)


Christina

Am 25.02.2011 18:21, schrieb Christina Roßmanith:

Hi,

I've removed BMP_FEHLT in two files. Build was successful.

Christina Rossmanith


___
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] removed BMP_FEHLT

2011-02-25 Thread Christina Roßmanith

Hi,

I've removed BMP_FEHLT in two files. Build was successful.

Christina Rossmanith
>From 83e4b188a4655bf55c43161ca1501917b4bb44a1 Mon Sep 17 00:00:00 2001
From: Christina Rossmanith 
Date: Fri, 25 Feb 2011 18:19:26 +0100
Subject: [PATCH] removed BMP_FEHLT

---
 sw/source/ui/app/app.src |3 ---
 sw/source/ui/inc/app.hrc |3 ---
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 5a597ae..6771554 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -169,9 +169,6 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
 
 
 
-// Default Bitmap for Toolbox
-BITMAP BMP_FEHLT { FILE = "x.bmp" ; };
-
 // Bitmap for the NumberingTemplates in the Organizer
 Bitmap BMP_STYLES_FAMILY_NUM { File = "styfamnu.bmp" ; };
 
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 30ca41b..9d017f5 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -30,9 +30,6 @@
 
 #include "rcid.hrc"
 
-// Default Bitmap fuer ToolBox
-#define BMP_FEHLT	(RC_APP_BEGIN + 1)
-
 // Document-Icon
 #define RC_DOC_ICON (RC_APP_BEGIN + 2)
 
-- 
1.7.0.4

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


[Libreoffice] [PUSHED] Re: [Patch][EasyHack] Fix fdo#32376 Set default color to the current one in toolbar popups

2011-02-25 Thread Caolán McNamara
On Sat, 2011-02-12 at 02:57 +0900, KUROSAWA, Takeshi wrote:
> Hi,
> 
> Here is a patch to fix bug 32376:
> 
> Bug 32376 - [EasyHack] Set default color to the current one in toolbar popups
> https://bugs.freedesktop.org/show_bug.cgi?id=32376
> 
> With this patch, color selection popups remember previously selected color.

This one seems to have slipped between the cracks, but looks good to me
and improves the situation IMO. Thanks for this, now pushed.

C.

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


Re: [Libreoffice] [Patch] Accelerate Perl installer builder

2011-02-25 Thread Jan Darmochwal
Hi!

This patch speeds up make_installer.pl by about 5% on linux
(probably much less speedup on windows). The Patch is LGPLv3+/MPL.

The next patch will focus on Windows speed (if I succeed in setting
up a Windows build environment for LibreOffice).

Jan
>From b00c14d851996150da952eb71d84eee50cf68a7f Mon Sep 17 00:00:00 2001
From: Jan Darmochwal 
Date: Fri, 25 Feb 2011 11:23:25 +0100
Subject: [PATCH] Accelerate Perl installer builder

* subs in converter.pl rewritten
* fixed bug in convert_whitespace_stringlist_into_array
* removed copy_array_from_reference (can be written as "$copy = [@{$source}]")
* removed copy_hash_from_reference (can be written as "$copy = {%{$source}}")
* removed convert_stringlist_into_array_without_linebreak_and_quotes
  (equivalent to convert_stringlist_into_array_without_newline)
---
 solenv/bin/modules/installer/archivefiles.pm  |2 +-
 solenv/bin/modules/installer/converter.pm |  269 +++--
 solenv/bin/modules/installer/helppack.pm  |4 +-
 solenv/bin/modules/installer/languagepack.pm  |4 +-
 solenv/bin/modules/installer/windows/idtglobal.pm |4 +-
 solenv/bin/modules/installer/worker.pm|   50 +
 solenv/bin/modules/installer/xpdinstaller.pm  |2 +-
 7 files changed, 48 insertions(+), 287 deletions(-)

diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index 3cd07b7..34fff6c 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -88,7 +88,7 @@ sub get_patch_file_list
 $patchfilestring =~ s/^\s*\///;
 $patchfilestring =~ s/^\s*\\//;
 
-my $patchfilesarray = installer::converter::convert_stringlist_into_array_without_linebreak_and_quotes(\$patchfilestring, ",");
+my $patchfilesarray = installer::converter::convert_stringlist_into_array_without_newline(\$patchfilestring, ",");
 
 return $patchfilesarray;
 }
diff --git a/solenv/bin/modules/installer/converter.pm b/solenv/bin/modules/installer/converter.pm
index 24be74e..ea95fb8 100644
--- a/solenv/bin/modules/installer/converter.pm
+++ b/solenv/bin/modules/installer/converter.pm
@@ -35,20 +35,14 @@ use installer::globals;
 
 sub convert_array_to_hash
 {
-my ($arrayref) = @_;  
-
+my ($arrayref) = @_;
+
 my %newhash = ();
 
-for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
+for (@{$arrayref})
 {
-my $line = ${$arrayref}[$i];
-
-if ( $line =~ /^\s*([\w-]+?)\s+(.*?)\s*$/ )
-{
-my $key = $1;
-my $value = $2;
-$newhash{$key} = $value;
-}
+next unless /^\s*([\w-]+?)\s+(.*?)\s*$/;
+$newhash{$1} = $2;
 }
 
 return \%newhash;
@@ -58,44 +52,7 @@ sub convert_hash_into_array
 {
 my ($hashref) = @_;
 
-my @array = ();
-my $key;
-
-foreach $key (keys %{$hashref})
-{
-my $value = $hashref->{$key};
-my $input = "$key = $value\n";
-push(@array ,$input);
-}
-
-return \@array
-}
-
-#
-# Converting a string list with separator $listseparator 
-# into an array
-#
-
-sub convert_stringlist_into_array_without_linebreak_and_quotes
-{
-my ( $includestringref, $listseparator ) = @_;
-
-my @newarray = ();
-my $first;
-my $last = ${$includestringref};
-
-while ( $last =~ /^\s*(.+?)\Q$listseparator\E(.+)\s*$/)	# "$" for minimal matching
-{
-$first = $1;
-$last = $2;	
-$first =~ s/\"//g;
-push(@newarray, $first);
-}	
-
-$last =~ s/\"//g;
-push(@newarray, $last);	
-
-return \@newarray;
+return [map { "$_ = $hashref->{$_}\n" } keys %{$hashref}];
 }
 
 #
@@ -107,22 +64,7 @@ sub convert_stringlist_into_array
 {
 my ( $includestringref, $listseparator ) = @_;
 
-my @newarray = ();
-my $first;
-my $last = ${$includestringref};
-
-while ( $last =~ /^\s*(.+?)\Q$listseparator\E(.+)\s*$/)	# "$" for minimal matching
-{
-$first = $1;
-$last = $2;	
-# Problem with two directly following listseparators. For example a path with two ";;" directly behind each other
-$first =~ s/^$listseparator//;
-push(@newarray, "$first\n");
-}	
-
-push(@newarray, "$last\n");	
-
-return \@newarray;
+return [map "$_\n", split /\Q$listseparator\E\s*/, ${$includestringref}];
 }
 
 #
@@ -134,20 +76,7 @@ sub convert_stringlist_into_array_without_newline
 {
 my ( $includestringref, $listseparator ) = @_;
 
-my @newarray = ();
-my $first;
-my $last = ${$includestringref};
-
-while ( $last =~ /^\s*(.+?)\Q$listseparator\E(.+)\

Re: [Libreoffice] [PATCH] add registration of MS Office MIME types to Web plugin

2011-02-25 Thread Cedric Bosdonnat
On Thu, 2011-02-24 at 17:52 +, Chris Cunningham wrote:
> First time contribution, simple patch attached to bug 34673* to add
> support for the MS Office MIME types to the Web plugin. Can someone
> please check it? (filed bug and attached patch to it rather than
> posting here, sorry if I should have done the opposite)

[...]

> * https://bugs.freedesktop.org/show_bug.cgi?id=34673

I answered in the bug report. The question to me is about consistency:
shouldn't we check if the MSO files are to be bound with LibreOffice
instead of handling them in all cases?

Any other thoughts?

-- 
Cédric Bosdonnat
LibreOffice hacker
http://documentfoundation.org
OOo Eclipse Integration developer
http://cedric.bosdonnat.free.fr

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


Re: [Libreoffice] Tools - Media Player

2011-02-25 Thread Fernand Vanrie

Thomas ,

No we are not placing video in odt, files, but our editors (while there 
are working in writer), needs to see some video content as a "source" 
for there work. But we would like to add some
video content to our Writerfiles and then transfer them to Epup or 
interactive PDF's


Greetz

Fernand

Hi,

On 02/25/2011 12:07 PM, Fernand Vanrie wrote:

Please consider: We are living and working in a Multi Media world:
Not only who is working with Impress needs a media player, all content
can have  mixed content and LO must be the "one stop" place to handle
all  multi media stuff.

I partially reverted the changes for writer. The background calls are
there again, so anybody who needs Media Player could add this by
customizing the menu. And I've enabled Media Player for web by default
as this make really sense.

Fernand, only for my personal interest: are you using videos in odt
files? Maybe I'm not knowing what's possible with this ;)

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


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


Re: [Libreoffice] EasyHack: Improved bug filing form / flow

2011-02-25 Thread Jan Holesovsky
Hi Daniel,

On 2011-02-24 at 19:37 -0500, Daniel Neel wrote:

> I think this project is moving a bit beyond what I currently have
> skill and time to complete with quality. I think it would be best for
> me to pass the current work on to someone else.

Sorry to hear that :-(  You are doing great from my point of view, but
of course, cannot force you ;-)

>  Would the best course of action be to update the EasyHacks page with
> a notice of the current progress on the hack, an attachment of the
> file, and maybe a link to this mailing list conversation? I look
> forward to helping out LO in other ways soon.

Yes please - the best would be to send your current work to this mailing
list (as a mail attachment), and add the description + link to the mail
with the attachment in the mail archive
(http://lists.freedesktop.org/archives/libreoffice/) + link to the
entire conversation to the wiki.

All the best,
Kendy

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


Re: [Libreoffice] [PATCH] Remove obsolete Hyperlink Bar - final patches

2011-02-25 Thread Jan Holesovsky
Hi Alfonso,

On 2011-02-24 at 21:48 +, Alfonso Eusebio wrote:

> My main concern is more related to the creation of the actual text that 
> should 
> replace the current one.
> What I've seen in the help text is that there are sections that speak about 
> hyperlinks and mention the hyperlink bar as a way for creating them.
> On the same text or page there would be a reference to the insert hyperlink 
> icon 
> and dialogue as well (which should be maintained).
> 
> In summary, my problem is not necessarily with finding and changing the text. 
> My 
> problem is that I don't think it should be me deciding what that text should 
> say 
> now.
> Unfortunately, is not a clean removal of a whole page/section.

I have cc'd the Documentation team, I think they might be able to help
you :-)

Regards,
Kendy

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


Re: [Libreoffice] Build logs from the tinderbox

2011-02-25 Thread Christian Lohmaier
Hi *,

On Fri, Feb 25, 2011 at 10:48 AM, Jan Holesovsky  wrote:
> On 2011-02-25 at 09:02 +0100, Thorsten Behrens wrote:
>
>> Christian, is there anything on the tinderbox master side that needs
>> to be done, to have it recognize new branches?

Yes - tinderbox ignores/discards all mail with trees it doesn't know
anything about.

> Christian says that:
>
> - 8< -
> MASTER is created fixed in
> /srv/tinderbox/local_conf/TreeData.pm - if the others should be
> created automatically, you'd have to add it to
> /srv/tinderbox/bin/get-latest-master.pl (well, or probably easier to
> create a seperate one and hook that up to tinderupdate.sh) and then
> read in that file in in TreeData.pm - preferrably with a group
> "LibreOffice".
> - 8< -
>
> So with that in place, go ahead, please!

And wrt to the group - this would then allow a URL like
http://tinderbox.go-oo.org/LibreOffice.express.html
that would show a shortened overview (no individual build results,
just the builder's status) like
http://tinderbox.go-oo.org/ready_for_QA.express.html

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


Re: [Libreoffice] Tools - Media Player

2011-02-25 Thread Thomas Arnhold
Hi,

On 02/25/2011 12:07 PM, Fernand Vanrie wrote:
> Please consider: We are living and working in a Multi Media world:
> Not only who is working with Impress needs a media player, all content
> can have  mixed content and LO must be the "one stop" place to handle
> all  multi media stuff.

I partially reverted the changes for writer. The background calls are
there again, so anybody who needs Media Player could add this by
customizing the menu. And I've enabled Media Player for web by default
as this make really sense.

Fernand, only for my personal interest: are you using videos in odt
files? Maybe I'm not knowing what's possible with this ;)

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


Re: [Libreoffice] Build fails without gdb installed

2011-02-25 Thread Thomas Arnhold
On 02/24/2011 10:37 PM, Caolán McNamara wrote:
> It only does this if the environmental variables DEBUGCPPUNIT or
> debugcppunit are set. Those aren't automatically set, they have to be
> set manually when trying to debug a unit test, at which point its
> reasonable to expect gdb to be installed. Did you set those yourself
> recently ?

Yes, set them. But before I set them it failed, too (also at this
cppunit test, but don't know if with gdb). I started from a clean tree
(make distclean). Now it doesn't occur and builds...

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


Re: [Libreoffice] Tools - Media Player

2011-02-25 Thread Fernand Vanrie

Yifan and others,

Please consider: We are living and working in a Multi Media world:
Not only who is working with Impress needs a media player, all content 
can have  mixed content and LO must be the "one stop" place to handle 
all  multi media stuff.


Greetz

Fernand

Hi Thomas,

On Wed, Feb 23, 2011 at 11:26:55PM +0100, Thomas Arnhold wrote:

Hi Yifan,

On 02/23/2011 10:47 AM, Yifan Jiang wrote:

I guess end-users could still bring the menu item back using the menu
customization UI (Tools->Customize...->Menus). Is that right?

That's possible. But for writer and calc the background calls are gone.
So it won't work.

There's another entry button of the media play in the customized toolbar
set. So I think this would also not work based on the context?


Maybe I re-enable them, so someone could still
customize his menus with Media Player enabled.

This would be perfectly acceptable in my personal opinion. We don't actually
know who will use the stand-alone player in other apps rather than impress, I
mean it depends on the end users' personal favour and habits.  So IMHO, we
should be cautious to *totally* take out an existing feature.

Michael? What about your opinion of this?

Best regards,
Yifan
___
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] Build failure in DbAdminImpl.cxx

2011-02-25 Thread Francois Tigeot
Hi,

I've got some compilations errors due to recent changes in
dbaccess/source/ui/dlg/DbAdminImpl.cxx :

/home/ftigeot/Projects/LibreOffice/bootstrap/clone/base/dbaccess/source/ui/dlg/DbAdminImpl.cxx:1000:
error: 'translatePropertyId' was not declared in this scope
/home/ftigeot/Projects/LibreOffice/bootstrap/clone/base/dbaccess/source/ui/dlg/DbAdminImpl.cxx:1030:
error: 'translatePropertyId' was not declared in this scope
/home/ftigeot/Projects/LibreOffice/bootstrap/clone/base/dbaccess/source/ui/dlg/DbAdminImpl.cxx:1047:
error: 'translatePropertyId' was not declared in this scope

It seems this commit is to blame:
http://cgit.freedesktop.org/libreoffice/base/commit/?id=a66fec7123aa82cf441066cf91e0e287450f0784

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


Re: [Libreoffice] Assertion failure in osl_process.cxx

2011-02-25 Thread Francois Tigeot
On Thu, Feb 24, 2011 at 09:15:07PM +, Caolán McNamara wrote:
> 
> Hmm, I think this just boils down to that the order of environ variables
> is undefined after putenv. Pull and try again, and if it still fails,
> try dmake dbglevel=2 again and attach that output.

Thanks Caolán, your fix is fine.

I had to comment some code for an unrelated failure; I'll send a separate
mail for that one.

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


Re: [Libreoffice] Tools - Media Player

2011-02-25 Thread Yifan Jiang
Hi Thomas,

On Wed, Feb 23, 2011 at 11:26:55PM +0100, Thomas Arnhold wrote:
> Hi Yifan,
> 
> On 02/23/2011 10:47 AM, Yifan Jiang wrote:
> > I guess end-users could still bring the menu item back using the menu
> > customization UI (Tools->Customize...->Menus). Is that right?
> 
> That's possible. But for writer and calc the background calls are gone.
> So it won't work.

There's another entry button of the media play in the customized toolbar
set. So I think this would also not work based on the context?

> Maybe I re-enable them, so someone could still
> customize his menus with Media Player enabled.

This would be perfectly acceptable in my personal opinion. We don't actually
know who will use the stand-alone player in other apps rather than impress, I
mean it depends on the end users' personal favour and habits.  So IMHO, we
should be cautious to *totally* take out an existing feature.

Michael? What about your opinion of this?

Best regards,
Yifan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice] [PATCH] Comment translation of writer/sw/source/ui/dialog

2011-02-25 Thread Martin Kepplinger
This translates all code comments in this directory from german to english.

This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.

thanks,
martin
---
 sw/source/ui/dialog/abstract.src   |8 +--
 sw/source/ui/dialog/ascfldlg.cxx   |2 +-
 sw/source/ui/dialog/dialog.src |4 +-
 sw/source/ui/dialog/docstdlg.cxx   |8 ++--
 sw/source/ui/dialog/macassgn.cxx   |   16 
 sw/source/ui/dialog/regionsw.cxx   |6 +-
 sw/source/ui/dialog/regionsw.src   |4 +-
 sw/source/ui/dialog/uiregionsw.cxx |   76 ++--
 8 files changed, 61 insertions(+), 63 deletions(-)

diff --git a/sw/source/ui/dialog/abstract.src b/sw/source/ui/dialog/abstract.src
index ab5a863..ebb9082 100644
--- a/sw/source/ui/dialog/abstract.src
+++ b/sw/source/ui/dialog/abstract.src
@@ -34,9 +34,7 @@ ModalDialog DLG_INSERT_ABSTRACT
 OutputSize = TRUE ;
 SVLook = TRUE ;
 Size = MAP_APPFONT ( 239 , 68 ) ;
-/* ### ACHTUNG: Neuer Text in Resource? AutoAbstract erzeugen : 
AutoAbstrakt erzeugen */
-/* ### ACHTUNG: Neuer Text in Resource? AutoAbstract erzeugen : 
AutoAbstrakt erzeugen */
-/* ### ACHTUNG: Neuer Text in Resource? AutoAbstract erzeugen : 
AutoAbstrakt erzeugen */
+/* ### ATTENTION: New text in resource? create AutoAbstract : create 
AutoAbstract */
 Moveable = TRUE ;
 FixedLine FL_1
 {
@@ -70,7 +68,7 @@ ModalDialog DLG_INSERT_ABSTRACT
 {
 Pos = MAP_APPFONT ( 12 , 27 ) ;
 Size = MAP_APPFONT ( 120 , 8 ) ;
-/* ### ACHTUNG: Neuer Text in Resource? Absätze je Kapitel : Absõtze 
je Kapitel */
+/* ### ATTENTION: New text in resource? paragraphs per chapter : 
paragraphs per chapter */
 Text [ en-US ] = "Subpoints per level" ;
 };
 NumericField NF_PARA
@@ -92,7 +90,7 @@ ModalDialog DLG_INSERT_ABSTRACT
 {
 Pos = MAP_APPFONT ( 12 , 43 ) ;
 Size = MAP_APPFONT ( 165 , 16 ) ;
-/* ### ACHTUNG: Neuer Text in Resource? Im Abstrakt erscheint die 
ausgewählte Anzahl von Absätzen aus den einbezogenen Kapitelebenen. : Im 
Abstrakt erscheint die ausgewõhlte Anzahl von Absõtzen aus den einbezogenen 
Kapitelebenen. */
+/* ### ATTENTION: New text in resource? The selected number of 
paragraphs from the included outline levels appears in the abstract. : The 
selected number of paragraphs from the included outline levels appears in the 
abstract. */
 WordBreak = TRUE ;
 Text [ en-US ] = "The abstract contains the selected number of 
paragraphs from the included outline levels." ;
 };
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 893263d..745524c 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -266,7 +266,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, 
SwDocShell& rDocSh,
 SetSizePixel( aSize );
 }
 
-// initialisiere Zeichensatz
+// initialise character set
 aCharSetLB.FillFromTextEncodingTable( pStream != NULL );
 aCharSetLB.SelectTextEncoding( aOpt.GetCharSet()  );
 
diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src
index f3df744..55860f6 100644
--- a/sw/source/ui/dialog/dialog.src
+++ b/sw/source/ui/dialog/dialog.src
@@ -28,7 +28,7 @@
 
 CheckBox CB_USE_PASSWD
 {
-/* ### ACHTUNG: Neuer Text in Resource? ~Paßwort : ~Pa˜wort */
+/* ### ATTENTION: New text in resource? ~password : ~password */
 Text [ en-US ] = "~Password" ;
 };
 CheckBox CB_READ_ONLY
@@ -37,7 +37,7 @@ CheckBox CB_READ_ONLY
 };
 String STR_LINKEDIT_TEXT
 {
-/* ### ACHTUNG: Neuer Text in Resource? Verknüpfungen bearbeiten : 
Verkn³pfungen bearbeiten */
+/* ### ATTENTION: New text in resource? edit links : edit links */
 Text [ en-US ] = "Edit links" ;
 };
 String STR_PATH_NOT_FOUND
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index bd2711b..5b88900 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -102,7 +102,7 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const 
SfxItemSet &rSet) :
 }
 
 /*
-Beschreibung:  ItemSet fuellen bei Aenderung
+Description:   fill ItemSet when changed
  */
 
 
@@ -115,7 +115,7 @@ void  SwDocStatPage::Reset(const SfxItemSet &/*rSet*/)
 {
 }
 /*
- Beschreibung: Aktualisieren / Setzen der Daten
+ Description:  update / set data
 */
 
 
@@ -131,7 +131,7 @@ void SwDocStatPage::SetData(const SwDocStat &rStat)
 }
 
 /*
- Beschreibung: Aktualisieren der Statistik
+ Description:  update statistics
 

Re: [Libreoffice] Feature Request / How to solve the issue on my own ?

2011-02-25 Thread Thorsten Behrens
Chynte wrote:
> 1. For generating a ToC I need to store somewhere, if the title
> shouldappear in the ToC or not.
> Where can I store this information?I found the "Description" and the
> "Name" tags I could use but I fear, thatthis will interact with
> other software also using these tags...
> 
I'd use Description first, and maybe later try alien attributes
http://xml.openoffice.org/faq.html#5 - though currently not sure
whether those really work in Impress. ;)

> Where can I store the information, that a specific word should
> appear inthis Index? You know I see problem with using "Description"
> and "Name" tags.
>
Well, the main extension points for ODF are alien attributes and RDF
- support for both is kinda there in LibO, but with a bunch of rough
edges. Conversely, it's relatively trivial to add new attributes in
the core code - so you might ponder hacking the core. It's actually
fun. :)

> 3. Is Python/PyUNO the good choice for programming this feature in Impress?
> Can you give me Pro´s and Con´s?
> 
See above - you cannot easily extend the LibO core code. Otherwise,
for doing nice extensions, it's not a bad choice either.

> 4. What´s about the needed skills? Do you think, this project is
> feasiblefor someone who made up to now only very small standalone
> apps "just forfun" in Python?
> 
If you're motivated to hack on that, sure - you'll learn a lot that
way, probably.

Cheers,

-- Thorsten


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


Re: [Libreoffice] Build logs from the tinderbox

2011-02-25 Thread Jan Holesovsky
Hi Thorsten,

On 2011-02-25 at 09:02 +0100, Thorsten Behrens wrote:

> > We've now three more boxes sending results, see here:
> > 
> > http://tinderbox.go-oo.org/MASTER/status.html
> > 
> Hm, noticing the tree name is hard-coded, what about attached patch?
> Christian, is there anything on the tinderbox master side that needs
> to be done, to have it recognize new branches?

Christian says that:

- 8< -
MASTER is created fixed in
/srv/tinderbox/local_conf/TreeData.pm - if the others should be
created automatically, you'd have to add it to
/srv/tinderbox/bin/get-latest-master.pl (well, or probably easier to
create a seperate one and hook that up to tinderupdate.sh) and then
read in that file in in TreeData.pm - preferrably with a group
"LibreOffice".
- 8< -

So with that in place, go ahead, please!

>  Also, after that
> change, it would be http://tinderbox.go-oo.org/master/status.html ;)

No objection here :-)

Regards,
Kendy

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


Re: [Libreoffice] Build logs from the tinderbox

2011-02-25 Thread Thorsten Behrens
> We've now three more boxes sending results, see here:
> 
> http://tinderbox.go-oo.org/MASTER/status.html
> 
Hm, noticing the tree name is hard-coded, what about attached patch?
Christian, is there anything on the tinderbox master side that needs
to be done, to have it recognize new branches? Also, after that
change, it would be http://tinderbox.go-oo.org/master/status.html ;)

Cheers,

-- Thorsten
From f25173b9e3b687090c86ae276e805286d98a7987 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens 
Date: Fri, 25 Feb 2011 08:54:18 +0100
Subject: [PATCH] Use current branch name, instead of MASTER for tinderbox msg

Don't unconditionally use MASTER as the tinderbox: tree: name, but
extract branch name from git.
---
 bin/tinbuild |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/tinbuild b/bin/tinbuild
index cfa86cd..8b69b53 100755
--- a/bin/tinbuild
+++ b/bin/tinbuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 export LC_ALL="C"
 
@@ -153,13 +153,16 @@ sendTinderboxLog ()
 	else
 		STARTLINE="tinderbox: starttime: `date '+%s' -d \"$STARTTIME\"`"
 	fi
+	CURR_HEAD=$(<".git/HEAD")
+	CURR_BRANCH="${CURR_HEAD#*/*/}"
+
 	XTINDER="X-Tinder: cookie"
 	SUBJECT="tinderbox build start notification"
 	GZLOG=
 	MESSAGE="
 tinderbox: administrator: $OWNER
 tinderbox: buildname: $TINDERNAME
-tinderbox: tree: MASTER
+tinderbox: tree: $CURR_BRANCH
 $STARTLINE
 tinderbox: timenow: `date '+%s'`
 tinderbox: errorparser: unix
-- 
1.7.3.4



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