[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf2' - sc/source

2012-07-31 Thread Daniel Bankston
 sc/source/filter/xml/xmlcelli.cxx |   47 --
 sc/source/filter/xml/xmlcelli.hxx |2 +
 2 files changed, 27 insertions(+), 22 deletions(-)

New commits:
commit 17e8bcbca919b3ca7cac2bf9c5bac4d4ef504232
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date:   Tue Jul 31 00:26:05 2012 -0500

Import intended blank or error cached formula results instead of 0

There are cases where a formula cell is exported with an office:value of 0 
or
no office:value at all, but the formula cell will have a text:p value which
contains the intended formula result.  If these cases are not taken into
consideration during import, a 0 will be displayed in the cell
instead of the intended special formula result (blanks or errors).
These cases include when a formula result:
 - is blank
 - has a constant error value beginning with # (such as #VALUE! or 
#N/A)
 - has an Err:[###] (where [###] is an error number)

Change-Id: I8068cf1c9809c02513662f2b0a6fb16eb44920e0

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 21c2d14..e09868f 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -188,9 +188,9 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( 
ScXMLImport rImport,
 ::sax::Converter::convertDouble(fValue, sValue);
 bIsEmpty = false;
 
-//if office:value=0, treat like text in case the formula
-//result is Err:###, #N/A, or matrix reference cell 
with
-//blank text result until we confirm otherwise.
+//if office:value=0, let's get the text:p in case this is
+//a special case in HasSpecialCaseFormulaText(). If it
+//turns out not to be a special case, we'll use the 0 
value.
 if(fValue == 0.0)
 bFormulaTextResult = true;
 }
@@ -262,6 +262,11 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( 
ScXMLImport rImport,
 bFormulaTextResult = true;
 if(nCellType == util::NumberFormat::DATETIME)
 nCellType = util::NumberFormat::UNDEFINED;
+//if bIsEmpty is true at this point, then there is no office value.
+//we must get the text:p (even if it is empty) in case this a special
+//case in HasSpecialCaseFormulaText().
+if(bIsEmpty)
+bFormulaTextResult = true;
 }
 rXMLImport.GetStylesImportHelper()-SetAttributes(pStyleName, 
pCurrencySymbol, nCellType);
 }
@@ -748,7 +753,7 @@ void 
ScXMLTableRowCellContext::SetFormulaCell(ScFormulaCell* pFCell) const
 {
 if(pFCell)
 {
-if( bFormulaTextResult  pOUTextValue  !pOUTextValue-isEmpty() )
+if( bFormulaTextResult  pOUTextValue )
 pFCell-SetHybridString( *pOUTextValue );
 else
 pFCell-SetHybridDouble( fValue );
@@ -1109,26 +1114,23 @@ void ScXMLTableRowCellContext::AddFormulaCell( const 
ScAddress rCellPos )
 }
 }
 
-namespace{
-
-bool isSpecialValue(const rtl::OUString rStr, sal_Int16 rnCellType)
+//There are cases where a formula cell is exported with an office:value of 0 or
+//no office:value at all, but the formula cell will have a text:p value which
+//contains the intended formula result.
+//These cases include when a formula result:
+// - is blank
+// - has a constant error value beginning with # (such as #VALUE! or 
#N/A)
+// - has an Err:[###] (where [###] is an error number)
+bool ScXMLTableRowCellContext::HasSpecialCaseFormulaText() const
 {
-if( (rStr.indexOf(Err:)   -1) || (rStr.indexOf(#N/A)  -1) )
-return true;
-//If a matrix formula has a matrix reference cell that is intended to have
-//a blank text result, the matrix reference cell is actually saved(export)
-//as a float cell with 0 as the value and empty text:p/.
-//Import works around this by setting these cells as text cells so that
-//the blank text is used for display instead of the number 0.
-if( rStr.isEmpty() )
-{
-rnCellType = util::NumberFormat::TEXT;
+if(  pOUTextContent 
+ ( pOUTextContent-isEmpty() || (pOUTextContent-indexOf(#)  -1) ||
+   (pOUTextContent-indexOf(Err:)   -1) )
+  )
 return true;
-}
 return false;
 }
 
-}
 
 void ScXMLTableRowCellContext::EndElement()
 {
@@ -1146,10 +1148,11 @@ void ScXMLTableRowCellContext::EndElement()
 }
 }
 
-//if this is a blank matrix formula result, Err:###, or #N/A then
-//use text:p string because of the way export saves these types of cells.
-if( bFormulaTextResult  pOUTextContent  
isSpecialValue(*pOUTextContent, nCellType) )
+if( bFormulaTextResult  HasSpecialCaseFormulaText() )
+{
 pOUTextValue.reset(*pOUTextContent);
+nCellType = util::NumberFormat::TEXT;
+}
 
 ScAddress aCellPos = 

Re: Static src analysis of LibreOffice

2012-07-31 Thread David Tardon
Hi,

On Mon, Jul 30, 2012 at 01:42:44PM +0200, John Smith wrote:
 On Mon, Jul 30, 2012 at 12:29 PM, Tor Lillqvist t...@iki.fi wrote:
  So if there
  is a way to configure LO (configure --without-foo --without-bar, or
  something) to not make it compile all the 3rd party stuff,
 
  --with-system-libs. How well that works (how many of the 3rd-party
  libs you still need to compile) depends on your distro and version.
 
 Well im on my way to install all the needed libraries when configuring
 --with-system-libs
 
 But now ikm running into something I simply dont understand
 
 lo ./configure gives me :
 
 checking for __db185_open in -ldb4... configure: error: db library not
 found. Use the correct -L flag,
 no
 or install the Berkeley db development package.
 
 
 but rpm -qa gives me :
 
 db4-cxx-4.8.30-10.fc17.i686
 db4-devel-4.8.30-10.fc17.i686
 db4-4.8.30-10.fc17.i686
 
 
 I have no idea whats going on, or how to fix it...
 [ running Fedora 17 ]

You want libdb-devel .

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


Re: Static src analysis of LibreOffice

2012-07-31 Thread David Tardon
Hi,

On Mon, Jul 30, 2012 at 03:08:04PM +0200, John Smith wrote:
 On Mon, Jul 30, 2012 at 2:58 PM, Michael Stahl mst...@redhat.com wrote:
  On 30/07/12 14:50, John Smith wrote:
 
  If someone knows how to fix that: let me know
  If it's not really a big deal: Ill do a analysis of libreoffice this way 
  now.
 
  most likely the versions on the system are too old for LO.  e.g. we
  depend on the mdds 0.6 that was just released a week ago.
 
 Hrm. Im having 0.5-something, so youre probably right

There is mdds-devel-0.6.0-2.fc17.noarch available in updates-testing. Run

yum update --enablerepo=updates-testing mdds-devel

to get it.

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


Re: Static src analysis of LibreOffice

2012-07-31 Thread John Smith
Well, after a lot of tweaking, I almost have 'configure' working with
'--with-system-libs' now, except for saxon.

Running configure with my system saxon gives me : configure: error:
saxontest could not be compiled, non-functional saxon jar
Even though I have saxon installed. I cant figure out whats going
wrong here. Ive attached my config.log for details, if anyone wants to
look at it.

Thanks,


Regards,


John Smith.


config.log.gz
Description: GNU Zip compressed data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] fdo#42492: fixing Basic HEX command

2012-07-31 Thread János Uray
The patch solves this bug:
https://bugs.freedesktop.org/show_bug.cgi?id=42492
There was a buffer overflow: char aBuffer[16] had no room for the
terminating null character.
But the hex command was still wrong, because the printf used %X and
%lX, which are very platform-dependent.
Actually the integer is only 16-bit, and long is only 32-bit. I've
corrected this by using %SAL_PRIXUINT32 as described in
http://wiki.documentfoundation.org/Development/Sal_Types (and there is no
SAL_PRIXUINT16, so both were converted to sal_uInt32).

Regards,
Uray M. János
From d7a39a31a9b39edab1c3354748c5383b1b57b924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uray=20M.=20J=C3=A1nos?= uray.ja...@gmail.com
Date: Tue, 31 Jul 2012 08:04:06 +0200
Subject: [PATCH] fdo#42492: fixing Basic HEX command

Change-Id: I133590c9f2a34d8daab031da0c77bd049d275c29
---
 basic/source/runtime/methods.cxx |   11 ++-
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 7050093..c06e0d7 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -871,12 +871,13 @@ RTLFUNC(Hex)
 StarBASIC::Error( SbERR_BAD_ARGUMENT );
 else
 {
-char aBuffer[16];
+char aBuffer[17];
 SbxVariableRef pArg = rPar.Get( 1 );
-if ( pArg-IsInteger() )
-snprintf( aBuffer, sizeof(aBuffer), %X, pArg-GetInteger() );
-else
-snprintf( aBuffer, sizeof(aBuffer), %lX, static_castlong unsigned int(pArg-GetLong()) );
+// converting value to unsigned
+sal_uInt32 nVal = pArg-IsInteger() ?
+static_castsal_uInt16(pArg-GetInteger()) :
+static_castsal_uInt32(pArg-GetLong());
+snprintf( aBuffer, sizeof(aBuffer), %SAL_PRIXUINT32, nVal );
 rPar.Get(0)-PutString( rtl::OUString::createFromAscii( aBuffer ) );
 }
 }
-- 
1.7.7

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


[Libreoffice-commits] .: android/experimental config_host.mk.in configure.in

2012-07-31 Thread Tor Lillqvist
 android/experimental/DocumentLoader/Makefile |4 +-
 config_host.mk.in|2 +
 configure.in |   47 ++-
 3 files changed, 36 insertions(+), 17 deletions(-)

New commits:
commit 963f417fa89746fe087f7b7e585edb79fdd3b14d
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Jul 31 09:53:58 2012 +0300

More NDK r8b adaptation

Change-Id: Ic65795a1b7bfe0435292f87f27ae39e2c3069fed

diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index 9423336..cdbf196 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -134,7 +134,7 @@ copy-stuff:
done
 #
 # Then the shared GNU C++ library
-   $(call 
COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
+   $(call 
COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/armeabi-v7a/libgnustl_shared.so)
 #
 # Then other assets. Let the directory structure under assets mimic
 # that under solver for now.
@@ -233,7 +233,7 @@ copy-stuff:
 #
 # Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
 #
-   cp 
$(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver 
$(SODEST)
+   cp $(ANDROID_NDK_GDBSERVER) $(SODEST)
echo set solib-search-path ./obj/local/armeabi-v7a $(SODEST)/gdb.setup
 
 build-ant: copy-stuff properties
diff --git a/config_host.mk.in b/config_host.mk.in
index 52ec1fc..6926012 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -16,6 +16,8 @@ export ANT_HOME=@ANT_HOME@
 export ANT_LIB=@ANT_LIB@
 export ANCIENT_BISON=@ANCIENT_BISON@
 export ANDROID_NDK_HOME=@ANDROID_NDK_HOME@
+export 
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=@ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR@
+export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@
 export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@
 export AR=@AR@
 export ATL_INCLUDE=@ATL_INCLUDE@
diff --git a/configure.in b/configure.in
index 20d5b88..48009d0 100644
--- a/configure.in
+++ b/configure.in
@@ -141,27 +141,33 @@ if test -n $with_android_ndk; then
 # linking especially our libmerged. Work to support that in progress. Until
 # that is done, please use no newer NDK than r8.
 
-ANDROID_ABI_PREBUILT_BIN=`echo 
$ANDROID_NDK_HOME/toolchains/$host_cpu-*$with_android_ndk_toolchain_version/prebuilt/*/bin`
+if test $host_cpu = arm; then
+android_gcc_prefix=arm-linux-androideabi
+android_cpu=arm
+else
+android_gcc_prefix=i686-android-linux
+# host_cpu is something like i386 or i686 I guess, NDK uses
+# x86 in some contexts
+android_cpu=x86
+fi
+
+ANDROID_ABI_PREBUILT_BIN=`echo 
$ANDROID_NDK_HOME/toolchains/$android_cpu-*$with_android_ndk_toolchain_version/prebuilt/*/bin`
 # Check if there are several toolchain versions
 case $ANDROID_ABI_PREBUILT_BIN in
 */bin\ */bin*)
 AC_MSG_ERROR([Several toolchain versions in NDK, you must specify 
--with-android-ndk-toolchain-version])
 esac
 
-toolchain_version_subdir=
-case `echo $ANDROID_NDK_HOME/toolchains/$host_cpu-*/prebuilt/*/bin` in
+# This stays empty if there is just one version of the toolchain in the NDK
+ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=
+case `echo $ANDROID_NDK_HOME/toolchains/$android_cpu-*/prebuilt/*/bin` in
 */bin\ */bin*)
-toolchain_version_subdir=${with_android_ndk_toolchain_version}/
+# Trailing slash intentional and necessary, compare to how this is used
+
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=${with_android_ndk_toolchain_version}/
 ;;
 esac
 
-if test $host_cpu = arm; then
-android_gcc_prefix=arm-linux-androideabi
-else
-android_gcc_prefix=i686-android-linux
-fi
-
-test -z $SYSBASE  export 
SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-$host_cpu
+test -z $SYSBASE  export 
SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-$android_cpu
 test -z $AR  AR=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-ar
 test -z $NM  NM=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-nm
 test -z $OBJDUMP  
OBJDUMP=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-objdump
@@ -169,9 +175,9 @@ if test -n $with_android_ndk; then
 test -z $STRIP  
STRIP=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-strip
 
 if test $host_cpu = arm; then
-ANDROIDCFLAGS=-Wno-psabi -march=armv7-a -mfloat-abi=softfp -mfpu=neon 
-Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${toolchain_version_subdir}libs/armeabi-v7a
+ANDROIDCFLAGS=-Wno-psabi -march=armv7-a -mfloat-abi=softfp -mfpu=neon 
-Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/armeabi-v7a
 

[Libreoffice-commits] .: editeng/source

2012-07-31 Thread Stephan Bergmann
 editeng/source/lookuptree/Node.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9d75ea50e7e64b7d282655e986564acb640bf04e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jul 31 09:15:34 2012 +0200

error: attempt to increment a past-the-end iterator

...when running editeng/CppunitTest_editeng_lookuptree.mk

Change-Id: Ida1cbb16965138a42bec9e675b630bcbf2f6617e

diff --git a/editeng/source/lookuptree/Node.cxx 
b/editeng/source/lookuptree/Node.cxx
index 6d5e320..2492a88 100644
--- a/editeng/source/lookuptree/Node.cxx
+++ b/editeng/source/lookuptree/Node.cxx
@@ -56,7 +56,10 @@ void Node::removeChild(Node* pChild)
 {
 i = m_lChildren.erase( i );
 }
-++i;
+else
+{
+++i;
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'feature/mork' - connectivity/source

2012-07-31 Thread David Ostrovsky
 connectivity/source/drivers/mork/MConnection.cxx |   26 +--
 connectivity/source/drivers/mork/MDatabaseMetaData.cxx   |   16 +++---
 connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx |   12 ++---
 connectivity/source/drivers/mork/MDriver.cxx |6 +-
 4 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 4bd7e5f48ab9c463ffe0aba423a2156d84c9fa6d
Author: David Ostrovsky da...@ostrovsky.org
Date:   Tue Jul 31 09:17:16 2012 +0200

mork driver: fixed SAL_LOG typo

Change-Id: I7761832978da95606c0f4d1fcfc51d3a9eee15df

diff --git a/connectivity/source/drivers/mork/MConnection.cxx 
b/connectivity/source/drivers/mork/MConnection.cxx
index 3f4d245..a406734 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -72,7 +72,7 @@ void SAL_CALL OConnection::release() throw()
 void OConnection::construct(const ::rtl::OUString url,const Sequence 
PropertyValue  info)  throw(SQLException)
 {
 (void) info; // avoid warnings
-SAL_INFO(connectvity.mork, = OConnection::construct() );
+SAL_INFO(connectivity.mork, = OConnection::construct() );
 //  open file
 setURL(url);
 //
@@ -106,8 +106,8 @@ void OConnection::construct(const ::rtl::OUString 
url,const Sequence PropertyV
 sAdditionalInfo = aAddrbookURI.copy( nLen + 1 );
 }
 
-SAL_INFO(connectvity.mork, URI =   aAddrbookURI );
-SAL_INFO(connectvity.mork, Scheme =   aAddrbookScheme );
+SAL_INFO(connectivity.mork, URI =   aAddrbookURI );
+SAL_INFO(connectivity.mork, Scheme =   aAddrbookScheme );
 
 ::rtl::OUString defaultProfile = 
m_pProfileAccess-getDefaultProfile(::com::sun::star::mozilla::MozillaProductType_Thunderbird);
 SAL_INFO(connectivity.mork, DefaultProfile:   defaultProfile);
@@ -149,7 +149,7 @@ IMPLEMENT_SERVICE_INFO(OConnection, 
com.sun.star.sdbc.drivers.mork.OConnection
 // 

 Reference XStatement  SAL_CALL OConnection::createStatement(  ) 
throw(SQLException, RuntimeException)
 {
-SAL_INFO(connectvity.mork, = OConnection::createStatement() );
+SAL_INFO(connectivity.mork, = OConnection::createStatement() );
 
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -163,34 +163,34 @@ Reference XStatement  SAL_CALL 
OConnection::createStatement(  ) throw(SQLExcep
 // 

 Reference XPreparedStatement  SAL_CALL OConnection::prepareStatement( const 
::rtl::OUString _sSql ) throw(SQLException, RuntimeException)
 {
-SAL_INFO(connectvity.mork, = OConnection::prepareStatement() );
+SAL_INFO(connectivity.mork, = OConnection::prepareStatement() );
 
 OSL_UNUSED( _sSql );
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
-SAL_INFO(connectvity.mork, OConnection::prepareStatement(   _sSql  
 ));
+SAL_INFO(connectivity.mork, OConnection::prepareStatement(   _sSql 
  ));
 return NULL;
 }
 // 

 Reference XPreparedStatement  SAL_CALL OConnection::prepareCall( const 
::rtl::OUString _sSql ) throw(SQLException, RuntimeException)
 {
-SAL_INFO(connectvity.mork, = OConnection::prepareCall() );
-SAL_INFO(connectvity.mork, sql:   _sSql);
+SAL_INFO(connectivity.mork, = OConnection::prepareCall() );
+SAL_INFO(connectivity.mork, sql:   _sSql);
 OSL_UNUSED( _sSql );
 ::dbtools::throwFeatureNotImplementedException( 
XConnection::prepareCall, *this );
-SAL_INFO(connectvity.mork, OConnection::prepareCall(   _sSql   
));
+SAL_INFO(connectivity.mork, OConnection::prepareCall(   _sSql   
));
 return NULL;
 }
 // 

 ::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString _sSql 
) throw(SQLException, RuntimeException)
 {
-SAL_INFO(connectvity.mork, = OConnection::nativeSQL() );
-SAL_INFO(connectvity.mork, sql:   _sSql);
+SAL_INFO(connectivity.mork, = OConnection::nativeSQL() );
+SAL_INFO(connectivity.mork, sql:   _sSql);
 
 ::osl::MutexGuard aGuard( m_aMutex );
 // when you need to transform SQL92 to you driver specific you can do it 
here
-SAL_INFO(connectvity.mork, OConnection::nativeSQL(  _sSql   ) );
+SAL_INFO(connectivity.mork, OConnection::nativeSQL(  _sSql   ) );
 
 return _sSql;
 }
@@ -228,7 +228,7 @@ sal_Bool SAL_CALL OConnection::isClosed(  ) 
throw(SQLException, RuntimeException
 // 

 Reference XDatabaseMetaData  SAL_CALL OConnection::getMetaData(  ) 
throw(SQLException, RuntimeException)
 {
-SAL_INFO(connectvity.mork, = OConnection::getMetaData() );
+

Re: Static src analysis of LibreOffice

2012-07-31 Thread David Tardon
Hi,

On Tue, Jul 31, 2012 at 08:03:00AM +0200, John Smith wrote:
 Well, after a lot of tweaking, I almost have 'configure' working with
 '--with-system-libs' now, except for saxon.
 
 Running configure with my system saxon gives me : configure: error:
 saxontest could not be compiled, non-functional saxon jar
 Even though I have saxon installed. I cant figure out whats going
 wrong here. Ive attached my config.log for details, if anyone wants to
 look at it.

You cannot use system saxon, because the open source HE variant does not
support all the features we need
(http://www.saxonica.com/feature-matrix.html). I guess that does not
matter for static analysis, but then saxon is java, not C++, so it does
not get in the way :-)

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


[Libreoffice-commits] .: writerfilter/qa

2012-07-31 Thread Caolán McNamara
 writerfilter/qa/cppunittests/rtftok/data/fail/EDB-18749-1.rtf |binary
 writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18754-1.rtf |binary
 writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18940-1.rtf |binary
 3 files changed

New commits:
commit 892fffaea2af837b09699974c0f9eab05a48a04b
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jul 30 20:59:46 2012 +0100

various rtf regression tests

Change-Id: If4fd8fba87c13b6294813a86155d3d0ea4d18eb2

diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/EDB-18749-1.rtf 
b/writerfilter/qa/cppunittests/rtftok/data/fail/EDB-18749-1.rtf
new file mode 100644
index 000..18795f5
Binary files /dev/null and 
b/writerfilter/qa/cppunittests/rtftok/data/fail/EDB-18749-1.rtf differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18754-1.rtf 
b/writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18754-1.rtf
new file mode 100644
index 000..f4a7369
Binary files /dev/null and 
b/writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18754-1.rtf differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18940-1.rtf 
b/writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18940-1.rtf
new file mode 100644
index 000..794f325
Binary files /dev/null and 
b/writerfilter/qa/cppunittests/rtftok/data/pass/EDB-18940-1.rtf differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: configure.in

2012-07-31 Thread Tor Lillqvist
 configure.in |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 1d3ca559966d522c3e5f98d137e02d295cb5751a
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Jul 31 10:46:03 2012 +0300

More NDK r8b fixes

Change-Id: Ib91d60bc66860ad44541b28fbe89aa01d89cdee2

diff --git a/configure.in b/configure.in
index 48009d0..170e2ee 100644
--- a/configure.in
+++ b/configure.in
@@ -142,10 +142,8 @@ if test -n $with_android_ndk; then
 # that is done, please use no newer NDK than r8.
 
 if test $host_cpu = arm; then
-android_gcc_prefix=arm-linux-androideabi
 android_cpu=arm
 else
-android_gcc_prefix=i686-android-linux
 # host_cpu is something like i386 or i686 I guess, NDK uses
 # x86 in some contexts
 android_cpu=x86
@@ -167,6 +165,16 @@ if test -n $with_android_ndk; then
 ;;
 esac
 
+if test $host_cpu = arm; then
+   android_gcc_prefix=arm-linux-androideabi
+elif test -f $ANDROID_ABI_PREBUILT_BIN/i686-android-linux-gcc; then
+android_gcc_prefix=i686-android-linux
+elif test -f $ANDROID_ABI_PREBUILT_BIN/i686-linux-android-gcc; then
+android_gcc_prefix=i686-linux-android
+else
+AC_MSG_ERROR([Can't figure out the toolchain prefix])
+fi
+
 test -z $SYSBASE  export 
SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-$android_cpu
 test -z $AR  AR=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-ar
 test -z $NM  NM=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-nm
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-07-31 Thread Petr Mladek
 sc/source/filter/ftools/ftools.cxx |   10 +++---
 sc/source/filter/qpro/qpro.cxx |   20 +++-
 2 files changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 079223a9680c0a0c232c6615203817c4eb147226
Author: Eike Rathke [er] eike.rat...@oracle.com
Date:   Tue Jul 31 10:00:56 2012 +0200

QuattroPro warnings

diff --git a/sc/source/filter/ftools/ftools.cxx 
b/sc/source/filter/ftools/ftools.cxx
index 52f848e..cb224bc 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -280,7 +280,8 @@ ByteString ScfTools::ReadCString( SvStream rStrm )
 {
 rtl::OStringBuffer aRet;
 
-while (1)
+sal_uInt32 nLen = 0;
+while (nLen++  STRING_MAXLEN)
 {
 sal_Char cChar(0);
 rStrm  cChar;
@@ -288,7 +289,9 @@ ByteString ScfTools::ReadCString( SvStream rStrm )
 break;
 aRet.append(cChar);
 }
-
+// Callers assume that a 0-byte was read and may advance their book keeping
+// counters by String.Len()+1, don't put back cChar!=0 if STRING_MAXLEN was
+// reached.
 return aRet.makeStringAndClear();
 }
 
@@ -296,7 +299,8 @@ ByteString ScfTools::ReadCString( SvStream rStrm, 
sal_Int32 rnBytesLeft )
 {
 rtl::OStringBuffer aRet;
 
-while (1)
+sal_uInt32 nLen = 0;
+while (nLen++  STRING_MAXLEN)
 {
 sal_Char cChar(0);
 rStrm  cChar;
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index b8ee3ab..8572e66 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -64,10 +64,16 @@ FltError ScQProReader::readSheet( SCTAB nTab, ScDocument* 
pDoc, ScQProStyle *pSt
 case 0x000f:{ // Label cell
 String aLabel;
 *mpStream  nCol  nDummy  nRow  nStyle  nDummy;
-readString( aLabel, getLength() - 7 );
-nStyle = nStyle  3;
-pStyle-SetFormat( pDoc, nCol, nRow, nTab, nStyle );
-pDoc-PutCell( nCol, nRow, nTab, ScBaseCell::CreateTextCell( 
aLabel, pDoc ), true );
+sal_uInt16 nLen = getLength();
+if (nLen = 7)
+{
+readString( aLabel, nLen - 7 );
+nStyle = nStyle  3;
+pStyle-SetFormat( pDoc, nCol, nRow, nTab, nStyle );
+pDoc-PutCell( nCol, nRow, nTab, 
ScBaseCell::CreateTextCell( aLabel, pDoc ), true );
+}
+else
+eRet = eERR_FORMAT;
 }
 break;
 
@@ -195,7 +201,11 @@ FltError ScQProReader::import( ScDocument *pDoc )
 String aLabel;
 *mpStream  nPtSize  nFontAttr;
 pStyleElement-setFontRecord( j, nFontAttr, nPtSize );
-readString( aLabel, getLength() - 4 );
+sal_uInt16 nLen = getLength();
+if (nLen = 4)
+readString( aLabel, nLen - 4 );
+else
+eRet = eERR_FORMAT;
 pStyleElement-setFontType( j, aLabel );
 j++;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] cosmetic patch for conditional formatting

2012-07-31 Thread Jean-Baptiste Faure
Hi,

here is a small patch to vertically align the fields in the conditional
formatting dialog.
Additionnaly it give more room for several strings which is useful for
FR translation.
To easily understand the code, I reordered it according to the lines in
the dialog.

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

From 998885a7fb9f7e17fe3c9a03e66f5c7daa8dc938 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste FAURE jbf.fa...@orange.fr
Date: Tue, 31 Jul 2012 10:03:16 +0200
Subject: [PATCH] vertically align and enlarge fields in cond.formatting
 dialog

add more room in several fields: usefull for FR translation
reorder the code by levels/lines in the dialog

Change-Id: I2c4cbaf926ade87b35a5900ab5461477e0157822
---
 sc/source/ui/src/condformatdlg.src |   56 ++--
 1 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src
index 174da1f..12d4ef9 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -95,7 +95,7 @@ Control RID_COND_ENTRY
 ListBox LB_TYPE
 {
 Pos = MAP_APPFONT( 5, 15 );
-Size = MAP_APPFONT( 60, 40 );
+Size = MAP_APPFONT( 80, 40 );
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
@@ -107,7 +107,7 @@ Control RID_COND_ENTRY
 };
 ListBox LB_CELLIS_TYPE
 {
-Pos = MAP_APPFONT( 70, 15 );
+Pos = MAP_APPFONT( 90, 15 );
 Size = MAP_APPFONT( 80, 40 );
 Border = TRUE;
 DropDown = TRUE;
@@ -125,52 +125,52 @@ Control RID_COND_ENTRY
 not duplicate;
 };
 };
-FixedText FT_STYLE
-{
-Pos = MAP_APPFONT( 10, 32 );
-Size = MAP_APPFONT( 35, 14 );
-Text [ en-US ] = Apply Style;
-};
 Edit ED_VAL1
 {
-Pos = MAP_APPFONT( 155, 15 );
+Pos = MAP_APPFONT( 175, 15 );
 Size = MAP_APPFONT( 50, 12 );
 Border = TRUE;
 };
 Edit ED_VAL2
 {
-Pos = MAP_APPFONT( 210, 15 );
+Pos = MAP_APPFONT( 230, 15 );
 Size = MAP_APPFONT( 50, 12 );
 Border = TRUE;
 };
-ListBox LB_STYLE
+ListBox LB_COLOR_FORMAT
 {
-Pos = MAP_APPFONT( 50, 32 );
-Size = MAP_APPFONT( 50, 80 );
+Pos = MAP_APPFONT( 100, 15 );
+Size = MAP_APPFONT( 100, 60);
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
 {
-New Style...;
+Color Scale (2 Entries);
+Color Scale (3 Entries);
+Data Bar;
 };
 };
-ListBox LB_COLOR_FORMAT
+FixedText FT_STYLE
 {
-Pos = MAP_APPFONT( 70, 15 );
-Size = MAP_APPFONT( 80, 60);
+Pos = MAP_APPFONT( 5, 32 );
+Size = MAP_APPFONT( 50, 14 );
+Text [ en-US ] = Apply Style;
+};
+ListBox LB_STYLE
+{
+Pos = MAP_APPFONT( 90, 32 );
+Size = MAP_APPFONT( 80, 80 );
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
 {
-Color Scale (2 Entries);
-Color Scale (3 Entries);
-Data Bar;
+New Style...;
 };
 };
 ListBox LB_TYPE_COL_SCALE
 {
 Pos = MAP_APPFONT( 5, 32 );
-Size = MAP_APPFONT( 60, 60 );
+Size = MAP_APPFONT( 80, 60 );
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
@@ -183,17 +183,17 @@ Control RID_COND_ENTRY
 Formula;
 };
 };
-Edit ED_COL_SCALE
+Window WD_PREVIEW
 {
-Pos = MAP_APPFONT( 5, 48 );
-Size = MAP_APPFONT( 60, 12 );
+Pos = MAP_APPFONT( 175, 32 );
+Size = MAP_APPFONT( 105, 14 );
+Text [ en-US ] = Example;
 Border = TRUE;
 };
-Window WD_PREVIEW
+Edit ED_COL_SCALE
 {
-Pos = MAP_APPFONT( 150, 32 );
-Size = MAP_APPFONT( 60, 14 );
-Text [ en-US ] = Example;
+Pos = MAP_APPFONT( 5, 48 );
+Size = MAP_APPFONT( 60, 12 );
 Border = TRUE;
 };
 ListBox LB_COL
-- 
1.7.5.4

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


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

2012-07-31 Thread Petr Mladek
 sc/source/filter/inc/scflt.hxx  |1 
 sc/source/filter/starcalc/scflt.cxx |  225 +---
 2 files changed, 136 insertions(+), 90 deletions(-)

New commits:
commit 44fb4f1b061e4bd7335e50ced0b4e88a589f4b24
Author: Eike Rathke [er] eike.rat...@oracle.com
Date:   Tue Jul 31 10:12:12 2012 +0200

StarCalc 1.0: fix memory leaks

diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index 35f7743..f6cc056 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/inc/scflt.hxx
@@ -417,6 +417,7 @@ struct Sc10ColAttr
 Sc10ColData*pData;
 
 Sc10ColAttr() : pData(NULL) {}
+~Sc10ColAttr() { delete [] pData; }
 };
 
 // GraphHeader
diff --git a/sc/source/filter/starcalc/scflt.cxx 
b/sc/source/filter/starcalc/scflt.cxx
index 1d30ea2..365ab74 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -83,36 +83,51 @@ using namespace com::sun::star;
 
 #define DEFCHARSET  RTL_TEXTENCODING_MS_1252
 
-#define SC10TOSTRING(p) String(p,DEFCHARSET)
+#define SC10TOSTRING(p)String((p),DEFCHARSET)
 
 const SCCOL SC10MAXCOL = 255;   // #i85906# don't try to load more columns 
than there are in the file
 
 
-void lcl_ReadFileHeader(SvStream rStream, Sc10FileHeader rFileHeader)
+/** Those strings are used with SC10TOSTRING() and strcmp() and such, hence 
+need to be 0-terminated. */
+static void lcl_ReadFixedString( SvStream rStream, void* pData, size_t nLen )
 {
-rStream.Read(rFileHeader.CopyRight, sizeof(rFileHeader.CopyRight));
+sal_Char* pBuf = static_castsal_Char*(pData);
+if (!nLen)
+pBuf[0] = 0;
+else
+{
+rStream.Read( pBuf, nLen);
+pBuf[nLen-1] = 0;
+}
+}
+
+
+static void lcl_ReadFileHeader(SvStream rStream, Sc10FileHeader rFileHeader)
+{
+   lcl_ReadFixedString( rStream, rFileHeader.CopyRight, 
sizeof(rFileHeader.CopyRight));
 rStream  rFileHeader.Version;
 rStream.Read(rFileHeader.Reserved, sizeof(rFileHeader.Reserved));
 }
 
 
-void lcl_ReadTabProtect(SvStream rStream, Sc10TableProtect rProtect)
+static void lcl_ReadTabProtect(SvStream rStream, Sc10TableProtect rProtect)
 {
-rStream.Read(rProtect.PassWord, sizeof(rProtect.PassWord));
+   lcl_ReadFixedString( rStream, rProtect.PassWord, 
sizeof(rProtect.PassWord));
 rStream  rProtect.Flags;
 rStream  rProtect.Protect;
 }
 
 
-void lcl_ReadSheetProtect(SvStream rStream, Sc10SheetProtect rProtect)
+static void lcl_ReadSheetProtect(SvStream rStream, Sc10SheetProtect rProtect)
 {
-rStream.Read(rProtect.PassWord, sizeof(rProtect.PassWord));
+   lcl_ReadFixedString( rStream, rProtect.PassWord, 
sizeof(rProtect.PassWord));
 rStream  rProtect.Flags;
 rStream  rProtect.Protect;
 }
 
 
-void lcl_ReadRGB(SvStream rStream, Sc10Color rColor)
+static void lcl_ReadRGB(SvStream rStream, Sc10Color rColor)
 {
 rStream  rColor.Dummy;
 rStream  rColor.Blue;
@@ -121,21 +136,21 @@ void lcl_ReadRGB(SvStream rStream, Sc10Color rColor)
 }
 
 
-void lcl_ReadPalette(SvStream rStream, Sc10Color* pPalette)
+static void lcl_ReadPalette(SvStream rStream, Sc10Color* pPalette)
 {
 for (sal_uInt16 i = 0; i  16; i++)
 lcl_ReadRGB(rStream, pPalette[i]);
 }
 
 
-void lcl_ReadValueFormat(SvStream rStream, Sc10ValueFormat rFormat)
+static void lcl_ReadValueFormat(SvStream rStream, Sc10ValueFormat rFormat)
 {
 rStream  rFormat.Format;
 rStream  rFormat.Info;
 }
 
 
-void lcl_ReadLogFont(SvStream rStream, Sc10LogFont rFont)
+static void lcl_ReadLogFont(SvStream rStream, Sc10LogFont rFont)
 {
 rStream  rFont.lfHeight;
 rStream  rFont.lfWidth;
@@ -150,11 +165,11 @@ void lcl_ReadLogFont(SvStream rStream, Sc10LogFont 
rFont)
 rStream  rFont.lfClipPrecision;
 rStream  rFont.lfQuality;
 rStream  rFont.lfPitchAndFamily;
-rStream.Read(rFont.lfFaceName, sizeof(rFont.lfFaceName));
+   lcl_ReadFixedString( rStream, rFont.lfFaceName, 
sizeof(rFont.lfFaceName));
 }
 
 
-void lcl_ReadBlockRect(SvStream rStream, Sc10BlockRect rBlock)
+static void lcl_ReadBlockRect(SvStream rStream, Sc10BlockRect rBlock)
 {
 rStream  rBlock.x1;
 rStream  rBlock.y1;
@@ -163,9 +178,9 @@ void lcl_ReadBlockRect(SvStream rStream, Sc10BlockRect 
rBlock)
 }
 
 
-void lcl_ReadHeadFootLine(SvStream rStream, Sc10HeadFootLine rLine)
+static void lcl_ReadHeadFootLine(SvStream rStream, Sc10HeadFootLine rLine)
 {
-rStream.Read(rLine.Title, sizeof(rLine.Title));
+   lcl_ReadFixedString( rStream, rLine.Title, sizeof(rLine.Title));
 lcl_ReadLogFont(rStream, rLine.LogFont);
 rStream  rLine.HorJustify;
 rStream  rLine.VerJustify;
@@ -179,7 +194,7 @@ void lcl_ReadHeadFootLine(SvStream rStream, 
Sc10HeadFootLine rLine)
 }
 
 
-void lcl_ReadPageFormat(SvStream rStream, Sc10PageFormat rFormat)
+static void lcl_ReadPageFormat(SvStream rStream, Sc10PageFormat rFormat)
 {
 lcl_ReadHeadFootLine(rStream, rFormat.HeadLine);
 

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-07-31 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 52615, which changed state.

Bug 52615 Summary: FILEOPEN: ADO driver inactive (thus no connection to MS 
Access databases)
https://bugs.freedesktop.org/show_bug.cgi?id=52615

   What|Old Value   |New Value

 Status|NEW |ASSIGNED
 Resolution||FIXED
 Status|ASSIGNED|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-commits] .: 2 commits - Makefile.top postprocess/packcomponents

2012-07-31 Thread David Tardon
 Makefile.top   |2 +-
 postprocess/packcomponents/makefile.mk |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7484f81faf2ee4e6bd80b9200ba48ca013434695
Author: David Tardon dtar...@redhat.com
Date:   Tue Jul 31 10:22:54 2012 +0200

fdo#52615 add ADO component to services.rdb again

This was accidentally removed by commit
d4efa8b0cf48f092d8984f3f085909cd1a6a39af .

Change-Id: Idaa97ea5a141dca7cde6ba4aae51ecb5bf8856d3

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 0ba2f25..e1497aa 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -339,6 +339,7 @@ my_components += \
 
 .IF $(OS) == WNT
 my_components += \
+component/connectivity/source/drivers/ado/ado \
 component/dtrans/source/generic/dtrans \
 component/dtrans/util/dnd \
 component/dtrans/util/ftransl \
commit 44eb85bb2089c0d83cbaf621bdaed7b1fe895684
Author: David Tardon dtar...@redhat.com
Date:   Tue Jul 31 09:27:18 2012 +0200

accept 'verbose' too

Change-Id: Icd5683ec2609e401e2e04021df5065986875c77c

diff --git a/Makefile.top b/Makefile.top
index 4aaf832..62715de 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -18,7 +18,7 @@ endif
 include $(SRCDIR)/config_$(gb_Side).mk
 
 ifeq ($(GMAKE_OPTIONS),)
-ifeq ($(VERBOSE),)
+ifeq ($(verbose)$(VERBOSE),)
 export GMAKE_OPTIONS:=-rs
 else
 export GMAKE_OPTIONS:=-r
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[REVIEW 3-6] fdo#52615 ADO driver inactive

2012-07-31 Thread David Tardon
Hi all,

commit 7484f81faf2ee4e6bd80b9200ba48ca013434695 adds back a line I
accidentally dropped from postprocess/packcomponents/makefile.mk in
commit d4efa8b0cf48f092d8984f3f085909cd1a6a39af .

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


[REVIEW 3-5][REVIEW 3-6] rhbz#842552 crash on .pptx import

2012-07-31 Thread David Tardon
Hi all,

commit 772699ac1f2375c33f0819ebb127555d3178c4e5 fixes a crash on import
of a pptx file (the file is attached to the bug).

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


Re: [PATCH] fdo#42492: fixing Basic HEX command

2012-07-31 Thread Noel Power

On 31/07/12 07:13, János Uray wrote:
The patch solves this bug: 
https://bugs.freedesktop.org/show_bug.cgi?id=42492
There was a buffer overflow: char aBuffer[16] had no room for the 
terminating null character.
But the hex command was still wrong, because the printf used %X and 
%lX, which are very platform-dependent.
Actually the integer is only 16-bit, and long is only 32-bit. I've 
corrected this by using %SAL_PRIXUINT32 as described in 
http://wiki.documentfoundation.org/Development/Sal_Types (and there is 
no SAL_PRIXUINT16, so both were converted to sal_uInt32).
hmm, not looking at the patch in detail yet I am not sure if a length of 
16 is sensible, if the size of the type for the hex output is 2 
(integer) or 4 bytes (long) I would expect the max display from HEX to 
be   or  respectively :/ I'd like to see what MS vba does 
here, we should try to remain compatible if possible.


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


Re: fdo#47907: fix flickering scrolling in Basic IDE

2012-07-31 Thread Noel Power

Hi János
you forgot to attach the patch :-)

On 30/07/12 19:04, János Uray wrote:
This patch solves this bug: 
https://bugs.freedesktop.org/show_bug.cgi?id=47907


The text was flickering because Window::Invalidate() clears the client 
area by default. To prevent this, I've added an INVALIDATE_NOERASE 
parameter to Invalidate() calls.
On the other hand, the background still needed to be erased outside 
the text: the indentation space and the rest of the line.


(Note: both svtools and basctl must be rebuilt.)

Regards,
Uray M. János



___
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


[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-07-31 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #62 from Roman Eisele b...@eikota.de 2012-07-31 09:27:13 UTC ---
(In reply to comment #58)
 Add Bug 52610 - FILESAVE [DOCX] File.docx, created LibO Writer, can't be 
 opened
 in other programs (https://bugs.freedesktop.org/show_bug.cgi?id=52610)

(In reply to comment #59)
 Add Bug 52612 - FILESAVE [DOCX] Loss of footnotes's text when exporting to
 DOCX-files (https://bugs.freedesktop.org/show_bug.cgi?id=52612)

Both bugs have been nominated, but not acutally added to the Depends on list,
and this is good so -- because none of the two bugs is new in LibO 3.6.x, and
for now only bugs new in 3.6.x should be added to the present list. So, if
someone still considers one or both of these bugs as most annoying, he/she
should please add it to our LibO 3.5 most annoying bugs list, but not here.
Thanks!

-- 
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-commits] .: starmath/source tools/source vcl/aqua vcl/headless vcl/inc vcl/ios vcl/Package_inc.mk vcl/source vcl/unx vcl/win

2012-07-31 Thread Noel Power
 starmath/source/dialog.cxx  |1 
 tools/source/debug/debug.cxx|   11 -
 vcl/Package_inc.mk  |1 
 vcl/aqua/source/window/salframe.cxx |   15 -
 vcl/headless/svpframe.cxx   |4 ---
 vcl/inc/aqua/salframe.h |1 
 vcl/inc/headless/svpframe.hxx   |1 
 vcl/inc/ios/salframe.h  |1 
 vcl/inc/salframe.hxx|3 --
 vcl/inc/unx/gtk/gtkframe.hxx|2 -
 vcl/inc/unx/saldisp.hxx |2 -
 vcl/inc/unx/salframe.h  |1 
 vcl/inc/vcl/sndstyle.hxx|   40 
 vcl/inc/win/salframe.h  |1 
 vcl/ios/source/window/salframe.cxx  |   15 -
 vcl/source/app/dbggui.cxx   |2 -
 vcl/unx/generic/app/saldisp.cxx |7 --
 vcl/unx/generic/window/salframe.cxx |   16 --
 vcl/unx/gtk/window/gtkframe.cxx |   13 ---
 vcl/win/source/window/salframe.cxx  |   18 
 20 files changed, 155 deletions(-)

New commits:
commit 85cb9084533605657aca0394afe4516058a8e4ef
Author: Mathieu Vonlanthen mat_...@fastmail.fm
Date:   Mon Jul 30 11:45:03 2012 +0200

fdo#48549 System::Beep() removal

Change-Id: I402202e199dfc8c2462859d00529f2782f6228b0

diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 0cec1b9..532ed8a 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -30,7 +30,6 @@
 #include svtools/ctrltool.hxx
 #include sfx2/printer.hxx
 #include vcl/help.hxx
-#include vcl/sndstyle.hxx
 #include vcl/waitobj.hxx
 #include vcl/settings.hxx
 #include vcl/wall.hxx
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index cad812f..2d90389 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -631,15 +631,6 @@ static void DbgGetLogFileName( sal_Char* pStr )
 
 // ---
 
-static void DbgDebugBeep()
-{
-#if defined( WNT )
-MessageBeep( MB_ICONHAND );
-#endif
-}
-
-// ---
-
 static DebugData* GetDebugData()
 {
 if ( !aDebugData.bInit )
@@ -1491,8 +1482,6 @@ void DbgOut( const sal_Char* pMsg, sal_uInt16 nDbgOut, 
const sal_Char* pFile, sa
 {
 nOut = pData-aDbgData.nErrorOut;
 pStr = Error: ;
-if ( pData-aDbgData.nErrorOut == DBG_OUT_FILE )
-DbgDebugBeep();
 }
 else if ( nDbgOut == DBG_OUT_WARNING )
 {
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index 0da4b14..a01822f 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -131,7 +131,6 @@ $(eval $(call 
gb_Package_add_file,vcl_inc,inc/vcl/scrbar.hxx,vcl/scrbar.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/seleng.hxx,vcl/seleng.hxx))
 $(eval $(call 
gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx))
-$(eval $(call 
gb_Package_add_file,vcl_inc,inc/vcl/sndstyle.hxx,vcl/sndstyle.hxx))
 $(eval $(call 
gb_Package_add_file,vcl_inc,inc/vcl/solarmutex.hxx,vcl/solarmutex.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
diff --git a/vcl/aqua/source/window/salframe.cxx 
b/vcl/aqua/source/window/salframe.cxx
index 456bb91..a80ff4e 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1344,21 +1344,6 @@ const SystemEnvData* AquaSalFrame::GetSystemData() const
 
 // ---
 
-void AquaSalFrame::Beep( SoundType eSoundType )
-{
-switch( eSoundType )
-{
-case SOUND_DISABLE:
-// don't beep
-break;
-default:
-NSBeep();
-break;
-}
-}
-
-// ---
-
 void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, 
sal_uInt16 nFlags)
 {
 if ( !mpWindow )
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 208313d..c6ca6c1 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -428,10 +428,6 @@ void SvpSalFrame::UpdateSettings( AllSettings )
 {
 }
 
-void SvpSalFrame::Beep( SoundType )
-{
-}
-
 const SystemEnvData* SvpSalFrame::GetSystemData() const
 {
 return m_aSystemChildData;
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index 50ec407..e51035a 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -147,7 +147,6 @@ public:
 virtual sal_BoolMapUnicodeToKeyCode( sal_Unicode aUnicode, 
LanguageType aLangType, KeyCode rKeyCode );
 virtual LanguageTypeGetInputLanguage();
 virtual voidUpdateSettings( AllSettings rSettings );
-virtual voidBeep( SoundType 

[Libreoffice-commits] .: 3 commits - cui/source svl/inc unusedcode.easy

2012-07-31 Thread Caolán McNamara
 cui/source/inc/treeopt.hxx |4 ---
 cui/source/options/treeopt.cxx |   24 +---
 svl/inc/svl/svarray.hxx|   47 +
 unusedcode.easy|   13 ---
 4 files changed, 18 insertions(+), 70 deletions(-)

New commits:
commit 7dcc3f5e900724c6bc46296ddb4aa83f16df17f3
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jul 31 10:36:55 2012 +0100

strip down the PTRARR macro to the bits the last two uses require

Change-Id: I60323cd849e98b194af43e80aebc699ab662ed0e

diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 64d5403..23e702b 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -71,24 +71,6 @@ public:
 // SORTARR - Begin
 
 #define _SV_IMPL_SORTAR_ALG(nm, AE)\
-void nm::Insert( const nm * pI, sal_uInt16 nS, sal_uInt16 nE )\
-{\
-if( USHRT_MAX == nE )\
-nE = pI-Count();\
-sal_uInt16 nP;\
-const AE * pIArr = pI-GetData();\
-for( ; nS  nE; ++nS )\
-{\
-if( ! Seek_Entry( *(pIArr+nS), nP) )\
-nm##_SAR::Insert( *(pIArr+nS), nP );\
-if( ++nP = Count() )\
-{\
-nm##_SAR::Insert( pI, nP, nS+1, nE );\
-nS = nE;\
-}\
-}\
-}\
-\
 sal_Bool nm::Insert( const AE  aE )\
 {\
 sal_uInt16 nP;\
@@ -98,33 +80,12 @@ sal_Bool nm::Insert( const AE  aE )\
 nm##_SAR::Insert( aE, nP );\
 return !bExist;\
 }\
-sal_Bool nm::Insert( const AE  aE, sal_uInt16 rP )\
-{\
-sal_Bool bExist;\
-bExist = Seek_Entry( aE, rP );\
-if( ! bExist )\
-nm##_SAR::Insert( aE, rP );\
-return !bExist;\
-}\
-void nm::Insert( const AE* pE, sal_uInt16 nL)\
-{\
-sal_uInt16 nP;\
-for( sal_uInt16 n = 0; n  nL; ++n )\
-if( ! Seek_Entry( *(pE+n), nP ))\
-nm##_SAR::Insert( *(pE+n), nP );\
-}\
+\
 void nm::Remove( sal_uInt16 nP, sal_uInt16 nL )\
 {\
 if( nL )\
 nm##_SAR::Remove( nP, nL);\
-}\
-\
-void nm::Remove( const AE aE, sal_uInt16 nL )\
-{\
-sal_uInt16 nP;\
-if( nL  Seek_Entry( aE, nP ) )   \
-nm##_SAR::Remove( nP, nL);\
-}\
+}
 
 #define SV_DECL_PTRARR_SORT(nm, AE, IS)\
 class nm##_SAR: public SvPtrarr \
@@ -167,12 +128,8 @@ class nm : private nm##_SAR \
 public:\
 nm(sal_uInt16 nSize = IS)\
 : nm##_SAR(nSize) {}\
-void Insert( const nm *pI, sal_uInt16 nS=0, sal_uInt16 nE=USHRT_MAX );\
 sal_Bool Insert( const AE aE );\
-sal_Bool Insert( const AE aE, sal_uInt16 rP );\
-void Insert( const AE *pE, sal_uInt16 nL );\
 void Remove( sal_uInt16 nP, sal_uInt16 nL = 1 );\
-void Remove( const AE aE, sal_uInt16 nL = 1 );\
 sal_uInt16 Count() const  {   return nm##_SAR::Count(); }\
 const AE* GetData() const { return (const AE*)pData; }\
 AE operator[](sal_uInt16 nP) const {\
diff --git a/unusedcode.easy b/unusedcode.easy
index 0dd7c11..14faca2 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -38,21 +38,9 @@ SvXMLStyleIndices_Impl::Remove(SvXMLStyleIndex_Impl*)
 SvtSlideSorterBarOptions::AddListenerLink(Link const)
 SvtSlideSorterBarOptions::RemoveListenerLink(Link const)
 SvxPositionSizeTabPage::GetRect()
-SwSortElements::Insert(SwSortElement* const, unsigned short)
-SwSortElements::Insert(SwSortElement* const*, unsigned short)
-SwSortElements::Insert(SwSortElements const*, unsigned short, unsigned short)
-SwSortElements::Remove(SwSortElement* const, unsigned short)
 SwSortElements::Remove(unsigned short, unsigned short)
 SwXMLTableColumnsSortByWidth_Impl::GetPos(SwXMLTableColumn_Impl const*) const
 SwXMLTableColumnsSortByWidth_Impl::Remove(SwXMLTableColumn_Impl*)
-SwpHtEnd::Insert(SwTxtAttr const*, unsigned short)
-SwpHtEnd::Insert(SwTxtAttr const**, unsigned short)
-SwpHtEnd::Insert(SwpHtEnd const*, unsigned short, unsigned short)
-SwpHtEnd::Remove(SwTxtAttr const*, unsigned short)
-SwpHtStart::Insert(SwTxtAttr const*, unsigned short)
-SwpHtStart::Insert(SwTxtAttr const**, unsigned short)
-SwpHtStart::Insert(SwpHtStart const*, unsigned short, unsigned short)
-SwpHtStart::Remove(SwTxtAttr const*, unsigned short)
 TempFile::IsValid() const
 TextEngine::GetLeftMargin() const
 ThumbnailView::GetItemCount() const
commit 4e407dd808253f3298f9a5bd2eed3684b5e819ca
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jul 31 10:06:09 2012 +0100

callcatcher: pModule is leaking

Change-Id: I85aae76937c2416964d6e49cdd6ac39dca83ebbd

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 2e4fad1..9100312 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1926,13 +1926,18 @@ bool isNodeActive( OptionsNode* pNode, Module* pModule )
 void OfaTreeOptionsDialog::LoadExtensionOptions( const rtl::OUString 
rExtensionId )
 {
 Module* pModule = NULL;
-Reference XMultiServiceFactory  xMSFac = 
comphelper::getProcessServiceFactory();
+
 // when called by Tools - Options then load nodes of active module
 if ( 

Re: [PUSHED][PATCH (partial)] fdo#48549 System::Beep() removal

2012-07-31 Thread Noel Power

pushed, thanks !!

Noel
On 28/07/12 23:06, Mathieu Vonlanthen wrote:

Hi,

I've written a new patch cleaning remaining calls to Sound::Beep and
unused include. I've also removed sound.hxx and sound.cxx as they were
no more used.

I've built master with this patch without warnings on the modified files
but there is still no logging added.

There is still calls to GetDisplay()-Beep() and gdk_display_beep(
getGdkDisplay() ), they are not directly related to fdo#48549 but they
maybe deserve to be removed too?

Best Regards

Mathieu



___
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


[PATCH] Convert documents to follow the doxygen standard

2012-07-31 Thread Gerrit
From Norah A. Abanumay  naban...@kacst.edu.sa:

Norah A. Abanumay  has uploaded a new change for review.

Change subject: Convert documents to follow the doxygen standard
..

Convert documents to follow the doxygen standard

Change-Id: I9086f6129f61afba6b7d0317248756cde34f075b
---
M sd/inc/CustomAnimationCloner.hxx
M sd/inc/anminfo.hxx
M sd/inc/drawdoc.hxx
M sd/inc/pres.hxx
M sd/inc/sdpage.hxx
M sd/inc/sdpptwrp.hxx
M sd/inc/sdxmlwrp.hxx
M sd/inc/shapelist.hxx
M sd/source/filter/eppt/epptbase.hxx
M sd/source/filter/eppt/pptexanimations.hxx
M sd/source/filter/eppt/pptexsoundcollection.hxx
M sd/source/filter/ppt/ppt97animations.hxx
M sd/source/filter/ppt/pptatom.hxx
13 files changed, 122 insertions(+), 107 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/352/1
--
To view, visit https://gerrit.libreoffice.org/352
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9086f6129f61afba6b7d0317248756cde34f075b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norah A. Abanumay  naban...@kacst.edu.sa

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


Re: Tinderbox failure, MacOSX-Intel@1-built_no-moz_on_10.6.8, MASTER, last success: 2012-07-31 07:03:36

2012-07-31 Thread Tomaž Vajngerl
Hi,

I have some time today in the evening. I hope I will be able to resolve this.

Regards, Tomaž

On Tue, Jul 31, 2012 at 11:46 AM, Stephan Bergmann sberg...@redhat.com wrote:
 Hi Tomaž,

 http://cgit.freedesktop.org/libreoffice/core/commit/?id=fa351042bc425f0437bfb50d09220bedbc257948
 LookupTree for fast autocompletion lookups (by Nico Weyand) apparently
 still has problems (even after
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=9d75ea50e7e64b7d282655e986564acb640bf04e
 error: attempt to increment a past-the-end iterator), see below, and
 running with valgrind (on Linux x86_64) indeed indicates problems, see
 attachment.

 Do you have time to take a look?

 Thanks,
 Stephan

 On 07/31/2012 09:32 AM, nthieb...@gmail.com wrote:

 Hi folks,

 One of you broke the build of LibreOffice with your commit :-(
 Please commit and push a fix ASAP!

 Full log available at http://tinderbox.libreoffice.org/MASTER/status.html

 Tinderbox info:

Box name: MacOSX-Intel@1-built_no-moz_on_10.6.8
Branch: MASTER
starttime: 1343719331
Machine: Darwin tpamac.local 10.8.0 Darwin Kernel Version 10.8.0: Tue
 Jun  7 16:33:36 PDT 2011; root:xnu-1504.15.3~1/RELEASE_I386 i386
Configured with: --with-distro=LibreOfficeMacOSX
 --with-max-jobs=8
 --with-num-cpus=8
 --enable-werror
 --enable-epm
 --disable-systray
 --with-help=no
 --disable-dependency-tracking

 Commits since the last success:

  core 
9d75ea5  error: attempt to increment a past-the-end iterator
  binfilter 
  dictionaries 

 The error is:

 [...]

 /bin/sh: line 1:  7887 Bus error   DYLD_LIBRARY_PATH=$O/lib
 DBGSV_ERROR_OUT=shell STAR_RESOURCEPATH=$O/bin/ $O/bin/cppunit/cppunittester
 $W/LinkTarget/CppunitTest/libtest_editeng_lookuptree.dylib --headless 
 $W/CppunitTest/editeng_lookuptree.test.log 21
 [ build CXX ] svx/source/unodraw/unoshap3.cxx

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

 export DEBUGCPPUNIT=TRUE# for exception catching
 export GDBCPPUNITTRACE=gdb --args # for interactive debugging
 export VALGRIND=memcheck# for memory checking
 and retry.
 make[2]: ***
 [/Volumes/TBRAM/core/workdir/unxmacxi.pro/CppunitTest/editeng_lookuptree.test]
 Error 1
 make[2]: *** Waiting for unfinished jobs
 ERROR: error 512 occurred while making /Volumes/TBRAM/core/tail_build/prj
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2012-07-31 Thread Michael Stahl
 sc/source/filter/excel/tokstack.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 1f52bf67892a5ce61bcf90c350a462f638580eb7
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jul 27 18:10:33 2012 +0200

warning: statement has no effect

Change-Id: I06a26ebd1703e1d753e35daeed610671fc451a8f
(cherry picked from commit 114ccd28e09f0fd13c8ff4e61e82e3f13198febf)

Signed-off-by: Eike Rathke er...@redhat.com

diff --git a/sc/source/filter/excel/tokstack.cxx 
b/sc/source/filter/excel/tokstack.cxx
index bef0ef8..44ad276 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -524,7 +524,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId )
 pScToken-AddExternalSingleReference(r.mnFileId, 
r.maTabName, r.maRef);
 }
 else
-bRet - false;
+bRet = false;
 }
 break;
 case T_ExtRefA:
@@ -536,7 +536,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId )
 pScToken-AddExternalDoubleReference(r.mnFileId, 
r.maTabName, r.maRef);
 }
 else
-bRet - false;
+bRet = false;
 }
 break;
 default:
commit 95dbbee43af6c8f16273bdf3850e3c312794dc3f
Author: Eike Rathke er...@redhat.com
Date:   Fri Jul 27 19:20:50 2012 +0200

added back a missing else

c75e2ed27d5da71891ed7a148ff9603c58eaa58e (merge of OOo filter rework)
omitted an else of a condition.

Change-Id: I6f342a48938aaf4090fc738afc6cf551a083b4fc
(cherry picked from commit b06d679eb3d8190a470f7640740571f388106605)

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

diff --git a/sc/source/filter/excel/tokstack.cxx 
b/sc/source/filter/excel/tokstack.cxx
index cdf6ac5..bef0ef8 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -477,7 +477,8 @@ bool TokenPool::GetElement( const sal_uInt16 nId )
 else
 pScToken-AddExternal( p-aText, p-eId );
 }
-bRet = false;
+else
+bRet = false;
 }
 break;
 case T_Nlf:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: sd/source

2012-07-31 Thread Noel Power
 sd/source/ui/docshell/docshel4.cxx |4 ++--
 sd/source/ui/view/DocumentRenderer.cxx |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2b6bdcc3dafc0cf8193ac321da6d9209923b73cf
Author: Rob Snelders programm...@ertai.nl
Date:   Fri Jul 27 17:05:20 2012 +0200

- fdo#47707 - PRINTING: Printing windows wrong color indication

Change-Id: I77cd68b96452896d4eec9f4bbd5200bd65d77f2a

diff --git a/sd/source/ui/docshell/docshel4.cxx 
b/sd/source/ui/docshell/docshel4.cxx
index df97c37..04bd707 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -129,9 +129,9 @@ SfxPrinter* DrawDocShell::GetPrinter(sal_Bool bCreate)
 sal_uLong nMode = DRAWMODE_DEFAULT;
 
 if( nQuality == 1 )
-nMode = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_BLACKTEXT 
| DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT;
+nMode = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT 
| DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT;
 else if( nQuality == 2 )
-nMode = DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT | 
DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP | DRAWMODE_WHITEGRADIENT;
+nMode = DRAWMODE_BLACKLINE | DRAWMODE_WHITEFILL | 
DRAWMODE_BLACKTEXT | DRAWMODE_WHITEBITMAP | DRAWMODE_WHITEGRADIENT;
 
 mpPrinter-SetDrawMode( nMode );
 
diff --git a/sd/source/ui/view/DocumentRenderer.cxx 
b/sd/source/ui/view/DocumentRenderer.cxx
index 1dd9417..2a9233a 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1508,13 +1508,13 @@ private:
 {
 case 1:
 aInfo.mnDrawMode = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL
-| DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP
+| DRAWMODE_GRAYTEXT | DRAWMODE_GRAYBITMAP
 | DRAWMODE_GRAYGRADIENT;
 break;
 
 case 2:
-aInfo.mnDrawMode = DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT
-| DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP
+aInfo.mnDrawMode = DRAWMODE_BLACKLINE | DRAWMODE_WHITEFILL
+| DRAWMODE_BLACKTEXT | DRAWMODE_WHITEBITMAP
 | DRAWMODE_WHITEGRADIENT;
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PUSHED] - fdo#47707 - PRINTING: Printing windows wrong color indicat...

2012-07-31 Thread Gerrit
From Noel Power noel.po...@suse.com:

Noel Power has submitted this change and it was merged.

Change subject: - fdo#47707 - PRINTING: Printing windows wrong color indication
..


- fdo#47707 - PRINTING: Printing windows wrong color indication

Change-Id: I77cd68b96452896d4eec9f4bbd5200bd65d77f2a
---
M sd/source/ui/docshell/docshel4.cxx
M sd/source/ui/view/DocumentRenderer.cxx
2 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/347
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I77cd68b96452896d4eec9f4bbd5200bd65d77f2a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rob Snelders libreoff...@ertai.nl
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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


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

2012-07-31 Thread Noel Power
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 32af6dec1b7b80759a793e5f1da0a1129823c51e
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Jul 27 21:20:34 2012 +0200

fdo#48033 fix RTF import of pictures inside table cells

Change-Id: I2d9ef3b346d4b10b99b67d0934d63d59f6119f97

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3fb9491..af2d592 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -801,7 +801,13 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 }
 writerfilter::ReferenceProperties::Pointer_t const pProperties(new 
RTFReferenceProperties(aAttributes, aSprms));
 checkFirstRun();
-Mapper().props(pProperties);
+if (!m_pCurrentBuffer)
+Mapper().props(pProperties);
+else
+{
+RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
+m_pCurrentBuffer-push_back(make_pair(BUFFER_PROPS, pValue));
+}
 
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-07-31 Thread Noel Power
 oox/source/drawingml/table/tablecell.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0c9b786d4fd37b11cca65beb7444f3bede021ae7
Author: David Tardon dtar...@redhat.com
Date:   Thu Jul 26 14:17:09 2012 +0200

rhbz#842552 always create text content

The following line in oox::drawingml::table::TableCell::pushToXCell
suggests that it is assumed that the cell always contains text:

Reference text::XText  xText( rxCell, UNO_QUERY_THROW );

So TableCell should always hold a valid TextBody too.

Change-Id: Ic2db7b535c98dd5f2b18941846709a781df4585c

diff --git a/oox/source/drawingml/table/tablecell.cxx 
b/oox/source/drawingml/table/tablecell.cxx
index d4bbbcf..f68f766 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -53,7 +53,8 @@ using ::com::sun::star::drawing::LineStyle;
 namespace oox { namespace drawingml { namespace table {
 
 TableCell::TableCell()
-: mnRowSpan ( 1 )
+: mpTextBody( new TextBody() )
+, mnRowSpan ( 1 )
 , mnGridSpan( 1 )
 , mbhMerge( sal_False )
 , mbvMerge( sal_False )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [PUSHED][REVIEW 3-5][REVIEW 3-6] rhbz#842552 crash on .pptx import

2012-07-31 Thread Noel Power

pushed
Noel
On 31/07/12 09:42, David Tardon wrote:

Hi all,

commit 772699ac1f2375c33f0819ebb127555d3178c4e5 fixes a crash on import
of a pptx file (the file is attached to the bug).

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



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


[Libreoffice-commits] .: Branch 'libreoffice-3-6' - postprocess/packcomponents

2012-07-31 Thread Noel Power
 postprocess/packcomponents/makefile.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d46bd28012890fd0b5ae2dc1f562a9d33eae2639
Author: David Tardon dtar...@redhat.com
Date:   Tue Jul 31 10:22:54 2012 +0200

fdo#52615 add ADO component to services.rdb again

This was accidentally removed by commit
d4efa8b0cf48f092d8984f3f085909cd1a6a39af .

Change-Id: Idaa97ea5a141dca7cde6ba4aae51ecb5bf8856d3

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 5ff27d5..09e296b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -342,6 +342,7 @@ my_components += \
 
 .IF $(OS) == WNT
 my_components += \
+component/connectivity/source/drivers/ado/ado \
 component/dtrans/source/generic/dtrans \
 component/dtrans/util/dnd \
 component/dtrans/util/ftransl \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: mingw build broken

2012-07-31 Thread d . ostrovsky

Hey Kendy,

thank you for your response.
Yeah, my wine-* packages were outdated (1.4.*, we could check it in  
configure). After upgrading winegcc is working again, and after ccache  
-C

(@David tnank you for that hint) LO even compiles, but

... cd /tmp/xfUNKMLKsY_temp.11871; tar -cf - . | gzip   
/home/david/numpty/workspace/LO-Mingw32/instsetoo_native/wntgcci.pro/LibreOffice_Dev_SDK/archive/install/en-US_inprogress/LibO-Dev-SDK_3.7.0.0.alpha0_Win_x86_install-arc_en-US.tar.gz  
...


where is the expected msi package?
Or do i have to provide some extra configure parameter for that?

Regards
David

Quoting Jan Holesovsky ke...@suse.cz:


Hi David,

On 2012-07-28 at 23:20 +0200, David Ostrovsky wrote:


here is the whole truth (CC to David, because he is the second one, who
knows what going on on mingw world ;-):

http://pastebin.com/96xS1WHt

Should i file the bug request on winehq project?


No idea - it still might be some misconfiguration that is not covered by
the configure checks, or something, no real idea :-(  It builds for me
here, but of course, I first got it to build, and then tried hard to
reproduce my fails, and cover them in configure, but apparently I must
have had some pre-configured things, or something.

As you asked on the irc:


rpm -qf /usr/lib/wine/libkernel32.def

wine-devel-1.5.9-178.1
wine-devel-32bit-1.5.9-178.1

The best might be to extend the winegcc check so that it we do that only
when we are trying to build the msi; OTOH we should default to that
ASAP...

Sorry for the trouble :-(,
Kendy





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


Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-07-31 Thread Eike Rathke
Hi anwen,

On Friday, 2012-07-27 08:43:25 -0700, anwen wrote:

 The deadlock scenario is that the spreadsheet called the functions many
 times and was showing dynamical financial data. Then I closed the
 spreadsheet window. The window quit immediately, but the soffice.bin and
 soffice.exe were still in task manager. I had to kill these processes
 manually. From the log file, I saw that main thread hung at destruction
 process, trying to close the second thread, and the second thread hang at
 ReferenceXResultLisenter - modified(), trying to update the spreadsheet.

This sounds like the actual culprit. The result listener should not try
to update if the document is in destruction. Actually the listeners are
detroyed during document close, but it seems this is a race condition
and a modified() is fired in between. If it detected that situation it
wouldn't need to lock SolarMutex but could bail out early instead.

Could you please submit a bug for this and assign it to me?

Thanks
  Eike

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


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


Re: fdo#47907: fix flickering scrolling in Basic IDE

2012-07-31 Thread János Uray
Again? Oh, yes.
Now here it is.

On Tue, Jul 31, 2012 at 11:10 AM, Noel Power nopo...@suse.com wrote:

  Hi János
 you forgot to attach the patch :-)

 On 30/07/12 19:04, János Uray wrote:

 This patch solves this bug:
 https://bugs.freedesktop.org/show_bug.cgi?id=47907

 The text was flickering because Window::Invalidate() clears the client
 area by default. To prevent this, I've added an INVALIDATE_NOERASE
 parameter to Invalidate() calls.
 On the other hand, the background still needed to be erased outside the
 text: the indentation space and the rest of the line.

 (Note: both svtools and basctl must be rebuilt.)

 Regards,
 Uray M. János



 ___
 LibreOffice mailing 
 listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice



From 52553e121656d3eaf429148f930362489dcd762f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uray=20M.=20J=C3=A1nos?= uray.ja...@gmail.com
Date: Mon, 30 Jul 2012 19:41:03 +0200
Subject: [PATCH] fdo#47907: fix flickering scrolling in Basic IDE

Change-Id: I745a8284e4d361872c5c0c0c54500e0d36158fb0
---
 basctl/source/basicide/baside2b.cxx |6 ++--
 svtools/source/edit/texteng.cxx |   50 +--
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 3e96c22..610d779 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -357,7 +357,7 @@ void EditorWindow::Resize()
 }
 InitScrollBars();
 if ( nVisY != pEditView-GetStartDocPos().Y() )
-Invalidate();
+Invalidate(INVALIDATE_NOERASE);
 }
 }
 
@@ -655,7 +655,7 @@ void EditorWindow::DataChanged(DataChangedEvent const  rDCEvt)
 != rDCEvt.GetOldSettings()-GetStyleSettings().GetFieldColor())
 {
 SetBackground(Wallpaper(aColor));
-Invalidate();
+Invalidate(INVALIDATE_NOERASE);
 }
 if (pEditEngine != 0)
 {
@@ -685,7 +685,7 @@ void EditorWindow::Notify( SfxBroadcaster /*rBC*/, const SfxHint rHint )
 ( 0, pModulWindow-GetBreakPointWindow().GetCurYOffset() - pEditView-GetStartDocPos().Y() );
 pModulWindow-GetLineNumberWindow().DoScroll
 ( 0, pModulWindow-GetLineNumberWindow().GetCurYOffset() - pEditView-GetStartDocPos().Y() );
-pModulWindow-Invalidate();
+pModulWindow-Invalidate(INVALIDATE_NOERASE);
 }
 else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
 {
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index efce793..a7e7d32 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -1983,6 +1983,8 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point rStartPos, Rectan
 if ( !IsFormatted() )
 FormatDoc();
 
+Size const aOutSize = pOutDev-GetOutputSizePixel();
+
 bool bTransparent = false;
 Window* pOutWin = dynamic_castWindow*(pOutDev);
 bTransparent = (pOutWin  pOutWin-IsPaintTransparent());
@@ -2140,30 +2142,24 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point rStartPos, Rectan
 break;
 case PORTIONKIND_TAB:
 {
-// Bei HideSelection() nur Range, pSelection = 0.
-if ( pSelStart || pPaintRange )
+Rectangle aTabArea( aTmpPos, Point( aTmpPos.X()+nTxtWidth, aTmpPos.Y()+mnCharHeight-1 ) );
+sal_Bool bDone = sal_False;
+if ( pSelStart )
 {
-Rectangle aTabArea( aTmpPos, Point( aTmpPos.X()+nTxtWidth, aTmpPos.Y()+mnCharHeight-1 ) );
-sal_Bool bDone = sal_False;
-if ( pSelStart )
+// liegt der Tab in der Selektion???
+TextPaM aTextStart( nPara, nIndex );
+TextPaM aTextEnd( nPara, nIndex+1 );
+if ( ( aTextStart  *pSelEnd )  ( aTextEnd  *pSelStart ) )
 {
-// liegt der Tab in der Selektion???
-TextPaM aTextStart( nPara, nIndex );
-TextPaM aTextEnd( nPara, nIndex+1 );
-if ( ( aTextStart  *pSelEnd )  ( aTextEnd  *pSelStart ) )
-{
-Color aOldColor = pOutDev-GetFillColor();
-  

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-07-31 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #63 from Korrawit Pruegsanusak detective.conan.1...@gmail.com 
2012-07-31 11:43:45 UTC ---
Nominating bug 52998 and bug 52999: Saving file as XLS/XLSX lost comments.
These are regressions in 3.6 version, and IMHO we need public caution for these
bugs if we release 3.6.0 with them. Thanks.

-- 
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-commits] .: Branch 'feature/gsoc-calc-perf2' - sc/source

2012-07-31 Thread Daniel Bankston
 sc/source/filter/oox/workbookhelper.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 3c95101f43a8abb2a644fa2bdb3468cda5e459b0
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date:   Tue Jul 31 06:43:06 2012 -0500

Prevent broadcasts to gain xlsx formula import performance boost

oox import filter was spending a lot of time in ScFormulaCell::Notify()
because of unnecessary broadcasts.
Now the oox import filter will use the same approach
that the xml import filter uses to prevent this from happening which
results in shorter import time.

Change-Id: I65e86919f352de0b22916a8d57d3166af0a58984

diff --git a/sc/source/filter/oox/workbookhelper.cxx 
b/sc/source/filter/oox/workbookhelper.cxx
index db6342d..5aaf414 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -553,6 +553,10 @@ void WorkbookGlobals::initialize( bool bWorkbookFile )
 //! TODO: localize progress bar text
 mxProgressBar.reset( new SegmentProgressBar( 
mrBaseFilter.getStatusIndicator(), CREATE_OUSTRING( Loading... ) ) );
 mxFmlaParser.reset( new FormulaParser( *this ) );
+
+//prevent unnecessary broadcasts and half way listeners as
+//is done in ScDocShell::BeforeXMLLoading() for ods
+getScDocument().SetInsertingFromOtherDoc(true);
 }
 else if( mrBaseFilter.isExportFilter() )
 {
@@ -597,6 +601,10 @@ void WorkbookGlobals::finalize()
 aPropSet.setProperty( PROP_IsChangeReadOnlyEnabled, false );
 // #111099# open forms in alive mode (has no effect, if no controls in 
document)
 aPropSet.setProperty( PROP_ApplyFormDesignMode, false );
+
+//stop preventing establishment of listeners as is done in
+//ScDocShell::AfterXMLLoading() for ods
+getScDocument().SetInsertingFromOtherDoc(false);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [PATCH] fdo#42492: fixing Basic HEX command

2012-07-31 Thread János Uray
Yes, that is what I was trying to say: length 15 and length 16 were both
wrong. There were two mistakes: the buffer overflow, and the non-compatible
types and printf-strings. Fixing the latter one (which resulted in 16
characters on 64-bit platforms, where C++ long is 64-bit) makes the
former one (the 15 characters) irrelevant. The patch prints at most 4
(integer) or 8 (long) characters.
The integer and long in LibreOffice Basic are described here:
http://help.libreoffice.org/Basic/Using_Variables#Integer_Variables
Microsoft Visual Basic uses double sizes (4 and 8 bytes):
http://msdn.microsoft.com/en-US/library/47zceaw7%28v=vs.110%29

Uray M. János

On Tue, Jul 31, 2012 at 11:08 AM, Noel Power nopo...@suse.com wrote:

 On 31/07/12 07:13, János Uray wrote:

 The patch solves this bug: https://bugs.freedesktop.org/**
 show_bug.cgi?id=42492https://bugs.freedesktop.org/show_bug.cgi?id=42492
 There was a buffer overflow: char aBuffer[16] had no room for the
 terminating null character.
 But the hex command was still wrong, because the printf used %X and
 %lX, which are very platform-dependent.
 Actually the integer is only 16-bit, and long is only 32-bit. I've
 corrected this by using %SAL_PRIXUINT32 as described in http://wiki.**
 documentfoundation.org/**Development/Sal_Typeshttp://wiki.documentfoundation.org/Development/Sal_Types(and
  there is no SAL_PRIXUINT16, so both were converted to sal_uInt32).

 hmm, not looking at the patch in detail yet I am not sure if a length of
 16 is sensible, if the size of the type for the hex output is 2 (integer)
 or 4 bytes (long) I would expect the max display from HEX to be   or
  respectively :/ I'd like to see what MS vba does here, we should
 try to remain compatible if possible.

 Noel

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


[GSoC] testing - Weekly Report no. 10

2012-07-31 Thread Artur Dorda
Hi there,

This week I continued my work  on the Word format import tests in
sw/qa/extras/{rtf,ooxml,ww8}tok. There has been some issues, but all
have been overcome.
The results was good and working:
- first the ooxml border test has beeen done
- later I refactored the code, put it to the separate .hxx file, so it
could be used for all three of them
- and later I did the two other formats working

So now all 3 Word formats import tests are working nicely.

In the upcoming week I will be working on the other border tests,
starting from odfimport.

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


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

2012-07-31 Thread Petr Mladek
 sot/source/sdstor/stg.cxx  |  117 ++---
 sot/source/sdstor/stgavl.cxx   |   79 +--
 sot/source/sdstor/stgcache.cxx |   59 +---
 sot/source/sdstor/stgcache.hxx |2 
 sot/source/sdstor/stgdir.cxx   |   58 +---
 sot/source/sdstor/stgdir.hxx   |2 
 sot/source/sdstor/stgelem.cxx  |   76 ++
 sot/source/sdstor/stgelem.hxx  |3 -
 sot/source/sdstor/stgio.cxx|   31 --
 sot/source/sdstor/stgole.cxx   |   35 +++-
 sot/source/sdstor/stgstrms.cxx |   91 +--
 sot/source/sdstor/stgstrms.hxx |4 -
 sot/source/sdstor/storinfo.cxx |7 +-
 13 files changed, 396 insertions(+), 168 deletions(-)

New commits:
commit f95762beb3b5849bfaccd39523a11fe15b191d89
Author: Mikhail Voytenko m...@openoffice.org
Date:   Tue Jul 31 12:08:39 2012 +0200

sot: prevent some null pointer crashes

diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 18e95f6..dbb34a1 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -100,7 +100,8 @@ const SvStream* OLEStorageBase::GetSvStream_Impl() const
 OLEStorageBase::OLEStorageBase( StgIo* p, StgDirEntry* pe, StreamMode nMode )
 : nStreamMode( nMode ), pIo( p ), pEntry( pe )
 {
-p-IncRef();
+if ( p )
+p-IncRef();
 if( pe )
 pe-nRefCnt++;
 }
@@ -117,21 +118,28 @@ OLEStorageBase::~OLEStorageBase()
 else
 pEntry-Close();
 }
+
+pEntry = NULL;
 }
 
 
-if( !pIo-DecRef() )
+   if( pIo  !pIo-DecRef() )
+{
 delete pIo;
+pIo = NULL;
+}
 }
 
 // Validate the instance for I/O
 
 sal_Bool OLEStorageBase::Validate_Impl( sal_Bool bWrite ) const
 {
-if( pEntry
+if( pIo
+ pIo-pTOC
+ pEntry
  !pEntry-bInvalid
   ( !bWrite || !pEntry-bDirect || ( nStreamMode  STREAM_WRITE ) ) )
-return sal_True;
+return sal_True;
 return sal_False;
 }
 
@@ -170,7 +178,7 @@ StorageStream::StorageStream( StgIo* p, StgDirEntry* q, 
StreamMode m )
  : OLEStorageBase( p, q, m_nMode ), nPos( 0L )
 {
 // The dir entry may be 0; this means that the stream is invalid.
-if( q )
+if( q  p )
 {
 if( q-nRefCnt == 1 )
 {
@@ -278,14 +286,21 @@ sal_Bool StorageStream::Commit()
 
 sal_Bool StorageStream::Revert()
 {
-pEntry-Revert();
-pIo-MoveError( *this );
-return Good();
+sal_Bool bResult = sal_False;
+
+if ( Validate() )
+{
+pEntry-Revert();
+pIo-MoveError( *this );
+bResult = Good();
+}
+
+return bResult;
 }
 
 sal_Bool StorageStream::CopyTo( BaseStorageStream* pDest )
 {
-if( !Validate() || !pDest-Validate( sal_True ) || Equals( *pDest ) )
+if( !Validate() || !pDest || !pDest-Validate( sal_True ) || Equals( 
*pDest ) )
 return sal_False;
 pEntry-Copy( *pDest );
 pDest-Commit();
@@ -345,14 +360,20 @@ sal_Bool Storage::IsStorageFile( const String  rFileName 
)
 
 sal_Bool Storage::IsStorageFile( SvStream* pStream )
 {
-StgHeader aHdr;
-sal_uLong nPos = pStream-Tell();
-sal_Bool bRet = ( aHdr.Load( *pStream )  aHdr.Check() );
+sal_Bool bRet = sal_False;
+
+if ( pStream )
+{
+StgHeader aHdr;
+sal_uLong nPos = pStream-Tell();
+bRet = ( aHdr.Load( *pStream )  aHdr.Check() );
+
+// It's not a stream error if it is too small for a OLE storage header
+if ( pStream-GetErrorCode() == ERRCODE_IO_CANTSEEK )
+pStream-ResetError();
+pStream-Seek( nPos );
+}
 
-// It's not a stream error if it is too small for a OLE storage header
-if ( pStream-GetErrorCode() == ERRCODE_IO_CANTSEEK )
-pStream-ResetError();
-pStream-Seek( nPos );
 return bRet;
 }
 
@@ -467,7 +488,9 @@ void Storage::Init( sal_Bool bCreate )
 pEntry = NULL;
 sal_Bool bHdrLoaded = sal_False;
 bIsRoot = sal_True;
-if( pIo-Good() )
+
+OSL_ENSURE( pIo, The pointer may not be empty at this point! );
+   if( pIo-Good()  pIo-GetStrm() )
 {
 sal_uLong nSize = pIo-GetStrm()-Seek( STREAM_SEEK_TO_END );
 pIo-GetStrm()-Seek( 0L );
@@ -488,7 +511,7 @@ void Storage::Init( sal_Bool bCreate )
 // the file is empty
 if( !bHdrLoaded )
 pIo-Init();
-if( pIo-Good() )
+if( pIo-Good()  pIo-pTOC )
 {
 pEntry = pIo-pTOC-GetRoot();
 pEntry-nRefCnt++;
@@ -543,7 +566,7 @@ const String Storage::GetName() const
 
 void Storage::FillInfoList( SvStorageInfoList* pList ) const
 {
-if( Validate() )
+   if( Validate()  pList )
 {
 StgIterator aIter( *pEntry );
 StgDirEntry* p = aIter.First();
@@ -739,21 +762,24 @@ sal_Bool Storage::CopyTo( const String rElem, 
BaseStorage* pDest, const String
 BaseStorage* p1 = OpenStorage( rElem, INTERNAL_MODE );
 BaseStorage* p2 = 

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

2012-07-31 Thread Petr Mladek
 sw/source/core/doc/number.cxx |4 ++--
 sw/source/filter/ww1/w1filter.cxx |2 +-
 sw/source/filter/ww8/ww8graf.cxx  |2 +-
 sw/source/filter/ww8/ww8par5.cxx  |8 +++-
 sw/source/filter/ww8/ww8par6.cxx  |2 +-
 sw/source/ui/app/docsh.cxx|   11 ++-
 sw/source/ui/dialog/ascfldlg.cxx  |2 --
 sw/source/ui/misc/num.cxx |5 +
 sw/source/ui/table/tabledlg.cxx   |6 ++
 sw/source/ui/utlui/unotools.cxx   |6 --
 10 files changed, 33 insertions(+), 15 deletions(-)

New commits:
commit 746954f550d3d42393a817cd1172403e098d119f
Author: Michael Stahl m...@openoffice.org
Date:   Tue Jul 31 14:37:03 2012 +0200

sw: fix some warnings

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

diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index c56c74b..bec3981 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1108,9 +1108,9 @@ namespace numfunc
 }
 inline sal_Unicode GetChar( sal_uInt8 p_nListLevel ) const
 {
-if ( p_nListLevel  MAXLEVEL )
+if (p_nListLevel = MAXLEVEL)
 {
-p_nListLevel = MAXLEVEL;
+p_nListLevel = MAXLEVEL - 1;
 }
 
 return mnLevelChars[p_nListLevel];
diff --git a/sw/source/filter/ww1/w1filter.cxx 
b/sw/source/filter/ww1/w1filter.cxx
index 0cd32f4..c17b1eb 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -1380,7 +1380,7 @@ SvxFontItem Ww1Fonts::GetFont(sal_uInt16 nFCode)
 FAMILY_DONTKNOW, FAMILY_ROMAN, FAMILY_SWISS, FAMILY_MODERN,
 FAMILY_SCRIPT, FAMILY_DECORATIVE
 };
-if (b  sizeof(eFamilyA))
+if (b  (sizeof(eFamilyA)/sizeof(eFamilyA[0])))
 eFamily = eFamilyA[b];
 }
 else
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 8182cff..f99ad5f 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -269,7 +269,7 @@ static void SetFill( SfxItemSet rSet, WW8_DP_FILL rFill )
 else
 {
 rSet.Put(XFillStyleItem(XFILL_SOLID));  // necessary for textbox
-if (nPat = 1 || nPat  sizeof(nPatA))
+if (nPat = 1 || ((sizeof(nPatA)/sizeof(nPatA[0])) = nPat))
 {
 // Solid Background or unknown
 rSet.Put(XFillColorItem(aEmptyStr, WW8TransCol(rFill.dlpcBg)));
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 949ddd9..c6cc594 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1033,10 +1033,16 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
 if (bNested)
 return 0;
 
-sal_uInt16 n = ( aF.nId = eMax ) ? aF.nId : static_cast sal_uInt16 
(eMax); // alle  91 werden 92
+sal_uInt16 n = (aF.nId = eMax) ? aF.nId : static_castsal_uInt16(eMax);
 sal_uInt16 nI = n / 32; // # des sal_uInt32
 sal_uLong nMask = 1  ( n % 32 );  // Maske fuer Bits
 
+if ((sizeof(nFieldTagAlways)/sizeof(nFieldTagAlways[0])) = nI)
+{   // if indexes larger than 95 are needed, then a new configuration
+// item has to be added, and nFieldTagAlways/nFieldTagBad expanded!
+return aF.nLen;
+}
+
 if( nFieldTagAlways[nI]  nMask )   // Flag: Tag it
 return Read_F_Tag( aF );   // Resultat nicht als Text
 
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 2f7a956..1677207 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3479,7 +3479,7 @@ bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode, 
FontFamily reFamily,
 break;
 }
 }
-if( b  sizeof( eFamilyA ) )
+if (b  (sizeof(eFamilyA)/sizeof(eFamilyA[0])))
 reFamily = eFamilyA[b];
 else
 reFamily = FAMILY_DONTKNOW;
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 6f5a902..17ff4c0 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -1221,7 +1221,7 @@ uno::Reference frame::XController 
 return aRet;
 }
 
-static const char* pEventNames[] =
+static const char* s_EventNames[] =
 {
 OnPageCountChange,
 OnMailMerge,
@@ -1230,6 +1230,7 @@ static const char* pEventNames[] =
 OnFieldMergeFinished,
 OnLayoutFinished
 };
+static sal_Int32 const s_nEvents(sizeof(s_EventNames)/sizeof(s_EventNames[0]));
 
 Sequence OUString SwDocShell::GetEventNames()
 {
@@ -1247,12 +1248,12 @@ Sequence OUString SwDocShell::GetEventNames()
 return aRet;
 }
 
-static sal_Int32 nEvents=13;
-
 rtl::OUString SwDocShell::GetEventName( sal_Int32 nIndex )
 {
-if ( nIndexnEvents )
-return ::rtl::OUString::createFromAscii(pEventNames[nIndex]);
+if (nIndex  s_nEvents)
+{
+return 

[PATCH] Revert toolbox bg rendering as it creates hard to fix regression

2012-07-31 Thread Ruslan Kabatsayev
Hello,

This patch reverts my earlier patch which tried to render native
background on ToolBox. It appears that this breaks some themes, and
there's no easy fix for this (at least not simple enough to be worth
the trouble).

Regards,
Ruslan


0001-Revert-Enable-native-background-rendering-for-ToolBo.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[GSoC 2012][Collaboration] ScDocFunc and Collaboration

2012-07-31 Thread Matúš Kukan
Hello calc guys,

I have ~two questions about ScDocShell, ScDocFunc and Collaboration.

I am working on moving sc/source/ui/collab/contacts.* into tubes/
There will be new Collaboration abstract class in tubes/ and something
in sc/ should implement it.

First:
1, Why we have new ScDocFuncSend( *this, new ScDocFuncRecv( new
ScDocFuncDirect( *this ) ) ); chain ?
It could be just one class as long as it inherits from ScDocFunc I think.
Also ScDocFuncDirect is just ScDocFunc with own costructor, not sure what for.

2,
For class ScCollaboration : Collaboration there are two possibilities I think.
a, We will use just one ScDocFunc and make it work when (not)collaborating.
Then we can use ScCollaboration directly wiith this ScDocFunc but it
would complicate it a little more.
b, We continue to use more versions of ScDocFunc depending on whether
we collaborate.
But then, I think, we need to use ScCollaboration with ScDocShell, so
it has access to it's ScDocFunc and can change it.

I am not sure what's more ideal.. b, is probably more similar to the
current state but it's messing also with ScDocShell.
a, could be nicer because there would be only one ScDocFunc but that
may not be best.

Thanks to anyone for reading and any comments, questions ...
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] .: framework/inc

2012-07-31 Thread Thomas Arnhold
 framework/inc/classes/filtercachedata.hxx |   62 --
 1 file changed, 62 deletions(-)

New commits:
commit 98e697dcb02b2864a7d701656ba160a7070d5501
Author: Thomas Arnhold tho...@arnhold.org
Date:   Mon Jul 30 18:24:06 2012 +0200

cleanup filtercachedata.hxx

Actually only two definitions of this long list are really used...

Change-Id: I45e85b18f63e4d2cda948766159d81aed27c9289

diff --git a/framework/inc/classes/filtercachedata.hxx 
b/framework/inc/classes/filtercachedata.hxx
index 781829e..276d5da 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -76,72 +76,10 @@ namespace framework{
 //  exported const
 
//_
 
-#define PACKAGENAME_TYPEDETECTION_STANDARD  
DECLARE_ASCII(Office.TypeDetection)   /// Names 
of our configuration files.
-#define PACKAGENAME_TYPEDETECTION_ADDITIONAL
DECLARE_ASCII(Office.TypeDetectionAdditional  )
-#define CFG_PATH_SEPERATOR  DECLARE_ASCII(/  
 )   /// separator for configuration paths
-#define PROPERTY_SEPERATOR  sal_Unicode(',')   
 /// separator for own formated 
property strings of types and filters
 #define DEFAULT_FILTERCACHE_VERSION 6  
 /// these implmentation of FilterCache 
support different version of TypeDetection.xml! This define the current set 
default one.
 
 #define DEFAULT_FILTERCACHE_MODECONFIG_MODE_DELAYED_UPDATE 
| CONFIG_MODE_ALL_LOCALES  /// 
ConfigItems could run in different modes: supported values are ... { 
CONFIG_MODE_IMMEDIATE_UPDATE, CONFIG_MODE_DELAYED_UPDATE, 
CONFIG_MODE_ALL_LOCALES }
 
-//*
-// This are all supported set-names of our filter configuration.
-//*
-#define SUBLIST_TYPES   DECLARE_ASCII(Types  
 )
-#define SUBLIST_FILTERS DECLARE_ASCII(Filters
 )
-#define SUBLIST_DETECTSERVICES  
DECLARE_ASCII(DetectServices  )
-#define SUBLIST_FRAMELOADERS
DECLARE_ASCII(FrameLoaders)
-#define SUBLIST_CONTENTHANDLERS 
DECLARE_ASCII(ContentHandlers )
-#define SUBLIST_DEFAULTSDECLARE_ASCII(Defaults   
 )
-
-#define TEMPLATENAME_TYPE   DECLARE_ASCII(Type   
 )
-#define TEMPLATENAME_FILTER DECLARE_ASCII(Filter 
 )
-#define TEMPLATENAME_DETECTSERVICE  
DECLARE_ASCII(DetectService   )
-#define TEMPLATENAME_FRAMELOADER
DECLARE_ASCII(FrameLoader )
-#define TEMPLATENAME_CONTENTHANDLER 
DECLARE_ASCII(ContentHandler  )
-
-//*
-// These defines declare all supported names of configuration key names.
-// They are not sorted and could be shared by different base configuration 
items.
-//*
-#define SUBKEY_PREFERREDDECLARE_ASCII(Preferred  
 )
-#define SUBKEY_INSTALLEDDECLARE_ASCII(Installed  
 )
-#define SUBKEY_NAME DECLARE_ASCII(Name   
 )
-#define SUBKEY_UINAME   DECLARE_ASCII(UIName 
 )
-#define SUBKEY_MEDIATYPEDECLARE_ASCII(MediaType  
 )
-#define SUBKEY_CLIPBOARDFORMAT  
DECLARE_ASCII(ClipboardFormat )
-#define SUBKEY_URLPATTERN   DECLARE_ASCII(URLPattern 
 )
-#define SUBKEY_EXTENSIONS   DECLARE_ASCII(Extensions 
 )
-#define SUBKEY_DOCUMENTICONID

[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_sw binfilter/inc

2012-07-31 Thread Thomas Arnhold
 binfilter/bf_sc/source/ui/inc/imoptdlg.hxx |2 
 binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx |1 
 binfilter/bf_sfx2/source/inc/referers.hxx  |   32 
 binfilter/bf_svtools/source/config/svt_itemholder2.cxx |1 
 binfilter/bf_sw/source/core/inc/blink.hxx  |   56 --
 binfilter/bf_sw/source/core/layout/sw_newfrm.cxx   |1 
 binfilter/bf_sw/source/ui/app/sw_swmodule.cxx  |2 
 binfilter/bf_sw/source/ui/inc/glshell.hxx  |   64 -
 binfilter/inc/bf_svtools/apearcfg.hxx  |   57 ---
 binfilter/inc/bf_svx/txencbox.hxx  |   28 ---
 10 files changed, 244 deletions(-)

New commits:
commit 6d93be1f8e80df2b2fc30b0b3397405480fca7bc
Author: Thomas Arnhold tho...@arnhold.org
Date:   Tue Jul 31 00:16:51 2012 +0200

Remove unused header files

As their content is unused.

Change-Id: Ie17edae1c766b29ec649623c41cd3bfdc648f844

diff --git a/binfilter/bf_sc/source/ui/inc/imoptdlg.hxx 
b/binfilter/bf_sc/source/ui/inc/imoptdlg.hxx
index df738ec..3858180 100644
--- a/binfilter/bf_sc/source/ui/inc/imoptdlg.hxx
+++ b/binfilter/bf_sc/source/ui/inc/imoptdlg.hxx
@@ -30,8 +30,6 @@
 
 #include vcl/button.hxx
 
-#include bf_svx/txencbox.hxx
-
 #include global.hxx
 namespace binfilter {
 
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx 
b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx
index 935ab06..cfdc02b 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx
@@ -70,7 +70,6 @@
 #include objsh.hxx
 #include objshimp.hxx
 #include openflag.hxx
-#include referers.hxx
 #include request.hxx
 #include appimp.hxx
 #include appuno.hxx
diff --git a/binfilter/bf_sfx2/source/inc/referers.hxx 
b/binfilter/bf_sfx2/source/inc/referers.hxx
deleted file mode 100644
index b95356f..000
--- a/binfilter/bf_sfx2/source/inc/referers.hxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SFX_REFERERS_HXX
-#define _SFX_REFERERS_HXX
-namespace binfilter {
-
-#define SFX_REFERER_USERprivate:user
-#define SFX_REFERER_APPEVENTprivate:appevent
-#define SFX_REFERER_EXPLORERprivate:explorer
-#define SFX_REFERER_NEWMENU private:newmenu
-
-
-}//end of namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svtools/source/config/svt_itemholder2.cxx 
b/binfilter/bf_svtools/source/config/svt_itemholder2.cxx
index ae2190a..ec5f956 100644
--- a/binfilter/bf_svtools/source/config/svt_itemholder2.cxx
+++ b/binfilter/bf_svtools/source/config/svt_itemholder2.cxx
@@ -26,7 +26,6 @@
 
 #include com/sun/star/lang/XComponent.hpp
 
-#include apearcfg.hxx
 #include bf_svtools/cjkoptions.hxx
 #include bf_svtools/colorcfg.hxx
 #include bf_svtools/ctloptions.hxx
diff --git a/binfilter/bf_sw/source/core/inc/blink.hxx 
b/binfilter/bf_sw/source/core/inc/blink.hxx
deleted file mode 100644
index 4bceda4..000
--- a/binfilter/bf_sw/source/core/inc/blink.hxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _BLINK_HXX
-#define _BLINK_HXX
-
-class SwLinePortion;
-class SwTxtFrm;
-

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

2012-07-31 Thread Petr Mladek
 sd/source/core/sdpage.cxx   |6 +++---
 sd/source/filter/ppt/pptanimations.hxx  |2 +-
 writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx |   12 
 xmloff/source/style/weighhdl.cxx|2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 10790f7a0bcf0fdcfafedda8c98a8f6ef845fd38
Author: Michael Stahl m...@openoffice.org
Date:   Tue Jul 31 14:47:26 2012 +0200

sd, sfx2, writerfilter, xmloff: fix some warnings

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

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 1fd344d..8313c84 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1390,7 +1390,7 @@ void findAutoLayoutShapesImpl( SdPage rPage, const 
LayoutDescriptor rDescripto
 bool bMissing = false;
 
 // for each entry in the layoutdescriptor, arrange a presentation shape
-for( i = 0; (i  PRESOBJ_MAX)  (rDescriptor.meKind[i] != PRESOBJ_NONE); 
i++ )
+for (i = 0; (i  MAX_PRESOBJS)  (rDescriptor.meKind[i] != PRESOBJ_NONE); 
i++)
 {
 PresObjKind eKind = rDescriptor.meKind[i];
 SdrObject* pObj = 0;
@@ -1412,7 +1412,7 @@ void findAutoLayoutShapesImpl( SdPage rPage, const 
LayoutDescriptor rDescripto
 if( bMissing  bInit )
 {
 // for each entry in the layoutdescriptor, look for an alternative 
shape
-for( i = 0; (i  PRESOBJ_MAX)  (rDescriptor.meKind[i] != 
PRESOBJ_NONE); i++ )
+for (i = 0; (i  MAX_PRESOBJS)  (rDescriptor.meKind[i] != 
PRESOBJ_NONE); i++)
 {
 if( rShapes[i] )
 continue;
@@ -1572,7 +1572,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, sal_Bool 
bInit, sal_Bool bCreate
 int i;
 
 // for each entry in the layoutdescriptor, arrange a presentation shape
-for( i = 0; (i  PRESOBJ_MAX)  (aDescriptor.meKind[i] != PRESOBJ_NONE); 
i++ )
+for (i = 0; (i  MAX_PRESOBJS)  (aDescriptor.meKind[i] != PRESOBJ_NONE); 
i++)
 {
 PresObjKind eKind = aDescriptor.meKind[i];
 SdrObject* pObj = InsertAutoLayoutShape( aLayoutShapes[i], eKind, 
aDescriptor.mbVertical[i], aRectangle[i], bInit );
diff --git a/sd/source/filter/ppt/pptanimations.hxx 
b/sd/source/filter/ppt/pptanimations.hxx
index ed1d5f0..b82b321 100644
--- a/sd/source/filter/ppt/pptanimations.hxx
+++ b/sd/source/filter/ppt/pptanimations.hxx
@@ -123,7 +123,7 @@ namespace ppt
 #define DFF_ANIM_GROUP_ID   19
 #define DFF_ANIM_NODE_TYPE  20
 #define DFF_ANIM_VOLUME 22
-#define DFF_ANIM_PROPERTY_ID_COUNT  DFF_ANIM_VOLUME
+#define DFF_ANIM_PROPERTY_ID_COUNT (DFF_ANIM_VOLUME + 1)
 
 
 
diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
index c89fd90..4bcec2a 100644
--- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
@@ -72,6 +72,8 @@ OOXMLFastTokenHandler::OOXMLFastTokenHandler
 {
 ::rtl::OUString sResult;
 
+#if 0
+//FIXME this is broken: tokenmap::wordlist is not indexed by Token!
 if ( Token = 0 || Token  OOXML_FAST_TOKENS_END )
 {
 static ::rtl::OUString aTokens[OOXML_FAST_TOKENS_END];
@@ -80,6 +82,9 @@ OOXMLFastTokenHandler::OOXMLFastTokenHandler
 aTokens[Token] = ::rtl::OUString::createFromAscii
 (tokenmap::wordlist[Token].name);
 }
+#else
+(void) Token;
+#endif
 
 return sResult;
 }
@@ -87,10 +92,17 @@ OOXMLFastTokenHandler::OOXMLFastTokenHandler
 css::uno::Sequence ::sal_Int8  SAL_CALL 
OOXMLFastTokenHandler::getUTF8Identifier(::sal_Int32 Token)
 throw (css::uno::RuntimeException)
 {
+#if 0
 if ( Token  0  || Token = OOXML_FAST_TOKENS_END )
+#endif
 return css::uno::Sequence ::sal_Int8 ();
 
+#if 0
+//FIXME this is broken: tokenmap::wordlist is not indexed by Token!
 return css::uno::Sequence ::sal_Int8 (reinterpret_cast const sal_Int8 
*(tokenmap::wordlist[Token].name), strlen(tokenmap::wordlist[Token].name));
+#else
+(void) Token;
+#endif
 }
 
 ::sal_Int32 SAL_CALL OOXMLFastTokenHandler::getTokenFromUTF8
diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx
index 2befaa8..66fd369 100644
--- a/xmloff/source/style/weighhdl.cxx
+++ b/xmloff/source/style/weighhdl.cxx
@@ -109,7 +109,7 @@ sal_Bool XMLFontWeightPropHdl::importXML( const OUString 
rStrImpValue, Any rVa
 {
 bRet = sal_False;
 static int nCount = sizeof(aFontWeightMap)/sizeof(FontWeightMapper);
-for( int i=0; inCount; i++ )
+for (int i = 0; i  (nCount-1); ++i)
 {
 if( (nWeight = aFontWeightMap[i].nValue)  (nWeight = 
aFontWeightMap[i+1].nValue) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] .: 4 commits - sw/source writerfilter/inc writerfilter/source

2012-07-31 Thread Cédric Bosdonnat
 sw/source/core/layout/fly.cxx |   17 -
 sw/source/core/layout/frmtool.cxx |4 
 sw/source/core/text/xmldump.cxx   |2 +-
 writerfilter/inc/dmapper/DomainMapper.hxx |2 ++
 writerfilter/source/dmapper/DomainMapper.cxx  |5 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 ++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 ++
 writerfilter/source/dmapper/GraphicImport.cxx |6 --
 8 files changed, 28 insertions(+), 16 deletions(-)

New commits:
commit ae126d43e4737ab39e53827d9ad3bd6983577b1f
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Tue Jul 31 15:19:23 2012 +0200

n#772094: writerfilter, pictures anchored in header/footer won't be opaque

This dark magic is needed to have a behavior similar to the one of Word
for images anchored in headers/footers. Writer can't have pictures laid
over the header/footer but below the body text.

Change-Id: I2c001d4f696c1623370c531059b74e3d5fa4f5b7

diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx 
b/writerfilter/inc/dmapper/DomainMapper.hxx
index b781418..c22eebe 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -108,6 +108,8 @@ public:
 boost::shared_ptr StyleSheetTable  GetStyleSheetTable( );
 GraphicZOrderHelper* graphicZOrderHelper();
 
+bool IsInHeaderFooter() const;
+
 private:
 // Stream
 virtual void lcl_startSectionGroup();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 1bc0737..4aa843c 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3839,6 +3839,11 @@ GraphicZOrderHelper* DomainMapper::graphicZOrderHelper()
 return zOrderHelper.get();
 }
 
+bool DomainMapper::IsInHeaderFooter() const
+{
+return m_pImpl-IsInHeaderFooter();
+}
+
 } //namespace dmapper
 } //namespace writerfilter
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 73a084a..ebee085 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -192,6 +192,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_sCurrentParaStyleId(),
 m_bInStyleSheetImport( false ),
 m_bInAnyTableImport( false ),
+m_bInHeaderFooterImport( false ),
 m_bLineNumberingSet( false ),
 m_bIsInFootnoteProperties( true ),
 m_bIsCustomFtnMark( false ),
@@ -1268,6 +1269,8 @@ uno::Reference beans::XPropertySet  
DomainMapper_Impl::appendTextSectionAfter(
 
 void DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType)
 {
+m_bInHeaderFooterImport = true;
+
 //get the section context
 PropertyMapPtr pContext = 
DomainMapper_Impl::GetTopContextOfType(CONTEXT_SECTION);
 //ask for the header name of the given type
@@ -1307,6 +1310,8 @@ void 
DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType)
 
 void DomainMapper_Impl::PushPageFooter(SectionPropertyMap::PageType eType)
 {
+m_bInHeaderFooterImport = true;
+
 //get the section context
 PropertyMapPtr pContext = 
DomainMapper_Impl::GetTopContextOfType(CONTEXT_SECTION);
 //ask for the footer name of the given type
@@ -1350,6 +1355,7 @@ void DomainMapper_Impl::PopPageHeaderFooter()
 RemoveLastParagraph( );
 if (!m_aTextAppendStack.empty())
 m_aTextAppendStack.pop();
+m_bInHeaderFooterImport = false;
 }
 
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 3e28f22..2622cb7 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -332,6 +332,7 @@ private:
 OUString m_sCurrentParaStyleId;
 boolm_bInStyleSheetImport; //in import of 
fonts, styles, lists or lfos
 boolm_bInAnyTableImport; //in import of fonts, 
styles, lists or lfos
+boolm_bInHeaderFooterImport;
 
 boolm_bLineNumberingSet;
 boolm_bIsInFootnoteProperties;
@@ -499,6 +500,7 @@ public:
 void PushPageFooter(SectionPropertyMap::PageType eType);
 
 void PopPageHeaderFooter();
+bool IsInHeaderFooter() const { return m_bInHeaderFooterImport; }
 
 void PushFootOrEndnote( bool bIsFootnote );
 void PopFootOrEndnote();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 415fa41..fb0d6fa 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1390,10 +1390,12 @@ uno::Reference text::XTextContent  
GraphicImport::createGraphicObject( const b

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

2012-07-31 Thread Noel Power
 basic/source/runtime/methods.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 02a7dfb729799f9e1437a718951566640d0fde02
Author: Noel Power noel.po...@novell.com
Date:   Tue Jul 31 14:25:29 2012 +0100

tweak for commit 8181dddb7bf166be4a00e9280d52f8d7a1741290 fdo#42492

avoid char buffer and snprintf.

Change-Id: Ia83cfc9333591bcb3b191679ccf2be587b4be243

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 06f319c..c8d8c0f 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -861,14 +861,12 @@ RTLFUNC(Hex)
 StarBASIC::Error( SbERR_BAD_ARGUMENT );
 else
 {
-char aBuffer[17];
 SbxVariableRef pArg = rPar.Get( 1 );
-// converting value to unsigned
+// converting value to unsigned and limit to 2 or 4 byte representation
 sal_uInt32 nVal = pArg-IsInteger() ?
 static_castsal_uInt16(pArg-GetInteger()) :
 static_castsal_uInt32(pArg-GetLong());
-snprintf( aBuffer, sizeof(aBuffer), %SAL_PRIXUINT32, nVal );
-rPar.Get(0)-PutString( rtl::OUString::createFromAscii( aBuffer ) );
+rPar.Get(0)-PutString( rtl::OUString::valueOf( sal_Int64(nVal), 16 ) 
);
 }
 }
 
commit 556720fcdd419820814164ecafbedb6598b5bb20
Author: Uray M. János uray.ja...@gmail.com
Date:   Tue Jul 31 08:04:06 2012 +0200

fdo#42492: fixing Basic HEX command

Change-Id: I133590c9f2a34d8daab031da0c77bd049d275c29

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 3b511b2..06f319c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -861,12 +861,13 @@ RTLFUNC(Hex)
 StarBASIC::Error( SbERR_BAD_ARGUMENT );
 else
 {
-char aBuffer[16];
+char aBuffer[17];
 SbxVariableRef pArg = rPar.Get( 1 );
-if ( pArg-IsInteger() )
-snprintf( aBuffer, sizeof(aBuffer), %X, pArg-GetInteger() );
-else
-snprintf( aBuffer, sizeof(aBuffer), %lX, static_castlong 
unsigned int(pArg-GetLong()) );
+// converting value to unsigned
+sal_uInt32 nVal = pArg-IsInteger() ?
+static_castsal_uInt16(pArg-GetInteger()) :
+static_castsal_uInt32(pArg-GetLong());
+snprintf( aBuffer, sizeof(aBuffer), %SAL_PRIXUINT32, nVal );
 rPar.Get(0)-PutString( rtl::OUString::createFromAscii( aBuffer ) );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [PATCH] fdo#42492: fixing Basic HEX command

2012-07-31 Thread Noel Power
Ok, pushed now and also with a further tweak to avoid sprintf and the 
hardcoded buffersize ( 'cause 17 is too big anyway ) 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=02a7dfb729799f9e1437a718951566640d0fde02


On 31/07/12 12:55, János Uray wrote:
Yes, that is what I was trying to say: length 15 and length 16 were 
both wrong. There were two mistakes: the buffer overflow, and the 
non-compatible types and printf-strings. Fixing the latter one (which 
resulted in 16 characters on 64-bit platforms, where C++ long is 
64-bit) makes the former one (the 15 characters) irrelevant. The patch 
prints at most 4 (integer) or 8 (long) characters.
The integer and long in LibreOffice Basic are described here: 
http://help.libreoffice.org/Basic/Using_Variables#Integer_Variables
Microsoft Visual Basic uses double sizes (4 and 8 bytes): 
http://msdn.microsoft.com/en-US/library/47zceaw7%28v=vs.110%29
be careful with the documentation, there is a trap, VBA ( Visual Basic 
for Applications ) can be different from VB ( Visual Basic ), in this 
case 
http://msdn.microsoft.com/en-us/library/office/aa164754%28v=office.10%29 
you can see the definitions of Long and Integer types are the same as 
Libreoffice basic.


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


[Libreoffice-commits] .: vcl/source

2012-07-31 Thread Noel Power
 vcl/source/window/toolbox.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 4f97b3bcad3c2b138ec5d752f28c8032f34150b5
Author: Ruslan Kabatsayev b7.10110...@gmail.com
Date:   Tue Jul 31 17:07:37 2012 +0400

Revert Enable native background rendering for ToolBox

This reverts commit 0714d191e7273c3b32837834f9a37867b81cb78a.

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index b89d311..7608e5f 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -542,12 +542,6 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const 
Rectangle rRect )
 // execute pending paint requests
 ImplCheckUpdate( pThis );
 
-if ( 
pThis-IsNativeControlSupported(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL) 
-
pThis-DrawNativeControl(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL,rRect,
-CTRL_STATE_ENABLED,ImplControlValue(0),rtl::OUString())
-)
-return;
-
 ImplDockingWindowWrapper *pWrapper = 
ImplGetDockingManager()-GetDockingWindowWrapper( pThis );
 sal_Bool bIsInPopupMode = pThis-ImplIsInPopupMode();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [PATCH] Revert toolbox bg rendering as it creates hard to fix regression

2012-07-31 Thread Noel Power

On 31/07/12 14:11, Ruslan Kabatsayev wrote:

Hello,

This patch reverts my earlier patch which tried to render native
background on ToolBox. It appears that this breaks some themes, and
there's no easy fix for this (at least not simple enough to be worth
the trouble).

Regards,
Ruslan


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


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


Re: [PUSHED][PATCH] Revert toolbox bg rendering as it creates hard to fix regression

2012-07-31 Thread Noel Power

On 31/07/12 14:11, Ruslan Kabatsayev wrote:

Hello,

This patch reverts my earlier patch which tried to render native
background on ToolBox. It appears that this breaks some themes, and
there's no easy fix for this (at least not simple enough to be worth
the trouble).

Regards,
Ruslan


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


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


Re: [PATCH] gtk: listbox border was not rendered

2012-07-31 Thread Ruslan Kabatsayev
Hi,

After some checks I've come to the conclusion that your patch does it
as it should, and the breakage should be fixed in oxygen-gtk. The only
problem remains is when this fix should be done (i.e. there'll be some
time until your patch gets into a released version of LibO, and until
then we should use current oxygen-gtk code). Any pointers on when your
change may be released once pushed?

Regards,
Ruslan

On Sat, Jul 28, 2012 at 4:51 PM, Ivan Timofeev timofeev@gmail.com wrote:
 Hi Ruslan,


 On 28.07.2012 15:08, Ruslan Kabatsayev wrote:

 This mostly looks good, but breaks a bit border for oxygen-gtk


 I have just installed it, yeah - it is broken... :(


 (which somehow has worked before the patch, unlike other themes).


 Strange.


 I'd suggest using getFrameWidth() to adjust the shadow rect.


 AFAICS vcl makes listbox a child of borderwindow, which receives the border
 sizes via DecorationView::DrawFrame:
 http://opengrok.libreoffice.org/xref/core/vcl/source/window/brdwin.cxx#1212
 (for oxygen-gtk it is 2 for each border);

 shrinks the listbox size by that border in Resize():
 http://opengrok.libreoffice.org/xref/core/vcl/source/window/brdwin.cxx#2066

 draws CTRL_LISTBOX PART_WINDOW (i.e. calls gtk_paint_shadow with
 scrolled_window) with its size (i.e. client+borders):
 http://opengrok.libreoffice.org/xref/core/vcl/source/window/brdwin.cxx#1362

 Try to build with my patch and the attached diff applied, IMHO LibO will do
 things right. But probably I missed something (as usual :).


 OTOH, we've done quite some customizations in oxygen-gtk before to
 make it look better with LibO, so maybe this is what should be changed
 on oxygen-gtk side.


 It would be great if you could check it. :)

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


[Libreoffice-commits] .: Branch 'libreoffice-3-5' - basic/source cui/source extensions/source filter/source vcl/source

2012-07-31 Thread Petr Mladek
 basic/source/runtime/runtime.cxx   |6 +++---
 cui/source/tabpages/numpages.cxx   |6 ++
 extensions/source/scanner/sane.cxx |2 +-
 filter/source/graphicfilter/icgm/chart.cxx |2 +-
 vcl/source/gdi/metric.cxx  |2 +-
 vcl/source/gdi/outmap.cxx  |   11 ++-
 6 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit c096d40a4c7bf3231813126d6dc118292e1da506
Author: Michael Stahl m...@openoffice.org
Date:   Tue Jul 31 15:26:19 2012 +0200

basic, cui, extensions, filter, vcl: fix some warnings

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

diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 53f104e..3b70b04 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -711,17 +711,17 @@ sal_Bool SbiRuntime::Step()
 
 SbiOpcode eOp = (SbiOpcode ) ( *pCode++ );
 sal_uInt32 nOp1, nOp2;
-if( eOp = SbOP0_END )
+if (eOp  SbOP0_END)
 {
 (this-*( aStep0[ eOp ] ) )();
 }
-else if( eOp = SbOP1_START  eOp = SbOP1_END )
+else if (eOp = SbOP1_START  eOp  SbOP1_END)
 {
 nOp1 = *pCode++; nOp1 |= *pCode++  8; nOp1 |= *pCode++  16; 
nOp1 |= *pCode++  24;
 
 (this-*( aStep1[ eOp - SbOP1_START ] ) )( nOp1 );
 }
-else if( eOp = SbOP2_START  eOp = SbOP2_END )
+else if (eOp = SbOP2_START  eOp  SbOP2_END)
 {
 nOp1 = *pCode++; nOp1 |= *pCode++  8; nOp1 |= *pCode++  16; 
nOp1 |= *pCode++  24;
 nOp2 = *pCode++; nOp2 |= *pCode++  8; nOp2 |= *pCode++  16; 
nOp2 |= *pCode++  24;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index dd5d346..1b28cbc 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2850,6 +2850,12 @@ void SvxNumPositionTabPage::InitControls()
 nMask = 1;
 
 }
+if (SVX_MAX_NUM = nLvl)
+{
+OSL_ENSURE(false, cannot happen.);
+return;
+}
+
 if(bSameDistBorderNum)
 {
 long nDistBorderNum;
diff --git a/extensions/source/scanner/sane.cxx 
b/extensions/source/scanner/sane.cxx
index a26ff3c..b58d05b 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -985,7 +985,7 @@ String Sane::GetOptionUnitName( int n )
 String aText;
 SANE_Unit nUnit = mppOptions[n]-unit;
 size_t nUnitAsSize = (size_t)nUnit;
-if( nUnitAsSize  SAL_N_ELEMENTS( ppUnits ) )
+if (nUnitAsSize = SAL_N_ELEMENTS( ppUnits ))
 aText = String::CreateFromAscii( [unknown units] );
 else
 aText = String( ppUnits[ nUnit ], osl_getThreadTextEncoding() );
diff --git a/filter/source/graphicfilter/icgm/chart.cxx 
b/filter/source/graphicfilter/icgm/chart.cxx
index 7e34fdf..5eb52ab 100644
--- a/filter/source/graphicfilter/icgm/chart.cxx
+++ b/filter/source/graphicfilter/icgm/chart.cxx
@@ -69,7 +69,6 @@ void CGMChart::DeleteTextEntry( TextEntry* pTextEntry )
 pTAttr = pTAttr-pNextAttribute;
 delete pTempTAttr;
 }
-delete pTextEntry;
 ::std::vector TextEntry* ::iterator it;
 for ( it = maTextEntryList.begin(); it  maTextEntryList.end(); ++it )
 {
@@ -79,6 +78,7 @@ void CGMChart::DeleteTextEntry( TextEntry* pTextEntry )
 break;
 }
 }
+delete pTextEntry;
 }
 };
 
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index d0ad6e9..2709494 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.cxx
@@ -714,7 +714,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, 
CmapResult rResult )
 while( cMin  cEnd )
 {
 int j = 0;
-for(; (cMin  cEnd)  (j  NINSIZE); ++cMin )
+for (; (cMin  cEnd)  (j  (NINSIZE-1)); ++cMin)
 {
 if( cMin = 0x0100 )
 cCharsInp[ j++ ] = static_castsal_Char(cMin  8);
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index 740d5ad..c911c8b 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.cxx
@@ -61,9 +61,10 @@ DBG_NAMEEX( Region )
 
 // ===
 
-static long aImplNumeratorAry[MAP_PIXEL+1] =
+static int const s_ImplArySize = MAP_PIXEL+1;
+static long aImplNumeratorAry[s_ImplArySize] =
 {1,   1,   5,  50,1,   1,  1, 1,  1,1, 1 };
-static long aImplDenominatorAry[MAP_PIXEL+1] =
+static long aImplDenominatorAry[s_ImplArySize] =
  { 2540, 254, 127, 127, 1000, 100, 10, 1, 72, 1440, 1 };
 
 // ---
@@ -1861,9 +1862,9 @@ Region OutputDevice::PixelToLogic( const Region 
rDeviceRegion,
 #define ENTER3( eUnitSource, eUnitDest )\
 long nNumerator  = 1;   

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 5 commits - hunspell/hunspell-1.3.2-overflow.patch hunspell/makefile.mk mythes/makefile.mk mythes/mythes-1.2.0-overflow.patch neon/makefile.mk neon/

2012-07-31 Thread Petr Mladek
 hunspell/hunspell-1.3.2-overflow.patch   |   91 +++
 hunspell/makefile.mk |1 
 mythes/makefile.mk   |1 
 mythes/mythes-1.2.0-overflow.patch   |   24 
 neon/makefile.mk |2 
 neon/neon_ne_set_request_flag.patch  |   11 +++
 redland/raptor/makefile.mk   |1 
 redland/raptor/raptor-1.4.18.patch.fixes |   42 ++
 xpdf/makefile.mk |2 
 xpdf/xpdf-3.02-gfxColorMaxComps.patch|   24 
 10 files changed, 197 insertions(+), 2 deletions(-)

New commits:
commit f2cf95b62a35ba2a9f77edd79537189eace6515b
Author: Michael Stahl m...@openoffice.org
Date:   Tue Jul 31 16:03:31 2012 +0200

xpdf: fix some warnings

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

diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index 85c2a88..079d5fa 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -48,7 +48,7 @@ dummy:
 
 TARFILE_NAME=xpdf-3.02
 TARFILE_MD5=599dc4cc65a07ee868cf92a667a913d2
-PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-ooopwd.patch
+PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-ooopwd.patch 
xpdf-3.02-gfxColorMaxComps.patch
 
 CONFIGURE_DIR=
 BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/xpdf/xpdf-3.02-gfxColorMaxComps.patch 
b/xpdf/xpdf-3.02-gfxColorMaxComps.patch
new file mode 100644
index 000..3f0870b
--- /dev/null
+++ b/xpdf/xpdf-3.02-gfxColorMaxComps.patch
@@ -0,0 +1,24 @@
+--- misc/xpdf-3.02/xpdf/GfxState.cc2007-02-27 23:05:52.0 +0100
 misc/build/xpdf-3.02/xpdf/GfxState.cc  2011-05-18 20:08:45.003807128 
+0200
+@@ -2678,7 +2678,7 @@
+   double x[16], y[16];
+   Guint xi, yi;
+   GfxColorComp c[4][gfxColorMaxComps];
+-  Guint ci[4];
++  Guint ci[gfxColorMaxComps];
+   GfxShadingBitBuf *bitBuf;
+   Object obj1, obj2;
+   int i, j;
+--- misc/xpdf-3.02/xpdf/GfxState.h 2007-02-27 23:05:52.0 +0100
 misc/build/xpdf-3.02/xpdf/GfxState.h   2011-05-18 20:13:26.973936566 
+0200
+@@ -393,8 +393,8 @@
+ 
+   int nComps; // number of color components (1, 3, or 4)
+   GfxColorSpace *alt; // alternate color space
+-  double rangeMin[4]; // min values for each component
+-  double rangeMax[4]; // max values for each component
++  double rangeMin[gfxColorMaxComps];  // min values for each component
++  double rangeMax[gfxColorMaxComps];  // max values for each component
+   Ref iccProfileStream;   // the ICC profile
+ };
+ 
commit 83265ed949d918514d3791791e5d96873c3fd009
Author: Michael Stahl m...@openoffice.org
Date:   Tue Jul 31 16:03:26 2012 +0200

redland: fix some warnings in raptor

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

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index f214191..01453f8 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -57,6 +57,7 @@ OOO_PATCH_FILES= \
 $(TARFILE_NAME).patch.ooo_build \
 $(TARFILE_NAME).patch.dmake \
 $(TARFILE_NAME).patch.win32 \
+$(TARFILE_NAME).patch.fixes \
 $(TARFILE_NAME).patch.rindex \
 raptor-aix.patch \
 $(TARFILE_NAME).entities.patch
diff --git a/redland/raptor/raptor-1.4.18.patch.fixes 
b/redland/raptor/raptor-1.4.18.patch.fixes
new file mode 100644
index 000..7b7c959
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.fixes
@@ -0,0 +1,42 @@
+--- misc/raptor-1.4.18/src/raptor_abbrev.c 2008-06-15 09:34:06.0 
+0200
 misc/build/raptor-1.4.18/src/raptor_abbrev.c   2011-05-18 
18:58:35.440435467 +0200
+@@ -124,6 +124,7 @@
+ case RAPTOR_IDENTIFIER_TYPE_UNKNOWN: 
+ default:
+   RAPTOR_FREE(raptor_abbrev_node, node);
++  node = NULL;
+ }
+ 
+   }
+--- misc/raptor-1.4.18/src/raptor_parse.c  2008-06-15 09:18:50.0 
+0200
 misc/build/raptor-1.4.18/src/raptor_parse.c2011-05-18 
18:58:32.143702301 +0200
+@@ -1870,7 +1870,7 @@
+ ((char*)buffer)[FIRSTN]=c;
+ }
+ 
+-if(i  MAX_PARSERS) {
++if(i = MAX_PARSERS) {
+   raptor_finish();
+   RAPTOR_FATAL2(Number of parsers greater than static buffer size %d\n,
+ MAX_PARSERS);
+--- misc/raptor-1.4.18/src/raptor_rdfxml.c 2008-06-15 10:12:06.0 
+0200
 misc/build/raptor-1.4.18/src/raptor_rdfxml.c   2011-05-18 
18:58:30.031671100 +0200
+@@ -404,7 +404,7 @@
+ static const char *
+ 
raptor_rdfxml_element_content_type_as_string(raptor_rdfxml_element_content_type 
type) 
+ {
+-  if(type  RAPTOR_RDFXML_ELEMENT_CONTENT_TYPE_LAST)
++  if(type = RAPTOR_RDFXML_ELEMENT_CONTENT_TYPE_LAST)
+ return INVALID;
+   return rdf_content_type_info[type].name;
+ }
+--- misc/raptor-1.4.18/src/raptor_serialize_dot.c  2008-06-15 
09:34:29.0 +0200
 misc/build/raptor-1.4.18/src/raptor_serialize_dot.c2011-05-18 
18:58:33.986920218 +0200
+@@ -266,6 +266,7 @@
+   case RAPTOR_IDENTIFIER_TYPE_UNKNOWN: 
+   default:
+ 

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-07-31 Thread anwen




--
View this message in context: 
http://nabble.documentfoundation.org/Solarmutex-Deadlock-when-Closing-Calc-which-contains-functions-with-XVolatileResult-return-values-tp3998056p3998621.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: mingw build broken

2012-07-31 Thread Jan Holesovsky
Hi David,

d.ostrov...@idaia.de píše v Út 31. 07. 2012 v 12:55 +0200:

 thank you for your response.
 Yeah, my wine-* packages were outdated (1.4.*, we could check it in  
 configure). After upgrading winegcc is working again,

Great news :-)

  and after ccache  
 -C
 (@David tnank you for that hint) LO even compiles, but
 
 ... cd /tmp/xfUNKMLKsY_temp.11871; tar -cf - . | gzip   
 /home/david/numpty/workspace/LO-Mingw32/instsetoo_native/wntgcci.pro/LibreOffice_Dev_SDK/archive/install/en-US_inprogress/LibO-Dev-SDK_3.7.0.0.alpha0_Win_x86_install-arc_en-US.tar.gz
   
 ...
 
 where is the expected msi package?
 Or do i have to provide some extra configure parameter for that?

Yes, you need to provide --with-package-format=msi, but still it is not
building the .msi as there is some problem somewhere; Eilidh is chasing
that.

All the best,
Kendy

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


[Libreoffice-commits] .: sc/source

2012-07-31 Thread Daniel Bankston
 sc/source/filter/xml/xmlcelli.cxx |   47 --
 sc/source/filter/xml/xmlcelli.hxx |2 +
 2 files changed, 27 insertions(+), 22 deletions(-)

New commits:
commit cc5b8609490637e3a19761a965af9fdd47310954
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date:   Tue Jul 31 00:26:05 2012 -0500

Import intended blank or error cached formula results instead of 0

There are cases where a formula cell is exported with an office:value of 0 
or
no office:value at all, but the formula cell will have a text:p value which
contains the intended formula result.  If these cases are not taken into
consideration during import, a 0 will be displayed in the cell
instead of the intended special formula result (blanks or errors).
These cases include when a formula result:
 - is blank
 - has a constant error value beginning with # (such as #VALUE! or 
#N/A)
 - has an Err:[###] (where [###] is an error number)

Change-Id: I8068cf1c9809c02513662f2b0a6fb16eb44920e0

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 21c2d14..e09868f 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -188,9 +188,9 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( 
ScXMLImport rImport,
 ::sax::Converter::convertDouble(fValue, sValue);
 bIsEmpty = false;
 
-//if office:value=0, treat like text in case the formula
-//result is Err:###, #N/A, or matrix reference cell 
with
-//blank text result until we confirm otherwise.
+//if office:value=0, let's get the text:p in case this is
+//a special case in HasSpecialCaseFormulaText(). If it
+//turns out not to be a special case, we'll use the 0 
value.
 if(fValue == 0.0)
 bFormulaTextResult = true;
 }
@@ -262,6 +262,11 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( 
ScXMLImport rImport,
 bFormulaTextResult = true;
 if(nCellType == util::NumberFormat::DATETIME)
 nCellType = util::NumberFormat::UNDEFINED;
+//if bIsEmpty is true at this point, then there is no office value.
+//we must get the text:p (even if it is empty) in case this a special
+//case in HasSpecialCaseFormulaText().
+if(bIsEmpty)
+bFormulaTextResult = true;
 }
 rXMLImport.GetStylesImportHelper()-SetAttributes(pStyleName, 
pCurrencySymbol, nCellType);
 }
@@ -748,7 +753,7 @@ void 
ScXMLTableRowCellContext::SetFormulaCell(ScFormulaCell* pFCell) const
 {
 if(pFCell)
 {
-if( bFormulaTextResult  pOUTextValue  !pOUTextValue-isEmpty() )
+if( bFormulaTextResult  pOUTextValue )
 pFCell-SetHybridString( *pOUTextValue );
 else
 pFCell-SetHybridDouble( fValue );
@@ -1109,26 +1114,23 @@ void ScXMLTableRowCellContext::AddFormulaCell( const 
ScAddress rCellPos )
 }
 }
 
-namespace{
-
-bool isSpecialValue(const rtl::OUString rStr, sal_Int16 rnCellType)
+//There are cases where a formula cell is exported with an office:value of 0 or
+//no office:value at all, but the formula cell will have a text:p value which
+//contains the intended formula result.
+//These cases include when a formula result:
+// - is blank
+// - has a constant error value beginning with # (such as #VALUE! or 
#N/A)
+// - has an Err:[###] (where [###] is an error number)
+bool ScXMLTableRowCellContext::HasSpecialCaseFormulaText() const
 {
-if( (rStr.indexOf(Err:)   -1) || (rStr.indexOf(#N/A)  -1) )
-return true;
-//If a matrix formula has a matrix reference cell that is intended to have
-//a blank text result, the matrix reference cell is actually saved(export)
-//as a float cell with 0 as the value and empty text:p/.
-//Import works around this by setting these cells as text cells so that
-//the blank text is used for display instead of the number 0.
-if( rStr.isEmpty() )
-{
-rnCellType = util::NumberFormat::TEXT;
+if(  pOUTextContent 
+ ( pOUTextContent-isEmpty() || (pOUTextContent-indexOf(#)  -1) ||
+   (pOUTextContent-indexOf(Err:)   -1) )
+  )
 return true;
-}
 return false;
 }
 
-}
 
 void ScXMLTableRowCellContext::EndElement()
 {
@@ -1146,10 +1148,11 @@ void ScXMLTableRowCellContext::EndElement()
 }
 }
 
-//if this is a blank matrix formula result, Err:###, or #N/A then
-//use text:p string because of the way export saves these types of cells.
-if( bFormulaTextResult  pOUTextContent  
isSpecialValue(*pOUTextContent, nCellType) )
+if( bFormulaTextResult  HasSpecialCaseFormulaText() )
+{
 pOUTextValue.reset(*pOUTextContent);
+nCellType = util::NumberFormat::TEXT;
+}
 
 ScAddress aCellPos = 

Re: [GSoC 2012][Collaboration] ScDocFunc and Collaboration

2012-07-31 Thread Eike Rathke
Hi Matúš,

On Tuesday, 2012-07-31 15:15:18 +0200, Matúš Kukan wrote:

 I am working on moving sc/source/ui/collab/contacts.* into tubes/
 There will be new Collaboration abstract class in tubes/ and something
 in sc/ should implement it.

Sounds good. Designing this carefully hopefully will enable other LibO
applications to implement it as well.

 First:
 1, Why we have new ScDocFuncSend( *this, new ScDocFuncRecv( new
 ScDocFuncDirect( *this ) ) ); chain ?
 It could be just one class as long as it inherits from ScDocFunc I think.

You want the input (typing side) to send the processed input as command
and the receiver will apply the input to the document. To be able to
call the same methods from the view regardless of whether we have direct
or collaborative input we need ScDocFuncDirect and ScDocFuncSend,
otherwise we'd have to distinguish between direct and collab in each
method.

For the receiver we need ScDocFuncRecv to process the command and send
it as input to ScDocFuncDirect. The functionality of ScDocFuncRecv
theoretically could be implemented anywhere, but deriving it from
ScDocFunc gives access to ScDocShell (currently available as member in
ScDocFuncRecv also, but see abstract base class below), and IMHO
deriving it clarifies the relation between ScDocFunc* classes. Of
course, if you have something more elegant in mind, please feel free to
express yourself :-)

Chaining ScDocFuncRecv into ScDocFuncSend in real collab mode is only
needed for ScDocFuncSend::SetCollaboration() so could be passed there
instead, but in dev/demo mode it is also needed in
ScDocFuncSend::SendMessage() to emulate the broadcast, having it always
as member IMHO is fine.

 Also ScDocFuncDirect is just ScDocFunc with own costructor, not sure what for.

Ideally we'll have ScDocFunc as an abstract base class later, do not
construct the derived classes with an extra ScDocShell and have
ScDocFuncDirect implement the then abstract methods for which
implementation currently still lives at ScDocFunc. Just ignore that
little indirection for now.


 2,
 For class ScCollaboration : Collaboration there are two possibilities I think.
 a, We will use just one ScDocFunc and make it work when (not)collaborating.
 Then we can use ScCollaboration directly wiith this ScDocFunc but it
 would complicate it a little more.

I'd prefer if we kept the current design there (well, it's more just
a sketch now)

 b, We continue to use more versions of ScDocFunc depending on whether
 we collaborate.
 But then, I think, we need to use ScCollaboration with ScDocShell, so
 it has access to it's ScDocFunc and can change it.

Replacing the actual ScDocFunc* at ScDocShell shouldn't be a problem
I think.

 I am not sure what's more ideal.. b, is probably more similar to the
 current state but it's messing also with ScDocShell.

I wouldn't call that messing ;)  it just switches functionality.

 a, could be nicer because there would be only one ScDocFunc but that
 may not be best.

I actually see no benefit in having one ScDocFunc, why do you think it
would be nicer?

  Eike

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


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


Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-07-31 Thread anwen
Stephan, thank you for your kind and response. There is not a crash when I
closed the spreadsheet window and the processes still hung. I used explorer
process to create a mini dump file and a full dump file. Then I analyzed the
dump files at WinDBG. There are more than two threads, and I posted the back
trace of two problem related threads at the end of my response.
blpapi3_32.dll is a 3rd party API for providing streaming data.
BLPAPIAddIn_uno is my code for a spreadsheet extension.

Thanks,
Wendi

--Main thread
.  0  Id: 1244.1504 Suspend: 0 Teb: 7ffdf000 Unfrozen
ChildEBP RetAddr  Args to Child  
00e3edfc 7c90df5a 7c8025db 03e4  ntdll!KiFastSystemCallRet
00e3ee00 7c8025db 03e4   ntdll!ZwWaitForSingleObject+0xc
00e3ee64 7c802542 03e4  
kernel32!WaitForSingleObjectEx+0xa8
00e3ee78 08297b2e 03e4  083d5c58
kernel32!WaitForSingleObject+0x12
WARNING: Stack unwind information not available. Following frames may be
wrong.
00e3ee94 0829978f 083d5c58 0dd4cc18 0dd4cba8
blpapi3_32!blpapi_Name_destroy+0x7919e
00e3eea8 081bda85 0dd4cc18 eea6ed9c 7c91137a
blpapi3_32!blpapi_Name_destroy+0x7adff
00e3eed8 7c911460 7c9113e1 7c9113f2 7c91137a
blpapi3_32!blpapi_SubscriptionItr_create+0x1115
00e3ef14 081c0690 083d8318 081c4533 0dd4cba8 ntdll!RtlpFreeDebugInfo+0x6a
00e3ef1c 081c4533 0dd4cba8 08378b5c eea6ec14
blpapi3_32!blpapi_SubscriptionItr_create+0x3d20
00e3ef44 7854f33b 0011 00e3ef8c 78550051
blpapi3_32!blpapi_SubscriptionItr_create+0x7bc3
00e3ef50 78550051 785b73c8 78550048 3993af06 msvcr90!_unlock_file+0x2d
00e3ef58 78550048 3993af06 07ce3d38 0803dc08 msvcr90!fflush+0x51
00e3ef8c 082ea803 0008 0829831e 0d5223f8 msvcr90!fflush+0x48
00e3efc0 07f69c88 0803dc08 07f7fa1c 0001
blpapi3_32!blpapi_Name_destroy+0xcbe73
00e3efc8 07f7fa1c 0001 eebe5446 07fb9490
BLPAPIAddIn_uno!BloombergLP::blpapi::Session::`scalar deleting
destructor'+0x8
00e3eff8 07f72404 eebe4b9a 00e3f8e0 07ce3ce0
BLPAPIAddIn_uno!blp_mktdata::~blp_mktdata+0x6c
[y:\src\extension\src\blp\blp_mktdata.cpp @ 289]
00e3f024 07f76708 02c2b450 00352dc2 0001
BLPAPIAddIn_uno!com::telemetry::sheet::BLPAPIAddIn_Impl::~BLPAPIAddIn_Impl+0x124
[y:\src\extension\src\blp_addin.cpp @ 154]
00e3f02c 00352dc2 0001 0102742f 07ce3ce0
BLPAPIAddIn_uno!com::telemetry::sheet::BLPAPIAddIn_Impl::`scalar deleting
destructor'+0x8
00e3f044 0b571ba1 07ce3ce0 00e3f05c 01026306
cppuhelper3MSC!cppu::OWeakObject::release+0x42
[c:\git\libo\cppuhelper\source\weak.cxx @ 213]
00e3f050 01026306 07ce3cf8 00e3f08c 01026288
sclo!com::sun::star::uno::cpp_release+0x11
[c:\git\libo\solver\wntmsci12.pro\inc\com\sun\star\uno\genfunc.hxx @ 54]
00e3f05c 01026288 07ce3cf8 0b571b90 000e cppu3!cppu::_release+0x16
[c:\git\libo\cppu\source\uno\prim.hxx @ 103]
00e3f08c 01026580 079cc7c0 0b571b90 00e3f0b0 cppu3!cppu::_destructAny+0x2e8
[c:\git\libo\cppu\source\uno\destr.hxx @ 183]
00e3f09c 0b571d15 079cc7c0 0b571b90 079cc7c0 cppu3!uno_any_destruct+0x10
[c:\git\libo\cppu\source\uno\any.cxx @ 140]
00e3f0b0 0b738667 5e2bd32f 079cc7f0 079cc7a8
sclo!com::sun::star::uno::Any::~Any+0x15
[c:\git\libo\solver\wntmsci12.pro\inc\com\sun\star\uno\any.hxx @ 99]
00e3f0d8 0b73913f 079cc7a8 00e3f12c 0b7390b2
sclo!ScUnoAddInFuncData::~ScUnoAddInFuncData+0x87
[c:\git\libo\sc\source\core\tool\addincol.cxx @ 116]
00e3f0e4 0b7390b2 0001 079cc6b8 0794e318
sclo!ScUnoAddInFuncData::`scalar deleting destructor'+0xf
00e3f12c 0b738faf 079b3f90 00e3f144 0b6e23ef
sclo!ScUnoAddInCollection::Clear+0xf2
[c:\git\libo\sc\source\core\tool\addincol.cxx @ 278]
00e3f138 0b6e23ef 079b3f90 00e3f284 0b6e1d15
sclo!ScUnoAddInCollection::~ScUnoAddInCollection+0xf
[c:\git\libo\sc\source\core\tool\addincol.cxx @ 268]
00e3f144 0b6e1d15 0001 00e3f224 7c91084c
sclo!ScUnoAddInCollection::`scalar deleting destructor'+0xf
00e3f284 0b9a6d77 5e2bd13f 0790af58 0790af08 sclo!ScGlobal::Clear+0x105
[c:\git\libo\sc\source\core\data\global.cxx @ 653]
00e3f2c8 0b9a6b8f 0790e838 00e3f304 017ae1fd sclo!ScModule::~ScModule+0x147
[c:\git\libo\sc\source\ui\app\scmod.cxx @ 208]
00e3f2d4 017ae1fd 0001 078981f4 00e3f340 sclo!ScModule::`scalar deleting
destructor'+0xf
00e3f304 01756c51 3b7bfc0c  00e3f35c
sfxlo!SfxModule::DestroyModules_Impl+0x6d
[c:\git\libo\sfx2\source\appl\module.cxx @ 338]
00e3f354 017511ad 078981f0 00e3f3d8 01768a76
sfxlo!SfxApplication::~SfxApplication+0xb1
[c:\git\libo\sfx2\source\appl\app.cxx @ 352]
00e3f360 01768a76 0001 3b7bfc80 00e3f37c sfxlo!SfxApplication::`vector
deleting destructor'+0x4d
00e3f3d8 0931dc70 07263e08 00e3f46c b7214404
sfxlo!SfxTerminateListener_Impl::notifyTermination+0x296
[c:\git\libo\sfx2\source\appl\appinit.cxx @ 140]
00e3f490 09280fdb 07251044 b721447c 07251044
fwklo!framework::Desktop::terminate+0x520
[c:\git\libo\framework\source\services\desktop.cxx @ 424]
00e3f4e8 09280332 b72146a4 00e3f8e0 02c2b450
fwklo!framework::CloseDispatcher::implts_terminateApplication+0x10b

Re: [PATCH] gtk: listbox border was not rendered

2012-07-31 Thread Ivan Timofeev

Hi Ruslan

On 31.07.2012 17:56, Ruslan Kabatsayev wrote:

After some checks I've come to the conclusion that your patch does it
as it should, and the breakage should be fixed in oxygen-gtk. The only
problem remains is when this fix should be done (i.e. there'll be some
time until your patch gets into a released version of LibO, and until
then we should use current oxygen-gtk code). Any pointers on when your
change may be released once pushed?


The next major release will be published in the beginning of Feb 2013:
http://wiki.documentfoundation.org/ReleasePlan#3.7_release

Thanks for sorting this out! :)

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


Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-07-31 Thread anwen
Eike, thank you for your kind response.  I just now submitted a bug report
with the same title. I attached a text file which is the analyzed result of
a full dump file. If you are assigned this bug and would like to check out
the full/mini dump files, or need more information, please feel free to let
me know.

BTW, in my previous post, you can see part of the analyzed result.

Thanks,
Wendi


Eike Rathke-2 wrote
 
 Hi anwen,
 
 On Friday, 2012-07-27 08:43:25 -0700, anwen wrote:
 
 The deadlock scenario is that the spreadsheet called the functions many
 times and was showing dynamical financial data. Then I closed the
 spreadsheet window. The window quit immediately, but the soffice.bin and
 soffice.exe were still in task manager. I had to kill these processes
 manually. From the log file, I saw that main thread hung at destruction
 process, trying to close the second thread, and the second thread hang at
 ReferenceXResultLisenter - modified(), trying to update the
 spreadsheet.
 
 This sounds like the actual culprit. The result listener should not try
 to update if the document is in destruction. Actually the listeners are
 detroyed during document close, but it seems this is a race condition
 and a modified() is fired in between. If it detected that situation it
 wouldn't need to lock SolarMutex but could bail out early instead.
 
 Could you please submit a bug for this and assign it to me?
 
 Thanks
   Eike
 
 -- 
 LibreOffice Calc developer. Number formatter stricken i18n
 transpositionizer.
 GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD
 
 ___
 LibreOffice mailing list
 LibreOffice@.freedesktop
 http://lists.freedesktop.org/mailman/listinfo/libreoffice
 




--
View this message in context: 
http://nabble.documentfoundation.org/Solarmutex-Deadlock-when-Closing-Calc-which-contains-functions-with-XVolatileResult-return-values-tp3998056p3998635.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-07-31 Thread anwen
Eike, I agree with you that the listeners are destroyed during document
close. I observed it in my log file. However, the worker thread is running
asynchronously if not calling the listeners' modified function. How can it
know that the document is closed, stop calling the modified function, and
quit itself gracefully. So in the first post, I asked if there is a signal
which announces that the document is closed.

Please correct me if there is something wrong with my thought.

Best,
Wendi


Eike Rathke-2 wrote
 
 Hi anwen,
 
 On Friday, 2012-07-27 08:43:25 -0700, anwen wrote:
 
 The deadlock scenario is that the spreadsheet called the functions many
 times and was showing dynamical financial data. Then I closed the
 spreadsheet window. The window quit immediately, but the soffice.bin and
 soffice.exe were still in task manager. I had to kill these processes
 manually. From the log file, I saw that main thread hung at destruction
 process, trying to close the second thread, and the second thread hang at
 ReferenceXResultLisenter - modified(), trying to update the
 spreadsheet.
 
 This sounds like the actual culprit. The result listener should not try
 to update if the document is in destruction. Actually the listeners are
 detroyed during document close, but it seems this is a race condition
 and a modified() is fired in between. If it detected that situation it
 wouldn't need to lock SolarMutex but could bail out early instead.
 
 Could you please submit a bug for this and assign it to me?
 
 Thanks
   Eike
 
 -- 
 LibreOffice Calc developer. Number formatter stricken i18n
 transpositionizer.
 GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD
 
 ___
 LibreOffice mailing list
 LibreOffice@.freedesktop
 http://lists.freedesktop.org/mailman/listinfo/libreoffice
 




--
View this message in context: 
http://nabble.documentfoundation.org/Solarmutex-Deadlock-when-Closing-Calc-which-contains-functions-with-XVolatileResult-return-values-tp3998056p3998638.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Change in core[master]: fdo#50269: bitmap area fill pattern reversed in LO3.5.x

2012-07-31 Thread Noel Power

On 31/07/12 15:10, Takeshi Abe wrote:

Hi Noel,

Thank you for your review.

On Tue, 31 Jul 2012 12:16:17 +, Gerrit ger...@gerrit.libreoffice.org 
wrote:

 From Noel Power noel.po...@suse.com:

Noel Power has posted comments on this change.

Change subject: fdo#50269: bitmap area fill pattern reversed in LO3.5.x
..


Patch Set 1:

the document attached to associated bug 
https://issues.apache.org/ooo/show_bug.cgi?id=71731 ( to do with the partially 
reverted commit ) looks quite different with the patch applied.

Hmm, I am wondering if you noticed that the chart is parameterised by numbers
generated with RAND()

/face slap

yup, I feel stupid, after testing both scenarios seem good

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


[PUSHED] fdo#50269: bitmap area fill pattern reversed in LO3.5.x

2012-07-31 Thread Gerrit
From Noel Power noel.po...@suse.com:

Noel Power has submitted this change and it was merged.

Change subject: fdo#50269: bitmap area fill pattern reversed in LO3.5.x
..


fdo#50269: bitmap area fill pattern reversed in LO3.5.x

this partially reverted 619ea0c6d3b8fb4390bf5e82f1b44608c3cd878d
in order to retain a hack for non-black background color

Change-Id: I89d89cedb5e27e2a05b1ecc13569e4899d1743d2
---
M filter/source/msfilter/msdffimp.cxx
1 file changed, 11 insertions(+), 2 deletions(-)

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/318
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I89d89cedb5e27e2a05b1ecc13569e4899d1743d2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Takeshi Abe t...@fixedpoint.jp
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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


[Libreoffice-commits] .: 3 commits - Makefile.top sfx2/source svl/inc svl/source tools/inc

2012-07-31 Thread Caolán McNamara
 Makefile.top  |3 ++
 sfx2/source/appl/lnkbase2.cxx |6 ++--
 svl/inc/svl/svdde.hxx |8 -
 svl/source/svdde/ddesvr.cxx   |   24 
 tools/inc/tools/list.hxx  |   61 --
 5 files changed, 21 insertions(+), 81 deletions(-)

New commits:
commit e1544be5759bfbaf93d8a4dd66a950a8736e58e5
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jul 31 14:46:02 2012 +0100

remove DECLARE_LIST

Change-Id: Ic74476797edbb08ed6721ea9a7d23b0dd042b4ce

diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 8bc6704..a2b7410 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -606,8 +606,9 @@ static DdeTopic* FindTopic( const String  rLinkName, 
sal_uInt16* pItemStt )
 String sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) );
 
 DdeServices rSvc = DdeService::GetServices();
-for( DdeService* pService = rSvc.First(); pService;
-pService = rSvc.Next() )
+for (DdeServices::iterator aI = rSvc.begin(); aI != rSvc.end(); ++aI)
+{
+DdeService* pService = *aI;
 if( pService-GetName() == sService )
 {
 // then we search for the Topic
@@ -631,6 +632,7 @@ static DdeTopic* FindTopic( const String  rLinkName, 
sal_uInt16* pItemStt )
 }
 break;
 }
+}
 return 0;
 }
 
diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index e393b36..0895a81 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -23,7 +23,6 @@
 #include svl/svldllapi.h
 #include sot/exchange.hxx
 #include tools/string.hxx
-#include tools/list.hxx
 #include tools/link.hxx
 #include vector
 
@@ -45,12 +44,7 @@ struct DdeImp;
 class DdeItemImp;
 struct Conversation;
 
-#ifndef _SVDDE_NOLISTS
-DECLARE_LIST( DdeServices, DdeService* )
-#else
-typedef List DdeServices;
-#endif
-
+typedef ::std::vector DdeService*  DdeServices;
 typedef ::std::vector long  DdeFormats;
 typedef ::std::vector Conversation*  ConvList;
 
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index d713191..dadba45 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -461,7 +461,7 @@ DdeService::DdeService( const String rService )
 pConv = new ConvList;
 
 if ( pInst-pServicesSvr )
-pInst-pServicesSvr-Insert( this );
+pInst-pServicesSvr-push_back( this );
 
 pName = new DdeString( pInst-hDdeInstSvr, rService );
 if ( nStatus == DMLERR_NO_ERROR )
@@ -486,7 +486,7 @@ DdeService::~DdeService()
 DdeInstData* pInst = ImpGetInstData();
 DBG_ASSERT(pInst,SVDDE:No instance data);
 if ( pInst-pServicesSvr )
-pInst-pServicesSvr-Remove( this );
+pInst-pServicesSvr-erase(std::remove(pInst-pServicesSvr-begin(), 
pInst-pServicesSvr-end(), this), pInst-pServicesSvr-end());
 
 // MT: Im Auftrage des Herrn (AM) auskommentiert...
 // Grund:
diff --git a/tools/inc/tools/list.hxx b/tools/inc/tools/list.hxx
index 63d4ff6..d7a4e0e 100644
--- a/tools/inc/tools/list.hxx
+++ b/tools/inc/tools/list.hxx
@@ -63,67 +63,6 @@ public:
 { return Container::operator !=( rList ); }
 };
 
-// 
-// - DECLARE_LIST -
-// 
-
-#define DECLARE_LIST( ClassName, Type ) \
-class ClassName : private List  \
-{   \
-public: \
-using List::Clear;  \
-using List::Count;  \
-using List::GetCurPos;  \
-\
-ClassName( sal_uInt16 _nInitSize = 16,  \
-   sal_uInt16 _nReSize = 16 ) : \
-List( _nInitSize, _nReSize ) {} \
-ClassName( sal_uInt16 _nBlockSize, sal_uInt16 _nInitSize,  
 \
-   sal_uInt16 _nReSize ) :  \
-List( _nBlockSize, _nInitSize, _nReSize ) {}\
-ClassName( const ClassName rClassName ) :  \
-List( rClassName ) {}   \
-\
-voidInsert( Type p, sal_uIntPtr nIndex )  \
-{ List::Insert( (void*)p, nIndex ); }   \
-voidInsert( Type p )\
-{ List::Insert( (void*)p ); }   \
-TypeRemove()

[Libreoffice-commits] .: binfilter/inc

2012-07-31 Thread Caolán McNamara
 binfilter/inc/bf_svtools/svdde.hxx |   61 +
 1 file changed, 61 insertions(+)

New commits:
commit e0be9e6691269d305ceedc7f1d4955a7976e3dc6
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jul 31 15:10:34 2012 +0100

move DECLARE_LIST into binfilter

Change-Id: I524579858012f1a62e1caf45726abc0d39985f4b

diff --git a/binfilter/inc/bf_svtools/svdde.hxx 
b/binfilter/inc/bf_svtools/svdde.hxx
index dbac563..9b9fe52 100644
--- a/binfilter/inc/bf_svtools/svdde.hxx
+++ b/binfilter/inc/bf_svtools/svdde.hxx
@@ -29,6 +29,67 @@
 #include tools/list.hxx
 #include tools/link.hxx
 
+// 
+// - DECLARE_LIST -
+// 
+
+#define DECLARE_LIST( ClassName, Type )  \
+class ClassName : private List   \
+{\
+public:  \
+using List::Clear;   \
+using List::Count;   \
+using List::GetCurPos;   \
+ \
+ClassName( sal_uInt16 _nInitSize = 16,   \
+   sal_uInt16 _nReSize = 16 ) :  \
+List( _nInitSize, _nReSize ) {}  \
+ClassName( sal_uInt16 _nBlockSize, sal_uInt16 _nInitSize,\
+   sal_uInt16 _nReSize ) :   \
+List( _nBlockSize, _nInitSize, _nReSize ) {} \
+ClassName( const ClassName rClassName ) :   \
+List( rClassName ) {}\
+ \
+voidInsert( Type p, sal_uIntPtr nIndex ) \
+{ List::Insert( (void*)p, nIndex ); }\
+voidInsert( Type p ) \
+{ List::Insert( (void*)p ); }\
+TypeRemove() \
+{ return (Type)List::Remove(); } \
+TypeRemove( sal_uIntPtr nIndex ) \
+{ return (Type)List::Remove( nIndex ); } \
+TypeRemove( Type p ) \
+{ return (Type)List::Remove( (void*)p ); }   \
+TypeReplace( Type p, sal_uIntPtr nIndex )\
+{ return (Type)List::Replace( (void*)p, nIndex ); }  \
+TypeReplace( Type pNew, Type pOld )  \
+{ return (Type)List::Replace( (void*)pNew,   \
+  (void*)pOld ); }   \
+ \
+TypeGetCurObject() const \
+{ return (Type)List::GetCurObject(); }   \
+TypeGetObject( sal_uIntPtr nIndex ) const\
+{ return (Type)List::GetObject( nIndex ); }  \
+sal_uIntPtr   GetPos( const Type p ) const   \
+{ return List::GetPos( (const void*)p ); }   \
+ \
+TypeSeek( sal_uIntPtr nIndex )   \
+{ return (Type)List::Seek( nIndex ); }   \
+TypeSeek( void* p ) { return (Type)List::Seek( p ); }\
+TypeFirst() { return (Type)List::First(); }  \
+TypeLast()  { return (Type)List::Last(); }   \
+TypeNext()  { return (Type)List::Next(); }   \
+TypePrev()  { return (Type)List::Prev(); }   \
+ \
+ClassName  operator =( const ClassName rClassName )\
+{ List::operator =( rClassName ); return *this; }\
+ \
+sal_Booloperator ==( const ClassName rList ) const  \
+{ return List::operator ==( rList ); }   \
+sal_Booloperator !=( const ClassName rList ) const  \
+{ return List::operator !=( rList ); }   \
+};
+
 namespace binfilter
 {
 
___
Libreoffice-commits mailing list

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-07-31 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

Rainer Bielefeld libreoff...@bielefeldundbuss.de changed:

   What|Removed |Added

 Depends on||53012

--- Comment #64 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 
2012-07-31 16:14:31 UTC ---
Add Bug 53012 - FILEOPEN .csv will CRASH if fixed width is preselected,
might affect many users.

-- 
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-commits] .: Branch 'feature/gsoc_test_improvements3' - sw/qa

2012-07-31 Thread Artur Dorda
 sw/qa/extras/inc/bordertest.hxx  |  190 +++
 sw/qa/extras/ooxmltok/data/borders_ooo33.odt |binary
 sw/qa/extras/ooxmltok/ooxmltok.cxx   |9 +
 3 files changed, 199 insertions(+)

New commits:
commit f3bcc791323bef379f5576e48959d1eb81f7a014
Author: Artur Dorda artur.dorda+l...@gmail.com
Date:   Tue Jul 31 18:21:25 2012 +0200

Added new border test in Writer, checks all the borders, not only the top 
one

Change-Id: Ibbbd5043e89104de4b91425b4972920e8c51cdca

diff --git a/sw/qa/extras/inc/bordertest.hxx b/sw/qa/extras/inc/bordertest.hxx
index 3ac7c6e..030fcc7 100644
--- a/sw/qa/extras/inc/bordertest.hxx
+++ b/sw/qa/extras/inc/bordertest.hxx
@@ -38,6 +38,9 @@ using rtl::OUString;
 typedef std::maprtl::OUString, com::sun::star::table::BorderLine 
BorderLineMap;
 typedef std::pairrtl::OUString, com::sun::star::table::BorderLine 
StringBorderPair;
 
+typedef std::maprtl::OUString, com::sun::star::uno::Sequence 
com::sun::star::table::BorderLine  AllBordersMap;
+typedef std::pairrtl::OUString, com::sun::star::uno::Sequence 
com::sun::star::table::BorderLine  StringSequencePair;
+
 using namespace com::sun::star;
 
 class BorderTest
@@ -184,5 +187,192 @@ public:
 } while(xParaEnum-hasMoreElements());
 }
 
+void testOdtBorders(uno::Referencelang::XComponent mxComponent)
+{
+AllBordersMap map;
+uno::Sequence table::BorderLine  tempSequence(4);
+
+tempSequence[0] = table::BorderLine(0, 2, 2, 35);   // left
+tempSequence[1] = table::BorderLine(0, 2, 2, 35);   // right
+tempSequence[2] = table::BorderLine(0, 2, 2, 35);   // top
+tempSequence[3] = table::BorderLine(0, 2, 2, 35);   // bottom
+map.insert(StringSequencePair(OUString(B2), tempSequence));
+tempSequence[0] = table::BorderLine(0, 0, 2, 0);
+tempSequence[1] = table::BorderLine(0, 0, 2, 0);
+tempSequence[2] = table::BorderLine(0, 0, 2, 0);
+tempSequence[3] = table::BorderLine(0, 0, 2, 0);
+map.insert(StringSequencePair(OUString(D2), tempSequence));
+tempSequence[0] = table::BorderLine(0, 2, 2, 88);
+tempSequence[1] = table::BorderLine(0, 2, 2, 88);
+tempSequence[2] = table::BorderLine(0, 2, 2, 88);
+tempSequence[3] = table::BorderLine(0, 2, 2, 88);
+map.insert(StringSequencePair(OUString(B4), tempSequence));
+tempSequence[0] = table::BorderLine(0, 0, 18, 0);
+tempSequence[1] = table::BorderLine(0, 0, 18, 0);
+tempSequence[2] = table::BorderLine(0, 0, 18, 0);
+tempSequence[3] = table::BorderLine(0, 0, 18, 0);
+map.insert(StringSequencePair(OUString(D4), tempSequence));
+tempSequence[0] = table::BorderLine(0, 35, 35, 35);
+tempSequence[1] = table::BorderLine(0, 35, 35, 35);
+tempSequence[2] = table::BorderLine(0, 35, 35, 35);
+tempSequence[3] = table::BorderLine(0, 35, 35, 35);
+map.insert(StringSequencePair(OUString(B6), tempSequence));
+tempSequence[0] = table::BorderLine(0, 0, 35, 0);
+tempSequence[1] = table::BorderLine(0, 0, 35, 0);
+tempSequence[2] = table::BorderLine(0, 0, 35, 0);
+tempSequence[3] = table::BorderLine(0, 0, 35, 0);
+map.insert(StringSequencePair(OUString(D6), tempSequence));
+tempSequence[0] = table::BorderLine(0, 88, 88, 88);
+tempSequence[1] = table::BorderLine(0, 88, 88, 88);
+tempSequence[2] = table::BorderLine(0, 88, 88, 88);
+tempSequence[3] = table::BorderLine(0, 88, 88, 88);
+map.insert(StringSequencePair(OUString(B8), tempSequence));
+tempSequence[0] = table::BorderLine(0, 0, 88, 0);
+tempSequence[1] = table::BorderLine(0, 0, 88, 0);
+tempSequence[2] = table::BorderLine(0, 0, 88, 0);
+tempSequence[3] = table::BorderLine(0, 0, 88, 0);
+map.insert(StringSequencePair(OUString(D8), tempSequence));
+tempSequence[0] = table::BorderLine(0, 2, 35, 88);
+tempSequence[1] = table::BorderLine(0, 2, 35, 88);
+tempSequence[2] = table::BorderLine(0, 2, 35, 88);
+tempSequence[3] = table::BorderLine(0, 2, 35, 88);
+map.insert(StringSequencePair(OUString(B10), tempSequence));
+tempSequence[0] = table::BorderLine(0, 0, 141, 0);
+tempSequence[1] = table::BorderLine(0, 0, 141, 0);
+tempSequence[2] = table::BorderLine(0, 0, 141, 0);
+tempSequence[3] = table::BorderLine(0, 0, 141, 0);
+map.insert(StringSequencePair(OUString(D10), tempSequence));
+tempSequence[0] = table::BorderLine(0, 2, 88, 88);
+tempSequence[1] = table::BorderLine(0, 2, 88, 88);
+tempSequence[2] = table::BorderLine(0, 2, 88, 88);
+tempSequence[3] = table::BorderLine(0, 2, 88, 88);
+map.insert(StringSequencePair(OUString(B12), tempSequence));
+tempSequence[0] = table::BorderLine(0, 0, 176, 0);
+tempSequence[1] = table::BorderLine(0, 0, 176, 0);
+ 

[PUSHED] fix concat-deps

2012-07-31 Thread Gerrit
From Björn Michaelsen bjoern.michael...@canonical.com:

Björn Michaelsen has submitted this change and it was merged.

Change subject: fix concat-deps
..


fix concat-deps

* make concat-deps use absolute paths whereever possible
* collapse /../ _after_ making the path absolute otherwise it will break for
  relative paths starting with ../
* substitude SRCDIR variable, so trees can be moved
* this fixes subsequentcheck as it does run gbuild from a different work
  directory in a few non-tail_build modules, which are then complaining about
  missing/unresolvable deps
* this should fix troubles from module rebuild as relative paths were different
  between tail_build and the module dir

Change-Id: I5a25e1f55bdc2b475df2af04b711fd808d95cdaf
---
M solenv/bin/concat-deps.c
1 file changed, 86 insertions(+), 23 deletions(-)

Approvals:
  Björn Michaelsen: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/351
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a25e1f55bdc2b475df2af04b711fd808d95cdaf
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com

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


[PUSHED] add ./logerrit resubmit

2012-07-31 Thread Gerrit
From Björn Michaelsen bjoern.michael...@canonical.com:

Björn Michaelsen has submitted this change and it was merged.

Change subject: add ./logerrit resubmit
..


add ./logerrit resubmit

resubmit creates a new Change-Id for the current change and thus allow to submit
changes for review on release branches that were already reviewed on master.

Also hint advanced users to 'git review' which requires some more setup, but
should make things easier for regular users.

Getting this functionality into 'git review' would be likely help adoption too
-- and in python there is some sane errorchecking possible.

Change-Id: Ibea6bbfe747af160728b838c6ee236fd8f89671d
---
M logerrit
1 file changed, 37 insertions(+), 22 deletions(-)

Approvals:
  Björn Michaelsen: Verified
  Norbert Thiebaud: Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/343
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibea6bbfe747af160728b838c6ee236fd8f89671d
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com

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


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

2012-07-31 Thread Bjoern Michaelsen
 logerrit |   59 -
 solenv/bin/concat-deps.c |  107 +--
 2 files changed, 122 insertions(+), 44 deletions(-)

New commits:
commit 4e15809a78ea3c6062e20e439cf8df3d06cd8569
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Jul 25 01:13:53 2012 +0200

add ./logerrit resubmit

resubmit creates a new Change-Id for the current change and thus allow to 
submit
changes for review on release branches that were already reviewed on master.

Also hint advanced users to 'git review' which requires some more setup, but
should make things easier for regular users.

Getting this functionality into 'git review' would be likely help adoption 
too
-- and in python there is some sane errorchecking possible.

Change-Id: Ibea6bbfe747af160728b838c6ee236fd8f89671d

diff --git a/logerrit b/logerrit
index 05346d9..6585db1 100755
--- a/logerrit
+++ b/logerrit
@@ -31,20 +31,43 @@ ask_tristate() {
 
 }
 
+submit() {
+   BRANCH=$1
+   if test -z $BRANCH
+   then
+   BRANCH=`git symbolic-ref HEAD 2 /dev/null`
+   BRANCH=${BRANCH##refs/heads/}
+   if test -z $BRANCH
+   then
+   echo no branch specified, and could not guess 
the current branch
+   exit 1
+   fi
+   echo no branch specified, guessing current branch 
$BRANCH
+   fi
+   git push $GERRITURL HEAD:refs/for/$BRANCH
+}
+
 case $1 in
help)
echo Usage: ./logerrit subcommand [options]
+   echo simple and basic tool to interact with LibreOffice gerrit
echo subcommands:
-   echo  test test your gerrit setup
-   echo  submit [BRANCH]  submit your change for 
review to a branch
-   echo  nextchange [BRANCH]   reset branch to the 
remote to start with the next change
-   echo  checkout CHANGEIDcheckout the changes 
for review
-   echo  pull CHANGEIDpull (and merge) the 
changes on current branch
-   echo  cherry-pick CHANGEID cherry-pick the change 
on current branch
-   echo  patch CHANGEID   show the change as a 
patch
-   echo  review [CHANGEID]interactively review a 
change (current one if no changeid given)
-   echo  query    query for changes for 
review on project core
+   echo  testtest your gerrit 
setup
+   echo  --- for submitters:
+   echo  submit [BRANCH] submit your change 
for review
+   echo  resubmit [BRANCH]   create a new 
Change-Id and submit your change for review
+   echo  (yes, this modifies 
your last commit)
+   echo  nextchange [BRANCH] reset branch to the 
remote to start with the next change
+   echo  --- for reviewers:
+   echo  checkout CHANGEID   checkout the changes 
for review
+   echo  pull CHANGEID   pull (and merge) the 
changes on current branch
+   echo  cherry-pick CHANGEIDcherry-pick the 
change on current branch
+   echo  patch CHANGEID  show the change as a 
patch
+   echo  review [CHANGEID]   interactively review 
a change (current one if no changeid given)
+   echo  query   query for changes 
for review on project core
echo  any other gerrit command
+   echo advanced users should consider using git review instead:
+   echo http://wiki.documentfoundation.org/Development/GitReview;
exit
;;
test)
@@ -58,20 +81,12 @@ case $1 in
fi
;;
submit)
-   BRANCH=$2
-   if test -z $BRANCH
-   then
-   BRANCH=`git symbolic-ref HEAD 2 /dev/null`
-   BRANCH=${BRANCH##refs/heads/}
-   if test -z $BRANCH
-   then
-   echo no branch specified, and could not guess 
the current branch
-   exit 1
-   fi
-   echo no branch specified, guessing current branch 
$BRANCH
-   fi
-   git push $GERRITURL HEAD:refs/for/$BRANCH
+submit $2
;;
+resubmit)
+git log -1 --pretty=%B | grep -v ^Change-Id: | git commit --amend -F -
+  

[Libreoffice-commits] .: editeng/qa editeng/source

2012-07-31 Thread Tomaž Vajngerl
 editeng/qa/lookuptree/lookuptree_test.cxx |   12 ++--
 editeng/source/lookuptree/LatinLookupTree.cxx |2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 3752a5fab427e210033903b498717bcc3ba38edf
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Tue Jul 31 19:00:07 2012 +0200

Invalidate current position in LookupTree at remove action.

Change-Id: I7a32e8d7c21c1e87e1acab9020f9ecbb7e441f2c

diff --git a/editeng/qa/lookuptree/lookuptree_test.cxx 
b/editeng/qa/lookuptree/lookuptree_test.cxx
index 9ca8bdc..5cfd578 100644
--- a/editeng/qa/lookuptree/lookuptree_test.cxx
+++ b/editeng/qa/lookuptree/lookuptree_test.cxx
@@ -117,21 +117,21 @@ void LookupTreeTest::test()
 a-advance( 'z' );
 CPPUNIT_ASSERT ( a-suggestAutoCompletion().isEmpty() );
 
-a-gotoNode( vorschlag13 );
+/*a-gotoNode( vorschlag13 );
 CPPUNIT_ASSERT ( a-suggestAutoCompletion().isEmpty() );
 
 a-advance( 'g' );
 a-advance( '1' );
 a-advance( '3' );
 a-remove( vorschlag13 );
-CPPUNIT_ASSERT_EQUAL( OUString(), a-suggestAutoCompletion() );
+CPPUNIT_ASSERT_EQUAL( OUString(), a-suggestAutoCompletion() );*/
 
 a-insert( VeraHatMichL1eb., 100 );
 a-returnToRoot();
 CPPUNIT_ASSERT_EQUAL( OUString(VeraHatMichL1eb.), 
a-suggestAutoCompletion() );
 
-a-gotoNode( VeraHatMich );
 a-remove( VeraHatMichL1eb. );
+a-gotoNode( VeraHatMich );
 CPPUNIT_ASSERT_EQUAL( OUString(), a-suggestAutoCompletion() );
 
 a-returnToRoot();
@@ -146,8 +146,8 @@ void LookupTreeTest::test()
 a-returnToRoot();
 CPPUNIT_ASSERT_EQUAL( OUString(VeraHatMichL1eb.), 
a-suggestAutoCompletion() );
 
-a-gotoNode( VeraHatMich );
 a-remove( VeraHatMichL1eb. );
+a-gotoNode( VeraHatMich );
 CPPUNIT_ASSERT ( a-suggestAutoCompletion().isEmpty() );
 
 a-advance( 'L' );
@@ -155,8 +155,8 @@ void LookupTreeTest::test()
 
 a-insert( VeraHatMichL1eb., 100 );
 a-returnToRoot();
-a-gotoNode( VeraHatMich );
 a-remove( VeraHatMichL1eb. );
+a-gotoNode( VeraHatMich );
 CPPUNIT_ASSERT ( a-suggestAutoCompletion().isEmpty() );
 
 a-goBack();
@@ -164,8 +164,8 @@ void LookupTreeTest::test()
 
 a-insert( VeraHatMichL1eb., 100 );
 a-returnToRoot();
-a-gotoNode( VeraHatMich );
 a-remove( VeraHatMichL1eb. );
+a-gotoNode( VeraHatMich );
 CPPUNIT_ASSERT ( a-suggestAutoCompletion().isEmpty() );
 
 a-goBack();
diff --git a/editeng/source/lookuptree/LatinLookupTree.cxx 
b/editeng/source/lookuptree/LatinLookupTree.cxx
index 5d78724..0762044 100644
--- a/editeng/source/lookuptree/LatinLookupTree.cxx
+++ b/editeng/source/lookuptree/LatinLookupTree.cxx
@@ -104,6 +104,8 @@ void LatinLookupTree::insert(const int nProbability)
 
 void LatinLookupTree::remove(OUString sKey)
 {
+returnToRoot();
+
 if ( !sKey.isEmpty() )
 {
 removeKey( sKey );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [GSoC 2012][Collaboration] ScDocFunc and Collaboration

2012-07-31 Thread Matúš Kukan
Hi Eike,

On 31 July 2012 16:54, Eike Rathke er...@redhat.com wrote:

 On Tuesday, 2012-07-31 15:15:18 +0200, Matúš Kukan wrote:

 There will be new Collaboration abstract class in tubes/ and something
 in sc/ should implement it.

 Sounds good. Designing this carefully hopefully will enable other LibO
 applications to implement it as well.

:-)

 You want the input (typing side) to send the processed input as command
 and the receiver will apply the input to the document. To be able to
 call the same methods from the view regardless of whether we have direct
 or collaborative input we need ScDocFuncDirect and ScDocFuncSend,
 otherwise we'd have to distinguish between direct and collab in each
 method.

Right, it would be about adding one 'if' into each method.

 For the receiver we need ScDocFuncRecv to process the command and send
 it as input to ScDocFuncDirect. The functionality of ScDocFuncRecv
 theoretically could be implemented anywhere, but deriving it from
 ScDocFunc gives access to ScDocShell (currently available as member in
 ScDocFuncRecv also, but see abstract base class below), and IMHO
 deriving it clarifies the relation between ScDocFunc* classes.

But currently ScDocFuncRecv is not deriving from anything and there is
just ~one method,
which is possible to move into ScDocFuncSend.
See attached diff as illustration for what I have in mind.

 Chaining ScDocFuncRecv into ScDocFuncSend in real collab mode is only
 needed for ScDocFuncSend::SetCollaboration() so could be passed there
 instead, but in dev/demo mode it is also needed in
 ScDocFuncSend::SendMessage() to emulate the broadcast, having it always
 as member IMHO is fine.

I was ignoring demo mode for now, I believe it can be solved later.

 Also ScDocFuncDirect is just ScDocFunc with own costructor, not sure what 
 for.

 Ideally we'll have ScDocFunc as an abstract base class later, do not
 construct the derived classes with an extra ScDocShell and have
 ScDocFuncDirect implement the then abstract methods for which
 implementation currently still lives at ScDocFunc. Just ignore that
 little indirection for now.

Sorry if that's obvious but I don't understand why ScDocFunc should be abstract.
I've never understood the comment in sendfunc.cxx:
// FIXME: really ScDocFunc should be an abstract base, so
// we don't need the rDocSh hack/pointer
ScDocFuncSend::ScDocFuncSend( ScDocShell rDocSh, ScDocFuncRecv *pDirect )
: ScDocFunc( rDocSh ),

How does that depend on whether ScDocFunc is abstract ( that means it
has at least one pure virtual method I guess ? ) or not ?

 2,
 For class ScCollaboration : Collaboration there are two possibilities I 
 think.
 a, We will use just one ScDocFunc and make it work when (not)collaborating.
 Then we can use ScCollaboration directly wiith this ScDocFunc but it
 would complicate it a little more.

 I'd prefer if we kept the current design there (well, it's more just
 a sketch now)

sounds fine

 I am not sure what's more ideal.. b, is probably more similar to the
 current state but it's messing also with ScDocShell.

 I wouldn't call that messing ;)  it just switches functionality.

sure :-)

 a, could be nicer because there would be only one ScDocFunc but that
 may not be best.

 I actually see no benefit in having one ScDocFunc, why do you think it
 would be nicer?

Hmm, because there would be only one but that may be also (ideo)logically bad.
Depends where you want to distinguish between collaboration modes,
what ScDocFunc means ...

Thanks,
Matus


ScDocFuncRecv.diff
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [PATCH] fdo#42492: fixing Basic HEX command

2012-07-31 Thread János Uray
I also like to avoid C-style string handling, but valueOf() doesn't support
unsigned integers (it should support all C++ integer types), and converting
to sal_Int64 didn't come into my mind.
Why did you extend the comment: // converting value to unsigned *and limit
to 2 or 4 byte representation*? GetInteger() and GetLong() return
sal_Int16 and sal_Int32, respectively, so the static_casts only convert
them to unsigned.

Uray M. János

On Tue, Jul 31, 2012 at 3:38 PM, Noel Power nopo...@suse.com wrote:

 Ok, pushed now and also with a further tweak to avoid sprintf and the
 hardcoded buffersize ( 'cause 17 is too big anyway )
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=02a7dfb729799f9e1437a718951566640d0fde02
 l

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


Re: Triaging Event?

2012-07-31 Thread Joel Madero
I was wondering if anyone is interested in trying to do a triaging
extravaganza in the next month or so. The main goal would be to get the
unconfirmed bugs in the proper status (New, NeedInfo, Resolved) and set
priority. Whiteboard status would be a plus but a secondary triaging event
could do this. Currently there are 1,452 unconfirmed bugs, if we could
get 5-10 people to commit and get on IRC for a few hours in the next few
weeks I think we could get through a lot of them.

Triaging Event Date Poll:

New Doodle poll:
http://doodle.com/**kzmzfr86pwk59ihuhttp://doodle.com/kzmzfr86pwk59ihu


Thanks to Florian for setting this up :)

Joel

P.S. After that particular week I become more open on weekends, the Sunday,
September 9th works for me as well. Weekdays 9-11 PST (GMT - 7) is hard for
me as I'm at work, after 4PM (11PM GMT) works for me but I know that's
difficult for a lot of people in Europe. I'll try to be flexible
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Open Issues

2012-07-31 Thread Rainer Bielefeld

Joel Madero schrieb:


Do we have an ongoing list of open issues that we keep track of ...


Hi,

I doubt that such a list can be useful. My concern: lots of people start 
lots of comments someone should 


I use Reminderfox what reminds me to check bugs where I have been 
involved and where other people's contribution was required (Needinfo 
...), and I think that proceeding is reliable in much more than 90%.


Only my personal point of view, of course!

Can you lease always leave a suggestion on what public list (like 
libreoffice...@lists.freedesktop.org discussion should be continued. 
Multi-lists-discussions are really painful.


I recommend to continue discussion on libreoffice...@lists.freedesktop.org

Bet regards

Rainer

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


[Libreoffice-commits] .: 3 commits - sfx2/inc sfx2/source

2012-07-31 Thread Rafael Dominguez
 sfx2/inc/sfx2/templateonlineview.hxx   |9 ++-
 sfx2/inc/templatedlg.hxx   |4 +
 sfx2/source/control/templateonlineview.cxx |   48 +++---
 sfx2/source/control/thumbnailview.cxx  |3 +
 sfx2/source/doc/templatedlg.cxx|   76 -
 sfx2/source/doc/templatedlg.hrc|   10 +++
 sfx2/source/doc/templatedlg.src|   20 ---
 7 files changed, 128 insertions(+), 42 deletions(-)

New commits:
commit 953a08b2dea5e07efb487b4d9bfccce5960193fc
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Tue Jul 31 12:31:24 2012 -0430

After closing a remote repository overlay display local view.

Change-Id: Ic7a2274b36719eeb979218b3dd54f19488f114dc

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 4947aa5..765f664 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -324,7 +324,11 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, CloseOverlayHdl)
 mpTemplateBar-Hide();
 mpViewBar-Show();
 
-mpCurView-showOverlay(false);
+if (mpCurView == maView)
+mpCurView-showOverlay(false);
+else
+switchMainView(true);
+
 return 0;
 }
 
commit bff778a8d8bf9b634408db3dfdf0270d58ebb1c4
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Mon Jul 30 20:37:49 2012 -0430

Display repository list in a popup menu instead of a thumbnail view.

Change-Id: Ib8205631a3c49b3ef4a942fa32a4b08ad9d4cb23

diff --git a/sfx2/inc/sfx2/templateonlineview.hxx 
b/sfx2/inc/sfx2/templateonlineview.hxx
index 245da5f..d60e048 100644
--- a/sfx2/inc/sfx2/templateonlineview.hxx
+++ b/sfx2/inc/sfx2/templateonlineview.hxx
@@ -14,6 +14,8 @@
 
 #include com/sun/star/ucb/XCommandEnvironment.hpp
 
+class TemplateOnlineViewItem;
+
 class TemplateOnlineView : public TemplateAbstractView
 {
 public:
@@ -29,18 +31,21 @@ public:
 
 virtual void showOverlay (bool bVisible);
 
+bool loadRepository (const sal_uInt16 nRepositoryId);
+
+const std::vectorTemplateOnlineViewItem* getRepositories () const { 
return maRepositories; }
+
 void setItemDimensions (long ItemWidth, long ThumbnailHeight, long 
DisplayHeight, int itemPadding);
 
 private:
 
 virtual void Resize ();
 
-virtual void OnItemDblClicked (ThumbnailViewItem *pItem);
-
 private:
 
 com::sun::star::uno::Sequence rtl::OUString  maUrls;
 com::sun::star::uno::Sequence rtl::OUString  maNames;
+std::vectorTemplateOnlineViewItem* maRepositories;
 com::sun::star::uno::Reference com::sun::star::ucb::XCommandEnvironment  
m_xCmdEnv;
 };
 
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 406fcb5..e22fe8c 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -64,6 +64,7 @@ private:
 
 DECL_LINK(MenuSelectHdl, Menu*);
 DECL_LINK(MoveMenuSelectHdl, Menu*);
+DECL_LINK(RepositoryMenuSelectHdl, Menu*);
 
 DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*);
 
@@ -78,6 +79,8 @@ private:
 
 void centerTopButtons ();
 
+void createRepositoryMenu ();
+
 // Exchange view between local/online view.
 void switchMainView (bool bDisplayLocal);
 
@@ -119,6 +122,7 @@ private:
 TemplateOnlineView *mpOnlineView;
 PopupMenu *mpCreateMenu;
 PopupMenu *mpActionMenu;
+PopupMenu *mpRepositoryMenu;
 
 int mnSelectionCount;
 std::setconst ThumbnailViewItem* maSelTemplates;
diff --git a/sfx2/source/control/templateonlineview.cxx 
b/sfx2/source/control/templateonlineview.cxx
index 822145c..f33d0bd 100644
--- a/sfx2/source/control/templateonlineview.cxx
+++ b/sfx2/source/control/templateonlineview.cxx
@@ -66,6 +66,8 @@ TemplateOnlineView::TemplateOnlineView (Window *pParent, 
WinBits nWinStyle, bool
 
 TemplateOnlineView::~TemplateOnlineView ()
 {
+for (size_t i = 0, n = maRepositories.size(); i  n; ++i)
+delete maRepositories[i];
 }
 
 void TemplateOnlineView::Populate()
@@ -84,13 +86,8 @@ void TemplateOnlineView::Populate()
 pItem-maTitle = maNames[i];
 pItem-setURL(maUrls[i]);
 
-mItemList.push_back(pItem);
+maRepositories.push_back(pItem);
 }
-
-CalculateItemPositions();
-
-if (IsReallyVisible()  IsUpdateMode())
-Invalidate();
 }
 
 void TemplateOnlineView::filterTemplatesByApp(const FILTER_APPLICATION eApp)
@@ -113,20 +110,22 @@ void TemplateOnlineView::showOverlay (bool bVisible)
 }
 }
 
-void TemplateOnlineView::setItemDimensions(long ItemWidth, long 
ThumbnailHeight, long DisplayHeight, int itemPadding)
+bool TemplateOnlineView::loadRepository (const sal_uInt16 nRepositoryId)
 {
-
ThumbnailView::setItemDimensions(ItemWidth,ThumbnailHeight,DisplayHeight,itemPadding);
+TemplateOnlineViewItem *pItem = NULL;
 
-
mpItemView-setItemDimensions(ItemWidth,ThumbnailHeight,DisplayHeight,itemPadding);
-}
+for (size_t i = 0, n = maRepositories.size(); i  n; ++i)
+{
+if (maRepositories[i]-mnId == nRepositoryId)
+

LibreOffice Conference: Call for Papers ends in about two weeks

2012-07-31 Thread Andreas Mantke
Hi all,

the LibreOffice conference will take place this October in Berlin.
You'll all available information about the conference on our special
conference site: http://conference.libreoffice.org.

The call for papers started at the end of June and will close in about
two weeks, at the 15th August, 11.59 pm. If you have a topic you want to
speak about please log-in to the conference website and submit your
paper. We have a short explanation about the process to get your paper
onto the website: http://conference.libreoffice.org/support-information.


Topics for the conference this year are:

  * Open Document Format (ODF) Track
  * Interoperability
  * LibreOffice - Development and the future: Technology, API, Extensions
  * Community-Track: Localization, Documentation, etc.
  * Best Practice and Migration:Certification and Support

Hint: It's posible to create a first draft and edit your work later (and
submit it for review to the program commitee once it is finished, but in
time before the CfP closed) ;-)

We are looking for your papers!

Regards,
Andreas

-- 
## Developer LibreOffice
## Freie Office-Suite für Linux, Mac, Windows
## http://LibreOffice.org
## Support the Document Foundation (http://documentfoundation.org)
## Meine Seite: http://www.amantke.de 

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


[Libreoffice-commits] .: 13 commits - o3tl/inc o3tl/qa sc/workben svl/Library_svl.mk svl/Package_inc.mk svl/inc svl/source svx/source sw/inc sw/source

2012-07-31 Thread Michael Stahl
 o3tl/inc/o3tl/sorted_vector.hxx|   86 ++-
 o3tl/qa/test-sorted_vector.cxx |  114 
 sc/workben/result.hxx  |1 
 svl/Library_svl.mk |1 
 svl/Package_inc.mk |1 
 svl/inc/svl/svarray.hxx|  202 -
 svl/source/memtools/svarray.cxx|   97 -
 svx/source/inc/fmshimp.hxx |1 
 sw/inc/docary.hxx  |5 
 sw/inc/flypos.hxx  |2 
 sw/inc/ndhints.hxx |   34 --
 sw/source/core/doc/docfld.cxx  |   22 +---
 sw/source/core/doc/docsort.cxx |   43 ---
 sw/source/core/text/redlnitr.cxx   |   12 +-
 sw/source/core/text/redlnitr.hxx   |2 
 sw/source/core/txtnode/ndhints.cxx |  143 +++---
 sw/source/filter/html/htmlfly.hxx  |7 +
 sw/source/ui/utlui/content.cxx |4 
 18 files changed, 290 insertions(+), 487 deletions(-)

New commits:
commit 28a48f2aab4aa32ce8a7d46b8b5e6f26b732afd3
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jul 31 20:18:22 2012 +0200

svarray.hxx: 'e's pining for the fjords...

Change-Id: I3eeb257092a76744482ebd2d0eccaa29ead8a644

diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 41f91b5..768f2db 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -105,7 +105,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
 svl/source/items/szitem \
 svl/source/items/visitem \
 svl/source/items/whiter \
-svl/source/memtools/svarray \
 svl/source/misc/PasswordHelper \
 svl/source/misc/adrparse \
 svl/source/misc/documentlockfile \
diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
index 2cb3544..ae63792 100644
--- a/svl/Package_inc.mk
+++ b/svl/Package_inc.mk
@@ -98,7 +98,6 @@ $(eval $(call 
gb_Package_add_file,svl_inc,inc/svl/strmadpt.hxx,svl/strmadpt.hxx)
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hrc,svl/style.hrc))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hxx,svl/style.hxx))
 $(eval $(call 
gb_Package_add_file,svl_inc,inc/svl/stylepool.hxx,svl/stylepool.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svarray.hxx,svl/svarray.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svdde.hxx,svl/svdde.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svl.hrc,svl/svl.hrc))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldllapi.h,svl/svldllapi.h))
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
deleted file mode 100644
index 23e702b..000
--- a/svl/inc/svl/svarray.hxx
+++ /dev/null
@@ -1,202 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SVARRAY_HXX
-#define _SVARRAY_HXX
-
-/***
-*
-*   Hier folgt die Beschreibung fuer die exportierten Makros:
-*
-*   SV_DECL_PTRARR_SORT(nm, AE, IS, GS)
-*   SV_IMPL_OP_PTRARR_SORT( nm,AE )
-*   defieniere/implementiere ein Sort-Array mit Pointern, das nach
-*   Objecten sortiert ist. Basiert auf einem PTRARR.
-*   Sortierung mit Hilfe der Object-operatoren  und ==
-*
-***/
-
-#include svl/svldllapi.h
-
-#include limits.h // USHRT_MAX
-#include osl/diagnose.h
-#include rtl/alloc.h
-#include tools/solar.h
-
-typedef void* VoidPtr;
-class SVL_DLLPUBLIC SvPtrarr
-{
-protected:
-VoidPtr*pData;
-sal_uInt16 nFree;
-sal_uInt16 nA;
-
-void _resize(size_t n);
-
-public:
-SvPtrarr( sal_uInt16= 0 );
-~SvPtrarr() { rtl_freeMemory( pData ); }
-
-VoidPtr operator[](sal_uInt16 nP) const { return *(pData+nP); }
-
-void Insert( const SvPtrarr * pI, sal_uInt16 nP,
- sal_uInt16 nS = 0, sal_uInt16 nE = USHRT_MAX );
-
-VoidPtr GetObject(sal_uInt16 nP) const { return (*this)[nP]; }
-
-void Insert( const VoidPtr aE, sal_uInt16 nP );
-void Insert( const VoidPtr *pE, sal_uInt16 nL, sal_uInt16 nP );
-void Remove( sal_uInt16 nP, sal_uInt16 nL = 1 );
-sal_uInt16 Count() const { return nA; }
-const 

[Libreoffice-commits] .: vcl/aqua

2012-07-31 Thread Tor Lillqvist
 vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx |6 ++
 vcl/aqua/source/gdi/atsui/salgdi.cxx|6 ++
 2 files changed, 12 insertions(+)

New commits:
commit 16ae7484b03149345751b7804cbc9ce3180565ec
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Jul 31 22:10:19 2012 +0300

Add declaration of the very deprecated FMGetATSFontRefFromFont

Change-Id: I6a1b0ee2e7e012080774d29ea6ea5db5e9229d82

diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx 
b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index c56ac0d..346fd6b 100644
--- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -201,6 +201,12 @@ static void UpdateAttributesFromPSName( const String 
rPSName, ImplDevFontAttrib
 
 // ---
 
+#if MACOSX_SDK_VERSION = 1070
+extern C {
+extern ATSFontRef FMGetATSFontRefFromFont(FMFont iFont);
+}
+#endif
+
 static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes 
rDFA )
 {
 // all ATSU fonts are device fonts that can be directly rotated
diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx 
b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index 18fe982..cd68245 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -128,6 +128,12 @@ inline FourCharCode GetTag(const char aTagName[5])
 static unsigned GetUShort( const unsigned char* p ){return((p[0]8)+p[1]);}
 static unsigned GetUInt( const unsigned char* p ) { 
return((p[0]24)+(p[1]16)+(p[2]8)+p[3]);}
 
+#if MACOSX_SDK_VERSION = 1070
+extern C {
+extern ATSFontRef FMGetATSFontRefFromFont(FMFont iFont);
+}
+#endif
+
 const ImplFontCharMap* ImplMacFontData::GetImplFontCharMap() const
 {
 // return the cached charmap
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH]fdo#52636:VIEWING: unintuitive Heading for 'Enable experimental Features

2012-07-31 Thread Joel Madero
Feel free to comment. Thanks

Joel


0001-fdo-52636-Added-Sectional-Line-and-Header-for-Experi.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] .: filter/source

2012-07-31 Thread Noel Power
 filter/source/msfilter/msdffimp.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 134028c6160de7d2c05f0ff67d71cbdb4bff4737
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Mon Jul 16 09:28:37 2012 +0900

fdo#50269: bitmap area fill pattern reversed in LO3.5.x

this partially reverted 619ea0c6d3b8fb4390bf5e82f1b44608c3cd878d
in order to retain a hack for non-black background color

Change-Id: I89d89cedb5e27e2a05b1ecc13569e4899d1743d2

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index cd44fd9..c3c4139 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1723,8 +1723,17 @@ void DffPropertyReader::ApplyFillAttributes( SvStream 
rIn, SfxItemSet rSet, co
 aXOBitmap.Bitmap2Array();
 aXOBitmap.SetBitmapType( XBITMAP_8X8 );
 aXOBitmap.SetPixelSize( aBmp.GetSizePixel() );
-   aXOBitmap.SetPixelColor( aCol1 );
-   aXOBitmap.SetBackgroundColor( aCol2 );
+
+if( aXOBitmap.GetBackgroundColor() == COL_BLACK )
+{
+aXOBitmap.SetPixelColor( aCol1 );
+aXOBitmap.SetBackgroundColor( aCol2 );
+}
+else
+{
+aXOBitmap.SetPixelColor( aCol2 );
+aXOBitmap.SetBackgroundColor( aCol1 );
+}
aXOBitmap.Array2Bitmap();
 }
 rSet.Put( XFillBitmapItem( rtl::OUString(), aXOBitmap 
) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [PATCH] fdo#42492: fixing Basic HEX command

2012-07-31 Thread Noel Power

On 31/07/12 18:16, János Uray wrote:
Why did you extend the comment: // converting value to unsigned /and 
limit to 2 or 4 byte representation/? GetInteger() and GetLong() 
return sal_Int16 and sal_Int32, respectively, so the static_casts only 
convert them to unsigned.
it's just the way I think about it :-) the basic language numerical 
representation is a 2 byte or 4byte format, that with the fact the value 
in basic types is one big huge union :-) If the comment disturbs you or 
makes things more unclear then feel free to get rid of it ( to be honest 
I don't even recall typing it :-) )


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


[Libreoffice-commits] .: 2 commits - svl/inc sw/source

2012-07-31 Thread Michael Stahl
 svl/inc/svl/svdde.hxx  |2 +-
 sw/source/core/txtnode/ndhints.cxx |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 68303dee45ff6c81f5eb396df9c6805b7874cdd7
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jul 31 22:01:45 2012 +0200

DdeServices has forward declarations so can't be typedef'd

Change-Id: I1455d380cbb8b096255a0d3cb402ff0dc4d35996

diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index 0895a81..825e899 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -44,7 +44,7 @@ struct DdeImp;
 class DdeItemImp;
 struct Conversation;
 
-typedef ::std::vector DdeService*  DdeServices;
+class DdeServices : public ::std::vector DdeService*  {};
 typedef ::std::vector long  DdeFormats;
 typedef ::std::vector Conversation*  ConvList;
 
commit 0f618909d348f6ff26a34367b0d57b21c1b85a01
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jul 31 21:55:51 2012 +0200

SwpHintsArray::DeleteAtPos: Apple GCC unused variable warning

Change-Id: Idc56569da52554a5478fc23548b8d3395648a2bf

diff --git a/sw/source/core/txtnode/ndhints.cxx 
b/sw/source/core/txtnode/ndhints.cxx
index 29efd9f..af2a032 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -148,6 +148,7 @@ void SwpHintsArray::DeleteAtPos( const sal_uInt16 nPos )
 
 bool const done = m_HintEnds.erase(pHt);
 assert(done);
+(void) done; // unused in NDEBUG
 }
 
 sal_uInt16 SwpHintsArray::GetPos( const SwTxtAttr *pHt ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: svl/source

2012-07-31 Thread Fridrich Strba
 svl/source/svdde/ddesvr.cxx |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 8df3fbe5249c3f4a1ea3d5586b5c073d5a756fb0
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jul 31 22:30:34 2012 +0200

Fix mingw build of svl

Change-Id: I9992dba75903fea3d31be73de69e49f439df3a41

diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index dadba45..25cc3cf 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -82,8 +82,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
 DdeQueryString( pInst-hDdeInstSvr, hText1, chTopicBuf,
 sizeof(chTopicBuf)/sizeof(TCHAR), 
CP_WINUNICODE );
 
-for( pService = rAll.First();pService;pService = rAll.Next() )
+for (DdeServices::iterator aI = rAll.begin(); aI != rAll.end(); 
++aI)
 {
+pService = *aI;
 if ( !hText2 || ( *pService-pName == hText2 ) )
 {
 String sTopics( pService-Topics() );
@@ -113,8 +114,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
 return (HDDEDATA)NULL;
 
 HSZPAIR* q = pPairs;
-for( pService = rAll.First(); pService; pService = rAll.Next() )
+for (DdeServices::iterator aI = rAll.begin(); aI != rAll.end(); 
++aI)
 {
+pService = *aI;
 if ( !hText2 || (*pService-pName == hText2 ) )
 {
 String sTopics( pService-Topics() );
@@ -177,8 +179,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
 return (HDDEDATA)NULL;
 }
 
-for ( pService = rAll.First(); pService; pService = rAll.Next() )
+for (DdeServices::iterator aI = rAll.begin(); aI != rAll.end(); ++aI)
 {
+pService = *aI;
 for ( size_t i = 0, n = pService-pConv-size(); i  n; ++i )
 {
 pC = (*pService-pConv)[ i ];
@@ -365,8 +368,9 @@ DdeService* DdeInternal::FindService( HSZ hService )
 {
 DdeService*  s;
 DdeServices rSvc = DdeService::GetServices();
-for ( s = rSvc.First(); s; s = rSvc.Next() )
+for (DdeServices::iterator aI = rSvc.begin(); aI != rSvc.end(); ++aI)
 {
+s = *aI;
 if ( *s-pName == hService )
 return s;
 }
@@ -1033,7 +1037,7 @@ String DdeService::Formats()
 {
 TCHAR buf[128];
 GetClipboardFormatName( (UINT)f, buf, sizeof(buf) / 
sizeof(TCHAR) );
-s += rtl::OUString(buf);
+s += rtl::OUString(reinterpret_castsal_Unicode*(buf));
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[GSOC-UPDATE](31.07) Impress Remote

2012-07-31 Thread Andrzej J. R. Hunt

Hi everyone,

Today I was still working on the notes export:
- Finally found which code is used to export XHTML
- Eventually discovered that I should be using the UI name to load the 
specific filter I needed, rather than trying to get an instance of an 
XMLFilterAdapter as I had previously been attempting to do.


I still haven't managed to get the export to work, but am now in the 
process of adapting working code to export a notes page rather than a 
document. (I also now know quite a bit more about how saving and export 
of documents to various formats works for the various parts of lo...)


Cheers,

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


Re: [PUSHED] Re: [PATCH] Final stretch of converting SV_DECL_PTRARR to STL containers stage 3/3

2012-07-31 Thread Noel Grandin
On Tue, Jul 31, 2012 at 10:38 PM, Michael Stahl mst...@redhat.com wrote:


 so with the subsequent removal of svarray.hxx (yay!) there are still
 obsolete containers left in tools/inc/tools/{contnr,list,unqidx}.hxx if
 you feel bored  :)

Thanks for working through those patches.
I've already started on the DECLARE_CONTAINER ones :-)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Open Issues

2012-07-31 Thread Bjoern Michaelsen
Hi,

On Tue, Jul 31, 2012 at 09:09:27AM -0700, Joel Madero wrote:
 Do we have an ongoing list of open issues that we keep track of and up to
 date? 

Yes, its called bugzilla. ;)

 If not it might be a good idea to get one going. I think that there
 are at least 3-4 things in the past couple months that have had serious
 conversations but a decision was never made to finalize things. The most
 notable that I remember is the CTL discussion that we had over the course
 of a couple weeks. Quite a few users are requesting us to make a final
 decision on that and it's kind of just in limbo.

What purpose shall this (third) database/list of issues (after bugzilla
tracking _all_ bugs and the MAB metabug boiling down to those that we really
shouldnt miss out)?

Best,

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


[PATCH] fdo#43135 - fix for MULTINOMIAL only supporting parameters u...

2012-07-31 Thread Gerrit
From Albert Thuswaldner albert.thuswald...@gmail.com:

Albert Thuswaldner has uploaded a new change for review.

Change subject: fdo#43135 - fix for MULTINOMIAL only supporting parameters up 
to 170
..

fdo#43135 - fix for MULTINOMIAL only supporting parameters up to 170

Change-Id: I9366de24414fa10e292e42df08a9658d90e5c1c1
---
M scaddins/source/analysis/analysis.cxx
M scaddins/source/analysis/analysishelper.cxx
M scaddins/source/analysis/analysishelper.hxx
3 files changed, 19 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/353/1
--
To view, visit https://gerrit.libreoffice.org/353
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9366de24414fa10e292e42df08a9658d90e5c1c1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Albert Thuswaldner albert.thuswald...@gmail.com

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


[Libreoffice-commits] .: basctl/source

2012-07-31 Thread Takeshi Abe
 basctl/source/accessibility/accessibledialogwindow.cxx |6 +++---
 basctl/source/basicide/baside3.cxx |6 +++---
 basctl/source/basicide/moduldl2.cxx|   16 
 basctl/source/basicide/moduldlg.cxx|6 +++---
 basctl/source/dlged/dlgedfunc.cxx  |6 +++---
 basctl/source/dlged/dlgedobj.cxx   |8 
 basctl/source/dlged/propbrw.cxx|4 ++--
 basctl/source/inc/accessibledialogwindow.hxx   |2 +-
 basctl/source/inc/baside3.hxx  |2 +-
 basctl/source/inc/dlgedfunc.hxx|2 +-
 basctl/source/inc/dlgedobj.hxx |4 ++--
 basctl/source/inc/propbrw.hxx  |2 +-
 12 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 088915c36ba207591a3d97e94bcf1a395bfa69ed
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Wed Aug 1 10:05:20 2012 +0900

sal_Bool - bool

Change-Id: I82157e89d04eda35525c5a540504e6a8d18bc86c

diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx 
b/basctl/source/accessibility/accessibledialogwindow.cxx
index 7a45247..987dbc8 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -214,9 +214,9 @@ void AccessibleDialogWindow::UpdateBounds()
 
 // 
-
 
-sal_Bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor rDesc )
+bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor rDesc )
 {
-sal_Bool bVisible = sal_False;
+bool bVisible = false;
 
 if ( m_pDialogWindow )
 {
@@ -250,7 +250,7 @@ sal_Bool AccessibleDialogWindow::IsChildVisible( const 
ChildDescriptor rDesc )
 // check, if the shape's bounding box intersects with 
the bounding box of its parent
 Rectangle aParentRect( Point( 0, 0 ), 
m_pDialogWindow-GetSizePixel() );
 if ( aParentRect.IsOver( aRect ) )
-bVisible = sal_True;
+bVisible = true;
 }
 }
 }
diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index cad5d8c..fd6e2f7 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -661,16 +661,16 @@ Reference container::XNameContainer  
DialogWindow::GetDialog() const
 return pEditor-GetDialog();
 }
 
-sal_Bool DialogWindow::RenameDialog( const ::rtl::OUString rNewName )
+bool DialogWindow::RenameDialog( const ::rtl::OUString rNewName )
 {
 if ( !BasicIDE::RenameDialog( this, GetDocument(), GetLibName(), 
GetName(), rNewName ) )
-return sal_False;
+return false;
 
 SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
 if ( pBindings )
 pBindings-Invalidate( SID_DOC_MODIFIED );
 
-return sal_True;
+return true;
 }
 
 void DialogWindow::DisableBrowser()
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 6c9aacd..d68603e 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -906,7 +906,7 @@ void LibPage::InsertLib()
 InfoBox( this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE) ).Execute();
 else
 {
-sal_Bool bChanges = sal_False;
+bool bChanges = false;
 ::rtl::OUString aExtension( aURLObj.getExtension() );
 ::rtl::OUString 
aLibExtension(RTL_CONSTASCII_USTRINGPARAM(xlb));
 ::rtl::OUString 
aContExtension(RTL_CONSTASCII_USTRINGPARAM(xlc));
@@ -918,7 +918,7 @@ void LibPage::InsertLib()
 if ( pLibDlg-Execute() )
 {
 sal_uLong nNewPos = aLibBox.GetEntryCount();
-sal_Bool bRemove = sal_False;
+bool bRemove = false;
 sal_Bool bReplace = pLibDlg-IsReplace();
 sal_Bool bReference = pLibDlg-IsReference();
 for ( sal_uInt16 nLib = 0; nLib  
pLibDlg-GetLibBox().GetEntryCount(); nLib++ )
@@ -957,7 +957,7 @@ void LibPage::InsertLib()
 }
 
 // remove existing libraries
-bRemove = sal_True;
+bRemove = true;
 }
 else
 {
@@ -1134,7 +1134,7 @@ void LibPage::InsertLib()
 
 // insert listbox entry
 ImpInsertLibEntry( aLibName, 
aLibBox.GetEntryCount() );
-bChanges = sal_True;
+bChanges = true;
  

[Libreoffice-commits] .: configure.in

2012-07-31 Thread Tor Lillqvist
 configure.in |4 
 1 file changed, 4 deletions(-)

New commits:
commit 71573ba4edd5413836f0e20e969fccd68bf4da96
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Jul 31 23:00:44 2012 +0300

Building against SDKs 10.7 and 10.8 seems to succeed now

Change-Id: I22c94844eb109f9ab81a434692272d2c392c2202

diff --git a/configure.in b/configure.in
index 170e2ee..bd53759 100644
--- a/configure.in
+++ b/configure.in
@@ -2509,14 +2509,10 @@ if test $_os = Darwin; then
 10.7)
 MACOSX_SDK_PATH=`xcode-select 
-print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
 MACOSX_SDK_VERSION=1070
-AC_MSG_WARN([Building with SDK 10.7 is known to fail in vcl])
-echo Building with SDK 10.7 is known to fail in vcl  warn
 ;;
 10.8)
 MACOSX_SDK_PATH=`xcode-select 
-print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk
 MACOSX_SDK_VERSION=1080
-AC_MSG_WARN([Building with SDK 10.8 is known to fail in vcl])
-echo Building with SDK 10.8 is known to fail in vcl  warn
 ;;
 *)
 AC_MSG_ERROR([$with_macosx_sdk is not a supported SDK value, supported 
value are 10.4--8])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-qa] Bug triage workflow

2012-07-31 Thread Jan Holesovsky
Hi Joel,

Some time ago you created a nice bug triage workflow diagram.  Today I
was trying to find it in the wiki, but failed :-(  Can you please remind
me where it is, and link it from:

http://wiki.documentfoundation.org/BugTriage

Thank you a lot!

All the best,
Kendy

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


Re: [Libreoffice-qa] Online update in 3.6

2012-07-31 Thread klaus-jürgen weghorn ol

Hi Jan,
Am 30.07.2012 08:39, schrieb klaus-jürgen weghorn ol:

Good morning Jan,
  Am 09.07.2012 12:31, schrieb klaus-jürgen weghorn ol:


No 3.6 RC2
My Version 3.6.0.1 (Build ID: 73f9fb6) is on neuester Stand.


LibreOffice 3.6.0 RC2 ist verfügbar.
No 3.6.0.4.


Have you forgotten me? ;-)

--
Grüße
k-j
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Online update in 3.6

2012-07-31 Thread Pedro
Hi Kendy, all

Isn't there some way for you to create a script that runs daily and checks
if the file that is on 
http://dev-builds.libreoffice.org/pre-releases/
is already uploaded to some reference mirror (meaning that it was already
announced)?

Then the script would update the information on the update check engine...

This could also apply to stable releases (thus moving another step for
people being allowed to choose development updates or just stable updates)

Maybe this idea is stupid and there is a better way to automate this...

And, no Michael (et al), I don't have a patch or code to provide. This is
just an idea/suggestion. If it is not welcome, just ignore it.

Regards,
Pedro



--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Online-update-in-3-6-tp3992549p3998585.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


Re: [Libreoffice-qa] Bug triage workflow

2012-07-31 Thread Joel Madero
It's terribly located, I'll fix it today. It's on the right page but just
not very clear:

http://wiki.documentfoundation.org/BugReport_Details#Severity

If you scroll down you'll see a link to it but it's small and not very easy
to find. Direct link is here:

https://wiki.documentfoundation.org/images/0/06/Prioritizing_Bugs_Flowchart.jpg

The other site that you linked to is for triaging status not priority. I
intend on making another one for status but just haven't found the time.
Hope that helps.


Best Wishes,
Joel

On Tue, Jul 31, 2012 at 1:20 AM, Jan Holesovsky ke...@suse.cz wrote:

 Hi Joel,

 Some time ago you created a nice bug triage workflow diagram.  Today I
 was trying to find it in the wiki, but failed :-(  Can you please remind
 me where it is, and link it from:

 http://wiki.documentfoundation.org/BugTriage

 Thank you a lot!

 All the best,
 Kendy


___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] Triaging Event?

2012-07-31 Thread Joel Madero
Hi QA people :)

I was wondering if anyone is interested in trying to do a triaging
extravaganza in the next month or so. The main goal would be to get the
unconfirmed bugs in the proper status (New, NeedInfo, Resolved) and set
priority. Whiteboard status would be a plus but a secondary triaging event
could do this. Currently there are 1,452 unconfirmed bugs, if we could
get 5-10 people to commit and get on IRC for a few hours in the next few
weeks I think we could get through a lot of them.

Let me know what you think.


Joel
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] Open Issues

2012-07-31 Thread Joel Madero
Hi All,

Do we have an ongoing list of open issues that we keep track of and up to
date? If not it might be a good idea to get one going. I think that there
are at least 3-4 things in the past couple months that have had serious
conversations but a decision was never made to finalize things. The most
notable that I remember is the CTL discussion that we had over the course
of a couple weeks. Quite a few users are requesting us to make a final
decision on that and it's kind of just in limbo.


Joel
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Triaging Event?

2012-07-31 Thread Joel Madero
Triaging Event Date Poll:

New Doodle poll:
http://doodle.com/**kzmzfr86pwk59ihuhttp://doodle.com/kzmzfr86pwk59ihu


Thanks to Florian for setting this up :)

Joel

P.S. After that particular week I become more open on weekends, the Sunday,
September 9th works for me as well. Weekdays 9-11 PST (GMT - 7) is hard for
me as I'm at work.


Joel

On Tue, Jul 31, 2012 at 7:58 AM, Joel Madero jmadero@gmail.com wrote:

 Hi QA people :)

 I was wondering if anyone is interested in trying to do a triaging
 extravaganza in the next month or so. The main goal would be to get the
 unconfirmed bugs in the proper status (New, NeedInfo, Resolved) and set
 priority. Whiteboard status would be a plus but a secondary triaging event
 could do this. Currently there are 1,452 unconfirmed bugs, if we could
 get 5-10 people to commit and get on IRC for a few hours in the next few
 weeks I think we could get through a lot of them.

 Let me know what you think.


 Joel

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

  1   2   3   >