date:20111209

 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml |4 
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml   |4 
 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |2 ++
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx |1 +
 4 files changed, 11 insertions(+)

New commits:
commit e363458ffa31184dc2d2c58283457e0036ad506f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 25 11:01:18 2011 +0100

duplicate add Oracle Java 1.7.0 recognition from javavendors_linux - wnt

Cherry-picked from 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=f95052c29b076995a54b1d3f7c0becf35ebcd23f.

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 267f02f..180a136 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -9,6 +9,9 @@
   vendor name=Sun Microsystems Inc.
 minVersion1.5.0/minVersion
   /vendor
+  vendor name=Oracle Corporation
+minVersion1.7.0/minVersion
+  /vendor
   vendor name=IBM Corporation
 minVersion1.5.0/minVersion
   /vendor
@@ -16,6 +19,7 @@
 
  plugins
   library vendor=Sun Microsystems 
Inc.vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll/library
+  library vendor=Oracle 
Corporationvnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll/library
   library vendor=IBM 
Corporationvnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll/library
  /plugins
 /javaSelection
commit 25ff8db963820a82b9fba31d35d16cc15062ba6e
Author: Hanno Meyer-Thurow h@web.de
Date:   Tue Sep 13 13:23:28 2011 +0100

add Oracle Java 1.7.0 recognition

Cherry-picked from 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=549e54fb2f8113502743c443d6deadfe648dede1.

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 2422195..874ca64 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -9,6 +9,9 @@
   vendor name=Sun Microsystems Inc.
 minVersion1.5.0/minVersion
   /vendor
+  vendor name=Oracle Corporation
+minVersion1.7.0/minVersion
+  /vendor
   vendor name=IBM Corporation
 minVersion1.5.0/minVersion
   /vendor
@@ -25,6 +28,7 @@
 
  plugins
   library vendor=Sun Microsystems 
Inc.vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so/library
+  library vendor=Oracle 
Corporationvnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so/library
   library vendor=IBM 
Corporationvnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so/library
   library vendor=Blackdown Java-Linux 
Teamvnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so/library
   library vendor=Free Software Foundation, 
Inc.vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so/library
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 
b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 9feee72..4d617c4 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -112,6 +112,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
 //Only do something if the sunjavaplugin created this JavaInfo
 rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM(Sun Microsystems 
Inc.));
+rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM(Oracle Corporation));
 rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM(IBM Corporation));
 rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM(Blackdown Java-Linux 
Team));
 rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM(Apple Inc.));
@@ -121,6 +122,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM(The FreeBSD 
Foundation));
 if ( ! (sVendor1.equals(pInfo-sVendor) == sal_True
 || sVendor2.equals(pInfo-sVendor) == sal_True
+|| sVendor9.equals(pInfo-sVendor) == sal_True
 || sVendor3.equals(pInfo-sVendor) == sal_True
 || sVendor4.equals(pInfo-sVendor) == sal_True
 || sVendor5.equals(pInfo-sVendor) == sal_True
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 059d8a0..3f4c734 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -52,6 +52,7 @@ namespace jfw_plugin
  */
 BEGIN_VENDOR_MAP()
 VENDOR_MAP_ENTRY(Sun Microsystems Inc., SunInfo)
+VENDOR_MAP_ENTRY(Oracle Corporation, SunInfo)
 VENDOR_MAP_ENTRY(IBM Corporation, OtherInfo)
 VENDOR_MAP_ENTRY(Blackdown Java-Linux Team, OtherInfo)
 VENDOR_MAP_ENTRY(Apple Inc., OtherInfo)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - default_images/brand_dev

2011-12-09 Thread Thorsten Behrens

 default_images/brand_dev/about.png |binary
 default_images/brand_dev/intro.png |binary
 2 files changed

New commits:
commit 912603ee0d8c7be9e283edd58d905731d5c69c31
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri Dec 9 10:04:23 2011 +0100

Default to non-TDF artwork for Libo-Dev builds, too.

diff --git a/default_images/brand_dev/about.png 
b/default_images/brand_dev/about.png
index 3152215..b9e7626 100644
Binary files a/default_images/brand_dev/about.png and 
b/default_images/brand_dev/about.png differ
diff --git a/default_images/brand_dev/intro.png 
b/default_images/brand_dev/intro.png
index 26be421..ec74b1e 100644
Binary files a/default_images/brand_dev/intro.png and 
b/default_images/brand_dev/intro.png differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: default_images/brand_dev

2011-12-09 Thread Thorsten Behrens

 default_images/brand_dev/about.png |binary
 default_images/brand_dev/intro.png |binary
 2 files changed

New commits:
commit c83d5a1fe14a65be687f687e0537f1d5e4c820b3
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri Dec 9 10:08:20 2011 +0100

Default to non-TDF artwork for Libo-Dev builds, too.

diff --git a/default_images/brand_dev/about.png 
b/default_images/brand_dev/about.png
index 3152215..b9e7626 100644
Binary files a/default_images/brand_dev/about.png and 
b/default_images/brand_dev/about.png differ
diff --git a/default_images/brand_dev/intro.png 
b/default_images/brand_dev/intro.png
index 26be421..ec74b1e 100644
Binary files a/default_images/brand_dev/intro.png and 
b/default_images/brand_dev/intro.png differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: postgresql/makefile.mk postgresql/postgresql-9.1.1.patch postgresql/prj

 postgresql/makefile.mk|   33 +++---
 postgresql/postgresql-9.1.1.patch |   85 ++
 postgresql/prj/d.lst  |8 +--
 3 files changed, 105 insertions(+), 21 deletions(-)

New commits:
commit efcc41848b7fbdeaf2eea20d232f47f9346c42ce
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Dec 9 10:59:23 2011 +0100

Trying to simplify the building of static libpq

diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 438e2ca..6e85025 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -30,17 +30,16 @@ PRJ=.
 PRJNAME=postgresql
 TARGET=so_postgresql
 
-EXT_PROJECT_NAME=postgresql-9.1.1
-MAJOR_VER=9.1
-
 # --- Settings -
 
 .INCLUDE : settings.mk
 
 # --- Files 
 
-TARFILE_NAME=$(EXT_PROJECT_NAME)
+TARFILE_NAME=postgresql-9.1.1
 TARFILE_MD5=061a9f17323117c9358ed60f33ecff78
+PATCH_FILES=\
+   $(TARFILE_NAME).patch
 
 .IF $(SYSTEM_POSTGRESQL) == YES
 @all:
@@ -48,7 +47,16 @@ TARFILE_MD5=061a9f17323117c9358ed60f33ecff78
 .ENDIF
 
 
-BUILD_DIR=.
+.IF $(GUI)$(COM)==WNTGCC
+CONFIGURE_DIR=.
+BUILD_DIR=src
+
+CONFIGURE_ACTION =
+BUILD_ACTION = nmake -f win32.mak
+.ELSE
+CONFIGURE_DIR=.
+BUILD_DIR=src/interfaces/libpq
+
 # TODO:
 # --datarootdir changes where libpq expects internationalisation of its 
messages
 #   (which we don't install anyway for now...)
@@ -57,18 +65,9 @@ BUILD_DIR=.
 .IF $(VERBOSE)==
 MAKE_SILENT=-s
 .ENDIF
-BUILD_ACTION = \
-./configure   --sysconfdir=/etc/postgresql-common \
- --datarootdir=/usr/share/ \
- --datadir=/usr/share/postgresql/$(MAJOR_VER) \
- --bindir=/usr/lib/postgresql/$(MAJOR_VER)/bin \
- --libdir=/usr/lib/ \
- --includedir=/usr/include/postgresql/ \
- --without-readline \
- DESTDIR=$(SRC_ROOT)/$(PRJNAME)/$(INPATH)/ \
- export DESTDIR \
- make $(MAKE_SILENT) -j$(GMAKE_MODULE_PARALLELISM) -C 
src/interfaces/libpq install \
- ./config/install-sh -c -m 644 src/include/postgres_ext.h 
$${{DESTDIR}}/usr/include/postgresql/
+CONFIGURE_ACTION = ./configure --without-readline
+BUILD_ACTION = make $(MAKE_SILENT) -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
+.ENDIF
 
 # --- Targets --
 
diff --git a/postgresql/postgresql-9.1.1.patch 
b/postgresql/postgresql-9.1.1.patch
new file mode 100644
index 000..cafb4a3
--- /dev/null
+++ b/postgresql/postgresql-9.1.1.patch
@@ -0,0 +1,85 @@
+--- misc/postgresql-9.1.1/src/interfaces/libpq/win32.mak   2011-09-22 
23:57:57.0 +0200
 misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-09 
10:44:54.151291450 +0100
+@@ -11,18 +11,19 @@
+ 
+ # CPU=i386 or CPU environment of nmake.exe (AMD64 or IA64)
+ 
+-!IF ($(CPU) == )||($(CPU) == i386)
+-CPU=i386
++!IF ($(CPU) == )||($(CPU) == I)
++MACHINE=i386
+ !MESSAGE Building the Win32 static library...
+ !MESSAGE
+-!ELSEIF ($(CPU) == IA64)||($(CPU) == AMD64)
++!ELSEIF ($(CPU) == X)
++MACHINE=AMD64
+ ADD_DEFINES=/D WIN64 /Wp64 /GS
+ ADD_SECLIB=bufferoverflowU.lib
+ !MESSAGE Building the Win64 static library...
+ !MESSAGE
+ !ELSE
+ !MESSAGE Please check a CPU=$(CPU) ?
+-!MESSAGE CPU=i386 or AMD64 or IA64
++!MESSAGE CPU=I or X
+ !ERROR Make aborted.
+ !ENDIF
+ 
+@@ -54,7 +55,7 @@
+ !ENDIF
+ 
+ !IF $(KFW_LIB_PATH) == 
+-KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(CPU)
++KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(MACHINE)
+ !MESSAGE Using default Kerberos Library directory: $(KFW_LIB_PATH)
+ !ENDIF
+ 
+@@ -67,18 +68,11 @@
+ CPP=cl.exe
+ RSC=rc.exe
+ 
+-!IFDEF DEBUG
+-OUTDIR=.\Debug
+-INTDIR=.\Debug
+-CPP_OBJS=.\Debug/
+-!ELSE
+-OUTDIR=.\Release
+-INTDIR=.\Release
+-CPP_OBJS=.\Release/
+-!ENDIF
+-
++OUTDIR=$(OUTDIR)/lib
++INTDIR=$(OUTDIR)/lib
++CPP_OBJS=$(OUTDIR)/slo/
+ 
+-ALL : config $(OUTDIR)\$(OUTFILENAME).lib $(OUTDIR)\$(OUTFILENAME).dll
++ALL : config $(OUTDIR)\$(OUTFILENAME).lib
+ 
+ CLEAN :
+   -@erase $(INTDIR)\getaddrinfo.obj
+@@ -178,7 +172,7 @@
+ $(OUTDIR) :
+ if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
+ 
+-CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I ..\..\include /I 
..\..\include\port\win32 /I ..\..\include\port\win32_msvc /I ..\..\port 
/I. /I $(SSL_INC) \
++CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I ..\..\include /I 
..\..\include\port\win32 /I ..\..\include\port\win32_msvc /I ..\..\port 
/I. $(SOLARINC) \
+  /D FRONTEND $(DEBUGDEF) \
+  /D WIN32 /D _WINDOWS /Fp$(INTDIR)\libpq.pch \
+  /Fo$(INTDIR)\\ /Fd$(INTDIR)\\ /FD /c  \
+@@ -205,7 +199,7 @@
+ LINK32=link.exe
+ LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib 
ws2_32.lib secur32.lib $(SSL_LIBS)  $(KFW_LIB) $(ADD_SECLIB) \
+  /nologo /subsystem:windows /dll $(LOPT) /incremental:no \
+- /pdb:$(OUTDIR)\libpqdll.pdb /machine:$(CPU) \
++

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - postgresql/makefile.mk postgresql/postgresql-9.1.1.patch postgresql/prj

 postgresql/makefile.mk|   33 +++---
 postgresql/postgresql-9.1.1.patch |   85 ++
 postgresql/prj/d.lst  |8 +--
 3 files changed, 105 insertions(+), 21 deletions(-)

New commits:
commit 84738f5143cd2989a41583943b95d500493b11d0
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Dec 9 10:59:23 2011 +0100

Trying to simplify the building of static libpq

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

diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 438e2ca..6e85025 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -30,17 +30,16 @@ PRJ=.
 PRJNAME=postgresql
 TARGET=so_postgresql
 
-EXT_PROJECT_NAME=postgresql-9.1.1
-MAJOR_VER=9.1
-
 # --- Settings -
 
 .INCLUDE : settings.mk
 
 # --- Files 
 
-TARFILE_NAME=$(EXT_PROJECT_NAME)
+TARFILE_NAME=postgresql-9.1.1
 TARFILE_MD5=061a9f17323117c9358ed60f33ecff78
+PATCH_FILES=\
+   $(TARFILE_NAME).patch
 
 .IF $(SYSTEM_POSTGRESQL) == YES
 @all:
@@ -48,7 +47,16 @@ TARFILE_MD5=061a9f17323117c9358ed60f33ecff78
 .ENDIF
 
 
-BUILD_DIR=.
+.IF $(GUI)$(COM)==WNTGCC
+CONFIGURE_DIR=.
+BUILD_DIR=src
+
+CONFIGURE_ACTION =
+BUILD_ACTION = nmake -f win32.mak
+.ELSE
+CONFIGURE_DIR=.
+BUILD_DIR=src/interfaces/libpq
+
 # TODO:
 # --datarootdir changes where libpq expects internationalisation of its 
messages
 #   (which we don't install anyway for now...)
@@ -57,18 +65,9 @@ BUILD_DIR=.
 .IF $(VERBOSE)==
 MAKE_SILENT=-s
 .ENDIF
-BUILD_ACTION = \
-./configure   --sysconfdir=/etc/postgresql-common \
- --datarootdir=/usr/share/ \
- --datadir=/usr/share/postgresql/$(MAJOR_VER) \
- --bindir=/usr/lib/postgresql/$(MAJOR_VER)/bin \
- --libdir=/usr/lib/ \
- --includedir=/usr/include/postgresql/ \
- --without-readline \
- DESTDIR=$(SRC_ROOT)/$(PRJNAME)/$(INPATH)/ \
- export DESTDIR \
- make $(MAKE_SILENT) -j$(GMAKE_MODULE_PARALLELISM) -C 
src/interfaces/libpq install \
- ./config/install-sh -c -m 644 src/include/postgres_ext.h 
$${{DESTDIR}}/usr/include/postgresql/
+CONFIGURE_ACTION = ./configure --without-readline
+BUILD_ACTION = make $(MAKE_SILENT) -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
+.ENDIF
 
 # --- Targets --
 
diff --git a/postgresql/postgresql-9.1.1.patch 
b/postgresql/postgresql-9.1.1.patch
new file mode 100644
index 000..cafb4a3
--- /dev/null
+++ b/postgresql/postgresql-9.1.1.patch
@@ -0,0 +1,85 @@
+--- misc/postgresql-9.1.1/src/interfaces/libpq/win32.mak   2011-09-22 
23:57:57.0 +0200
 misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-09 
10:44:54.151291450 +0100
+@@ -11,18 +11,19 @@
+ 
+ # CPU=i386 or CPU environment of nmake.exe (AMD64 or IA64)
+ 
+-!IF ($(CPU) == )||($(CPU) == i386)
+-CPU=i386
++!IF ($(CPU) == )||($(CPU) == I)
++MACHINE=i386
+ !MESSAGE Building the Win32 static library...
+ !MESSAGE
+-!ELSEIF ($(CPU) == IA64)||($(CPU) == AMD64)
++!ELSEIF ($(CPU) == X)
++MACHINE=AMD64
+ ADD_DEFINES=/D WIN64 /Wp64 /GS
+ ADD_SECLIB=bufferoverflowU.lib
+ !MESSAGE Building the Win64 static library...
+ !MESSAGE
+ !ELSE
+ !MESSAGE Please check a CPU=$(CPU) ?
+-!MESSAGE CPU=i386 or AMD64 or IA64
++!MESSAGE CPU=I or X
+ !ERROR Make aborted.
+ !ENDIF
+ 
+@@ -54,7 +55,7 @@
+ !ENDIF
+ 
+ !IF $(KFW_LIB_PATH) == 
+-KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(CPU)
++KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(MACHINE)
+ !MESSAGE Using default Kerberos Library directory: $(KFW_LIB_PATH)
+ !ENDIF
+ 
+@@ -67,18 +68,11 @@
+ CPP=cl.exe
+ RSC=rc.exe
+ 
+-!IFDEF DEBUG
+-OUTDIR=.\Debug
+-INTDIR=.\Debug
+-CPP_OBJS=.\Debug/
+-!ELSE
+-OUTDIR=.\Release
+-INTDIR=.\Release
+-CPP_OBJS=.\Release/
+-!ENDIF
+-
++OUTDIR=$(OUTDIR)/lib
++INTDIR=$(OUTDIR)/lib
++CPP_OBJS=$(OUTDIR)/slo/
+ 
+-ALL : config $(OUTDIR)\$(OUTFILENAME).lib $(OUTDIR)\$(OUTFILENAME).dll
++ALL : config $(OUTDIR)\$(OUTFILENAME).lib
+ 
+ CLEAN :
+   -@erase $(INTDIR)\getaddrinfo.obj
+@@ -178,7 +172,7 @@
+ $(OUTDIR) :
+ if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
+ 
+-CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I ..\..\include /I 
..\..\include\port\win32 /I ..\..\include\port\win32_msvc /I ..\..\port 
/I. /I $(SSL_INC) \
++CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I ..\..\include /I 
..\..\include\port\win32 /I ..\..\include\port\win32_msvc /I ..\..\port 
/I. $(SOLARINC) \
+  /D FRONTEND $(DEBUGDEF) \
+  /D WIN32 /D _WINDOWS /Fp$(INTDIR)\libpq.pch \
+  /Fo$(INTDIR)\\ /Fd$(INTDIR)\\ /FD /c  \
+@@ -205,7 +199,7 @@
+ LINK32=link.exe
+ LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib 
ws2_32.lib secur32.lib $(SSL_LIBS)  $(KFW_LIB) $(ADD_SECLIB) \
+  /nologo /subsystem:windows /dll $(LOPT) /incremental:no \
+-

[Libreoffice-commits] .: dictionaries/en dictionaries/hu_HU

2011-12-09 Thread László Németh

 dictionaries/en/Lightproof.py|2 +-
 dictionaries/hu_HU/Lightproof.py |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 95bcc5e8d51b8d8e153400380d522fb603c5b894
Author: LÃ¡szlÃ³ NÃ©meth nem...@numbertext.org
Date:   Fri Dec 9 11:36:00 2011 +0100

Fix possible problems on Windows raised by the unsupported sys.stdout

diff --git a/dictionaries/en/Lightproof.py b/dictionaries/en/Lightproof.py
index a6b669c..45a0446 100644
--- a/dictionaries/en/Lightproof.py
+++ b/dictionaries/en/Lightproof.py
@@ -286,7 +286,7 @@ class Lightproof( unohelper.Base, XProofreader, 
XServiceInfo, XServiceName, XSer
 aRes.aErrors = proofread( nDocId, rText, rLocale, \
 nStartOfSentencePos, aRes.nBehindEndOfSentencePosition, 
rProperties)
 except:
-traceback.print_exc(file=sys.stdout)
+# traceback.print_exc(file=sys.stdout)
 aRes.aErrors = ()
 aRes.aProperties = ()
 aRes.xProofreader = self
diff --git a/dictionaries/hu_HU/Lightproof.py b/dictionaries/hu_HU/Lightproof.py
index 24eac51..32a7b5a 100644
--- a/dictionaries/hu_HU/Lightproof.py
+++ b/dictionaries/hu_HU/Lightproof.py
@@ -286,7 +286,7 @@ class Lightproof( unohelper.Base, XProofreader, 
XServiceInfo, XServiceName, XSer
 aRes.aErrors = proofread( nDocId, rText, rLocale, \
 nStartOfSentencePos, aRes.nBehindEndOfSentencePosition, 
rProperties)
 except:
-traceback.print_exc(file=sys.stdout)
+# traceback.print_exc(file=sys.stdout)
 aRes.aErrors = ()
 aRes.aProperties = ()
 aRes.xProofreader = self
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/inc

 sal/inc/rtl/ustrbuf.hxx |   24 
 1 file changed, 24 insertions(+)

New commits:
commit 0670d4652dab1986412f4e9d3c9f36ba2e34db64
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Dec 9 12:31:49 2011 +0100

rtl::OUStringBuffer::insert overloaded for char (similar to ::append).

diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index d9c3893..74df4fe 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -647,6 +647,30 @@ public:
 @param  offset   the offset.
 @param  ch   a codechar/code.
 @return this string buffer.
+
+@since LibreOffice 3.6
+ */
+OUStringBuffer  insert(sal_Int32 offset, char c)
+{
+sal_Unicode u = c;
+return insert( offset, u, 1 );
+}
+
+/**
+Inserts the string representation of the codechar/code
+argument into this string buffer.
+
+The second argument is inserted into the contents of this string
+buffer at the position indicated by codeoffset/code. The length
+of this string buffer increases by one.
+p
+The offset argument must be greater than or equal to
+code0/code, and less than or equal to the length of this
+string buffer.
+
+@param  offset   the offset.
+@param  ch   a codechar/code.
+@return this string buffer.
  */
 OUStringBuffer  insert(sal_Int32 offset, sal_Unicode c)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: postgresql/makefile.mk postgresql/postgresql-9.1.1.patch postgresql/prj

 postgresql/makefile.mk|9 +++--
 postgresql/postgresql-9.1.1.patch |6 +++---
 postgresql/prj/d.lst  |2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 6e407a58872c0bef1be1cdf825cffb7902cb5699
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Dec 9 13:05:56 2011 +0100

Fix Windows build and delivery of libpq

diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 6e85025..2aae5db 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -47,7 +47,7 @@ PATCH_FILES=\
 .ENDIF
 
 
-.IF $(GUI)$(COM)==WNTGCC
+.IF $(GUI)$(COM)==WNTMSC
 CONFIGURE_DIR=.
 BUILD_DIR=src
 
@@ -62,11 +62,8 @@ BUILD_DIR=src/interfaces/libpq
 #   (which we don't install anyway for now...)
 # --sysconfdir: config files. Ideally, we would like that to be the same as 
the platform default,
 #   but that's quite some guessing work.
-.IF $(VERBOSE)==
-MAKE_SILENT=-s
-.ENDIF
-CONFIGURE_ACTION = ./configure --without-readline
-BUILD_ACTION = make $(MAKE_SILENT) -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
+CONFIGURE_ACTION = ./configure --without-readline --disable-shared
+BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM)
 .ENDIF
 
 # --- Targets --
diff --git a/postgresql/postgresql-9.1.1.patch 
b/postgresql/postgresql-9.1.1.patch
index cafb4a3..54ac388 100644
--- a/postgresql/postgresql-9.1.1.patch
+++ b/postgresql/postgresql-9.1.1.patch
@@ -47,9 +47,9 @@
 -CPP_OBJS=.\Release/
 -!ENDIF
 -
-+OUTDIR=$(OUTDIR)/lib
-+INTDIR=$(OUTDIR)/lib
-+CPP_OBJS=$(OUTDIR)/slo/
++OUTDIR=.
++INTDIR=.
++CPP_OBJS=./
  
 -ALL : config $(OUTDIR)\$(OUTFILENAME).lib $(OUTDIR)\$(OUTFILENAME).dll
 +ALL : config $(OUTDIR)\$(OUTFILENAME).lib
diff --git a/postgresql/prj/d.lst b/postgresql/prj/d.lst
index 88c3a86..a96f3b1 100644
--- a/postgresql/prj/d.lst
+++ b/postgresql/prj/d.lst
@@ -3,5 +3,5 @@ mkdir: %_DEST%\inc\postgresql
 ..\%__SRC%\misc\build\postgresql-*\src\include\postgres_ext.h 
%_DEST%\inc\postgresql\
 ..\%__SRC%\misc\build\postgresql-*\src\interfaces\libpq\libpq-fe.h 
%_DEST%\inc\postgresql\
 ..\%__SRC%\misc\build\postgresql-*\src\interfaces\libpq\libpq.a %_DEST%\lib\
-..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\misc\build\postgresql-*\src\interfaces\libpq\libpq.lib %_DEST%\lib\
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

 solenv/gbuild/JavaClassSet.mk |   10 +-
 solenv/gbuild/JunitTest.mk|8 
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 91af205a93440b82ff1730528e98e6355092e02c
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Dec 9 14:31:53 2011 +0200

Don't misuse CLASSPATH for what goes into the -cp option to javac

CLASSPATH is supposed to show where to find the classes needed by Java
programs running at build time. The -cp switch to javac tells where to
find classes referenced by the code being compiled. These are
different things. (But it doesn't seem to have mattered much in our
build system.) So use T_CP instead, named in the same fashion as
T_CXXFLAGS etc.

But... for some reason this change, which as such should be just more
or less cosmetic, also fixes a build problem in the scripting module
on Windows, seen by Noel Grandin

(http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/19016
) and me.

diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index cea27c0..16d914a 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -43,7 +43,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(filter-out $(JARDEPS),$(4)  \
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
$(gb_JavaClassSet_JAVACDEBUG) \
-   -cp $(CLASSPATH)$(gb_CLASSPATHSEP)$(call 
gb_JavaClassSet_get_classdir,$(2)) \
+   -cp $(T_CP)$(gb_CLASSPATHSEP)$(call 
gb_JavaClassSet_get_classdir,$(2)) \
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
@$$RESPONSEFILE ) \
rm -f $$RESPONSEFILE  \
@@ -60,8 +60,8 @@ $(call gb_JavaClassSet_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
 
-# no initialization of scoped variable CLASSPATH as it is inherited from 
controlling instance (e.g. JUnitTest, Jar)
 # UGLY: cannot use target local variable for REPO because it's needed in prereq
+# No idea what above comment means, and whether still relevant
 define gb_JavaClassSet_JavaClassSet
 $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
 endef
@@ -81,7 +81,7 @@ $(foreach sourcefile,$(2),$(call 
gb_JavaClassSet_add_sourcefile,$(1),$(sourcefil
 endef
 
 define gb_JavaClassSet_set_classpath
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2))
 
 endef
 
@@ -89,13 +89,13 @@ endef
 # build order dependency is a hack to get these prerequisites out of the way 
in the build command
 define gb_JavaClassSet_add_jar
 $(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := 
$$(CLASSPATH)$(gb_CLASSPATHSEP)$(strip $(2)))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := 
$$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)))
 $(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
 endef
 
 # this does not generate dependency on the jar
 define gb_JavaClassSet_add_system_jar
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := 
$$(CLASSPATH)$(gb_CLASSPATHSEP)$(strip $(2)))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := 
$$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)))
 $(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
 endef
 
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 5afe595..177cad6 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -47,7 +47,7 @@ $(call gb_JunitTest_get_target,%) :
 rm -rf $(call gb_JunitTest_get_userdir,$*)  \
mkdir -p $(call gb_JunitTest_get_userdir,$*)  \
 (DBGSV_ERROR_OUT=shell $(gb_JunitTest_JAVACOMMAND) \
--cp $(CLASSPATH) \
+-cp $(T_CP) \
 $(DEFS) \
 org.junit.runner.JUnitCore \
 $(CLASSES)  $@.log 21 || \
@@ -69,7 +69,7 @@ $(call gb_JunitTest_get_target,%) :
$(CLEAN_CMD)
 
 define gb_JunitTest_JunitTest
-$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value 
XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call 
gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $(value 
XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call 
gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib
 $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
 $(call gb_JunitTest_JunitTest_platform,$(1))
 
@@ -105,12 +105,12 @@ $(foreach sourcefile,$(2),$(call 
gb_JunitTest_add_sourcefile,$(1),$(sourcefile))
 endef
 
 define gb_JunitTest_set_classpath
-$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(2)
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $(2)
 
 endef
 
 define gb_JunitTest_add_jar
-$(call

[Libreoffice-commits] .: connectivity/prj connectivity/source

 connectivity/prj/d.lst |1 +
 connectivity/source/drivers/postgresql/makefile.mk |   10 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit a4845bd70e7e759e853ca0458ee27c65c165c91c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Dec 9 14:50:17 2011 +0100

Make link and deliver the postgresql.oxt extension also on windows

diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 55099c2..954a89d 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -8,6 +8,7 @@
 ..\%__SRC%\slb\connectivity*.* %_DEST%\lib\connectivity*.*
 ..\%__SRC%\lib\idbt* %_DEST%\lib\idbt*
 ..\%__SRC%\lib\*.oxt %_DEST%\bin\*.oxt
+..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt
 ..\source\cpool\*.xml %_DEST%\xml\*.xml
 ..\source\drivers\adabas\*.xml %_DEST%\xml\*.xml
 ..\source\drivers\ado\*.xml %_DEST%\xml\*.xml
diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index ac19cd9..91184d8 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -102,13 +102,13 @@ SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
 #  as per instructions in libpq documentation.
 #  If it turns out the rest was needed, reenable it.
 .IF $(SYSTEM_POSTGRESQL)==YES
-.IF $(GUI)==WNT
-LIBPQ_LINK=libpq.lib #wsock32.lib advapi32.lib
-.ELSE
-LIBPQ_LINK=-lpq #-lcrypt
-.ENDIF
+LIBPQ_LINK=-lpq
 .ELSE #SYSTEM_POSTGRESQL==NO
+.IF $(GUI)$(COM)==WNTMSC
+LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.lib ws2_32.lib secur32.lib 
advapi32.lib shell32.lib
+.ELSE
 LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a
+.ENDIF
 POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql
 POSTGRESQL_LIB=
 .ENDIF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 connectivity/prj/d.lst |1 +
 connectivity/source/drivers/postgresql/makefile.mk |   10 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 2d9f258c80473fe8cdf7a039c1747a94be9c8395
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Dec 9 14:50:17 2011 +0100

Make link and deliver the postgresql.oxt extension also on windows

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

diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 55099c2..954a89d 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -8,6 +8,7 @@
 ..\%__SRC%\slb\connectivity*.* %_DEST%\lib\connectivity*.*
 ..\%__SRC%\lib\idbt* %_DEST%\lib\idbt*
 ..\%__SRC%\lib\*.oxt %_DEST%\bin\*.oxt
+..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt
 ..\source\cpool\*.xml %_DEST%\xml\*.xml
 ..\source\drivers\adabas\*.xml %_DEST%\xml\*.xml
 ..\source\drivers\ado\*.xml %_DEST%\xml\*.xml
diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index ac19cd9..91184d8 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -102,13 +102,13 @@ SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
 #  as per instructions in libpq documentation.
 #  If it turns out the rest was needed, reenable it.
 .IF $(SYSTEM_POSTGRESQL)==YES
-.IF $(GUI)==WNT
-LIBPQ_LINK=libpq.lib #wsock32.lib advapi32.lib
-.ELSE
-LIBPQ_LINK=-lpq #-lcrypt
-.ENDIF
+LIBPQ_LINK=-lpq
 .ELSE #SYSTEM_POSTGRESQL==NO
+.IF $(GUI)$(COM)==WNTMSC
+LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.lib ws2_32.lib secur32.lib 
advapi32.lib shell32.lib
+.ELSE
 LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a
+.ENDIF
 POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql
 POSTGRESQL_LIB=
 .ENDIF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - svtools/source sw/CppunitTest_sw_macros_test.mk

 svtools/source/misc/imagemgr.src |   22 +++---
 sw/CppunitTest_sw_macros_test.mk |4 +++-
 2 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit bb5bad165e32603478ff590251fb88c46534dac6
Author: Michael Stahl mst...@redhat.com
Date:   Fri Dec 9 15:10:23 2011 +0100

svtools: imagemgr.src: use %PRODUCTXMLFILEFORMATNAME

Currently on File-Properties we display LibreOffice 1.0 Text Document
etc. for OpenOffice.org XML format documents, which is wrong: these
should not be re-branded.

diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index ca4a075..1ab37cb 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -289,19 +289,19 @@ String STR_DESCRIPTION_FACTORY_DATABASE
 };
 String STR_DESCRIPTION_CALC_TEMPLATE
 {
-Text [ en-US ] = %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet 
Template ;
+Text [ en-US ] = %PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION 
Spreadsheet Template ;
 };
 String STR_DESCRIPTION_DRAW_TEMPLATE
 {
-Text [ en-US ] = %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing 
Template ;
+Text [ en-US ] = %PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION 
Drawing Template ;
 };
 String STR_DESCRIPTION_IMPRESS_TEMPLATE
 {
-Text [ en-US ] = %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation 
Template ;
+Text [ en-US ] = %PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION 
Presentation Template ;
 };
 String STR_DESCRIPTION_WRITER_TEMPLATE
 {
-Text [ en-US ] = %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document 
Template ;
+Text [ en-US ] = %PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION 
Text Document Template ;
 };
 String STR_DESCRIPTION_LOCALE_VOLUME
 {
@@ -336,37 +336,37 @@ String STR_DESCRIPTION_POWERPOINT_SHOW
 
 String STR_DESCRIPTION_SXMATH_DOC
 {
-Text [ en-US ] = %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formula ;
+Text [ en-US ] = %PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION 
Formula ;
 };
 
 String STR_DESCRIPTION_SXCHART_DOC
 {
-Text [ en-US ] = %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Chart ;
+Text [ en-US ] = %PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION 
Chart ;
 };
 
 String STR_DESCRIPTION_SXDRAW_DOC
 {
-Text [ en-US ] = %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing ;
+Text [ en-US ] = %PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION 
Drawing ;
 };
 
 String STR_DESCRIPTION_SXCALC_DOC
 {
-Text [ en-US ] = %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet ;
+Text [ en-US ] = %PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION 
Spreadsheet ;
 };
 
 String STR_DESCRIPTION_SXIMPRESS_DOC
 {
-Text [ en-US ] = %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation ;
+Text [ en-US ] = %PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION 
Presentation ;
 };
 
 String STR_DESCRIPTION_SXWRITER_DOC
 {
-Text [ en-US ] = %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document 
;
+Text [ en-US ] = %PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION 
Text Document ;
 };
 
 String STR_DESCRIPTION_SXGLOBAL_DOC
 {
-Text [ en-US ] = %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Master 
Document ;
+Text [ en-US ] = %PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION 
Master Document ;
 };
 String STR_DESCRIPTION_MATHML_DOC
 {
commit 90bf7efd26d6d1bf047238857c429de9d0dbeed7
Author: Michael Stahl mst...@redhat.com
Date:   Wed Dec 7 12:57:51 2011 +0100

CppunitTest_sw_macros_test.mk: depends on vbaswobj

This should fix the spurious segfaults caused by running the test while
the library is being overwritten in parallel that cannot be reproduced
by just running the test.

diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 9c2c11f..a640452 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -137,6 +137,8 @@ $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\
 # a) explicitly depend on library msword because it is not implied by a link
 #relation
 # b) explicitly depend on the sw resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sw_macros_test) : $(call 
gb_Library_get_target,msword)
+$(call gb_CppunitTest_get_target,sw_macros_test) : \
+   $(call gb_Library_get_target,msword) \
+   $(call gb_Library_get_target,vbaswobj) \
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: officecfg/registry

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit a92266c0e5d1eebac39352eace2f7f164132c21d
Author: Christian Lippka ORACLE christian.lip...@oracle.com
Date:   Fri Dec 9 16:08:16 2011 +0100

impress210: #i116847# added CTRL-ALT-C as shortcut for inserting comments 
in calc

# HG changeset patch
# User Christian Lippka ORACLE christian.lip...@oracle.com
# Date 1299490586 -3600
# Node ID dc37f2767c97d459067f4206d7fa97f07dcfa32c
# Parent  3877d3f525421bfb50bd8e4bf8649277a9b3df6c

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 507cf5c..2f0bfef 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -913,6 +913,12 @@
   value xml:lang=en-US.uno:Redo/value
  /prop
 /node
+node oor:name=C_MOD1_MOD2 oor:op=replace
+  prop oor:name=Command
+value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value
+value xml:lang=en-US.uno:InsertAnnotation/value
+  /prop
+/node
/node
node oor:name=com.sun.star.chart2.ChartDocument oor:op=replace
 node oor:name=9_SHIFT_MOD1_MOD2 oor:op=replace
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

 writerfilter/source/filter/RtfFilter.cxx   |5 ++---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 1a6853e422a43c41a50db14a3a3b8cdf9cc7aa1b
Author: Michael Stahl mst...@redhat.com
Date:   Fri Dec 9 16:42:56 2011 +0100

writerfilter: fix build breakers

diff --git a/writerfilter/source/filter/RtfFilter.cxx 
b/writerfilter/source/filter/RtfFilter.cxx
index b2316fb..0d0e929 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -26,9 +26,8 @@
  *
  /
 
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_
+#include rtl/oustringostreaminserter.hxx
 #include cppuhelper/implementationentry.hxx
-#endif
 #include osl/module.hxx
 #include tools/solar.h
 #include RtfFilter.hxx
@@ -101,7 +100,7 @@ sal_Bool RtfFilter::filter( const uno::Sequence 
beans::PropertyValue  aDescri
 }
 catch (const uno::Exception e)
 {
-SAL_INFO(writerfilter, Exception caught:   e.Message());
+SAL_INFO(writerfilter, Exception caught:   e.Message);
 return sal_False;
 }
 }
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a60a77b..b29fc5b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -229,7 +229,6 @@ static writerfilter::ReferenceProperties::Pointer_t 
lcl_getBookmarkProperties(
 return lcl_getBookmarkProperties(nPos, aStr);
 }
 
-#if OSL_DEBUG_LEVEL  1
 static const char* lcl_RtfToString(RTFKeyword nKeyword)
 {
 for (int i = 0; i  nRTFControlWords; i++)
@@ -239,7 +238,6 @@ static const char* lcl_RtfToString(RTFKeyword nKeyword)
 }
 return NULL;
 }
-#endif
 
 static util::DateTime lcl_getDateTime(std::stackRTFParserState aStates)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: distro-configs/LibreOfficeLinux.conf

 distro-configs/LibreOfficeLinux.conf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 27f83e9f32b53c03f516aab1bacb20cebd670440
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Dec 9 16:59:13 2011 +0100

Use the internal libpq for universal builds

diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index b2c6894..1a4ab2e 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -1,6 +1,5 @@
 --with-vendor=The Document Foundation
 --with-system-dicts
---with-system-postgresql
 --without-unix-wrapper
 --without-system-zlib
 --without-system-stdlibs
@@ -12,6 +11,7 @@
 --without-system-jpeg
 --without-system-jars
 --without-system-cairo
+--without-system-postgresql
 --without-openldap
 --without-junit
 --without-helppack-integration
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - distro-configs/LibreOfficeLinux.conf

 distro-configs/LibreOfficeLinux.conf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 35bb1f9579a97178afd3da4de74fc75c0696b521
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Dec 9 16:59:13 2011 +0100

Use the internal libpq for universal builds

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

diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index b2c6894..1a4ab2e 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -1,6 +1,5 @@
 --with-vendor=The Document Foundation
 --with-system-dicts
---with-system-postgresql
 --without-unix-wrapper
 --without-system-zlib
 --without-system-stdlibs
@@ -12,6 +11,7 @@
 --without-system-jpeg
 --without-system-jars
 --without-system-cairo
+--without-system-postgresql
 --without-openldap
 --without-junit
 --without-helppack-integration
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-12-09 Thread Ivan Timofeev

 sd/source/ui/dlg/navigatr.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 8c763915fbb11a261dbbf64280cabeefb7ca6c6a
Author: Ivan Timofeev timofeev@gmail.com
Date:   Fri Dec 9 21:23:50 2011 +0400

fdo#39528: do not lose height of tree list box in Navigator

diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index bb5bf26..3fb63a9 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -555,10 +555,11 @@ void SdNavigatorWin::Resize()
 maToolbox.SetOutputSizePixel( aObjSize );
 
 // Umgroessern der TreeLB
-aObjSize = maTlbObjects.Control::GetOutputSizePixel();
+aObjSize = maTlbObjects.GetSizePixel();
 aObjSize.Width() += aDiffSize.Width();
-aObjSize.Height() += aDiffSize.Height();
-maTlbObjects.SetOutputSizePixel( aObjSize );
+aObjSize.Height() = maLbDocs.GetPosPixel().Y() + aDiffSize.Height() -
+maTlbObjects.GetPosPixel().Y() - 4;
+maTlbObjects.SetSizePixel( aObjSize );
 
 Point aPt( 0, aDiffSize.Height() );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/core/doc/docedt.cxx|7 +--
 sw/source/ui/uiview/viewsrch.cxx |   17 +++--
 2 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 4eec19b1d634b66580423eb995621f87b422a46a
Author: Michael Stahl mst...@redhat.com
Date:   Fri Nov 18 14:12:42 2011 +0100

fdo#40831: SwView::ExecSearch:

Replace may delete nodes, so the current cursor position must be stored
in a way so that it is corrected when nodes are removed.

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

diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index b3e8d6e..cf4e14a 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -30,6 +30,9 @@
 #include precompiled_sw.hxx
 
 #include string
+
+#include boost/scoped_ptr.hpp
+
 #include hintids.hxx
 #include com/sun/star/util/SearchOptions.hpp
 #include svl/cjkoptions.hxx
@@ -57,6 +60,8 @@
 #include uitool.hxx
 #include cmdid.h
 #include docsh.hxx
+#include doc.hxx
+#include unocrsr.hxx
 
 #include view.hrc
 #include SwRewriter.hxx
@@ -283,7 +288,14 @@ void SwView::ExecSearch(SfxRequest rReq, sal_Bool 
bNoMessage)
 case SVX_SEARCHCMD_REPLACE_ALL:
 {
 SwSearchOptions aOpts( pWrtShell, pSrchItem-GetBackward() 
);
-SwCrsrSaveState aSaveCursor( *pWrtShell-GetSwCrsr());
+
+// Fix for i#8288: Replace all should leave the cursor 
at the place it was
+// before executing the command, rather than at the site 
of the final replacement.
+// To do this take note of the current cursor position 
before replace all begins:
+// note: must be stored so that it is corrected by PamCorr*
+::boost::scoped_ptrSwUnoCrsr const pTmpCursor(
+pWrtShell-GetDoc()-CreateUnoCrsr(
+*pWrtShell-GetSwCrsr()-GetPoint()));
 
 if( !pSrchItem-GetSelection() )
 {
@@ -304,7 +316,8 @@ void SwView::ExecSearch(SfxRequest rReq, sal_Bool 
bNoMessage)
 pWrtShell-StartAllAction();
 nFound = FUNC_Search( aOpts );
 // #i8288# Now that everything has been replaced, 
restore the original cursor position.
-pWrtShell-GetSwCrsr()-RestoreSavePos();  // 
(position saved by SwCrsrSaveState above)
+*(pWrtShell-GetSwCrsr()-GetPoint()) =
+*pTmpCursor-GetPoint();
 pWrtShell-EndAllAction();
 }
 
commit f4fb39640571fd588299ecd603733eaf94e61605
Author: Michael Stahl mst...@redhat.com
Date:   Fri Nov 18 14:07:11 2011 +0100

i#102333: SwDoc::ReplaceRangeImpl:

The fix for this (230fcf4a456636bb466f72834cd57238621d206d) was not
quite right; there are 2 different join modes, and moving the cursor
backward is required in one of them, but not the other.

This can be seen when doing replace all ^$ with several consecutive
empty lines.

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

diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 297c42f..b6eadc3 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -2482,8 +2482,11 @@ SetRedlineMode( eOld );
 rPam.GetMark()-nNode = aPtNd;
 rPam.GetMark()-nContent.Assign( aPtNd.GetNode().GetCntntNode(),
 nPtCnt );
-if( bJoinTxt )
-rPam.Move( fnMoveBackward );
+
+if (bJoinTxt  !bJoinPrev)
+{
+rPam.Move(fnMoveBackward);
+}
 
 if( pUndoRpl )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - solenv/gbuild sw/source

 solenv/gbuild/extensions/post_BuildplTargets.mk |3 +++
 sw/source/ui/app/applab.cxx |   10 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 18069824a67602719007673c393ae511c476747e
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Dec 9 20:46:02 2011 +0100

do nothing in buildpl stage for debugrun

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 66bb98a..cd98688 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -146,6 +146,9 @@ check: subsequentcheck
 unitcheck: build
@true
 
+debugrun:
+   @true
+
 endif # gb_SourceEnvAndRecurse_STAGE=buildpl
 
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
commit a34ccd2ec9ffaf09162427b198fdc08cc324a3f3
Author: Winfried Donkers w.donk...@dci-electronics.nl
Date:   Fri Dec 9 17:44:20 2011 +0100

fdo#36874: Label PRINTING misplaced on paper sheet

diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index f6784f5..e913db7 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -264,10 +264,14 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool 
bLabel)
 
 aDesc.SetUseOn(nsUseOnPage::PD_ALL);// Site 
numbering
 
+// fix (fdo36874) revised page size calculation
 // Set page size
-rFmt.SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE,
-rItem.lLeft  + rItem.nCols * 
rItem.lHDist + MINLAY,
-rItem.lUpper + rItem.nRows * 
rItem.lVDist + MINLAY));
+   long lPgWidth, lPgHeight;
+   lPgWidth = (((rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft)  MINLAY) ?
+   (rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft) : MINLAY);
+   lPgHeight = (((rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper)  MINLAY) ?
+   (rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper) : MINLAY);
+rFmt.SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE, lPgWidth, lPgHeight 
));
 
 // Numbering type
 SvxNumberType aType;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 solenv/gbuild/extensions/post_BuildplTargets.mk |3 +++
 sw/source/ui/app/applab.cxx |   10 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 044d1d6a9586f02c1137ee8f654f89008bd12e39
Author: Winfried Donkers w.donk...@dci-electronics.nl
Date:   Fri Dec 9 17:44:20 2011 +0100

fdo#36874: Label PRINTING misplaced on paper sheet

diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index f6784f5..e913db7 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -264,10 +264,14 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool 
bLabel)
 
 aDesc.SetUseOn(nsUseOnPage::PD_ALL);// Site 
numbering
 
+// fix (fdo36874) revised page size calculation
 // Set page size
-rFmt.SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE,
-rItem.lLeft  + rItem.nCols * 
rItem.lHDist + MINLAY,
-rItem.lUpper + rItem.nRows * 
rItem.lVDist + MINLAY));
+   long lPgWidth, lPgHeight;
+   lPgWidth = (((rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft)  MINLAY) ?
+   (rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft) : MINLAY);
+   lPgHeight = (((rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper)  MINLAY) ?
+   (rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper) : MINLAY);
+rFmt.SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE, lPgWidth, lPgHeight 
));
 
 // Numbering type
 SvxNumberType aType;
commit f5ac85575ad7066c9490c423cdfeba72df3d78fc
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Dec 9 20:46:02 2011 +0100

do nothing in buildpl stage for debugrun

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 66bb98a..cd98688 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -146,6 +146,9 @@ check: subsequentcheck
 unitcheck: build
@true
 
+debugrun:
+   @true
+
 endif # gb_SourceEnvAndRecurse_STAGE=buildpl
 
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-12-09 Thread Kohei Yoshida

 sc/source/ui/view/drawvie3.cxx |7 +++
 svx/inc/svx/svdhdl.hxx |1 +
 svx/source/svdraw/svdhdl.cxx   |   20 
 3 files changed, 28 insertions(+)

New commits:
commit 656b578086f88f262002869c3632fdbd95a66784
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Dec 9 16:31:30 2011 -0500

fdo#38545: Show/hide anchor when the anchoring status changes.

Setting a page-anchored object to cell-anchored didn't show the anchor
immediately until you unselect the object and re-select it.  Same for
the cell-anchored to page-anchored direction.

This commit fixes it.

diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 964fb14..ed701a2 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -87,6 +87,10 @@ void ScDrawView::SetPageAnchored()
 
 if ( pViewData )
 pViewData-GetDocShell()-SetDrawModified();
+
+// Remove the anchor object.
+aHdl.RemoveAllByKind(HDL_ANCHOR);
+aHdl.RemoveAllByKind(HDL_ANCHOR_TR);
 }
 }
 
@@ -108,6 +112,9 @@ void ScDrawView::SetCellAnchored()
 
 if ( pViewData )
 pViewData-GetDocShell()-SetDrawModified();
+
+// Set the anchor object.
+AddCustomHdl();
 }
 }
 
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 895644d..f94a00e 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -502,6 +502,7 @@ public:
 // also auf dem Heap stehen, da Clear() ein delete macht.
 voidAddHdl(SdrHdl* pHdl, sal_Bool bAtBegin=sal_False);
 SdrHdl* RemoveHdl(sal_uIntPtr nNum);
+void RemoveAllByKind(SdrHdlKind eKind);
 
 // Zuletzt eingefuegte Handles werden am ehesten getroffen
 // (wenn Handles uebereinander liegen).
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 3d2e786..5d58e1f 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -2081,6 +2081,26 @@ SdrHdl* SdrHdlList::RemoveHdl(sal_uIntPtr nNum)
 return pRetval;
 }
 
+void SdrHdlList::RemoveAllByKind(SdrHdlKind eKind)
+{
+SdrHdl* p = static_castSdrHdl*(aList.Last());
+while (p)
+{
+if (p-GetKind() == eKind)
+{
+// If removing an item doesn't invalidate the current position,
+// then perhaps it's safe to keep calling Prev here.  But then I'm
+// too lazy to find out  this Container needs to be replaced by
+// STL anyways... :-P
+aList.Remove(p);
+delete p;
+p = static_castSdrHdl*(aList.Last()); // start from the back 
again.
+}
+else
+p = static_castSdrHdl*(aList.Prev());
+}
+}
+
 void SdrHdlList::Clear()
 {
 for (sal_uIntPtr i=0; iGetHdlCount(); i++)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source i18npool/inc i18npool/source svtools/inc svtools/source

 cui/source/options/optgdlg.cxx   |4 ++--
 i18npool/inc/i18npool/mslangid.hxx   |   15 +--
 i18npool/source/isolang/mslangid.cxx |5 +++--
 svtools/inc/svtools/langtab.hxx  |8 +++-
 svtools/source/misc/langtab.cxx  |4 ++--
 svtools/source/misc/langtab.src  |1 +
 6 files changed, 28 insertions(+), 9 deletions(-)

New commits:
commit 8c736b8543ca3d36612270cb4ceb2ae0a7abe2e7
Author: Eike Rathke er...@redhat.com
Date:   Fri Dec 9 22:33:50 2011 +0100

fixed fdo#37349 present Catalan (Valencian) as selectable UI language

Catalan (Valencian) has no ISO 639 code assigned and the UI localization 
uses
the ca-XV hack where XV is of the reserved ISO 3166 user-assigned range. 
This
should not escape to document content therefor internally a replacement to
ca-ES is done for all locale attribution. For the UI localization to be
distinguishable under Tools-Options-LanguageSettings-UserInterface this
needed a special handling to allow Catalan (Valencian) again.

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 42a6c21..0e428e3 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1279,7 +1279,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 
 String aUILang(aStr);
 aUILang += String::CreateFromAscii( - );
-aUILang += pLanguageTable-GetString( 
Application::GetSettings().GetUILanguage() );
+aUILang += pLanguageTable-GetString( 
Application::GetSettings().GetUILanguage(), true );
 
 aUserInterfaceLB.InsertEntry(aUILang);
 aUserInterfaceLB.SetEntryData(0, 0);
@@ -1307,7 +1307,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 if (aLang != LANGUAGE_DONTKNOW)
 {
 //sal_uInt16 p = aUserInterfaceLB.InsertLanguage(aLang);
-String aLangStr( pLanguageTable-GetString( aLang ) );
+String aLangStr( pLanguageTable-GetString( aLang, true ) );
 sal_uInt16 p = aUserInterfaceLB.InsertEntry(aLangStr);
 aUserInterfaceLB.SetEntryData(p, (void*)(i+1));
 }
diff --git a/i18npool/inc/i18npool/mslangid.hxx 
b/i18npool/inc/i18npool/mslangid.hxx
index 717a5bb..f1da981 100644
--- a/i18npool/inc/i18npool/mslangid.hxx
+++ b/i18npool/inc/i18npool/mslangid.hxx
@@ -203,8 +203,19 @@ public:
 
 /** Map an obsolete user defined LANGID (see lang.h
 LANGUAGE_OBSOLETE_USER_...) to the new value defined by MS in the
-meantime. */
-static LanguageType getReplacementForObsoleteLanguage( LanguageType nLang 
);
+meantime.
+
+Also used to map UI localizations using reserved ISO codes to something
+official but not identical in order to not pollute documents with
+invalid ISO codes.
+
+@param bUserInterfaceSelection
+If TRUE, don't replace such UI-only locale. Only use for
+ Tools-Options-LanguageSettings-UserInterface listbox.
+If FALSE, do replace.
+ */
+static LanguageType getReplacementForObsoleteLanguage( LanguageType nLang,
+bool bUserInterfaceSelection = false );
 
 
 /** @ATTENTION: these are _ONLY_ to be called by the application's
diff --git a/i18npool/source/isolang/mslangid.cxx 
b/i18npool/source/isolang/mslangid.cxx
index 06941b6..e5661da 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -379,7 +379,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 
 
 // static
-LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang )
+LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang, 
bool bUserInterfaceSelection )
 {
 switch (nLang)
 {
@@ -433,7 +433,8 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( 
LanguageType nLang )
  // Do not use ca-XV for document content.
  /* TODO: remove in case we implement BCP47 language tags. */
 case LANGUAGE_USER_CATALAN_VALENCIAN:
-nLang = LANGUAGE_CATALAN;
+if (!bUserInterfaceSelection)
+nLang = LANGUAGE_CATALAN;
 break;
 }
 return nLang;
diff --git a/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx
index 9b38297..5785322 100644
--- a/svtools/inc/svtools/langtab.hxx
+++ b/svtools/inc/svtools/langtab.hxx
@@ -43,7 +43,13 @@ public:
 SvtLanguageTable();
 ~SvtLanguageTable();
 
-const String   GetString( const LanguageType eType ) const;
+/**
+@param bUserInterfaceSelection
+If TRUE, don't replace an UI-only locale. Only use for
+ Tools-Options-LanguageSettings-UserInterface listbox.
+If FALSE, do replace.
+ */
+const String   GetString( const LanguageType eType, bool 
bUserInterfaceSelection = false ) const;
 LanguageTypeGetType( const String

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source i18npool/inc i18npool/source svtools/inc svtools/source

 cui/source/options/optgdlg.cxx   |4 ++--
 i18npool/inc/i18npool/mslangid.hxx   |   15 +--
 i18npool/source/isolang/mslangid.cxx |5 +++--
 svtools/inc/svtools/langtab.hxx  |8 +++-
 svtools/source/misc/langtab.cxx  |4 ++--
 svtools/source/misc/langtab.src  |1 +
 6 files changed, 28 insertions(+), 9 deletions(-)

New commits:
commit eea858f6c7696becab4e67ca00f5ee0293e63718
Author: Eike Rathke er...@redhat.com
Date:   Fri Dec 9 22:33:50 2011 +0100

fixed fdo#37349 present Catalan (Valencian) as selectable UI language

Catalan (Valencian) has no ISO 639 code assigned and the UI localization 
uses
the ca-XV hack where XV is of the reserved ISO 3166 user-assigned range. 
This
should not escape to document content therefor internally a replacement to
ca-ES is done for all locale attribution. For the UI localization to be
distinguishable under Tools-Options-LanguageSettings-UserInterface this
needed a special handling to allow Catalan (Valencian) again.

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index dabc5a7..79c41d8 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1280,7 +1280,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 
 String aUILang(aStr);
 aUILang += String::CreateFromAscii( - );
-aUILang += pLanguageTable-GetString( 
Application::GetSettings().GetUILanguage() );
+aUILang += pLanguageTable-GetString( 
Application::GetSettings().GetUILanguage(), true );
 
 aUserInterfaceLB.InsertEntry(aUILang);
 aUserInterfaceLB.SetEntryData(0, 0);
@@ -1308,7 +1308,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 if (aLang != LANGUAGE_DONTKNOW)
 {
 //sal_uInt16 p = aUserInterfaceLB.InsertLanguage(aLang);
-String aLangStr( pLanguageTable-GetString( aLang ) );
+String aLangStr( pLanguageTable-GetString( aLang, true ) );
 sal_uInt16 p = aUserInterfaceLB.InsertEntry(aLangStr);
 aUserInterfaceLB.SetEntryData(p, (void*)(i+1));
 }
diff --git a/i18npool/inc/i18npool/mslangid.hxx 
b/i18npool/inc/i18npool/mslangid.hxx
index 717a5bb..f1da981 100644
--- a/i18npool/inc/i18npool/mslangid.hxx
+++ b/i18npool/inc/i18npool/mslangid.hxx
@@ -203,8 +203,19 @@ public:
 
 /** Map an obsolete user defined LANGID (see lang.h
 LANGUAGE_OBSOLETE_USER_...) to the new value defined by MS in the
-meantime. */
-static LanguageType getReplacementForObsoleteLanguage( LanguageType nLang 
);
+meantime.
+
+Also used to map UI localizations using reserved ISO codes to something
+official but not identical in order to not pollute documents with
+invalid ISO codes.
+
+@param bUserInterfaceSelection
+If TRUE, don't replace such UI-only locale. Only use for
+ Tools-Options-LanguageSettings-UserInterface listbox.
+If FALSE, do replace.
+ */
+static LanguageType getReplacementForObsoleteLanguage( LanguageType nLang,
+bool bUserInterfaceSelection = false );
 
 
 /** @ATTENTION: these are _ONLY_ to be called by the application's
diff --git a/i18npool/source/isolang/mslangid.cxx 
b/i18npool/source/isolang/mslangid.cxx
index 06941b6..e5661da 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -379,7 +379,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 
 
 // static
-LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang )
+LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang, 
bool bUserInterfaceSelection )
 {
 switch (nLang)
 {
@@ -433,7 +433,8 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( 
LanguageType nLang )
  // Do not use ca-XV for document content.
  /* TODO: remove in case we implement BCP47 language tags. */
 case LANGUAGE_USER_CATALAN_VALENCIAN:
-nLang = LANGUAGE_CATALAN;
+if (!bUserInterfaceSelection)
+nLang = LANGUAGE_CATALAN;
 break;
 }
 return nLang;
diff --git a/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx
index 9b38297..5785322 100644
--- a/svtools/inc/svtools/langtab.hxx
+++ b/svtools/inc/svtools/langtab.hxx
@@ -43,7 +43,13 @@ public:
 SvtLanguageTable();
 ~SvtLanguageTable();
 
-const String   GetString( const LanguageType eType ) const;
+/**
+@param bUserInterfaceSelection
+If TRUE, don't replace an UI-only locale. Only use for
+ Tools-Options-LanguageSettings-UserInterface listbox.
+If FALSE, do replace.
+ */
+const String   GetString( const LanguageType eType, bool 
bUserInterfaceSelection = false ) const;
 LanguageTypeGetType( const String

[Libreoffice-commits] .: writerfilter/source

2011-12-09 Thread Cédric Bosdonnat

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1d1f049859e080b403c743f7e0604bd72475a824
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Fri Dec 9 17:04:13 2011 +0100

rtf import: Check for the first run even when getting \par

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b29fc5b..b76dceb 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1274,6 +1274,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 break;
 case RTF_PAR:
 {
+checkFirstRun();
 checkNeedPap();
 if (!m_pCurrentBuffer)
 parBreak();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - accessibility/source avmedia/source smoketestoo_native/makefile.mk UnoControls/source

 UnoControls/source/controls/framecontrol.cxx  |2 +-
 UnoControls/source/controls/progressmonitor.cxx   |6 +++---
 accessibility/source/extended/accessibleiconchoicectrl.cxx|2 +-
 accessibility/source/extended/textwindowaccessibility.cxx |2 +-
 accessibility/source/standard/accessiblemenuitemcomponent.cxx |2 +-
 accessibility/source/standard/vclxaccessiblebox.cxx   |2 +-
 accessibility/source/standard/vclxaccessibletoolboxitem.cxx   |2 +-
 avmedia/source/framework/mediacontrol.cxx |8 
 avmedia/source/viewer/mediawindow.cxx |8 
 smoketestoo_native/makefile.mk|3 +++
 10 files changed, 20 insertions(+), 17 deletions(-)

New commits:
commit b2f6fbeafc5a944e98a5511ba9fe29b5b8feb5ca
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Dec 9 22:08:22 2011 +0100

install-gdb-printers for --disable-linkoo

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index 90adceb..0e11d61 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -54,5 +54,8 @@ localinstall :
 $(RM) -r $(installationtest_instpath)
 $(MKDIRHIER) $(installationtest_instpath)
 ooinstall $(my_linkoo) $(installationtest_instpath)/opt
+.IF $(DISABLE_LINKOO) == TRUE
+install-gdb-printers -L
+.END
 cpptest : localinstall
 .END
commit f43311dfb77342f0d003bee5336215f92500f15c
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Fri Dec 9 14:00:09 2011 -0200

Fix for fdo43460, Part I, getLength to isEmpty

Part I
Modules
unoControl, accessibility and avmedia

diff --git a/UnoControls/source/controls/framecontrol.cxx 
b/UnoControls/source/controls/framecontrol.cxx
index 006924c..6b29190 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -203,7 +203,7 @@ void SAL_CALL FrameControl::createPeer( const   Reference 
XToolkit   xToo
 BaseControl::createPeer( xToolkit, xParentPeer );
 if ( impl_getPeerWindow().is() )
 {
-if( m_sComponentURL.getLength()  0 )
+if( !m_sComponentURL.isEmpty() )
 {
 impl_createFrame( getPeer(), m_sComponentURL, m_seqLoaderArguments 
);
 }
diff --git a/UnoControls/source/controls/progressmonitor.cxx 
b/UnoControls/source/controls/progressmonitor.cxx
index 52bd71a..b3a5182 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -1038,11 +1038,11 @@ sal_Bool ProgressMonitor::impl_debug_checkParameter (
 ) {
 // Check rTopic
 if ( rTopic==  NULL) return sal_False ;// NULL-pointer 
for reference ???!!!
-if ( rTopic.getLength ()   1   ) return sal_False ;// 
+if ( rTopic.isEmpty()   ) return sal_False ;// 
 
 // Check rText
 if ( rText ==  NULL) return sal_False ;// NULL-pointer 
for reference ???!!!
-if ( rText.getLength ()1   ) return sal_False ;// 
+if ( rText.isEmpty()   ) return sal_False ;// 
 
 // bbeforeProgress is valid in everyway!
 
@@ -1055,7 +1055,7 @@ sal_Bool ProgressMonitor::impl_debug_checkParameter ( 
const OUString rTopic, sa
 {
 // Check rTopic
 if ( rTopic==  NULL) return sal_False ;// NULL-pointer 
for reference ???!!!
-if ( rTopic.getLength ()   1   ) return sal_False ;// 
+if ( rTopic.isEmpty()  ) return sal_False ;// 
 
 // bbeforeProgress is valid in everyway!
 
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx 
b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index eb47993..c7894ad 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -211,7 +211,7 @@ namespace accessibility
 ensureAlive();
 
 ::rtl::OUString sName = getCtrl()-GetAccessibleName();
-if ( sName.getLength() == 0 )
+if ( sName.isEmpty() )
 sName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
IconChoiceControl ) );
 return sName;
 }
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx 
b/accessibility/source/extended/textwindowaccessibility.cxx
index 57c6378..39b332c 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1798,7 +1798,7 @@ Document::changeParagraphText(::sal_uLong nNumber, 
::sal_uInt16 nBegin, ::sal_uI
 m_rView.DeleteSelected();
 if (bPaste)
 m_rView.Paste();
-else if (rText.getLength() != 0)
+else if (!rText.isEmpty())
 m_rView.InsertText(rText);
 }
 
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx 
b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index

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

 sc/source/filter/excel/xistyle.cxx |   12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 53757e9d714d6b3cde83d5b4c390e9e2739bfb2c
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Dec 7 10:38:25 2011 -0500

fdo#43308: Set the logic straight for center across selection setting.

Another unfortunate logic change introduced via DECLARE_LIST removal.
Reverting the logic to the original one.

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

diff --git a/sc/source/filter/excel/xistyle.cxx 
b/sc/source/filter/excel/xistyle.cxx
index 1f6e680..045e753 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1833,15 +1833,9 @@ void XclImpXFRangeBuffer::SetXF( const ScAddress 
rScPos, sal_uInt16 nXFIndex, X
 if( pXF  ((pXF-GetHorAlign() == EXC_XF_HOR_CENTER_AS) || 
(pXF-GetHorAlign() == EXC_XF_HOR_FILL)) )
 {
 // expand last merged range if this attribute is set repeatedly
-if ( !maMergeList.empty() )
-{
-ScRange* pRange = maMergeList.back();
-if(  (pRange-aEnd.Row() == nScRow)
-   (pRange-aEnd.Col() + 1 == nScCol)
-   (eMode  == xlXFModeBlank)
-  )
-pRange-aEnd.IncCol();
-}
+ScRange* pRange = maMergeList.empty() ? NULL : maMergeList.back();
+if (pRange  (pRange-aEnd.Row() == nScRow)  
(pRange-aEnd.Col() + 1 == nScCol)  (eMode == xlXFModeBlank))
+pRange-aEnd.IncCol();
 else if( eMode != xlXFModeBlank )   // do not merge empty cells
 SetMerge( nScCol, nScRow );
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-12-09 Thread Kohei Yoshida

 sc/source/ui/unoobj/chart2uno.cxx |  105 +-
 1 file changed, 60 insertions(+), 45 deletions(-)

New commits:
commit 3d5e50860ea9375acad9c42f2aefbbf6d7a1866e
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Sat Dec 10 00:41:09 2011 -0500

fdo#43467: Infer number format from formula result if appropriate.

In case the data source has a formula cell, the number format may be
inferred from the formula result in case the cell format is General.

Also,

1) no need to use UNO API in the API implementation.  Let use the
   internal API here.

2) this method didn't take into account the hidden cells.

TODO: We need to handle number formats for external ref data properly.

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 1847bb0..3852e3b 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3145,80 +3145,95 @@ uno::Sequence ::rtl::OUString  SAL_CALL 
ScChart2DataSequence::generateLabel(ch
 return aSeq;
 }
 
+namespace {
+
+sal_uLong getDisplayNumberFormat(ScDocument* pDoc, const ScAddress rPos)
+{
+sal_uLong nFormat = pDoc-GetNumberFormat(rPos); // original format from 
cell.
+SvNumberFormatter* pFormatter = pDoc-GetFormatTable();
+if (!pFormatter)
+return nFormat;
+
+ScBaseCell* pCell = pDoc-GetCell(rPos);
+if (!pCell || pCell-GetCellType() != CELLTYPE_FORMULA)
+return nFormat;
+
+// With formula cell, the format may be inferred from the formula result.
+return static_castScFormulaCell*(pCell)-GetStandardFormat(*pFormatter, 
nFormat);
+}
+
+}
+
 ::sal_Int32 SAL_CALL ScChart2DataSequence::getNumberFormatKeyByIndex( 
::sal_Int32 nIndex )
 throw (lang::IndexOutOfBoundsException,
uno::RuntimeException)
 {
 // index -1 means a heuristic value for the entire sequence
 bool bGetSeriesFormat = (nIndex == -1);
-sal_Int32 nResult = 0;
 
 SolarMutexGuard aGuard;
 if ( !m_pDocument || !m_pTokens.get())
-return nResult;
-
-sal_Int32 nCount = 0;
-bool bFound = false;
-ScRange* p;
+return 0;
 
-uno::Reference sheet::XSpreadsheetDocument xSpreadDoc( 
lcl_GetSpreadSheetDocument( m_pDocument ));
-if (!xSpreadDoc.is())
-return nResult;
+// TODO: Handle external references too.
 
-uno::Referencecontainer::XIndexAccess xIndex( xSpreadDoc-getSheets(), 
uno::UNO_QUERY );
-if (!xIndex.is())
-return nResult;
+sal_Int32 nCount = 0;
 
 ScRangeList aRanges;
 ScRefTokenHelper::getRangeListFromTokens(aRanges, *m_pTokens);
-uno::Reference table::XCellRange  xSheet;
-for ( size_t rIndex = 0, nRanges = aRanges.size(); (rIndex  nRanges)  
!bFound; ++rIndex )
-{
-p = aRanges[ rIndex ];
-// TODO: use DocIter?
-table::CellAddress aStart, aEnd;
-ScUnoConversion::FillApiAddress( aStart, p-aStart );
-ScUnoConversion::FillApiAddress( aEnd, p-aEnd );
-for ( sal_Int16 nSheet = aStart.Sheet; nSheet = aEnd.Sheet  
!bFound; ++nSheet)
-{
-xSheet.set(xIndex-getByIndex(nSheet), uno::UNO_QUERY);
-for ( sal_Int32 nCol = aStart.Column; nCol = aEnd.Column  
!bFound; ++nCol)
+for (size_t i = 0, n = aRanges.size(); i  n; ++i)
+{
+ScRange* p = aRanges[i];
+for (SCTAB nTab = p-aStart.Tab(); nTab = p-aEnd.Tab(); ++nTab)
+{
+for (SCCOL nCol = p-aStart.Col(); nCol = p-aEnd.Col(); ++nCol)
 {
-for ( sal_Int32 nRow = aStart.Row; nRow = aEnd.Row  
!bFound; ++nRow)
+if (!m_bIncludeHiddenCells)
 {
+// Skip hidden columns.
+SCCOL nLastCol = -1;
+bool bColHidden = m_pDocument-ColHidden(nCol, nTab, NULL, 
nLastCol);
+if (bColHidden)
+{
+nCol = nLastCol;
+continue;
+}
+}
+
+for (SCROW nRow = p-aStart.Row(); nRow = p-aEnd.Row(); 
++nRow)
+{
+if (!m_bIncludeHiddenCells)
+{
+// Skip hidden rows.
+SCROW nLastRow = -1;
+bool bRowHidden = m_pDocument-RowHidden(nRow, nTab, 
NULL, nLastRow);
+if (bRowHidden)
+{
+nRow = nLastRow;
+continue;
+}
+}
+
+ScAddress aPos(nCol, nRow, nTab);
+
 if( bGetSeriesFormat )
 {
 // TODO: use nicer heuristic
 // return format of first non-empty cell
-uno::Reference text::XText  xText(
-xSheet-getCellByPosition(nCol,

Re: [Libreoffice] Make check from master fails in sc_datapilotfieldobj

2011-12-09 Thread Alex Thurgood


Le 08/12/2011 09:43, Markus Mohrhard a écrit :


Hi Markus,





It is fixed and it seems that you have a problem laoding the testfile.
Can you check that you can open
sc/qa/extras/testfiles/datapilotfieldobj.ods and that you don't have
any hidden lock files in this directory.



I ran the tests again yesterday after a pull/rebuild and they completed 
without error this time.



Alex

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

Re: [Libreoffice] definition of line caps for dashed lines

2011-12-09 Thread Thorsten Behrens

Regina Henschel wrote:
 So the question is, how should the new property linecap work on
 dashed lines? It is possible, that a document sets linecap = 'round'
 and dash style = 'rect', which are contradictory. I have found no
 rule in the ODF1.2 spec to solve it.
 
Hi Regina,

nice catch, sounds like a defect in the spec to me - my take is,
dash style is superseded by the svg linecaps.

 Microsoft Office has a line property Endetyp (German) with values
 'Flach', 'Rund', and 'Rechteck' which corresponds to the linecap
 property. Microsoft Office applies the property to each dash, but
 the caps are not added to the dashes. Rounding is cut of the flat
 size of the inner dashes and only added to the outer dashes.
 
Do I get that right, you say MSO only applies the caps to the very
ends of the line? At least for MSO2007, I see round caps also on all
dash elements.

Cheers,

-- Thorsten


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

[Libreoffice] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)


On 12/08/2011 05:19 PM, Michael Meeks wrote:

+ back-port Java 7 to 3.4 if no show-stopping regressions in B0 
(Stephan)
AA: + enable Java 7 in 3.4.5  check RC1 feedback (Stephan)


Support for Java 7 (both Linux and Windows) is now also enabled for the 
upcoming LO 3.4.5.  I just checked on Linux that a JRE 1.7.0_01 can be 
enabled on the Tools - Options... - LibreOffice - Java tab page, and 
that File - Wizards - Letter... (which uses Java) looks reasonable.


Would be great if somebody could check Java 7 more thoroughly, for both 
upcoming LO 3.4.5 and 3.5.


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

Re: [Libreoffice] postresql-sdbc bits out of minutes of tech. steering call

2011-12-09 Thread Alexander Thurgood

Hi,

Le 09/12/11 01:52, Lionel Elie Mamane a écrit :
 Now that I think of it, since libpq is in a path like
 /Library/PostgreSQL/9.1/lib/libpq.5.dylib, how is it supposed to be
 found by the dynamic linker at runtime? That's probably the problem,
 unless that directory is added to the equivalent of /etc/ld.so.conf on
 GNU/Linux... Try: otool -L
 /path/to/your/postgresql-sdbc-impl.uno.dylib If that's indeed the
 problem, you can solve it with the DYLD_LIBRARY_PATH envvar, but then,
 how do we fix it for *all* our users (that have an ABI-compatible
 libpq installed) automatically, since their libq.5.dylib may be at
 another path than on our build machine? Or maybe MacOS X work à la
 Microsoft Windows for libraries in that every application is supposed
 to bundle a copy of every dynamic library it uses? I wouldn't have
 expected so. 

If I compare with the postgres OXT file on Linux, the connector includes
the impl.uno file, which weighs in at 6.2Mb uncompressed. However, the
Mac OXT in comparison does not include the impl.uno file in its bundle,
so maybe it is just a packaging issue ?


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

Re: [Libreoffice] postresql-sdbc bits out of minutes of tech. steering call

2011-12-09 Thread Alexander Thurgood

Hi Lionel,


Le 09/12/11 01:52, Lionel Elie Mamane a écrit :
 Try: otool -L /path/to/your/postgresql-sdbc-impl.uno.dylib If that's
 indeed the problem, you can solve it with the DYLD_LIBRARY_PATH
 envvar, but then, how do we fix it for *all* our users (that have an
 ABI-compatible libpq installed) automatically, since their
 libq.5.dylib may be at another path than on our build machine? Or
 maybe MacOS X work à la Microsoft Windows for libraries in that
 every application is supposed to bundle a copy of every dynamic
 library it uses? I wouldn't have expected so. 

Here's my otool output :

otool -L
/Users/Shared/LO/master/connectivity/unxmacxi.pro/lib/postgresql-sdbc-impl.uno.dylib

/Users/Shared/LO/master/connectivity/unxmacxi.pro/lib/postgresql-sdbc-impl.uno.dylib:
   
@__OOO/postgresql-sdbc-impl.uno.dylib
(compatibility version 0.0.0, current version 0.0.0)
/usr/lib/libobjc.A.dylib (compatibility version 1.0.0, current
version 227.0.0)
@loader_path/../ure-link/lib/libuno_cppu.dylib.3 (compatibility
version 0.0.0, current version 0.0.0)
@loader_path/../ure-link/lib/libuno_cppuhelpergcc3.dylib.3
(compatibility version 0.0.0, current version 0.0.0)
@loader_path/../ure-link/lib/libuno_sal.dylib.3 (compatibility
version 0.0.0, current version 0.0.0)
@loader_path/../ure-link/lib/libuno_salhelpergcc3.dylib.3
(compatibility version 0.0.0, current version 0.0.0)
libpq.5.dylib (compatibility version 5.0.0, current version 5.3.0)
/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current
version 88.3.11)
/usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current
version 7.4.0)
/usr/lib/libgcc_s.1.dylib (compatibility version 1.0.0, current
version 1.0.0)


Note that I actually have 2 postgresql-sdbc-impl.uno.dylib files in my
tree, which have different sizes ! Not quite sure why, as my
understanding was that the one in solver was simply a copy of the one in
connectivity ?


Alex


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

Re: [Libreoffice] [Libreoffice-qa] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)

 Support for Java 7 (both Linux and Windows) is now also enabled for the
 upcoming LO 3.4.5.  I just checked on Linux that a JRE 1.7.0_01 can be
 enabled on the Tools - Options... - LibreOffice - Java tab page, and that
 File - Wizards - Letter... (which uses Java) looks reasonable.

 Would be great if somebody could check Java 7 more thoroughly, for both
 upcoming LO 3.4.5 and 3.5.

I'm new to this QA system, but wouldn't it be useful to know when
(date/time) this was added?

There isn't a 3.4.5 branch yet so I assume this can be tested on the
master? The latest Win daily is from Dec 7th so it probably doesn't
include that fix?

Is there a list of functions that depend on Java? Or a Java test for LO?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] definition of line caps for dashed lines

2011-12-09 Thread Regina Henschel


Hi,

Thorsten Behrens schrieb:

Regina Henschel wrote:

So the question is, how should the new property linecap work on
dashed lines? It is possible, that a document sets linecap = 'round'
and dash style = 'rect', which are contradictory. I have found no
rule in the ODF1.2 spec to solve it.


Hi Regina,

nice catch, sounds like a defect in the spec to me - my take is,
dash style is superseded by the svg linecaps.


That is my thought too. I suggest to write a mail to OASIS to remove 
attribute draw:style. (I would write it, if there is a consensus to do so.)


I don't know what to do with our 'enum DashStyle' and the element 
'style' in 'struct LineDash' in the API. It does not correspond exactly 
to ODF. It seems to me, that it is currently only used for import/export 
with the MS-formats.


'enum DashStyle' has the values RECT, ROUND, RECTRELATIVE, and 
ROUNDRELATIVE, and the ODF has for 'draw:style' the values 'rect' and 
'round' and 'svg:stroke-linecap' has the values 'butt', 'round' and 
'square', where 'butt' is without cap.


I know no lines, where dashes are actually rounded. Or do I miss something?





Microsoft Office has a line property Endetyp (German) with values
'Flach', 'Rund', and 'Rechteck' which corresponds to the linecap
property. Microsoft Office applies the property to each dash, but
the caps are not added to the dashes. Rounding is cut of the flat
size of the inner dashes and only added to the outer dashes.


Do I get that right, you say MSO only applies the caps to the very
ends of the line? At least for MSO2007, I see round caps also on all
dash elements.


In MS2010 it adds the cap only to the end. If the style is set to 
'round' then the inner dashes are transformed in a way, that the 
rounding is cut from the dashes, so that the space remains the same as 
for 'flat'. In case of 'rectangle' you see no difference to 'flat' for 
the inner dashes, but only the outer end gets a half square added in 
case of 'rectangle'.


That is different to the way the browser render the svg:stroke-linecap. 
Browser really add the caps, so that the space between the dashes become 
smaller.


There are some decisions needed:
(1) Should the element 'style' of 'struct LineDash' be preserved or 
should it be superseded with svg:stroke-linecap and a corresponding 
property 'LineCap' of 'Service LineProperties'? [Both produce some 
follow up questions.]
(2) Should the rounding for inner dashes be added to the dashes and 
reduce the space (svg kind) or should the rounding be taken from the 
dashes and preserve the space (MS kind)?


Kind regards
Regina



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

Re: [Libreoffice] [Libreoffice-qa] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)

 I'm new to this QA system, but wouldn't it be useful to know when
 (date/time) this was added?

Added where? You need to realise that we use a *distributed* version
control system, git, and time stamps are not important, as far as I
understand it.

Sure, in our case there are central repositories to which all
developers push their changes, and from which they pull changes by
others. But that is just our convention. And still, time stamps don't
necessarily make much sense. All repositories in principle are equal,
and there is no hierarchy in a strict sense (except by convention).

Would you be interested in the time stamp when a change was committed
to the developer's local repository? Or when it was pushed to our
central repository? Or when it was pulled from there into the build
machine's repository?

I am not a git expert at all, but the above is my understanding...
that time stamps in git are informational only and can and should not
be used to say if something happened before something else, for
instance. (Indeed, when you push commits from your local clone, which
might be several days old, they just get appended after newer commits
already in the remote repo.)

Anyway, you can check the git logs at
http://cgit.freedesktop.org/libreoffice/core/ . It's easy for the
master branch where all the code is in a single repository, core.
For the 3-4 branch, we use several repositories. The Java 1.7
recognising code we are talking about in this thread in is in the
ure repository,
http://cgit.freedesktop.org/libreoffice/ure/?h=libreoffice-3-4

 There isn't a 3.4.5 branch yet so I assume this can be tested on the master?

Well, master is quite far from the liboreoffice-3-4 branch.

 The latest Win daily is from Dec 7th so it probably doesn't
 include that fix?

That change has been in master for a long time.

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

Re: [Libreoffice] [Libreoffice-qa] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)

Hi Pedro,

On Fri, 2011-12-09 at 10:05 +, Pedro Lino wrote:
  Would be great if somebody could check Java 7 more thoroughly, for both
  upcoming LO 3.4.5 and 3.5.
...
 There isn't a 3.4.5 branch yet so I assume this can be tested on the
 master ? The latest Win daily is from Dec 7th so it probably doesn't
 include that fix?

Yes - you can test either on master or a libreoffice-3-4 build (RC1
will be coming next week or so I think).

 Is there a list of functions that depend on Java? Or a Java test for LO?

Not really; perhaps litmus has some Java related data ? things like the
hsqldb (default database backend) use Java, also the Wizards currently
still use Java (File-Wizard etc.) - there are also some Java samples we
ship I suspect in the macros menu. The nlpsolver is Java, the wiki
publisher, and base report-builder.

HTH,

Michael.

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

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

Re: [Libreoffice] [Libreoffice-qa] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)

Hi Tor, all

Thank you for all the replies

 Added where? You need to realise that we use a *distributed* version
 control system, git, and time stamps are not important, as far as I
 understand it.

Yes, I do realize. They still are important if you are using daily
builds from the central repository.

 Would you be interested in the time stamp when a change was committed
 to the developer's local repository? Or when it was pushed to our
 central repository? Or when it was pulled from there into the build
 machine's repository?

I'm interest in the time a change was committed to the central
repository by a developer (in this case the Java 1.7 change) which can
(I hope!) be compared to the pull time of the dailies in the
tinderboxes.

If this doesn't work this way, please let me know! :)

 There isn't a 3.4.5 branch yet so I assume this can be tested on the master?

 Well, master is quite far from the liboreoffice-3-4 branch.

Fixes applied to the 3.4 branch were added back to the master (I
hope). So until a 3.4.5 build is released this is the nearest approach
to test back ;)

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

Re: [Libreoffice] minutes of tech. steering call ...


On Thu, 2011-12-08 at 16:19 +, Michael Meeks wrote:
 * gtk3 backend
   + change the configure to default to 'on' for this
   + not feasible to build on our legacy machines

So - just to wind Fridrich up ;-) I had a wonderful idea of making a
'stubify' perl script that would provide an ABI identical (but empty)
library (via some custom assembler) / pkgconfig files etc. such that we
could compile  link the gtk3 backend even on really old systems.

Not done yet, but ... on the TODO stack ;-)

HTH,

Michael.

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

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

Re: [Libreoffice] [Libreoffice-qa] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)

Hi Michael

 There isn't a 3.4.5 branch yet so I assume this can be tested on the
 master ? The latest Win daily is from Dec 7th so it probably doesn't
 include that fix?

        Yes - you can test either on master or a libreoffice-3-4 build (RC1
 will be coming next week or so I think).

Excellent. Thank you for the confirmation.

        Not really; perhaps litmus has some Java related data ? things like the
 hsqldb (default database backend) use Java, also the Wizards currently
 still use Java (File-Wizard etc.) - there are also some Java samples we
 ship I suspect in the macros menu. The nlpsolver is Java, the wiki
 publisher, and base report-builder.

This sure helps ;)

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

Re: [Libreoffice] [Libreoffice-qa] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)

 I'm interest in the time a change was committed to the central
 repository by a developer

But developers don't commit to the central repository. They commit to
their local clones of it, and then at some (much) later stage push
outstanding commits to the central repository. And then there are
feature branches and merges...

  Fixes applied to the 3.4 branch were added back to the master (I
 hope).

In this case (and usually) it is the other way around: Fixes are done
on master, and those deemed good and important are cherry-picked to
a stable branch. (Although technically, as we use different repository
structure for master and 3-4 (single core vs. a bunch), it isn't a
cherry-pick.)

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

Re: [Libreoffice] [Libreoffice-qa] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)

 But developers don't commit to the central repository. They commit to
 their local clones of it, and then at some (much) later stage push
 outstanding commits to the central repository. And then there are
 feature branches and merges...

Ok. Wrong wording. What I meant was the time a change was pushed to
the central repository by a developer which is comparable to the pull
time from the central repository.

 In this case (and usually) it is the other way around: Fixes are done
 on master, and those deemed good and important are cherry-picked to
 a stable branch. (Although technically, as we use different repository
 structure for master and 3-4 (single core vs. a bunch), it isn't a
 cherry-pick.)

Excellent. Then all good changes are in the master already :)

Thank you for the clarification ;)

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

Re: [Libreoffice] Make check from master fails in sc_datapilotfieldobj


On Thu, 2011-12-08 at 12:54 +0100, Michael Stahl wrote:
 it looks like this is only evaluated in the low-level osl file
 implementation, and thus completely orthogonal to the question of how to
 get the high-level framework stuff to not write a lock file.

Ah - what fun; locking is an onion it seems, it makes you cry when you
cut into it ;-)

Thanks,

Michael.

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

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

Re: [Libreoffice] postresql-sdbc bits out of minutes of tech. steering call

2011-12-09 Thread Lionel Elie Mamane

On Fri, Dec 09, 2011 at 10:35:51AM +0100, Alexander Thurgood wrote:
 Le 09/12/11 01:52, Lionel Elie Mamane a écrit :

 Now that I think of it, since libpq is in a path like
 /Library/PostgreSQL/9.1/lib/libpq.5.dylib, how is it supposed to be
 found by the dynamic linker at runtime?

 If I compare with the postgres OXT file on Linux, the connector includes
 the impl.uno file, which weighs in at 6.2Mb uncompressed. However, the
 Mac OXT in comparison does not include the impl.uno file in its bundle,
 so maybe it is just a packaging issue ?

That would indeed make it not work, as this contains the actual
driver!

But I'm clueless as to why that is so. The Mac OS .oxt file has
postgresql-sdbc.uno.dylib, but not postgresql-sdbc-impl.uno.dylib if I
understand right?

Maybe I can find a clue in verbose build log of postgresql-sdbc?
Here's how to get one:

source Env.Host.sh
cd connectivity
find unxmac* -name '*postgresql*' -or -name 'pq_*' | xargs rm
build verbose=T 21 | tee build.log

And then the build log is in file build.log

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

[Libreoffice] [REVIEWED] fdo#42147: fix crash

Hi Ivan,

On Fri, 2011-12-09 at 09:44 +0400, Ivan Timofeev wrote:
 Oh no, wait, I was getting all mixed up :(
 This is not a fix for the mentioned bug, the proper fix was
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=3524727db0f3cfecf3a47046795c527808c10c3e
 which is now backported to 3-4.

So - it seems there is no review necessary now ? :-)

Thanks,

Michael.

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

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

Re: [Libreoffice] odd ND_FOONODE bits was fdo#42147: fix crash

On Fri, 2011-12-09 at 09:44 +0400, Ivan Timofeev wrote:
 08.12.2011 23:36, Ivan Timofeev пишет:
 This is not a fix for the mentioned bug, the proper fix was
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=3524727db0f3cfecf3a47046795c527808c10c3e
 which is now backported to 3-4.

I wouldn't call my fix a great solution, more of a band-aid, but good to
know it makes the crash go away.

Looking at your original patch anyway it looks right to me. Can't cast
something whose NodeType is ND_CONTENTNODE which is a superset of the
ND_TEXTNODE bits to a SwTxtNode seeing as a SwTxtNode inherits from
SwCntntNode so not all SwCntntNodes are SwTxtNodes.

It's all a little strange, i.e. 
ND_TEXTNODE of 0x08 and a
ND_CONTENTNODE of 0x38
with
inline sal_Bool SwNode::IsCntntNode() const
{
return ND_CONTENTNODE  nNodeType  ? sal_True : sal_False;
}

inline sal_Bool SwNode::IsTxtNode() const
{
return ND_TEXTNODE == nNodeType  ? sal_True : sal_False;
}

sees very odd. It suggests that IsCntntNode on a SwTxtNode is false,
even though a SwTxtNode isa SwCntntNode.

Looking at...
const BYTE ND_TEXTNODE  = 0x08;
const BYTE ND_GRFNODE   = 0x10;
const BYTE ND_OLENODE   = 0x20;
const BYTE ND_CONTENTNODE   = 0x38;
const BYTE ND_NOTXTNODE = 0x30;
and then http://docs.libreoffice.org/sw/html/classSwCntntNode.html
this is equivalent to
const BYTE ND_GRFNODE   = 0x10;
const BYTE ND_OLENODE   = 0x20;
const BYTE ND_NOTXTNODE = ND_GRFNODE | ND_OLENODE;
const BYTE ND_TEXTNODE  = 0x08;
const BYTE ND_CONTENTNODE   = ND_NOTXTNODE | ND_TEXTNODE;
this presumably is the derivation of the bits.

These bits seem inverted in the sense that the default bits for a
baseclass are the superset of all possible derived class bits!?

On the other hand

const BYTE ND_STARTNODE = 0x02;
const BYTE ND_TABLENODE = 0x06;
const BYTE ND_SECTIONNODE   = 0x42;

is equivalent to 
const BYTE ND_STARTNODE = 0x02;
const BYTE ND_TABLENODE = 0x04 | ND_STARTNODE;
const BYTE ND_SECTIONNODE   = 0x40 | ND_STARTNODE;

and the hierarchy there is
http://docs.libreoffice.org/sw/html/classSwStartNode.html
i.e. more derived class *add* more bits, which makes far more sense.

caolanm-mstahl: Any insights here into why this is the way it is ?
Under what circumstances *can* IsCntntNode be true, I mean on a casual
inspection do we have any bare SwCntntNodes in existance, as opposed to
things that inherit from it and set a different NodeType
http://docs.libreoffice.org/sw/html/classSwCntntNode.html

C.

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

Re: [Libreoffice] [REVIEW 3-4] fdo#42147: fix crash

On 09/12/11 06:44, Ivan Timofeev wrote:
 Oh no, wait, I was getting all mixed up :(
 This is not a fix for the mentioned bug, the proper fix was
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=3524727db0f3cfecf3a47046795c527808c10c3e
 which is now backported to 3-4.
 
 Heh, excuse my having done so! I tested the bug with master and there 
 was a crash, but after my patch there was not. Then I lost my sanity and 
 went wrong way...

hi Ivan,

don't worry, losing one's sanity is just the natural reaction to
continued exposure to Writer code  :)

perhaps we should put up warning signs...

regards,
 michael

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

Re: [Libreoffice] how to acquire an ScDocument reference from scratch

2011-12-09 Thread Kevin Hunter


At 4:47pm -0500 Thu, 08 Dec 2011, Michael Meeks wrote:

On Thu, 2011-12-08 at 13:05 -0500, Kevin Hunter wrote:

More specifically, I wish there were a way to run exactly and only
one test (i.e. a single ::testFunction()).


Fine, sounds like a worthy goal. I suggest you hack cppunit to add
some magic macro wrappers to stringify the function name, and allow
some run-time parameter that will filter the tests immediately on
entry down to the one you want.


Oh!  I didn't realize cppunit was open for hacking from our end.  Let's 
see ... looking through that directory then ... the basic workflow is to 
write a patch to apply before we compile Cppunit, yes?



Also - it seems Noel Grandin is working on a (somewhat different)
re-hash of the note storage thing in his tree - worth not treading
on his feet there; but of course the more unit tests for note stuff
the merrier.


Cheers.  If Noel is working on that, then I'll turn my attention to 
something along the test lines.  Given my $REAL_LIFE constraints, maybe 
what I work on should fall farther from the LO critical path ...


Thanks,

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

Re: [Libreoffice] how to acquire an ScDocument reference from scratch

2011-12-09 Thread Noel Grandin

I don't have any unit tests in my tree yet, so feel free to go ahead.

-- Noel Grandin

Kevin Hunter wrote:
 At 4:47pm -0500 Thu, 08 Dec 2011, Michael Meeks wrote:
 On Thu, 2011-12-08 at 13:05 -0500, Kevin Hunter wrote:
 More specifically, I wish there were a way to run exactly and only
 one test (i.e. a single ::testFunction()).

 Fine, sounds like a worthy goal. I suggest you hack cppunit to add
 some magic macro wrappers to stringify the function name, and allow
 some run-time parameter that will filter the tests immediately on
 entry down to the one you want.

 Oh!  I didn't realize cppunit was open for hacking from our end.  Let's see 
 ... looking through that directory then
 ... the basic workflow is to write a patch to apply before we compile 
 Cppunit, yes?

 Also - it seems Noel Grandin is working on a (somewhat different)
 re-hash of the note storage thing in his tree - worth not treading
 on his feet there; but of course the more unit tests for note stuff
 the merrier.

 Cheers.  If Noel is working on that, then I'll turn my attention to something 
 along the test lines.  Given my
 $REAL_LIFE constraints, maybe what I work on should fall farther from the LO 
 critical path ...

 Thanks,

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


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


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

Re: [Libreoffice] [REVIEWED] fdo#42147: fix crash

2011-12-09 Thread Ivan Timofeev


09.12.2011 15:26, Michael Meeks пишет:

Hi Ivan,

On Fri, 2011-12-09 at 09:44 +0400, Ivan Timofeev wrote:

Oh no, wait, I was getting all mixed up :(
This is not a fix for the mentioned bug, the proper fix was
http://cgit.freedesktop.org/libreoffice/core/commit/?id=3524727db0f3cfecf3a47046795c527808c10c3e
which is now backported to 3-4.


So - it seems there is no review necessary now ? :-)


Yeah, and is there any way to exclude my commits from the bugfix log? It 
is autogenerated from the git history, isn't it?


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

Re: [Libreoffice] how to acquire an ScDocument reference from scratch

2011-12-09 Thread Kevin Hunter


At 7:03am -0500 Fri, 09 Dec 2011, Noel Grandin wrote:

I don't have any unit tests in my tree yet, so feel free to go
ahead.


Ah, what I'm going to be working on is the implementation of Cppunit for 
us such that we can have some niceties that would have helped me 
tremendously while getting up to speed with Calc and the ScPostIt 
stuffs.  Not unit tests per se.


I did write a couple of unit tests in that patch I sent your way a week 
ago, and some comments on some of the unit tests that I thought needed 
to be added, if you'd like to harvest so of that thought-process.


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

Re: [Libreoffice] odd ND_FOONODE bits was fdo#42147: fix crash

On 09/12/11 12:34, Caolán McNamara wrote:
 On Fri, 2011-12-09 at 09:44 +0400, Ivan Timofeev wrote:
 08.12.2011 23:36, Ivan Timofeev пишет:
 This is not a fix for the mentioned bug, the proper fix was
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=3524727db0f3cfecf3a47046795c527808c10c3e
 which is now backported to 3-4.
 
 I wouldn't call my fix a great solution, more of a band-aid, but good to
 know it makes the crash go away.
 
 Looking at your original patch anyway it looks right to me. Can't cast
 something whose NodeType is ND_CONTENTNODE which is a superset of the
 ND_TEXTNODE bits to a SwTxtNode seeing as a SwTxtNode inherits from
 SwCntntNode so not all SwCntntNodes are SwTxtNodes.

but the previous test was on ND_TEXTNODE, so the patch shouldn't change
the behaviour, it is however a nice stylistic cleanup

 It's all a little strange, i.e. 
 ND_TEXTNODE of 0x08 and a
 ND_CONTENTNODE of 0x38
 with
 inline sal_Bool SwNode::IsCntntNode() const
 {
 return ND_CONTENTNODE  nNodeType  ? sal_True : sal_False;
 }
 
 inline sal_Bool SwNode::IsTxtNode() const
 {
 return ND_TEXTNODE == nNodeType  ? sal_True : sal_False;
 }
 
 sees very odd. It suggests that IsCntntNode on a SwTxtNode is false,
 even though a SwTxtNode isa SwCntntNode.

indeed; it also seems that SwNode::GetCntntNode only returns 0

d'oh!  no, we are just unable to read  correctly:
if _any_ of the bits in 0x38 is set in the nNodeType, then the 
evaluates to true; so it doesn't seem broken after all.

 Looking at...
 const BYTE ND_TEXTNODE  = 0x08;
 const BYTE ND_GRFNODE   = 0x10;
 const BYTE ND_OLENODE   = 0x20;
 const BYTE ND_CONTENTNODE   = 0x38;
 const BYTE ND_NOTXTNODE = 0x30;
 and then http://docs.libreoffice.org/sw/html/classSwCntntNode.html
 this is equivalent to
 const BYTE ND_GRFNODE   = 0x10;
 const BYTE ND_OLENODE   = 0x20;
 const BYTE ND_NOTXTNODE = ND_GRFNODE | ND_OLENODE;
 const BYTE ND_TEXTNODE  = 0x08;
 const BYTE ND_CONTENTNODE   = ND_NOTXTNODE | ND_TEXTNODE;
 this presumably is the derivation of the bits.
 
 These bits seem inverted in the sense that the default bits for a
 baseclass are the superset of all possible derived class bits!?
 
 On the other hand
 
 const BYTE ND_STARTNODE = 0x02;
 const BYTE ND_TABLENODE = 0x06;
 const BYTE ND_SECTIONNODE   = 0x42;
 
 is equivalent to 
 const BYTE ND_STARTNODE = 0x02;
 const BYTE ND_TABLENODE = 0x04 | ND_STARTNODE;
 const BYTE ND_SECTIONNODE   = 0x40 | ND_STARTNODE;
 
 and the hierarchy there is
 http://docs.libreoffice.org/sw/html/classSwStartNode.html
 i.e. more derived class *add* more bits, which makes far more sense.

hmm.. would be nice if that were more consistent...

 caolanm-mstahl: Any insights here into why this is the way it is ?

well i can only speculate, but perhaps it all makes more sense after
consuming sufficient amounts of mind altering substances.

 Under what circumstances *can* IsCntntNode be true, I mean on a casual
 inspection do we have any bare SwCntntNodes in existance, as opposed to
 things that inherit from it and set a different NodeType

i don't believe we ever instantiate bare SwCntntNodes, only its subclasses.

the SwCntntNode also has other bizarre aspects like the whole SwIndexReg
and Len() thing that is only actually used by SwTxtNode...

perhaps many years ago there was another subclass of SwCntntNode, there
is a comment:

// Returns count of elements of node content. Default is 1.
// There are differences between text node and formula node.
virtual xub_StrLen Len() const;

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

Re: [Libreoffice] [Libreoffice-qa] QA ideas for 3.5 WAS Re: Improving the QA and Release for 3.5

2011-12-09 Thread Cor Nouws


Cor Nouws wrote (29-11-11 21:36)


Will post more details soon :-)


Ah well, what is soon ;-)

On the wiki, I added a section with the draft for the later to create 
separate wiki page:

http://wiki.documentfoundation.org/QA/Improving_QA-Release-3.5#DRAFT_for_page_with_info_for_bug-hunting_session

Theme   Make version 3.5.0 a great one!  

Suggestions welcome!

Cheers,

--
 - Cor
 - http://nl.libreoffice.org

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

Re: [Libreoffice] bug in Jar_ScriptProviderForJava.mk?

I ran into the same problem today, and I think I fixed it by using a
variable called T_CP instead of CLASSPATH in gbuild to collect the -cp
option to be passed to javac. (Which is cleaner, too, as  the Java
CLASSPATH  concept and the -cp option to the Java compiler are
different things.) Pushed to master. I have no idea why this helps,
and why this problem was seen only on Windows...

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

Re: [Libreoffice] how to acquire an ScDocument reference from scratch


On 12/09/2011 12:55 PM, Kevin Hunter wrote:

At 4:47pm -0500 Thu, 08 Dec 2011, Michael Meeks wrote:

On Thu, 2011-12-08 at 13:05 -0500, Kevin Hunter wrote:

More specifically, I wish there were a way to run exactly and only
one test (i.e. a single ::testFunction()).


Fine, sounds like a worthy goal. I suggest you hack cppunit to add
some magic macro wrappers to stringify the function name, and allow
some run-time parameter that will filter the tests immediately on
entry down to the one you want.


Oh! I didn't realize cppunit was open for hacking from our end. Let's


Not really.  Keep in mind that LO's configure has --with-system-cppunit, 
which people do make use of.  The existing patches fix bugs or warnings, 
and should have been upstreamed if there were a living upstream.  They 
do not introduce features.


That said, AFAIU, xUnit in general and CppUnit in particular does 
support the notion of finer-grained test suites, allowing one to execute 
only a subset of a given set of tests.  Never looked into how that 
works, though.


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

Re: [Libreoffice] 3.6 features page ...

Hi,

On Thursday, 2011-12-08 10:27:24 +, Michael Meeks wrote:

 On Wed, 2011-12-07 at 22:07 -0500, August Sodora wrote:
  I have removed the testtool and am listing the relevant commits here
  (http://wiki.documentfoundation.org/User:Augsod) for future reference.
 
   Nice :-) which reminds me; I created this for features that missed
 3.5 ...
 
   http://wiki.documentfoundation.org/ReleaseNotes/3.6
 
   Perhaps a cleanup section, with this included would be good.

Due to my invasive rebase failure on Wednesday, the testtool removal is
already in 3-5
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=0451f4cfa683d6fa8491ae05bd206927e3b567a2

  Eike

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


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

Re: [Libreoffice] modules are inconsistent/missing during make dev-install


On 12/08/2011 03:35 PM, Terrence Enger wrote:

I just noticed that `make dev-install` has been producing
messages ...

|   WARNING(S):
|   Following modules are inconsistent/missing: instsetoo_native


Saw that one too, and it is bogus.  Apparently fallout from the recent 
get-make-working-correctly-again saga.


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

Re: [Libreoffice] odd ND_FOONODE bits was fdo#42147: fix crash

2011-12-09 Thread Lubos Lunak

On Friday 09 of December 2011, Michael Stahl wrote:
 On 09/12/11 12:34, Caolán McNamara wrote:
  caolanm-mstahl: Any insights here into why this is the way it is ?

 well i can only speculate, but perhaps it all makes more sense after
 consuming sufficient amounts of mind altering substances.

  Under what circumstances *can* IsCntntNode be true, I mean on a casual
  inspection do we have any bare SwCntntNodes in existance, as opposed to
  things that inherit from it and set a different NodeType

 i don't believe we ever instantiate bare SwCntntNodes, only its subclasses.

 There are no SwCntntNode instances, that can be quite easily checked by 
explicitly marking the dtor as pure virtual. And even enforced, if that's the 
idea, I could commit that, but I try to stay away from mind altering 
substances and core/docnode/nodes.cxx does instantiate SwNode, so I really 
don't know.

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

Re: [Libreoffice] postresql-sdbc bits out of minutes of tech. steering call


On 12/09/2011 10:44 AM, Alexander Thurgood wrote:

otool -L
/Users/Shared/LO/master/connectivity/unxmacxi.pro/lib/postgresql-sdbc-impl.uno.dylib

/Users/Shared/LO/master/connectivity/unxmacxi.pro/lib/postgresql-sdbc-impl.uno.dylib:

@__OOO/postgresql-sdbc-impl.uno.dylib
(compatibility version 0.0.0, current version 0.0.0)
 /usr/lib/libobjc.A.dylib (compatibility version 1.0.0, current
version 227.0.0)
 @loader_path/../ure-link/lib/libuno_cppu.dylib.3 (compatibility
version 0.0.0, current version 0.0.0)
 @loader_path/../ure-link/lib/libuno_cppuhelpergcc3.dylib.3
(compatibility version 0.0.0, current version 0.0.0)
 @loader_path/../ure-link/lib/libuno_sal.dylib.3 (compatibility
version 0.0.0, current version 0.0.0)
 @loader_path/../ure-link/lib/libuno_salhelpergcc3.dylib.3
(compatibility version 0.0.0, current version 0.0.0)
 libpq.5.dylib (compatibility version 5.0.0, current version 5.3.0)


That way it won't be found at runtime.  If it is a lib from the system, 
it should have an absolute path (like the ones below), if it is part of 
LO it should be referenced relatively via @loader_path (like the ones 
above).



 /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current
version 88.3.11)
 /usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current
version 7.4.0)
 /usr/lib/libgcc_s.1.dylib (compatibility version 1.0.0, current
version 1.0.0)


Note that I actually have 2 postgresql-sdbc-impl.uno.dylib files in my
tree, which have different sizes ! Not quite sure why, as my
understanding was that the one in solver was simply a copy of the one in
connectivity ?


For still-dmake-based modules, libraries are stripped when copied from 
the local output tree to solver.


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

Re: [Libreoffice] odd ND_FOONODE bits was fdo#42147: fix crash

On Fri, 2011-12-09 at 13:31 +0100, Michael Stahl wrote:
 On 09/12/11 12:34, Caolán McNamara wrote:
  
  Looking at your original patch anyway it looks right to me. Can't cast
  something whose NodeType is ND_CONTENTNODE which is a superset of the
  ND_TEXTNODE bits to a SwTxtNode seeing as a SwTxtNode inherits from
  SwCntntNode so not all SwCntntNodes are SwTxtNodes.
 
 The previous test was on ND_TEXTNODE, so the patch shouldn't change
 the behaviour, it is however a nice stylistic cleanup

Just to be clear, given my later confusion, in the good case where it
is a SwTxtNode there is no change, while if it was somehow a underived
SwCntntNode there would be a desirable change in behaviour.

const sal_uInt8 ND_CONTENTNODE  = 0x38;
const sal_uInt8 ND_TEXTNODE = 0x08;

inline sal_Bool SwNode::IsTxtNode() const
{
return ND_TEXTNODE == nNodeType  ? sal_True : sal_False;
}

nNdTyp = ND_CONTENTNODE; //evil

- if( ND_TEXTNODE  nNdTyp )
^^^ would be 8, i.e. true
+ if( rNd.IsTxtNode() )
^^^ would be false

nNdTyp = ND_TEXTNODE; //good

- if( ND_TEXTNODE  nNdTyp )
^^^ would be 8, i.e. true
+ if( rNd.IsTxtNode() )
^^^ would be true


  It's all a little strange, i.e. 
  ND_TEXTNODE of 0x08 and a
  ND_CONTENTNODE of 0x38
  with
  inline sal_Bool SwNode::IsCntntNode() const
  {
  return ND_CONTENTNODE  nNodeType  ? sal_True : sal_False;
  }
 
 d'oh!  no, we are just unable to read  correctly:
 if _any_ of the bits in 0x38 is set in the nNodeType, then the 
 evaluates to true; so it doesn't seem broken after all.

*slap forehead*, sigh, indeed. SwTxtNodes are SwCntntNodes alright wrt 
ND_CONTENTNODE  ND_TEXTNODE.

Ah well, its probably worth munging in the derivation of the bits as |
of the super-class bits anyway so its a little more clear. Should ditch
this in favour of real rtti if there's no gotchass.

C.

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

Re: [Libreoffice] odd ND_FOONODE bits was fdo#42147: fix crash

On Fri, 2011-12-09 at 14:20 +0100, Lubos Lunak wrote:
  There are no SwCntntNode instances, that can be quite easily checked by 
 explicitly marking the dtor as pure virtual. And even enforced, if that's the 
 idea, I could commit that.

Seems sane, worth a shot.

 substances and core/docnode/nodes.cxx does instantiate SwNode, so I really 

All of these are new SwNode( aIdx, ND_SECTIONDUMMY ); ?, Not sure what
all that's about, but could add a SwDummySectionNode or something of
that nature to allow removing raw SwNode instantiation.

C.

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

[Libreoffice] SAL_INFO usage (was: [Libreoffice-commits] .: writerfilter/source)


On 12/08/2011 09:45 PM, Cédric Bosdonnat wrote:

@@ -102,7 +102,7 @@ sal_Bool RtfFilter::filter( const uno::Sequence  
beans::PropertyValue  aDescri
  catch (const uno::Exception  e)
  {
  #if OSL_DEBUG_LEVEL  1
-OSL_TRACE( Exception caught: %s,
+SAL_INFO(writerfilter, Exception caught: 
  rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 
).getStr() );
  #endif
  (void)e;


For one, the #if OSL_DEBUG_LEVEL 1 condition can be removed (SAL_INFO 
handles that well enough internally, in combination with the SAL_LOG 
environment variable), together with the (void)e; -- the arguments to 
SAL_INFO are visible to the compiler regardless of OSL_DEBUG_LEVEL and 
DBG_UTIL settings, so it never considers e unused.


For another, #include rtl/oustringostreaminserter.hxx overloads 
std::ostream's  for rtl::OUString, so the catch block can be 
simplified to just


  {
 SAL_INFO(writerfilter, Exception caught:   e.Message);
  }

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

[Libreoffice] What is bibisect? And what is it doing in my office?

Hi all,

bibisect stands for binary bisect and is intended to help QA for LibreOffice
3.5. Regressions are a most annoying artifact that unfortunately come with
software development and QA. However, regressions are a misfeature we want to
deal with quick and early as they might get harder and harder to triage and fix
as time passes. 

Because the way git stores its stuff, this download:

 http://people.canonical.com/~bjoern/bibisect-3.5.lzma

contains:

 - 53 complete office installs between the creation of the core repo and the
   -3-5 branchoff (thats 5000 commits) 
 - at 450MB each, that would be ~22GB total
 - however, it is only 749MB total download size, thats 15MB per installation

And one does not need to install them in parallel as one can switch through all
of them with a quick git checkout source-hash-XX -- one switch costs 1
second).

As developers are helped extraordinary by knowing as exact as possible when
some regression first showed up in the product there is some value in making
this task as easy and fast as possible. In source code there is the possibility
to bisect:

 http://book.git-scm.com/5_finding_issues_-_git_bisect.html

and with the core repository, we have -- in theory -- the ability to exactly
identify where the regression was introduced. In theory, because you need a
compile and install to triage the bug and different from most other projects,
this still takes quite some time for LibreOffice and thus we cannot fix
regressions as quick as we should.

This is were bibisect comes in: It contains fully completed LibreOffice
installations between two major releases(1) and you can bisect your regression
(to identify when the offending change happened). Once the range where the bug
was introduced is identified, developers will be much more eager to fix the
issue (as the scope can not only be guessed better, it is also known to be
quite limited now).

Bibisect also has the binary installs tagged with the commit-id from the source
repository -- which is the only thing identifying a build that really helps
developers. And by the order they are on the branch one can quickly see which
build is older and which is newer.

The script this was generated with(2) is here:

  http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/bibisect

and I sincerly wish it is worth the carbon footprint needed to generate the
output in the last days. ;)

So I hope with this, we make regression finding some more fun and allow us --
QA and developers together -- to stabilize this release more quickly that ever
before.

If there are questions about how bisecting works, I am pretty sure developers
will be happy to help out people interested to get started as this allows us to
distribute the work on more shoulders.

Opinions/Comments?

Best,

Bjoern

(1) Not quite for 3.4-3.5 as the stuff as is only works from the point in time,
where we merged repositories, but from the merge point (early August 2011) to
the point of 3.5 branchoff (early December).

(2) Almost: I forgot to disable-oolink, so I had to filter the branch to tweak
the links again. :-/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] how to acquire an ScDocument reference from scratch

2011-12-09 Thread Kevin Hunter


At 8:05am -0500 Fri, 09 Dec 2011, Stephan Bergmann wrote:

On 12/09/2011 12:55 PM, Kevin Hunter wrote:

Oh! I didn't realize cppunit was open for hacking from our end.



Not really. Keep in mind that LO's configure has
--with-system-cppunit, which people do make use of. The existing
patches fix bugs or warnings, and should have been upstreamed if
there were a living upstream. They do not introduce features.


Oh.  Back to square 1.5.


That said, AFAIU, xUnit in general and CppUnit in particular does
support the notion of finer-grained test suites, allowing one to
execute only a subset of a given set of tests. Never looked into how
that works, though.


Thank you.  I was hoping as much.  In any event, gots to study what's 
available to me with my couple hours a week ...


Cheers,

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

Re: [Libreoffice] What is bibisect? And what is it doing in my office?

On Fri, 2011-12-09 at 14:59 +0100, Bjoern Michaelsen wrote:
  http://people.canonical.com/~bjoern/bibisect-3.5.lzma
 
 contains:
 
  - 53 complete office installs between the creation of the core repo and the
-3-5 branchoff (thats 5000 commits) 
  - at 450MB each, that would be ~22GB total
  - however, it is only 749MB total download size, thats 15MB per installation
 
 And one does not need to install them in parallel as one can switch through 
 all
 of them with a quick git checkout source-hash-XX -- one switch costs 1
 second).

That is fairly amazing :-)

C.

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

Re: [Libreoffice] What is bibisect? And what is it doing in my office?


On 12/09/2011 02:59 PM, Bjoern Michaelsen wrote:

(2) Almost: I forgot to disable-oolink, so I had to filter the branch to tweak
the links again. :-/


Note that configure now has --disable-oolink.  In case you'll do this 
again for 3.5--3.6.


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

Re: [Libreoffice] What is bibisect? And what is it doing in my office?

Hi,

On Fri, Dec 09, 2011 at 03:12:53PM +0100, Stephan Bergmann wrote:
 On 12/09/2011 02:59 PM, Bjoern Michaelsen wrote:
 (2) Almost: I forgot to disable-oolink, so I had to filter the branch to 
 tweak
 the links again. :-/
 
 Note that configure now has --disable-oolink.  In case you'll do
 this again for 3.5--3.6.

Already commited like that:
http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/bibisect/build.sh#n37

Best,

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

Re: [Libreoffice] how to acquire an ScDocument reference from scratch

2011-12-09 Thread Noel Grandin

If there is no living upstream, surely we shouldn't let the current state of 
affairs hold us back?
Why not add the features we need, and remove --with-system-cppunit?

I see unit-testing as a project-internal thing anyhow, and it's a build-time 
dependency, not a run-time dependency, so I
don't see --with-system-cppunit as being that important.
But I could be wrong?

I'd just hate to see our unit-testing efforts held back by the lack of an 
upstream

Stephan Bergmann wrote:
 On 12/09/2011 12:55 PM, Kevin Hunter wrote:
 At 4:47pm -0500 Thu, 08 Dec 2011, Michael Meeks wrote:
 On Thu, 2011-12-08 at 13:05 -0500, Kevin Hunter wrote:
 More specifically, I wish there were a way to run exactly and only
 one test (i.e. a single ::testFunction()).

 Fine, sounds like a worthy goal. I suggest you hack cppunit to add
 some magic macro wrappers to stringify the function name, and allow
 some run-time parameter that will filter the tests immediately on
 entry down to the one you want.

 Oh! I didn't realize cppunit was open for hacking from our end. Let's

 Not really.  Keep in mind that LO's configure has --with-system-cppunit, 
 which people do make use of.  The existing
 patches fix bugs or warnings, and should have been upstreamed if there were a 
 living upstream.  They do not introduce
 features.

 That said, AFAIU, xUnit in general and CppUnit in particular does support the 
 notion of finer-grained test suites,
 allowing one to execute only a subset of a given set of tests.  Never looked 
 into how that works, though.

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


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


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

Re: [Libreoffice] What is bibisect? And what is it doing in my office?

Hi Bjoern,

On Friday, 2011-12-09 14:59:53 +0100, Bjoern Michaelsen wrote:

 bibisect stands for binary bisect

Way cool!

  Eike

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


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

Re: [Libreoffice] What is bibisect? And what is it doing in my office?


On Fri, 2011-12-09 at 14:59 +0100, Bjoern Michaelsen wrote:
 bibisect stands for binary bisect and is intended to help QA for LibreOffice
 3.5. Regressions are a most annoying artifact that unfortunately come with
 software development and QA.

Wow - I assume this was the cryptic  magic item you wanted to discuss
at the TSC next week :-)

 If there are questions ...

How did you get so awesome ? :-)

A couple of points:

+ a quick re-send to the libreoffice...@lists.freedesktop.org
  would be cool :-) so more QA guys get it.

+ are these binaries 'generic' ? ie. did you build them
  on an old enough distribution, with a clean enough config
  that they are usable on things other than
  Debian/Ubuntu-latest ? :-)

Either way - it seems pretty cool to me. I wonder if we could find a
way to completely automate the production of this using our generic
linux tinderboxen ?

ATB,

Michael.

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

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

Re: [Libreoffice] What is bibisect? And what is it doing in my office?

Hi,

On Fri, Dec 09, 2011 at 02:47:47PM +, Michael Meeks wrote:
   Wow - I assume this was the cryptic  magic item you wanted to discuss
 at the TSC next week :-)

Yes. ;)

   + are these binaries 'generic' ? ie. did you build them
 on an old enough distribution, with a clean enough config
 that they are usable on things other than
 Debian/Ubuntu-latest ? :-)

They are generic only in the sense that I didnt do a --with-system-foo, but
other than that, they have been compile on Ubuntu 11.10, so might not work on
older stuff. I was driven by the Now is better than never. line from the Zen
of Python for this decision. ;)

   Either way - it seems pretty cool to me. I wonder if we could find a
 way to completely automate the production of this using our generic
 linux tinderboxen ?

Should be doable. There were quite a few of tweaks and turns in the beginning
(you want to get this stuff halfway right, when you are churning away 24 cores
nonstop for 3 days on your own electricity bill), but in the end it should
integrate well with the tinderboxes. However, I assume this will not work quite
as well incrementally as the binary repo was ~4GB before I purged and repacked
it with:

git purge  git repack -ad --window 2000 --depth 55 --funroll-loops 
--abuse-my-ram --yes-all-of-it

Which:
- takes quite a bit of time
- packs everything in one pack, which sucks for incremental downloads

So, it is a proof-of-concept prototype, but unless somebody finds out I packed
the same version 53 times or something like that, it should be a good starting
point.

Best,

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

[Libreoffice] Calc : add carriage return via Ctrl+Enter in the Formula bar

2011-12-09 Thread Maxime de Roucy

Hello

I have been ask to add the possibility to add a carriage return in a
cell via Ctrl+Enter in the formula bar (like when I directly edit the
cell).

#

Currently, when I edit a cell (directly, not via the formula bar) and
type test(Ctrl+Enter)test I get this cell :
 ___
|test   |
|test___|

When I edit a cell via the formula bar and try to type the same thing I
leave the formula when I type Ctrl+Enter.

What I have been asked :
Same behavior in the formula bar and the cell. When I edit a cell via
the formula bar and type test(Ctrl+Enter)test I get this cell :
 ___
|test   |
|test___|

#

Before starting to code or even look if it's possible and how many time
it will take (I am a beginner at LibreOffice development) I would like
to know if this feature have chance to be accepted ?

Thanks in advance

-- 
Maxime de Roucy
Groupe LINAGORA - OSSA
80 rue Roque de Fillol
92800 PUTEAUX
Tel. : 0 810 251 251


signature.asc
Description: This is a digitally signed message part
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Developing new built-in functions within LibreCalc

Hi Lucas,

On Thu, 2011-12-08 at 14:32 -0300, Lucas Aimaretto wrote:
 Yes, I think I'll first give a try the development of the Add-in. If
 that works, then great!. In any case I still have lots to read and
 learn. As I said before, I'm very basic at programming and well, it
 will take some time -I guess- until I get this add-in to work well
 with Calc.

So - one place you could start reading, is the 'scaddins' directory at
the top-level in the source code; we implement a few of our internal
functions as add-ins which could be a useful base to build from. Quite
what the limitations are there (if any) around help, and the formula
editor etc. I don't know, but I'd start there myself.

All the best,

Michael.

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

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

Re: [Libreoffice] Calc : add carriage return via Ctrl+Enter in the Formula bar

2011-12-09 Thread Kohei Yoshida

Hello Maxime,

On Fri, 2011-12-09 at 16:12 +0100, Maxime de Roucy wrote:
 Hello
 
 I have been ask to add the possibility to add a carriage return in a
 cell via Ctrl+Enter in the formula bar (like when I directly edit the
 cell).

I think Noel (CC'ed) either has already implemented that, or is planning
to.  Note that the formula bar has been reworked heavily for 3.5, to
allow multi-line editing (it's very cool BTW!).  This was originally a
task in GSOC 2011, then Noel has picked it up to polish it up for 3.5.

He is still working to get some kinks out since the use of EditEngine in
this code is very well let's say interesting.  Either way you
should sync with him to see where we are currently.

Kohei

-- 
Kohei Yoshida, LibreOffice hacker, Calc

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

Re: [Libreoffice] ecofont

2011-12-09 Thread Németh László

Hi,

LibreOffice has already supported a similar solution to save more ink
with the following improvements:

• Scalable ink saving (20-90%, or arbitrary values);
• extreme ink saving (96%) with excellent readability;
• better layout on low resolution (1200 dpi): instead of ugly spotted
letters it uses low level methods of printers to provide consistent
typefaces;
• it works with all fonts.

Usage: choose Grey 80%...Grey 10% colors for your text (you can add
more colors to the palette:
http://wiki.services.openoffice.org/wiki/Documentation/OOoAuthors_User_Manual/Draw_Guide/Color_palette).
For extreme ink saving, set outlined character formatting (=~60% ink
saving) and combine with Gray 90% text color.

Best regards,
László



2011/12/9 810d4rk 810d...@gmail.com:
 Looking forward, unless EcoFont has a patent on swiss-cheesing fonts,
 one could potentially make swiss-cheese versions of the existing fonts
 in LO.

 That would be very good to have on LO for anyone that wants to save
 ink and use whatever font they like, but will be not be part of
 version 3.5?

 As for merely saving toner/ink when printing, it appears that someone
 did some testing and found that some fonts (e.g. Century Gothic) will
 save more ink per word than the EcoFont.
 http://www.treehugger.com/sustainable-product-design/century-gothic-saves-more-ink-than-ecofont.html

 The ecofont website has tells the advantages of their fonts:
 http://www.ecofont.com/en/products/green/printing/saving-printing-costs-and-eco-friendly/why-ecofont-saves-more-ink-than-century-gothic.html



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

[Libreoffice] build error

2011-12-09 Thread Winfried Donkers

Hello all,

I have just got a new computer, which should make LibO much faster than my old 
machine does :) .
Unfortunately, I get a make error:
.../core/solver/unxlngi6.pro/bin/cppunit/cppunittester: symbol lookup error: 
/usr/lib/gtk-2.0/2.10.0/engines/liboxygen-gtk.so: undefined symbol: 
cairo_surface_create_for_rectangle
...
make[2]: *** 
[.../core/workdir/unxlngi6.pro/CppunitTest/hwpfilter_test_hwpfilter.test] Error 
1

Possibly I haven't installed all I need yet, but I wouldn't know what is 
missing.

I use openSUSE 12.1, installed all packages with zypper si -d libreoffice plus 
some more based on errors when running autogen.sh --with-max-jobs=6 
--with-num-cpus=6 --without-junit (untill autogen.sh gave a successfull result).
Can anyone give me a hint how I can get LibO built?

Winfried

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

[Libreoffice] [PATCH] Fix for fdo43460, Part I, getLength to isEmpty

2011-12-09 Thread Olivier Hallot

Please find attached a partial fix for Easy Hack FDO43460,

Part I
Modules
unoControl, accessibility and avmedia

Regards
-- 
Olivier Hallot
Founder and Steering Commitee Member
The Document Foundation
From 17122a94a17eb089d9d0f43888e6192f21f62dc6 Mon Sep 17 00:00:00 2001
From: Olivier Hallot olivier.hal...@alta.org.br
Date: Fri, 9 Dec 2011 14:00:09 -0200
Subject: [PATCH] Fix for fdo43460, Part I, getLength to isEmpty

Part I
Modules
unoControl, accessibility and avmedia
---
 UnoControls/source/controls/framecontrol.cxx   |2 +-
 UnoControls/source/controls/progressmonitor.cxx|6 +++---
 .../source/extended/accessibleiconchoicectrl.cxx   |2 +-
 .../source/extended/textwindowaccessibility.cxx|2 +-
 .../standard/accessiblemenuitemcomponent.cxx   |2 +-
 .../source/standard/vclxaccessiblebox.cxx  |2 +-
 .../source/standard/vclxaccessibletoolboxitem.cxx  |2 +-
 avmedia/source/framework/mediacontrol.cxx  |8 
 avmedia/source/viewer/mediawindow.cxx  |8 
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 006924c..6b29190 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -203,7 +203,7 @@ void SAL_CALL FrameControl::createPeer( const   Reference XToolkit   xToo
 BaseControl::createPeer( xToolkit, xParentPeer );
 if ( impl_getPeerWindow().is() )
 {
-if( m_sComponentURL.getLength()  0 )
+if( !m_sComponentURL.isEmpty() )
 {
 impl_createFrame( getPeer(), m_sComponentURL, m_seqLoaderArguments );
 }
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 52bd71a..b3a5182 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -1038,11 +1038,11 @@ sal_Bool ProgressMonitor::impl_debug_checkParameter (
 ) {
 // Check rTopic
 if ( rTopic==  NULL) return sal_False ;// NULL-pointer for reference ???!!!
-if ( rTopic.getLength ()   1   ) return sal_False ;// 
+if ( rTopic.isEmpty()   ) return sal_False ;// 
 
 // Check rText
 if ( rText ==  NULL) return sal_False ;// NULL-pointer for reference ???!!!
-if ( rText.getLength ()1   ) return sal_False ;// 
+if ( rText.isEmpty()   ) return sal_False ;// 
 
 // bbeforeProgress is valid in everyway!
 
@@ -1055,7 +1055,7 @@ sal_Bool ProgressMonitor::impl_debug_checkParameter ( const OUString rTopic, sa
 {
 // Check rTopic
 if ( rTopic==  NULL) return sal_False ;// NULL-pointer for reference ???!!!
-if ( rTopic.getLength ()   1   ) return sal_False ;// 
+if ( rTopic.isEmpty()  ) return sal_False ;// 
 
 // bbeforeProgress is valid in everyway!
 
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index eb47993..c7894ad 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -211,7 +211,7 @@ namespace accessibility
 ensureAlive();
 
 ::rtl::OUString sName = getCtrl()-GetAccessibleName();
-if ( sName.getLength() == 0 )
+if ( sName.isEmpty() )
 sName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IconChoiceControl ) );
 return sName;
 }
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 57c6378..39b332c 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1798,7 +1798,7 @@ Document::changeParagraphText(::sal_uLong nNumber, ::sal_uInt16 nBegin, ::sal_uI
 m_rView.DeleteSelected();
 if (bPaste)
 m_rView.Paste();
-else if (rText.getLength() != 0)
+else if (!rText.isEmpty())
 m_rView.InsertText(rText);
 }
 
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index ee10a60..f36dcb8 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -208,7 +208,7 @@ void OAccessibleMenuItemComponent::SetAccessibleName( const ::rtl::OUString sAc
 {
 sal_uInt16 nItemId = m_pParent-GetItemId( m_nItemPos );
 sName = m_pParent-GetAccessibleName( nItemId );
-if ( sName.getLength() == 0 )
+if ( sName.isEmpty() )
 sName = m_pParent-GetItemText( nItemId );
 sName = OutputDevice::GetNonMnemonicString( sName );
 }
diff --git

Re: [Libreoffice] ecofont

2011-12-09 Thread Pedro


Németh László-2 wrote
 
 • it works with all fonts.
 

This. It makes more sense to use printer settings and font color/size to
save on ink/toner/paper than to be restricted to a single font with cheesy
(pun intended) copyright :)

--
View this message in context: 
http://nabble.documentfoundation.org/ecofont-tp3565779p3573332.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: [Libreoffice] [Libreoffice-qa] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)

2011-12-09 Thread Norbert Thiebaud

On Fri, Dec 9, 2011 at 5:20 AM, Pedro Lino pedl...@gmail.com wrote:
 But developers don't commit to the central repository. They commit to
 their local clones of it, and then at some (much) later stage push
 outstanding commits to the central repository. And then there are
 feature branches and merges...

 Ok. Wrong wording. What I meant was the time a change was pushed to
 the central repository by a developer which is comparable to the pull
 time from the central repository.

the problem is that this 'time' is not recorded anywhere. git does not
keep track of it.
So the only way to be 'certain' is to use sha1 and git log to compare
where the sha1 of the build you test is compared to the dha1 of the
alledge fix.

It is possible to do a web service to automate that (that is giving 2
sha1s and it tell you if the second one (the fix) is an 'ancestor' of
the first one (your build)

essentially:  if $(git merge-base build-sha fix-sha) = fix-sha

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

[Libreoffice] Call for LO-3.5.0-beta1 pre-tag testing

2011-12-09 Thread Petr Mladek

Hi guys,

could you please do some testing with the last daily builds from the
libreoffice-3-5 branch? See below where to get them.

It would be great if you replay this mail and describe your feeling.
Please mention the git commit IDs from the about dialog from the tested
build. We might want to use the tested commit for the beta1 build.

Current situation:

We have finally stabilized build in the libreoffice-3-5 branch and got
few builds on MAC and Windows in a row. The Linux builds are still not
available. We do them with all languages on relatively slow machines.
There were problems that happened only in the release build environment.
I hope to get them soon, though.

Anyway, the plan is to create the tag on Monday if we get a positive
feedback about the current daily builds. The official build will be
available 2-3 days later.

I suggest to use the last daily builds from the following tinderboxes:

Windows:
http://dev-builds.libreoffice.org/daily/Win-x86@6-fast/libreoffice-3-5/current/

MAC:
http://dev-builds.libreoffice.org/daily/MacOSX-Intel@3-OSX_10.6.0-gcc_4.0.1/libreoffice-3-5/current/

Linux (still not uploaded):
http://dev-builds.libreoffice.org/daily/Linux-x86_10-Release_Configuration/libreoffice-3-5/current/
http://dev-builds.libreoffice.org/daily/Linux-x86_64_11-Release_Configuration/libreoffice-3-5/current/

Thanks in advance.

Best Regards,
Petr

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

Re: [Libreoffice] ecofont

2011-12-09 Thread Robinson Tryon

On Fri, Dec 9, 2011 at 11:04 AM, Németh László nem...@numbertext.org wrote:
 Hi,

 LibreOffice has already supported a similar solution to save more ink
 with the following improvements:

 • Scalable ink saving (20-90%, or arbitrary values);
 • extreme ink saving (96%) with excellent readability;
 • better layout on low resolution (1200 dpi): instead of ugly spotted
 letters it uses low level methods of printers to provide consistent
 typefaces;
 • it works with all fonts.

 Usage: choose Grey 80%...Grey 10% colors for your text (you can add
 more colors to the palette:
 http://wiki.services.openoffice.org/wiki/Documentation/OOoAuthors_User_Manual/Draw_Guide/Color_palette).
 For extreme ink saving, set outlined character formatting (=~60% ink
 saving) and combine with Gray 90% text color.

 Best regards,
 László


Hi László,

Thank you for the information about ink/cost-savings during printing.
I've put your notes (and a brief mention of the EcoFont, etc..) up on
the wiki here:
http://wiki.documentfoundation.org/Documentation/Printing

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

Re: [Libreoffice] how to acquire an ScDocument reference from scratch


On 12/09/2011 03:26 PM, Noel Grandin wrote:

If there is no living upstream, surely we shouldn't let the current
state of affairs hold us back?
Why not add the features we need, and remove --with-system-cppunit?


My hope would be that CppUnit already caters for our needs.  But sure, 
if not, extending CppUnit would be a sensible approach.  Would best be 
done by reviving upstream, however, I'd say.


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

Re: [Libreoffice] [PATCH] Fix for fdo43460, Part I, getLength to isEmpty


On 12/09/2011 05:14 PM, Olivier Hallot wrote:

diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx 
b/accessibility/source/standard/vclxaccessiblebox.cxx
index e868403..82a7677 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -156,7 +156,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const 
VclWindowEvent rVclWindowEven
 if ( xText.is() )
 {
 ::rtl::OUString sText = xText-getSelectedText();
-if ( !sText.getLength() )
+if ( !sText.isEmpty() )
 sText = xText-getText();
 pList-UpdateSelection (sText);
 }


This and a few more that follow invert the logic -- !sText.getLength() 
= sText.getLength() == 0 = sText.isEmpty().  I'll fix those and push 
later today.


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

Re: [Libreoffice] [PATCH] Fix for fdo43460, Part I, getLength to isEmpty

2011-12-09 Thread Olivier Hallot

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

ooops... silly me

thanks

Em 09-12-2011 16:07, Stephan Bergmann escreveu:
 On 12/09/2011 05:14 PM, Olivier Hallot wrote:
 diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx
 b/accessibility/source/standard/vclxaccessiblebox.cxx
 index e868403..82a7677 100644
 --- a/accessibility/source/standard/vclxaccessiblebox.cxx
 +++ b/accessibility/source/standard/vclxaccessiblebox.cxx
 @@ -156,7 +156,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
 VclWindowEvent rVclWindowEven
  if ( xText.is() )
  {
  ::rtl::OUString sText = xText-getSelectedText();
 -if ( !sText.getLength() )
 +if ( !sText.isEmpty() )
  sText = xText-getText();
  pList-UpdateSelection (sText);
  }
 
 This and a few more that follow invert the logic -- !sText.getLength()
 = sText.getLength() == 0 = sText.isEmpty().  I'll fix those and push
 later today.
 
 Thanks a lot,
 Stephan
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice

- -- 
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJO4lBBAAoJEJp3R7nH3vLxrnsH/2xbSxmaNCe6Xu7swN/wLG+x
5EByvDnDo9nOdbTH/UwDrK/ZpNmEulbtU+qsu4RdVIefFWJiv7y77ddVzTIofOhw
xKkg6Im/A6V/ECJbdDNBQojV0zdLmAN5EYdjzIg99vEVppb9irbchuV1c7Iu/hDF
snacl6IeItfV+LDGbaOVPbpARHo2Qp4BPRvD7I/riVLbEsJIPwZnHHH38k/PElSy
IAoNibf5oc9MzSnib6i+37pFlcSoF96b75LnOpo3srB76Oi1aA/t3CNjEc0D7m7w
ikhZHpns/vIKa3SGEznT0xootv8cJTzOR+VuRBLYLyYtXnyVTJvDvKZnpDZmY10=
=rkYL
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Call for LO-3.5.0-beta1 pre-tag testing

2011-12-09 Thread Rainer Bielefeld


Petr Mladek schrieb:

Hi guys,

could you please do some testing with the last daily builds from the
libreoffice-3-5 branch? See below where to get them.



Hi,

is that a parallel installer?

CU

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

Re: [Libreoffice] build error

2011-12-09 Thread Matteo Casalin


Hi Winfried, please find my comments below.

On 12/09/2011 05:10 PM, Winfried Donkers wrote:

Hello all,

I have just got a new computer, which should make LibO much faster than my old 
machine does :) .
Unfortunately, I get a make error:
.../core/solver/unxlngi6.pro/bin/cppunit/cppunittester: symbol lookup error: 
/usr/lib/gtk-2.0/2.10.0/engines/liboxygen-gtk.so: undefined symbol: 
cairo_surface_create_for_rectangle
...
make[2]: *** 
[.../core/workdir/unxlngi6.pro/CppunitTest/hwpfilter_test_hwpfilter.test] Error 
1


If I remember correctly I had the same problem when first trying to 
build LibO on kubuntu 11.10 (thus in a KDE environment) and I solved it 
by disabling Oxigen style in System settings panel, more precisely in 
Application Appearance/GTK+ appearance/Widget style, and setting 
it to Raleigh. Probably I also rebooted the machine before trying to 
build LibO again. This solution will probably affect the appearance of 
LibO itself. I didn't test other configurations, my machine is much 
slower than yours.


Hope this helps, let me know if you find better solutions.

Matteo



Possibly I haven't installed all I need yet, but I wouldn't know what is 
missing.

I use openSUSE 12.1, installed all packages with zypper si -d libreoffice plus 
some more based on errors when running autogen.sh --with-max-jobs=6 
--with-num-cpus=6 --without-junit (untill autogen.sh gave a successfull result).
Can anyone give me a hint how I can get LibO built?

Winfried

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



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

Re: [Libreoffice] [Libreoffice-qa] Call for LO-3.5.0-beta1 pre-tag testing

2011-12-09 Thread Volker Merschmann

Hi Rainer,

2011/12/9 Rainer Bielefeld libreoff...@bielefeldundbuss.de:
 Petr Mladek schrieb:
 could you please do some testing with the last daily builds from the
 libreoffice-3-5 branch? See below where to get them.

 is that a parallel installer?

Yes, it is.

BTW I can tell that it installed fine on my Windows XP32.   I have
started to check the minimum functionality.


Bye


Volker


-- 
Volker Merschmann
Member of The Document Foundation
http://www.documentfoundation.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Call for LO-3.5.0-beta1 pre-tag testing

2011-12-09 Thread Tomáš Chvátal

2011/12/9 Rainer Bielefeld libreoff...@bielefeldundbuss.de:
 Hi,

 is that a parallel installer?

 CU

 Rainer

Yes it should be :)

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

[Libreoffice] [PUSHED] Re: [REVIEW 3.4] fix for fdo#40831 i#102333

On 08/12/11 12:56, Michael Meeks wrote:
 Hi Michael,
 
 On Thu, 2011-12-08 at 11:57 +0100, Michael Stahl wrote:
 i'd like to backport the following Writer searchreplace crash fixing
 commits to 3.4:
 
   Look fine to me; you're certain that none of the pointers in the 2nd
 patch are going to be NULL ? :-)

well the only dereference that i've actually added is
pWrtShell-GetDoc() and that is de-referenced without checking in other
files in the same directory a lot, so...

 and could you do the format-patch / git
 am magic ?

pushed to 3.4 with your sign-off

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

Re: [Libreoffice] [Libreoffice-qa] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)

Hi Norbert

 the problem is that this 'time' is not recorded anywhere. git does not
 keep track of it.

I have the pull time because the tinderbox code was kindly modified to
provide a log file for each build
E.g. 
http://dev-builds.libreoffice.org/daily/Win-x86@6-fast/libreoffice-3-5/current/libreoffice-3-5~2011-12-09_12.44.50_build_info.txt

And Petr Vladek has suggested that this info should/could be included
in the About box
http://nabble.documentfoundation.org/Naming-builds-Please-tt3556898.html#a3561117

However Bjoern seems to have a different idea... But I still don't
know what it is :)
http://nabble.documentfoundation.org/Naming-builds-Please-tt3556898.html#a3567211

 It is possible to do a web service to automate that (that is giving 2
 sha1s and it tell you if the second one (the fix) is an 'ancestor' of
 the first one (your build)

 essentially:  if $(git merge-base build-sha fix-sha) = fix-sha

That would be nice ;)

The important part here is to know if the fix is included or not. When
or the exact time is not important at all!

Can you do that? :)

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

Re: [Libreoffice] [Libreoffice-qa] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)

2011-12-09 Thread Norbert Thiebaud

On Fri, Dec 9, 2011 at 1:23 PM, Pedro Lino pedl...@gmail.com wrote:
 Hi Norbert

 the problem is that this 'time' is not recorded anywhere. git does not
 keep track of it.

 I have the pull time because the tinderbox code was kindly modified to
 provide a log file for each build
 E.g. 
 http://dev-builds.libreoffice.org/daily/Win-x86@6-fast/libreoffice-3-5/current/libreoffice-3-5~2011-12-09_12.44.50_build_info.txt

I know, I did it... but you don't have a 'push time'


 And Petr Vladek has suggested that this info should/could be included
 in the About box
 http://nabble.documentfoundation.org/Naming-builds-Please-tt3556898.html#a3561117

it is less reliable and at best redundant with the git-sha... otoh I
am considering addin the tinderbox id to the about box, so one can
know which box built it (and therefore what config was used)



 Can you do that? :)

The shell script that give you the anwser given the about box info and
the sha1 of the fix, yes... the web page that wrap it all nicely, no

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

Re: [Libreoffice] [Libreoffice-qa] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)

 I know, I did it... but you don't have a 'push time'

:) Thank you, then :)
Why do I need to know the push time? Any commits that were pushed into
Central repository before time X are included in the source that is
pulled after time X... I think?

 And Petr Vladek has suggested that this info should/could be included
 in the About box
 http://nabble.documentfoundation.org/Naming-builds-Please-tt3556898.html#a3561117

 it is less reliable and at best redundant with the git-sha...

Redundant is good! Especially if the redundant information can be
understood by non-technical users ;)

  otoh I
 am considering addin the tinderbox id to the about box, so one can
 know which box built it (and therefore what config was used)

It would be great if that information was added BOTH to the About box
and to the tar/msi file name! Please do consider it :)

 Can you do that? :)

 The shell script that give you the anwser given the about box info and
 the sha1 of the fix, yes... the web page that wrap it all nicely, no

Does anyone on this list know how to add this script to the wiki? I
think that would be the best place to have this...

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

Re: [Libreoffice] build error

Hi there,

On Fri, 2011-12-09 at 17:10 +0100, Winfried Donkers wrote:
 I have just got a new computer, which should make LibO much faster than my 
 old machine does :) .

Fun :-)

 Unfortunately, I get a make error:
 .../core/solver/unxlngi6.pro/bin/cppunit/cppunittester:
 symbol lookup error: /usr/lib/gtk-2.0/2.10.0/engines/liboxygen-gtk.so: 
 undefined symbol: cairo_surface_create_for_rectangle
 ...
 make[2]: *** 
 [.../core/workdir/unxlngi6.pro/CppunitTest/hwpfilter_test_hwpfilter.test] 
 Error 1

Looks like a symbol conflict between your internal cairo library and
the system gtk+ library. Curious that it happens with the cppunit test
of course. Essentially I would remove *cairo* from the solver (or run
deliver -delete inside cairo/) and re-configure and build with
--with-system-cairo.

 I use openSUSE 12.1, installed all packages with zypper si -d libreoffice 
 plus some 
 more based on errors when running autogen.sh --with-max-jobs=6 
 --with-num-cpus=6
 --without-junit (untill autogen.sh gave a successfull result).
 Can anyone give me a hint how I can get LibO built?

I use --with-system-cairo on the same systme with no problems :-) FWIW,
you're by no means the last accidental victim of the idiocy that is
known as interposing in the ELF linker ;-)

HTH,

Michael.

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

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

[Libreoffice] [PUSHED master libreoffice-3-5] Label PRINTING misplaced on paper sheet

On Wed, Dec 07, 2011 at 09:22:45AM +0100, Winfried Donkers wrote:
 Attached is a patch for bug 36874. 

Looks good. Pushed to master. Cherry-picked to -3-5.

Best,

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

Re: [Libreoffice] [Libreoffice-qa] Java 7 support in LO 3.4.5 (was: minutes of tech. steering call ...)

2011-12-09 Thread Norbert Thiebaud

On Fri, Dec 9, 2011 at 1:55 PM, Pedro Lino pedl...@gmail.com wrote:
 I know, I did it... but you don't have a 'push time'

 :) Thank you, then :)
 Why do I need to know the push time? Any commits that were pushed into
 Central repository before time X are included in the source that is
 pulled after time X... I think?

sure. but then how do you known 'when' a given fix was pushed ? (and
bear in mind timezone :-))



 It would be great if that information was added BOTH to the About box
 and to the tar/msi file name! Please do consider it :)

for dailies: to download it you already have all that info since
otherwise you would not have found the file to start with.

for pre-release, we don't want to have too fancy filename, that would
make thing much more dicey when we 'release'...

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

[Libreoffice] [PATCH] Decoview cleanup #9 - ImplDrawFrame

2011-12-09 Thread Matteo Casalin


Hi all,
this should ideally be my last patch to DecoView, just to not leave 
the work incomplete. Sadly, I think this patch also needs some thorough 
review, since the underlying architecture is not so clear to me.
Apart from some recoding that should have kept the functionalities, the 
corrections are:

* Share code between draw/nodraw on window devices (this needs review
  for sure, I didn't understand clearly the conditions to be met for
  the nodraw case);
* Fix drawn FRAME_DRAW_GROUP not resizing its Rectangle;
* Avoid filtering/recreating FRAME_DRAW_MENU flag.

Ciao
Matteo
From 9ed12c989a64306e1503edf2943e6bd5d60d3140 Mon Sep 17 00:00:00 2001
From: Matteo Casalin matteo.casa...@poste.it
Date: Fri, 9 Dec 2011 21:13:58 +0100
Subject: [PATCH] DecoView cleanup: rework ImplDrawFrame

---
 vcl/source/window/decoview.cxx |  398 +++-
 1 files changed, 187 insertions(+), 211 deletions(-)

diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index a1511ab..38dbe74 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -633,6 +633,193 @@ void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect,
 }
 }
 
+void ImplDrawFrame( OutputDevice *const pDev, Rectangle rRect,
+const StyleSettings rStyleSettings, sal_uInt16 nStyle )
+{
+Window *const pWin = (pDev-GetOutDevType()==OUTDEV_WINDOW) ? (Window*) pDev : NULL;
+
+const bool bMenuStyle = nStyle  FRAME_DRAW_MENU;
+
+// UseFlatBorders disables 3D style for all frames except menus
+// menus may use different border colors (eg on XP)
+// normal frames will be drawn using the shadow color
+// whereas window frame borders will use black
+bool bFlatBorders = !bMenuStyle  rStyleSettings.GetUseFlatBorders();
+
+// no flat borders for standard VCL controls (ie formcontrols that keep their classic look)
+// will not affect frame windows (like dropdowns)
+if( bFlatBorders  pWin  pWin-GetType() == WINDOW_BORDERWINDOW  (pWin != pWin-ImplGetFrameWindow()) )
+{
+// check for formcontrol, i.e., a control without NWF enabled
+Control *const pControl = dynamic_cast Control* ( pWin-GetWindow( WINDOW_CLIENT ) );
+if( !pControl || !pControl-IsNativeWidgetEnabled() )
+bFlatBorders = false;
+}
+
+const bool bNoDraw = nStyle  FRAME_DRAW_NODRAW;
+
+if ( (rStyleSettings.GetOptions()  STYLE_OPTION_MONO) ||
+ (pDev-GetOutDevType() == OUTDEV_PRINTER) ||
+ bFlatBorders )
+nStyle |= FRAME_DRAW_MONO;
+
+if( pWin  pWin-IsNativeControlSupported(CTRL_FRAME, PART_BORDER) )
+{
+ImplControlValue aControlValue( nStyle |
+(pWin-GetType()==WINDOW_BORDERWINDOW) ?
+FRAME_DRAW_BORDERWINDOWBORDER : 0 );
+Rectangle aBound, aContent;
+Rectangle aNatRgn( rRect );
+if( pWin-GetNativeControlRegion(CTRL_FRAME, PART_BORDER,
+aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+{
+// if bNoDraw is true then don't call the drawing routine
+// but just update the target rectangle
+if( bNoDraw ||
+pWin-DrawNativeControl( CTRL_FRAME, PART_BORDER, aContent, CTRL_STATE_ENABLED,
+ aControlValue, rtl::OUString()) )
+{
+rRect = aContent;
+return;
+}
+}
+}
+
+if ( nStyle  FRAME_DRAW_MONO )
+{
+// no round corners for window frame borders
+const bool bRound = bFlatBorders  !(nStyle  FRAME_DRAW_WINDOWBORDER);
+
+if ( bNoDraw )
+{
+ImplDrawDPILineRect( pDev, rRect, NULL, bRound );
+}
+else
+{
+Color aColor = bRound ? rStyleSettings.GetShadowColor()
+  : pDev-GetSettings().GetStyleSettings().GetMonoColor();
+// when the MonoColor wasn't set, check face color
+if (
+(bRound  aColor.IsDark()) ||
+(
+  (aColor == Color(COL_BLACK)) 
+  pDev-GetSettings().GetStyleSettings().GetFaceColor().IsDark()
+)
+   )
+{
+aColor = Color( COL_WHITE );
+}
+ImplDrawDPILineRect( pDev, rRect, aColor, bRound );
+}
+}
+else
+{
+if ( bNoDraw )
+{
+switch ( nStyle  FRAME_DRAW_STYLE )
+{
+case FRAME_DRAW_IN:
+case FRAME_DRAW_OUT:
+++rRect.Left();
+++rRect.Top();
+--rRect.Right();
+--rRect.Bottom();
+break;
+
+case FRAME_DRAW_GROUP:
+case FRAME_DRAW_DOUBLEIN:
+case FRAME_DRAW_DOUBLEOUT:
+

[Libreoffice] End of the line for 3.3 family and regressions