[Libreoffice-commits] .: solenv/gbuild

2011-12-09 Thread Lionel Elie Mamane 
 solenv/gbuild/Output.mk |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 13b93f40ab2dd0777c4051996e604858c4e2fafb
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Dec 9 09:17:23 2011 +0100

Allow gb_COLOR and gb_TITLES for 256color TERMs, too

diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index e4b811f..ab5ec5a 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -60,8 +60,12 @@ gb_Output_BELL := $(shell echo|awk 'BEGIN { printf %c, 7 
}' -)
 # only enable colorized output if
 # - gb_COLOR is set
 # - we have a known term
+KNOWN_TERM:=Eterm aterm gnome kterm linux putty rxvt rxvt-unicode screen xterm 
xterm xtermc
+KNOWN_TERM:=$(KNOW_TERM) $(patsubst %,%-color,$(KNOWN_TERM))
+KNOWN_TERM:=$(KNOW_TERM) $(patsubst %-color,%-256color,$(KNOWN_TERM))
+KNOWN_TERM:=$(KNOW_TERM) $(patsubst %-color,%+256color,$(KNOWN_TERM))
 ifneq ($(strip $(gb_COLOR)),)
-ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen 
xterm xterm-color xtermc),)
+ifneq ($(filter $(TERM),$(KNOWN_TERM)),)
 
 gb_Output_COLOR_RESET := $(gb_Output_ESCAPE)[0m
 gb_Output_COLOR_RESETANDESCAPE := $(gb_Output_COLOR_RESET)$(gb_Output_ESCAPE)
@@ -121,7 +125,7 @@ endif
 # - gb_TITLES is set
 # - we have a known term
 ifneq ($(strip $(gb_TITLES)),)
-ifneq ($(filter $(TERM),Eterm aterm gnome kterm rxvt rxvt-unicode screen xterm 
xterm-color),)
+ifneq ($(filter $(TERM),$(KNOWN_TERM)),)
 define gb_Output_announce_title
 $(info $(gb_Output_ESCAPE)]2;gbuild: 
$(1)$(gb_Output_BELL)$(gb_Output_ESCAPE)[A)
 endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-09 Thread Jan Holesovsky 
 solenv/gbuild/gbuild.mk |2 +-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7052a5d6242df174ba21134635ac3d18530bf34
Author: Jan Holesovsky ke...@suse.cz
Date:   Thu Dec 8 23:55:45 2011 +0100

i18npool on Windows needed more fixes.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..256261c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -311,7 +311,7 @@ gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $$(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 809d83c..5f8fb1c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE)  $(subst 
$(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
 $(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst 
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst 
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst 
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst 
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst 
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)
 endef
 
-gb_Helper_set_ld_path := PATH=\$${PATH}:$(OUTDIR)/bin\
+gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
 
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
___
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 - jvmfwk/distributions jvmfwk/plugins

2011-12-09 Thread Stephan Bergmann 
 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

2011-12-09 Thread Fridrich Strba 
 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

2011-12-09 Thread Fridrich Strba 
 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

2011-12-09 Thread Stephan Bergmann 
 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

2011-12-09 Thread Fridrich Strba 
 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

2011-12-09 Thread Tor Lillqvist 
 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

2011-12-09 Thread Fridrich Strba 
 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

2011-12-09 Thread Fridrich Strba 
 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

2011-12-09 Thread Michael Stahl 
 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

2011-12-09 Thread Eike Rathke 
 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

2011-12-09 Thread Michael Stahl 
 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

2011-12-09 Thread Fridrich Strba 
 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

2011-12-09 Thread Fridrich Strba 
 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

2011-12-09 Thread Michael Stahl 
 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

2011-12-09 Thread Bjoern Michaelsen 
 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

2011-12-09 Thread Bjoern Michaelsen 
 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

2011-12-09 Thread Eike Rathke 
 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

2011-12-09 Thread Eike Rathke 
 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

2011-12-09 Thread Stephan Bergmann 
 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

2011-12-09 Thread Eike Rathke 
 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,