date:20140917




On 2014-09-17 04:36 AM, Lionel Elie Mamane wrote:

Rather than hard-coding a path, I presume our build system has a
variable for the path to the Windows SDK. Also, rather than me (not
having a Microsoft Windows development environment) trying blindly
and relying on tinderboxes to test the build, I was hoping someone
having a Microsoft Windows development environment ready to build
LibreOffice would take care of it.





On my Windows virtual machine, which is currently set up according to the 
Windows build instructions,
sqlext.h
lives in
C:\Program Files (x86)\Windows Kits\8.0\Include\um

It looks like configure.ac has logic to deal with that (at line 9557) but why 
it is not working I don't know.
Lionel, I'm on IRC this morning if you want me to run more tests.
I could probably give you TeamViewer access to that machine if you want.

Disclaimer: http://www.peralex.com/disclaimer.html


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

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

 bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java 
|2 +-
 bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java   
|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ec2d5ac3718981b4d225ac831232ae4a8a7e498f
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Tue Sep 16 13:21:40 2014 +0200

jni_uno: string comparison

Change-Id: If093afb43f6ad8d4fcf6c0ec426eb48a6061ef3e
Reviewed-on: https://gerrit.libreoffice.org/11470
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java 
b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
index 99fd9bc..1c2b691 100644
--- 
a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
+++ 
b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_info_holder.java
@@ -24,7 +24,7 @@ import com.sun.star.lib.util.NativeLibraryLoader;
 public final class JNI_info_holder
 {
 static {
-if (System.getProperty(java.vendor) == The Android Project) {
+if (The Android Project.equals(System.getProperty(java.vendor))) {
 // See corresponding code in
 // javaunohelper/com/sun/star/comp/helper/Bootstrap.java for more
 // comments.
diff --git 
a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java 
b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
index 8a60bee..af8f4a9 100644
--- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
+++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
@@ -31,7 +31,7 @@ import com.sun.star.uno.IQueryInterface;
 public final class JNI_proxy implements java.lang.reflect.InvocationHandler
 {
 static {
-if (System.getProperty(java.vendor) == The Android Project) {
+if (The Android Project.equals(System.getProperty(java.vendor))) {
 // See corresponding code in
 // javaunohelper/com/sun/star/comp/helper/Bootstrap.java for more
 // comments.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

 bean/com/sun/star/beans/LocalOfficeConnection.java |   33 -
 1 file changed, 26 insertions(+), 7 deletions(-)

New commits:
commit bd21a82ea4c7499dd8401687f641d44a7593dc44
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Tue Sep 16 18:15:12 2014 +0200

bean: encode(String) in URLEncoder has been deprecated

Change-Id: Ife3ed199e79aeb6886a146324ffb145c7bc3
Reviewed-on: https://gerrit.libreoffice.org/11476
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/beans/LocalOfficeConnection.java
index af2be37..e972e2b 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -20,6 +20,7 @@ package com.sun.star.beans;
 
 import java.awt.Container;
 import java.io.File;
+import java.io.UnsupportedEncodingException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
@@ -72,7 +73,17 @@ public class LocalOfficeConnection
 setUnoUrl( uno:pipe,name= + getPipeName() + 
;urp;StarOffice.ServiceManager );
 }
 catch ( java.net.MalformedURLException e )
-{}
+{
+com.sun.star.uno.RuntimeException e2 = new 
com.sun.star.uno.RuntimeException();
+e2.initCause(e);
+throw e2;
+}
+catch ( UnsupportedEncodingException e)
+{
+com.sun.star.uno.RuntimeException e2 = new 
com.sun.star.uno.RuntimeException();
+e2.initCause(e);
+throw e2;
+}
 
 // load libofficebean.so/officebean.dll
 String aSharedLibName = getProgramPath() + java.io.File.separator +
@@ -525,12 +536,12 @@ public class LocalOfficeConnection
 
 /** creates a unique pipe name.
 */
-static String getPipeName()
+static String getPipeName() throws UnsupportedEncodingException
 {
 // turn user name into a URL and file system safe name (% chars will 
not work)
 String aPipeName = System.getProperty(user.name) + OFFICE_ID_SUFFIX;
 aPipeName = aPipeName.replace( _, %B7 );
-return java.net.URLEncoder.encode(aPipeName).replace( \\+, %20 
).replace( %, _ );
+return java.net.URLEncoder.encode(aPipeName, UTF-8).replace( \\+, 
%20 ).replace( %, _ );
 }
 
 /**
@@ -547,10 +558,18 @@ public class LocalOfficeConnection
  */
 public String getIdentifier()
 {
-if ( mPipe == null)
-return getPipeName();
-else
-return mPipe;
+String identifier = null;
+try
+{
+identifier = ( mPipe == null) ? getPipeName() : mPipe;
+}
+catch (UnsupportedEncodingException e)
+{
+com.sun.star.uno.RuntimeException e2 = new 
com.sun.star.uno.RuntimeException();
+e2.initCause(e);
+throw e2;
+}
+return identifier;
 }
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

 bean/com/sun/star/beans/LocalOfficeConnection.java  |3 ++-
 bean/com/sun/star/comp/beans/LocalOfficeConnection.java |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 99920c36e926471311b940902c132d48370328ca
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Tue Sep 16 18:34:08 2014 +0200

bean: Array concatenated with a String


http://docs.oracle.com/javase/1.5.0/docs/api/java/util/Arrays.html#toString(java.lang.Object[])

Change-Id: I42090bf534a9a59fa97061ec2855f79328b1dd45
Reviewed-on: https://gerrit.libreoffice.org/11478
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/beans/LocalOfficeConnection.java
index e972e2b..b091d54 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.lang.XEventListener;
@@ -594,7 +595,7 @@ public class LocalOfficeConnection
 // start process
 mProcess = Runtime.getRuntime().exec(cmdArray);
 if ( mProcess == null )
-throw new RuntimeException( cannot start soffice:  + 
cmdArray );
+throw new RuntimeException( cannot start soffice:  + 
Arrays.toString(cmdArray) );
 }
 
 /**
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index f1299cd..7f1a95a 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.lang.XComponent;
@@ -725,7 +726,7 @@ public class LocalOfficeConnection
 // start process
 mProcess = Runtime.getRuntime().exec(cmdArray);
 if ( mProcess == null )
-throw new com.sun.star.uno.RuntimeException( cannot start 
soffice:  + cmdArray );
+throw new com.sun.star.uno.RuntimeException( cannot start 
soffice:  + Arrays.toString(cmdArray) );
 new StreamProcessor(mProcess.getInputStream(), System.out);
 new StreamProcessor(mProcess.getErrorStream(), System.err);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/test

 bean/test/applet/oooapplet/OOoViewer.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 804e0335fbcc9758ef36a207c5e95664972d31f9
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Tue Sep 16 18:25:16 2014 +0200

bean: unchecked call to getMethod() as a member of the raw type Class

http://docs.oracle.com/javase/tutorial/reflect/class/classTrouble.html

Change-Id: Ib548b47c412394e1518fea42b83d05a36c1655c8
Reviewed-on: https://gerrit.libreoffice.org/11477
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/bean/test/applet/oooapplet/OOoViewer.java 
b/bean/test/applet/oooapplet/OOoViewer.java
index cd86b4a..f2571ba 100644
--- a/bean/test/applet/oooapplet/OOoViewer.java
+++ b/bean/test/applet/oooapplet/OOoViewer.java
@@ -63,7 +63,7 @@ public class OOoViewer extends Applet {
 @Override
 public void start() {
 try {
-Class beanClass = 
m_loader.loadClass(com.sun.star.comp.beans.OOoBean);
+Class? beanClass = 
m_loader.loadClass(com.sun.star.comp.beans.OOoBean);
 m_objBean = beanClass.newInstance();
 setLayout(new BorderLayout());
 add((java.awt.Container)m_objBean, BorderLayout.CENTER);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 cppu/source/uno/lbenv.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e71bc82224418f6dbd266697cf255013a22adbb4
Author: Noel Grandin n...@peralex.com
Date:   Wed Sep 17 08:20:09 2014 +0200

attempt to fix Android buildbot

it seems to have issues with a  token followed by a :: token.

Change-Id: I8cc6a5b6cf00a233182de273ab6aa8609326aca9

diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 5adecc3..96069a0 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -98,7 +98,7 @@ struct FctPtrHash :
 public ::std::unary_function const void *, ::std::size_t 
 {
 ::std::size_t operator () ( const void * pKey ) const
-{ return reinterpret_cast::std::size_t( pKey ); }
+{ return reinterpret_cast ::std::size_t( pKey ); }
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: MySQL Connector/C++ 1.1.4 requires MySQL Connector/C 6.1.4

2014-09-17 Thread Alex Thurgood

Le 17/09/2014 04:52, Lionel Elie Mamane a écrit :

Just my 2c, but

 
 So, we could:
 
 1) Have another try with MariaDB native client right now by including
the patch for CONC-104

 http://bazaar.launchpad.net/~maria-captains/mariadb-native-client/trunk/revision/149
 
 2) Have another try with MariaDB native client right now by updating
our external to the full trunk revision 149.
 
 3) Include libmysqlclient as an external.
 


If any of the above enables me to avoid having to mess around on OSX
with cmake directives (thanks for the mail Lionel by the way, but I
still couldn't get it to build - some missing CMakelist.txt file error),
then I'm all for whatever just works.


Alex

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 3 commits - include/com oox/source sd/source svtools/source

 include/com/sun/star/uno/Reference.h |4 ++--
 oox/source/ppt/timenode.cxx  |2 +-
 sd/source/filter/ppt/pptinanimations.cxx |2 +-
 sd/source/ui/unoidl/unosrch.cxx  |2 +-
 svtools/source/uno/treecontrolpeer.cxx   |1 -
 5 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 1131a069b0aa2b2e3f0b7bdd083ebe95d6cec719
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jun 16 10:22:31 2014 +0200

SAL_WARN_UNUSED_RESULT for static Reference::query function

...which the recent loplugin:staticcall changes showed was occasionally used
apparently under the assumption that it was non-static and changed the 
object
it was called on.

(cherry picked from commit 7242fe6e3360843f9ef5ce07b447de729323a3c8)

Conflicts:
include/com/sun/star/uno/Reference.h
svtools/source/uno/treecontrolpeer.cxx

Change-Id: I989a2a4ed3886d7f370855c9e8c1867e646c059b

diff --git a/include/com/sun/star/uno/Reference.h 
b/include/com/sun/star/uno/Reference.h
index b1299fd..636a339 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -546,13 +546,13 @@ public:
 @param rRef interface reference
 @return interface reference of demanded type (may be null)
 */
-inline static Reference interface_type  SAL_CALL query( const 
BaseReference  rRef ) SAL_THROW( (RuntimeException) );
+inline static SAL_WARN_UNUSED_RESULT Reference interface_type  SAL_CALL 
query( const BaseReference  rRef ) SAL_THROW( (RuntimeException) );
 /** Queries given interface for type interface_type.
 
 @param pInterface interface pointer
 @return interface reference of demanded type (may be null)
 */
-inline static Reference interface_type  SAL_CALL query( XInterface * 
pInterface ) SAL_THROW( (RuntimeException) );
+inline static SAL_WARN_UNUSED_RESULT Reference interface_type  SAL_CALL 
query( XInterface * pInterface ) SAL_THROW( (RuntimeException) );
 };
 
 /// @cond INTERNAL
diff --git a/svtools/source/uno/treecontrolpeer.cxx 
b/svtools/source/uno/treecontrolpeer.cxx
index 1dc40e8..b4cbb4d 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1450,7 +1450,6 @@ bool TreeControlPeer::loadImage( const OUString rURL, 
Image rImage )
 {
 Reference XComponentContext  xContext( 
::comphelper::getProcessComponentContext() );
 Reference XInterface  x( graphic::GraphicProvider::create(xContext) 
);
-mxGraphicProvider.query( x );
 mxGraphicProvider = Reference XGraphicProvider ( x, UNO_QUERY );
 }
 
commit 85406fb19b4576d34fe132c8c3ee0b3c4846459f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Sep 17 09:06:40 2014 +0200

css::uno::Reference::query does not have side effects

partial cherry-pick of c6eb208473109234886600ac299f0cc75ee94e9c 
loplugin:staticcall

Change-Id: Icb2ee78db94ba3a87a5c8ff35d72d191f01d4900

diff --git a/sd/source/filter/ppt/pptinanimations.cxx 
b/sd/source/filter/ppt/pptinanimations.cxx
index be60d65..813d04f 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -597,7 +597,7 @@ void AnimationImporter::fixMainSequenceTiming( const 
::com::sun::star::uno::Refe
 // with node
 xE2-nextElement() = xEA2;
 if( xEA2.is() )
-xE2.query( xEA2-createEnumeration() );
+xE2.set(xEA2-createEnumeration(), 
css::uno::UNO_QUERY);
 else
 xE2.clear();
 
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index 65804c2..587a600 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -498,7 +498,7 @@ uno::Reference text::XTextRange   
SdUnoSearchReplaceShape::Search( uno::Refere
 {
 uno::Reference text::XTextContent   xParagraph( 
xParaEnum-nextElement(), uno::UNO_QUERY );
 if( xParagraph.is() )
-xEnumAccess.query( xParagraph );
+xEnumAccess.set(xParagraph, css::uno::UNO_QUERY);
 else
 xEnumAccess.clear();
 
commit d6bb442109319c6d25c132c11338b5b84149918b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 13 17:50:50 2014 +0200

loplugin:staticcall

Change-Id: I1d428ccd434b7b6f61461ea29447291759c3a7bf
(cherry picked from commit 732e7bdfa2d0e7b0296599517f53d194c02acfee)

diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index ff31be2..0070367 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -138,7 +138,7 @@ namespace oox { namespace ppt {
 // with node
 xE2-nextElement() = xEA2;
 if( xEA2.is() )
-xE2.query( xEA2-createEnumeration() );
+

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

 vcl/source/window/menu.cxx  |9 +
 vcl/source/window/menubarwindow.cxx |5 +
 vcl/source/window/menubarwindow.hxx |1 +
 vcl/source/window/menuwindow.hxx|1 +
 4 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit df9145abe89ae698287facdeb41c0dd3b7758190
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Sep 17 09:42:11 2014 +0200

vcl menu: Add the height setting to the IMenuBarWindow interface.

Change-Id: I7b5f6e1b79f9972e2f23ed50c8da53874ad8b55e

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 28fb6fa..043d2d3 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2481,15 +2481,16 @@ Window* MenuBar::ImplCreate( Window* pParent, Window* 
pWindow, MenuBar* pMenu )
 pMenu-pStartedFrom = 0;
 pMenu-pWindow = pWindow;
 pMenuBarWindow-SetMenu(pMenu);
-long nHeight = pMenu-ImplCalcSize( pWindow ).Height();
+long nHeight = pMenu-ImplCalcSize(pWindow).Height();
 
 // depending on the native implementation or the displayable flag
 // the menubar windows is suppressed (ie, height=0)
-if( !((MenuBar*) pMenu)-IsDisplayable() ||
-( pMenu-ImplGetSalMenu()  pMenu-ImplGetSalMenu()-VisibleMenuBar() 
) )
+if (!pMenu-IsDisplayable() || (pMenu-ImplGetSalMenu()  
pMenu-ImplGetSalMenu()-VisibleMenuBar()))
+{
 nHeight = 0;
+}
 
-pWindow-setPosSizePixel( 0, 0, 0, nHeight, WINDOW_POSSIZE_HEIGHT );
+pMenuBarWindow-SetHeight(nHeight);
 return pWindow;
 }
 
diff --git a/vcl/source/window/menubarwindow.cxx 
b/vcl/source/window/menubarwindow.cxx
index 4645df4..d5998d8 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -194,6 +194,11 @@ void MenuBarWindow::SetMenu( MenuBar* pMen )
 }
 }
 
+void MenuBarWindow::SetHeight(long nHeight)
+{
+setPosSizePixel(0, 0, 0, nHeight, WINDOW_POSSIZE_HEIGHT);
+}
+
 void MenuBarWindow::ShowButtons( bool bClose, bool bFloat, bool bHide )
 {
 aCloseBtn.ShowItem(IID_DOCUMENTCLOSE, bClose);
diff --git a/vcl/source/window/menubarwindow.hxx 
b/vcl/source/window/menubarwindow.hxx
index 52d0820..ad3c336 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -123,6 +123,7 @@ public:
 virtual sal_uLong GetFocusId() const SAL_OVERRIDE { return nSaveFocusId; }
 
 virtual voidSetMenu(MenuBar* pMenu) SAL_OVERRIDE;
+virtual voidSetHeight(long nHeight) SAL_OVERRIDE;
 virtual voidKillActivePopup() SAL_OVERRIDE;
 virtual voidPopupClosed(Menu* pMenu) SAL_OVERRIDE;
 virtual sal_uInt16 GetHighlightedItem() const SAL_OVERRIDE { return 
nHighlightedItem; }
diff --git a/vcl/source/window/menuwindow.hxx b/vcl/source/window/menuwindow.hxx
index 73c99df..880b3f1 100644
--- a/vcl/source/window/menuwindow.hxx
+++ b/vcl/source/window/menuwindow.hxx
@@ -80,6 +80,7 @@ public:
 
 virtual void SetAutoPopup(bool bAuto) = 0;
 virtual void SetMenu(MenuBar* pMenu) = 0;
+virtual void SetHeight(long nHeight) = 0;
 virtual void KillActivePopup() = 0;
 
 /// Add an arbitrary button to the menubar that will appear next to the 
close button.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Test the SDK

2014-09-17 Thread Miklos Vajna

On Tue, Sep 16, 2014 at 04:56:24PM +0200, Stephan Bergmann 
sberg...@redhat.com wrote:
 ...should work once again with 
 https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=d1a734cef0ed5d655774c2f8ac7a2203f8c0a385
 Create instdir uno ini-file from instsetoo_native.

It does -- thanks!


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

[Libreoffice-commits] core.git: 4 commits - avmedia/source chart2/source include/vcl oox/source sd/qa vcl/source

2014-09-17 Thread Zolnai Tamás

 avmedia/source/opengl/oglplayer.cxx|2 
 chart2/source/view/main/OpenGLRender.cxx   |8 +--
 include/vcl/opengl/OpenGLHelper.hxx|4 -
 oox/source/ppt/pptshape.cxx|   10 +--
 oox/source/ppt/presentationfragmenthandler.cxx |   11 
 sd/qa/unit/data/pptx/bnc584721_1_2.pptx|binary
 sd/qa/unit/data/pptx/bnc584721_3.pptx  |binary
 sd/qa/unit/import-tests.cxx|   64 +
 vcl/source/opengl/OpenGLHelper.cxx |4 -
 9 files changed, 89 insertions(+), 14 deletions(-)

New commits:
commit 079c861f08d27aa8b6368aebc37f235979049286
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Wed Sep 17 08:04:36 2014 +0200

fdo#81237: 2D OpenGL charts was upside-down

The problem is that LO drawinglayer uses a coordinate system
with an origin at the top-left corner of the screen, while
OpenGL uses a complete coordinate system (with all four
quarters, e.g.: allows negative values). The points in
LO are always positive values which means they are drawn
in the first quarter of the OpenGL coordinate system which
also means that the origin is at the bottom-left corner
of the scene. This difference causes the flipped scene.

* To solve that problem scale the projection matrix with -1.0f
along the y axis.
* glDisable(GL_CULL_FACE) is necessary to avoid dropping primitives
after scaling with -1.0.
* Since projection matrix mirrors also the textures we don't need to
do that inside the ConvertBitmapExToRGBATextureBuffer() method.

Change-Id: Ieba642f3e665778a12368fe50a20865ec8f73514

diff --git a/avmedia/source/opengl/oglplayer.cxx 
b/avmedia/source/opengl/oglplayer.cxx
index a21d5db..c7f0c05 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -103,7 +103,7 @@ bool OGLPlayer::create( const OUString rURL )
 }
 BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
 rFile.buffer = new char[4 * aBitmapEx.GetSizePixel().Width() * 
aBitmapEx.GetSizePixel().Height()];
-OpenGLHelper::ConvertBitmapExToRGBATextureBuffer(aBitmapEx, 
reinterpret_castsal_uInt8*(rFile.buffer));
+OpenGLHelper::ConvertBitmapExToRGBATextureBuffer(aBitmapEx, 
reinterpret_castsal_uInt8*(rFile.buffer), true);
 rFile.imagewidth = aBitmapEx.GetSizePixel().Width();
 rFile.imageheight = aBitmapEx.GetSizePixel().Height();
 }
diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index 7c328b9..428b300 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -87,7 +87,7 @@ GLfloat texCoords[] = {
 int OpenGLRender::InitOpenGL()
 {
 glEnable(GL_TEXTURE_2D);
-glEnable(GL_CULL_FACE);
+glDisable(GL_CULL_FACE);
 glCullFace(GL_BACK);
 glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 // Enable depth test
@@ -107,7 +107,8 @@ int OpenGLRender::InitOpenGL()
 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 //Init the Projection matrix
-m_Projection = glm::ortho(0.f, float(m_iWidth), 0.f, float(m_iHeight), 
-1.f, 1.f);
+m_Projection = glm::ortho(0.f, float(m_iWidth), -float(m_iHeight), 0.f, 
-1.f, 1.f);
+m_Projection = m_Projection * glm::scale(1.0f, -1.0f, 1.0f);
 m_View   = glm::lookAt(glm::vec3(0,0,1), // Camera is at (4,3,-3), in 
World Space
glm::vec3(0,0,0), // and looks at the origin
glm::vec3(0,1,0)  // Head is up (set to 0,-1,0 
to look upside-down)
@@ -356,7 +357,8 @@ void OpenGLRender::SetSize(int width, int height)
 {
 m_iWidth = width;
 m_iHeight = height;
-m_Projection = glm::ortho(0.f, float(m_iWidth), 0.f, float(m_iHeight), 
-4.f, 3.f);
+m_Projection = glm::ortho(0.f, float(m_iWidth), -float(m_iHeight), 0.f, 
-4.f, 3.f);
+m_Projection = m_Projection * glm::scale(1.0f, -1.0f, 1.0f);
 }
 
 void OpenGLRender::SetLine2DColor(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b, 
sal_uInt8 nAlpha)
diff --git a/include/vcl/opengl/OpenGLHelper.hxx 
b/include/vcl/opengl/OpenGLHelper.hxx
index f4ed8ea..8c04e32 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -25,9 +25,9 @@ public:
  * The caller is responsible for allocate the memory for the RGBA buffer, 
before call
  * this method. RGBA buffer size is assumed to be 4*width*height.
  * Since OpenGL uses textures flipped relative to BitmapEx storage this 
method
- * also mirrors the bitmap vertically.
+ * also adds the possibility to mirror the bitmap vertically at the same 
time.
 **/
-static void ConvertBitmapExToRGBATextureBuffer(const BitmapEx rBitmapEx, 
sal_uInt8* o_pRGBABuffer);
+static void ConvertBitmapExToRGBATextureBuffer(const BitmapEx rBitmapEx, 
sal_uInt8* o_pRGBABuffer,

[Libreoffice-commits] core.git: 32 commits - extras/source include/sfx2 include/svx sc/inc sc/source sd/source sfx2/source svx/Library_svxcore.mk svx/source svx/uiconfig svx/UIConfig_svx.mk sw/inc sw/

2014-09-17 Thread Tomaž Vajngerl

 extras/source/glade/libreoffice-catalog.xml.in |7 
 include/sfx2/objsh.hxx |2 
 include/svx/Palette.hxx|   83 +++
 include/svx/PaletteManager.hxx |   76 ++
 include/svx/SvxColorValueSet.hxx   |1 
 include/svx/tbcontrl.hxx   |   30 --
 sc/inc/document.hxx|2 
 sc/source/core/data/document10.cxx |   51 
 sc/source/ui/app/scdll.cxx |2 
 sc/source/ui/docshell/docsh.cxx|5 
 sc/source/ui/inc/docsh.hxx |2 
 sd/source/ui/app/sddll.cxx |2 
 sfx2/source/doc/objcont.cxx|7 
 sfx2/source/toolbox/tbxitem.cxx|2 
 svx/Library_svxcore.mk |2 
 svx/UIConfig_svx.mk|1 
 svx/source/tbxctrls/Palette.cxx|  209 +
 svx/source/tbxctrls/PaletteManager.cxx |  250 +
 svx/source/tbxctrls/SvxColorValueSet.cxx   |   22 +
 svx/source/tbxctrls/colorwindow.hxx|   24 +-
 svx/source/tbxctrls/tbcontrl.cxx   |  293 -
 svx/uiconfig/ui/colorwindow.ui |  146 
 sw/inc/doc.hxx |2 
 sw/inc/docsh.hxx   |2 
 sw/source/core/doc/docfmt.cxx  |   43 +++
 sw/source/uibase/app/docst.cxx |5 
 sw/source/uibase/app/swmodule.cxx  |2 
 vcl/source/app/settings.cxx|2 
 28 files changed, 1095 insertions(+), 180 deletions(-)

New commits:
commit e03223d4c3cdc5d89598f0afefbd3eaee8a69736
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.co.uk
Date:   Wed Sep 17 10:18:12 2014 +0200

Don't manually set the SvxColorWindow size

Change-Id: Idd5ba4480c5323fb15dbb4c850b46e3f0604737b

diff --git a/svx/source/tbxctrls/colorwindow.hxx 
b/svx/source/tbxctrls/colorwindow.hxx
index 37ca5a8..faffc67 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -37,7 +37,7 @@ private:
 const sal_uInt16theSlotId;
 SvxColorValueSet*   mpColorSet;
 SvxColorValueSet*   mpRecentColorSet;
-SizemaWindowSize;
+
 ListBox*mpPaletteListBox;
 PushButton* mpButtonAutoColor;
 PushButton* mpButtonPicker;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index ae02c6e..1afb936 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1009,7 +1009,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString 
   rCommand,
 palette_popup_window, svx/ui/colorwindow.ui,
 rFrame ),
 theSlotId( nSlotId ),
-maWindowSize( 250, 350 ),
 maCommand( rCommand ),
 mrPaletteManager( rPaletteManager ),
 mnColorSetCols( 10 )
@@ -1186,7 +1185,6 @@ void SvxColorWindow_Impl::Resize()
 {
 mpColorSet-SetSizePixel( this-GetOutputSizePixel() );
 mpRecentColorSet-SetSizePixel( this-GetOutputSizePixel() );
-SetOutputSizePixel(maWindowSize);
 }
 
 void SvxColorWindow_Impl::StartSelection()
commit 83eefb378bbfc6bcdc6db9630a70c32a6ef4acc8
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.co.uk
Date:   Wed Sep 17 10:16:16 2014 +0200

Adjust color window UI  align with FloatWindow changes

Change-Id: I6a402bf29af6edc153e661b28e53166c509823af

diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index f33366a..d15eb42 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -1,9 +1,18 @@
 ?xml version=1.0 encoding=UTF-8?
-!-- Generated with glade 3.16.1 --
+!-- Generated with glade 3.18.3 --
 interface
   requires lib=gtk+ version=3.10/
+  requires lib=LibreOffice version=1.0/
   object class=GtkWindow id=palette_popup_window
 property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
+property name=border_width6/property
+property name=resizableFalse/property
+property name=destroy_with_parentTrue/property
+property name=type_hintpopup-menu/property
+property name=skip_pager_hintTrue/property
+property name=deletableFalse/property
 child
   object class=GtkBox id=box1
 property name=visibleTrue/property
@@ -15,6 +24,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
+property name=reliefnone/property
   /object
   packing
 property name=expandFalse/property
@@ -46,6 +56,8 @@
 /child
 child
   object class=svxlo-SvxColorValueSet id=colorset
+property name=width_request200/property
+

Reverts notification?

Hi,

Taking this to the list, actually :-)

lio...@mamane.lu píše v Út 16. 09. 2014 v 18:00 +0200:

  I've reverted
 
 Thanks for the notice. I very much prefer communication rather than
 silent change-on-top / revert and I discover it by chance weeks /
 months later, if ever.

I wonder if it might make sense to extend our IRC notification bot to
detect reverts, and mail the author (or committer?) of the patch that
has been reverted?

All the best,
Kendy

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

[Libreoffice-commits] core.git: include/svl svl/source svtools/source sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk unusedcode.easy writerfilter/source

2014-09-17 Thread Caolán McNamara

 include/svl/gridprinter.hxx|6 -
 svl/source/misc/gridprinter.cxx|   10 -
 svtools/source/dialogs/roadmapwizard.cxx   |9 -
 svtools/source/uno/unocontroltablemodel.cxx|   16 --
 svtools/source/uno/unocontroltablemodel.hxx|4 
 sw/UIConfig_swriter.mk |1 
 sw/inc/editsh.hxx  |4 
 sw/source/core/edit/editsh.cxx |8 -
 sw/source/filter/ww8/docxsdrexport.cxx |5 
 sw/source/filter/ww8/docxsdrexport.hxx |2 
 sw/source/uibase/dbui/dbui.cxx |   35 --
 sw/source/uibase/dbui/mmconfigitem.cxx |   18 ---
 sw/source/uibase/inc/dbui.hxx  |   21 ---
 sw/source/uibase/inc/mmconfigitem.hxx  |2 
 sw/uiconfig/swriter/ui/mmcreatingdialog.ui |  116 -
 unusedcode.easy|5 
 writerfilter/source/dmapper/WrapPolygonHandler.cxx |5 
 writerfilter/source/dmapper/WrapPolygonHandler.hxx |2 
 18 files changed, 269 deletions(-)

New commits:
commit d49d0139a7f4b9835a2179b6dcc6741a41b0197c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Sep 17 09:20:21 2014 +0100

callcatcher: update unused code

Change-Id: I2ddda0600ee876e9886ee3221f0ac5ad515fbd22

diff --git a/include/svl/gridprinter.hxx b/include/svl/gridprinter.hxx
index d63adfc..446072b 100644
--- a/include/svl/gridprinter.hxx
+++ b/include/svl/gridprinter.hxx
@@ -27,14 +27,8 @@ class SVL_DLLPUBLIC GridPrinter
 public:
 GridPrinter( size_t nRows, size_t nCols, bool bPrint = true );
 ~GridPrinter();
-
 void set( size_t nRow, size_t nCol, const OUString rStr );
-
 void print( const char* pHeader ) const;
-
-void clear();
-
-void resize( size_t nRows, size_t nCols );
 };
 
 }
diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
index a472649..2cbadca 100644
--- a/svl/source/misc/gridprinter.cxx
+++ b/svl/source/misc/gridprinter.cxx
@@ -126,16 +126,6 @@ void GridPrinter::print( const char* pHeader ) const
 }
 }
 
-void GridPrinter::clear()
-{
-mpImpl-maMatrix.clear();
-}
-
-void GridPrinter::resize( size_t nRows, size_t nCols )
-{
-mpImpl-maMatrix.resize(nRows, nCols);
-}
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/roadmapwizard.cxx 
b/svtools/source/dialogs/roadmapwizard.cxx
index a1dc4f9..6e83474 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -117,17 +117,8 @@ namespace svt
 return nMinLength;
 }
 
-
 //= RoadmapWizard
-
-
 #ifdef DBG_UTIL
-const char* CheckInvariants( const void* pVoid )
-{
-return static_cast const RoadmapWizard* ( pVoid )-checkInvariants();
-}
-
-
 const sal_Char* RoadmapWizard::checkInvariants() const
 {
 // all paths have to start with the same state
diff --git a/svtools/source/uno/unocontroltablemodel.cxx 
b/svtools/source/uno/unocontroltablemodel.cxx
index 16e7507..395737c 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -123,26 +123,10 @@ namespace svt { namespace table
 }
 };
 
-
 //= UnoControlTableModel
-
-#ifdef DBG_UTIL
-const char* UnoControlTableModel::checkInvariants() const
-{
-Reference XGridDataModel  const xDataModel( m_pImpl-m_aDataModel );
-if ( !xDataModel.is() )
-return data model anymore;
-
-// TODO: more?
-
-return NULL;
-}
-#endif
-
 #define DBG_CHECK_ME() \
 DBG_TESTSOLARMUTEX(); \
 
-
 UnoControlTableModel::UnoControlTableModel()
 :m_pImpl( new UnoControlTableModel_Impl )
 {
diff --git a/svtools/source/uno/unocontroltablemodel.hxx 
b/svtools/source/uno/unocontroltablemodel.hxx
index db711d3..6433511 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -152,10 +152,6 @@ namespace svt { namespace table
 */
 voidnotifyAllDataChanged() const;
 
-#ifdef DBG_UTIL
-const char* checkInvariants() const;
-#endif
-
 private:
 voidimpl_notifyTableMetricsChanged() const;
 };
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index dbfb7d4..e2d35c2 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -171,7 +171,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/queryshowchangesdialog \
sw/uiconfig/swriter/ui/mailmerge \
sw/uiconfig/swriter/ui/mmaddressblockpage \
-   sw/uiconfig/swriter/ui/mmcreatingdialog \
sw/uiconfig/swriter/ui/mmlayoutpage \
sw/uiconfig/swriter/ui/mmmailbody \
sw/uiconfig/swriter/ui/mmmergepage \
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index e9a5a34..9aaea8c 100644
---

Re: Reverts notification?

2014-09-17 Thread Markus Mohrhard

Hey,

I think it is a good idea and would improve the workflow. Adding it should
be a quite simple task as the ciabot script is modular enough to just
integrate it.
It currently lives in the dev-tools repo and after implementing it you need
to talk to miklos so that he can update the production copy.

Regards,
Markus
On Sep 17, 2014 6:24 PM, Jan Holesovsky ke...@collabora.com wrote:

 Hi,

 Taking this to the list, actually :-)

 lio...@mamane.lu píše v Út 16. 09. 2014 v 18:00 +0200:

   I've reverted
 
  Thanks for the notice. I very much prefer communication rather than
  silent change-on-top / revert and I discover it by chance weeks /
  months later, if ever.

 I wonder if it might make sense to extend our IRC notification bot to
 detect reverts, and mail the author (or committer?) of the patch that
 has been reverted?

 All the best,
 Kendy

 ___
 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-commits] core.git: instsetoo_native/CustomTarget_setup.mk scp2/source scripting/java scripting/source

 instsetoo_native/CustomTarget_setup.mk |   
 2 +-
 scp2/source/ooo/common_brand.scp   |   
 4 ++--
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java |   
 2 +-
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java  |   
 8 
 scripting/source/pyprov/pythonscript.py|   
 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 27d5b5c6dd21dd123fad71cf01880299ef969b49
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Sep 17 11:45:14 2014 +0200

BRAND_BIN_SUBDIR - BRAND_INI_DIR, to cater for new Mac OS X layout

Change-Id: Ic367545895a25a4cf6e95fc1be2f5db9f36a221b

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index 79cf5ec..0c61a21 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -50,7 +50,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
( \
echo '[Bootstrap]' \
 echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \
-echo 'BRAND_BIN_SUBDIR=$(LIBO_BIN_FOLDER)' \
+echo 'BRAND_INI_DIR=$${ORIGIN}' \
 echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
 echo 
'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry 
res:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry 
bundledext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 userext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 user:$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/registrymodifications.xcu'
 \
 echo 
'LO_JAVA_DIR=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)' \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 801a4fa..ce7bbc5 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1056,8 +1056,8 @@ ProfileItem 
gid_Brand_Profileitem_Fundamental_Brand_Bin_Subdir
 ModuleID = gid_Module_Root_Brand;
 ProfileID = gid_Brand_Profile_Fundamental_Ini;
 Section = Bootstrap;
-Key = BRAND_BIN_SUBDIR;
-Value = LIBO_BIN_FOLDER;
+Key = BRAND_INI_DIR;
+Value = ${ORIGIN};
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Lib_Dir
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 55eb560..d55b226 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -95,7 +95,7 @@ public class ScriptMetaData extends ScriptEntry {
 vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR;
 
 private static final String USER =
-vnd.sun.star.expand:${$BRAND_BASE_DIR/BRAND_BIN_SUBDIR/ +
+vnd.sun.star.expand:${$BRAND_INI_DIR/ +
 PathUtils.BOOTSTRAP_NAME +
 ::UserInstallation}/user;
 
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index 2da7926..3ee02ec 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -211,19 +211,19 @@ public abstract class ScriptProvider
 if ( originalContextURL.startsWith( bundled ) )
 {
 contextUrl = vnd.sun.star.expand:$BUNDLED_EXTENSIONS;
-extensionDb = 
vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/ + 
PathUtils.BOOTSTRAP_NAME + ::UserInstallation}/user;
+extensionDb = vnd.sun.star.expand:${$BRAND_INI_DIR/ 
+ PathUtils.BOOTSTRAP_NAME + ::UserInstallation}/user;
 extensionRepository = bundled;
 }
 else if ( originalContextURL.startsWith( share ) )
 {
 contextUrl = 
vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR;
-extensionDb = 
vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/ + 
PathUtils.BOOTSTRAP_NAME + ::UserInstallation}/user;
+extensionDb =

LiMux student kick-off

2014-09-17 Thread Jan-Marek Glogowski

Hi everybody,

since the LiMux students are already working on various LO
EasyHacks, I really want to get the long-term projects started.

We're using currently using the #libreoffice-lhm channel for
communication. I hope the respective groups get organized themself.

And I hope I have all involved persons in the CC.

So - just as a reminder from the LOConf14 hack night:

 * KDE5 - OpenGL / VCL rendering backend (Moggi / Tor)
   + solve the BitmapEx problem ...
   + CloudOn / KDE5 / Android ?
   + DTardon ?
   + Stefan Weiberg
   + Michael Juamannn
   ** Tor - help with infrastructure / setup etc.

LHM: Jan-Marek Glogowski

I just started to refresh my 10+ year old OpenGL knowledge.

 * VCL: main-loop / timeout foo [ menTor ;-]
   + Making our main-loop have an 'idle' concept
 with priorities vs. mix  match timers.
   + Tobias Madl
   + Jennifer Liebel

LHM: Florian Haftmann

 * Import performance - XFastParser vs. old-style parsers.
   + ooxml foo [!] ... - semi-mechanical ?
   * Auto-correction first:
   + Daniel Sikeler

LHM: Ignaz forster

AFAIK Miklos was Michaels suggestion for the mentoring - can't remember.

Last week at LiMux we sat together and wrote down aprocedure to handle
the mentoring from our POV. We already have a non-digital kanban board
(anybody used to https://trello.com/?).

  Sketch of a model for cooperation and coordination
  --
 
  ### Framework
 
  * Two-week iterations (»sprints«)
  * At the transition from one iteration to another, there is a common status 
 meeting via Google Hangout. This covers:
  * A status report concerning the passed iteration.
  * General remarks concerning the state of the whole progress, including 
 refinement proposals.
  * A planning of the next iteration with envisaged aims and effort 
 estimation as far as appropriate.
  * The iterations cover the following issues
  * Three major topics (»stories«):
  * OpenGL backend
  * Priority scheduling
  * FastParser promotion
  * Vast minor topics (»small tasks«):
  * easy hacks and most annyoing bugs from LibreOffice
  * various LHM-specific issues
  * Issues are selected via status meetings. A reasonable proportion of issues 
 (e.g. 70 % stories, 30 % small tasks) is taken into account.
  * A task lifecycle could look like as follows
  * stories
  * iterative breakdown in smaller issues
  * overall status estimation (»_ % done«)
  * small tasks
  * qualification
  * development
  * test (four-eye-principle)
  * internal documentation (for LHM reporting)
  * Visualisation is done using a taskboard (Kanban like)
  * no equipment for digital taskbaord available, but we can take a photo 
 for each status meeting
  * suitable color code, e.g.
  * story = green card
  * story task = bright yellow card
  * small task = pink card
  * Administrative tasks can also be represented (e.g. dark yellow card)
  * e.g. pre-qualification of LHM-specific issues
  * Structure of task board resembles task lifecycle

  ### Common Todos
 
  * Refinement of sketch
  * Agree upon sketch
  * Find suitable weekday for status report 

Probably we should simply add a Wiki page for easier coordination?

Comments please

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

[Libreoffice-commits] core.git: include/sal scripting/source

 include/sal/log-areas.dox  |1 +
 scripting/source/provider/MasterScriptProvider.cxx |4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a01ef1978cb0c6a8a721ca543495deb0adfcb7b9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Sep 17 11:48:20 2014 +0200

Improve logging

Change-Id: I9c879cc16de0d5353a5ab8ce4c8a8cd7f000a170

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 691fae0..60a1af5 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -494,6 +494,7 @@ certain functionality.
 @li @c reportdesign
 @li @c rsc
 @li @c sax
+@li @c scripting.provider
 @li @c shell
 @li @c stoc
 @li @c store
diff --git a/scripting/source/provider/MasterScriptProvider.cxx 
b/scripting/source/provider/MasterScriptProvider.cxx
index 8f59d97..ced3d0b 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -540,8 +540,10 @@ MasterScriptProvider::insertByName( const OUString aName, 
const Any aElement )
 xCont-insertByName( aName, aElement );
 break;
 }
-catch ( Exception )
+catch ( Exception e )
 {
+SAL_INFO(
+scripting.provider, ignoring Exception   e.Message);
 }
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 ucbhelper/source/client/content.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6ee5be0e1dc300120439c3579430d35e7d31131c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Sep 17 11:48:56 2014 +0200

Improve exception msg

Change-Id: I4edbecd0ca3006c24fd5920a9ef9ad1fdc6016fb

diff --git a/ucbhelper/source/client/content.cxx 
b/ucbhelper/source/client/content.cxx
index c8ccd88..d0a5c19 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -277,7 +277,7 @@ static Reference XContent  getContentThrow(
 ensureContentProviderForURL( rBroker, xId-getContentIdentifier() );
 
 throw ContentCreationException(
-Unable to create Content!  + msg,
+Unable to create Content for  + xId-getContentIdentifier() + 
:  + msg,
 Reference XInterface (),
 ContentCreationError_CONTENT_CREATION_FAILED );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=75025

Bug 75025 depends on bug 80939, which changed state.

Bug 80939 Summary: Mac OS X: LibreOffice windows are pixelated on Retina 
displays
https://bugs.freedesktop.org/show_bug.cgi?id=80939

   What|Removed |Added

 Status|RESOLVED|UNCONFIRMED
 Resolution|FIXED   |---

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source

2014-09-17 Thread Matúš Kukan

 oox/source/drawingml/graphicshapecontext.cxx |   40 ++-
 1 file changed, 27 insertions(+), 13 deletions(-)

New commits:
commit 23a817342f264bde5b6d4cb6b00b298c7b930430
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Fri Sep 12 16:08:34 2014 +0200

bnc#591147: OOXML import: Import video file too.

Change-Id: Ie9b6c5ff866269e5d7a26d025cb1c0d884ff1134
(cherry picked from commit b7006f3c2f8f71f4d4721c6e5cdc122628c756f0)
Reviewed-on: https://gerrit.libreoffice.org/11468
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/oox/source/drawingml/graphicshapecontext.cxx 
b/oox/source/drawingml/graphicshapecontext.cxx
index cd4e75d..1813af4 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -47,6 +47,22 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::oox::core;
 
+static OUString lcl_CopyToTempFile(const OUString rStream, const 
oox::core::XmlFilterBase rFilter)
+{
+if (rStream.isEmpty())
+return OUString();
+
+Reference XInputStream  xInStrm( rFilter.openInputStream(rStream), 
UNO_SET_THROW );
+Reference XTempFile  xTempFile( 
TempFile::create(rFilter.getComponentContext()) );
+Reference XOutputStream  xOutStrm( xTempFile-getOutputStream(), 
UNO_SET_THROW );
+oox::BinaryXOutputStream aOutStrm( xOutStrm, false );
+oox::BinaryXInputStream aInStrm( xInStrm, false );
+aInStrm.copyToStream( aOutStrm );
+
+xTempFile-setRemoveFile( false );
+return xTempFile-getUri();
+}
+
 namespace oox {
 namespace drawingml {
 
@@ -70,19 +86,17 @@ ContextHandlerRef GraphicShapeContext::onCreateContext( 
sal_Int32 aElementToken,
 case XML_wavAudioFile:
 {
 getEmbeddedWAVAudioFile( getRelations(), 
rAttribs.getFastAttributeList(), mpShapePtr-getGraphicProperties().maAudio );
-if( !mpShapePtr-getGraphicProperties().maAudio.msEmbed.isEmpty() )
-{
-Reference XComponentContext  xContext = 
comphelper::getProcessComponentContext();
-Reference XInputStream  xInStrm( 
getFilter().openInputStream( mpShapePtr-getGraphicProperties().maAudio.msEmbed 
), UNO_SET_THROW );
-Reference XTempFile  xTempFile( TempFile::create(xContext) );
-Reference XOutputStream  xOutStrm( 
xTempFile-getOutputStream(), UNO_SET_THROW );
-BinaryXOutputStream aOutStrm( xOutStrm, false );
-BinaryXInputStream aInStrm( xInStrm, false );
-aInStrm.copyToStream( aOutStrm );
-
-xTempFile-setRemoveFile( false );
-mpShapePtr-getGraphicProperties().maAudio.msEmbed = 
xTempFile-getUri();
-}
+mpShapePtr-getGraphicProperties().maAudio.msEmbed =
+lcl_CopyToTempFile( 
mpShapePtr-getGraphicProperties().maAudio.msEmbed, getFilter() );
+}
+break;
+case XML_audioFile:
+case XML_videoFile:
+{
+OUString rPath = getRelations().getFragmentPathFromRelId(
+rAttribs.getString(R_TOKEN(link)).get() );
+mpShapePtr-getGraphicProperties().maAudio.msEmbed =
+lcl_CopyToTempFile( rPath, getFilter() );
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source include/filter include/oox oox/source sw/source

2014-09-17 Thread Nikhil Walvekar

 filter/source/msfilter/escherex.cxx  |   11 +++
 filter/source/msfilter/eschesdo.cxx  |   14 +++---
 filter/source/msfilter/eschesdo.hxx  |4 ++--
 include/filter/msfilter/escherex.hxx |8 +---
 include/oox/export/vmlexport.hxx |2 +-
 oox/source/export/vmlexport.cxx  |4 ++--
 sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
 7 files changed, 25 insertions(+), 20 deletions(-)

New commits:
commit 6f87913d843a97963703721506495bd57af36461
Author: Nikhil Walvekar nikhil.walve...@synerzip.com
Date:   Fri Nov 29 14:03:46 2013 +0530

fdo#65836 bnc#621241 Do not compress WMF / EMF file incase of OOXML export

(cherry picked from commit 8fe352be80ff69552f622f3c7a6a6f269912ab71)

Change-Id: Ic498e5703ab48719f998be6da3f245843cc0979d
Reviewed-on: https://gerrit.libreoffice.org/11426
Reviewed-by: Nikhil Walvekar nikhil.walve...@synerzip.com
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 7318de1..cc865ba 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1428,7 +1428,7 @@ sal_Bool 
EscherPropertyContainer::CreateEmbeddedHatchProperties( const ::com::su
 sal_Bool EscherPropertyContainer::CreateGraphicProperties(
 const ::com::sun::star::uno::Reference 
::com::sun::star::beans::XPropertySet   rXPropSet,
 const OUString rSource, const sal_Bool bCreateFillBitmap, const 
sal_Bool bCreateCroppingAttributes,
-const sal_Bool bFillBitmapModeAllowed )
+const sal_Bool bFillBitmapModeAllowed, const sal_Bool bOOxmlExport 
)
 {
 sal_BoolbRetValue = sal_False;
 sal_BoolbCreateFillStyles = sal_False;
@@ -1742,7 +1742,7 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
 SvMemoryStream aMemStrm;
 Rectangle aRect;
 
-if ( aProvider.GetBlibID( aMemStrm, aUniqueId, aRect, 
NULL, pGraphicAttr ) )
+if ( aProvider.GetBlibID( aMemStrm, aUniqueId, aRect, 
NULL, pGraphicAttr, bOOxmlExport ) )
 {
 // grab BLIP from stream and insert directly as 
complex property
 // ownership of stream memory goes to complex property
@@ -4217,7 +4217,8 @@ sal_Bool EscherGraphicProvider::GetPrefSize( const 
sal_uInt32 nBlibId, Size rPr
 }
 
 sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream rPicOutStrm, const 
OString rId,
-const Rectangle /* rBoundRect */, 
const com::sun::star::awt::Rectangle* pVisArea, const GraphicAttr* pGraphicAttr 
)
+const Rectangle /* rBoundRect */, 
const com::sun::star::awt::Rectangle* pVisArea,
+const GraphicAttr* pGraphicAttr, 
const sal_Bool bOOxmlExport )
 {
 sal_uInt32  nBlibId = 0;
 GraphicObject   aGraphicObject( rId );
@@ -4353,7 +4354,9 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream 
rPicOutStrm, const OStrin
 else if ( eBlibType == PEG )
 rPicOutStrm  (sal_uInt16)0x0505;
 }
-if ( ( eBlibType == PEG ) || ( eBlibType == PNG ) )
+// #69607 do not compress WMF files if we are in OOXML export
+if ( ( eBlibType == PEG ) || ( eBlibType == PNG ) ||
+( ( ( eBlibType == WMF ) || ( eBlibType == EMF ) )  
bOOxmlExport ) )
 {
 nExtra = 17;
 p_EscherBlibEntry-mnSizeExtra = nExtra + 8;
diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index 0e20dfb..cbf457f 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -173,7 +173,7 @@ void ImplEESdrWriter::MapRect(ImplEESdrObject /* rObj */ )
 
 sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject rObj,
 EscherSolverContainer rSolverContainer,
-ImplEESdrPageType ePageType )
+ImplEESdrPageType ePageType, const sal_Bool 
bOOxmlExport )
 {
 sal_uInt32 nShapeID = 0;
 sal_uInt16 nShapeType = 0;
@@ -209,7 +209,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject rObj,
 ImplEESdrObject aObj( *this, *(Reference XShape *)
 xXIndexAccess-getByIndex( n ).getValue() 
);
 if( aObj.IsValid() )
-ImplWriteShape( aObj, rSolverContainer, ePageType );
+ImplWriteShape( aObj, rSolverContainer, ePageType, 
bOOxmlExport );
 }
 mpEscherEx-LeaveGroup();
 }
@@ -551,7 +551,7 @@ sal_uInt32

Re: LiMux student kick-off


On Wed, 2014-09-17 at 11:47 +0200, Jan-Marek Glogowski wrote:
 AFAIK Miklos was Michaels suggestion for the mentoring - can't remember.

Matus is the XFastParser expert =) I guess it'd be nice to have a small
XFastParser unit test as well (as some sort of entry-level easy-hack
there).

 Probably we should simply add a Wiki page for easier coordination?

Sure - why not =)

 Comments please

All sounds sensible, my hope is that we can mentor interactively and
superimpose the two-weekly what got done meetings =)

Anyhow - exciting tasks !

ATB,

Michael.

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

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

Re: Reverts notification?

Hi Markus,

Markus Mohrhard píše v St 17. 09. 2014 v 11:18 +0200:

 I think it is a good idea and would improve the workflow. Adding it
 should be a quite simple task as the ciabot script is modular enough
 to just integrate it.

Great.

 It currently lives in the dev-tools repo and after implementing it you
 need to talk to miklos so that he can update the production copy.

Yep, I know (was one of the authors)  have access to the account
myself :-) - just wanted to sanity check the idea.

All the best,
Kendy

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

using eclipse c++ with libreoffice on windows

Hi,

Is anyone using eclipse c++ on windows for Libreoffice development?

 

My first attempt, eclipse was overloaded with too

many projects and died.

 

Eclipse c++ is used as an IDE for linux development.

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

[Libreoffice-commits] core.git: configure.ac external/coinmp external/libgltf external/python3 solenv/gbuild

 configure.ac|   33 
 external/coinmp/ExternalProject_coinmp.mk   |1 
 external/libgltf/ExternalProject_libgltf.mk |2 -
 external/python3/ExternalProject_python3.mk |2 -
 solenv/gbuild/platform/com_MSC_defs.mk  |   15 +---
 5 files changed, 12 insertions(+), 41 deletions(-)

New commits:
commit e7f8b9f8f558e3d862d32a73d0d91f83d7d7be6b
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Sep 17 12:29:13 2014 +0300

Bye bye VS2010

Change-Id: I9d16f4f0df42ae4b046bc1e4ac4fba95c4b9d785

diff --git a/configure.ac b/configure.ac
index 07ff996..c423df9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2010,12 +2010,13 @@ AC_ARG_WITH(
 [with_doxygen=yes])
 
 AC_ARG_WITH(visual-studio,
-AS_HELP_STRING([--with-visual-studio=2013/2012/2010],
+AS_HELP_STRING([--with-visual-studio=2013/2012],
 [Specify which Visual Studio version to use in case several are
  are installed. If not specified, the order of preference is
- 2013, 2012, 2010 (including Express editions).])
+ 2013, 2012 (including Express editions). Note that it is
+ unclear whether using 2013 actually works as intended.])
 [
-  Usage: --with-visual-studio=2013/2012/2010
+  Usage: --with-visual-studio=2013/2012
 ],
 ,)
 
@@ -3381,8 +3382,6 @@ map_vs_year_to_version()
 unset vsversion
 
 case $1 in
-2010)
-vsversion=10.0;;
 2012)
 vsversion=11.0;;
 2013)
@@ -3403,14 +3402,14 @@ vs_versions_to_check()
 map_vs_year_to_version $1
 vsversions=$vsversion
 else
-# By default we prefer 2013, 2012, then 2010
-vsversions=12.0 11.0 10.0
+# By default we prefer 2013, then 2012
+vsversions=12.0 11.0
 fi
 }
 
 find_msvs()
 {
-# Find Visual Studio 2013/2012/2010
+# Find Visual Studio 2013/2012
 # Args: $1 (optional) : versions to check, in the order of preference
 # Return value: $vstest
 
@@ -3434,7 +3433,7 @@ find_msvs()
 
 find_msvc()
 {
-# Find Visual C++ 2013/2012/2010
+# Find Visual C++ 2013/2012
 # Args: $1 (optional) : The VS version year
 # Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot
 
@@ -3457,10 +3456,6 @@ find_msvc()
 if test -n $vctest; then
 vcnumwithdot=$ver
 case $vcnumwithdot in
-10.0)
-vcyear=2010
-vcnum=100
-;;
 11.0)
 vcyear=2012
 vcnum=110
@@ -3484,7 +3479,7 @@ if test $_os = WINNT; then
 if test -n $with_visual_studio; then
 AC_MSG_ERROR([No Visual Studio $with_visual_studio 
installation found])
 else
-AC_MSG_ERROR([No Visual Studio 2012, 2010 or 2013 installation 
found])
+AC_MSG_ERROR([No Visual Studio 2012 or 2013 installation 
found])
 fi
 fi
 
@@ -3566,7 +3561,7 @@ if test $_os = WINNT; then
 COMPATH=`echo $VC_PRODUCT_DIR`
 fi
 fi
-if test $BITNESS_OVERRIDE =  -a $vcnum != 100; then
+if test $BITNESS_OVERRIDE = ; then
 CC=$CC -arch:SSE # MSVC 2012 default for x86 is -arch:SSE2
 fi
 export INCLUDE=`cygpath -d $COMPATH/Include`
@@ -3581,14 +3576,6 @@ if test $_os = WINNT; then
 # are always better, we list them in reverse chronological order.
 
 case $vcnum in
-100)
-COMEX=13
-WINDOWS_SDK_ACCEPTABLE_VERSIONS=7.1A 7.1 7.0A 6.0A
-if test $ENABLE_LTO = TRUE; then
-AC_MSG_WARN([LTO is known to cause problems with MSVC 
2010])
-add_warning LTO is known to cause problems with MSVC 2010
-fi
-;;
 110)
 COMEX=14
 WINDOWS_SDK_ACCEPTABLE_VERSIONS=8.0 7.1A
diff --git a/external/coinmp/ExternalProject_coinmp.mk 
b/external/coinmp/ExternalProject_coinmp.mk
index 3c54e42..c140d0e 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -19,7 +19,6 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
MSBuild.exe CoinMP.sln /t:Build \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=Win32 \
-   $(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 
/p:VisualStudioVersion=10.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
,CoinMP/MSVisualStudio/v9)
diff --git a/external/libgltf/ExternalProject_libgltf.mk

Re: Reverts notification?

2014-09-17 Thread Markus Mohrhard

On Sep 17, 2014 8:07 PM, Jan Holesovsky ke...@collabora.com wrote:

 Hi Markus,

 Markus Mohrhard píše v St 17. 09. 2014 v 11:18 +0200:

  I think it is a good idea and would improve the workflow. Adding it
  should be a quite simple task as the ciabot script is modular enough
  to just integrate it.

 Great.

  It currently lives in the dev-tools repo and after implementing it you
  need to talk to miklos so that he can update the production copy.

 Yep, I know (was one of the authors)  have access to the account
 myself :-) - just wanted to sanity check the idea.

Ok. I was not sure if you followed all the steps. Move from private git
repo to dev-tools and move from gimli to the gerrit host. Otherwise this is
just the documentation for the poor soul having to look at the Perl scripts
again ;)

Regards,
Markus

 All the best,
 Kendy

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

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

 svx/source/tbxctrls/Palette.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 65bd55cc6aa3056d0f4f62b9ab0f9d0527137ed4
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Sep 17 12:19:08 2014 +0200

Fix the Windows build.

Change-Id: I38fd1856044863b46792e3a1d6f69e51e9fffe0f

diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx
index ba5bdbd..b0e70db 100644
--- a/svx/source/tbxctrls/Palette.cxx
+++ b/svx/source/tbxctrls/Palette.cxx
@@ -52,8 +52,7 @@ void PaletteGPL::LoadColorSet( SvxColorValueSet rColorSet )
 
 rColorSet.Clear();
 int nIx = 1;
-for(typename ColorList::const_iterator it = maColors.begin();
-it != maColors.end(); ++it)
+for (ColorList::const_iterator it = maColors.begin(); it != 
maColors.end(); ++it)
 {
 rColorSet.InsertItem(nIx, it-first, it-second);
 ++nIx;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sc/source sw/source

 sc/source/core/data/document10.cxx |   24 +++-
 sw/source/core/doc/docfmt.cxx  |   25 -
 2 files changed, 31 insertions(+), 18 deletions(-)

New commits:
commit cc6c01632dda28db0da8d007f2fcac63f1c85e38
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Sep 17 12:46:01 2014 +0200

Fix Windows build - the same thing in Writer.

Change-Id: Iba40d99dd6c162f20ca35e5a937b7c5ee3d2e126

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 4cd06b2..1283e4a 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1915,8 +1915,6 @@ void SwDoc::RenameFmt(SwFmt  rFmt, const OUString  
sNewName,
 
 std::vectorColor SwDoc::GetDocColors()
 {
-// list of color attributes to collect
-const std::vectorsal_uInt16 aColAttrs({RES_CHRATR_COLOR, 
RES_CHRATR_HIGHLIGHT, RES_BACKGROUND});
 std::vectorColor docColors;
 
 for(unsigned int i = 0; i  m_pNodes-Count(); ++i)
@@ -1937,14 +1935,23 @@ std::vectorColor SwDoc::GetDocColors()
 if( SfxItemState::SET == pItemSet-GetItemState( nWhich, false, 
pItem ) )
 {
 sal_uInt16 aWhich = pItem-Which();
-if( std::find(aColAttrs.begin(), aColAttrs.end(), aWhich) != 
aColAttrs.end() )
+switch (aWhich)
 {
-Color aColor( ((SvxColorItem*)pItem)-GetValue() );
-if( COL_AUTO != aColor.GetColor() 
-std::find(docColors.begin(), docColors.end(), aColor) 
== docColors.end() )
-{
-docColors.push_back( aColor );
-}
+// list of color attributes to collect
+case RES_CHRATR_COLOR:
+case RES_CHRATR_HIGHLIGHT:
+case RES_BACKGROUND:
+{
+Color aColor( ((SvxColorItem*)pItem)-GetValue() );
+if( COL_AUTO != aColor.GetColor() 
+std::find(docColors.begin(), 
docColors.end(), aColor) == docColors.end() )
+{
+docColors.push_back( aColor );
+}
+}
+break;
+default:
+break;
 }
 }
 
commit 2d9cdbd9d9a43e41a7242f9c5bc843fde9362920
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Sep 17 12:37:23 2014 +0200

Another Windows build fix - too much C++11 for MSVC 2012...

Change-Id: I2ae08bd7b850e26bd58d8cb9fad830edb0395259

diff --git a/sc/source/core/data/document10.cxx 
b/sc/source/core/data/document10.cxx
index 8702e4c..51b85ec 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -248,8 +248,6 @@ void ScDocument::CopyCellValuesFrom( const ScAddress 
rTopPos, const sc::CellVal
 
 std::vectorColor ScDocument::GetDocColors()
 {
-// list of color attributes to collect
-const std::vectorsal_uInt16 aColAttrs({ATTR_FONT_COLOR, 
ATTR_BACKGROUND});
 std::vectorColor docColors;
 
 for( unsigned int nTabIx = 0; nTabIx  maTabs.size(); ++nTabIx )
@@ -273,14 +271,22 @@ std::vectorColor ScDocument::GetDocColors()
 if( SfxItemState::SET == rItemSet.GetItemState( nWhich, false, 
pItem ) )
 {
 sal_uInt16 aWhich = pItem-Which();
-if( std::find(aColAttrs.begin(), aColAttrs.end(), aWhich) 
!= aColAttrs.end() )
+switch (aWhich)
 {
-Color aColor( ((SvxColorItem*)pItem)-GetValue() );
-if( COL_AUTO != aColor.GetColor() 
-std::find(docColors.begin(), docColors.end(), 
aColor) == docColors.end() )
-{
-docColors.push_back( aColor );
-}
+// attributes we want to collect
+case ATTR_FONT_COLOR:
+case ATTR_BACKGROUND:
+{
+Color aColor( 
((SvxColorItem*)pItem)-GetValue() );
+if( COL_AUTO != aColor.GetColor() 
+std::find(docColors.begin(), 
docColors.end(), aColor) == docColors.end() )
+{
+docColors.push_back( aColor );
+}
+}
+break;
+default:
+break;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Reverts notification?

Hi,

On Wednesday, 2014-09-17 10:24:38 +0200, Jan Holesovsky wrote:

   I've reverted
  
  Thanks for the notice. I very much prefer communication rather than
  silent change-on-top / revert and I discover it by chance weeks /
  months later, if ever.
 
 I wonder if it might make sense to extend our IRC notification bot to
 detect reverts, and mail the author (or committer?) of the patch that
 has been reverted?

Also, if bug IDs are present in the revert summary, shouldn't the
corresponding bugs be set to REOPENED if they were already resolved or
closed?

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - filter/source framework/source include/filter include/oox oox/source sw/source

2014-09-17 Thread Nikhil Walvekar

 filter/source/msfilter/escherex.cxx  |   11 ---
 filter/source/msfilter/eschesdo.cxx  |   14 -
 filter/source/msfilter/eschesdo.hxx  |4 +-
 framework/source/services/autorecovery.cxx   |   24 +++-
 include/filter/msfilter/escherex.hxx |8 +++--
 include/oox/export/vmlexport.hxx |2 -
 oox/source/drawingml/graphicshapecontext.cxx |   40 ++-
 oox/source/export/vmlexport.cxx  |4 +-
 sw/source/filter/ww8/docxattributeoutput.cxx |2 -
 9 files changed, 69 insertions(+), 40 deletions(-)

New commits:
commit 9cfd47f878dbb84fe516ce7992277fedcb026b24
Author: Nikhil Walvekar nikhil.walve...@synerzip.com
Date:   Fri Nov 29 14:03:46 2013 +0530

fdo#65836 bnc#621241 Do not compress WMF / EMF file incase of OOXML export

(cherry picked from commit 8fe352be80ff69552f622f3c7a6a6f269912ab71)

Change-Id: Ic498e5703ab48719f998be6da3f245843cc0979d
Reviewed-on: https://gerrit.libreoffice.org/11426
Reviewed-by: Nikhil Walvekar nikhil.walve...@synerzip.com
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 7318de1..cc865ba 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1428,7 +1428,7 @@ sal_Bool 
EscherPropertyContainer::CreateEmbeddedHatchProperties( const ::com::su
 sal_Bool EscherPropertyContainer::CreateGraphicProperties(
 const ::com::sun::star::uno::Reference 
::com::sun::star::beans::XPropertySet   rXPropSet,
 const OUString rSource, const sal_Bool bCreateFillBitmap, const 
sal_Bool bCreateCroppingAttributes,
-const sal_Bool bFillBitmapModeAllowed )
+const sal_Bool bFillBitmapModeAllowed, const sal_Bool bOOxmlExport 
)
 {
 sal_BoolbRetValue = sal_False;
 sal_BoolbCreateFillStyles = sal_False;
@@ -1742,7 +1742,7 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
 SvMemoryStream aMemStrm;
 Rectangle aRect;
 
-if ( aProvider.GetBlibID( aMemStrm, aUniqueId, aRect, 
NULL, pGraphicAttr ) )
+if ( aProvider.GetBlibID( aMemStrm, aUniqueId, aRect, 
NULL, pGraphicAttr, bOOxmlExport ) )
 {
 // grab BLIP from stream and insert directly as 
complex property
 // ownership of stream memory goes to complex property
@@ -4217,7 +4217,8 @@ sal_Bool EscherGraphicProvider::GetPrefSize( const 
sal_uInt32 nBlibId, Size rPr
 }
 
 sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream rPicOutStrm, const 
OString rId,
-const Rectangle /* rBoundRect */, 
const com::sun::star::awt::Rectangle* pVisArea, const GraphicAttr* pGraphicAttr 
)
+const Rectangle /* rBoundRect */, 
const com::sun::star::awt::Rectangle* pVisArea,
+const GraphicAttr* pGraphicAttr, 
const sal_Bool bOOxmlExport )
 {
 sal_uInt32  nBlibId = 0;
 GraphicObject   aGraphicObject( rId );
@@ -4353,7 +4354,9 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream 
rPicOutStrm, const OStrin
 else if ( eBlibType == PEG )
 rPicOutStrm  (sal_uInt16)0x0505;
 }
-if ( ( eBlibType == PEG ) || ( eBlibType == PNG ) )
+// #69607 do not compress WMF files if we are in OOXML export
+if ( ( eBlibType == PEG ) || ( eBlibType == PNG ) ||
+( ( ( eBlibType == WMF ) || ( eBlibType == EMF ) )  
bOOxmlExport ) )
 {
 nExtra = 17;
 p_EscherBlibEntry-mnSizeExtra = nExtra + 8;
diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index 0e20dfb..cbf457f 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -173,7 +173,7 @@ void ImplEESdrWriter::MapRect(ImplEESdrObject /* rObj */ )
 
 sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject rObj,
 EscherSolverContainer rSolverContainer,
-ImplEESdrPageType ePageType )
+ImplEESdrPageType ePageType, const sal_Bool 
bOOxmlExport )
 {
 sal_uInt32 nShapeID = 0;
 sal_uInt16 nShapeType = 0;
@@ -209,7 +209,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( 
ImplEESdrObject rObj,
 ImplEESdrObject aObj( *this, *(Reference XShape *)
 xXIndexAccess-getByIndex( n ).getValue() 
);
 if( aObj.IsValid() )
-ImplWriteShape( aObj, rSolverContainer, ePageType );
+ImplWriteShape( aObj, rSolverContainer, ePageType, 
bOOxmlExport );

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

2014-09-17 Thread Miklos Vajna

 writerfilter/source/ooxml/model.xml |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit c59bb8162fa13d4ae064a564136d5d7bd8f4a1e1
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Sep 17 13:01:11 2014 +0200

Unused file attributes

Change-Id: I564bf16b0c8a6c12d43cf2e38b4ab07dfc96dfc5

diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index a3406b2..a302a0c 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -60,7 +60,7 @@
   token tokenid=ooxml:footerl/
   token tokenid=ooxml:footerr/
   token tokenid=ooxml:footerf/
-  namespace name=dml-stylesheet file=dml-stylesheet.rng
+  namespace name=dml-stylesheet
 start name=theme/
 start name=themeOverride/
 start name=themeManager/
@@ -213,7 +213,7 @@
   element name=hlinkClick tokenid=ooxml:hlinkClick_hlinkClick/
 /resource
   /namespace
-  namespace name=dml-styleDefaults file=dml-styleDefaults
+  namespace name=dml-styleDefaults
 grammar xmlns=http://relaxng.org/ns/structure/1.0; 
ns=http://schemas.openxmlformats.org/drawingml/2006/main;
   !-- ISO RELAX NG Schema --
   include href=dml-shapeProperties.rng/
@@ -1013,7 +1013,7 @@
   element name=extLst tokenid=ooxml:CT_BaseStyles_extLst/
 /resource
   /namespace
-  namespace name=dml-textCharacter file=dml-textCharacter.rng
+  namespace name=dml-textCharacter
 grammar xmlns=http://relaxng.org/ns/structure/1.0; 
ns=http://schemas.openxmlformats.org/drawingml/2006/main;
   !-- ISO RELAX NG Schema --
   include href=dml-shapeEffects.rng/
@@ -2612,7 +2612,7 @@
   attribute name=bwMode tokenid=ooxml:CT_ShapeProperties_bwMode/
 /resource
   /namespace
-  namespace name=dml-baseTypes file=dml-baseTypes
+  namespace name=dml-baseTypes
 grammar xmlns=http://relaxng.org/ns/structure/1.0; 
ns=http://schemas.openxmlformats.org/drawingml/2006/main;
   !-- ISO RELAX NG Schema --
   include href=shared-relationshipReference.rng/
@@ -4112,7 +4112,7 @@
   element name=sizeRelV tokenid=ooxml:sizeRelV_sizeRelV/
 /resource
   /namespace
-  namespace name=w14 file=w14.rng
+  namespace name=w14
 start name=glow/
 start name=shadow/
 start name=reflection/
@@ -5346,7 +5346,7 @@
   element name=cntxtAlts tokenid=ooxml:cntxtAlts_cntxtAlts/
 /resource
   /namespace
-  namespace name=a14 file=a14.rng
+  namespace name=a14
 grammar xmlns=http://relaxng.org/ns/structure/1.0; 
ns=http://schemas.microsoft.com/office/drawingml/2010/main;
   !-- Simple types --
   define name=ST_ArtisticEffectParam10
@@ -7159,7 +7159,7 @@
   element name=anchor tokenid=ooxml:anchor_anchor/
 /resource
   /namespace
-  namespace name=sml-customXmlMappings file=sml-customXmlMappings-rng
+  namespace name=sml-customXmlMappings
 start name=schemaLibrary/
 grammar xmlns=http://relaxng.org/ns/structure/1.0; 
ns=http://schemas.openxmlformats.org/schemaLibrary/2006/main;
   !-- ISO RELAX NG Schema --
@@ -8291,7 +8291,7 @@
   /define
 /grammar
   /namespace
-  namespace name=dml-chartDrawing file=dml-chartDrawing.rng
+  namespace name=dml-chartDrawing
 start name=pic/
 grammar xmlns=http://relaxng.org/ns/structure/1.0; 
ns=http://schemas.openxmlformats.org/drawingml/2006/picture;
   !-- ISO RELAX NG Schema --
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: enable-dbgutil

Hi nicholas,

On Tuesday, 2014-09-16 09:29:01 -0400, nicholas ferguson wrote:

 I am trying to escape having to untar all of the 3rd parties and see which
 ones are missing win32 debug libs and dlls.
 
  
 
 On first pass of building Libreoffice with:
 
 --enable-dbgutil.
 
  
 
 build complained that 
 
 ExternalPackage_icu.mk:24 ...file icudtd53.dll does not exist in the
 tarball.

As has already been pointed out in the other mail thread you started,
the icudt*.dll was moved from external/icu/ExternalPackage_icu.mk to
external/icu/ExternalPackage_icu_ure.mk already in July.

 So reading configure help.  I can set
 
 --with-system-icu and do a debug build there.

You can safely assume that almost none of the --with-system-... options
will work on Windows simply because the Windows system does not provide
any of those libraries.

Plus, if you change configure options, especially with --enable-dbgutil,
you usually need to  make clean  make  to force a clean build. In fact
the missing icudtd53.dll may be a result of such mixed build because in
a non-dbgutil build it is icudt53.dll instead.

 A git clone of Libreoffice from trunk.

Git has no notion of trunk, you probably mean the master branch, but
apparently you're trying to build a quite old snapshot.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

Statement

2014-09-17 Thread William Bonnet


Hi,

all my current and past contributions made to the LibreOffice project
may be licensed under the MPLv2/LGPLv3+ dual license.

Until further notice, all my future contributions to the LibreOffice
project are available under the MPLv2/LGPLv3+ dual license.

Best regards,

--
Williamhttp://www.wbonnet.net

http://france.debian.net Association Debian France
http://www.opencsw.org   Community SoftWare for Solaris

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

QA Meeting Minutes - 2014-09-10

2014-09-17 Thread Robinson Tryon

Hi all,

A big thanks to everyone who showed up for our QA meeting today!
Please find the minutes from our the meeting below:
https://wiki.documentfoundation.org/QA/Meetings/2014/September_10#IRC_Minutes

Our next meeting will be in two weeks, at the same time:
https://wiki.documentfoundation.org/QA/Meetings/2014/September_24

I hope to see all of you there!

Best,
--R

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: getting help with Bug 71248 - Excel VBA: ActiveDocument is not tracking currently selected document

2014-09-17 Thread Noel Power

On 09/09/14 15:55, Justin Luth wrote:
 Are sc/source/ui/vba/vbaapplications.cxx and
 vbahelper/source/vbahelper/vbahelper.cxx ONLY used for MS VBA
 compatibility, or does it also affect StarBasic etc?
it only affects MS VBA compatability

 I have identified that the vbahelper function getCurrentDoc() is
 broken, causing bug 71248, and suggested a band-aid solution for it in
 the comments.  However, I don't know the larger implications of
 replacing getCurrentDoc with getThisExcelDoc.  In practice, THIS and
 CURRENT are likely the same thing
no, 'THIS' refers to the document running the macro and 'CURRENT' is the
'active' document. E.g. if a macro in foo.xls opens existing ba.xls,
'THIS' refers to foo.xls and CURRENT refers to ba.xls (after the
document is raised and opened and is still on top)
 , but perhaps the current implementation is necessary and working for
 someone...

 I'm still going to try to figure out how to properly fix
 getCurrentDoc but so far I don't really understand what it is doing.
I haven't looked at that code in a long time so feel free to dive in
there, iirc basically 'THIS' is tracked in the uno context (VBA has a
custom uno context), CURRENT should be accessible as a UNO global
variable inserted in to 'application' StarBasic. It sounds like somehow
somewhere getCurrentDoc either is no longer searching for the correct
variable, or its no longer getting updated (used to be updated somewhere
in sfx2/.../objxstor.cxx (try searching for 'ThisComponent', it's bound
to be handled somewhere close to that)
There used to be some confusing (but necessary) indirection to handling
this e.g. because Libreoffice is a single application (and VBA support
was trying to support both Word  Excel) the code in objxstor.cxx needs
to find out which variable in StartBasic to update, in the case of a
Word document it would need to update StarBasic variable named
'ThisWordDoc'  for Excel 'ThisExcelDoc' variable (both can exist
simulateously if multiple documents xls/doc are open).  That is my
recollection how this used to work, it is possible imports from AOO code
have trampled/changed this possibly in an incompatible way
 If someone who actually knows how to program and submit patches could
 take over from this point, that would be great.

 suggested Band-aid fix:
 uno::Reference frame::XModel   getCurrentExcelDoc( const
 uno::Reference uno::XComponentContext  xContext ) throw
 (uno::RuntimeException)
 {
 return getThisExcelDoc( xContext );
 }
I think this would be a bad idea, getCurrentExcelDoc needs fixing to
return the topmost open Excel document
 Thanks,
 Justin
 https://bugs.freedesktop.org/show_bug.cgi?id=71248

thanks,

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

insert a base64 encoded png into odt using python uno

2014-09-17 Thread Marco Lechner - FOSSGIS e.V.

Hi,

can anybody point me to an example to insert a base64 encoded
picture/graphic (PNG, JPEG) into a writer document using pyuno. How
could this be donde? Do I have to decode the base64 string into a file
and store it in the filesystem?

Marco

-- 
+
Verpasst?
FOSSGIS 2014, Die Konferenz für Open Source GIS mit OpenData und OpenStreetMap!
Alle Vorträge nachschauen: http://www.youtube.com/fossgis
+
FOSSGIS e.V.

die unabhängige Hilfe bei freier GIS-Software und freien Geodaten
http://www.fossgis.de
+

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

Aw: LibreOffice Digest, Vol 49, Issue 14

2014-09-17 Thread philipp gallaschik

I dont know if this is the right place to write this but:
Is it possible to create a wiktionary extension for openoffice? (Optimally an extension where you could add missing words directly from openoffice) 
Greetings Philipp



Gesendet:Sonntag, 14. September 2014 um 21:00 Uhr
Von:libreoffice-requ...@lists.freedesktop.org
An:libreoffice@lists.freedesktop.org

Betreff:LibreOffice Digest, Vol 49, Issue 14


Send LibreOffice mailing list submissions to
	libreoffice@lists.freedesktop.org

To subscribe or unsubscribe via the World Wide Web, visit
	http://lists.freedesktop.org/mailman/listinfo/libreoffice
or, via email, send a message with subject or body help to
	libreoffice-requ...@lists.freedesktop.org

You can reach the person managing the list at
	libreoffice-ow...@lists.freedesktop.org

When replying, please edit your Subject line so it is more specific
than Re: Contents of LibreOffice digest...


Todays Topics:

   1. [Bug 75025] LibreOffice 4.3 most annoying bugs
  (bugzilla-dae...@freedesktop.org)
   2. LibreOffice Gerrit News for core on 2014-09-14
  (ger...@libreoffice.org)
   3. LibreOffice Gerrit News for submodules on 2014-09-14
  (ger...@libreoffice.org)
   4. About recent commits for C++11 building (julien2412)
   5. [ABANDONNED] Re: About recent commits for C++11 building
  (julien2412)
   6. Re: [ABANDONNED] Re: About recent commits for C++11 building
  (Noel Grandin)
   7. Re: [ABANDONNED] Re: About recent commits for C++11 building
  (Julien Nabet)
   8. [Bug 65675] LibreOffice 4.2 most annoying bugs
  (bugzilla-dae...@freedesktop.org)
   9. [Bug 79641] LibreOffice 4.4 most annoying bugs
  (bugzilla-dae...@freedesktop.org)
  10. [Bug 79641] LibreOffice 4.4 most annoying bugs
  (bugzilla-dae...@freedesktop.org)
  11. [Bug 35862] Increase font and decrease font could work
  even if the selection contains differing font sizes
  (bugzilla-dae...@freedesktop.org)


--

Message: 1
Date: Sat, 13 Sep 2014 19:47:53 +
From: bugzilla-dae...@freedesktop.org
To: libreoffice@lists.freedesktop.org
Subject: [Bug 75025] LibreOffice 4.3 most annoying bugs
Message-ID: bug-75025-19970-wbw1nro...@http.bugs.freedesktop.org/
Content-Type: text/plain; charset=utf-8

https://bugs.freedesktop.org/show_bug.cgi?id=75025

Bug 75025 depends on bug 80939, which changed state.

Bug 80939 Summary: Mac OS X: LibreOffice windows are pixelated on Retina displays
https://bugs.freedesktop.org/show_bug.cgi?id=80939

   WhatRemoved Added

 StatusNEW RESOLVED
 Resolution--- FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-- next part --
An HTML attachment was scrubbed...
URL: http://lists.freedesktop.org/archives/libreoffice/attachments/20140913/1b581535/attachment-0001.html

--

Message: 2
Date: Sun, 14 Sep 2014 06:00:01 -
From: ger...@libreoffice.org
To: libreoffice@lists.freedesktop.org
Cc: q...@fr.libreoffice.org
Subject: LibreOffice Gerrit News for core on 2014-09-14
Message-ID: 20140914060348.9731a4c0...@gerrit.libreoffice.org
Content-Type: text/plain; charset=utf-8

Moin!

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

 First time contributors doing great things! 
+ Updated example paths in wizards/com/sun/star/wizards/README
  in https://gerrit.libreoffice.org/11440 from Ryan McCoskrie
  about module wizards
+ scripting: Uncaught Exception
  in https://gerrit.libreoffice.org/11439 from Robert Antoni Buj i Gelonch
  about module scripting
+ scripting: replace StringBuffer with StringBuilder method
  in https://gerrit.libreoffice.org/11436 from Robert Antoni Buj i Gelonch
  about module scripting
+ Changed some options from picture/graphics to image
  in https://gerrit.libreoffice.org/11429 from Lim Jing
  about module svx
 End of freshness 

+ cppcheck: unpreciseMathCall
  in https://gerrit.libreoffice.org/11434 from Julien Nabet
  about module extensions, sc
+ fdo#75256 Correct the alignment of some icons. New icons for quit and avm
  in https://gerrit.libreoffice.org/11345 from Matthias Freund
  about module icon-themes
+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/11413 from Takeshi Abe
  about module sd


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

+ scripting: encode(String) in URLEncoder has been deprecated
  in https://gerrit.libreoffice.org/11438 from Robert Antoni Buj i Gelonch
+ scripting: [deprecation] show() in Window has been deprecated
  in https://gerrit.libreoffice.org/11437 from Robert Antoni Buj i Gelonch
+ Add proper help for with-build-platform-configure-options

VALS semester of code

2014-09-17 Thread narayan

Maybe this is an interesting project for some of the LibreOffice developers
to join?

http://semesterofcode.com/



--
View this message in context: 
http://nabble.documentfoundation.org/VALS-semester-of-code-tp4122185.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LiMux student kick-off

2014-09-17 Thread Ptyl Dragon

This week we (CloudOn) did a kick off for the openGL project,
mainly reviewing OpenGL, and what we know of the requirements for the
project.

My conclusions so far (feel free to correct them. i'm an OpenGL noob):

1. We should use OpenGL 3.0 ES API - i.e use the 3.0 ES API subset, even
when using non OpenGL ES (e.g on linux, osx, windows)
2. Use cases:

 a. Tiled rendering (i.e mobile) -

 i. OpenGL renders to a memory buffer. It would be best if the tile
memory would have been this memory buffer, but if not, then this memory
buffer is later copied to the tile OpenGL context.
 ii. Context creation is handled by the Mobile app
 iii. this is the simple case

b. Window (i.e Desktop) -

i. LibreOffice's SalInstance should create an OpenGL window, and
provide the openGL context (enabling the option can be denoted via a
compilation flag). This needs to be done per OS, though possibly, can be
simplified via abstraction frameworks such as SDL, or what have you.
Possibly, this task is a good candidate for mentoring
ii. the rendering is done via 3 buffers: 2 buffers (front and back)
for de-interlacing, and 1 back layer buffer for actual rendering.
Additionally, for stuff like copy area, we might require temp buffers for
bit blit, and resending these bitmaps back to the GPU. Would be happy to
find a better solution, as it sounds like copying the same bitmap 4 times...
iii. this is the complex case, and as such, arguably, we should
begin the work on tiled rendering, then apply the solution on the window /
Desktop case, in a later iteration.

3. Shaders - For simplicity and performance (i.e to not compile shaders
again and again), we should use one costant naive Vertex shader all the
time, and one constant Fragment shader, which uses if statements to
differentiate between 2 states - solid color, and texture. AFAIK, VCL does
not use any other more complex rendering. Note also, that if statements in
GLSL are optimized on the GPU, so using them should not cost performance.

4. Text - would be rendered using the current software implementation, and
rendered via openGL, as bitmaps.

Considering these, action items are (VERY roughly):

A. add build flags if necessary
B. decide whether to approach tiled rendering first. If so, solve context
creation on mobile apps. If not, implement the OpenGL context creation for
SalInstances on all OSes
C. Write the shader
D. Replace the VCL primitive drawing functions one by one, with OpenGL
counterparts
E. Handle the copy area case
F. Handle the Bitmap case
G. Handle the text case

if agreed upon, we could distribute the action items, and begin the actual
work

On Wed, Sep 17, 2014 at 1:10 PM, Michael Meeks michael.me...@collabora.com
wrote:


 On Wed, 2014-09-17 at 11:47 +0200, Jan-Marek Glogowski wrote:
  AFAIK Miklos was Michaels suggestion for the mentoring - can't remember.

 Matus is the XFastParser expert =) I guess it'd be nice to have a
 small
 XFastParser unit test as well (as some sort of entry-level easy-hack
 there).

  Probably we should simply add a Wiki page for easier coordination?

 Sure - why not =)

  Comments please

 All sounds sensible, my hope is that we can mentor interactively
 and
 superimpose the two-weekly what got done meetings =)

 Anyhow - exciting tasks !

 ATB,

 Michael.

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




-- 

[image: appicon.png]



*Ptyl Dragon*

Twitter http://www.twitter.com/cloudoninc | LinkedIn
http://www.linkedin.com/company/cloudon | Facebook
http://www.facebook.com/cloudoninc | Blog http://site.cloudon.com/blog
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Should we use boost::math::log1p/expm1 instead of rtl_math_log1p/expm1 ?

2014-09-17 Thread Andrew Douglas Pitonyak


On 09/15/2014 03:38 PM, julien2412 wrote:

Hello,

Following
http://cgit.freedesktop.org/libreoffice/core/commit/?id=a3ad01dc1e07da21182077bd899094fd73f57714,
should  it worth it to replace rtl_math_log1p/rtl_math_expm1 and related by
boost::math::log1p/expm1 ?
Or should we let the code as it is right now?

Since we already use Boost, I thought it could be interesting to use it even
more, waiting by a even more C++11 compatibility (since this standard
includes these 2 functions).

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Should-we-use-boost-math-log1p-expm1-instead-of-rtl-math-log1p-expm1-tp4122334.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice



Julien, I am curious if you have done any testing. On a whim, I ran the 
following on my 64-bit Fedora machine using g++.


#include boost/math/special_functions/log1p.hpp
#include boost/math/special_functions/expm1.hpp

#include iostream
#include math.h

int main()
{
  double min_x = -0.2;
  double max_x = 0.2;
  long max_its = 1000;
  double delta_x = (max_x - min_x) / (max_its - 1);
  double x;
  double d;
  long i;
  for (i=0; imax_its; ++i) {
x = min_x + i * delta_x;
d = fabs(log1p(x) - boost::math::log1p(x));
if (d  0.0) {
  std::cout  1. diff(  x  ) =   d  std::endl;
}
  }

  for (i=0; imax_its; ++i) {
x = min_x + i * delta_x;
d = fabs(expm1(x) - boost::math::expm1(x));
if (d  0.0) {
  std::cout  2. diff(  x  ) =   d  std::endl;
}
  }
  std::cout  Finished!  std::endl;
  return 0;
}

No differences were found in this little test. Then again, on Fedora, 
Boost may be configured to use the built-in implementation, I don't 
really know. I did not check our source code, but, it might reduce the 
LO code complexity a little bit, that might be a gain.


--
Andrew Pitonyak
My Macro Document: http://www.pitonyak.org/AndrewMacro.odt
Info:  http://www.pitonyak.org/oo.php

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

Re: [libreoffice] allow passing FilterOptions via cli

2014-09-17 Thread Tomas Hlavaty

Hi all,

would it be possible to cherry-pick
http://cgit.freedesktop.org/libreoffice/core/commit/?id=45ba4d79d968f81f74ef0c4588fd15b1ce91153f
to the 4.3.2 release? It is currently commited towards 4.4 (scheduled
for 2/2015) but as this is an old bug and 4.3.2 is called bugfix
release, I wonder if it was be acceptable?

Thank you,

Tomas

On 04/06/14 14:28, Stephan Bergmann wrote:
On 06/04/2014 02:16 PM, Tomas Hlavaty wrote:
From your remark
https://bugs.freedesktop.org/show_bug.cgi?id=36313#c17 I understand,
that it does not seem very user friendly. However, the patch at least
makes it possible to achieve the desired behaviour, which was not
possible previously. Maybe the remaining problem should be seen as how
to make the CVS filter options more user friendly? I don't have an
answer to that, unfortunatelly.

Yeah; maybe leave it to one of the people who reported to that issue
to decide whether to mark it as resolved.

I found another bug report
https://bugs.freedesktop.org/show_bug.cgi?id=47892 which explicitly
asks for FilterOptions at least for --convert-to so I should have
probably addressed this, but I found it later.

Should I mark https://bugs.freedesktop.org/show_bug.cgi?id=47892 as
resolved or leave it to QA people to handle that?

Please do mark that one as resolved.

Stephan
___
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

Correction == Building a debug version of calc to be used in Visual Studio 2010

Goal:  Visual Studio 2010, where I can fully debug calc with an ability to
compile individual files from library sc, and all of the libraries that are
linked to sc.

 

State of affairs:  via cygwin64, I can build Libreoffice, in a release mode,
with symbols, and open a LibreOffice.sln with 338 projects in Visual Studio
2010.

 

 

Question:

(1)What steps must I do to get autogen.input feature:

-enable-dbgutil 

to work? 

When I use that option, running 'make' always fails.  I suspect because some
link dependencies are getting built in release mode and create a conflict.


Do I need to set specific features in autgen.input that will
support -enable-dbgutil

 

I saw an email that 'make dev-install'  would do what I want..but apparently
that has been deprecated.

 

My dev env:

Cygwin64.  

A git clone of Libreoffice from trunk.

Windows 7, SDK 7.0A, DirectX SDK, MSBuild, Visual Studio 2010 Pro (trial
version)

 

 

 

With these options in autogen.input, my build does finish

--enable-symbols

--enable-pch

--disable-odk

--enable-vlc

--visual-studio=2010

--disable-cve-tests

--with-ant-home=/opt/apache-ant-1.9.2

--with-junit=/opt/junit/share/java/junit-4.4.jar

 

After a good build, I run

make vs2012-ide-integration  ( I edit the file to work with VS2010)

 

And then I can open LibreOffice.sln in visual Studio 2010.

 



 

 

I can't get this optional feature of configure to work

--enable-dbgutil

 

My build fails.  I suspect because many of the lower level librairies get
built in release mode.and create a conflict.

 

 

 

 

 

 

 

 

 

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

Re: [libreoffice-marketing] Re: LibreOffice Weekly News #5 waiting for reviews

2014-09-17 Thread Charles-H. Schulz

I am outside today,
I will comment later or tomorrow. Thanks for the LOWN!

Best,

Charles.

On 13 septembre 2014 11:48:28 CEST, Norbert Thiebaud nthieb...@gmail.com 
wrote:
On Sat, Sep 13, 2014 at 10:38 AM, Sophie gautier.sop...@gmail.com
wrote:
 Hi,
 Le 13/09/2014 10:07, Norbert Thiebaud a écrit :

 [...]


 Yet 7 new contributors to the LibreOffice project! Welcome to
them!
 -
 We welcomed 7 new contributors to the LibreOffice project:

 And I would say ...7 new contributors to the development team, there
are
 new contributors to the project not cited here.

True.. point taken :-)

-- 
To unsubscribe e-mail to: marketing+unsubscr...@global.libreoffice.org
Problems?
http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more:
http://wiki.documentfoundation.org/Netiquette
List archive: http://listarchives.libreoffice.org/global/marketing/
All messages sent to this list will be publicly archived and cannot be
deleted

-- 
Envoyé de mon téléphone avec Kaiten Mail. Excusez la brièveté.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: issue with --enable-dbgutil for Visual Studio on Windows 7 ( solution to this mess)

Hi nicholas,

On Tuesday, 2014-09-16 19:24:15 -0400, nicholas ferguson wrote:

 I found a working solution to an issue, that I posted today, to this list ..
 [...]
 . Nor did I get a quick answer with a solution from this list.  

Do not expect answers within minutes or even not one day on a mailing list.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

RE: enable-dbgutil

I expect a much more erudite answer from a developer at redhat.

To read my email and think oh...I can tell him to eliminate icu from a
build..and that is the only problem reported.  So problem is solved.

That is irritating to read.

-Original Message-
From: Eike Rathke [mailto:er...@redhat.com] 
Sent: Wednesday, September 17, 2014 7:19 AM
To: nicholas ferguson
Cc: libreoffice@lists.freedesktop.org
Subject: Re: enable-dbgutil

Hi nicholas,

On Tuesday, 2014-09-16 09:29:01 -0400, nicholas ferguson wrote:

 I am trying to escape having to untar all of the 3rd parties and see 
 which ones are missing win32 debug libs and dlls.
 
  
 
 On first pass of building Libreoffice with:
 
 --enable-dbgutil.
 
  
 
 build complained that
 
 ExternalPackage_icu.mk:24 ...file icudtd53.dll does not exist in the 
 tarball.

As has already been pointed out in the other mail thread you started, the
icudt*.dll was moved from external/icu/ExternalPackage_icu.mk to
external/icu/ExternalPackage_icu_ure.mk already in July.

 So reading configure help.  I can set
 
 --with-system-icu and do a debug build there.

You can safely assume that almost none of the --with-system-... options will
work on Windows simply because the Windows system does not provide any of
those libraries.

Plus, if you change configure options, especially with --enable-dbgutil, you
usually need to  make clean  make  to force a clean build. In fact the
missing icudtd53.dll may be a result of such mixed build because in a
non-dbgutil build it is icudt53.dll instead.

 A git clone of Libreoffice from trunk.

Git has no notion of trunk, you probably mean the master branch, but
apparently you're trying to build a quite old snapshot.

  Eike

--
LibreOffice Calc developer. Number formatter stricken i18n
transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack
---BeginMessage---
I found a working solution to an issue, that I posted today, to this list ..
About using an option feature in autogen.input  

-enable-dgbutil

on a windows platform.  My builds were failing. An initial error msg was
that  build failed because it could NOT find debug libs for icu .  My
question today to this list was what do I need to correct ? And get good
builds.

 

A solution I worked out today, corrected issues I was having with building
LibreOffice with  -enable-dbgutil, on a Windows platform.  I verified that
correct debug lib files even for icu, were being generated.  I looked into
the /workdir/UnpackedTarBall/icu/source/lib  and the debug versions of its
range of libs had been built by this LibreOffice build system.  

 

My methodology

. I searched the list.freedesktop.org archives for problems with
--enable-dbgutil on Windows and 

. I did not find an expected series of posts answering previous
questions on how to make it work on windows.  .Really.. 

. Nor did I find a series of post to this issue that answered with
we are NOT having any issues building LibreOffice with option feature
'-enable-dbgutil' on windows.  

. Nor did I get a quick answer with a solution from this list.  

. Started a review of LibreOffice's  makefile design, and
Library.mk file interdependencies to discover why I was having this
problem. 

 

I tossed that investigation aside thinking that that route had been poured
over by LibreOffice experts; and took another look...

 

I didn't understand why I had to clean up this mess, with an open source
product that has been on the market, for years.. 

 

Boost libs that were built with LibreOffice's makefile system were not
conforming to boost lib naming conventions.  Checking, LibreOffice was
working with Boost  v 1 55 0.  

 

So I decided to independently build Boost v 1_55_0, all of it.  This insured
that boost libs would have a correct naming convention.  That took several
hours.  and then referred to a lib path in autogen.input. 

--with-boost-libdir=/home/lo/master/issues/boost_1_55_0/stage/lib   

 

. Autogen worked with that option feature  -with-boost-libdir, as
per its explicit design features spelled out in configure.

 

. autogen.input had this option feature:

--enable-dbgutil

 

 

I will post instructions at
https://github.com/nicholasferguson/LibreOffice-Inx-for-VS2010-VS2012-dev-en
v

 

Regards

Nicholas

 

 

From: nicholas ferguson [mailto:nicholasfergu...@wingarch.com] 
Sent: Tuesday, September 16, 2014 9:29 AM
To: 'libreoffice@lists.freedesktop.org'
Subject: enable-dbgutil

 

I am trying to escape having to untar all of the 3rd parties and see which
ones are missing win32 debug libs and dlls.

 

On first pass of building Libreoffice with:

--enable-dbgutil.

 

build complained that 

ExternalPackage_icu.mk:24 ...file icudtd53.dll does not exist in the
tarball.

 

So reading configure help.  I can set

--with-system-icu and do a debug build there.

 

My

Re: Correction == Building a debug version of calc to be used in Visual Studio 2010

Hi nicholas,

On Tuesday, 2014-09-16 07:16:57 -0400, nicholas ferguson wrote:

 Goal:  Visual Studio 2010, where I can fully debug calc with an ability to
 compile individual files from library sc, and all of the libraries that are
 linked to sc.

 (1)What steps must I do to get autogen.input feature:
 
 -enable-dbgutil 
 
 to work? 

Note that to get debug symbols you do not need --enable-dbgutil, which
is a binary incompatible build option that requires (!) ro rebuild the
entire suite from scratch. You will get additional output and debug
facilities from dbgutil builds so it is fine to have, but it is also
possible to just build selected modules with debug information. Please
read
https://wiki.documentfoundation.org/Development/How_to_debug#Debugging_options

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source

2014-09-17 Thread Matúš Kukan

 oox/source/drawingml/graphicshapecontext.cxx |   40 ++-
 1 file changed, 27 insertions(+), 13 deletions(-)

New commits:
commit 5847fbef3052b2606a931860ee8cd40963bcd39a
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Fri Sep 12 16:08:34 2014 +0200

bnc#591147: OOXML import: Import video file too.

Change-Id: Ie9b6c5ff866269e5d7a26d025cb1c0d884ff1134
(cherry picked from commit b7006f3c2f8f71f4d4721c6e5cdc122628c756f0)
Reviewed-on: https://gerrit.libreoffice.org/11469
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/oox/source/drawingml/graphicshapecontext.cxx 
b/oox/source/drawingml/graphicshapecontext.cxx
index db04d5c..4b7905e 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -47,6 +47,22 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::oox::core;
 
+static OUString lcl_CopyToTempFile(const OUString rStream, const 
oox::core::XmlFilterBase rFilter)
+{
+if (rStream.isEmpty())
+return OUString();
+
+Reference XInputStream  xInStrm( rFilter.openInputStream(rStream), 
UNO_SET_THROW );
+Reference XTempFile  xTempFile( 
TempFile::create(rFilter.getComponentContext()) );
+Reference XOutputStream  xOutStrm( xTempFile-getOutputStream(), 
UNO_SET_THROW );
+oox::BinaryXOutputStream aOutStrm( xOutStrm, false );
+oox::BinaryXInputStream aInStrm( xInStrm, false );
+aInStrm.copyToStream( aOutStrm );
+
+xTempFile-setRemoveFile( false );
+return xTempFile-getUri();
+}
+
 namespace oox {
 namespace drawingml {
 
@@ -70,19 +86,17 @@ ContextHandlerRef GraphicShapeContext::onCreateContext( 
sal_Int32 aElementToken,
 case XML_wavAudioFile:
 {
 getEmbeddedWAVAudioFile( getRelations(), 
rAttribs.getFastAttributeList(), mpShapePtr-getGraphicProperties().maAudio );
-if( !mpShapePtr-getGraphicProperties().maAudio.msEmbed.isEmpty() )
-{
-Reference XComponentContext  xContext = 
comphelper::getProcessComponentContext();
-Reference XInputStream  xInStrm( 
getFilter().openInputStream( mpShapePtr-getGraphicProperties().maAudio.msEmbed 
), UNO_SET_THROW );
-Reference XTempFile  xTempFile( TempFile::create(xContext) );
-Reference XOutputStream  xOutStrm( 
xTempFile-getOutputStream(), UNO_SET_THROW );
-BinaryXOutputStream aOutStrm( xOutStrm, false );
-BinaryXInputStream aInStrm( xInStrm, false );
-aInStrm.copyToStream( aOutStrm );
-
-xTempFile-setRemoveFile( false );
-mpShapePtr-getGraphicProperties().maAudio.msEmbed = 
xTempFile-getUri();
-}
+mpShapePtr-getGraphicProperties().maAudio.msEmbed =
+lcl_CopyToTempFile( 
mpShapePtr-getGraphicProperties().maAudio.msEmbed, getFilter() );
+}
+break;
+case XML_audioFile:
+case XML_videoFile:
+{
+OUString rPath = getRelations().getFragmentPathFromRelId(
+rAttribs.getString(R_TOKEN(link)).get() );
+mpShapePtr-getGraphicProperties().maAudio.msEmbed =
+lcl_CopyToTempFile( rPath, getFilter() );
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: enable-dbgutil

Hi nicholas,

On Wednesday, 2014-09-17 07:46:19 -0400, nicholas ferguson wrote:

 I expect a much more erudite answer from a developer at redhat.
 
 To read my email and think oh...I can tell him to eliminate icu from a
 build..and that is the only problem reported.  So problem is solved.
 
 That is irritating to read.

That is not what I said. I told you you need to build ICU and not use
with-system and you need to rebuild everything from scratch if you
enable dbgutil.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - filter/source

2014-09-17 Thread Björgvin Ragnarsson

 filter/source/graphicfilter/ieps/ieps.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7493c458780cce40f1b564b719c4445b8920f259
Author: BjÃ¶rgvin Ragnarsson nifgr...@gmail.com
Date:   Thu Sep 4 00:43:04 2014 +0300

fdo#81592 Use 24-bit color depth, not 256 colors when converting an 
EPS-file.

This regression was introduced in f5c3f5601a3739dead635f9abc446951b385018f.

Change-Id: Ica48732398cd5d225b433b177ff6e6fff649e732
(cherry picked from commit 0791335cf007e04de25e03c0a6e0aa53fa66016a)
Reviewed-on: https://gerrit.libreoffice.org/11465
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx 
b/filter/source/graphicfilter/ieps/ieps.cxx
index c361bc2c..945ae5d 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -347,7 +347,7 @@ static bool RenderAsBMPThroughGS(const sal_uInt8* pBuf, 
sal_uInt32 nBytesRead,
 OUString arg6(-dTextAlphaBits=4);
 OUString arg7(-dGraphicsAlphaBits=4);
 OUString arg8(-r300x300);
-OUString arg9(-sDEVICE=bmp256);
+OUString arg9(-sDEVICE=bmp16m);
 OUString arg10(-sOutputFile=-);
 OUString arg11(-);
 rtl_uString *args[] =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Reverts notification?

Hi Eike,

Eike Rathke píše v St 17. 09. 2014 v 12:50 +0200:

 Also, if bug IDs are present in the revert summary, shouldn't the
 corresponding bugs be set to REOPENED if they were already resolved or
 closed?

I'd prefer not to do it, similarly as we don't close the bugs
automagically when the commit has the bug id.

Sometimes there are partial reverts, sometimes there are 'Related'
commits that can be not crucial for the bug itself.

The comment will go to the bug, so I'd prefer to leave the decision
whether to re-open or not up to the QA guys, probably?

All the best,
Kendy

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

RE: enable-dbgutil

You obviously have never built Libreoffice under a window, using
--enable-dbgutil.  So to tell me to do extra work...on your hypothesis.
Don't.  I have tons of work then to prove our your hypothesis. And I think
this rule should apply to any answers you give on Libreoffice.

I expect a Redhat developer, world experts in Linux...not to have me chase
their rabbits.

nick

-Original Message-
From: Eike Rathke [mailto:er...@redhat.com] 
Sent: Wednesday, September 17, 2014 8:04 AM
To: nicholas ferguson
Cc: libreoffice@lists.freedesktop.org
Subject: Re: enable-dbgutil

Hi nicholas,

On Wednesday, 2014-09-17 07:46:19 -0400, nicholas ferguson wrote:

 I expect a much more erudite answer from a developer at redhat.
 
 To read my email and think oh...I can tell him to eliminate icu from a 
 build..and that is the only problem reported.  So problem is solved.
 
 That is irritating to read.

That is not what I said. I told you you need to build ICU and not use
with-system and you need to rebuild everything from scratch if you enable
dbgutil.

  Eike

--
LibreOffice Calc developer. Number formatter stricken i18n
transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

RE: enable-dbgutil

I don't think that telling you..not to provide me with 'guesses' is insulting.

Libreoffice is a huge installation.  Your guesses  can cost me day(s) of 
useless work.  I'm not willin g to chase your guesses.  I am posting questions 
on this list so that an expert can answer me.  Expert with actual experience 
can tell me do a,b,c and problem solved. 

As a redhat developer, you should understand that.

-Original Message-
From: Noel Grandin [mailto:noelgran...@gmail.com] 
Sent: Wednesday, September 17, 2014 8:14 AM
To: nicholas ferguson
Subject: Re: enable-dbgutil

We're generally quite a friendly bunch, but you're not making it very
easy to help you.
You start off by insulting us, and then insult the person trying to help you.

If you need rapid answers, I suggest you start hanging out on the
#libreoffice-dev IRC channel, and give us a little more time -
remember that a lot of us here are pure volunteers, not being paid one
cent for our work.



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

Re: enable-dbgutil

2014-09-17 Thread Norbert Thiebaud

On Wed, Sep 17, 2014 at 7:13 AM, nicholas ferguson
nicholasfergu...@wingarch.com wrote:
 You obviously have never built Libreoffice under a window, using
 --enable-dbgutil.  So to tell me to do extra work...on your hypothesis.
 Don't.  I have tons of work then to prove our your hypothesis. And I think
 this rule should apply to any answers you give on Libreoffice.

 I expect a Redhat developer, world experts in Linux...not to have me chase
 their rabbits.

What make you think you can _expect_ anything at all.

As an expert Windows dev you should know that there is no such thing
as 'system icu' on windows...
In anycase, you asked a question, it has been answered graciously.. if
you do not like the answer, fine, just ignore it and fidn a better one
for yourself.. but do _not_ bite the hand that nicely tried to help
you

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

RE: enable-dbgutil

I disagree.  Answers have to be responsible.
I got one answer, and the person said, I don't have any experience with 
enable-dbgutil on windows..but I advise you not to use VS 2010.  That is a 
responsible answer.

So tell me you don't have any experience with --enable-dbgutil on windows.   
And then give me some pointers, about other issues of LibreOffice.. .

But don't answer an email.. where the intent of the msgs is that if I follow 
your suggestions..I 'might' get a build

-Original Message-
From: Norbert Thiebaud [mailto:nthieb...@gmail.com] 
Sent: Wednesday, September 17, 2014 8:19 AM
To: nicholas ferguson
Cc: Eike Rathke; libreoffice
Subject: Re: enable-dbgutil

On Wed, Sep 17, 2014 at 7:13 AM, nicholas ferguson 
nicholasfergu...@wingarch.com wrote:
 You obviously have never built Libreoffice under a window, using 
 --enable-dbgutil.  So to tell me to do extra work...on your hypothesis.
 Don't.  I have tons of work then to prove our your hypothesis. And I 
 think this rule should apply to any answers you give on Libreoffice.

 I expect a Redhat developer, world experts in Linux...not to have me 
 chase their rabbits.

What make you think you can _expect_ anything at all.

As an expert Windows dev you should know that there is no such thing as 'system 
icu' on windows...
In anycase, you asked a question, it has been answered graciously.. if you do 
not like the answer, fine, just ignore it and fidn a better one for yourself.. 
but do _not_ bite the hand that nicely tried to help you

Norbert



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

Re: enable-dbgutil

Well for starters, I (Noel Grandin) am not a RedHat developer. I work
on this on my own time.
I help out on this project, including sometimes dispensing advice.
For which I do not charge a single dime.

If you need accurate rapid answers from a full-time LibreOffice
developer, then you should expect to pay for it, and what you need is
a professional support contract, which various companies (see list
here http://www.documentfoundation.org/supporters/) will be happy to
sell you.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: enable-dbgutil

Jan Holesovsky píše v St 17. 09. 2014 v 14:39 +0200:

 I suggest we stop with thread and start anew - is that possible?

stop this thread is what I meant FWIW.


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

RE: enable-dbgutil

-Original Message-
From: Jan Holesovsky [mailto:ke...@collabora.com] 
Sent: Wednesday, September 17, 2014 8:40 AM
To: nicholas ferguson
Cc: 'Norbert Thiebaud'; 'Eike Rathke'; 'libreoffice'
Subject: Re: enable-dbgutil

Hi Nicholas,

I suggest we stop with thread and start anew - is that possible?

I am sorry that you are having trouble building with --enable-dbgutil on 
Windows.  I used to maintain a tinderbox that had this setting on, to avoid 
bitrot, but then switched that to --enable-debug (so that it can be tested by 
wider user base), so I don't think we have a tinderbox that would force 
buildability of LibreOffice on Windows with --enable-dbgutil; if you need that, 
you are on your own.

Having said that; why do you need --enable-dbgutil specifically?  Where did you 
get the suggestion to use --enable-dbgutil?  For normal development, 
--enable-debug should be enough, and also it will give you faster builds + 
runtime.

My suggestion would be to change --enable-dbgutil in your autogen.input to 
--enable-debug, then do make clean, and make.

FWIW, master has been broken on Windows in the morning, but since the commit

http://cgit.freedesktop.org/libreoffice/core/commit/?id=cc6c01632dda28db0da8d007f2fcac63f1c85e38

it should be OK again (or at least is for me with MSVC 2012).

All the best,
Kendy

---BeginMessage---
I found a working solution to an issue, that I posted today, to this list ..
About using an option feature in autogen.input  

-enable-dgbutil

on a windows platform.  My builds were failing. An initial error msg was
that  build failed because it could NOT find debug libs for icu .  My
question today to this list was what do I need to correct ? And get good
builds.

A solution I worked out today, corrected issues I was having with building
LibreOffice with  -enable-dbgutil, on a Windows platform.  I verified that
correct debug lib files even for icu, were being generated.  I looked into
the /workdir/UnpackedTarBall/icu/source/lib  and the debug versions of its
range of libs had been built by this LibreOffice build system.  

My methodology

. I searched the list.freedesktop.org archives for problems with
--enable-dbgutil on Windows and 

. I did not find an expected series of posts answering previous
questions on how to make it work on windows.  .Really.. 

. Nor did I find a series of post to this issue that answered with
we are NOT having any issues building LibreOffice with option feature
'-enable-dbgutil' on windows.  

. Nor did I get a quick answer with a solution from this list.  

. Started a review of LibreOffice's  makefile design, and
Library.mk file interdependencies to discover why I was having this
problem. 

I tossed that investigation aside thinking that that route had been poured
over by LibreOffice experts; and took another look...

I didn't understand why I had to clean up this mess, with an open source
product that has been on the market, for years.. 

Boost libs that were built with LibreOffice's makefile system were not
conforming to boost lib naming conventions.  Checking, LibreOffice was
working with Boost  v 1 55 0.  

So I decided to independently build Boost v 1_55_0, all of it.  This insured
that boost libs would have a correct naming convention.  That took several
hours.  and then referred to a lib path in autogen.input. 

--with-boost-libdir=/home/lo/master/issues/boost_1_55_0/stage/lib   

. Autogen worked with that option feature  -with-boost-libdir, as
per its explicit design features spelled out in configure.

. autogen.input had this option feature:

--enable-dbgutil

I will post instructions at
https://github.com/nicholasferguson/LibreOffice-Inx-for-VS2010-VS2012-dev-en
v

Regards

Nicholas

From: nicholas ferguson [mailto:nicholasfergu...@wingarch.com] 
Sent: Tuesday, September 16, 2014 9:29 AM
To: 'libreoffice@lists.freedesktop.org'
Subject: enable-dbgutil

I am trying to escape having to untar all of the 3rd parties and see which
ones are missing win32 debug libs and dlls.

On first pass of building Libreoffice with:

--enable-dbgutil.

build complained that 

ExternalPackage_icu.mk:24 ...file icudtd53.dll does not exist in the
tarball.

So reading configure help.  I can set

--with-system-icu and do a debug build there.

My question:  Who can send me instructon for how many of these third party
tools have to be built that way?  And what about boost?  Libreoffice names
its boost libraries not in boost naming style  How do I handle that.

My dev environment

Cygwin64.  

A git clone of Libreoffice from trunk.

Windows 7, SDK 7.0A, DirectX SDK, MSBuild, Visual Studio 2010 Pro (trial
version)

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

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

 scp2/source/ooo/common_brand.scp |6 ++
 scp2/source/ooo/ure.scp  |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 21c1e55cd4ac022144b683bd2e611dba904eaf2a
Author: Tor Lillqvist t...@collabora.com
Date:   Sat Sep 13 07:36:33 2014 +0300

Correct the location of the URE unorc in scp2 for OS X

The URE unorc should be in Resources/ure/etc also when constructing an
app bundle from scp2 data.

Change-Id: Id33d20bda0175018b8340c686ae9cd47525cd401

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index ce7bbc5..0551e95 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -45,6 +45,7 @@ Module gid_Module_Root_Brand
 gid_Brand_Dir_Share_Uno_Packages,
 gid_Brand_Dir_Share_Uno_Packages_Cache,
 gid_Brand_Dir_Share_Ure,
+gid_Brand_Dir_Share_Ure_Etc,
 gid_Brand_Dir_Share_Ure_Share,
 gid_Brand_Dir_Share_Glade,
 gid_Brand_Dir_Share_Labels,
@@ -446,6 +447,11 @@ Directory gid_Brand_Dir_Share_Ure
 DosName = ure;
 End
 
+Directory gid_Brand_Dir_Share_Ure_Etc
+ParentID = gid_Brand_Dir_Share_Ure;
+DosName = etc;
+End
+
 Directory gid_Brand_Dir_Share_Ure_Share
 ParentID = gid_Brand_Dir_Share_Ure;
 DosName = share;
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 1f551ce7..01e2cbd 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -160,7 +160,7 @@ End
 Profile gid_Profile_Dl_Uno_Ini
 ModuleID = gid_Module_Root_Ure_Hidden;
 #if defined MACOSX
-Dir = gid_Brand_Dir_Share_Ure;
+Dir = gid_Brand_Dir_Share_Ure_Etc;
 #else
 Dir = SCP2_URE_DL_DIR;
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: enable-dbgutil

2014-09-17 Thread Bjoern Michaelsen

Hi,

On Wed, Sep 17, 2014 at 08:25:39AM -0400, nicholas ferguson wrote:
 But don't answer an email.. where the intent of the msgs is that if I follow
 your suggestions..I 'might' get a build

In that case you wouldnt have an answer right now. Also note that the answer
certainly did already provide lots of helpful hints. In fact, much more than
can be expected as there was quite a lot of information missing in the original
post (which is -- unfortunately -- expected, given the complexity of the
issue).

Ranting vs. an developer that provides help is generally not appreciated, Even
less so when trying to create diversion by bringing in the employer of the
helping hand in the discussion, which is way off topic here[1].

Feel free to continue to ask questions here and we will try to help out as best
as we can. If you need support beyond that, there are multiple companies that
can offer you L3 support, which is explicitly not something this mailing list
will, can or should ever provide[2]. 

Best,

Bjoern


[1] And somehow trying to construct a special responsibility of RedHat
employees for troubles on a competing operating system to the offers by
the employer is downright rediculous.

[2] One alternative is to become a valuable upstream contributor -- there is
quite a lot of motivation to go an extra mile helping someone old or new in 
the
project, if there is a clear indication of a benefit for the project in 
form of
expected contributions or improvements. If so, it would be very helpful to
learn what is being worked on and how that will benefit the project.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

RE: enable-dbgutil

Thanks. There is an English language issue.  Your points #1 and #2... I
don't understand what you are referring to

-Original Message-
From: Bjoern Michaelsen [mailto:bjoern.michael...@canonical.com] 
Sent: Wednesday, September 17, 2014 9:00 AM
To: nicholas ferguson
Cc: 'Norbert Thiebaud'; 'Eike Rathke'; 'libreoffice'
Subject: Re: enable-dbgutil

Hi,

On Wed, Sep 17, 2014 at 08:25:39AM -0400, nicholas ferguson wrote:
 But don't answer an email.. where the intent of the msgs is that if I 
 follow your suggestions..I 'might' get a build

In that case you wouldnt have an answer right now. Also note that the answer
certainly did already provide lots of helpful hints. In fact, much more than
can be expected as there was quite a lot of information missing in the
original post (which is -- unfortunately -- expected, given the complexity
of the issue).

Ranting vs. an developer that provides help is generally not appreciated,
Even less so when trying to create diversion by bringing in the employer of
the helping hand in the discussion, which is way off topic here[1].

Feel free to continue to ask questions here and we will try to help out as
best as we can. If you need support beyond that, there are multiple
companies that can offer you L3 support, which is explicitly not something
this mailing list will, can or should ever provide[2]. 

Best,

Bjoern

[1] And somehow trying to construct a special responsibility of RedHat
employees for troubles on a competing operating system to the offers by
the employer is downright rediculous.

[2] One alternative is to become a valuable upstream contributor -- there is
quite a lot of motivation to go an extra mile helping someone old or new
in the
project, if there is a clear indication of a benefit for the project in
form of
expected contributions or improvements. If so, it would be very helpful
to
learn what is being worked on and how that will benefit the project.

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

[Libreoffice-commits] core.git: bin/find-german-comments mysqlc/source

 bin/find-german-comments   |2 +-
 mysqlc/source/mysqlc_statement.cxx |   22 --
 mysqlc/source/mysqlc_statement.hxx |   14 +++---
 3 files changed, 4 insertions(+), 34 deletions(-)

New commits:
commit be75acefbcca66f2c8e8df203bd2f4c3946daec4
Author: Michael Meeks michael.me...@collabora.com
Date:   Wed Sep 17 14:08:57 2014 +0100

Translate German comment.

Change-Id: I3d452ac218005b40568ec116ede9962cc1e60a18

diff --git a/bin/find-german-comments b/bin/find-german-comments
index f040f89..dca70e3 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -286,7 +286,7 @@ class Parser:
 lingucomponent : 1,
 linguistic : 1,
 lotuswordpro : 1,
-mysqlc : 0, #
+mysqlc : 1,
 o3tl : 1,
 odk : 1,
 officecfg : 1,
diff --git a/mysqlc/source/mysqlc_statement.cxx 
b/mysqlc/source/mysqlc_statement.cxx
index 54679df..60cc7f6 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -48,7 +48,6 @@ using namespace com::sun::star::io;
 using namespace com::sun::star::util;
 using ::osl::MutexGuard;
 
-/* {{{ OConnection::OCommonStatement() -I- */
 OCommonStatement::OCommonStatement(OConnection* _pConnection, sql::Statement 
*_cppStatement)
 :OCommonStatement_IBase(m_aMutex)
 ,OPropertySetHelper(OCommonStatement_IBase::rBHelper)
@@ -60,18 +59,12 @@ OCommonStatement::OCommonStatement(OConnection* 
_pConnection, sql::Statement *_c
 OSL_TRACE(OCommonStatement::OCommonStatement);
 m_pConnection-acquire();
 }
-/* }}} */
-
 
-/* {{{ OConnection::~OCommonStatement() -I- */
 OCommonStatement::~OCommonStatement()
 {
 OSL_TRACE(OCommonStatement::~OCommonStatement);
 }
-/* }}} */
-
 
-/* {{{ OConnection::disposeResultSet() -I- */
 void OCommonStatement::disposeResultSet()
 {
 OSL_TRACE(OCommonStatement::disposeResultSet);
@@ -79,10 +72,7 @@ void OCommonStatement::disposeResultSet()
 delete cppStatement;
 cppStatement = NULL;
 }
-/* }}} */
-
 
-/* {{{ OConnection::disposing() -I- */
 void OCommonStatement::disposing()
 {
 OSL_TRACE(OCommonStatement::disposing);
@@ -99,10 +89,7 @@ void OCommonStatement::disposing()
 dispose_ChildImpl();
 OCommonStatement_IBase::disposing();
 }
-/* }}} */
 
-
-/* {{{ OCommonStatement::queryInterface() -I- */
 Any SAL_CALL OCommonStatement::queryInterface(const Type  rType)
 throw(RuntimeException, std::exception)
 {
@@ -113,10 +100,7 @@ Any SAL_CALL OCommonStatement::queryInterface(const Type  
rType)
 }
 return aRet;
 }
-/* }}} */
 
-
-/* {{{ OCommonStatement::getTypes() -I- */
 Sequence Type  SAL_CALL OCommonStatement::getTypes()
 throw(RuntimeException, std::exception)
 {
@@ -127,10 +111,7 @@ Sequence Type  SAL_CALL OCommonStatement::getTypes()
 
 return concatSequences(aTypes.getTypes(), 
OCommonStatement_IBase::getTypes());
 }
-/* }}} */
 
-
-/* {{{ OCommonStatement::cancel() -I- */
 void SAL_CALL OCommonStatement::cancel()
 throw(RuntimeException, std::exception)
 {
@@ -139,10 +120,7 @@ void SAL_CALL OCommonStatement::cancel()
 checkDisposed(rBHelper.bDisposed);
 // cancel the current sql statement
 }
-/* }}} */
-
 
-/* {{{ OCommonStatement::close() -I- */
 void SAL_CALL OCommonStatement::close()
 throw(SQLException, RuntimeException, std::exception)
 {
diff --git a/mysqlc/source/mysqlc_statement.hxx 
b/mysqlc/source/mysqlc_statement.hxx
index aa94e9f..68e4107 100644
--- a/mysqlc/source/mysqlc_statement.hxx
+++ b/mysqlc/source/mysqlc_statement.hxx
@@ -171,8 +171,9 @@ namespace connectivity
 virtual ~OStatement(){}
 
 public:
-// ein Konstruktor, der fuer das Returnen des Objektes benoetigt 
wird:
-OStatement(OConnection* _pConnection, sql::Statement 
*_cppStatement) : OCommonStatement(_pConnection, _cppStatement) {}
+// A constructor which is required for the return of the objects
+OStatement(OConnection* _pConnection, sql::Statement 
*_cppStatement) :
+OCommonStatement(_pConnection, _cppStatement) {}
 
 virtual OUString SAL_CALL getImplementationName()
 throw (css::uno::RuntimeException, std::exception) 
SAL_OVERRIDE;
@@ -205,13 +206,4 @@ namespace connectivity
 }
 #endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_STATEMENT_HXX
 
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim600: noet sw=4 ts=4
- */
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/find-german-comments registry/source

 bin/find-german-comments|4 ++--
 registry/source/keyimpl.cxx |   18 +-
 registry/source/regimpl.cxx |6 +++---
 registry/source/regimpl.hxx |2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit c44b8ce27fd5df20b2c871c28cce4cd913551779
Author: Michael Meeks michael.me...@collabora.com
Date:   Wed Sep 17 14:15:39 2014 +0100

Translate German comments.

Change-Id: I1d7c1fa2fffe20a0bc60cf5533b8f8c28e360a1d

diff --git a/bin/find-german-comments b/bin/find-german-comments
index dca70e3..7e48b9f 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -255,7 +255,7 @@ class Parser:
 cpputools : 1,
 crashrep : 1,
 cui : 1,
-dbaccess : 0, #
+dbaccess : 1,
 desktop : 1,
 drawinglayer : 1,
 dtrans : 1,
@@ -294,7 +294,7 @@ class Parser:
 package : 1,
 postprocess : 1,
 pyuno : 1,
-registry : 0, #
+registry : 1,
 remotebridges : 1,
 reportdesign : 0, #
 rsc : 0, #
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 40f7983..b4e4786 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -381,7 +381,7 @@ RegError ORegKey::setLongListValue(const OUString 
valueName, sal_Int32* pValueL
 return REG_SET_VALUE_FAILED;
 }
 
-sal_uInt32 size = 4; // 4 Bytes (sal_uInt32) fuer die Laenge
+sal_uInt32 size = 4; // 4 bytes (sal_uInt32) for the length
 
 size += len * 4;
 
@@ -392,7 +392,7 @@ RegError ORegKey::setLongListValue(const OUString 
valueName, sal_Int32* pValueL
 writeUINT32(pBuffer+VALUE_TYPEOFFSET, size);
 writeUINT32(pBuffer+VALUE_HEADEROFFSET, len);
 
-sal_uInt32 offset = 4; // initial 4 Bytes fuer die Laenge des Arrays
+sal_uInt32 offset = 4; // initial 4 bytes for the size of the array
 
 for (sal_uInt32 i=0; i  len; i++)
 {
@@ -440,7 +440,7 @@ RegError ORegKey::setStringListValue(const OUString 
valueName, sal_Char** pValu
 return REG_SET_VALUE_FAILED;
 }
 
-sal_uInt32 size = 4; // 4 Bytes (sal_uInt32) fuer die Laenge
+sal_uInt32 size = 4; // 4 bytes (sal_uInt32) for the length
 
 sal_uInt32 i;
 for (i=0; i  len; i++)
@@ -455,7 +455,7 @@ RegError ORegKey::setStringListValue(const OUString 
valueName, sal_Char** pValu
 writeUINT32(pBuffer+VALUE_TYPEOFFSET, size);
 writeUINT32(pBuffer+VALUE_HEADEROFFSET, len);
 
-sal_uInt32 offset = 4; // initial 4 Bytes fuer die Laenge des Arrays;
+sal_uInt32 offset = 4; // initial 4 bytes for the size of the array;
 sal_uInt32 sLen = 0;
 
 for (i=0; i  len; i++)
@@ -508,7 +508,7 @@ RegError ORegKey::setUnicodeListValue(const OUString 
valueName, sal_Unicode** p
 return REG_SET_VALUE_FAILED;
 }
 
-sal_uInt32 size = 4; // 4 Bytes (sal_uInt32) fuer die Laenge
+sal_uInt32 size = 4; // 4 bytes (sal_uInt32) for the length
 
 sal_uInt32 i;
 for (i=0; i  len; i++)
@@ -523,7 +523,7 @@ RegError ORegKey::setUnicodeListValue(const OUString 
valueName, sal_Unicode** p
 writeUINT32(pBuffer+VALUE_TYPEOFFSET, size);
 writeUINT32(pBuffer+VALUE_HEADEROFFSET, len);
 
-sal_uInt32 offset = 4; // initial 4 Bytes fuer die Laenge des Arrays;
+sal_uInt32 offset = 4; // initial 4 bytes for the size of the array;
 sal_uInt32 sLen = 0;
 
 for (i=0; i  len; i++)
@@ -747,7 +747,7 @@ RegError ORegKey::getLongListValue(const OUString 
valueName, sal_Int32** pValue
 *pLen = len;
 sal_Int32* pVList = (sal_Int32*)rtl_allocateZeroMemory(len * 
sizeof(sal_Int32));
 
-sal_uInt32 offset = 4; // initial 4 Bytes fuer die Laenge des Arrays;
+sal_uInt32 offset = 4; // initial 4 bytes for the size of the array;
 
 for (sal_uInt32 i = 0; i  len; i++)
 {
@@ -844,7 +844,7 @@ RegError ORegKey::getStringListValue(const OUString 
valueName, sal_Char*** pVal
 *pLen = len;
 sal_Char** pVList = (sal_Char**)rtl_allocateZeroMemory(len * 
sizeof(sal_Char*));
 
-sal_uInt32 offset = 4; // initial 4 Bytes fuer die Laenge des Arrays;
+sal_uInt32 offset = 4; // initial 4 bytes for the size of the array;
 sal_uInt32 sLen = 0;
 
 sal_Char *pValue;
@@ -950,7 +950,7 @@ RegError ORegKey::getUnicodeListValue(const OUString 
valueName, sal_Unicode***
 *pLen = len;
 sal_Unicode** pVList = (sal_Unicode**)rtl_allocateZeroMemory(len * 
sizeof(sal_Unicode*));
 
-sal_uInt32 offset = 4; // initial 4 Bytes fuer die Laenge des Arrays;
+sal_uInt32 offset = 4; // initial 4 bytes for the size of the array;
 sal_uInt32 sLen = 0;
 
 sal_Unicode *pValue;
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 9f07d16..7021f45 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -1569,7 +1569,7 @@ RegError ORegistry::dumpValue(const OUString sPath, 
const OUString sName, sal_

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

2014-09-17 Thread Hideki Ikeda

 svx/source/table/cell.cxx|   20 
 svx/source/table/cell.hxx|2 
 svx/source/table/tablecontroller.cxx |  142 +++
 3 files changed, 164 insertions(+)

New commits:
commit 9bfd1aced3da2aab9df3fc6f93543a5b6b1075b6
Author: Hideki Ikeda hideki.ik...@gmail.com
Date:   Thu Jul 17 16:46:16 2014 -0400

fdo#60712 - Inherits cell styles in inserting rows/columns

Add the code to copy cell styles from the caret row/column
to new rows/columns. The span is also copiedl.

Change-Id: I39596a33141ed2159ea2d09e422892cbd68cd81a
Reviewed-on: https://gerrit.libreoffice.org/10373
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index ce7a6a9..5fd38f9 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -525,6 +525,26 @@ void Cell::setMerged()
 
 
 
+void Cell::copyFormatFrom( const CellRef xSourceCell )
+{
+if( xSourceCell.is()  mpProperties )
+{
+mpProperties-SetMergedItemSet( xSourceCell-GetObjectItemSet() );
+
+SdrTableObj rTableObj = dynamic_cast SdrTableObj ( GetObject() );
+SdrTableObj rSourceTableObj = dynamic_cast SdrTableObj ( 
xSourceCell-GetObject() );
+
+if(rSourceTableObj.GetModel() != rTableObj.GetModel())
+{
+SetStyleSheet( 0, true );
+}
+
+notifyModified();
+}
+}
+
+
+
 void Cell::notifyModified()
 {
 if( mxTable.is() )
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 65fdcd0..66cc5a7 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -102,6 +102,8 @@ public:
 
 SVX_DLLPRIVATE void setMerged();
 
+SVX_DLLPRIVATE void copyFormatFrom( const CellRef xSourceCell );
+
 // XInterface
 SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( 
const ::com::sun::star::uno::Type Type ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 SVX_DLLPRIVATE virtual void SAL_CALL acquire() throw () SAL_OVERRIDE;
diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 514505c..c310cb2 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -564,6 +564,77 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const 
SfxItemSet* pArgs )
 getPropertyValue( sSize ) );
 }
 
+// Copy cell properties
+sal_Int32 nPropSrcCol = (bInsertAfter ? aEnd.mnCol : aStart.mnCol 
+ nNewColumns);
+sal_Int32 nRowSpan = 0;
+bool bNewSpan = false;
+
+for( sal_Int32 nRow = 0; nRow  mxTable-getRowCount(); ++nRow )
+{
+CellRef xSourceCell( dynamic_cast Cell* ( 
mxTable-getCellByPosition( nPropSrcCol, nRow ).get() ) );
+
+// When we insert new COLUMNs, we want to copy ROW spans.
+if( nRowSpan == 0 )
+{
+// we are not in a span yet. Let's find out if the current 
cell is in a span.
+sal_Int32 nColSpan;
+sal_Int32 nSpanInfoCol;
+
+if( xSourceCell-getRowSpan()  1 )
+{
+// The current cell is the top-left cell in a span.
+// Get the span info and propagate it to the target.
+nRowSpan = xSourceCell-getRowSpan();
+nColSpan = xSourceCell-getColumnSpan();
+nSpanInfoCol = nPropSrcCol;
+}
+else if( xSourceCell-isMerged() )
+{
+// The current cell is a middle cell in a 2D span.
+// Look for the top-left cell in the span.
+for( nSpanInfoCol = nPropSrcCol - 1; nSpanInfoCol = 
0; --nSpanInfoCol )
+{
+CellRef xMergeInfoCell( dynamic_cast Cell* ( 
mxTable-getCellByPosition( nSpanInfoCol, nRow ).get() ) );
+if( !xMergeInfoCell-isMerged() )
+{
+nRowSpan = xMergeInfoCell-getRowSpan();
+nColSpan = xMergeInfoCell-getColumnSpan();
+break;
+}
+}
+if( nRowSpan == 1 )
+nRowSpan = 0;
+}
+
+// The target colomns are outside the span; Start a new 
span.
+if( nRowSpan  0  ( nNewStartColumn  nSpanInfoCol || 
nSpanInfoCol + nColSpan = nNewStartColumn ) )
+bNewSpan = true;
+}
+
+// Now copy the properties from the source to the targets
+

[Bug 65675] LibreOffice 4.2 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 60712, which changed state.

Bug 60712 Summary: On inserting New Row/column does not inherit the style of 
cells in table
https://bugs.freedesktop.org/show_bug.cgi?id=60712

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: RepositoryModule_build.mk solenv/gbuild

 RepositoryModule_build.mk  |1 +
 solenv/gbuild/extensions/pre_BuildTools.mk |1 +
 2 files changed, 2 insertions(+)

New commits:
commit c42d2a5c7a195c6d80160567a098d1387de741e5
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Sep 17 16:26:47 2014 +0300

Set up the instdir_for_build URE unorc file when cross-compiling

Change-Id: Icde8c214f510d168b52f2594821071a5aff19ecf

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 11aae8e..2642a53 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
i18nlangtag \
i18nutil \
i18npool \
+   instsetoo_native \
idl \
io \
javaunohelper \
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk 
b/solenv/gbuild/extensions/pre_BuildTools.mk
index 05ac6d1..e5604b9 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -42,5 +42,6 @@ gb_BUILD_TOOLS = \
$(foreach executable, \
xsltproc \
,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
+   $(INSTDIR)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: enable-dbgutil

2014-09-17 Thread Norbert Thiebaud

On Wed, Sep 17, 2014 at 8:04 AM, nicholas ferguson
nicholasfergu...@wingarch.com wrote:
 Thanks. There is an English language issue.  Your points #1 and #2... I
 don't understand what you are referring to

It is indeed an international list.. we usually use English, but if
that is an issue, what language would you feel more at ease with,
maybe someone can accommodate

BTW: top-posting is not helping. http://catb.org/jargon/html/T/top-post.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-09-17 Thread Caolán McNamara

 sd/source/ui/view/DocumentRenderer.cxx |   28 +++-
 1 file changed, 15 insertions(+), 13 deletions(-)

New commits:
commit cca120ad92ecab741ca9683f3cf76d9e4fc81729
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Sep 17 14:32:03 2014 +0100

Resolves: fdo#80911 don't swap notes page width/height

Change-Id: I9826f69d03de85ea8d2b2c025121599877798852

diff --git a/sd/source/ui/view/DocumentRenderer.cxx 
b/sd/source/ui/view/DocumentRenderer.cxx
index c370a69..a5ffa6a 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1361,6 +1361,7 @@ private:
 {
 SdDrawDocument* pDocument = mrBase.GetMainViewShell()-GetDoc();
 rInfo.meOrientation = ORIENTATION_PORTRAIT;
+bool bDoDodgyHeightWidthFit = !mpOptions-IsDraw()  
!mpOptions-IsNotes();
 
 if( ! mpOptions-IsBooklet())
 {
@@ -1369,9 +1370,9 @@ private:
 else if (rInfo.maPageSize.Width()  rInfo.maPageSize.Height())
 rInfo.meOrientation = ORIENTATION_LANDSCAPE;
 
-// Draw should abide by specified paper size
+// Draw and Notes should abide by their specified paper size
 Size aPaperSize;
-if (mpOptions-IsDraw())
+if (!bDoDodgyHeightWidthFit)
 {
 aPaperSize.setWidth(rInfo.maPageSize.Width());
 aPaperSize.setHeight(rInfo.maPageSize.Height());
@@ -1382,18 +1383,19 @@ private:
 aPaperSize.setHeight(rInfo.mpPrinter-GetPaperSize().Height());
 }
 
-if( (rInfo.meOrientation == ORIENTATION_LANDSCAPE 
-  (aPaperSize.Width()  aPaperSize.Height()))
-   ||
-(rInfo.meOrientation == ORIENTATION_PORTRAIT 
-  (aPaperSize.Width()  aPaperSize.Height()))
-  )
-{
-maPrintSize = awt::Size(aPaperSize.Height(), aPaperSize.Width());
-}
-else
+maPrintSize = awt::Size(aPaperSize.Width(), aPaperSize.Height());
+
+if (bDoDodgyHeightWidthFit)
 {
-maPrintSize = awt::Size(aPaperSize.Width(), aPaperSize.Height());
+if( (rInfo.meOrientation == ORIENTATION_LANDSCAPE 
+  (aPaperSize.Width()  aPaperSize.Height()))
+   ||
+(rInfo.meOrientation == ORIENTATION_PORTRAIT 
+  (aPaperSize.Width()  aPaperSize.Height()))
+  )
+{
+maPrintSize = awt::Size(aPaperSize.Height(), 
aPaperSize.Width());
+}
 }
 
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Reverts notification?

Hi Jan,

On Wednesday, 2014-09-17 14:07:36 +0200, Jan Holesovsky wrote:

  Also, if bug IDs are present in the revert summary, shouldn't the
  corresponding bugs be set to REOPENED if they were already resolved or
  closed?
 
 I'd prefer not to do it, similarly as we don't close the bugs
 automagically when the commit has the bug id.
 
 Sometimes there are partial reverts, sometimes there are 'Related'
 commits that can be not crucial for the bug itself.

You're right. Automatism might not be that helpful..

 The comment will go to the bug, so I'd prefer to leave the decision
 whether to re-open or not up to the QA guys, probably?

And hopefully it is assigned to the dev so s/he'll notice and act,
maybe..

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: 2 commits - configure.ac .gitignore Makefile.in Repository.mk sal/Library_sal.mk scp2/source ure/Module_ure.mk ure/Package_builddir_install.mk ure/source

 .gitignore  |1 -
 Makefile.in |3 +--
 Repository.mk   |1 -
 configure.ac|6 ++
 sal/Library_sal.mk  |1 -
 scp2/source/ooo/ure.scp |2 +-
 ure/Module_ure.mk   |1 -
 ure/Package_builddir_install.mk |   18 --
 ure/source/unorc.in |   23 ---
 9 files changed, 4 insertions(+), 52 deletions(-)

New commits:
commit 332f6a5f997677a3468c47a7b7d5b7c448809293
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Sep 17 17:39:10 2014 +0300

The URE unorc is now set up in instsetoo_native/CustomTarget_setup.mk

So no need to expand it at configure time in ure/source/unorc, and no need 
to
handle the related builddir!=srcdir complications.

Change-Id: Ifa34d25fab9ad2da13ed039bf6c5921b0fb58703

diff --git a/.gitignore b/.gitignore
index a273e0b..b7ebd03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,6 @@
 /config_build.mk
 /configure
 /lo.xcent
-/ure/source/unorc
 /Makefile
 /NEWS
 /TODO
diff --git a/Makefile.in b/Makefile.in
index a2271c0..9f5dd1a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -169,8 +169,7 @@ distclean : clean compilerplugins-clean
 $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
 $(BUILDDIR)/ios/lo.xcconfig \
 $(BUILDDIR)/lo.xcent \
-$(BUILDDIR)/sysui/desktop/macosx/Info.plist \
-$(BUILDDIR)/ure/source/unorc
+$(BUILDDIR)/sysui/desktop/macosx/Info.plist
find $(SRCDIR)/solenv/gdb -name *.pyc -exec rm {} \;
 
 #
diff --git a/Repository.mk b/Repository.mk
index 707a0c1..69ef8ec 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -733,7 +733,6 @@ endif
 
 $(eval $(call gb_Helper_register_packages_for_install,ure,\
ure_install \
-   ure_builddir_install \
$(if $(ENABLE_JAVA),\
jvmfwk_javavendors \
jvmfwk_jreproperties \
diff --git a/configure.ac b/configure.ac
index c423df9..23a1f20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4443,8 +4443,7 @@ if test $cross_compiling = yes; then
 instsetoo_native/util/openoffice.lst.in \
 config_host/*.in \
 sysui/desktop/macosx/Info.plist.in \
-ios/lo.xcconfig.in \
-ure/source/unorc.in) \
+ios/lo.xcconfig.in) \
 | (cd CONF-FOR-BUILD  tar xf -)
 cp configure CONF-FOR-BUILD
 test -d config_build  cp -p config_build/*.h CONF-FOR-BUILD/config_host 
2/dev/null
@@ -12770,8 +12769,7 @@ AC_CONFIG_FILES([config_host.mk
  lo.xcent
  instsetoo_native/util/openoffice.lst
  sysui/desktop/macosx/Info.plist
- ios/lo.xcconfig
- ure/source/unorc])
+ ios/lo.xcconfig])
 AC_CONFIG_HEADERS([config_host/config_buildid.h])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
 AC_CONFIG_HEADERS([config_host/config_eot.h])
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 77d4176..e5c02c2 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,sal,\
 # need the ure-link symlink to exist in INSTDIR so it's possible to link sal
 # FIXME: this creates cyclic dependency between ure and sal modules
 $(eval $(call gb_Library_use_package,sal,ure_install))
-$(eval $(call gb_Library_use_package,sal,ure_builddir_install))
 
 $(eval $(call gb_Library_use_libraries,sal,\
$(if $(filter $(OS),ANDROID), \
diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk
index 4d8c2c0..88cbc71 100644
--- a/ure/Module_ure.mk
+++ b/ure/Module_ure.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,ure))
 
 $(eval $(call gb_Module_add_targets,ure,\
Package_install \
-   Package_builddir_install \
Rdb_ure \
 ))
 
diff --git a/ure/Package_builddir_install.mk b/ure/Package_builddir_install.mk
deleted file mode 100644
index 49defbc..000
--- a/ure/Package_builddir_install.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,ure_builddir_install,$(BUILDDIR)/ure/source))
-
-ifneq ($(CROSS_COMPILING),)
-$(eval $(call 
gb_Package_add_files,ure_builddir_install,$(LIBO_URE_ETC_FOLDER),\
-   $(if $(filter unorc,$(call gb_Helper_get_rcfile,uno)),$(call 
gb_Helper_get_rcfile,uno)) \
-))
-endif
-
-# vim:set noet sw=4 ts=4:
diff --git a/ure/source/unorc.in b/ure/source/unorc.in
deleted file mode 100644
index bc0ecbe..000
--- a/ure/source/unorc.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of

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

2014-09-17 Thread Caolán McNamara

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 25bc3f0ba4474ff66d49d698f4551df736eb
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Sep 17 16:15:35 2014 +0100

don't crash on insertTextPortion returning empty reference

Change-Id: Id55ea26f1467fd160dab30b31327646240edabaf

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 378fbc3..657c279 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1245,6 +1245,9 @@ void DomainMapper_Impl::appendTextPortion( const 
OUString rString, PropertyMapP
 if (m_bStartIndex || m_bStartBibliography || 
m_bStartGenericField)
 xTOCTextCursor-goLeft(1, false);
 xTextRange = 
xTextAppend-insertTextPortion(rString, pValues, xTOCTextCursor);
+SAL_WARN_IF(!xTextRange.is(), 
writerfilter.dmapper, insertTextPortion failed);
+if (!xTextRange.is())
+throw uno::Exception(insertTextPortion 
failed, NULL);
 m_bTextInserted = true;
 xTOCTextCursor-gotoRange(xTextRange-getEnd(), 
true);
 mxTOCTextCursor = xTOCTextCursor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa sc/source

2014-09-17 Thread Kohei Yoshida

 sc/qa/unit/ucalc_pivottable.cxx  |   52 +++
 sc/source/core/data/dpoutput.cxx |9 ++
 2 files changed, 35 insertions(+), 26 deletions(-)

New commits:
commit 902564bfe52e7699cefc80b3334c2eb0a8cacdcf
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Sep 17 11:24:56 2014 -0400

bnc#592918: Display data description in pivot table.

When there are no column fields and exactly one data field.

Change-Id: I10d2af7e626f98a4d8a981e078e99e7da9207d1c

diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 40b3d6c..ef24b49 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -1075,7 +1075,7 @@ void Test::testPivotTableNormalGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 1 },
 { B, 2 },
 { C, 3 },
@@ -1123,7 +1123,7 @@ void Test::testPivotTableNormalGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][3] = {
-{ Name2, Name, 0 },
+{ Name2, Name, Sum - Value },
 { D, D, 4 },
 { E, E, 5 },
 { F, F, 6 },
@@ -1160,7 +1160,7 @@ void Test::testPivotTableNormalGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][3] = {
-{ Name2, Name, 0 },
+{ Name2, Name, Sum - Value },
 { G, G, 7 },
 { Group1, A, 1 },
 { 0,B, 2 },
@@ -1257,7 +1257,7 @@ void Test::testPivotTableNumberGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Order, 0 },
+{ Order, Sum - Score },
 { 30,   423 },
 { 30-39, 87  },
 { 40-49, 241 },
@@ -1372,7 +1372,7 @@ void Test::testPivotTableDateGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][4] = {
-{ Years, Quarters, Date, 0 },
+{ Years, Quarters, Date, Sum - Value },
 { 2011, Q1, Jan, 1 },
 { 0, 0, Mar, 2 },
 { 0,  Q3, Sep, 7 },
@@ -1404,7 +1404,7 @@ void Test::testPivotTableDateGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][4] = {
-{ Years, Quarters, Date, 0 },
+{ Years, Quarters, Date, Sum - Value },
 { 2011, Q1, Jan, 1 },
 { 0, 0, Mar, 2 },
 { 0,  Q3, Sep, 7 },
@@ -1428,7 +1428,7 @@ void Test::testPivotTableDateGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Date, 0 },
+{ Date, Sum - Value },
 { 2011-01-01, 1 },
 { 2011-03-02, 2 },
 { 2011-09-03, 7 },
@@ -1496,7 +1496,7 @@ void Test::testPivotTableEmptyRows()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 1 },
 { B, 2 },
 { C, 3 },
@@ -1519,7 +1519,7 @@ void Test::testPivotTableEmptyRows()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 1 },
 { B, 2 },
 { C, 3 },
@@ -1546,7 +1546,7 @@ void Test::testPivotTableEmptyRows()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { B, 3 },
 { C, 3 },
 { D, 4 },
@@ -1624,7 +1624,7 @@ void Test::testPivotTableTextNumber()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { 0001, 1 },
 { 0002, 2 },
 { 0003, 3 },
@@ -1708,7 +1708,7 @@ void Test::testPivotTableCaseInsensitiveStrings()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 3 },
 { Total Result, 3 },
 };
@@ -1871,7 +1871,7 @@ void Test::testPivotTableFieldReference()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 1 },
 { B, 2 },
 { C, 4 },
@@ -1898,7 +1898,7 @@ void Test::testPivotTableFieldReference()
 {
 // Expected

[Libreoffice-commits] dev-tools.git: scripts/bugcommenters-by-target.py

2014-09-17 Thread Robinson Tryon

 scripts/bugcommenters-by-target.py |   39 +++--
 1 file changed, 37 insertions(+), 2 deletions(-)

New commits:
commit 95e494703c62c7e5dd29a8c36b2ef7f25fa2b88b
Author: Robinson Tryon qu...@runcibility.com
Date:   Wed Sep 17 10:54:46 2014 -0500

bugcommenters: Add optional 'wiki' format (70col wrap, group by #)

This commit adds support for a new 'wiki' format for the
bugcommenters. Users are grouped by total # of bug comments, and
output is wrapped to 70cols max.

USAGE:
  ./bugcommenters-by-target.py 4.3.2 wiki

This format is used on our Releases pages on the wiki. Example:

https://wiki.documentfoundation.org/Releases/4.3.2/RC2#Thanks_to_all_who_took_part_in_handling_the_issues

Change-Id: I91754a9e951548e59fb307b1cb9584344cdfa3f9

diff --git a/scripts/bugcommenters-by-target.py 
b/scripts/bugcommenters-by-target.py
index f03b38e..9998072 100755
--- a/scripts/bugcommenters-by-target.py
+++ b/scripts/bugcommenters-by-target.py
@@ -9,6 +9,7 @@
 
 import sys
 import re
+import textwrap
 from urllib.request import urlopen, URLError
 from io import BytesIO
 
@@ -59,8 +60,42 @@ def get_target_toucher_counts(target):
 touch_counts[toucher]=1
 touch_counts_sorted = reversed(sorted((count, name) for (name, count) in 
touch_counts.items()))
 return touch_counts_sorted
-
-if __name__ == '__main__':
+
+# Print one line (wrapped to 70 cols) for each set of users who made
+# the same # of bug comments.
+#
+# (We use this format for Release pages on the wiki)
+def print_for_wiki():
+counts = {}
+for count, name in get_target_toucher_counts(sys.argv[1]):
+if name == 'Commit Notification':
+# Throw out these lines
+pass
+elif count in counts:
+counts[count] += ,  + name
+else:
+counts[count] = name
+
+# Sort dictionary keys from largest # of comments to least and
+# print them out.
+pad = 5
+
+# Text body is indented 1 additional char from comment count.
+tw = textwrap.TextWrapper(subsequent_indent=  * (pad + 1))
+for count, names in sorted(counts.items(), reverse=True):
+print({n:{width}} .format(n=count, width=pad) + tw.fill(names))
+
+# Print one line for each commenter.
+def print_regular():
 for touch_count in get_target_toucher_counts(sys.argv[1]):
 if not touch_count[1] == 'Commit Notification':
 print(%5d %s % (touch_count[0], touch_count[1]))
+
+if __name__ == '__main__':
+if(len(sys.argv)  2 and
+   sys.argv[2] == wiki):
+print_for_wiki()
+elif(len(sys.argv)  1):
+print_regular()
+else:
+print('Error: Please provide a LibreOffice version!')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa sw/source

2014-09-17 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/empty-annotation-mark.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   22 +++
 sw/source/filter/ww8/wrtw8nds.cxx|7 
 3 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit fff019debf14a0bf8cd358591a686191347f1542
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Sep 17 17:31:27 2014 +0200

MSWordExportBase: ignore empty annotation marks

Change-Id: I182700a7b74aa65a1eeb39ff702f068a10dd3346

diff --git a/sw/qa/extras/ooxmlexport/data/empty-annotation-mark.docx 
b/sw/qa/extras/ooxmlexport/data/empty-annotation-mark.docx
new file mode 100644
index 000..854b6d7
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/empty-annotation-mark.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 20b1301..4dd7dfc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -231,6 +231,28 @@ DECLARE_OOXMLEXPORT_TEST(testShapeInFloattable, 
shape-in-floattable.docx)
 }
 }
 
+DECLARE_OOXMLEXPORT_TEST(testEmptyAnnotationMark, empty-annotation-mark.docx)
+{
+if (mbExported)
+{
+// Delete the word that is commented, and save again.
+uno::Referencetext::XTextRange xRun = getRun(getParagraph(1), 3);
+CPPUNIT_ASSERT_EQUAL(OUString(with), xRun-getString());
+xRun-setString();
+uno::Referenceframe::XStorable xStorable(mxComponent, 
uno::UNO_QUERY);
+xStorable-store();
+
+// Then inspect the OOXML markup of the modified document model.
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+// There were two commentReference nodes.
+assertXPath(pXmlDoc, //w:commentReference, id, 0);
+// Empty comment range was not ignored on export, this was 1.
+assertXPath(pXmlDoc, //w:commentRangeStart, 0);
+// Ditto.
+assertXPath(pXmlDoc, //w:commentRangeEnd, 0);
+}
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 5bb95bc..e000918 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1806,7 +1806,12 @@ bool MSWordExportBase::GetAnnotationMarks( const 
SwTxtNode rNd, sal_Int32 nStt,
 bool bIsStartOk = ( pMark-GetMarkStart().nNode == nNd )  ( 
nBStart = nStt )  ( nBStart = nEnd );
 bool bIsEndOk = ( pMark-GetMarkEnd().nNode == nNd )  ( nBEnd = 
nStt )  ( nBEnd = nEnd );
 
-if ( bIsStartOk || bIsEndOk )
+// Annotation marks always have at least one character: the anchor
+// point of the comment field. In this case Word wants only the
+// comment field, so ignore the annotation mark itself.
+bool bSingleChar = pMark-GetMarkStart().nNode == 
pMark-GetMarkEnd().nNode  nBStart + 1 == nBEnd;
+
+if ( ( bIsStartOk || bIsEndOk )  !bSingleChar )
 {
 rArr.push_back( pMark );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - include/svx sc/source svx/source sw/inc

 include/svx/Palette.hxx|   12 ++--
 include/svx/PaletteManager.hxx |4 ++--
 sc/source/ui/inc/docsh.hxx |2 +-
 svx/source/tbxctrls/PaletteManager.cxx |4 ++--
 sw/inc/docsh.hxx   |2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit ffeac200b21a2f6b83cea2311562149554f87500
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Sep 17 19:17:13 2014 +0300

WaE: overriding virtual function declaration not marked 'override'

Change-Id: Ic7f3e661a4824cca06fc16f2b1f23a2873ef4ecf

diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index a877bd9..37c995e 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -243,7 +243,7 @@ public:
sal_Int32 nFileFormat,
bool bTemplate = false ) const SAL_OVERRIDE;
 
-virtual std::vectorColor GetDocColors();
+virtual std::vectorColor GetDocColors() SAL_OVERRIDE;
 
 virtual void LoadStyles( SfxObjectShell rSource ) SAL_OVERRIDE;
 
commit d032e5f519353cf5ac399ce01682fe4d930011f0
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Sep 17 19:04:16 2014 +0300

WaE: overriding virtual function declaration not marked 'override'

Change-Id: I3c210fa3866fe34c4e5f9ea799a4156862290432

diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index b621a8a..6572410 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -202,7 +202,7 @@ public:
sal_Int32 nFileFormat,
bool bTemplate = false ) const SAL_OVERRIDE;
 
-virtual std::vectorColor GetDocColors();
+virtual std::vectorColor GetDocColors() SAL_OVERRIDE;
 
 virtual boolInitNew( const ::com::sun::star::uno::Reference 
::com::sun::star::embed::XStorage  ) SAL_OVERRIDE;
 virtual boolLoad( SfxMedium rMedium ) SAL_OVERRIDE;
commit 9de2ad3474e34383dfee6166d31983ba24ef0da8
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Sep 17 18:58:05 2014 +0300

WaE: passing class rtl::OUString by value, rather pass by reference

Change-Id: Ie42cc9cbf13467d6c1644dc35e361250bd3a9533

diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index cb70d2c..7070bc1 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -67,8 +67,8 @@ public:
 voidAddRecentColor(const Color rRecentColor);
 
 voidSetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater);
-voidPopupColorPicker(const OUString aCommand);
-static void DispatchColorCommand(const OUString aCommand, const Color 
aColor);
+voidPopupColorPicker(const OUString aCommand);
+static void DispatchColorCommand(const OUString aCommand, const Color 
aColor);
 };
 
 #endif // INCLUDED_SVX_PALETTEMANAGER_HXX
diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index 101c002..df4c4b8 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -204,7 +204,7 @@ void 
PaletteManager::SetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater)
 mpBtnUpdater = pBtnUpdater;
 }
 
-void PaletteManager::PopupColorPicker(const OUString aCommand)
+void PaletteManager::PopupColorPicker(const OUString aCommand)
 {
 SvColorDialog aColorDlg( 0 );
 aColorDlg.SetColor ( mLastColor );
@@ -218,7 +218,7 @@ void PaletteManager::PopupColorPicker(const OUString 
aCommand)
 }
 }
 
-void PaletteManager::DispatchColorCommand(const OUString aCommand, const Color 
aColor)
+void PaletteManager::DispatchColorCommand(const OUString aCommand, const 
Color aColor)
 {
 using namespace css::uno;
 using namespace css::frame;
commit a9cd260ebb7bf5760eee536cd911780773c6051d
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Sep 17 18:48:43 2014 +0300

WaE: overriding virtual function declaration not marked 'override'

Change-Id: If610c94f02da66d3f83f0787ef0dcebab47ebe2d

diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index 6eab3f4..32088a8 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -56,10 +56,10 @@ public:
 PaletteGPL( const OUString rFPath, const OUString rFName );
 virtual ~PaletteGPL();
 
-virtual const OUString GetName();
-virtual voidLoadColorSet( SvxColorValueSet rColorSet );
+virtual const OUString GetName() SAL_OVERRIDE;
+virtual voidLoadColorSet( SvxColorValueSet rColorSet ) 
SAL_OVERRIDE;
 
-virtual boolIsValid();
+virtual boolIsValid() SAL_OVERRIDE;
 };
 
 class PaletteSOC : public Palette
@@ -72,10 +72,10 @@ public:
 PaletteSOC( const OUString rFPath, const OUString rFName );
 virtual ~PaletteSOC();
 
-virtual const OUString GetName();
-virtual voidLoadColorSet( SvxColorValueSet rColorSet );
+virtual

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

2014-09-17 Thread Samuel Mehrbrodt

 sd/source/ui/dlg/LayerTabBar.cxx  |2 -
 sd/source/ui/inc/FrameView.hxx|4 --
 sd/source/ui/inc/GraphicViewShell.hxx |3 --
 sd/source/ui/view/drviews5.cxx|3 --
 sd/source/ui/view/frmview.cxx |2 -
 sd/source/ui/view/grviewsh.cxx|   51 --
 sd/source/ui/view/viewshel.cxx|   11 +++
 7 files changed, 13 insertions(+), 63 deletions(-)

New commits:
commit 20800ebc7ef05637134c3915798e13a272663341
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Tue Sep 16 23:15:40 2014 +0200

Move the scrollbar and layer tabs in a separate row in Draw

The reason for this is that the height of the scrollbar is theme-dependent
and makes the tabs unreadable if it's too small.

The same has already been done for Calc (fdo#36772).

Change-Id: Ibe22cf5e7d5863ccf276c19bfa969f5b5fc16a5a
Reviewed-on: https://gerrit.libreoffice.org/11480
Reviewed-by: TomaÅ¾ Vajngerl qui...@gmail.com
Tested-by: TomaÅ¾ Vajngerl qui...@gmail.com

diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index 82eaf93..c12ff2a 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -45,7 +45,7 @@ namespace sd {
  * default constructor
  */
 LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent)
-: TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | 
WB_SIZEABLE ) ),
+: TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL ) ),
 DropTargetHelper( this ),
 pDrViewSh(pViewSh)
 {
diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx
index c9c2c83..b0a1c02 100644
--- a/sd/source/ui/inc/FrameView.hxx
+++ b/sd/source/ui/inc/FrameView.hxx
@@ -163,9 +163,6 @@ public:
 void SetDrawMode(sal_uLong nNewDrawMode) { mnDrawMode = nNewDrawMode; };
 sal_uLong GetDrawMode() const { return mnDrawMode; };
 
-void SetTabCtrlPercent( double nPercent ) { mnTabCtrlPercent = nPercent; }
-double GetTabCtrlPercent() const { return mnTabCtrlPercent; }
-
 void SetIsNavigatorShowingAllShapes (const bool 
bIsNavigatorShowingAllShapes);
 bool IsNavigatorShowingAllShapes (void) const { return 
mbIsNavigatorShowingAllShapes;}
 
@@ -200,7 +197,6 @@ private:
 sal_uInt16  mnSlotId;   /// SlotId, which was initial 
mentioned
 sal_uInt16  mnSlidesPerRow; /// slides per row on the 
slide-desk
 sal_uLong   mnDrawMode; /// draw mode for the normal 
window
-double  mnTabCtrlPercent;
 /** Remember whether the navigator shows all shapes (TRUE/) or only
 the names ones (FALSE/).  Not persistent.
 */
diff --git a/sd/source/ui/inc/GraphicViewShell.hxx 
b/sd/source/ui/inc/GraphicViewShell.hxx
index 632a31e..3f35b78 100644
--- a/sd/source/ui/inc/GraphicViewShell.hxx
+++ b/sd/source/ui/inc/GraphicViewShell.hxx
@@ -72,9 +72,6 @@ public:
 protected:
 void ConstructGraphicViewShell (void);
 virtual void ArrangeGUIElements (void) SAL_OVERRIDE;
-
-private:
-DECL_LINK(TabBarSplitHandler, TabBar*);
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 118e2f5..8401254 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -106,8 +106,7 @@ void DrawViewShell::ArrangeGUIElements (void)
 // Retrieve the current size (thickness) of the scroll bars.  That is
 // the width of the vertical and the height of the horizontal scroll
 // bar.
-int nScrollBarSize =
-GetParentWindow()-GetSettings().GetStyleSettings().GetScrollBarSize();
+int nScrollBarSize = 
GetParentWindow()-GetSettings().GetStyleSettings().GetScrollBarSize();
 maScrBarWH = Size (nScrollBarSize, nScrollBarSize);
 
 Point aHPos = maViewPos;
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 39aaadb..8ce1f57 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -192,7 +192,6 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* 
pFrameView /* = NULK *
 mbClickChangeRotation = pFrameView-IsClickChangeRotation();
 mnSlidesPerRow = pFrameView-GetSlidesPerRow();
 mnDrawMode = pFrameView-GetDrawMode();
-mnTabCtrlPercent = pFrameView-GetTabCtrlPercent();
 mbIsNavigatorShowingAllShapes = 
pFrameView-IsNavigatorShowingAllShapes();
 SetPreviousViewShellType (pFrameView-GetPreviousViewShellType());
 SetViewShellTypeOnLoad (pFrameView-GetViewShellTypeOnLoad());
@@ -226,7 +225,6 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* 
pFrameView /* = NULK *
 bool bUseContrast = 
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 mnDrawMode = bUseContrast ? OUTPUT_DRAWMODE_CONTRAST : 
OUTPUT_DRAWMODE_COLOR;
 }
-mnTabCtrlPercent = 0.0;
 mbIsNavigatorShowingAllShapes = false;

Re: help from Windows developer sought: use system ODBC headers

2014-09-17 Thread Lionel Elie Mamane

On Wed, Sep 17, 2014 at 08:05:02AM +0200, Noel Grandin wrote:
 On 2014-09-17 04:36 AM, Lionel Elie Mamane wrote:
 Rather than hard-coding a path, I presume our build system has a
 variable for the path to the Windows SDK. Also, rather than me (not
 having a Microsoft Windows development environment) trying blindly
 and relying on tinderboxes to test the build, I was hoping someone
 having a Microsoft Windows development environment ready to build
 LibreOffice would take care of it.

 On my Windows virtual machine, which is currently set up according to the 
 Windows build instructions,
 sqlext.h
 lives in
 C:\Program Files (x86)\Windows Kits\8.0\Include\um

 It looks like configure.ac has logic to deal with that (at line 9557) but why 
 it is not working I don't know.
 Lionel, I'm on IRC this morning if you want me to run more tests.
 I could probably give you TeamViewer access to that machine if you
 want.

I'm not very available this week for LibreOffice; if it suits you,
we'll do this next week. Thanks in advance.

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

[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/source

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit 636dd4aba3bf9fbe83f74532c2df4bace3fdf712
Author: Eike Rathke er...@redhat.com
Date:   Wed Sep 17 18:40:43 2014 +0200

add Kven Finnish [fkv-NO] to language list, fdo#83332

Change-Id: I3faa39ebc32e909bd2e76ae67c6f3148fb7c

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index e91b09e..8e1ac7e 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -647,6 +647,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_FRENCH_BENIN,   fr, BJ, 0 },
 { LANGUAGE_USER_FRENCH_NIGER,   fr, NE, 0 },
 { LANGUAGE_USER_FRENCH_TOGO,fr, TG, 0 },
+{ LANGUAGE_USER_KVEN_FINNISH,  fkv, NO, 0 },
 { LANGUAGE_MULTIPLE,   mul,   , 0 },// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   und,   , 0 },// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   zxx,   , 0 },// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 1c47be7..8bd8572 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -701,6 +701,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_FRENCH_BENIN  0x840C  /* makeLangID( 0x21, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
 #define LANGUAGE_USER_FRENCH_NIGER  0x880C  /* makeLangID( 0x22, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
 #define LANGUAGE_USER_FRENCH_TOGO   0x8C0C  /* makeLangID( 0x23, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
+#define LANGUAGE_USER_KVEN_FINNISH  0x0693
 
 
 /* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 67fcfd3..f3a4ae9 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -388,6 +388,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  French (Benin) ; LANGUAGE_USER_FRENCH_BENIN ;  ;
  French (Niger) ; LANGUAGE_USER_FRENCH_NIGER ;  ;
  French (Togo) ; LANGUAGE_USER_FRENCH_TOGO ;  ;
+ Kven Finnish ; LANGUAGE_USER_KVEN_FINNISH ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/qa sc/source

2014-09-17 Thread Kohei Yoshida

 sc/qa/unit/ucalc_pivottable.cxx  |   52 +++
 sc/source/core/data/dpoutput.cxx |9 ++
 2 files changed, 35 insertions(+), 26 deletions(-)

New commits:
commit 800884a0b9ce12924b8ed225571c01e7b0fb0ec7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Sep 17 11:24:56 2014 -0400

bnc#592918: Display data description in pivot table.

When there are no column fields and exactly one data field.

Change-Id: I10d2af7e626f98a4d8a981e078e99e7da9207d1c
(cherry picked from commit 902564bfe52e7699cefc80b3334c2eb0a8cacdcf)
Reviewed-on: https://gerrit.libreoffice.org/11491
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 5f742a1..2dd42b4 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -1076,7 +1076,7 @@ void Test::testPivotTableNormalGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 1 },
 { B, 2 },
 { C, 3 },
@@ -1124,7 +1124,7 @@ void Test::testPivotTableNormalGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][3] = {
-{ Name2, Name, 0 },
+{ Name2, Name, Sum - Value },
 { D, D, 4 },
 { E, E, 5 },
 { F, F, 6 },
@@ -1161,7 +1161,7 @@ void Test::testPivotTableNormalGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][3] = {
-{ Name2, Name, 0 },
+{ Name2, Name, Sum - Value },
 { G, G, 7 },
 { Group1, A, 1 },
 { 0,B, 2 },
@@ -1258,7 +1258,7 @@ void Test::testPivotTableNumberGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Order, 0 },
+{ Order, Sum - Score },
 { 30,   423 },
 { 30-39, 87  },
 { 40-49, 241 },
@@ -1373,7 +1373,7 @@ void Test::testPivotTableDateGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][4] = {
-{ Years, Quarters, Date, 0 },
+{ Years, Quarters, Date, Sum - Value },
 { 2011, Q1, Jan, 1 },
 { 0, 0, Mar, 2 },
 { 0,  Q3, Sep, 7 },
@@ -1405,7 +1405,7 @@ void Test::testPivotTableDateGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][4] = {
-{ Years, Quarters, Date, 0 },
+{ Years, Quarters, Date, Sum - Value },
 { 2011, Q1, Jan, 1 },
 { 0, 0, Mar, 2 },
 { 0,  Q3, Sep, 7 },
@@ -1429,7 +1429,7 @@ void Test::testPivotTableDateGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Date, 0 },
+{ Date, Sum - Value },
 { 2011-01-01, 1 },
 { 2011-03-02, 2 },
 { 2011-09-03, 7 },
@@ -1497,7 +1497,7 @@ void Test::testPivotTableEmptyRows()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 1 },
 { B, 2 },
 { C, 3 },
@@ -1520,7 +1520,7 @@ void Test::testPivotTableEmptyRows()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 1 },
 { B, 2 },
 { C, 3 },
@@ -1547,7 +1547,7 @@ void Test::testPivotTableEmptyRows()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { B, 3 },
 { C, 3 },
 { D, 4 },
@@ -1625,7 +1625,7 @@ void Test::testPivotTableTextNumber()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { 0001, 1 },
 { 0002, 2 },
 { 0003, 3 },
@@ -1709,7 +1709,7 @@ void Test::testPivotTableCaseInsensitiveStrings()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 3 },
 { Total Result, 3 },
 };
@@ -1872,7 +1872,7 @@ void Test::testPivotTableFieldReference()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-

[Libreoffice-commits] core.git: 3 commits - sd/qa sw/CppunitTest_sw_htmlimport.mk sw/Module_sw.mk sw/qa sw/source

2014-09-17 Thread Matúš Kukan

 sd/qa/unit/data/pptx/bnc591147.pptx   |binary
 sd/qa/unit/import-tests.cxx   |   37 +++
 sw/CppunitTest_sw_htmlimport.mk   |   56 ++
 sw/Module_sw.mk   |1 
 sw/qa/extras/htmlimport/data/picture.html |   23 
 sw/qa/extras/htmlimport/htmlimport.cxx|   35 ++
 sw/source/filter/html/htmlgrin.cxx|   19 +++---
 7 files changed, 159 insertions(+), 12 deletions(-)

New commits:
commit a3ef3b658dea9b59ded319f2f092e73e4deaad24
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Wed Sep 17 18:50:04 2014 +0200

bnc#591147: unit test for media files import

Change-Id: Ie45818c54d756628e9cbc2619e5ad43cedcac92c

diff --git a/sd/qa/unit/data/pptx/bnc480256.pptx 
b/sd/qa/unit/data/pptx/bnc480256.pptx
old mode 100755
new mode 100644
diff --git a/sd/qa/unit/data/pptx/bnc591147.pptx 
b/sd/qa/unit/data/pptx/bnc591147.pptx
new file mode 100644
index 000..afa382e
Binary files /dev/null and b/sd/qa/unit/data/pptx/bnc591147.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 91fec0f..6bc206a 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -77,6 +77,7 @@ public:
 void testBnc870237();
 void testBnc887225();
 void testBnc480256();
+void testBnc591147();
 void testCreationDate();
 void testBnc584721_1();
 void testBnc584721_2();
@@ -102,6 +103,7 @@ public:
 CPPUNIT_TEST(testBnc870237);
 CPPUNIT_TEST(testBnc887225);
 CPPUNIT_TEST(testBnc480256);
+CPPUNIT_TEST(testBnc591147);
 CPPUNIT_TEST(testCreationDate);
 CPPUNIT_TEST(testBnc584721_1);
 CPPUNIT_TEST(testBnc584721_2);
@@ -773,6 +775,41 @@ void SdFiltersTest::testBnc584721_3()
 xDocShRef-DoClose();
 }
 
+void SdFiltersTest::testBnc591147()
+{
+::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc(/sd/qa/unit/data/pptx/bnc591147.pptx), PPTX);
+
+// In the document, there are two slides with media files.
+uno::Reference drawing::XDrawPagesSupplier  xDoc(
+xDocShRef-GetDoc()-getUnoModel(), uno::UNO_QUERY_THROW );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(2), xDoc-getDrawPages()-getCount() );
+
+// First page has video file inserted
+uno::Reference drawing::XDrawPage  xPage(
+xDoc-getDrawPages()-getByIndex(0), uno::UNO_QUERY_THROW );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(1), xPage-getCount() );
+
+uno::Reference drawing::XShape  xShape(xPage-getByIndex(0), 
uno::UNO_QUERY_THROW );
+uno::Reference beans::XPropertySet  xPropSet( xShape, 
uno::UNO_QUERY_THROW );
+OUString sVideoURL(emptyURL);
+bool bSucess = xPropSet-getPropertyValue(MediaURL) = sVideoURL;
+CPPUNIT_ASSERT_MESSAGE( MediaURL property is not set, bSucess );
+
+// Second page has audio file inserted
+xPage.set( xDoc-getDrawPages()-getByIndex(1), uno::UNO_QUERY_THROW );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(1), xPage-getCount() );
+
+xShape.set( xPage-getByIndex(0), uno::UNO_QUERY_THROW );
+xPropSet.set( xShape, uno::UNO_QUERY_THROW );
+OUString sAudioURL(emptyURL);
+bSucess = xPropSet-getPropertyValue(MediaURL) = sAudioURL;
+CPPUNIT_ASSERT_MESSAGE( MediaURL property is not set, bSucess );
+
+CPPUNIT_ASSERT_MESSAGE( sAudioURL and sVideoURL should not be equal, 
sAudioURL != sVideoURL );
+
+xDocShRef-DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdFiltersTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit bcf8dc3d9b9d2df6f6a67c71efc52630ff65371b
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Wed Sep 17 11:56:24 2014 +0200

sw: html import test: local images shouldn't be file links (bnc#580834)

Change-Id: Id35e03a3f814609e40e4beea778e66cce39054d1

diff --git a/sw/CppunitTest_sw_htmlimport.mk b/sw/CppunitTest_sw_htmlimport.mk
new file mode 100644
index 000..3036076
--- /dev/null
+++ b/sw/CppunitTest_sw_htmlimport.mk
@@ -0,0 +1,56 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_htmlimport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_htmlimport, \
+   sw/qa/extras/htmlimport/htmlimport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_htmlimport, \
+   comphelper \
+   cppu \
+   cppuhelper \
+   i18nlangtag \
+   sal \
+   sw \
+   test \
+   tl \
+   unotest \
+   utl \
+   vcl \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_htmlimport,\
+   boost_headers \
+

[Libreoffice-commits] core.git: 5 commits - writerperfect/inc writerperfect/Library_wpftcalc.mk writerperfect/Library_wpftdraw.mk writerperfect/source

2014-09-17 Thread David Tardon

 writerperfect/Library_wpftcalc.mk  |6 
 writerperfect/Library_wpftdraw.mk  |5 
 writerperfect/inc/writerperfect/DocumentHandlerFor.hxx |   28 ++
 writerperfect/inc/writerperfect/ImportFilter.hxx   |  206 +
 writerperfect/source/calc/DocumentHandlerForOds.hxx|   31 ++
 writerperfect/source/calc/ImportFilterBase.cxx |  182 ---
 writerperfect/source/calc/ImportFilterBase.hxx |  113 -
 writerperfect/source/calc/MSWorksCalcImportFilter.cxx  |2 
 writerperfect/source/calc/MSWorksCalcImportFilter.hxx  |   10 
 writerperfect/source/calc/MWAWCalcImportFilter.cxx |2 
 writerperfect/source/calc/MWAWCalcImportFilter.hxx |   10 
 writerperfect/source/draw/CDRImportFilter.cxx  |2 
 writerperfect/source/draw/CDRImportFilter.hxx  |2 
 writerperfect/source/draw/CMXImportFilter.cxx  |2 
 writerperfect/source/draw/CMXImportFilter.hxx  |2 
 writerperfect/source/draw/FreehandImportFilter.cxx |2 
 writerperfect/source/draw/FreehandImportFilter.hxx |2 
 writerperfect/source/draw/ImportFilterBase.cxx |3 
 writerperfect/source/draw/ImportFilterBase.hxx |4 
 writerperfect/source/draw/MSPUBImportFilter.cxx|2 
 writerperfect/source/draw/MSPUBImportFilter.hxx|2 
 writerperfect/source/draw/MWAWDrawImportFilter.cxx |2 
 writerperfect/source/draw/MWAWDrawImportFilter.hxx |2 
 writerperfect/source/draw/PageMakerImportFilter.cxx|2 
 writerperfect/source/draw/PageMakerImportFilter.hxx|2 
 writerperfect/source/draw/VisioImportFilter.cxx|2 
 writerperfect/source/draw/VisioImportFilter.hxx|2 
 writerperfect/source/draw/WPGImportFilter.cxx  |2 
 writerperfect/source/draw/WPGImportFilter.hxx  |2 
 writerperfect/source/writer/AbiWordImportFilter.cxx|2 
 writerperfect/source/writer/AbiWordImportFilter.hxx|2 
 writerperfect/source/writer/EBookImportFilter.cxx  |   19 -
 writerperfect/source/writer/EBookImportFilter.hxx  |2 
 writerperfect/source/writer/ImportFilterBase.cxx   |3 
 writerperfect/source/writer/ImportFilterBase.hxx   |4 
 writerperfect/source/writer/MSWorksImportFilter.cxx|2 
 writerperfect/source/writer/MSWorksImportFilter.hxx|2 
 writerperfect/source/writer/MWAWImportFilter.cxx   |2 
 writerperfect/source/writer/MWAWImportFilter.hxx   |2 
 39 files changed, 334 insertions(+), 340 deletions(-)

New commits:
commit 006a5d5be6071b27551baa3048c805891a1eae63
Author: David Tardon dtar...@redhat.com
Date:   Wed Sep 17 18:53:37 2014 +0200

use MediaDescriptor to get input stream

Change-Id: Iecc7f373d0d352281b53324ef8824c5d7073fe8a

diff --git a/writerperfect/inc/writerperfect/ImportFilter.hxx 
b/writerperfect/inc/writerperfect/ImportFilter.hxx
index 294dd46..ec59c09 100644
--- a/writerperfect/inc/writerperfect/ImportFilter.hxx
+++ b/writerperfect/inc/writerperfect/ImportFilter.hxx
@@ -68,14 +68,9 @@ public:
 virtual sal_Bool SAL_CALL filter(const ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue  rDescriptor)
 throw (::com::sun::star::uno::RuntimeException, std::exception) 
SAL_OVERRIDE
 {
-sal_Int32 nLength = rDescriptor.getLength();
-const css::beans::PropertyValue *pValue = rDescriptor.getConstArray();
+utl::MediaDescriptor aDescriptor(rDescriptor);
 css::uno::Reference  css::io::XInputStream  xInputStream;
-for (sal_Int32 i = 0 ; i  nLength; i++)
-{
-if (pValue[i].Name == InputStream)
-pValue[i].Value = xInputStream;
-}
+aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()] = xInputStream;
 if (!xInputStream.is())
 {
 OSL_ASSERT(false);
@@ -103,7 +98,6 @@ public:
 
 this-doRegisterHandlers(exporter);
 
-utl::MediaDescriptor aDescriptor(rDescriptor);
 return this-doImportDocument(input, exporter, aDescriptor);
 }
 
commit a23a51af899b31bcf93781637371ffd8ef813bf5
Author: David Tardon dtar...@redhat.com
Date:   Wed Sep 17 18:41:45 2014 +0200

convert wpftcalc to use ImportFilter base class

Change-Id: I6692aee51753cddf57aaca1b7b7a94afafe60a9d

diff --git a/writerperfect/Library_wpftcalc.mk 
b/writerperfect/Library_wpftcalc.mk
index e09c195..49d4b6c 100644
--- a/writerperfect/Library_wpftcalc.mk
+++ b/writerperfect/Library_wpftcalc.mk
@@ -19,6 +19,11 @@
 
 $(eval $(call gb_Library_Library,wpftcalc))
 
+$(eval $(call gb_Library_set_include,wpftcalc,\
+   -I$(SRCDIR)/writerperfect/inc \
+   $$(INCLUDE) \
+))
+
 $(eval $(call 
gb_Library_set_componentfile,wpftcalc,writerperfect/source/calc/wpftcalc))
 
 $(eval $(call gb_Library_use_sdk_api,wpftcalc))
@@ -49,7 +54,6 @@ $(eval $(call gb_Library_use_externals,wpftcalc,\
 ))
 
 $(eval $(call

[Libreoffice-commits] core.git: include/toolkit sc/source svx/source

2014-09-17 Thread Julien Nabet

 include/toolkit/controls/geometrycontrolmodel.hxx |2 +-
 sc/source/core/data/dpoutput.cxx  |2 +-
 svx/source/form/fmobj.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 40825c4369696b4f491d093d4f0218278ab5f140
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Sep 17 20:15:27 2014 +0200

Typo: excatly-exactly

Change-Id: Ica1e1399bc4a9b9ca61d09cf26e8c47e2368f644

diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx 
b/include/toolkit/controls/geometrycontrolmodel.hxx
index 903441d..3ed7791 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -96,7 +96,7 @@ namespace com { namespace sun { namespace star {
 
 /**
 @param _rxAggregateInstance
-is the object to be aggregated. Must be acquired excatly once 
(by the reference object given).br/
+is the object to be aggregated. Must be acquired exactly once 
(by the reference object given).br/
 Will be reset to NULL upon leaving
 */
 OGeometryControlModel_Base(::com::sun::star::uno::Reference 
::com::sun::star::util::XCloneable  _rxAggregateInstance);
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index eaa8fea..a110a74 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1130,7 +1130,7 @@ void ScDPOutput::Output()
 
 if (nColCount == 1  nRowCount  0  nColFieldCount == 0)
 {
-// the table contains excatly one data field and no column fields.
+// the table contains exactly one data field and no column fields.
 // Display data description at top right corner.
 ScSetStringParam aParam;
 aParam.setTextInput();
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 8b5a49e..9d92835 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -355,7 +355,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource)
 
 ensureModelEnv(xSourceContainer, m_xEnvironmentHistory);
 m_aEventsHistory = aEvts;
-// if we we're clone there was a call to operator=, so aEvts are 
excatly the events we need here ...
+// if we we're clone there was a call to operator=, so aEvts are 
exactly the events we need here ...
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

 solenv/gbuild/extensions/pre_BuildTools.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9acf9b650481c53ac2fe3a13ad2b5a04db395386
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Sep 17 21:38:42 2014 +0300

s/INSTDIR/INSTROOT

Fixes cross-compilation on OS X.

Change-Id: I416e8b54c4c33c390c90139a82e4562668eb9ad4

diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk 
b/solenv/gbuild/extensions/pre_BuildTools.mk
index e5604b9..f387df6 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -42,6 +42,6 @@ gb_BUILD_TOOLS = \
$(foreach executable, \
xsltproc \
,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
-   $(INSTDIR)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
+   $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: help from Windows developer sought: use system ODBC headers

I have figured out a hacky solution to this.
I'll tidy it up and post an RFC patch to gerrit tomorrow.
It's bedtime for me now and I'm tired of debugging over a horribly
laggy connection :-)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source sfx2/source sw/inc sw/source

2014-09-17 Thread Julien Nabet

 dbaccess/qa/complex/dbaccess/RowSet.java   |2 +-
 dbaccess/source/core/api/CacheSet.cxx  |2 +-
 dbaccess/source/core/api/KeySet.cxx|   10 +-
 dbaccess/source/core/api/OptimisticSet.cxx |2 +-
 sfx2/source/view/viewsh.cxx|4 ++--
 sw/inc/anchoreddrawobject.hxx  |2 +-
 sw/source/core/text/txtfly.cxx |2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit a762204a5df46ef68c5b0be4427fc99e32c4c36d
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Sep 17 21:14:52 2014 +0200

Typos

Change-Id: Icf850c4b7b146a82a5638a3cd88ad02f3171aff3

diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java 
b/dbaccess/qa/complex/dbaccess/RowSet.java
index c9bb39a..66749fb 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -200,7 +200,7 @@ public class RowSet extends TestCase
 System.out.println(testing testRowSet);
 createTestCase(true);
 
-// sequential postioning
+// sequential positioning
 m_resultSet.beforeFirst();
 testSequentialPositining(m_resultSet, m_row);
 
diff --git a/dbaccess/source/core/api/CacheSet.cxx 
b/dbaccess/source/core/api/CacheSet.cxx
index 65c5e83..de9d943 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -282,7 +282,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow 
_rInsertRow ,const ORowSetR
 fillTableName(xSet);
 
 OUStringBuffer aSql(UPDATE  + m_aComposedTableName +  SET );
-// list all cloumns that should be set
+// list all columns that should be set
 
 OUStringBuffer aCondition;
 ::std::list sal_Int32 aOrgValues;
diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 2c75718..96e01ab 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -562,14 +562,14 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow 
_rInsertRow ,const ORowSetRow
 fillTableName(xSet);
 
 OUStringBuffer aSql = UPDATE  + m_aComposedTableName +  SET ;
-// list all cloumns that should be set
+// list all columns that should be set
 static OUString aPara( = ?,);
 OUString aQuote  = getIdentifierQuoteString();
 static OUString aAnd( AND );
 OUString sIsNull( IS NULL);
 OUString sParam( = ?);
 
-// use keys and indexes for exact postioning
+// use keys and indexes for exact positioning
 // first the keys
 ReferenceXNameAccess xKeyColumns = getKeyColumns();
 
@@ -972,11 +972,11 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow 
_rDeleteRow,const connectivit
 
 OUStringBuffer aSql(DELETE FROM  + m_aComposedTableName +  WHERE );
 
-// list all cloumns that should be set
+// list all columns that should be set
 OUString aQuote  = getIdentifierQuoteString();
 static OUString aAnd( AND );
 
-// use keys and indexes for excat postioning
+// use keys and indexes for exact positioning
 ReferenceXNameAccess xKeyColumns = getKeyColumns();
 // second the indexes
 ReferenceXIndexesSupplier xIndexSup(_xTable,UNO_QUERY);
@@ -1082,7 +1082,7 @@ void SAL_CALL OKeySet::moveToCurrentRow(  ) 
throw(SQLException, RuntimeException
 
 ReferenceXNameAccess OKeySet::getKeyColumns() const
 {
-// use keys and indexes for exact postioning
+// use keys and indexes for exact positioning
 // first the keys
 
 ReferenceXIndexAccess xKeys = m_xTableKeys;
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx 
b/dbaccess/source/core/api/OptimisticSet.cxx
index 44e7807..aece21b 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -182,7 +182,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow 
_rInsertRow ,const ORow
 {
 if ( m_aJoinedKeyColumns.empty() )
 throw SQLException();
-// list all cloumns that should be set
+// list all columns that should be set
 static OUString s_sPara( = ?);
 OUString aQuote  = getIdentifierQuoteString();
 
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 9b40bb4..fd07e1a 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1052,7 +1052,7 @@ void SfxViewShell::OuterResizePixel
 here. The mainuse is to change the size of the Vis-Area.
 
 If the Border is changed due to the new calculation then this has to be set
-by SfxViewShell::SetBorderPixel(const SvBorder). The Postioning of Tools
+by SfxViewShell::SetBorderPixel(const SvBorder). The Positioning of 
Tools
 is only allowed after the calling of 'SetBorderPixel'.
 
 [Example]
@@ -1101,7 +1101,7 @@ void SfxViewShell::InnerResizePixel
 
 If the Border is changed due to the new calculation then is has to be set
 by SfxViewShell::SetBorderPixel(const SvBorder).
-The Postioning of Tools is only allowed after the calling of
+The

Re: Should we use boost::math::log1p/expm1 instead of rtl_math_log1p/expm1 ?

2014-09-17 Thread julien2412

Andrew Douglas Pitonyak wrote
 Julien, I am curious if you have done any testing.
 ...

Hi Andrew,

First thank you for your feedback.
I must recognize that no, I didn't made any tests.


Andrew Douglas Pitonyak wrote
 No differences were found in this little test. Then again, on Fedora, 
 Boost may be configured to use the built-in implementation, I don't 
 really know. I did not check our source code, but, it might reduce the 
 LO code complexity a little bit, that might be a gain.

Ok, let's wait for a building expert about this.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Should-we-use-boost-math-log1p-expm1-instead-of-rtl-math-log1p-expm1-tp4122334p4122614.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: writerperfect/Library_wpftcalc.mk writerperfect/Library_wpftdraw.mk

 writerperfect/Library_wpftcalc.mk |1 +
 writerperfect/Library_wpftdraw.mk |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 510bb3fab28dffcdd5ff544b85063e8cc3d3f48e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Sep 17 21:47:57 2014 +0200

Missing boost_headers dependencies

Change-Id: I3e192bd3711ac690f3212fc36809b2c25526e9aa

diff --git a/writerperfect/Library_wpftcalc.mk 
b/writerperfect/Library_wpftcalc.mk
index 49d4b6c..395d1d8 100644
--- a/writerperfect/Library_wpftcalc.mk
+++ b/writerperfect/Library_wpftcalc.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,wpftcalc,\
 ))
 
 $(eval $(call gb_Library_use_externals,wpftcalc,\
+   boost_headers \
odfgen \
revenge \
mwaw \
diff --git a/writerperfect/Library_wpftdraw.mk 
b/writerperfect/Library_wpftdraw.mk
index 106fc97..c3a3ce0 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\
 ))
 
 $(eval $(call gb_Library_use_externals,wpftdraw,\
+   boost_headers \
cdr \
freehand \
mspub \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: enable-dbgutil

2014-09-17 Thread Anthonys Lists


On 17/09/2014 14:32, Norbert Thiebaud wrote:

On Wed, Sep 17, 2014 at 8:04 AM, nicholas ferguson
nicholasfergu...@wingarch.com  wrote:

Thanks. There is an English language issue.  Your points #1 and #2... I
don't understand what you are referring to

It is indeed an international list.. we usually use English, but if
that is an issue, what language would you feel more at ease with,
maybe someone can accommodate
Libre Office is, from its roots, a German product iirc. That big 
clean-up I mentioned included translating most of the comments from 
German into English.


Not surprisingly, therefore, LO is a European-based product, with many 
(maybe a majority?) of devs being non-native-English speakers. (It 
doesn't help when Americans think they speak English :-) Besides English 
(which may be a minority, as I said), I suspect a large portion of 
people here have as their native language either German or a variant of 
Slav.


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

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

2014-09-17 Thread Andras Timar

 shell/source/win32/zipfile/zipfile.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae4c836b49a8ac41312f855e24f20b0b050fcbd4
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Sep 18 00:46:16 2014 +0200

bnc#887307 ODF files not showing up on Windows search

Under Windows 7, ODF and OpenOffice.org 1.1 files were not found,
when the folder containing them was not indexed, and full text
search was switched on. The problem did not occur under Windows 8.

Apparently there is a bug in Windows 7, reading beyond the end of a
BufferStream resulted in 0 bytes read. So we take care not to read
beyond the end of stream.

Change-Id: Id01b08922121dabbb7b49c54f8ef11cb0e4ac413

diff --git a/shell/source/win32/zipfile/zipfile.cxx 
b/shell/source/win32/zipfile/zipfile.cxx
index ceccb7a..ca43812 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -289,7 +289,7 @@ static bool findCentralDirectoryEnd(StreamInterface *stream)
 
 try
 {
-for (long nOffset = nLength - BLOCK_SIZE;
+for (long nOffset = nLength - BLOCK_SIZE - 4;
  nOffset  0; nOffset -= BLOCK_SIZE)
 {
 if (findSignatureAtOffset(stream, nOffset))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: issue solved with --enable-dbgutil for Visual Studio on Windows 7 ( solution to this mess)

2014-09-17 Thread Anthonys Lists


On 17/09/2014 00:27, nicholas ferguson wrote:


I tossed that investigation aside thinking that that route had been 
poured over by LibreOffice experts; and took another look.


I didn't understand why I had to clean up this mess, with an open 
source product that has been on the market, for years


Sorry, you know the Open Source warranty, don't you? If it breaks, you 
get to keep both pieces?


The reality is that the guy who originally set it up presumably lost 
interest, and if no-one else has been using it, it bit-rotted. That's a 
very common occurrence in ALL software, be it Open Source or commercial 
- indeed, LibreOffice has just been through a massive clean up of 
bit-rotted code which, iirc, deleted a *third* of the code base!!!


It wouldn't surprise me if this feature dated from the proprietary Star 
Office days, and obviously got missed in the clean-up. (Which would 
explain why the original guy lost interest - he would have done it 
because he was told to, not because he wanted to.)


As they say in the Open Source world, if a feature doesn't work for you, 
patches welcome. Sorry you got put to this pain, but it seems obvious 
the functionality wasn't important to anyone else. But thanks for fixing 
it for the next person :-)


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

Re: LiMux student kick-off

2014-09-17 Thread Markus Mohrhard

Hey,

So I will only be able to provide a short feedback as I'm still on vacation
for another month and don't have access to any computer.

On Sep 17, 2014 9:29 PM, Ptyl Dragon p...@cloudon.com wrote:

 This week we (CloudOn) did a kick off for the openGL project,
 mainly reviewing OpenGL, and what we know of the requirements for the
project.

 My conclusions so far (feel free to correct them. i'm an OpenGL noob):

 1. We should use OpenGL 3.0 ES API - i.e use the 3.0 ES API subset, even
when using non OpenGL ES (e.g on linux, osx, windows)

That is way too young. Currently I think we should target Opengl 2.1 and
keep an option for OpenGL 3.2 open. That would mean we would target
something along of OpenGL ES 2.0. I can't check right now the differences
between the es version and the normal opengl version.

 2. Use cases:

  a. Tiled rendering (i.e mobile) -

  i. OpenGL renders to a memory buffer. It would be best if the
tile memory would have been this memory buffer, but if not, then this
memory buffer is later copied to the tile OpenGL context.
  ii. Context creation is handled by the Mobile app
  iii. this is the simple case

 b. Window (i.e Desktop) -

 i. LibreOffice's SalInstance should create an OpenGL window, and
provide the openGL context (enabling the option can be denoted via a
compilation flag). This needs to be done per OS, though possibly, can be
simplified via abstraction frameworks such as SDL, or what have you.
Possibly, this task is a good candidate for mentoring

We have that already. The OpenGLContext class abstracts the creation of a
context. We can't use an existing framework as it needs to integrate with
vcl at least on the desktop.

 ii. the rendering is done via 3 buffers: 2 buffers (front and
back) for de-interlacing, and 1 back layer buffer for actual rendering.
Additionally, for stuff like copy area, we might require temp buffers for
bit blit, and resending these bitmaps back to the GPU. Would be happy to
find a better solution, as it sounds like copying the same bitmap 4 times...

At least on the desktop this is not true. We have automatic front and back
buffer. I know that this is a bit more complicated on mobile platforms but
even then I think you only need 2 FBO. The place where you want a FBO for
copy operations textures seem like the better idea.

 iii. this is the complex case, and as such, arguably, we should
begin the work on tiled rendering, then apply the solution on the window /
Desktop case, in a later iteration.

I totally disagree here. The desktop stuff is already working and it is
only some work necessary to create a new vcl plugin. I would prefer if we
start there as this can easily be tested by many people and the development
plan is already available (see the estimation that Michael shared with
you). For the tiled rendering we first need to work on some infrastructure
problems that are not yet fully understood.


 3. Shaders - For simplicity and performance (i.e to not compile shaders
again and again), we should use one costant naive Vertex shader all the
time, and one constant Fragment shader, which uses if statements to
differentiate between 2 states - solid color, and texture. AFAIK, VCL does
not use any other more complex rendering. Note also, that if statements in
GLSL are optimized on the GPU, so using them should not cost performance.

That sounds just wrong. You only need to compile your shaders once if you
correctly manage the life cycle of them. We most likely only need one
vertex shader bit should use a few different fragment shaders. Especially
to handle some more complex features like gradients efficiently. One of the
ideas of creating an OpenGL context was that we could move some of these
ugly tasks like drawing gradients to the GPU.


 4. Text - would be rendered using the current software implementation,
and rendered via openGL, as bitmaps.

 Considering these, action items are (VERY roughly):

 A. add build flags if necessary
 B. decide whether to approach tiled rendering first. If so, solve context
creation on mobile apps. If not, implement the OpenGL context creation for
SalInstances on all OSes
 C. Write the shader
 D. Replace the VCL primitive drawing functions one by one, with OpenGL
counterparts
 E. Handle the copy area case
 F. Handle the Bitmap case
 G. Handle the text case

 if agreed upon, we could distribute the action items, and begin the
actual work

 On Wed, Sep 17, 2014 at 1:10 PM, Michael Meeks 
michael.me...@collabora.com wrote:


 On Wed, 2014-09-17 at 11:47 +0200, Jan-Marek Glogowski wrote:
  AFAIK Miklos was Michaels suggestion for the mentoring - can't
remember.

 Matus is the XFastParser expert =) I guess it'd be nice to have
a small
 XFastParser unit test as well (as some sort of entry-level easy-hack
 there).

  Probably we should simply add a Wiki page for easier coordination?

 Sure - why not =)

  Comments please

 All sounds sensible,

Re: LiMux student kick-off

Hi Ptyl,

On Wed, 2014-09-17 at 15:45 +0300, Ptyl Dragon wrote:
 ok, then we'll use GL2.1. we'll make sure we use only API used in ES 2
 too.

The whole situation around different GL versions vs. mismatching GLES
versions etc. is too horrible for words =) my hope is that we could
support OpenGL 3.2 - to get a good Mac baseline, and fallback for Linux
where we can.

 We need simple thing. after all, we are not making a First Person
 Shooter. For starters we are just making a 2d rendering engine

=)

 I don't think i follow. Is the idea is to keep using the current
 rendering mechanism, and just use OpenGL to render lines and
 rectangles?
 
I guess that's a good first start.
 
 in any case, for tiled rendering, we want to render all the elements
 in the tile together and at once, per tile. If this is all done by
 OpenGL, it would ensure the performance we require. 

Sure - doesn't that follow from a pure OpenGL renderer ?

 Also note that in tiled rendering, notions like copyArea are
 irrelevant, as by definition, each tile contains nothing of the
 neighboring tiles.

The copyArea stuff is interesting; my hope is that we could get rid of
that mess; however that intersects with some of the paint / timer work
that is also planned for the interns - since we currently defer
re-painting of various things to a timeout.


 1. what exactly is the thing that is already working on desktop?
 (explanation + code pointers)

We have some nice cross-platform GL context creation going on that
Markus created I believe (sadly he is away from a PC / E-mail from now)
- which should be easy to re-use.

 2. what are VCL plugins? Does VCL have a plugin infrastructure ? does
 it use dynamic linking (if so, it won't work for iOS)? it would be
 great if someone could direct me to some code pointers that show how
 this plugin infrastructure works

The backends have the vcl/inc/ API including salgdi there to implement;
but on Linux we can choose dynamically between many of these backends
eg. KDE3, KDE4, GTK2, GTK3, raw-X etc.

 3. I'm not sure if i saw the OpenGL development plan, so i'd be happy
 if anyone could direct me to it.

I've just forwarded you some rough notes.

 I want to learn all there is to learn, so to be able to actively
 expedite this front (i.e hack the way myself)

Sure - so I think one thing we need to get unwound (and that you
identified and raised) is the issue of immediate rendering.

If we go for immediate rendering; then we need to render to an
off-screen frame-buffer, and then we can fool around with copyArea
etc. ;-) [ this is not such a terrible thing to do of course but not
ideal ].

If we instead collect damage from immediate rendering, and then just
trigger a full re-render of that area using an OpenGL context - then
that might work better: and overlap with tiled rendering.

In the end / long-run we'd want to rid ourselves of immediate
rendering, and emit damage events not in window co-ordinates but
document co-ordinates (IMHO etc.). But of course - as a first step
killing all immediate rendering is a great idea.

Chris Sherlock was having a look at this problem in the past - with an
aim of stopping Windows deriving from OutputDevice - such that it's not
even possible to go rendering on Windows in an un-controlled way at any
time.

It would be great - Noel - perhaps this is something you could do ? =)
if we could find all instances of method calls on OutputDevice that
occur in a method that is not a child of some 'Paint' or render
method ;-) [ that would give us a hit-list ] - I'm not sure if that is
Clang-plugin-able ? ;-) [ how is the view of the call-graph from there
].

Ideally all rendering is done to a transient context that is passed in
only for the duration of the rendering call.

 As Markus is now on vacation, perhaps someone else can help me with
 these issues? I don't want to stall a month now, as I believe we can
 make progress in this time frame

Does any of the above help ?

 If it will make things simple, efficient, and maintainable, then all
 good with me, again, i'm an OpenGL noob, and i don't know where the
 performance bottlenecks are Still, to prevent a waterfall scenario,
 let's wait with the gradient handling, and the drawing layer
 optimizations in general, until we have things working in VCL without
 it.  
 
Personally, I'm completely with you on: First make something work ;-)
then we can go for performance - but it'd be great to avoid making big
design / performance mistakes at the outset of course/

Hope that helps,

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: LiMux student kick-off

2014-09-17 Thread Ptyl Dragon

hi Markus
hope you enjoy your vacation
and thanks for the feedback

inline

On Wed, Sep 17, 2014 at 2:58 PM, Markus Mohrhard 
markus.mohrh...@googlemail.com wrote:

 Hey,

 So I will only be able to provide a short feedback as I'm still on
 vacation for another month and don't have access to any computer.

 On Sep 17, 2014 9:29 PM, Ptyl Dragon p...@cloudon.com wrote:
 
  This week we (CloudOn) did a kick off for the openGL project,
  mainly reviewing OpenGL, and what we know of the requirements for the
 project.
 
  My conclusions so far (feel free to correct them. i'm an OpenGL noob):
 
  1. We should use OpenGL 3.0 ES API - i.e use the 3.0 ES API subset, even
 when using non OpenGL ES (e.g on linux, osx, windows)

 That is way too young. Currently I think we should target Opengl 2.1 and
 keep an option for OpenGL 3.2 open. That would mean we would target
 something along of OpenGL ES 2.0. I can't check right now the differences
 between the es version and the normal opengl version.

ok, then we'll use GL2.1. we'll make sure we use only API used in ES 2 too.
We need simple thing. after all, we are not making a First Person Shooter.
For starters we are just making a 2d rendering engine


  2. Use cases:
 
   a. Tiled rendering (i.e mobile) -
 
   i. OpenGL renders to a memory buffer. It would be best if the
 tile memory would have been this memory buffer, but if not, then this
 memory buffer is later copied to the tile OpenGL context.
   ii. Context creation is handled by the Mobile app
   iii. this is the simple case
 
  b. Window (i.e Desktop) -
 
  i. LibreOffice's SalInstance should create an OpenGL window, and
 provide the openGL context (enabling the option can be denoted via a
 compilation flag). This needs to be done per OS, though possibly, can be
 simplified via abstraction frameworks such as SDL, or what have you.
 Possibly, this task is a good candidate for mentoring

 We have that already. The OpenGLContext class abstracts the creation of a
 context. We can't use an existing framework as it needs to integrate with
 vcl at least on the desktop.

good to know



  ii. the rendering is done via 3 buffers: 2 buffers (front and
 back) for de-interlacing, and 1 back layer buffer for actual rendering.
 Additionally, for stuff like copy area, we might require temp buffers for
 bit blit, and resending these bitmaps back to the GPU. Would be happy to
 find a better solution, as it sounds like copying the same bitmap 4 times...

 At least on the desktop this is not true. We have automatic front and back
 buffer. I know that this is a bit more complicated on mobile platforms but
 even then I think you only need 2 FBO. The place where you want a FBO for
 copy operations textures seem like the better idea.


I don't think i follow.
Is the idea is to keep using the current rendering mechanism, and just use
OpenGL to render lines and rectangles?


in any case, for tiled rendering, we want to render all the elements in the
tile together and at once, per tile. If this is all done by OpenGL, it
would ensure the performance we require.
Also note that in tiled rendering, notions like copyArea are irrelevant, as
by definition, each tile contains nothing of the neighboring tiles.

  iii. this is the complex case, and as such, arguably, we should
 begin the work on tiled rendering, then apply the solution on the window /
 Desktop case, in a later iteration.

 I totally disagree here. The desktop stuff is already working and it is
 only some work necessary to create a new vcl plugin. I would prefer if we
 start there as this can easily be tested by many people and the development
 plan is already available (see the estimation that Michael shared with
 you). For the tiled rendering we first need to work on some infrastructure
 problems that are not yet fully understood.

I would like to understand the details of what you just said:
1. what exactly is the thing that is already working on desktop?
(explanation + code pointers)
2. what are VCL plugins? Does VCL have a plugin infrastructure ? does it
use dynamic linking (if so, it won't work for iOS)? it would be great if
someone could direct me to some code pointers that show how this plugin
infrastructure works
3. I'm not sure if i saw the OpenGL development plan, so i'd be happy if
anyone could direct me to it.

I want to learn all there is to learn, so to be able to actively expedite
this front (i.e hack the way myself)

As Markus is now on vacation,
perhaps someone else can help me with these issues?

I don't want to stall a month now, as I believe we can make progress in
this time frame


 
  3. Shaders - For simplicity and performance (i.e to not compile shaders
 again and again), we should use one costant naive Vertex shader all the
 time, and one constant Fragment shader, which uses if statements to
 differentiate between 2 states - solid color, and texture. AFAIK, VCL does
 not use any other more complex

Re: LiMux student kick-off

2014-09-17 Thread Ptyl Dragon

inline

On Wed, Sep 17, 2014 at 8:17 PM, Michael Meeks michael.me...@collabora.com
wrote:

 Hi Ptyl,

 On Wed, 2014-09-17 at 15:45 +0300, Ptyl Dragon wrote:
  ok, then we'll use GL2.1. we'll make sure we use only API used in ES 2
  too.

 The whole situation around different GL versions vs. mismatching
 GLES
 versions etc. is too horrible for words =) my hope is that we could
 support OpenGL 3.2 - to get a good Mac baseline, and fallback for Linux
 where we can.


Regarding this, from the little i've learned so far of OpenGL, the main
thing would be to avoid use the OpenGL extensions and API calls that don't
exist in ES, which from what i know so far (and i might be wrong) include
using only triangles, lines and dots (which might not be ideal for the
polypolygons stuff, but is necessary for porting to ES), refrain from using
GLSL 4.x stuff, possibly avoid GLU and GLUT (i think they are unsupported
in iOS) and the likes. In other words, whatever feature of OpenGL we use,
we should first ensure it exists in the target OpenGL ES version we choose,
on Android and iOS.



  We need simple thing. after all, we are not making a First Person
  Shooter. For starters we are just making a 2d rendering engine

 =)

  I don't think i follow. Is the idea is to keep using the current
  rendering mechanism, and just use OpenGL to render lines and
  rectangles?
 
 I guess that's a good first start.
 
  in any case, for tiled rendering, we want to render all the elements
  in the tile together and at once, per tile. If this is all done by
  OpenGL, it would ensure the performance we require.

 Sure - doesn't that follow from a pure OpenGL renderer ?


yes. That's why i thought it was tiled rendering is the simpler case,
because once we agree the target is to use a pure GL renderer, then doing
the quasi mode (i.e. use the existing solution and augment it with
OpenGL) becomes a bit of a spaghetti over the pure OpenGL  solution - i.e
rendering in OpenGL, then copying to non OpenGL while still using a double
buffer for OpenGL, and maintaining the existing VCL rendering in parallel.
In my mind, what would have worked better is to avoid the quasi mode, do a
pure OpenGL rendering, then integrating it in Desktop via a desktop tiled
rendering mechanismthough i guess that's a waterfall in itself. Still,
if we focus on that, we'd get to Android high performance support faster,
and i think that in many ways, that should be the goal, because of all the
OSes on which libreoffice runs (in one way or another) android suffers the
worst rendering performance. I would think, the other platforms can wait
since they are getting decent performance already. But i can see why you
would disagree with me on this.


  Also note that in tiled rendering, notions like copyArea are
  irrelevant, as by definition, each tile contains nothing of the
  neighboring tiles.

 The copyArea stuff is interesting; my hope is that we could get
 rid of
 that mess; however that intersects with some of the paint / timer work
 that is also planned for the interns - since we currently defer
 re-painting of various things to a timeout.


in our iOS implementation we solved the timer issues by considering them as
damaged areas, similar to areas changed by editing. Viewer only
functionality may not require this by default, but still, it can solve this
without getting rid of the timers. Still, i agree that in the long run, the
timer thing needs to go.



  1. what exactly is the thing that is already working on desktop?
  (explanation + code pointers)

 We have some nice cross-platform GL context creation going on that
 Markus created I believe (sadly he is away from a PC / E-mail from now)
 - which should be easy to re-use.


great!


  2. what are VCL plugins? Does VCL have a plugin infrastructure ? does
  it use dynamic linking (if so, it won't work for iOS)? it would be
  great if someone could direct me to some code pointers that show how
  this plugin infrastructure works

 The backends have the vcl/inc/ API including salgdi there to
 implement;
 but on Linux we can choose dynamically between many of these backends
 eg. KDE3, KDE4, GTK2, GTK3, raw-X etc.


got it


  3. I'm not sure if i saw the OpenGL development plan, so i'd be happy
  if anyone could direct me to it.

 I've just forwarded you some rough notes.


thanks.
i looked at them. Possibly, i will need a hands on review of it, to know
where CloudOn / myself can bulge in.



  I want to learn all there is to learn, so to be able to actively
  expedite this front (i.e hack the way myself)

 Sure - so I think one thing we need to get unwound (and that you
 identified and raised) is the issue of immediate rendering.

 If we go for immediate rendering; then we need to render to an
 off-screen frame-buffer, and then we can fool around with copyArea
 etc. ;-) [ this is not such a terrible thing to do of course but not
 ideal ].

Re: using eclipse c++ with libreoffice on windows


On 2014-09-17 12:07 PM, nicholas ferguson wrote:

Is anyone using eclipse c++ on windows for Libreoffice development?


I use Eclipse for doing Java work on LibreOffice where it works reasonably well, but it took me a long time to set it up 
for best results.


For C++ on Windows I have used Visual Studio and CodeLite in the past with reasonable results, but now I'm back to using 
Notepad++ and a cygwin bash window.



Disclaimer: http://www.peralex.com/disclaimer.html


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

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

 filter/source/svg/svgexport.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 91dc7f82db0d5645746ae0bb7115c5e2aa92eeac
Author: Noel Grandin n...@peralex.com
Date:   Wed Sep 17 11:02:55 2014 +0200

cid#736037 Missing break in switch

Change-Id: I4a982ebfd3864b5953bce4ddf90008706e0e49b9

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 2c42ff1..6cf6593 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2199,6 +2199,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo 
)
 default:
 break;
 }
+break;
 case SVXDATEFORMAT_C:   // 13.Feb 1996
 case SVXDATEFORMAT_D:   // 13.February 1996
 switch( eCurDateFormat )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 83963] New: PDF export from LibreOffice is not able to handle transparency of text fields

https://bugs.freedesktop.org/show_bug.cgi?id=83963

  Priority: medium
Bug ID: 83963
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: PDF export from LibreOffice is not able to handle
transparency of text fields
  Severity: major
Classification: Unclassified
OS: Linux (All)
  Reporter: push...@email.cz
  Hardware: x86-64 (AMD64)
Status: UNCONFIRMED
   Version: 4.3.1.2 release
 Component: Printing and PDF export
   Product: LibreOffice

Created attachment 106404
  -- https://bugs.freedesktop.org/attachment.cgi?id=106404action=edit
Source file for export

A text field with transparent background created in LibreOffice Writer is
exported to PDF without transparency. E. g. a text field with white background
colour set to 100% transparency is exported as a text field with white
background.

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 83963] PDF export from LibreOffice is not able to handle transparency of text fields

https://bugs.freedesktop.org/show_bug.cgi?id=83963

--- Comment #1 from Karel Hruska push...@email.cz ---
Created attachment 106405
  -- https://bugs.freedesktop.org/attachment.cgi?id=106405action=edit
Exported PDF without additional settings (broken)

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 83963] PDF export from LibreOffice is not able to handle transparency of text fields