[Libreoffice-commits] .: avmedia/source extensions/source sal/qa sd/source vcl/test

2012-01-24 Thread Thomas Arnhold
 avmedia/source/gstreamer/gstplayer.cxx|2 +-
 extensions/source/plugin/base/nfuncs.cxx  |6 +++---
 extensions/source/plugin/base/xplugin.cxx |4 ++--
 sal/qa/osl/socket/osl_Socket.cxx  |4 ++--
 sal/qa/osl/socket/osl_Socket2.cxx |4 ++--
 sd/source/filter/eppt/pptx-epptbase.cxx   |6 +++---
 vcl/test/dndtest.cxx  |   10 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 04b8bac4a9e8e251ca61c4373beb0f1df76b2d54
Author: Thomas Arnhold tho...@arnhold.org
Date:   Tue Jan 24 10:19:42 2012 +0100

finalize gcc 4.7 string literal operators

diff --git a/avmedia/source/gstreamer/gstplayer.cxx 
b/avmedia/source/gstreamer/gstplayer.cxx
index c394b50..a8d2642 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -380,7 +380,7 @@ void SAL_CALL Player::setMediaTime( double fTime )
 if( !isPlaying() )
 gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
 
-DBG( seek to: %SAL_PRIdINT64 ns original: %lf s, gst_position, 
fTime );
+DBG( seek to: % SAL_PRIdINT64  ns original: %lf s, gst_position, 
fTime );
 }
 }
 
diff --git a/extensions/source/plugin/base/nfuncs.cxx 
b/extensions/source/plugin/base/nfuncs.cxx
index 69b73f5..b06665b 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -56,7 +56,7 @@ void TRACE( char const * s )
 if (s_file)
 {
 oslThreadIdentifier t = osl_getThreadIdentifier(0);
-fprintf( s_file, log [t_id=%SAL_PRIuUINT32]: %s\n, t, s );
+fprintf( s_file, log [t_id=% SAL_PRIuUINT32 ]: %s\n, t, s );
 fflush( s_file );
 }
 }
@@ -67,7 +67,7 @@ void TRACEN( char const * s, long n )
 if (s_file)
 {
 oslThreadIdentifier t = osl_getThreadIdentifier(0);
-fprintf( s_file, log [t_id=%SAL_PRIuUINT32]: %s%ld\n, t, s, n );
+fprintf( s_file, log [t_id=% SAL_PRIuUINT32 ]: %s%ld\n, t, s, n );
 fflush( s_file );
 }
 }
@@ -78,7 +78,7 @@ void TRACES( char const* s, char const* s2 )
 if (s_file)
 {
 oslThreadIdentifier t = osl_getThreadIdentifier(0);
-fprintf( s_file, log [t_id=%SAL_PRIuUINT32]: %s %s\n, t, s, s2 );
+fprintf( s_file, log [t_id=% SAL_PRIuUINT32 ]: %s %s\n, t, s, s2 );
 fflush( s_file );
 }
 }
diff --git a/extensions/source/plugin/base/xplugin.cxx 
b/extensions/source/plugin/base/xplugin.cxx
index 0a9618d..263cb4e 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -751,7 +751,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString 
mimetype,
 fprintf( stderr,
  new stream \%s\ of MIMEType \%s\\n
  for plugin \%s\\n
- seekable = %s, length = %SAL_PRIdINT32\n,
+ seekable = %s, length = % SAL_PRIdINT32 \n,
  aURL.getStr(), aMIME.getStr(), 
getPluginComm()-getLibName().getStr(),
  isfile ? true : false, length );
 
@@ -862,7 +862,7 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32 
nY_, sal_Int32 nWidth_,
 Guard Mutex  aGuard( m_aMutex );
 
 #if OSL_DEBUG_LEVEL  1
-fprintf( stderr, XPlugin_Impl::setPosSize( %SAL_PRIdINT32, 
%SAL_PRIdINT32, %SAL_PRIdINT32, %SAL_PRIdINT32, %d )\n,
+fprintf( stderr, XPlugin_Impl::setPosSize( % SAL_PRIdINT32 , % 
SAL_PRIdINT32 , % SAL_PRIdINT32 , % SAL_PRIdINT32 , %d )\n,
  nX_, nY_, nWidth_, nHeight_, nFlags );
 #endif
 
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index 967c1fc..1c3b212 100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -2470,7 +2470,7 @@ namespace osl_Socket
 // on Linux, the value of option is 1, on Solaris, it's 16, but 
it's not important the exact value,
 // just judge it is zero or not!
 sal_Bool bOK = ( 0  !=  *pGetBuffer );
-t_print(#setOption_001: getOption is %SAL_PRIdINT32 \n, 
*pGetBuffer);
+t_print(#setOption_001: getOption is % SAL_PRIdINT32  \n, 
*pGetBuffer);
 
 // toggle check, set to 0
 *pbDontRouteSet = 0;
@@ -2482,7 +2482,7 @@ namespace osl_Socket
 
 sal_Bool bOK2 = ( 0  ==  *pGetBuffer );
 
-t_print(#setOption_001: getOption is %SAL_PRIdINT32 \n, 
*pGetBuffer);
+t_print(#setOption_001: getOption is % SAL_PRIdINT32  \n, 
*pGetBuffer);
 
 // LLA: sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( 
sal_Bool ) );
 // LLA: *pbDontTouteSet = sal_True;
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx 
b/sal/qa/osl/socket/osl_Socket2.cxx
index 10e1c4b..ba2c1d6 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -1107,7 +1107,7 @@ namespace osl_Socket
 // on Linux, the value of option is 1, on Solaris, it's 16, but 
it's not important the exact value,

[Libreoffice-commits] .: connectivity/source

2012-01-24 Thread Thomas Arnhold
 connectivity/source/drivers/evoab2/NConnection.cxx |4 -
 connectivity/source/drivers/evoab2/NDebug.cxx  |   40 --
 connectivity/source/drivers/evoab2/NDebug.hxx  |   45 -
 connectivity/source/drivers/evoab2/NStatement.cxx  |   13 ++
 connectivity/source/drivers/evoab2/makefile.mk |1 
 5 files changed, 8 insertions(+), 95 deletions(-)

New commits:
commit e8d4222a1cf5770433d465441b35eced9b30f9b8
Author: Thomas Arnhold tho...@arnhold.org
Date:   Sun Jan 22 14:20:52 2012 +0100

Remove evoab debug facility and use SAL_INFO

diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx 
b/connectivity/source/drivers/evoab2/NConnection.cxx
index f3e5313..896d34f 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -36,8 +36,8 @@
 #include comphelper/extract.hxx
 #include connectivity/dbexception.hxx
 #include comphelper/processfactory.hxx
-#include NDebug.hxx
 #include comphelper/sequence.hxx
+#include rtl/oustringostreaminserter.hxx
 
 using namespace connectivity::evoab;
 using namespace dbtools;
@@ -105,7 +105,7 @@ IMPLEMENT_SERVICE_INFO(OEvoabConnection, 
com.sun.star.sdbc.drivers.evoab.Connec
 void OEvoabConnection::construct(const ::rtl::OUString url, const Sequence 
PropertyValue  info)  throw(SQLException)
 {
 osl_incrementInterlockedCount( m_refCount );
-EVO_TRACE_STRING(OEvoabConnection::construct()::url = %s\n, url );
+SAL_INFO(evoab2, OEvoabConnection::construct()::url =   url );
 
  ::rtl::OUString sPassword;
 const char* pPwd= password;
diff --git a/connectivity/source/drivers/evoab2/NDebug.cxx 
b/connectivity/source/drivers/evoab2/NDebug.cxx
deleted file mode 100644
index 6fa7af3..000
--- a/connectivity/source/drivers/evoab2/NDebug.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
- /*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include NDebug.hxx
-#include osl/diagnose.h
-#if OSL_DEBUG_LEVEL  1
-void evo_traceStringMessage( const sal_Char *pFormat,
- const ::rtl::OUString rString )
-{
-rtl::OString aStr(::rtl::OUStringToOString(rString, 
RTL_TEXTENCODING_UTF8));
-OSL_TRACE(pFormat, aStr.getStr());
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NDebug.hxx 
b/connectivity/source/drivers/evoab2/NDebug.hxx
deleted file mode 100644
index 95ba056..000
--- a/connectivity/source/drivers/evoab2/NDebug.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
- /*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- 

[Libreoffice-commits] .: configure.in

2012-01-24 Thread Tor Lillqvist
 configure.in |   88 +--
 1 file changed, 44 insertions(+), 44 deletions(-)

New commits:
commit 066283f43b792234ab2833ef8d1052b02517d55b
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jan 24 11:15:46 2012 +0200

Indent the postgresql stuff consistently like the rest of the file

diff --git a/configure.in b/configure.in
index 2f7bd61..ac986f6 100644
--- a/configure.in
+++ b/configure.in
@@ -6121,59 +6121,59 @@ dnl 
===
 if test x$enable_postgresql_sdbc != xno; then
 SCPDEFS=$SCPDEFS -DWITH_POSTGRESQL_SDBC
 
-# if/when anything else than PostgreSQL uses Kerberos,
-# move this out of `test x$enable_postgresql_sdbc != xno'
-WITH_KRB5=NO
-WITH_GSSAPI=no
-case $_os in
-  Darwin)
-# MacOS X has system MIT Kerberos 5 since 10.4
-if test $with_krb5 != no; then
-  WITH_KRB5=YES
-  AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' 
com_err 'com_err -lssl -lcrypto'], [],
-[AC_MSG_ERROR([could not find function 'com_err' required 
for Kerberos 5])])
-  AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
-[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
-fi
-if test $with_gssapi != no; then
-  WITH_GSSAPI=YES
-  AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 
-lcrypto'], [],
- [AC_MSG_ERROR([could not find function 
'gss_init_sec_context' required for GSSAPI])])
-fi
-   ;;
-  WINNT)
-   if test $with_krb5 = yes || $with_gssapi = yes; then
-  AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Microsoft 
Windows.])
-   fi
-  ;;
-  *)
-if test $with_krb5 = yes; then
-  WITH_KRB5=YES
-  AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' 
com_err 'com_err -lssl -lcrypto'], [],
-[AC_MSG_ERROR([could not find function 'com_err' required 
for Kerberos 5])])
-  AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
-[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
-fi
-if test $with_gssapi = yes; then
-  WITH_GSSAPI=YES
-  AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 
-lcrypto'], [],
- [AC_MSG_ERROR([could not find function 
'gss_init_sec_context' required for GSSAPI])])
-fi
-esac
+# if/when anything else than PostgreSQL uses Kerberos,
+# move this out of `test x$enable_postgresql_sdbc != xno'
+WITH_KRB5=NO
+WITH_GSSAPI=no
+case $_os in
+Darwin)
+# MacOS X has system MIT Kerberos 5 since 10.4
+if test $with_krb5 != no; then
+WITH_KRB5=YES
+AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' 
com_err 'com_err -lssl -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 'com_err' required for 
Kerberos 5])])
+AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
+[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
+fi
+if test $with_gssapi != no; then
+  WITH_GSSAPI=YES
+  AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 
-lcrypto'], [],
+[AC_MSG_ERROR([could not find function 'gss_init_sec_context' 
required for GSSAPI])])
+fi
+;;
+WINNT)
+if test $with_krb5 = yes || $with_gssapi = yes; then
+AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on 
Microsoft Windows.])
+fi
+;;
+*)
+if test $with_krb5 = yes; then
+WITH_KRB5=YES
+AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' 
com_err 'com_err -lssl -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 'com_err' required for 
Kerberos 5])])
+AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
+[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
+fi
+if test $with_gssapi = yes; then
+WITH_GSSAPI=YES
+AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi 
-lkrb5 -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 'gss_init_sec_context' 
required for GSSAPI])])
+fi
+esac
 
 AC_MSG_CHECKING([PostgreSQL C interface])
 if test $with_system_postgresql = yes; then
 AC_MSG_RESULT([external PostgreSQL])
 SYSTEM_POSTGRESQL=YES
 if test $_os = Darwin; then
-   supp_path=''
-   for d in /Library/PostgreSQL/9.*/bin /sw/opt/postgresql/9.*/bin 
/opt/local/lib/postgresql9*/bin; do
-pg_supp_path=$P_SEP$d$pg_supp_path
-   done
+  

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - setup_native/source

2012-01-24 Thread Stephan Bergmann
 setup_native/source/packinfo/packinfo_office.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 19006c6644e2469561a5053506dd26164aef0dee
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jan 24 10:51:13 2012 +0100

Trivial description fix of previous fix (extension - driver).

diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 0ebc0b4..34cfbc8 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1269,7 +1269,7 @@ requires = %BASISPACKAGEPREFIX%PRODUCTVERSION-base
 copyright = 2000-2008 by Sun Microsystems, Inc.; 2011 by Lionel Elie Mamane 
and other LibreOffice contributors
 solariscopyright = solariscopyrightfile
 vendor = The Document Foundation
-description = PostgreSQL Connector extension for %PRODUCTNAME %PRODUCTVERSION
+description = PostgreSQL Connector driver for %PRODUCTNAME %PRODUCTVERSION
 destpath = /opt
 packageversion = %PACKAGEVERSION
 End
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: setup_native/source

2012-01-24 Thread Stephan Bergmann
 setup_native/source/packinfo/packinfo_office.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 229eb2e9dec3c54fa2b73b968d61985e5528edbf
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jan 24 10:53:09 2012 +0100

Trivial description fix of previous fix (extension - driver).

diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index b85a038..97127ef 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1223,7 +1223,7 @@ requires = %BASISPACKAGEPREFIX%PRODUCTVERSION-base
 copyright = 2000-2008 by Sun Microsystems, Inc.; 2011 by Lionel Elie Mamane 
and other LibreOffice contributors
 solariscopyright = solariscopyrightfile
 vendor = The Document Foundation
-description = PostgreSQL Connector extension for %PRODUCTNAME %PRODUCTVERSION
+description = PostgreSQL Connector driver for %PRODUCTNAME %PRODUCTVERSION
 destpath = /opt
 packageversion = %PACKAGEVERSION
 End
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extras/source

2012-01-24 Thread Michael Meeks
 extras/source/truetype/symbol/OpenSymbol.sfd |  335 +--
 extras/source/truetype/symbol/opens___.ttf   |binary
 2 files changed, 167 insertions(+), 168 deletions(-)

New commits:
commit 8493377235b06c2ac552bef69dfcd7c42f3b3cd9
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Sat Jan 7 08:15:45 2012 -0200

Fix for bug fdo#44110, New Math symbols issues in Windows

This patch fixes the rendering issues in Windows for the new Math symbols 
for game theory.
The precsim and succsim symbols were truncated. They have been shifted 
upward.

File OpenSymbol.sfd with only the characters touched (at the end of the 
file)
File opens.ttf generated from OpenSymbol.sfd (fontforge)

Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd 
b/extras/source/truetype/symbol/OpenSymbol.sfd
index 49b35f1..a2169dc 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -107379,10 +107379,10 @@ Validated: 1
 EndChar
 
 StartChar: uni227A
-Encoding: 993 8826 993
+Encoding: 8826 8826 995
 Width: 1628
+GlyphClass: 2
 Flags: W
-HStem: -12 21G1300.5 1387 495 134241 540.469
 LayerCount: 2
 Fore
 SplineSet
@@ -107399,12 +107399,12 @@ SplineSet
  910 502 910 502 1113 386 c 128,-1,14
  1316 270 1316 270 1387 147 c 1,0,-1
 EndSplineSet
-Validated: 1
 EndChar
 
 StartChar: uni227B
-Encoding: 994 8827 994
+Encoding: 8827 8827 996
 Width: 1628
+GlyphClass: 2
 Flags: W
 LayerCount: 2
 Fore
@@ -107422,213 +107422,212 @@ SplineSet
  718 522 718 522 515 406 c 128,-1,14
  312 290 312 290 241 167 c 1,0,-1
 EndSplineSet
-Validated: 1
 EndChar
 
 StartChar: uni227C
-Encoding: 995 8828 995
+Encoding: 8828 8828 997
 Width: 1628
-Flags: W
+GlyphClass: 2
+Flags: HWO
 LayerCount: 2
 Fore
 SplineSet
-1385 153 m 5,0,-1
- 1385 -5 l 5,1,2
- 1213 225 1213 225 903.5 349 c 132,-1,3
- 594 473 594 473 243 500 c 5,4,-1
- 243 635 l 5,5,6
- 594 662 594 662 903.5 786 c 132,-1,7
- 1213 910 1213 910 1385 1139 c 5,8,-1
- 1385 981 l 5,9,10
- 1313 858 1313 858  742.5 c 132,-1,11
- 909 627 909 627 700 567 c 5,12,13
- 909 508 909 508  392 c 132,-1,14
- 1313 276 1313 276 1385 153 c 5,0,-1
-1385 -234 m 5,15,-1
- 1385 -394 l 5,16,17
- 1285 -269 1285 -269 1134 -171.5 c 132,-1,18
- 983 -74 983 -74 820 -21 c 132,-1,19
- 657 32 657 32 515.5 61 c 132,-1,20
- 374 90 374 90 243 98 c 5,21,-1
- 243 233 l 5,22,23
- 544 221 544 221 866 105 c 132,-1,24
- 1188 -11 1188 -11 1385 -234 c 5,15,-1
+1385 238 m 5,0,-1
+ 1385 80 l 5,1,2
+ 1213 310 1213 310 903.5 434 c 132,-1,3
+ 594 558 594 558 243 585 c 5,4,-1
+ 243 720 l 5,5,6
+ 594 747 594 747 903.5 871 c 132,-1,7
+ 1213 995 1213 995 1385 1224 c 5,8,-1
+ 1385 1066 l 5,9,10
+ 1313 943 1313 943  827.5 c 132,-1,11
+ 909 712 909 712 700 652 c 5,12,13
+ 909 593 909 593  477 c 132,-1,14
+ 1313 361 1313 361 1385 238 c 5,0,-1
+1385 -149 m 5,15,-1
+ 1385 -309 l 5,16,17
+ 1285 -184 1285 -184 1134 -86.5 c 132,-1,18
+ 983 11 983 11 820 64 c 132,-1,19
+ 657 117 657 117 515.5 146 c 132,-1,20
+ 374 175 374 175 243 183 c 5,21,-1
+ 243 318 l 5,22,23
+ 544 306 544 306 866 190 c 132,-1,24
+ 1188 74 1188 74 1385 -149 c 5,15,-1
 EndSplineSet
-Validated: 1
 EndChar
 
 StartChar: uni227D
-Encoding: 996 8829 996
+Encoding: 8829 8829 998
 Width: 1628
-Flags: W
+GlyphClass: 2
+Flags: HWO
 LayerCount: 2
 Fore
 SplineSet
-243 153 m 1,0,-1
- 243 -5 l 1,1,2
- 415 225 415 225 724.5 349 c 128,-1,3
- 1034 473 1034 473 1385 500 c 1,4,-1
- 1385 635 l 1,5,6
- 1034 662 1034 662 724.5 786 c 128,-1,7
- 415 910 415 910 243 1139 c 1,8,-1
- 243 981 l 1,9,10
- 315 858 315 858 517 742.5 c 128,-1,11
- 719 627 719 627 928 567 c 1,12,13
- 719 508 719 508 517 392 c 128,-1,14
- 315 276 315 276 243 153 c 1,0,-1
-243 -234 m 1,15,-1
- 243 -394 l 1,16,17
- 343 -269 343 -269 494 -171.5 c 128,-1,18
- 645 -74 645 -74 808 -21 c 128,-1,19
- 971 32 971 32 1112.5 61 c 128,-1,20
- 1254 90 1254 90 1385 98 c 1,21,-1
- 1385 233 l 1,22,23
- 1084 221 1084 221 762 105 c 128,-1,24
- 440 -11 440 -11 243 -234 c 1,15,-1
+243 238 m 5,0,-1
+ 243 80 l 5,1,2
+ 415 310 415 310 724.5 434 c 132,-1,3
+ 1034 558 1034 558 1385 585 c 5,4,-1
+ 1385 720 l 5,5,6
+ 1034 747 1034 747 724.5 871 c 132,-1,7
+ 415 995 415 995 243 1224 c 5,8,-1
+ 243 1066 l 5,9,10
+ 315 943 315 943 517 827.5 c 132,-1,11
+ 719 712 719 712 928 652 c 5,12,13
+ 719 593 719 593 517 477 c 132,-1,14
+ 315 361 315 361 243 238 c 5,0,-1
+243 -149 m 5,15,-1
+ 243 -309 l 5,16,17
+ 343 -184 343 -184 494 -86.5 c 132,-1,18
+ 645 11 645 11 808 64 c 132,-1,19
+ 971 117 971 117 1112.5 146 c 132,-1,20
+ 1254 175 1254 175 1385 183 c 5,21,-1
+ 1385 318 l 5,22,23
+ 1084 306 1084 306 762 190 c 132,-1,24
+ 440 74 440 74 243 -149 c 5,15,-1
 EndSplineSet
-Validated: 1
 EndChar
 
 StartChar: uni227E
-Encoding: 997 8830 997
+Encoding: 8830 8830 999
 Width: 1628
-Flags: W
-LayerCount: 2
-Fore
-SplineSet
-1355 150 m 5,0,-1
- 1355 0 l 5,1,2
- 1191 218 1191 218 896.5 336.5 c 132,-1,3
- 

[Libreoffice-commits] .: sc/source solenv/bin

2012-01-24 Thread Noel Power
 sc/source/ui/app/inputwin.cxx |   15 +++
 sc/source/ui/inc/inputwin.hxx |1 +
 solenv/bin/ooinstall  |2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 1f0ba007489e77e4145fc840cc3a878772494fd7
Author: Noel Power noel.po...@novell.com
Date:   Tue Jan 24 10:40:21 2012 +

fix ( hopefully ) viewing artifacts in input line fdo#44391

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index f6404a7..1ae727c 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1125,7 +1125,8 @@ ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen, 
ScTabViewShell* pViewSh
 ScTextWnd( pParen, pViewSh ),
 mrGroupBar(* pParen ),
 mnLines( 1 ),
-mnLastExpandedLines( INPUTWIN_MULTILINES )
+mnLastExpandedLines( INPUTWIN_MULTILINES ),
+mbInvalidate( false )
 {
 nTextStartPos = TEXT_MULTI_STARTPOS;
 }
@@ -1138,7 +1139,14 @@ void ScMultiTextWnd::Paint( const Rectangle rRec )
 {
 EditView* pView = GetEditView();
 if ( pView )
-pView-Paint( rRec );
+{
+if ( mbInvalidate )
+{
+pView-Invalidate();
+mbInvalidate = false;
+}
+pEditView-Paint( rRec );
+}
 }
 
 EditView* ScMultiTextWnd::GetEditView()
@@ -1403,8 +1411,7 @@ void ScMultiTextWnd::SetTextString( const String 
rNewString )
 // inputbar window scrolled to the bottom if we do that here ( because the 
tableview and topview
 // are synced I guess ).
 // should fix that I suppose :-/ need to look a bit further into that
-if ( pEditView )
-pEditView-Invalidate();
+mbInvalidate = true; // ensure next Paint ( that uses editengine ) call 
will call Invalidate first
 ScTextWnd::SetTextString( rNewString );
 SetScrollBarRange();
 DoScroll();
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 7b5bc28..eec7fed 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -204,6 +204,7 @@ private:
 ScInputBarGroup mrGroupBar;
 long mnLines;
 long mnLastExpandedLines;
+bool mbInvalidate;
 };
 
 class ScInputBarGroup : public ScTextWndBase
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 794e81b..3b60909 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -50,7 +50,7 @@ for $arg (@ARGV) {
$path = Cwd::realpath( $ENV{DESTDIR} . $arg );
if (!$do_link) {
my $destdir = Cwd::realpath( $ENV{DESTDIR} );
-   $path =~ s|$destdir||;
+#  $path =~ s|$destdir||;
}
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 2 commits - solenv/bin

2012-01-24 Thread Noel Power
 solenv/bin/ooinstall |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f00b387faeca2902909ce181f2f772a51ec4527f
Author: Noel Power noel.po...@novell.com
Date:   Tue Jan 24 11:14:38 2012 +

fix ( hopefully ) viewing artifacts in input line fdo#44391

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index f6404a7..1ae727c 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1125,7 +1125,8 @@ ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen, 
ScTabViewShell* pViewSh
 ScTextWnd( pParen, pViewSh ),
 mrGroupBar(* pParen ),
 mnLines( 1 ),
-mnLastExpandedLines( INPUTWIN_MULTILINES )
+mnLastExpandedLines( INPUTWIN_MULTILINES ),
+mbInvalidate( false )
 {
 nTextStartPos = TEXT_MULTI_STARTPOS;
 }
@@ -1138,7 +1139,14 @@ void ScMultiTextWnd::Paint( const Rectangle rRec )
 {
 EditView* pView = GetEditView();
 if ( pView )
-pView-Paint( rRec );
+{
+if ( mbInvalidate )
+{
+pView-Invalidate();
+mbInvalidate = false;
+}
+pEditView-Paint( rRec );
+}
 }
 
 EditView* ScMultiTextWnd::GetEditView()
@@ -1403,8 +1411,7 @@ void ScMultiTextWnd::SetTextString( const String 
rNewString )
 // inputbar window scrolled to the bottom if we do that here ( because the 
tableview and topview
 // are synced I guess ).
 // should fix that I suppose :-/ need to look a bit further into that
-if ( pEditView )
-pEditView-Invalidate();
+mbInvalidate = true; // ensure next Paint ( that uses editengine ) call 
will call Invalidate first
 ScTextWnd::SetTextString( rNewString );
 SetScrollBarRange();
 DoScroll();
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 7b5bc28..eec7fed 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -204,6 +204,7 @@ private:
 ScInputBarGroup mrGroupBar;
 long mnLines;
 long mnLastExpandedLines;
+bool mbInvalidate;
 };
 
 class ScInputBarGroup : public ScTextWndBase
commit e8681bede97a64d03eaa01556d19f5822f898c26
Author: Noel Power noel.po...@novell.com
Date:   Tue Jan 24 11:13:04 2012 +

Revert fix ( hopefully ) viewing artifacts in input line fdo#44391

This reverts commit 1f0ba007489e77e4145fc840cc3a878772494fd7.

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 1ae727c..f6404a7 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1125,8 +1125,7 @@ ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen, 
ScTabViewShell* pViewSh
 ScTextWnd( pParen, pViewSh ),
 mrGroupBar(* pParen ),
 mnLines( 1 ),
-mnLastExpandedLines( INPUTWIN_MULTILINES ),
-mbInvalidate( false )
+mnLastExpandedLines( INPUTWIN_MULTILINES )
 {
 nTextStartPos = TEXT_MULTI_STARTPOS;
 }
@@ -1139,14 +1138,7 @@ void ScMultiTextWnd::Paint( const Rectangle rRec )
 {
 EditView* pView = GetEditView();
 if ( pView )
-{
-if ( mbInvalidate )
-{
-pView-Invalidate();
-mbInvalidate = false;
-}
-pEditView-Paint( rRec );
-}
+pView-Paint( rRec );
 }
 
 EditView* ScMultiTextWnd::GetEditView()
@@ -1411,7 +1403,8 @@ void ScMultiTextWnd::SetTextString( const String 
rNewString )
 // inputbar window scrolled to the bottom if we do that here ( because the 
tableview and topview
 // are synced I guess ).
 // should fix that I suppose :-/ need to look a bit further into that
-mbInvalidate = true; // ensure next Paint ( that uses editengine ) call 
will call Invalidate first
+if ( pEditView )
+pEditView-Invalidate();
 ScTextWnd::SetTextString( rNewString );
 SetScrollBarRange();
 DoScroll();
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index eec7fed..7b5bc28 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -204,7 +204,6 @@ private:
 ScInputBarGroup mrGroupBar;
 long mnLines;
 long mnLastExpandedLines;
-bool mbInvalidate;
 };
 
 class ScInputBarGroup : public ScTextWndBase
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 3b60909..794e81b 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -50,7 +50,7 @@ for $arg (@ARGV) {
$path = Cwd::realpath( $ENV{DESTDIR} . $arg );
if (!$do_link) {
my $destdir = Cwd::realpath( $ENV{DESTDIR} );
-#  $path =~ s|$destdir||;
+   $path =~ s|$destdir||;
}
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 2 commits - canvas/source solenv/gdb

2012-01-24 Thread David Tardon
 canvas/source/tools/spriteredrawmanager.cxx |3 ++-
 solenv/gdb/libreoffice/sal.py   |1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f933735c1cd7f1fad71c300fdb14baebdc62e1bd
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 24 12:03:11 2012 +0100

make slide transitions work

diff --git a/canvas/source/tools/spriteredrawmanager.cxx 
b/canvas/source/tools/spriteredrawmanager.cxx
index 2af5b34..91b81c5 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -277,7 +277,8 @@ namespace canvas
 
 VectorOfSprites::iterator aEnd=
 ::std::unique( aUpdatableSprites.begin(),
-   aUpdatableSprites.end() );
+   aUpdatableSprites.end(),
+   aSpriteComparator );
 
 // for each unique sprite, check the change event vector,
 // calculate the update operation from that, and add the
commit efe48e57e986d03c388668e5955ded4f563d3a61
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 24 11:51:18 2012 +0100

remove debugging print

diff --git a/solenv/gdb/libreoffice/sal.py b/solenv/gdb/libreoffice/sal.py
index 15cebe8..df87ed5 100644
--- a/solenv/gdb/libreoffice/sal.py
+++ b/solenv/gdb/libreoffice/sal.py
@@ -83,7 +83,6 @@ class RtlReferencePrinter(object):
 self.val = val
 
 def to_string(self):
-print(RtlReferencePrinter:to_string)
 pointee = self.val['m_pBody']
 if pointee:
 val = pointee.dereference()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: basic/source

2012-01-24 Thread Noel Power
 basic/source/sbx/sbxvalue.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 68a55b78362209fb6244ed31e23042af60c39c85
Author: Noel Power noel.po...@novell.com
Date:   Tue Jan 24 12:27:19 2012 +

tweak treatment of '+/-' operators when dealing with Date types

Any '+' operation involving Date types results in a Date, '-' of a Date 
type results in a Date except if both LHS  RHS are Date(s)

diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index e67335c..f4aab28 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1272,10 +1272,15 @@ Lbl_OpIsDouble:
 SetError( SbxERR_NOTIMP );
 }
 // Date with + or - needs special handling that
-// forces the Date type ( except if lhs AND rhs are already
-// Date types
-if( ( eOp == SbxPLUS || eOp == SbxMINUS )  ( ( GetType() 
== SbxDATE || rOp.GetType() == SbxDATE )  ( GetType() != rOp.GetType() ) ) )
-aL.eType = SbxDATE;
+// forces the Date type. If the operation is '+' the
+// result is always a Date, if '-' the result is only
+// a Date if one of lhs or rhs ( but not both ) is already
+// a Date
+if( ( GetType() == SbxDATE || rOp.GetType() == SbxDATE ) )
+{
+if( eOp == SbxPLUS  || ( ( eOp == SbxMINUS )   ( 
GetType() != rOp.GetType() ) ) )
+aL.eType = SbxDATE;
+}
 
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

2012-01-24 Thread Markus Mohrhard
 sc/source/ui/app/inputwin.cxx |   15 +++
 sc/source/ui/inc/inputwin.hxx |1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 4fa27dfc0e67adb298bbb412657958908433d547
Author: Noel Power noel.po...@novell.com
Date:   Tue Jan 24 11:14:38 2012 +

fix ( hopefully ) viewing artifacts in input line fdo#44391

Signed-off-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 1793fae..37caced 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1125,7 +1125,8 @@ ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen, 
ScTabViewShell* pViewSh
 ScTextWnd( pParen, pViewSh ),
 mrGroupBar(* pParen ),
 mnLines( 1 ),
-mnLastExpandedLines( INPUTWIN_MULTILINES )
+mnLastExpandedLines( INPUTWIN_MULTILINES ),
+mbInvalidate( false )
 {
 nTextStartPos = TEXT_MULTI_STARTPOS;
 }
@@ -1138,7 +1139,14 @@ void ScMultiTextWnd::Paint( const Rectangle rRec )
 {
 EditView* pView = GetEditView();
 if ( pView )
-pView-Paint( rRec );
+{
+if ( mbInvalidate )
+{
+pView-Invalidate();
+mbInvalidate = false;
+}
+pEditView-Paint( rRec );
+}
 }
 
 EditView* ScMultiTextWnd::GetEditView()
@@ -1403,8 +1411,7 @@ void ScMultiTextWnd::SetTextString( const String 
rNewString )
 // inputbar window scrolled to the bottom if we do that here ( because the 
tableview and topview
 // are synced I guess ).
 // should fix that I suppose :-/ need to look a bit further into that
-if ( pEditView )
-pEditView-Invalidate();
+mbInvalidate = true; // ensure next Paint ( that uses editengine ) call 
will call Invalidate first
 ScTextWnd::SetTextString( rNewString );
 SetScrollBarRange();
 DoScroll();
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 7b5bc28..eec7fed 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -204,6 +204,7 @@ private:
 ScInputBarGroup mrGroupBar;
 long mnLines;
 long mnLastExpandedLines;
+bool mbInvalidate;
 };
 
 class ScInputBarGroup : public ScTextWndBase
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-5' - desktop/Executable_soffice.bin.mk desktop/Module_desktop.mk desktop/util desktop/WinResTarget_sofficebin.mk desktop/WinResTarget_soffice.mk officecf

2012-01-24 Thread Fridrich Strba
 desktop/Executable_soffice.bin.mk  
  |2 
 desktop/Module_desktop.mk  
  |1 
 desktop/WinResTarget_soffice.mk
  |2 
 desktop/WinResTarget_sofficebin.mk 
  |   49 ++
 desktop/util/officeloader.rc   
  |   36 +--
 officecfg/registry/data/org/openoffice/Setup.xcu   
  |   22 ++--
 reportbuilder/registry/data/org/openoffice/Setup.xcu   
  |2 
 scp2/inc/macros.inc
  |2 
 scp2/source/base/registryitem_base.scp 
  |2 
 scp2/source/binfilter/registryitem_binfilter.scp   
  |   16 +--
 scp2/source/calc/registryitem_calc.scp 
  |   26 ++---
 scp2/source/draw/registryitem_draw.scp 
  |   12 +-
 scp2/source/impress/registryitem_impress.scp   
  |   28 ++---
 scp2/source/math/registryitem_math.scp 
  |8 -
 scp2/source/ooo/registryitem_ooo.scp   
  |4 
 scp2/source/writer/registryitem_writer.scp 
  |   32 +++---
 
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
 |   17 +--
 
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
 |1 
 setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx  
  |4 
 sfx2/source/appl/shutdowniconunx.cxx   
  |6 -
 sfx2/source/appl/shutdowniconw32.cxx   
  |   18 +--
 vcl/inc/svids.hrc  
  |8 -
 vcl/inc/vcl/syswin.hxx 
  |   16 +--
 vcl/unx/generic/window/salframe.cxx
  |2 
 24 files changed, 166 insertions(+), 150 deletions(-)

New commits:
commit 842f11cc651f2ab077f46323d260987de190ff57
Author: Andras Timar ati...@suse.com
Date:   Wed Jan 18 13:11:11 2012 +0100

fdo#37740 remove duplicate icons from soffice.bin/soffice.exe

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/desktop/Executable_soffice.bin.mk 
b/desktop/Executable_soffice.bin.mk
index a4aa573..7e168aa 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -102,6 +102,6 @@ $(eval $(call gb_Executable_set_ldflags,\
 
 endif
 
-$(eval $(call gb_Executable_add_nativeres,$(sofficebin),soffice/src)) 
+$(eval $(call gb_Executable_add_nativeres,$(sofficebin),sofficebin/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 7ce47f7..dd18d73 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
 WinResTarget_sdraw \
 WinResTarget_simpress \
 WinResTarget_soffice \
+WinResTarget_sofficebin \
 WinResTarget_smath \
 WinResTarget_sweb \
 WinResTarget_swriter \
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index b15..fe66aa5 100644
--- a/desktop/WinResTarget_soffice.mk
+++ b/desktop/WinResTarget_soffice.mk
@@ -44,6 +44,6 @@ $(eval $(call gb_WinResTarget_add_dependency,soffice/src,\
 sysui/desktop/icons/main_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/util/officeloader))
+$(eval $(call 
gb_WinResTarget_add_file,soffice/src,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_sofficebin.mk 
b/desktop/WinResTarget_sofficebin.mk
new file mode 100644
index 000..334c9b7
--- /dev/null
+++ b/desktop/WinResTarget_sofficebin.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights 

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - xmloff/source

2012-01-24 Thread Petr Mladek
 xmloff/source/text/txtparae.cxx |   32 +---
 1 file changed, 21 insertions(+), 11 deletions(-)

New commits:
commit 31c8d797c40644e73f119b59c596432ffb6cf7ae
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jan 20 13:45:54 2012 +0100

rhbz#746174: also export list restart for non root list

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 40d4203..18f078a 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -916,8 +916,8 @@ void XMLTextParagraphExport::exportListChange(
 // Thus, for other document types sListId is empty.
 const ::rtl::OUString sListId( rNextInfo.GetListId() );
 bool bExportListStyle( true );
-bool bRestartNumberingAtContinuedRootList( false );
-sal_Int16 nRestartValueForContinuedRootList( -1 );
+bool bRestartNumberingAtContinuedList( false );
+sal_Int32 nRestartValueForContinuedList( -1 );
 bool bContinueingPreviousSubList = !bRootListToBeStarted 

rNextInfo.IsContinueingPreviousSubTree();
 do {
@@ -990,9 +990,9 @@ void XMLTextParagraphExport::exportListChange(
  ( nListLevelsToBeOpened != 1 ||
!rNextInfo.HasStartValue() ) )
 {
-bRestartNumberingAtContinuedRootList = true;
-nRestartValueForContinuedRootList =
-
rNextInfo.GetListLevelStartValue();
+bRestartNumberingAtContinuedList = true;
+nRestartValueForContinuedList =
+rNextInfo.GetListLevelStartValue();
 }
 }
 
@@ -1013,6 +1013,18 @@ void XMLTextParagraphExport::exportListChange(
 GetExport().AddAttribute( XML_NAMESPACE_TEXT, 
XML_STYLE_NAME,
 GetExport().EncodeStyleName( sListStyleName ) );
 bExportListStyle = false;
+
+
+}
+else
+{
+// rhbz#746174: also export list restart for non root list
+if (rNextInfo.IsRestart()  !rNextInfo.HasStartValue())
+{
+bRestartNumberingAtContinuedList = true;
+nRestartValueForContinuedList =
+rNextInfo.GetListLevelStartValue();
+}
 }
 
 if ( bContinueingPreviousSubList )
@@ -1041,9 +1053,7 @@ void XMLTextParagraphExport::exportListChange(
 // text:list-header or text:list-item
 GetExport().CheckAttrList();
 
-/* Export start value in case of 
bRestartNumberingAtContinuedRootList
-   at correct list item (#i97309#)
-*/
+/* Export start value at correct list item (#i97309#) */
 if ( nListLevelsToBeOpened == 1 )
 {
 if ( rNextInfo.HasStartValue() )
@@ -1053,14 +1063,14 @@ void XMLTextParagraphExport::exportListChange(
 GetExport().AddAttribute( XML_NAMESPACE_TEXT, 
XML_START_VALUE,
   aBuffer.makeStringAndClear() );
 }
-else if ( bRestartNumberingAtContinuedRootList )
+else if (bRestartNumberingAtContinuedList)
 {
 OUStringBuffer aBuffer;
-aBuffer.append( 
(sal_Int32)nRestartValueForContinuedRootList );
+aBuffer.append( nRestartValueForContinuedList );
 GetExport().AddAttribute( XML_NAMESPACE_TEXT,
   XML_START_VALUE,
   aBuffer.makeStringAndClear() 
);
-bRestartNumberingAtContinuedRootList = false;
+bRestartNumberingAtContinuedList = false;
 }
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: officecfg/registry

2012-01-24 Thread Andras Timar
 officecfg/registry/data/org/openoffice/VCL.xcu |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 82e0266b05dd53d0ce8b12bd5c76ae25872b87a9
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 24 14:56:35 2012 +0100

country code 'IN' is not in use for these locales fdo#44208, fdo#45107

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index d4d5f0b..248e439 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -836,7 +836,7 @@
 valueLohit Nepali;Kalimati;Samanata;Sans/value
   /prop
 /node
-node oor:name=as-IN oor:op=replace
+node oor:name=as oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale 
Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -856,7 +856,7 @@
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=bn-IN oor:op=replace
+node oor:name=bn oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -876,7 +876,7 @@
 valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=hi-IN oor:op=replace
+node oor:name=hi oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial 
Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -896,7 +896,7 @@
 valueLohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=gu-IN oor:op=replace
+node oor:name=gu oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode 
MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -916,7 +916,7 @@
 valueLohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=kn-IN oor:op=replace
+node oor:name=kn oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode 
MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -936,7 +936,7 @@
 valueLohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=mai-IN oor:op=replace
+node oor:name=mai oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Maithili;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale 
Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -956,7 +956,7 @@
 valueLohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=ml-IN oor:op=replace
+node oor:name=ml oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueAnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida 
Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans 
Unicode;clearlyU/value
   /prop
@@ -976,7 +976,7 @@
 valueAnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS/value
   /prop
 /node
-node oor:name=mr-IN oor:op=replace
+node oor:name=mr oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Marathi;Tahoma;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -996,7 +996,7 @@
 valueLohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=or-IN oor:op=replace
+node oor:name=or oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueutkal;Kalinga;Lohit Oriya;Samyak Oriya;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -1036,7 +1036,7 @@
 valueRaavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial 
Unicode MS/value
   /prop
 /node
-node oor:name=ta-IN oor:op=replace
+node oor:name=ta oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Tamil;Latha;Sans Serif/value
   /prop
@@ -1056,7 +1056,7 @@
 valueLohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=te-IN oor:op=replace
+node oor:name=te oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode 
MS;Lucida Sans Unicode;clearlyU/value
   /prop

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - ucb/source

2012-01-24 Thread Petr Mladek
 ucb/source/ucp/webdav/LockEntrySequence.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3eff3abb4ea327b884a35e20bcaa3d371ce526f0
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Jan 16 20:45:44 2012 +0100

Fix Same expression on both sides of '||'

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/ucb/source/ucp/webdav/LockEntrySequence.cxx 
b/ucb/source/ucp/webdav/LockEntrySequence.cxx
index 49e5547..075af01 100644
--- a/ucb/source/ucp/webdav/LockEntrySequence.cxx
+++ b/ucb/source/ucp/webdav/LockEntrySequence.cxx
@@ -171,7 +171,7 @@ extern C int LockEntrySequence_endelement_callback(
 break;
 
 case STATE_LOCKENTRY:
-if ( !pCtx-hasType || !pCtx-hasType )
+if ( !pCtx-hasType || !pCtx-hasScope )
 return 1; // abort
 break;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: qadevOOo/runner

2012-01-24 Thread Thomas Arnhold
 qadevOOo/runner/convwatch/DBHelper.java |   42 --
 qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java |   45 --
 qadevOOo/runner/convwatch/StringHelper.java |  103 
 3 files changed, 190 deletions(-)

New commits:
commit 74a356c3464b56e94c2174a0e7a1d63de8f7071e
Author: Thomas Arnhold tho...@arnhold.org
Date:   Tue Jan 24 15:43:03 2012 +0100

dead java code in qa

diff --git a/qadevOOo/runner/convwatch/DBHelper.java 
b/qadevOOo/runner/convwatch/DBHelper.java
index e28fafb..719920b 100644
--- a/qadevOOo/runner/convwatch/DBHelper.java
+++ b/qadevOOo/runner/convwatch/DBHelper.java
@@ -200,54 +200,12 @@ public class DBHelper
 return null;
 }
 
-
-/**
- * This method removes all entries of the givenbr
- * module/platform combination
- * @param mdl the name of the module, e.g. sal
- * @param os the name of the platform, e.g. unxsols
- */
-// LLA: public static void SQLdeleteValues(Connection _aCon, String 
_sEnvironment, String _sUnitName, String _sMethodName, String _sCWS, String 
_sDate)
-// LLA: {
-// LLA: String sSQL =
-// LLA: DELETE FROM states WHERE  +
-// LLA:  unit= + DatabaseEntry.Quote(_sUnitName) +
-// LLA:  AND pf=   + DatabaseEntry.Quote (_sEnvironment) +
-// LLA:  AND meth= + DatabaseEntry.Quote (_sMethodName) +
-// LLA:  AND cws=  + DatabaseEntry.Quote(_sCWS) +
-// LLA:  AND dt=   + DatabaseEntry.Quote(_sDate);
-// LLA:
-// LLA: // ExecSQL(_aCon, sSQL);
-// LLA: }
-
 protected synchronized void ExecSQL(Connection _aCon, String _sSQL)
 {
 MySQLThread aSQLThread = new MySQLThread(_aCon, _sSQL);
 aSQLThread.start();
 }
 
-
-
-// public static int QueryIntFromSQL(String _sSQL, String _sColumnName, 
String _sValue)
-// {
-// boolean bNeedSecondTry = false;
-// int nValue = 0;
-// do
-// {
-// try
-// {
-// nValue = QueryIntFromSQL(_sSQL, _sColumnName, _sValue);
-// }
-// catch (ValueNotFoundException e)
-// {
-// bNeedSecondTry = true;
-// String sSQL = INSERT INTO  + _sTable + ( + 
_sColumnName + ) VALUES ( + _sValue + );
-// ExecSQL(sSQL);
-// }
-// } while (bNeedSecondTry);
-// return nValue;
-// }
-
 public int QueryIntFromSQL(Connection _aCon, String _sSQL, String 
_sColumnName)
 throws ValueNotFoundException
 {
diff --git a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java 
b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
index efce96c..7dde9cb 100644
--- a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
+++ b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
@@ -68,23 +68,9 @@ public class GraphicalDifferenceCheck
  */
 public static void createReferences(String _sInputPath, String 
_sReferencePath, GraphicalTestArguments _aGTA) throws ConvWatchException
 {
-//!
-//System.out.println(createReferences() InputPath:  + 
_sInputPath +  refpath:  + _sReferencePath);
 showVersion();
 File aInputPath = new File(_sInputPath);
 
-//System.out.println(Inputpath in file:  + 
aInputPath.getAbsolutePath());
-//!
-// if (aInputPath.exists())
-// {
-// System.out.println(Inputpath exists);
-// }
-// else
-// {
-// System.out.println(Inputpath doesn't exists);
-// return;
-// }
-
 if (aInputPath.isDirectory())
 {
 String fs = System.getProperty(file.separator);
@@ -102,7 +88,6 @@ public class GraphicalDifferenceCheck
 }
 else
 {
-//!
 // System.out.println(No directory.);
 createOneReferenceFile(_sInputPath, _sReferencePath, _aGTA);
 }
@@ -288,36 +273,6 @@ public class GraphicalDifferenceCheck
 return convwatch.ConvWatch.check(_aGTA, _sOutputPath, sInputFile, 
_sReferencePath);
 }
 
-
-// LLA: old! /**
-// LLA: old!  * Returns 'true' if a reference document on the specific 
output path exists.
-// LLA: old!  * The name of the document is corresponding to the input 
document, which can be
-// LLA: old!  * provided by a single name or path.
-// LLA: old!  *
-// LLA: old!  * @param inputPath   the original document name 
(possibly including path)
-// LLA: old!  * @param referencePath   the directory where the reference 
document will be stored
-// LLA: old!
-// LLA: old!  */
-// LLA: old! public static boolean isReferencExistent(String 

[Libreoffice-commits] .: sw/source

2012-01-24 Thread Lubos Lunak
 sw/source/filter/xml/xmlimp.cxx  |   30 +-
 sw/source/ui/uno/SwXDocumentSettings.cxx |6 ++
 2 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit db0f839920c38973f8448df0f74de7c4c95c832c
Author: Luboš Luňák l.lu...@suse.cz
Date:   Tue Jan 24 16:05:37 2012 +0100

order database properties so that opening it in writer works (bnc#740032)

http://lists.freedesktop.org/archives/libreoffice/2012-January/024380.html

diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index a59ebf7..f19a20a 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1188,6 +1188,13 @@ void SwXMLImport::SetConfigurationSettings(const 
Sequence  PropertyValue   aC
 
 OUString sRedlineProtectionKey( RTL_CONSTASCII_USTRINGPARAM( 
RedlineProtectionKey ) );
 
+const PropertyValue* currentDatabaseDataSource = NULL;
+const PropertyValue* currentDatabaseCommand = NULL;
+const PropertyValue* currentDatabaseCommandType = NULL;
+OUString currentDatabaseDataSourceKey( RTL_CONSTASCII_USTRINGPARAM( 
CurrentDatabaseDataSource ));
+OUString currentDatabaseCommandKey( RTL_CONSTASCII_USTRINGPARAM( 
CurrentDatabaseCommand ));
+OUString currentDatabaseCommandTypeKey( RTL_CONSTASCII_USTRINGPARAM( 
CurrentDatabaseCommandType ));
+
 while( nCount-- )
 {
 if( !bIsUserSetting )
@@ -1212,7 +1219,15 @@ void SwXMLImport::SetConfigurationSettings(const 
Sequence  PropertyValue   aC
 }
 else
 {
-xProps-setPropertyValue( pValues-Name,
+// HACK: Setting these out of order does not work.
+if( pValues-Name.equals( currentDatabaseDataSourceKey 
))
+currentDatabaseDataSource = pValues;
+else if( pValues-Name.equals( 
currentDatabaseCommandKey ))
+currentDatabaseCommand = pValues;
+else if( pValues-Name.equals( 
currentDatabaseCommandTypeKey ))
+currentDatabaseCommandType = pValues;
+else
+xProps-setPropertyValue( pValues-Name,
   pValues-Value );
 }
 }
@@ -1267,6 +1282,19 @@ void SwXMLImport::SetConfigurationSettings(const 
Sequence  PropertyValue   aC
 pValues++;
 }
 
+try
+{
+if( currentDatabaseDataSource != NULL )
+xProps-setPropertyValue( currentDatabaseDataSource-Name, 
currentDatabaseDataSource-Value );
+if( currentDatabaseCommand != NULL )
+xProps-setPropertyValue( currentDatabaseCommand-Name, 
currentDatabaseCommand-Value );
+if( currentDatabaseCommandType != NULL )
+xProps-setPropertyValue( currentDatabaseCommandType-Name, 
currentDatabaseCommandType-Value );
+} catch( Exception )
+{
+OSL_FAIL( SwXMLImport::SetConfigurationSettings: Exception! );
+}
+
 // finally, treat the non-default cases
 // introduce boolean, that indicates a document, written by version prior 
SO8.
 const bool bDocumentPriorSO8 = !bConsiderWrapOnObjPos;
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx 
b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 7398dfd..c349631 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -474,6 +474,8 @@ void SwXDocumentSettings::_setSingleValue( const 
comphelper::PropertyInfo  rInf
 case HANDLE_CURRENT_DATABASE_COMMAND:
 {
 SwDBData aData = mpDoc-GetDBData();
+SAL_WARN_IF( aData.sDataSource.isEmpty(), sw.uno,
+\CurrentDatabaseCommand\ property possibly set before 
\CurrentDatabaseDataSource\ );
 if ( rValue = aData.sCommand )
 mpDoc-ChgDBData( aData );
 }
@@ -481,6 +483,10 @@ void SwXDocumentSettings::_setSingleValue( const 
comphelper::PropertyInfo  rInf
 case HANDLE_CURRENT_DATABASE_COMMAND_TYPE:
 {
 SwDBData aData = mpDoc-GetDBData();
+SAL_WARN_IF( aData.sDataSource.isEmpty(), sw.uno,
+\CurrentDatabaseCommandType\ property possibly set before 
\CurrentDatabaseDataSource\ );
+SAL_WARN_IF( aData.sCommand.isEmpty(), sw.uno,
+\CurrentDatabaseCommandType\ property possibly set before 
\CurrentDatabaseCommand\ );
 if ( rValue = aData.nCommandType )
 mpDoc-ChgDBData( aData );
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: officecfg/registry

2012-01-24 Thread Fridrich Strba
 officecfg/registry/data/org/openoffice/VCL.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86bf32c487852f4e466b27320e3724266cb53dba
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 24 16:22:15 2012 +0100

Fix build: dupplicate node/prop /VCL/DefaultFonts/bn

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 248e439..6cf60ef 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -856,7 +856,7 @@
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=bn oor:op=replace
+node oor:name=bn-IN oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: qadevOOo/Jar_OOoRunnerLight.mk qadevOOo/Jar_OOoRunner.mk

2012-01-24 Thread Fridrich Strba
 qadevOOo/Jar_OOoRunner.mk  |1 -
 qadevOOo/Jar_OOoRunnerLight.mk |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 7938b75ab7d8052b66859db05201cafc5175d95e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 24 16:29:33 2012 +0100

Don't try to build inexisting file

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 0bb436d..43a4740 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -123,7 +123,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/runner/convwatch/ReportDesignerTest \
 qadevOOo/runner/convwatch/SimpleFileSemaphore \
 qadevOOo/runner/convwatch/StatusHelper \
-qadevOOo/runner/convwatch/StringHelper \
 qadevOOo/runner/convwatch/TimeHelper \
 qadevOOo/runner/convwatch/TriState \
 qadevOOo/runner/convwatch/ValueNotFoundException \
diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk
index 2dc0c15..7a51d06 100644
--- a/qadevOOo/Jar_OOoRunnerLight.mk
+++ b/qadevOOo/Jar_OOoRunnerLight.mk
@@ -120,7 +120,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\
 qadevOOo/runner/convwatch/ReportDesignerTest \
 qadevOOo/runner/convwatch/SimpleFileSemaphore \
 qadevOOo/runner/convwatch/StatusHelper \
-qadevOOo/runner/convwatch/StringHelper \
 qadevOOo/runner/convwatch/TimeHelper \
 qadevOOo/runner/convwatch/TriState \
 qadevOOo/runner/convwatch/ValueNotFoundException \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

2012-01-24 Thread Michael Stahl
 sw/source/filter/xml/xmlimp.cxx  |   30 +-
 sw/source/ui/uno/SwXDocumentSettings.cxx |6 ++
 2 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit 17ccd3cfc9dd86e2911a0a31f6dcbba8d7e7950a
Author: Luboš Luňák l.lu...@suse.cz
Date:   Tue Jan 24 16:05:37 2012 +0100

order database properties so that opening it in writer works (bnc#740032)

http://lists.freedesktop.org/archives/libreoffice/2012-January/024380.html
(cherry picked from commit db0f839920c38973f8448df0f74de7c4c95c832c)

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 36643e4..ca700d0 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1189,6 +1189,13 @@ void SwXMLImport::SetConfigurationSettings(const 
Sequence  PropertyValue   aC
 
 OUString sRedlineProtectionKey( RTL_CONSTASCII_USTRINGPARAM( 
RedlineProtectionKey ) );
 
+const PropertyValue* currentDatabaseDataSource = NULL;
+const PropertyValue* currentDatabaseCommand = NULL;
+const PropertyValue* currentDatabaseCommandType = NULL;
+OUString currentDatabaseDataSourceKey( RTL_CONSTASCII_USTRINGPARAM( 
CurrentDatabaseDataSource ));
+OUString currentDatabaseCommandKey( RTL_CONSTASCII_USTRINGPARAM( 
CurrentDatabaseCommand ));
+OUString currentDatabaseCommandTypeKey( RTL_CONSTASCII_USTRINGPARAM( 
CurrentDatabaseCommandType ));
+
 while( nCount-- )
 {
 if( !bIsUserSetting )
@@ -1213,7 +1220,15 @@ void SwXMLImport::SetConfigurationSettings(const 
Sequence  PropertyValue   aC
 }
 else
 {
-xProps-setPropertyValue( pValues-Name,
+// HACK: Setting these out of order does not work.
+if( pValues-Name.equals( currentDatabaseDataSourceKey 
))
+currentDatabaseDataSource = pValues;
+else if( pValues-Name.equals( 
currentDatabaseCommandKey ))
+currentDatabaseCommand = pValues;
+else if( pValues-Name.equals( 
currentDatabaseCommandTypeKey ))
+currentDatabaseCommandType = pValues;
+else
+xProps-setPropertyValue( pValues-Name,
   pValues-Value );
 }
 }
@@ -1268,6 +1283,19 @@ void SwXMLImport::SetConfigurationSettings(const 
Sequence  PropertyValue   aC
 pValues++;
 }
 
+try
+{
+if( currentDatabaseDataSource != NULL )
+xProps-setPropertyValue( currentDatabaseDataSource-Name, 
currentDatabaseDataSource-Value );
+if( currentDatabaseCommand != NULL )
+xProps-setPropertyValue( currentDatabaseCommand-Name, 
currentDatabaseCommand-Value );
+if( currentDatabaseCommandType != NULL )
+xProps-setPropertyValue( currentDatabaseCommandType-Name, 
currentDatabaseCommandType-Value );
+} catch( Exception )
+{
+OSL_FAIL( SwXMLImport::SetConfigurationSettings: Exception! );
+}
+
 // finally, treat the non-default cases
 // introduce boolean, that indicates a document, written by version prior 
SO8.
 const bool bDocumentPriorSO8 = !bConsiderWrapOnObjPos;
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx 
b/sw/source/ui/uno/SwXDocumentSettings.cxx
index a56f584..7b4b738 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -470,6 +470,8 @@ void SwXDocumentSettings::_setSingleValue( const 
comphelper::PropertyInfo  rInf
 case HANDLE_CURRENT_DATABASE_COMMAND:
 {
 SwDBData aData = mpDoc-GetDBData();
+SAL_WARN_IF( aData.sDataSource.isEmpty(), sw.uno,
+\CurrentDatabaseCommand\ property possibly set before 
\CurrentDatabaseDataSource\ );
 if ( rValue = aData.sCommand )
 mpDoc-ChgDBData( aData );
 }
@@ -477,6 +479,10 @@ void SwXDocumentSettings::_setSingleValue( const 
comphelper::PropertyInfo  rInf
 case HANDLE_CURRENT_DATABASE_COMMAND_TYPE:
 {
 SwDBData aData = mpDoc-GetDBData();
+SAL_WARN_IF( aData.sDataSource.isEmpty(), sw.uno,
+\CurrentDatabaseCommandType\ property possibly set before 
\CurrentDatabaseDataSource\ );
+SAL_WARN_IF( aData.sCommand.isEmpty(), sw.uno,
+\CurrentDatabaseCommandType\ property possibly set before 
\CurrentDatabaseCommand\ );
 if ( rValue = aData.nCommandType )
 mpDoc-ChgDBData( aData );
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-4' - dbaccess/source

2012-01-24 Thread Tor Lillqvist
 dbaccess/source/ui/browser/unodatbr.cxx |   18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 300578ec39bfc829afefb30d4149881297a799fa
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Jan 23 21:09:24 2012 +0100

Fix fdo#44040 VIEWING: Crash when page preview after f4 (data sources)

Caolán fixed Iterator management which was buggy. (thank you !)

Signed-off-by: Tor Lillqvist tlillqv...@suse.com

diff --git a/dbaccess/source/ui/browser/unodatbr.cxx 
b/dbaccess/source/ui/browser/unodatbr.cxx
index 37f0880..3525fcf 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1409,24 +1409,22 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const 
EventObject _rSource ) thr
 Reference XDispatch  xSource(_rSource.Source, UNO_QUERY);
 if(xSource.is())
 {
-for (  ExternalFeaturesMap::iterator aLoop = 
m_aExternalFeatures.begin();
-  aLoop != m_aExternalFeatures.end();
-  ++aLoop
-)
+ExternalFeaturesMap::iterator aLoop = m_aExternalFeatures.begin();
+ExternalFeaturesMap::iterator aEnd = m_aExternalFeatures.end();
+while (aLoop != aEnd)
 {
-if ( aLoop-second.xDispatcher.get() == xSource.get() )
+ExternalFeaturesMap::iterator aI = aLoop++;
+if ( aI-second.xDispatcher.get() == xSource.get() )
 {
-ExternalFeaturesMap::iterator aPrevious = aLoop;
---aPrevious;
+sal_uInt16 nSlot = aI-first;
 
 // remove it
-m_aExternalFeatures.erase( aLoop );
+m_aExternalFeatures.erase(aI);
 
 // maybe update the UI
-implCheckExternalSlot(aLoop-first);
+implCheckExternalSlot(nSlot);
 
 // continue, the same XDispatch may be resposible for more 
than one URL
-aLoop = aPrevious;
 }
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/inc sc/source

2012-01-24 Thread Petr Mladek
 sc/inc/dpobject.hxx  |7 ++
 sc/source/core/data/dpobject.cxx |  121 +--
 2 files changed, 124 insertions(+), 4 deletions(-)

New commits:
commit a0dc477bfa4460a3091e533eed57fae93f481d5a
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Jan 23 16:34:15 2012 -0500

Fix refresh problem on pivot tables whose data cache have not been created.

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 47c1999..2d8991a 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -330,6 +330,7 @@ public:
 ScDocument* mpDoc;
 public:
 DBCaches(ScDocument* pDoc);
+bool hasCache(sal_Int32 nSdbType, const rtl::OUString rDBName, const 
rtl::OUString rCommand) const;
 const ScDPCache* getCache(sal_Int32 nSdbType, const ::rtl::OUString 
rDBName, const ::rtl::OUString rCommand);
 size_t size() const;
 
@@ -386,6 +387,12 @@ private:
 /** Only to be called from ScDPCache::RemoveReference(). */
 void RemoveCache(const ScDPCache* pCache);
 
+void GetAllTables(const ScRange rSrcRange, std::setScDPObject* rRefs) 
const;
+void GetAllTables(const rtl::OUString rSrcName, std::setScDPObject* 
rRefs) const;
+void GetAllTables(
+sal_Int32 nSdbType, const ::rtl::OUString rDBName, const 
::rtl::OUString rCommand,
+std::setScDPObject* rRefs) const;
+
 private:
 typedef ::boost::ptr_vectorScDPObject TablesType;
 
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 3113f1b..ba7af2e 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2706,6 +2706,13 @@ bool ScDPCollection::DBType::less::operator() (const 
DBType left, const DBType
 
 ScDPCollection::DBCaches::DBCaches(ScDocument* pDoc) : mpDoc(pDoc) {}
 
+bool ScDPCollection::DBCaches::hasCache(sal_Int32 nSdbType, const OUString 
rDBName, const OUString rCommand) const
+{
+DBType aType(nSdbType, rDBName, rCommand);
+CachesType::const_iterator itr = maCaches.find(aType);
+return itr != maCaches.end();
+}
+
 const ScDPCache* ScDPCollection::DBCaches::getCache(sal_Int32 nSdbType, const 
OUString rDBName, const OUString rCommand)
 {
 DBType aType(nSdbType, rDBName, rCommand);
@@ -2911,13 +2918,27 @@ sal_uLong ScDPCollection::ReloadCache(ScDPObject* 
pDPObj, std::setScDPObject*
 {
 // cache by named range
 ScDPCollection::NameCaches rCaches = GetNameCaches();
-rCaches.updateCache(pDesc-GetRangeName(), 
pDesc-GetSourceRange(), rRefs);
+if (rCaches.hasCache(pDesc-GetRangeName()))
+rCaches.updateCache(pDesc-GetRangeName(), 
pDesc-GetSourceRange(), rRefs);
+else
+{
+// Not cached yet.  Collect all tables that use this named
+// range as data source.
+GetAllTables(pDesc-GetRangeName(), rRefs);
+}
 }
 else
 {
 // cache by cell range
 ScDPCollection::SheetCaches rCaches = GetSheetCaches();
-rCaches.updateCache(pDesc-GetSourceRange(), rRefs);
+if (rCaches.hasCache(pDesc-GetSourceRange()))
+rCaches.updateCache(pDesc-GetSourceRange(), rRefs);
+else
+{
+// Not cached yet.  Collect all tables that use this range as
+// data source.
+GetAllTables(pDesc-GetSourceRange(), rRefs);
+}
 }
 }
 else if (pDPObj-IsImportData())
@@ -2928,8 +2949,15 @@ sal_uLong ScDPCollection::ReloadCache(ScDPObject* 
pDPObj, std::setScDPObject*
 return STR_ERR_DATAPILOTSOURCE;
 
 ScDPCollection::DBCaches rCaches = GetDBCaches();
-rCaches.updateCache(
-pDesc-GetCommandType(), pDesc-aDBName, pDesc-aObject, rRefs);
+if (rCaches.hasCache(pDesc-GetCommandType(), pDesc-aDBName, 
pDesc-aObject))
+rCaches.updateCache(
+pDesc-GetCommandType(), pDesc-aDBName, pDesc-aObject, 
rRefs);
+else
+{
+// Not cached yet.  Collect all tables that use this range as
+// data source.
+GetAllTables(pDesc-GetCommandType(), pDesc-aDBName, 
pDesc-aObject, rRefs);
+}
 }
 return 0;
 }
@@ -3155,6 +3183,91 @@ void ScDPCollection::RemoveCache(const ScDPCache* pCache)
 return;
 }
 
+void ScDPCollection::GetAllTables(const ScRange rSrcRange, 
std::setScDPObject* rRefs) const
+{
+std::setScDPObject* aRefs;
+TablesType::const_iterator it = maTables.begin(), itEnd = maTables.end();
+for (; it != itEnd; ++it)
+{
+const ScDPObject rObj = *it;
+if (!rObj.IsSheetData())
+// Source is not a sheet range.
+continue;
+
+const ScSheetSourceDesc* pDesc = rObj.GetSheetDesc();
+if (!pDesc)
+continue;
+
+if 

[Libreoffice-commits] .: 2 commits - connectivity/source vcl/source

2012-01-24 Thread Caolán McNamara
 connectivity/source/drivers/evoab2/NCatalog.cxx   |1 -
 connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx  |1 -
 connectivity/source/drivers/evoab2/NDriver.cxx|1 -
 connectivity/source/drivers/evoab2/NResultSetMetaData.cxx |1 -
 connectivity/source/drivers/evoab2/NTables.cxx|1 -
 vcl/source/window/msgbox.cxx  |7 +--
 6 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit aeab59f2b0565ae3adbb2b96e192ad3522574fd4
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 24 17:04:42 2012 +

NDebug.hxx is gone now

diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx 
b/connectivity/source/drivers/evoab2/NCatalog.cxx
index b29349d..f505dc6 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.cxx
@@ -31,7 +31,6 @@
 #include NTables.hxx
 #include com/sun/star/sdbc/XRow.hpp
 #include com/sun/star/sdbc/XResultSet.hpp
-#include NDebug.hxx
 
 
 // -
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx 
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index d6faab5..45f93b9 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -29,7 +29,6 @@
 #ifndef _CONNECTIVITY_EVOAB_DATABASEMETADATA_HXX_
 #define _CONNECTIVITY_EVOAB_DATABASEMETADATA_HXX_
 
-#include NDebug.hxx
 #include NConnection.hxx
 #include TDatabaseMetaDataBase.hxx
 #include FDatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx 
b/connectivity/source/drivers/evoab2/NDriver.cxx
index 93009a0..04ec1b1 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -36,7 +36,6 @@
 #include com/sun/star/ucb/XContentAccess.hpp
 #include com/sun/star/ucb/XCommandEnvironment.hpp
 #include ucbhelper/content.hxx
-#include NDebug.hxx
 #include signal.h
 #include resource/common_res.hrc
 #include resource/sharedresources.hxx
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx 
b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index cf46818..88996b1 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -30,7 +30,6 @@
 #include NDatabaseMetaData.hxx
 #include connectivity/dbexception.hxx
 #include com/sun/star/sdbc/DataType.hpp
-#include NDebug.hxx
 #include resource/evoab2_res.hrc
 
 using namespace connectivity::evoab;
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx 
b/connectivity/source/drivers/evoab2/NTables.cxx
index 4dfd37b..84a88bb 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -40,7 +40,6 @@
 #include connectivity/dbexception.hxx
 #include cppuhelper/interfacecontainer.h
 #include comphelper/types.hxx
-#include NDebug.hxx
 #include NTable.hxx
 using namespace ::comphelper;
 
commit 4be34f5e14c57e4663c140d2373c6ae693ada814
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 24 16:56:50 2012 +

WaE: unused e

diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index b42136c..07610d6 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -573,9 +573,12 @@ ErrorBox::ErrorBox( Window* pParent, const ResId rResId ) 
:
 
 Image ErrorBox::GetStandardImage()
 {
-try {
+try
+{
 ImplInitMsgBoxImageList();
-} catch (const ::com::sun::star::uno::Exception e) {
+}
+catch (const ::com::sun::star::uno::Exception )
+{
 // During early bootstrap we can have no initialized
 // ucb and hence no ability to get this image, so nop.
 return Image();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 2 commits - sfx2/source

2012-01-24 Thread Ivan Timofeev
 sfx2/source/appl/workwin.cxx |2 
 sfx2/source/view/viewsh.cxx  |  528 +--
 2 files changed, 261 insertions(+), 269 deletions(-)

New commits:
commit b46d71a558d935bac5c1f484e9635338b1654728
Author: Ivan Timofeev timofeev@gmail.com
Date:   Tue Jan 24 17:21:56 2012 +0400

remove unused #define SFX_ITEMTYPE_STATBAR in workwin.cxx

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index f400096..9281858 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1630,8 +1630,6 @@ void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId, 
SfxShell*, SfxBindings
 aStatBar.nId = sal::static_int_castsal_uInt16(nResId);
 }
 
-#define SFX_ITEMTYPE_STATBAR 4
-
 void SfxWorkWindow::UpdateStatusBar_Impl()
 {
 Reference ::com::sun::star::beans::XPropertySet  xPropSet( 
GetFrameInterface(), UNO_QUERY );
commit 853768873d2ebc8b9e63bf4f0a16e5867b0a1504
Author: Ivan Timofeev timofeev@gmail.com
Date:   Tue Jan 24 17:00:27 2012 +0400

sfx2: fix indentation in viewsh.cxx

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c1bf067..70d0d14 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -199,7 +199,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SfxClipboardChangeListener, 
AsyncExecuteHdl_Impl, A
 }
 
 void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject 
/*rEventObject*/ )
-throw ( uno::RuntimeException )
+throw ( uno::RuntimeException )
 {
 // Either clipboard or ViewShell is going to be destroyed - no interest 
in listening anymore
 uno::Reference lang::XComponent  xCtrl( m_xCtrl );
@@ -219,7 +219,7 @@ throw ( uno::RuntimeException )
 }
 
 void SAL_CALL SfxClipboardChangeListener::changedContents( const 
datatransfer::clipboard::ClipboardEvent )
-throw ( RuntimeException )
+throw ( RuntimeException )
 {
 // Make asynchronous call to avoid locking SolarMutex which is the
 // root for many deadlocks, especially in conjuction with the Windows
@@ -315,7 +315,7 @@ SfxViewShell_Impl::SfxViewShell_Impl(sal_uInt16 const 
nFlags)
 //=
 SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0))
 {
-SFX_CHILDWINDOW_REGISTRATION( SID_MAIL_CHILDWIN );
+SFX_CHILDWINDOW_REGISTRATION( SID_MAIL_CHILDWIN );
 }
 
 TYPEINIT2(SfxViewShell,SfxShell,SfxListener);
@@ -345,12 +345,12 @@ static ::rtl::OUString 
impl_retrieveFilterNameFromTypeAndModule(
 {
 ::comphelper::SequenceAsHashMap aFilterPropsHM( 
xEnumeration-nextElement() );
 ::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault(
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Name)),
-::rtl::OUString() );
+::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Name)),
+::rtl::OUString() );
 
 sal_Int32 nFilterFlags = aFilterPropsHM.getUnpackedValueOrDefault(
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Flags)),
-sal_Int32( 0 ) );
+::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Flags)),
+sal_Int32( 0 ) );
 
 if ( nFilterFlags  nFlags )
 {
@@ -388,36 +388,36 @@ enum ETypeFamily
 switch(eTypeFamily)
 {
 case E_MS_DOC:
- {
-if (sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
com.sun.star.text.TextDocument ) ))
-sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
writer_MS_Word_97 ));
-else
-if (sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
com.sun.star.sheet.SpreadsheetDocument ) ))
-sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
calc_MS_Excel_97 ));
-else
-if (sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
com.sun.star.drawing.DrawingDocument ) ))
-sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
impress_MS_PowerPoint_97 ));
-else
-if (sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
com.sun.star.presentation.PresentationDocument ) ))
-sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
impress_MS_PowerPoint_97 ));
- }
- break;
+{
+if (sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
com.sun.star.text.TextDocument ) ))
+sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
writer_MS_Word_97 ));
+else
+if (sModule.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
com.sun.star.sheet.SpreadsheetDocument ) ))
+sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
calc_MS_Excel_97 ));
+else
+if 

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.2'

2012-01-24 Thread Petr Mladek
Tag 'libreoffice-3.5.0.2' created by Petr Mladek pmla...@suse.cz at 
2012-01-24 17:04 +0100

Tag 3.5.0.2 (3.5.0-rc2)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJPHuStAAoJEPQ0oe+v7q6jV+QP/AxmdQP8nfcYr5INnyDfQ2sw
XfwigKiBDFXPscV4lz0HAz0t+q3GV1x4rHk2K3dl3YlqpmKMorA3QjrBR5uCggUx
UQDawT3cQeyTfaOZb9c9PiUYmDgQldKO1NufCicyU+SSE66XaboN8jc6RIc4pa/B
iEIoc01aYe5N9NZtbcjCCPuEtCtJDAzS45MNyNscxEXJn8mwAHQjStzu1gnHU8Zq
yyivre3rP14Pg2xD7UfLXIbT8xK/H9GNy30BPpylk0QpLxnQZrq/mjp40cx/D5D/
V/pJJjA41wS9REmv/HGYp0oUm5tVALh9cvsNyQKQ2WZlrOXpDDOw6SQ0OfShn1la
Lfu8aPgXIZg++J/YarCU/wVQVMIxapxS57WMzCHAtfr+z0BJPeHJ/mczy61z7Ygg
GnuCiZ++Sr8NvYqSvM4Pt7ZzLtehV4YF+kW+2k8SAMs3hucMroigi8gtTLgmN+9i
W0U5CZ9kYBh2biwb7ltfhe2R+LyFeBkTLOkgSN6LbhhnMbrlywM6Jp8LzTTbbpl2
BwyIa3rXgmeKnlbcIwbrQa0TSG45WMZ9x/HvfPbqigUzoXd8TP7HYMhseGVYrZB8
604WYKZZRgbujv8yEYUWCW2a8SGidgzzX6MS/d3gENRVJdHPPDbExcuGXO1BlPvF
YjwliOynSGDKfNIg2pH/
=ckhJ
-END PGP SIGNATURE-

Changes since libreoffice-3-5-branch-point-652:
---
 0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.2'

2012-01-24 Thread Petr Mladek
Tag 'libreoffice-3.5.0.2' created by Petr Mladek pmla...@suse.cz at 
2012-01-24 17:04 +0100

Tag 3.5.0.2 (3.5.0-rc2)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJPHuStAAoJEPQ0oe+v7q6jCDYQALHohZwRSJvTCGdrj3UEwN52
+mjiUZSMzQ0n5DUM51x7noHMblVZ2HnByJy4Bjwj/k1LrLmUcuxzOqGWmxrlnjil
Q+vS9ZSC8qxYTBKc9J0sIWYFeibeUNd6ZDcsudFsY6admeL1VNNAtYIQ4ao/gMXH
7zvcpec4PwqLuoI/47MKOzXuDL7hh6eJ/b3f2LlkcpAZLpOO+HIzCvbRCgqEVHL4
zjsnxbOq7AbICUSkMDNsZKcmqEKWETU1PptWOIbSZaCFMzJ5EjPwuZ2heD7EVzAD
5SsIwGXRdEyGTUR/iMD7cZH3wg2zGkqGnrNVZOtSPo50DhFmX6S2yrtZl9MfY3VU
a4R9daejAnn8+E5WkZ6ZL0W3yUBUIVKURYiUrB0kiYfo55CqAcAERqhnd7bjCzgt
l+yF7JKokKvDjgq5ZRVsm9iFuoCETbCawBpHNWkv0LrszBrBMbUQixvFUOWVeUUs
2GVrIDi4M+2flksiMoiQAQ/5F6gDKpirjeMD89lYITOsYftyyxpCTw1w7l+8Ii3M
0K2wfWW/dOoqut4/k985mjNFR1WIw9aIzxhrvtBGp0rKZKlpEMYL/lS6gJ1T/qT5
Aq010e43qQKQePZFaWDnFffZxpiIKxe+T/EPcTxxGZn2JQJqclFIteBOW6Q0+VnB
qzWn55OifBK+3zgIswrR
=9p+M
-END PGP SIGNATURE-

Changes since libreoffice-3.5.0.1:
Petr Mladek (1):
  Version 3.5.0.2, tag libreoffice-3.5.0.2 (3.5.0-rc2)

---
 0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.2'

2012-01-24 Thread Petr Mladek
Tag 'libreoffice-3.5.0.2' created by Petr Mladek pmla...@suse.cz at 
2012-01-24 17:04 +0100

Tag 3.5.0.2 (3.5.0-rc2)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJPHuSuAAoJEPQ0oe+v7q6jaY0P/1d3l4Cv8VFmX3N46cWdpMHN
OLGm7m+Px/urIjTJdcCaB72hDERHDwhEsMNVrqstnb5YpczcyEOAd2xng1EI7X1Y
zU0mtUrCNsIWyOgUrCvvYQ2ZTlp0RMGtSm8sMabvvK86XVNQh9kmyW1mOkMeq1EX
v0rgfyw9bvXUnzRuXIFXSQO/WAFHae9jRWLmV/0xoxIf1f5v70yGlj/gZ7d7jQgP
ux5v2tc41q31YCrivbla9jqDpv/84VRNdOKkHnblBm5f5KNcwLQSXfuceb4IH4i+
Esaoj/y9VVjBjHxs/fhpfDCBRel+iT0/4+K7cWYxn7SX14PSwXNx3RvidrAx32gU
IZY0l3jH5K+oFVeVuBCvPlomf4GawBpB6bfncCGm4Ys/+xn6muNnneUR44wh4Yv9
xsoertx1E8KrmqxAEc4bCxpdJVbOMFUy3+/hfuFZacpCLxhrIa2q1b0f+0AMo8hf
NEyHgYIzE+1uwfOHfYOpxkfpL68wjgge1xcs3cc9aEzB5azs+D5FA4jAiLVy8Fmx
HLV2rVqKZ4Txg0Z+n2n2GYb6FSocQAsUt8HVIKirPg6VCLte2JF8FHU2yzjab38a
uci4OS6CCL/4rvCDZJ/REraFGseQbuR4ikHC0GQ/d6t/uG2Gq1Fq70YI8MWWRHTM
4FlntXRHV4IKPBxc0KAw
=7MUl
-END PGP SIGNATURE-

Changes since libreoffice-3-5-branch-point-26:
---
 0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: officecfg/registry

2012-01-24 Thread Andras Timar
 officecfg/registry/data/org/openoffice/VCL.xcu |   20 
 1 file changed, 20 deletions(-)

New commits:
commit 9b55eeba78d4e6418750a12c3dad4b42e2dd3f03
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 24 19:01:44 2012 +0100

remove bn-IN node, we have bn

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 6cf60ef..be7b42e 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -856,26 +856,6 @@
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=bn-IN oor:op=replace
-  prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
-  /prop
-  prop oor:name=CTL_DISPLAY oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_HEADING oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_PRESENTATION oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_SPREADSHEET oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_TEXT oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-/node
 node oor:name=hi oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial 
Unicode MS;Lucida Sans Unicode;clearlyU/value
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: basic/inc

2012-01-24 Thread Takeshi Abe
 basic/inc/basic/sbxvar.hxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit ebe3e061ac80584b5ff9b6b190b1fe2a78b73c99
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Wed Jan 25 03:07:13 2012 +0900

Removed unused field and non-existent class

diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 08e8002..2416216 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -106,12 +106,8 @@ struct SbxValues
 
 struct SbxValues;
 
-class SbxValueImpl;
-
 class BASIC_DLLPUBLIC SbxValue : public SbxBase
 {
-SbxValueImpl* mpSbxValueImplImpl;   // Impl data
-
 // #55226 Transport additional infos
 BASIC_DLLPRIVATE SbxValue* TheRealValue( sal_Bool bObjInObjError ) const;
 BASIC_DLLPRIVATE SbxValue* TheRealValue() const;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 6 commits - android/qa desktop/source sal/osl

2012-01-24 Thread Michael Meeks
 android/qa/desktop/Makefile|   35 ---
 desktop/source/app/app.cxx |5 -
 desktop/source/app/userinstall.cxx |   14 --
 sal/osl/unx/security.c |   34 +-
 4 files changed, 73 insertions(+), 15 deletions(-)

New commits:
commit 8b589f50f29031a1e93fc040646f917a7fff7bda
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jan 24 18:10:07 2012 +

android: extend rc files some more to aid bootstrapping.

it seems there are two 'unorc' files - confusing huh ?

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 67bc851..09b5fa9 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -33,9 +33,11 @@ buildrcs:
echo Logo=1  assets/program/lofficerc
echo NativeProgress=1  assets/program/lofficerc
echo URE_BOOTSTRAP=file:///assets/program/fundamentalrc  
assets/program/lofficerc
-   echo RTL_LOGFILE=file:///dev/log/main  assets/program/lofficerc
+#  echo RTL_LOGFILE=file:///dev/log/main  assets/program/lofficerc
echo HOME=$(APP_DATA_PATH)/files  assets/program/lofficerc
echo OSL_SOCKET_PATH=$(APP_DATA_PATH)/files  
assets/program/lofficerc
+# - this looks useful but breaks more than it fixes ...
+#  echo DISABLE_EXTENSION_SYNCHRONIZATION=1  assets/program/lofficerc
 # fundamentalrc ini ...
echo [Bootstrap]  assets/program/fundamentalrc
echo LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/  
assets/program/fundamentalrc
@@ -45,6 +47,19 @@ buildrcs:
echo 
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway'  
assets/program/fundamentalrc
echo 'URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb 
file:///assets/program/types/types.rdb'  assets/program/fundamentalrc
echo 'URE_MORE_SERVICES=file:///assets/ure/share/misc/services.rdb 
file:///assets/program/services/services.rdb 
$$BRAND_BASE_DIR/program/services*'  assets/program/fundamentalrc
+   echo 'BUNDLED_EXTENSIONS=$$BRAND_BASE_DIR/share/extensions'  
assets/program/fundamentalrc
+   echo 'BUNDLED_EXTENSIONS_PREREG=$$BRAND_BASE_DIR/share/prereg/bundled' 
 assets/program/fundamentalrc
+   echo 
'BUNDLED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bundled'
  assets/program/fundamentalrc
+   echo 
'TMP_EXTENSIONS=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/tmp'
  assets/program/fundamentalrc
+   echo 
'SHARED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/shared'
  assets/program/fundamentalrc
+   echo 'UNO_SHARED_PACKAGES=$$BRAND_BASE_DIR/share/uno_packages'  
assets/program/fundamentalrc
+   echo 'UNO_SHARED_PACKAGES_CACHE=$$UNO_SHARED_PACKAGES/cache'  
assets/program/fundamentalrc
+   echo 
'UNO_USER_PACKAGES=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/uno_packages'
  assets/program/fundamentalrc
+   echo 'UNO_USER_PACKAGES_CACHE=$$UNO_USER_PACKAGES/cache'  
assets/program/fundamentalrc
+   echo 
'PKG_BundledUnoFile=$$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc'
  assets/program/fundamentalrc
+   echo 
'PKG_SharedUnoFile=$$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc'
  assets/program/fundamentalrc
+   echo 
'PKG_UserUnoFile=$$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc'
  assets/program/fundamentalrc
+
 # unorc ini ...
echo [Bootstrap]  assets/program/unorc
echo URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/  
assets/program/unorc
commit 181dd08b1d3a811f66e629ef61b3ac96de3025b7
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jan 24 18:09:48 2012 +

android: disable bundled extension synchronisation

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 496a8b9..cf648b4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -605,6 +605,7 @@ void Desktop::Init()
 
 // Check for lastsynchronized file for bundled extensions in the user 
directory
 // and test if synchronzation is necessary!
+#ifndef ANDROID
 {
 ::rtl::OUString aUserLastSyncFilePathURL = 
getLastSyncFileURLFromUserInstallation();
 ::rtl::OUString aPreregSyncFilePathURL = 
getLastSyncFileURLFromBrandInstallation();
@@ -620,6 +621,7 @@ void Desktop::Init()
 copy_bundled_recursive( aPreregBundledPath, aUserPath, +1 );
 }
 }
+#endif
 
 // We need to have service factory before going further, but see fdo#37195.
 // Doing this will mmap common.rdb, making it not overwritable on windows,
commit 72a0b0ad0c364a92fb4872fca4bf3aaaeae0977d
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jan 24 16:57:11 2012 +

android: initialize security 

[Libreoffice-commits] .: 4 commits - configure.in sal/android sal/inc sal/osl

2012-01-24 Thread Tor Lillqvist
 configure.in   |3 ++-
 sal/android/lo-bootstrap.c |   25 +++--
 sal/inc/osl/detail/file.h  |5 +
 sal/osl/unx/file.cxx   |5 -
 sal/osl/unx/file_misc.cxx  |   34 +++---
 5 files changed, 57 insertions(+), 15 deletions(-)

New commits:
commit 5488d34bbf79a83942221f0f3bf94bec09db05a2
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jan 24 21:06:54 2012 +0200

Put a local.properties in android/qa/desktop, too

diff --git a/configure.in b/configure.in
index ac986f6..9a348e3 100644
--- a/configure.in
+++ b/configure.in
@@ -2961,6 +2961,7 @@ if test $cross_compiling = yes; then
 bin/repo-list.in \
 build_env.in \
 android/qa/sc/local.properties.in \
+android/qa/desktop/local.properties.in \
 config.guess \
 config_host.mk.in \
 configure \
@@ -10485,7 +10486,7 @@ else
 echo  set_soenv.last
 fi
 
-AC_CONFIG_FILES([config_host.mk ooo.lst set_soenv bin/repo-list build_env 
android/qa/sc/local.properties])
+AC_CONFIG_FILES([config_host.mk ooo.lst set_soenv bin/repo-list build_env 
android/qa/sc/local.properties android/qa/desktop/local.properties])
 AC_OUTPUT
 
 # touch the config timestamp file set_soenv.stamp
commit 52681e4405b303028340bfb63ddb6c14eb17caa2
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jan 24 20:51:02 2012 +0200

Use own own osl/file.h API to read the source in osl_copyFile()

It seems that we call osl_copyFile() to copy from /assets on Android
in some cases.

diff --git a/sal/inc/osl/detail/file.h b/sal/inc/osl/detail/file.h
index 8e2c910..f9798da 100644
--- a/sal/inc/osl/detail/file.h
+++ b/sal/inc/osl/detail/file.h
@@ -49,6 +49,11 @@ extern C {
 #define osl_File_OpenFlag_Trunc 0x0010L
 #define osl_File_OpenFlag_NoExcl0x0020L
 
+SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFilePath(
+const char *cpFilePath,
+oslFileHandle* pHandle,
+sal_uInt32 uFlags );
+
 /*  Get the OS specific handle of an open file. */
 SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileOSHandle(
 oslFileHandle Handle,
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index aa6cc26..63e9775 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -892,7 +892,7 @@ SAL_CALL osl_openMemoryAsFile( void *address, size_t size, 
oslFileHandle *pHandl
 #define OPEN_CREATE_FLAGS ( O_CREAT | O_RDWR )
 #endif
 
-static oslFileError
+oslFileError
 SAL_CALL osl_openFilePath( const char *cpFilePath, oslFileHandle* pHandle, 
sal_uInt32 uFlags )
 {
 oslFileError eRet;
@@ -908,7 +908,10 @@ SAL_CALL osl_openFilePath( const char *cpFilePath, 
oslFileHandle* pHandle, sal_u
 size_t size;
 address = lo_apkentry(cpFilePath, size);
 if (address == NULL)
+{
+errno = ENOENT;
 return osl_File_E_NOENT;
+}
 return osl_openMemoryAsFile(address, size, pHandle);
 }
 #endif
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 52e73cb..260b711 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -27,6 +27,7 @@
  /
 
 #include osl/file.hxx
+#include osl/detail/file.h
 
 #include osl/diagnose.h
 #include osl/thread.h
@@ -833,7 +834,7 @@ static oslFileError osl_psz_copyFile( const sal_Char* 
pszPath, const sal_Char* p
 int DestFileExists=1;
 
 /* mfe: does the source file really exists? */
-nRet = lstat(pszPath,aFileStat);
+nRet = lstat_c(pszPath,aFileStat);
 
 if ( nRet  0 )
 {
@@ -1050,13 +1051,23 @@ static int oslDoCopyLink(const sal_Char* 
pszSourceFileName, const sal_Char* pszD
 
 static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* 
pszDestFileName, size_t nSourceSize, mode_t mode)
 {
-int SourceFileFD=0;
+oslFileHandle SourceFileFH=0;
 int DestFileFD=0;
 int nRet=0;
 
-SourceFileFD=open(pszSourceFileName,O_RDONLY);
-if ( SourceFileFD  0 )
+#ifdef ANDROID
+volatile int beenhere = 0;
+if (!beenhere) {
+beenhere++;
+fprintf(stderr, Sleeping NOW, start ndk-gdb!\n);
+::sleep(20);
+}
+#endif
+if (osl_openFilePath(pszSourceFileName,
+ SourceFileFH,
+ 
osl_File_OpenFlag_Read|osl_File_OpenFlag_NoLock|osl_File_OpenFlag_NoExcl) != 
osl_File_E_None)
 {
+// Let's hope errno is still set relevantly after osl_openFilePath...
 nRet=errno;
 return nRet;
 }
@@ -1066,7 +1077,7 @@ static int oslDoCopyFile(const sal_Char* 
pszSourceFileName, const sal_Char* pszD
 if ( DestFileFD  0 )
 {
 nRet=errno;
-close(SourceFileFD);
+osl_closeFile(SourceFileFH);
 return nRet;
 }
 
@@ -1080,15 +1091,17 @@ static int oslDoCopyFile(const sal_Char* 
pszSourceFileName, const sal_Char* pszD
 do
 {
 size_t nToRead = std::min( 

[Libreoffice-commits] Changes to 'libreoffice-3-5-0'

2012-01-24 Thread Petr Mladek
New branch 'libreoffice-3-5-0' available with the following commits:
commit 090f8779bbccb4adbfc4944c68f05402b24f51aa
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Jan 24 21:04:27 2012 +0100

Branch libreoffice-3-5-0

This is 'libreoffice-3-5-0' - the stable branch for the 3.5.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.5.x release,
please use the 'libreoffice-3-5' branch.

If you want to build something cool, unstable, and risky, use master.

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'libreoffice-3-5-0'

2012-01-24 Thread Petr Mladek
New branch 'libreoffice-3-5-0' available with the following commits:
commit 216cd4131a188d3dd533f726d2851142e0811e88
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Jan 24 21:04:30 2012 +0100

Branch libreoffice-3-5-0

This is 'libreoffice-3-5-0' - the stable branch for the 3.5.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.5.x release,
please use the 'libreoffice-3-5' branch.

If you want to build something cool, unstable, and risky, use master.

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - instsetoo_native/util

2012-01-24 Thread Petr Mladek
 instsetoo_native/util/openoffice.lst |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6d4824f772d9463622ffb98f901339719df69c6f
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Jan 24 21:15:41 2012 +0100

bump product version suffix in the about dialog to rc2+

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index f595663..10b82d6 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -59,7 +59,7 @@ LibreOffice
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX rc2
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc2+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -118,7 +118,7 @@ LibreOffice_wJRE
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX rc2
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc2+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -177,7 +177,7 @@ LibreOffice_Dev
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX rc2
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc2+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -464,7 +464,7 @@ OxygenOffice
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX rc2
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc2+
BASEPRODUCTVERSION 3.5
 PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -528,7 +528,7 @@ OxygenOffice_wJRE
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX rc2
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc2+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: android/qa

2012-01-24 Thread Tor Lillqvist
 android/qa/desktop/Makefile |   16 +---
 1 file changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 116f3f2e163327e5494c86fb47853ec2282dd1fe
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jan 24 22:44:40 2012 +0200

We don't do cppunit stuff here

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 09b5fa9..375bb82 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -84,21 +84,7 @@ copy-stuff: buildrcs
 # First the most important one, liblo-bootstrap.so
$(call COPY,$(OUTDIR)/lib/liblo-bootstrap.so)
 #
-# Then the cppunittester program. As all program
-# files we build for Android actually is a shared object.
-   $(call COPY,$(OUTDIR)/bin/cppunit/cppunittester,libcppunittester.so)
-#
-# The cppunit library
-#
-   $(call COPY,$(OUTDIR)/lib/libcppunit-1.12.so)
-#
-# The tests we run here
-#
-   for F in sc_ucalc sc_filters_test; do \
-   $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \
-   done
-#
-# Libs and UNO components that the tests need.
+# Libs and UNO components that we need.
 #
for F in $(strip \
  basebmplo \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: xmlhelp/source

2012-01-24 Thread Olivier Hallot
 xmlhelp/source/cxxhelp/provider/databases.cxx |   28 --
 xmlhelp/source/cxxhelp/provider/provider.cxx  |2 -
 xmlhelp/source/cxxhelp/provider/resultsetbase.cxx |2 -
 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx |4 +-
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx  |   24 +++
 xmlhelp/source/cxxhelp/provider/urlparameter.hxx  |   12 +++
 xmlhelp/source/treeview/tvfactory.cxx |2 -
 xmlhelp/source/treeview/tvread.cxx|   13 +++-
 8 files changed, 42 insertions(+), 45 deletions(-)

New commits:
commit 2727a29e57cdcd5dddc94a829194f88cfc2808ab
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Tue Jan 24 11:44:35 2012 -0200

Fix for fdo43460 Part XLVI getLength() to isEmpty()

Part XLVI
Modules
xmlhelp

diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx 
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 6287325..4a4a756 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -243,7 +243,7 @@ static bool impl_getZipFile(
 for ( int i = 0; i  rImagesZipPaths.getLength(); ++i )
 {
 rtl::OUString aFileName = pPathArray[ i ];
-if ( aFileName.getLength() )
+if ( !aFileName.isEmpty() )
 {
 if ( 1 + aFileName.lastIndexOf( '/' ) != aFileName.getLength() )
 {
@@ -292,14 +292,14 @@ rtl::OString Databases::getImagesZipFileURL()
 bChanged = true;
 }
 
-if ( !m_aImagesZipFileURL.getLength() || bChanged )
+if ( m_aImagesZipFileURL.isEmpty() || bChanged )
 {
 rtl::OUString aImageZip, aSymbolsStyleName;
 aResult = 
xAccess-getByHierarchicalName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Misc/SymbolStyle)));
 aResult = aSymbolsStyleName;
 
 bool bFound = false;
-if ( aSymbolsStyleName.getLength() != 0 )
+if ( !aSymbolsStyleName.isEmpty() )
 {
 rtl::OUString aZipName = 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( images_ ));
 aZipName += aSymbolsStyleName;
@@ -594,7 +594,7 @@ Db* Databases::getBerkeley( const rtl::OUString Database,
 const rtl::OUString Language, bool helpText,
 const rtl::OUString* pExtensionPath )
 {
-if( ! Database.getLength() || ! Language.getLength() )
+if( Database.isEmpty() || Language.isEmpty() )
 return 0;
 
 osl::MutexGuard aGuard( m_aMutex );
@@ -668,7 +668,7 @@ Databases::getCollator( const rtl::OUString Language,
 m_xContext ), UNO_QUERY );
 rtl::OUString langStr = processLang(Language);
 rtl::OUString countryStr = country(Language);
-if( !countryStr.getLength() )
+if( countryStr.isEmpty() )
 {
 if( langStr.compareToAscii(de) == 0 )
 countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DE));
@@ -914,7 +914,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString 
Database,
 KeyDataBaseFileIterator aDbFileIt( m_xContext, *this, Database, 
Language );
 rtl::OUString fileURL;
 bool bExtension = false;
-while( (fileURL = aDbFileIt.nextDbFile( bExtension )).getLength()  0 )
+while( !(fileURL = aDbFileIt.nextDbFile( bExtension )).isEmpty() )
 {
 Db table;
 
@@ -1024,8 +1024,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString 
Database,
 Reference XHierarchicalNameAccess  Databases::jarFile( const rtl::OUString 
jar,
  const rtl::OUString 
Language )
 {
-if( ! jar.getLength() ||
-! Language.getLength() )
+if( jar.isEmpty() || Language.isEmpty() )
 {
 return Reference XHierarchicalNameAccess ( 0 );
 }
@@ -1114,8 +1113,7 @@ Reference XHierarchicalNameAccess  
Databases::findJarFileForPath
   rtl::OUString* o_pExtensionRegistryPath )
 {
 Reference XHierarchicalNameAccess  xNA;
-if( ! jar.getLength() ||
-! Language.getLength() )
+if( jar.isEmpty() || Language.isEmpty() )
 {
 return xNA;
 }
@@ -1136,7 +1134,7 @@ Reference XHierarchicalNameAccess  
Databases::findJarFileForPath
 aIdentifierInPath = path.copy( 0, nFindSlash );
 
 beans::Optionalrtl::OUString aIdentifierOptional = 
xParentPackageBundle-getIdentifier();
-if( aIdentifierInPath.getLength()  
aIdentifierOptional.IsPresent )
+if( !aIdentifierInPath.isEmpty()  
aIdentifierOptional.IsPresent )
 {
 rtl::OUString aUnencodedIdentifier = 
aIdentifierOptional.Value;
 rtl::OUString aIdentifier = rtl::Uri::encode( 
aUnencodedIdentifier,
@@ -1616,7 +1614,7 @@ rtl::OUString 
ExtensionIteratorBase::implGetFileFromPackage(
 const rtl::OUString 

[Libreoffice-commits] .: desktop/source

2012-01-24 Thread Tor Lillqvist
 desktop/source/app/app.cxx |8 
 desktop/source/app/userinstall.cxx |3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit d947fb8a6c69a9144ed2d00de4521e86925b0d48
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jan 24 23:47:03 2012 +0200

WaE: defined but not used for stuff bypassed for Android

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cf648b4..91c7531 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -130,7 +130,10 @@ namespace desktop
 static oslSignalHandler pSignalHandler = 0;
 static sal_Bool _bCrashReporterEnabled = sal_True;
 
+#ifndef ANDROID
 static ::rtl::OUString getBrandSharePreregBundledPathURL();
+#endif
+
 // 
 
 ResMgr* Desktop::GetDesktopResManager()
@@ -355,6 +358,8 @@ void ReplaceStringHookProc( UniString rStr )
 static const char  pLastSyncFileName[] = lastsynchronized;
 static const sal_Int32 nStrLenLastSync = 16;
 
+#ifndef ANDROID
+
 static bool needsSynchronization(
 ::rtl::OUString const  baseSynchronizedURL, ::rtl::OUString const  
userSynchronizedURL )
 {
@@ -462,6 +467,9 @@ static ::rtl::OUString 
getLastSyncFileURLFromUserInstallation()
 
 return aTmp.makeStringAndClear();
 }
+
+#endif
+
 //Checks if the argument src is the folder of the help or configuration
 //backend in the prereg folder
 static bool excludeTmpFilesAndFolders(const rtl::OUString  src)
diff --git a/desktop/source/app/userinstall.cxx 
b/desktop/source/app/userinstall.cxx
index 72eb8f6..6b1672d 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -216,6 +216,7 @@ namespace desktop {
 return err;
 }
 
+#ifndef ANDROID
 static const char *pszSrcList[] = {
 /presets,
 NULL
@@ -224,7 +225,7 @@ namespace desktop {
 /user,
 NULL
 };
-
+#endif
 
 static UserInstall::UserInstallError create_user_install(OUString 
aUserPath)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: sc/source

2012-01-24 Thread Kohei Yoshida
 sc/source/core/data/dpoutput.cxx |   15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit c4431fda193d1aa28aafbdd440a77aebb9b78014
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Jan 24 17:17:05 2012 -0500

fdo#45067: Differentiate numeric and non-numeric field member values.

diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index c5bb124..32179e3 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -795,11 +795,18 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, 
SCTAB nTab,
 
 if ( nFlags  sheet::MemberResultFlags::HASMEMBER )
 {
-// We need automatic number format detection here. Date and number
-// grouping functionality depend on it.
+bool bNumeric = (nFlags  sheet::MemberResultFlags::NUMERIC) != 0;
 ScSetStringParam aParam;
-aParam.mbDetectNumberFormat = true;
-aParam.mbSetTextCellFormat = false;
+if (bNumeric)
+{
+aParam.mbDetectNumberFormat = true;
+aParam.mbSetTextCellFormat = false;
+}
+else
+{
+aParam.mbDetectNumberFormat = false;
+aParam.mbSetTextCellFormat = true;
+}
 pDoc-SetString(nCol, nRow, nTab, rData.Caption, aParam);
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 2 commits - filter/source sd/CppunitTest_sd_filters_test.mk sd/Module_sd.mk

2012-01-24 Thread Thorsten Behrens
 filter/source/svg/svgexport.cxx   |   38 +++---
 filter/source/svg/svgreader.cxx   |6 +++---
 filter/source/svg/svgwriter.hxx   |6 --
 sd/CppunitTest_sd_filters_test.mk |2 +-
 sd/Module_sd.mk   |   13 +
 5 files changed, 12 insertions(+), 53 deletions(-)

New commits:
commit efc28fae8d9453ff313f363d28e5a94ccd3adc4a
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Jan 24 23:19:22 2012 +0100

Disable svg font embedding for sd filters test, enable again.

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 1d63611..24aa950 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -27,8 +27,6 @@
  /
 
 
-#define ITEMID_FIELD 0
-
 #include svgwriter.hxx
 #include svgfontexport.hxx
 #include svgfilter.hxx
@@ -37,6 +35,7 @@
 
 #include com/sun/star/util/MeasureUnit.hpp
 
+#include rtl/bootstrap.hxx
 #include svtools/miscopt.hxx
 #include svx/unopage.hxx
 #include svx/unoshape.hxx
@@ -488,9 +487,14 @@ sal_Bool SVGFilter::implExport( const Sequence 
PropertyValue  rDescriptor )
 
 // font embedding
 const char* pSVGDisableFontEmbedding = getenv( 
SVG_DISABLE_FONT_EMBEDDING );
+rtl::OUString aEmbedFontEnv(
+RTL_CONSTASCII_USTRINGPARAM(${SVG_DISABLE_FONT_EMBEDDING}));
+rtl::Bootstrap::expandMacros(aEmbedFontEnv);
+const bool bEmbedFonts=pSVGDisableFontEmbedding ? false : (
+aEmbedFontEnv.getLength() ? false : true);
 
 maFilterData[ 1 ].Name = B2UCONST( SVG_PROP_EMBEDFONTS );
-maFilterData[ 1 ].Value = (sal_Bool) ( pSVGDisableFontEmbedding ? 
sal_False : sal_True );
+maFilterData[ 1 ].Value = (sal_Bool) (bEmbedFonts);
 
 // Native decoration
 maFilterData[ 2 ].Name = B2UCONST( SVG_PROP_NATIVEDECORATION );
diff --git a/sd/CppunitTest_sd_filters_test.mk 
b/sd/CppunitTest_sd_filters_test.mk
index b4de440..5b89b8f 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -123,7 +123,7 @@ $(eval $(call 
gb_CppunitTest_add_old_components,sd_filters_test,\
 $(eval $(call gb_CppunitTest_set_args,sd_filters_test,\
 --headless \
 --protector unoexceptionprotector$(gb_Library_DLLEXT) 
unoexceptionprotector \
--env:CONFIGURATION_LAYERS=xcsxcu:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) \
+-env:CONFIGURATION_LAYERS=xcsxcu:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) 
-env:SVG_DISABLE_FONT_EMBEDDING=YEAH module:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) \
 ))
 # .../spool is required for the (somewhat strange) filter configuration
 
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index f015d04..edc6f25 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -52,18 +52,7 @@ endif
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
 JunitTest_sd_unoapi \
+CppunitTest_sd_regression_test \
 ))
-#TODO: Disabled for now, needs work by Thorsten Behrens to get don't embed 
font
-# config taken into account, otherwise leads to failures like
-#  regression-test.cxx:84:Assertion
-#  Test name: SdFiltersTest::test
-#  assertion failed
-#  - Expression: false
-#  - Mismatch between reference file and exported file in line 60.
-#  Expected: font-face font-family=StarSymbol embedded units-per-em=2048
-#   font-weight=normal font-style=normal ascent=1693 descent=318/
-#  Found   : font-face font-family=StarSymbol embedded units-per-em=2048
-#   font-weight=normal font-style=normal ascent=1640 descent=397/
-# CppunitTest_sd_regression_test \
 
 # vim: set noet sw=4 ts=4:
commit e5e0aae1e220cdde7b06c899425dcabd912048d1
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Jan 24 22:23:19 2012 +0100

Remove dead code from svg filter

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 905bd62..1d63611 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -38,7 +38,6 @@
 #include com/sun/star/util/MeasureUnit.hpp
 
 #include svtools/miscopt.hxx
-#include svtools/FilterConfigItem.hxx
 #include svx/unopage.hxx
 #include svx/unoshape.hxx
 #include svx/svdpage.hxx
@@ -482,18 +481,6 @@ sal_Bool SVGFilter::implExport( const Sequence 
PropertyValue  rDescriptor )
 // if no filter data is given use stored/prepared ones
 if( !maFilterData.getLength() )
 {
-#ifdef _SVG_USE_CONFIG
-FilterConfigItem aCfgItem( String( RTL_CONSTASCII_USTRINGPARAM( 
SVG_EXPORTFILTER_CONFIGPATH ) ) );
-
-aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( 
SVG_PROP_TINYPROFILE ) ), sal_True );
-aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( 
SVG_PROP_EMBEDFONTS ) ), sal_True );
-aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( 

[Libreoffice-commits] .: 2 commits - sal/android sal/inc sal/Package_inc.mk vcl/android vcl/headless vcl/inc vcl/Library_vcl.mk

2012-01-24 Thread Michael Meeks
 sal/Package_inc.mk|1 
 sal/android/android_native_app_glue.c |   15 +
 sal/android/android_native_app_glue.h |  349 -
 sal/android/lo-bootstrap.c|3 
 sal/inc/osl/detail/android.h  |  352 ++
 vcl/Library_vcl.mk|5 
 vcl/android/androidinst.cxx   |   70 --
 vcl/headless/svpinst.cxx  |   45 ++--
 vcl/inc/android/androidinst.hxx   |6 
 vcl/inc/headless/svpinst.hxx  |3 
 10 files changed, 454 insertions(+), 395 deletions(-)

New commits:
commit 7dbd2a0a6d983bdd14bf7a022c0199fde76e143a
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jan 24 22:36:25 2012 +

android: re-factor headless a little, and start on the mainloop

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 3983608..fa6093e 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -431,6 +431,11 @@ $(eval $(call gb_Library_use_externals,vcl,\
 endif
 
 ifeq ($(GUIBASE),android)
+$(eval $(call gb_Library_add_libs,vcl,\
+   -llog \
+   -landroid \
+   -llo-bootstrap \
+))
 $(eval $(call gb_Library_add_defs,vcl,\
 -DSAL_DLLPREFIX=\$(gb_Library_SYSPRE)\ \
 -DSAL_DLLPOSTFIX=\$(gb_Library_OOOEXT)\ \
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 6a1bbcd..91971e6 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -30,11 +30,15 @@
 #include headless/svpdummies.hxx
 #include generic/gendata.hxx
 #include android/log.h
+#include android/looper.h
+#include osl/detail/android.h
 
 AndroidSalInstance::AndroidSalInstance( SalYieldMutex *pMutex )
 : SvpSalInstance( pMutex )
 {
-fprintf (stderr, created Android Sal Instance\n);
+fprintf (stderr, created Android Sal Instance for app %p window %p\n,
+ global_android_app,
+ global_android_app ? global_android_app-window : NULL);
 }
 
 AndroidSalInstance::~AndroidSalInstance()
@@ -42,6 +46,34 @@ AndroidSalInstance::~AndroidSalInstance()
 fprintf (stderr, destroyed Android Sal Instance\n);
 }
 
+void AndroidSalInstance::Wakeup()
+{
+if (global_android_app  global_android_app-looper)
+ALooper_wake (global_android_app-looper);
+else
+fprintf (stderr, busted - no global looper\n);
+}
+
+void AndroidSalInstance::DoReleaseYield (int nTimeoutMS)
+{
+// release yield mutex
+sal_uLong nAcquireCount = ReleaseYieldMutex();
+
+fprintf (stderr, DoReleaseYield for %d ms\n, nTimeoutMS);
+//int ALooper_pollOnce(timeoutMs, int* outFd, int* outEvents, void** 
outData);
+
+// acquire yield mutex again
+AcquireYieldMutex(nAcquireCount);
+}
+
+bool AndroidSalInstance::AnyInput( sal_uInt16 nType )
+{
+// FIXME: ideally we should check the input queue to avoid being busy ...
+fprintf (stderr, FIXME: AnyInput returns true\n);
+// global_android_app-inputQueue ? ...
+return true;
+}
+
 class AndroidSalSystem : public SvpSalSystem {
 public:
 AndroidSalSystem() : SvpSalSystem() {}
@@ -52,14 +84,9 @@ public:
   int nDefButton )
 {
 (void)rButtons; (void)nDefButton;
-#if 0
 __android_log_print(ANDROID_LOG_INFO, LibreOffice - dialog '%s': 
'%s',
 rtl::OUStringToOString(rTitle, 
RTL_TEXTENCODING_ASCII_US).getStr(),
 rtl::OUStringToOString(rMessage, 
RTL_TEXTENCODING_ASCII_US).getStr());
-#endif
-fprintf (stderr, LibreOffice - dialog '%s': '%s',
- rtl::OUStringToOString(rTitle, 
RTL_TEXTENCODING_ASCII_US).getStr(),
- rtl::OUStringToOString(rMessage, 
RTL_TEXTENCODING_ASCII_US).getStr());
 return 0;
 }
 };
@@ -77,19 +104,6 @@ public:
 virtual bool ErrorTrapPop( bool ) { return false; }
 };
 
-SalInstance *CreateSalInstance()
-{
-AndroidSalInstance* pInstance = new AndroidSalInstance( new 
SalYieldMutex() );
-new AndroidSalData( pInstance );
-return pInstance;
-}
-
-void DestroySalInstance( SalInstance *pInst )
-{
-pInst-ReleaseYieldMutex();
-delete pInst;
-}
-
 // All the interesting stuff is slaved from the AndroidSalInstance
 void InitSalData()   {}
 void DeInitSalData() {}
@@ -103,12 +117,8 @@ void SalAbort( const rtl::OUString rErrorText, bool 
bDumpCore )
 aError = rtl::OUString::createFromAscii(Unknown application error);
 ::fprintf( stderr, %s\n, rtl::OUStringToOString(rErrorText, 
osl_getThreadTextEncoding()).getStr() );
 
-#if 0
 __android_log_print(ANDROID_LOG_INFO, SalAbort: '%s',
 rtl::OUStringToOString(aError, 
RTL_TEXTENCODING_ASCII_US).getStr());
-#endif
-fprintf( stderr, SalAbort: '%s',
- rtl::OUStringToOString(aError, 
RTL_TEXTENCODING_ASCII_US).getStr() );
 if( bDumpCore )
 abort();
 else
@@ -132,4 +142,18 @@ SalData::~SalData()
 {
 }
 
+// This is our main entry point:
+SalInstance 

[Libreoffice-commits] .: sd/qa

2012-01-24 Thread Thorsten Behrens
 sd/qa/unit/data/svg/test.svg |   65 ++-
 1 file changed, 4 insertions(+), 61 deletions(-)

New commits:
commit 738851f76966981370f1b311b7e7d2066537f07c
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Jan 24 23:40:02 2012 +0100

Adapt reference svg to not contain embedded fonts anymore.

diff --git a/sd/qa/unit/data/svg/test.svg b/sd/qa/unit/data/svg/test.svg
index 9e8ce1d..74e01e6 100644
--- a/sd/qa/unit/data/svg/test.svg
+++ b/sd/qa/unit/data/svg/test.svg
@@ -6,69 +6,12 @@
rect x=0 y=0 width=28002 height=20999/
   /clipPath
  /defs
- defs
-  font id=EmbeddedFont_1 horiz-adv-x=2048
-   font-face font-family=Liberation Sans embedded units-per-em=2048 
font-weight=normal font-style=normal ascent=1852 descent=423/
-   missing-glyph horiz-adv-x=2048 d=M 0,0 L 2047,0 2047,2047 0,2047 0,0 
Z/
-   glyph unicode=x horiz-adv-x=1033 d=M 801,0 L 510,444 217,0 23,0 
408,556 41,1082 240,1082 510,661 778,1082 979,1082 612,558 1002,0 801,0 Z/
-   glyph unicode=v horiz-adv-x=1059 d=M 613,0 L 400,0 7,1082 199,1082 
437,378 C 442,363 447,346 454,325 460,304 466,282 473,259 480,236 486,215 
492,194 497,173 502,155 506,141 510,155 515,173 522,194 528,215 534,236 541,258 
548,280 555,302 562,323 569,344 575,361 580,376 L 826,1082 1017,1082 613,0 Z/
-   glyph unicode=u horiz-adv-x=901 d=M 314,1082 L 314,396 C 314,343 
318,299 326,264 333,229 346,200 363,179 380,157 403,142 432,133 460,124 495,119 
537,119 580,119 618,127 653,142 687,157 716,178 741,207 765,235 784,270 797,312 
810,353 817,401 817,455 L 817,1082 997,1082 997,231 C 997,208 997,185 998,160 
998,135 998,111 999,89 1000,66 1000,47 1001,31 1002,15 1002,5 1003,0 L 833,0 C 
832,3 832,12 831,27 830,42 830,59 829,78 828,97 827,116 826,136 825,155 825,172 
825,185 L 822,185 C 805,154 786,125 765,100 744,75 720,53 693,36 666,18 634,4 
599,-6 564,-15 523,-20 476,-20 416,-20 364,-13 321,2 278,17 242,39 214,70 
186,101 166,140 153,188 140,236 133,294 133,361 L 133,1082 314,1082 Z/
-   glyph unicode=t horiz-adv-x=531 d=M 554,8 C 527,1 499,-5 471,-10 
442,-14 409,-16 372,-16 228,-16 156,66 156,229 L 156,951 31,951 31,1082 
163,1082 216,1324 336,1324 336,1082 536,1082 536,951 336,951 336,268 C 336,216 
345,180 362,159 379,138 408,127 450,127 467,127 484,128 501,131 517,134 535,137 
554,141 L 554,8 Z/
-   glyph unicode=r horiz-adv-x=556 d=M 142,0 L 142,830 C 142,853 142,876 
142,900 141,923 141,946 140,968 139,990 139,1011 138,1030 137,1049 137,1067 
136,1082 L 306,1082 C 307,1067 308,1049 309,1030 310,1010 311,990 312,969 
313,948 313,929 314,910 314,891 314,874 314,861 L 318,861 C 331,902 344,938 
359,969 373,999 390,1024 409,1044 428,1063 451,1078 478,1088 505,1097 537,1102 
575,1102 590,1102 604,1101 617,1099 630,1096 641,1094 648,1092 L 648,927 C 
636,930 622,933 606,935 590,936 572,937 552,937 511,937 476,928 447,909 418,890 
394,865 376,832 357,799 344,759 335,714 326,668 322,618 322,564 L 322,0 142,0 
Z/
-   glyph unicode=o horiz-adv-x=980 d=M 1053,542 C 1053,353 1011,212 
928,119 845,26 724,-20 565,-20 490,-20 422,-9 363,14 304,37 254,71 213,118 
172,165 140,223 119,294 97,364 86,447 86,542 86,915 248,1102 571,1102 655,1102 
728,1090 789,1067 850,1044 900,1009 939,962 978,915 1006,857 1025,787 1044,717 
1053,635 1053,542 Z M 864,542 C 864,626 858,695 845,750 832,805 813,848 788,881 
763,914 732,937 696,950 660,963 619,969 574,969 528,969 487,962 450,949 413,935 
381,912 355,879 329,846 309,802 296,747 282,692 275,624 275,542 275,458 282,389 
297,334 312,279 332,235 358,202 383,169 414,146 449,133 484,120 522,113 563,113 
609,113 651,120 688,133 725,146 757,168 783,201 809,234 829,278 843,333 857,388 
864,458 864,542 Z/
-   glyph unicode=n horiz-adv-x=900 d=M 825,0 L 825,686 C 825,739 821,783 
814,818 806,853 793,882 776,904 759,925 736,941 708,950 679,959 644,963 602,963 
559,963 521,956 487,941 452,926 423,904 399,876 374,847 355,812 342,771 329,729 
322,681 322,627 L 322,0 142,0 142,851 C 142,874 142,898 142,923 141,948 141,971 
140,994 139,1016 139,1035 138,1051 137,1067 137,1077 136,1082 L 306,1082 C 
307,1079 307,1070 308,1055 309,1040 310,1024 311,1005 312,986 312,966 313,947 
314,927 314,910 314,897 L 317,897 C 334,928 353,957 374,982 395,1007 419,1029 
446,1047 473,1064 505,1078 540,1088 575,1097 616,1102 663,1102 723,1102 
775,1095 818,1080 861,1065 897,1043 925,1012 953,981 974,942 987,894 1000,845 
1006,788 1006,721 L 1006,0 825,0 Z/
-   glyph unicode=m horiz-adv-x=1456 d=M 768,0 L 768,686 C 768,739 
765,783 758,818 751,853 740,882 725,904 709,925 688,941 663,950 638,959 607,963 
570,963 532,963 498,956 467,941 436,926 410,904 389,876 367,847 350,812 339,771 
327,729 321,681 321,627 L 321,0 142,0 142,851 C 142,874 142,898 142,923 141,948 
141,971 140,994 139,1016 139,1035 138,1051 137,1067 137,1077 136,1082 L 
306,1082 C 307,1079 307,1070 308,1055 309,1040 310,1024 311,1005 312,986 
312,966 313,947 314,927 314,910 314,897 L 317,897 C 333,928 350,957 369,982 
388,1007 410,1029 435,1047 460,1064 488,1078 

[Libreoffice-commits] .: basegfx/inc basegfx/source unusedcode.easy

2012-01-24 Thread Muthu Subramanian
 basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx |7 -
 basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx |   10 -
 basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx |   14 --
 basegfx/source/polygon/b2dpolygonclipper.cxx  |   66 --
 basegfx/source/polygon/b2dpolygoncutandtouch.cxx  |  112 --
 basegfx/source/polygon/b3dpolygonclipper.cxx  |  102 
 unusedcode.easy   |   10 -
 7 files changed, 321 deletions(-)

New commits:
commit 92a87649a79de6013703d2344365ef86fc9788bd
Author: Alexander Bergmann myadd...@gmx.de
Date:   Wed Jan 25 12:01:28 2012 +0530

Removing unused code (basegfx).

diff --git a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx 
b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
index 172996a..2556b34 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
@@ -57,13 +57,6 @@ namespace basegfx
 BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnRange(const 
B2DPolyPolygon rCandidate, const B2DRange rRange, bool bInside, bool bStroke);
 BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnRange(const B2DPolygon 
rCandidate, const B2DRange rRange, bool bInside, bool bStroke);
 
-// Clip given PolyPolygon against the endless edge (ray) defined by 
the given two points. bAbove defines on which side
-// of the edge the result will be together with the definition of the 
edge. If the edge is seen as a vector
-// from A to B and bAbove is true, the result will contain the 
geometry left of the vector.
-// The switch bStroke decides if the polygon is interpreted as area 
(false) or strokes (true).
-BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnEdge(const 
B2DPolyPolygon rCandidate, const B2DPoint rPointA, const B2DPoint rPointB, 
bool bAbove, bool bStroke);
-BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnEdge(const B2DPolygon 
rCandidate, const B2DPoint rPointA, const B2DPoint rPointB, bool bAbove, bool 
bStroke);
-
 // Clip given PolyPolygon against given clipping polygon.
 // The switch bStroke decides if the polygon is interpreted as area 
(false) or strokes (true).
 // With stroke polygons, You get all line snippets inside rCip.
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx 
b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
index 0c6296d..8997c54 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
@@ -53,28 +53,18 @@ namespace basegfx
 // not change or add points to rMask.
 BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCutsAndTouches(const 
B2DPolyPolygon rMask, const B2DPolygon rCandidate);
 
-// look for intersections of rCandidate with all polygons from rMask 
and add extra points there. Do
-// not change or add points to rMask.
-BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCutsAndTouches(const 
B2DPolyPolygon rMask, const B2DPolyPolygon rCandidate);
-
 // look for intersections of rCandidate with the edge from rStart to 
rEnd and add extra points there.
 // Points are only added in the range of the edge, not on the endless 
vector.
 BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon 
rCandidate, const B2DPoint rStart, const B2DPoint rEnd);
-BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon 
rCandidate, const B2DPoint rStart, const B2DPoint rEnd);
 
 // look for intersections of rCandidate with the mask Polygon and add 
extra points there.
 // The mask polygon is assumed to be closed, even when it's not 
explicitly.
 BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon 
rCandidate, const B2DPolyPolygon rMask);
-BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon 
rCandidate, const B2DPolyPolygon rMask);
 
 // look for self-intersections in given polygon and add extra points 
there. Result will have no
 // intersections on an edge
 BASEGFX_DLLPUBLIC B2DPolygon addPointsAtCuts(const B2DPolygon 
rCandidate);
 
-// add points at all self-intersections of single polygons (depends on 
bSelfIntersections)
-// and at polygon-polygon intersections
-BASEGFX_DLLPUBLIC B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon 
rCandidate, bool bSelfIntersections = true);
-
 } // end of namespace tools
 } // end of namespace basegfx
 
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx 
b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
index 0c66967..f34effe 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
@@ -62,26 +62,12 @@ namespace basegfx
 // version for Polygons
 BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnOrthogonalPlane(const 
B3DPolygon 

[Libreoffice-commits] .: vcl/inc vcl/source

2012-01-24 Thread Muthu Subramanian
 vcl/inc/vcl/outdev.hxx |1 +
 vcl/source/gdi/outdev.cxx  |   32 
 vcl/source/gdi/outdev2.cxx |   35 +--
 3 files changed, 22 insertions(+), 46 deletions(-)

New commits:
commit f9c09fbbb32f3808e2ef2eaa7148e10a130ccd20
Author: Christina Rossmanith chrrossman...@web.de
Date:   Wed Jan 25 13:23:49 2012 +0530

Reduced duplicate code detected by simian.

diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 9ce143d..f14943b 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -547,6 +547,7 @@ public:
 
 // tells whether this output device is RTL in an LTR UI or LTR in a RTL UI
 SAL_DLLPRIVATE bool ImplIsAntiparallel() const ;
+SAL_DLLPRIVATE Color ImplDrawModeToColor( const Color rColor );
 
 // #i101491#
 // Helper which holds the old line geometry creation and is extended to 
use AA when
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index fe49527..76b09d0 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -1238,38 +1238,36 @@ void OutputDevice::SetLineColor()
 
 // ---
 
-void OutputDevice::SetLineColor( const Color rColor )
+Color OutputDevice::ImplDrawModeToColor( const Color rColor )
 {
-OSL_TRACE( OutputDevice::SetLineColor( %lx ), rColor.GetColor() );
-DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
-
 Color aColor( rColor );
+sal_uLong  nDrawMode = GetDrawMode();
 
-if( mnDrawMode  ( DRAWMODE_BLACKLINE | DRAWMODE_WHITELINE |
-   DRAWMODE_GRAYLINE | DRAWMODE_GHOSTEDLINE |
-   DRAWMODE_SETTINGSLINE ) )
+if( nDrawMode  ( DRAWMODE_BLACKLINE | DRAWMODE_WHITELINE |
+  DRAWMODE_GRAYLINE | DRAWMODE_GHOSTEDLINE |
+  DRAWMODE_SETTINGSLINE ) )
 {
 if( !ImplIsColorTransparent( aColor ) )
 {
-if( mnDrawMode  DRAWMODE_BLACKLINE )
+if( nDrawMode  DRAWMODE_BLACKLINE )
 {
 aColor = Color( COL_BLACK );
 }
-else if( mnDrawMode  DRAWMODE_WHITELINE )
+else if( nDrawMode  DRAWMODE_WHITELINE )
 {
 aColor = Color( COL_WHITE );
 }
-else if( mnDrawMode  DRAWMODE_GRAYLINE )
+else if( nDrawMode  DRAWMODE_GRAYLINE )
 {
 const sal_uInt8 cLum = aColor.GetLuminance();
 aColor = Color( cLum, cLum, cLum );
 }
-else if( mnDrawMode  DRAWMODE_SETTINGSLINE )
+else if( nDrawMode  DRAWMODE_SETTINGSLINE )
 {
 aColor = GetSettings().GetStyleSettings().GetFontColor();
 }
 
-if( mnDrawMode  DRAWMODE_GHOSTEDLINE )
+if( nDrawMode  DRAWMODE_GHOSTEDLINE )
 {
 aColor = Color( ( aColor.GetRed()  1 ) | 0x80,
 ( aColor.GetGreen()  1 ) | 0x80,
@@ -1277,6 +1275,16 @@ void OutputDevice::SetLineColor( const Color rColor )
 }
 }
 }
+return aColor;
+}
+
+
+void OutputDevice::SetLineColor( const Color rColor )
+{
+OSL_TRACE( OutputDevice::SetLineColor( %lx ), rColor.GetColor() );
+DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
+
+Color aColor = ImplDrawModeToColor( rColor );
 
 if( mpMetaFile )
 mpMetaFile-AddAction( new MetaLineColorAction( aColor, sal_True ) );
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 2003de8..9b0b4f3 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -1441,40 +1441,7 @@ void OutputDevice::DrawPixel( const Point rPt, const 
Color rColor )
 OSL_TRACE( OutputDevice::DrawPixel() );
 DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
 
-Color aColor( rColor );
-
-if( mnDrawMode  ( DRAWMODE_BLACKLINE | DRAWMODE_WHITELINE |
-   DRAWMODE_GRAYLINE | DRAWMODE_GHOSTEDLINE |
-   DRAWMODE_SETTINGSLINE ) )
-{
-if( !ImplIsColorTransparent( aColor ) )
-{
-if( mnDrawMode  DRAWMODE_BLACKLINE )
-{
-aColor = Color( COL_BLACK );
-}
-else if( mnDrawMode  DRAWMODE_WHITELINE )
-{
-aColor = Color( COL_WHITE );
-}
-else if( mnDrawMode  DRAWMODE_GRAYLINE )
-{
-const sal_uInt8 cLum = aColor.GetLuminance();
-aColor = Color( cLum, cLum, cLum );
-}
-else if( mnDrawMode  DRAWMODE_SETTINGSLINE )
-{
-aColor = GetSettings().GetStyleSettings().GetFontColor();
-}
-
-if( mnDrawMode  DRAWMODE_GHOSTEDLINE )
-{
-aColor = Color( ( aColor.GetRed()  1 ) | 0x80,
-( aColor.GetGreen()  1 ) | 

Re: [Libreoffice] [PATCH][PUSHED] Replace ENSURE_OR_* macros with regular code.

2012-01-24 Thread Stephan Bergmann
[This should have gone out last night already, somehow didn't make it 
off my computer.]


On 01/23/2012 11:08 AM, Marcel Metz wrote:

I oppose to the macros improve readability argument, these macros
don't improve readability, they hide some regular execution from the
programmer. You would need to know the structure of the macro to
completely understand what the code is doing which could be a problem
for developers that are not aware of the side effects of the macros.
When reading the regular code the keywords that change the execution
would stand out while the macros could easily be skipped.


Indeed, macros with hidden control flow magic are extra evil.  C++ 
offers poor abstractions in this regard, but macros overall bring more 
pain than relief, so one generally has to bite the bullet and write some 
repetitive -- albeit trivial -- boilerplate.


However, I have another question:  I notice that, while most occurrences 
are replaced with SAL_WARN, some were left as OSL_ENSURE (which I 
changed to SAL_WARN; one missed a comma, anyway) and some are changed to 
SAL_INFO.  Was there some rationale for that?  Anyway, pushed now (and 
additionally removed some newly unnecessary #include tools/diagnose_ex.h).


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


Re: [Libreoffice] [PATCH][PUSHED] Replace ENSURE_OR_* macros with regular code.

2012-01-24 Thread Marcel Metz
Hello Stephan,

On 24.01.2012 09:30, Stephan Bergmann wrote:
 However, I have another question:  I notice that, while most
 occurrences  are replaced with SAL_WARN, some were left as OSL_ENSURE
 (which I changed to SAL_WARN; one missed a comma, anyway) and some
 are changed to SAL_INFO.  Was there some rationale for that?

No, unfortunately none aside from my sloppiness. Even after reviewing it
twice it does seem like I don't get it right. :/
Thanks for your review Stephan.

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


Re: [Libreoffice] Important details for easy woking on LibreOffice

2012-01-24 Thread Petr Mladek
Danylo Sa píše v Ne 22. 01. 2012 v 15:12 +0100:
 Hello.
 
 People who used MS Office before has some complaints about LibreOffice:
 
  1 - Insert number of pages is a pain in LibreOffice Writer.
  Why all this complication for a simple task?
 
SOLUTION
-- Why don't you include the old pagination extension in main release?

Sounds interesting. Could you please report it into bugzilla[*] and add
cedric.bosdonnat@free.fr into CC?

Please, also add link where to find the pagination extension.


  2 - Printing only even pages or odd pages is a pain in LibreOffice.
  Lots of people doesn't know that left pages means even and right pages 
 means odd
 
SOLUTION
-- Why don't you include the terms odd and even beside the right 
 and left terms? It would be like this:
 
  [ ] print only left pages (even)
  [ ] print only right pages (odd)

Where do you see this this? I see the following items in
File/Print/Page Layout/Page Sides/Include in LO-3.4 and 3.5:

+ All pages
+ Back sides / Left pages
+ Front sides / Right pages

If you really see some confusion with the even/odd terms in recent LO =
3.4 version, please report it into bugzilla[*] and add
christoph.spamfo...@dogmatux.com into CC

[*] You might create it directly at https://bugs.freedesktop.org or use
the wizard at https://www.libreoffice.org/get-help/bug/.


 Your office suite is the best; however, it needs some tweaks.
 I love LibreOffice and God bless you all.

We are glad to hear this.

Thanks for your tips.


Best Regards,
Petr

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


Re: [Libreoffice] Build fails for Tail_build

2012-01-24 Thread Michael Meeks
Hi Anurag,

On Tue, 2012-01-24 at 09:07 +0530, Anurag Jain wrote:
 I've been building LO and it seems build is failing for me in
 tail_build for one of the unit test. I asked about if there is any
 work around other than cleaning and rebuilding this big chunk in the
 main channel.

Ah :-) so - of course, something is going wrong there, either in the
code, or in the unit test itself.

 File tested,Test Result,Execution Time (ms)
 file:///home/anurag/libo/core/svtools/qa/cppunit/data/wmf/pass/CVE-2006-4071-1.wmf,filters-test.cxx:123:Assertion
 Test name: SvtoolsFiltersTest::testCVEs
 assertion failed
 - Expression: osl::FileBase::E_None == osl::File::remove(sTmpFile)

Something is failing; as a quick  nasty cheat, you could simply

rm home/anurag/libo/core/svtools/qa/cppunit/data/wmf/pass/CVE-2006-4071-1.wmf

 Error: a unit test failed, please do one of:

Or - failing that, we can try this lot:

 export DEBUGCPPUNIT=TRUE# for exception catching
 export GDBCPPUNITTRACE=gdb --args # for interactive debugging
 export VALGRIND=memcheck# for memory checking

To see what is going wrong; try the gdb --args - and see what it is
trying to remove, and why it is not there and/or what error the
osl::File::remove returns [ perhaps tweaking the test code itself ].

Also - you'll prolly want to:

cd core/svtools ; make clean ; make debug=true -j2

to get some better locality and debug symbols to help.

And of course pastebin the output to the dev channel for some help with
that :-)

Thanks !

Michael.

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

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


Re: [Libreoffice] [REVIEW][3-5] Fix pivot table's date and number grouping

2012-01-24 Thread Markus Mohrhard
Hello Kohei,

2012/1/24 Kohei Yoshida kohei.yosh...@gmail.com:
 Hi there,

 I would like

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

 to be backported to the 3-5 branch.  It fixes

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

 Review and sign-off appreciated.


 Did you check with libreoffice 3-5? I think that eike's work for date
patterns is missing in 3-5 so that this patch does reopen the bug we
discussed on IRC. At least your unit test fails and I think we should
check that before adding the patch to 3-5.

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


[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs

2012-01-24 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 44110, which changed state.

Bug 44110 Summary: New Math symbols poorly rendered in Windows
https://bugs.freedesktop.org/show_bug.cgi?id=44110

   What|Old Value   |New Value

 Resolution||FIXED
 Status|NEW |RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] [REVIEWED/PUSHED] Fix for bug fdo#44110, New Math symbols issues in Windows

2012-01-24 Thread Michael Meeks
On Mon, 2012-01-23 at 22:32 -0200, Olivier Hallot wrote:
 I have fixed and pushed in master this issue, but it should be
 cherry-picked into 3.5

Reviewed  pushed to -3-5 :-)

Thanks !

Michael.

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

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


[Libreoffice] unused function parameters

2012-01-24 Thread Stephan Bergmann
When we made the original OOo code base warning-clean a number of years 
ago, many warnings about unused parameters were silenced by removing the 
parameter name, instead of actually fixing the code by dropping the 
unused parameter.  Of course, dropping an unused parameter is not always 
the right fix, e.g., in virtual functions (where some overrides require 
the parameter and others don't, so it consistently needs to be present 
in all overrides).


That gave me the idea of writing a GCC plugin (as a gcc-python-plugin 
script, see https://fedorahosted.org/gcc-python-plugin/) that looks 
for unused, unnamed parameters (so that they can be revisited now, 
deciding on a proper fix), but takes into account patterns where the 
parameter is likely legitimately unused (like in the case of virtual 
functions).  (In turn, I wrote that script mainly to have something to 
present as http://fosdem.org/2012/schedule/event/libocompiler 
Analysing LibreOffice with Compiler plugins.)


However, there are still a number of legitimately unused function 
parameters that the script does not catch (think about functions that 
need to adhere to a certain signature, so their addresses can be 
assigned to function pointers of given type).  So I started to annotate 
those cases with GCC's __attribute__ ((unused)), wrapped in a newly 
introduced SAL_UNUSED_PARAMETER (sal/types.h), in the LO source code 
(and let the script ignore those).  Unfortunately, I also needed to add 
__attribute__ ((unused)) annotations to a number of headers from 
external modules included in the LO code base (I did that with specific 
new patches that are only relevant when running the plugin script, and 
are only applied to the external source when building with GCC).


The work turned out to be more tedious than anticipated, with many 
legitimately unused parameters having to be annotated, and not that many 
spectacular cases where removing a truly unused parameter has a rippling 
effect of allowing to also remove sizeable chunks of code that supplied 
values for that parameter in calls of the given function.  Anyway, I 
carried along up into somewhere in svl, the result is 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=7c704c78d3c652504c064b4ac7af55a2c1ee49bb 
Removed some unused parameters; added SAL_UNUSED_PARAMETER.  Maybe 
carrying this further up into the higher modules will lead to more 
satisfying results...  I'll see if I can extract an easy hack from this.


So, just in case you stumble across a newly introduced 
SAL_UNUSED_PARAMETER, you know what it is there for.  The GCC plugin 
script itself is detailed at 
https://fedorahosted.org/pipermail/gcc-python-plugin/2012-January/000157.html 
Additions for C++.


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


Re: [Libreoffice] [PATCH] optimized zoom to use more common intervals

2012-01-24 Thread Korrawit Pruegsanusak
Hello Tim,

Thanks for your patch. :-)
I didn't test it yet, but just my nitpick: could you please remove the
#include rtl/math.hxx
which I added to make the build success ?
It seems to be unused now.

And FYI, Jan Holesovsky changed the zoom factor to 2^(1/4).
http://cgit.freedesktop.org/libreoffice/core/commit/?id=a18c8a06073650e12f3c1f9f8990670484ac5cf1

Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice] [REVIEW 3-5] potential fix for fdo#44391

2012-01-24 Thread Noel Power
would like to get this committed for 3.5, although I don't see the same 
artifacts  as mentioned in the bug, I do see sometimes the  some 
character is displayed still after switching to a blank cell from one 
with content. I no longer see this with the patch and believe that it 
can't do any harm in any case ( and probably does fix the issue )


fix to cherry pick is 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=f00b387faeca2902909ce181f2f772a51ec4527f


thanks,

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


Re: [Libreoffice] Flat ODF usage in Git [Was: concept for c++ based subsequenttests]

2012-01-24 Thread Michael Meeks

On Mon, 2012-01-23 at 15:27 +0100, Michael Stahl wrote:
 unfortunately this would have less benefits than you imagine, because of
 the way xmloff writes automatic styles: they are generated anew on every
 export, in a non-deterministic order

Wow - how non-deterministic ? randomly shuffled or ... ? ;-)

 , which results in huge spurious diffs... (at least for Writer)

Interesting; the order is really not based on the order that the
different intersection of styles appear in the document ? I suspect this
is something that a number of people will want to improve for all those
funky store flat odf in git things :-)

All the best,

Michael.

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

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


Re: [Libreoffice] [REVIEW][3-5] Fix pivot table's date and number grouping

2012-01-24 Thread Eike Rathke
Hi,

On Tuesday, 2012-01-24 11:42:57 +0100, Markus Mohrhard wrote:

  Did you check with libreoffice 3-5? I think that eike's work for date
 patterns is missing in 3-5

Yes, that's only on master.

 so that this patch does reopen the bug we
 discussed on IRC. At least your unit test fails and I think we should
 check that before adding the patch to 3-5.

Relying on date patterns sounds very fragile, they vary between locales
and may change at any time.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


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


Re: [Libreoffice] [REVIEW][3-5] Fix for pivot table refresh problem

2012-01-24 Thread Markus Mohrhard
Hello Kohei,


 I'd like to have

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

 cherry-picked to 3-5.  This is a follow-up to my earlier changes in the
 pivot table code which somewhat changes the way pivot tables are
 refreshed.

 In short, Calc currently fails to properly refresh pivot tables whose
 data cache have not been created.  This typically happens when you open
 a document with pivot table, immediately modify the source data then
 refresh the table without launching the field popup or the pivot table
 dialog.


It seems that your patch does not fix the problem in 3-5. I tested
with sc/qa/extras/testdocuments/ScDataPilotTableObj.ods similar and
changed B6 but refresh does not work except if you force to create the
cache.

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


Re: [Libreoffice] [REVIEW] fdo#43932: try to fix paper tray settings

2012-01-24 Thread Ivan Timofeev

17.01.2012 16:05, Caolán McNamara пишет:

On Fri, 2012-01-13 at 22:22 +0400, Ivan Timofeev wrote:

Hi there,

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

this patch partially reverts
http://cgit.freedesktop.org/libreoffice/core/commit/?id=4cc5448ed82f13bb107695b65f39589df1e46cb9
because the following change made the option
[ ] Use only paper tray from printer preferences useless:


...


1. I haven't got a multitray printer to test this.


caolanm-dtardon: is there any multitray printers over where you are to
give this a quick sanity test ?

C.



*cough* (very bashfully) So what? :)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] File not found: cairocanvas.uno.so in smoketestoo_native

2012-01-24 Thread Michael Meeks
Hi Riccardo,

On Tue, 2012-01-24 at 12:26 +0100, Riccardo Magliocchetti wrote:
 with this configuration (note --disable-cairo-canvas is set)
 
 /autogen.sh --without-junit --without-java --disable-epm --disable-gtk 
...
 --disable-cairo-canvas --disable-neon --disable-dbus --disable-systray 

I guess the --disable-cairo-canvas thing is not working so well for you
for some reason. I guess for your case, you want to use the VCL canvas,
with the svp backend and hope :-) [ this is a somewhat under-tested
code-path I suspect, but ... lets see ;-].

 ... analyzing files ...
 ERROR: The following files could not be found:
 ERROR: File not found: cairocanvas.uno.so
 ... cleaning the output tree ...

So - you'll need to poke in the scp2/ directory and git grep for
cairocanvas there, and add a define in the makefile.mk to SCPDEFS (which
we pre-process with), and a conditonal in the relevant scp2. then re-run
'build  deliver' in scp2 and try again I guess.

Failing that editing the setup_osl.ins in the solver to manually hack
that out would work-around.

 Then something looks wrong with the paths in the help for debugging the 
 issue:

There are a number of these around, I wouldn't worry about them :-)

ATB,

Michael.

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

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


Re: [Libreoffice] [REVIEW] fdo#43932: try to fix paper tray settings

2012-01-24 Thread David Tardon
On Tue, Jan 24, 2012 at 03:36:23PM +0400, Ivan Timofeev wrote:
 17.01.2012 16:05, Caolán McNamara пишет:
 On Fri, 2012-01-13 at 22:22 +0400, Ivan Timofeev wrote:
 Hi there,
 
 https://bugs.freedesktop.org/show_bug.cgi?id=43932
 
 this patch partially reverts
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=4cc5448ed82f13bb107695b65f39589df1e46cb9
 because the following change made the option
 [ ] Use only paper tray from printer preferences useless:
 
 ...
 
 1. I haven't got a multitray printer to test this.
 
 caolanm-dtardon: is there any multitray printers over where you are to
 give this a quick sanity test ?
 
 C.
 
 
 *cough* (very bashfully) So what? :)

Oops, sorry... It seems it does not work: the tray setting is always
reset to 'Auto' again.

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


Re: [Libreoffice] [REVIEW][3-4] date change regression fdo#44385

2012-01-24 Thread Noel Power

On 21/01/12 01:42, Andrew Douglas Pitonyak wrote:

I believe that you intend to cause the following behavior:

date + numDate
date - num Date
date * num Double
date / num  Double
date + dateDate [2]
date - date Double [3]
date * date Double

[2] - I prefer this, but I would not spend much energy advocating it.
[3] - I would have subtraction return the same type as addition. So, 
if date + date returns date, then I would return date for [3]. If 
you have [2] return a double, then have [3] return a double.


My opinion is that you now just pick one and do it. I will call it a 
consensus and back your decision in the unlikely event I am ever 
called upon to do so.


so, in general terms I can accept that subtraction will result in either 
a Date or a Double ( depending on whether one or both sides of the 
operation are Dates ). I can also accept that adding a number to a Date 
should result in a Date also makes sense. I have more difficulty 
understanding why adding 2 dates should give a Date as a result and am 
(like you) a little uncomfortable about the lack of symmetry regarding 
treatment of '-/+'. However, having an overriding rule that ensures any 
'+' operation involving a Date type results in a Date type does ensure 
that those operations you mentioned previously e.g. something like

Date1 + num + Date2
will result in a Date type maybe explains the reason for this lack of 
symmetry in the treatment of '+/-'. Anyway since I can't make anymore 
sense of this I prefer to defer to both the previous behaviour ( and 
additionally behavriour of mso vba ) and modify the behaviour in the 
minimum way, e.g. just change the behaviour of Date - 'num' to return a 
Date. So, I will commit a change to provide the behaviour as is 
described in the table above ( including the asymmetric treatment of +/- 
). That's not to say we couldn't or shouldn't change the behaviour of 
'+' later, just right now I am not comfortable with doing that.


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


[Libreoffice] [PUSHED] Re: [REVIEW 3-5] fdo#43705: fix incomplete updating of the page preview pane in Draw

2012-01-24 Thread Radek Doulik
Hi Ivan,

the patch looks good to me. Pushed.

Cheers
Radek

On Sun, 2012-01-22 at 15:35 +0400, Ivan Timofeev wrote:
 Hi,
 
 https://bugs.freedesktop.org/show_bug.cgi?id=43705 (regression since 3.4)
 
 The fix for review:
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=799f2de5d1085d845ec498af0a7932965c42ed68
 
 Thanks,
 Ivan
 ___
 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] [Bug 37361] LibreOffice 3.5 most annoying bugs

2012-01-24 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=37361

--- Comment #138 from sasha.libreoff...@gmail.com 2012-01-24 04:33:29 PST ---
In one bug hard to distinguish regression from new functionality:
Bug 35735 - Save As defaults to current document format

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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


Re: [Libreoffice] sal / unit tests ...

2012-01-24 Thread Michael Meeks
Hi Matus,

On Sat, 2012-01-21 at 19:39 +0100, Matúš Kukan wrote:
 On 21 January 2012 14:19, Matúš Kukan matus.ku...@gmail.com wrote:
  On 21 January 2012 13:07, Michael Meeks michael.me...@suse.com wrote:
 * Cppunit_ gnumakefiles can only handle a single test per file
 + I split up the osl_File one to make it run:

  Oh no, my bad. This is the case only for three unit-tests' makefiles
  in sal. I will split them.
 
 So, I fixed something with:

Cool ! thanks for that :-) Of course, unfortunately still most of the
tests are not run because of the missing:

CPPUNIT_REGISTRY_ADD_TO_DEFAULT( osl_File );

But I guess this needs doing on a branch and then testing per platform:
so prolly a post 3.5 task :-) should I add an easy hack for that ?

All the best,

Michael.

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

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


Re: [Libreoffice] [REVIEW 3-5] [PUSHED] potential fix for fdo#44391

2012-01-24 Thread Markus Mohrhard
Hello Noel,

2012/1/24 Noel Power nopo...@suse.com:
 would like to get this committed for 3.5, although I don't see the same
 artifacts  as mentioned in the bug, I do see sometimes the  some character
 is displayed still after switching to a blank cell from one with content. I
 no longer see this with the patch and believe that it can't do any harm in
 any case ( and probably does fix the issue )

 fix to cherry pick is
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=f00b387faeca2902909ce181f2f772a51ec4527f


I think too that the patch will not create problems. Pushed to 3-5
with my sign-off.

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


Re: [Libreoffice] [REVIEW][PUSHED] Fixing page break button flickering

2012-01-24 Thread Petr Mladek
Cedric Bosdonnat píše v Pá 20. 01. 2012 v 15:44 +0100:
 Hi all,
 
 Moving the mouse over the page break line simply makes the button
 flicker... it's then not possible to see or click on it. The bug has
 only been reported on this list and ux-advise.
 
 This is caused by the following commit:
 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=1e0de54
 
 Could someone review that and revert it from 3.5?

I see it pushed in 3-5 branch. Anyway, it looks fine and really helps
with the problem and almost fixes
https://bugs.freedesktop.org/show_bug.cgi?id=45141



Best Regards,
Petr

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


Re: [Libreoffice] [PUSHED][REVIEW 3-5] remove duplicated icons from soffice.bin/soffice.exe (fdo#37740)

2012-01-24 Thread Fridrich Strba

Looks sane.

I pushed it into 3-5.

F.

On 19/01/12 13:20, Michael Meeks wrote:

Hi Andras,

On Thu, 2012-01-19 at 13:01 +0100, Andras Timar wrote:

Duplicated beyond that. Windows .ico files contain icon sets, each
file contains 16x16, 32x32, 48x48, 128x128, and 256x256 icons. But
many identical .ico files were embedded into the resource with
different names (for historical reasons). Almost all of them were
referenced from the code.


Oh - nice :-)


Another level of duplication was that soffice.exe and soffice.bin both
contained the same 40 icons. soffice.exe contained the icons for
Windows Explorer, soffice.bin contained the icons for application
windows' titlebar and Alt-Tab. Now Windows Explorer takes the icons
from soffice.bin, too.


Great.


Zoom levels are not affected. And yes, I read your comment in the bug
about images.zip. But I have no idea how to create an icon handle from
an image runtime, that Windows API call expects.


Lovely; so - I'm ecstatic :-) it'd be nice to get a triple new-feature
review from Tor or Fridrich on the topic - but I'd like to see it in 3.5
if we can: should shrink our download  speed our startup.

Thanks !

Michael.



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


Re: [Libreoffice] [REVIEWED:3-5][PUSHED:3-5] rhbz#746174 ODF export: numbering restart lost

2012-01-24 Thread Petr Mladek
Michael Stahl píše v Po 23. 01. 2012 v 20:22 +0100:
 the following fix for libreoffice-3.5:
 
 seems that under very special circumstances we don't export a list restart
 if the paragraph has only the restart flag set but no start value set.
 
 not a regression as far as i can tell; broken since OOo 3.0.1 at least.
 
 fixed on master:
 
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=c82ed24c4e51492105b5d94e164ece3cf86d6d86

It fixes the problem and looks sane = pushed into the 3-5 branch.


Best Regards,
Petr

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


Re: [Libreoffice] [PUSHED:3-5] Re: About Same expression on both sides of '||' in LockEntrySequence.cxx

2012-01-24 Thread Petr Mladek
julien2412 píše v Po 16. 01. 2012 v 11:49 -0800:
 Thank you Caolan and Christophe !
 I commited the patch as it was and pushed on Master.
 
 Julien.
 (PS : if you want/think useful I cherry pick it on 3.5, I can do it)

The patch made sense and looked safe = pushed into 3-5 branch.


Best Regards,
Petr

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


Re: [Libreoffice] Handling ordering problem when properties are set one by one

2012-01-24 Thread Michael Stahl
On 23/01/12 21:31, Lubos Lunak wrote:
 
  Hello,
 
  I have a bug that's related to databases in Writer (menu-Edit-Exchange 
 Database and RES_HIDDENTXTFLD). The code that triggers it does a copy of the 
 document in order to do the necessary substitutions there (well, this all is 
 at least how I understand it) and during the copying it copies data 
 identifying the database used by the document. Sadly, that's at least two 
 pieces of information (data source and command, whatever exactly those two 
 are) and the code does the copying in random other, because it simply 
 copies a bunch of properties of the source document, and the resulting orders 
 happens to be the reverse of what it should be. The code that handles the 
 database requires the data source first and the command afterwards (which is 
 quite logical, as the latter presumably doesn't make sense without the sooner 
 first).
 
  Technically, I get in SwXDocumentSettings::_setSingleValue() first a call 
 with HANDLE_CURRENT_DATABASE_DATA_SOURCE and then with 
 HANDLE_CURRENT_DATABASE_COMMAND. They both call first SwDoc::GetDBDesc(), 
 which first applies the command to some default data source and afterwards 
 sets the given data source without the right command afterwards. The reversed 
 ordering of the input data comes from some call far far in the past and I 
 have no idea if reusing old command does not cause a problem for other code 
 using this functionality.

i wonder, does it start doing something immediately if you set a single
property?  if nothing is actually done until later, probably we could
risk to change the setProperty so a new DATA_SOURCE doesn't clear a
previously set COMMAND; but note that i have no idea what this stuff
does anyway...

  It seems to be quite a common way for LO code to use this 
 let's-push-all-the-data-as-properties-one-by-one approach, so I wonder what 
 the common way of avoiding this problem is? Preferably something that's not 
 an ugly hack, excuse the naivety.

i'm not aware of a general solution for this problem; i'm afraid if
there are good reasons not do a change as above, then ugly hack is in
order...  i don't remember running into such a problem before, probably
this kind of dependency is quite rare.

also, there are lots of silly implementations of XMultiPropertySet or
XTolerantMultiPropertySet or something like that in Writer that
basically loop over a sequence of PropertyVaules and call
setPropertyValue for every one; presumably it would be much faster in
some cases to convert the whole sequence to say an SfxItemSet and push
that into the core in one call...

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


Re: [Libreoffice] Problem with clipboard paste in 3.5

2012-01-24 Thread Jan Holesovsky
Hi Petr,

On 2012-01-23 at 11:29 +0100, Petr Cisar wrote:

 So my next question is whether it is possible that LO can run without 
 libdtrans for some reason and what may be the possible cause ?

I'm sorry, I cannot answer your specific question; but if you haven't
tried yet, I'd build vcl with extra debugging info, like:

cd vcl
make clean
make dbglevel=2

Then when you re-run LibreOffice (assuming you are using the linked
installation, like the one produced by 'make dev-install'), you should
see a lot of debugging output when doing Ctrl+c or Ctrl+v, like:

getPasteData( CLIPBOARD, native: TARGETS )
handleReceivePropertyNotify for property CLIPBOARD
found 32 bytes data of type ATOM and format 32, items = 0
read 8 items data of type ATOM and format 32, 0 bytes left in property
handleSelectionNotify for selection CLIPBOARD and property CLIPBOARD (0x18e)
Warning: selection in state 0
handleReceivePropertyNotify for property CLIPBOARD
native type: TIMESTAMP
native type: TARGETS
native type: MULTIPLE
native type: SAVE_TARGETS
native type: UTF8_STRING
native type: COMPOUND_TEXT
native type: TEXT
native type: STRING
SelectionManager::getPasteDataTypes( CLIPBOARD ) = true
type: text/plain;charset=utf-16
type: TIMESTAMP
type: TARGETS
type: MULTIPLE
type: SAVE_TARGETS
type: text/plain;charset=utf-8
type: TEXT
type: text/plain;charset=iso8859-1
getPasteData( CLIPBOARD, text/plain;charset=utf-16 )
getPasteData( CLIPBOARD, native: UTF8_STRING )
handleReceivePropertyNotify for property CLIPBOARD
found 6 bytes data of type UTF8_STRING and format 8, items = 0
read 6 items data of type UTF8_STRING and format 8, 0 bytes left in property
handleSelectionNotify for selection CLIPBOARD and property CLIPBOARD (0x18e)
Warning: selection in state 0
handleReceivePropertyNotify for property CLIPBOARD
getPasteData for selection CLIPBOARD and data type text/plain;charset=utf-16 
returns true, returned sequence has length 14
X11Transferable::getTransferData( text/plain;charset=utf-16 )
 - nazdar
handleSendPropertyNotify for property WM_CLASS (new value)
handleSendPropertyNotify for property WM_STATE (new value)
handleSendPropertyNotify for property _NET_WM_STATE (new value)
handleSendPropertyNotify for property WM_STATE (new value)
handleSendPropertyNotify for property _NET_WM_STATE (new value)

This is from Gnome, and LO running the Gtk+ vclplugin; I'd try if it
works for you there, and then switch back to KDE - maybe the problem
really is KDE3-related.

Regards,
Kendy

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


Re: [Libreoffice] [REVIEW][3-5] Fix pivot table's date and number grouping

2012-01-24 Thread Kohei Yoshida
On Tue, 2012-01-24 at 12:24 +0100, Eike Rathke wrote:
 Hi,
 
 On Tuesday, 2012-01-24 11:42:57 +0100, Markus Mohrhard wrote:
 
   Did you check with libreoffice 3-5? I think that eike's work for date
  patterns is missing in 3-5
 
 Yes, that's only on master.
 
  so that this patch does reopen the bug we
  discussed on IRC. At least your unit test fails and I think we should
  check that before adding the patch to 3-5.
 
 Relying on date patterns sounds very fragile, they vary between locales
 and may change at any time.

Sure, but that's how it used to work.  It's fragile, yes, but to fix it
properly we'd have to make more invasive changes, and definitely not for
3.5.

-- 
Kohei Yoshida, LibreOffice hacker, Calc

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


Re: [Libreoffice] [REVIEW][3-5] Fix for pivot table refresh problem

2012-01-24 Thread Kohei Yoshida
On Tue, 2012-01-24 at 12:35 +0100, Markus Mohrhard wrote:
 Hello Kohei,
 
 
  I'd like to have
 
  http://cgit.freedesktop.org/libreoffice/core/commit/?id=561b044d62f4701e51abb4a7c47ce3b07f788f8e
 
  cherry-picked to 3-5.  This is a follow-up to my earlier changes in the
  pivot table code which somewhat changes the way pivot tables are
  refreshed.
 
  In short, Calc currently fails to properly refresh pivot tables whose
  data cache have not been created.  This typically happens when you open
  a document with pivot table, immediately modify the source data then
  refresh the table without launching the field popup or the pivot table
  dialog.
 
 
 It seems that your patch does not fix the problem in 3-5. I tested
 with sc/qa/extras/testdocuments/ScDataPilotTableObj.ods similar and
 changed B6 but refresh does not work except if you force to create the
 cache.

Does it at least fix it in the UI though?

Kohei

-- 
Kohei Yoshida, LibreOffice hacker, Calc

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


Re: [Libreoffice] [REVIEW-3.5] Handling ordering problem when properties are set one by one

2012-01-24 Thread Lubos Lunak
On Tuesday 24 of January 2012, Michael Stahl wrote:
 On 23/01/12 21:31, Lubos Lunak wrote:
   Technically, I get in SwXDocumentSettings::_setSingleValue() first a
  call with HANDLE_CURRENT_DATABASE_DATA_SOURCE and then with
  HANDLE_CURRENT_DATABASE_COMMAND. They both call first SwDoc::GetDBDesc(),
  which first applies the command to some default data source and
  afterwards sets the given data source without the right command
  afterwards. The reversed ordering of the input data comes from some call
  far far in the past and I have no idea if reusing old command does not
  cause a problem for other code using this functionality.

 i wonder, does it start doing something immediately if you set a single
 property?  if nothing is actually done until later, probably we could
 risk to change the setProperty so a new DATA_SOURCE doesn't clear a
 previously set COMMAND; but note that i have no idea what this stuff
 does anyway...

 Count me in.

   It seems to be quite a common way for LO code to use this
  let's-push-all-the-data-as-properties-one-by-one approach, so I wonder
  what the common way of avoiding this problem is? Preferably something
  that's not an ugly hack, excuse the naivety.

 i'm not aware of a general solution for this problem; i'm afraid if
 there are good reasons not do a change as above, then ugly hack is in
 order...  i don't remember running into such a problem before, probably
 this kind of dependency is quite rare.

 I've eventually settled on db0f839920c38973f8448df0f74de7c4c95c832c , could 
somebody review and push to 3.5?

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] sc_unoapi failure

2012-01-24 Thread Kohei Yoshida
On Mon, 2012-01-23 at 13:01 +0100, Eike Rathke wrote:
 Hi Stephan,
 
 On Monday, 2012-01-23 11:44:43 +0100, Stephan Bergmann wrote:
 
  On 01/23/2012 11:38 AM, Stephan Bergmann wrote:
  The Linux-RHEL6-x86_64@14-with-check tinderbox is consistently failing
  with a crash in sc_unoapi in all the builds since the one whose failure
  mail is at the end of this mail. I made a valgrind run of sc_unoapi (on
  a different machine than the tinderbox), and it indeed indicates two
  problems:
 
 Thanks for the pointers, I'm investigating.

One thing that comes to mind is our recent rework on ScColumn's cell
storage.  Especially in ScColumn::Delete(), before and after the rework
the logic of removing the cell from the array of cells may have changed.

The following part

pNoteCell-Delete();
--nCount;
memmove( pItems[nIndex], pItems[nIndex + 1], (nCount - nIndex) * 
sizeof(ColEntry) );
pItems[nCount].nRow = 0;
pItems[nCount].pCell = NULL;

was what was in 3.5.  The following

pNoteCell-Delete();
maItems.erase(maItems.end() - 1);

is what we have on master.  Clearly it's not correct to always pop from
the last element on cell deletion...  I should've spotted this during
review.  This is a disadvantage of reviewing a large patch. :-/

Maybe that's what's causing the crash?

Kohei

-- 
Kohei Yoshida, LibreOffice hacker, Calc

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


Re: [Libreoffice] [REVIEW][3-5] Fix for pivot table refresh problem

2012-01-24 Thread Kohei Yoshida
On Tue, 2012-01-24 at 09:49 -0500, Kohei Yoshida wrote:

  It seems that your patch does not fix the problem in 3-5. I tested
  with sc/qa/extras/testdocuments/ScDataPilotTableObj.ods similar and
  changed B6 but refresh does not work except if you force to create the
  cache.
 
 Does it at least fix it in the UI though?

For the record, it works for me in the 3.5 branch.

Kohei

-- 
Kohei Yoshida, LibreOffice hacker, Calc

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


[Libreoffice] Storage of user's configuration

2012-01-24 Thread Martin Richard
Hi everybody,

I'm hacking the cross-platform filepicker (in fpicker/source/office). I
added a Places (bookmarks) list on the left and I would like to save the
entries that the user bookmarked .

Cedric Bosdonnat told me to look at xcu and xcs files, but I'm a bit lost.
I'm looking for a code sample where user's persistent configuration is
manipulated (read and written) and/or anything that can be usefull, like
search keywords, links to old threads in the mailing list, which would help
me to identify some good practices (naming conventions, for instance).

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


[Libreoffice] Changing list setup to not add to subject

2012-01-24 Thread Lubos Lunak

 Hello,

 could this mailing list's configuration be changed to not add the pointless 
[Libreoffice] to the beginning?

- it leaves less room for the actually important part of the subject when 
browsing mail
- which gets expecially insane when forwarding mails futher or between such 
mailing lists
- it makes adding tags like [PUSHED] more cumbersome
- one would hope that by 2012 everybody interested in filtering mail can 
actually do it based on the List-Id header, which has the additional benefit 
of really filtering mails from the mailing list

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice] Database of areas for SAL_INFO etc.

2012-01-24 Thread Lubos Lunak

 Hello,

 as already discussed on IRC, I think it would be a good idea to have a list 
of debug areas written down somewhere.

 It is meant to be just a plain text file (so not used by code) and the 
reasoning is:

- the area is just a text string and without a list we could end up 
with sw.doc vs sw.ww8 vs sw.word used in related code, just because 
it's been written by different people who used whatever they made up at the 
moment

- it is also important to know what each area is actually for, so that not 
only the same area is used when writting the code, but it's also easy to find 
out what debug info to enable when debugging something (after a year with 
writerfilter I still don't know how to use its ~10 different debug switches, 
so I rather go with printf)

- it may be incomplete, but that's still better than not having it at all and 
having the problems listed above instead

 I intend to put just a short note to the documentation in sal/log.hxx 
pointing to this file (so that additions wouldn't trigger rebuilds), but I'm 
not sure where to put the file itself. I've been thinking sal/DEBUG , but 
that doesn't look very good to me. Does somebody know where a good place for 
such a file would be?

 Thanks.

PS: A good place meaning that people would actually be able to find it and use 
it, which rules out the option of burying it in some random wiki page.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice] [PUSHED] Re: [REVIEW-3.5] Handling ordering problem when properties are set one by one

2012-01-24 Thread Michael Stahl
On 24/01/12 16:12, Lubos Lunak wrote:
 On Tuesday 24 of January 2012, Michael Stahl wrote:
 On 23/01/12 21:31, Lubos Lunak wrote:

  It seems to be quite a common way for LO code to use this
 let's-push-all-the-data-as-properties-one-by-one approach, so I wonder
 what the common way of avoiding this problem is? Preferably something
 that's not an ugly hack, excuse the naivety.

 i'm not aware of a general solution for this problem; i'm afraid if
 there are good reasons not do a change as above, then ugly hack is in
 order...  i don't remember running into such a problem before, probably
 this kind of dependency is quite rare.
 
  I've eventually settled on db0f839920c38973f8448df0f74de7c4c95c832c , could 
 somebody review and push to 3.5?

that shouldn't break anything, pushed:

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=17ccd3cfc9dd86e2911a0a31f6dcbba8d7e7950a

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


Re: [Libreoffice] [REVIEWED][PUSHED][3-5] Fix for pivot table refresh problem

2012-01-24 Thread Petr Mladek
Kohei Yoshida píše v Út 24. 01. 2012 v 10:21 -0500:
 On Tue, 2012-01-24 at 09:49 -0500, Kohei Yoshida wrote:
 
   It seems that your patch does not fix the problem in 3-5. I tested
   with sc/qa/extras/testdocuments/ScDataPilotTableObj.ods similar and
   changed B6 but refresh does not work except if you force to create the
   cache.
  
  Does it at least fix it in the UI though?
 
 For the record, it works for me in the 3.5 branch.

It worked here as well in 3-5 branch. The fix looked sane = pushed

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=a0dc477bfa4460a3091e533eed57fae93f481d5a


Best Regards,
Petr

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


Re: [Libreoffice] Problem with clipboard paste in 3.5

2012-01-24 Thread Korrawit Pruegsanusak
Hello Petr,

On Mon, Jan 23, 2012 at 17:29, Petr Cisar petr.ci...@ericsson.com wrote:
 I did some tests, I tried to put some debug printouts to file 
 clone/libs-gui/dtrans/source/generic/clipboardmanager.cxx, but never seen one 
 while running LO.

You said clone/libs-gui/... ?
IMHO you're using the old version of our repositories (and thus code). :-)

You are recommended to use 'core' repository by following
http://wiki.documentfoundation.org/Development/Native_Build#Getting_the_sources

Hope that helps.
Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] [Libreoffice-commits] .: officecfg/registry

2012-01-24 Thread Stephan Bergmann

On 01/24/2012 04:22 PM, Fridrich Strba wrote:

  officecfg/registry/data/org/openoffice/VCL.xcu |2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86bf32c487852f4e466b27320e3724266cb53dba
Author: Fridrich Štrbafridrich.st...@bluewin.ch
Date:   Tue Jan 24 16:22:15 2012 +0100

 Fix build: dupplicate node/prop /VCL/DefaultFonts/bn


Andras, would this fix for your 82e0266b05dd53d0ce8b12bd5c76ae25872b87a9 
country code 'IN' is not in use for these locales fdo#44208, fdo#45107 
better remove the bn-IN node completely?


Stephan


diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 248e439..6cf60ef 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -856,7 +856,7 @@
  valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
/prop
  /node
-node oor:name=bn oor:op=replace
+node oor:name=bn-IN oor:op=replace
prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
  valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans UI;Arial 
Unicode MS;Lucida Sans Unicode;clearlyU/value
/prop

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


[Libreoffice] [Bug 35673] LibreOffice 3.4 most annoying bugs

2012-01-24 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=35673

fabien.mic...@hespul.org changed:

   What|Removed |Added

 Depends on||40907

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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


Re: [Libreoffice] [PATCH] optimized zoom to use more common intervals

2012-01-24 Thread Tim Hardeck
Hi Korrawit,

thanks for the information, I have attached a new patch and also 25% is 
enforced like Stefan requested.

Regards
Tim

On Tuesday 24 January 2012 12:13:20 Korrawit Pruegsanusak wrote:
 Hello Tim,
 
 Thanks for your patch. :-)
 I didn't test it yet, but just my nitpick: could you please remove the
 #include rtl/math.hxx
 which I added to make the build success ?
 It seems to be unused now.
 
 And FYI, Jan Holesovsky changed the zoom factor to 2^(1/4).
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=a18c8a06073650e12f3c1f9f8990670484ac5cf1
 
 Best Regards,
 

-- 
SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 
16746 (AG Nürnberg)
Maxfeldstr. 5, 90409 Nürnberg, Germany
T: +49 (0) 911 74053-0  F: +49 (0) 911 74053-483
http://www.suse.de/
From 31f1589af188ff87ebbde08b956fa73a34d96745 Mon Sep 17 00:00:00 2001
From: Tim Hardeck thard...@suse.com
Date: Wed, 18 Jan 2012 16:42:55 +0100
Subject: [PATCH] optimized zoom to use more common intervals

Round zoom values beginning with 50 to a multiple of 5, with 100 to one
of 10, with 500 to one of 50 and with 1000 to one of 100.
The step 100 is enforced to have one fixed point.

The zoom factor was also changed from 1.2 to 1.1.
---
 basegfx/Library_basegfx.mk  |1 +
 basegfx/Package_inc.mk  |1 +
 basegfx/StaticLibrary_basegfx_s.mk  |1 +
 basegfx/inc/basegfx/tools/zoomtools.hxx |   57 +
 basegfx/source/tools/zoomtools.cxx  |  141 +++
 sc/source/ui/view/prevwsh.cxx   |6 +-
 sc/source/ui/view/tabview.cxx   |7 +-
 sd/source/ui/view/viewshel.cxx  |7 +-
 svx/inc/svx/zoom_def.hxx|4 -
 svx/source/stbctrls/zoomsliderctrl.cxx  |7 +-
 sw/source/ui/uiview/viewport.cxx|7 +-
 11 files changed, 216 insertions(+), 23 deletions(-)
 create mode 100644 basegfx/inc/basegfx/tools/zoomtools.hxx
 create mode 100644 basegfx/source/tools/zoomtools.cxx

diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index fa0607b..fc6a479 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_Library_add_linked_libs,basegfx,\
 $(eval $(call gb_Library_add_exception_objects,basegfx,\
 	basegfx/source/tools/b2dclipstate \
 	basegfx/source/tools/canvastools \
+	basegfx/source/tools/zoomtools \
 	basegfx/source/tools/gradienttools \
 	basegfx/source/tools/keystoplerp \
 	basegfx/source/tools/liangbarsky \
diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk
index 5767a8f..13b5ff8 100644
--- a/basegfx/Package_inc.mk
+++ b/basegfx/Package_inc.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unopolypolygon.h
 $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/tools.hxx,basegfx/tools/tools.hxx))
 $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unotools.hxx,basegfx/tools/unotools.hxx))
 $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/gradienttools.hxx,basegfx/tools/gradienttools.hxx))
+$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/zoomtools.hxx,basegfx/tools/zoomtools.hxx))
 $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/numeric/ftools.hxx,basegfx/numeric/ftools.hxx))
 $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3i64tuple.hxx,basegfx/tuple/b3i64tuple.hxx))
 $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3dtuple.hxx,basegfx/tuple/b3dtuple.hxx))
diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk
index 79d6ed9..69616f7 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -72,6 +72,7 @@ $(WORKDIR)/CustomTarget/basegfx/source/%.cxx : $(SRCDIR)/basegfx/source/%.cxx
 $(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\
 	CustomTarget/basegfx/source/tools/liangbarsky \
 	CustomTarget/basegfx/source/tools/canvastools \
+	CustomTarget/basegfx/source/tools/zoomtools \
 	CustomTarget/basegfx/source/tools/gradienttools \
 	CustomTarget/basegfx/source/tools/keystoplerp \
 	CustomTarget/basegfx/source/tools/unopolypolygon \
diff --git a/basegfx/inc/basegfx/tools/zoomtools.hxx b/basegfx/inc/basegfx/tools/zoomtools.hxx
new file mode 100644
index 000..8deb385
--- /dev/null
+++ b/basegfx/inc/basegfx/tools/zoomtools.hxx
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for 

Re: [Libreoffice] Database of areas for SAL_INFO etc.

2012-01-24 Thread Stephan Bergmann

On 01/24/2012 04:40 PM, Lubos Lunak wrote:

  I intend to put just a short note to the documentation in sal/log.hxx
pointing to this file (so that additions wouldn't trigger rebuilds), but I'm
not sure where to put the file itself. I've been thinking sal/DEBUG , but
that doesn't look very good to me. Does somebody know where a good place for
such a file would be?

PS: A good place meaning that people would actually be able to find it and use
it, which rules out the option of burying it in some random wiki page.


But when you link to it from sal/log.hxx it ain't buried, is it? 
Anyway, I would suggest a file next to sal/inc/sal/log.hxx, like 
log-documentation.txt (or maybe even a log-documentation.dox that is 
also delivered to solver and somehow included in doxygen documentation 
generation in odk/pack/gendocu?).


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


Re: [Libreoffice] Database of areas for SAL_INFO etc.

2012-01-24 Thread Stephan Bergmann

On 01/24/2012 06:01 PM, Stephan Bergmann wrote:

like log-documentation.txt


... or log-areas.txt
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] [REVIEW][3-5] let postgresql-sdbc find its dependencies

2012-01-24 Thread Lionel Elie Mamane
On Mon, Jan 23, 2012 at 04:16:55PM +0100, Lionel Elie Mamane wrote:
 On Mon, Jan 23, 2012 at 03:21:30PM +0100, Stephan Bergmann wrote:

 * https://bugs.freedesktop.org/show_bug.cgi?id=45058
 postgresql-sdbc doesn't work on LO 3.5RC1 win32

 * https://bugs.freedesktop.org/show_bug.cgi?id=45090
 PostgreSQL-SDBC fails to load on Unix / official binaries: missing
 libldap50.so

 can (only) be solved by changing the postgresql-sdbc functionality
 from a bundled extension into a proper (optional) part of LO.

 Whether the functionality actually works there however is not clear
 to me, as I have no recipe how to test it.

 I'm working on that. Doing a recompile with your patch applied.

No, does not work for me. Says (on stderr):

warn:configmgr:30707:1:/home/master/src/libreoffice/core/configmgr/source/components.cxx:723:
 file does not exist: 
file:///home/master/src/libreoffice/core/solver/unxlngx6/installation/opt/program/../share/extensions/postgresql-sdbc/postgresql.xcu

And when actually trying to connect, a GUI pop-up says:

An exception occured
Type: com.sun.star.loader.CannotActivateFactoryException
Message:
file:///path/to/libo/solver/unxlngx6/installation/opt/program/../program/postgresql-sdbc.uno.so:
cannot get factory of demanded implementation: 
org.openoffice.comp.connectivity.pq.Connection

And probably unrelated, also says:

warn:legacy.osl:30729:8:/home/master/src/libreoffice/core/tools/source/rc/resmgr.cxx:813:
 
file:///home/master/src/libreoffice/core/solver/unxlngx6/installation/opt/program/../program/resource/vclen-US.res
Class: 275, Id: 25017. Cannot load resource! 
Resource Stack

warn:legacy.osl:30729:8:/home/master/src/libreoffice/core/vcl/source/gdi/bitmapex.cxx:117:
 BitmapEx::BitmapEx( const ResId rResId ): could not load image resource not 
found
warn:legacy.tools:30729:8:/home/master/src/libreoffice/core/vcl/source/gdi/bmpacc.cxx:77:
 Forbidden Access to empty bitmap!
warn:legacy.osl:30729:8:/home/master/src/libreoffice/core/tools/source/rc/resmgr.cxx:813:
 
file:///home/master/src/libreoffice/core/solver/unxlngx6/installation/opt/program/../program/resource/vclen-US.res
Class: 275, Id: 24017. Cannot load resource! 
Resource Stack

warn:legacy.osl:30729:8:/home/master/src/libreoffice/core/vcl/source/gdi/bitmapex.cxx:117:
 BitmapEx::BitmapEx( const ResId rResId ): could not load image resource not 
found
warn:legacy.tools:30729:8:/home/master/src/libreoffice/core/vcl/source/gdi/bmpacc.cxx:77:
 Forbidden Access to empty bitmap!

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


Re: [Libreoffice] Storage of user's configuration

2012-01-24 Thread Fernand Vanrie

Martin ,

i use folowed BASIC code to make a path consitent , maybe  it helps ?

public sElementnaam , sfotopath as string
public oParameter as object

sub addFotoPath()
sRegisterPath = /org.openoffice.OpmaakMacro.FotoPath/Parameters/
CreateRegistrySchemaPathIfNotPresent(sRegisterPath)
aSettings = GetConfigSettings(sRegisterPath)
sElementNaam = FOTO
sParaNaam = FotoPath
sParameter = c:\test

call addParameter(aSettings, sParaNaam, sParaMeter)

end sub
sub getFotoPath
sRegisterPath = /org.openoffice.OpmaakMacro.FotoPath/Parameters/
aSettings = GetConfigSettings(sRegisterPath)
asElNames = aSettings.ElementNames
if aSettings.hasByName(FOTO) then
oParameter = aSettings.getByName(FOTO)

   sFOTOpath = oParameter.getByName(ParameterString)
   else
   sFOTOpath = 
   endif
end sub


function GetConfigSettings(sRegisterPath as String) as Object 'Taken 
from DannyB

Dim args(1) As new com.sun.star.beans.PropertyValue
aConfProv = 
createUnoService(com.sun.star.configuration.ConfigurationProvider)

args(1).Name = nodepath
args(1).Value = sRegisterPath
args(0).Name = EnableAsync
args(0).Value = false
GetConfigSettings = 
aConfProv.createInstanceWithArguments(com.sun.star.configuration.ConfigurationUpdateAccess, 
args())

end function

sub CreateRegistrySchemaPathIfNotPresent(sRegisterPath as String)
oPathSettings = CreateUnoService( com.sun.star.util.PathSettings )
xray oPathSettings
sPathConfig = oPathSettings.Work 'Config

asPath1 = split(sRegisterPath, /)
sFullDotPath = asPath1(1)
asPath2 = Split(sFullDotPath,.)
sFolder = join(asPath2,/)


sRegistrySchemaPath = file:///H:/  sFolder  .xcs

sFileName = asPath2(UBound(asPath2))
sPackage = left(sFullDotPath, len(sFullDotPath)-len(sFileName)-1)

oSFA = createUNOService (com.sun.star.ucb.SimpleFileAccess)
if not oSFA.exists(sRegistrySchemaPath) then 'See the chapter 15 of the 
dev guide for some explanation

print sRegistrySchemaPath
  oOutStream = oSFA.openFileWrite(sRegistrySchemaPath)
  oOutText = createUNOService (com.sun.star.io.TextOutputStream)
  oOutText.setOutputStream(oOutStream)

  oOutText.WriteString(?xml version='1.0' encoding='UTF-8'?  Chr(10))

  oOutText.WriteString(oor:component-schema oor:name=  sFileName 
  oor:package=  sPackage)
  oOutText.WriteString(xml:lang=en-US 
xmlns:oor=http://openoffice.org/2001/registry;  )

  oOutText.WriteString(xmlns:xs=http://www.w3.org/2001/XMLSchema;  )
  
oOutText.WriteString(xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
 Chr(10))


  oOutText.WriteString(templates  Chr(10))
  oOutText.WriteString( group oor:name=Parameter  Chr(10))
  oOutText.WriteString( prop oor:name=ParameterName 
oor:type=xs:string/  Chr(10))
  oOutText.WriteString( prop oor:name=ParameterString 
oor:type=xs:string/  Chr(10))

  oOutText.WriteString( /group  Chr(10))
  oOutText.WriteString(/templates  Chr(10))

  oOutText.WriteString(component  Chr(10))
  oOutText.WriteString( set oor:name=Parameters 
oor:node-type=Parameter/  Chr(10))

  oOutText.WriteString(/component  Chr(10))

  oOutText.WriteString(/oor:component-schema  Chr(10))

  oOutText.closeOutput()
  oOutStream.closeOutput
  endif

end sub

sub addParameter(aSettings as Object, ParameterName as String, 
ParameterString as String)


  Dim arParameters1(0) As new com.sun.star.beans.PropertyValue
  arParameters1(0).Name = ParameterName
  arParameters1(0).Value = ParameterString
  call setParameters(aSettings, arParameters1(0))

end sub

function getParameterCount(aSettings as Object) as long
getParameterCount = UBound(aSettings.ElementNames)+1
end function



sub setParameters(aSettings as Object, aNewValue as Object)
  if aSettings.hasbyName(sElementnaam) then
'print aNewvalue.name
   oParameter = aSettings.createInstance()
  oParameter.ParameterName = aNewValue.Name
  oParameter.ParameterString = aNewValue.Value

  aSettings.ReplaceByName(sElementNaam , oParameter)

  aSettings.commitChanges()
  else
   oParameter =  aSettings.createInstance()
  oParameter.ParameterName = aNewValue.Name
  oParameter.ParameterString = aNewValue.Value

  aSettings.insertByName(sElementNaam , oParameter)
   aSettings.commitChanges()
   endif

end sub

Hi everybody,

I'm hacking the cross-platform filepicker (in fpicker/source/office). 
I added a Places (bookmarks) list on the left and I would like to 
save the entries that the user bookmarked .


Cedric Bosdonnat told me to look at xcu and xcs files, but I'm a bit 
lost. I'm looking for a code sample where user's persistent 
configuration is manipulated (read and written) and/or anything that 
can be usefull, like search keywords, links to old threads in the 
mailing list, which would help me to identify some good practices 
(naming conventions, for instance).


Cheers,
Martin Richard


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



___
LibreOffice mailing 

Re: [Libreoffice] [REVIEW][3-5] let postgresql-sdbc find its dependencies

2012-01-24 Thread Lionel Elie Mamane
On Tue, Jan 24, 2012 at 06:15:09PM +0100, Lionel Elie Mamane wrote:
 On Mon, Jan 23, 2012 at 04:16:55PM +0100, Lionel Elie Mamane wrote:
 On Mon, Jan 23, 2012 at 03:21:30PM +0100, Stephan Bergmann wrote:

 * https://bugs.freedesktop.org/show_bug.cgi?id=45058
 postgresql-sdbc doesn't work on LO 3.5RC1 win32

 * https://bugs.freedesktop.org/show_bug.cgi?id=45090
 PostgreSQL-SDBC fails to load on Unix / official binaries: missing
 libldap50.so

 can (only) be solved by changing the postgresql-sdbc functionality
 from a bundled extension into a proper (optional) part of LO.

 Whether the functionality actually works there however is not clear
 to me, as I have no recipe how to test it.

 I'm working on that. Doing a recompile with your patch applied.

 No, does not work for me. Says (on stderr):

 warn:configmgr:30707:1:/home/master/src/libreoffice/core/configmgr/source/components.cxx:723:
  file does not exist: 
 file:///home/master/src/libreoffice/core/solver/unxlngx6/installation/opt/program/../share/extensions/postgresql-sdbc/postgresql.xcu

 And when actually trying to connect, a GUI pop-up says:

 An exception occured
 Type: com.sun.star.loader.CannotActivateFactoryException
 Message:
 file:///path/to/libo/solver/unxlngx6/installation/opt/program/../program/postgresql-sdbc.uno.so:
 cannot get factory of demanded implementation: 
 org.openoffice.comp.connectivity.pq.Connection

Ah no, you fixed that; just seen the other message. Will pull,
recompile and test again.

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


Re: [Libreoffice] Storage of user's configuration

2012-01-24 Thread Martin Richard
Hi Fernand,

Thank you for your response, it may help indeed.

It seems that you create your own xcs file from scratch and store it in a
custom location. I think that in my case, I will need to find a way to make
it cross platform and environment independent.

Cheers

2012/1/24 Fernand Vanrie s...@pmgroup.be

  Martin ,

 i use folowed BASIC code to make a path consitent , maybe  it helps ?

 public sElementnaam , sfotopath as string
 public oParameter as object

 sub addFotoPath()
 sRegisterPath = /org.openoffice.OpmaakMacro.FotoPath/Parameters/
 CreateRegistrySchemaPathIfNotPresent(sRegisterPath)
 aSettings = GetConfigSettings(sRegisterPath)
 sElementNaam = FOTO
 sParaNaam = FotoPath
 sParameter = c:\test

 call addParameter(aSettings, sParaNaam, sParaMeter)

 end sub
 sub getFotoPath
 sRegisterPath = /org.openoffice.OpmaakMacro.FotoPath/Parameters/
 aSettings = GetConfigSettings(sRegisterPath)
 asElNames = aSettings.ElementNames
 if aSettings.hasByName(FOTO) then
 oParameter = aSettings.getByName(FOTO)

sFOTOpath = oParameter.getByName(ParameterString)
else
sFOTOpath = 
endif
 end sub


 function GetConfigSettings(sRegisterPath as String) as Object 'Taken from
 DannyB
 Dim args(1) As new com.sun.star.beans.PropertyValue
 aConfProv =
 createUnoService(com.sun.star.configuration.ConfigurationProvider)
 args(1).Name = nodepath
 args(1).Value = sRegisterPath
 args(0).Name = EnableAsync
 args(0).Value = false
 GetConfigSettings =
 aConfProv.createInstanceWithArguments(com.sun.star.configuration.ConfigurationUpdateAccess,
 args())
 end function

 sub CreateRegistrySchemaPathIfNotPresent(sRegisterPath as String)
 oPathSettings = CreateUnoService( com.sun.star.util.PathSettings )
 xray oPathSettings
 sPathConfig = oPathSettings.Work 'Config

 asPath1 = split(sRegisterPath, /)
 sFullDotPath = asPath1(1)
 asPath2 = Split(sFullDotPath,.)
 sFolder = join(asPath2,/)


 sRegistrySchemaPath = file:///H:/  sFolder  .xcs

 sFileName = asPath2(UBound(asPath2))
 sPackage = left(sFullDotPath, len(sFullDotPath)-len(sFileName)-1)

 oSFA = createUNOService (com.sun.star.ucb.SimpleFileAccess)
 if not oSFA.exists(sRegistrySchemaPath) then 'See the chapter 15 of the
 dev guide for some explanation
 print sRegistrySchemaPath
   oOutStream = oSFA.openFileWrite(sRegistrySchemaPath)
   oOutText = createUNOService (com.sun.star.io.TextOutputStream)
   oOutText.setOutputStream(oOutStream)

   oOutText.WriteString(?xml version='1.0' encoding='UTF-8'?  Chr(10))

   oOutText.WriteString(oor:component-schema oor:name=  sFileName 
  oor:package=  sPackage)
   oOutText.WriteString(xml:lang=en-US xmlns:oor=
 http://openoffice.org/2001/registry;http://openoffice.org/2001/registry
  )
   
 oOutText.WriteString(xmlns:xs=http://www.w3.org/2001/XMLSchema;http://www.w3.org/2001/XMLSchema
  )
   oOutText.WriteString(xmlns:xsi=
 http://www.w3.org/2001/XMLSchema-instance;http://www.w3.org/2001/XMLSchema-instance
  Chr(10))

   oOutText.WriteString(templates  Chr(10))
   oOutText.WriteString(  group oor:name=Parameter  Chr(10))
   oOutText.WriteString(prop oor:name=ParameterName
 oor:type=xs:string/  Chr(10))
   oOutText.WriteString(prop oor:name=ParameterString
 oor:type=xs:string/  Chr(10))
   oOutText.WriteString(  /group  Chr(10))
   oOutText.WriteString(/templates  Chr(10))

   oOutText.WriteString(component  Chr(10))
   oOutText.WriteString(  set oor:name=Parameters
 oor:node-type=Parameter/  Chr(10))
   oOutText.WriteString(/component  Chr(10))

   oOutText.WriteString(/oor:component-schema  Chr(10))

   oOutText.closeOutput()
   oOutStream.closeOutput
   endif

 end sub

 sub addParameter(aSettings as Object, ParameterName as String,
 ParameterString as String)

   Dim arParameters1(0) As new com.sun.star.beans.PropertyValue
   arParameters1(0).Name = ParameterName
   arParameters1(0).Value = ParameterString
   call setParameters(aSettings, arParameters1(0))

 end sub

 function getParameterCount(aSettings as Object) as long
 getParameterCount = UBound(aSettings.ElementNames)+1
 end function



 sub setParameters(aSettings as Object, aNewValue as Object)
   if aSettings.hasbyName(sElementnaam) then
 'print aNewvalue.name
oParameter = aSettings.createInstance()
   oParameter.ParameterName = aNewValue.Name
   oParameter.ParameterString = aNewValue.Value

   aSettings.ReplaceByName(sElementNaam , oParameter)

   aSettings.commitChanges()
   else
oParameter =  aSettings.createInstance()
   oParameter.ParameterName = aNewValue.Name
   oParameter.ParameterString = aNewValue.Value

   aSettings.insertByName(sElementNaam , oParameter)
aSettings.commitChanges()
endif

 end sub

 Hi everybody,


 I'm hacking the cross-platform filepicker (in fpicker/source/office). I
 added a Places (bookmarks) list on the left and I would like to save the
 entries that the user bookmarked .

 Cedric Bosdonnat told me to look at xcu and xcs files, but I'm a bit lost.
 I'm looking for a code sample where 

[Libreoffice] bootstrap repos (was: Re: Problem with clipboard paste in 3.5)

2012-01-24 Thread Michael Stahl
On 24/01/12 17:19, Korrawit Pruegsanusak wrote:
 Hello Petr,
 
 On Mon, Jan 23, 2012 at 17:29, Petr Cisar petr.ci...@ericsson.com wrote:
 I did some tests, I tried to put some debug printouts to file 
 clone/libs-gui/dtrans/source/generic/clipboardmanager.cxx, but never seen 
 one while running LO.

is there some documentation out there somewhere that still recommends to
use bootstrap repos?

 You said clone/libs-gui/... ?
 IMHO you're using the old version of our repositories (and thus code). :-)
 
 You are recommended to use 'core' repository by following
 http://wiki.documentfoundation.org/Development/Native_Build#Getting_the_sources

it seems we have somebody unfortunate enough to try to build the master
branch from bootstrap repos once a week; would it be possible to do
something to prevent that?

e.g. create a master-backup that points at the current master commit,
then let master point to an empty source tree; that way people should
notice something's wrong when they try... any opinions from git experts?

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


Re: [Libreoffice] [REVIEWED] fdo#43932: try to fix paper tray settings

2012-01-24 Thread Ivan Timofeev

24.01.2012 15:56, David Tardon пишет:

Oops, sorry... It seems it does not work: the tray setting is always
reset to 'Auto' again.


Oh, well then my patch is wrong. I'm sorry for my fallacy...

No another idea on this bug, and no idea of testing patches without a 
multitray printer, I'll reset assignee there.


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


Re: [Libreoffice] Storage of user's configuration

2012-01-24 Thread Michael Meeks
Hi Martin,

On Tue, 2012-01-24 at 16:22 +0100, Martin Richard wrote:
 I'm hacking the cross-platform filepicker (in fpicker/source/office).
 I added a Places (bookmarks) list on the left and I would like to
 save the entries that the user bookmarked .

Great.

 Cedric Bosdonnat told me to look at xcu and xcs files, but I'm a bit
 lost. I'm looking for a code sample where user's persistent
 configuration is manipulated (read and written) and/or anything that
 can be usefull, like search keywords, links to old threads in the
 mailing list, which would help me to identify some good practices
 (naming conventions, for instance).

Naming conventions is a suck  see :-) look for something that seems
related, and put it next to it.

The schemas (XML description of settings and their defaults) live in
officecfg/

If you do:

git grep -3 ExperimentalMode

you should get a manageable set of hits for a single config setting. I
don't think you'll easily be able to use the nice new syntax that
Stephan created:

if (officecfg::Office::Common::Misc::ExperimentalMode::get( 
comphelper::getProcessComponentContext() ))

style - since you want a list of items: which is (I'm afraid) harder to
do, you'll most likely have to use a twistier UNO API to access the
configmgr/ implementation, and may have more fun with the schemas :-)

Hope that helps,

Michael.

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

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


Re: [Libreoffice] Storage of user's configuration

2012-01-24 Thread Fernand Vanrie

Martin,

I supose it is already cross platform and environment independent, neve 
tested it but interesting to know.




Hi Fernand,

Thank you for your response, it may help indeed.

It seems that you create your own xcs file from scratch and store it 
in a custom location. I think that in my case, I will need to find a 
way to make it cross platform and environment independent.


Cheers

2012/1/24 Fernand Vanrie s...@pmgroup.be mailto:s...@pmgroup.be

Martin ,

i use folowed BASIC code to make a path consitent , maybe  it
helps ?

public sElementnaam , sfotopath as string
public oParameter as object

sub addFotoPath()
sRegisterPath = /org.openoffice.OpmaakMacro.FotoPath/Parameters/
CreateRegistrySchemaPathIfNotPresent(sRegisterPath)
aSettings = GetConfigSettings(sRegisterPath)
sElementNaam = FOTO
sParaNaam = FotoPath
sParameter = c:\test

call addParameter(aSettings, sParaNaam, sParaMeter)

end sub
sub getFotoPath
sRegisterPath =
/org.openoffice.OpmaakMacro.FotoPath/Parameters/
aSettings = GetConfigSettings(sRegisterPath)
asElNames = aSettings.ElementNames
if aSettings.hasByName(FOTO) then
oParameter = aSettings.getByName(FOTO)

   sFOTOpath = oParameter.getByName(ParameterString)
   else
   sFOTOpath = 
   endif
end sub


function GetConfigSettings(sRegisterPath as String) as Object
'Taken from DannyB
Dim args(1) As new com.sun.star.beans.PropertyValue
aConfProv =
createUnoService(com.sun.star.configuration.ConfigurationProvider)
args(1).Name = nodepath
args(1).Value = sRegisterPath
args(0).Name = EnableAsync
args(0).Value = false
GetConfigSettings =

aConfProv.createInstanceWithArguments(com.sun.star.configuration.ConfigurationUpdateAccess,
args())
end function

sub CreateRegistrySchemaPathIfNotPresent(sRegisterPath as String)
oPathSettings = CreateUnoService( com.sun.star.util.PathSettings )
xray oPathSettings
sPathConfig = oPathSettings.Work 'Config

asPath1 = split(sRegisterPath, /)
sFullDotPath = asPath1(1)
asPath2 = Split(sFullDotPath,.)
sFolder = join(asPath2,/)


sRegistrySchemaPath = file:///H:/  sFolder  .xcs

sFileName = asPath2(UBound(asPath2))
sPackage = left(sFullDotPath, len(sFullDotPath)-len(sFileName)-1)

oSFA = createUNOService (com.sun.star.ucb.SimpleFileAccess)
if not oSFA.exists(sRegistrySchemaPath) then 'See the chapter 15
of the dev guide for some explanation
print sRegistrySchemaPath
  oOutStream = oSFA.openFileWrite(sRegistrySchemaPath)
  oOutText = createUNOService (com.sun.star.io.TextOutputStream)
  oOutText.setOutputStream(oOutStream)

  oOutText.WriteString(?xml version='1.0' encoding='UTF-8'? 
Chr(10))

  oOutText.WriteString(oor:component-schema oor:name= 
sFileName   oor:package=  sPackage)
  oOutText.WriteString(xml:lang=en-US
xmlns:oor=http://openoffice.org/2001/registry;
http://openoffice.org/2001/registry  )
 
oOutText.WriteString(xmlns:xs=http://www.w3.org/2001/XMLSchema;

http://www.w3.org/2001/XMLSchema  )
 
oOutText.WriteString(xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;

http://www.w3.org/2001/XMLSchema-instance  Chr(10))

  oOutText.WriteString(templates  Chr(10))
  oOutText.WriteString( group oor:name=Parameter  Chr(10))
  oOutText.WriteString( prop oor:name=ParameterName
oor:type=xs:string/  Chr(10))
  oOutText.WriteString( prop oor:name=ParameterString
oor:type=xs:string/  Chr(10))
  oOutText.WriteString( /group  Chr(10))
  oOutText.WriteString(/templates  Chr(10))

  oOutText.WriteString(component  Chr(10))
  oOutText.WriteString( set oor:name=Parameters
oor:node-type=Parameter/  Chr(10))
  oOutText.WriteString(/component  Chr(10))

  oOutText.WriteString(/oor:component-schema  Chr(10))

  oOutText.closeOutput()
  oOutStream.closeOutput
  endif

end sub

sub addParameter(aSettings as Object, ParameterName as String,
ParameterString as String)

  Dim arParameters1(0) As new com.sun.star.beans.PropertyValue
  arParameters1(0).Name = ParameterName
  arParameters1(0).Value = ParameterString
  call setParameters(aSettings, arParameters1(0))

end sub

function getParameterCount(aSettings as Object) as long
getParameterCount = UBound(aSettings.ElementNames)+1
end function



sub setParameters(aSettings as Object, aNewValue as Object)
  if aSettings.hasbyName(sElementnaam) then
'print aNewvalue.name
   oParameter = aSettings.createInstance()
  oParameter.ParameterName = aNewValue.Name
  oParameter.ParameterString = aNewValue.Value

  aSettings.ReplaceByName(sElementNaam , oParameter)

  aSettings.commitChanges()
  else
   oParameter =  aSettings.createInstance()
  oParameter.ParameterName = aNewValue.Name
  

Re: [Libreoffice] sal / unit tests ...

2012-01-24 Thread Matúš Kukan
On 24 January 2012 13:34, Michael Meeks michael.me...@suse.com wrote:
        Cool ! thanks for that :-) Of course, unfortunately still most of the
 tests are not run because of the missing:

    CPPUNIT_REGISTRY_ADD_TO_DEFAULT( osl_File );

        But I guess this needs doing on a branch and then testing per platform:
 so prolly a post 3.5 task :-) should I add an easy hack for that ?

I guess so, if you want to run more tests, yes.
I only wanted to fix what was broken by gbuild'ification and that
should be done now.

Best,

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


Re: [Libreoffice] LO and address book wizard

2012-01-24 Thread Julien Nabet

On 23/01/2012 22:30, Caolán McNamara wrote:

On Mon, 2011-11-21 at 11:39 -0500, Arno Teigseth wrote:

Hi

Anyone else having trouble with adding address books to Libreoffice
(File-Wizard-Address book).

I'm getting SDBC error on my system, _git master LO_ on linux mint
11. Have both thunderbird (repo) and evolution (repo) installed.

The more button says 'A connection for the following URL was
requested sdbc:address:evolution:local.'

Funny, since I did select Thunderbird.

Does this work now in 3-5/master or do you still have a problem ?
We did fix one known problem, which Julien discovered, in finding the
right config dir location for thunderbird which might have been related
to your original problem. hopefully anyway.

C.


Hi,

In fact, since I'm on Debian, I use Icedove. Icedove is a rebranding of 
Thunderbird (license pb discussion between with Mozilla fundation and 
Debian responsables).

I pushed a patch to have access to Icedove addressbook :
http://cgit.freedesktop.org/libreoffice/core/commit/?id=8d7e1a6e13008bd7d35896e676796196038f1105

Here are 2 threads about it :
- 
http://nabble.documentfoundation.org/PATCH-About-enabling-Icedove-addressbook-connection-for-Base-tp3639069p3639069.html
- 
http://nabble.documentfoundation.org/About-enabling-Icedove-addressbook-connection-for-Base-tp3616221p3616221.html


About Evolution, I tested Evolution local on master, i didn't see any 
problem. But perhaps I missed something.

(I'm on Pc Debian x86-64).

Julien



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


[Libreoffice] [ANNOUNCE] libreoffice-3.5.0.2 tag created (3.5.0-rc2)

2012-01-24 Thread Petr Mladek
Hi,

there have been created the libreoffice-3.5.0.2 tag for 3.5.0-rc2
release. The corresponding official builds will be available by the end of the 
week.

See the attached list of changes against 3.5.0-rc1.

I am going to create the libreoffice-3-5-0 branch for the final stabilization.

See also the schedule at 
http://wiki.documentfoundation.org/ReleasePlan#3.5_release
and release criteria at http://wiki.documentfoundation.org/Release_Criteria


Now, if you want to switch your clone to the tag, please do:

./g fetch --tags
./g checkout -b tag-libreoffice-3.5.0.2 libreoffice-3.5.0.2

Alternatively, the packaged sources can be found at
http://dev-builds.libreoffice.org/pre-releases/src/



Best Regards,
Petr
+ core
+ accomodate localized text expansion (fdo#44896) [Andras Timar]
+ also export list restart for non root list (rhbz#746174) [Michael Stahl]
+ changed postgresql-sdbc from bundled oxt to proper optional part. (fdo#45090) [Stephan Bergmann]
+ connectivity: fix crash on DISTINCT: (fdo#43479) [Michael Stahl]
+ don't replace NULLs given by the database by type-default values (fdo#44813) [Lionel Elie Mamane]
+ fix ( hopefully ) viewing artifacts in input line (fdo#44391) [Noel Power]
+ fix RTF import of \paperh and \paperw (fdo#44983) [Miklos Vajna]
+ fix VIEWING: Crash when page preview after f4 (data sources) (fdo#44040) [Julien Nabet]
+ fix for bug New Math symbols issues in Windows (fdo#44110) [Olivier Hallot]
+ fix incomplete updating of the page preview pane in Draw (fdo#43705) [Ivan Timofeev]
+ force calculating layout before Activate to avoid crashes and loops (fdo#40438) [Cédric Bosdonnat]
+ mSI installer l10n bug (fdo#44915) [Andras Timar]
+ make older Duden Korrektor work with LO (fdo#37561) [Fridrich Štrba]
+ make the refresh query filter NULL-safe (fdo#44813) [Lionel Elie Mamane]
+ make these strings localizable again (fdo#44947) [David Tardon]
+ mozilla-libreoffice mislabeled as OpenOffice.org Plug-in (lp#711673) [Bjoern Michaelsen]
+ named range should overwrite existing name. (fdo#44831) [Kohei Yoshida]
+ order database properties so that opening it in writer works (bnc#740032) [Luboš Luňák]
+ package stlport on Windows when requested (fdo#37561) [Fridrich Štrba]
+ remove duplicate icons from soffice.bin/soffice.exe (fdo#37740) [Andras Timar]
+ repair dbaccess::ORowSetCache::isLast() after matrix (re)fill (fdo#44025) [Lionel Elie Mamane]
+ resolved Calc export to HTML with graphics failed (fdo#45032) [Eike Rathke]
+ resolved crash in ScMatrix::GetDimensons() from ScInterpreter (rhbz#783556) [Eike Rathke]
+ restore special DATE handling code for SbxValue::Compute (fdo#44385) [Noel Power]
+ skew artificial fonts before glyph or layout rotation (fdo#44856) [Caolán McNamara]
+ translations
+ remove ~ (fdo#45037) [Andras Timar]
+ common
+ version 3.5.0.2, tag libreoffice-3.5.0.2 (3.5.0-rc2) [Petr Mladek]
+ core
+ _MSC_VER is compiler define and cpp.lcc needs to be taught about it [Fridrich Štrba]
+ accomodate localized text expansion (fdo#44896) [Andras Timar]
+ add missing semicolons. *blush* [David Tardon]
+ added SubViewSize property to EnhancedCustomShapePath [Radek Doulik]
+ also export list restart for non root list (rhbz#746174) [Michael Stahl]
+ bump product version to 3.5.0-rc1+, release number to 11 [Fridrich Štrba]
+ bump product version to 3.5.0-rc2, release number to 12 [Petr Mladek]
+ changed postgresql-sdbc from bundled oxt to proper optional part. (fdo#45090) [Stephan Bergmann]
+ connectivity: fix crash on DISTINCT: (fdo#43479) [Michael Stahl]
+ decompose() should return the original rotation angle and scales. [Thorsten Behrens]
+ don't replace NULLs given by the database by type-default values (fdo#44813) [Lionel Elie Mamane]
+ fix Same expression on both sides of '||' [Julien Nabet]
+ fix ( hopefully ) viewing artifacts in input line (fdo#44391) [Noel Power]
+ fix RTF import of \paperh and \paperw (fdo#44983) [Miklos Vajna]
+ fix RTF import of dotted and word underline [Miklos Vajna]
+ fix VIEWING: Crash when page preview after f4 (data sources) (fdo#44040) [Julien Nabet]
+ fix WiLangId.vbs operation [Fridrich Štrba]
+ fix a crash when copying a sheet with drawing obj to a new document. [Kohei Yoshida]
+ fix error in handling 'z' for svg:d string parsing [Thorsten Behrens]
+ fix for bug New Math symbols issues in Windows (fdo#44110) [Olivier Hallot]
+ fix incomplete updating of the page preview pane in Draw (fdo#43705) [Ivan Timofeev]
+ fix refresh problem on pivot tables whose data cache have not been created. [Kohei Yoshida]
+ fix zh-TW translation errors reported by Cheng-Chia Tseng in e-mail [Andras Timar]
+ force calculating layout before Activate to avoid crashes and loops (fdo#40438) [Cédric Bosdonnat]
+ gbuild: UnoApiTarget: initialize target local vars 

Re: [Libreoffice] Changing list setup to not add to subject

2012-01-24 Thread khagaroth
While at it, it would be nice to also set Reply-To:
libreoffice@lists.freedesktop.org.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice] [ANNOUNCE] Branch libreoffice-3-5-0 created

2012-01-24 Thread Petr Mladek
Hi all,

there have been created the libreoffice-3-5-0 branch. It will be used
for fine tuning of the 3.5.0 release. It is based on the tag
libreoffice-3.5.0.2 for 3.5.0-rc2 release.

The following rules apply:

+ preferably just translation or blocker fixes
+ only cherry-picking from libreoffice-3-5 branch
+ 2 additional reviews needed; 2nd reviewer pushes
+ no regular merges back to anything

The 'libreoffice-3-5' branch is still active and will be used for the
3.5.1 bugfix release. Please read more at

   http://wiki.documentfoundation.org/ReleasePlan
   http://wiki.documentfoundation.org/Development/Branches


Now, if you want to switch your clone to the branch, please do:

./g pull -r
./g checkout -b libreoffice-3-5-0 origin/libreoffice-3-5-0

Hopefully it will work for you :-)  Most probably, you will also want to
do (if you haven't done it yet):

git config --global push.default tracking

When you do git push with this, git will push only the branch you are
on; e.g. libreoffice-3-5-0 when you have switched to it.  This will
save you some git shouting at you.


Happy hacking,
Petr

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


Re: [Libreoffice] Storage of user's configuration

2012-01-24 Thread Stephan Bergmann

On 01/24/2012 04:22 PM, Martin Richard wrote:

I'm hacking the cross-platform filepicker (in fpicker/source/office). I
added a Places (bookmarks) list on the left and I would like to save
the entries that the user bookmarked .

Cedric Bosdonnat told me to look at xcu and xcs files, but I'm a bit
lost. I'm looking for a code sample where user's persistent
configuration is manipulated (read and written) and/or anything that can
be usefull, like search keywords, links to old threads in the mailing
list, which would help me to identify some good practices (naming
conventions, for instance).


The configuration data is stored into a hierarchy of groups (think 
structs) and typed properties, plus homogeneous sets (where a set is 
somewhat like an array with members of one kind of group, but the order 
is not defined and the members have arbitrary names rather than 
numerical indices).  The static structure of that hierarchy is at 
officecfg/registry/data/ and the actual initial data at 
officecfg/registry/schema/.


For file paths, there is already something looking over-engineered at 
org.openoffice.Office.Paths, but if all you need is an (ordered?) list 
of bookmarks (just URIs?) that does not grow unbounded, you might get 
away with a single property of type oor:string-list. 
org.openoffice.Office.Common is a kind of catch-all file for various 
configuration settings that do not fit any of the other, more 
specialized ones.  Maybe you find a fitting group node there, or add a 
new one.


Accessing the configuration at runtime to read/write the data is 
something of a disaster.  The configuration is UNO based, but tries to 
re-use each and every of the existing UNO interfaces, so that getting an 
idea of how it actually works is rather difficult.  Plus, various people 
thought it a good idea to add various wrappers on top of it, adding even 
more confusion.  I'm trying to clean up that mess over time, but it is 
no easy feat.


One thing that's already there, though, is that if you can indeed go 
with a single string-list property (lets assume you add it as 
org.openoffice.Office.Common/Misc/FilePickerBookmarks), you can


  #include officecfg/Office/Common.hxx

and read the list (as a com::sun::star::uno::Sequencertl::OUString) with

  officecfg::Office::Common::Misc::FilePickerBookmarks::get(context)

where context is the UNO component context (use 
comphelper::getProcessComponentContext() for now if you have none 
around).  Writing is always done in batch mode:


  unotools::ConfigurationChanges batch(
unotools::ConfigurationChanges::create(context));
  officecfg::Office::Common::Misc::FilePickerBookmarks::set(
context, batch, value);
  batch.commit();

svl/source/config/asiancfg.cxx is one of the few examples that are 
already converted to this new, simplified approach.


Don't hesitate to come back with any further questions (I'm sberg on IRC).

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


  1   2   3   >