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

[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 
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
- * 
- * 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 
-
-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 
-#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] .: 2 commits - sw/source

[Stefan Knorr]

 sw/source/core/doc/docfly.cxx |  137 +
 sw/source/core/doc/docfmt.cxx |  270 --
 2 files changed, 193 insertions(+), 214 deletions(-)

New commits:
commit b8c18bbb837c892657d189f1456ceee31d7740e3
Author: Philipp Weissenbacher 
Date:   Wed Nov 30 03:41:57 2011 +0100

Translate German comments

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 394a049..10cd5f7 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -53,15 +53,15 @@
 #include 
 #include 
 #include 
-#include // fuer SwHyphenBug (in SetDefault)
+#include // for SwHyphenBug (in SetDefault)
 #include 
 #include 
 #include 
 #include 
 #include 
-#include  // Fuer Sonderbehandlung in InsFrmFmt
+#include  // For special treatment in InsFrmFmt
 #include// Undo-Attr
-#include// servieren: Veraenderungen erkennen
+#include// serve: Recognize changes
 #include 
 #include 
 #include 
@@ -86,11 +86,11 @@ using namespace ::com::sun::star::uno;
 SV_IMPL_PTRARR(SwFrmFmts,SwFrmFmtPtr)
 SV_IMPL_PTRARR(SwCharFmts,SwCharFmtPtr)
 
-//Spezifische Frameformate (Rahmen)
+// Specific frame formats (frames)
 SV_IMPL_PTRARR(SwSpzFrmFmts,SwFrmFmtPtr)
 
 /*
- * interne Funktionen
+ * Internal functions
  */
 
 sal_Bool SetTxtFmtCollNext( const SwTxtFmtCollPtr& rpTxtColl, void* pArgs )
@@ -104,10 +104,10 @@ sal_Bool SetTxtFmtCollNext( const SwTxtFmtCollPtr& 
rpTxtColl, void* pArgs )
 }
 
 /*
- * Zuruecksetzen der harten Formatierung fuer Text
+ * Reset the text's hard formatting
  */
 
-// Uebergabeparameter fuer _Rst und lcl_SetTxtFmtColl
+// Parameters for _Rst and lcl_SetTxtFmtColl
 struct ParaRstFmt
 {
 SwFmtColl* pFmtColl;
@@ -152,8 +152,8 @@ struct ParaRstFmt
 {}
 };
 
-/* in pArgs steht die ChrFmtTablle vom Dokument
- * (wird bei Selectionen am Start/Ende und bei keiner SSelection benoetigt)
+/* pArgs contains the document's ChrFmtTable
+ * Is need for selections at the beginning/end and with no SSelection.
  */
 
 sal_Bool lcl_RstTxtAttr( const SwNodePtr& rpNd, void* pArgs )
@@ -174,7 +174,7 @@ sal_Bool lcl_RstTxtAttr( const SwNodePtr& rpNd, void* pArgs 
)
 
 if( pPara->pHistory )
 {
-// fuers Undo alle Attribute sichern
+// Save all attributes for the Undo.
 SwRegHistory aRHst( *pTxtNode, pPara->pHistory );
 pTxtNode->GetpSwpHints()->Register( &aRHst );
 pTxtNode->RstAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
@@ -363,8 +363,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
 SwIndex& rSt = pPam->GetPoint()->nContent;
 sal_uInt16 nMkPos, nPtPos = rSt.GetIndex();
 
-// JP 22.08.96: Sonderfall: steht der Crsr in einem URL-Attribut
-//  dann wird dessen Bereich genommen
+// Special case: if the Crsr is located within a URL attribute, we 
take over it's area
 SwTxtAttr const*const pURLAttr(
 pTxtNd->GetTxtAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
 if (pURLAttr && pURLAttr->GetINetFmt().GetValue().Len())
@@ -401,7 +400,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
 }
 
 // #i96644#
-//SwDataChanged aTmp( *pPam, 0 );
+// SwDataChanged aTmp( *pPam, 0 );
 std::auto_ptr< SwDataChanged > pDataChanged;
 if ( bSendDataChangedEvents )
 {
@@ -452,9 +451,9 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
 sal_Bool bAdd = sal_True;
 SwNodeIndex aTmpStt( pStt->nNode );
 SwNodeIndex aTmpEnd( pEnd->nNode );
-if( pStt->nContent.GetIndex() ) // nur ein Teil
+if( pStt->nContent.GetIndex() ) // just one part
 {
-// dann spaeter aufsetzen und alle CharFmtAttr -> TxtFmtAttr
+// set up a later, and all CharFmtAttr -> TxtFmtAttr
 SwTxtNode* pTNd = aTmpStt.GetNode().GetTxtNode();
 if( pTNd && pTNd->HasSwAttrSet() && pTNd->GetpSwAttrSet()->Count() )
 {
@@ -472,7 +471,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
 aTmpStt++;
 }
 if( pEnd->nContent.GetIndex() == 
pEnd->nNode.GetNode().GetCntntNode()->Len() )
-// dann spaeter aufsetzen und alle CharFmtAttr -> TxtFmtAttr
+ // set up a later, and all CharFmtAttr -> TxtFmtAttr
 aTmpEnd++, bAdd = sal_False;
 else if( pStt->nNode != pEnd->nNode || !pStt->nContent.GetIndex() )
 {
@@ -515,14 +514,14 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
 
 #define DELETECHARSETS if ( bDelete ) { delete pCharSet; delete pOtherSet; }
 
-// Einfuegen der Hints nach Inhaltsformen;
-// wird in SwDoc::Insert(..., SwFmtHint &rHt) benutzt
+// Insert Hints according to content types;
+// Is used in SwDoc::Insert(..., SwFmtHint &rHt)
 
 static bool
 lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
 const SetAttrMode nFlags, SwUndoAttr *const pUndo)
 {
-// teil die Sets auf (fuer Selektion in Nodes)
+// Divide the Sets (f

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

[François Tigeot]

 distro-configs/LibreOfficeDragonFly.conf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 53ed1eb35926d4dccd4deac779327ea1a1f581cd
Author: François Tigeot 
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

[Andras Timar]

 desktop/Executable_unopkg.bin.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ddefdad69ac963126a3ab6bec2f536804d92c56
Author: Andras Timar 
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

[Andras Timar]

 desktop/Executable_soffice.bin.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d76479654748454e280ac48217fb0036bc5940a1
Author: Andras Timar 
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

[François Tigeot]

 odk/settings/settings.mk |   15 ---
 1 file changed, 15 deletions(-)

New commits:
commit 4821546a240df94c25f2f5a3b0fc3c480596fa3b
Author: François Tigeot 
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

[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 
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 
 #include 
 #include 
 
@@ -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

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

[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 
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] .: basctl/source

[Eike Rathke]

 basctl/source/basicide/baside2.cxx  |2 +-
 basctl/source/basicide/bastypes.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0083479a80de831b0ae90877aa4f5d6c4670eb49
Author: Niklas Johansson 
Date:   Wed Nov 30 13:33:26 2011 +0100

Fixed fdo#42778 pass count in Manage Breakpoints and crash in dialog

When entering pass count 2 it is expected that the breakpoint is
passed two times before breaking not to break the second time.

Also fixed a crash due to dangling pointers of breakpoints.

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index e963871..0f425cf 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -722,7 +722,7 @@ long ModulWindow::BasicBreakHdl( StarBASIC* pBasic )
 if ( pBrk )
 {
 pBrk->nHitCount++;
-if ( pBrk->nHitCount < pBrk->nStopAfter && GetBasic()->IsBreak() )
+if ( pBrk->nHitCount <= pBrk->nStopAfter && GetBasic()->IsBreak() )
 return aStatus.nBasicFlags; // go on...
 }
 
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 008fa99..b1a6709 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -287,7 +287,7 @@ void BreakPointList::transfer(BreakPointList & rList)
 reset();
 for (size_t i = 0; i < rList.size(); ++i)
 maBreakPoints.push_back( rList.at( i ) );
-rList.reset();
+rList.clear();
 }
 
 void BreakPointList::InsertSorted( BreakPoint* pNewBrk )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/Executable.mk |2 +-
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |8 +---
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 509590426a08fd9cdc30d895d5adfd07efea0ebf
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 13:36:07 2011 +0100

fix TARGETGUI for windows

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 60841a0..7858967 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -60,7 +60,7 @@ $(call gb_Deliver_add_deliverable,$(call 
gb_Executable_get_target,$(1)),$(call g
 endef
 
 define gb_Executable_set_targettype_gui
-$(call gb_Executable_get_target,$(1)) : gb_Executable_TARGETGUI := $(2)
+$(call gb_LinkTarget_get_target,Executable/$(1)$(gb_Executable_EXT)) : 
TARGETGUI := $(2)
 endef
 
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 688d53d..ae99f11 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -173,7 +173,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) $(strip \
$(gb_Executable_TARGETTYPEFLAGS) \
-   $(if $(filter YES,$(gb_Executable_TARGETGUI)), -mwindows, 
-mconsole) \
+   $(if $(filter YES,$(TARGETGUI)), -mwindows, -mconsole) \
$(T_LDFLAGS) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
@@ -393,8 +393,10 @@ gb_StaticLibrary_StaticLibrary_platform =
 gb_Executable_EXT := .exe
 gb_Executable_TARGETTYPEFLAGS :=
 gb_Executable_get_rpath :=
-gb_Executable_Executable_platform =
-gb_Executable_TARGETGUI :=
+
+define gb_Executable_Executable_platform
+$(call gb_LinkTarget_get_target,$(2)) : TARGETGUI :=
+endef
 
 # CppunitTest class
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 3051f5d..7a56245 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -358,7 +358,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter 
StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
-   $(if $(filter YES,$(gb_Executable_TARGETGUI)), 
-SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \
+   $(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS, 
-SUBSYSTEM:CONSOLE) \
$(T_LDFLAGS) \
$(if $(gb_PRODUCT),,-NODEFAULTLIB) \
@$${RESPONSEFILE} \
@@ -548,7 +548,6 @@ gb_Executable_EXT := .exe
 gb_Executable_TARGETTYPEFLAGS := $(gb_Windows_PE_TARGETTYPEFLAGS)
 
 gb_Executable_get_rpath :=
-gb_Executable_TARGETGUI := 
 
 define gb_Executable_Executable_platform
 $(call gb_LinkTarget_set_auxtargets,$(2),\
@@ -562,7 +561,8 @@ $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := 
$(call gb_Executable
 $(call gb_Deliver_add_deliverable,$(call 
gb_Executable_get_target,$(1)).manifest,$(call 
gb_LinkTarget_get_target,$(2)).manifest,$(1))
 
 $(call gb_LinkTarget_get_target,$(2)) \
-$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call 
gb_LinkTarget_get_pdbfile,$(2))
+$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE := $(call 
gb_LinkTarget_get_pdbfile,$(2))
+$(call gb_LinkTarget_get_target,$(2)) : TARGETGUI :=
 
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 configure.in |2 ++
 connectivity/prj/d.lst   |1 +
 connectivity/source/drivers/postgresql/makefile.mk   |2 +-
 scp2/source/extensions/directory_extensions.scp  |   11 +++
 scp2/source/extensions/file_extensions.scp   |   13 +
 scp2/source/extensions/module_extensions.scp |   15 +++
 scp2/source/extensions/module_extensions.ulf |6 ++
 setup_native/source/packinfo/packinfo_extensions.txt |   15 +++
 8 files changed, 64 insertions(+), 1 deletion(-)

New commits:
commit 51bd0803b34565ee68d8be62e4076cb581785b06
Author: Michael Meeks 
Date:   Wed Nov 30 12:39:32 2011 +

rename, and bundle the postgresql driver if it is enabled

diff --git a/configure.in b/configure.in
index 4c11c91..cafaf1f 100644
--- a/configure.in
+++ b/configure.in
@@ -5396,6 +5396,8 @@ dnl Check for PostgreSQL stuff
 dnl ===
 
 if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
+SCPDEFS="$SCPDEFS -DWITH_EXTENSION_POSTGRESQL"
+
 AC_MSG_CHECKING([for PostgreSQL prerequisites])
 if test "$with_system_postgresql" = "yes"; then
 AC_MSG_RESULT([external PostgreSQL])
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 1387da4..55099c2 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -7,6 +7,7 @@
 ..\%__SRC%\lib\*.a %_DEST%\lib\*.a
 ..\%__SRC%\slb\connectivity*.* %_DEST%\lib\connectivity*.*
 ..\%__SRC%\lib\idbt* %_DEST%\lib\idbt*
+..\%__SRC%\lib\*.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 f0f184e..4f2dffd 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -159,7 +159,7 @@ SHL2VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
 SLOFILES=   $(LIB1OBJFILES) $(LIB2OBJFILES)
 
 
-DRIVERNAME=postgresql-sdbc-$(PQ_SDBC_VERSION).oxt
+DRIVERNAME=postgresql-sdbc.oxt
 ALLTAR : $(DLLDEST)$/$(DRIVERNAME)
 
 .ENDIF # BUILD_POSTGRESQL_SDBC
diff --git a/scp2/source/extensions/directory_extensions.scp 
b/scp2/source/extensions/directory_extensions.scp
index a7295a7..69e5dc5 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -223,6 +223,17 @@ End
 
 #endif
 
+/* ** PostgreSQL Connector ** */
+
+#ifdef WITH_EXTENSION_POSTGRESQL
+
+Directory gid_Brand_Dir_Share_Extensions_PostgreSQL
+   ParentID = gid_Brand_Dir_Share_Extensions;
+   DosName = "postgresql-sdbc";
+End
+
+#endif
+
 /* ** MySQL Connector ** */
 
 #ifdef WITH_EXTENSION_MYSQLC
diff --git a/scp2/source/extensions/file_extensions.scp 
b/scp2/source/extensions/file_extensions.scp
index 7c34871..48f9e42 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -256,6 +256,19 @@ End
 
 #endif
 
+/* ** PostgreSQL Connector ** */
+
+#ifdef WITH_EXTENSION_POSTGRESQL
+
+File gid_File_Oxt_PostgreSQL
+TXT_FILE_BODY;
+Styles = (PACKED, ARCHIVE);
+Dir = gid_Brand_Dir_Share_Extensions_PostgreSQL;
+Name = "postgresql-sdbc.oxt";
+End
+
+#endif
+
 /* ** MySQL Connector ** */
 
 #ifdef WITH_EXTENSION_MYSQLC
diff --git a/scp2/source/extensions/module_extensions.scp 
b/scp2/source/extensions/module_extensions.scp
index e3514bc..91e6baf 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -295,6 +295,21 @@ Module gid_Module_Optional_Extensions_LanguageTool
 End
 #endif
 
+/* ** PostgreSQL Connector ** */
+
+#ifdef WITH_EXTENSION_POSTGRESQL
+Module gid_Module_Optional_Extensions_PostgreSQL
+ PackageInfo = "packinfo_extensions.txt";
+ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_POSTGRESQL);
+ ParentID = gid_Module_Optional_Extensions;
+ Files = (
+ gid_File_Oxt_PostgreSQL );
+ Minimal = NO;
+ Default = YES;
+ Styles = ( );
+End
+#endif
+
 /* ** MySQL Connector ** */
 
 #ifdef WITH_EXTENSION_MYSQLC
diff --git a/scp2/source/extensions/module_extensions.ulf 
b/scp2/source/extensions/module_extensions.ulf
index 4a7dbc5..3c7cb80 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -141,6 +141,12 @@ en-US = "MySQL Connector"
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MYSQLC]
 en-US = "MySQL Connector"
 
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_POSTGRESQL]
+en-US = "PostgreSQL Connector"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_POSTGRESQL]
+en-US = "PostgreSQL Connector"
+
 [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
 en-US = "Metaweblog Support"
 
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt 
b/setup_native/source/packinfo/packinfo_extensions.txt
index 225ab49..5d5c790 100644

[Libreoffice-commits] .: 2 commits - solenv/gbuild svtools/source svx/source vcl/inc vcl/win

[Caolán McNamara]

 solenv/gbuild/extensions/post_BuildplTargets.mk |   16 
 svtools/source/misc/transfer.cxx|   17 +
 svx/source/dialog/sendreportw32.cxx |5 +++--
 vcl/inc/win/saldata.hxx |2 +-
 vcl/win/source/app/saldata.cxx  |6 +++---
 5 files changed, 24 insertions(+), 22 deletions(-)

New commits:
commit 66a2598e164e2003bed045f03e9ed6c0921f7f2b
Author: Caolán McNamara 
Date:   Wed Nov 30 10:38:17 2011 +

convert over hidden windows-only ByteStrings

diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 9cf2990..aac7126 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -927,14 +927,15 @@ sal_Bool TransferableHelper::SetINetBookmark( const 
INetBookmark& rBmk,
 memset( &rFDesc1, 0, sizeof( FILEDESCRIPTOR ) );
 rFDesc1.dwFlags = FD_LINKUI;
 
-ByteString aStr( rBmk.GetDescription(), eSysCSet );
-for( sal_uInt16 nChar = 0; nChar < aStr.Len(); ++nChar )
-if( strchr( "\\/:*?\"<>|", aStr.GetChar( nChar ) ) )
-aStr.Erase( nChar--, 1 );
-
-aStr.Insert( "Shortcut to ", 0 );
-aStr += ".URL";
-strcpy( rFDesc1.cFileName, aStr.GetBuffer() );
+rtl::OStringBuffer aStr(rtl::OUStringToOString(
+rBmk.GetDescription(), eSysCSet));
+for( sal_uInt16 nChar = 0; nChar < aStr.getLength(); ++nChar )
+if( strchr( "\\/:*?\"<>|", aStr[nChar] ) )
+aStr.remove(nChar--, 1);
+
+aStr.insert(0, RTL_CONSTASCII_STRINGPARAM("Shortcut to "));
+aStr.append(RTL_CONSTASCII_STRINGPARAM(".URL"));
+strcpy( rFDesc1.cFileName, aStr.getStr() );
 
 maAny <<= aSeq;
 }
diff --git a/svx/source/dialog/sendreportw32.cxx 
b/svx/source/dialog/sendreportw32.cxx
index 4f2a45c..514fd46 100644
--- a/svx/source/dialog/sendreportw32.cxx
+++ b/svx/source/dialog/sendreportw32.cxx
@@ -203,9 +203,10 @@ namespace svx{
 
 if ( fp )
 {
-ByteString  strUTF8( GetUsing(), RTL_TEXTENCODING_UTF8 );
+rtl::OString strUTF8(rtl::OUStringToOString(GetUsing(),
+RTL_TEXTENCODING_UTF8));
 
-fwrite( strUTF8.GetBuffer(), 1, strUTF8.Len(), fp );
+fwrite( strUTF8.getStr(), 1, strUTF8.getLength(), fp );
 fclose( fp );
 }
 
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 7450af0..2d6bbf1 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -245,7 +245,7 @@ bool ImplIsFontAvailable( HDC hDC, const UniString& rName );
 
 // \WIN\SOURCE\APP\SALDATA.CXX
 rtl_TextEncoding ImplSalGetSystemEncoding();
-ByteString ImplSalGetWinAnsiString( const UniString& rStr, sal_Bool bFileName 
= FALSE );
+rtl::OString ImplSalGetWinAnsiString( const UniString& rStr, sal_Bool 
bFileName = FALSE );
 UniString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen = 
STRING_LEN );
 int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
 
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 0fd4cf7..854849f 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -53,12 +53,12 @@ rtl_TextEncoding ImplSalGetSystemEncoding()
 
 // ---
 
-ByteString ImplSalGetWinAnsiString( const UniString& rStr, sal_Bool bFileName )
+rtl::OString ImplSalGetWinAnsiString( const UniString& rStr, sal_Bool 
bFileName )
 {
 rtl_TextEncoding eEncoding = ImplSalGetSystemEncoding();
 if ( bFileName )
 {
-return ByteString( rStr, eEncoding,
+return rtl::OUStringToOString( rStr, eEncoding,
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_UNDERLINE |
RTL_UNICODETOTEXT_FLAGS_INVALID_UNDERLINE |
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |
@@ -67,7 +67,7 @@ ByteString ImplSalGetWinAnsiString( const UniString& rStr, 
sal_Bool bFileName )
 }
 else
 {
-return ByteString( rStr, eEncoding,
+return rtl::OUStringToOString( rStr, eEncoding,
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |
RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |
commit bc340ff02dcc519dc4fa7770c3da6140048108c8
Author: Caolán McNamara 
Date:   Wed Nov 30 10:05:43 2011 +

get findunusedcode target working

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index a053420..7e9b898 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -1,4 +1,4 @@
-#   -*- Mode: C++; tab-width: 4; indent-t

[Libreoffice-commits] .: binfilter/bf_so3

[Caolán McNamara]

 binfilter/bf_so3/source/solink/impldde.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit e52d84416c9958ddcdc0bedd3e5250fa2383e826
Author: Caolán McNamara 
Date:   Wed Nov 30 13:05:28 2011 +

convert over hidden windows-only ByteStrings

diff --git a/binfilter/bf_so3/source/solink/impldde.cxx 
b/binfilter/bf_so3/source/solink/impldde.cxx
index b05fbff..13c5984 100644
--- a/binfilter/bf_so3/source/solink/impldde.cxx
+++ b/binfilter/bf_so3/source/solink/impldde.cxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -196,11 +197,13 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
 // Server nicht da, starten und nochmal versuchen
 if( !bInWinExec )
 {
-ByteString aCmdLine( sServer, RTL_TEXTENCODING_ASCII_US );
-aCmdLine.Append( ".exe " );
-aCmdLine.Append( ByteString( sTopic, RTL_TEXTENCODING_ASCII_US ) );
+rtl::OStringBuffer aCmdLine(rtl::OUStringToOString(sServer,
+RTL_TEXTENCODING_ASCII_US));
+aCmdLine.append(".exe ");
+aCmdLine.append(rtl::OUStringToOString(sTopic,
+RTL_TEXTENCODING_ASCII_US));
 
-if( WinExec( aCmdLine.GetBuffer(), SW_SHOWMINIMIZED ) < 32 )
+if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) < 32 )
 nError = DDELINK_ERROR_APP;
 else
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/unx

[Michael Meeks]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 0608cb332ad5b4e4e331b990c28f6354823fd2ae
Author: Khaled Hosny 
Date:   Wed Nov 30 08:57:46 2011 +0200

gtk: fix RTL combobox rendering

GTK themes expect the button and the editing area to be swapped in RTL.

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 2cdd032..6afba20 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2185,6 +2185,8 @@ sal_Bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* 
gdkDrawable,
 
 RectangleaEditBoxRect( pixmapRect );
 aEditBoxRect.SetSize( Size( pixmapRect.GetWidth() - buttonRect.GetWidth(), 
aEditBoxRect.GetHeight() ) );
+if( Application::GetSettings().GetLayoutRTL() )
+aEditBoxRect.SetPos( Point( x + buttonRect.GetWidth() , y ) );
 
 #define ARROW_EXTENT0.7
 arrowRect.SetSize( Size( (gint)(MIN_ARROW_SIZE * ARROW_EXTENT),
@@ -2254,8 +2256,11 @@ static Rectangle NWGetComboBoxButtonRect( int nScreen,
 if( nPart == PART_BUTTON_DOWN )
 {
 aButtonRect.SetSize( Size( nButtonWidth, aAreaRect.GetHeight() ) );
-aButtonRect.SetPos( Point( aAreaRect.Left() + aAreaRect.GetWidth() - 
nButtonWidth,
-   aAreaRect.Top() ) );
+if( Application::GetSettings().GetLayoutRTL() )
+aButtonRect.SetPos( Point( aAreaRect.Left(), aAreaRect.Top() ) );
+else
+aButtonRect.SetPos( Point( aAreaRect.Left() + aAreaRect.GetWidth() 
- nButtonWidth,
+   aAreaRect.Top() ) );
 }
 else if( nPart == PART_SUB_EDIT )
 {
@@ -2271,6 +2276,8 @@ static Rectangle NWGetComboBoxButtonRect( int nScreen,
 Point aEditPos = aAreaRect.TopLeft();
 aEditPos.X() += adjust_x;
 aEditPos.Y() += adjust_y;
+if( Application::GetSettings().GetLayoutRTL() )
+aEditPos.X() += nButtonWidth;
 aButtonRect.SetPos( aEditPos );
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 9 commits - instsetoo_native/util

[Petr Mladek]

 instsetoo_native/util/openoffice.lst |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 817bf1d41bb07aeb3ed7649d25c2b44ee4acb1fe
Merge: 0a112ee... 0608cb3...
Author: Petr Mladek 
Date:   Wed Nov 30 14:29:22 2011 +0100

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

commit 0a112eecbcbe58d3795a4e14ef56b0f253461a98
Merge: ef91e38... dd750cf...
Author: Petr Mladek 
Date:   Tue Nov 29 18:15:13 2011 +0100

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

commit ef91e38681a668cb1c587d59117a83caae51fe32
Author: Petr Mladek 
Date:   Tue Nov 29 17:52:42 2011 +0100

Version 3.5.0.0, tag libreoffice-3.5.0.0 (3.5.0-beta0)
commit da29b0405bc91546f8eaee70303a1c40494e867e
Author: Petr Mladek 
Date:   Tue Nov 29 17:48:30 2011 +0100

bump product version to 3.5.0-beta1, release number stays at 0

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 22a5227..8883713 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -54,7 +54,7 @@ LibreOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION alpha0
+   SHORT_PRODUCTEXTENSION beta0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -115,7 +115,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION alpha0
+   SHORT_PRODUCTEXTENSION beta0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -175,7 +175,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION alpha0
+   SHORT_PRODUCTEXTENSION beta0
UNIXBASISROOTNAME lo-dev
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
@@ -246,7 +246,7 @@ URE
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.5
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION alpha0
+SHORT_PRODUCTEXTENSION beta0
 LICENSENAME LGPL
 SETSTATICPATH 1
 NOVERSIONINDIRNAME 1
@@ -284,7 +284,7 @@ LibreOffice_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION alpha0
+SHORT_PRODUCTEXTENSION beta0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
@@ -330,7 +330,7 @@ LibreOffice_Dev_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION alpha0
+SHORT_PRODUCTEXTENSION beta0
 UNIXBASISROOTNAME lo-dev
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -381,7 +381,7 @@ OxygenOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION  alpha0
+   SHORT_PRODUCTEXTENSION  beta0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -447,7 +447,7 @@ OxygenOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION alpha0
+   SHORT_PRODUCTEXTENSION beta0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
commit 1aa1b7298c2ea84f27881e3beb6ae7108554876f
Author: Stephan Bergmann 
Date:   Tue Nov 29 10:41:38 2011 +0100

...originally probably replaced an en-dash (thanks Roman Eisele).

diff --git 
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
 
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
index e77c972..50666ff 100755
--- 
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
+++ 
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
@@ -18,7 +18,7 @@
  * @References:
  * [1] Storn R, Price K. Differential evolution - a simple and efficient
  * heuristic for global optimization over continuous spaces. Journal of
- * Global Optimization, 1997, 11: 341 C359
+ * Global Optimization, 1997, 11: 341-359
  * @ The original differential evolution idea

[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_BuildplTargets.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1f538764acdd67c3f294cd03da006ace27f736ef
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 14:02:08 2011 +0100

make build.pl verbose on non-silent builds

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
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits -

[Petr Mladek]

 0 files changed

New commits:
commit b211287c4ae78576d4c13422399c2dff377f
Merge: b1d4df6... e52d844...
Author: Petr Mladek 
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 
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] .:

[Petr Mladek]

 0 files changed

New commits:
commit 090bcbaa55370d7906b0cab08839fe88f4e80215
Author: Petr Mladek 
Date:   Tue Nov 29 17:52:43 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

[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 
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 )

[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/Module.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ec894c5fb90bdee1c56d113d14b0bf524df9f5a9
Author: Bjoern Michaelsen 
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

[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 
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< s

[Libreoffice-commits] .: 14 commits - starmath/source writerfilter/source

[Lubos Lunak]

 starmath/source/ooxmlexport.cxx |   76 --
 starmath/source/ooxmlimport.cxx |  263 ++--
 starmath/source/ooxmlimport.hxx |8 +
 writerfilter/source/ooxml/model.xml |1 
 4 files changed, 294 insertions(+), 54 deletions(-)

New commits:
commit d5effb40f2bfa95b8b1d19f56195754f125a75c5
Author: Luboš Luňák 
Date:   Wed Nov 30 15:51:56 2011 +0100

create placeholders properly in docx mathml import

diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 62ad52f..24d 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -29,6 +29,7 @@
 
 #include "ooxmlimport.hxx"
 
+#include 
 #include 
 #include 
 
@@ -81,6 +82,12 @@ OUString SmOoxmlImport::handleStream()
 ret += item;
 }
 stream.ensureClosingTag( M_TOKEN( oMath ));
+// Placeholders are written out as nothing (i.e. nothing inside e.g. the 
 element),
+// which will result in "{}" in the formula text. Fix this up.
+ret = comphelper::string::searchAndReplaceAllAsciiWithAscii( ret, "{}", 
"" );
+// And as a result, empty parts of the formula that are not placeholders 
are written out
+// as a single space, so fix that up too.
+ret = comphelper::string::searchAndReplaceAllAsciiWithAscii( ret, "{ }", 
"{}" );
 fprintf(stderr, "FORMULA: %s\n", rtl::OUStringToOString( ret, 
RTL_TEXTENCODING_UTF8 ).getStr());
 return ret;
 }
@@ -404,11 +411,11 @@ OUString SmOoxmlImport::handleLimLowUpp( LimLowUpp_t 
limlowupp )
 OUString e = readOMathArgInElement( M_TOKEN( e ));
 OUString lim = readOMathArgInElement( M_TOKEN( lim ));
 stream.ensureClosingTag( token );
-// fix up overbrace/underbrace
-if( limlowupp == LimUpp && e.endsWithAsciiL( RTL_CONSTASCII_STRINGPARAM( " 
overbrace {}" )))
-return e.copy( 0, e.getLength() - 1 ) + lim + STR( "}" );
-if( limlowupp == LimLow && e.endsWithAsciiL( RTL_CONSTASCII_STRINGPARAM( " 
underbrace {}" )))
-return e.copy( 0, e.getLength() - 1 ) + lim + STR( "}" );
+// fix up overbrace/underbrace  (use { }, as {} will be converted to a 
placeholder)
+if( limlowupp == LimUpp && e.endsWithAsciiL( RTL_CONSTASCII_STRINGPARAM( " 
overbrace { }" )))
+return e.copy( 0, e.getLength() - 2 ) + lim + STR( "}" );
+if( limlowupp == LimLow && e.endsWithAsciiL( RTL_CONSTASCII_STRINGPARAM( " 
underbrace { }" )))
+return e.copy( 0, e.getLength() - 2 ) + lim + STR( "}" );
 return e + ( limlowupp == LimLow ? STR( " csub {" ) : STR( " csup {" )) + 
lim + STR( "}" );
 }
 
@@ -435,9 +442,9 @@ OUString SmOoxmlImport::handleGroupChr()
 OUString e = readOMathArgInElement( M_TOKEN( e ));
 stream.ensureClosingTag( M_TOKEN( groupChr ));
 if( pos == top && chr == sal_Unicode( 0x23de ))
-return STR( "{" ) + e + STR( "} overbrace {}" );
+return STR( "{" ) + e + STR( "} overbrace { }" );
 if( pos == bot && chr == sal_Unicode( 0x23df ))
-return STR( "{" ) + e + STR( "} underbrace {}" );
+return STR( "{" ) + e + STR( "} underbrace { }" );
 if( pos == top )
 return STR( "{" ) + e + STR( "} csup {" ) + OUString( chr ) + STR( "}" 
);
 else
commit baaf0aa0295a052f6c47079438b10952f79718cd
Author: Luboš Luňák 
Date:   Wed Nov 30 15:39:20 2011 +0100

do not add unnecessary spaces in docx mathml import

diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 9993bd4..62ad52f 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -224,7 +224,7 @@ OUString SmOoxmlImport::handleAcc()
 }
 OUString e = readOMathArgInElement( M_TOKEN( e ));
 stream.ensureClosingTag( M_TOKEN( acc ));
-return acc + STR( " { " ) + e + STR( " }" );
+return acc + STR( " {" ) + e + STR( "}" );
 }
 
 OUString SmOoxmlImport::handleBar()
@@ -246,9 +246,9 @@ OUString SmOoxmlImport::handleBar()
 OUString e = readOMathArgInElement( M_TOKEN( e ));
 stream.ensureClosingTag( M_TOKEN( bar ));
 if( topbot == top )
-return STR( "bar { " ) + e + STR( " }" );
+return STR( "bar {" ) + e + STR( "}" );
 else
-return STR( "underline { " ) + e + STR( " }" );
+return STR( "underline {" ) + e + STR( "}" );
 }
 
 OUString SmOoxmlImport::handleBox()
@@ -279,7 +279,7 @@ OUString SmOoxmlImport::handleBorderBox()
 OUString e = readOMathArgInElement( M_TOKEN( e ));
 stream.ensureClosingTag( M_TOKEN( borderBox ));
 if( isStrikeH )
-return STR( "overstrike { " ) + e + STR( " }" );
+return STR( "overstrike {" ) + e + STR( "}" );
 // LO does not seem to implement anything for handling the other cases
 return e;
 }
@@ -380,7 +380,7 @@ OUString SmOoxmlImport::handleF()
 else // noBar
 { // TODO we write out stack of 3 items as recursive m:f, so merge here 
back
   // to 'stack { x # y # z }'
-return STR( "binom { " ) + num + STR( " } { " ) + den + STR( "

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

[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 
> 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

[Caolán McNamara]

 unusedcode.easy |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 22ad135d1beffa214bff0f628d6e1c3fd182b60c
Author: Caolán McNamara 
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::Reference const&)
 (anonymous 
namespace)::getState(std::__debug::vector > const&)
 (anonymous 
namespace)::writeInfo(com::sun::star::uno::Reference
 const&, rtl::OUString const&, rtl::OUString const&)
 AtomDocument::AtomDocument(AtomPubSession*, std::basic_string, std::allocator >)
@@ -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::vector > const&, 
com::sun::star::awt::Point const&)
 
oox::drawingml::GetPoint2D(com::sun::star::uno::Reference
 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

[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 
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

[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 
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_cast( O % 31 + 1 );
 nMonth = sal::static_int_cast( 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_cast(nUnit[year]),
 
sal::static_int_cast(nUnit[month]),
 
sal::static_int_cast(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

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_BuildplTargets.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 83e0a67b9384fdfe25306ada675f3325b3d93bba
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 17:12:02 2011 +0100

fix silent pass on to buildpl

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 702d84f..874b29c 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -48,7 +48,8 @@ endif
 
 gb_BuildplTarget_COMPLETEDTARGETS=
 define gb_BuildplTarget_command
-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)
+$(info MAKEFLAGS $(MAKEFLAGS) filter:$(filter s,$(MAKEFLAGS)):)
+cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl $(if 
$(findstring s,$(MAKEFLAGS)),,VERBOSE=T) -P$(BUILD_NCPUS) $(2) 
-P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
 $(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/ui/dlg/ConnectionPage.cxx |5 +++--
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |5 +++--
 dbaccess/source/ui/dlg/detailpages.cxx|3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 7b0f53a5ea218d053eba2bf85a46c892267b3bb1
Author: Lionel Elie Mamane 
Date:   Wed Nov 30 17:12:44 2011 +0100

Success to load JDBC driver is still info, not an error

diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx 
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index e444815..1aa3a94 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -343,8 +343,9 @@ namespace dbaui
 {
 }
 
-sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : 
STR_JDBCDRIVER_NO_SUCCESS;
-OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String() );
+const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : 
STR_JDBCDRIVER_NO_SUCCESS;
+const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info 
: OSQLMessageBox::Error;
+OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String(), 
WB_OK | WB_DEF_OK, mt );
 aMsg.Execute();
 return 0L;
 }
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx 
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 2f54e75..6d48a65 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -577,8 +577,9 @@ DBG_NAME(OMySQLIntroPageSetup)
 {
 }
 
-sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : 
STR_JDBCDRIVER_NO_SUCCESS;
-OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String(), 
WB_OK | WB_DEF_OK, OSQLMessageBox::MessageType::Error );
+const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : 
STR_JDBCDRIVER_NO_SUCCESS;
+const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info 
: OSQLMessageBox::Error;
+OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String(), 
WB_OK | WB_DEF_OK, mt );
 aMsg.Execute();
 return 0L;
 }
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx 
b/dbaccess/source/ui/dlg/detailpages.cxx
index 734bba1..b9836ed 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -647,7 +647,8 @@ namespace dbaui
 }
 
 sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : 
STR_JDBCDRIVER_NO_SUCCESS;
-OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String(), 
WB_OK | WB_DEF_OK, OSQLMessageBox::MessageType::Error );
+const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info 
: OSQLMessageBox::Error;
+OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String(), 
WB_OK | WB_DEF_OK, mt );
 aMsg.Execute();
 return 0L;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/postgresql/pq_statics.cxx |   38 +-
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit a3e51cf3d16fcc166d6335b222765cb628524308
Author: Lionel Elie Mamane 
Date:   Wed Nov 30 17:18:30 2011 +0100

pq-sdbc statics: properly initialise defTypeInfoMetaData

diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx 
b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 935a634..3a95279 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -702,25 +702,25 @@ Statics & getStatics()
 // LEM TODO: isSigned (last field) is not initialised
 DefColumnMetaData defTypeInfoMetaData[] =
 {
-{ "TYPE_NAME", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0 },  // 0
-{ "DATA_TYPE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0 },  // 1
-{ "PRECISION", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0 },  // 2
-{ "foo1", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0 },  // 3
-{ "foo2", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0 },  // 4
-{ "CREATE_PARAMS", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0 },  // 5
-{ "NULLABLE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0 },  // 6
-{ "CASE_SENSITIVE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::BIT, 0,50,0,0,0,0 },  // 7
-{ "SEARCHABLE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::SMALLINT, 0,50,0,0,0,0 },  // 8
-{ "UNSIGNED_ATTRIBUTE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::BIT, 0,50,0,0,0,0 },  // 9
-{ "FIXED_PREC_SCALE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::BIT, 0,50,0,0,0,0 },  // 10
-{ "AUTO_INCREMENT", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::BIT, 0,50,0,0,0,0 },  // 11
-{ "foo3", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0 },  // 12
-{ "MINIMUM_SCALE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0 },  // 13
-{ "MAXIMUM_SCALE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0 },  // 14
-{ "foo4", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0 },  // 15
-{ "foo5", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0 },  // 16
-{ "NUM_PREC_RADIX", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0 },  // 17
-{0,0,0,0,0,0,0,0,0,0,0}
+{ "TYPE_NAME", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0, false },  // 0
+{ "DATA_TYPE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::SMALLINT, 0,50,0,0,0,0, true },  // 1
+{ "PRECISION", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0, true },  // 2
+{ "LITERAL_PREFIX", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0, false },  // 3
+{ "LITERAL_SUFFIX", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0, false },  // 4
+{ "CREATE_PARAMS", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0, false },  // 5
+{ "NULLABLE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0, true },  // 6
+{ "CASE_SENSITIVE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::BIT, 0,50,0,0,0,0, false },  // 7
+{ "SEARCHABLE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::SMALLINT, 0,50,0,0,0,0, true },  // 8
+{ "UNSIGNED_ATTRIBUTE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::BIT, 0,50,0,0,0,0, false },  // 9
+{ "FIXED_PREC_SCALE", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::BIT, 0,50,0,0,0,0, false },  // 10
+{ "AUTO_INCREMENT", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::BIT, 0,50,0,0,0,0, false },  // 11
+{ "LOCAL_TYPE_NAME", "TYPEINFO", "pg_catalog", "", 
com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0, false },  // 12
+  

[Libreoffice-commits] .: dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/ui/dlg/detailpages.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 15f7470531cbb184e23b5eeec312e75d8bb1d3a8
Author: Lionel Elie Mamane 
Date:   Wed Nov 30 17:20:20 2011 +0100

add const

diff --git a/dbaccess/source/ui/dlg/detailpages.cxx 
b/dbaccess/source/ui/dlg/detailpages.cxx
index b9836ed..684156a 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -646,7 +646,7 @@ namespace dbaui
 {
 }
 
-sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : 
STR_JDBCDRIVER_NO_SUCCESS;
+const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : 
STR_JDBCDRIVER_NO_SUCCESS;
 const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info 
: OSQLMessageBox::Error;
 OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String(), 
WB_OK | WB_DEF_OK, mt );
 aMsg.Execute();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Jan Holesovsky]

 solenv/gbuild/BuildDirs.mk |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 28275d470f3a062cfa27d72bbf89328af1e83c68
Author: Jan Holesovsky 
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] .: 2 commits - sc/CppunitTest_sc_unoapi_xcellrangesquery.mk sc/Module_sc.mk sc/qa test/inc test/prj test/source

[Markus Mohrhard]

 sc/CppunitTest_sc_unoapi_xcellrangesquery.mk|  141 ++
 sc/Module_sc.mk |5 
 sc/qa/unoapi/knownissues.xcl|4 
 sc/qa/unoapi/testdocuments/xcellrangesquery.ods |binary
 sc/qa/unoapi/xcellrangesquery.cxx   |  179 
 test/inc/test/unoapi_test.hxx   |   64 
 test/prj/d.lst  |1 
 test/source/makefile.mk |3 
 test/source/unoapi_test.cxx |   67 
 9 files changed, 461 insertions(+), 3 deletions(-)

New commits:
commit 286665960a3474ddee1f01807de10d5251f49848
Author: Markus Mohrhard 
Date:   Wed Nov 30 16:12:48 2011 +0100

port a failing sc subsequenttest to c++

potential improvements: only load the file once and use fods instead of
ods

diff --git a/sc/CppunitTest_sc_unoapi_xcellrangesquery.mk 
b/sc/CppunitTest_sc_unoapi_xcellrangesquery.mk
new file mode 100644
index 000..2dc2f18
--- /dev/null
+++ b/sc/CppunitTest_sc_unoapi_xcellrangesquery.mk
@@ -0,0 +1,141 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#   Markus Mohrhard 
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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 applicable
+# instead of those above.
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_unoapi_xcellrangesquery))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_unoapi_xcellrangesquery, 
\
+sc/qa/unoapi/xcellrangesquery \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sc_unoapi_xcellrangesquery, \
+avmedia \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+fileacc \
+for \
+forui \
+i18nisolang1 \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sb \
+sc \
+sfx \
+sot \
+svl \
+svt \
+svx \
+svxcore \
+   test \
+tl \
+tk \
+ucbhelper \
+   unotest \
+utl \
+vbahelper \
+vcl \
+xo \
+   $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_unoapi_xcellrangesquery,\
+-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
+-I$(realpath $(SRCDIR)/sc/inc) \
+$$(INCLUDE) \
+-I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_CppunitTest_add_api,sc_unoapi_xcellrangesquery,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sc_unoapi_xcellrangesquery))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sc_unoapi_xcellrangesquery,\
+types \
+))
+
+$(eval $(call gb_CppunitTest_add_components,sc_unoapi_xcellrangesquery,\
+basic/util/sb \
+comphelper/util/comphelp \
+dbaccess/util/dba \
+fileaccess/source/fileacc \
+filter/source/config/cache/filterconfig1 \
+forms/util/frm \
+framework/util/fwk \
+i18npool/util/i18npool \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+sax/source/fastparser/fastsax \
+sc/util/sc \
+sc/util/scd \
+sc/util/scfilt \
+sc/util/vbaobj \
+scripting/source/basprov/basprov \
+scripting/util/scriptframe \
+sfx2/util/sfx \
+sot/util/sot \
+svl/source/fsstor/fsstorage \
+toolkit/util/tk \
+unotools/util/utl \
+unoxml/source/rdf/unordf \
+unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_CppunitTest_add_old_components,sc_unoapi_xcellrangesquery,\
+configmgr \
+ucb1 \
+ucpfile1 \
+ucptdoc1 \
+))
+
+$(eval $(call gb_CppunitTest_set_args,sc_unoapi_xcellrangesquery,\
+--headless \
+--protector unoexceptionprotector$(gb_Library_DLLEXT) 
unoexceptionprotector \
+"-env:CONFIGURATION_LAYERS=xcsxcu:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call 
gb_CppunitTarget__ma

[Libreoffice-commits] .: connectivity/source

[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 
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

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_SpeedUpTargets.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7d3f21b27469d04b57dbd9f7befb3109001422ed
Author: Bjoern Michaelsen 
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] .: vcl/inc vcl/source

[Ivan Timofeev]

 vcl/inc/printdlg.hxx   |7 ---
 vcl/source/window/printdlg.cxx |6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 041fc1f56618b18923f23a27a6e482ed81a98fe2
Author: Ivan Timofeev 
Date:   Wed Nov 30 21:59:13 2011 +0400

fdo#34641: move initial focus to printer selection

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index d162bc0..4afe1c0 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -212,9 +212,6 @@ namespace vcl
 void setupLayout();
 };
 
-OKButtonmaOKButton;
-CancelButtonmaCancelButton;
-HelpButton  maHelpButton;
 PrintPreviewWindow  maPreviewWindow;
 NumericFieldmaPageEdit;
 FixedText   maNumPagesText;
@@ -228,6 +225,10 @@ namespace vcl
 
 FixedLine   maButtonLine;
 
+OKButtonmaOKButton;
+CancelButtonmaCancelButton;
+HelpButton  maHelpButton;
+
 boost::shared_ptr< PrinterController >  maPController;
 
 rtl::OUString   maPageStr;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index dc11b25..546fa49 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -718,9 +718,6 @@ void PrintDialog::OutputOptPage::storeToSettings()
 
 PrintDialog::PrintDialog( Window* i_pParent, const 
boost::shared_ptr& i_rController )
 : ModalDialog( i_pParent, VclResId( SV_DLG_PRINT ) )
-, maOKButton( this, VclResId( SV_PRINT_OK ) )
-, maCancelButton( this, VclResId( SV_PRINT_CANCEL ) )
-, maHelpButton( this, VclResId( SV_PRINT_HELP ) )
 , maPreviewWindow( this, VclResId( SV_PRINT_PAGE_PREVIEW ) )
 , maPageEdit( this, VclResId( SV_PRINT_PAGE_EDIT ) )
 , maNumPagesText( this, VclResId( SV_PRINT_PAGE_TXT ) )
@@ -731,6 +728,9 @@ PrintDialog::PrintDialog( Window* i_pParent, const 
boost::shared_ptrhttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_BuildplTargets.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0e3f81ae4d277cd2cfeb1e70204266d769dc2a3e
Author: Bjoern Michaelsen 
Date:   Wed Nov 30 19:18:17 2011 +0100

remove debug line

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 874b29c..5532579 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -48,7 +48,6 @@ endif
 
 gb_BuildplTarget_COMPLETEDTARGETS=
 define gb_BuildplTarget_command
-$(info MAKEFLAGS $(MAKEFLAGS) filter:$(filter s,$(MAKEFLAGS)):)
 cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl $(if 
$(findstring s,$(MAKEFLAGS)),,VERBOSE=T) -P$(BUILD_NCPUS) $(2) 
-P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
 $(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
 endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ivan Timofeev]

 vcl/inc/printdlg.hxx   |   10 +-
 vcl/source/window/printdlg.cxx |8 
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 858def93c81ab4c94fdf191b7495eeb01a9c3d2f
Author: Ivan Timofeev 
Date:   Wed Nov 30 22:27:50 2011 +0400

fix previous commit, really move initial focus to printer selection

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 4afe1c0..7aea96b 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -212,17 +212,17 @@ namespace vcl
 void setupLayout();
 };
 
+TabControl  maTabCtrl;
+NUpTabPage  maNUpPage;
+JobTabPage  maJobPage;
+OutputOptPage   maOptionsPage;
+
 PrintPreviewWindow  maPreviewWindow;
 NumericFieldmaPageEdit;
 FixedText   maNumPagesText;
 PushButton  maBackwardBtn;
 PushButton  maForwardBtn;
 
-TabControl  maTabCtrl;
-NUpTabPage  maNUpPage;
-JobTabPage  maJobPage;
-OutputOptPage   maOptionsPage;
-
 FixedLine   maButtonLine;
 
 OKButtonmaOKButton;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 546fa49..6119555 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -718,15 +718,15 @@ void PrintDialog::OutputOptPage::storeToSettings()
 
 PrintDialog::PrintDialog( Window* i_pParent, const 
boost::shared_ptr& i_rController )
 : ModalDialog( i_pParent, VclResId( SV_DLG_PRINT ) )
+, maTabCtrl( this, VclResId( SV_PRINT_TABCTRL ) )
+, maNUpPage( &maTabCtrl, VclResId( SV_PRINT_TAB_NUP ) )
+, maJobPage( &maTabCtrl, VclResId( SV_PRINT_TAB_JOB ) )
+, maOptionsPage( &maTabCtrl, VclResId( SV_PRINT_TAB_OPT ) )
 , maPreviewWindow( this, VclResId( SV_PRINT_PAGE_PREVIEW ) )
 , maPageEdit( this, VclResId( SV_PRINT_PAGE_EDIT ) )
 , maNumPagesText( this, VclResId( SV_PRINT_PAGE_TXT ) )
 , maBackwardBtn( this, VclResId( SV_PRINT_PAGE_BACKWARD ) )
 , maForwardBtn( this, VclResId( SV_PRINT_PAGE_FORWARD ) )
-, maTabCtrl( this, VclResId( SV_PRINT_TABCTRL ) )
-, maNUpPage( &maTabCtrl, VclResId( SV_PRINT_TAB_NUP ) )
-, maJobPage( &maTabCtrl, VclResId( SV_PRINT_TAB_JOB ) )
-, maOptionsPage( &maTabCtrl, VclResId( SV_PRINT_TAB_OPT ) )
 , maButtonLine( this, VclResId( SV_PRINT_BUTTONLINE ) )
 , maOKButton( this, VclResId( SV_PRINT_OK ) )
 , maCancelButton( this, VclResId( SV_PRINT_CANCEL ) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Noel Power]

 sc/source/ui/app/inputhdl.cxx |   21 +++
 sc/source/ui/app/inputwin.cxx |   57 ++
 sc/source/ui/inc/inputwin.hxx |2 +
 3 files changed, 32 insertions(+), 48 deletions(-)

New commits:
commit 93acae3d17c528bd98b28cc9078c8dd7612316a8
Author: Noel Power 
Date:   Wed Nov 30 18:49:40 2011 +

gsoc inputbar ( fix scrolling ) add support for hard linebreaks

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index e857551..0fdd0e4 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2061,7 +2061,11 @@ IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG )
 //  update input line from ModifyHdl for changes that are not
 //  wrapped by DataChanging/DataChanged calls (like Drag&Drop)
 
-String aText = GetEditText(pEngine);
+String aText;
+if ( pInputWin->IsMultiLineInput() )
+aText = ScEditUtil::GetMultilineString(*pEngine);
+else
+aText = GetEditText(pEngine);
 lcl_RemoveTabs(aText);
 pInputWin->SetTextString(aText);
 }
@@ -2109,11 +2113,15 @@ void ScInputHandler::DataChanged( sal_Bool 
bFromTopNotify )
 
 if (eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE)
 {
-String aText = GetEditText(pEngine);
+String aText;
+if ( pInputWin->IsMultiLineInput() )
+aText = ScEditUtil::GetMultilineString(*pEngine);
+else
+aText = GetEditText(pEngine);
 lcl_RemoveTabs(aText);
 
 if ( pInputWin )
-pInputWin->SetTextString(aText);
+pInputWin->SetTextString( aText );
 }
 
 //  wenn der Cursor vor dem Absatzende steht, werden Teile rechts 
rausgeschoben
@@ -3010,7 +3018,7 @@ sal_Bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, 
sal_Bool bStartEdit /*
 switch ( nCode )
 {
 case KEY_RETURN:
-if (bControl && !bShift && !bInputLine)
+if (bControl && !bShift && ( !bInputLine || pInputWin && 
pInputWin->IsMultiLineInput() ) )
 bDoEnter = sal_True;
 else if ( nModi == 0 && nTipVisible && pFormulaData && nAutoPos != 
SCPOS_INVALID )
 {
@@ -3404,7 +3412,10 @@ void ScInputHandler::NotifyChange( const 
ScInputHdlState* pState,
 if (pData)
 {
 pEngine->SetText( *pData );
-aString = GetEditText(pEngine);
+if ( pInputWin->IsMultiLineInput() )
+aString = 
ScEditUtil::GetMultilineString(*pEngine);
+else
+aString = GetEditText(pEngine);
 lcl_RemoveTabs(aString);
 bTextValid = false;
 aCurrentText.Erase();
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 650293a..5689307 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -180,7 +180,8 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* 
pBind ) :
 mnMaxY  (0),
 bIsOkCancelMode ( false ),
 bIsMultiLine( false ),
-bInResize   ( false )
+bInResize   ( false ),
+mbIsMultiLine   ( lcl_isExperimentalMode() )
 {
 ScModule*pScMod  = SC_MOD();
 SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
@@ -518,7 +519,7 @@ void ScInputWindow::Select()
 void ScInputWindow::Resize()
 {
 ToolBox::Resize();
-if ( lcl_isExperimentalMode() )
+if ( mbIsMultiLine )
 {
 aTextWindow.Resize();
 Size aSize = GetSizePixel();
@@ -759,7 +760,7 @@ bool ScInputWindow::IsPointerAtResizePos()
 
 void ScInputWindow::MouseMove( const MouseEvent& rMEvt )
 {
-if ( lcl_isExperimentalMode() )
+if ( mbIsMultiLine )
 {
 Point aPosPixel = GetPointerPosPixel();
 
@@ -805,7 +806,7 @@ void ScInputWindow::MouseMove( const MouseEvent& rMEvt )
 
 void ScInputWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
-if ( lcl_isExperimentalMode() )
+if ( mbIsMultiLine )
 {
 if ( rMEvt.IsLeft() )
 {
@@ -829,7 +830,7 @@ void ScInputWindow::MouseButtonDown( const MouseEvent& 
rMEvt )
 }
 void ScInputWindow::MouseButtonUp( const MouseEvent& rMEvt )
 {
-if ( lcl_isExperimentalMode() )
+if ( mbIsMultiLine )
 {
 ReleaseMouse();
 if ( rMEvt.IsLeft() )
@@ -1180,17 +1181,19 @@ IMPL_LINK(ScMultiTextWnd, ModifyHdl, EENotify*, pNotify)
 IMPL_LINK(ScMultiTextWnd, NotifyHdl, EENotify*, pNotify)
 {
 // need to process EE_NOTIFY_TEXTVIEWSCROLLED here
-// sometimes when pasting we don't seem to get EE_NOTIFY_TEXTVIEWSCROLLED
-// but we always seem to get EE_NOTIFY_TEXTMODIFIED
+// sometimes we don't seem to get EE_NOTIFY_TEXTVIEWSCROLLED e.g. when
+// we insert text at th

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

[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 
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

[Tor Lillqvist]

 download |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f7593f3d39ef7f8036e80b5d44f9304ef6c41e7b
Author: Tor Lillqvist 
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

[Tor Lillqvist]

 sal/android/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 895d23328e5c7fa9293eb581d562f4d8fae1afed
Author: Tor Lillqvist 
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

[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 
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 
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 
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

[Tor Lillqvist]

 set_soenv.in |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 53125e89eb279fc816bc2f903d07a66bfd165c6f
Author: Tor Lillqvist 
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

[Lionel Elie Mamane]

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 130028f2b4f27765ddf1b657f1f8e1d4a4005698
Author: Lionel Elie Mamane 
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

[Tor Lillqvist]

 set_soenv.in |  248 +--
 1 file changed, 124 insertions(+), 124 deletions(-)

New commits:
commit 5408edd6e054420b081a45e58f2bdd40b0673863
Author: Tor Lillqvist 
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

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

[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 
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 
-#include 
-#include 
 
 #include 
 
-
 #include 
 #include 
 #include 
@@ -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
+ * 
+ * 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)
+,m_nType(nType)
+{
+}
+
+SbxItem::SbxItem(sal_uInt16 nWhich_

[Libreoffice-commits] .: basctl/source

[August Sodora]

 basctl/source/basicide/bastypes.cxx |   35 +++
 1 file changed, 15 insertions(+), 20 deletions(-)

New commits:
commit 8ceae013e9664bfc86d4f95d00b2c7fb1f42be76
Author: August Sodora 
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 
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include   // unfortunately pModulWindow is needed partly...
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include "baside2.hrc"
+#include "basidesh.hrc"
+#include "helpid.hrc"
 
-#include 
+#include "baside2.hxx" // unfortunately pModulWindow is needed partly...
+#include "baside3.hxx"
+#include "basobj.hxx"
+#include "iderdll.hxx"
 
-#include 
-#include 
+#include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 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

[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 
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 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
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 
 #include 
 #include 
 #include 
 #include 
 
 class LocalizationMgr;
+class SvxLanguageBox;
 
 struct LanguageEntry
 {
commit b291c3a1f2d0595096d671c8f6d2812caa993f83
Author: August Sodora 
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

[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 
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 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #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 
 
-#include 
-
+#include "idetemp.hxx"
+#include "tbxctl.hxx"
 
-#define _BASIDE_POPUPWINDOWTBX
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
 #include 
+#include 
 #include 
 #include 
 
 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

[August Sodora]

 sw/JunitTest_sw_complex.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 96a5d372f3e2d84522e68407e1061a1c4bfecdb5
Author: August Sodora 
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

[Norbert Thiebaud]

 libvisio/prj/build.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 74b3b4bc25ae31a43c08fdb09d71dae73d1f5cae
Author: Norbert Thiebaud 
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