[Libreoffice-commits] .: oowintool

2011-10-05 Thread Tor Lillqvist 
 oowintool |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit fd4c879e2ebd5920b48b2e48ac32181565f5ee1b
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Oct 4 23:56:02 2011 +0300

s/dump/print

diff --git a/oowintool b/oowintool
index fc18a8d..bc75736 100755
--- a/oowintool
+++ b/oowintool
@@ -44,16 +44,16 @@ sub print_syntax()
 print-w   - windows form\n;
 print-u   - unix form (default)\n;
 print  commands:\n;
-print--msvc-ver  - dump version of MSVC eg. 6.0\n;
+print--msvc-ver  - print version of MSVC eg. 6.0\n;
 print--msvc-copy-dlls dest - copy msvc[pr]??.dlls into 
dest/msvcp??/\n;
-print--msvc-productdir   - dump productdir\n;
-print--msvs-productdir   - dump productdir\n;
-print--dotnetsdk-dir - dump .NET SDK path\n;
-print--csc-compilerdir   - dump .NET SDK compiler path\n;
-print--windows-sdk-home  - dump Windows SDK install dir\n;
-print--jdk-home  - dump the jdk install dir\n;
-print--nsis-dir  - dump NSIS path\n;
-print--help  - this message\n;
+print--msvc-productdir   - print productdir\n;
+print--msvs-productdir   - print productdir\n;
+print--dotnetsdk-dir - print .NET SDK path\n;
+print--csc-compilerdir   - print .NET SDK compiler path\n;
+print--windows-sdk-home  - print Windows SDK install dir\n;
+print--jdk-home  - print the jdk install dir\n;
+print--nsis-dir  - print NSIS path\n;
+print--help  - print this message\n;
 }
 
 sub cygpath($$$)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: postprocess/packcomponents

2011-10-05 Thread Thorsten Behrens 
 postprocess/packcomponents/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02f7ab6af0dfc75205a14f472d2934b9730b9a80
Author: Thorsten Behrens tbehr...@novell.com
Date:   Wed Oct 5 09:13:08 2011 +0200

Enable CMIS only when it's TRUEly enabled.

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 0dcd0b7..ec4bc15 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -221,7 +221,7 @@ my_components += gconfbe1
 my_components += ucpgio
 .END
 
-.IF $(ENABLE_CMIS) != 
+.IF $(ENABLE_CMIS) == TRUE
 my_components += ucpcmis
 .END
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/inc

2011-10-05 Thread Stephan Bergmann 
 sal/inc/rtl/strbuf.hxx  |   14 ++
 sal/inc/rtl/string.hxx  |   24 +++-
 sal/inc/rtl/ustrbuf.hxx |   14 ++
 sal/inc/rtl/ustring.hxx |   12 +++-
 4 files changed, 38 insertions(+), 26 deletions(-)

New commits:
commit 112bdf84d684590e042725c7173e059b4afa2f83
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Oct 5 09:20:59 2011 +0200

Removed dangerous rtl::O[U]String[Buffer]::operator sal_{char,Unicode} 
const *.

As a replacement, added appropriate operator [] functions.  All other uses 
can
use getStr().

diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 63ae448..962d3df 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -287,12 +287,18 @@ public:
 /**
 Return a null terminated character array.
  */
-operatorconst sal_Char *() const { return pData-buffer; }
+const sal_Char* getStr() const { return pData-buffer; }
 
 /**
-Return a null terminated character array.
- */
-const sal_Char* getStr() const { return pData-buffer; }
+  Access to individual characters.
+
+  @param index must be non-negative and less than length.
+
+  @return a reference to the character at the given index.
+
+  @since LibreOffice 3.5
+*/
+sal_Char  operator [](sal_Int32 index) { return pData-buffer[index]; }
 
 /**
 Return a OString instance reflecting the current content
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 96ca406..22de6dd 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -251,19 +251,6 @@ public:
 /**
   Returns a pointer to the characters of this string.
 
-  pThe returned pointer is not guaranteed to point to a null-terminated
-  byte string.  Note that this string object may contain embedded null
-  characters, which will thus also be embedded in the returned byte
-  string./p
-
-  @return a pointer to a (not necessarily null-terminated) byte string
-  representing the characters of this string object.
-*/
-operator const sal_Char *() const SAL_THROW(()) { return pData-buffer; }
-
-/**
-  Returns a pointer to the characters of this string.
-
   pThe returned pointer is guaranteed to point to a null-terminated byte
   string.  But note that this string object may contain embedded null
   characters, which will thus also be embedded in the returned
@@ -275,6 +262,17 @@ public:
 const sal_Char * getStr() const SAL_THROW(()) { return pData-buffer; }
 
 /**
+  Access to individual characters.
+
+  @param index must be non-negative and less than length.
+
+  @return the character at the given index.
+
+  @since LibreOffice 3.5
+*/
+sal_Char operator [](sal_Int32 index) const { return getStr()[index]; }
+
+/**
   Compares two strings.
 
   The comparison is based on the numeric value of each character in
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index a356309..47569e5 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -267,12 +267,18 @@ public:
 /**
 Return a null terminated unicode character array.
  */
-operatorconst sal_Unicode *() const { return pData-buffer; }
+const sal_Unicode*  getStr() const { return pData-buffer; }
 
 /**
-Return a null terminated unicode character array.
- */
-const sal_Unicode*  getStr() const { return pData-buffer; }
+  Access to individual characters.
+
+  @param index must be non-negative and less than length.
+
+  @return a reference to the character at the given index.
+
+  @since LibreOffice 3.5
+*/
+sal_Unicode  operator [](sal_Int32 index) { return pData-buffer[index]; }
 
 /**
 Return a OUString instance reflecting the current content
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index ed268d9..e104f0d 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -300,16 +300,18 @@ public:
 
   @return   a pointer to the Unicode characters buffer from this object.
 */
-operator const sal_Unicode *() const SAL_THROW(()) { return pData-buffer; 
}
+const sal_Unicode * getStr() const SAL_THROW(()) { return pData-buffer; }
 
 /**
-  Returns a pointer to the Unicode character buffer from this string.
+  Access to individual characters.
 
-  It isn't necessarily NULL terminated.
+  @param index must be non-negative and less than length.
 
-  @return   a pointer to the Unicode characters buffer from this object.
+  @return the character at the given index.
+
+  @since LibreOffice 3.5
 */
-const sal_Unicode * getStr() const SAL_THROW(()) { return pData-buffer; }
+sal_Unicode operator [](sal_Int32 index) const { return getStr()[index]; }
 
 /**
   Compares two strings.
___
Libreoffice-commits mailing

[Libreoffice-commits] .: 5 commits - comphelper/source editeng/inc editeng/source sc/source sw/inc sw/source unusedcode.easy vcl/inc vcl/source xmloff/source

2011-10-05 Thread Caolán McNamara 
 comphelper/source/misc/documentinfo.cxx |2 
 comphelper/source/misc/namedvaluecollection.cxx |2 
 editeng/inc/editeng/unolingu.hxx|3 -
 editeng/source/misc/unolingu.cxx|6 --
 sc/source/filter/ftools/ftools.cxx  |   14 -
 sc/source/filter/inc/ftools.hxx |2 
 sw/inc/editsh.hxx   |2 
 sw/source/core/edit/edfld.cxx   |   13 -
 sw/source/ui/table/tabledlg.cxx |7 +-
 sw/source/ui/table/tablepg.hxx  |2 
 unusedcode.easy |6 --
 vcl/inc/image.h |1 
 vcl/source/gdi/impimage.cxx |   11 
 xmloff/source/draw/sdxmlexp.cxx |   60 
 14 files changed, 7 insertions(+), 124 deletions(-)

New commits:
commit b540dc49a69a80bcc4160037198a5fb945969cb4
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Oct 5 09:01:40 2011 +0100

conversion operator gone

diff --git a/comphelper/source/misc/documentinfo.cxx 
b/comphelper/source/misc/documentinfo.cxx
index a9b9a85..46bc112 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -187,7 +187,7 @@ namespace comphelper {
 sMessage += \nin function:\n;
 sMessage += BOOST_CURRENT_FUNCTION;
 sMessage += \n;
-OSL_FAIL( sMessage );
+OSL_FAIL( sMessage.getStr() );
 }
 
 return sTitle;
diff --git a/comphelper/source/misc/namedvaluecollection.cxx 
b/comphelper/source/misc/namedvaluecollection.cxx
index 6ed6cd1..ff7aa8c 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -211,7 +211,7 @@ namespace comphelper
 ::rtl::OStringBuffer message;
 message.append( NamedValueCollection::impl_assign: 
encountered a value type which I cannot handle:\n );
 message.append( ::rtl::OUStringToOString( 
pArgument-getValueTypeName(), RTL_TEXTENCODING_ASCII_US ) );
-OSL_FAIL( message.makeStringAndClear() );
+OSL_FAIL( message.getStr() );
 }
 #endif
 }
commit 253576484ff4c991a1a1299c71cb8cfb463d2c83
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Oct 4 23:38:52 2011 +0100

can replace ScfTools::AppendCString with SvStream::ReadCString

diff --git a/sc/source/filter/ftools/ftools.cxx 
b/sc/source/filter/ftools/ftools.cxx
index cf48cdd..744cb49 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -310,22 +310,10 @@ ByteString ScfTools::ReadCString( SvStream rStrm, 
sal_Int32 rnBytesLeft )
 return aRet.makeStringAndClear();
 }
 
-void ScfTools::AppendCString( SvStream rStrm, ByteString rString )
-{
-sal_Char cChar;
-
-rStrm  cChar;
-while( cChar )
-{
-rString += cChar;
-rStrm  cChar;
-}
-}
-
 void ScfTools::AppendCString( SvStream rStrm, String rString, 
rtl_TextEncoding eTextEnc )
 {
 ByteString aByteString;
-AppendCString( rStrm, aByteString );
+rStrm.ReadCString(aByteString);
 rString += String( aByteString, eTextEnc );
 }
 
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index cdd2d62..39c49dc 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -249,8 +249,6 @@ public:
 { return String( ReadCString( rStrm, rnBytesLeft 
), eTextEnc ); }
 
 /** Appends a zero terminted byte string. */
-static void AppendCString( SvStream rStrm, ByteString rString );
-/** Appends a zero terminted byte string. */
 static void AppendCString( SvStream rStrm, String rString, 
rtl_TextEncoding eTextEnc );
 
 // *** HTML table names - named range names *** -
commit a1c936ce5364ffae88e682780f4579b3b94b673d
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Oct 4 23:24:19 2011 +0100

doesn't need to be a LINK

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 25708a3..25bc3a8 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -247,7 +247,7 @@ IMPL_LINK( SwFormatTablePage, AutoClickHdl, CheckBox *, 
pBox )
 }
 else if( ( RadioButton * ) pBox == aFreeBtn )
 {
-RightModifyHdl(aRightMF);
+RightModify();
 bLeftEnable = sal_True;
 bWidthEnable = sal_True;
 bOthers = sal_False;
@@ -276,7 +276,7 @@ IMPL_LINK( SwFormatTablePage, AutoClickHdl, CheckBox *, 
pBox )
 }
 
 /*--*/
-IMPL_LINK( SwFormatTablePage, RightModifyHdl, MetricField *, EMPTYARG )
+void SwFormatTablePage::RightModify()
 {
 if(aFreeBtn.IsChecked())
 {
@@ -291,14 +291,13 @@ IMPL_LINK( SwFormatTablePage, RightModifyHdl,

[Libreoffice-commits] .: solenv/gbuild

2011-10-05 Thread Stephan Bergmann 
 solenv/gbuild/gbuild.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3f3853f5693744da7a16d19ce2e5e949ec71131a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Oct 5 12:32:14 2011 +0200

In gbuild, set OSL_DEBUG_LEVEL=1 if non-product (same as dmake).

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0d6f64f..c91b99f 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -97,6 +97,8 @@ endif
 gb_DEBUGLEVEL := 0
 ifneq ($(strip $(DEBUG)$(debug)),)
 gb_DEBUGLEVEL := 1
+else ifeq ($(gb_PRODUCT),$(false))
+gb_DEBUGLEVEL := 1
 endif
 
 ifneq ($(strip $(DBGLEVEL)$(dbglevel)),)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libcmis/libcmis-0.1.0.patch

2011-10-05 Thread Jan Holesovsky 
 libcmis/libcmis-0.1.0.patch |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0514f90ec9e0a2abe0123cec1f153cda4bd2c212
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Oct 5 12:38:10 2011 +0200

Fix libcmis build with the old way of building too.

diff --git a/libcmis/libcmis-0.1.0.patch b/libcmis/libcmis-0.1.0.patch
index dc4d2da..48c2482 100644
--- a/libcmis/libcmis-0.1.0.patch
+++ b/libcmis/libcmis-0.1.0.patch
@@ -1,6 +1,6 @@
 --- misc/libcmis-0.1.0/src/libcmis/makefile.mk 2011-10-05 10:55:51.349325061 
+0200
 +++ misc/build/libcmis-0.1.0/src/libcmis/makefile.mk   2011-10-05 
10:54:58.290853952 +0200
-@@ -1 +1,31 @@
+@@ -1 +1,38 @@
 -dummy
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 +
@@ -20,6 +20,13 @@
 +CFLAGSCXX+=-frtti
 +.ENDIF
 +
++.IF $(SYSTEM_LIBXML)==YES
++CFLAGS+=$(LIBXML_CFLAGS)
++.ENDIF
++.IF $(SYSTEM_CURL)==YES
++CFLAGS+=$(CURL_CFLAGS)
++.ENDIF
++
 +SLOFILES= \
 +  $(SLO)$/session-factory.obj \
 +  $(SLO)$/atom-document.obj \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in libcmis/Module_libcmis.mk postprocess/packcomponents scp2/source set_soenv.in ucb/source

2011-10-05 Thread Fridrich Strba 
 configure.in   |6 --
 libcmis/Module_libcmis.mk  |2 
 postprocess/packcomponents/makefile.mk |5 -
 scp2/source/ooo/file_library_ooo.scp   |2 
 scp2/source/ooo/module_hidden_ooo.scp  |2 
 set_soenv.in   |1 
 ucb/source/ucp/cmis/makefile.mk|   87 +++--
 7 files changed, 42 insertions(+), 63 deletions(-)

New commits:
commit 3b53c579ce298c8f2582323d5210a7aee3aac068
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Oct 5 13:04:08 2011 +0200

Fix Windows build and enable CMIS inconditionally

Since the provider should now build everywhere,
enable it inconditionally to catch minor problems

diff --git a/configure.in b/configure.in
index 8088409..9ba7653 100644
--- a/configure.in
+++ b/configure.in
@@ -7030,12 +7030,6 @@ if test $enable_cairo_canvas = yes ; then
 fi
 AC_SUBST(ENABLE_CAIRO_CANVAS)
 
-ENABLE_CMIS=FALSE
-if test x$with_cmis != xno ; then
-   ENABLE_CMIS=TRUE
-fi
-AC_SUBST(ENABLE_CMIS)
-
 dnl ===
 dnl Check whether the GStreamer libraries are available.
 dnl ===
diff --git a/libcmis/Module_libcmis.mk b/libcmis/Module_libcmis.mk
index f311acf..0cf0d04 100644
--- a/libcmis/Module_libcmis.mk
+++ b/libcmis/Module_libcmis.mk
@@ -27,11 +27,9 @@
 
 $(eval $(call gb_Module_Module,libcmis))
 
-ifeq ($(ENABLE_CMIS),TRUE)
 $(eval $(call gb_Module_add_targets,libcmis,\
ExternalLib_libcmis \
 ))
-endif
 
 
 # vim: set noet sw=4 ts=4:
diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index ec4bc15..819d7d5 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -168,6 +168,7 @@ my_components = \
 ucphier1 \
 ucppkg1 \
 ucptdoc1 \
+   ucpcmis1 \
 
 .IF $(BUILD_TYPE) != $(BUILD_TYPE:s/DESKTOP//)
 my_components += \
@@ -221,10 +222,6 @@ my_components += gconfbe1
 my_components += ucpgio
 .END
 
-.IF $(ENABLE_CMIS) == TRUE
-my_components += ucpcmis
-.END
-
 .IF $(ENABLE_GNOMEVFS) != 
 my_components += ucpgvfs
 .END
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index b8eaa20..9a4f3dd 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1333,9 +1333,7 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, 
ucpexpand1.uno)
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
 #endif
 
-#if ENABLE_CMIS
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
-#endif
 
 File gid_File_Lib_Lnth
 TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 826b6b4..2d220e3 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -327,9 +327,7 @@ Module gid_Module_Root_Files_5
 #if ! defined SYSTEM_LIBGSF
 gid_File_Lib_Libgsf,
 #endif
-#if ENABLE_CMIS
gid_File_Lib_Cmis,
-#endif
gid_File_Lib_Dict_Ja,
gid_File_Lib_Dict_Zh,
 gid_File_Lib_Collator_Data,
diff --git a/set_soenv.in b/set_soenv.in
index 1f49738..63223e7 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1496,7 +1496,6 @@ ToFile( ENABLE_STATIC_GTK, @ENABLE_STATIC_GTK@, e );
 ToFile( SPLIT_APP_MODULES, @SPLIT_APP_MODULES@,e );
 ToFile( SPLIT_OPT_FEATURES,@SPLIT_OPT_FEATURES@,e );
 ToFile( ENABLE_CAIRO_CANVAS, @ENABLE_CAIRO_CANVAS@, e );
-ToFile( ENABLE_CMIS,@ENABLE_CMIS@, e );
 ToFile( ENABLE_OPENGL, @ENABLE_OPENGL@,e );
 ToFile( ENABLE_PDFIMPORT,  @ENABLE_PDFIMPORT@, e );
 ToFile( ENABLE_MINIMIZER,   @ENABLE_MINIMIZER@,e );
diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk
index 5db9e92..08ffa6f 100644
--- a/ucb/source/ucp/cmis/makefile.mk
+++ b/ucb/source/ucp/cmis/makefile.mk
@@ -1,43 +1,41 @@
+#*
 #
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# 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/
+# OpenOffice.org - a multi-platform office productivity suite
 #
-# 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.
+# This file is part of OpenOffice.org.
 #
-# Major Contributor(s):
-# [ Copyright (C) 2011 SUSE cbosdon...@suse.com (initial developer) ]
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under

[Libreoffice-commits] .: scp2/source

2011-10-05 Thread Fridrich Strba 
 scp2/source/ooo/module_hidden_ooo.scp |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9e3f639df008ae37044e137d45a94ba2e7019028
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Oct 5 13:07:47 2011 +0200

Don't package this one

diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 2d220e3..3ba48ef 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -327,7 +327,6 @@ Module gid_Module_Root_Files_5
 #if ! defined SYSTEM_LIBGSF
 gid_File_Lib_Libgsf,
 #endif
-   gid_File_Lib_Cmis,
gid_File_Lib_Dict_Ja,
gid_File_Lib_Dict_Zh,
 gid_File_Lib_Collator_Data,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - connectivity/source toolkit/source

2011-10-05 Thread Tor Lillqvist 
 connectivity/source/inc/ado/Aolewrap.hxx |2 +-
 toolkit/source/awt/vclxwindows.cxx   |9 +
 2 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 76d6f75b06a0cf491bbcd6b791bb28493d576a81
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Oct 5 14:06:08 2011 +0300

WaE: switch statement contains 'default' but no 'case' labels

diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index f95ceb6..441810d 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -6665,14 +6665,7 @@ throw(::com::sun::star::uno::RuntimeException)
 (void)bVoid;
 #endif
 
-sal_uInt16 nPropType = GetPropertyId( PropertyName );
-switch ( nPropType )
-{
-default:
-{
-VCLXContainer::setProperty( PropertyName, Value );
-}
-}
+VCLXContainer::setProperty( PropertyName, Value );
 }
 
 void VCLXFrame::ProcessWindowEvent( const VclWindowEvent rVclWindowEvent )
commit 2bc6f3424be27d5e036523b07ddff7a388042a2f
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Oct 5 14:05:23 2011 +0300

Use OString::getStr() now

diff --git a/connectivity/source/inc/ado/Aolewrap.hxx 
b/connectivity/source/inc/ado/Aolewrap.hxx
index 46dcf18..51407bc 100644
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
@@ -190,7 +190,7 @@ namespace connectivity
 #if OSL_DEBUG_LEVEL  0
 ::rtl::OString sTemp(Unknown Item: );
 sTemp += 
::rtl::OString(sStr.getStr(),sStr.getLength(),osl_getThreadTextEncoding());
-OSL_FAIL(sTemp);
+OSL_FAIL(sTemp.getStr());
 #endif
 }
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - configure.in sal/qa

2011-10-05 Thread Tomáš Chvátal 
 configure.in |  116 ---
 sal/qa/osl/module/osl_Module.cxx |   45 ---
 2 files changed, 50 insertions(+), 111 deletions(-)

New commits:
commit 0ca1973c7c97e62c727484ea66adef26fa2f8162
Author: Tomas Chvatal tchva...@suse.cz
Date:   Wed Oct 5 13:11:49 2011 +0200

Drop test that require tmp with exec rights.

diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index c8fed7d..0a0a37e 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -291,54 +291,9 @@ namespace osl_Module
 CPPUNIT_ASSERT_MESSAGE( #test comment#: load function should do 
the same thing as constructor with library name.,
 sal_True == bRes  );
 }
-// load lib which is under a CJK directory
-void load_002( )
-{
-#if defined( UNX )  !defined( MACOSX )  !defined( FREEBSD )
-// TODO: Find out why this fails on Mac OS X
-//Can not get a CJK directory already exist, so here create one. 
Perhaps reason is encoding problem.
-::rtl::OUString aPidDirURL = 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///tmp/)) + 
::rtl::OUString::valueOf( ( long )getpid( ) );
-::rtl::OUString aMyDirURL = aPidDirURL + aKname;
-createTestDirectory( aPidDirURL );
-createTestDirectory( aMyDirURL );
-
-::rtl::OUString aDLLURL = aMyDirURL + 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/libModule_DLL.so));
-//check if the lib exist.
-//FIXME: if assert condition is false, the case will return, so 
the directory will not be clean-up
-CPPUNIT_ASSERT_MESSAGE( #Source file is not exist. please 
manually clean-up directory and file under /tmp, ifFileExist( getDllURL( ) ) 
== sal_True );
-::osl::FileBase::RC nError = ::osl::File::copy( getDllURL( ), 
aDLLURL );
-CPPUNIT_ASSERT_MESSAGE( #copy failed. please manually clean-up 
directory and file under /tmp, nError == ::osl::FileBase::E_None );
-//ifFileExist returned false but the file exist
-CPPUNIT_ASSERT_MESSAGE( #This file is not exist, copy failed. 
please manually clean-up directory and file under /tmp, ifFileExist( aDLLURL ) 
== sal_True );
-
-//test if can create a normal file
-::rtl::OUString aFileURL = aMyDirURL + 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/test_file));
-::osl::File testFile( aFileURL );
-nError = testFile.open( osl_File_OpenFlag_Create );
-CPPUNIT_ASSERT_MESSAGE( #create failed. please manually clean-up 
directory and file under /tmp, nError == ::osl::FileBase::E_None );
-CPPUNIT_ASSERT_MESSAGE( #This file is not exist, create failed. 
please manually clean-up directory and file under /tmp, ifFileExist( aFileURL 
) == sal_True );
-
-//load the copied dll
-::osl::Module aMod( aDLLURL );
-::osl::Module aMod1;
-
-sal_Bool bOK = aMod1.load( aDLLURL );
-bRes = oslModule(aMod) == oslModule(aMod1);
-aMod.unload( );
-aMod1.unload( );
-deleteTestFile( aFileURL );
-deleteTestFile( aDLLURL );
-deleteTestDirectory( aMyDirURL );
-deleteTestDirectory( aPidDirURL );
-
-CPPUNIT_ASSERT_MESSAGE( #test comment#: load lib which is under a 
CJK directory.,
-sal_True == bRes  bOK == sal_True );
-#endif
-}
 
 SAL_CPPUNIT_TEST_SUITE( load );
 CPPUNIT_TEST( load_001 );
-CPPUNIT_TEST( load_002 );
 SAL_CPPUNIT_TEST_SUITE_END( );
 }; // class load
 
commit e9cc0d9cabb6df2ec956be026970042cc3dbd70a
Author: Tomas Chvatal tchva...@suse.cz
Date:   Tue Oct 4 11:02:22 2011 +0200

Use simpler detection for system/internal libs.

diff --git a/configure.in b/configure.in
index 9ba7653..21a1a5e 100644
--- a/configure.in
+++ b/configure.in
@@ -685,8 +685,8 @@ AC_ARG_WITH(external-thes-dir,
 
 AC_ARG_WITH(system-libs,
 AS_HELP_STRING([--with-system-libs],
-[Use libraries already on system -- enables all --with-system-* flags 
except
- mozilla, libvisio, libexttextcat and translate-toolkit.]),
+[Use C/C++ libraries already on system -- enables all --with-system-*.
+ Except mozilla libs.]),
 ,)
 
 AC_ARG_WITH(system-headers,
@@ -698,9 +698,7 @@ AC_ARG_WITH(system-headers,
 
 AC_ARG_WITH(system-jars,
 AS_HELP_STRING([--without-system-jars],
-[When building with --with-system-libs, also the needed jars are 
expected
- on the system. Use this to disable that (except for the db case where
- --with-system-db *has to* imply using the db.jar from there, too).]),
+[Use Java packages already on system]),
 ,)
 
 AC_ARG_WITH(system-zlib,
@@ -2280,7 +2278,7 @@ fi
 dnl Set the ENABLE_WERROR variable. (Activate

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - vcl/unx

2011-10-05 Thread Stephan Bergmann 
 vcl/unx/gtk/a11y/atkutil.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 18744f661be29d5f41421c5b71b2434097e8ef4c
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 29 21:59:28 2011 +0100

help gcc 4.6.1 out with ambiguity

diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 68bb949..e662f6e 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -312,8 +312,12 @@ void DocumentFocusListener::attachRecursive(
 uno::Reference accessibility::XAccessibleEventBroadcaster  xBroadcaster =
 uno::Reference accessibility::XAccessibleEventBroadcaster (xContext, 
uno::UNO_QUERY);
 
+if (!xBroadcaster.is())
+return;
+
 // If not already done, add the broadcaster to the list and attach as 
listener.
-if( xBroadcaster.is()  m_aRefList.insert(xBroadcaster).second )
+uno::Reference uno::XInterface  xInterface = xBroadcaster;
+if( m_aRefList.insert(xInterface).second )
 {
 xBroadcaster-addEventListener(static_cast 
accessibility::XAccessibleEventListener *(this));
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: embeddedobj/source

2011-10-05 Thread Caolán McNamara 
 embeddedobj/source/msole/olepersist.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ed156a994ab3473b7028425f0c986ab0bf831f67
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Oct 5 12:30:26 2011 +0100

fix post cast removal build error

diff --git a/embeddedobj/source/msole/olepersist.cxx 
b/embeddedobj/source/msole/olepersist.cxx
index 4aec3ea..540064b 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -1066,7 +1066,7 @@ void OleEmbeddedObject::StoreObjectToStream( 
uno::Reference io::XOutputStream 
 m_pOleComponent-StoreOwnTmpIfNecessary();
 
 // now all the changes should be in temporary location
-if ( !m_aTempURL )
+if ( m_aTempURL.isEmpty() )
 throw uno::RuntimeException();
 
 // open temporary file for reading
@@ -2021,7 +2021,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const 
uno::Reference embed::XStorag
 catch ( uno::Exception )
 {
 delete pNewOleComponent;
-if ( m_aTempURL )
+if ( !m_aTempURL.isEmpty() )
KillFile_Impl( m_aTempURL, m_xFactory );
 m_aTempURL = aOldTempURL;
 throw;
@@ -2033,7 +2033,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const 
uno::Reference embed::XStorag
 catch( uno::Exception )
 {
 delete pNewOleComponent;
-if ( m_aTempURL )
+if ( !m_aTempURL.isEmpty() )
KillFile_Impl( m_aTempURL, m_xFactory );
 m_aTempURL = aOldTempURL;
 throw;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-05 Thread Stephan Bergmann 
 extensions/source/propctrlr/editpropertyhandler.cxx  |   12 +--
 extensions/source/propctrlr/formcomponenthandler.cxx |   44 +--
 extensions/source/propctrlr/xsdvalidationhelper.cxx  |2 
 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx |   36 -
 4 files changed, 47 insertions(+), 47 deletions(-)

New commits:
commit 242f1bee6e0df3c58c257178058d61a1c349c2ed
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 29 21:32:08 2011 +0100

get this building with gcc 4.6.1

diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx 
b/extensions/source/propctrlr/editpropertyhandler.cxx
index a1693ae..363f685 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -248,13 +248,13 @@ namespace pcr
 ::std::vector ::rtl::OUString  aSuperseded;
 if ( implHaveBothScrollBarProperties() )
 {
-aSuperseded.push_back( PROPERTY_HSCROLL );
-aSuperseded.push_back( PROPERTY_VSCROLL );
+aSuperseded.push_back( static_castconst 
rtl::OUString(PROPERTY_HSCROLL) );
+aSuperseded.push_back( static_castconst 
rtl::OUString(PROPERTY_VSCROLL) );
 }
 if ( implHaveTextTypeProperty() )
 {
-aSuperseded.push_back( PROPERTY_RICHTEXT );
-aSuperseded.push_back( PROPERTY_MULTILINE );
+aSuperseded.push_back(  static_castconst 
rtl::OUString(PROPERTY_RICHTEXT) );
+aSuperseded.push_back(  static_castconst 
rtl::OUString(PROPERTY_MULTILINE) );
 }
 if ( aSuperseded.empty() )
 return Sequence ::rtl::OUString ();
@@ -267,8 +267,8 @@ namespace pcr
 ::osl::MutexGuard aGuard( m_aMutex );
 ::std::vector ::rtl::OUString  aInterestingActuatingProps;
 if ( implHaveTextTypeProperty() )
-aInterestingActuatingProps.push_back( PROPERTY_TEXTTYPE );
-aInterestingActuatingProps.push_back( PROPERTY_MULTILINE );
+aInterestingActuatingProps.push_back(  static_castconst 
rtl::OUString(PROPERTY_TEXTTYPE) );
+aInterestingActuatingProps.push_back( static_castconst 
rtl::OUString(PROPERTY_MULTILINE) );
 return Sequence ::rtl::OUString ( 
(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() );;
 }
 
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx 
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 48d0bbe..a006ab5 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -947,28 +947,28 @@ namespace pcr
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 ::std::vector ::rtl::OUString  aInterestingProperties;
-aInterestingProperties.push_back( PROPERTY_DATASOURCE );
-aInterestingProperties.push_back( PROPERTY_COMMAND );
-aInterestingProperties.push_back( PROPERTY_COMMANDTYPE );
-aInterestingProperties.push_back( PROPERTY_LISTSOURCE );
-aInterestingProperties.push_back( PROPERTY_LISTSOURCETYPE );
-aInterestingProperties.push_back( PROPERTY_SUBMIT_ENCODING );
-aInterestingProperties.push_back( PROPERTY_REPEAT );
-aInterestingProperties.push_back( PROPERTY_TABSTOP );
-aInterestingProperties.push_back( PROPERTY_BORDER );
-aInterestingProperties.push_back( PROPERTY_CONTROLSOURCE );
-aInterestingProperties.push_back( PROPERTY_DROPDOWN );
-aInterestingProperties.push_back( PROPERTY_IMAGE_URL );
-aInterestingProperties.push_back( PROPERTY_TARGET_URL );
-aInterestingProperties.push_back( PROPERTY_STRINGITEMLIST );
-aInterestingProperties.push_back( PROPERTY_BUTTONTYPE );
-aInterestingProperties.push_back( PROPERTY_ESCAPE_PROCESSING );
-aInterestingProperties.push_back( PROPERTY_TRISTATE );
-aInterestingProperties.push_back( PROPERTY_DECIMAL_ACCURACY );
-aInterestingProperties.push_back( PROPERTY_SHOWTHOUSANDSEP );
-aInterestingProperties.push_back( PROPERTY_FORMATKEY );
-aInterestingProperties.push_back( PROPERTY_EMPTY_IS_NULL );
-aInterestingProperties.push_back( PROPERTY_TOGGLE );
+aInterestingProperties.push_back(  static_castconst 
rtl::OUString(PROPERTY_DATASOURCE) );
+aInterestingProperties.push_back(  static_castconst 
rtl::OUString(PROPERTY_COMMAND) );
+aInterestingProperties.push_back(  static_castconst 
rtl::OUString(PROPERTY_COMMANDTYPE) );
+aInterestingProperties.push_back(  static_castconst 
rtl::OUString(PROPERTY_LISTSOURCE) );
+aInterestingProperties.push_back(  static_castconst 
rtl::OUString(PROPERTY_LISTSOURCETYPE) );
+aInterestingProperties.push_back(  static_castconst 
rtl::OUString(PROPERTY_SUBMIT_ENCODING) );
+aInterestingProperties.push_back(  static_castconst 
rtl::OUString(PROPERTY_REPEAT) );
+

[Libreoffice-commits] .: shell/source

2011-10-05 Thread Stephan Bergmann 
 shell/source/unix/misc/open-url.c   |  174 --
 shell/source/unix/misc/open-url.def |1 
 shell/source/unix/misc/senddoc.c|  206 
 shell/source/unix/misc/senddoc.def  |1 
 4 files changed, 382 deletions(-)

New commits:
commit aa878cddf8a504e3de1b55155c1353fc14ec5ebd
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Oct 5 13:50:08 2011 +0200

Removed dead code.

diff --git a/shell/source/unix/misc/open-url.c 
b/shell/source/unix/misc/open-url.c
deleted file mode 100755
index 7d7230f..000
--- a/shell/source/unix/misc/open-url.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include stdlib.h
-#include stdio.h
-#include string.h
-#include unistd.h
-#include process.h
-#include time.h
-
-#define INCL_DOS
-#define INCL_DOSERRORS
-#define INCL_PM
-#include os2.h
-
-// OOo uses popen() to start us, so we cannot show PM dialogs.
-// log message to disk.
-void logMessage( char* msg)
-{
-PPIBpib;
-CHARszApplicationName[_MAX_PATH];
-CHARszDrive[_MAX_PATH];
-CHARszDir[_MAX_PATH];
-CHARszFileName[_MAX_PATH];
-CHARszExt[_MAX_PATH];
-FILE*   log;
-time_t  timeOfDay;
-struct tm* localTime;
-
-// get executable fullpath
-DosGetInfoBlocks(NULL, pib);
-DosQueryModuleName(pib-pib_hmte, sizeof(szApplicationName), 
szApplicationName);
-_splitpath( szApplicationName, szDrive, szDir, szFileName, szExt );
-// log name
-_makepath( szApplicationName, szDrive, szDir, szFileName, (.LOG) );
-log = fopen( szApplicationName, a);
-if (!log)
-return;
-time( timeOfDay);
-localTime = localtime( timeOfDay);
-fprintf( log, %04d/%02d/%02d %02d:%02d:%02d %s\n,
-localTime-tm_year+1900, localTime-tm_mon+1, localTime-tm_mday,
-localTime-tm_hour, localTime-tm_min, localTime-tm_sec, msg);
-fclose( log);
-}
-
-// dump comand line arguments
-void dumpArgs( int argc, char *argv[] )
-{
-int i;
-
-logMessage( Start of command line arguments dump:);
-for( i=0; iargc; i++)
-logMessage( argv[i]);
-}
-
-/*
- * The intended use of this tool is to pass the argument to
- * the default URL exe.
- */
-int main(int argc, char *argv[] )
-{
-APIRET  rc;
-RESULTCODES result = {0};
-charszAppFromINI[_MAX_PATH];
-charszDirFromINI[_MAX_PATH];
-charszCmdLine[1024];
-charszFail[ _MAX_PATH];
-ULONG   ulSID;
-PID pid;
-
-// check parameters
-if (argc != 2)
-{
-logMessage( Usage: open-url url);
-dumpArgs( argc, argv);
-return -1;
-}
-
-// check configuration
-rc = PrfQueryProfileString(HINI_USER, WPURLDEFAULTSETTINGS,
-  DefaultBrowserExe, ,
-  szAppFromINI, sizeof(szAppFromINI));
-rc = PrfQueryProfileString(HINI_USER, WPURLDEFAULTSETTINGS,
-  DefaultWorkingDir, ,
-  szDirFromINI, sizeof(szDirFromINI));
-if (*szAppFromINI == 0 || *szDirFromINI == 0)
-{
-logMessage( Unable to find default url handler in USER.INI; exiting.);
-dumpArgs( argc, argv);
-return -1;
-}
-
-// get default parameter list
-rc = PrfQueryProfileString(HINI_USER, WPURLDEFAULTSETTINGS,
-  DefaultParameters, ,
-  szCmdLine, sizeof(szCmdLine));
-strcat( szCmdLine,  );
-strcat( szCmdLine, argv[1]);
-
-// change default directory
-_chdir( szDirFromINI);
-
-// start default handler
-STARTDATA   SData;
-CHARszObjBuf[CCHMAXPATH];
-
-SData.Length  = sizeof(STARTDATA);
-SData.Related = SSF_RELATED_INDEPENDENT;
-SData.FgBg= (1) ?

[Libreoffice-commits] .: fpicker/source

2011-10-05 Thread Fridrich Strba 
 fpicker/source/win32/filepicker/FileOpenDlg.cxx |8 
 fpicker/source/win32/filepicker/filepickerstate.cxx |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d624a657a8f47a4d970e7b1c0d15d9b2b7d1437d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Oct 5 14:12:02 2011 +0200

Fix fpicker windows build

diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx 
b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
index cb1c446..8bcbe48 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
@@ -243,7 +243,7 @@ rtl::OUString SAL_CALL CFileOpenDialog::getFullFileName() 
const
 
 rtl::OUString SAL_CALL CFileOpenDialog::getFileName() const
 {
-return rtl::OUString(m_fileTitleBuffer);
+return rtl::OUString(m_fileTitleBuffer.getStr());
 }
 
 //
@@ -374,7 +374,7 @@ rtl::OUString SAL_CALL 
CFileOpenDialog::getCurrentFilePath() const
 if (nLen  0)
 {
 m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1);
-return rtl::OUString(m_helperBuffer);
+return rtl::OUString(m_helperBuffer.getStr());
 }
 return rtl::OUString();
 }
@@ -396,7 +396,7 @@ rtl::OUString SAL_CALL 
CFileOpenDialog::getCurrentFolderPath() const
 if (nLen  0)
 {
 m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1);
-return rtl::OUString(m_helperBuffer);
+return rtl::OUString(m_helperBuffer.getStr());
 }
 return rtl::OUString();
 }
@@ -418,7 +418,7 @@ rtl::OUString SAL_CALL 
CFileOpenDialog::getCurrentFileName() const
 if (nLen  0)
 {
 m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1);
-return rtl::OUString(m_helperBuffer);
+return rtl::OUString(m_helperBuffer.getStr());
 }
 return rtl::OUString();
 }
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx 
b/fpicker/source/win32/filepicker/filepickerstate.cxx
index aec50c5..eeba2e7 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -213,7 +213,7 @@ OUString MatchFixBrokenPath(const OUString path)
 if (path[1] == ':'  path[2] == '.'  path[3] == '\\')
 {
 // skip the '.'
-return OUString(path, 2) + path.copy(3, path.getLength() - 3);
+return OUString(path.getStr(), 2) + path.copy(3, path.getLength() - 3);
 }
 return path;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-05 Thread Fridrich Strba 
 ucb/prj/d.lst  |2 -
 ucb/source/ucp/cmis/makefile.mk|8 +++
 ucb/source/ucp/cmis/ucpcmis.component  |   34 -
 ucb/source/ucp/cmis/ucpcmis1.component |   34 +
 4 files changed, 39 insertions(+), 39 deletions(-)

New commits:
commit 2d5ce4cfcc0ec5d6ac61a085c8226bcd31c572e8
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Oct 5 14:26:40 2011 +0200

Deliver the right thing

diff --git a/ucb/prj/d.lst b/ucb/prj/d.lst
index 1351c77..080d900 100644
--- a/ucb/prj/d.lst
+++ b/ucb/prj/d.lst
@@ -40,7 +40,7 @@
 
 ..\%__SRC%\misc\ucpgvfs.component  %_DEST%\xml\ucpgvfs.component
 ..\%__SRC%\misc\ucpgio.component  %_DEST%\xml\ucpgio.component
-..\%__SRC%\misc\ucpcmis.component  %_DEST%\xml\ucpcmis.component
+..\%__SRC%\misc\ucpcmis1.component  %_DEST%\xml\ucpcmis1.component
 ..\%__SRC%\misc\cached1.component %_DEST%\xml\cached1.component
 ..\%__SRC%\misc\srtrs1.component %_DEST%\xml\srtrs1.component
 ..\%__SRC%\misc\ucb1.component %_DEST%\xml\ucb1.component
diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk
index 08ffa6f..ebaf703 100644
--- a/ucb/source/ucp/cmis/makefile.mk
+++ b/ucb/source/ucp/cmis/makefile.mk
@@ -81,10 +81,10 @@ DEF1NAME = $(SHL1TARGET)
 
 .INCLUDE : target.mk
 
-ALLTAR : $(MISC)/ucpcmis.component
+ALLTAR : $(MISC)/ucpcmis1.component
 
-$(MISC)/ucpcmis.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-ucpcmis.component
+$(MISC)/ucpcmis1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ucpcmis1.component
 $(XSLTPROC) --nonet --stringparam uri \
 '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-$(SOLARENV)/bin/createcomponent.xslt ucpcmis.component
+$(SOLARENV)/bin/createcomponent.xslt ucpcmis1.component
diff --git a/ucb/source/ucp/cmis/ucpcmis.component 
b/ucb/source/ucp/cmis/ucpcmis.component
deleted file mode 100644
index 0d61780..000
--- a/ucb/source/ucp/cmis/ucpcmis.component
+++ /dev/null
@@ -1,34 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!--**
- * 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.
- *
- * Major Contributor(s):
- * [ Copyright (C) 2011 SUSE cbosdon...@suse.com (initial developer) ]
- *
- * All Rights Reserved.
- *
- * 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.
-**--
-
-component loader=com.sun.star.loader.SharedLibrary
-xmlns=http://openoffice.org/2010/uno-components;
-  implementation name=com.sun.star.comp.CmisContentProvider
-service name=com.sun.star.ucb.CmisContentProvider/
-  /implementation
-/component
diff --git a/ucb/source/ucp/cmis/ucpcmis1.component 
b/ucb/source/ucp/cmis/ucpcmis1.component
new file mode 100644
index 000..0d61780
--- /dev/null
+++ b/ucb/source/ucp/cmis/ucpcmis1.component
@@ -0,0 +1,34 @@
+?xml version=1.0 encoding=UTF-8?
+!--**
+ * 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.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 SUSE cbosdon...@suse.com (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * 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

[Libreoffice-commits] .: ucb/source

2011-10-05 Thread Jan Holesovsky 
 ucb/source/ucp/odma/odma_datasupplier.cxx |4 ++--
 ucb/source/ucp/odma/odma_provider.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a8f868af45d4d2ed24dec2bc20bed4b9a78f93c4
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Oct 5 14:44:14 2011 +0200

Fix MinGW build.

diff --git a/ucb/source/ucp/odma/odma_datasupplier.cxx 
b/ucb/source/ucp/odma/odma_datasupplier.cxx
index 0003d93..50a1c8b 100644
--- a/ucb/source/ucp/odma/odma_datasupplier.cxx
+++ b/ucb/source/ucp/odma/odma_datasupplier.cxx
@@ -281,10 +281,10 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
 ODMSTATUS odm = NODMGetDMS(ODMA_ODMA_REGNAME, lpszDMSList);
 lpszDMSList[strlen(lpszDMSList)+1] = '\0';
 
-::rtl::OString sQuery(SELECT ODM_DOCID_LATEST, ODM_NAME);
+const char sQuery[] = SELECT ODM_DOCID_LATEST, ODM_NAME;
 
 DWORD dwFlags = ODM_SPECIFIC;
-odm = NODMQueryExecute(ContentProvider::getHandle(), sQuery,dwFlags, 
lpszDMSList, pQueryId );
+odm = NODMQueryExecute(ContentProvider::getHandle(), sQuery, dwFlags, 
lpszDMSList, pQueryId );
 if(odm != ODM_SUCCESS) {
 delete[] pQueryId;
 delete[] lpszDMSList;
diff --git a/ucb/source/ucp/odma/odma_provider.cxx 
b/ucb/source/ucp/odma/odma_provider.cxx
index 20da599..7ad0a14 100644
--- a/ucb/source/ucp/odma/odma_provider.cxx
+++ b/ucb/source/ucp/odma/odma_provider.cxx
@@ -444,7 +444,7 @@ void ContentProvider::append(const 
::rtl::ReferenceContentProperties _rProp)
 sQuery += ';
 
 DWORD dwFlags = ODM_SPECIFIC;
-odm = NODMQueryExecute(getHandle(), sQuery,dwFlags, lpszDMSList, 
pQueryId );
+odm = NODMQueryExecute(getHandle(), sQuery.getStr(), dwFlags, 
lpszDMSList, pQueryId );
 if(odm == ODM_SUCCESS)
 {
 sal_uInt16 nCount   = 10;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: canvas/workben desktop/source desktop/unx slideshow/test svx/source ucb/source

2011-10-05 Thread Michael Meeks 
 canvas/workben/canvasdemo.cxx  |2 +-
 desktop/source/app/officeipcthread.cxx |4 ++--
 desktop/unx/splash/unxsplash.cxx   |2 +-
 slideshow/test/demoshow.cxx|   11 +--
 svx/source/gengal/gengal.cxx   |2 +-
 ucb/source/ucp/gvfs/gvfs_provider.cxx  |4 ++--
 6 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit 6c2d66e5257e46f8db438ae2151ba440870e2400
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Oct 5 14:00:00 2011 +0100

remove const sal_Char * casts of rtl::OUStringToOString results, fixes ucb

diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index db72a7d..63a5652 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -634,7 +634,7 @@ void TestWindow::Paint( const Rectangle /*rRect*/ )
 catch (const uno::Exception e)
 {
 fprintf( stderr, Exception '%s' thrown\n ,
- (const sal_Char *) ::rtl::OUStringToOString( e.Message, 
RTL_TEXTENCODING_UTF8 ) );
+ ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 
).getStr() );
 }
 }
 
diff --git a/desktop/source/app/officeipcthread.cxx 
b/desktop/source/app/officeipcthread.cxx
index 6583e51..9d1ea0f 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -230,8 +230,8 @@ OfficeIPCThread*OfficeIPCThread::pGlobalOfficeIPCThread 
= 0;
 String CreateMD5FromString( const OUString aMsg )
 {
 #if (OSL_DEBUG_LEVEL  2)
-fprintf (stderr, create md5 from '%s'\n,
- (const sal_Char *)rtl::OUStringToOString (aMsg, 
RTL_TEXTENCODING_UTF8));
+fprintf( stderr, create md5 from '%s'\n,
+ rtl::OUStringToOString (aMsg, RTL_TEXTENCODING_UTF8).getStr() );
 #endif
 
 rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index 88d6906..85a9f80 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
@@ -130,7 +130,7 @@ UnxSplashScreen::initialize( const 
::com::sun::star::uno::Sequence ::com::sun::
 m_pOutFd = fdopen( fd, w );
 #if OSL_DEBUG_LEVEL  1
 fprintf( stderr, Got argument '--splash-pipe=%d ('%s') (%p)\n,
- fd, (const sal_Char *)rtl::OUStringToOString( aNum, 
RTL_TEXTENCODING_UTF8 ),
+ fd, rtl::OUStringToOString( aNum, RTL_TEXTENCODING_UTF8 
).getStr(),
  m_pOutFd );
 #endif
 }
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 7e238da..d591537 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -370,8 +370,7 @@ void ChildWindow::init()
 catch (const uno::Exception e)
 {
 OSL_TRACE( Exception '%s' thrown\n ,
-   (const sal_Char*)::rtl::OUStringToOString( e.Message,
-  
RTL_TEXTENCODING_UTF8 ));
+   ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 
).getStr() );
 }
 }
 
@@ -385,8 +384,8 @@ void ChildWindow::Paint( const Rectangle /*rRect*/ )
 catch (const uno::Exception e)
 {
 OSL_TRACE( Exception '%s' thrown\n ,
-   (const sal_Char*)::rtl::OUStringToOString( e.Message,
-  
RTL_TEXTENCODING_UTF8 ));
+   ::rtl::OUStringToOString( e.Message,
+ RTL_TEXTENCODING_UTF8 ).getStr() 
);
 }
 }
 
@@ -478,8 +477,8 @@ void DemoWindow::init()
 catch (const uno::Exception e)
 {
 OSL_TRACE( Exception '%s' thrown\n ,
-   (const sal_Char*)::rtl::OUStringToOString( e.Message,
-  
RTL_TEXTENCODING_UTF8 ));
+   ::rtl::OUStringToOString( e.Message,
+ RTL_TEXTENCODING_UTF8 ).getStr() 
);
 }
 }
 
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index d8daa1c..21f687a 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -175,7 +175,7 @@ static void createTheme( rtl::OUString aThemeName,
 if( aGraphic.GetType() == GRAPHIC_NONE )
 {
 fprintf( stderr, Failed to load '%s'\n,
- (const sal_Char *) rtl::OUStringToOString( *aIter, 
RTL_TEXTENCODING_UTF8 ) );
+ rtl::OUStringToOString( *aIter, RTL_TEXTENCODING_UTF8 
).getStr() );
 continue;
 }
 
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx 
b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index ecd143f..9098a95 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -113,8 +113,8 @@ ContentProvider::queryContent(
 {
 #ifdef DEBUG
 g_warning (QueryContent: '%s',
-   (const sal_Char *)rtl::OUStringToOString
-

[Libreoffice-commits] .: svtools/source

2011-10-05 Thread Caolán McNamara 
 svtools/source/filter/wmf/winmtf.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 03268fc84e1c3a0fb588ddff340b052f70c5100a
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Oct 5 14:01:15 2011 +0100

rejig this to remove self-assign

diff --git a/svtools/source/filter/wmf/winmtf.hxx 
b/svtools/source/filter/wmf/winmtf.hxx
index 693190c..a7c0b48 100644
--- a/svtools/source/filter/wmf/winmtf.hxx
+++ b/svtools/source/filter/wmf/winmtf.hxx
@@ -738,9 +738,9 @@ public:
 const Point rEndAngle
 );
 voidDrawPolygon( Polygon rPolygon, sal_Bool bRecordPath = 
sal_False );
-voidDrawPolygon( Polygon rPolygon, sal_Bool bDrawTo, 
sal_Bool bRecordPath)
-{ //only for the template compatibility
-bDrawTo = bDrawTo; //to avoid complaints about 
unused parameter
+voidDrawPolygon( Polygon rPolygon, sal_Bool /*bDrawTo*/, 
sal_Bool bRecordPath)
+{
+//For ReadAndDrawPolygon template compatibility
 DrawPolygon(rPolygon, bRecordPath);
 }
 voidDrawPolyPolygon( PolyPolygon rPolyPolygon, sal_Bool 
bRecordPath = sal_False );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libvisio/libvisio-0.0.8-draw_stroke.patch libvisio/makefile.mk

2011-10-05 Thread Fridrich Strba 
 libvisio/libvisio-0.0.8-draw_stroke.patch |   11 +++
 libvisio/makefile.mk  |3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit f666e37a478e7bf8507737676297f7a1802eeafa
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Oct 5 15:08:05 2011 +0200

Fix a typo, for others, use git version of libvisio

diff --git a/libvisio/libvisio-0.0.8-draw_stroke.patch 
b/libvisio/libvisio-0.0.8-draw_stroke.patch
new file mode 100644
index 000..407be89
--- /dev/null
+++ b/libvisio/libvisio-0.0.8-draw_stroke.patch
@@ -0,0 +1,11 @@
+--- misc/libvisio-0.0.8/src/lib/VSDXContentCollector.cpp   2011-09-29 
14:45:38.0 +0200
 misc/build/libvisio-0.0.8/src/lib/VSDXContentCollector.cpp 2011-10-05 
15:06:20.374633773 +0200
+@@ -876,7 +876,7 @@
+   m_noLine = noLine;
+   m_noShow = noShow;
+   if (m_noLine || m_linePattern == 0)
+-m_styleProps.insert(svg:stroke-color, none);
++m_styleProps.insert(draw:stroke, none);
+   else
+ m_styleProps.insert(svg:stroke-color, m_lineColour);
+   if (m_noFill || m_fillPattern == 0)
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index c6c7a0a..fa4e069 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -59,7 +59,8 @@ TARFILE_MD5=3c9c6cba49387e9b8e2bced5f2eba4e3
 
 PATCH_FILES=\
 libvisio-0.0.8.patch \
-   libvisio-0.0.8-build.patch
+   libvisio-0.0.8-build.patch \
+   libvisio-0.0.8-draw_stroke.patch
 
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-10-05 Thread Fridrich Strba 
 configure.in |  116 +--
 1 file changed, 66 insertions(+), 50 deletions(-)

New commits:
commit 9ff7b0bd64c6f5312aae6644926bc865296a64ee
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Oct 5 15:13:09 2011 +0200

Revert Use simpler detection for system/internal libs.

This reverts commit e9cc0d9cabb6df2ec956be026970042cc3dbd70a.

diff --git a/configure.in b/configure.in
index 21a1a5e..9ba7653 100644
--- a/configure.in
+++ b/configure.in
@@ -685,8 +685,8 @@ AC_ARG_WITH(external-thes-dir,
 
 AC_ARG_WITH(system-libs,
 AS_HELP_STRING([--with-system-libs],
-[Use C/C++ libraries already on system -- enables all --with-system-*.
- Except mozilla libs.]),
+[Use libraries already on system -- enables all --with-system-* flags 
except
+ mozilla, libvisio, libexttextcat and translate-toolkit.]),
 ,)
 
 AC_ARG_WITH(system-headers,
@@ -698,7 +698,9 @@ AC_ARG_WITH(system-headers,
 
 AC_ARG_WITH(system-jars,
 AS_HELP_STRING([--without-system-jars],
-[Use Java packages already on system]),
+[When building with --with-system-libs, also the needed jars are 
expected
+ on the system. Use this to disable that (except for the db case where
+ --with-system-db *has to* imply using the db.jar from there, too).]),
 ,)
 
 AC_ARG_WITH(system-zlib,
@@ -2278,7 +2280,7 @@ fi
 dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
 dnl ===
 AC_MSG_CHECKING([whether to turn warnings to errors])
-if test x$enable_werror = xyes; then
+if test -n $enable_werror  test $enable_werror != no; then
 ENABLE_WERROR=TRUE
 AC_MSG_RESULT([yes])
 else
@@ -2290,7 +2292,7 @@ AC_SUBST(ENABLE_WERROR)
 dnl Set the ENABLE_DEBUG variable. (Activate --enable-symbols)
 dnl ===
 AC_MSG_CHECKING([whether to do a debug build])
-if test x$enable_debug != xyes; then
+if test -n $enable_debug  test $enable_debug != no; then
 ENABLE_DEBUG=TRUE
 enable_symbols=yes
 AC_MSG_RESULT([yes])
@@ -2303,7 +2305,7 @@ AC_SUBST(ENABLE_DEBUG)
 dnl Set the ENABLE_DBGUTIL variable
 dnl ===
 AC_MSG_CHECKING([whether to build with additional debug utilities])
-if test x$enable_dbgutil = xyes; then
+if test -n $enable_dbgutil  test $enable_dbgutil != no; then
 PROEXT=
 PRODUCT=
 AC_MSG_RESULT([yes])
@@ -2329,7 +2331,7 @@ AC_SUBST(PROEXT)
 # Set the ENABLE_LTO variable
 # ===
 AC_MSG_CHECKING([whether to use link-time optimization])
-if test x$enable_lto = xyes; then
+if test -n $enable_lto -a $enable_lto != no; then
 ENABLE_LTO=TRUE
 AC_MSG_RESULT([yes])
 else
@@ -2341,7 +2343,7 @@ AC_SUBST(ENABLE_LTO)
 dnl whether to include symbols into final build.
 dnl ===
 AC_MSG_CHECKING([whether to include symbols])
-if test x$enable_symbols != xyes; then
+if test -n $enable_symbols -a $enable_symbols != no; then
 ENABLE_SYMBOLS=TRUE
 AC_MSG_RESULT([yes])
 else
@@ -2353,7 +2355,10 @@ AC_SUBST(ENABLE_SYMBOLS)
 dnl Determine if the solver is to be stripped or not.
 dnl ===
 AC_MSG_CHECKING([whether to strip the solver or not.])
-if test x$enable_strip_solver != xno; then
+if test z$enable_strip_solver = zno; then
+DISABLE_STRIP=TRUE
+AC_MSG_RESULT([no])
+else
 if test -n $ENABLE_SYMBOLS; then
 DISABLE_STRIP=TRUE
 AC_MSG_RESULT([no])
@@ -2361,9 +2366,6 @@ if test x$enable_strip_solver != xno; then
 DISABLE_STRIP=
 AC_MSG_RESULT([yes])
 fi
-else
-DISABLE_STRIP=TRUE
-AC_MSG_RESULT([no])
 fi
 AC_SUBST(DISABLE_STRIP)
 
@@ -2509,7 +2511,7 @@ dnl 
===
 dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
 dnl ===
 AC_MSG_CHECKING([whether to enable pch feature])
-if test $enable_pch = yes; then
+if test -n $enable_pch  test $enable_pch != no; then
 if test $_os = WINNT -a $WITH_MINGW != yes; then
 ENABLE_PCH=TRUE
 AC_MSG_RESULT([yes])
@@ -4534,8 +4536,8 @@ dnl 
===
 dnl Check for system stdlibs
 dnl ===
 AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset])
-if test $with_system_stdlibs = yes -o x$with_system_libs = xyes  \
-test x$with_system_stdlibs != xno; then
+if test -n $with_system_stdlibs -o -n $with_system_libs  \
+test $with_system_stdlibs != no; then
 AC_MSG_RESULT([no])
 SYSTEM_STDLIBS=YES
 else
@@ -4548,8 +4550,9 @@ dnl

[Libreoffice-commits] .: connectivity/source

2011-10-05 Thread Michael Meeks 
 connectivity/source/drivers/kab/KDriver.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 738f9cc6a75a4857ecda43883c4dbdc128078556
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Oct 5 14:21:15 2011 +0100

fix OString concatenation

diff --git a/connectivity/source/drivers/kab/KDriver.cxx 
b/connectivity/source/drivers/kab/KDriver.cxx
index 8c55540..7240e53 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -32,6 +32,7 @@
 #include KDriver.hxx
 #include KDEInit.h
 #include KConnection.hxx
+#include rtl/strbuf.hxx
 
 /** === begin UNO includes === **/
 #include com/sun/star/sdb/SQLContext.hpp
@@ -106,7 +107,10 @@ namespace
 
 if ( !_rFunction )
 {   // did not find the symbol
-OSL_FAIL( ::rtl::OString( lcl_getFunctionFromModuleOrUnload: 
could not find the symbol  ) + ::rtl::OString( _pAsciiSymbolName ) );
+rtl::OStringBuffer aBuf;
+aBuf.append( lcl_getFunctionFromModuleOrUnload: could not 
find the symbol  );
+aBuf.append( _pAsciiSymbolName );
+OSL_FAIL( aBuf.makeStringAndClear().getStr() );
 osl_unloadModule( _rModule );
 _rModule = NULL;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-10-05 Thread Tomáš Chvátal 
 configure.in |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 25c27aae73f09759f7d6d874c54c6071e21d0c42
Author: Tomas Chvatal tchva...@suse.cz
Date:   Wed Oct 5 15:27:58 2011 +0200

Add libexttextcat and libvisio under system-libs switch

diff --git a/configure.in b/configure.in
index 9ba7653..84ae9d6 100644
--- a/configure.in
+++ b/configure.in
@@ -4610,7 +4610,8 @@ dnl 
===
 dnl Check for system libvisio
 dnl ===
 AC_MSG_CHECKING([which libvisio to use])
-if test -n $with_system_libvisio -a $with_system_libvisio = yes; then
+if test -n $with_system_libvisio -o -n $with_system_libs  \
+test $with_system_libvisio != no; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBVISIO=YES
 PKG_CHECK_MODULES( VISIO, libvisio-0.0 )
@@ -6494,7 +6495,8 @@ dnl 
===
 dnl Checking for libexttextcat
 dnl ===
 AC_MSG_CHECKING([which libexttextcat to use])
-if test x$with_system_libexttextcat = xyes; then
+if test -n $with_system_libexttextcat -o -n $with_system_libs  \
+test $with_system_libexttextcat != no; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBEXTTEXTCAT=YES
 PKG_CHECK_MODULES([LIBEXTTEXTCAT], [libexttextcat])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-05 Thread Cédric Bosdonnat 
 sw/inc/swundo.hxx   |3 +-
 sw/source/core/undo/undo.hrc|3 +-
 sw/source/core/undo/undo.src|4 +++
 sw/source/ui/docvw/PageBreakWin.cxx |   41 +++-
 4 files changed, 48 insertions(+), 3 deletions(-)

New commits:
commit 9767483eea7800aadd18b4489069ad633ce7a79c
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Tue Oct 4 15:35:41 2011 +0200

Page Break: basic implementation of the popup menu actions

Open the paragraph properties dialog on Text Flow tab when clicking on
the Edit item. Remove the page break (and add it to the undo stack) when
clicking on the Delete item.

diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index 4a91cff..9e07154 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -177,7 +177,8 @@ enum SwUndoId
 UNDO_UI_INSERT_URLBTN,
 UNDO_UI_INSERT_URLTXT,
 UNDO_UI_DELETE_INVISIBLECNTNT,
-UNDO_UI_REPLACE_STYLE
+UNDO_UI_REPLACE_STYLE,
+UNDO_UI_DELETE_PAGE_BREAK
 };
 
 
diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc
index 8edccd3..eee3e3c 100644
--- a/sw/source/core/undo/undo.hrc
+++ b/sw/source/core/undo/undo.hrc
@@ -172,7 +172,8 @@
 #define STR_INSERT_URLTXT   (UI_UNDO_BEGIN + 11)
 #define STR_DELETE_INVISIBLECNTNT   (UI_UNDO_BEGIN + 12)
 #define STR_REPLACE_STYLE   (UI_UNDO_BEGIN + 13)
-#define UI_UNDO_END STR_REPLACE_STYLE
+#define STR_DELETE_PAGE_BREAK   (UI_UNDO_BEGIN + 14)
+#define UI_UNDO_END STR_DELETE_PAGE_BREAK
 
 #define UNDO_MORE_STRINGS_BEGIN (UI_UNDO_END + 1)
 #define STR_OCCURRENCES_OF  (UNDO_MORE_STRINGS_BEGIN)
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index fefa5ef..d1222fe 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -189,6 +189,10 @@ String STR_REPLACE_STYLE
 {
 Text [ en-US ] = Replace style: $1 $2 $3 ;
 };
+String STR_DELETE_PAGE_BREAK
+{
+Text [ en-US ] = Delete page break ;
+};
 String STR_OUTLINE_LR
 {
 Text [ en-US ] = Promote/demote outline ;
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index b9ca0a3..2b70887 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -25,13 +25,19 @@
  * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
  * instead of those above.
  */
+#include globals.hrc
 #include popup.hrc
 #include utlui.hrc
 
+#include cmdid.h
+#include cntfrm.hxx
 #include DashedLine.hxx
+#include doc.hxx
 #include edtwin.hxx
+#include IDocumentUndoRedo.hxx
 #include PageBreakWin.hxx
 #include pagefrm.hxx
+#include view.hxx
 #include viewopt.hxx
 
 #include basegfx/color/bcolortools.hxx
@@ -40,6 +46,8 @@
 #include basegfx/range/b2drectangle.hxx
 #include drawinglayer/primitive2d/polygonprimitive2d.hxx
 #include drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+#include editeng/brkitem.hxx
+#include sfx2/dispatch.hxx
 #include svx/sdr/contact/objectcontacttools.hxx
 #include vcl/decoview.hxx
 #include vcl/svapp.hxx
@@ -232,7 +240,38 @@ void SwPageBreakWin::Paint( const Rectangle )
 
 void SwPageBreakWin::Select( )
 {
-// TODO Menu item selected...
+switch( GetCurItemId( ) )
+{
+case FN_PAGEBREAK_EDIT:
+{
+// TODO Handle the break on a table case
+SfxUInt16Item aItem( GetEditWin()-GetView().GetPool( 
).GetWhich( SID_PARA_DLG ), TP_PARA_EXT );
+
GetEditWin()-GetView().GetViewFrame()-GetDispatcher()-Execute(
+SID_PARA_DLG, 
SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, aItem, NULL );
+}
+break;
+case FN_PAGEBREAK_DELETE:
+{
+const SwLayoutFrm* pBodyFrm = static_cast const SwLayoutFrm* 
( GetPageFrame()-Lower() );
+while ( pBodyFrm  !pBodyFrm-IsBodyFrm() )
+pBodyFrm = static_cast const SwLayoutFrm* ( 
pBodyFrm-GetNext() );
+
+if ( pBodyFrm )
+{
+// TODO Handle the break before a table case
+SwCntntFrm *pCnt = const_cast SwCntntFrm* ( 
pBodyFrm-ContainsCntnt() );
+sal_uInt16 nWhich = 
pCnt-GetAttrSet()-GetPool()-GetWhich( SID_ATTR_PARA_PAGEBREAK );
+SwCntntNode* pNd = pCnt-GetNode();
+
+pNd-GetDoc()-GetIDocumentUndoRedo( ).StartUndo( 
UNDO_UI_DELETE_PAGE_BREAK, NULL );
+SvxFmtBreakItem aNoBreakItem( SVX_BREAK_NONE, nWhich );
+SwPaM aPaM( *pNd );
+pNd-GetDoc()-InsertPoolItem( aPaM, aNoBreakItem, 
nsSetAttrMode::SETATTR_DEFAULT );
+pNd-GetDoc()-GetIDocumentUndoRedo( ).EndUndo( 
UNDO_UI_DELETE_PAGE_BREAK, NULL );
+}
+}
+break;
+}
 }
 
 void SwPageBreakWin::UpdatePosition( )

[Libreoffice-commits] .: hwpfilter/qa lotuswordpro/qa sc/qa sc/RdbTarget_sc_filters_test.mk svtools/qa sw/qa test/inc test/source writerfilter/qa

2011-10-05 Thread Michael Meeks 
 hwpfilter/qa/cppunit/test_hwpfilter.cxx|9 +--
 lotuswordpro/qa/cppunit/test_lotuswordpro.cxx  |9 ++-
 sc/RdbTarget_sc_filters_test.mk|1 
 sc/qa/unit/filters-test.cxx|   31 ++---
 sc/qa/unit/ucalc.cxx   |6 ++
 svtools/qa/cppunit/filters-test.cxx|7 ---
 sw/qa/core/filters-test.cxx|7 +--
 sw/qa/core/swdoc-test.cxx  |   17 ++-
 test/inc/test/bootstrapfixture.hxx |8 +++
 test/inc/test/filters-test.hxx |3 -
 test/source/bootstrapfixture.cxx   |   48 +
 writerfilter/qa/cppunittests/rtftok/testrtftok.cxx |7 ++-
 12 files changed, 95 insertions(+), 58 deletions(-)

New commits:
commit 8a0d0457a79836fa9d8ea8d4c48ecbf7bac2e95b
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Oct 5 16:00:44 2011 +0100

test fix: use setUp and tearDown not constructors to init LibreOffice

It turns out the constructors are all run back-to-back one per filter,
and we need to init and de-init in a sensible order to make multiple
tests that otherwise share the ContentBroker work properly.

diff --git a/hwpfilter/qa/cppunit/test_hwpfilter.cxx 
b/hwpfilter/qa/cppunit/test_hwpfilter.cxx
index a0451ed..2e96284 100644
--- a/hwpfilter/qa/cppunit/test_hwpfilter.cxx
+++ b/hwpfilter/qa/cppunit/test_hwpfilter.cxx
@@ -40,10 +40,8 @@ namespace
 class HwpFilterTest : public test::FiltersTest
 {
 public:
-HwpFilterTest();
-
+virtual void setUp();
 virtual bool load(const rtl::OUString , const rtl::OUString rURL, 
const rtl::OUString );
-
 void test();
 
 CPPUNIT_TEST_SUITE(HwpFilterTest);
@@ -53,13 +51,14 @@ namespace
 uno::Referencedocument::XFilter m_xFilter;
 };
 
-HwpFilterTest::HwpFilterTest()
+void HwpFilterTest::setUp()
 {
+test::FiltersTest::setUp();
+
 m_xFilter = uno::Reference document::XFilter 
(m_xSFactory-createInstance(
 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
 com.sun.comp.hwpimport.HwpImportFilter))),
 uno::UNO_QUERY_THROW);
-
 }
 
 bool HwpFilterTest::load(const rtl::OUString ,
diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx 
b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
index b68c86d..7500e25 100644
--- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
+++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
@@ -39,7 +39,9 @@ namespace
 class LotusWordProTest : public test::FiltersTest
 {
 public:
-LotusWordProTest();
+LotusWordProTest() : FiltersTest(true, false) {}
+
+virtual void setUp();
 
 virtual bool load(const rtl::OUString ,
 const rtl::OUString rURL, const rtl::OUString );
@@ -53,9 +55,10 @@ namespace
 uno::Referencedocument::XFilter m_xFilter;
 };
 
-LotusWordProTest::LotusWordProTest()
-: FiltersTest(true, false)
+void LotusWordProTest::setUp()
 {
+test::FiltersTest::setUp();
+
 m_xFilter = uno::Reference document::XFilter 
(m_xSFactory-createInstance(
 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
 com.sun.star.comp.Writer.LotusWordProImportFilter))),
diff --git a/sc/RdbTarget_sc_filters_test.mk b/sc/RdbTarget_sc_filters_test.mk
index a0d32bb..d6d1bc8 100644
--- a/sc/RdbTarget_sc_filters_test.mk
+++ b/sc/RdbTarget_sc_filters_test.mk
@@ -59,6 +59,7 @@ $(eval $(call 
gb_RdbTarget_add_old_components,sc_filters_test,\
 configmgr \
 ucb1 \
 ucpfile1 \
+ucptdoc1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index bdb8997..766cb6b 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -39,6 +39,7 @@
 
 #include editeng/brshitem.hxx
 #include editeng/justifyitem.hxx
+#include basic/sbxdef.hxx
 
 #include helper/csv_handler.hxx
 #include orcus/csv_parser.hpp
@@ -55,6 +56,7 @@
 #define XLSX2
 
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
 
 namespace {
 
@@ -140,6 +142,9 @@ public:
 void createFileURL(const rtl::OUString aFileBase, const rtl::OUString 
aFileExtension, rtl::OUString rFilePath);
 void createCSVPath(const rtl::OUString aFileBase, rtl::OUString 
rFilePath);
 
+virtual void setUp();
+virtual void tearDown();
+
 /**
  * Ensure CVEs remain unbroken
  */
@@ -165,6 +170,7 @@ public:
 CPPUNIT_TEST(testBugFixesODS);
 CPPUNIT_TEST(testBugFixesXLS);
 CPPUNIT_TEST(testBugFixesXLSX);
+
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -178,16 +184,16 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString 
rFilter, const rtl::OUStr
 sal_uInt32 nFormat = 0;
 if (nFormatType)
 nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS;
-SfxFilter aFilter(
+SfxFilter*

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

2011-10-05 Thread Tor Lillqvist 
 fpicker/source/generic/fpicker.cxx  |3 ++-
 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 877de645ffb45b8446d9195996d1a56a8a89e64b
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Oct 5 18:01:50 2011 +0300

WaE: unreachable code

diff --git a/fpicker/source/generic/fpicker.cxx 
b/fpicker/source/generic/fpicker.cxx
index bb38287..1444fde 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -67,6 +67,8 @@ static OUString FilePicker_getSystemPickerServiceName()
 return OUString (RTL_CONSTASCII_USTRINGPARAM 
(com.sun.star.ui.dialogs.KDE4FilePicker));
 else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii (macosx))
 return OUString (RTL_CONSTASCII_USTRINGPARAM 
(com.sun.star.ui.dialogs.AquaFilePicker));
+else
+return OUString (RTL_CONSTASCII_USTRINGPARAM 
(com.sun.star.ui.dialogs.SystemFilePicker));
 #endif
 #ifdef WNT
 if (SvtMiscOptions().TryODMADialog()  ::odma::DMSsAvailable()) {
@@ -74,7 +76,6 @@ static OUString FilePicker_getSystemPickerServiceName()
 }
 return OUString (RTL_CONSTASCII_USTRINGPARAM 
(com.sun.star.ui.dialogs.Win32FilePicker));
 #endif
-return OUString (RTL_CONSTASCII_USTRINGPARAM 
(com.sun.star.ui.dialogs.SystemFilePicker));
 }
 
 static Reference css::uno::XInterface  FilePicker_createInstance (
commit 8d6030fa420cb999572b0770fb52442e1b5b8190
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Oct 5 17:56:09 2011 +0300

Use OUString::getStr()

diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 0e0a3ff..17af330 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -709,7 +709,7 @@ void VistaFilePickerImpl::impl_sta_SetDirectory(const 
RequestRef rRequest)
 #ifdef __MINGW32__
 HRESULT hResult = SHCreateItemFromParsingName ( 
reinterpret_castLPCTSTR(sDirectory.getStr()), NULL, IID_IShellItem, 
(void**)(pFolder) );
 #else
-HRESULT hResult = SHCreateItemFromParsingName ( sDirectory, NULL, 
IID_PPV_ARGS(pFolder) );
+HRESULT hResult = SHCreateItemFromParsingName ( sDirectory.getStr(), NULL, 
IID_PPV_ARGS(pFolder) );
 #endif
 if ( FAILED(hResult) )
 return;
@@ -902,7 +902,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const 
RequestRef rRequest)
 #ifdef __MINGW32__
 HRESULT hResult = SHCreateItemFromParsingName ( 
reinterpret_castLPCTSTR(m_sDirectory.getStr()), NULL, IID_IShellItem, 
(void**)(pFolder) );
 #else
-HRESULT hResult = SHCreateItemFromParsingName ( m_sDirectory, 
NULL, IID_PPV_ARGS(pFolder) );
+HRESULT hResult = SHCreateItemFromParsingName ( 
m_sDirectory.getStr(), NULL, IID_PPV_ARGS(pFolder) );
 #endif
 if ( SUCCEEDED(hResult) )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: boost/boost_1_44_0.patch boost/boost.4713.warnings.patch boost/makefile.mk

2011-10-05 Thread Fridrich Strba 
 boost/boost.4713.warnings.patch |   57 
 boost/boost_1_44_0.patch|   24 
 boost/makefile.mk   |   10 ---
 3 files changed, 88 insertions(+), 3 deletions(-)

New commits:
commit ce37e6b98718057ff4e980e7122f47c3cb8c43c2
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Oct 5 17:09:48 2011 +0200

Build a small static date_time/gregorian for cbosdonnat's perusal

diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch
index df76947..6564c9b 100644
--- a/boost/boost.4713.warnings.patch
+++ b/boost/boost.4713.warnings.patch
@@ -1,3 +1,22 @@
+--- misc/boost_1_44_0/boost/date_time/date_names_put.hpp   2008-02-27 
21:00:24.0 +0100
 misc/build/boost_1_44_0/boost/date_time/date_names_put.hpp 2011-10-05 
16:58:58.413575307 +0200
+@@ -218,14 +218,14 @@
+  const charT* const weekday_long_names[],
+  charT separator_char = '-',
+  ymd_order_spec order_spec = ymd_order_iso,
+- month_format_spec month_format = 
month_as_short_string) :
++ month_format_spec month_format_ = 
month_as_short_string) :
+ month_short_names_(month_short_names),
+ month_long_names_(month_long_names),
+ special_value_names_(special_value_names),
+ weekday_short_names_(weekday_short_names),
+ weekday_long_names_(weekday_long_names),
+ order_spec_(order_spec),
+-month_format_spec_(month_format)
++month_format_spec_(month_format_)
+   {
+ separator_char_[0] = separator_char;
+ separator_char_[1] = '\0';
 --- misc/boost_1_44_0/boost/ptr_container/detail/map_iterator.hpp  
2008-06-24 22:37:35.0 +0200
 +++ misc/build/boost_1_44_0/boost/ptr_container/detail/map_iterator.hpp
2011-02-04 16:39:19.0 +0100
 @@ -49,7 +49,7 @@
@@ -900,3 +919,41 @@
  
  ~object_pool();
  
+--- misc/boost_1_44_0/libs/date_time/src/gregorian/greg_month.cpp  
2008-11-23 12:13:35.0 +0100
 misc/build/boost_1_44_0/libs/date_time/src/gregorian/greg_month.cpp
2011-10-05 16:56:34.627320523 +0200
+@@ -108,7 +108,7 @@
+*/
+   BOOST_DATE_TIME_DECL 
+   boost::date_time::all_date_names_putgreg_facet_config, char* 
+-  create_facet_def(char type)
++  create_facet_def(char /* type */)
+   {
+ typedef 
+   boost::date_time::all_date_names_putgreg_facet_config, char facet_def;
+@@ -121,7 +121,7 @@
+   }
+   
+   //! generates a locale with the set of gregorian name-strings of type char*
+-  BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale loc, char 
type){
++  BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale loc, char /* 
type */){
+ typedef boost::date_time::all_date_names_putgreg_facet_config, char 
facet_def;
+ return std::locale(loc, new facet_def(short_month_names,
+   long_month_names,
+@@ -139,7 +139,7 @@
+*/
+   BOOST_DATE_TIME_DECL 
+   boost::date_time::all_date_names_putgreg_facet_config, wchar_t* 
+-  create_facet_def(wchar_t type)
++  create_facet_def(wchar_t /* type */)
+   {
+ typedef 
+   boost::date_time::all_date_names_putgreg_facet_config,wchar_t 
facet_def;
+@@ -152,7 +152,7 @@
+   }
+ 
+   //! generates a locale with the set of gregorian name-strings of type 
wchar_t*
+-  BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale loc, wchar_t 
type){
++  BOOST_DATE_TIME_DECL std::locale generate_locale(std::locale loc, wchar_t 
/* type */){
+ typedef boost::date_time::all_date_names_putgreg_facet_config, wchar_t 
facet_def;
+ return std::locale(loc, new facet_def(w_short_month_names,
+   w_long_month_names,
diff --git a/boost/boost_1_44_0.patch b/boost/boost_1_44_0.patch
index 4673919..a2e5380 100644
--- a/boost/boost_1_44_0.patch
+++ b/boost/boost_1_44_0.patch
@@ -23,3 +23,27 @@
 +
 +.INCLUDE :  target.mk
 +.ENDIF
+--- misc/boost_1_44_0/libs/date_time/src/gregorian/makefile.mk 2011-10-05 
16:28:29.191616897 +0200
 misc/build/boost_1_44_0/libs/date_time/src/gregorian/makefile.mk   
2011-10-05 16:27:40.511187732 +0200
+@@ -1 +1,20 @@
+-dummy
++PRJ=..$/..$/..$/..$/..$/..$/..$/..
++
++PRJNAME=boostdatetime
++TARGET=boostdatetime
++ENABLE_EXCEPTIONS=TRUE
++LIBTARGET=NO
++
++.INCLUDE :  settings.mk
++
++SLOFILES= \
++  $(SLO)$/gregorian_types.obj \
++  $(SLO)$/greg_weekday.obj \
++  $(SLO)$/date_generators.obj \
++  $(SLO)$/greg_month.obj \
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
++LIB1OBJFILES=$(SLOFILES)
++
++.INCLUDE :  target.mk
diff --git a/boost/makefile.mk b/boost/makefile.mk
index b9feb7b..3ba21d8 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -63,7 +63,8 @@ PATCH_FILES+=boost.gcc47679.patch
 PATCH_FILES+=boost.windows.patch
 
 ADDITIONAL_FILES= \
-

[Libreoffice-commits] .: writerfilter/source

2011-10-05 Thread Caolán McNamara 
 writerfilter/source/dmapper/OLEHandler.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit eddc7f6846f5bd78ba8f4913d83b66f646fe09cc
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Oct 5 16:30:08 2011 +0100

WaE: unused variables

diff --git a/writerfilter/source/dmapper/OLEHandler.cxx 
b/writerfilter/source/dmapper/OLEHandler.cxx
index 1e89825..907e4a7 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -127,6 +127,8 @@ void OLEHandler::lcl_attribute(Id rName, Value  rVal)
 #if DEBUG
 clog  Exception in OLE Handler: ;
 clog  rtl::OUStringToOString( e.Message, 
RTL_TEXTENCODING_UTF8 ).getStr( )  endl;
+#else
+(void)e;
 #endif
 }
 }
@@ -176,6 +178,8 @@ void OLEHandler::lcl_sprm(Sprm  rSprm)
 #if DEBUG
 clog  Exception in OLE Handler: ;
 clog  rtl::OUStringToOString( e.Message, 
RTL_TEXTENCODING_UTF8 ).getStr( )  endl;
+#else
+(void)e;
 #endif
 }
 }
@@ -230,9 +234,8 @@ void OLEHandler::lcl_sprm(Sprm  rSprm)
 uno::Reference lang::XComponent  xComp( xEmbeddedResolver, 
uno::UNO_QUERY_THROW );
 xComp-dispose();
 }
-catch( const uno::Exception rEx)
+catch( const uno::Exception )
 {
-(void)rEx;
 OSL_FAIL(exception in OLEHandler::createOLEObject);
 }
 return sRet;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/unx

2011-10-05 Thread Fridrich Strba 
 vcl/unx/gtk/app/gtkinst.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3daddf9e013db9220c1c49861e1e18c9e3c16314
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Oct 5 17:30:19 2011 +0200

fix also older gtk+ build

diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index f0cf177..16c1a78 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -258,7 +258,7 @@ void GtkInstance::AddToRecentDocumentList(const 
rtl::OUString rFileUrl, const r
 static addItemFnc sym_gtk_recent_manager_add_item =
 (addItemFnc)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin, 
gtk_recent_manager_add_item);
 if (sym_gtk_recent_manager_get_default  sym_gtk_recent_manager_add_item)
-sym_gtk_recent_manager_add_item(sym_gtk_recent_manager_get_default(), 
sGtkURL);
+sym_gtk_recent_manager_add_item(sym_gtk_recent_manager_get_default(), 
sGtkURL.getStr());
 else
 X11SalInstance::AddToRecentDocumentList(rFileUrl, rMimeType);
 #endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-10-05 Thread Cédric Bosdonnat 
 sw/source/core/layout/paintfrm.cxx  |   11 +--
 sw/source/ui/docvw/PageBreakWin.cxx |   24 +++-
 sw/source/ui/shells/tabsh.cxx   |3 +++
 3 files changed, 31 insertions(+), 7 deletions(-)

New commits:
commit 86456335a32a630547e774f23dc34fe567660497
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Wed Oct 5 17:33:05 2011 +0200

Page Break: implement the break before page case

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 22f3d6c..d51ef08 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3335,8 +3335,15 @@ void SwPageFrm::PaintBreak( ) const
 
 if ( pBodyFrm )
 {
-const SwCntntFrm *pCnt = static_cast const SwLayoutFrm* ( 
pBodyFrm )-ContainsCntnt();
-if ( pCnt  pCnt-IsPageBreak( sal_True ) )
+const SwLayoutFrm* pLayBody = static_cast const SwLayoutFrm* ( 
pBodyFrm );
+const SwFlowFrm *pFlowFrm = pLayBody-ContainsCntnt();
+
+// Test if the first node is a table
+const SwFrm* pFirstFrm = pLayBody-Lower();
+if ( pFirstFrm-IsTabFrm() )
+pFlowFrm = static_cast const SwTabFrm* ( pFirstFrm );
+
+if ( pFlowFrm  pFlowFrm-IsPageBreak( sal_True ) )
 {
 SwWrtShell* pWrtSh = dynamic_cast SwWrtShell* ( pGlobalShell 
);
 if ( pWrtSh )
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index 2b70887..170ccce 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -244,10 +244,25 @@ void SwPageBreakWin::Select( )
 {
 case FN_PAGEBREAK_EDIT:
 {
-// TODO Handle the break on a table case
-SfxUInt16Item aItem( GetEditWin()-GetView().GetPool( 
).GetWhich( SID_PARA_DLG ), TP_PARA_EXT );
-
GetEditWin()-GetView().GetViewFrame()-GetDispatcher()-Execute(
-SID_PARA_DLG, 
SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, aItem, NULL );
+const SwLayoutFrm* pBodyFrm = static_cast const SwLayoutFrm* 
( GetPageFrame()-Lower() );
+while ( pBodyFrm  !pBodyFrm-IsBodyFrm() )
+pBodyFrm = static_cast const SwLayoutFrm* ( 
pBodyFrm-GetNext() );
+
+if ( pBodyFrm )
+{
+if ( pBodyFrm-Lower()-IsTabFrm() )
+{
+SfxUInt16Item aItem( GetEditWin()-GetView().GetPool( 
).GetWhich( FN_FORMAT_TABLE_DLG ), TP_TABLE_TEXTFLOW );
+
GetEditWin()-GetView().GetViewFrame()-GetDispatcher()-Execute(
+FN_FORMAT_TABLE_DLG, 
SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, aItem, NULL );
+}
+else
+{
+SfxUInt16Item aItem( GetEditWin()-GetView().GetPool( 
).GetWhich( SID_PARA_DLG ), TP_PARA_EXT );
+
GetEditWin()-GetView().GetViewFrame()-GetDispatcher()-Execute(
+SID_PARA_DLG, 
SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, aItem, NULL );
+}
+}
 }
 break;
 case FN_PAGEBREAK_DELETE:
@@ -258,7 +273,6 @@ void SwPageBreakWin::Select( )
 
 if ( pBodyFrm )
 {
-// TODO Handle the break before a table case
 SwCntntFrm *pCnt = const_cast SwCntntFrm* ( 
pBodyFrm-ContainsCntnt() );
 sal_uInt16 nWhich = 
pCnt-GetAttrSet()-GetPool()-GetWhich( SID_ATTR_PARA_PAGEBREAK );
 SwCntntNode* pNd = pCnt-GetNode();
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index bfc441a..44500b8 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -596,6 +596,9 @@ void SwTableShell::Execute(SfxRequest rReq)
 
 pDlg = pFact-CreateSwTableTabDlg( GetView().GetWindow(), 
GetPool(), aCoreSet, rSh, DLG_FORMAT_TABLE );
 OSL_ENSURE(pDlg, Dialogdiet fail!);
+
+if( pItem )
+pDlg-SetCurPageId( ((SfxUInt16Item *)pItem)-GetValue() );
 }
 aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, 
::GetHtmlMode(GetView().GetDocShell(;
 rSh.GetTblAttr(aCoreSet);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/source

2011-10-05 Thread Noel Power 
 oox/source/ole/olehelper.cxx |   28 ++--
 1 file changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 04688482241aa28b40f3ba911a4c9acab87b5d56
Author: Noel Power noel.po...@novell.com
Date:   Wed Oct 5 17:52:32 2011 +0100

add hackery re. EditControls, FormattedField  ImageControls from msocximex

diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index fd4672a..3943e65 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -138,6 +138,7 @@ struct IdCntrlData
 };
 
 const sal_Int16 TOGGLEBUTTON = -1;
+const sal_Int16 FIELDCONTROL = -2;
 
 typedef std::map sal_Int16, GUIDCNamePair  GUIDCNamePairMap;
 class classIdToGUIDCNamePairMap
@@ -196,6 +197,9 @@ classIdToGUIDCNamePairMap::classIdToGUIDCNamePairMap()
 {  FormComponentType::PATTERNFIELD,
  { AX_GUID_TEXTBOX, TextBox},
 },
+{  FormComponentType::FORMULAFIELD,
+ { AX_GUID_TEXTBOX, TextBox},
+},
 {  FormComponentType::IMAGEBUTTON,
  { AX_GUID_COMMANDBUTTON, CommandButton},
 },
@@ -501,14 +505,34 @@ OleFormCtrlExportHelper::OleFormCtrlExportHelper(  const 
Reference XComponentCo
 PropertySet aPropSet( mxControlModel );
 if ( aPropSet.getProperty( nClassId, PROP_ClassId ) )
 {
-// psuedo ripped from legacy msocximex
-if ( nClassId == FormComponentType::COMMANDBUTTON )
+/* psuedo ripped from legacy msocximex:
+  There is a truly horrible thing with EditControls and 
FormattedField
+  Controls, they both pretend to have an EDITBOX ClassId for 
compability
+  reasons, at some stage in the future hopefully there will be a 
proper
+  FormulaField ClassId rather than this piggybacking two controls 
onto the
+  same ClassId, cmc.
+*/
+if ( nClassId == FormComponentType::TEXTFIELD)
+{
+if (xInfo-
+supportsService( CREATE_OUSTRING( 
com.sun.star.form.component.FormattedField ) ) )
+nClassId = FormComponentType::FORMULAFIELD;
+}
+else if ( nClassId == FormComponentType::COMMANDBUTTON )
 {
 bool bToggle = false;
 aPropSet.getProperty( bToggle, PROP_Toggle );
 if ( bToggle )
 nClassId = TOGGLEBUTTON;
 }
+else if ( nClassId == FormComponentType::CONTROL )
+{
+Reference XServiceInfo  xInfo( xCntrlModel,
+UNO_QUERY);
+if (xInfo-
+supportsService(OUString( CREATE_OUSTRING( 
com.sun.star.form.component.ImageControl ) ) ) )
+nClassId = FormComponentType::IMAGECONTROL;
+}
 
 GUIDCNamePairMap cntrlMap = classIdToGUIDCNamePairMap::get();
 GUIDCNamePairMap::iterator it = cntrlMap.find( nClassId );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/qa

2011-10-05 Thread Markus Mohrhard 
 sc/qa/unit/data/ods/StarBasic.ods |binary
 sc/qa/unit/filters-test.cxx   |   47 +-
 2 files changed, 46 insertions(+), 1 deletion(-)

New commits:
commit ac3f311320d042eebbb31411d804b6e08b43cb4d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Oct 5 19:27:51 2011 +0200

add Star Basic unit test to calc

test is still disabled by default,
it works but does nothing useful yet

diff --git a/sc/qa/unit/data/ods/StarBasic.ods 
b/sc/qa/unit/data/ods/StarBasic.ods
new file mode 100644
index 000..a4b74b3
Binary files /dev/null and b/sc/qa/unit/data/ods/StarBasic.ods differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 766cb6b..54bc7a5 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -36,6 +36,7 @@
 #include sfx2/docfilt.hxx
 #include sfx2/docfile.hxx
 #include sfx2/sfxmodelfactory.hxx
+#include svl/intitem.hxx
 
 #include editeng/brshitem.hxx
 #include editeng/justifyitem.hxx
@@ -160,6 +161,8 @@ public:
 void testBugFixesXLS();
 void testBugFixesXLSX();
 
+void testStarBasic();
+
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testCVEs);
 CPPUNIT_TEST(testRangeName);
@@ -170,6 +173,9 @@ public:
 CPPUNIT_TEST(testBugFixesODS);
 CPPUNIT_TEST(testBugFixesXLS);
 CPPUNIT_TEST(testBugFixesXLSX);
+//enable this test if you want to play with star basic macros in unit tests
+//CPPUNIT_TEST(testStarBasic);
+
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -191,13 +197,16 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString 
rFilter, const rtl::OUStr
 aFilter-SetVersion(SOFFICE_FILEFORMAT_CURRENT);
 
 ScDocShellRef xDocShRef = new ScDocShell;
-SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ, true);
+SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READWRITE, true);
 pSrcMed-SetFilter(aFilter);
 if (!xDocShRef-DoLoad(pSrcMed))
 // load failed.
 xDocShRef.Clear();
 else if (nFormatType)
+{
+pSrcMed-GetItemSet()-Put( SfxUInt16Item( SID_MACROEXECMODE, 4));
 SfxObjectShell::SetCurrentComponent( xDocShRef-GetModel() );
+}
 
 return xDocShRef;
 }
@@ -348,6 +357,7 @@ void ScFiltersTest::testContent()
 CPPUNIT_ASSERT_MESSAGE(Failed to load universal-content.*, 
xDocSh.Is());
 ScDocument* pDoc = xDocSh-GetDocument();
 testContentImpl(pDoc);
+xDocSh-DoClose();
 }
 }
 
@@ -368,6 +378,7 @@ void ScFiltersTest::testFunctions()
 rtl::OUString aCSVFileName;
 
createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(logical-functions.)), 
aCSVFileName);
 testFile(aCSVFileName, pDoc, 0);
+xDocSh-DoClose();
 }
 
 void ScFiltersTest::testDatabaseRanges()
@@ -411,6 +422,7 @@ void ScFiltersTest::testDatabaseRanges()
 CPPUNIT_ASSERT_MESSAGE(Sheet2: A11: formula result is incorrect, aValue 
== 4);
 pDoc-GetValue(1, 10, 1, aValue);
 CPPUNIT_ASSERT_MESSAGE(Sheet2: B11: formula result is incorrect, aValue 
== 2);
+xDocSh-DoClose();
 }
 
 void ScFiltersTest::testFormats()
@@ -492,6 +504,7 @@ void ScFiltersTest::testFormats()
 
createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(conditionalFormatting.)),
 aCSVFileName);
 testCondFile(aCSVFileName, pDoc, 2);
 }
+xDocSh-DoClose();
 }
 }
 
@@ -509,6 +522,7 @@ void ScFiltersTest::testBugFixesODS()
 CPPUNIT_ASSERT_MESSAGE(Failed to load bugFixes.ods, xDocSh.Is());
 ScDocument* pDoc = xDocSh-GetDocument();
 CPPUNIT_ASSERT_MESSAGE(No Document, pDoc); //remove with first test
+xDocSh-DoClose();
 }
 
 void ScFiltersTest::testBugFixesXLS()
@@ -525,6 +539,7 @@ void ScFiltersTest::testBugFixesXLS()
 CPPUNIT_ASSERT_MESSAGE(Failed to load bugFixes.xls, xDocSh.Is());
 ScDocument* pDoc = xDocSh-GetDocument();
 CPPUNIT_ASSERT_MESSAGE(No Document, pDoc); //remove with first test
+xDocSh-DoClose();
 }
 
 void ScFiltersTest::testBugFixesXLSX()
@@ -541,6 +556,36 @@ void ScFiltersTest::testBugFixesXLSX()
 CPPUNIT_ASSERT_MESSAGE(Failed to load bugFixes.xlsx, xDocSh.Is());
 ScDocument* pDoc = xDocSh-GetDocument();
 CPPUNIT_ASSERT_MESSAGE(No Document, pDoc); //remove with first test
+xDocSh-DoClose();
+}
+
+void ScFiltersTest::testStarBasic()
+{
+const rtl::OUString 
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(StarBasic.));
+rtl::OUString aFileExtension(aFileFormats[0].pName, 
strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 );
+rtl::OUString aFilterName(aFileFormats[0].pFilterName, 
strlen(aFileFormats[0].pFilterName), RTL_TEXTENCODING_UTF8) ;
+rtl::OUString aFileName;
+createFileURL(aFileNameBase, aFileExtension, aFileName);
+rtl::OUString aFilterType(aFileFormats[0].pTypeName, 
strlen(aFileFormats[0].pTypeName), RTL_TEXTENCODING_UTF8);
+std::cout  aFileFormats[0].pName   Test  std::endl;
+ScDocShellRef xDocSh = load (aFilterName, aFileName, rtl::OUString(), 
aFilterType,

[Libreoffice-commits] .: 2 commits - sc/CppunitTest_sc_filters_test.mk sc/qa sc/RdbTarget_sc_filters_test.mk

2011-10-05 Thread Markus Mohrhard 
 sc/CppunitTest_sc_filters_test.mk |2 +
 sc/RdbTarget_sc_filters_test.mk   |2 +
 sc/qa/unit/data/xls/vba.xls   |binary
 sc/qa/unit/filters-test.cxx   |   40 +-
 4 files changed, 43 insertions(+), 1 deletion(-)

New commits:
commit 3086838ebffe99cdcec41b927378cdb5e1b5c0e0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Oct 5 21:42:35 2011 +0200

enable the star basic test to see if it causes troubles anywhere

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 6f8c1e2..cc866c4 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -176,7 +176,7 @@ public:
 CPPUNIT_TEST(testBugFixesXLSX);
 //enable this test if you want to play with star basic macros in unit tests
 //works but does nothing useful yet
-//CPPUNIT_TEST(testStarBasic);
+CPPUNIT_TEST(testStarBasic);
 //enable if you want to hack vba support for unit tests
 //does not work, still problems during loading
 //CPPUNIT_TEST(testVba);
commit fef8e18f896b02ebe42407fb9b5341f9884d1ccb
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Oct 5 21:40:24 2011 +0200

add initial work for vba tests in calc( work in progress)

this does not work yet, it still does not load the vba code correctly
and therefore can't find the vba library

diff --git a/sc/CppunitTest_sc_filters_test.mk 
b/sc/CppunitTest_sc_filters_test.mk
index a164696..3fc42c2 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -79,12 +79,14 @@ $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\
 
 $(eval $(call gb_CppunitTest_add_api,sc_filters_test,\
 offapi \
+oovbaapi \
 udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_filters_test))
 
 $(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\
+oovbaapi \
 types \
 ))
 
diff --git a/sc/RdbTarget_sc_filters_test.mk b/sc/RdbTarget_sc_filters_test.mk
index d6d1bc8..827f66c 100644
--- a/sc/RdbTarget_sc_filters_test.mk
+++ b/sc/RdbTarget_sc_filters_test.mk
@@ -46,9 +46,11 @@ $(eval $(call gb_RdbTarget_add_components,sc_filters_test,\
 sax/source/fastparser/fastsax \
 sc/util/sc \
 sc/util/scfilt \
+sc/util/vbaobj \
 scripting/source/basprov/basprov \
 scripting/util/scriptframe \
 sfx2/util/sfx \
+sot/util/sot \
 toolkit/util/tk \
 unotools/util/utl \
 unoxml/source/rdf/unordf \
diff --git a/sc/qa/unit/data/xls/vba.xls b/sc/qa/unit/data/xls/vba.xls
new file mode 100644
index 000..2ee53a5
Binary files /dev/null and b/sc/qa/unit/data/xls/vba.xls differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 54bc7a5..6f8c1e2 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -162,6 +162,7 @@ public:
 void testBugFixesXLSX();
 
 void testStarBasic();
+void testVba();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testCVEs);
@@ -174,7 +175,11 @@ public:
 CPPUNIT_TEST(testBugFixesXLS);
 CPPUNIT_TEST(testBugFixesXLSX);
 //enable this test if you want to play with star basic macros in unit tests
+//works but does nothing useful yet
 //CPPUNIT_TEST(testStarBasic);
+//enable if you want to hack vba support for unit tests
+//does not work, still problems during loading
+//CPPUNIT_TEST(testVba);
 
 
 CPPUNIT_TEST_SUITE_END();
@@ -588,6 +593,39 @@ void ScFiltersTest::testStarBasic()
 xDocSh-DoClose();
 }
 
+void ScFiltersTest::testVba()
+{
+const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(vba.));
+rtl::OUString aFileExtension(aFileFormats[1].pName, 
strlen(aFileFormats[1].pName), RTL_TEXTENCODING_UTF8 );
+rtl::OUString aFilterName(aFileFormats[1].pFilterName, 
strlen(aFileFormats[1].pFilterName), RTL_TEXTENCODING_UTF8) ;
+rtl::OUString aFileName;
+createFileURL(aFileNameBase, aFileExtension, aFileName);
+rtl::OUString aFilterType(aFileFormats[1].pTypeName, 
strlen(aFileFormats[1].pTypeName), RTL_TEXTENCODING_UTF8);
+std::cout  aFileFormats[1].pName   Test  std::endl;
+ScDocShellRef xDocSh = load (aFilterName, aFileName, rtl::OUString(), 
aFilterType, aFileFormats[1].nFormatType);
+
+CPPUNIT_ASSERT_MESSAGE(Failed to load vba.xls, xDocSh.Is());
+
+//is it really the right way to call a vba macro through CallXScript?
+//it seems that the basic ide does it differently, but then we would need 
to init all parts ourself
+//the problem is that CallXScript inits the basic part
+BasicIDE::RunMethod takes an SbMethod as parametre
+rtl::OUString 
aURL(RTL_CONSTASCII_USTRINGPARAM(vnd.sun.Star.script:VBAProject.Modul1.macro1?language=Basiclocation=document));
+String sUrl = aURL;
+Any aRet;
+Sequence sal_Int16  aOutParamIndex;
+Sequence Any  aOutParam;
+Sequence uno::Any  aParams;
+ScDocument* pDoc = xDocSh-GetDocument();
+
+xDocSh-CallXScript(sUrl, aParams,