[Libreoffice-commits] .: sal/inc sal/rtl

2011-11-30 Thread Stephan Bergmann 
 sal/inc/internal/once.h |   82 
 sal/rtl/source/alloc_arena.cxx  |1 
 sal/rtl/source/alloc_cache.cxx  |1 
 sal/rtl/source/alloc_global.cxx |1 
 sal/rtl/source/locale.cxx   |1 
 5 files changed, 86 deletions(-)

New commits:
commit cbcf00ad04e8e1457f5563a25b6f9cf68e3f4a24
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Nov 30 09:10:17 2011 +0100

Removed unused sal/inc/internal/once.h.

diff --git a/sal/inc/internal/once.h b/sal/inc/internal/once.h
deleted file mode 100644
index 45f9c37..000
--- a/sal/inc/internal/once.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef INCLUDED_SAL_INTERNAL_ONCE_H
-#define INCLUDED_SAL_INTERNAL_ONCE_H
-
-/** sal_once_type
- *  (platform dependent)
- */
-
-#if defined(SAL_UNX)
-
-#include pthread.h
-
-typedef pthread_once_t sal_once_type;
-
-#define SAL_ONCE_INIT PTHREAD_ONCE_INIT
-#define SAL_ONCE(once, init) pthread_once((once), (init))
-
-#elif defined(SAL_W32)
-
-#define WIN32_LEAN_AND_MEAN
-#pragma warning(push,1) /* disable warnings within system headers */
-#include windows.h
-#pragma warning(pop)
-
-typedef struct sal_once_st sal_once_type;
-struct sal_once_st
-{
-LONG volatile m_done;
-LONG volatile m_lock;
-};
-
-#define SAL_ONCE_INIT { 0, 0 }
-#define SAL_ONCE(once, init) \
-{ \
-sal_once_type * control = (once); \
-if (!(control-m_done)) \
-{ \
-while (InterlockedExchange((control-m_lock), 1) == 1) Sleep(0); \
-if (!(control-m_done)) \
-{ \
-void (*init_routine)(void) = (init); \
-(*init_routine)(); \
-control-m_done = 1; \
-} \
-InterlockedExchange((control-m_lock), 0); \
-} \
-}
-
-#else
-#error Unknown platform
-#endif /* SAL_UNX | SAL_W32 */
-
-#endif /* INCLUDED_SAL_INTERNAL_ONCE_H */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/rtl/source/alloc_arena.cxx b/sal/rtl/source/alloc_arena.cxx
index 20ee962..03c7f47 100644
--- a/sal/rtl/source/alloc_arena.cxx
+++ b/sal/rtl/source/alloc_arena.cxx
@@ -30,7 +30,6 @@
 #include alloc_arena.hxx
 
 #include alloc_impl.hxx
-#include internal/once.h
 #include internal/rtllifecycle.h
 #include sal/macros.h
 #include osl/diagnose.h
diff --git a/sal/rtl/source/alloc_cache.cxx b/sal/rtl/source/alloc_cache.cxx
index a1d8d54..0769b8e 100644
--- a/sal/rtl/source/alloc_cache.cxx
+++ b/sal/rtl/source/alloc_cache.cxx
@@ -29,7 +29,6 @@
 #include alloc_cache.hxx
 #include alloc_impl.hxx
 #include alloc_arena.hxx
-#include internal/once.h
 #include internal/rtllifecycle.h
 #include sal/macros.h
 #include osl/diagnose.h
diff --git a/sal/rtl/source/alloc_global.cxx b/sal/rtl/source/alloc_global.cxx
index e48fdd1..c0de496 100644
--- a/sal/rtl/source/alloc_global.cxx
+++ b/sal/rtl/source/alloc_global.cxx
@@ -51,7 +51,6 @@ static void determine_alloc_mode()
  *
  * = */
 
-#include internal/once.h
 #include sal/macros.h
 
 /* = *
diff --git a/sal/rtl/source/locale.cxx b/sal/rtl/source/locale.cxx
index 1d975ad..885b139 100644
--- a/sal/rtl/source/locale.cxx
+++ b/sal/rtl/source/locale.cxx
@@ -31,7 +31,6 @@
 #include osl/diagnose.h
 #include rtl/alloc.h
 
-#include internal/once.h
 #include internal/rtllifecycle.h
 
 static sal_Int32 RTL_HASHTABLE_SIZE[] =
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-30 Thread François Tigeot 
 distro-configs/LibreOfficeDragonFly.conf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 53ed1eb35926d4dccd4deac779327ea1a1f581cd
Author: François Tigeot ftig...@wolfpond.org
Date:   Wed Nov 30 11:11:04 2011 +0100

sampleicc has not yet been packaged in pkgsrc

diff --git a/distro-configs/LibreOfficeDragonFly.conf 
b/distro-configs/LibreOfficeDragonFly.conf
index 2621e7e..e40da2e 100644
--- a/distro-configs/LibreOfficeDragonFly.conf
+++ b/distro-configs/LibreOfficeDragonFly.conf
@@ -23,4 +23,5 @@
 --without-system-mdds
 --without-system-mozilla-headers
 --without-system-mythes
+--without-system-sampleicc
 --x-includes=/usr/pkg/include
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_unopkg.bin.mk

2011-11-30 Thread Andras Timar 
 desktop/Executable_unopkg.bin.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ddefdad69ac963126a3ab6bec2f536804d92c56
Author: Andras Timar ati...@suse.com
Date:   Wed Nov 30 11:40:27 2011 +0100

fix license header

diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index cf286a7..68687d1 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -20,7 +20,7 @@
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 3 or later (the GPLv3+), or
 # the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are licable
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
 ifeq ($(OS_FOR_BUILD),WNT)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk

2011-11-30 Thread Andras Timar 
 desktop/Executable_soffice.bin.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d76479654748454e280ac48217fb0036bc5940a1
Author: Andras Timar ati...@suse.com
Date:   Wed Nov 30 12:01:06 2011 +0100

temporary hack: soffice.bin should be type of GUI app, not CUI app fdo#42914

It is puzzling that Executable_soffice.bin.mk contains the line
$(eval $(call gb_Executable_set_targettype_gui,$(sofficebin),YES))
yet, in the build log we see -SUBSYSTEM:CONSOLE among the linker flags.
I added -SUBSYSTEM:WINDOWS flag exlicitely, and it comes later so it
prevails. I guess MinGW will be still affected. It really should be
fixed correctly by a gbuild expert.

diff --git a/desktop/Executable_soffice.bin.mk 
b/desktop/Executable_soffice.bin.mk
index cc5796a..9682afc 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -58,6 +58,7 @@ ifeq ($(COM),MSC)
 
 $(eval $(call gb_Executable_add_ldflags,$(sofficebin),\
 /STACK:1000 \
+/SUBSYSTEM:WINDOWS \
 ))
 
 endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: odk/settings

2011-11-30 Thread François Tigeot 
 odk/settings/settings.mk |   15 ---
 1 file changed, 15 deletions(-)

New commits:
commit 4821546a240df94c25f2f5a3b0fc3c480596fa3b
Author: François Tigeot ftig...@wolfpond.org
Date:   Wed Nov 30 12:06:59 2011 +0100

Remove unused variable PACKAGE_LIB_DIR

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index e4fc05a..949ece7 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -51,7 +51,6 @@ EXE_EXT=.exe
 COPY=copy
 SHAREDLIB_EXT=dll
 SHAREDLIB_OUT=$(OUT_BIN)
-PACKAGE_LIB_DIR=windows.plt
 UNOPKG_PLATFORM=Windows
 
 OSEP=^
@@ -133,18 +132,15 @@ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d- 
-f1)$(shell /usr/ccs/bin/elf
 
 ifeq $(PROCTYPE) sparc
 PLATFORM=solsparc
-PACKAGE_LIB_DIR=solaris_sparc.plt
 UNOPKG_PLATFORM=Solaris_SPARC
 JAVA_PROC_TYPE=sparc
 else
 ifeq $(PROCTYPE) sparc64
 PLATFORM=solsparc
-PACKAGE_LIB_DIR=solaris_sparc64.plt
 UNOPKG_PLATFORM=Solaris_SPARC64
 JAVA_PROC_TYPE=sparcv9
 else
 PLATFORM=solintel
-PACKAGE_LIB_DIR=solaris_x86.plt
 UNOPKG_PLATFORM=Solaris_x86
 JAVA_PROC_TYPE=i386
 endif
@@ -243,24 +239,20 @@ ifneq (,$(findstring linux,$(PLATFORM)))
 PROCTYPE := $(shell $(PRJ)/config.guess | cut -d - -f1 | sed -e 
's/^i.86$$/i386/')
 PLATFORM=linux
 
-PACKAGE_LIB_DIR=linux_$(PROCTYPE).plt
 UNOPKG_PLATFORM=Linux_$(PROCTYPE)
 JAVA_PROC_TYPE=$(PROCTYPE)
 
 ifeq $(PROCTYPE) i386
-PACKAGE_LIB_DIR=linux_x86.plt
 UNOPKG_PLATFORM=Linux_x86
 JAVA_PROC_TYPE=i386
 endif
 
 ifeq $(PROCTYPE) powerpc
-PACKAGE_LIB_DIR=linux_powerpc.plt
 UNOPKG_PLATFORM=Linux_PowerPC
 JAVA_PROC_TYPE=ppc
 endif
 
 ifeq $(PROCTYPE) sparc
-PACKAGE_LIB_DIR=linux_sparc.plt
 UNOPKG_PLATFORM=Linux_SPARC
 JAVA_PROC_TYPE=sparc
 endif
@@ -376,16 +368,13 @@ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d- -f1)
 PLATFORM=macosx
 
 ifeq $(PROCTYPE) i386
-PACKAGE_LIB_DIR=macosx_x86.plt
 UNOPKG_PLATFORM=MacOSX_x86
 JAVA_PROC_TYPE=x86
 else
 ifeq $(PROCTYPE) x86_64
-PACKAGE_LIB_DIR=macosx_x86.plt
 UNOPKG_PLATFORM=MacOSX_x86
 JAVA_PROC_TYPE=x86
 else
-PACKAGE_LIB_DIR=macosx_ppc.plt
 UNOPKG_PLATFORM=MacOSX_PowerPC
 JAVA_PROC_TYPE=ppc
 endif
@@ -500,19 +489,15 @@ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d- -f1)
 ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM)))
 PLATFORM=kfreebsd
 ifeq $(PROCTYPE) x86_64
-PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
 UNOPKG_PLATFORM=kFreeBSD_x86_64
 else
-PACKAGE_LIB_DIR=kfreebsd_x86.plt
 UNOPKG_PLATFORM=kFreeBSD_x86
 endif
 else
 PLATFORM=freebsd
 ifeq $(PROCTYPE) x86_64
-PACKAGE_LIB_DIR=freebsd_x86_64.plt
 UNOPKG_PLATFORM=FreeBSD_x86_64
 else
-PACKAGE_LIB_DIR=freebsd_x86.plt
 UNOPKG_PLATFORM=FreeBSD_x86
 endif
 endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/rtl

2011-11-30 Thread Stephan Bergmann 
 sal/rtl/source/alloc_arena.cxx  |  162 ++
 sal/rtl/source/alloc_cache.cxx  |  214 ++--
 sal/rtl/source/alloc_global.cxx |   14 +-
 3 files changed, 182 insertions(+), 208 deletions(-)

New commits:
commit 2d9beb7854bdfa6e6140e78ab754414340725e38
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Nov 30 10:27:23 2011 +0100

OSL_TRACE in sal/rtl/source/alloc_*.cxx leads to deadlock...

...with SAL_LOG=+INFO due to std::ostringstream in log.cxx using global 
operator
new, which potentially calls rtl_allocateMemory.

diff --git a/sal/rtl/source/alloc_arena.cxx b/sal/rtl/source/alloc_arena.cxx
index 03c7f47..e101310 100644
--- a/sal/rtl/source/alloc_arena.cxx
+++ b/sal/rtl/source/alloc_arena.cxx
@@ -34,6 +34,7 @@
 #include sal/macros.h
 #include osl/diagnose.h
 
+#include cassert
 #include string.h
 #include stdio.h
 
@@ -118,14 +119,11 @@ rtl_arena_segment_constructor (void * obj)
 static void
 rtl_arena_segment_destructor (void * obj)
 {
-#if OSL_DEBUG_LEVEL == 0
-(void) obj; /* unused */
-#else /* OSL_DEBUG_LEVEL */
-rtl_arena_segment_type * segment = (rtl_arena_segment_type*)(obj);
-
-OSL_ASSERT(QUEUE_STARTED_NAMED(segment, s));
-OSL_ASSERT(QUEUE_STARTED_NAMED(segment, f));
-#endif /* OSL_DEBUG_LEVEL */
+rtl_arena_segment_type * segment = static_cast rtl_arena_segment_type * (
+obj);
+assert(QUEUE_STARTED_NAMED(segment, s));
+assert(QUEUE_STARTED_NAMED(segment, f));
+(void) segment; // avoid warnings
 }
 
 /* = */
@@ -184,7 +182,7 @@ rtl_arena_segment_get (
 {
 rtl_arena_segment_type * head;
 
-OSL_ASSERT(*ppSegment == 0);
+assert(*ppSegment == 0);
 
 head = (arena-m_segment_reserve_head);
 if ((head-m_snext != head) || rtl_arena_segment_populate (arena))
@@ -212,13 +210,13 @@ rtl_arena_segment_put (
 {
 rtl_arena_segment_type * head;
 
-OSL_ASSERT(QUEUE_STARTED_NAMED((*ppSegment), s));
-OSL_ASSERT(QUEUE_STARTED_NAMED((*ppSegment), f));
+assert(QUEUE_STARTED_NAMED((*ppSegment), s));
+assert(QUEUE_STARTED_NAMED((*ppSegment), f));
 
 (*ppSegment)-m_addr = 0;
 (*ppSegment)-m_size = 0;
 
-OSL_ASSERT((*ppSegment)-m_type != RTL_ARENA_SEGMENT_TYPE_HEAD);
+assert((*ppSegment)-m_type != RTL_ARENA_SEGMENT_TYPE_HEAD);
 (*ppSegment)-m_type = 0;
 
 /* keep as reserve */
@@ -274,7 +272,7 @@ rtl_arena_freelist_remove (
 rtl_arena_segment_type * head;
 
 head = segment-m_fprev;
-OSL_ASSERT(arena-m_freelist_bitmap  head-m_size);
+assert(arena-m_freelist_bitmap  head-m_size);
 arena-m_freelist_bitmap ^= head-m_size;
 }
 QUEUE_REMOVE_NAMED(segment, f);
@@ -323,16 +321,14 @@ rtl_arena_hash_rescale (
 old_table = arena-m_hash_table;
 old_size  = arena-m_hash_size;
 
-OSL_TRACE(
-rtl_arena_hash_rescale(\%s\): 
-nseg: %PRIu64 (ave: %PRIu64), frees: %PRIu64 
-[old_size: %lu, new_size: %lu],
-arena-m_name,
-arena-m_stats.m_alloc - arena-m_stats.m_free,
-(arena-m_stats.m_alloc - arena-m_stats.m_free)  
arena-m_hash_shift,
-arena-m_stats.m_free,
-old_size, new_size
-);
+// SAL_INFO(
+//  sal,
+//  rtl_arena_hash_rescale(  arena-m_name  ): nseg: 
+//   (arena-m_stats.m_alloc - arena-m_stats.m_free)   (ave: 

+//   ((arena-m_stats.m_alloc - arena-m_stats.m_free)
+//   arena-m_hash_shift)
+//   ), frees:   arena-m_stats.m_free   [old_size: 
+//   old_size  , new_size:   new_size  ']');
 
 arena-m_hash_table = new_table;
 arena-m_hash_size  = new_size;
@@ -404,10 +400,6 @@ rtl_arena_hash_remove (
 rtl_arena_segment_type *segment, **segpp;
 sal_Size lookups = 0;
 
-#if OSL_DEBUG_LEVEL == 0
-(void) size; /* unused */
-#endif /* OSL_DEBUG_LEVEL */
-
 segpp = (arena-m_hash_table[RTL_ARENA_HASH_INDEX(arena, addr)]);
 while ((segment = *segpp) != 0)
 {
@@ -422,10 +414,11 @@ rtl_arena_hash_remove (
 segpp = (segment-m_fnext);
 }
 
-OSL_POSTCOND(segment != 0, rtl_arena_hash_remove(): bad free.);
+assert(segment != 0); // bad free
 if (segment != 0)
 {
-OSL_POSTCOND(segment-m_size == size, rtl_arena_hash_remove(): wrong 
size.);
+assert(segment-m_size == size);
+(void) size; // avoid warnings
 
 arena-m_stats.m_free  += 1;
 arena-m_stats.m_mem_alloc -= segment-m_size;
@@ -470,7 +463,7 @@ rtl_arena_segment_alloc (
 {
 int index = 0;
 
-OSL_ASSERT(*ppSegment == 0);
+assert(*ppSegment == 0);
 if (!RTL_MEMORY_ISP2(size))
 {
 int msb = highbit(size);
@@ -504,7 +497,7 @@ rtl_arena_segment_alloc (
 
 head = (arena-m_freelist_head[index - 1]);
 (*ppSegment) = head-m_fnext;
-

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

2011-11-30 Thread Eike Rathke 
 svl/source/items/dateitem.cxx |2 +-
 vcl/source/control/field2.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c593018f6f2deec8eb98880ac89f19b59a3aee1f
Author: Eike Rathke er...@redhat.com
Date:   Wed Nov 30 13:15:34 2011 +0100

no need to check for Gregorian cut-off date here

diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
index accd1cf..67ed229 100644
--- a/svl/source/items/dateitem.cxx
+++ b/svl/source/items/dateitem.cxx
@@ -148,7 +148,7 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation
 )   const
 {
 DBG_CHKTHIS(SfxDateTimeItem, 0);
-if (aDateTime.IsValidAndGregorian())
+if (aDateTime.IsValidDate())
 if (pIntlWrapper)
 {
 rText = pIntlWrapper-getLocaleData()-getDate(aDateTime);
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 5fadf7e..8705c6e 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1309,7 +1309,7 @@ static sal_Bool ImplDateGetValue( const XubString rStr, 
Date rDate, ExtDateFie
 
 Date aNewDate( nDay, nMonth, nYear );
 DateFormatter::ExpandCentury( aNewDate, utl::MiscCfg().GetYear2000() );
-if ( aNewDate.IsValidAndGregorian() )
+if ( aNewDate.IsValidDate() )
 {
 rDate = aNewDate;
 return sal_True;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits -

2011-11-30 Thread Petr Mladek 
 0 files changed

New commits:
commit b211287c4ae78576d4c13422399c2dff377f
Merge: b1d4df6... e52d844...
Author: Petr Mladek pmla...@suse.cz
Date:   Wed Nov 30 14:30:52 2011 +0100

Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/binfilter

commit b1d4df63a7d435ae25879c14181a4a9880679702
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Nov 29 17:52:42 2011 +0100

Version 3.5.0.0, tag libreoffice-3.5.0.0 (3.5.0-beta0)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-11-30 Thread Stephan Bergmann 
 basctl/source/basicide/basides1.cxx |   18 +-
 basctl/source/basicide/basidesh.cxx |6 +++---
 basctl/source/basicide/basobj2.cxx  |2 +-
 basctl/source/basicide/basobj3.cxx  |2 +-
 basctl/source/basicide/bastype3.cxx |   10 +-
 basctl/source/basicide/moduldl2.cxx |2 +-
 basctl/source/basicide/moduldlg.cxx |4 ++--
 basctl/source/inc/basidesh.hxx  |2 +-
 basctl/source/inc/sbxitem.hxx   |   12 ++--
 9 files changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 08b921ef07ff2f5089b1e55c9fa11325a594ab22
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Nov 30 14:51:39 2011 +0100

Enum member names live in the outer name scope.

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 2aff96e..62cb0c6 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -615,9 +615,9 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 String aName( rSbxItem.GetName() );
 if ( !m_aCurLibName.Len() || ( aDocument == m_aCurDocument  
aLibName == m_aCurLibName ) )
 {
-if ( rSbxItem.GetType() == BasicIDEType::Module )
+if ( rSbxItem.GetType() == BASICIDE_TYPE_MODULE )
 FindBasWin( aDocument, aLibName, aName, sal_True );
-else if ( rSbxItem.GetType() == BasicIDEType::Dialog )
+else if ( rSbxItem.GetType() == BASICIDE_TYPE_DIALOG )
 FindDlgWin( aDocument, aLibName, aName, sal_True );
 }
 }
@@ -641,15 +641,15 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest rReq )
 String aName( rSbxItem.GetName() );
 SetCurLib( aDocument, aLibName );
 IDEBaseWindow* pWin = 0;
-if ( rSbxItem.GetType() == BasicIDEType::Dialog )
+if ( rSbxItem.GetType() == BASICIDE_TYPE_DIALOG )
 {
 pWin = FindDlgWin( aDocument, aLibName, aName, sal_True );
 }
-else if ( rSbxItem.GetType() == BasicIDEType::Module )
+else if ( rSbxItem.GetType() == BASICIDE_TYPE_MODULE )
 {
 pWin = FindBasWin( aDocument, aLibName, aName, sal_True );
 }
-else if ( rSbxItem.GetType() == BasicIDEType::Method )
+else if ( rSbxItem.GetType() == BASICIDE_TYPE_METHOD )
 {
 pWin = FindBasWin( aDocument, aLibName, aName, sal_True );
 ((ModulWindow*)pWin)-EditMacro( rSbxItem.GetMethodName() );
@@ -1137,7 +1137,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, 
sal_Bool bUpdateTabBar
 BasicIDEData* pData = BasicIDEGlobals::GetExtraData();
 if ( pData )
 {
-sal_uInt16 nCurrentType = pCurWin-IsA( TYPE( ModulWindow 
) ) ? BasicIDEType::Module : BasicIDEType::Dialog;
+sal_uInt16 nCurrentType = pCurWin-IsA( TYPE( ModulWindow 
) ) ? BASICIDE_TYPE_MODULE : BASICIDE_TYPE_DIALOG;
 LibInfoItem* pLibInfoItem = new LibInfoItem( 
pCurWin-GetDocument(), pCurWin-GetLibName(), pCurWin-GetName(), nCurrentType 
);
 pData-GetLibInfos().InsertInfo( pLibInfoItem );
 }
@@ -1247,14 +1247,14 @@ IDEBaseWindow* BasicIDEShell::FindWindow( const 
ScriptDocument rDocument, const
 {
 if ( !pWin-IsSuspended() || bFindSuspended )
 {
-if ( !rLibName.Len() || !rName.Len() || nType == 
BasicIDEType::Unknown )
+if ( !rLibName.Len() || !rName.Len() || nType == 
BASICIDE_TYPE_UNKNOWN )
 {
 // return any non-suspended window
 return pWin;
 }
 else if ( pWin-IsDocument( rDocument )  pWin-GetLibName() == 
rLibName  pWin-GetName() == rName 
-  ( ( pWin-IsA( TYPE( ModulWindow ) )   nType == 
BasicIDEType::Module ) ||
-( pWin-IsA( TYPE( DialogWindow ) )  nType == 
BasicIDEType::Dialog ) ) )
+  ( ( pWin-IsA( TYPE( ModulWindow ) )   nType == 
BASICIDE_TYPE_MODULE ) ||
+( pWin-IsA( TYPE( DialogWindow ) )  nType == 
BASICIDE_TYPE_DIALOG ) ) )
 {
 return pWin;
 }
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index 0e77823..65c92d6 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -131,7 +131,7 @@ public:
 rtl::OUString sModuleName;
 if( mpShell   ( Event.Accessor = sModuleName ) )
 {
-IDEBaseWindow* pWin = mpShell-FindWindow( 
mpShell-m_aCurDocument, mpShell-m_aCurLibName, sModuleName, 
BasicIDEType::Module, sal_True );
+IDEBaseWindow* pWin = mpShell-FindWindow( 
mpShell-m_aCurDocument, mpShell-m_aCurLibName, sModuleName, 
BASICIDE_TYPE_MODULE, sal_True );
 if( pWin

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen 
 solenv/gbuild/Module.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ec894c5fb90bdee1c56d113d14b0bf524df9f5a9
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 30 15:21:28 2011 +0100

lets only depend build-order only on build from debugrun for now

- as long as we still have the slow build.pl run for top-level build

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 02e76ea..2efef85 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -84,6 +84,7 @@ $(call gb_Module_get_target,%) :
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 check : subsequentcheck
+debugrun :| build
 
 define gb_Module_BUILDHINT
 
@@ -108,6 +109,7 @@ else
 gb_Module_BUILDHINT=
 gb_Module_DEVINSTALLHINT=
 
+debugrun : build
 endif
 
 all : build unitcheck
@@ -142,7 +144,7 @@ check : unitcheck
$(call gb_Output_announce_title,all tests checked.)
$(call gb_Output_announce_bell)

-debugrun : build
+debugrun :
$(call gb_Module_DEBUGRUNCOMMAND)
 
 dev-install :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - connectivity/source dbaccess/source

2011-11-30 Thread Lionel Elie Mamane 
 connectivity/source/drivers/odbcbase/OStatement.cxx|   19 ++--
 connectivity/source/drivers/postgresql/pq_connection.cxx   |1 
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |   13 +-
 connectivity/source/drivers/postgresql/pq_tools.cxx|   46 
+++---
 connectivity/source/drivers/postgresql/pq_tools.hxx|8 +
 connectivity/source/drivers/postgresql/pq_xcolumns.cxx |   17 +--
 connectivity/source/drivers/postgresql/pq_xindexes.cxx |   15 +--
 connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx  |   15 +--
 connectivity/source/drivers/postgresql/pq_xkeys.cxx|   18 ++-
 connectivity/source/drivers/postgresql/pq_xtables.cxx  |   19 ++--
 connectivity/source/drivers/postgresql/pq_xusers.cxx   |   15 +--
 connectivity/source/drivers/postgresql/pq_xviews.cxx   |   20 ++--
 connectivity/source/inc/odbc/OStatement.hxx|8 -
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx  |2 
 dbaccess/source/ui/dlg/detailpages.cxx |2 
 15 files changed, 129 insertions(+), 89 deletions(-)

New commits:
commit 5f3bd5bed3f5d677208dc1b897b2f21eb5f622bb
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Nov 30 15:57:08 2011 +0100

pgsql-sdbc: Robustify against empty arrays, etc

diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx 
b/connectivity/source/drivers/postgresql/pq_connection.cxx
index bf30c77..ef6ec78 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -492,6 +492,7 @@ static void properties2arrays( const Sequence 
PropertyValue   args,
 for( int i = 0; i  args.getLength() ; ++i )
 {
 bool append = true;
+// TODO: rewrite this as a static table of keywords, and a loop over 
these keywords.
 if( args[i].Name.matchIgnoreAsciiCaseAsciiL( 
RTL_CONSTASCII_STRINGPARAM( password ) ) )
 {
 keywords.push_back( password, SAL_NO_ACQUIRE );
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 7bca582..28aad9c 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1250,8 +1250,7 @@ sal_Bool 
DatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw (SQLExc
 closeable-close();
 
 return new SequenceResultSet(
-m_refMutex, *this, statics.tablesRowNames,
-Sequence Sequence Any   ( vec[0],vec.size() ), m_pSettings-tc );
+m_refMutex, *this, statics.tablesRowNames, sequence_of_vector(vec), 
m_pSettings-tc );
 }
 
 struct SortInternalSchemasLastAndPublicFirst
@@ -1325,8 +1324,7 @@ struct SortInternalSchemasLastAndPublicFirst
 if( closeable.is() )
 closeable-close();
 return new SequenceResultSet(
-m_refMutex, *this, getStatics().schemaNames,
-Sequence Sequence Any   ( vec[0], vec.size() ), m_pSettings-tc );
+m_refMutex, *this, getStatics().schemaNames, sequence_of_vector(vec), 
m_pSettings-tc );
 }
 
 ::com::sun::star::uno::Reference XResultSet  DatabaseMetaData::getCatalogs(  
)
@@ -1670,8 +1668,7 @@ static void columnMetaData2DatabaseTypeDescription(
 closeable-close();
 
 return new SequenceResultSet(
-m_refMutex, *this, statics.columnRowNames,
-Sequence Sequence Any   ( vec[0],vec.size() ), m_pSettings-tc );
+m_refMutex, *this, statics.columnRowNames, sequence_of_vector(vec), 
m_pSettings-tc );
 }
 
 ::com::sun::star::uno::Reference XResultSet  
DatabaseMetaData::getColumnPrivileges(
@@ -2348,7 +2345,7 @@ static void pgTypeInfo2ResultSet(
 m_refMutex,
 *this,
 getStatics().typeinfoColumnNames,
-Sequence Sequence Any   ( vec[0] , vec.size() ),
+sequence_of_vector(vec),
 m_pSettings-tc,
 ( getStatics().typeInfoMetaData ));
 }
@@ -2494,7 +2491,7 @@ static sal_Int32 seqContains( const Sequence sal_Int32  
seq, sal_Int32 value
 }
 return new SequenceResultSet(
 m_refMutex, *this, getStatics().indexinfoColumnNames,
-Sequence Sequence Any   ( vec[0] , vec.size() ),
+sequence_of_vector(vec),
 m_pSettings-tc );
 }
 
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx 
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index ac9c66f..c27bf15 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -829,8 +829,7 @@ com::sun::star::uno::Sequence Any  parseArray( const 
rtl::OUString  str ) thr
 }
 i++;
 }
-ret = Sequence Any  ( elements[0] , elements.size() );
-return ret;
+return sequence_of_vector(elements);
 }
 
 com::sun::star::uno::Sequence sal_Int32  parseIntArray( const

Re: [Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Lubos Lunak 
On Wednesday 30 of November 2011, Bjoern Michaelsen wrote:
  solenv/gbuild/extensions/post_BuildplTargets.mk |2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 New commits:
 commit 1f538764acdd67c3f294cd03da006ace27f736ef
 Author: Bjoern Michaelsen bjoern.michael...@canonical.com
 Date:   Wed Nov 30 14:02:08 2011 +0100

 make build.pl verbose on non-silent builds

 This does not work, the build is verbose regardless of any -s passed to make. 
Moreover I question the usefullness of having verbose build by default.

 diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk
 b/solenv/gbuild/extensions/post_BuildplTargets.mk index 7e9b898..cd3101d
 100644
 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk
 +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
 @@ -54,7 +54,7 @@ endif

  gb_BuildplTarget_COMPLETEDTARGETS=
  define gb_BuildplTarget_command
 -cd $(SRCDIR)/$(1)  unset MAKEFLAGS  $(SOLARENV)/bin/build.pl
 -P$(BUILD_NCPUS) $(2) -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
 +cd $(SRCDIR)/$(1)  unset MAKEFLAGS  $(SOLARENV)/bin/build.pl $(if
 $(filter s,$(MAKEFLAGS)),,VERBOSE=T) -P$(BUILD_NCPUS) $(2)
 -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET) $(eval
 gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
  endef

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

[Libreoffice-commits] .: unusedcode.easy

2011-11-30 Thread Caolán McNamara 
 unusedcode.easy |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 22ad135d1beffa214bff0f628d6e1c3fd182b60c
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Nov 30 15:40:16 2011 +

update list

diff --git a/unusedcode.easy b/unusedcode.easy
index ca085ff..874a1e8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,3 +1,4 @@
+(anonymous namespace)::UpdateInformationProvider::storeCommandInfo(int, 
com::sun::star::uno::Referencecom::sun::star::ucb::XCommandProcessor const)
 (anonymous 
namespace)::getState(std::__debug::vectorcppcanvas::internal::OutDevState, 
std::allocatorcppcanvas::internal::OutDevState  const)
 (anonymous 
namespace)::writeInfo(com::sun::star::uno::Referencecom::sun::star::registry::XRegistryKey
 const, rtl::OUString const, rtl::OUString const)
 AtomDocument::AtomDocument(AtomPubSession*, std::basic_stringchar, 
std::char_traitschar, std::allocatorchar )
@@ -79,6 +80,7 @@ CurrencyBox::RemoveValue(long)
 CurrencyField::CurrencyField(Window*, ResId const)
 CurrencyFormatter::SetCurrencySymbol(String const)
 CustomToolBarImportHelper::showToolbar(rtl::OUString const)
+Date::IsValidDate() const
 DateBox::DateBox(Window*, ResId const)
 DateBox::GetDate(unsigned short) const
 DateBox::GetDatePos(Date const) const
@@ -1989,7 +1991,6 @@ 
oox::drawingml::CustomShapeProperties::getValue(std::__debug::vectoroox::drawin
 oox::drawingml::Diagram::getLayoutId() const
 
oox::drawingml::DiagramLayout::layout(std::__debug::vectoroox::drawingml::dgm::Point,
 std::allocatoroox::drawingml::dgm::Point  const, 
com::sun::star::awt::Point const)
 
oox::drawingml::GetPoint2D(com::sun::star::uno::Referencecom::sun::star::xml::sax::XFastAttributeList
 const)
-oox::drawingml::GetShapePresetType(int)
 oox::drawingml::GetTextMargin(rtl::OUString const)
 oox::drawingml::GetTextVerticalAdjust(int)
 
oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties 
const)
@@ -2025,7 +2026,9 @@ 
oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const, un
 oox::dump::XmlStreamObject::XmlStreamObject(oox::dump::OutputObjectBase 
const, oox::dump::BinaryInputStreamRef const)
 oox::dump::biff::BiffObjectBase::dumpRowRange(oox::dump::String const, bool)
 oox::dump::biff::FormulaObject::dumpCellFormula(oox::dump::String const, 
unsigned short)
+oox::formulaimport::XmlStream::AttributeList::attribute(int, unsigned short) 
const
 oox::formulaimport::XmlStream::AttributeList::hasAttribute(int) const
+oox::formulaimport::XmlStream::skipElement(int)
 oox::ole::VbaHelper::getBasicScriptUrl(rtl::OUString const, rtl::OUString 
const, rtl::OUString const)
 oox::ole::VbaProject::hasDialog(rtl::OUString const) const
 oox::ole::VbaProject::hasModule(rtl::OUString const) const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen 
 solenv/gbuild/extensions/post_BuildplTargets.mk |6 --
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |   16 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit ab988b37908a0b8ee62869bd637bf176b03ac3ac
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 30 16:45:31 2011 +0100

fix conditions on when to read gbuild definitions

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index cd3101d..702d84f 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -27,12 +27,6 @@
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 
-gb_Module_add_target=
-gb_Module_add_moduledir=
-gb_Module_add_check_target=
-gb_Module_add_subsequentcheck_target=
-gb_FULLDEPS=
-
 clean: clean-host clean-build
 
 subsequentcheck: smoketestoo_native
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 842f05e..f5e17b8 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -27,14 +27,26 @@
 
 
 # speed up if no target need to parse all modules
+gb_SpeedUpTargets_WRAPPEDBUILD:=
 ifneq ($(strip $(MAKECMDGOALS)),)
-ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun 
Env.Host.sh,$(MAKECMDGOALS)),)
+ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun 
$(SRCDIR)/Env.Host.sh,$(MAKECMDGOALS)),)
+gb_SpeedUpTargets_WRAPPEDBUILD:=T
+endif
+endif
+
+ifeq ($(strip $(gb_PARTIALBUILD)),)
+ifeq ($(filter-out clean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset 
findunusedcode,$(MAKECMDGOALS)),)
+gb_SpeedUpTargets_WRAPPEDBUILD:=T
+endif
+endif
+
+ifneq ($(strip $(gb_SpeedUpTargets_WRAPPEDBUILD)),)
+$(info wrapped build - skip reading gbuild definitions)
 gb_Module_add_target=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
 gb_FULLDEPS=
 endif
-endif
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-30 Thread Eike Rathke 
 sc/source/core/inc/interpre.hxx  |6 +-
 sc/source/core/tool/interpr2.cxx |9 +
 sc/source/core/tool/interpr4.cxx |2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 445ae496f9a3b8abf8427e8ffe82d85cdaecd384
Author: Eike Rathke er...@redhat.com
Date:   Wed Nov 30 16:52:56 2011 +0100

sort out Gregorian cut-off date as side effect of validity

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 111f74f..586a4dd 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -551,8 +551,12 @@ void ScTTT();
 1999-03-03.
 If TRUE, the date passed must be a valid Gregorian calendar date. No
 two-digit expanding or rollover is done.
+
+@param bCheckGregorian
+If TRUE, date must be Gregorian, i.e. = 1582-10-15.
+If FALSE, don't care, any valid date = 0-1-1 will do.
  */
-double GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, bool 
bStrict );
+double GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, bool 
bStrict, bool bCheckGregorian );
 
 void ScGetActDate();
 void ScGetActTime();
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index ef42258..5859a1a 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -66,7 +66,8 @@ using namespace formula;
 // Datum und Zeit
 //-
 
-double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, 
sal_Int16 nDay, bool bStrict )
+double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, 
sal_Int16 nDay,
+bool bStrict, bool bCheckGregorian )
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, sc, er, 
ScInterpreter::GetDateSerial );
 if ( nYear  100  !bStrict )
@@ -93,7 +94,7 @@ double ScInterpreter::GetDateSerial( sal_Int16 nYear, 
sal_Int16 nMonth, sal_Int1
 Date aDate( nD, nM, nY);
 if (!bStrict)
 aDate += nDay - 1;
-if (aDate.IsValidAndGregorian())
+if ((!bCheckGregorian  aDate.IsValidDate()) || (bCheckGregorian  
aDate.IsValidAndGregorian()))
 return (double) (aDate - *(pFormatter-GetNullDate()));
 else
 {
@@ -266,7 +267,7 @@ void ScInterpreter::ScEasterSunday()
 O = H + L - 7 * M + 114;
 nDay = sal::static_int_castsal_Int16( O % 31 + 1 );
 nMonth = sal::static_int_castsal_Int16( int(O / 31) );
-PushDouble( GetDateSerial( nYear, nMonth, nDay, true ) );
+PushDouble( GetDateSerial( nYear, nMonth, nDay, true, true ) );
 }
 }
 
@@ -283,7 +284,7 @@ void ScInterpreter::ScGetDate()
 PushIllegalArgument();
 else
 {
-PushDouble(GetDateSerial(nYear, nMonth, nDay, false));
+PushDouble(GetDateSerial(nYear, nMonth, nDay, false, true));
 }
 }
 }
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index d134d74..1bbad1c 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -405,7 +405,7 @@ double ScInterpreter::ConvertStringToValue( const String 
rStr )
 
sal::static_int_castsal_Int16(nUnit[year]),
 
sal::static_int_castsal_Int16(nUnit[month]),
 
sal::static_int_castsal_Int16(nUnit[day]),
-true) : 0.0);
+true, false) : 0.0);
 fValue += ((nUnit[hour] * 3600) + (nUnit[minute] * 
60) + nUnit[second] + fFraction) / 86400.0;
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Jan Holesovsky 
 solenv/gbuild/BuildDirs.mk |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 28275d470f3a062cfa27d72bbf89328af1e83c68
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Nov 30 16:20:11 2011 +0100

Don't overwrite OUTDIR  friends.

diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index 6a0933b..828546f 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -35,15 +35,6 @@ ifeq ($(strip $(SOLARENV)),)
 $(error SOLARENV variable is empty, no environment set, aborting)
 endif
 
-# HACK
-# unixify windoze paths
-ifeq ($(OS_FOR_BUILD),WNT)
-override WORKDIR := $(shell cygpath -u $(WORKDIR))
-override OUTDIR := $(shell cygpath -u $(OUTDIR))
-override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD))
-override SRCDIR := $(shell cygpath -u $(SRCDIR))
-endif
-
 REPODIR := $(patsubst %/,%,$(dir $(SRCDIR)))
 
 # vim: set noet sw=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source

2011-11-30 Thread Lionel Elie Mamane 
 connectivity/source/drivers/postgresql/pq_statics.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit aad641e29b87013ecd77d03d18d7755f284539d7
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Nov 30 18:30:39 2011 +0100

pgsql-sdbc: adapt comment to new code situation

diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx 
b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 3a95279..acd0d28 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -698,8 +698,9 @@ Statics  getStatics()
baseTypeDefs[i].value;
 }
 
-// LEM TODO: this bears a passing resemblance with the structure 
of pg_catalog.pg_type
-// LEM TODO: isSigned (last field) is not initialised
+// This is the metadata for the columns of the recordset returned
+// by ::com::sun::star::sdbc::XDatabaseMetaData::getTypeInfo(),
+// that is what is returned by getTypeInfo().getMetaData()
 DefColumnMetaData defTypeInfoMetaData[] =
 {
 { TYPE_NAME, TYPEINFO, pg_catalog, , 
com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0, false },  // 0
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen 
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7d3f21b27469d04b57dbd9f7befb3109001422ed
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 30 19:06:46 2011 +0100

dont read gbuild definitions on distclean

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index f5e17b8..e3b65b3 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -35,7 +35,7 @@ endif
 endif
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
-ifeq ($(filter-out clean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset 
findunusedcode,$(MAKECMDGOALS)),)
+ifeq ($(filter-out clean distclean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset 
findunusedcode,$(MAKECMDGOALS)),)
 gb_SpeedUpTargets_WRAPPEDBUILD:=T
 endif
 endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in connectivity/source

2011-11-30 Thread Lionel Elie Mamane 
 configure.in   |   10 +-
 connectivity/source/drivers/postgresql/makefile.mk |9 +
 2 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 05b53b1b8e500b31bef1db737303725a168379da
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Nov 30 21:09:43 2011 +0100

postgresql-sdbc: review build rules

diff --git a/configure.in b/configure.in
index a47725f..e2b9ea3 100644
--- a/configure.in
+++ b/configure.in
@@ -5400,7 +5400,7 @@ dnl 
===
 dnl Check for PostgreSQL stuff
 dnl ===
 
-if test x$enable_ext_postgresql_sdbc = xyes; then
+if test x$enable_ext_postgresql_sdbc = xyes -a 
x$enable_extension_integration != xno; then
 SCPDEFS=$SCPDEFS -DWITH_EXTENSION_POSTGRESQL
 
 AC_MSG_CHECKING([for PostgreSQL prerequisites])
@@ -5412,12 +5412,12 @@ if test x$enable_ext_postgresql_sdbc = xyes; then
AC_MSG_ERROR([pg_config needed; set PGCONFIG if not in PATH])
 fi
 POSTGRESQL_INC=-I$(pg_config --includedir)
-POSTGRESQL_LIB=-L$(pg_config --libdir) -lpq
+POSTGRESQL_LIB=-L$(pg_config --libdir)
 else
 SYSTEM_POSTGRESQL=NO
 if test -n $with_libpq_path; then
 AC_MSG_RESULT([external libpq])
-POSTGRESQL_LIB=-L${with_libpq_path}/lib/ -lpq
+POSTGRESQL_LIB=-L${with_libpq_path}/lib/
 POSTGRESQL_INC=-I${with_libpq_path}/include/
 else
 AC_MSG_ERROR([not given. Please specify either 
--with-system-postgresql or --with-libpq-path])
@@ -5427,8 +5427,8 @@ if test x$enable_ext_postgresql_sdbc = xyes; then
 save_CFLAGS=$CFLAGS
 save_CPPFLAGS=$CPPFLAGS
 save_LIBS=$LIBS
-CPPFLAGS=${POSTGRESQL_INC}
-LIBS=${POSTGRESQL_LIB}
+CPPFLAGS=${CPPFLAGS} ${POSTGRESQL_INC}
+LIBS=${LIBS} ${POSTGRESQL_LIB}
 AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], 
[])
 AC_CHECK_LIB(pq, PQconnectdbParams, [],
 [AC_MSG_ERROR(libpq not found or too old. Need = 9.0)], [])
diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 4f2dffd..e498981 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -97,14 +97,14 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=  $(SHL1TARGET)
 SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
 
-# use the static version
+# use the static version on Windows?
 # LEM 17/11/2011: removed everything except libpq proper;
 #  as per instructions in libpq documentation.
 #  If it turns out the rest was needed, reenable it.
 .IF $(GUI)==WNT
-POSTGRESQL_LIB=libpq.lib #wsock32.lib advapi32.lib
+LIBPQ_LINK=libpq.lib #wsock32.lib advapi32.lib
 .ELSE
-POSTGRESQL_LIB=-lpq #-lcrypt
+LIBPQ_LINK=-lpq #-lcrypt
 .ENDIF
 SHL2TARGET=postgresql-sdbc-impl.uno
 LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
@@ -148,7 +148,8 @@ SHL2STDLIBS= \
 $(CPPUHELPERLIB)   \
 $(SALLIB)  \
 $(SALHELPERLIB)\
-$(POSTGRESQL_LIB)
+$(POSTGRESQL_LIB)  \
+$(LIBPQ_LINK)
 
 SHL2LIBS=  $(LIB2TARGET)
 SHL2DEF=   $(MISC)$/$(SHL2TARGET).def
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: download

2011-11-30 Thread Tor Lillqvist 
 download |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f7593f3d39ef7f8036e80b5d44f9304ef6c41e7b
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Nov 30 22:13:54 2011 +0200

Avoid syntax error if $OXYGENOFFICE_PACK is undefined

diff --git a/download b/download
index 716bd53..6880e03 100755
--- a/download
+++ b/download
@@ -278,7 +278,7 @@ for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK 
$OOOP_SAMPLES_PACK $OOOP_TEMPLAT
 unzip -o -q $TARFILE_LOCATION/$pack -d $SRC_ROOT/extras/source
 done
 
-if [ $OXYGENOFFICE_PACK = YES ] ; then
+if [ $OXYGENOFFICE_PACK = YES ] ; then
 check_file $TARFILE_LOCATION/$OXYGENOFFICE_PACK
 echo Unpacking OxygenOffice '$OXYGENOFFICE_PACK' ...
 unzip -o -q $TARFILE_LOCATION/$OXYGENOFFICE_PACK -d $SRC_ROOT/src
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/android

2011-11-30 Thread Tor Lillqvist 
 sal/android/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 895d23328e5c7fa9293eb581d562f4d8fae1afed
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Nov 30 22:47:22 2011 +0200

Fix build breaker thinko

diff --git a/sal/android/makefile.mk b/sal/android/makefile.mk
index 74de4ee..c5e630b 100644
--- a/sal/android/makefile.mk
+++ b/sal/android/makefile.mk
@@ -38,7 +38,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
 
 .IF $(OS) != ANDROID
 ALL:
-   @: do nothing
+# do nothing
 .ENDIF
 
 SHL1TARGET = $(TARGET)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen 
 solenv/gbuild/Module.mk |6 +-
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 1f6be70688a74b9f2ff1f641ef45c6fc5d20cc38
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 30 22:20:17 2011 +0100

do not even read module dirs when shortcuting

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 2b86a7d..87209c2 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -45,6 +45,7 @@ $(info wrapped build - skip reading gbuild definitions)
 gb_Module_add_target=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
+gb_Module_add_moduledir=
 gb_FULLDEPS=
 endif
 
commit f95bf9c68dde00624a9b4134993f9ddf14123d1a
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 30 22:16:11 2011 +0100

debugrun does not need to read gbuild definitions

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index e3b65b3..2b86a7d 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -35,7 +35,7 @@ endif
 endif
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
-ifeq ($(filter-out clean distclean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset 
findunusedcode,$(MAKECMDGOALS)),)
+ifeq ($(filter-out clean distclean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset findunusedcode 
debugrun,$(MAKECMDGOALS)),)
 gb_SpeedUpTargets_WRAPPEDBUILD:=T
 endif
 endif
commit 359dc427b4633b271078fbb80fdf674f54c89c0d
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 30 22:15:29 2011 +0100

execute debugrun after building

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 2efef85..c0f8ffd 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -84,7 +84,11 @@ $(call gb_Module_get_target,%) :
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 check : subsequentcheck
-debugrun :| build
+
+# execute debugrun at the end
+ifneq ($(filter dev-install build all,$(MAKECMDGOALS)),)
+debugrun :| $(filter dev-install build all,$(MAKECMDGOALS))
+endif
 
 define gb_Module_BUILDHINT
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: set_soenv.in

2011-11-30 Thread Tor Lillqvist 
 set_soenv.in |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 53125e89eb279fc816bc2f903d07a66bfd165c6f
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Nov 30 23:53:45 2011 +0200

Set JAVA_HOME before it is used

diff --git a/set_soenv.in b/set_soenv.in
index 5c01664..90fcc0f 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -128,6 +128,12 @@ $EPM_FLAGS = ;
 $CL_X64 = '@CL_X64@';
 $GNUMAKE= @GNUMAKE@;
 
+# JAVA_HOME as argument from autoconf.
+$JAVA_HOME = PathFormat('@JAVA_HOME@') ;
+
+if ( $platform =~ m/cygwin/ ) {
+   $JAVA_HOME =~ s/[\s\/]+$//; # remove trailing \n or \/ if there is any.
+}
 #
 #
 # IV. Initialise the warning container and print a note to the user.
@@ -797,13 +803,6 @@ $SRC_ROOT = PathFormat($SRC_ROOT);
 CheckPathExist( $SRC_ROOT );
 
 
-# 2. Java home directory.
-# JAVA_HOME as argument from autoconf.
-$JAVA_HOME = PathFormat('@JAVA_HOME@') ;
-
-if ( $platform =~ m/cygwin/ ) {
-   $JAVA_HOME =~ s/[\s\/]+$//; # remove trailing \n or \/ if there is any.
-}
 # 3. bash path.
 $OOO_SHELL = '@BASH@';
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-11-30 Thread Lionel Elie Mamane 
 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 130028f2b4f27765ddf1b657f1f8e1d4a4005698
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Nov 30 22:54:42 2011 +0100

configure pgsql-sdbc: use PGCONFIG instead of relying on PATH

diff --git a/configure.in b/configure.in
index e2b9ea3..a9dac9d 100644
--- a/configure.in
+++ b/configure.in
@@ -5411,8 +5411,8 @@ if test x$enable_ext_postgresql_sdbc = xyes -a 
x$enable_extension_integrati
 if test -z $PGCONFIG; then
AC_MSG_ERROR([pg_config needed; set PGCONFIG if not in PATH])
 fi
-POSTGRESQL_INC=-I$(pg_config --includedir)
-POSTGRESQL_LIB=-L$(pg_config --libdir)
+POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
+POSTGRESQL_LIB=-L$(${PGCONFIG} --libdir)
 else
 SYSTEM_POSTGRESQL=NO
 if test -n $with_libpq_path; then
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: set_soenv.in

2011-11-30 Thread Tor Lillqvist 
 set_soenv.in |  248 +--
 1 file changed, 124 insertions(+), 124 deletions(-)

New commits:
commit 5408edd6e054420b081a45e58f2bdd40b0673863
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Dec 1 00:53:09 2011 +0200

Now that JAVA_HOME is set early, no need to expand it lazily

Just use $JAVA_HOME instead of '$JAVA_HOME'. Fixes build breaker in at
least bean on Linux.

diff --git a/set_soenv.in b/set_soenv.in
index 90fcc0f..559ad16 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -194,9 +194,9 @@ if ( $platform =~ m/solaris/ )
   }
   $CPU= I;
   $CPUNAME= INTEL;
- $JRELIBDIR  = '$JAVA_HOME'.$ds.jre.$ds.lib.$ds.i386;
- $JRETOOLKITDIR  = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.i386.$ds.xawt;
- $JRETHREADDIR   = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.i386.$ds.native_threads;
+ $JRELIBDIR  = $JAVA_HOME.$ds.jre.$ds.lib.$ds.i386;
+ $JRETOOLKITDIR  = 
$JAVA_HOME.$ds.jre.$ds.lib.$ds.i386.$ds.xawt;
+ $JRETHREADDIR   = 
$JAVA_HOME.$ds.jre.$ds.lib.$ds.i386.$ds.native_threads;
 
}
else
@@ -210,9 +210,9 @@ if ( $platform =~ m/solaris/ )
   }
   $CPU= S;
   $CPUNAME= SPARC;
- $JRELIBDIR  = '$JAVA_HOME'.$ds.jre.$ds.lib.$ds.sparc;
- $JRETOOLKITDIR  = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.sparc.$ds.xawt;
- $JRETHREADDIR   = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.sparc.$ds.native_threads;
+ $JRELIBDIR  = $JAVA_HOME.$ds.jre.$ds.lib.$ds.sparc;
+ $JRETOOLKITDIR  = 
$JAVA_HOME.$ds.jre.$ds.lib.$ds.sparc.$ds.xawt;
+ $JRETHREADDIR   = 
$JAVA_HOME.$ds.jre.$ds.lib.$ds.sparc.$ds.native_threads;
}
 
$COM= GCC;
@@ -231,33 +231,33 @@ elsif ( $platform =~ m/netbsd/ )
{  print Setting NetBSD x86 specific values... ;
   $CPU= I;
   $CPUNAME= INTEL;
-  $JRELIBDIR  = '$JAVA_HOME'.$ds.jre.$ds.lib.$ds.i386;
-  $JRETOOLKITDIR  = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.i386.$ds.client;
-  $JRETHREADDIR   = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.i386.$ds.native_threads;
+  $JRELIBDIR  = $JAVA_HOME.$ds.jre.$ds.lib.$ds.i386;
+  $JRETOOLKITDIR  = $JAVA_HOME.$ds.jre.$ds.lib.$ds.i386.$ds.client;
+  $JRETHREADDIR   = 
$JAVA_HOME.$ds.jre.$ds.lib.$ds.i386.$ds.native_threads;
}
elsif ($platform =~ m/^x86_64/)
{  print Setting NetBSD x86-64 specific values... ;
   $CPU= X;
   $CPUNAME= X86_64;
-  $JRELIBDIR  = '$JAVA_HOME'.$ds.jre.$ds.lib.$ds.amd64;
-  $JRETOOLKITDIR  = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.amd64.$ds.client;
-  $JRETHREADDIR   = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.amd64.$ds.native_threads;
+  $JRELIBDIR  = $JAVA_HOME.$ds.jre.$ds.lib.$ds.amd64;
+  $JRETOOLKITDIR  = 
$JAVA_HOME.$ds.jre.$ds.lib.$ds.amd64.$ds.client;
+  $JRETHREADDIR   = 
$JAVA_HOME.$ds.jre.$ds.lib.$ds.amd64.$ds.native_threads;
}
elsif ($platform =~ m/^sparc/)
{  print Setting NetBSD Sparc specific values... ;
   $CPU= S;
   $CPUNAME= SPARC;
-  $JRELIBDIR  = '$JAVA_HOME'.$ds.jre.$ds.lib.$ds.sparc;
-  $JRETOOLKITDIR  = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.sparc.$ds.client;
-  $JRETHREADDIR   = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.sparc.$ds.native_threads;
+  $JRELIBDIR  = $JAVA_HOME.$ds.jre.$ds.lib.$ds.sparc;
+  $JRETOOLKITDIR  = 
$JAVA_HOME.$ds.jre.$ds.lib.$ds.sparc.$ds.client;
+  $JRETHREADDIR   = 
$JAVA_HOME.$ds.jre.$ds.lib.$ds.sparc.$ds.native_threads;
}
elsif ($platform =~ m/powerpc/)
{  print Setting NetBSD PPC specific values... ;
   $CPU= P;
   $CPUNAME= POWERPC;
-  $JRELIBDIR  = '$JAVA_HOME'.$ds.jre.$ds.lib.$ds.ppc;
-  $JRETOOLKITDIR  = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.ppc.$ds.classic;
-  $JRETHREADDIR   = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.ppc.$ds.native_threads;
+  $JRELIBDIR  = $JAVA_HOME.$ds.jre.$ds.lib.$ds.ppc;
+  $JRETOOLKITDIR  = $JAVA_HOME.$ds.jre.$ds.lib.$ds.ppc.$ds.classic;
+  $JRETHREADDIR   = 
$JAVA_HOME.$ds.jre.$ds.lib.$ds.ppc.$ds.native_threads;
}
else
{ print Unsupported NetBSD architecture: $platform \n;
@@ -294,9 +294,9 @@ elsif ( $platform =~ m/kfreebsd/ )
   $CPUNAME= INTEL;
   $OUTPATH= unxkfgi6;
 
-  $JRELIBDIR  = '$JAVA_HOME'.$ds.jre.$ds.lib.$ds.i386;
-  $JRETOOLKITDIR  = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.i386.$ds.client;
-  $JRETHREADDIR   = 
'$JAVA_HOME'.$ds.jre.$ds.lib.$ds.i386.$ds.native_threads;
+  $JRELIBDIR  = $JAVA_HOME.$ds.jre.$ds.lib.$ds.i386;
+  $JRETOOLKITDIR  = $JAVA_HOME.$ds.jre.$ds.lib.$ds.i386.$ds.client;
+  $JRETHREADDIR   = 
$JAVA_HOME.$ds.jre.$ds.lib.$ds.i386.$ds.native_threads;
 
}
elsif ($platform =~ m/^x86_64/)
@@ -306,9 +306,9 @@ elsif ( $platform =~ m/kfreebsd/ )
   $CPUNAME= X86_64;
   $OUTPATH= unxkfgx6;
 
-

[Libreoffice-commits] .: basctl/Library_basctl.mk basctl/source

2011-11-30 Thread August Sodora 
 basctl/Library_basctl.mk|1 
 basctl/source/basicide/bastypes.cxx |   48 -
 basctl/source/basicide/sbxitem.cxx  |  126 
 basctl/source/inc/sbxitem.hxx   |   31 
 4 files changed, 142 insertions(+), 64 deletions(-)

New commits:
commit 93e3a86977cb8a2d60db7cf3489564c95d18ee80
Author: August Sodora aug...@gmail.com
Date:   Wed Nov 30 21:35:07 2011 -0500

Refactor sbxitem

diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 521a577..45403ec 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_Library_add_exception_objects,basctl,\
basctl/source/basicide/moduldlg \
basctl/source/basicide/objdlg \
basctl/source/basicide/register \
+   basctl/source/basicide/sbxitem \
basctl/source/basicide/scriptdocument \
basctl/source/basicide/tbxctl \
basctl/source/basicide/unomodel \
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index b1a6709..7c79bec 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -26,14 +26,10 @@
  *
  /
 
-
 #include vcl/msgbox.hxx
-#include vector
-#include algorithm
 
 #include ide_pch.hxx
 
-
 #include basic/sbx.hxx
 #include helpid.hrc
 #include basidesh.hrc
@@ -886,50 +882,6 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey rKey )
 return pItem;
 }
 
-SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument rDocument, const 
::rtl::OUString aLibName, const ::rtl::OUString aName, BasicIDEType nType )
-:SfxPoolItem( nWhich_ )
-,m_aDocument(rDocument)
-,m_aLibName(aLibName)
-,m_aName(aName)
-,m_nType(nType)
-{
-}
-
-SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument rDocument, const 
::rtl::OUString aLibName, const ::rtl::OUString aName, const ::rtl::OUString 
aMethodName, BasicIDEType nType )
-:SfxPoolItem( nWhich_ )
-,m_aDocument(rDocument)
-,m_aLibName(aLibName)
-,m_aName(aName)
-,m_aMethodName(aMethodName)
-,m_nType(nType)
-{
-}
-
-SbxItem::SbxItem(const SbxItem rCopy)
-:SfxPoolItem( rCopy )
-,m_aDocument( rCopy.m_aDocument )
-{
-m_aLibName = rCopy.m_aLibName;
-m_aName = rCopy.m_aName;
-m_aMethodName = rCopy.m_aMethodName;
-m_nType = rCopy.m_nType;
-}
-
-int SbxItem::operator==( const SfxPoolItem rCmp) const
-{
-DBG_ASSERT( rCmp.ISA( SbxItem ), ==: Kein SbxItem! );
-return ( SfxPoolItem::operator==( rCmp )  ( m_aDocument == ((const 
SbxItem)rCmp).m_aDocument )
-  ( m_aLibName == ((const 
SbxItem)rCmp).m_aLibName )
-  ( m_aName == ((const 
SbxItem)rCmp).m_aName )
-  ( m_aMethodName == ((const 
SbxItem)rCmp).m_aMethodName )
-  ( m_nType == ((const 
SbxItem)rCmp).m_nType ) );
-}
-
-SfxPoolItem *SbxItem::Clone( SfxItemPool* ) const
-{
-return new SbxItem(*this);
-}
-
 sal_Bool QueryDel( const String rName, const ResId rId, Window* pParent )
 {
 String aQuery( rId );
diff --git a/basctl/source/basicide/sbxitem.cxx 
b/basctl/source/basicide/sbxitem.cxx
new file mode 100644
index 000..e1837c6
--- /dev/null
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -0,0 +1,126 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * http://www.openoffice.org/license.html
+ * for a copy of the LGPLv3 License.
+ *
+ /
+
+#include sbxitem.hxx
+
+SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument rDocument, const 
::rtl::OUString aLibName, const ::rtl::OUString aName, BasicIDEType nType)
+:SfxPoolItem( nWhich_ )
+,m_aDocument(rDocument)
+,m_aLibName(aLibName)
+,m_aName(aName)
+

[Libreoffice-commits] .: basctl/source

2011-11-30 Thread August Sodora 
 basctl/source/basicide/bastypes.cxx |   35 +++
 1 file changed, 15 insertions(+), 20 deletions(-)

New commits:
commit 8ceae013e9664bfc86d4f95d00b2c7fb1f42be76
Author: August Sodora aug...@gmail.com
Date:   Wed Nov 30 21:48:32 2011 -0500

Remove unnecessary includes

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 7c79bec..f7dc4e5 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -26,29 +26,24 @@
  *
  /
 
-#include vcl/msgbox.hxx
-
-#include ide_pch.hxx
-
-#include basic/sbx.hxx
-#include helpid.hrc
-#include basidesh.hrc
-#include bastypes.hxx
-#include bastype2.hxx
-#include baside2.hxx  // unfortunately pModulWindow is needed partly...
-#include baside3.hxx
-#include baside2.hrc
-#include svtools/textview.hxx
-#include svtools/texteng.hxx
-#include basobj.hxx
-#include sbxitem.hxx
-#include iderdll.hxx
+#include baside2.hrc
+#include basidesh.hrc
+#include helpid.hrc
 
-#include sfx2/passwd.hxx
+#include baside2.hxx // unfortunately pModulWindow is needed partly...
+#include baside3.hxx
+#include basobj.hxx
+#include iderdll.hxx
 
-#include com/sun/star/script/XLibraryContainer2.hpp
-#include com/sun/star/script/XLibraryContainerPassword.hpp
+#include basic/basmgr.hxx
 #include com/sun/star/script/ModuleType.hpp
+#include com/sun/star/script/XLibraryContainerPassword.hpp
+#include sfx2/dispatch.hxx
+#include sfx2/passwd.hxx
+#include sfx2/viewfrm.hxx
+#include svl/intitem.hxx
+#include svl/stritem.hxx
+#include vcl/msgbox.hxx
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-30 Thread August Sodora 
 basctl/source/dlged/managelang.cxx |   14 ++
 basctl/source/inc/managelang.hxx   |   12 ++--
 2 files changed, 12 insertions(+), 14 deletions(-)

New commits:
commit 98fd966d0c2c46b51b84da26cdb4bc5ac81e0372
Author: August Sodora aug...@gmail.com
Date:   Wed Nov 30 22:03:58 2011 -0500

Remove unnecessary includes

diff --git a/basctl/source/dlged/managelang.cxx 
b/basctl/source/dlged/managelang.cxx
index feeabbd..d41ed42 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -26,24 +26,23 @@
  *
  /
 
-
 #include basidesh.hxx
 #include basobj.hxx
-#include dlgresid.hrc
 #include iderdll.hxx
 #include iderid.hxx
 #include localizationmgr.hxx
 #include managelang.hxx
 
-#include managelang.hrc
+#include dlgresid.hrc
 #include helpid.hrc
+#include managelang.hrc
 
-#include com/sun/star/i18n/XBreakIterator.hpp
 #include com/sun/star/i18n/WordType.hpp
 #include comphelper/string.hxx
 #include editeng/unolingu.hxx
 #include sfx2/bindings.hxx
 #include svtools/langtab.hxx
+#include svx/langbox.hxx
 #include vcl/unohelp.hxx
 #include vcl/svapp.hxx
 #include vcl/msgbox.hxx
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 6d81efd..f9f9dba 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -29,13 +29,13 @@
 #ifndef _BASCTL_MANAGELANG_HXX
 #define _BASCTL_MANAGELANG_HXX
 
-#include svx/langbox.hxx
 #include svx/checklbx.hxx
 #include vcl/button.hxx
 #include vcl/dialog.hxx
 #include vcl/fixed.hxx
 
 class LocalizationMgr;
+class SvxLanguageBox;
 
 struct LanguageEntry
 {
commit b291c3a1f2d0595096d671c8f6d2812caa993f83
Author: August Sodora aug...@gmail.com
Date:   Wed Nov 30 21:56:20 2011 -0500

String-OUString

diff --git a/basctl/source/dlged/managelang.cxx 
b/basctl/source/dlged/managelang.cxx
index a83c62c..feeabbd 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -100,10 +100,9 @@ ManageLanguageDialog::ManageLanguageDialog( Window* 
pParent, LocalizationMgr* _p
 m_aHelpBtn  ( this, IDEResId( PB_HELP ) ),
 m_aCloseBtn ( this, IDEResId( PB_CLOSE ) ),
 m_pLocalizationMgr  ( _pLMgr ),
-m_sDefLangStr   (   IDEResId( STR_DEF_LANG ) ),
-m_sDeleteStr(   IDEResId( STR_DELETE ) ),
-m_sCreateLangStr(   IDEResId( STR_CREATE_LANG ) )
-
+m_sDefLangStr   (ResId::toString(IDEResId(STR_DEF_LANG))),
+m_sDeleteStr(ResId::toString(IDEResId(STR_DELETE))),
+m_sCreateLangStr(ResId::toString(IDEResId(STR_CREATE_LANG)))
 {
 FreeResource();
 
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index d31188f..6d81efd 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -39,11 +39,11 @@ class LocalizationMgr;
 
 struct LanguageEntry
 {
-String  m_sLanguage;
+::rtl::OUString m_sLanguage;
 ::com::sun::star::lang::Locale  m_aLocale;
 boolm_bIsDefault;
 
-LanguageEntry( const String _rLanguage,
+LanguageEntry( const ::rtl::OUString _rLanguage,
const ::com::sun::star::lang::Locale _rLocale,
bool _bIsDefault ) :
 m_sLanguage( _rLanguage ),
@@ -70,9 +70,9 @@ private:
 
 LocalizationMgr*m_pLocalizationMgr;
 
-String  m_sDefLangStr;
-String  m_sDeleteStr;
-String  m_sCreateLangStr;
+::rtl::OUString m_sDefLangStr;
+::rtl::OUString m_sDeleteStr;
+::rtl::OUString m_sCreateLangStr;
 
 voidInit();
 voidCalcInfoSize();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2011-11-30 Thread August Sodora 
 basctl/source/basicide/basdoc.cxx |7 ++-
 basctl/source/basicide/tbxctl.cxx |   16 +++-
 2 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit 49da4d5da016f8a5cce52014b64362e8daa1bffe
Author: August Sodora aug...@gmail.com
Date:   Wed Nov 30 22:34:22 2011 -0500

Remove unnecessary includes

diff --git a/basctl/source/basicide/basdoc.cxx 
b/basctl/source/basicide/basdoc.cxx
index 4e8db31..01f8535 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -26,7 +26,12 @@
  *
  /
 
-#include ide_pch.hxx
+#include sfx2/app.hxx
+#include sfx2/docfac.hxx
+#include sfx2/printer.hxx
+#include sfx2/objface.hxx
+#include sfx2/objsh.hxx
+#include svl/itemset.hxx
 
 #include unomodel.hxx
 
diff --git a/basctl/source/basicide/tbxctl.cxx 
b/basctl/source/basicide/tbxctl.cxx
index 02f9176..985ed2d 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -26,24 +26,22 @@
  *
  /
 
+#define _BASIDE_POPUPWINDOWTBX
 
+#include tbxctl.hrc
+#include svx/svxids.hrc
 
-#include ide_pch.hxx
-
+#include idetemp.hxx
+#include tbxctl.hxx
 
-#define _BASIDE_POPUPWINDOWTBX
-#include tbxctl.hxx
-#include svx/svxids.hrc
-#include iderid.hxx
-#include tbxctl.hrc
-#include idetemp.hxx
+#include sfx2/dispatch.hxx
 #include sfx2/imagemgr.hxx
+#include sfx2/viewfrm.hxx
 #include svl/aeitem.hxx
 #include vcl/toolbox.hxx
 
 using namespace ::com::sun::star::uno;
 
-
 static ::rtl::OUString aSubToolBarResName( RTL_CONSTASCII_USTRINGPARAM( 
private:resource/toolbar/insertcontrolsbar ) );
 
 SFX_IMPL_TOOLBOX_CONTROL( TbxControls, SfxAllEnumItem )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/JunitTest_sw_complex.mk

2011-11-30 Thread August Sodora 
 sw/JunitTest_sw_complex.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 96a5d372f3e2d84522e68407e1061a1c4bfecdb5
Author: August Sodora aug...@gmail.com
Date:   Thu Dec 1 00:16:23 2011 -0500

fdo#35657: reenable subsequent test

diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 3c330b6..4ed426d 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -63,9 +63,7 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
 complex.writer.CheckFlies \
 complex.writer.CheckIndexedPropertyValues \
 complex.writer.CheckNamedPropertyValues \
+complex.writer.TextPortionEnumerationTest \
 ))
-# fd#35657 test disabled - reenable if fixed
-#complex.writer.TextPortionEnumerationTest \
-
 
 # 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] .: libvisio/prj

2011-11-30 Thread Norbert Thiebaud 
 libvisio/prj/build.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 74b3b4bc25ae31a43c08fdb09d71dae73d1f5cae
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu Dec 1 00:21:14 2011 -0600

fix libvisio's build.lst so that boost dep is taken into account

diff --git a/libvisio/prj/build.lst b/libvisio/prj/build.lst
index 77fec71..dd788b5 100644
--- a/libvisio/prj/build.lst
+++ b/libvisio/prj/build.lst
@@ -1,3 +1,3 @@
-vsdlibvisio: LIBWPD:libwpd LIBWPG:libwpg BOOST::boost soltools NULL
+vsdlibvisio: LIBWPD:libwpd LIBWPG:libwpg BOOST:boost soltools NULL
 vsdlibvisiousr1-   all vsd_mkout NULL
 vsdlibvisionmake   -   all vsd_libvisio NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits