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

2011-10-04 Thread Stephan Bergmann 
 stoc/source/inspect/introspection.cxx |   25 +++--
 1 file changed, 7 insertions(+), 18 deletions(-)

New commits:
commit a65b1498035a468377fac09f33696da583aabdfc
Merge: a313cf8... fd4c879...
Author: Stephan Bergmann 
Date:   Wed Oct 5 08:53:56 2011 +0200

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

commit a313cf86071795bbd051feb9b99258be0a5c8c48
Author: Kevin Hunter 
Date:   Tue Oct 4 12:58:10 2011 -0400

Fix logic of isDerivedFrom function

From an email conversation with Stephen Bergmann

"I think the real intent always was to actually look through all the
returned getSuperclasses(), and the error that superclasses past the
first one are effectively ignored has never been noticed."

diff --git a/stoc/source/inspect/introspection.cxx 
b/stoc/source/inspect/introspection.cxx
index 36f1acc..dd6e32c 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -110,29 +110,18 @@ sal_Bool isDerivedFrom( Reference 
xToTestClass, Reference
 {
 Sequence< Reference > aClassesSeq = 
xToTestClass->getSuperclasses();
 const Reference* pClassesArray = aClassesSeq.getConstArray();
+
 sal_Int32 nSuperClassCount = aClassesSeq.getLength();
-sal_Int32 i;
-for( i = 0 ;
- i < nSuperClassCount ;
- /* No "increment" expression needed as the body always
-  * returns, and in fact MSVC warns about unreachable code if
-  * we include one. On the other hand, what's the point in
-  * using a for loop here then if all we ever will look at is
-  * pClassesArray[0] ?
-  */ )
+for ( sal_Int32 i = 0; i < nSuperClassCount; ++i )
 {
 const Reference& rxClass = pClassesArray[i];
-if( xDerivedFromClass->equals( rxClass ) )
-{
-// Treffer
+
+if ( xDerivedFromClass->equals( rxClass ) ||
+ isDerivedFrom( rxClass, xDerivedFromClass )
+   )
 return sal_True;
-}
-else
-{
-// Rekursiv weitersuchen
-return isDerivedFrom( rxClass, xDerivedFromClass );
-}
 }
+
 return sal_False;
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oowintool

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

New commits:
commit fd4c879e2ebd5920b48b2e48ac32181565f5ee1b
Author: Tor Lillqvist 
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  - copy msvc[pr]??.dlls into 
/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] .: libexttextcat/libexttextcat-3.1.1.patch

2011-10-04 Thread Fridrich Strba 
 libexttextcat/libexttextcat-3.1.1.patch |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 9f886509ed26ba2296d0142b57a2b07577762dcf
Author: Fridrich Å trba 
Date:   Wed Oct 5 07:20:07 2011 +0200

Name the libraries correctly too

diff --git a/libexttextcat/libexttextcat-3.1.1.patch 
b/libexttextcat/libexttextcat-3.1.1.patch
index f739921..a6aaa27 100644
--- a/libexttextcat/libexttextcat-3.1.1.patch
+++ b/libexttextcat/libexttextcat-3.1.1.patch
@@ -1,5 +1,16 @@
 --- misc/libexttextcat-3.1.1/src/makefile.mk   2011-09-30 13:04:43.0 
+0200
-+++ misc/build/libexttextcat-3.1.1/src/makefile.mk 2011-10-05 
06:59:07.102698404 +0200
 misc/build/libexttextcat-3.1.1/src/makefile.mk 2011-10-05 
07:18:03.509285358 +0200
+@@ -27,8 +27,8 @@
+ 
+ PRJ = ..$/..$/..$/..$/..
+ 
+-PRJNAME = libtextcat
+-TARGET  = libtextcat
++PRJNAME = libexttextcat
++TARGET  = libexttextcat
+ CFLAGSCALL=gsd
+ 
+ USE_DEFFILE=TRUE
 @@ -65,7 +65,7 @@
  DEF1NAME=   $(SHL1TARGET)
  DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libexttextcat/libexttextcat-3.1.1.patch libexttextcat/makefile.mk

2011-10-04 Thread Fridrich Strba 
 libexttextcat/libexttextcat-3.1.1.patch |   11 +++
 libexttextcat/makefile.mk   |1 +
 2 files changed, 12 insertions(+)

New commits:
commit 052317f0ed4694351cb259aaae890d734066dbc1
Author: Fridrich Å trba 
Date:   Wed Oct 5 07:03:57 2011 +0200

Fix MSVC build of libexttextcat

diff --git a/libexttextcat/libexttextcat-3.1.1.patch 
b/libexttextcat/libexttextcat-3.1.1.patch
new file mode 100644
index 000..f739921
--- /dev/null
+++ b/libexttextcat/libexttextcat-3.1.1.patch
@@ -0,0 +1,11 @@
+--- misc/libexttextcat-3.1.1/src/makefile.mk   2011-09-30 13:04:43.0 
+0200
 misc/build/libexttextcat-3.1.1/src/makefile.mk 2011-10-05 
06:59:07.102698404 +0200
+@@ -65,7 +65,7 @@
+ DEF1NAME=   $(SHL1TARGET)
+ DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
+ 
+-SHL1VERSIONMAP= libtextcat.map
++SHL1VERSIONMAP= libexttextcat.map
+ 
+ # --- Targets --
+ 
diff --git a/libexttextcat/makefile.mk b/libexttextcat/makefile.mk
index ce607a3..91f96c2 100644
--- a/libexttextcat/makefile.mk
+++ b/libexttextcat/makefile.mk
@@ -47,6 +47,7 @@ all:
 TARFILE_NAME=libexttextcat-3.1.1
 TARFILE_MD5=33f01c57f92eb6f940b59015c35a4eea
 TARFILE_ROOTDIR=libexttextcat-3.1.1
+PATCH_FILES=libexttextcat-3.1.1.patch
 
 .IF "$(GUI)"=="UNX"
 #relative to CONFIGURE_DIR
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sch binfilter/inc

2011-10-04 Thread Joseph Powers 
 binfilter/bf_sch/source/core/sch_axisid.cxx   |7 -
 binfilter/bf_sch/source/core/sch_datapoin.cxx |   18 ---
 binfilter/bf_sch/source/core/sch_datarow.cxx  |   11 --
 binfilter/bf_sch/source/core/sch_memchrt.cxx  |   24 
 binfilter/bf_sch/source/core/sch_objadj.cxx   |   13 --
 binfilter/bf_sch/source/core/sch_objfac.cxx   |2 
 binfilter/bf_sch/source/core/sch_objid.cxx|   18 ---
 binfilter/bf_sch/source/ui/app/sch_schdll.cxx |  133 --
 binfilter/bf_sch/util/bf_sch.map  |   16 ---
 binfilter/inc/bf_sch/datapoin.hxx |2 
 binfilter/inc/bf_sch/datarow.hxx  |2 
 binfilter/inc/bf_sch/objadj.hxx   |2 
 binfilter/inc/bf_sch/objid.hxx|2 
 binfilter/inc/bf_sch/schdll.hxx   |6 -
 binfilter/inc/bf_svx/svdobj.hxx   |2 
 15 files changed, 9 insertions(+), 249 deletions(-)

New commits:
commit 4a8c673c912bdb38f2d17325aa1f4d078da47cc0
Author: Joseph Powers 
Date:   Tue Oct 4 20:28:09 2011 -0700

The last of the easy DBG_BF_ASSERT from bf_sch

diff --git a/binfilter/bf_sch/source/core/sch_axisid.cxx 
b/binfilter/bf_sch/source/core/sch_axisid.cxx
index 2ef3a1e..dc31350 100644
--- a/binfilter/bf_sch/source/core/sch_axisid.cxx
+++ b/binfilter/bf_sch/source/core/sch_axisid.cxx
@@ -34,13 +34,6 @@
 #include "glob.hxx"
 #include 
 namespace binfilter {
-/*
-|*
-|* Objekt-Id ermitteln;
-|* Liefert -1, wenn das Objekt keine Id hat
-|*
-\/
-
 
 /*
 |*
diff --git a/binfilter/bf_sch/source/core/sch_datapoin.cxx 
b/binfilter/bf_sch/source/core/sch_datapoin.cxx
index 2ef40b1..dd2bf9b 100644
--- a/binfilter/bf_sch/source/core/sch_datapoin.cxx
+++ b/binfilter/bf_sch/source/core/sch_datapoin.cxx
@@ -114,24 +114,6 @@ namespace binfilter {
 
 /*
 |*
-|* Kopier-Konstruktor
-|*
-\/
-
-
-/*
-|*
-|* Kopie erzeugen
-|*
-\/
-
-/*N*/ SdrObjUserData* SchDataPoint::Clone(SdrObject *) const
-/*N*/ {
-/*?*/   DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-/*
-|*
 |* Daten aus Stream lesen
 |*
 \/
diff --git a/binfilter/bf_sch/source/core/sch_datarow.cxx 
b/binfilter/bf_sch/source/core/sch_datarow.cxx
index bc59592..c9fc08e 100644
--- a/binfilter/bf_sch/source/core/sch_datarow.cxx
+++ b/binfilter/bf_sch/source/core/sch_datarow.cxx
@@ -110,17 +110,6 @@ namespace binfilter {
 
 /*
 |*
-|* Kopie erzeugen
-|*
-\/
-
-/*N*/ SdrObjUserData* SchDataRow::Clone(SdrObject *) const
-/*N*/ {
-/*?*/   DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-/*
-|*
 |* Daten aus Stream lesen
 |*
 \/
diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx 
b/binfilter/bf_sch/source/core/sch_memchrt.cxx
index bf5e151..2e620b1 100644
--- a/binfilter/bf_sch/source/core/sch_memchrt.cxx
+++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx
@@ -26,13 +26,6 @@
  *
  /
 
-#ifndef _STREAM_HXX
-// enable stream operators >>/<< for UniString (8 Bit !)
-//#ifndef ENABLE_STRING_STREAM_OPERATORS
-//#define ENABLE_STRING_STREAM_OPERATORS
-//#endif
-#endif
-
 #ifndef _ZFORLIST_HXX //autogen
 #ifndef _ZFORLIST_DECLARE_TABLE
 #define _ZFORLIST_DECLARE_TABLE
@@ -586,12 +579,6 @@ namespace binfilter {
 /*N*/   return rIn;
 /*N*/ }
 
-/*
-|*
-|* QuickSort ueber Spalten
-|*
-\/
-
 
 /*
 |*
@@ -610,12 +597,6 @@ namespace binfilter {
 /*N*/   pRowNumFmtId[i]=-1;
 /*N*/ }
 
-/*
-|*
-|* QuickSort ueber Spalten
-|*
-\/
-
 
 /*
 |*
@@ -914,10 +895,7 @@ using namespace ::com::sun::star;
 /*?*/ bool bNeedsQuoting = bNeedsEscaping || ( 
aIter->msTableName.indexOf( aSpace ) > -1 );
 /*?*/
 /*?*/ // quote ta

[Libreoffice-commits] .: sc/source

2011-10-04 Thread Kohei Yoshida 
 sc/source/filter/excel/xehelper.cxx |  120 
 1 file changed, 41 insertions(+), 79 deletions(-)

New commits:
commit 0e1de41755fd3e9f9e1c42edb7285e64aff07218
Author: Kohei Yoshida 
Date:   Tue Oct 4 21:59:17 2011 -0400

bnc#719887: Encode virtual paths to local volume correctly.

When exporting to xls, we weren't encoding the so-called virtual paths
(used for recording external workbook paths etc) correctly when the
external docs were located under the same drive as the referencing doc.
This patch fixes this.

diff --git a/sc/source/filter/excel/xehelper.cxx 
b/sc/source/filter/excel/xehelper.cxx
index f36d318..f6f4821 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -902,106 +902,67 @@ void XclExpHFConverter::AppendPortion( const 
EditTextObject* pTextObj, sal_Unico
 
 namespace {
 
-/** Converts the file URL passed in rUrl to a URL in DOS notation (local or 
UNC).
-@param rUrl  (in/out-param) In: URL to convert; Out: Converted URL in DOS 
notation.
-@param rBasePath  Base path for relative URLs.
-@param bSaveRelUrl  Converts to a relative URL, using rBasePath.
-@return  True = Conversion successful, rUrl contains converted file URL. */
-bool lclConvertToDos( String& rUrl, const String& rBasePath, bool bSaveRelUrl )
-{
-String aDosUrl( INetURLObject( rUrl ).getFSysPath( INetURLObject::FSYS_DOS 
) );
-bool bRet = (aDosUrl.Len() > 0);
-if( bRet && bSaveRelUrl )
-{
-// try to convert to relative path
-String aDosBase( INetURLObject( rBasePath ).getFSysPath( 
INetURLObject::FSYS_DOS ) );
-if( aDosBase.Len() )
-{
-xub_StrLen nPos;
-
-// --- 1st step: delete equal subdirectories ---
-
-// special handling for UNC
-xub_StrLen nStartSearch = aDosBase.EqualsAscii( "", 0, 2 ) ? 2 
: 0;
-bool bEqualBase = false;
-bool bLoop = true;
-while( bLoop && ((nPos = aDosBase.Search( '\\', nStartSearch )) != 
STRING_NOTFOUND) )
-{
-bLoop = (sal_True == aDosBase.Equals( aDosUrl, 0, nPos + 1 ));
-if( bLoop )
-{
-aDosBase.Erase( 0, nPos + 1 );
-aDosUrl.Erase( 0, nPos + 1 );
-nStartSearch = 0;
-bEqualBase = true;
-}
-}
-
-// --- 2nd step: add parent directory levels ---
-
-if( bEqualBase )
-{
-while( (nPos = aDosBase.Search( '\\' )) != STRING_NOTFOUND )
-{
-aDosBase.Erase( 0, nPos + 1 );
-aDosUrl.InsertAscii( "..\\", 0 );
-}
-}
-}
-rUrl = aDosUrl;
-}
-return bRet;
-}
-
 /** Encodes special parts of the URL, i.e. directory separators and volume 
names.
 @param pTableName  Pointer to a table name to be encoded in this URL, or 
0. */
-void lclEncodeDosUrl( XclBiff eBiff, String& rUrl, const rtl::OUString* 
pTableName = 0 )
+rtl::OUString lclEncodeDosUrl(
+XclBiff eBiff, const rtl::OUString& rUrl, const rtl::OUString& rBase, 
const rtl::OUString* pTableName)
 {
-if( rUrl.Len() )
+rtl::OUStringBuffer aBuf;
+
+if (!rUrl.isEmpty())
 {
-String aOldUrl( rUrl );
-rUrl = EXC_URLSTART_ENCODED;
+rtl::OUString aOldUrl = rUrl;
+aBuf.append(EXC_URLSTART_ENCODED);
 
-if( (aOldUrl.Len() > 2) && aOldUrl.EqualsAscii( "", 0, 2 ) )
+if (aOldUrl.getLength() > 2 && aOldUrl.copy(0,2).equalsAscii(""))
 {
 // UNC
-rUrl.Append( EXC_URL_DOSDRIVE ).Append( '@' );
-aOldUrl.Erase( 0, 2 );
+aBuf.append(EXC_URL_DOSDRIVE).append(sal_Unicode('@'));
+aOldUrl = aOldUrl.copy(2);
 }
-else if( (aOldUrl.Len() > 2) && aOldUrl.EqualsAscii( ":\\", 1, 2 ) )
+else if (aOldUrl.getLength() > 2 && 
aOldUrl.copy(1,2).equalsAscii(":\\"))
 {
 // drive letter
-rUrl.Append( EXC_URL_DOSDRIVE ).Append( aOldUrl.GetChar( 0 ) );
-aOldUrl.Erase( 0, 3 );
+sal_Unicode cThisDrive = rBase.isEmpty() ? ' ' : rBase.getStr()[0];
+sal_Unicode cDrive = aOldUrl.getStr()[0];
+if (cThisDrive == cDrive)
+// This document and the referenced document are under the 
same drive.
+aBuf.append(EXC_URL_DRIVEROOT);
+else
+aBuf.append(EXC_URL_DOSDRIVE).append(cDrive);
+aOldUrl = aOldUrl.copy(3);
 }
 
 // directories
-xub_StrLen nPos;
-while( (nPos = aOldUrl.Search( '\\' )) != STRING_NOTFOUND )
+sal_Int32 nPos = -1;
+while((nPos = aOldUrl.indexOf('\\')) != -1)
 {
-if( aOldUrl.EqualsAscii( "..", 0, 2 ) )
-rUrl.Append( EXC_URL_PARENTDIR );

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

2011-10-04 Thread Bjoern Michaelsen 
 solenv/gbuild/Module.mk|2 +-
 solenv/inc/gbuildbridge.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 74feb347fd5a0267f774f76968f8f3403421b17f
Author: Bjoern Michaelsen 
Date:   Wed Oct 5 03:28:53 2011 +0200

fix gb_PARTIALBUILD usage

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 912..82da041 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -113,7 +113,7 @@ check : unitcheck
$(call gb_Output_announce_bell)

 
-ifeq ($(strip$(gb_PARTIALBUILD)),)
+ifeq ($(strip $(gb_PARTIALBUILD)),)
 check : subsequentcheck
 endif
 
diff --git a/solenv/inc/gbuildbridge.mk b/solenv/inc/gbuildbridge.mk
index 4c54958..e62e1a2 100644
--- a/solenv/inc/gbuildbridge.mk
+++ b/solenv/inc/gbuildbridge.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) 
$(gb_MAKETARGET)
+cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) 
$(gb_MAKETARGET) gb_PARTIALBUILD=T
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-10-04 Thread Bjoern Michaelsen 
 solenv/gbuild/Module.mk |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 04280a3788ebff10992ac54be8cd5e8cf93d9146
Author: Bjoern Michaelsen 
Date:   Wed Oct 5 03:24:33 2011 +0200

OOO_SUBSEQUENT_TESTS is gone

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index cac27a4..912 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -84,11 +84,6 @@ $(call gb_Module_get_target,%) :
 
 all : build unitcheck
 
-# compatibility with the old build system
-ifneq ($(strip $(OOO_SUBSEQUENT_TESTS)),)
-.DEFAULT_GOAL := subsequentcheck
-endif
-
 build : 
$(call gb_Output_announce,top level modules: $(foreach 
module,$(filter-out deliverlog,$^),$(notdir $(module))),$(true),ALL,6)
$(call gb_Output_announce,loaded modules: $(sort 
$(gb_Module_ALLMODULES)),$(true),ALL,6)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-10-04 Thread Bjoern Michaelsen 
 solenv/gbuild/RdbTarget.mk |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 8412974348794d6ab1419baecbaae51c2e15d5c7
Author: Bjoern Michaelsen 
Date:   Wed Oct 5 02:52:45 2011 +0200

split records for awks little brain (also improve readability)

diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
index 5ced7ed..fa9ab78 100644
--- a/solenv/gbuild/RdbTarget.mk
+++ b/solenv/gbuild/RdbTarget.mk
@@ -34,8 +34,13 @@ $(call gb_RdbTarget_get_target,%) :
mkdir -p $(dir $@) && \
echo 'http://openoffice.org/2010/uno-components";>' > $@ && \
$(gb_AWK) -- \
-   '/^<\?xml version.*/ { next; } \
-   { gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, 
"vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); 
gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, 
"vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); print; }' \
+   ' BEGIN { RS=">"; } \
+   /^<\?xml version.*/ { next; } \
+   /.*[^\r\n\t\s].*/ { \
+   
gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, 
"vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); \
+   
gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, 
"vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); \
+   print $$0 ">"; \
+   }' \
$(foreach component,$(COMPONENTS),$(call 
gb_ComponentTarget_get_target,$(component))) \
$(foreach component,$(OLD_COMPONENTS),$(call 
gb_RdbTarget__get_old_component_target,$(component))) \
>> $@ && \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile.in solenv/bin

2011-10-04 Thread Stephan Bergmann 
 Makefile.in |1 -
 solenv/bin/install-gdb-printers |   16 ++--
 solenv/bin/linkoo   |2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 23af3341322143f2edde5a6c6668294c915c3ae5
Author: Stephan Bergmann 
Date:   Tue Oct 4 23:32:39 2011 +0200

Some fixes for linkoo and install-gdb-printers.

- Adapted linkoo's link_gdb_py to libs moved from basis to brand layer.
- Fixed install-gdb-printers's handling of Mac OS X ".dylib" suffix.
- No need to call install-gdb-printers from top-level make dev-install;
  linkoo's link_gdb_py already does that.

diff --git a/Makefile.in b/Makefile.in
index 2b5eb5c..b7fd5f5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,6 @@ dev-install: build
 ln -s "$$SOLARVER/$$INPATH"/installation/opt/ \
 "@abs_builddir@"/install && \
 printf '\n' && \
-install-gdb-printers -L && \
 printf \
 '\nDeveloper installation finished, you can now execute:\n\n' \
 && \
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index b4dcd0d..eaab2e8 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -29,7 +29,11 @@
 GDBDIR="${SOLARENV}/gdb"
 SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib"
 INSTALLDIR="${SOLARVER}/${INPATH}/installation/opt"
-[ "$(uname)" = Darwin ] && INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
+DYLIB=so
+if [ "$(uname)" = Darwin ]; then
+INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
+DYLIB=dylib
+fi
 
 die() {
 echo "$1" >&2
@@ -165,10 +169,10 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
 cp -r "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}"
 fi
 
-make_autoload cppu basis-link/ure-link/lib libuno_cppu.{dylib,so}.3
-make_autoload sal basis-link/ure-link/lib libuno_sal.{dylib,so}.3
-make_autoload svl program libsvllo.{dylib,so}
-make_autoload sw program libswlo.{dylib,so}
-make_autoload tl program libtllo.{dylib,so}
+make_autoload cppu basis-link/ure-link/lib libuno_cppu."$DYLIB".3
+make_autoload sal basis-link/ure-link/lib libuno_sal."$DYLIB".3
+make_autoload svl program libsvllo."$DYLIB"
+make_autoload sw program libswlo."$DYLIB"
+make_autoload tl program libtllo."$DYLIB"
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 5da680c..14b595b 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -374,7 +374,7 @@ sub link_gdb_py()
print STDERR "Warning: missing helpful python debug helpers\n";
 } else {
for my $c (@basis) {
-   do_link ($src, "$OOO_INSTALL/basis-link/program", $c, $c, 1);
+   do_link ($src, "$OOO_INSTALL/program", $c, $c, 1);
}
for my $c (@ure) {
do_link ($src, "$OOO_INSTALL/ure/lib", $c, $c, 1);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libexttextcat/prj

2011-10-04 Thread René Engelhard 
 libexttextcat/prj/d.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d97af2c4aea25c766285259f437e0bf7985bb325
Author: Rene Engelhard 
Date:   Tue Oct 4 21:28:26 2011 +

correctly deliver libexttextcat 3.1.1s headers

diff --git a/libexttextcat/prj/d.lst b/libexttextcat/prj/d.lst
index e52e342..5414254 100644
--- a/libexttextcat/prj/d.lst
+++ b/libexttextcat/prj/d.lst
@@ -3,8 +3,8 @@
 ..\%__SRC%\lib\ilib*.*%_DEST%\lib\ilib*.*
 ..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll
 
-mkdir: %_DEST%\inc\external\libtextcat
-..\%__SRC%\misc\build\libexttextcat-3.1.0\src\*.h 
%_DEST%\inc\external\libtextcat\*.h
+mkdir: %_DEST%\inc\external\libexttextcat
+..\%__SRC%\misc\build\libexttextcat-3.1.1\src\*.h 
%_DEST%\inc\external\libexttextcat\*.h
 
 # data for language guessing
 ..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\pck\*.zip
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: lingucomponent/source

2011-10-04 Thread René Engelhard 
 lingucomponent/source/languageguessing/guess.cxx |2 +-
 lingucomponent/source/languageguessing/guesslang.cxx |2 +-
 lingucomponent/source/languageguessing/simpleguesser.cxx |   10 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 4d6f1ad5ad6cfb633c38a8320fa6227038d504fc
Author: Rene Engelhard 
Date:   Tue Oct 4 22:34:32 2011 +0200

libtextcat -> libexttextcat in #include's

diff --git a/lingucomponent/source/languageguessing/guess.cxx 
b/lingucomponent/source/languageguessing/guess.cxx
index dc0a743..66717cc 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -32,7 +32,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx 
b/lingucomponent/source/languageguessing/guesslang.cxx
index fff3e72..8dfee1e 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -51,7 +51,7 @@
 
 #include 
 
-#include 
+#include 
 
 using namespace ::rtl;
 using namespace ::osl;
diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx 
b/lingucomponent/source/languageguessing/simpleguesser.cxx
index eb6efdb..b4018e4 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.cxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.cxx
@@ -43,11 +43,11 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ooo.lst.in

2011-10-04 Thread René Engelhard 
 ooo.lst.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46f1caf94dece0cfd0b222bc5118f944920f72a6
Author: Rene Engelhard 
Date:   Tue Oct 4 22:14:45 2011 +0200

update ooo.lst.in for new libexttextcat

diff --git a/ooo.lst.in b/ooo.lst.in
index 4ba17d2..5eea4b4 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -3,7 +3,7 @@ http://dev-www.libreoffice.org/src
 63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
 09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
-8dc93ffd48cb80b738075ce37df8f915-libexttextcat-3.1.0.tar.bz2
+33f01c57f92eb6f940b59015c35a4eea-libexttextcat-3.1.1.tar.bz2
 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - libexttextcat/makefile.mk libexttextcat/prj libtextcat/libexttextcat-3.0.1.patch libtextcat/makefile.mk libtextcat/prj lingucomponent/prj lingucomponent/source

2011-10-04 Thread René Engelhard 
 libexttextcat/makefile.mk  |   87 
 libexttextcat/prj/build.lst|3 
 libexttextcat/prj/d.lst|   10 ++
 libtextcat/libexttextcat-3.0.1.patch   |   20 
 libtextcat/makefile.mk |   90 -
 libtextcat/prj/build.lst   |3 
 libtextcat/prj/d.lst   |   10 --
 lingucomponent/prj/build.lst   |2 
 lingucomponent/source/languageguessing/makefile.mk |8 +
 9 files changed, 107 insertions(+), 126 deletions(-)

New commits:
commit d001fb170616df7b6068e66e9f9a573ed33b8445
Author: Rene Engelhard 
Date:   Tue Oct 4 14:37:36 2011 +

update LIBTEXTCATLIB

diff --git a/lingucomponent/source/languageguessing/makefile.mk 
b/lingucomponent/source/languageguessing/makefile.mk
index 624ccba..b4e5bc9 100644
--- a/lingucomponent/source/languageguessing/makefile.mk
+++ b/lingucomponent/source/languageguessing/makefile.mk
@@ -39,9 +39,13 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Files 
 
 .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)$(COM)"=="WNTGCC"
-LIBTEXTCATLIB=-ltextcat
+.IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES"
+LIBTEXTCATLIB=$(LIBEXTTEXTCAT_LIBS)
+.ELSE
+LIBTEXTCATLIB=-lexttextcat
+.ENDIF
 .ELSE   # "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-LIBTEXTCATLIB=ilibtextcat.lib
+LIBTEXTCATLIB=ilibexttextcat.lib
 .ENDIF  # "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
 
 SLOFILES = \
commit 816c7a28a0a8bf464111812c61ffda120d0f769b
Author: Rene Engelhard 
Date:   Tue Oct 4 13:43:05 2011 +

update to libexttextcat 3.1.1

diff --git a/libexttextcat/makefile.mk b/libexttextcat/makefile.mk
new file mode 100644
index 000..ce607a3
--- /dev/null
+++ b/libexttextcat/makefile.mk
@@ -0,0 +1,87 @@
+#*
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# 
+# for a copy of the LGPLv3 License.
+#
+#*
+
+PRJ=.
+
+PRJNAME=libexttextcat
+TARGET=libexttextcat
+
+.IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES"
+all:
+@echo "An already available installation of libexttextcat should exist 
on your system."
+@echo "Therefore the version provided here does not need to be built 
in addition."
+.ENDIF
+
+# --- Settings -
+
+.INCLUDE : settings.mk
+
+# --- Files 
+
+# See http://cgit.freedesktop.org/libreoffice/libexttextcat/ for upstream
+# sources, far better to commit your changes in there
+TARFILE_NAME=libexttextcat-3.1.1
+TARFILE_MD5=33f01c57f92eb6f940b59015c35a4eea
+TARFILE_ROOTDIR=libexttextcat-3.1.1
+
+.IF "$(GUI)"=="UNX"
+#relative to CONFIGURE_DIR
+CONFIGURE_ACTION=configure --disable-shared --with-pic CFLAGS="$(ARCH_FLAGS) 
$(EXTRA_CFLAGS)"
+CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
+.IF "$(OS)"=="AIX"
+CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
+.ENDIF
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
+BUILD_ACTION=make
+
+OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libexttextcat.a
+
+.ENDIF # "$(GUI)"=="UNX"
+
+
+.IF "$(GUI)"=="WNT"
+BUILD_ACTION=cd src && dmake $(MAKEMACROS)
+.ENDIF # "$(GUI)"=="WNT"
+
+ALLTAR: $(BIN)/fingerprint.zip
+
+# --- Targets --
+
+.INCLUDE : set_ext.mk
+.INCLUDE : tg_ext.mk
+.INCLUDE : target.mk
+
+$(BIN)/fingerprint.zip: $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
+   @-rm -f $@
+   @echo creating ../../../../../$@
+   $(COMMAND_ECHO)zip -j $(ZIP_VERBOSITY) $@ 
$(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/fpdb.conf
+   $(COMMAND_ECHO)find $(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/LM \
+   -name "*.lm" -print0 | \
+xargs -0 zip -j $(ZIP_VERBOSITY) $@
diff --git a/libexttextcat/prj/build.lst b/libexttextca

[Libreoffice-commits] .: sc/qa

2011-10-04 Thread Markus Mohrhard 
 sc/qa/unit/helper/csv_handler.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b9801b50e1dbd634d9a081c2f278c27fce296e7
Author: Markus Mohrhard 
Date:   Tue Oct 4 20:38:45 2011 +0200

SCCOl is 16 bit too

diff --git a/sc/qa/unit/helper/csv_handler.hxx 
b/sc/qa/unit/helper/csv_handler.hxx
index da18787..8b525d4 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -57,7 +57,7 @@ rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB 
nTab)
 rtl::OStringBuffer aString("Error in Table: ");
 aString.append(static_cast(nTab));
 aString.append(" Column: ");
-aString.append(nCol);
+aString.append(static_cast(nCol));
 aString.append(" Row: ");
 aString.append(nRow);
 return aString.makeStringAndClear();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/qa

2011-10-04 Thread Markus Mohrhard 
 sc/qa/unit/helper/csv_handler.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e9e67382f6d7a26c9b059416630caf0a84530370
Author: Markus Mohrhard 
Date:   Tue Oct 4 20:18:40 2011 +0200

mac tinderbox can't deal with rtl::OStringBuffer::append(sal_Int16)

diff --git a/sc/qa/unit/helper/csv_handler.hxx 
b/sc/qa/unit/helper/csv_handler.hxx
index c3e9313..da18787 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -55,7 +55,7 @@ rtl::OUString getConditionalFormatString(ScDocument* pDoc, 
SCCOL nCol, SCROW nRo
 rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab)
 {
 rtl::OStringBuffer aString("Error in Table: ");
-aString.append(nTab);
+aString.append(static_cast(nTab));
 aString.append(" Column: ");
 aString.append(nCol);
 aString.append(" Row: ");
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/qa

2011-10-04 Thread Markus Mohrhard 
 sc/qa/unit/helper/csv_handler.hxx |   42 ++
 1 file changed, 38 insertions(+), 4 deletions(-)

New commits:
commit 976f08098ee99499cea6a61787e7da834cfc50bb
Author: Markus Mohrhard 
Date:   Tue Oct 4 19:21:45 2011 +0200

improve error message for csv_handler

diff --git a/sc/qa/unit/helper/csv_handler.hxx 
b/sc/qa/unit/helper/csv_handler.hxx
index dce26e6..c3e9313 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -52,6 +52,40 @@ rtl::OUString getConditionalFormatString(ScDocument* pDoc, 
SCCOL nCol, SCROW nRo
 return rtl::OUString(aString);
 }
 
+rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab)
+{
+rtl::OStringBuffer aString("Error in Table: ");
+aString.append(nTab);
+aString.append(" Column: ");
+aString.append(nCol);
+aString.append(" Row: ");
+aString.append(nRow);
+return aString.makeStringAndClear();
+}
+
+rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, const 
rtl::OUString& rExpectedString, const rtl::OUString& rString)
+{
+rtl::OStringBuffer aString(createErrorMessage(nCol, nRow, nTab));
+aString.append("; Expected: '");
+aString.append(rtl::OUStringToOString(rExpectedString, 
RTL_TEXTENCODING_UTF8));
+aString.append("' Found: '");
+aString.append(rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
+aString.append("'");
+return aString.makeStringAndClear();
+}
+
+rtl::OString createErrorMessage(SCCOL nCol, SCROW nRow, SCTAB nTab, double 
aExpected, double aValue)
+{
+rtl::OStringBuffer aString(createErrorMessage(nCol, nRow, nTab));
+aString.append("; Expected: '");
+aString.append(aExpected);
+aString.append("' Found: '");
+aString.append(aValue);
+aString.append("'");
+return aString.makeStringAndClear();
+
+}
+
 }
 
 enum StringType { PureString, FormulaValue, StringValue };
@@ -97,7 +131,7 @@ public:
 std::cout << "result: " << (int)(aCSVString == aString) << 
std::endl;
 #endif //DEBUG_CSV_HANDLER
 
-CPPUNIT_ASSERT_MESSAGE("content is not correct in cell", aString 
== aCSVString);
+CPPUNIT_ASSERT_MESSAGE(createErrorMessage(mnCol, mnRow, mnTab, 
aCSVString, aString).getStr(), aString == aCSVString);
 }
 else
 {
@@ -125,7 +159,7 @@ public:
 std::cout << "result: " << (int)(aCSVString == aString) << 
std::endl;
 #endif //DEBUG_CSV_HANDLER
 
-CPPUNIT_ASSERT_MESSAGE("content is not correct in cell", 
aString == aCSVString);
+CPPUNIT_ASSERT_MESSAGE(createErrorMessage(mnCol, mnRow, mnTab, 
aCSVString, aString).getStr(), aString == aCSVString);
 }
 else
 {
@@ -136,7 +170,7 @@ public:
 std::cout << "CSVValue: " << nValue << std::endl;
 std::cout << "result: " << (int)(aValue == nValue) << 
std::endl;
 #endif //DEBUG_CSV_HANDLER
-CPPUNIT_ASSERT_MESSAGE("content is not correct in cell", 
aValue == nValue);
+CPPUNIT_ASSERT_MESSAGE(createErrorMessage(mnCol, mnRow, mnTab, 
nValue, aValue).getStr(), aValue == nValue);
 }
 }
 ++mnCol;
@@ -185,7 +219,7 @@ public:
 std::cout << "CSVString: " << rtl::OUStringToOString(aCSVString, 
RTL_TEXTENCODING_UTF8).getStr() << std::endl;
 std::cout << "result: " << (int)(aCSVString == aString) << std::endl;
 #endif //DEBUG_CSV_HANDLER
-CPPUNIT_ASSERT_MESSAGE("", aString == aCSVString );
+CPPUNIT_ASSERT_MESSAGE(createErrorMessage(mnCol, mnRow, mnTab, 
aCSVString, aString).getStr(), aString == aCSVString );
 ++mnCol;
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 11 commits - hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk hwpfilter/Module_hwpfilter.mk hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk i18npool/CppunitTest_i18npool_test

2011-10-04 Thread Bjoern Michaelsen 
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk  |   11 -
 hwpfilter/Module_hwpfilter.mk  |1 
 hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk|   44 
 i18npool/CppunitTest_i18npool_test_breakiterator.mk|6 
 i18npool/Module_i18npool.mk|1 
 i18npool/RdbTarget_i18npool_test_breakiterator.mk  |   35 +++
 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk |6 
 lotuswordpro/Module_lotuswordpro.mk|1 
 lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk   |   39 +++
 sc/CppunitTest_sc_filters_test.mk  |  106 +
 sc/CppunitTest_sc_test_filters.mk  |  139 -
 sc/CppunitTest_sc_ucalc.mk |   14 -
 sc/Module_sc.mk|4 
 sc/RdbTarget_sc_filters_test.mk|   64 +
 sc/RdbTarget_sc_ucalc.mk   |   46 
 sd/CppunitTest_sd_uimpress.mk  |7 
 sd/Module_sd.mk|1 
 sd/RdbTarget_sd_uimpress.mk|   36 +++
 solenv/gbuild/RdbTarget.mk |4 
 starmath/CppunitTest_starmath_qa_cppunit.mk|   22 --
 starmath/Module_starmath.mk|6 
 starmath/RdbTarget_starmath_qa_cppunit.mk  |   51 
 sw/CppunitTest_sw_filters_test.mk  |   94 
 sw/CppunitTest_sw_swdoc_test.mk|   16 -
 sw/CppunitTest_sw_test_filters.mk  |  116 --
 sw/Module_sw.mk|4 
 sw/RdbTarget_sw_filters_test.mk|   53 
 sw/RdbTarget_sw_swdoc_test.mk  |   47 
 writerfilter/CppunitTest_writerfilter_rtftok.mk|   11 -
 writerfilter/Module_writerfilter.mk|1 
 writerfilter/RdbTarget_writerfilter_rtftok.mk  |   42 +++
 31 files changed, 678 insertions(+), 350 deletions(-)

New commits:
commit 266598b810b5325bf8948c01c78438210d21b49e
Author: Bjoern Michaelsen 
Date:   Tue Oct 4 18:33:36 2011 +0200

adapt i18npool unittests to separate RdbTarget makefile requirement

diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk 
b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index 28a8c39..5be23d7 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -63,12 +63,6 @@ $(eval $(call 
gb_CppunitTest_set_args,i18npool_test_breakiterator,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector 
\
 ))
 
-$(eval $(call gb_RdbTarget_RdbTarget,i18npool_test_breakiterator))
-
-$(eval $(call gb_RdbTarget_add_components,i18npool_test_breakiterator,\
-   i18npool/util/i18npool \
-))
-
 $(call gb_CppunitTest_get_target,i18npool_test_breakiterator) : $(call 
gb_Module_get_target,i18npool)
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index 022e85f..8b6947b 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -59,6 +59,7 @@ endif
 
 $(eval $(call gb_Module_add_check_targets,i18npool,\
CppunitTest_i18npool_test_breakiterator \
+   RdbTarget_i18npool_test_breakiterator \
 ))
 
 ifeq ($(OS),IOS)
diff --git a/i18npool/RdbTarget_i18npool_test_breakiterator.mk 
b/i18npool/RdbTarget_i18npool_test_breakiterator.mk
new file mode 100644
index 000..994e08e
--- /dev/null
+++ b/i18npool/RdbTarget_i18npool_test_breakiterator.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#   Matúš Kukan 
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the G

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

2011-10-04 Thread Tor Lillqvist 
 connectivity/inc/connectivity/sqlparse.hxx |   13 -
 connectivity/source/drivers/ado/AStatement.cxx |2 ++
 connectivity/source/parse/sqlnode.cxx  |   13 -
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 1967376c7b3072fefb6f74566cfa70fd03b9bd04
Author: Tor Lillqvist 
Date:   Tue Oct 4 18:51:00 2011 +0300

WaE: deletion of pointer to incomplete type; no destructor called

Move the struct OSQLParser_Data definition to the sqlparse.hxx
header. A somewhat ugly workaround for warning C4150: deletion of
pointer to incomplete type 'connectivity::OSQLParser_Data'; no
destructor called.

diff --git a/connectivity/inc/connectivity/sqlparse.hxx 
b/connectivity/inc/connectivity/sqlparse.hxx
index 1d7f128..8339d20 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -44,6 +44,7 @@
 #include 
 #include "connectivity/IParseContext.hxx"
 #include "connectivity/dbtoolsdllapi.hxx"
+#include "connectivity/sqlerror.hxx"
 #include 
 #include 
 
@@ -127,7 +128,17 @@ namespace connectivity
 
//==
 //= OSQLParser
 
//==
-struct OSQLParser_Data;
+struct OSQLParser_Data
+{
+::com::sun::star::lang::Locale  aLocale;
+::connectivity::SQLErroraErrors;
+
+OSQLParser_Data( const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory )
+:aErrors( _xServiceFactory )
+{
+}
+};
+
 /** Parser for SQL92
 */
 class OOO_DLLPUBLIC_DBTOOLS OSQLParser
diff --git a/connectivity/source/parse/sqlnode.cxx 
b/connectivity/source/parse/sqlnode.cxx
index 599128d..f978900 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -68,7 +68,6 @@
 #include 
 #include "connectivity/dbtools.hxx"
 #include "connectivity/dbmetadata.hxx"
-#include "connectivity/sqlerror.hxx"
 #include 
 #include 
 #include 
@@ -154,18 +153,6 @@ namespace connectivity
 {
 
 //=
-struct OSQLParser_Data
-{
-::com::sun::star::lang::Locale  aLocale;
-::connectivity::SQLErroraErrors;
-
-OSQLParser_Data( const Reference< XMultiServiceFactory >& _xServiceFactory 
)
-:aErrors( _xServiceFactory )
-{
-}
-};
-
-//=
 //= SQLParseNodeParameter
 //=
 //-
commit 67a565eabf3dcbf7a76dd4a6b9ab139274fa3da7
Author: Tor Lillqvist 
Date:   Tue Oct 4 18:43:23 2011 +0300

WaE: unreachable code

diff --git a/connectivity/source/drivers/ado/AStatement.cxx 
b/connectivity/source/drivers/ado/AStatement.cxx
index 2ea1cb5..8548bd2 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -521,6 +521,7 @@ sal_Int32 OStatement_Base::getMaxRows() const 
throw(SQLException, RuntimeExcepti
 sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, 
RuntimeException)
 {
 return m_eLockType;
+#if 0 // Huh?
 sal_Int32 nValue=0;
 switch(m_eLockType)
 {
@@ -533,6 +534,7 @@ sal_Int32 OStatement_Base::getResultSetConcurrency() const 
throw(SQLException, R
 }
 
 return nValue;
+#endif
 }
 
//--
 sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, 
RuntimeException)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

2011-10-04 Thread Tor Lillqvist 
 ucb/source/cacher/cachedcontentresultset.cxx  |2 +-
 ucb/source/cacher/contentresultsetwrapper.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 73a038df3769f5c6776dcd8f4e36d6d0165b8554
Author: Tor Lillqvist 
Date:   Tue Oct 4 17:19:36 2011 +0300

WaE: unreferenced local variable

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx 
b/ucb/source/cacher/cachedcontentresultset.cxx
index 6a296c4..c26eed6 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -792,7 +792,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 return bValid;
 }
 }
-catch (const SQLException& rEx)
+catch (const SQLException&)
 {
 if( !bAfterLastApplied && !bAfterLast && nRow > nLastAppliedPos && 
impl_isForwardOnly() )
 {
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx 
b/ucb/source/cacher/contentresultsetwrapper.cxx
index fbed827..326ade7 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -613,7 +613,7 @@ void SAL_CALL ContentResultSetWrapper
 m_xPropertySetOrigin->addPropertyChangeListener(
 OUString(), static_cast< XPropertyChangeListener * >( 
m_pMyListenerImpl ) );
 }
-catch( Exception& rEx )
+catch( Exception& )
 {
 m_pPropertyChangeListeners->removeInterface( aPropertyName, 
xListener );
 throw;
@@ -664,7 +664,7 @@ void SAL_CALL ContentResultSetWrapper
 m_xPropertySetOrigin->addVetoableChangeListener(
 OUString(), static_cast< XVetoableChangeListener * >( 
m_pMyListenerImpl ) );
 }
-catch( Exception& rEx )
+catch( Exception& )
 {
 m_pVetoableChangeListeners->removeInterface( rPropertyName, 
xListener );
 throw;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sdext/source svx/inc svx/source unusedcode.easy

2011-10-04 Thread Caolán McNamara 
 sdext/source/pdfimport/tree/treevisiting.hxx |2 +-
 svx/inc/galbrws2.hxx |1 -
 svx/source/gallery2/galbrws2.cxx |   12 
 unusedcode.easy  |7 ---
 4 files changed, 1 insertion(+), 21 deletions(-)

New commits:
commit 9c28c7d66b10b6008c09da40dae37fcdff3137df
Author: Caolán McNamara 
Date:   Tue Oct 4 15:53:36 2011 +0100

callcatcher: update list

diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 61226b4..31d87b2 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -168,7 +168,6 @@ public:
 INetURLObject   GetURL() const;
 String  GetFilterName() const;
 Graphic GetGraphic() const;
-sal_BoolGetVCDrawModel( FmFormModel& rModel ) const;
 sal_BoolIsLinkage() const;
 
 sal_Int8AcceptDrop( DropTargetHelper& rTarget, const 
AcceptDropEvent& rEvt );
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 9c1ba48..693b907 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1197,18 +1197,6 @@ Graphic GalleryBrowser2::GetGraphic() const
 
 // 
-
 
-sal_Bool GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const
-{
-sal_Bool bRet = sal_False;
-
-if( mpCurTheme && mnCurActionPos != 0x )
-bRet = mpCurTheme->GetModel( mnCurActionPos, rModel );
-
-return bRet;
-}
-
-// 
-
-
 sal_Bool GalleryBrowser2::IsLinkage() const
 {
 return mbCurActionIsLinkage;
diff --git a/unusedcode.easy b/unusedcode.easy
index 28ceb2b..8203c75 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -799,7 +799,6 @@ StgCache::Pos2Page(int)
 StgHeader::SetClassId(ClsId const&)
 StorageStream::ValidateMode(unsigned short, StgDirEntry*) const
 SvBorder::SvBorder(Rectangle const&, Rectangle const&)
-SvByteStrings::DeleteAndDestroy(unsigned short, unsigned short)
 SvFileStream::UnlockFile()
 SvI18NMap_Impl::Insert(SvI18NMapEntry_Impl* const&, unsigned short&)
 SvI18NMap_Impl::Insert(SvI18NMapEntry_Impl* const*, unsigned short)
@@ -840,11 +839,6 @@ SvStringsSortDtor::Insert(SvStringsSortDtor const*, 
unsigned short, unsigned sho
 SvStringsSortDtor::Remove(String* const&, unsigned short)
 SvStringsSortDtor::Remove(unsigned short, unsigned short)
 SvTabListBox::GetTabJustify(unsigned short) const
-SvULongs::Insert(SvULongs const*, unsigned short, unsigned short, unsigned 
short)
-SvULongs::Remove(unsigned short, unsigned short)
-SvULongs::Replace(unsigned long const&, unsigned short)
-SvULongs::Replace(unsigned long const*, unsigned short, unsigned short)
-SvULongs::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned 
long const&, void*), void*)
 SvUShorts::Insert(SvUShorts const*, unsigned short, unsigned short, unsigned 
short)
 SvUShorts::Replace(unsigned short const&, unsigned short)
 SvUShorts::Replace(unsigned short const*, unsigned short, unsigned short)
@@ -1774,7 +1768,6 @@ binfilter::SvBools::Insert(binfilter::SvBools const*, 
unsigned short, unsigned s
 binfilter::SvBools::Replace(unsigned char const&, unsigned short)
 binfilter::SvBools::Replace(unsigned char const*, unsigned short, unsigned 
short)
 binfilter::SvBools::_ForEach(unsigned short, unsigned short, unsigned char 
(*)(unsigned char const&, void*), void*)
-binfilter::SvByteStrings::DeleteAndDestroy(unsigned short, unsigned short)
 binfilter::SvBytes::Insert(binfilter::SvBytes const*, unsigned short, unsigned 
short, unsigned short)
 binfilter::SvBytes::Replace(unsigned char const&, unsigned short)
 binfilter::SvBytes::Replace(unsigned char const*, unsigned short, unsigned 
short)
commit d7829740dde1150a90cef695ce880bf99ce71d95
Author: Caolán McNamara 
Date:   Tue Oct 4 15:53:22 2011 +0100

keep it simple, original won't compile except on msvc anyway

diff --git a/sdext/source/pdfimport/tree/treevisiting.hxx 
b/sdext/source/pdfimport/tree/treevisiting.hxx
index 73b3f24..2da532e 100644
--- a/sdext/source/pdfimport/tree/treevisiting.hxx
+++ b/sdext/source/pdfimport/tree/treevisiting.hxx
@@ -63,7 +63,7 @@ namespace pdfi
 virtual void visit( ImageElement&, const std::list< Element* 
>::const_iterator&  ) = 0;
 virtual void visit( PageElement&, const std::list< Element* 
>::const_iterator&  ) = 0;
 virtual void visit( DocumentElement&, const std::list< Element* 
>::const_iterator&  ) = 0;
-virtual ~ElementTreeVisitor() = 0 { };
+virtual ~ElementTreeVisitor() {}
 };
 typedef boost::shared_ptr ElementTreeVisitorSharedPtr;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-10-04 Thread Takeshi Abe 
 sw/source/filter/xml/DocSettingNames.hxx |   29 -
 1 file changed, 29 deletions(-)

New commits:
commit aaab2b0e8b381b0f0c5fe46a259dcda0dbbd0397
Author: Takeshi Abe 
Date:   Tue Oct 4 23:44:50 2011 +0900

removed isolated file

diff --git a/sw/source/filter/xml/DocSettingNames.hxx 
b/sw/source/filter/xml/DocSettingNames.hxx
deleted file mode 100644
index 968a334..000
--- a/sw/source/filter/xml/DocSettingNames.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-const char* aNmArr[] = {
-"ForbiddenCharacters" ,
-"IsKernAsianPunctuation" ,
-"CharacterCompressionType" ,
-"LinkUpdateMode" ,
-"FieldAutoUpdate" ,
-"ChartAutoUpdate" ,
-"AddParaTableSpacing" ,
-"AddParaTableSpacingAtStart" ,
-"PrintAnnotationMode" ,
-"PrintBlackFonts" ,
-"PrintControls" ,
-"PrintDrawings" ,
-"PrintGraphics" ,
-"PrintLeftPages" ,
-"PrintPageBackground" ,
-"PrintProspect" ,
-"PrintReversed" ,
-"PrintRightPages" ,
-"PrintFaxName" ,
-"PrintPaperFromSetup" ,
-"PrintTables" ,
-"PrintSingleJobs",
-"UpdateFromTemplate",
-"PrintEmptyPages",
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sch binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw

2011-10-04 Thread Joseph Powers 
 binfilter/bf_sc/source/filter/xml/sc_xmlfonte.cxx |3 
 binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx |2 
 binfilter/bf_sch/source/core/sch_chtmode5.cxx |5 
 binfilter/bf_sch/source/core/sch_chtmode6.cxx |   16 -
 binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx  |2 
 binfilter/bf_starmath/source/starmath_mathml.cxx  |  148 --
 binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx  |2 
 binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx  |   15 -
 binfilter/bf_svx/source/editeng/svx_impedit2.cxx  |   16 -
 binfilter/bf_svx/source/form/svx_fmpage.cxx   |   16 -
 binfilter/bf_svx/source/outliner/svx_outlvw.cxx   |   92 
 binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx|   49 
 binfilter/bf_svx/source/svxlink/svx_fileobj.cxx   |   36 ---
 binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx  |3 
 binfilter/bf_sw/source/core/inc/laycache.hxx  |3 
 binfilter/bf_sw/source/core/inc/tblrwcl.hxx   |3 
 binfilter/bf_sw/source/core/sw3io/sw3imp.hxx  |7 
 binfilter/bf_sw/source/core/text/porlin.hxx   |3 
 binfilter/bf_sw/source/core/text/sw_porlin.cxx|   12 -
 binfilter/bf_sw/source/core/text/sw_txtftn.cxx|3 
 binfilter/bf_sw/source/core/text/txtfly.hxx   |5 
 binfilter/bf_sw/source/ui/inc/edtwin.hxx  |8 
 binfilter/bf_sw/source/ui/uno/SwXDocumentSettings.hxx |2 
 binfilter/bf_sw/source/ui/uno/SwXPrintPreviewSettings.hxx |2 
 24 files changed, 8 insertions(+), 445 deletions(-)

New commits:
commit c4f33e6da3e1370d7fed705594d99a567baea5ea
Author: Joseph Powers 
Date:   Tue Oct 4 07:48:17 2011 -0700

Cleanup the #if a little

diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlfonte.cxx 
b/binfilter/bf_sc/source/filter/xml/sc_xmlfonte.cxx
index 9ef5ae5..f5db657 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlfonte.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlfonte.cxx
@@ -26,9 +26,6 @@
  *
  /
 
-#ifdef PRECOMPILED
-#endif
-
 #ifdef _MSC_VER
 #pragma hdrstop
 #endif
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx 
b/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
index 4408711..a359233 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
@@ -33,8 +33,6 @@
 #include "xmlexprt.hxx"
 #include "xmlimprt.hxx"
 
-/*#ifndef _PROPIMP0_HXX
-#endif*/
 #include "XMLConverter.hxx"
 
 #include 
diff --git a/binfilter/bf_sch/source/core/sch_chtmode5.cxx 
b/binfilter/bf_sch/source/core/sch_chtmode5.cxx
index 3295557..e9dc807 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode5.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode5.cxx
@@ -41,12 +41,8 @@
 #define ITEMID_DOUBLE   0
 #define ITEMID_CHARTTEXTORDER   SCHATTR_TEXT_ORDER
 #define ITEMID_CHARTTEXTORIENT  SCHATTR_TEXT_ORIENT
-
-
 #endif
 
-#ifndef _CHTMODEL_HXX
-#endif
 #include 
 #include 
 #include 
@@ -61,6 +57,7 @@
 #endif
 #include 
 #endif
+
 namespace binfilter {
 
 
diff --git a/binfilter/bf_sch/source/core/sch_chtmode6.cxx 
b/binfilter/bf_sch/source/core/sch_chtmode6.cxx
index afce003..d2d0e6e 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode6.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode6.cxx
@@ -35,11 +35,7 @@
 #define _SDR_NOITEMS
 #define _SDR_NOTOUCH
 #define _SDR_NOTRANSFORM
-//#define _SDR_NOOBJECTS
-//#define _SDR_NOVIEWS ***
 
-//#define SI_NOITEMS
-//#define SI_NODRW
 #define _SI_NOSBXCONTROLS
 #define _SI_NOOTHERFORMS
 #define _SI_NOCONTROL
@@ -47,9 +43,6 @@
 
 #include 
 
-#ifndef _SV_MENU_HXX //autogen
-#endif
-
 #include "schattr.hxx"
 
 #ifndef _SVX_CHRTITEM_HXX //autogen
@@ -71,17 +64,10 @@
 
 #include 
 
-#ifndef _CHTMODEL_HXX
-#endif
-
 #include "docshell.hxx"
 
-
-
-
-
-
 #include 
+
 namespace binfilter {
 
 /*
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx 
b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
index 9482507..849d2f5 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
@@ -1290,10 +1290,8 @@ void SAL_CALL   ChXDiagram::setPropertyValues (
 uno::RuntimeException)
 {
 RTL_LOGFILE_CONTEXT (context2, "sch (af119097) 
::ChXDiagram::setPropertyValues");
-#if 1
 for (sal_Int32 i=0; i & xAttrList )
 {
-#if 1
 aStyleHelper.RetrieveAttrs(xAttrList);
-#else
-sal_Int8 nOldIsBold=nIsBold;
-sal_Int8 nOldIsItalic=nIsItalic;
-double nOldFontSize=nFontSize;
-sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-OUString sOldFontFamily = sFontFamily;
-for (sal_Int16 i=0;igetNameByIndex(i);
-O

[Libreoffice-commits] .: 4 commits - libvisio/libvisio-0.0.7.patch libvisio/libvisio-0.0.8.patch libvisio/makefile.mk libwpg/libwpg-0.2.0.patch libwpg/libwpg-mingw.patch libwpg/makefile.mk ooo.lst.in

2011-10-04 Thread Fridrich Strba 
 libvisio/libvisio-0.0.7.patch|   33 ---
 libvisio/libvisio-0.0.8.patch|   33 +++
 libvisio/makefile.mk |6 ++--
 libwpg/libwpg-0.2.0.patch|   14 ---
 libwpg/libwpg-mingw.patch|   11 -
 libwpg/makefile.mk   |7 +
 ooo.lst.in   |4 +--
 writerperfect/source/filter/OdgGenerator.cxx |   12 +++--
 8 files changed, 44 insertions(+), 76 deletions(-)

New commits:
commit 8f4a14e07ceffc0b86e233c0adb711eafa087ba5
Author: Fridrich Å trba 
Date:   Tue Oct 4 16:45:30 2011 +0200

Uploading release binary of libvisio 0.0.8

diff --git a/libvisio/libvisio-0.0.7.patch b/libvisio/libvisio-0.0.7.patch
deleted file mode 100644
index d8c2209..000
--- a/libvisio/libvisio-0.0.7.patch
+++ /dev/null
@@ -1,33 +0,0 @@
 misc/libvisio-0.0.7/src/lib/libvisio_utils.h
-+++ misc/build/libvisio-0.0.7/src/lib/libvisio_utils.h
-@@ -41,17 +41,8 @@
- 
- #else
- 
--#ifdef HAVE_CONFIG_H
--#include 
--#endif
--
--#ifdef HAVE_STDINT_H
- #include 
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include 
--#endif
- 
- #endif
- 
 misc/libvisio-0.0.7/src/lib/makefile.mk
-+++ misc/build/libvisio-0.0.7/src/lib/makefile.mk
-@@ -37,9 +37,9 @@
-   $(SLO)$/VSDSVGGenerator.obj \
-   $(SLO)$/VSDXCharacterList.obj \
-   $(SLO)$/VSDXCollector.obj \
-+  $(SLO)$/VSDXOutputElementList.obj \
-   $(SLO)$/VSDXContentCollector.obj \
-   $(SLO)$/VSDXGeometryList.obj \
--  $(SLO)$/VSDXOutputElementList.obj \
-   $(SLO)$/VSDXPages.obj \
-   $(SLO)$/VSDXParser.obj \
-   $(SLO)$/VSDXShapeList.obj \
diff --git a/libvisio/libvisio-0.0.8.patch b/libvisio/libvisio-0.0.8.patch
new file mode 100644
index 000..ab138db
--- /dev/null
+++ b/libvisio/libvisio-0.0.8.patch
@@ -0,0 +1,33 @@
+--- misc/libvisio-0.0.8/src/lib/libvisio_utils.h
 misc/build/libvisio-0.0.8/src/lib/libvisio_utils.h
+@@ -41,17 +41,8 @@
+ 
+ #else
+ 
+-#ifdef HAVE_CONFIG_H
+-#include 
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include 
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include 
+-#endif
+ 
+ #endif
+ 
+--- misc/libvisio-0.0.8/src/lib/makefile.mk
 misc/build/libvisio-0.0.8/src/lib/makefile.mk
+@@ -37,9 +37,9 @@
+   $(SLO)$/VSDSVGGenerator.obj \
+   $(SLO)$/VSDXCharacterList.obj \
+   $(SLO)$/VSDXCollector.obj \
++  $(SLO)$/VSDXOutputElementList.obj \
+   $(SLO)$/VSDXContentCollector.obj \
+   $(SLO)$/VSDXGeometryList.obj \
+-  $(SLO)$/VSDXOutputElementList.obj \
+   $(SLO)$/VSDXPages.obj \
+   $(SLO)$/VSDXParser.obj \
+   $(SLO)$/VSDXShapeList.obj \
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index ba46253..ce39d64 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -54,11 +54,11 @@ INCPRE+=$(LIBWPG_CFLAGS)
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
 .ENDIF
 
-TARFILE_NAME=libvisio-0.0.7
-TARFILE_MD5=cfb4259665fa96874deaa1b233d0b9c2
+TARFILE_NAME=libvisio-0.0.8
+TARFILE_MD5=3c9c6cba49387e9b8e2bced5f2eba4e3
 
 PATCH_FILES=\
-libvisio-0.0.7.patch
+libvisio-0.0.8.patch
 
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
diff --git a/ooo.lst.in b/ooo.lst.in
index 4b62e3e..4ba17d2 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -88,7 +88,7 @@ d6447e3ae278800c58ae40b740c861c0-libwpd-0.9.3.tar.bz2
 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
-cfb4259665fa96874deaa1b233d0b9c2-libvisio-0.0.7.tar.bz2
+3c9c6cba49387e9b8e2bced5f2eba4e3-libvisio-0.0.8.tar.bz2
 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip
 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
 @GOOGLE_DOCS_EXTENSION_PACK@
commit f4e71b5aa2b40aa76946a8f93c1d20a0a87ec439
Author: Fridrich Å trba 
Date:   Tue Oct 4 16:25:45 2011 +0200

Uploading release binary of libwpg 0.2.1

diff --git a/libwpg/libwpg-0.2.0.patch b/libwpg/libwpg-0.2.0.patch
deleted file mode 100644
index 86567b1..000
--- a/libwpg/libwpg-0.2.0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
 misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp
-+++ misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp
-@@ -30,7 +30,11 @@
- {
-   std::ostringstream tempStream;
-   tempStream << value;
-+#ifndef __ANDROID__
-   std::string decimalPoint(localeconv()->decimal_point);
-+#else
-+  std::string decimalPoint(".");
-+#endif
-   if ((decimalPoint.size() == 0) || (decimalPoint == "."))
- return tempStream.str();
-   std::string stringValue(tempStream.str());
diff --git a/libwpg/libwpg-mingw.patch b/libwpg/libwpg-mingw.patch
deleted file mode 100644
index 45b8d68..000
--- a/libwpg/libwpg-mingw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 misc/build/libwpg-0.2.0/src/lib/makefile.mk.orig   2011-08-22 
07:21:59.0 +0200
-+++ misc/build/libwpg-0.2.0/src/lib/makefile.mk2011-08-22 
07:22:08.0 +0

[Libreoffice-commits] .: binfilter/bf_sch binfilter/inc

2011-10-04 Thread Caolán McNamara 
 binfilter/bf_sch/source/core/sch_chtmode3.cxx |8 +---
 binfilter/inc/bf_sch/axisid.hxx   |2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 6b3760f186b3219ae8ee2940c2fdf0e01d219227
Author: Caolán McNamara 
Date:   Tue Oct 4 15:32:59 2011 +0100

WaE: new warnings

diff --git a/binfilter/bf_sch/source/core/sch_chtmode3.cxx 
b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
index f21efa6..272021c 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode3.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
@@ -256,7 +256,7 @@ namespace binfilter {
 /*N*/   PutDataRowAttr(nCnt,rAttr,bMerge,bClearPoints);
 /*N*/ }
 
-/*N*/ void ChartModel::PutDataRowAttr(long nRow, const SfxItemSet& rAttr,BOOL 
bMerge,BOOL bClearPoints)
+/*N*/ void ChartModel::PutDataRowAttr(long nRow, const SfxItemSet& rAttr,BOOL 
bMerge, BOOL /*bClearPoints*/)
 /*N*/ {
 /*N*/
 /*N*/   CHART_TRACE1( "ChartModel::PutDataRowAttr %smerge", bMerge? "": "NO " 
);
@@ -893,7 +893,6 @@ namespace binfilter {
 /*N*/
 /*N*/   SchObjectId* pObjId = GetObjectId( *pObj );
 /*N*/
-/*N*/   SfxItemSet *pItemSet = NULL;
 /*N*/   String* pStrToChange = NULL;
 /*N*/
 /*N*/   if( pTextObject )
@@ -908,23 +907,18 @@ namespace binfilter {
 /*N*/   switch( nId )
 /*N*/   {
 /*N*/   case CHOBJID_DIAGRAM_TITLE_X_AXIS:
-/*N*/   pItemSet = pXAxisTitleAttr;
 /*N*/   pStrToChange = &aXAxisTitle;
 /*N*/   break;
 /*N*/   case CHOBJID_DIAGRAM_TITLE_Y_AXIS:
-/*N*/   pItemSet = pYAxisTitleAttr;
 /*N*/   pStrToChange = &aYAxisTitle;
 /*N*/   break;
 /*N*/   case CHOBJID_DIAGRAM_TITLE_Z_AXIS:
-/*N*/   pItemSet = pZAxisTitleAttr;
 /*N*/   pStrToChange = &aZAxisTitle;
 /*N*/   break;
 /*N*/   case CHOBJID_TITLE_MAIN:
-/*N*/   pItemSet = pMainTitleAttr;
 /*N*/   pStrToChange = &aMainTitle;
 /*N*/   break;
 /*N*/   case CHOBJID_TITLE_SUB:
-/*N*/   pItemSet = pSubTitleAttr;
 /*N*/   pStrToChange = &aSubTitle;
 /*N*/   break;
 /*N*/   }
diff --git a/binfilter/inc/bf_sch/axisid.hxx b/binfilter/inc/bf_sch/axisid.hxx
index 93f94cc..764907c 100644
--- a/binfilter/inc/bf_sch/axisid.hxx
+++ b/binfilter/inc/bf_sch/axisid.hxx
@@ -52,7 +52,7 @@ public:
 SchAxisId ();
 SchAxisId (long nId);
 
-virtual SdrObjUserData* Clone(SdrObject *pObj) const { return NULL; } // 
DBG_BF_ASSERT
+virtual SdrObjUserData* Clone(SdrObject *) const { return NULL; } // 
DBG_BF_ASSERT
 
 virtual void WriteData(SvStream& ) {}
 virtual void ReadData(SvStream& rIn);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-04 Thread Tor Lillqvist 
 sdext/source/pdfimport/tree/treevisiting.hxx|1 +
 sdext/source/presenter/PresenterBitmapContainer.cxx |1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1e085b43c14c8c67f3c46905eb1a8a528b900e59
Author: Tor Lillqvist 
Date:   Tue Oct 4 16:27:13 2011 +0300

WaE: class has virtual functions, but destructor is not virtual

diff --git a/sdext/source/pdfimport/tree/treevisiting.hxx 
b/sdext/source/pdfimport/tree/treevisiting.hxx
index b62340a..73b3f24 100644
--- a/sdext/source/pdfimport/tree/treevisiting.hxx
+++ b/sdext/source/pdfimport/tree/treevisiting.hxx
@@ -63,6 +63,7 @@ namespace pdfi
 virtual void visit( ImageElement&, const std::list< Element* 
>::const_iterator&  ) = 0;
 virtual void visit( PageElement&, const std::list< Element* 
>::const_iterator&  ) = 0;
 virtual void visit( DocumentElement&, const std::list< Element* 
>::const_iterator&  ) = 0;
+virtual ~ElementTreeVisitor() = 0 { };
 };
 typedef boost::shared_ptr ElementTreeVisitorSharedPtr;
 
commit 028c275a07b9ec130694cbdd15e93ae193097c21
Author: Tor Lillqvist 
Date:   Tue Oct 4 16:14:21 2011 +0300

WaE: unreachable code

diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx 
b/sdext/source/presenter/PresenterBitmapContainer.cxx
index 1422ac3..2084bca 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
@@ -452,7 +452,6 @@ css::uno::Reference
 case Mask:
 return mxMaskBitmap;
 }
-return NULL;
 }
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_sw binfilter/inc

2011-10-04 Thread Caolán McNamara 
 binfilter/bf_svtools/source/memtools/svt_svarray.cxx |2 --
 binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx|2 +-
 binfilter/inc/bf_svtools/svstdarr.hxx|5 -
 3 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 75e468669cfe7553c4521f94e68f5ebd7272825d
Author: Caolán McNamara 
Date:   Tue Oct 4 12:52:09 2011 +0100

SvByteStrings can go from here too

diff --git a/binfilter/bf_svtools/source/memtools/svt_svarray.cxx 
b/binfilter/bf_svtools/source/memtools/svt_svarray.cxx
index 25e2b67..cfd7c8f 100644
--- a/binfilter/bf_svtools/source/memtools/svt_svarray.cxx
+++ b/binfilter/bf_svtools/source/memtools/svt_svarray.cxx
@@ -88,8 +88,6 @@ SV_IMPL_PTRARR( SvStringsDtor, StringPtr )
 SV_IMPL_OP_PTRARR_SORT( SvStringsSort, StringPtr )
 SV_IMPL_OP_PTRARR_SORT( SvStringsSortDtor, StringPtr )
 
-SV_IMPL_PTRARR( SvByteStrings, ByteStringPtr )
-
 //  strings -
 
 // Array mit anderer Seek-Methode!
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx 
b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index d25118a..3a3b547 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -33,7 +33,7 @@
 
 #include 
 
-#if !(defined _SVSTDARR_STRINGS_DECL && defined _SVSTDARR_BYTESTRINGS_DECL && \
+#if !(defined _SVSTDARR_STRINGS_DECL && \
   defined _SVSTDARR_USHORTS_DECL && defined _SVSTDARR_XUB_STRLEN_DECL && \
   defined _SVSTDARR_BOOLS_DECL)
 #define _SVSTDARR_STRINGS
diff --git a/binfilter/inc/bf_svtools/svstdarr.hxx 
b/binfilter/inc/bf_svtools/svstdarr.hxx
index 4ff866e..4ce79a4 100644
--- a/binfilter/inc/bf_svtools/svstdarr.hxx
+++ b/binfilter/inc/bf_svtools/svstdarr.hxx
@@ -140,11 +140,6 @@ SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvStringsISortDtor, 
StringPtr, 1, 1,  )
 #define _SVSTDARR_STRINGSISORTDTOR_DECL
 #endif
 
-#ifndef _SVSTDARR_BYTESTRINGS_DECL
-SV_DECL_PTRARR_VISIBILITY( SvByteStrings, ByteStringPtr, 1, 1,  )
-#define _SVSTDARR_BYTESTRINGS_DECL
-#endif
-
 #ifndef _SVSTDARR_XUB_STRLEN_DECL
 SV_DECL_VARARR_VISIBILITY( SvXub_StrLens, xub_StrLen, 1, 1,  )
 #define _SVSTDARR_XUB_STRLEN_DECL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sd/source

2011-10-04 Thread Caolán McNamara 
 sd/source/ui/view/DocumentRenderer.cxx |   35 +
 1 file changed, 23 insertions(+), 12 deletions(-)

New commits:
commit e758f6fa4bfc28fed1751b27ab0915ae875657f7
Author: Ivan Timofeev 
Date:   Tue Oct 4 17:16:34 2011 +0400

fix doubling of one page when range is empty and incorrect selection page

diff --git a/sd/source/ui/view/DocumentRenderer.cxx 
b/sd/source/ui/view/DocumentRenderer.cxx
index 1439b65..9966f6c 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -210,18 +210,29 @@ namespace {
 OUString GetPrinterSelection (sal_Int32 nPageCount, sal_Int32 
nCurrentPageIndex) const
 {
 sal_Int32 nContent = 
static_cast(mrProperties.getIntValue( "PrintContent", 0 ));
-OUString sValue = ::rtl::OUStringBuffer(4)
-.append(static_cast(1))
-.append(static_cast('-'))
-.append(nPageCount).makeStringAndClear();
-
-if( nContent == 1 )
-sValue = mrProperties.getStringValue( "PageRange", sValue );
-else if ( nContent == 2 )
-sValue = nCurrentPageIndex < 0
-? OUString() : OUString::valueOf(nCurrentPageIndex);
-
-return sValue;
+OUString sFullRange = ::rtl::OUStringBuffer()
+ .append(static_cast(1))
+ .append(static_cast('-'))
+ .append(nPageCount).makeStringAndClear();
+
+if (nContent == 0) // all pages/slides
+{
+return sFullRange;
+}
+
+if (nContent == 1) // range
+{
+OUString sValue = mrProperties.getStringValue("PageRange");
+return sValue.getLength() ? sValue : sFullRange;
+}
+
+if (nContent == 2 && // selection
+nCurrentPageIndex >= 0)
+{
+return OUString::valueOf(nCurrentPageIndex + 1);
+}
+
+return OUString();
 }
 
 private:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: test/source

2011-10-04 Thread Tor Lillqvist 
 test/source/filters-test.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6cb6080869c7b527c7325694f8e29c8fa0834358
Author: Tor Lillqvist 
Date:   Tue Oct 4 15:57:42 2011 +0300

WaE: '==' : unsafe mix of type 'bool' and type 'test::filterStatus'

diff --git a/test/source/filters-test.cxx b/test/source/filters-test.cxx
index 1cb085d..f36e014 100644
--- a/test/source/filters-test.cxx
+++ b/test/source/filters-test.cxx
@@ -125,7 +125,7 @@ void FiltersTest::recursiveScan(const rtl::OUString 
&rFilter, const rtl::OUStrin
 bRes?"Pass":"Fail",nEndTime-nStartTime);
 if (nExpected == test::indeterminate)
 continue;
-CPPUNIT_ASSERT_MESSAGE(aRes.getStr(), bRes == nExpected);
+CPPUNIT_ASSERT_MESSAGE(aRes.getStr(), bRes == (nExpected == 
test::pass));
 }
 }
 CPPUNIT_ASSERT(osl::FileBase::E_None == aDir.close());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: test/user-template

2011-10-04 Thread Michael Meeks 
 test/user-template/user/registry/Langpack-en-US.xcd |   15 
 test/user-template/user/registry/base.xcd   |  299 
 test/user-template/user/registry/calc.xcd   | 3447 +
 test/user-template/user/registry/draw.xcd   | 1082 
 test/user-template/user/registry/gnome.xcd  |  129 
 test/user-template/user/registry/graphicfilter.xcd  | 2677 
 test/user-template/user/registry/impress.xcd| 3463 +
 test/user-template/user/registry/lingucomponent.xcd |   37 
 test/user-template/user/registry/main.xcd   |62696 +++-
 test/user-template/user/registry/math.xcd   |  574 
 test/user-template/user/registry/ogltrans.xcd   |7 
 test/user-template/user/registry/palm.xcd   |   61 
 test/user-template/user/registry/pocketexcel.xcd|   55 
 test/user-template/user/registry/pocketword.xcd |   61 
 test/user-template/user/registry/pyuno.xcd  |   13 
 test/user-template/user/registry/writer.xcd | 8164 ++
 test/user-template/user/registry/xsltfilter.xcd |  512 
 17 files changed, 83268 insertions(+), 24 deletions(-)

New commits:
commit ef689ffaa6075b5203f29b2524643c88e0739a86
Author: Michael Meeks 
Date:   Tue Oct 4 13:48:21 2011 +0100

pretty print the user template registry to make diffs meaningful

Disable macro security for unit testing macros ...

diff --git a/test/user-template/user/registry/Langpack-en-US.xcd 
b/test/user-template/user/registry/Langpack-en-US.xcd
index 3a47480..cb3ecc9 100644
--- a/test/user-template/user/registry/Langpack-en-US.xcd
+++ b/test/user-template/user/registry/Langpack-en-US.xcd
@@ -1,2 +1,15 @@
 
-http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:oor="http://openoffice.org/2001/registry";>OpenOffice.org
+http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:oor="http://openoffice.org/2001/registry";>
+  
+  
+
+  
+
+  
+OpenOffice.org
+  
+
+  
+
+  
+
diff --git a/test/user-template/user/registry/base.xcd 
b/test/user-template/user/registry/base.xcd
index c262721..afee1fa 100644
--- a/test/user-template/user/registry/base.xcd
+++ b/test/user-template/user/registry/base.xcd
@@ -1,2 +1,299 @@
 
-http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:oor="http://openoffice.org/2001/registry";>IMPORT EXPORT OWN 
DEFAULT 3RDPARTYFILTER ENCRYPTION6200StarBasecom.sun.star.sdb.OfficeDatabaseDocumentStarBaseorg.openoffice.comp.dbflt.DBTypeDetectionprivate:factory/sdatabase*odbapplication/vnd.sun.xml.basefalseStarOffice XML (Base)OpenDocument 
DatabaseStarBase 
6.0http://openoffice.org/2004/installation"; oor:name="Common" 
oor:package="org.openoffice.Office">private:factory/sdatabase?InteractiveDatabase_defaultprivate:image/3245slot:10934Address Data 
Source..._selfprivate:image/3216http://openoffice.org/2004/installation"; oor:name="Setup" 
oor:package="org.openoffice">DbuCommandsdbrelationDbRelationWindowState14GenericCategoriesBase: Relation 
DesignDbuCommandsdbqueryDbQueryWindowState14GenericCategoriesBase: Query 
DesignDbuCommandsdbqueryDbQueryWindowState14GenericCategoriesBase: View 
DesignDbuCommandsdbtableDbTableWindowState14GenericCategoriesBase: Table 
DesignDbuCommandsdbbrowserDbBrowserWindowState14GenericCategoriesBase: Data 
ViewDbuCommandsdbtdataDbTableDataWindowState14GenericCategoriesBase: Table Data 
Viewcom.sun.star.sdb.OfficeDatabaseDocumentDbuCommandsStarOffice 
XML (Base)StarOffice XML (Ba
 se)private:factory/sdatabase14falsedbappBaseWindowStateGenericCategoriesBase
+http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:oor="http://openoffice.org/2001/registry";>
+  
+  
+
+  
+
+  IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION
+
+
+
+
+
+  6200
+
+
+  StarBase
+
+
+
+  com.sun.star.sdb.OfficeDatabaseDocument
+
+  
+
+  
+  
+
+  
+
+  StarBase
+
+  
+
+  
+  
+
+  
+
+  org.openoffice.comp.dbflt.DBTypeDetection
+
+
+  private:factory/sdatabase*
+
+
+  odb
+
+
+  application/vnd.sun.xml.base
+
+
+  false
+
+
+  StarOffice XML (Base)
+
+
+  OpenDocument Database
+
+
+  StarBase 6.0
+
+  
+
+  
+  http://openoffice.org/2004/installation"; 
oor:name="Common" oor:package="org.openoffice.Office">
+
+  
+
+  
+private:factory/sdatabase?Interactive
+  
+  
+Database
+  
+  
+_default
+  
+  
+private:image/3245
+  
+

[Libreoffice-commits] .: scp2/source

2011-10-04 Thread Bjoern Michaelsen 
 scp2/source/ooo/file_library_ooo.scp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e944e135bc157d092532fff0829390fa7d4fa958
Author: Bjoern Michaelsen 
Date:   Tue Oct 4 14:27:35 2011 +0200

Revert "fix invalid superflous #endif from 
5bd2890a56125d391b42f34d51e2e0c57b0a80b0"

This reverts commit d2f633c5464fd4339e9e804c97596a78bfa58e62.

diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index b6b5e2c..03e2f93 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -206,6 +206,8 @@ File gid_File_Lib_Cmis
   #endif
 End
 
+#endif
+
 #ifndef SYSTEM_DB
 
 File gid_File_Lib_Db
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: xmloff/source

2011-10-04 Thread Tor Lillqvist 
 xmloff/source/style/bordrhdl.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ba6eedee31055a73e66c59b3ddecaa50559463c4
Author: Tor Lillqvist 
Date:   Tue Oct 4 15:33:30 2011 +0300

WaE: 'rUnitConverter' : unreferenced formal parameter

diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index 230f108..9181827 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -304,7 +304,7 @@ sal_Bool XMLBorderHdl::importXML( const OUString& 
rStrImpValue, uno::Any& rValue
 return sal_True;
 }
 
-sal_Bool XMLBorderHdl::exportXML( OUString& rStrExpValue, const uno::Any& 
rValue, const SvXMLUnitConverter& rUnitConverter ) const
+sal_Bool XMLBorderHdl::exportXML( OUString& rStrExpValue, const uno::Any& 
rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const
 {
 OUStringBuffer aOut;
 
@@ -320,7 +320,7 @@ sal_Bool XMLBorderHdl::exportXML( OUString& rStrExpValue, 
const uno::Any& rValue
 }
 else
 {
-rUnitConverter.convertMeasure( aOut, nWidth,
+SvXMLUnitConverter::convertMeasure( aOut, nWidth,
MAP_100TH_MM, MAP_POINT );
 
 aOut.append( sal_Unicode( ' ' ) );
@@ -363,7 +363,7 @@ sal_Bool XMLBorderHdl::exportXML( OUString& rStrExpValue, 
const uno::Any& rValue
 
 aOut.append( sal_Unicode( ' ' ) );
 
-rUnitConverter.convertColor( aOut, aBorderLine.Color );
+SvXMLUnitConverter::convertColor( aOut, aBorderLine.Color );
 }
 
 rStrExpValue = aOut.makeStringAndClear();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: README.cross

2011-10-04 Thread Jan Holesovsky 
 README.cross |1 -
 1 file changed, 1 deletion(-)

New commits:
commit abe151e5dcb60d27552275d89f9e3f7e42821c65
Author: Jan Holesovsky 
Date:   Tue Oct 4 14:17:56 2011 +0200

No need to copy the .dlls to the installation any more.

diff --git a/README.cross b/README.cross
index 9f7b6e1..7040685 100644
--- a/README.cross
+++ b/README.cross
@@ -215,7 +215,6 @@ Once you have compiled it, you may want to try to run it:
 $ cd /tmp
 $ tar xf 
/instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US/LibO-Dev_OOO350m1_Win_x86_install-arc_en-US.tar.gz
 $ cd LibO-Dev_OOO350m1_Win_x86_install-arc_en-US/LibO-dev\ 3.5/program
-$ cp /usr/i686-w64-mingw32/sys-root/mingw/bin/* ./
 $ wine soffice.exe
 
 NB. it is important to unpack somewhere low in the hierarchy structure (like
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: setup_native/source

2011-10-04 Thread Tor Lillqvist 
 setup_native/source/win32/customactions/rebase/rebase.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6a0c6b4839843c0c2716df970013daf381bd7b99
Author: Tor Lillqvist 
Date:   Tue Oct 4 14:43:15 2011 +0300

WaE: name was marked as #pragma deprecated

diff --git a/setup_native/source/win32/customactions/rebase/rebase.cxx 
b/setup_native/source/win32/customactions/rebase/rebase.cxx
index ad3686c..641e397 100644
--- a/setup_native/source/win32/customactions/rebase/rebase.cxx
+++ b/setup_native/source/win32/customactions/rebase/rebase.cxx
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#define STRSAFE_NO_DEPRECATE
 #include 
 #ifdef _MSC_VER
 #pragma warning(pop)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

2011-10-04 Thread Tor Lillqvist 
 ucb/source/ucp/cmis/makefile.mk |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit a34dbd394f512dec090ef1cf2e8158f8dfbd4a5f
Author: Tor Lillqvist 
Date:   Tue Oct 4 14:52:48 2011 +0300

Check ENABLE_CMIS harder

diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk
index 4068486..a416316 100644
--- a/ucb/source/ucp/cmis/makefile.mk
+++ b/ucb/source/ucp/cmis/makefile.mk
@@ -37,7 +37,7 @@ NO_BSYMBOLIC=TRUE
 .INCLUDE: settings.mk
 .IF "$(L10N_framework)"==""
 
-.IF "$(ENABLE_CMIS)"!=""
+.IF "$(ENABLE_CMIS)"=="TRUE"
 
 # no "lib" prefix
 DLLPRE =
@@ -61,11 +61,13 @@ SHL1STDLIBS=\
 
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
-.ENDIF  # "$(ENABLE_CMIS)"!=""
+.ENDIF  # "$(ENABLE_CMIS)"=="TRUE"
 .ENDIF # L10N_framework
 
 .INCLUDE: target.mk
 
+.IF "$(ENABLE_CMIS)"=="TRUE"
+
 ALLTAR : $(MISC)/ucpcmis.component
 
 $(MISC)/ucpcmis.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
@@ -73,3 +75,5 @@ $(MISC)/ucpcmis.component .ERRREMOVE : 
$(SOLARENV)/bin/createcomponent.xslt \
 $(XSLTPROC) --nonet --stringparam uri \
 '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
 $(SOLARENV)/bin/createcomponent.xslt ucpcmis.component
+
+.ENDIF  # "$(ENABLE_CMIS)"=="TRUE"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

2011-10-04 Thread Bjoern Michaelsen 
 scp2/source/ooo/file_library_ooo.scp |2 --
 1 file changed, 2 deletions(-)

New commits:
commit d2f633c5464fd4339e9e804c97596a78bfa58e62
Author: Bjoern Michaelsen 
Date:   Tue Oct 4 13:48:27 2011 +0200

fix invalid superflous #endif from 5bd2890a56125d391b42f34d51e2e0c57b0a80b0

diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 03e2f93..b6b5e2c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -206,8 +206,6 @@ File gid_File_Lib_Cmis
   #endif
 End
 
-#endif
-
 #ifndef SYSTEM_DB
 
 File gid_File_Lib_Db
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: postprocess/packcomponents

2011-10-04 Thread Caolán McNamara 
 postprocess/packcomponents/makefile.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit fb3adf4b19bed003e441c239f7e48f0a0a59f445
Author: Caolán McNamara 
Date:   Tue Oct 4 12:33:21 2011 +0100

duplicate component

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 8d6a363..0dcd0b7 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -318,9 +318,6 @@ my_components += \
 component/dtrans/util/ftransl \
 component/dtrans/util/sysdtrans \
 component/vcl/vcl.windows
-.ELSE
-my_components += \
-ucpcmis
 .END
 
 .IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "IOS" && "$(OS)" != 
"ANDROID"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/source

2011-10-04 Thread Caolán McNamara 
 desktop/source/app/app.cxx |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 4e4bfa470c5376e77aa15c40ae9fa970da962829
Author: Caolán McNamara 
Date:   Tue Oct 4 12:28:53 2011 +0100

verbose error message please

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1cb3f30..fb1da91 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -767,18 +767,19 @@ void Desktop::InitFinished()
 // on Unix command line args needs to be checked before Desktop::Init()
 void Desktop::ensureProcessServiceFactory()
 {
-if (!comphelper::getProcessServiceFactory().is()) {
-try {
+if (!comphelper::getProcessServiceFactory().is())
+{
+try
+{
 comphelper::setProcessServiceFactory(
 CreateApplicationServiceManager());
-} catch (css::uno::Exception & e) {
-OSL_TRACE(
-OSL_LOG_PREFIX "caught UNO exception with message \"%s\"",
-rtl::OUStringToOString(
-e.Message, RTL_TEXTENCODING_UTF8).getStr());
+}
+catch (const css::uno::Exception& e)
+{
+OSL_FAIL(rtl::OUStringToOString(e.Message, 
osl_getThreadTextEncoding()).getStr());
+// let exceptions escape and tear down the process, it is
+// completely broken anyway
 throw;
-// let exceptions escape and tear down the process, it is
-// completely broken anyway
 }
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - solenv/gbuild solenv/inc vcl/source vcl/win

2011-10-04 Thread Tor Lillqvist 
 solenv/gbuild/platform/windows.mk |2 ++
 solenv/inc/wntmsc.mk  |2 +-
 vcl/source/glyphs/graphite_layout.cxx |2 ++
 vcl/win/source/gdi/salgdi3.cxx|2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit d5a5be9e7d29cad539d6870c251988fd5490db6d
Author: Tor Lillqvist 
Date:   Tue Oct 4 14:17:09 2011 +0300

WaE: unreachable code

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index fdb9296..db072f6 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -535,7 +535,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars( const 
ImplFontData* pFace,
 int nMatchCount = 0;
 // static const int nMaxMatchCount = 1; // TODO: tolerate more missing 
characters?
 const sal_Int32 nStrLen = rMissingChars.getLength();
-for( sal_Int32 nStrIdx = 0; nStrIdx < nStrLen; ++nStrIdx )
+for( sal_Int32 nStrIdx = 0; nStrIdx < nStrLen; /* ++nStrIdx unreachable 
code, see the 'break' below */ )
 {
 const sal_UCS4 uChar = rMissingChars.iterateCodePoints( &nStrIdx );
 nMatchCount += pCharMap->HasChar( uChar );
commit 779ae5ee23c601e2b93f03c04c61cb1505d06a5e
Author: Tor Lillqvist 
Date:   Tue Oct 4 14:13:28 2011 +0300

WaE: 'e' : unreferenced local variable

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 0085906..7a4b04a 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -667,6 +667,8 @@ bool GraphiteLayout::LayoutGlyphs(ImplLayoutArgs& rArgs, 
gr_segment * pSegment)
 {
 #ifdef GRLAYOUT_DEBUG
 fprintf(grLog(),"LayoutGlyphs failed %s\n", e.what());
+#else
+(void)e;
 #endif
 return false;
 }
commit 2e3bdc598f24285ed15c8b218db5dab868173cf1
Author: Tor Lillqvist 
Date:   Tue Oct 4 14:12:01 2011 +0300

And C4245

diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 2db6f42..5d9feb7 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -98,6 +98,7 @@ gb_CFLAGS := \
-wd4217 \
-wd4242 \
-wd4244 \
+   -wd4245 \
-wd4250 \
-wd4251 \
-wd4255 \
@@ -148,6 +149,7 @@ gb_CXXFLAGS := \
-wd4217 \
-wd4242 \
-wd4244 \
+   -wd4245 \
-wd4250 \
-wd4251 \
-wd4275 \
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index cc3edb2..4d7a305 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -193,7 +193,7 @@ CFLAGSOUTOBJ=-Fo
 #   '()' to '(void)'".
 # - "warning C4365: conversion from ... to ... signed/unsigned mismatch"
 
-CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4242 -wd4244 -wd4250 
-wd4251 -wd4275 \
+CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4242 -wd4244 -wd4245 
-wd4250 -wd4251 -wd4275 \
 -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4611 -wd4625 -wd4626 \
 -wd4640 -wd4675 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \
 -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/aqua

2011-10-04 Thread Tor Lillqvist 
 vcl/aqua/source/window/salframeview.mm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2a883c1447f5694db1db098d895f865284cc1ae
Author: Tor Lillqvist 
Date:   Tue Oct 4 14:22:15 2011 +0300

Fix build against the 10.4 SDK

diff --git a/vcl/aqua/source/window/salframeview.mm 
b/vcl/aqua/source/window/salframeview.mm
index 6f451f5..ae12b85 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -1597,7 +1597,7 @@ private:
 return 0;
 }
 
-#if defined(MAC_OS_X_VERSION_10_5)
+#if defined (NSFoundationVersionNumber10_5)
 /* SDK 10.5 or greater, even if MAC_OS_X_VERSION_MAX_ALLOWED might be less 
than 10.5 */
 - (NSInteger)conversationIdentifier
 #else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - libcmis/ExternalLib_libcmis.mk ooo.lst.in sw/source

2011-10-04 Thread Cédric Bosdonnat 
 libcmis/ExternalLib_libcmis.mk  |4 +++-
 ooo.lst.in  |2 +-
 sw/source/ui/docvw/FrameControlsManager.cxx |8 
 sw/source/ui/inc/FrameControlsManager.hxx   |2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit fadb5d1dcd78f5ceb79863381d52964c3f054434
Author: Cédric Bosdonnat 
Date:   Tue Oct 4 13:11:50 2011 +0200

Page Break: fixed crasher due to bad removal of frame controls

diff --git a/sw/source/ui/docvw/FrameControlsManager.cxx 
b/sw/source/ui/docvw/FrameControlsManager.cxx
index 4a07636..6fe07e2 100644
--- a/sw/source/ui/docvw/FrameControlsManager.cxx
+++ b/sw/source/ui/docvw/FrameControlsManager.cxx
@@ -68,7 +68,7 @@ SwFrameControlsManager::~SwFrameControlsManager()
 m_aControls.clear();
 }
 
-std::vector< SwFrameControlPtr > SwFrameControlsManager::GetControls( 
FrameControlType eType )
+std::vector< SwFrameControlPtr >& SwFrameControlsManager::GetControls( 
FrameControlType eType )
 {
 return m_aControls[eType];
 }
@@ -84,7 +84,7 @@ void SwFrameControlsManager::RemoveControls( const SwFrm* 
pFrm )
 
 while ( pIt != m_aControls.end() )
 {
-vector< SwFrameControlPtr > aVect = pIt->second;
+vector< SwFrameControlPtr >& aVect = pIt->second;
 aVect.erase( remove_if( aVect.begin(),
 aVect.end(),
 FramePredicate( pFrm ) ), aVect.end() );
@@ -124,7 +124,7 @@ void SwFrameControlsManager::SetHeaderFooterControl( const 
SwPageFrm* pPageFrm,
 // Check if we already have the control
 SwFrameControlPtr pControl;
 
-vector< SwFrameControlPtr > aControls = m_aControls[HeaderFooter];
+vector< SwFrameControlPtr >& aControls = m_aControls[HeaderFooter];
 
 vector< SwFrameControlPtr >::iterator pIt = aControls.begin();
 while ( pIt != aControls.end() && !pControl.get() )
@@ -159,7 +159,7 @@ void SwFrameControlsManager::SetPageBreakControl( const 
SwPageFrm* pPageFrm )
 // Check if we already have the control
 SwFrameControlPtr pControl;
 
-vector< SwFrameControlPtr > aControls = m_aControls[PageBreak];
+vector< SwFrameControlPtr >& aControls = m_aControls[PageBreak];
 
 vector< SwFrameControlPtr >::iterator pIt = aControls.begin();
 while ( pIt != aControls.end() && !pControl.get() )
diff --git a/sw/source/ui/inc/FrameControlsManager.hxx 
b/sw/source/ui/inc/FrameControlsManager.hxx
index c3e91ee..b79843f 100644
--- a/sw/source/ui/inc/FrameControlsManager.hxx
+++ b/sw/source/ui/inc/FrameControlsManager.hxx
@@ -57,7 +57,7 @@ class SwFrameControlsManager
 SwFrameControlsManager( SwEditWin* pEditWin );
 ~SwFrameControlsManager( );
 
-std::vector< SwFrameControlPtr > GetControls( FrameControlType eType );
+std::vector< SwFrameControlPtr >& GetControls( FrameControlType eType 
);
 void AddControl( FrameControlType eType, SwFrameControlPtr pControl );
 void RemoveControls( const SwFrm* pFrm );
 void HideControls( FrameControlType eType );
commit 5f1a277f2e7fc2d32673d2a917d6775d5276d481
Author: Cédric Bosdonnat 
Date:   Tue Oct 4 13:10:55 2011 +0200

libcmis: disable unit tests and static lib as they aren't used

diff --git a/libcmis/ExternalLib_libcmis.mk b/libcmis/ExternalLib_libcmis.mk
index 12f6b74..797dea5 100644
--- a/libcmis/ExternalLib_libcmis.mk
+++ b/libcmis/ExternalLib_libcmis.mk
@@ -28,9 +28,11 @@
 
 $(eval $(call gb_ExternalLib_ExternalLib,libcmis,autotools))
 
-$(eval $(call 
gb_ExternalLib_set_src_package,libcmis,d821b3cdeba34db1d084b9bd709b3a52-libcmis-0.1.0.tar.gz))
+$(eval $(call 
gb_ExternalLib_set_src_package,libcmis,7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz))
 $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--disable-client))
 $(eval $(call 
gb_ExternalLib_add_patch,libcmis,libcmis/libcmis-0.1.0-autotools.patch))
+$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--disable-tests))
+$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--disable-static))
 
 ifneq ($(filter $(OS),MACOSX ANDROID),)
 
diff --git a/ooo.lst.in b/ooo.lst.in
index 1595a8b..04f3661 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
 cfb4259665fa96874deaa1b233d0b9c2-libvisio-0.0.7.tar.bz2
 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip
-d821b3cdeba34db1d084b9bd709b3a52-libcmis-0.1.0.tar.gz
+7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
 @GOOGLE_DOCS_EXTENSION_PACK@
 http://dev-www.libreoffice.org/extern
 185d60944ea767075d27247c3162b3bc-unowinreg.dll
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-04 Thread Tor Lillqvist 
 solenv/gbuild/platform/windows.mk |2 ++
 solenv/inc/wntmsc.mk  |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 093345dfae7db37b0b1f8a8736f8092243499b50
Author: Tor Lillqvist 
Date:   Tue Oct 4 14:06:10 2011 +0300

Ditto for C4242

diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 67f07b9..2db6f42 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -96,6 +96,7 @@ gb_CFLAGS := \
-wd4189 \
-wd4191 \
-wd4217 \
+   -wd4242 \
-wd4244 \
-wd4250 \
-wd4251 \
@@ -145,6 +146,7 @@ gb_CXXFLAGS := \
-wd4189 \
-wd4191 \
-wd4217 \
+   -wd4242 \
-wd4244 \
-wd4250 \
-wd4251 \
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 4bd2795..cc3edb2 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -193,7 +193,7 @@ CFLAGSOUTOBJ=-Fo
 #   '()' to '(void)'".
 # - "warning C4365: conversion from ... to ... signed/unsigned mismatch"
 
-CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4244 -wd4250 -wd4251 
-wd4275 \
+CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4242 -wd4244 -wd4250 
-wd4251 -wd4275 \
 -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4611 -wd4625 -wd4626 \
 -wd4640 -wd4675 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \
 -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-04 Thread Tor Lillqvist 
 solenv/gbuild/platform/windows.mk |2 ++
 solenv/inc/wntmsc.mk  |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7dd7b1474f76ae76247836f1acbe347dc76eedef
Author: Tor Lillqvist 
Date:   Tue Oct 4 13:58:09 2011 +0300

Don't bother with MSVC's C4244 warnings, we have too many of them

diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 989669f..67f07b9 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -96,6 +96,7 @@ gb_CFLAGS := \
-wd4189 \
-wd4191 \
-wd4217 \
+   -wd4244 \
-wd4250 \
-wd4251 \
-wd4255 \
@@ -144,6 +145,7 @@ gb_CXXFLAGS := \
-wd4189 \
-wd4191 \
-wd4217 \
+   -wd4244 \
-wd4250 \
-wd4251 \
-wd4275 \
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index efb5329..4bd2795 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -193,7 +193,7 @@ CFLAGSOUTOBJ=-Fo
 #   '()' to '(void)'".
 # - "warning C4365: conversion from ... to ... signed/unsigned mismatch"
 
-CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4250 -wd4251 -wd4275 \
+CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4244 -wd4250 -wd4251 
-wd4275 \
 -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4611 -wd4625 -wd4626 \
 -wd4640 -wd4675 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \
 -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-10-04 Thread Noel Power 
 sc/source/filter/excel/xiescher.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 93580dbf2367d15c2c1c8c3d8b3f154ed0d67e14
Author: Noel Power 
Date:   Tue Oct 4 11:53:44 2011 +0100

bnc#705977 apply control name before control is inserted into Forms 
container

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 0c04214..2d88855 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3342,6 +3342,8 @@ SdrObject* XclImpDffConverter::CreateSdrObject( const 
XclImpPictureObj& rPicObj,
  // ReadOCXExcelKludgeStream( )
  if ( xFComp.is() )
  {
+ ScfPropertySet aPropSet( xFComp );
+ aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" 
), rPicObj.GetObjName() );
  InsertControl( xFComp, aSz,&xShape,true);
  xSdrObj.reset( rPicObj.CreateSdrObjectFromShape( 
xShape, rAnchorRect ) );
  }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - curl/makefile.mk svl/inc svl/source

2011-10-04 Thread Caolán McNamara 
 curl/makefile.mk|2 ++
 svl/inc/svl/svstdarr.hxx|5 -
 svl/source/memtools/svarray.cxx |2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit ae3a5e9c2d426ffed6d5fe53ebeb1113087903c4
Author: Caolán McNamara 
Date:   Tue Oct 4 11:51:58 2011 +0100

SvByteStrings can go now

diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 6968cc6..9df5b4b 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -83,11 +83,6 @@ SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvStringsISortDtor, 
StringPtr, 1, 1, SVL_DLL
 #define _SVSTDARR_STRINGSISORTDTOR_DECL
 #endif
 
-#ifndef _SVSTDARR_BYTESTRINGS_DECL
-SV_DECL_PTRARR_VISIBILITY( SvByteStrings, ByteStringPtr, 1, 1, SVL_DLLPUBLIC )
-#define _SVSTDARR_BYTESTRINGS_DECL
-#endif
-
 typedef std::deque< xub_StrLen > SvXub_StrLens;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 88cc111..7024640 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -68,8 +68,6 @@ SV_IMPL_PTRARR( SvStringsDtor, StringPtr )
 SV_IMPL_OP_PTRARR_SORT( SvStringsSort, StringPtr )
 SV_IMPL_OP_PTRARR_SORT( SvStringsSortDtor, StringPtr )
 
-SV_IMPL_PTRARR( SvByteStrings, ByteStringPtr )
-
 //  strings -
 
 // Array mit anderer Seek-Methode!
commit 84dfaea69b40fe517b94ac4636b99fdd8c4bda4c
Author: Caolán McNamara 
Date:   Tue Oct 4 11:51:16 2011 +0100

no .pc when built without configure

diff --git a/curl/makefile.mk b/curl/makefile.mk
index 322c465..66b8d9b 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -159,7 +159,9 @@ OUT2INC= \
 include$/curl$/curlbuild.h \
 include$/curl$/curlrules.h
 
+.IF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
 OUT2INC+=libcurl.pc
+.ENDIF
 
 # --- Targets --
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2011-10-04 Thread Tor Lillqvist 
 solenv/inc/premac.h |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0b0f3b0530b8f08c4005264adc5402ea5d447cea
Author: Tor Lillqvist 
Date:   Tue Oct 4 13:35:10 2011 +0300

Do Objective-C -specific foo only when compiling Objective-C

diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h
index c60c42c..b5fff62 100644
--- a/solenv/inc/premac.h
+++ b/solenv/inc/premac.h
@@ -47,11 +47,13 @@
 #define StringPtr MacOSStringPtr
 #define TimeValue MacOSTimeValue
 
+#ifdef __OBJC__
 #import 
 #if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 
1050
 @class CALayer;
 @class NSViewController;
 typedef int NSColorRenderingIntent;
 #endif
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc

2011-10-04 Thread Stephan Bergmann 
 binfilter/bf_sc/source/core/data/sc_documen2.cxx |2 
 binfilter/bf_sc/source/core/data/sc_documen3.cxx |5 --
 binfilter/bf_sc/source/core/data/sc_document.cxx |   48 ---
 binfilter/bf_sc/source/core/data/sc_table1.cxx   |3 -
 binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx |2 
 binfilter/inc/bf_sc/document.hxx |   23 ---
 binfilter/inc/bf_sc/table.hxx|3 -
 7 files changed, 33 insertions(+), 53 deletions(-)

New commits:
commit 67db757ab744cbea949e64b94c0162b10ef985f3
Author: Stephan Bergmann 
Date:   Tue Oct 4 12:22:53 2011 +0200

Some more warning cleanup.

diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx 
b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index cbfb02d..63c081d 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -983,7 +983,7 @@ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG )
 /*N*/   short nDz = ((short)nDestPos) - (short)nSrcPos;
 /*N*/   pTab[nDestPos]->UpdateReference(URM_COPY, 0, 0, nDestPos,
 /*N*/MAXCOL, MAXROW, 
nDestPos,
-/*N*/0, 0, nDz, NULL);
+/*N*/0, 0, nDz);
 /*N*/ // Test for outside absolute references for info box
 /*N*/ BOOL bIsAbsRef = 
pSrcDoc->pTab[nSrcPos]->TestTabRefAbs(nSrcPos);
 /*N*/ // Readjust self-contained absolute references to this sheet
diff --git a/binfilter/bf_sc/source/core/data/sc_documen3.cxx 
b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
index c28f5c3..f0f863d 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
@@ -403,8 +403,7 @@ using namespace ::com::sun::star;
 /*N*/ void ScDocument::UpdateReference( UpdateRefMode eUpdateRefMode,
 /*N*/   USHORT nCol1, USHORT nRow1, USHORT 
nTab1,
 /*N*/   USHORT nCol2, USHORT nRow2, USHORT 
nTab2,
-/*N*/   short nDx, short nDy, short nDz,
-/*N*/   ScDocument* pUndoDoc, BOOL 
bIncludeDraw )
+/*N*/   short nDx, short nDy, short nDz )
 /*N*/ {
 /*N*/   PutInOrder( nCol1, nCol2 );
 /*N*/   PutInOrder( nRow1, nRow2 );
@@ -445,7 +444,7 @@ using namespace ::com::sun::star;
 /*N*/   if (pTab[i])
 /*N*/   pTab[i]->UpdateReference(
 /*N*/   eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, 
nTab2,
-/*N*/   nDx, nDy, nDz, pUndoDoc, bIncludeDraw );
+/*N*/   nDx, nDy, nDz );
 /*N*/
 /*N*/   if ( bIsEmbedded )
 /*N*/   {
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx 
b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 5fa6c2d..649a5f7 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -461,7 +461,7 @@ namespace binfilter {
 
 /*N*/ BOOL ScDocument::InsertRow( USHORT nStartCol, USHORT nStartTab,
 /*N*/   USHORT nEndCol,   USHORT nEndTab,
-/*N*/   USHORT nStartRow, USHORT nSize, ScDocument* 
pRefUndoDoc )
+/*N*/   USHORT nStartRow, USHORT nSize )
 /*N*/ {
 /*N*/   PutInOrder( nStartCol, nEndCol );
 /*N*/   PutInOrder( nStartTab, nEndTab );
@@ -484,7 +484,7 @@ namespace binfilter {
 /*N*/   ScAddress( nEndCol, MAXROW, nEndTab )), 0, nSize, 0 );
 /*N*/   UpdateReference( URM_INSDEL, nStartCol, nStartRow, nStartTab,
 /*N*/nEndCol, MAXROW, nEndTab,
-/*N*/0, nSize, 0, pRefUndoDoc, FALSE ); // without 
drawing objects
+/*N*/0, nSize, 0 );
 /*N*/   for (i=nStartTab; i<=nEndTab; i++)
 /*N*/   if (pTab[i])
 /*N*/   pTab[i]->InsertRow( nStartCol, nEndCol, nStartRow, nSize );
@@ -515,19 +515,17 @@ namespace binfilter {
 /*N*/ }
 
 
-/*N*/ BOOL ScDocument::InsertRow( const ScRange& rRange, ScDocument* 
pRefUndoDoc )
+/*N*/ BOOL ScDocument::InsertRow( const ScRange& rRange )
 /*N*/ {
 /*N*/   return InsertRow( rRange.aStart.Col(), rRange.aStart.Tab(),
 /*N*/ rRange.aEnd.Col(),   rRange.aEnd.Tab(),
-/*N*/ rRange.aStart.Row(), 
rRange.aEnd.Row()-rRange.aStart.Row()+1,
-/*N*/ pRefUndoDoc );
+/*N*/ rRange.aStart.Row(), 
rRange.aEnd.Row()-rRange.aStart.Row()+1 );
 /*N*/ }
 
 
 /*N*/ void ScDocument::DeleteRow( USHORT nStartCol, USHORT nStartTab,
 /*N*/   USHORT nEndCol,   USHORT nEndTab,
-/*N*/   USHORT nStartRow, USHORT nSize,
-/*N*/   ScDocument* pRefUndoDoc, BOOL* pUndoOutline )
+/*N*/   USHORT nStartRow, USHORT nSize )

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

2011-10-04 Thread Tor Lillqvist 
 svl/source/items/poolio.cxx |2 +-
 svl/source/numbers/zforlist.cxx |2 --
 svl/source/svdde/ddesvr.cxx |4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 27be19bd8bba63d0186b7425f30fc323ecc5a925
Author: Tor Lillqvist 
Date:   Tue Oct 4 13:09:13 2011 +0300

WaE: '==' : signed/unsigned mismatch

diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 08894db..7e114c3 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -598,7 +598,7 @@ void DdeService::AddFormat( sal_uLong nFmt )
 {
 nFmt = DdeData::GetExternalFormat( nFmt );
 for ( size_t i = 0, n = aFormats.size(); i < n; ++i )
-if ( aFormats[ i ] == nFmt )
+if ( (sal_uLong) aFormats[ i ] == nFmt )
 return;
 aFormats.push_back( nFmt );
 }
@@ -609,7 +609,7 @@ void DdeService::RemoveFormat( sal_uLong nFmt )
 {
 nFmt = DdeData::GetExternalFormat( nFmt );
 for ( DdeFormats::iterator it = aFormats.begin(); it < aFormats.end(); 
++it ) {
-if ( *it == nFmt ) {
+if ( (sal_uLong) *it == nFmt ) {
 aFormats.erase( it );
 break;
 }
commit deb6a43c1feadb285639709fb8883e509fadd3f1
Author: Tor Lillqvist 
Date:   Tue Oct 4 13:07:45 2011 +0300

WaE: unreachable code

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 8ce8eef..5169baa 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1267,7 +1267,6 @@ bool SvNumberFormatter::IsCompatible(short eOldType,
 default:
 return false;
 }
-return false;
 }
 }
 
@@ -4337,7 +4336,6 @@ sal_Char NfCurrencyEntry::GetEuroSymbol( rtl_TextEncoding 
eTextEncoding )
 return '\x80';
 #endif
 }
-return '\x80';
 }
 
 
commit 14c8a75cf3f869d08097ac1f3bce4e1bc369ff6d
Author: Tor Lillqvist 
Date:   Tue Oct 4 13:06:24 2011 +0300

WaE: '==' : unsafe mix of type 'bool' and type 'sal_Bool' in operation

diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 5174498..eb84af5 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -196,7 +196,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
 // !poolable wird gar nicht im Pool gespeichert
 // und itemsets/plain-items je nach Runde
 if ( *itrArr && IsItemFlag(**ppDefItem, SFX_ITEM_POOLABLE) &&
- pImp->bInSetItem == (*ppDefItem)->ISA(SfxSetItem) )
+ pImp->bInSetItem == (bool) (*ppDefItem)->ISA(SfxSetItem) )
 {
 // eigene Kennung, globale Which-Id und Item-Version
 sal_uInt16 nSlotId = GetSlotId( (*ppDefItem)->Which(), 
sal_False );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

2011-10-04 Thread Caolán McNamara 
 scp2/source/ooo/file_library_ooo.scp |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a2623000c16d9f02bb945559a91d5bd76651772a
Author: Caolán McNamara 
Date:   Tue Oct 4 11:00:53 2011 +0100

stray endif

diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index d5b62bc..03e2f93 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -205,7 +205,6 @@ File gid_File_Lib_Cmis
#endif
   #endif
 End
-#endif
 
 #endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc

2011-10-04 Thread Caolán McNamara 
 binfilter/bf_sc/source/core/data/sc_table1.cxx |2 +-
 binfilter/inc/bf_sc/stlpool.hxx|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit efcf85f637bcd7568cacbf6b3ca3c468568d
Author: Caolán McNamara 
Date:   Tue Oct 4 10:45:55 2011 +0100

WaE: unused parameters

diff --git a/binfilter/bf_sc/source/core/data/sc_table1.cxx 
b/binfilter/bf_sc/source/core/data/sc_table1.cxx
index adc9fa4..9e1fb48 100644
--- a/binfilter/bf_sc/source/core/data/sc_table1.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table1.cxx
@@ -502,7 +502,7 @@ extern BOOL bIsOlk, bOderSo;
 
 /*N*/ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, USHORT 
nCol1, USHORT nRow1, USHORT nTab1,
 /*N*/USHORT nCol2, USHORT nRow2, USHORT nTab2, short nDx, 
short nDy, short nDz,
-/*N*/ScDocument* pUndoDoc, BOOL /*bIncludeDraw*/ )
+/*N*/ScDocument* /*pUndoDoc*/, BOOL /*bIncludeDraw*/ )
 /*N*/ {
 /*N*/   if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 )   // print 
ranges: only within the table
 /*N*/   {
diff --git a/binfilter/inc/bf_sc/stlpool.hxx b/binfilter/inc/bf_sc/stlpool.hxx
index 6b35632..4754732 100644
--- a/binfilter/inc/bf_sc/stlpool.hxx
+++ b/binfilter/inc/bf_sc/stlpool.hxx
@@ -68,7 +68,7 @@ protected:
 virtual SfxStyleSheetBase* Create( const String&rName,
SfxStyleFamily   eFamily,
USHORT   nMask);
-virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle ) { 
return NULL; } // DBG_BF_ASSERT
+virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ) { return 
NULL; } // DBG_BF_ASSERT
 
 private:
 SfxStyleSheetBase*  pActualStyleSheet;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-10-04 Thread Bjoern Michaelsen 
 solenv/gbuild/Helper.mk   |3 +++
 solenv/gbuild/Pyuno.mk|6 +-
 solenv/gbuild/platform/ios.mk |4 +++-
 solenv/gbuild/platform/macosx.mk  |4 +++-
 solenv/gbuild/platform/solaris.mk |3 ++-
 solenv/gbuild/platform/unxgcc.mk  |4 +++-
 solenv/gbuild/platform/windows.mk |5 -
 7 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit 27eec46ef7f4dfbd0d3573ab3bc3984510677b12
Author: Bjoern Michaelsen 
Date:   Tue Oct 4 11:30:37 2011 +0200

introduce gb_Helper_OUTDIRLIBDIR

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 675ef20..22aec26 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -184,4 +184,7 @@ endef
 export gb_Helper_set_ld_path
 export gb_Helper_execute
 
+# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker 
need to use
+# for libraries from the OUTDIR
+
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index 2ec6821..b8eb04e 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -23,11 +23,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS),WNT)
-gb_Pyuno__get_outdir_path = bin/pyuno/$(1)
-else
-gb_Pyuno__get_outdir_path = lib/pyuno/$(1)
-endif
+gb_Pyuno__get_outdir_path = $(patsubst 
$(OUTDIR)/%,%,$(gb_Helper_OUTDIRLIBDIR))/pyuno/$(1)
 
 $(call gb_Pyuno_get_target,%) :
$(call gb_Output_announce,$*,$(true),PYU,3)
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 661f25d..8e260d1 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -135,6 +135,8 @@ define gb_Helper_convert_native
 $(1)
 endef
 
+gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
+
 # YaccObject class
 
 define gb_YaccObject__command
@@ -381,7 +383,7 @@ endef
 gb_CppunitTest_CPPTESTPRECOMMAND := :
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .dylib
-gb_CppunitTest_LIBDIR := $(OUTDIR)/lib
+gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index ba1438a..9cf0c87 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -165,6 +165,8 @@ define gb_Helper_convert_native
 $(1)
 endef
 
+gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
+
 # YaccObject class
 
 ifeq ($(CPUNAME),POWERPC)
@@ -473,7 +475,7 @@ endef
 gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .dylib
-gb_CppunitTest_LIBDIR := $(OUTDIR)/lib
+gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
 
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index ad7c5cc..8bcd70e 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -142,6 +142,7 @@ define gb_Helper_convert_native
 $(1)
 endef
 
+gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
 
 # CObject class
 
@@ -344,7 +345,7 @@ endef
 gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .so
-gb_CppunitTest_LIBDIR := $(OUTDIR)/lib
+gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index e64079c..180ff5e 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -213,6 +213,8 @@ define gb_Helper_convert_native
 $(1)
 endef
 
+gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
+
 # YaccObject class
 
 define gb_YaccObject__command
@@ -455,7 +457,7 @@ endef
 gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .so
-gb_CppunitTest_LIBDIR := $(OUTDIR)/lib
+gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
 
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 8546a69..989669f 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -234,6 +234,7 @@ endef
 endif
 
 # Helper class
+
 gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ 
print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ 
print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDI

[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeAndroid.conf libcmis/ExternalLib_libcmis.mk libcmis/libcmis-0.1.0-autotools.patch libcmis/Module_libcmis.mk

2011-10-04 Thread Thorsten Behrens 
 distro-configs/LibreOfficeAndroid.conf |1 +
 libcmis/ExternalLib_libcmis.mk |3 ++-
 libcmis/Module_libcmis.mk  |2 +-
 libcmis/libcmis-0.1.0-autotools.patch  |   29 +
 4 files changed, 33 insertions(+), 2 deletions(-)

New commits:
commit ff04ef4ed7c370a4da4e9467937e5a66450c72cc
Author: Thorsten Behrens 
Date:   Tue Oct 4 11:05:46 2011 +0200

Disable libcmis for Android for the while

diff --git a/distro-configs/LibreOfficeAndroid.conf 
b/distro-configs/LibreOfficeAndroid.conf
index 6075646..45befb1 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -18,4 +18,5 @@
 --without-java
 --without-junit
 --without-ppds
+--without-cmis
 --without-stlport
diff --git a/libcmis/Module_libcmis.mk b/libcmis/Module_libcmis.mk
index 3c0beeb..f311acf 100644
--- a/libcmis/Module_libcmis.mk
+++ b/libcmis/Module_libcmis.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Module_Module,libcmis))
 
-ifneq ($(ENABLE_CMIS),)
+ifeq ($(ENABLE_CMIS),TRUE)
 $(eval $(call gb_Module_add_targets,libcmis,\
ExternalLib_libcmis \
 ))
commit 9c74d5c3f614171dcf045e9b1165a615d3161695
Author: Thorsten Behrens 
Date:   Tue Oct 4 10:27:31 2011 +0200

Initial support for Android

diff --git a/libcmis/ExternalLib_libcmis.mk b/libcmis/ExternalLib_libcmis.mk
index 156b8c3..12f6b74 100644
--- a/libcmis/ExternalLib_libcmis.mk
+++ b/libcmis/ExternalLib_libcmis.mk
@@ -30,8 +30,9 @@ $(eval $(call gb_ExternalLib_ExternalLib,libcmis,autotools))
 
 $(eval $(call 
gb_ExternalLib_set_src_package,libcmis,d821b3cdeba34db1d084b9bd709b3a52-libcmis-0.1.0.tar.gz))
 $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--disable-client))
+$(eval $(call 
gb_ExternalLib_add_patch,libcmis,libcmis/libcmis-0.1.0-autotools.patch))
 
-ifeq ($(OS),MACOSX)
+ifneq ($(filter $(OS),MACOSX ANDROID),)
 
 $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'CPPUNIT_LIBS=""'))
 $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'CPPUNIT_CFLAGS=""'))
diff --git a/libcmis/libcmis-0.1.0-autotools.patch 
b/libcmis/libcmis-0.1.0-autotools.patch
new file mode 100644
index 000..29e492e
--- /dev/null
+++ b/libcmis/libcmis-0.1.0-autotools.patch
@@ -0,0 +1,29 @@
+--- bleh/config.sub2011-09-27 22:48:43.0 +0200
 blah/config.sub2011-10-04 09:26:51.0 +0200
+@@ -4,7 +4,7 @@
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2009-11-20'
++timestamp='2011-10-04'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -123,7 +123,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | 
linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
+   kopensolaris*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+@@ -1294,7 +1294,7 @@
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* 
| -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/inc

2011-10-04 Thread Tor Lillqvist 
 l10ntools/inc/l10ntools/vosapp.hxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit d0889dd36be48a02d4042f6b29ec7e477d95fd19
Author: Tor Lillqvist 
Date:   Tue Oct 4 12:01:57 2011 +0300

WaE: return: conversion from sal_uInt32 to sal_uInt16, possible loss of data

diff --git a/l10ntools/inc/l10ntools/vosapp.hxx 
b/l10ntools/inc/l10ntools/vosapp.hxx
index e8e97fb..ee7d3a4 100644
--- a/l10ntools/inc/l10ntools/vosapp.hxx
+++ b/l10ntools/inc/l10ntools/vosapp.hxx
@@ -18,7 +18,15 @@ public:
 // Urg: Cut & Paste from svapp.cxx: we don't want to depend on vcl
 sal_uInt16 Application::GetCommandLineParamCount()
 {
+#ifdef _MSC_VER
+// Avoid using a cast, instead just disable the warning, sigh...
+#pragma warning (push)
+#pragma warning (disable:4244)
+#endif
 return osl_getCommandArgCount();
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
 }
 
 XubString Application::GetCommandLineParam( sal_uInt16 nParam )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-10-04 Thread Caolán McNamara 
 configure.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b58151b34794b9c2f980310d7e32236652de4a1e
Author: Caolán McNamara 
Date:   Tue Oct 4 09:58:35 2011 +0100

use the same pattern as all the other ones

diff --git a/configure.in b/configure.in
index d08e4c1..0a2970b 100644
--- a/configure.in
+++ b/configure.in
@@ -4628,7 +4628,8 @@ dnl Check for system libcmis
 dnl ===
 if test "x$with_cmis" != "xno" ; then
 AC_MSG_CHECKING([which libcmis to use])
-if test "x$with_system_libcmis" != "xno"; then
+if test -n "$with_system_libcmis" -o -n "$with_system_libs" && \
+test "$with_system_libcmis" != "no"; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBCMIS=YES
 PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-10-04 Thread Tomáš Chvátal 
 configure.in |   26 ++
 1 file changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 05c008e3fb8aef19d3fa521859dd40d40e1eb9e0
Author: Tomas Chvatal 
Date:   Tue Oct 4 10:42:36 2011 +0200

Wrap the cmis system/internal check into global feature switch.

diff --git a/configure.in b/configure.in
index 911aed2..d08e4c1 100644
--- a/configure.in
+++ b/configure.in
@@ -4626,19 +4626,21 @@ AC_SUBST(LIBVISIO_LIBS)
 dnl ===
 dnl Check for system libcmis
 dnl ===
-AC_MSG_CHECKING([which libcmis to use])
-if test "x$with_system_libcmis" != "xno"; then
-AC_MSG_RESULT([external])
-SYSTEM_LIBCMIS=YES
-PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 )
-else
-AC_MSG_RESULT([internal])
-SYSTEM_LIBCMIS=NO
-BUILD_TYPE="$BUILD_TYPE LIBCMIS"
+if test "x$with_cmis" != "xno" ; then
+AC_MSG_CHECKING([which libcmis to use])
+if test "x$with_system_libcmis" != "xno"; then
+AC_MSG_RESULT([external])
+SYSTEM_LIBCMIS=YES
+PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 )
+else
+AC_MSG_RESULT([internal])
+SYSTEM_LIBCMIS=NO
+BUILD_TYPE="$BUILD_TYPE LIBCMIS"
+fi
+AC_SUBST(SYSTEM_LIBCMIS)
+AC_SUBST(LIBCMIS_CFLAGS)
+AC_SUBST(LIBCMIS_LIBS)
 fi
-AC_SUBST(SYSTEM_LIBCMIS)
-AC_SUBST(LIBCMIS_CFLAGS)
-AC_SUBST(LIBCMIS_LIBS)
 
 
 dnl ===
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-10-04 Thread Tomáš Chvátal 
 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8aaa52f21fc20f3266c4b6a13422e7e35bc8d34d
Author: Tomas Chvatal 
Date:   Tue Oct 4 10:32:15 2011 +0200

The system-libs switch should not be done here yet.

diff --git a/configure.in b/configure.in
index c8b3d02..911aed2 100644
--- a/configure.in
+++ b/configure.in
@@ -4627,7 +4627,7 @@ dnl 
===
 dnl Check for system libcmis
 dnl ===
 AC_MSG_CHECKING([which libcmis to use])
-if test "x$with_system_libcmis" != "xno" -o -n "$with_system_libs"; then
+if test "x$with_system_libcmis" != "xno"; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBCMIS=YES
 PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-10-04 Thread Tomáš Chvátal 
 configure.in |1 -
 1 file changed, 1 deletion(-)

New commits:
commit ab0c5e94146711a7e2fd8cd953a63854c8f53740
Author: Tomas Chvatal 
Date:   Tue Oct 4 10:23:25 2011 +0200

Cosmetics: remove stray yes

This removes result for check on cups,
it is required as other checkers already print yes/no during the
test, even if it seems like the command is now "unresulted".

diff --git a/configure.in b/configure.in
index 6501529..c8b3d02 100644
--- a/configure.in
+++ b/configure.in
@@ -2378,7 +2378,6 @@ if test "$test_cups" = "yes"; then
 if test "$ac_cv_lib_cups_cupsPrintFiles" != "yes" -a 
"$ac_cv_header_cups_cups_h" != "yes"; then
 AC_MSG_ERROR([Could not find CUPS. Install libcupsys2-dev or 
cups???-devel.])
 fi
-AC_MSG_RESULT([yes])
 fi
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: tools/bootstrp

2011-10-04 Thread Tor Lillqvist 
 tools/bootstrp/prj.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit c2e8470f17f6152e34f92361e74774b83a2804c2
Author: Tor Lillqvist 
Date:   Tue Oct 4 11:27:00 2011 +0300

WaE: 'argument' : conversion from 'sal_Int32' to 'sal_uInt16'

Just disable the warning then instead to avoid ugly casts.

diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index 0f15bb7..d6432e9 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -62,7 +62,15 @@ rtl::OString SimpleConfig::getNext()
 return rtl::OString();
 
 rtl::OString aString = comphelper::string::getToken(aStringBuffer, 0, 
'\t');
-aStringBuffer.Erase(0, (sal_uInt16)aString.getLength()+1);
+
+#ifdef _MSC_VER
+#pragma warning (push)
+#pragma warning (disable:4244)
+#endif
+aStringBuffer.Erase(0, aString.getLength()+1);
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
 
 aStringBuffer.EraseLeadingChars( '\t' );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - binaryurp/qa rsc/Executable_rsc.mk tools/source

2011-10-04 Thread Tor Lillqvist 
 binaryurp/qa/test-unmarshal.cxx |   12 ++--
 rsc/Executable_rsc.mk   |2 ++
 tools/source/stream/stream.cxx  |   10 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 588a0d58d238e33a937641252b64020cec2a2af7
Author: Tor Lillqvist 
Date:   Tue Oct 4 11:07:46 2011 +0300

Silly attempts at humour not appreciated

diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 6cc226a..afaa917 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1154,7 +1154,7 @@ sal_Size SvStream::SeekRel( sal_sSize nPos )
 
 SvStream& SvStream::operator>>(sal_uInt16& r)
 {
-sal_uInt16 n = 666;
+sal_uInt16 n = 0;
 READNUMBER_WITHOUT_SWAP(sal_uInt16, n)
 if (good())
 {
@@ -1167,7 +1167,7 @@ SvStream& SvStream::operator>>(sal_uInt16& r)
 
 SvStream& SvStream::operator>>(sal_uInt32& r)
 {
-sal_uInt32 n = 42;
+sal_uInt32 n = 0;
 READNUMBER_WITHOUT_SWAP(sal_uInt32, n)
 if (good())
 {
@@ -1181,7 +1181,7 @@ SvStream& SvStream::operator>>(sal_uInt32& r)
 
 SvStream& SvStream::operator>>(sal_uInt64& r)
 {
-sal_uInt64 n = 0xDEADCAFEBABE;
+sal_uInt64 n = 0;
 READNUMBER_WITHOUT_SWAP(sal_uInt64, n)
 if (good())
 {
@@ -1200,7 +1200,7 @@ SvStream& SvStream::operator >>(long& r) //puke!, kill 
this
 if (good())
 r = n;
 #else
-long n = 0; // Ran out of "fun" numbers
+long n = 0;
 READNUMBER_WITHOUT_SWAP(long, n)
 if (good())
 {
@@ -1287,7 +1287,7 @@ SvStream& SvStream::operator>>( unsigned char& r )
 
 SvStream& SvStream::operator>>(float& r)
 {
-float n = 3.14159265358979323846f;
+float n = 0;
 READNUMBER_WITHOUT_SWAP(float, n)
 if (good())
 {
commit 40b0fcec20a027ed5fe1db552cdad3220f39f586
Author: Tor Lillqvist 
Date:   Tue Oct 4 11:04:01 2011 +0300

WaE: 'static_cast' : truncation of constant value

diff --git a/binaryurp/qa/test-unmarshal.cxx b/binaryurp/qa/test-unmarshal.cxx
index 74ee12c..3e8aac3 100644
--- a/binaryurp/qa/test-unmarshal.cxx
+++ b/binaryurp/qa/test-unmarshal.cxx
@@ -69,9 +69,9 @@ private:
 void Test::testTypeOfBooleanSequence() {
 binaryurp::ReaderState state;
 css::uno::Sequence< sal_Int8 > buf(13);
-buf[0] = static_cast< sal_Int8 >(20 | 0x80); // sequence type | cache flag
-buf[1] = static_cast< sal_Int8 >(binaryurp::cache::ignore >> 8);
-buf[2] = static_cast< sal_Int8 >(binaryurp::cache::ignore & 0xFF);
+buf[0] = static_cast< sal_Int8 >(static_cast< sal_uInt8 >(20 | 0x80)); // 
sequence type | cache flag
+buf[1] = static_cast< sal_Int8 >(static_cast< sal_uInt8 
>(binaryurp::cache::ignore >> 8));
+buf[2] = static_cast< sal_Int8 >(static_cast< sal_uInt8 
>(binaryurp::cache::ignore & 0xFF));
 buf[3] = RTL_CONSTASCII_LENGTH("[]boolean");
 buf[4] = '[';
 buf[5] = ']';
@@ -94,9 +94,9 @@ void Test::testTypeOfBooleanSequence() {
 void Test::testTypeOfVoidSequence() {
 binaryurp::ReaderState state;
 css::uno::Sequence< sal_Int8 > buf(10);
-buf[0] = static_cast< sal_Int8 >(20 | 0x80); // sequence type | cache flag
-buf[1] = static_cast< sal_Int8 >(binaryurp::cache::ignore >> 8);
-buf[2] = static_cast< sal_Int8 >(binaryurp::cache::ignore & 0xFF);
+buf[0] = static_cast< sal_Int8 >(static_cast< sal_uInt8 >(20 | 0x80)); // 
sequence type | cache flag
+buf[1] = static_cast< sal_Int8 >(static_cast< sal_uInt8 
>(binaryurp::cache::ignore >> 8));
+buf[2] = static_cast< sal_Int8 >(static_cast< sal_uInt8 
>(binaryurp::cache::ignore & 0xFF));
 buf[3] = RTL_CONSTASCII_LENGTH("[]void");
 buf[4] = '[';
 buf[5] = ']';
commit 9b45575e89e09db5df0750da29f8c88c479805bd
Author: Tor Lillqvist 
Date:   Tue Oct 4 10:52:43 2011 +0300

WaE: C++ exception handler used, but unwind semantics are not enabled

So override the T_CXXFLAGS for the yacc-generated source file to use
gb_LinkTarget_EXCEPTIONFLAGS. Seems to work.

diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index 651677d..c95678d 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -58,6 +58,8 @@ $(eval $(call gb_Executable_add_grammars,rsc,\
rsc/source/parser/rscyacc \
 ))
 
+$(call gb_YaccObject_get_target,rsc/source/parser/rscyacc): T_CXXFLAGS := 
$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
+
 $(eval $(call gb_Executable_add_exception_objects,rsc,\
rsc/source/parser/erscerr \
rsc/source/parser/rscdb \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - editeng/inc editeng/source linguistic/source lotuswordpro/source solenv/gbuild svl/inc svl/source svtools/inc svtools/source svx/inc svx/source tools/inc tools/sou

2011-10-04 Thread Caolán McNamara 
 editeng/inc/editeng/editeng.hxx  |4 
 editeng/source/editeng/editeng.cxx   |   40 
 linguistic/source/lngopt.cxx |  155 ---
 linguistic/source/lngopt.hxx |   10 -
 lotuswordpro/source/filter/lwpfont.cxx   |   28 ---
 lotuswordpro/source/filter/lwpfont.hxx   |4 
 lotuswordpro/source/filter/xfilter/xffontfactory.cxx |6 
 solenv/gbuild/CppunitTest.mk |2 
 svl/inc/svl/zforlist.hxx |4 
 svl/source/numbers/zforlist.cxx  |   22 --
 svtools/inc/svtools/taskbar.hxx  |2 
 svtools/source/control/taskbar.cxx   |   21 --
 svx/inc/svx/galbrws.hxx  |1 
 svx/inc/svx/gallery.hxx  |7 
 svx/source/gallery2/galbrws.cxx  |7 
 svx/source/gallery2/galexpl.cxx  |   67 
 tools/inc/tools/fract.hxx|1 
 tools/source/generic/fract.cxx   |   45 -
 unusedcode.easy  |   19 --
 vcl/inc/vcl/msgbox.hxx   |3 
 vcl/source/window/msgbox.cxx |   15 -
 21 files changed, 7 insertions(+), 456 deletions(-)

New commits:
commit 7c1a74b62ec33d6994445a7fb9d91088b3067316
Author: Caolán McNamara 
Date:   Tue Oct 4 08:56:30 2011 +0100

regenerate list

diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 047a4ca..cafaba9 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -99,25 +99,6 @@ LinguOptions::~LinguOptions()
 }
 }
 
-
-sal_Bool LinguOptions::SetLocale_Impl( sal_Int16 &rLanguage, Any &rOld, const 
Any &rVal, sal_Int16 nType)
-{
-sal_Bool bRes = sal_False;
-
-Locale  aNew;
-rVal >>= aNew;
-sal_Int16 nNew = 
MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aNew),
 nType);
-if (nNew != rLanguage)
-{
-Locale  aLocale( CreateLocale( rLanguage ) );
-rOld.setValue( &aLocale, ::getCppuType((Locale*)0 ));
-rLanguage = nNew;
-bRes = sal_True;
-}
-
-return bRes;
-}
-
 struct WID_Name
 {
 sal_Int32nWID;
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index f7d6948..1e0fa9f 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -68,12 +68,6 @@ class LinguOptions
 static SvtLinguOptions *pData;
 static oslInterlockedCount  nRefCount;  // number of objects of this class
 
-//! uses default assignment-operator
-
-sal_Bool SetLocale_Impl( sal_Int16 &rLanguage,
-::com::sun::star::uno::Any &rOld,
-const ::com::sun::star::uno::Any &rVal, sal_Int16 nType );
-
 public:
 LinguOptions();
 LinguOptions(const LinguOptions &rOpt);
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a463b76..e75ce4d 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -41,7 +41,7 @@ gb_CppunitTest__interactive := $(true)
 endif
 
 ifneq ($(strip $(VALGRIND)),)
-gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50
+gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 
--leak-check=full
 ifeq ($(strip $(VALGRIND)),memcheck)
 G_SLICE := always-malloc
 export G_SLICE
diff --git a/svx/inc/svx/galbrws.hxx b/svx/inc/svx/galbrws.hxx
index 1fd7c5e..2d9c20a 100644
--- a/svx/inc/svx/galbrws.hxx
+++ b/svx/inc/svx/galbrws.hxx
@@ -108,7 +108,6 @@ public:
 INetURLObject   GetURL() const;
 String  GetFilterName() const;
 Graphic GetGraphic() const;
-sal_BoolGetVCDrawModel( FmFormModel& rModel ) const;
 sal_BoolIsLinkage() const;
 
 sal_BoolKeyInput( const KeyEvent& rKEvt, Window* 
pWindow );
diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx
index a04659d..eb2b604 100644
--- a/svx/inc/svx/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
@@ -253,8 +253,6 @@ public:
Graphic* pGraphic = NULL, 
Bitmap* pThumb = NULL,
sal_Bool bProgess = sal_False );
 
-static sal_Bool InsertGraphicObj( const String& 
rThemeName, const Graphic& rGraphic );
-
 static sal_uIntPtr  GetSdrObjCount( const String& rThemeName );
 static sal_uIntPtr  GetSdrObjCount( sal_uIntPtr nThemeId );
 
@@ -263,8 +261,6 @@ public:
 static sal_Bool GetSdrObj( sal_uIntPtr nThemeId, 
sal_uIntPtr nSdrModelPos,
SdrModel* pModel = NULL, Bitmap* 
pThumb = NULL );
 
-static sal_Bool InsertSdrObj( const String& rThemeNam

[Libreoffice-commits] .: configure.in

2011-10-04 Thread Tomáš Chvátal 
 configure.in |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f1d4ce6ea51574a0f0a80c4c9ed2ddbc356fbec0
Author: Tomas Chvatal 
Date:   Tue Oct 4 09:57:00 2011 +0200

Use with rather than enable for cims switch.

It pulls external library and does not just switch some internal
feature.

Add proper bool logic to the conditional because by default
we consider it requested unless proven otherwise.
Sort out internal/external switch to also support system-libs switch.

diff --git a/configure.in b/configure.in
index 550b3a2..6501529 100644
--- a/configure.in
+++ b/configure.in
@@ -519,14 +519,14 @@ AC_ARG_ENABLE(release-build,
  See http://wiki.documentfoundation.org/DevBuild]),
 ,)
 
-AC_ARG_ENABLE(cmis,
-AS_HELP_STRING([--disable-cmis],
-[Disable CMIS experimental feature.]),
-,enable_cmis=yes)
-
 dnl ===
 dnl Optional Packages (--with/without-)
 dnl ===
+AC_ARG_WITH(cmis,
+AS_HELP_STRING([--without-cmis],
+[Disable experimental CMIS interface.]),
+)
+
 AC_ARG_WITH(gnu-patch,
 AS_HELP_STRING([--with-gnu-patch],
 [Specify location of GNU patch on Solaris or FreeBSD.]),
@@ -4628,7 +4628,7 @@ dnl 
===
 dnl Check for system libcmis
 dnl ===
 AC_MSG_CHECKING([which libcmis to use])
-if test -n "$with_system_libcmis" -a "$with_system_libcmis" = "yes"; then
+if test "x$with_system_libcmis" != "xno" -o -n "$with_system_libs"; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBCMIS=YES
 PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 )
@@ -7029,7 +7029,7 @@ fi
 AC_SUBST(ENABLE_CAIRO_CANVAS)
 
 ENABLE_CMIS="FALSE"
-if test "$enable_cmis" = "yes" ; then
+if test "x$with_cmis" != "xno" ; then
ENABLE_CMIS="TRUE"
 fi
 AC_SUBST(ENABLE_CMIS)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryExternal.mk scripting/Jar_ScriptProviderForBeanShell.mk

2011-10-04 Thread David Tardon 
 RepositoryExternal.mk   |   14 ++
 scripting/Jar_ScriptProviderForBeanShell.mk |5 -
 2 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 3bcf910cde3fb26afe1ce116d97bd54b25c1e4ef
Author: David Tardon 
Date:   Tue Oct 4 09:44:48 2011 +0200

bsh can be external

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1cc9c75..edaf6bf 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -847,5 +847,19 @@ endef
 
 endif # SYSTEM_SAXON
 
+ifeq ($(SYSTEM_BSH),YES)
+
+define gb_JavaClassSet__use_bsh
+$(call gb_JavaClassSet_add_system_jar,$(1),$(BSH_JAR))
+endef
+
+else # !SYSTEM_BSH
+
+define gb_JavaClassSet__use_bsh
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/bsh.jar)
+endef
+
+endif # SYSTEM_BSH
+
 
 # vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk 
b/scripting/Jar_ScriptProviderForBeanShell.mk
index 87e2cb9..e81f5b0 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -34,7 +34,10 @@ $(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/unoil.jar \
$(OUTDIR)/bin/ScriptFramework.jar \
-   $(OUTDIR)/bin/bsh.jar \
+))
+
+$(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\
+   bsh \
 ))
 
 $(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2011-10-04 Thread Jan Holesovsky 
 i18npool/source/breakiterator/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 28a9c86fface5d4674d9f47d92e6eee8cacf2087
Author: Jan Holesovsky 
Date:   Tue Oct 4 09:42:28 2011 +0200

Fix typo (SYSTEM_GENCODE, instead of SYSTEM_GENCCODE).

diff --git a/i18npool/source/breakiterator/Makefile 
b/i18npool/source/breakiterator/Makefile
index e292258..011dd6f 100644
--- a/i18npool/source/breakiterator/Makefile
+++ b/i18npool/source/breakiterator/Makefile
@@ -49,7 +49,7 @@ else
 GENBRK := $(SYSTEM_GENBRK)
 endif
 
-ifeq ($(SYSTEM_GENCODE),)
+ifeq ($(SYSTEM_GENCCODE),)
 GENCCODE := $(gb_Helper_execute)genccode
 else
 GENCCODE := $(SYSTEM_GENCCODE)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-10-04 Thread Cédric Bosdonnat 
 configure.in   |   16 
 libcmis/Module_libcmis.mk  |2 ++
 postprocess/packcomponents/makefile.mk |4 
 scp2/source/ooo/file_library_ooo.scp   |6 +++---
 scp2/source/ooo/module_hidden_ooo.scp  |4 +++-
 set_soenv.in   |1 +
 ucb/prj/build.lst  |2 +-
 ucb/source/ucp/cmis/makefile.mk|3 +++
 8 files changed, 29 insertions(+), 9 deletions(-)

New commits:
commit c45f59f062eb135463ea8ce0a06950eb9a6dfec2
Author: Cédric Bosdonnat 
Date:   Mon Oct 3 14:12:19 2011 +0200

Revert "Don't bother with libcmis on Windows for now"

This reverts commit 0dd1e3b1240e4d5a2c9ac6de0348658918e012a8. Use
--disable-cmis now to avoid building all CMIS-related code.

diff --git a/configure.in b/configure.in
index 2b58f78..550b3a2 100644
--- a/configure.in
+++ b/configure.in
@@ -4632,13 +4632,10 @@ if test -n "$with_system_libcmis" -a 
"$with_system_libcmis" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBCMIS=YES
 PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 )
-elif test $_os != WINNT; then
+else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBCMIS=NO
 BUILD_TYPE="$BUILD_TYPE LIBCMIS"
-else
-AC_MSG_RESULT([none])
-SYSTEM_LIBCMIS=YES
 fi
 AC_SUBST(SYSTEM_LIBCMIS)
 AC_SUBST(LIBCMIS_CFLAGS)
diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst
index 5fc0179..350d3f9 100644
--- a/ucb/prj/build.lst
+++ b/ucb/prj/build.lst
@@ -16,7 +16,7 @@ ucucb\source\ucp\tdoc nmake   -   
all uc_tdoc uc_inc NULL
 uc ucb\source\ucp\expand   nmake   -   all uc_expand 
uc_inc NULL
 uc ucb\source\ucp\ext  nmake   -   all uc_ext 
uc_inc NULL
 uc ucb\source\ucp\odma nmake   -   w   uc_odma 
uc_inc NULL
-uc ucb\source\ucp\cmis nmake   -   u   uc_cmis 
uc_inc NULL
+uc ucb\source\ucp\cmis nmake   -   all uc_cmis 
uc_inc NULL
 #uc  ucb\qa\complex\ucb  nmake   -   all 
uc_complex_ucb uc_inc NULL
 # fails, please fix
 # uc  ucb\qa\complex\tdoc nmake   -   all 
uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL
commit 5bd2890a56125d391b42f34d51e2e0c57b0a80b0
Author: Cédric Bosdonnat 
Date:   Mon Oct 3 14:10:10 2011 +0200

Added --disable-cmis flag for use while the feature is too unstable

diff --git a/configure.in b/configure.in
index f05a9bd..2b58f78 100644
--- a/configure.in
+++ b/configure.in
@@ -519,6 +519,11 @@ AC_ARG_ENABLE(release-build,
  See http://wiki.documentfoundation.org/DevBuild]),
 ,)
 
+AC_ARG_ENABLE(cmis,
+AS_HELP_STRING([--disable-cmis],
+[Disable CMIS experimental feature.]),
+,enable_cmis=yes)
+
 dnl ===
 dnl Optional Packages (--with/without-)
 dnl ===
@@ -7026,6 +7031,12 @@ if test "$enable_cairo_canvas" = "yes" ; then
 fi
 AC_SUBST(ENABLE_CAIRO_CANVAS)
 
+ENABLE_CMIS="FALSE"
+if test "$enable_cmis" = "yes" ; 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 0cf0d04..3c0beeb 100644
--- a/libcmis/Module_libcmis.mk
+++ b/libcmis/Module_libcmis.mk
@@ -27,9 +27,11 @@
 
 $(eval $(call gb_Module_Module,libcmis))
 
+ifneq ($(ENABLE_CMIS),)
 $(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 8b42349..8d6a363 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -221,6 +221,10 @@ my_components += gconfbe1
 my_components += ucpgio
 .END
 
+.IF "$(ENABLE_CMIS)" != ""
+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 0377940..d5b62bc 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -186,8 +186,7 @@ End
 
 #endif
 
-#ifndef WNT
-
+#if ENABLE_CMIS
 File gid_File_Lib_Cmis
 TXT_FILE_BODY;
 Styles = (PACKED);
@@ -206,6 +205,7 @@ File gid_File_Lib_Cmis
#endif
   #endif
 End
+#endif
 
 #endif
 
@@ -1356,7 +1356,7 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, 
ucpexpand1.uno)
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
 #endif
 
-#ifndef WNT
+#if ENABLE_CMIS
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
 #endif
 
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.

[Libreoffice-commits] .: 4 commits - tools/bootstrp tools/source

2011-10-04 Thread Tor Lillqvist 
 tools/bootstrp/prj.cxx  |2 +-
 tools/source/fsys/dirent.cxx|6 ++
 tools/source/generic/config.cxx |6 +++---
 tools/source/stream/stream.cxx  |   16 +---
 4 files changed, 19 insertions(+), 11 deletions(-)

New commits:
commit bee695a32d1bd6aad54372e3c6971b1067e35409
Author: Tor Lillqvist 
Date:   Tue Oct 4 10:25:32 2011 +0300

WaE: potentially uninitialized local variable 'n' used

diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 4609e65..6cc226a 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1154,7 +1154,7 @@ sal_Size SvStream::SeekRel( sal_sSize nPos )
 
 SvStream& SvStream::operator>>(sal_uInt16& r)
 {
-sal_uInt16 n;
+sal_uInt16 n = 666;
 READNUMBER_WITHOUT_SWAP(sal_uInt16, n)
 if (good())
 {
@@ -1167,7 +1167,7 @@ SvStream& SvStream::operator>>(sal_uInt16& r)
 
 SvStream& SvStream::operator>>(sal_uInt32& r)
 {
-sal_uInt32 n;
+sal_uInt32 n = 42;
 READNUMBER_WITHOUT_SWAP(sal_uInt32, n)
 if (good())
 {
@@ -1181,7 +1181,7 @@ SvStream& SvStream::operator>>(sal_uInt32& r)
 
 SvStream& SvStream::operator>>(sal_uInt64& r)
 {
-sal_uInt64 n;
+sal_uInt64 n = 0xDEADCAFEBABE;
 READNUMBER_WITHOUT_SWAP(sal_uInt64, n)
 if (good())
 {
@@ -1200,7 +1200,7 @@ SvStream& SvStream::operator >>(long& r) //puke!, kill 
this
 if (good())
 r = n;
 #else
-long n;
+long n = 0; // Ran out of "fun" numbers
 READNUMBER_WITHOUT_SWAP(long, n)
 if (good())
 {
@@ -1214,7 +1214,7 @@ SvStream& SvStream::operator >>(long& r) //puke!, kill 
this
 
 SvStream& SvStream::operator>>(short& r)
 {
-short n;
+short n = 0;
 READNUMBER_WITHOUT_SWAP(short, n)
 if (good())
 {
@@ -1227,7 +1227,7 @@ SvStream& SvStream::operator>>(short& r)
 
 SvStream& SvStream::operator>>(int& r)
 {
-int n;
+int n = 0;
 READNUMBER_WITHOUT_SWAP(int, n)
 if (good())
 {
@@ -1287,7 +1287,7 @@ SvStream& SvStream::operator>>( unsigned char& r )
 
 SvStream& SvStream::operator>>(float& r)
 {
-float n;
+float n = 3.14159265358979323846f;
 READNUMBER_WITHOUT_SWAP(float, n)
 if (good())
 {
commit c963747ed858007967f83d0a1f67cdcc57b3d695
Author: Tor Lillqvist 
Date:   Tue Oct 4 10:16:29 2011 +0300

WaE: unreferenced formal parameter

diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index ca3d004..4609e65 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1310,6 +1310,8 @@ SvStream& SvStream::operator>>(double& r)
 if (bSwap)
   SwapDouble(n);
 r = n;
+#else
+(void) r;
 #endif
 }
 return *this;
commit 9a113a7d931f140b6a8e7f57937d51063244b1c8
Author: Tor Lillqvist 
Date:   Tue Oct 4 09:44:04 2011 +0300

WaE: unreachable code, we always return in preceding code

diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index c27de5f..95fcd32 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -2084,7 +2084,13 @@ FSysError DirEntry::MoveTo( const DirEntry& rNewName ) 
const
 }
 #endif
 #endif
+
+// For the WNT case we always return already above, so avoid warning
+// C4702: unreachable code. Possibly also in non-WNT cases we always
+// return already above, but gcc apparently doesn't mind.
+#ifndef WNT
 return ERRCODE_NONE;
+#endif
 }
 
 #endif
commit b558502c96a779e9bd46b71903c7537da0d07f17
Author: Tor Lillqvist 
Date:   Tue Oct 4 09:39:32 2011 +0300

WaE: conversion from 'sal_Int32' to 'sal_uInt16', possible loss of data

diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index 391f4a6..0f15bb7 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -62,7 +62,7 @@ rtl::OString SimpleConfig::getNext()
 return rtl::OString();
 
 rtl::OString aString = comphelper::string::getToken(aStringBuffer, 0, 
'\t');
-aStringBuffer.Erase(0, aString.getLength()+1);
+aStringBuffer.Erase(0, (sal_uInt16)aString.getLength()+1);
 
 aStringBuffer.EraseLeadingChars( '\t' );
 
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index d72ed8a..6b89751 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -453,9 +453,9 @@ static sal_uInt8* ImplGetConfigBuffer( const 
ImplConfigData* pData, sal_uIntPtr&
 ImplKeyData*pKey;
 ImplGroupData*  pGroup;
 unsigned intnBufLen;
-sal_uInt16  nValueLen;
-sal_uInt16  nKeyLen;
-sal_uInt16  nLineEndLen;
+sal_uInt32  nValueLen;
+sal_uInt32  nKeyLen;
+sal_uInt32  nLineEndLen;
 
 if ( pData->meLineEnd == LINEEND_CR )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svl/source

2011-10-04 Thread David Tardon 
 svl/source/items/nranges.cxx |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 59abf8c506b0e06b4a8d4e6fbc7ef22f978c3b06
Author: David Tardon 
Date:   Tue Oct 4 09:18:08 2011 +0200

we do not need the counter now

diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx
index 38b9e01..ae0f86a 100644
--- a/svl/source/items/nranges.cxx
+++ b/svl/source/items/nranges.cxx
@@ -75,34 +75,34 @@ NUMTYPE InitializeRanges_Impl( NUMTYPE *&rpRanges, va_list 
pArgs,
 
 {
 NUMTYPE nSize = 0, nIns = 0;
-sal_uInt16 nCnt = 0;
 std::vector aNumArr;
 aNumArr.push_back( nWh1 );
 aNumArr.push_back( nWh2 );
 DBG_ASSERT( nWh1 <= nWh2, "Ungueltiger Bereich" );
 nSize += nWh2 - nWh1 + 1;
 aNumArr.push_back( nNull );
-nCnt = aNumArr.size();
+bool bEndOfRange = false;
 while ( 0 !=
 ( nIns =
   sal::static_int_cast< NUMTYPE >(
   va_arg( pArgs, NUMTYPE_ARG ) ) ) )
 {
-aNumArr.push_back( nIns );
-++nCnt;
-if ( 0 == (nCnt & 1) )   // 4,6,8, usw.
+bEndOfRange = !bEndOfRange;
+if ( bEndOfRange )
 {
-DBG_ASSERT( aNumArr[ nCnt-2 ] <= nIns, "Ungueltiger Bereich" );
-nSize += nIns - aNumArr[ nCnt-2 ] + 1;
+const NUMTYPE nPrev(*aNumArr.rbegin());
+DBG_ASSERT( nPrev <= nIns, "Ungueltiger Bereich" );
+nSize += nIns - nPrev + 1;
 }
+aNumArr.push_back( nIns );
 }
 
-DBG_ASSERT( 0 == (nCnt & 1), "ungerade Anzahl von Which-Paaren!" );
+DBG_ASSERT( bEndOfRange, "ungerade Anzahl von Which-Paaren!" );
 
 // so, jetzt sind alle Bereiche vorhanden und
-rpRanges = new NUMTYPE[ nCnt+1 ];
-std::copy( aNumArr.begin(), aNumArr.begin()+nCnt, rpRanges);
-*(rpRanges+nCnt) = 0;
+rpRanges = new NUMTYPE[ aNumArr.size() + 1 ];
+std::copy( aNumArr.begin(), aNumArr.end(), rpRanges);
+*(rpRanges + aNumArr.size()) = 0;
 
 return nSize;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits