[Libreoffice-commits] core.git: javaunohelper/JunitTest_juh.mk javaunohelper/test

[Robert Antoni Buj i Gelonch]

 javaunohelper/JunitTest_juh.mk   |3 
 javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java | 2376 
+-
 2 files changed, 1204 insertions(+), 1175 deletions(-)

New commits:
commit 2348f05b31f5fc6f4e60b128e9133c76e6df8ae3
Author: Robert Antoni Buj i Gelonch 
Date:   Sun Sep 28 00:37:19 2014 +0200

javaunohelper: migrate PropertySet_Test to JUnit

$ make JunitTest_juh

Change-Id: Ie6ed5070db01d8c183ddaae1852117667eae02f3
Reviewed-on: https://gerrit.libreoffice.org/11668
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/javaunohelper/JunitTest_juh.mk b/javaunohelper/JunitTest_juh.mk
index 03a..fc289ca 100644
--- a/javaunohelper/JunitTest_juh.mk
+++ b/javaunohelper/JunitTest_juh.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,juh,\
 javaunohelper/com/sun/star/lib/uno/helper/ComponentBase \
 javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer \
 javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer \
+javaunohelper/com/sun/star/lib/uno/helper/PropertySet \
 javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter \
 javaunohelper/com/sun/star/lib/uno/helper/WeakBase \
 javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test \
@@ -36,6 +37,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,juh,\
 javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test \
 javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test \
 
javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test 
\
+javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test \
 javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider \
 javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test \
 ))
@@ -45,6 +47,7 @@ $(eval $(call gb_JunitTest_add_classes,juh,\
 com.sun.star.lib.uno.helper.ComponentBase_Test \
 com.sun.star.lib.uno.helper.InterfaceContainer_Test \
 com.sun.star.lib.uno.helper.MultiTypeInterfaceContainer_Test \
+com.sun.star.lib.uno.helper.PropertySet_Test \
 com.sun.star.lib.uno.helper.WeakBase_Test \
 ))
 
diff --git 
a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java 
b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
index 88956b7..9ceb74d 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
@@ -38,1013 +38,1009 @@ import com.sun.star.beans.XPropertiesChangeListener;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.junit.Test;
+
 public class PropertySet_Test
 {
 
 private static final Logger logger = 
Logger.getLogger(PropertySet_Test.class.getName());
 
-public boolean convertPropertyValue()
+@Test public void convertPropertyValue() throws Exception
 {
 logger.log(Level.INFO, "PropertySet.convertPropertyValue");
-boolean[] r= new boolean[50];
-int i= 0;
-
 TestClass cl= new TestClass();
-try {
-r[i++]= cl.test_convertPropertyValue();
-}catch(java.lang.Exception e){
-i++;
-}
-boolean bOk= true;
-for (int c= 0; c < i; c++)
-bOk= bOk && r[c];
-logger.log(Level.INFO, bOk ? "Ok" : "Failed");
-return bOk;
+cl.test_convertPropertyValue();
 }
 
-public boolean setPropertyValueNoBroadcast()
+@Test public void setPropertyValueNoBroadcast() throws Exception
 {
 logger.log(Level.INFO, "PropertySet.setValueNoBroadcast");
-boolean[] r= new boolean[50];
-int i= 0;
-
 TestClass cl= new TestClass();
-try {
-r[i++]= cl.test_setPropertyValueNoBroadcast();
-}catch(java.lang.Exception e){
-i++;
-}
-boolean bOk= true;
-for (int c= 0; c < i; c++)
-bOk= bOk && r[c];
-logger.log(Level.INFO, bOk ? "Ok" : "Failed");
-return bOk;
+cl.test_setPropertyValueNoBroadcast();
 }
 
-public boolean setPropertyValue()
+@Test public void setPropertyValue() throws Exception
 {
 logger.log(Level.INFO, "PropertySet.setPropertyValue");
-boolean[] r= new boolean[150];
-int i= 0;
-
 TestClass cl= new TestClass();
+cl.resetPropertyMembers();
+Object value;
+Object ret;
+
+value= Boolean.TRUE;
+cl.setPropertyValue("PropBoolA", value);
+assertEquals((Boolean) cl.getPropertyValue("PropBoolA"), value);
+
+value= new Character('A');
+cl.setPropertyValue("PropCharA",value);
+assertEquals((Character) cl.getProp

LibreOffice Gerrit News for core on 2014-09-28

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ javaunohelper: migrate PropertySet_Test to JUnit
  in https://gerrit.libreoffice.org/11668 from Robert Antoni Buj i Gelonch
  about module javaunohelper
+ Improve Expert Configuration dialog
  in https://gerrit.libreoffice.org/11663 from Mihály Palenik
  about module cui, include, svtools
 End of freshness 

+ Restore missing title in addresstemplatedialog.ui
  in https://gerrit.libreoffice.org/11667 from Adolfo Jayme Barrientos
  about module svtools
+ border_width from 12 to 6, as the rest of dialogs
  in https://gerrit.libreoffice.org/11669 from Adolfo Jayme Barrientos
  about module basctl, cui, dbaccess, desktop, filter, sc, sfx2, svtools, sw, 
uui, vcl
+ DO NOT PUSH fdo#82577: Handle Region
  in https://gerrit.libreoffice.org/11664 from Noel Grandin
  about module basctl, canvas, chart2, cui, dbaccess, drawinglayer, editeng, 
extensions, external, filter, include, reportdesign, sc, sd, sfx2, starmath, 
svtools, svx, sw, toolkit, vcl
+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/11662 from Takeshi Abe
  about module sfx2
+ fdo#53920 Switch back tab at RefButton closure time
  in https://gerrit.libreoffice.org/11660 from Laurent BP
  about module sc


* Merged changes on master for project core changed in the last 25 hours:

+ border_width from 12 to 6, as the rest of dialogs
  in https://gerrit.libreoffice.org/11658 from Adolfo Jayme Barrientos
+ Add missing title to the Header and Footer dialog
  in https://gerrit.libreoffice.org/11657 from Adolfo Jayme Barrientos
+ HIG: Correct spacing for several UI options in Print dialog
  in https://gerrit.libreoffice.org/11656 from Adolfo Jayme Barrientos
+ fdo#84376 Add missing title to the Template Manager dialog
  in https://gerrit.libreoffice.org/11659 from Adolfo Jayme Barrientos


* Abandoned changes on master for project core changed in the last 25 hours:

None

* Open changes needing tweaks, but being untouched for more than a week:

+ HIG-ification of GSoC Color Picker dialog
  in https://gerrit.libreoffice.org/11494 from Olivier Hallot
+ l10ntools-transex3: convert 'int' to 'bool' where it's logical
  in https://gerrit.libreoffice.org/11317 from Douglas Mencken
+ Perftest for loading autocorrect dictionaries (fdo#79761)
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan
+ fdo#81956 : Rendering of vml group shape was wrong.
  in https://gerrit.libreoffice.org/11013 from sushil_shinde
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ fdo#81426 : Data from header and footer is getting lost.
  in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji
+ fdo#79541 :Corrupt: Shape  enclosed within a floating table
  in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji
+ fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT
  in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

LibreOffice Gerrit News for submodules on 2014-09-28

[gerrit]

Moin!



~~ Project dictionaries ~~

Nothing moved in the project for the last 25 hours

~~ Project translations ~~

Nothing moved in the project for the last 25 hours

~~ Project help ~~

* Open changes on master for project help changed in the last 25 hours:

None

* Merged changes on master for project help changed in the last 25 hours:

+ update name of label in Hyperlink dialog
  in https://gerrit.libreoffice.org/11655 from Stanislav Horáček


* Abandoned changes on master for project help changed in the last 25 hours:

None

* Open changes needing tweaks, but being untouched for more than a week:

None

Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: writerfilter/source

[Tor Lillqvist]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9d225c9d3a153d54bcdf4260390db8224816e4e5
Author: Tor Lillqvist 
Date:   Sun Sep 28 08:55:35 2014 +0300

WaE: implicit conversion of NULL constant to 'boost::detail::sp_nullptr_t'

Change-Id: Icaf39aaedab9663353268ee56063f2ed0ebbe57d

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1f72e0f..a416ea1 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3356,7 +3356,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 dmapper_logger->element("closeFieldCommand");
 #endif
 
-FieldContextPtr pContext = m_aFieldStack.empty() ? NULL : 
m_aFieldStack.top();
+FieldContextPtr pContext = m_aFieldStack.empty() ? nullptr : 
m_aFieldStack.top();
 OSL_ENSURE( pContext.get(), "no field context available");
 if( pContext.get() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: gbuild-to-ide incompatibility with make 4.0

[Norbert Thiebaud]

On Sat, Sep 27, 2014 at 6:02 PM, Peter Foley  wrote:
> On Sat, Sep 27, 2014 at 6:20 PM, Norbert Thiebaud  wrote:
>> On Mac, with recent SDK, there is alreay the need to manually build
>> m4, autogen,
>> At this point I do not think that requiring gnumake 4.0 would be much
>> more a hassle
>>
>> We just have to give some warning so that tb owner have the time to 
>> prepare...
>>
>> Norbert
>
> So, making gbuild-to-ide error out on make < 4.0 is fine?

I'm fine with it.

> I'm assuming that the normal build will move to requiring 4.0 soon as well.

well,  I said that as for Mac I don't see this as blocking... but I
can't talk about the linux side of the house. that is maybe something
to bring up during a ESC call

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

Re: gbuild-to-ide incompatibility with make 4.0

[Peter Foley]

On Sat, Sep 27, 2014 at 6:20 PM, Norbert Thiebaud  wrote:
> On Mac, with recent SDK, there is alreay the need to manually build
> m4, autogen,
> At this point I do not think that requiring gnumake 4.0 would be much
> more a hassle
>
> We just have to give some warning so that tb owner have the time to prepare...
>
> Norbert

So, making gbuild-to-ide error out on make < 4.0 is fine?
I'm assuming that the normal build will move to requiring 4.0 soon as well.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: gbuild-to-ide incompatibility with make 4.0

[Norbert Thiebaud]

On Sat, Sep 27, 2014 at 2:10 PM, Michael Stahl  wrote:
> On 26/09/14 17:30, Peter Foley wrote:
>> While looking at the gbuild-to-ide script, I noticed that almost all
>> of the regex broke due to the below change in make 4.0.
>>
>> * In -p output, .RECIPEPREFIX settings are shown and all target-specific
>>   variables are output as if in a makefile, instead of as comments.
>
> ouch...
>
>> I'm wondering if it would be fine to require make >= 4.0 to run this script?
>> Otherwise, two sets of regex would be needed, one for make 4.0+ and
>> one for older versions.
>> I'm going to try to get the script to work with make 4.0, but it would
>> be easier if I don't have to worry about old make versions.
>
> for Windows, developers need to download GNU make anyway, and i don't
> think it's a problem if we require a Win32 GNU make >= 4.0... i don't
> have the time and inclination to support non-Win32 GNU make anyway :)
>
> but for the other platforms usually only GNU make 3.82 or even 3.81 (on
> Mac, iirc) is available on the system, so if we require >= 4.0 then that
> means another thing that has to be installed manually, which is probably
> not a good direction to go in...

On Mac, with recent SDK, there is alreay the need to manually build
m4, autogen,
At this point I do not think that requiring gnumake 4.0 would be much
more a hassle

We just have to give some warning so that tb owner have the time to prepare...

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

Re: gbuild-to-ide incompatibility with make 4.0

[Peter Foley]

On Sat, Sep 27, 2014 at 5:34 PM, Markus Mohrhard
 wrote:
> Hey,
>
> I run it regularly and don't want to install another make just for that
> script. As long as we support 3.81/3.82 for lo builds it makes sense to keep
> the support especially as it is working right now.
>
> There are a lot of people out there still using 3.8x so breaking the future
> for them for supporting a newer version is not what I consider an
> improvement. If we'd raise the requirement to require make 4.0 for libo
> builds it would be different.


Ok, I'll keep 3.8 support then.
I mostly wanted to see if it was worth it, or if nobody actually used it.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e234e9ca0f993ebe298ac5c2c6d7fc79ee3f12c0
Author: Miklos Vajna 
Date:   Sat Sep 27 22:39:01 2014 +0200

DomainMapperTableManager::sprm: fix typo

Change-Id: I1cb23d8a1e6568046348377e1852dbadff37f9cc

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 91c922d..69592d4 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -373,7 +373,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
 // DomainMapperTableHandler::endTableGetCellProperties() can we
 // handle the combination of the cell direction and paragraph
 // alignment as necessary.
-pPropMap->Insert(PROP_CELL_DIRECTION, uno::Any(sal_Int32(3)));
+pPropMap->Insert(PROP_CELL_DIRECTION, 
uno::Any(sal_Int32(nIntValue)));
 
 bool bInsertCellProps = true;
 switch ( nIntValue )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Stanislav Horacek]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bddfaa770952aa4ff99fb3abd827091ea66ed474
Author: Stanislav Horacek 
Date:   Fri Sep 26 16:34:08 2014 +0200

Updated core
Project: help  2dd0975408b8fbae59c9f924d8e013f48d23da52

update name of label in Hyperlink dialog

Change-Id: I715fccf17272c7f905945eb5357da1854c5c9811
Reviewed-on: https://gerrit.libreoffice.org/11655
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/helpcontent2 b/helpcontent2
index c4b49fb..2dd0975 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c4b49fbddd2099733cb5c7606fbc5b848b23c1e0
+Subproject commit 2dd0975408b8fbae59c9f924d8e013f48d23da52
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Stanislav Horacek]

 source/text/shared/02/09070200.xhp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2dd0975408b8fbae59c9f924d8e013f48d23da52
Author: Stanislav Horacek 
Date:   Fri Sep 26 16:34:08 2014 +0200

update name of label in Hyperlink dialog

Change-Id: I715fccf17272c7f905945eb5357da1854c5c9811
Reviewed-on: https://gerrit.libreoffice.org/11655
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/source/text/shared/02/09070200.xhp 
b/source/text/shared/02/09070200.xhp
index 8398567..1872ecb 100644
--- a/source/text/shared/02/09070200.xhp
+++ b/source/text/shared/02/09070200.xhp
@@ -38,13 +38,13 @@
 
 Mail & News
 E-mail
-Assigns the 
specified e-mail address to the hyperlink. Clicking the new hyperlink 
in the document will open a new message document, addressed to the receiver 
specified in the E-mail field.
+Assigns the 
specified e-mail address to the hyperlink. Clicking the new hyperlink 
in the document will open a new message document, addressed to the receiver 
specified in the Recipient field.
 News
-Assigns a news 
address to the hyperlink. Clicking the hyperlink in the document will 
open a new message document to the news group you entered in the 
Receiver field.
-Receiver
+Assigns a news 
address to the hyperlink. Clicking the hyperlink in the document will 
open a new message document to the news group you entered in the 
Recipient field.
+Recipient
 Specifies the full URL of the 
addressee, in the form mailto:n...@provider.com or 
news:group.server.com. You can also use drag-and-drop.
 Data Sources
-Hides or shows 
the data source browser. Drag the receiver's E-mail data 
field from the data source browser into the Receiver text 
field.
+Hides or shows 
the data source browser. Drag the receiver's E-mail data 
field from the data source browser into the Recipient text 
field.
 Subject
 Specifies the subject that 
is inserted in the subject line of the new message document.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerfilter/source

[Caolán McNamara]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a392a1deb0bb55f39f0232f9b3df8ad9ac9062af
Author: Caolán McNamara 
Date:   Sat Sep 27 20:38:24 2014 +0100

Resolves: fdo#79130 Crash in DomainMapper_Impl::CloseFieldCommand

Change-Id: Ia59e0c79ec7f2066891b78657559f41eaeb80a09

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 471e59e..1f72e0f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3356,7 +3356,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 dmapper_logger->element("closeFieldCommand");
 #endif
 
-FieldContextPtr pContext = m_aFieldStack.top();
+FieldContextPtr pContext = m_aFieldStack.empty() ? NULL : 
m_aFieldStack.top();
 OSL_ENSURE( pContext.get(), "no field context available");
 if( pContext.get() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: gbuild-to-ide incompatibility with make 4.0

[Peter Foley]

On Sat, Sep 27, 2014 at 3:10 PM, Michael Stahl  wrote:
> On 26/09/14 17:30, Peter Foley wrote:
> for Windows, developers need to download GNU make anyway, and i don't
> think it's a problem if we require a Win32 GNU make >= 4.0... i don't
> have the time and inclination to support non-Win32 GNU make anyway :)
>
> but for the other platforms usually only GNU make 3.82 or even 3.81 (on
> Mac, iirc) is available on the system, so if we require >= 4.0 then that
> means another thing that has to be installed manually, which is probably
> not a good direction to go in...

Well, they only have to install it if they plan to run gbuild-to-ide,
regular builds won't care.
I'm don't think that's a common use-case, though I could be wrong.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: gbuild-to-ide incompatibility with make 4.0

[Michael Stahl]

On 26/09/14 17:30, Peter Foley wrote:
> While looking at the gbuild-to-ide script, I noticed that almost all
> of the regex broke due to the below change in make 4.0.
> 
> * In -p output, .RECIPEPREFIX settings are shown and all target-specific
>   variables are output as if in a makefile, instead of as comments.

ouch...

> I'm wondering if it would be fine to require make >= 4.0 to run this script?
> Otherwise, two sets of regex would be needed, one for make 4.0+ and
> one for older versions.
> I'm going to try to get the script to work with make 4.0, but it would
> be easier if I don't have to worry about old make versions.

for Windows, developers need to download GNU make anyway, and i don't
think it's a problem if we require a Win32 GNU make >= 4.0... i don't
have the time and inclination to support non-Win32 GNU make anyway :)

but for the other platforms usually only GNU make 3.82 or even 3.81 (on
Mac, iirc) is available on the system, so if we require >= 4.0 then that
means another thing that has to be installed manually, which is probably
not a good direction to go in...

(and yes, i'm also unhappy about the needlessly ugly and inefficient
directory dependencies in gbuild to keep GNU make 3.81 support alive)


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

[Libreoffice-commits] core.git: scp2/AutoInstall.mk scp2/inc scp2/InstallModule_winexplorerext.mk scp2/source

[Norbert Thiebaud]

 scp2/AutoInstall.mk|2 
 scp2/InstallModule_winexplorerext.mk   |4 
 scp2/inc/macros.inc|   14 ++
 scp2/source/winexplorerext/module_winexplorerext.scp   |4 
 scp2/source/winexplorerext/registryitem_winexplorerext.scp |   87 +
 5 files changed, 109 insertions(+), 2 deletions(-)

New commits:
commit 64914e407ccac91fbbaa5022a6854be9a01027f8
Author: Norbert Thiebaud 
Date:   Sat Sep 27 14:05:28 2014 -0500

vs2012 express support.

vs2012 express does not have atl so one need to
--disable-atl and --disable-activex

but then the packaging still try to include a few _x64.dll
that are not built.

Change-Id: I88ca5b9d23febd5a714fb48321dde5424cafceb6

diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index bc3e8d8..5c55a3e 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -35,8 +35,10 @@ $(eval $(call 
gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_J
 $(eval $(call 
gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
 $(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))
 $(eval $(call 
gb_AutoInstall_add_module,winexplorerextnt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT
 >= 600"))
+ifeq ($(BUILD_X64),TRUE)
 $(eval $(call 
gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
 $(eval $(call 
gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64
 >= 600"))
+endif
 $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_winexplorerext.mk 
b/scp2/InstallModule_winexplorerext.mk
index 9d64cbf..fa40740 100644
--- a/scp2/InstallModule_winexplorerext.mk
+++ b/scp2/InstallModule_winexplorerext.mk
@@ -13,8 +13,8 @@ $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/winexplorerext,\
winexplorerextbinarytable \
winexplorerext \
winexplorerextnt6 \
-   winexplorerextwin64 \
-   winexplorerextwin64nt6 \
+   $(if $(filter TRUE,$(BUILD_X64)), winexplorerextwin64 \
+   winexplorerextwin64nt6) \
 ))
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index d9bcf20..8ea47d9 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -427,6 +427,8 @@ End
 
 #ifdef _MSC_VER
 
+#ifdef BUILD_X64
+
 #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
 RegistryItem 
CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension)
 \
 ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
@@ -445,6 +447,18 @@ End
 End
 
 #else
+#endif
+
+#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
+RegistryItem 
CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension)
 \
+ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+ModuleID = gid_Module_Optional_Winexplorerext; \
+ComponentCondition = "VersionNT >= 600"; \
+Subkey = 
STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension));
 \
+Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
+End
+
+#else
 #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty
 #endif
 
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp 
b/scp2/source/winexplorerext/module_winexplorerext.scp
index 2be3523..c745959 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -21,8 +21,10 @@
 #include "AutoInstall/winexplorerextbinarytable"
 #include "AutoInstall/winexplorerext"
 #include "AutoInstall/winexplorerextnt6"
+#ifdef BUILD_X64
 #include "AutoInstall/winexplorerextwin64"
 #include "AutoInstall/winexplorerextwin64nt6"
+#endif
 
 Module gid_Module_Optional_Winexplorerext
 MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS );
@@ -37,6 +39,7 @@ Module gid_Module_Optional_Winexplorerext
  gid_File_Tmp_Userinstall_Winexplorerext_Inf);
 End
 
+#ifdef BUILD_X64
 Module gid_Module_Optional_Winexplorerext_x64
 ParentID = gid_Module_Optional_Winexplorerext;
 Name = "gid_Module_Optional_Winexplorerext_x64";
@@ -52,3 +55,4 @@ Module gid_Module_Optional_Winexplorerext_x64
  gid_File_Lib_Msvcp110,
  gid_File_Lib_Msvcr110);
 End
+#endif
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp 
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index a8eda1d..32c83bc 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -28,6 +28,8 @@ RegistryItem 
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
 Value = "[INSTALLLOC

Re: 4.3.x linux packages and collada support

[Michael Stahl]

On 27/09/14 16:05, Zolnai Tamás wrote:
> 2014-09-27 15:23 GMT+02:00 Miklos Vajna  >:
> 
> On Sat, Sep 27, 2014 at 08:26:38AM +0200, Zolnai Tamás
> mailto:zolnaitamas2...@gmail.com>> wrote:
> > So the only question is:
> > Is it possible to replace the 4.3.1 and 4.3.2 linux packages with new 
> ones
> > which are compiled with newer compilers? (expecting this is the problem)
> > To fix the bug mentioned above.
> 
> Isn't it possible to stick to boost::shared_ptr on -4-3, given that's
> what other code does?
> 
> 
> It's the collada2gltf code which uses std::shared_ptr at many places so
> it would be much work to replace all of them with boost::shared_ptr, but
> actually can be done if necessary. I just thought packages are created
> with newer compilers, since they generate more better output (in theory).
> Other thing is that I need to know whether this is the problem indeed.
> So can I know what compilers are used for packages? Are they support
> std::shared_ptr?

for LO 4.3 and earlier releases the RHEL5 gcc is used, i don't remember
if it is gcc 4.1 or 4.4; we're only switching to a C++11 compiler for LO
4.4.

actually most users will use the distro provided LO packages anyway and
those don't suffer from our ancient upstream RHEL5 baseline.

anyway, std::shared_ptr and boost::shared_ptr should be mostly the same,
so "find ... | xargs sed -i ..." should be able to fix things up quite
quickly to get a patch for the 4.3 branch.


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

Re: SolarMutexTryAndBuyGuard

[Michael Stahl]

On 27/09/14 15:10, Miklos Vajna wrote:
> Hi Michael,
> 
> On Fri, Sep 26, 2014 at 02:33:38PM -0700, Michael Stahl  
> wrote:
>> +class SolarMutexTryAndBuyGuard
>> +: private boost::noncopyable
>> +{
>> +private:
>> +bool m_isAcquired;
>> +#if OSL_DEBUG_LEVEL > 0
>> +bool m_isChecked;
>> +#endif
> 
> Isn't this exactly the situation when we should use DBG_UTIL and not
> OSL_DEBUG_LEVEL -- i.e. when the conditional part results in a different
> class layout?

in general, you are of course right.

but this all-inline guard class can only sensibly be used within a
single function, with the life time limited to a single stack frame;
this should imply that the situation where multiple compilation units
built with different OSL_DEBUG_LEVEL access the same instance with
different layout cannot happen.

on the other hand, you have a point in that inexperienced developers
could read this class and assume that all additional class members
should be guarded in this way; perhaps it would be better to change it
to DBG_UTIL just for consistency.

well, generally speaking all uses of SolarMutex::tryToAcquire() are
broken by design anyway...

on a related note, does anybody know what commit
6ea3c24201b2d4255306f6e745e242567f3bbb8c is trying to do with
SolarMutex?  it clearly looks to me that the error handling paths in
vcl/unx/source/dtrans/X11_selection.cxx will not release the SolarMutex
again in case it succeeds in acquiring it, which sounds like a bad idea.


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

[Libreoffice-commits] core.git: include/connectivity

[Miklos Vajna]

 include/connectivity/odbc.hxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 6b7d31810b5198ab17ddaccda41e94b253ff2a25
Author: Miklos Vajna 
Date:   Sat Sep 27 20:27:32 2014 +0200

error C2513: 'const short' : no variable declared before '='

com/sun/star/beans/PropertyAttribute.hdl's OPTIONAL had a clash with some of
the Windows headers.

Change-Id: I26a4fdcd1a1d53596b82ebdaf609e0a0e9309697

diff --git a/include/connectivity/odbc.hxx b/include/connectivity/odbc.hxx
index d241ddc..bf66edd 100644
--- a/include/connectivity/odbc.hxx
+++ b/include/connectivity/odbc.hxx
@@ -28,6 +28,8 @@
 #pragma warning(disable:4005)
 #endif
 
+#include 
+
 // just to go with calling convention of windows
 #if SYSTEM_ODBC_HEADERS
 #include 
@@ -54,6 +56,8 @@
 
 #define SDB_ODBC_CHAR UCHAR
 
+#include 
+
 #endif
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/uiconfig starmath/uiconfig svx/uiconfig sw/uiconfig

[Adolfo Jayme Barrientos]

 sfx2/uiconfig/ui/alienwarndialog.ui |6 +--
 sfx2/uiconfig/ui/querysavedialog.ui |4 +-
 starmath/uiconfig/smath/ui/savedefaultsdialog.ui|5 +-
 svx/uiconfig/ui/deletefooterdialog.ui   |5 +-
 svx/uiconfig/ui/deleteheaderdialog.ui   |5 +-
 svx/uiconfig/ui/formlinkwarndialog.ui   |9 ++--
 svx/uiconfig/ui/linkwarndialog.ui   |5 +-
 svx/uiconfig/ui/querydeletecontourdialog.ui |5 +-
 svx/uiconfig/ui/querydeleteobjectdialog.ui  |5 +-
 svx/uiconfig/ui/querydeletethemedialog.ui   |5 +-
 svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui |4 +-
 svx/uiconfig/ui/querynewcontourdialog.ui|5 +-
 svx/uiconfig/ui/querysavecontchangesdialog.ui   |5 +-
 svx/uiconfig/ui/querysaveimagemapchangesdialog.ui   |4 +-
 svx/uiconfig/ui/queryunlinkgraphicsdialog.ui|5 +-
 svx/uiconfig/ui/savemodifieddialog.ui   |4 +-
 sw/uiconfig/swriter/ui/alreadyexistsdialog.ui   |   30 
 sw/uiconfig/swriter/ui/asksearchdialog.ui   |4 +-
 sw/uiconfig/swriter/ui/attachnamedialog.ui  |   24 +++-
 sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui |5 +-
 sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui  |5 +-
 sw/uiconfig/swriter/ui/printmergedialog.ui  |4 +-
 sw/uiconfig/swriter/ui/querycontinuebegindialog.ui  |5 +-
 sw/uiconfig/swriter/ui/querycontinueenddialog.ui|5 +-
 sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui  |5 +-
 sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui |6 ++-
 sw/uiconfig/swriter/ui/querysavelabeldialog.ui  |5 +-
 sw/uiconfig/swriter/ui/queryshowchangesdialog.ui|5 +-
 sw/uiconfig/swriter/ui/saveashtmldialog.ui  |5 +-
 sw/uiconfig/swriter/ui/subjectdialog.ui |   30 
 sw/uiconfig/swriter/ui/warndatasourcedialog.ui  |5 +-
 sw/uiconfig/swriter/ui/warnemaildialog.ui   |5 +-
 32 files changed, 107 insertions(+), 122 deletions(-)

New commits:
commit 69241123ed87d6b9974f9fb45e54377efcf7cead
Author: Adolfo Jayme Barrientos 
Date:   Fri Sep 26 22:49:20 2014 -0500

border_width from 12 to 6, as the rest of dialogs

I know the old GNOME HIG mentions extra spacing for queries, but
I’ve never understood why -- not even GNOME itself respects that rule.
It just looks inconsistent and wastes space.

Change-Id: I181f800957f69b0943369791e460c7273b6b08f6
Reviewed-on: https://gerrit.libreoffice.org/11658
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sfx2/uiconfig/ui/alienwarndialog.ui 
b/sfx2/uiconfig/ui/alienwarndialog.ui
index 0e6141d..514630b 100644
--- a/sfx2/uiconfig/ui/alienwarndialog.ui
+++ b/sfx2/uiconfig/ui/alienwarndialog.ui
@@ -1,10 +1,10 @@
 
-
+
 
-  
+  
   
 False
-12
+6
 Confirm File Format
 False
 True
diff --git a/sfx2/uiconfig/ui/querysavedialog.ui 
b/sfx2/uiconfig/ui/querysavedialog.ui
index 93a67c3..86cf5b0 100644
--- a/sfx2/uiconfig/ui/querysavedialog.ui
+++ b/sfx2/uiconfig/ui/querysavedialog.ui
@@ -1,10 +1,10 @@
 
-
+
 
   
   
 False
-12
+6
 Save document?
 False
 dialog
diff --git a/starmath/uiconfig/smath/ui/savedefaultsdialog.ui 
b/starmath/uiconfig/smath/ui/savedefaultsdialog.ui
index da6040d..336bf09 100644
--- a/starmath/uiconfig/smath/ui/savedefaultsdialog.ui
+++ b/starmath/uiconfig/smath/ui/savedefaultsdialog.ui
@@ -1,9 +1,10 @@
 
+
 
-  
+  
   
 False
-12
+6
 Save defaults?
 False
 dialog
diff --git a/svx/uiconfig/ui/deletefooterdialog.ui 
b/svx/uiconfig/ui/deletefooterdialog.ui
index 78fa1d6..d6ef6f7 100644
--- a/svx/uiconfig/ui/deletefooterdialog.ui
+++ b/svx/uiconfig/ui/deletefooterdialog.ui
@@ -1,9 +1,10 @@
 
+
 
-  
+  
   
 False
-12
+6
 Delete footer?
 False
 dialog
diff --git a/svx/uiconfig/ui/deleteheaderdialog.ui 
b/svx/uiconfig/ui/deleteheaderdialog.ui
index bd471d9..a1fab03 100644
--- a/svx/uiconfig/ui/deleteheaderdialog.ui
+++ b/svx/uiconfig/ui/deleteheaderdialog.ui
@@ -1,9 +1,10 @@
 
+
 
-  
+  
   
 False
-12
+6
 Delete header?
 False
 dialog
diff --git a/svx/uiconfig/ui/formlinkwarndialog.ui 
b/svx/uiconfig/ui/formlinkwarndialog.ui
index 2ee639b..9c31aa4 100644
--- a/svx/uiconfig/ui/formlinkwarndialog.ui
+++ b/svx/uiconfig/ui/formlinkwarndialog.ui
@@ -1,17 +1,16 @@
 
-
+
 
   
   
 False
-12
+6
 False
 dialog
 True
 question
-This instance is linked with the 
form.
-
-The changes you make to this instance will be lost when the form is reloaded.
+This instance is linked with the 
form.
+The changes you make to 
this instance will be lost when the form is reloaded.
 
 How do

[Libreoffice-commits] core.git: oox/source

[Miklos Vajna]

 oox/source/drawingml/shape.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b45de3ceabe258a087c55ff3f031e1d4b2d3e14c
Author: Miklos Vajna 
Date:   Sat Sep 27 14:52:21 2014 +0200

Use oox::drawingml::EMU_PER_HMM

Change-Id: I2034f862b5e15ffaa2ba370ae0249628677c587d

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 5343172..96b9129 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -401,7 +401,7 @@ Reference< XShape > Shape::createAndInsert(
 bool bIsEmbMedia = false;
 SAL_INFO("oox.drawingml", OSL_THIS_FUNC << " id: " << msId);
 
-awt::Rectangle aShapeRectHmm( maPosition.X / 360, maPosition.Y / 360, 
maSize.Width / 360, maSize.Height / 360 );
+awt::Rectangle aShapeRectHmm( maPosition.X / EMU_PER_HMM, maPosition.Y / 
EMU_PER_HMM, maSize.Width / EMU_PER_HMM, maSize.Height / EMU_PER_HMM );
 
 OUString aServiceName;
 if( rServiceName == "com.sun.star.drawing.GraphicObjectShape" &&
@@ -461,14 +461,14 @@ Reference< XShape > Shape::createAndInsert(
 {
 // if global position is used, add it to transformation
 if (mbWps && aParentTransformation.isIdentity())
-aTransformation.translate( maPosition.X * 360, maPosition.Y * 360);
+aTransformation.translate( maPosition.X * EMU_PER_HMM, 
maPosition.Y * EMU_PER_HMM);
 else
 aTransformation.translate( maPosition.X, maPosition.Y );
 }
 
 aTransformation = aParentTransformation*aTransformation;
 aParentTransformation = aTransformation;
-aTransformation.scale(1/360.0, 1/360.0);
+aTransformation.scale(1/double(EMU_PER_HMM), 1/double(EMU_PER_HMM));
 
 // special for lineshape
 if ( aServiceName == "com.sun.star.drawing.LineShape" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/source officecfg/registry sd/source svx/source

[Samuel Mehrbrodt]

 avmedia/source/viewer/mediawindow.src|6 
+++---
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |4 
++--
 sd/source/ui/app/strings.src |8 

 svx/source/dialog/sdstring.src   |2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 1253b909a7bc285efe7f5bf25253bd5fac2d3bb3
Author: Samuel Mehrbrodt 
Date:   Sat Sep 27 19:39:56 2014 +0200

Term change: Sound/Movie -> Audio/Video

Change-Id: I389a3db5ca23718035413cbd0252f62eb8c870c3

diff --git a/avmedia/source/viewer/mediawindow.src 
b/avmedia/source/viewer/mediawindow.src
index 0e66f04..de2c88d 100644
--- a/avmedia/source/viewer/mediawindow.src
+++ b/avmedia/source/viewer/mediawindow.src
@@ -21,17 +21,17 @@
 
 String AVMEDIA_STR_INSERTMEDIA_DLG
 {
-Text[en-US] = "Insert Movie and Sound";
+Text[en-US] = "Insert Audio/Video";
 };
 
 String AVMEDIA_STR_OPENMEDIA_DLG
 {
-Text[en-US] = "Open Movie and Sound";
+Text[en-US] = "Open Audio/Video Dialog";
 };
 
 String AVMEDIA_STR_ALL_MEDIAFILES
 {
-Text[en-US] = "All movie and sound files";
+Text[en-US] = "All audio and video files";
 };
 
 String AVMEDIA_STR_ALL_FILES
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index fd670db..ce0aed3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3282,7 +3282,7 @@
   
   
 
-  ~Sound...
+  ~Audio...
 
 
   1
@@ -5513,7 +5513,7 @@
   
   
 
-  Mo~vie and Sound...
+  Audio/~Video...
 
 
   1
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 6cb0564..6250df0 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -349,7 +349,7 @@ String STR_UNDO_CHANGE_TITLE_AND_LAYOUT
 };
 String STR_WAV_FILE
 {
-Text [ en-US ] = "Sound" ;
+Text [ en-US ] = "Audio" ;
 };
 String STR_MIDI_FILE
 {
@@ -577,7 +577,7 @@ String STR_CLICK_ACTION_INVISIBLE
 };
 String STR_CLICK_ACTION_SOUND
 {
-Text [ en-US ] = "Play sound" ;
+Text [ en-US ] = "Play audio" ;
 };
 String STR_CLICK_ACTION_VERB
 {
@@ -605,7 +605,7 @@ String STR_EFFECTDLG_ACTION
 };
 String STR_EFFECTDLG_SOUND
 {
-Text [ en-US ] = "Sound" ;
+Text [ en-US ] = "Audio" ;
 };
 String STR_EFFECTDLG_PAGE_OBJECT
 {
@@ -967,7 +967,7 @@ String STR_UNDO_GRAFFILTER
 
 String STR_WARNING_NOSOUNDFILE
 {
-Text [ en-US ] = "The file %\nis not a valid sound file !" ;
+Text [ en-US ] = "The file %\nis not a valid audio file !" ;
 };
 
 String STR_UNDO_CONVERT_TO_METAFILE
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 23e606a..d63164d 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -177,7 +177,7 @@ String STR_EXTFILTER_ALL
 
 String STR_INSERT_SOUND_TITLE
 {
-Text [ en-US ] = "Insert sound" ;
+Text [ en-US ] = "Insert audio" ;
 };
 
 String STR_INSERT_VIDEO_TITLE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 4.3.x linux packages and collada support

[Michael Meeks]

Hi Tamas,

On Sat, 2014-09-27 at 16:05 +0200, Zolnai Tamás wrote:
> It's the collada2gltf code which uses std::shared_ptr at many places
> so it would be much work to replace all of them with
> boost::shared_ptr, but actually can be done if necessary.

Interesting; we should work out what is best to do there I guess.

>  I just thought packages are created with newer compilers, since they
> generate more better output (in theory).

We compile LibreOffice on our oldest Linux base-line, which is
something horribly old; that is because it is the only effective way to
get backwards comaptibilioty 

> Other thing is that I need to know whether this is the problem indeed.
> So can I know what compilers are used for packages? Are they support
> std::shared_ptr?

AFAICS it is bad form to disable the feature during the release series
without discussing it and/or notifying the author etc. I imagine it was
inadvertent, and/or Cloph who normally does the compiles is on vacation
& Robinson has been standing in for a bit; I've no idea what happened
here. I took a look at configure.ac and distro-config's on the branch
and couldn't see what happened there either.

What commit disabled that ?

All the best,

Michael.

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

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

Re: 4.3.x linux packages and collada support

[Michael Meeks]

Hi Tamas,

On Sat, 2014-09-27 at 16:05 +0200, Zolnai Tamás wrote:
> It's the collada2gltf code which uses std::shared_ptr at many places
> so it would be much work to replace all of them with
> boost::shared_ptr, but actually can be done if necessary.

Interesting; we should work out what is best to do there I guess.

>  I just thought packages are created with newer compilers, since they
> generate more better output (in theory).

We compile LibreOffice on our oldest Linux base-line, which is
something horribly old; that is because all newer releases are backwards
compatible, but no newer release makes it easy to compile for older
systems; sad but true.

> Other thing is that I need to know whether this is the problem indeed.
> So can I know what compilers are used for packages? Are they support
> std::shared_ptr?

Actually, I'm really surprised that this was turned off without any
discussion / notification to you. That's really not ideal; Cloph is away
on vacation just now - and we've had Robinson doing interim release mgmt
- but ... I'll push to the ESC agenda to investigate - it seems most
odd.

ATB,

Michael.

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

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

[Libreoffice-commits] core.git: sd/uiconfig

[Adolfo Jayme Barrientos]

 sd/uiconfig/simpress/ui/headerfooterdialog.ui |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c22ee0bdd2eae207dbd3cffa51bab4170a53344d
Author: Adolfo Jayme Barrientos 
Date:   Fri Sep 26 21:10:14 2014 -0500

Add missing title to the Header and Footer dialog

Change-Id: I720bf1be02b9b4decf5373d49de136b0e57c61c9
Reviewed-on: https://gerrit.libreoffice.org/11657
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sd/uiconfig/simpress/ui/headerfooterdialog.ui 
b/sd/uiconfig/simpress/ui/headerfooterdialog.ui
index da0a57a..22c6081 100644
--- a/sd/uiconfig/simpress/ui/headerfooterdialog.ui
+++ b/sd/uiconfig/simpress/ui/headerfooterdialog.ui
@@ -1,9 +1,11 @@
 
+
 
-  
+  
   
 False
 6
+Header and Footer
 dialog
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/uiconfig

[Adolfo Jayme Barrientos]

 sw/uiconfig/swriter/ui/printeroptions.ui |   17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 63ec219eca557c562433c4e9965a6f154e5966b5
Author: Adolfo Jayme Barrientos 
Date:   Fri Sep 26 19:08:10 2014 -0500

HIG: Correct spacing for several UI options in Print dialog

Change-Id: I2492274d5114a26ce802343a3bb9078d0556588b
Reviewed-on: https://gerrit.libreoffice.org/11656
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sw/uiconfig/swriter/ui/printeroptions.ui 
b/sw/uiconfig/swriter/ui/printeroptions.ui
index 63d14ee..09eeeb0 100644
--- a/sw/uiconfig/swriter/ui/printeroptions.ui
+++ b/sw/uiconfig/swriter/ui/printeroptions.ui
@@ -1,12 +1,12 @@
 
+
 
-  
+  
   
 True
 False
-True
-True
 vertical
+6
 
   
 True
@@ -17,12 +17,14 @@
   
 True
 False
+6
 12
 
   
 True
 False
 vertical
+6
 
   
 Page 
background
@@ -30,7 +32,6 @@
 True
 True
 False
-False
 0
 True
   
@@ -47,7 +48,6 @@
 True
 True
 False
-False
 0
 True
   
@@ -64,7 +64,6 @@
 True
 True
 False
-False
 0
 True
   
@@ -81,7 +80,6 @@
 True
 True
 False
-False
 0
 True
   
@@ -98,7 +96,6 @@
 True
 True
 False
-False
 0
 True
   
@@ -139,6 +136,7 @@
   
 True
 False
+6
 12
 
   
@@ -147,7 +145,6 @@
 True
 True
 False
-False
 0
 True
   
@@ -181,6 +178,7 @@
   
 True
 False
+6
 12
 
   
@@ -189,7 +187,6 @@
 True
 True
 False
-False
 0
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/uiconfig

[Adolfo Jayme Barrientos]

 sfx2/uiconfig/ui/templatedlg.ui |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2c2b1840c59e8fdbfaa83cc2552ab328ded20882
Author: Adolfo Jayme Barrientos 
Date:   Sat Sep 27 00:16:28 2014 -0500

fdo#84376 Add missing title to the Template Manager dialog

Change-Id: I514cc4354950119caa4c16d0ccb6b9d18290dee3
Reviewed-on: https://gerrit.libreoffice.org/11659
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui
index b6ecee8..945fca2 100644
--- a/sfx2/uiconfig/ui/templatedlg.ui
+++ b/sfx2/uiconfig/ui/templatedlg.ui
@@ -1,12 +1,13 @@
 
-
+
 
   
-  
+  
   
 800
 560
 False
+Template Manager
 
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Zolnai Tamás]

 configure.ac |   24 
 1 file changed, 24 deletions(-)

New commits:
commit c5a1cff00cb4a3a631dacaf54ff72a4c82923eef
Author: Zolnai Tamás 
Date:   Sat Sep 27 16:07:12 2014 +0200

Actually we use C++11 on master so don't need to check std::shared_ptr 
support

Change-Id: Ie5f0057ef391a6b5caee50c254e317689b810a2f

diff --git a/configure.ac b/configure.ac
index 4b81b0e..4bb0b5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6089,27 +6089,6 @@ CXXFLAGS=$save_CXXFLAGS
 
 AC_SUBST(CXXFLAGS_CXX11)
 
-AC_MSG_CHECKING([for std::shared_ptr])
-if test "$GCC" = "yes"; then
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#include 
-using std::shared_ptr;
-])],
-  [ have_std_shared_ptr=yes ],
-  [ have_std_shared_ptr=no ]
-)
-AC_LANG_POP([C++])
-CXXFLAGS=$save_CXXFLAGS
-elif test "$COM" = "MSC"; then
-have_std_shared_ptr=yes
-else
-have_std_shared_ptr=no
-fi
-AC_MSG_RESULT([$have_std_shared_ptr])
-
 dnl ==
 dnl Check for C++11 "= delete" support
 dnl ==
@@ -10369,9 +10348,6 @@ dnl 
===
 AC_MSG_CHECKING([whether to enable COLLADA support])
 ENABLE_COLLADA=
 if test "$enable_collada" != "no" -a "$ENABLE_GLTF" = "TRUE"; then
-if test "$have_std_shared_ptr" = "no"; then
-AC_MSG_ERROR([Collada support needs std::shared_ptr. Use a newer C++ 
compiler])
-fi
 AC_MSG_RESULT([yes])
 ENABLE_COLLADA=TRUE
 AC_DEFINE(HAVE_FEATURE_COLLADA,1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sd/uiconfig sw/uiconfig

[Samuel Mehrbrodt]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |4 
++--
 sc/uiconfig/scalc/menubar/menubar.xml|2 +-
 sd/uiconfig/sdraw/menubar/menubar.xml|2 +-
 sd/uiconfig/simpress/menubar/menubar.xml |2 +-
 sw/uiconfig/sglobal/menubar/menubar.xml  |2 +-
 sw/uiconfig/sweb/menubar/menubar.xml |8 
++--
 sw/uiconfig/swform/menubar/menubar.xml   |2 +-
 sw/uiconfig/swreport/menubar/menubar.xml |2 +-
 sw/uiconfig/swriter/menubar/menubar.xml  |2 +-
 sw/uiconfig/swxform/menubar/menubar.xml  |2 +-
 10 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 18ec913e413b05a44bbe79768f538d93bffa9e5d
Author: Samuel Mehrbrodt 
Date:   Sat Sep 27 15:05:06 2014 +0200

fdo#53682 Merge 'Insert Image' and 'Insert Audio/Video' in submenu

Change-Id: I4ddbd134ba15a48c0c529a11bcb1cd1f71f3a51a

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index a138e47..fd670db 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3053,7 +3053,7 @@
   
   
 
-  ~From File...
+  ~Image...
 
 
   1
@@ -5425,7 +5425,7 @@
   
   
 
-  ~Image
+  ~Media
 
   
   
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index 2cac34a..f1df595 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -214,6 +214,7 @@
 
 
 
+
 
 
 
@@ -228,7 +229,6 @@
 
 
 
-
 
 
 
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index ddcd289..77ae00d 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -187,6 +187,7 @@
   
 
   
+  
   
 
   
@@ -197,7 +198,6 @@
 
   
   
-  
   
 
   
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index 8e75035..1b15c3f 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -205,6 +205,7 @@
 
 
 
+
 
 
 
@@ -215,7 +216,6 @@
 
 
 
-
 
 
 
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index 7da8f32..b450e0c 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -216,6 +216,7 @@
   
 
   
+  
   
 
   
@@ -225,7 +226,6 @@
   
 
   
-  
   
 
   
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml 
b/sw/uiconfig/sweb/menubar/menubar.xml
index 2fbd8df..4879386 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -169,8 +169,12 @@
   
   
   
-  
-  
+  
+
+  
+  
+
+  
   
 
   
diff --git a/sw/uiconfig/swform/menubar/menubar.xml 
b/sw/uiconfig/swform/menubar/menubar.xml
index c139bd3..69cf742 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -215,6 +215,7 @@
   
 
   
+  
   
 
   
@@ -224,7 +225,6 @@
   
 
   
-  
   
 
   
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml 
b/sw/uiconfig/swreport/menubar/menubar.xml
index 7fa10f9..86252d7 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -216,6 +216,7 @@
   
 
   
+  
   
 
   
@@ -225,7 +226,6 @@
   
 
   
-  
   
 
   
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index ab69208..284d2c9 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -223,6 +223,7 @@
   
 
   
+  
   
 

Re: 4.3.x linux packages and collada support

[Zolnai Tamás]

2014-09-27 15:23 GMT+02:00 Miklos Vajna :

> On Sat, Sep 27, 2014 at 08:26:38AM +0200, Zolnai Tamás <
> zolnaitamas2...@gmail.com> wrote:
> > So the only question is:
> > Is it possible to replace the 4.3.1 and 4.3.2 linux packages with new
> ones
> > which are compiled with newer compilers? (expecting this is the problem)
> > To fix the bug mentioned above.
>
> Isn't it possible to stick to boost::shared_ptr on -4-3, given that's
> what other code does?
>

It's the collada2gltf code which uses std::shared_ptr at many places so it
would be much work to replace all of them with boost::shared_ptr, but
actually can be done if necessary. I just thought packages are created with
newer compilers, since they generate more better output (in theory).
Other thing is that I need to know whether this is the problem indeed. So
can I know what compilers are used for packages? Are they support
std::shared_ptr?

Thanks,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: 4.3.x linux packages and collada support

[Miklos Vajna]

On Sat, Sep 27, 2014 at 08:26:38AM +0200, Zolnai Tamás 
 wrote:
> So the only question is:
> Is it possible to replace the 4.3.1 and 4.3.2 linux packages with new ones
> which are compiled with newer compilers? (expecting this is the problem)
> To fix the bug mentioned above.

Isn't it possible to stick to boost::shared_ptr on -4-3, given that's
what other code does?


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

SolarMutexTryAndBuyGuard (was: Re: [Libreoffice-commits] core.git: 2 commits - include/vcl) sc/source svx/source

[Miklos Vajna]

Hi Michael,

On Fri, Sep 26, 2014 at 02:33:38PM -0700, Michael Stahl  
wrote:
> +class SolarMutexTryAndBuyGuard
> +: private boost::noncopyable
> +{
> +private:
> +bool m_isAcquired;
> +#if OSL_DEBUG_LEVEL > 0
> +bool m_isChecked;
> +#endif

Isn't this exactly the situation when we should use DBG_UTIL and not
OSL_DEBUG_LEVEL -- i.e. when the conditional part results in a different
class layout?

Regards,

Miklos


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