[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Jan Holesovsky]

 solenv/gbuild/gbuild.mk |2 +-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9c4d6da729a882f1e5ddfb48e2fad7495449ff0b
Author: Jan Holesovsky 
Date:   Thu Dec 8 23:55:45 2011 +0100

i18npool on Windows needed more fixes.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..256261c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -311,7 +311,7 @@ gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $$(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 809d83c..5f8fb1c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE) && $(subst 
$(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
 $(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst 
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst 
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst 
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst 
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst 
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)
 endef
 
-gb_Helper_set_ld_path := PATH=\"$${PATH}:$(OUTDIR)/bin\"
+gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
 
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

[August Sodora]

 basctl/source/basicide/basides1.cxx |2 -
 basctl/source/basicide/bastype2.cxx |2 -
 basctl/source/basicide/bastype3.cxx |2 -
 basctl/source/basicide/bastypes.cxx |   40 ++--
 basctl/source/basicide/moduldl2.cxx |6 ++---
 basctl/source/basicide/moduldlg.cxx |2 -
 basctl/source/inc/bastypes.hxx  |   12 +-
 7 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 9c2f9c79aca1e1dc0670d6443fd7865b8dc1ee63
Author: August Sodora 
Date:   Fri Dec 9 00:50:03 2011 -0500

String->OUString

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 9846e6c..b9245db 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -550,7 +550,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
 Reference< script::XLibraryContainerPassword > xPasswd( 
xModLibContainer, UNO_QUERY );
 if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( 
aLibName ) && !xPasswd->isLibraryPasswordVerified( aLibName ) )
 {
-String aPassword;
+::rtl::OUString aPassword;
 bOK = QueryPassword( xModLibContainer, aLibName, 
aPassword );
 }
 }
diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 15ce341..c3ce38a 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -661,7 +661,7 @@ long BasicTreeListBox::ExpandingHdl()
 Reference< script::XLibraryContainerPassword > xPasswd( 
xModLibContainer, UNO_QUERY );
 if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( 
aLibName ) && !xPasswd->isLibraryPasswordVerified( aLibName ) )
 {
-String aPassword;
+::rtl::OUString aPassword;
 bOK = QueryPassword( xModLibContainer, aLibName, 
aPassword );
 }
 }
diff --git a/basctl/source/basicide/bastype3.cxx 
b/basctl/source/basicide/bastype3.cxx
index 0edbddc..9f41a7a 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -78,7 +78,7 @@ void BasicTreeListBox::RequestingChildren( SvLBoxEntry* 
pEntry )
 Reference< script::XLibraryContainerPassword > xPasswd( 
xModLibContainer, UNO_QUERY );
 if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( 
aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) )
 {
-String aPassword;
+::rtl::OUString aPassword;
 bOK = QueryPassword( xModLibContainer, aLibName, aPassword );
 }
 }
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index ca6b97a..c019142 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -756,43 +757,43 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey& rKey )
 return pItem;
 }
 
-bool QueryDel( const String& rName, const ResId& rId, Window* pParent )
+bool QueryDel( const ::rtl::OUString& rName, const ResId& rId, Window* pParent 
)
 {
-String aQuery( rId );
-String aName( rName );
-aName += '\'';
-aName.Insert( '\'', 0 );
-aQuery.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "XX" ) ), 
aName );
+::rtl::OUString aQuery( ResId::toString(rId) );
+::rtl::OUStringBuffer aNameBuf( rName );
+aNameBuf.append('\'');
+aNameBuf.insert(0, '\'');
+aQuery = ::comphelper::string::replace(aQuery, 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "XX")), 
aNameBuf.makeStringAndClear());
 QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_YES, aQuery );
 return ( aQueryBox.Execute() == RET_YES );
 }
 
-bool QueryDelMacro( const String& rName, Window* pParent )
+bool QueryDelMacro( const ::rtl::OUString& rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYDELMACRO ), pParent );
 }
 
-bool QueryReplaceMacro( const String& rName, Window* pParent )
+bool QueryReplaceMacro( const ::rtl::OUString& rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYREPLACEMACRO ), pParent );
 }
 
-bool QueryDelDialog( const String& rName, Window* pParent )
+bool QueryDelDialog( const ::rtl::OUString& rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYDELDIALOG ), pParent );
 }
 
-bool QueryDelLib( const String& rName, bool bRef, Window* pParent )
+bool QueryDelLib( const ::rtl::OUString& rName, bool bRef, Window* pParent )
 {
 return QueryDel( rName, IDEResId( bRef ? RID_STR_QUERYDELLIBREF : 
RID_STR_QUERYDELLIB ), pParent );
 }
 
-bool QueryDelModule( const String& rName, Window* pParent )
+bool QueryDelModule( con

[Libreoffice-commits] .: basctl/source

[August Sodora]

 basctl/source/basicide/bastypes.cxx |   20 +---
 basctl/source/inc/bastypes.hxx  |   12 ++--
 2 files changed, 15 insertions(+), 17 deletions(-)

New commits:
commit 7ffca8ed2ed7dda9d74edb498ec74620e9489c7a
Author: August Sodora 
Date:   Fri Dec 9 00:15:26 2011 -0500

sal_Bool to bool

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 21dfce9..ca6b97a 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -756,7 +756,7 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey& rKey )
 return pItem;
 }
 
-sal_Bool QueryDel( const String& rName, const ResId& rId, Window* pParent )
+bool QueryDel( const String& rName, const ResId& rId, Window* pParent )
 {
 String aQuery( rId );
 String aName( rName );
@@ -764,39 +764,37 @@ sal_Bool QueryDel( const String& rName, const ResId& rId, 
Window* pParent )
 aName.Insert( '\'', 0 );
 aQuery.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "XX" ) ), 
aName );
 QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_YES, aQuery );
-if ( aQueryBox.Execute() == RET_YES )
-return sal_True;
-return sal_False;
+return ( aQueryBox.Execute() == RET_YES );
 }
 
-sal_Bool QueryDelMacro( const String& rName, Window* pParent )
+bool QueryDelMacro( const String& rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYDELMACRO ), pParent );
 }
 
-sal_Bool QueryReplaceMacro( const String& rName, Window* pParent )
+bool QueryReplaceMacro( const String& rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYREPLACEMACRO ), pParent );
 }
 
-sal_Bool QueryDelDialog( const String& rName, Window* pParent )
+bool QueryDelDialog( const String& rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYDELDIALOG ), pParent );
 }
 
-sal_Bool QueryDelLib( const String& rName, sal_Bool bRef, Window* pParent )
+bool QueryDelLib( const String& rName, bool bRef, Window* pParent )
 {
 return QueryDel( rName, IDEResId( bRef ? RID_STR_QUERYDELLIBREF : 
RID_STR_QUERYDELLIB ), pParent );
 }
 
-sal_Bool QueryDelModule( const String& rName, Window* pParent )
+bool QueryDelModule( const String& rName, Window* pParent )
 {
 return QueryDel( rName, IDEResId( RID_STR_QUERYDELMODULE ), pParent );
 }
 
-sal_Bool QueryPassword( const Reference< script::XLibraryContainer >& 
xLibContainer, const String& rLibName, String& rPassword, sal_Bool bRepeat, 
sal_Bool bNewTitle )
+bool QueryPassword( const Reference< script::XLibraryContainer >& 
xLibContainer, const String& rLibName, String& rPassword, bool bRepeat, bool 
bNewTitle )
 {
-sal_Bool bOK = sal_False;
+bool bOK = false;
 sal_uInt16 nRet = 0;
 
 do
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index fb24a2b..f65d1d6 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -274,12 +274,12 @@ voidCutLines( ::rtl::OUString& rStr, 
sal_Int32 nStartLine, sal_Int32
 String  CreateMgrAndLibStr( const String& rMgrName, const String& 
rLibName );
 sal_uLong   CalcLineCount( SvStream& rStream );
 
-sal_BoolQueryReplaceMacro( const String& rName, Window* pParent = 
0 );
-sal_BoolQueryDelMacro( const String& rName, Window* pParent = 0 );
-sal_BoolQueryDelDialog( const String& rName, Window* pParent = 0 );
-sal_BoolQueryDelModule( const String& rName, Window* pParent = 0 );
-sal_BoolQueryDelLib( const String& rName, sal_Bool bRef = 
sal_False, Window* pParent = 0 );
-sal_BoolQueryPassword( const ::com::sun::star::uno::Reference< 
::com::sun::star::script::XLibraryContainer >& xLibContainer, const String& 
rLibName, String& rPassword, sal_Bool bRepeat = sal_False, sal_Bool bNewTitle = 
sal_False );
+bool QueryReplaceMacro( const String& rName, Window* pParent = 0 );
+bool QueryDelMacro( const String& rName, Window* pParent = 0 );
+bool QueryDelDialog( const String& rName, Window* pParent = 0 );
+bool QueryDelModule( const String& rName, Window* pParent = 0 );
+bool QueryDelLib( const String& rName, bool bRef = sal_False, Window* pParent 
= 0 );
+bool QueryPassword( const ::com::sun::star::uno::Reference< 
::com::sun::star::script::XLibraryContainer >& xLibContainer, const String& 
rLibName, String& rPassword, bool bRepeat = false, bool bNewTitle = false );
 
 class ModuleInfoHelper
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/win

[August Sodora]

 dev/null |binary
 1 file changed

New commits:
commit 5a61ac273bff26d7ddbbd4fa0ea8099f486168f3
Author: August Sodora 
Date:   Fri Dec 9 00:04:33 2011 -0500

Remove old testtool icons

diff --git a/basic/win/res/basic.ico b/basic/win/res/basic.ico
deleted file mode 100644
index c453a0f..000
Binary files a/basic/win/res/basic.ico and /dev/null differ
diff --git a/basic/win/res/testtool.ico b/basic/win/res/testtool.ico
deleted file mode 100644
index db880c8..000
Binary files a/basic/win/res/testtool.ico and /dev/null differ
diff --git a/basic/win/res/work.ico b/basic/win/res/work.ico
deleted file mode 100644
index 43e3b5b..000
Binary files a/basic/win/res/work.ico and /dev/null differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/Module_basic.mk basic/source basic/StaticLibrary_sample.mk basic/workben

[August Sodora]

 basic/Module_basic.mk|1 
 basic/StaticLibrary_sample.mk|   48 ---
 basic/source/inc/collelem.hxx|   50 ---
 basic/source/sample/collelem.cxx |   79 -
 basic/source/sample/object.cxx   |  258 -
 basic/source/sample/sample.bas   |   39 --
 basic/workben/mgrtest.cxx|  591 ---
 7 files changed, 1066 deletions(-)

New commits:
commit 99ec322768053a6341ec7b5b6c6e533fb478bbfa
Author: August Sodora 
Date:   Thu Dec 8 23:59:57 2011 -0500

Remove archaic tests

diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk
index 58ac035..0fafc6c 100644
--- a/basic/Module_basic.mk
+++ b/basic/Module_basic.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,basic,\
AllLangResTarget_sb \
Library_sb \
Package_inc \
-   StaticLibrary_sample \
 ))
 
 $(eval $(call gb_Module_add_check_targets,basic,\
diff --git a/basic/StaticLibrary_sample.mk b/basic/StaticLibrary_sample.mk
deleted file mode 100644
index 2173a42..000
--- a/basic/StaticLibrary_sample.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,sample))
-
-$(eval $(call gb_StaticLibrary_add_package_headers,sample,basic_inc))
-
-$(eval $(call gb_StaticLibrary_set_include,sample,\
-   $$(INCLUDE) \
-   -I$(realpath $(SRCDIR)/basic/source/inc) \
-))
-
-$(eval $(call gb_StaticLibrary_add_api,sample,\
-   udkapi \
-   offapi \
-))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,sample,\
-   basic/source/sample/collelem \
-   basic/source/sample/object \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/basic/source/inc/collelem.hxx b/basic/source/inc/collelem.hxx
deleted file mode 100644
index 8465fd4..000
--- a/basic/source/inc/collelem.hxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _SAMPLE_COLLELEM_HXX
-#define _SAMPLE_COLLELEM_HXX
-
-#include 
-
-// The sample-element is a small object that contains the
-// properties name and value and the method Say which couples
-// the passed text with its own name. The name can be set from
-// outside. Implementation works with dynamic elements only.
-
-class SampleElement : public SbxObject
-{
-// Broadcaster Notification
-virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType );
-public:
-SampleElement( const String& );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sample/collelem.c

[Libreoffice-commits] .: basctl/source

[August Sodora]

 basctl/source/basicide/sbxitem.cxx |   25 -
 basctl/source/inc/sbxitem.hxx  |   17 -
 2 files changed, 4 insertions(+), 38 deletions(-)

New commits:
commit 3f5225ab63f7a1b1ebeb4dab375081ad7032872f
Author: August Sodora 
Date:   Thu Dec 8 23:21:12 2011 -0500

Clean up SbxItem

diff --git a/basctl/source/basicide/sbxitem.cxx 
b/basctl/source/basicide/sbxitem.cxx
index e1837c6..b2d33ac 100644
--- a/basctl/source/basicide/sbxitem.cxx
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -78,49 +78,24 @@ const ScriptDocument& SbxItem::GetDocument() const
 return m_aDocument;
 }
 
-void SbxItem::SetDocument(const ScriptDocument& rDocument)
-{
-m_aDocument = rDocument;
-}
-
 const ::rtl::OUString& SbxItem::GetLibName() const
 {
 return m_aLibName;
 }
 
-void SbxItem::SetLibName(const ::rtl::OUString& aLibName)
-{
-m_aLibName = aLibName;
-}
-
 const ::rtl::OUString& SbxItem::GetName() const
 {
 return m_aName;
 }
 
-void SbxItem::SetName(const ::rtl::OUString& aName)
-{
-m_aName = aName;
-}
-
 const ::rtl::OUString& SbxItem::GetMethodName() const
 {
 return m_aMethodName;
 }
 
-void SbxItem::SetMethodName(const ::rtl::OUString& aMethodName)
-{
-m_aMethodName = aMethodName;
-}
-
 BasicIDEType SbxItem::GetType() const
 {
 return m_nType;
 }
 
-void SbxItem::SetType(BasicIDEType nType)
-{
-m_nType = nType;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index 2f90535..4e0036b 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -43,10 +43,10 @@ enum BasicIDEType
 
 class SbxItem : public SfxPoolItem
 {
-ScriptDocument  m_aDocument;
-::rtl::OUString m_aLibName;
-::rtl::OUString m_aName;
-::rtl::OUString m_aMethodName;
+const ScriptDocumentm_aDocument;
+const ::rtl::OUString   m_aLibName;
+const ::rtl::OUString   m_aName;
+const ::rtl::OUString   m_aMethodName;
 BasicIDETypem_nType;
 
 public:
@@ -59,19 +59,10 @@ public:
 virtual int operator==(const SfxPoolItem&) const;
 
 const ScriptDocument& GetDocument() const;
-void SetDocument(const ScriptDocument& rDocument);
-
 const ::rtl::OUString& GetLibName() const;
-void SetLibName(const ::rtl::OUString& aLibName);
-
 const ::rtl::OUString& GetName() const;
-void SetName(const ::rtl::OUString& aName);
-
 const ::rtl::OUString& GetMethodName() const;
-void SetMethodName(const ::rtl::OUString& aMethodName);
-
 BasicIDEType GetType() const;
-void SetType(BasicIDEType nType);
 };
 
 #endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Kohei Yoshida]

 sc/source/core/data/column3.cxx |   46 ++--
 sc/source/core/data/table3.cxx  |7 +-
 2 files changed, 36 insertions(+), 17 deletions(-)

New commits:
commit 27b8382d07b8b0edafd6665906b59bc1cca9dcfe
Author: Kohei Yoshida 
Date:   Thu Dec 8 23:02:26 2011 -0500

bnc#656073: Allow filtering by error value.

The old way was that an error cell was evaulated as having a value of 0.
The error cell also showed up as blank in the popup.  Using the error
string is much more intuitive (and some users apparently want this
behavior).

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 898edfd..fbeb951 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1575,9 +1575,9 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW 
nEndRow, TypedScStrCollec
 
 while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : 
false )
 {
-ScBaseCell*  pCell= pItems[nIndex].pCell;
-TypedStrData*pData;
-sal_uLongnFormat  = GetNumberFormat( nRow );
+ScBaseCell* pCell = pItems[nIndex].pCell;
+TypedStrData* pData = NULL;
+sal_uLong nFormat = GetNumberFormat( nRow );
 
 ScCellFormat::GetInputString( pCell, nFormat, aString, *pFormatter );
 
@@ -1585,7 +1585,7 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW 
nEndRow, TypedScStrCollec
 pData = new TypedStrData( aString );
 else
 {
-double nValue;
+double nValue = 0.0;
 
 switch ( pCell->GetCellType() )
 {
@@ -1594,26 +1594,40 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW 
nEndRow, TypedScStrCollec
 break;
 
 case CELLTYPE_FORMULA:
-nValue = ((ScFormulaCell*)pCell)->GetValue();
-break;
+{
+ScFormulaCell* pFC = static_cast(pCell);
+sal_uInt16 nErr = pFC->GetErrCode();
+if (nErr)
+{
+// Error cell is evaluated as string (for now).
+String aErr = ScGlobal::GetErrorString(nErr);
+if (aErr.Len())
+pData = new TypedStrData(aErr);
+}
+else
+nValue = pFC->GetValue();
+}
+break;
 
 default:
-nValue = 0.0;
+;
 }
 
-if (pFormatter)
+if (!pData)
 {
-short nType = pFormatter->GetType(nFormat);
-if ((nType & NUMBERFORMAT_DATE) && !(nType & 
NUMBERFORMAT_TIME))
+if (pFormatter)
 {
-// special case for date values.  Disregard the time
-// element if the number format is of date type.
-nValue = ::rtl::math::approxFloor(nValue);
-bHasDates = true;
+short nType = pFormatter->GetType(nFormat);
+if ((nType & NUMBERFORMAT_DATE) && !(nType & 
NUMBERFORMAT_TIME))
+{
+// special case for date values.  Disregard the time
+// element if the number format is of date type.
+nValue = ::rtl::math::approxFloor(nValue);
+bHasDates = true;
+}
 }
+pData = new TypedStrData( aString, nValue, SC_STRTYPE_VALUE );
 }
-
-pData = new TypedStrData( aString, nValue, SC_STRTYPE_VALUE );
 }
 
 if ( !rStrings.Insert( pData ) )
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 1be106f..ffd5d6f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1277,7 +1277,12 @@ public:
 
 if ( pCell )
 {
-if (pCell->GetCellType() != CELLTYPE_NOTE)
+if (pCell->GetCellType() == CELLTYPE_FORMULA && 
pCell->GetErrorCode())
+{
+// Error cell is evaluated as string (for now).
+aCellStr = ScGlobal::GetErrorString(pCell->GetErrorCode());
+}
+else if (pCell->GetCellType() != CELLTYPE_NOTE)
 {
 sal_uLong nFormat = mrTab.GetNumberFormat( 
static_cast(rEntry.nField), nRow );
 ScCellFormat::GetInputString(pCell, nFormat, aCellStr, 
*mrDoc.GetFormatTable());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/core/data/column3.cxx |   46 ++--
 sc/source/core/data/table3.cxx  |7 +-
 2 files changed, 36 insertions(+), 17 deletions(-)

New commits:
commit 49b6cbe96b6655cd35366283f239af516cc2644d
Author: Kohei Yoshida 
Date:   Thu Dec 8 23:02:26 2011 -0500

bnc#656073: Allow filtering by error value.

The old way was that an error cell was evaulated as having a value of 0.
The error cell also showed up as blank in the popup.  Using the error
string is much more intuitive (and some users apparently want this
behavior).

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 898edfd..fbeb951 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1575,9 +1575,9 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW 
nEndRow, TypedScStrCollec
 
 while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : 
false )
 {
-ScBaseCell*  pCell= pItems[nIndex].pCell;
-TypedStrData*pData;
-sal_uLongnFormat  = GetNumberFormat( nRow );
+ScBaseCell* pCell = pItems[nIndex].pCell;
+TypedStrData* pData = NULL;
+sal_uLong nFormat = GetNumberFormat( nRow );
 
 ScCellFormat::GetInputString( pCell, nFormat, aString, *pFormatter );
 
@@ -1585,7 +1585,7 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW 
nEndRow, TypedScStrCollec
 pData = new TypedStrData( aString );
 else
 {
-double nValue;
+double nValue = 0.0;
 
 switch ( pCell->GetCellType() )
 {
@@ -1594,26 +1594,40 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW 
nEndRow, TypedScStrCollec
 break;
 
 case CELLTYPE_FORMULA:
-nValue = ((ScFormulaCell*)pCell)->GetValue();
-break;
+{
+ScFormulaCell* pFC = static_cast(pCell);
+sal_uInt16 nErr = pFC->GetErrCode();
+if (nErr)
+{
+// Error cell is evaluated as string (for now).
+String aErr = ScGlobal::GetErrorString(nErr);
+if (aErr.Len())
+pData = new TypedStrData(aErr);
+}
+else
+nValue = pFC->GetValue();
+}
+break;
 
 default:
-nValue = 0.0;
+;
 }
 
-if (pFormatter)
+if (!pData)
 {
-short nType = pFormatter->GetType(nFormat);
-if ((nType & NUMBERFORMAT_DATE) && !(nType & 
NUMBERFORMAT_TIME))
+if (pFormatter)
 {
-// special case for date values.  Disregard the time
-// element if the number format is of date type.
-nValue = ::rtl::math::approxFloor(nValue);
-bHasDates = true;
+short nType = pFormatter->GetType(nFormat);
+if ((nType & NUMBERFORMAT_DATE) && !(nType & 
NUMBERFORMAT_TIME))
+{
+// special case for date values.  Disregard the time
+// element if the number format is of date type.
+nValue = ::rtl::math::approxFloor(nValue);
+bHasDates = true;
+}
 }
+pData = new TypedStrData( aString, nValue, SC_STRTYPE_VALUE );
 }
-
-pData = new TypedStrData( aString, nValue, SC_STRTYPE_VALUE );
 }
 
 if ( !rStrings.Insert( pData ) )
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 1be106f..ffd5d6f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1277,7 +1277,12 @@ public:
 
 if ( pCell )
 {
-if (pCell->GetCellType() != CELLTYPE_NOTE)
+if (pCell->GetCellType() == CELLTYPE_FORMULA && 
pCell->GetErrorCode())
+{
+// Error cell is evaluated as string (for now).
+aCellStr = ScGlobal::GetErrorString(pCell->GetErrorCode());
+}
+else if (pCell->GetCellType() != CELLTYPE_NOTE)
 {
 sal_uLong nFormat = mrTab.GetNumberFormat( 
static_cast(rEntry.nField), nRow );
 ScCellFormat::GetInputString(pCell, nFormat, aCellStr, 
*mrDoc.GetFormatTable());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Kohei Yoshida]

 sc/source/core/tool/rangeutl.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 38e698d6913b11055144ebee6fb21c30566e0c3b
Author: Kohei Yoshida 
Date:   Thu Dec 8 21:37:10 2011 -0500

bnc#727504: Correctly convert chart data ranges.

We were supported to convert XML chart data range representations
with a hard-coded ';' as the range union operators, but incorrectly
using UI configurable range separators.  This caused charts with
series that consisted of multiple ranges to be imported correctly in
locales where the range separator (which re-uses the function argument
separator) was something other than ';'.

BTW I plan to remove this "always use Calc A1 syntax" restriction in
future versions.

diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index fda7615..5e1db5d 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -898,8 +898,7 @@ static void lcl_appendCellRangeAddress(
 void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, 
const OUString& rXMLRange, ScDocument* pDoc )
 {
 FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
-const OUString aRangeSep = ScCompiler::GetNativeSymbol(ocSep);
-const sal_Unicode cSep = ' ';
+const sal_Unicode cSep = ' ', cSepNew = ';';
 const sal_Unicode cQuote = '\'';
 
 OUStringBuffer aRetStr;
@@ -984,7 +983,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( 
OUString& rString, con
 if (bFirst)
 bFirst = false;
 else
-aRetStr.append(aRangeSep);
+aRetStr.append(cSepNew);
 
 lcl_appendCellRangeAddress(aRetStr, pDoc, aCell1, aCell2, 
aExtInfo1, aExtInfo2);
 }
@@ -1006,7 +1005,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( 
OUString& rString, con
 if (bFirst)
 bFirst = false;
 else
-aRetStr.append(aRangeSep);
+aRetStr.append(cSepNew);
 
 lcl_appendCellAddress(aRetStr, pDoc, aCell, aExtInfo);
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/core/tool/rangeutl.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit d598c76cb9f34aad83802450cc4d607b71792eb8
Author: Kohei Yoshida 
Date:   Thu Dec 8 21:37:10 2011 -0500

bnc#727504: Correctly convert chart data ranges.

We were supported to convert XML chart data range representations
with a hard-coded ';' as the range union operators, but incorrectly
using UI configurable range separators.  This caused charts with
series that consisted of multiple ranges to be imported correctly in
locales where the range separator (which re-uses the function argument
separator) was something other than ';'.

BTW I plan to remove this "always use Calc A1 syntax" restriction in
future versions.

diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index fda7615..5e1db5d 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -898,8 +898,7 @@ static void lcl_appendCellRangeAddress(
 void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, 
const OUString& rXMLRange, ScDocument* pDoc )
 {
 FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
-const OUString aRangeSep = ScCompiler::GetNativeSymbol(ocSep);
-const sal_Unicode cSep = ' ';
+const sal_Unicode cSep = ' ', cSepNew = ';';
 const sal_Unicode cQuote = '\'';
 
 OUStringBuffer aRetStr;
@@ -984,7 +983,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( 
OUString& rString, con
 if (bFirst)
 bFirst = false;
 else
-aRetStr.append(aRangeSep);
+aRetStr.append(cSepNew);
 
 lcl_appendCellRangeAddress(aRetStr, pDoc, aCell1, aCell2, 
aExtInfo1, aExtInfo2);
 }
@@ -1006,7 +1005,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( 
OUString& rString, con
 if (bFirst)
 bFirst = false;
 else
-aRetStr.append(aRangeSep);
+aRetStr.append(cSepNew);
 
 lcl_appendCellAddress(aRetStr, pDoc, aCell, aExtInfo);
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - mysqlcppconn/makefile.mk solenv/inc

[Lionel Elie Mamane]

 mysqlcppconn/makefile.mk |   34 ++
 solenv/inc/tg_ext.mk |   39 +--
 2 files changed, 31 insertions(+), 42 deletions(-)

New commits:
commit d17045d7756e22f39751352bc8778788e15cede6
Author: Lionel Elie Mamane 
Date:   Fri Dec 9 01:18:43 2011 +0100

Revert "mysqlcppconn: force recompilation when switching between different 
bindings"

This reverts commit b9e6db9be72625ff8de17c2cee5fc78d8d65957b.

diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk
index a6534a2..d7fa8a6 100644
--- a/mysqlcppconn/makefile.mk
+++ b/mysqlcppconn/makefile.mk
@@ -27,21 +27,10 @@
 
 PRJ=.
 
-# distro-specific builds want to link against a particular mysql library
-# then they do not require mysql-devel package at runtime
-# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate 
patch
-# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql 
library
-.IF "$(SYSTEM_MYSQL)" == "YES"
-MYSQL_BINDING=static
-.ELSE
-MYSQL_BINDING=dynamic
-.ENDIF
-
 PRJNAME=mysqlcppconn
-EXT_PROJECT_NAME=mysql-connector-c++-1.1.0
-TARGET=so_mysqlcppconn_binding-$(MYSQL_BINDING)
-TARFILE_ROOTDIR=mysql-connector-c++-1.1.0_binding-$(MYSQL_BINDING)
+TARGET=so_mysqlcppconn
 
+EXT_PROJECT_NAME=mysql-connector-c++-1.1.0
 
 # --- Settings -
 
@@ -60,6 +49,16 @@ ADDITIONAL_FILES=\
 CONVERTFILES=\
 cppconn$/build_config.h
 
+# distro-specific builds want to link against a particular mysql library
+# then they do not require mysql-devel package at runtime
+# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate 
patch
+# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql 
library
+.IF "$(SYSTEM_MYSQL)" == "YES"
+MYSQL_BINDING=static
+.ELSE
+MYSQL_BINDING=dynamic
+.ENDIF
+
 PATCH_FILES=\
 $(TARFILE_NAME).patch \
 $(TARFILE_NAME)-mysql-binding-$(MYSQL_BINDING).patch \
@@ -67,11 +66,6 @@ PATCH_FILES=\
 
 BUILD_DIR=driver
 BUILD_ACTION = \
-   if test -e ../../lastbuild; then LASTBUILD=$$(cat ../../lastbuild); 
else LASTBUILD='$(MYSQL_BINDING)'; fi && \
-   if test "$${LASTBUILD}" != "$(MYSQL_BINDING)"; then \
-   rm -f ../$(BACK_PATH)/slo/* 
../../so_built_so_mysqlcppconn_binding-$${LASTBUILD}; \
-fi && \
-echo "$(MYSQL_BINDING)" > ../../lastbuild && \
 cd nativeapi \
  && $(MAKE) $(MFLAGS) $(CALLMACROS) \
  && cd .. \
@@ -94,9 +88,9 @@ BUILD_ACTION = \
 NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
 
 $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
-@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/driver$/mysql_driver.h 
$(INCCOM)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/driver$/mysql_driver.h 
$(INCCOM)
 -@$(MKDIRHIER) $(INCCOM)$/cppconn
-@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/cppconn$/* 
$(INCCOM)$/cppconn
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/cppconn$/* 
$(INCCOM)$/cppconn
 @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
 
 normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index a6335a5..0adec0c 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -54,15 +54,10 @@ ABS_PACKAGE_DIR:=$(MAKEDIR)/$(MISC)/build
 BACK_PATH=../../../
 #MUST match with reference (currently MISC)
 MBACK_PATH=../../
-fake_root_dir=/$(TARFILE_ROOTDIR)
+.IF "$(TARFILE_IS_FLAT)" != ""
+fake_root_dir=/$(TARFILE_NAME)
 #MUST match fake_root_dir in directory levels
 fake_back=../
-.IF "$(TARFILE_IS_FLAT)" != ""
-zip_dir=.
-TAR_STRIP_LEVEL=0
-.ELSE
-zip_dir=..
-TAR_STRIP_LEVEL=1
 .ENDIF "$(TARFILE_IS_FLAT)" != ""
 
 TARFILE_LOCATION*=$(BACK_PATH)$(fake_back)download
@@ -111,9 +106,9 @@ clean:
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
 @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-@noop $(assign UNPACKCMD := sh -c "bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner --strip-components=$(TAR_STRIP_LEVEL) 
-x$(tar_verbose_switch)f - ")
+@noop $(assign UNPACKCMD := sh -c "bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ")
 .ELSE  # "$(GUI)"=="UNX"
-@noop $(assign UNPACKCMD := bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner --strip-components=$(TAR_STRIP_LEVEL) 
-x$(tar_verbose_switch)f - )
+@noop $(assign UNPACKCMD := bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
 .ENDIF # "$(GUI)"=="UNX"
 @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
@@ -121,49 +116,49 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
 

[Libreoffice-commits] .: 4 commits - mysqlcppconn/makefile.mk solenv/inc

[Lionel Elie Mamane]

 mysqlcppconn/makefile.mk |   34 ++
 solenv/inc/tg_ext.mk |   39 +--
 2 files changed, 31 insertions(+), 42 deletions(-)

New commits:
commit e89c99ce5e5474173d354778b531f2dff8eff25e
Author: Lionel Elie Mamane 
Date:   Fri Dec 9 01:17:19 2011 +0100

Revert "mysqlcppconn: force recompilation when switching between different 
bindings"

This reverts commit 694627b7860fb69f115c020719c5b149d328f9ef.

diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk
index a6534a2..d7fa8a6 100644
--- a/mysqlcppconn/makefile.mk
+++ b/mysqlcppconn/makefile.mk
@@ -27,21 +27,10 @@
 
 PRJ=.
 
-# distro-specific builds want to link against a particular mysql library
-# then they do not require mysql-devel package at runtime
-# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate 
patch
-# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql 
library
-.IF "$(SYSTEM_MYSQL)" == "YES"
-MYSQL_BINDING=static
-.ELSE
-MYSQL_BINDING=dynamic
-.ENDIF
-
 PRJNAME=mysqlcppconn
-EXT_PROJECT_NAME=mysql-connector-c++-1.1.0
-TARGET=so_mysqlcppconn_binding-$(MYSQL_BINDING)
-TARFILE_ROOTDIR=mysql-connector-c++-1.1.0_binding-$(MYSQL_BINDING)
+TARGET=so_mysqlcppconn
 
+EXT_PROJECT_NAME=mysql-connector-c++-1.1.0
 
 # --- Settings -
 
@@ -60,6 +49,16 @@ ADDITIONAL_FILES=\
 CONVERTFILES=\
 cppconn$/build_config.h
 
+# distro-specific builds want to link against a particular mysql library
+# then they do not require mysql-devel package at runtime
+# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate 
patch
+# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql 
library
+.IF "$(SYSTEM_MYSQL)" == "YES"
+MYSQL_BINDING=static
+.ELSE
+MYSQL_BINDING=dynamic
+.ENDIF
+
 PATCH_FILES=\
 $(TARFILE_NAME).patch \
 $(TARFILE_NAME)-mysql-binding-$(MYSQL_BINDING).patch \
@@ -67,11 +66,6 @@ PATCH_FILES=\
 
 BUILD_DIR=driver
 BUILD_ACTION = \
-   if test -e ../../lastbuild; then LASTBUILD=$$(cat ../../lastbuild); 
else LASTBUILD='$(MYSQL_BINDING)'; fi && \
-   if test "$${LASTBUILD}" != "$(MYSQL_BINDING)"; then \
-   rm -f ../$(BACK_PATH)/slo/* 
../../so_built_so_mysqlcppconn_binding-$${LASTBUILD}; \
-fi && \
-echo "$(MYSQL_BINDING)" > ../../lastbuild && \
 cd nativeapi \
  && $(MAKE) $(MFLAGS) $(CALLMACROS) \
  && cd .. \
@@ -94,9 +88,9 @@ BUILD_ACTION = \
 NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
 
 $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
-@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/driver$/mysql_driver.h 
$(INCCOM)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/driver$/mysql_driver.h 
$(INCCOM)
 -@$(MKDIRHIER) $(INCCOM)$/cppconn
-@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/cppconn$/* 
$(INCCOM)$/cppconn
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/cppconn$/* 
$(INCCOM)$/cppconn
 @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
 
 normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index e696054..0adec0c 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -54,13 +54,10 @@ ABS_PACKAGE_DIR:=$(MAKEDIR)/$(MISC)/build
 BACK_PATH=../../../
 #MUST match with reference (currently MISC)
 MBACK_PATH=../../
-fake_root_dir=/$(TARFILE_ROOTDIR)
+.IF "$(TARFILE_IS_FLAT)" != ""
+fake_root_dir=/$(TARFILE_NAME)
 #MUST match fake_root_dir in directory levels
 fake_back=../
-.IF "$(TARFILE_IS_FLAT)" != ""
-TAR_STRIP_LEVEL=0
-.ELSE
-TAR_STRIP_LEVEL=1
 .ENDIF "$(TARFILE_IS_FLAT)" != ""
 
 TARFILE_LOCATION*=$(BACK_PATH)$(fake_back)download
@@ -109,9 +106,9 @@ clean:
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
 @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-@noop $(assign UNPACKCMD := sh -c "bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner --strip-components=$(TAR_STRIP_LEVEL) 
-x$(tar_verbose_switch)f - ")
+@noop $(assign UNPACKCMD := sh -c "bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ")
 .ELSE  # "$(GUI)"=="UNX"
-@noop $(assign UNPACKCMD := bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner --strip-components=$(TAR_STRIP_LEVEL) 
-x$(tar_verbose_switch)f - )
+@noop $(assign UNPACKCMD := bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
 .ENDIF # "$(GUI)"=="UNX"
 @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
@@ -119,28 +116,28 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
 $(MISC)/%.unpack : $(TA

[Libreoffice-commits] .: solenv/inc

[Lionel Elie Mamane]

 solenv/inc/tg_ext.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0189e8881de7a48c62fdf84a9b0e9ce8668a530b
Author: Lionel Elie Mamane 
Date:   Fri Dec 9 00:54:46 2011 +0100

tg_ext.ml: fix patch when filename ambiguous

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index a6335a5..1ab9dc6 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -194,9 +194,9 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : 
$(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
 $(COMMAND_ECHO)$(TOUCH) $@
 .ELSE  # "$(PATCH_FILES)"=="none" ||   "$(PATCH_FILES)"==""
 .IF "$(GUI)"=="WNT"
-$(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | (cd 
.$(fake_root_dir) && patch $(PATCHFLAGS) -p3 ) && $(TOUCH) $(PATCH_FLAG_FILE)
+$(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | (cd 
.$(fake_root_dir) && patch $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE)
 .ELSE   # "$(GUI)"=="WNT"
-$(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | (cd .$(fake_root_dir) && 
$(GNUPATCH) $(PATCHFLAGS) -p3 ) && $(TOUCH) $(PATCH_FLAG_FILE)
+$(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | (cd .$(fake_root_dir) && 
$(GNUPATCH) $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE)
 .ENDIF  # "$(GUI)"=="WNT"
 .ENDIF # "$(PATCH_FILES)"=="none" ||   "$(PATCH_FILES)"==""
 .IF "$(T_ADDITIONAL_FILES)"!=""
@@ -306,10 +306,10 @@ $(MISC)/$(TARFILE_ROOTDIR).done : 
$(MISC)/$(TARFILE_MD5)-$(TARFILE_NAME).unpack
 #.IF "$(my4ver:s/.//:s/,//)" >= "300"
 #  $(COMMAND_ECHO)cd $(MISC) && ( $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch 
$(PATCHFLAGS) -p2 )
 #.ELSE # "$(my4ver:s/.//:s/,//)" >= "300"
-$(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | (cd 
.$(fake_root_dir) && patch $(PATCHFLAGS) -p3 )
+$(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | (cd 
.$(fake_root_dir) && patch $(PATCHFLAGS) -p2 )
 #.ENDIF# "$(my4ver:s/.//:s/,//)" >= "300"
 .ELSE   # "$(GUI)"=="WNT"
-$(COMMAND_ECHO)cd $(MISC) && $(TYPE) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | ( cd .$(fake_root_dir) && 
$(GNUPATCH) $(PATCHFLAGS) -p3 )
+$(COMMAND_ECHO)cd $(MISC) && $(TYPE) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | ( cd .$(fake_root_dir) && 
$(GNUPATCH) $(PATCHFLAGS) -p2 )
 .ENDIF  # "$(GUI)"=="WNT"
 .IF "$(CONVERTFILES)"!=""
 $(COMMAND_ECHO)$(CONVERT) dos  $(foreach,i,$(CONVERTFILES) 
$(MISC)/$(TARFILE_ROOTDIR)/$i)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/inc

[Lionel Elie Mamane]

 solenv/inc/tg_ext.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f7c0526a120711b02ad69b68fd254fcd8f5e0f09
Author: Lionel Elie Mamane 
Date:   Fri Dec 9 00:54:46 2011 +0100

tg_ext.ml: fix patch when filename ambiguous

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index a6335a5..1ab9dc6 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -194,9 +194,9 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : 
$(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
 $(COMMAND_ECHO)$(TOUCH) $@
 .ELSE  # "$(PATCH_FILES)"=="none" ||   "$(PATCH_FILES)"==""
 .IF "$(GUI)"=="WNT"
-$(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | (cd 
.$(fake_root_dir) && patch $(PATCHFLAGS) -p3 ) && $(TOUCH) $(PATCH_FLAG_FILE)
+$(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | (cd 
.$(fake_root_dir) && patch $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE)
 .ELSE   # "$(GUI)"=="WNT"
-$(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | (cd .$(fake_root_dir) && 
$(GNUPATCH) $(PATCHFLAGS) -p3 ) && $(TOUCH) $(PATCH_FLAG_FILE)
+$(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | (cd .$(fake_root_dir) && 
$(GNUPATCH) $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE)
 .ENDIF  # "$(GUI)"=="WNT"
 .ENDIF # "$(PATCH_FILES)"=="none" ||   "$(PATCH_FILES)"==""
 .IF "$(T_ADDITIONAL_FILES)"!=""
@@ -306,10 +306,10 @@ $(MISC)/$(TARFILE_ROOTDIR).done : 
$(MISC)/$(TARFILE_MD5)-$(TARFILE_NAME).unpack
 #.IF "$(my4ver:s/.//:s/,//)" >= "300"
 #  $(COMMAND_ECHO)cd $(MISC) && ( $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch 
$(PATCHFLAGS) -p2 )
 #.ELSE # "$(my4ver:s/.//:s/,//)" >= "300"
-$(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | (cd 
.$(fake_root_dir) && patch $(PATCHFLAGS) -p3 )
+$(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | (cd 
.$(fake_root_dir) && patch $(PATCHFLAGS) -p2 )
 #.ENDIF# "$(my4ver:s/.//:s/,//)" >= "300"
 .ELSE   # "$(GUI)"=="WNT"
-$(COMMAND_ECHO)cd $(MISC) && $(TYPE) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | ( cd .$(fake_root_dir) && 
$(GNUPATCH) $(PATCHFLAGS) -p3 )
+$(COMMAND_ECHO)cd $(MISC) && $(TYPE) 
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | ( cd .$(fake_root_dir) && 
$(GNUPATCH) $(PATCHFLAGS) -p2 )
 .ENDIF  # "$(GUI)"=="WNT"
 .IF "$(CONVERTFILES)"!=""
 $(COMMAND_ECHO)$(CONVERT) dos  $(foreach,i,$(CONVERTFILES) 
$(MISC)/$(TARFILE_ROOTDIR)/$i)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - mysqlcppconn/makefile.mk solenv/inc

[Lionel Elie Mamane]

 mysqlcppconn/makefile.mk |   34 --
 solenv/inc/tg_ext.mk |   39 ++-
 2 files changed, 42 insertions(+), 31 deletions(-)

New commits:
commit b9e6db9be72625ff8de17c2cee5fc78d8d65957b
Author: Lionel Elie Mamane 
Date:   Thu Dec 8 23:56:40 2011 +0100

mysqlcppconn: force recompilation when switching between different bindings

diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk
index d7fa8a6..a6534a2 100644
--- a/mysqlcppconn/makefile.mk
+++ b/mysqlcppconn/makefile.mk
@@ -27,10 +27,21 @@
 
 PRJ=.
 
-PRJNAME=mysqlcppconn
-TARGET=so_mysqlcppconn
+# distro-specific builds want to link against a particular mysql library
+# then they do not require mysql-devel package at runtime
+# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate 
patch
+# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql 
library
+.IF "$(SYSTEM_MYSQL)" == "YES"
+MYSQL_BINDING=static
+.ELSE
+MYSQL_BINDING=dynamic
+.ENDIF
 
+PRJNAME=mysqlcppconn
 EXT_PROJECT_NAME=mysql-connector-c++-1.1.0
+TARGET=so_mysqlcppconn_binding-$(MYSQL_BINDING)
+TARFILE_ROOTDIR=mysql-connector-c++-1.1.0_binding-$(MYSQL_BINDING)
+
 
 # --- Settings -
 
@@ -49,16 +60,6 @@ ADDITIONAL_FILES=\
 CONVERTFILES=\
 cppconn$/build_config.h
 
-# distro-specific builds want to link against a particular mysql library
-# then they do not require mysql-devel package at runtime
-# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate 
patch
-# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql 
library
-.IF "$(SYSTEM_MYSQL)" == "YES"
-MYSQL_BINDING=static
-.ELSE
-MYSQL_BINDING=dynamic
-.ENDIF
-
 PATCH_FILES=\
 $(TARFILE_NAME).patch \
 $(TARFILE_NAME)-mysql-binding-$(MYSQL_BINDING).patch \
@@ -66,6 +67,11 @@ PATCH_FILES=\
 
 BUILD_DIR=driver
 BUILD_ACTION = \
+   if test -e ../../lastbuild; then LASTBUILD=$$(cat ../../lastbuild); 
else LASTBUILD='$(MYSQL_BINDING)'; fi && \
+   if test "$${LASTBUILD}" != "$(MYSQL_BINDING)"; then \
+   rm -f ../$(BACK_PATH)/slo/* 
../../so_built_so_mysqlcppconn_binding-$${LASTBUILD}; \
+fi && \
+echo "$(MYSQL_BINDING)" > ../../lastbuild && \
 cd nativeapi \
  && $(MAKE) $(MFLAGS) $(CALLMACROS) \
  && cd .. \
@@ -88,9 +94,9 @@ BUILD_ACTION = \
 NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
 
 $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
-@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/driver$/mysql_driver.h 
$(INCCOM)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/driver$/mysql_driver.h 
$(INCCOM)
 -@$(MKDIRHIER) $(INCCOM)$/cppconn
-@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/cppconn$/* 
$(INCCOM)$/cppconn
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/cppconn$/* 
$(INCCOM)$/cppconn
 @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
 
 normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 0adec0c..a6335a5 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -54,10 +54,15 @@ ABS_PACKAGE_DIR:=$(MAKEDIR)/$(MISC)/build
 BACK_PATH=../../../
 #MUST match with reference (currently MISC)
 MBACK_PATH=../../
-.IF "$(TARFILE_IS_FLAT)" != ""
-fake_root_dir=/$(TARFILE_NAME)
+fake_root_dir=/$(TARFILE_ROOTDIR)
 #MUST match fake_root_dir in directory levels
 fake_back=../
+.IF "$(TARFILE_IS_FLAT)" != ""
+zip_dir=.
+TAR_STRIP_LEVEL=0
+.ELSE
+zip_dir=..
+TAR_STRIP_LEVEL=1
 .ENDIF "$(TARFILE_IS_FLAT)" != ""
 
 TARFILE_LOCATION*=$(BACK_PATH)$(fake_back)download
@@ -106,9 +111,9 @@ clean:
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
 @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-@noop $(assign UNPACKCMD := sh -c "bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ")
+@noop $(assign UNPACKCMD := sh -c "bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner --strip-components=$(TAR_STRIP_LEVEL) 
-x$(tar_verbose_switch)f - ")
 .ELSE  # "$(GUI)"=="UNX"
-@noop $(assign UNPACKCMD := bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
+@noop $(assign UNPACKCMD := bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner --strip-components=$(TAR_STRIP_LEVEL) 
-x$(tar_verbose_switch)f - )
 .ENDIF # "$(GUI)"=="UNX"
 @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
@@ -116,49 +121,49 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z
 @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-@noop $(assig

[Libreoffice-commits] .: solenv/inc

[Lionel Elie Mamane]

 solenv/inc/tg_ext.mk |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 58844404ad9c9da806b9b521d5e39af6cf78b480
Author: Lionel Elie Mamane 
Date:   Fri Dec 9 00:37:05 2011 +0100

tg_ext: fix unpack for flat zip files

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index f31c340..a6335a5 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -58,8 +58,10 @@ fake_root_dir=/$(TARFILE_ROOTDIR)
 #MUST match fake_root_dir in directory levels
 fake_back=../
 .IF "$(TARFILE_IS_FLAT)" != ""
+zip_dir=.
 TAR_STRIP_LEVEL=0
 .ELSE
+zip_dir=..
 TAR_STRIP_LEVEL=1
 .ENDIF "$(TARFILE_IS_FLAT)" != ""
 
@@ -146,22 +148,22 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip
 @-$(RM) $@
-@noop $(assign UNPACKCMD := cd .. && unzip $(unzip_quiet_switch)  -o 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).zip)
+@noop $(assign UNPACKCMD := cd $(zip_dir) && unzip $(unzip_quiet_switch)  
-o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).zip)
 @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.oxt
 @-$(RM) $@
-@noop $(assign UNPACKCMD := cd .. && unzip $(unzip_quiet_switch)  -o 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt)
+@noop $(assign UNPACKCMD := cd $(zip_dir) && unzip $(unzip_quiet_switch)  
-o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt)
 @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
 @-$(RM) $@
 .IF "$(OS)"=="SOLARIS"
-@noop $(assign UNPACKCMD := cd .. && jar xf 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
+@noop $(assign UNPACKCMD := cd $(zip_dir) && jar xf 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
 .ELSE  # "$(OS)"=="SOLARIS"
-@noop $(assign UNPACKCMD := cd .. && unzip $(unzip_quiet_switch)  -o 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
+@noop $(assign UNPACKCMD := cd $(zip_dir) && unzip $(unzip_quiet_switch)  
-o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
 .ENDIF # "$(OS)"=="SOLARIS"
 @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Eike Rathke]

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

New commits:
commit df28789d46d7f82b02502484e1fb105738cdf695
Author: Eike Rathke 
Date:   Fri Dec 9 00:27:17 2011 +0100

fixed fdo#43614 Crash when closing document and several Spreadsheet 
documents open

During Paint() in ScMultiTextWnd::InitEditEngine(),
ScTabViewShell::GetActiveViewShell() may return a view shell that does not
correspond with the document to be repainted if another document was opened 
or
when switching between documents. Prevent creating an EditEngine with wrong
SfxItemPool.

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index a271487..83bdb8a 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1094,11 +1094,19 @@ IMPL_LINK( ScInputBarGroup, Impl_ScrollHdl, ScrollBar*, 
EMPTYARG )
 //  ScMultiTextWnd
 //
 
-ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen ) : ScTextWnd( 
pParen/*, WB_TABSTOP*/ ), mrGroupBar(* pParen )
+ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen )
+:
+ScTextWnd( pParen/*, WB_TABSTOP*/ ),
+mrGroupBar(* pParen ),
+mpAssignedDocument( NULL ),
+mnLines( 1 ),
+mnLastExpandedLines( INPUTWIN_MULTILINES )
 {
 nTextStartPos = TEXT_MULTI_STARTPOS;
-mnLines = 1;
-mnLastExpandedLines = INPUTWIN_MULTILINES;
+}
+
+ScMultiTextWnd::~ScMultiTextWnd()
+{
 }
 
 int ScMultiTextWnd::GetLineCount()
@@ -1290,6 +1298,24 @@ void ScMultiTextWnd::InitEditEngine(SfxObjectShell* 
pObjSh)
 if ( pViewSh )
 {
 const ScDocument* pDoc = pViewSh->GetViewData()->GetDocument();
+
+// fdo#43614 If called from Paint() because pEditEngine==0 it may be
+// that StopEditEngine() was previously called when opening another
+// document or switching documents, the Paint() wants to paint the
+// previous document, but GetActiveViewShell() already returns the
+// shell of the new document. In that case we'd create an EditEngine
+// with the wrong item pool that later crashes when the corresponding
+// document was closed and may lead to other sorts of trouble.
+
+if (mpAssignedDocument)
+{
+if (mpAssignedDocument != pDoc)
+return; // Bail out, don't create and remember an
+// EditEngine without document pools for this case.
+}
+else
+mpAssignedDocument = pDoc;  // stick with this document
+
 pNew = new ScFieldEditEngine( pDoc->GetEnginePool(), 
pDoc->GetEditPool() );
 }
 else
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 7a1da05..c0f4234 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -46,6 +46,7 @@ class ScInputHandler;
 class ScAccessibleEditLineTextData;
 struct EENotify;
 class ScRangeList;
+class ScDocument;
 
 //
 
@@ -172,6 +173,7 @@ class ScMultiTextWnd : public ScTextWnd
 {
 public:
 ScMultiTextWnd( ScInputBarGroup* pParent );
+virtual ~ScMultiTextWnd();
 virtual void StartEditEngine();
 virtual void StopEditEngine( sal_Bool bAll );
 int GetLineCount();
@@ -194,6 +196,7 @@ protected:
 private:
 long GetPixelTextHeight();
 ScInputBarGroup& mrGroupBar;
+const ScDocument* mpAssignedDocument;
 long mnLines;
 long mnLastExpandedLines;
 };
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Eike Rathke]

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

New commits:
commit ce2fe82b08026238573867ff4baeb99fb33cb698
Author: Eike Rathke 
Date:   Fri Dec 9 00:27:17 2011 +0100

fixed fdo#43614 Crash when closing document and several Spreadsheet 
documents open

During Paint() in ScMultiTextWnd::InitEditEngine(),
ScTabViewShell::GetActiveViewShell() may return a view shell that does not
correspond with the document to be repainted if another document was opened 
or
when switching between documents. Prevent creating an EditEngine with wrong
SfxItemPool.

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index a271487..83bdb8a 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1094,11 +1094,19 @@ IMPL_LINK( ScInputBarGroup, Impl_ScrollHdl, ScrollBar*, 
EMPTYARG )
 //  ScMultiTextWnd
 //
 
-ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen ) : ScTextWnd( 
pParen/*, WB_TABSTOP*/ ), mrGroupBar(* pParen )
+ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen )
+:
+ScTextWnd( pParen/*, WB_TABSTOP*/ ),
+mrGroupBar(* pParen ),
+mpAssignedDocument( NULL ),
+mnLines( 1 ),
+mnLastExpandedLines( INPUTWIN_MULTILINES )
 {
 nTextStartPos = TEXT_MULTI_STARTPOS;
-mnLines = 1;
-mnLastExpandedLines = INPUTWIN_MULTILINES;
+}
+
+ScMultiTextWnd::~ScMultiTextWnd()
+{
 }
 
 int ScMultiTextWnd::GetLineCount()
@@ -1290,6 +1298,24 @@ void ScMultiTextWnd::InitEditEngine(SfxObjectShell* 
pObjSh)
 if ( pViewSh )
 {
 const ScDocument* pDoc = pViewSh->GetViewData()->GetDocument();
+
+// fdo#43614 If called from Paint() because pEditEngine==0 it may be
+// that StopEditEngine() was previously called when opening another
+// document or switching documents, the Paint() wants to paint the
+// previous document, but GetActiveViewShell() already returns the
+// shell of the new document. In that case we'd create an EditEngine
+// with the wrong item pool that later crashes when the corresponding
+// document was closed and may lead to other sorts of trouble.
+
+if (mpAssignedDocument)
+{
+if (mpAssignedDocument != pDoc)
+return; // Bail out, don't create and remember an
+// EditEngine without document pools for this case.
+}
+else
+mpAssignedDocument = pDoc;  // stick with this document
+
 pNew = new ScFieldEditEngine( pDoc->GetEnginePool(), 
pDoc->GetEditPool() );
 }
 else
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 7a1da05..c0f4234 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -46,6 +46,7 @@ class ScInputHandler;
 class ScAccessibleEditLineTextData;
 struct EENotify;
 class ScRangeList;
+class ScDocument;
 
 //
 
@@ -172,6 +173,7 @@ class ScMultiTextWnd : public ScTextWnd
 {
 public:
 ScMultiTextWnd( ScInputBarGroup* pParent );
+virtual ~ScMultiTextWnd();
 virtual void StartEditEngine();
 virtual void StopEditEngine( sal_Bool bAll );
 int GetLineCount();
@@ -194,6 +196,7 @@ protected:
 private:
 long GetPixelTextHeight();
 ScInputBarGroup& mrGroupBar;
+const ScDocument* mpAssignedDocument;
 long mnLines;
 long mnLastExpandedLines;
 };
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

[Lionel Elie Mamane]

 solenv/inc/tg_ext.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit fb46e93e1a85dd4c0377958cc7690eafd52d7580
Author: Lionel Elie Mamane 
Date:   Fri Dec 9 00:22:55 2011 +0100

tg_ext: fix unpack for zip files

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index e696054..f31c340 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -146,22 +146,22 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip
 @-$(RM) $@
-@noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).zip)
+@noop $(assign UNPACKCMD := cd .. && unzip $(unzip_quiet_switch)  -o 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).zip)
 @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.oxt
 @-$(RM) $@
-@noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt)
+@noop $(assign UNPACKCMD := cd .. && unzip $(unzip_quiet_switch)  -o 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt)
 @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
 
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
 @-$(RM) $@
 .IF "$(OS)"=="SOLARIS"
-@noop $(assign UNPACKCMD := jar xf 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
+@noop $(assign UNPACKCMD := cd .. && jar xf 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
 .ELSE  # "$(OS)"=="SOLARIS"
-@noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
+@noop $(assign UNPACKCMD := cd .. && unzip $(unzip_quiet_switch)  -o 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
 .ENDIF # "$(OS)"=="SOLARIS"
 @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: mysqlcppconn/makefile.mk solenv/inc

[Lionel Elie Mamane]

 mysqlcppconn/makefile.mk |   34 --
 solenv/inc/tg_ext.mk |   29 -
 2 files changed, 36 insertions(+), 27 deletions(-)

New commits:
commit 694627b7860fb69f115c020719c5b149d328f9ef
Author: Lionel Elie Mamane 
Date:   Thu Dec 8 23:56:40 2011 +0100

mysqlcppconn: force recompilation when switching between different bindings

diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk
index d7fa8a6..a6534a2 100644
--- a/mysqlcppconn/makefile.mk
+++ b/mysqlcppconn/makefile.mk
@@ -27,10 +27,21 @@
 
 PRJ=.
 
-PRJNAME=mysqlcppconn
-TARGET=so_mysqlcppconn
+# distro-specific builds want to link against a particular mysql library
+# then they do not require mysql-devel package at runtime
+# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate 
patch
+# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql 
library
+.IF "$(SYSTEM_MYSQL)" == "YES"
+MYSQL_BINDING=static
+.ELSE
+MYSQL_BINDING=dynamic
+.ENDIF
 
+PRJNAME=mysqlcppconn
 EXT_PROJECT_NAME=mysql-connector-c++-1.1.0
+TARGET=so_mysqlcppconn_binding-$(MYSQL_BINDING)
+TARFILE_ROOTDIR=mysql-connector-c++-1.1.0_binding-$(MYSQL_BINDING)
+
 
 # --- Settings -
 
@@ -49,16 +60,6 @@ ADDITIONAL_FILES=\
 CONVERTFILES=\
 cppconn$/build_config.h
 
-# distro-specific builds want to link against a particular mysql library
-# then they do not require mysql-devel package at runtime
-# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate 
patch
-# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql 
library
-.IF "$(SYSTEM_MYSQL)" == "YES"
-MYSQL_BINDING=static
-.ELSE
-MYSQL_BINDING=dynamic
-.ENDIF
-
 PATCH_FILES=\
 $(TARFILE_NAME).patch \
 $(TARFILE_NAME)-mysql-binding-$(MYSQL_BINDING).patch \
@@ -66,6 +67,11 @@ PATCH_FILES=\
 
 BUILD_DIR=driver
 BUILD_ACTION = \
+   if test -e ../../lastbuild; then LASTBUILD=$$(cat ../../lastbuild); 
else LASTBUILD='$(MYSQL_BINDING)'; fi && \
+   if test "$${LASTBUILD}" != "$(MYSQL_BINDING)"; then \
+   rm -f ../$(BACK_PATH)/slo/* 
../../so_built_so_mysqlcppconn_binding-$${LASTBUILD}; \
+fi && \
+echo "$(MYSQL_BINDING)" > ../../lastbuild && \
 cd nativeapi \
  && $(MAKE) $(MFLAGS) $(CALLMACROS) \
  && cd .. \
@@ -88,9 +94,9 @@ BUILD_ACTION = \
 NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
 
 $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
-@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/driver$/mysql_driver.h 
$(INCCOM)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/driver$/mysql_driver.h 
$(INCCOM)
 -@$(MKDIRHIER) $(INCCOM)$/cppconn
-@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/cppconn$/* 
$(INCCOM)$/cppconn
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/cppconn$/* 
$(INCCOM)$/cppconn
 @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
 
 normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 0adec0c..e696054 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -54,10 +54,13 @@ ABS_PACKAGE_DIR:=$(MAKEDIR)/$(MISC)/build
 BACK_PATH=../../../
 #MUST match with reference (currently MISC)
 MBACK_PATH=../../
-.IF "$(TARFILE_IS_FLAT)" != ""
-fake_root_dir=/$(TARFILE_NAME)
+fake_root_dir=/$(TARFILE_ROOTDIR)
 #MUST match fake_root_dir in directory levels
 fake_back=../
+.IF "$(TARFILE_IS_FLAT)" != ""
+TAR_STRIP_LEVEL=0
+.ELSE
+TAR_STRIP_LEVEL=1
 .ENDIF "$(TARFILE_IS_FLAT)" != ""
 
 TARFILE_LOCATION*=$(BACK_PATH)$(fake_back)download
@@ -106,9 +109,9 @@ clean:
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
 @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-@noop $(assign UNPACKCMD := sh -c "bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ")
+@noop $(assign UNPACKCMD := sh -c "bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner --strip-components=$(TAR_STRIP_LEVEL) 
-x$(tar_verbose_switch)f - ")
 .ELSE  # "$(GUI)"=="UNX"
-@noop $(assign UNPACKCMD := bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
+@noop $(assign UNPACKCMD := bzip2 -cd 
$(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | 
$(GNUTAR) --no-same-owner --strip-components=$(TAR_STRIP_LEVEL) 
-x$(tar_verbose_switch)f - )
 .ENDIF # "$(GUI)"=="UNX"
 @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
@@ -116,28 +119,28 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z
 @-$(RM) $@
 .IF "$(GUI)"=="UNX"
-@noop $(assign UNPACKCMD := sh -c "uncompress 

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in

[Lionel Elie Mamane]

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

New commits:
commit 331892b21d656a2b382165bca2a9e2cc0a777ca8
Author: Lionel Elie Mamane 
Date:   Thu Dec 8 23:21:49 2011 +0100

Allow Xinerama to sit in another directory than other X libraries

diff --git a/configure.in b/configure.in
index 1c9a08d..44bb5e9 100644
--- a/configure.in
+++ b/configure.in
@@ -8523,7 +8523,15 @@ if test "$_os" = "Darwin"; then
 XINERAMA_LINK=dynamic
 AC_MSG_RESULT([yes])
 elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
-if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
+if test "$x_libraries" = "default_x_libraries"; then
+XINERAMALIB=`$PKG_CONFIG --variable=libdir xinerama`
+if test "x$XINERAMALIB" = x; then
+   XINERAMALIB="/usr/lib"
+fi
+else
+XINERAMALIB="$x_libraries"
+fi
+if test -e "$XINERAMALIB/libXinerama.so" -a -e 
"$XINERAMALIB/libXinerama.a"; then
 # we have both versions, let the user decide but use the dynamic one
 # per default
 USE_XINERAMA=YES
@@ -8532,11 +8540,11 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
 else
 XINERAMA_LINK=static
 fi
-elif test -e "$XLIB/libXinerama.so" -a ! -e "$XLIB/libXinerama.a"; then
+elif test -e "$XINERAMALIB/libXinerama.so" -a ! -e 
"$XINERAMALIB/libXinerama.a"; then
 # we have only the dynamic version
 USE_XINERAMA=YES
 XINERAMA_LINK=dynamic
-elif test -e "$XLIB/libXinerama.a"; then
+elif test -e "$XINERAMALIB/libXinerama.a"; then
 # static version
 if echo $host_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
 USE_XINERAMA=YES
@@ -8554,7 +8562,11 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
 AC_MSG_RESULT([yes, with $XINERAMA_LINK linking])
 AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
 [AC_MSG_ERROR(Xinerama header not found.)], [])
-XINERAMA_EXTRA_LIBS="-L$XLIB -lXext"
+XEXTLIBS=`$PKG_CONFIG --variable=libs xext`
+if test "x$XEXTLIB" = x; then
+   XEXTLIBS="-L$XLIB -L$XINERAMALIB -lXext"
+fi
+XINERAMA_EXTRA_LIBS="$XEXTLIBS"
 if test "$_os" = "FreeBSD"; then
 XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -lXt"
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

[Lionel Elie Mamane]

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

New commits:
commit 4097499989f4058b9c66ed6f7fe79eb8f5543c8c
Author: Lionel Elie Mamane 
Date:   Thu Dec 8 23:21:49 2011 +0100

Allow Xinerama to sit in another directory than other X libraries

diff --git a/configure.in b/configure.in
index 509ce03..0228af5 100644
--- a/configure.in
+++ b/configure.in
@@ -8563,7 +8563,15 @@ if test "$_os" = "Darwin"; then
 XINERAMA_LINK=dynamic
 AC_MSG_RESULT([yes])
 elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
-if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
+if test "$x_libraries" = "default_x_libraries"; then
+XINERAMALIB=`$PKG_CONFIG --variable=libdir xinerama`
+if test "x$XINERAMALIB" = x; then
+   XINERAMALIB="/usr/lib"
+fi
+else
+XINERAMALIB="$x_libraries"
+fi
+if test -e "$XINERAMALIB/libXinerama.so" -a -e 
"$XINERAMALIB/libXinerama.a"; then
 # we have both versions, let the user decide but use the dynamic one
 # per default
 USE_XINERAMA=YES
@@ -8572,11 +8580,11 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
 else
 XINERAMA_LINK=static
 fi
-elif test -e "$XLIB/libXinerama.so" -a ! -e "$XLIB/libXinerama.a"; then
+elif test -e "$XINERAMALIB/libXinerama.so" -a ! -e 
"$XINERAMALIB/libXinerama.a"; then
 # we have only the dynamic version
 USE_XINERAMA=YES
 XINERAMA_LINK=dynamic
-elif test -e "$XLIB/libXinerama.a"; then
+elif test -e "$XINERAMALIB/libXinerama.a"; then
 # static version
 if echo $host_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
 USE_XINERAMA=YES
@@ -8594,7 +8602,11 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
 AC_MSG_RESULT([yes, with $XINERAMA_LINK linking])
 AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
 [AC_MSG_ERROR(Xinerama header not found.)], [])
-XINERAMA_EXTRA_LIBS="-L$XLIB -lXext"
+XEXTLIBS=`$PKG_CONFIG --variable=libs xext`
+if test "x$XEXTLIB" = x; then
+   XEXTLIBS="-L$XLIB -L$XINERAMALIB -lXext"
+fi
+XINERAMA_EXTRA_LIBS="$XEXTLIBS"
 if test "$_os" = "FreeBSD"; then
 XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -lXt"
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libcdr/libcdr-0.0.0.patch

[Tor Lillqvist]

 libcdr/libcdr-0.0.0.patch |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 03a8c54cfc1c0614fb5099d28e17a88b
Author: Tor Lillqvist 
Date:   Thu Dec 8 23:52:26 2011 +0200

Fix build with internal zlib

diff --git a/libcdr/libcdr-0.0.0.patch b/libcdr/libcdr-0.0.0.patch
index 8016fec..3258740 100644
--- a/libcdr/libcdr-0.0.0.patch
+++ b/libcdr/libcdr-0.0.0.patch
@@ -18,3 +18,17 @@
  
  #endif
  
+--- misc/libcdr-0.0.0/src/lib/makefile.mk
 misc/build/libcdr-0.0.0/src/lib/makefile.mk
+@@ -28,6 +28,10 @@
+ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
+ .ENDIF
+ 
++.IF "$(SYSTEM_ZLIB)" != "YES"
++INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib
++.ENDIF
++
+ SLOFILES= \
+ $(SLO)$/CDRDocument.obj \
+   $(SLO)$/CDRInternalStream.obj \
+
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sdext/source sd/source

[Michael Meeks]

 sd/source/ui/app/optsitem.cxx   |   15 +++
 sd/source/ui/inc/optsitem.hxx   |4 -
 sd/source/ui/inc/slideshow.hxx  |2 
 sd/source/ui/slideshow/SlideShowRestarter.cxx   |   20 +
 sd/source/ui/slideshow/SlideShowRestarter.hxx   |4 -
 sd/source/ui/slideshow/slideshow.cxx|   26 +-
 sdext/source/presenter/PresenterController.cxx  |   16 
 sdext/source/presenter/PresenterController.hxx  |4 +
 sdext/source/presenter/PresenterProtocolHandler.cxx |2 
 sdext/source/presenter/PresenterScreen.cxx  |   78 +---
 sdext/source/presenter/PresenterScreen.hxx  |   11 ++
 11 files changed, 134 insertions(+), 48 deletions(-)

New commits:
commit 202fca9d1534a500ed84dcd4b1e31355a49c4404
Author: Michael Meeks 
Date:   Thu Dec 8 19:44:51 2011 +

Fix misc. bugs in presenter view switch screen feature: make it work.

diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 4915bf6..486b402 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -63,6 +63,7 @@ class CommandEvent;
 class Rectangle;
 class Window;
 class SfxRequest;
+class WorkWindow;
 
 // TODO: Remove
 #define PAGE_NO_END 65535
@@ -205,6 +206,7 @@ private:
 void ThrowIfDisposed() throw (::com::sun::star::uno::RuntimeException);
 
 void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window* 
pParentWindow );
+WorkWindow *GetWorkWindow();
 
 // default: disabled copy/assignment
 SlideShow(const SlideShow&);
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx 
b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index 536b1a6..b017ce8 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -58,22 +58,19 @@ SlideShowRestarter::SlideShowRestarter (
 {
 }
 
-
-
-
 SlideShowRestarter::~SlideShowRestarter (void)
 {
 }
 
-
-
-
-void SlideShowRestarter::Restart (void)
+void SlideShowRestarter::Restart (bool bForce)
 {
 // Prevent multiple and concurrently restarts.
 if (mnEventId != 0)
 return;
 
+if (bForce)
+mnDisplayCount = 0;
+
 // Remember the current slide in order to restore it after the slide
 // show has been restarted.
 if (mpSlideShow.is())
@@ -90,9 +87,6 @@ void SlideShowRestarter::Restart (void)
 LINK(this, SlideShowRestarter, EndPresentation));
 }
 
-
-
-
 sal_Int32 SlideShowRestarter::GetDisplayCount (void)
 {
 const Reference xContext (
@@ -111,9 +105,6 @@ sal_Int32 SlideShowRestarter::GetDisplayCount (void)
 return xIndexAccess->getCount();
 }
 
-
-
-
 IMPL_LINK(SlideShowRestarter, EndPresentation, void*, EMPTYARG)
 {
 mnEventId = 0;
@@ -158,9 +149,6 @@ IMPL_LINK(SlideShowRestarter, EndPresentation, void*, 
EMPTYARG)
 return 0;
 }
 
-
-
-
 void SlideShowRestarter::StartPresentation (void)
 {
 if (mpDispatcher == NULL && mpViewShellBase!=NULL)
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx 
b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index 2f5badb..0828176 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -62,8 +62,10 @@ public:
 
 /** Restarting the slide show is an asynchronous multi step process
 which is started by calling this method.
+@param bForce
+   Used to force a re-start, even if the display count is unchanged.
 */
-void Restart (void);
+void Restart (bool bForce);
 
 private:
 sal_Int32 mnEventId;
diff --git a/sd/source/ui/slideshow/slideshow.cxx 
b/sd/source/ui/slideshow/slideshow.cxx
index edb9bb2..ca480f5 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -97,13 +97,15 @@ namespace {
   mpRestarter(new SlideShowRestarter(rpSlideShow, pViewShellBase))
 {}
 
+void Restart(bool bForce)
+{
+mpRestarter->Restart(bForce);
+}
 
 virtual void DataChanged (const DataChangedEvent& rEvent)
 {
 if (rEvent.GetType() == DATACHANGED_DISPLAY)
-{
-mpRestarter->Restart();
-}
+Restart(false);
 }
 
 private:
@@ -555,6 +557,11 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& 
aPropertyName, const
 
 SdOptions* pOptions = 
SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
 pOptions->SetDisplay( nDisplay );
+
+FullScreenWorkWindow *pWin = dynamic_cast(GetWorkWindow());
+if( !pWin )
+return;
+pWin->Restart(true);
 }
 break;
 }
@@ -674,6 +681,19 @@ void SAL_CALL SlideShow::start() throw(RuntimeException)
 
 // 
 
+WorkWindow *SlideShow::GetWorkWindow()
+{
+if( !mpFullScreenViewShellBase )
+ret

[Libreoffice-commits] .: writerfilter/source

[Cédric Bosdonnat]

 writerfilter/source/dmapper/DomainMapperTableManager.cxx |4 -
 writerfilter/source/filter/RtfFilter.cxx |4 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |   33 +++
 writerfilter/source/rtftok/rtfsdrimport.cxx  |8 +--
 writerfilter/source/rtftok/rtfskipdestination.cxx|2 
 writerfilter/source/rtftok/rtftokenizer.cxx  |   14 +++---
 6 files changed, 33 insertions(+), 32 deletions(-)

New commits:
commit 52422457d4aada3d9a12cd8cf2945c46dea7b275
Author: Cédric Bosdonnat 
Date:   Thu Dec 8 21:43:19 2011 +0100

Writerfilter: replace OSL_TRACE(...) by SAL_INFO("writerfilter",...)

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 3bfb463..bca93f9 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -261,13 +261,13 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
 // Binary filter takes BiDirection into account ( but I 
have no idea about that here )
 // or even what it is. But... here's where to handle it if 
it becomes an issue
 pPropMap->Insert( PROP_FRM_DIRECTION, false, 
uno::makeAny( VERT_TOP_RIGHT ));
-OSL_TRACE("Have inserted textDirection %d", nIntValue 
);
+SAL_INFO( "writerfilter", "Have inserted textDirection 
" << nIntValue );
 break;
 case 3:  // btLr
 // We have to fake this text direction
  pPropMap->Insert( PROP_FRM_DIRECTION, false, 
uno::makeAny( HORI_LEFT_TOP ));
  pPropMap->Insert( PROP_CHAR_ROTATION, false, 
uno::makeAny( sal_Int16( 900 ) ));
-OSL_TRACE("Have inserted textDirection %d", nIntValue 
);
+SAL_INFO( "writerfilter", "Have inserted textDirection 
" << nIntValue );
 break;
 case 4: // lrTbV
 pPropMap->Insert( PROP_FRM_DIRECTION, false, 
uno::makeAny( HORI_LEFT_TOP ));
diff --git a/writerfilter/source/filter/RtfFilter.cxx 
b/writerfilter/source/filter/RtfFilter.cxx
index 8786539..80fba44 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -54,7 +54,7 @@ RtfFilter::~RtfFilter()
 sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& 
aDescriptor )
throw (uno::RuntimeException)
 {
-OSL_TRACE("%s", OSL_THIS_FUNC);
+SAL_INFO("writerfilter", OSL_THIS_FUNC);
 if( m_xSrcDoc.is() )
 {
 uno::Reference< lang::XMultiServiceFactory > 
xMSF(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW);
@@ -102,7 +102,7 @@ sal_Bool RtfFilter::filter( const uno::Sequence< 
beans::PropertyValue >& aDescri
 catch (const uno::Exception& e)
 {
 #if OSL_DEBUG_LEVEL > 1
-OSL_TRACE( "Exception caught: %s",
+SAL_INFO("writerfilter", "Exception caught: " <<
 rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 
).getStr() );
 #endif
 (void)e;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a378e83..06f0580 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -374,9 +374,9 @@ void RTFDocumentImpl::resolveSubstream(sal_uInt32 nPos, Id 
nId, OUString& rIgnor
 m_aAuthor = OUString();
 }
 pImpl->seek(nPos);
-OSL_TRACE("substream start");
+SAL_INFO("writerfilter", "substream start");
 Mapper().substream(nId, pImpl);
-OSL_TRACE("substream end");
+SAL_INFO("writerfilter", "substream end");
 Strm().Seek(nCurrent);
 nPos = 0;
 }
@@ -523,25 +523,25 @@ void RTFDocumentImpl::resolve(Stream & rMapper)
 switch (m_pTokenizer->resolveParse())
 {
 case ERROR_OK:
-OSL_TRACE("%s: finished without errors", OSL_THIS_FUNC);
+SAL_INFO("writerfilter", OSL_THIS_FUNC << ": finished without 
errors");
 break;
 case ERROR_GROUP_UNDER:
-OSL_TRACE("%s: unmatched '}'", OSL_THIS_FUNC);
+SAL_INFO("writerfilter", OSL_THIS_FUNC << ": unmatched '}'");
 break;
 case ERROR_GROUP_OVER:
-OSL_TRACE("%s: unmatched '{'", OSL_THIS_FUNC);
+SAL_INFO("writerfilter", OSL_THIS_FUNC << ": unmatched '{'");
 throw io::UnexpectedEOFException();
 break;
 case ERROR_EOF:
-OSL_TRACE("%s: unexpected end of file", OSL_THIS_FUNC);
+SAL_INFO("writerfilter", OSL_THIS_FUNC << ": unexpected end of 
file");
 throw io::UnexpectedEOFException();
 break;
 case ERROR_HEX_INVALID:
-OSL_TRACE("%s: invalid hex char", OSL_THIS_FUNC);
+ 

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

[Michael Meeks]

 sd/source/ui/app/optsitem.cxx   |   15 +++
 sd/source/ui/inc/optsitem.hxx   |4 -
 sd/source/ui/inc/slideshow.hxx  |2 
 sd/source/ui/slideshow/SlideShowRestarter.cxx   |   20 +
 sd/source/ui/slideshow/SlideShowRestarter.hxx   |4 -
 sd/source/ui/slideshow/slideshow.cxx|   26 +-
 sdext/source/presenter/PresenterController.cxx  |   16 
 sdext/source/presenter/PresenterController.hxx  |4 +
 sdext/source/presenter/PresenterProtocolHandler.cxx |2 
 sdext/source/presenter/PresenterScreen.cxx  |   78 +---
 sdext/source/presenter/PresenterScreen.hxx  |   11 ++
 11 files changed, 134 insertions(+), 48 deletions(-)

New commits:
commit f1db9ee6c3c6d5be103608379c97d9ec8c865b0d
Author: Michael Meeks 
Date:   Thu Dec 8 19:44:51 2011 +

Fix misc. bugs in presenter view switch screen feature: make it work.

diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 4915bf6..486b402 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -63,6 +63,7 @@ class CommandEvent;
 class Rectangle;
 class Window;
 class SfxRequest;
+class WorkWindow;
 
 // TODO: Remove
 #define PAGE_NO_END 65535
@@ -205,6 +206,7 @@ private:
 void ThrowIfDisposed() throw (::com::sun::star::uno::RuntimeException);
 
 void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window* 
pParentWindow );
+WorkWindow *GetWorkWindow();
 
 // default: disabled copy/assignment
 SlideShow(const SlideShow&);
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx 
b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index 536b1a6..b017ce8 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -58,22 +58,19 @@ SlideShowRestarter::SlideShowRestarter (
 {
 }
 
-
-
-
 SlideShowRestarter::~SlideShowRestarter (void)
 {
 }
 
-
-
-
-void SlideShowRestarter::Restart (void)
+void SlideShowRestarter::Restart (bool bForce)
 {
 // Prevent multiple and concurrently restarts.
 if (mnEventId != 0)
 return;
 
+if (bForce)
+mnDisplayCount = 0;
+
 // Remember the current slide in order to restore it after the slide
 // show has been restarted.
 if (mpSlideShow.is())
@@ -90,9 +87,6 @@ void SlideShowRestarter::Restart (void)
 LINK(this, SlideShowRestarter, EndPresentation));
 }
 
-
-
-
 sal_Int32 SlideShowRestarter::GetDisplayCount (void)
 {
 const Reference xContext (
@@ -111,9 +105,6 @@ sal_Int32 SlideShowRestarter::GetDisplayCount (void)
 return xIndexAccess->getCount();
 }
 
-
-
-
 IMPL_LINK(SlideShowRestarter, EndPresentation, void*, EMPTYARG)
 {
 mnEventId = 0;
@@ -158,9 +149,6 @@ IMPL_LINK(SlideShowRestarter, EndPresentation, void*, 
EMPTYARG)
 return 0;
 }
 
-
-
-
 void SlideShowRestarter::StartPresentation (void)
 {
 if (mpDispatcher == NULL && mpViewShellBase!=NULL)
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx 
b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index 2f5badb..0828176 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -62,8 +62,10 @@ public:
 
 /** Restarting the slide show is an asynchronous multi step process
 which is started by calling this method.
+@param bForce
+   Used to force a re-start, even if the display count is unchanged.
 */
-void Restart (void);
+void Restart (bool bForce);
 
 private:
 sal_Int32 mnEventId;
diff --git a/sd/source/ui/slideshow/slideshow.cxx 
b/sd/source/ui/slideshow/slideshow.cxx
index edb9bb2..ca480f5 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -97,13 +97,15 @@ namespace {
   mpRestarter(new SlideShowRestarter(rpSlideShow, pViewShellBase))
 {}
 
+void Restart(bool bForce)
+{
+mpRestarter->Restart(bForce);
+}
 
 virtual void DataChanged (const DataChangedEvent& rEvent)
 {
 if (rEvent.GetType() == DATACHANGED_DISPLAY)
-{
-mpRestarter->Restart();
-}
+Restart(false);
 }
 
 private:
@@ -555,6 +557,11 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& 
aPropertyName, const
 
 SdOptions* pOptions = 
SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
 pOptions->SetDisplay( nDisplay );
+
+FullScreenWorkWindow *pWin = dynamic_cast(GetWorkWindow());
+if( !pWin )
+return;
+pWin->Restart(true);
 }
 break;
 }
@@ -674,6 +681,19 @@ void SAL_CALL SlideShow::start() throw(RuntimeException)
 
 // 
 
+WorkWindow *SlideShow::GetWorkWindow()
+{
+if( !mpFullScreenViewShellBase )
+ret

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch

[Lionel Elie Mamane]

 mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch |   11 
++
 1 file changed, 11 insertions(+)

New commits:
commit bf162f6ba161e7157d9dac61be01cf3b72b8a6c1
Author: Lionel Elie Mamane 
Date:   Thu Dec 8 20:35:41 2011 +0100

fix build with --enable-ext-mysql-connector --without-system-mysql

diff --git a/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch 
b/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch
index f013b5e..80a87c8 100644
--- a/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch
+++ b/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch
@@ -4,3 +4,14 @@
 -dummy
 +#define HAVE_DLFCN_H 1
 +//#define MYSQLCLIENT_STATIC_BINDING 1
+--- misc/mysql-connector-c++-1.1.0/driver/nativeapi/mysql_client_api.h 
2010-09-10 11:47:47.0 +0200
 misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/mysql_client_api.h   
2011-12-08 20:22:29.0 +0100
+@@ -107,6 +107,8 @@
+ 
+ typedef MYSQL_RES * (STDCALL *ptr2mysql_use_result)(MYSQL *);
+ 
++typedef unsigned long (STDCALL *ptr2mysql_realescapestring)(MYSQL *, char *, 
const char *, unsigned long);
++
+ /* Prepared Statement stmt_* functions */
+ typedef my_ulonglong (STDCALL *ptr2mysql_stmt_affected_rows)(MYSQL_STMT *);
+ 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch

[Lionel Elie Mamane]

 mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch |   11 
++
 1 file changed, 11 insertions(+)

New commits:
commit 85863c130ae9327f83d819c45a3a9c3de399cd1e
Author: Lionel Elie Mamane 
Date:   Thu Dec 8 20:35:41 2011 +0100

fix build with --enable-ext-mysql-connector --without-system-mysql

diff --git a/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch 
b/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch
index f013b5e..80a87c8 100644
--- a/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch
+++ b/mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch
@@ -4,3 +4,14 @@
 -dummy
 +#define HAVE_DLFCN_H 1
 +//#define MYSQLCLIENT_STATIC_BINDING 1
+--- misc/mysql-connector-c++-1.1.0/driver/nativeapi/mysql_client_api.h 
2010-09-10 11:47:47.0 +0200
 misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/mysql_client_api.h   
2011-12-08 20:22:29.0 +0100
+@@ -107,6 +107,8 @@
+ 
+ typedef MYSQL_RES * (STDCALL *ptr2mysql_use_result)(MYSQL *);
+ 
++typedef unsigned long (STDCALL *ptr2mysql_realescapestring)(MYSQL *, char *, 
const char *, unsigned long);
++
+ /* Prepared Statement stmt_* functions */
+ typedef my_ulonglong (STDCALL *ptr2mysql_stmt_affected_rows)(MYSQL_STMT *);
+ 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Ivan Timofeev]

 sw/source/core/crsr/callnk.cxx |2 +-
 sw/source/core/crsr/crsrsh.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 16fbfaaa2da85415944f1a3f3e16f48ee30505f6
Author: Ivan Timofeev 
Date:   Thu Dec 8 22:55:27 2011 +0400

fdo#42147: fix crash

it is not valid to use (type & ND_TEXTNODE) before casting to SwTxtNode,
type of SwCntntNode has the ND_TEXTNODE bit as well, but SwCntntNode is not
derived from SwTxtNode.

diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 66e7f45..a6373da 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -70,7 +70,7 @@ SwCallLink::SwCallLink( SwCrsrShell & rSh )
 nNdTyp = rNd.GetNodeType();
 bHasSelection = ( *pCrsr->GetPoint() != *pCrsr->GetMark() );
 
-if( ND_TEXTNODE & nNdTyp )
+if( rNd.IsTxtNode() )
 nLeftFrmPos = SwCallLink::getLayoutFrm( rShell.GetLayout(), 
(SwTxtNode&)rNd, nCntnt,
 !rShell.ActionPend() );
 else
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index ca32947..5617665 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -223,7 +223,7 @@ void SwCrsrShell::StartAction()
 nAktCntnt = pCurCrsr->GetPoint()->nContent.GetIndex();
 nAktNdTyp = rNd.GetNodeType();
 bAktSelection = *pCurCrsr->GetPoint() != *pCurCrsr->GetMark();
-if( ND_TEXTNODE & nAktNdTyp )
+if( rNd.IsTxtNode() )
 nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), 
(SwTxtNode&)rNd, nAktCntnt, sal_True );
 else
 nLeftFrmPos = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Ivan Timofeev]

 sw/source/core/crsr/callnk.cxx |2 +-
 sw/source/core/crsr/crsrsh.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dc61ebdc93a777f4f41c1ae837bdb6098ecffcce
Author: Ivan Timofeev 
Date:   Thu Dec 8 22:55:27 2011 +0400

fdo#42147: fix crash

it is not valid to use (type & ND_TEXTNODE) before casting to SwTxtNode,
type of SwCntntNode has the ND_TEXTNODE bit as well, but SwCntntNode is not
derived from SwTxtNode.

diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 66e7f45..a6373da 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -70,7 +70,7 @@ SwCallLink::SwCallLink( SwCrsrShell & rSh )
 nNdTyp = rNd.GetNodeType();
 bHasSelection = ( *pCrsr->GetPoint() != *pCrsr->GetMark() );
 
-if( ND_TEXTNODE & nNdTyp )
+if( rNd.IsTxtNode() )
 nLeftFrmPos = SwCallLink::getLayoutFrm( rShell.GetLayout(), 
(SwTxtNode&)rNd, nCntnt,
 !rShell.ActionPend() );
 else
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index ca32947..5617665 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -223,7 +223,7 @@ void SwCrsrShell::StartAction()
 nAktCntnt = pCurCrsr->GetPoint()->nContent.GetIndex();
 nAktNdTyp = rNd.GetNodeType();
 bAktSelection = *pCurCrsr->GetPoint() != *pCurCrsr->GetMark();
-if( ND_TEXTNODE & nAktNdTyp )
+if( rNd.IsTxtNode() )
 nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), 
(SwTxtNode&)rNd, nAktCntnt, sal_True );
 else
 nLeftFrmPos = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - connectivity/source solenv/gbuild

[Norbert Thiebaud]

 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |2 -
 connectivity/source/drivers/postgresql/pq_statement.cxx |2 -
 connectivity/source/drivers/postgresql/pq_xtables.cxx   |2 -
 solenv/gbuild/extensions/post_AuxTargets.mk |   19 
--
 4 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit 7fb4d669510994e409677be33868561bfcc37403
Author: Norbert Thiebaud 
Date:   Thu Dec 8 13:03:37 2011 -0600

WaE Mac gcc is confused with >>= operator overload (it is not alone)

>>= operator overload turn the right-value of the operator into a
left value... which confuse the heck out of the compiler's detection
of use of unitialized variables (and also C-reader like me for
whom >>= means something else altogether...
(why on earth are we right-bitshifting... with an unitialized variable...
oh! fracking operator overload!!!)

diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 
b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index b900c0f..9c35eef 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -681,7 +681,7 @@ void PreparedStatement::setObjectWithInfo(
 if( com::sun::star::sdbc::DataType::DECIMAL == targetSqlType ||
 com::sun::star::sdbc::DataType::NUMERIC == targetSqlType )
 {
-double myDouble;
+double myDouble = 0.0;
 OUString myString;
 if( x >>= myDouble )
 {
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx 
b/connectivity/source/drivers/postgresql/pq_statement.cxx
index b7f7401..7304b15 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -448,7 +448,7 @@ static Sequence< ::rtl::OUString > lookupKeys(
 while( enumeration->hasMoreElements() )
 {
 enumeration->nextElement() >>= set;
-sal_Int32 keyType;
+sal_Int32 keyType = 0;
 if( (set->getPropertyValue( st.TYPE ) >>= keyType ) &&
 keyType == com::sun::star::sdbcx::KeyType::PRIMARY )
 {
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx 
b/connectivity/source/drivers/postgresql/pq_xtables.cxx
index 483cc3f..44b1e18 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx
@@ -222,7 +222,7 @@ static void appendColumnList(
 OUString type = sqltype2string( column );
 if( isAutoIncrement )
 {
-sal_Int32 dataType;
+sal_Int32 dataType = 0;
 column->getPropertyValue( st.TYPE ) >>= dataType;
 if( com::sun::star::sdbc::DataType::INTEGER == dataType )
 {
commit c08f5d7de3edae2ed6ca419043da0b13a9877f25
Author: Norbert Thiebaud 
Date:   Thu Dec 8 12:58:35 2011 -0600

./download need to be run with $SRCDIR as working dir

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index a193869..7622047 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -43,8 +43,7 @@ distro-pack-install: install
$(SRCDIR)/bin/distro-install-file-lists
 
 $(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
-   $(if $(filter YES,$(DO_FETCH_TARBALLS)),@$(SRCDIR)/download 
$(SRCDIR)/ooo.lst)
-   @touch $@
+   $(if $(filter YES,$(DO_FETCH_TARBALLS)),cd $(SRCDIR) && ./download 
./ooo.lst && touch $@,touch $@)
 
 fetch: $(SRCDIR)/src.downloaded
 
commit 531098efd73a8e741ee502353071fefb58ee0cb8
Author: Norbert Thiebaud 
Date:   Thu Dec 8 12:58:10 2011 -0600

clean-up header and set the modfiel appropriately

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index 5e11850..a193869 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -1,24 +1,24 @@
-#   -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- 
*/
-#  
+# -*- 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.
-#  
+#
 #   Major Contributor(s):
 #   [ Copyri

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

[Norbert Thiebaud]

 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |2 -
 connectivity/source/drivers/postgresql/pq_statement.cxx |2 -
 connectivity/source/drivers/postgresql/pq_xtables.cxx   |2 -
 solenv/gbuild/extensions/post_AuxTargets.mk |   19 
--
 4 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit 0c60677c961814f2786f99b8ba0d8c9aec0605e4
Author: Norbert Thiebaud 
Date:   Thu Dec 8 13:03:37 2011 -0600

WaE Mac gcc is confused with >>= operator overload (it is not alone)

>>= operator overload turn the right-value of the operator into a
left value... which confuse the heck out of the compiler's detection
of use of unitialized variables (and also C-reader like me for
whom >>= means something else altogether...
(why on earth are we right-bitshifting... with an unitialized variable...
oh! fracking operator overload!!!)

diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 
b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index b900c0f..9c35eef 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -681,7 +681,7 @@ void PreparedStatement::setObjectWithInfo(
 if( com::sun::star::sdbc::DataType::DECIMAL == targetSqlType ||
 com::sun::star::sdbc::DataType::NUMERIC == targetSqlType )
 {
-double myDouble;
+double myDouble = 0.0;
 OUString myString;
 if( x >>= myDouble )
 {
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx 
b/connectivity/source/drivers/postgresql/pq_statement.cxx
index b7f7401..7304b15 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -448,7 +448,7 @@ static Sequence< ::rtl::OUString > lookupKeys(
 while( enumeration->hasMoreElements() )
 {
 enumeration->nextElement() >>= set;
-sal_Int32 keyType;
+sal_Int32 keyType = 0;
 if( (set->getPropertyValue( st.TYPE ) >>= keyType ) &&
 keyType == com::sun::star::sdbcx::KeyType::PRIMARY )
 {
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx 
b/connectivity/source/drivers/postgresql/pq_xtables.cxx
index 483cc3f..44b1e18 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx
@@ -222,7 +222,7 @@ static void appendColumnList(
 OUString type = sqltype2string( column );
 if( isAutoIncrement )
 {
-sal_Int32 dataType;
+sal_Int32 dataType = 0;
 column->getPropertyValue( st.TYPE ) >>= dataType;
 if( com::sun::star::sdbc::DataType::INTEGER == dataType )
 {
commit a41bf630601cfc1add08583ed0d5542ca71f3334
Author: Norbert Thiebaud 
Date:   Thu Dec 8 12:58:35 2011 -0600

./download need to be run with $SRCDIR as working dir

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index a193869..7622047 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -43,8 +43,7 @@ distro-pack-install: install
$(SRCDIR)/bin/distro-install-file-lists
 
 $(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
-   $(if $(filter YES,$(DO_FETCH_TARBALLS)),@$(SRCDIR)/download 
$(SRCDIR)/ooo.lst)
-   @touch $@
+   $(if $(filter YES,$(DO_FETCH_TARBALLS)),cd $(SRCDIR) && ./download 
./ooo.lst && touch $@,touch $@)
 
 fetch: $(SRCDIR)/src.downloaded
 
commit f2825ed71ada129c4e165815d005d80c34bd919f
Author: Norbert Thiebaud 
Date:   Thu Dec 8 12:58:10 2011 -0600

clean-up header and set the modfiel appropriately

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index 5e11850..a193869 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -1,24 +1,24 @@
-#   -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- 
*/
-#  
+# -*- 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.
-#  
+#
 #   Major Contributor(s):
 #   [ Copyri

[Libreoffice-commits] .: 2 commits - basic/inc basic/Package_inc.mk

[August Sodora]

 basic/Package_inc.mk |2 
 basic/inc/basic/dispdefs.hxx |   40 --
 basic/inc/basic/svtmsg.hrc   |  115 ---
 3 files changed, 157 deletions(-)

New commits:
commit cfcbcc8939f12b58568fe37899b55f76c26aaae7
Author: August Sodora 
Date:   Thu Dec 8 13:59:58 2011 -0500

Removed basic/svtmsg.hrc

diff --git a/basic/Package_inc.mk b/basic/Package_inc.mk
index ebd8b64..603e694 100644
--- a/basic/Package_inc.mk
+++ b/basic/Package_inc.mk
@@ -48,7 +48,6 @@ $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/sbxmeth.hxx,basic/sbxmeth.
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/sbxobj.hxx,basic/sbxobj.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/sbxprop.hxx,basic/sbxprop.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/sbxvar.hxx,basic/sbxvar.hxx))
-$(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/svtmsg.hrc,basic/svtmsg.hrc))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/vbahelper.hxx,basic/vbahelper.hxx))
 
 # vim: set noet sw=4 ts=4:
diff --git a/basic/inc/basic/svtmsg.hrc b/basic/inc/basic/svtmsg.hrc
deleted file mode 100755
index ff215d3..000
--- a/basic/inc/basic/svtmsg.hrc
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-#include "basic/ttglobal.hrc"
-
-
-// Here are the messages of /basic/source/app included
-
-///
-// Error message that go to the Resultfile.
-// *
-// ***  !!ATTENTION!!***
-// *
-// Theses numbers MUST NOT change ever!
-// Because they are stored in the Resultfiles and if you showed them again
-// the appropriate new or no Strings are viewed.
-///
-
-#define S_GPF_ABORT ( SVT_START +   0 )
-#define S_APP_SHUTDOWN  ( SVT_START +   1 )
-#define S_SID_EXECUTE_FAILED_NO_DISPATCHER  ( SVT_START +   2 )
-#define S_SID_EXECUTE_FAILED( SVT_START +   3 )
-#define S_UNO_PROPERTY_NITIALIZE_FAILED ( SVT_START +   4 )
-#define S_RESETAPPLICATION_FAILED_COMPLEX   ( SVT_START +   5 )
-#define S_RESETAPPLICATION_FAILED_UNKNOWN   ( SVT_START +   6 )
-#define S_NO_ACTIVE_WINDOW  ( SVT_START +   7 )
-#define S_NO_DIALOG_IN_GETACTIVE( SVT_START +   8 )
-#define S_NO_POPUP  ( SVT_START +   9 )
-#define S_NO_SUBMENU( SVT_START +  10 )
-#define S_CONTROLTYPE_NOT_SUPPORTED ( SVT_START +  11 )
-#define S_SELECTION_BY_ATTRIBUTE_ONLY_DIRECTORIES   ( SVT_START +  12 )
-#define S_NO_MORE_FILES ( SVT_START +  13 )
-#define S_UNKNOWN_METHOD( SVT_START +  14 )
-#define S_INVALID_PARAMETERS( SVT_START +  15 )
-#define S_POINTER_OUTSIDE_APPWIN( SVT_START +  16 )
-#define S_UNKNOWN_COMMAND   ( SVT_START +  17 )
-#define S_WIN_NOT_FOUND ( SVT_START +  18 )
-#define S_WIN_INVISIBLE ( SVT_START +  19 )
-#define S_WIN_DISABLED  ( SVT_START +  20 )
-#define S_NUMBER_TOO_BIG( SVT_START +  21 )
-#define S_NUMBER_TOO_SMALL  ( SVT_START +  22 )
-#define S_WINDOW_DISAPPEARED( SVT_START +  23 )
-#define S_ERROR_SAVING_IMAGE( SVT_START +  24 )
-#define S_INVALID_POSITION  ( SVT_START +  25 )
-#define S_SPLITWIN_NOT_FOUND( SVT_START +  26 )
-#define S_INTERNAL_ERROR( SVT_START +  27 )
-#define S_NO_STATUSBAR  ( SVT_START +  28 )
-#defi

[Libreoffice-commits] .: basic/inc basic/Package_inc.mk

[August Sodora]

 basic/Package_inc.mk|1 
 basic/inc/basic/process.hxx |   70 
 2 files changed, 71 deletions(-)

New commits:
commit da35c131feba086d66b5aad2764a5c611cfde401
Author: August Sodora 
Date:   Thu Dec 8 13:56:03 2011 -0500

Removed basic/process.hxx

diff --git a/basic/Package_inc.mk b/basic/Package_inc.mk
index 0f6b253..0c9c5b2 100644
--- a/basic/Package_inc.mk
+++ b/basic/Package_inc.mk
@@ -34,7 +34,6 @@ $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/basmgr.hxx,basic/basmgr.hx
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/basrdll.hxx,basic/basrdll.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/dispdefs.hxx,basic/dispdefs.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/modsizeexceeded.hxx,basic/modsizeexceeded.hxx))
-$(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/process.hxx,basic/process.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/sbdef.hxx,basic/sbdef.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/sberrors.hxx,basic/sberrors.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/sbmeth.hxx,basic/sbmeth.hxx))
diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx
deleted file mode 100644
index e795407..000
--- a/basic/inc/basic/process.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _PROCESS_HXX
-#define _PROCESS_HXX
-
-#include 
-#include 
-#include "basicdllapi.h"
-
-#include 
-
-typedef std::map< String, String > Environment;
-typedef Environment::value_type EnvironmentVariable;
-
-class Process
-{
-// Internal members and methods
-sal_uInt32  m_nArgumentCount;
-rtl_uString   **m_pArgumentList;
-sal_uInt32  m_nEnvCount;
-rtl_uString   **m_pEnvList;
-rtl::OUString   m_aProcessName;
-oslProcess  m_pProcess;
-sal_BoolImplIsRunning();
-longImplGetExitCode();
-sal_Bool bWasGPF;
-sal_Bool bHasBeenStarted;
-
-public:
-Process();
-~Process();
-// methods
-void SetImage( const String &aAppPath, const String &aAppParams, const 
Environment *pEnv = NULL );
-sal_Bool Start();
-sal_uIntPtr GetExitCode();
-sal_Bool IsRunning();
-sal_Bool WasGPF();
-
-sal_Bool Terminate();
-};
-
-#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] .: 3 commits - basctl/source svtools/inc svtools/source vcl/inc vcl/source

[August Sodora]

 basctl/source/basicide/breakpoint.cxx |5 --
 basctl/source/basicide/breakpoint.hxx |1 
 svtools/inc/svtools/filedlg.hxx   |6 --
 svtools/source/dialogs/filedlg.cxx|   35 --
 vcl/inc/vcl/svapp.hxx |5 --
 vcl/source/app/svapp.cxx  |   83 --
 6 files changed, 135 deletions(-)

New commits:
commit 0c1a331599bdafbfe0c1a64875ea5a247d149da6
Author: August Sodora 
Date:   Thu Dec 8 13:53:20 2011 -0500

Remove unused code

diff --git a/svtools/inc/svtools/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx
index 0390c3b..64b2255 100644
--- a/svtools/inc/svtools/filedlg.hxx
+++ b/svtools/inc/svtools/filedlg.hxx
@@ -78,7 +78,6 @@ private:
 LinkaFilterHdlLink; // Link zum FilterSelect-Handler
 
 public:
-FileDialog( Window* pParent, WinBits nWinStyle );
 ~FileDialog();
 
 virtual voidFileSelect();
@@ -86,11 +85,6 @@ public:
 
 voidSetDefaultExt( const UniString& rExt ) { aDfltExt = 
rExt; }
 const UniString&GetDefaultExt() const { return aDfltExt; }
-voidAddFilter( const UniString& rFilter, const UniString& 
rType );
-voidSetCurFilter( const UniString& rFilter );
-UniString   GetCurFilter() const;
-sal_uInt16  GetFilterCount() const;
-UniString   GetFilterName( sal_uInt16 nPos ) const;
 UniString   GetFilterType( sal_uInt16 nPos ) const;
 
 voidSetFileSelectHdl( const Link& rLink ) { aFileHdlLink = 
rLink; }
diff --git a/svtools/source/dialogs/filedlg.cxx 
b/svtools/source/dialogs/filedlg.cxx
index f26f072..77a071c 100644
--- a/svtools/source/dialogs/filedlg.cxx
+++ b/svtools/source/dialogs/filedlg.cxx
@@ -72,35 +72,10 @@ long PathDialog::OK()
 return sal_True;
 }
 
-
-FileDialog::FileDialog( Window* _pParent, WinBits nStyle ) :
-PathDialog( _pParent, WB_STDMODAL | nStyle )
-{
-// Dadurch dass hier bei VCL nicht der CTOR mit ResType verwendet wird,
-// wurde im PathDialog-CTOR leider ein ImpPathDialog angelegt...
-// So zwar scheisse, aber der Dialog ist eh' nur ein Hack:
-pImpFileDlg->CreateDialog( this, nStyle, WINDOW_FILEDIALOG, sal_False );
-}
-
 FileDialog::~FileDialog()
 {
 }
 
-void FileDialog::AddFilter( const UniString& rFilter, const UniString& rMask )
-{
-((ImpFileDialog*)pImpFileDlg->GetDialog())->AddFilter( rFilter, rMask );
-}
-
-void FileDialog::SetCurFilter( const UniString& rFilter )
-{
-((ImpFileDialog*)pImpFileDlg->GetDialog())->SetCurFilter( rFilter );
-}
-
-UniString FileDialog::GetCurFilter() const
-{
-return ((ImpFileDialog*)pImpFileDlg->GetDialog())->GetCurFilter();
-}
-
 void FileDialog::FileSelect()
 {
 aFileHdlLink.Call( this );
@@ -111,16 +86,6 @@ void FileDialog::FilterSelect()
 aFilterHdlLink.Call( this );
 }
 
-sal_uInt16 FileDialog::GetFilterCount() const
-{
-  return ((ImpFileDialog*)pImpFileDlg->GetDialog())->GetFilterCount();
-}
-
-UniString FileDialog::GetFilterName( sal_uInt16 nPos ) const
-{
-  return ((ImpFileDialog*)pImpFileDlg->GetDialog())->GetFilterName( nPos );
-}
-
 UniString FileDialog::GetFilterType( sal_uInt16 nPos ) const
 {
   return ((ImpFileDialog*)pImpFileDlg->GetDialog())->GetFilterType( nPos );
commit 954c3b2d9afd451006deef59143f97d4ee0391fe
Author: August Sodora 
Date:   Thu Dec 8 13:27:22 2011 -0500

Remove unused code

diff --git a/basctl/source/basicide/breakpoint.cxx 
b/basctl/source/basicide/breakpoint.cxx
index 6bbfdf9..1d28fec 100644
--- a/basctl/source/basicide/breakpoint.cxx
+++ b/basctl/source/basicide/breakpoint.cxx
@@ -169,11 +169,6 @@ const BreakPoint* BreakPointList::at(size_t i) const
 return i < maBreakPoints.size() ? maBreakPoints[ i ] : NULL;
 }
 
-void BreakPointList::push_back(BreakPoint* item)
-{
-maBreakPoints.push_back( item );
-}
-
 void BreakPointList::clear()
 {
 maBreakPoints.clear();
diff --git a/basctl/source/basicide/breakpoint.hxx 
b/basctl/source/basicide/breakpoint.hxx
index a989144..8d6ca9f 100644
--- a/basctl/source/basicide/breakpoint.hxx
+++ b/basctl/source/basicide/breakpoint.hxx
@@ -70,7 +70,6 @@ public:
 size_t size() const;
 BreakPoint* at(size_t i);
 const BreakPoint* at(size_t i) const;
-void push_back(BreakPoint* item);
 void clear();
 BreakPoint* remove(BreakPoint* ptr);
 };
commit 7cf6d38eb6c89f174b71f74cb06d5e54c9fa12d0
Author: August Sodora 
Date:   Thu Dec 8 13:24:58 2011 -0500

Remove unused code

diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index cfd46ed..a994ff9 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -206,7 +206,6 @@ public:
 static sal_Bool IsInMain();
 static sal_Bool IsInExecute();
 static sal_Bool IsInModalMode();
-static sal_uInt16   GetModalModeCount();
 
 static sal_uInt1

[Libreoffice-commits] .: solenv/gbuild

[Jan Holesovsky]

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

New commits:
commit ddbe08e1dd54f397f6fe8c04b2147f21a49db8b1
Author: Jan Holesovsky 
Date:   Thu Dec 8 17:09:41 2011 +0100

Fix build on Linux.

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index c154a7a..33aa936 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -144,7 +144,7 @@ else
 gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
 endif
 
-gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)=\"$(OUTDIR_FOR_BUILD)/lib\"
+gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)="$(OUTDIR_FOR_BUILD)/lib"
 
 # $(1): list of directory pathnames to append at the end of the ld path
 define gb_Helper_extend_ld_path
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Jan Holesovsky]

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

New commits:
commit 00d01a1ca7811f5589530c7992d91ff38042668b
Author: Jan Holesovsky 
Date:   Thu Dec 8 17:09:41 2011 +0100

Fix build on Linux.

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index c154a7a..33aa936 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -144,7 +144,7 @@ else
 gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
 endif
 
-gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)=\"$(OUTDIR_FOR_BUILD)/lib\"
+gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)="$(OUTDIR_FOR_BUILD)/lib"
 
 # $(1): list of directory pathnames to append at the end of the ld path
 define gb_Helper_extend_ld_path
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/source svx/source

[Radek Doulík]

 oox/source/drawingml/shape.cxx|   22 --
 svx/source/customshapes/EnhancedCustomShapeEngine.cxx |   11 -
 2 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit dc20e891db2065aa14ea5eac1ea4b57a1b9da644
Author: Muthu Subramanian 
Date:   Thu Dec 8 16:47:56 2011 +0530

n#719989: Rotation needs to be done post flipping.

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 2b81eac..d716823 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -509,18 +509,6 @@ Reference< XShape > Shape::createAndInsert(
 aFillProperties.pushToPropMap( aShapeProps, rGraphicHelper, 
mnRotation, nFillPhClr );
 aLineProperties.pushToPropMap( aShapeProps, rGraphicHelper, nLinePhClr 
);
 
-// Moved here because the properties like Flip needs to be applied 
before
-// applying the rotation property
-if( bIsCustomShape )
-{
-if ( mbFlipH )
-mpCustomShapePropertiesPtr->setMirroredX( sal_True );
-if ( mbFlipV )
-mpCustomShapePropertiesPtr->setMirroredY( sal_True );
-OSL_TRACE("==cscode== shape name: '%s'", 
rtl::OUStringToOString(msName, RTL_TEXTENCODING_UTF8 ).getStr());
-mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, 
mxShape );
-}
-
 // applying autogrowheight property before setting shape size, because
 // the shape size might be changed if currently autogrowheight is true
 // we must also check that the PropertySet supports the property.
@@ -534,6 +522,16 @@ Reference< XShape > Shape::createAndInsert(
 if( aServiceName != 
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape")) )
 PropertySet( xSet ).setProperties( aShapeProps );
 
+if( bIsCustomShape )
+{
+if ( mbFlipH )
+mpCustomShapePropertiesPtr->setMirroredX( sal_True );
+if ( mbFlipV )
+mpCustomShapePropertiesPtr->setMirroredY( sal_True );
+OSL_TRACE("==cscode== shape name: '%s'", 
rtl::OUStringToOString(msName, RTL_TEXTENCODING_UTF8 ).getStr());
+mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, 
mxShape );
+}
+
 // in some cases, we don't have any text body.
 if( getTextBody() )
 {
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx 
b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index de53ed6..a92a962 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -315,11 +315,6 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL 
EnhancedCustomShapeEngine::rende
 }
 pRenderedShape->Shear( 
pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, sal_False);
 }
-if( nRotateAngle )
-{
-double a = nRotateAngle * F_PI18000;
-pRenderedShape->NbcRotate( 
pSdrObjCustomShape->GetSnapRect().Center(), nRotateAngle, sin( a ), cos( a ) );
-}
 if ( bFlipV )
 {
 Point aLeft( aRect.Left(), ( aRect.Top() + aRect.Bottom() ) >> 
1 );
@@ -332,6 +327,12 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL 
EnhancedCustomShapeEngine::rende
 Point aBottom( aTop.X(), aTop.Y() + 1000 );
 pRenderedShape->NbcMirror( aTop, aBottom );
 }
+// Note that the rotation needs be done after flipping
+if( nRotateAngle )
+{
+double a = nRotateAngle * F_PI18000;
+pRenderedShape->NbcRotate( 
pSdrObjCustomShape->GetSnapRect().Center(), nRotateAngle, sin( a ), cos( a ) );
+}
 pRenderedShape->NbcSetStyleSheet( 
pSdrObjCustomShape->GetStyleSheet(), sal_True );
 pRenderedShape->RecalcSnapRect();
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source solenv/gbuild

[Jan Holesovsky]

 i18npool/source/localedata/Makefile |8 ++--
 solenv/gbuild/Helper.mk |2 +-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 solenv/gbuild/platform/com_GCC_defs.mk  |2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit c240dbc820359cf924e2383b743c02e204945a4c
Author: Bjoern Michaelsen 
Date:   Thu Dec 8 16:43:26 2011 +0100

Fix 18npool build on Windows.

diff --git a/i18npool/source/localedata/Makefile 
b/i18npool/source/localedata/Makefile
index 618db65..da83ff4 100755
--- a/i18npool/source/localedata/Makefile
+++ b/i18npool/source/localedata/Makefile
@@ -40,15 +40,11 @@ localedata_%.cxx : localedata_%_invis.cxx
 ifeq ($(OS_FOR_BUILD),WNT)
 localedata_%_invis.cxx : $(realpath 
$(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR)/bin/saxparser$(gb_Executable_EXT)
-   $(call gb_Helper_execute,saxparser $* `cygpath -m $<` $@ \
-   $(my_file)`cygpath -m 
$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m 
$(OUTDIR)/bin/types.rdb` \
-   -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
+   $(call gb_Helper_execute,saxparser $* `cygpath -m $<` $@ 
$(my_file)`cygpath -m 
$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m 
$(OUTDIR)/bin/types.rdb` -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
 else
 localedata_%_invis.cxx : $(realpath 
$(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build)
-   $(call gb_Helper_execute,saxparser $* $< $@ \
-   
$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb
 $(OUTDIR_FOR_BUILD)/bin/types.rdb \
-   -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
+   $(call gb_Helper_execute,saxparser $* $< $@ 
$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb
 $(OUTDIR_FOR_BUILD)/bin/types.rdb 
-env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
 endif
 
 saxparser.rdb : saxparser.input
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 881aed9..e27d2ee 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -165,7 +165,7 @@ gb_StaticLibrary_$(1) += $(2)
 endef
 
 define gb_Helper_execute
-$(call gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
+$(gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
 endef
 
 # gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker 
need to use
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 5f8fb1c..809d83c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE) && $(subst 
$(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
 $(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst 
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst 
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst 
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst 
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst 
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)
 endef
 
-gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
+gb_Helper_set_ld_path := PATH=\"$${PATH}:$(OUTDIR)/bin\"
 
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 03ac2a8..c154a7a 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -144,7 +144,7 @@ else
 gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
 endif
 
-gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib
+gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)=\"$(OUTDIR_FOR_BUILD)/lib\"
 
 # $(1): list of directory pathnames to append at the end of the ld path
 define gb_Helper_extend_ld_path
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - i18npool/source solenv/gbuild

[Jan Holesovsky]

 i18npool/source/localedata/Makefile |8 ++--
 solenv/gbuild/Helper.mk |2 +-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 solenv/gbuild/platform/com_GCC_defs.mk  |2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit f7ae3384e2ad7387d839e40ca5c7196e2b597991
Author: Bjoern Michaelsen 
Date:   Thu Dec 8 16:43:26 2011 +0100

Fix 18npool build on Windows.

diff --git a/i18npool/source/localedata/Makefile 
b/i18npool/source/localedata/Makefile
index 618db65..da83ff4 100755
--- a/i18npool/source/localedata/Makefile
+++ b/i18npool/source/localedata/Makefile
@@ -40,15 +40,11 @@ localedata_%.cxx : localedata_%_invis.cxx
 ifeq ($(OS_FOR_BUILD),WNT)
 localedata_%_invis.cxx : $(realpath 
$(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR)/bin/saxparser$(gb_Executable_EXT)
-   $(call gb_Helper_execute,saxparser $* `cygpath -m $<` $@ \
-   $(my_file)`cygpath -m 
$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m 
$(OUTDIR)/bin/types.rdb` \
-   -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
+   $(call gb_Helper_execute,saxparser $* `cygpath -m $<` $@ 
$(my_file)`cygpath -m 
$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m 
$(OUTDIR)/bin/types.rdb` -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
 else
 localedata_%_invis.cxx : $(realpath 
$(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build)
-   $(call gb_Helper_execute,saxparser $* $< $@ \
-   
$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb
 $(OUTDIR_FOR_BUILD)/bin/types.rdb \
-   -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
+   $(call gb_Helper_execute,saxparser $* $< $@ 
$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb
 $(OUTDIR_FOR_BUILD)/bin/types.rdb 
-env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
 endif
 
 saxparser.rdb : saxparser.input
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 881aed9..e27d2ee 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -165,7 +165,7 @@ gb_StaticLibrary_$(1) += $(2)
 endef
 
 define gb_Helper_execute
-$(call gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
+$(gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
 endef
 
 # gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker 
need to use
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 5f8fb1c..809d83c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE) && $(subst 
$(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
 $(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst 
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst 
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst 
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst 
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst 
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)
 endef
 
-gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
+gb_Helper_set_ld_path := PATH=\"$${PATH}:$(OUTDIR)/bin\"
 
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 03ac2a8..c154a7a 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -144,7 +144,7 @@ else
 gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
 endif
 
-gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib
+gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)=\"$(OUTDIR_FOR_BUILD)/lib\"
 
 # $(1): list of directory pathnames to append at the end of the ld path
 define gb_Helper_extend_ld_path
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in set_soenv.in solenv/gbuild

[Lubos Lunak]

 configure.in|   18 ++
 set_soenv.in|1 +
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |7 +++
 solenv/gbuild/platform/unxgcc.mk|7 +++
 4 files changed, 33 insertions(+)

New commits:
commit 5214f7843ca48f2207945fbfe32ba164afe7b3aa
Author: Luboš Luňák 
Date:   Thu Dec 8 16:38:23 2011 +0100

enable -gdwarf-4 by default if possible

http://lists.freedesktop.org/archives/libreoffice/2011-December/021638.html

diff --git a/configure.in b/configure.in
index 4cfeae0..0fe12fa 100644
--- a/configure.in
+++ b/configure.in
@@ -3821,6 +3821,24 @@ AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
 AC_SUBST(HAVE_GCC_VISIBILITY_BROKEN)
 
 dnl ===
+dnl gcc DWARF-4 support (smaller debug info)
+dnl ===
+if test "$GCC" = "yes"; then
+AC_MSG_CHECKING([whether $CC supports -gdwarf-4])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -gdwarf-4"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
HAVE_GCC_DWARF_4=TRUE ],[])
+CFLAGS=$save_CFLAGS
+if test "$HAVE_GCC_DWARF_4" = "TRUE"; then
+AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([no])
+fi
+fi
+
+AC_SUBST(HAVE_GCC_DWARF_4)
+
+dnl ===
 dnl allocator
 dnl ===
 AC_MSG_CHECKING([which memory allocator to use])
diff --git a/set_soenv.in b/set_soenv.in
index bef9405..3bb806a 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1779,6 +1779,7 @@ ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
"@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
 ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
 "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
+ToFile( "HAVE_GCC_DWARF_4","@HAVE_GCC_DWARF_4@","e" );
 ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
 ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
 ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index c0739f4..7363654 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -99,6 +99,9 @@ gb_LinkTarget_LDFLAGS += -shared-libgcc
 endif
 
 gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+ifeq ($(HAVE_GCC_DWARF_4),TRUE)
+gb_DEBUG_CFLAGS += -gdwarf-4
+endif
 
 gb_STDLIBS := \
mingwthrd \
@@ -152,6 +155,10 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) 
$(gb_CXXFLAGS_WERROR)
 ifeq ($(gb_SYMBOL),$(true))
 gb_LinkTarget_CXXFLAGS += -ggdb2
 gb_LinkTarget_CFLAGS += -ggdb2
+ifeq ($(HAVE_GCC_DWARF_4),TRUE)
+gb_LinkTarget_CXXFLAGS += -gdwarf-4
+gb_LinkTarget_CFLAGS += -gdwarf-4
+endif
 endif
 
 gb_LinkTarget_INCLUDE +=\
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 7403488..37c203f 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -162,6 +162,9 @@ gb_LINKEROPTFLAGS := -Wl,-O1
 endif
 
 gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+ifeq ($(HAVE_GCC_DWARF_4),TRUE)
+gb_DEBUG_CFLAGS += -gdwarf-4
+endif
 
 gb_COMPILERNOOPTFLAGS := -O0
 
@@ -206,6 +209,10 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) 
$(gb_CXXFLAGS_WERROR)
 ifeq ($(gb_SYMBOL),$(true))
 gb_LinkTarget_CXXFLAGS += -ggdb2
 gb_LinkTarget_CFLAGS += -ggdb2
+ifeq ($(HAVE_GCC_DWARF_4),TRUE)
+gb_LinkTarget_CXXFLAGS += -gdwarf-4
+gb_LinkTarget_CFLAGS += -gdwarf-4
+endif
 endif
 
 # note that `cat $(extraobjectlist)` is needed to build with older gcc 
versions, e.g. 4.1.2 on SLED10
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: starmath/qa

[Lubos Lunak]

 starmath/qa/testdocuments/docx/accents.docx  |binary
 starmath/qa/testdocuments/docx/d.docx|binary
 starmath/qa/testdocuments/docx/escaping.docx |binary
 starmath/qa/testdocuments/docx/lim.docx  |binary
 starmath/qa/testdocuments/docx/malformed_xml.docx|binary
 starmath/qa/testdocuments/docx/matrix.docx   |binary
 starmath/qa/testdocuments/docx/mso2k7.docx   |binary
 starmath/qa/testdocuments/docx/nary.docx |binary
 starmath/qa/testdocuments/docx/overbrace_underbrace.docx |binary
 starmath/qa/testdocuments/docx/overstrike.docx   |binary
 starmath/qa/testdocuments/docx/placeholders.docx |binary
 starmath/qa/testdocuments/docx/rad.docx  |binary
 starmath/qa/testdocuments/docx/subscripts.docx   |binary
 starmath/qa/testdocuments/docx/vertical_stacks.docx  |binary
 14 files changed

New commits:
commit 9a8d7e2a3f41f9e1c39c5634714a3a2b21776670
Author: Luboš Luňák 
Date:   Thu Dec 8 16:33:22 2011 +0100

add docx starmath testing documents

It's simply a bunch of documents with various math features in them.
It'd be nice to have an automated test built on top of them that
checks the formula is the same (roughly, in the meaning, it can't be
precise because import adds e.g. extra {}'s) after an export+import
roundtrip.

diff --git a/starmath/qa/testdocuments/docx/accents.docx 
b/starmath/qa/testdocuments/docx/accents.docx
new file mode 100644
index 000..b623cb5
Binary files /dev/null and b/starmath/qa/testdocuments/docx/accents.docx differ
diff --git a/starmath/qa/testdocuments/docx/d.docx 
b/starmath/qa/testdocuments/docx/d.docx
new file mode 100644
index 000..a18afdd
Binary files /dev/null and b/starmath/qa/testdocuments/docx/d.docx differ
diff --git a/starmath/qa/testdocuments/docx/escaping.docx 
b/starmath/qa/testdocuments/docx/escaping.docx
new file mode 100644
index 000..d51c475
Binary files /dev/null and b/starmath/qa/testdocuments/docx/escaping.docx differ
diff --git a/starmath/qa/testdocuments/docx/lim.docx 
b/starmath/qa/testdocuments/docx/lim.docx
new file mode 100644
index 000..6adb548
Binary files /dev/null and b/starmath/qa/testdocuments/docx/lim.docx differ
diff --git a/starmath/qa/testdocuments/docx/malformed_xml.docx 
b/starmath/qa/testdocuments/docx/malformed_xml.docx
new file mode 100644
index 000..53d64b0
Binary files /dev/null and b/starmath/qa/testdocuments/docx/malformed_xml.docx 
differ
diff --git a/starmath/qa/testdocuments/docx/matrix.docx 
b/starmath/qa/testdocuments/docx/matrix.docx
new file mode 100644
index 000..d6b5b18
Binary files /dev/null and b/starmath/qa/testdocuments/docx/matrix.docx differ
diff --git a/starmath/qa/testdocuments/docx/mso2k7.docx 
b/starmath/qa/testdocuments/docx/mso2k7.docx
new file mode 100644
index 000..b6b16ef
Binary files /dev/null and b/starmath/qa/testdocuments/docx/mso2k7.docx differ
diff --git a/starmath/qa/testdocuments/docx/nary.docx 
b/starmath/qa/testdocuments/docx/nary.docx
new file mode 100644
index 000..f3bb781
Binary files /dev/null and b/starmath/qa/testdocuments/docx/nary.docx differ
diff --git a/starmath/qa/testdocuments/docx/overbrace_underbrace.docx 
b/starmath/qa/testdocuments/docx/overbrace_underbrace.docx
new file mode 100644
index 000..e4119f6
Binary files /dev/null and 
b/starmath/qa/testdocuments/docx/overbrace_underbrace.docx differ
diff --git a/starmath/qa/testdocuments/docx/overstrike.docx 
b/starmath/qa/testdocuments/docx/overstrike.docx
new file mode 100644
index 000..9809edc
Binary files /dev/null and b/starmath/qa/testdocuments/docx/overstrike.docx 
differ
diff --git a/starmath/qa/testdocuments/docx/placeholders.docx 
b/starmath/qa/testdocuments/docx/placeholders.docx
new file mode 100644
index 000..1c32c04
Binary files /dev/null and b/starmath/qa/testdocuments/docx/placeholders.docx 
differ
diff --git a/starmath/qa/testdocuments/docx/rad.docx 
b/starmath/qa/testdocuments/docx/rad.docx
new file mode 100644
index 000..39194dc
Binary files /dev/null and b/starmath/qa/testdocuments/docx/rad.docx differ
diff --git a/starmath/qa/testdocuments/docx/subscripts.docx 
b/starmath/qa/testdocuments/docx/subscripts.docx
new file mode 100644
index 000..038925f
Binary files /dev/null and b/starmath/qa/testdocuments/docx/subscripts.docx 
differ
diff --git a/starmath/qa/testdocuments/docx/vertical_stacks.docx 
b/starmath/qa/testdocuments/docx/vertical_stacks.docx
new file mode 100644
index 000..50dfab0
Binary files /dev/null and 
b/starmath/qa/testdocuments/docx/vertical_stacks.docx differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libcdr/libcdr-0.0.0.patch libcdr/makefile.mk

[Fridrich Strba]

 libcdr/libcdr-0.0.0.patch |   20 
 libcdr/makefile.mk|3 +++
 2 files changed, 23 insertions(+)

New commits:
commit 8a51676799f731479bfd4f38fd2904e09998ed89
Author: Fridrich Å trba 
Date:   Thu Dec 8 16:06:04 2011 +0100

no config.h inside LO build

diff --git a/libcdr/libcdr-0.0.0.patch b/libcdr/libcdr-0.0.0.patch
new file mode 100644
index 000..8016fec
--- /dev/null
+++ b/libcdr/libcdr-0.0.0.patch
@@ -0,0 +1,20 @@
+--- misc/libcdr-0.0.0/src/lib/libcdr_utils.h
 misc/build/libcdr-0.0.0/src/lib/libcdr_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
+ 
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index c076512..8da337f 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -57,6 +57,9 @@ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
 TARFILE_NAME=libcdr-0.0.0
 TARFILE_MD5=cc8eb870d6a324d36575420efd856319
 
+PATCH_FILES=\
+libcdr-0.0.0.patch
+
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dictionaries/he_IL

[Andras Timar]

 dictionaries/he_IL/makefile.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9317aa0abe700154a49276296ca046c822453e6c
Author: Andras Timar 
Date:   Thu Dec 8 15:48:43 2011 +0100

add icon to makefile

diff --git a/dictionaries/he_IL/makefile.mk b/dictionaries/he_IL/makefile.mk
index 080f670..f279723 100644
--- a/dictionaries/he_IL/makefile.mk
+++ b/dictionaries/he_IL/makefile.mk
@@ -54,7 +54,8 @@ DESCRIPTION_SRC:=$(MISC)/$(EXTENSIONNAME)_in/description.xml
 # just copy:
 COMPONENT_FILES= \
 $(EXTENSIONDIR)$/he_IL.aff \
-$(EXTENSIONDIR)$/he_IL.dic 
+$(EXTENSIONDIR)$/he_IL.dic \
+$(EXTENSIONDIR)$/alphabet.png
 
 COMPONENT_CONFIGDEST=.
 COMPONENT_XCU= \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: tail_build/prj

[Stephan Bergmann]

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

New commits:
commit e7d2e8ffe2678e0b539d3bbcafe91b82313240bd
Author: Stephan Bergmann 
Date:   Thu Dec 8 15:34:11 2011 +0100

Missing dependency.

diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 72e90b4..ade021f 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb  tail_build : APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 
LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd 
LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl 
PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf 
avmedia basegfx basic bridges canvas comphelper configmgr connectivity 
cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi 
officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal 
sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools 
ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+tb  tail_build : APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBCDR:libcdr 
LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps 
LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss 
OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon 
TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas 
comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker 
javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo 
DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot 
stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure 
vcl xmlhelp xmloff xmlscript xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - desktop/source instsetoo_native/util

[Tor Lillqvist]

 desktop/source/app/app.cxx   |1 
 instsetoo_native/util/makefile.mk|   10 --
 instsetoo_native/util/openoffice.lst |   57 ---
 instsetoo_native/util/pack.lst   |1 
 4 files changed, 2 insertions(+), 67 deletions(-)

New commits:
commit 9a18da1e45a5aa89038d08fbd76a8d457e34b608
Author: Tor Lillqvist 
Date:   Thu Dec 8 16:18:58 2011 +0200

There is no LibreOffice with bundled JRE and won't be

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 907b2e7..64707d8 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -150,8 +150,6 @@ openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
 
 openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
 
-openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i)
-
 ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
 
 ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
@@ -205,8 +203,6 @@ openoffice_$(defaultlangiso).archive : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) openofficedev_$i) : $(ADDDEPS)
 
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : $(ADDDEPS)
-
 $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
@@ -248,10 +244,6 @@ openoffice_%{$(PKGFORMAT:^".") .archive} :
 $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f 
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice 
-u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage 
$(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
 $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch 
"$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product 
LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) 
$(PRJ)$/util$/update.xml > $(MISC)/`date 
+%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
-openofficewithjre_%{$(PKGFORMAT:^".")} :
-$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f 
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p 
LibreOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate 
$(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format 
$(@:e:s/.//) $(VERBOSESWITCH)
-
 $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
 openofficedev_%{$(PKGFORMAT:^".")} :
 $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f 
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p 
LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate 
$(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format 
$(@:e:s/.//) $(VERBOSESWITCH)
@@ -332,7 +324,7 @@ openoffice:
 
 .IF "$(DISABLE_PYTHON)" != "TRUE"
 .IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} 
openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} 
sdkoo_$i{$(PKGFORMAT:^".")} lotest_$i{$(PKGFORMAT:^".")} 
oxygenoffice_$i{$(PKGFORMAT:^".") .archive} 
oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} 
openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} 
lotest_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} 
oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
 .ENDIF # "$(LOCALPYFILES)"!=""
 
 .IF "$(GUI)"!="WNT"
diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 0cfafc5..72caad8 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -101,63 +101,6 @@ LibreOffice
}
 }
 
-LibreOffice_wJRE
-{
-   Settings
-   {
-   variables
-   {
-   PRODUCTNAME LibreOffice
-   PRODUCTVERSION 3.5
-   PRODUCTEXTENSION 
-   LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta0
-POSTVERSIONEXTENSION
-POSTVERSIONEXTENSIONUNIX
-   BRANDPACKAGEVERSION 3.5
-   USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.0
-   BASEPRODUCTVERSION 3.5
-   UPDATEURL http://update.libreoffice.org/check.php
-   ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
-   REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
-   ADDSYSTEMINTEGRATION 1
-   EVAL
-   FILEFORMATNAME OpenOffice.org
-   FILEFORMATVERSION 1.0
-   WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.0
-   PACKAGEREVI

[Libreoffice-commits] .: 2 commits - odk/docs odk/examples

[Stephan Bergmann]

 odk/docs/sdk_styles.css |   16 -
 odk/examples/examples.html  |   63 -
 odk/examples/python/toolpanel/CalcWindowState.xcu   |   48 +++
 odk/examples/python/toolpanel/Factory.xcu   |   53 
 odk/examples/python/toolpanel/META-INF/manifest.xml |   42 +++
 odk/examples/python/toolpanel/Makefile  |   49 +++
 odk/examples/python/toolpanel/description.xml   |   32 ++
 odk/examples/python/toolpanel/toolPanelPocBasic/Module1.xba |   29 ++
 odk/examples/python/toolpanel/toolPanelPocBasic/dialog.xlb  |3 
 odk/examples/python/toolpanel/toolPanelPocBasic/script.xlb  |5 
 odk/examples/python/toolpanel/toolpanel.component   |   35 ++
 odk/examples/python/toolpanel/toolpanel.py  |  148 
 odk/examples/python/toolpanel/toolpanels/poc.xdl|   11 
 13 files changed, 526 insertions(+), 8 deletions(-)

New commits:
commit ac579e29ad046d74331b9066f79f7caa59e2714b
Author: Stephan Bergmann 
Date:   Thu Dec 8 15:11:57 2011 +0100

Added Makefile for SDK Python example.

diff --git a/odk/examples/python/toolpanel/Makefile 
b/odk/examples/python/toolpanel/Makefile
new file mode 100644
index 000..b0a9747
--- /dev/null
+++ b/odk/examples/python/toolpanel/Makefile
@@ -0,0 +1,49 @@
+##
+## Version: MPL 1.1 / GPLv3+ / LGPLv3+
+##
+## The contents of this file are subject to the Mozilla Public License Version
+## 1.1 (the "License"); you may not use this file except in compliance with
+## the License or as specified alternatively below. You may obtain a copy of
+## the License at http://www.mozilla.org/MPL/
+##
+## Software distributed under the License is distributed on an "AS IS" basis,
+## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+## for the specific language governing rights and limitations under the
+## License.
+##
+## Major Contributor(s):
+## [ Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann 
+##   (initial developer) ]
+##
+## All Rights Reserved.
+##
+## For minor contributions see the git repository.
+##
+## Alternatively, the contents of this file may be used under the terms of
+## either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+## the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+## in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+## instead of those above.
+##
+
+PRJ = ../../..
+SETTINGS = $(PRJ)/settings
+
+include $(SETTINGS)/settings.mk
+include $(SETTINGS)/std.mk
+include $(SETTINGS)/dk.mk
+
+FILES = \
+CalcWindowState.xcu \
+Factory.xcu \
+META-INF/manifest.xml \
+description.xml \
+toolPanelPocBasic/Module1.xba \
+toolPanelPocBasic/dialog.xlb \
+toolPanelPocBasic/script.xlb \
+toolpanel.component \
+toolpanel.py \
+toolpanels/poc.xdl
+
+toolpanel.oxt: $(FILES)
+   $(SDK_ZIP) $@ $^
commit 07249785a76c356f49540c779d66d65973ed85cc
Author: Laurent Godard 
Date:   Wed Dec 7 17:24:12 2011 +0100

SDK examples : add Python section and ToolPanel python example

correct minor css rendering too

diff --git a/odk/docs/sdk_styles.css b/odk/docs/sdk_styles.css
index d1cd940..5be9eb7 100644
--- a/odk/docs/sdk_styles.css
+++ b/odk/docs/sdk_styles.css
@@ -876,7 +876,8 @@ hr {
  border-color: #CC;
  border-spacing: 0;
  border-collapse: collapse; 
- padding: 4; }
+ padding: 4;
+ color: #00; }
 
 .cell20 { width: 20%; 
  border-width: 2px; 
@@ -884,7 +885,8 @@ hr {
  border-color: #CC;
  border-spacing: 0;
  border-collapse: collapse; 
- padding: 4; }
+ padding: 4;
+ color: #00; }
 
 .cell80 { width: 80%;
  border-width: 2px; 
@@ -892,7 +894,8 @@ hr {
  border-color: #CC;
  border-spacing: 0;
  border-collapse: collapse;
- padding: 4; }
+ padding: 4;
+ color: #00; }
 
 .cell85 { width: 85%; 
  border-width: 2px; 
@@ -900,7 +903,8 @@ hr {
  border-color: #CC;
  border-spacing: 0;
  border-collapse: collapse; 
- padding: 4; }
+ padding: 4; 
+ color: #00;}
 
 .nothing1 { width: 20;
   height: 1; }
@@ -941,8 +945,8 @@ hr {
  font-weight: bold; }
 
 .thead { font-weight: bold;
- background-image:url(../docs/images/bg_table.png);
-backgorund-position: middle; }
+ background-color:#18a303;
+ background-position: middle; }
 
 .navigate { border: 0; }
 
diff --git a/odk/examples/examples.html b/odk/examples/examples.html
index ed66695..0c9c6b1 100644
--- a/odk/examples/examples.html
+++ b/odk/examples/examples.html
@@ -1,6 +1,6 @@
 
 
-  OpenOffice.org %PRODUCT_RELEASE% SDK - Examples
+  LibreOffice %PRODUCT_RELEASE% SDK - Examples
   
   
   
@@ -10,7 +10,7 @@
 
 

-
+
   

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

[Fridrich Strba]

 ooo.lst.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1ed632b4cd37f6a590af947a9d76e698cbc78cab
Author: Fridrich Å trba 
Date:   Thu Dec 8 14:30:57 2011 +0100

Don't forget to download the libcdr

diff --git a/ooo.lst.in b/ooo.lst.in
index c7b9b6e..eb0a751 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -91,6 +91,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip
 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
+cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
 @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] .: 2 commits - configure.in filter/Configuration_filter.mk filter/source libcdr/makefile.mk libcdr/prj postprocess/packcomponents RepositoryExternal.mk Repository.mk scp2/source

[Fridrich Strba]

 Repository.mk|1 
 RepositoryExternal.mk|   27 
 configure.in |   22 
 filter/Configuration_filter.mk   |2 
 filter/source/config/fragments/filters/CorelDrawDocument.xcu |   13 
 filter/source/config/fragments/types/draw_CorelDraw_Document.xcu |   12 
 libcdr/makefile.mk   |   67 ++
 libcdr/prj/build.lst |3 
 libcdr/prj/d.lst |5 
 postprocess/packcomponents/makefile.mk   |1 
 scp2/source/graphicfilter/file_graphicfilter.scp |2 
 set_soenv.in |   19 
 writerperfect/Library_cdrimport.mk   |   69 ++
 writerperfect/Module_writerperfect.mk|1 
 writerperfect/prj/build.lst  |2 
 writerperfect/source/cdrimp/CDRImportFilter.cxx  |  280 
++
 writerperfect/source/cdrimp/CDRImportFilter.hxx  |  117 
 writerperfect/source/cdrimp/cdrimport_genericfilter.cxx  |   68 ++
 writerperfect/util/cdrfilter.component   |8 
 19 files changed, 710 insertions(+), 9 deletions(-)

New commits:
commit dd8b86ea55a69dbb211294e9cf5b65e2a39b3c8d
Author: Fridrich Å trba 
Date:   Thu Dec 8 12:34:09 2011 +0100

CDR importer: fixing some build and esthetic issues

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index ae2789a..c09c663 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -545,7 +545,7 @@ $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s
draw8_template \
draw_WordPerfect_Graphics \
draw_Visio_Document \
-   draw_CDR_Document \
+   draw_CorelDraw_Document \
 )
 
 $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\
diff --git a/filter/source/config/fragments/filters/CorelDrawDocument.xcu 
b/filter/source/config/fragments/filters/CorelDrawDocument.xcu
index 7de8ac1..1f3a3c4 100644
--- a/filter/source/config/fragments/filters/CorelDrawDocument.xcu
+++ b/filter/source/config/fragments/filters/CorelDrawDocument.xcu
@@ -7,7 +7,7 @@
 Corel Draw
 
 0
-draw_CDR_Document
+draw_CorelDraw_Document
 
 com.sun.star.drawing.DrawingDocument
 
diff --git a/filter/source/config/fragments/types/draw_CDR_Document.xcu 
b/filter/source/config/fragments/types/draw_CDR_Document.xcu
deleted file mode 100644
index 5b07b62..000
--- a/filter/source/config/fragments/types/draw_CDR_Document.xcu
+++ /dev/null
@@ -1,12 +0,0 @@
-
-com.sun.star.comp.Draw.CDRImportFilter
-
-cdr
-application/vnd.corel-draw
-true
-Corel Draw 
Document
-
-Corel Draw
-
-
-
diff --git a/filter/source/config/fragments/types/draw_CorelDraw_Document.xcu 
b/filter/source/config/fragments/types/draw_CorelDraw_Document.xcu
new file mode 100644
index 000..d13a8fc
--- /dev/null
+++ b/filter/source/config/fragments/types/draw_CorelDraw_Document.xcu
@@ -0,0 +1,12 @@
+
+com.sun.star.comp.Draw.CDRImportFilter
+
+cdr
+application/vnd.corel-draw
+true
+Corel Draw 
Document
+
+Corel Draw
+
+
+
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index ce9e91d..c076512 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -45,17 +45,17 @@ TARGET=visio
 .IF "$(SYSTEM_LIBWPD)" == "YES"
 INCPRE+=$(WPD_CFLAGS)
 .ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
+INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd
+INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd-stream
 .ENDIF
 .IF "$(SYSTEM_LIBWPG)" == "YES"
 INCPRE+=$(WPG_CFLAGS)
 .ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
+INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
 .ENDIF
 
 TARFILE_NAME=libcdr-0.0.0
-TARFILE_MD5=9c9811817dccbd517ff25af8b2e8a86e
+TARFILE_MD5=cc8eb870d6a324d36575420efd856319
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
diff --git a/libcdr/prj/build.lst b/libcdr/prj/build.lst
index 30bd3e4..30487b1 100644
--- a/libcdr/prj/build.lst
+++ b/libcdr/prj/build.lst
@@ -1,3 +1,3 @@
-cdrlibcdr  : LIBWPD:libwpd LIBWPG:libwpg soltools NULL
+cdrlibcdr  : LIBWPD:libwpd LIBWPG:libwpg ZLIB:zlib soltools NULL
 cdrlibcdr  usr1-   all cdr_mkout NULL
 cdrlibcdr  nmake   -   all cdr_li

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8par.cxx |   69 ++--
 1 file changed, 59 insertions(+), 10 deletions(-)

New commits:
commit 7614f8a7781c0d33e86d7a5f0988f4e1f30087aa
Author: Caolán McNamara 
Date:   Thu Dec 8 12:39:07 2011 +

Resolves: fdo#43337 optimize weak-char overriding

When writer would choose the same bias automatically that word
implies or this doc hard-codes, then elide the font-forcing.
(cherry picked from commit 3e6ae8428a2d9da28c392c58bf8b3b15738088ff)

Signed-off-by: Caolán McNamara 

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 4d47144..9923768 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2777,6 +2777,26 @@ namespace
 }
 return nPos;
 }
+
+sal_Int32 lcl_getWriterScriptType(
+const uno::Reference& rBI,
+const rtl::OUString &rString, sal_Int32 nPos)
+{
+sal_Int16 nScript = i18n::ScriptType::WEAK;
+
+if (rString.isEmpty())
+return nScript;
+
+while (nPos >= 0)
+{
+nScript = rBI->getScriptType(rString, nPos);
+if (nScript != i18n::ScriptType::WEAK)
+break;
+--nPos;
+}
+
+return nScript;
+}
 }
 
 //In writer we categorize text into CJK, CTL and "Western" for everything else.
@@ -2817,6 +2837,14 @@ void 
SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS
 sal_Int16 nScript = lcl_getScriptType(xBI, rAddString, 0);
 sal_Int32 nLen = rAddString.getLength();
 
+rtl::OUString sParagraphText;
+const SwCntntNode *pCntNd = pPaM->GetCntntNode();
+const SwTxtNode* pNd = pCntNd ? pCntNd->GetTxtNode() : NULL;
+if (pNd)
+sParagraphText = pNd->GetTxt();
+sal_Int32 nParaOffset = sParagraphText.getLength();
+sParagraphText = sParagraphText + rAddString;
+
 sal_Int32 nPos = 0;
 while (nPos < nLen)
 {
@@ -2853,20 +2881,41 @@ void 
SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS
 break;
 }
 
-const SvxFontItem *pSourceFont = (const 
SvxFontItem*)GetFmtAttr(nForceFromFontId);
+//Now we know that word would use the nForceFromFontId font for 
this range
+//Try and determine what script writer would assign this range to
+
+sal_Int32 nWriterScript = lcl_getWriterScriptType(xBI, 
sParagraphText,
+nPos + nParaOffset);
+
+bool bWriterWillUseSameFontAsWordAutomatically = false;
+
+if (
+ (nWriterScript == i18n::ScriptType::ASIAN && nForceFromFontId 
== RES_CHRATR_CJK_FONT) ||
+ (nWriterScript == i18n::ScriptType::COMPLEX && 
nForceFromFontId == RES_CHRATR_CTL_FONT) ||
+ (nWriterScript == i18n::ScriptType::LATIN && nForceFromFontId 
== RES_CHRATR_FONT)
+   )
+{
+bWriterWillUseSameFontAsWordAutomatically = true;
+}
 
-for (size_t i = 0; i < SAL_N_ELEMENTS(aIds); ++i)
+//Writer won't use the same font as word, so force the issue
+if (!bWriterWillUseSameFontAsWordAutomatically)
 {
-const SvxFontItem *pDestFont = (const 
SvxFontItem*)GetFmtAttr(aIds[i]);
-aForced[i] = aIds[i] != nForceFromFontId && *pSourceFont != 
*pDestFont;
-if (aForced[i])
+const SvxFontItem *pSourceFont = (const 
SvxFontItem*)GetFmtAttr(nForceFromFontId);
+
+for (size_t i = 0; i < SAL_N_ELEMENTS(aIds); ++i)
 {
-pOverriddenItems[i] =
-(const 
SvxFontItem*)pCtrlStck->GetStackAttr(*pPaM->GetPoint(), aIds[i]);
+const SvxFontItem *pDestFont = (const 
SvxFontItem*)GetFmtAttr(aIds[i]);
+aForced[i] = aIds[i] != nForceFromFontId && *pSourceFont 
!= *pDestFont;
+if (aForced[i])
+{
+pOverriddenItems[i] =
+(const 
SvxFontItem*)pCtrlStck->GetStackAttr(*pPaM->GetPoint(), aIds[i]);
 
-SvxFontItem aForceFont(*pSourceFont);
-aForceFont.SetWhich(aIds[i]);
-pCtrlStck->NewAttr(*pPaM->GetPoint(), aForceFont);
+SvxFontItem aForceFont(*pSourceFont);
+aForceFont.SetWhich(aIds[i]);
+pCtrlStck->NewAttr(*pPaM->GetPoint(), aForceFont);
+}
 }
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dictionaries/en

[Andras Timar]

 dictionaries/en/description.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8372ca9f5079c936f757be8942a0d80fb88fca7a
Author: Andras Timar 
Date:   Thu Dec 8 13:46:35 2011 +0100

correct description

diff --git a/dictionaries/en/description.xml b/dictionaries/en/description.xml
index 81568e2..f3523c3 100644
--- a/dictionaries/en/description.xml
+++ b/dictionaries/en/description.xml
@@ -3,7 +3,7 @@
 
 
 
-English dictionaries, hyphenation rules, thesaurus, 
and grammar checker
+English spelling dictionaries, hyphenation rules, 
thesaurus, and grammar checker
 
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Cédric Bosdonnat]

 sw/source/core/fields/reffld.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit da8d70bcac0276a4ac9dcdd65e90e16211f45dc3
Author: Cédric Bosdonnat 
Date:   Thu Dec 8 12:34:39 2011 +0100

fdo#43521: Don't shown the name of a reference field if it's empty

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index ff29f49..98111d0 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -276,10 +276,15 @@ String SwGetRefField::Expand() const
 
 String SwGetRefField::GetFieldName() const
 {
-String aStr(GetTyp()->GetName());
-aStr += ' ';
-aStr += sSetRefName;
-return aStr;
+if ( GetTyp()->GetName().Len() > 0 || sSetRefName.Len() > 0 )
+{
+String aStr(GetTyp()->GetName());
+aStr += ' ';
+aStr += sSetRefName;
+return aStr;
+}
+else
+return Expand();
 }
 
 // #i81002# - parameter  added
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8par.cxx |   69 ++--
 1 file changed, 59 insertions(+), 10 deletions(-)

New commits:
commit 3e6ae8428a2d9da28c392c58bf8b3b15738088ff
Author: Caolán McNamara 
Date:   Thu Dec 8 12:39:07 2011 +

Resolves: fdo#43337 optimize weak-char overriding

When writer would choose the same bias automatically that word
implies or this doc hard-codes, then elide the font-forcing.

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 4d47144..9923768 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2777,6 +2777,26 @@ namespace
 }
 return nPos;
 }
+
+sal_Int32 lcl_getWriterScriptType(
+const uno::Reference& rBI,
+const rtl::OUString &rString, sal_Int32 nPos)
+{
+sal_Int16 nScript = i18n::ScriptType::WEAK;
+
+if (rString.isEmpty())
+return nScript;
+
+while (nPos >= 0)
+{
+nScript = rBI->getScriptType(rString, nPos);
+if (nScript != i18n::ScriptType::WEAK)
+break;
+--nPos;
+}
+
+return nScript;
+}
 }
 
 //In writer we categorize text into CJK, CTL and "Western" for everything else.
@@ -2817,6 +2837,14 @@ void 
SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS
 sal_Int16 nScript = lcl_getScriptType(xBI, rAddString, 0);
 sal_Int32 nLen = rAddString.getLength();
 
+rtl::OUString sParagraphText;
+const SwCntntNode *pCntNd = pPaM->GetCntntNode();
+const SwTxtNode* pNd = pCntNd ? pCntNd->GetTxtNode() : NULL;
+if (pNd)
+sParagraphText = pNd->GetTxt();
+sal_Int32 nParaOffset = sParagraphText.getLength();
+sParagraphText = sParagraphText + rAddString;
+
 sal_Int32 nPos = 0;
 while (nPos < nLen)
 {
@@ -2853,20 +2881,41 @@ void 
SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS
 break;
 }
 
-const SvxFontItem *pSourceFont = (const 
SvxFontItem*)GetFmtAttr(nForceFromFontId);
+//Now we know that word would use the nForceFromFontId font for 
this range
+//Try and determine what script writer would assign this range to
+
+sal_Int32 nWriterScript = lcl_getWriterScriptType(xBI, 
sParagraphText,
+nPos + nParaOffset);
+
+bool bWriterWillUseSameFontAsWordAutomatically = false;
+
+if (
+ (nWriterScript == i18n::ScriptType::ASIAN && nForceFromFontId 
== RES_CHRATR_CJK_FONT) ||
+ (nWriterScript == i18n::ScriptType::COMPLEX && 
nForceFromFontId == RES_CHRATR_CTL_FONT) ||
+ (nWriterScript == i18n::ScriptType::LATIN && nForceFromFontId 
== RES_CHRATR_FONT)
+   )
+{
+bWriterWillUseSameFontAsWordAutomatically = true;
+}
 
-for (size_t i = 0; i < SAL_N_ELEMENTS(aIds); ++i)
+//Writer won't use the same font as word, so force the issue
+if (!bWriterWillUseSameFontAsWordAutomatically)
 {
-const SvxFontItem *pDestFont = (const 
SvxFontItem*)GetFmtAttr(aIds[i]);
-aForced[i] = aIds[i] != nForceFromFontId && *pSourceFont != 
*pDestFont;
-if (aForced[i])
+const SvxFontItem *pSourceFont = (const 
SvxFontItem*)GetFmtAttr(nForceFromFontId);
+
+for (size_t i = 0; i < SAL_N_ELEMENTS(aIds); ++i)
 {
-pOverriddenItems[i] =
-(const 
SvxFontItem*)pCtrlStck->GetStackAttr(*pPaM->GetPoint(), aIds[i]);
+const SvxFontItem *pDestFont = (const 
SvxFontItem*)GetFmtAttr(aIds[i]);
+aForced[i] = aIds[i] != nForceFromFontId && *pSourceFont 
!= *pDestFont;
+if (aForced[i])
+{
+pOverriddenItems[i] =
+(const 
SvxFontItem*)pCtrlStck->GetStackAttr(*pPaM->GetPoint(), aIds[i]);
 
-SvxFontItem aForceFont(*pSourceFont);
-aForceFont.SetWhich(aIds[i]);
-pCtrlStck->NewAttr(*pPaM->GetPoint(), aForceFont);
+SvxFontItem aForceFont(*pSourceFont);
+aForceFont.SetWhich(aIds[i]);
+pCtrlStck->NewAttr(*pPaM->GetPoint(), aForceFont);
+}
 }
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source setup_native/source

[Andras Timar]

 scp2/source/ooo/common_brand.scp|5 +
 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   13 -
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   16 
 setup_native/source/packinfo/spellchecker_selection.txt |2 +-
 6 files changed, 49 insertions(+), 2 deletions(-)

New commits:
commit 9cb0e7af9d5d123a6e0cb933fb43d0f53ab4b904
Author: Andras Timar 
Date:   Thu Dec 8 13:33:17 2011 +0100

add Aragonese spelling dictionary

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 203f148..cf0a577 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -197,6 +197,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Af
 DosName = "dict-af";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_An
+ParentID = gid_Brand_Dir_Share_Extensions;
+DosName = "dict-an";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Ar
 ParentID = gid_Brand_Dir_Share_Extensions;
 DosName = "dict-ar";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b4630a6..b87b7fa 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1313,6 +1313,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_An
+   Dir = gid_Brand_Dir_Share_Extensions_Dict_An;
+   Name = "dict-an.oxt";
+   Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+   UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ar
Dir = gid_Brand_Dir_Share_Extensions_Dict_Ar;
Name = "dict-ar.oxt";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 473a026..5b76205 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -60,13 +60,24 @@ Module gid_Module_Root_Extension_Dictionary_Af
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AF );
 Files = (gid_File_Extension_Dictionary_Af);
 InstallOrder = "2000";
-Sortkey = "510";
+Sortkey = "500";
 Spellcheckerlanguage = "af";
 PackageInfo = "packinfo_office.txt";
 ParentID = gid_Module_Dictionaries;
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_An
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AN );
+Files = (gid_File_Extension_Dictionary_An);
+InstallOrder = "2000";
+Sortkey = "510";
+Spellcheckerlanguage = "an";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Ar
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AR );
 Files = (gid_File_Extension_Dictionary_Ar);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 4573c89..7fbb685 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -55,6 +55,12 @@ en-US = "Afrikaans"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_AF]
 en-US = "Afrikaans spelling dictionary, and hyphenation rules"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_AN]
+en-US = "Aragonese"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_AN]
+en-US = "Aragonese spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_AR]
 en-US = "Arabic"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 10b23b4..f7166f1 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -462,6 +462,22 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_An"
+script = "shellscripts_extensions.txt"
+solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-an"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-an"
+requires = 
"%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+linuxpatchrequires = ""
+copyright = "2011 Santiago Paricio, Juan Pablo Martinez"
+solariscopyright = "solariscop

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - jvmfwk/plugins

[Thorsten Behrens]

 jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 5b335c0b71ffa7e875c93690476a778c93591ad3
Author: Thorsten Behrens 
Date:   Wed Dec 7 18:23:00 2011 +0100

Fix nasty ppc ld crash, correct default return param setting

 * on OSX 10.5 PPC, ld crashes with a bus error, presumably because
   of the empty ar[] string array.
 * the "size = 0" default case looks wrong, replaced by *size=0

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 864dc2d..3de9019 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -87,11 +87,9 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
 char const* const* OtherInfo::getLibraryPaths(int* size)
 {
 
-#ifdef UNX
+#if defined(UNX) && !defined(MACOSX)
+//mac version does not have a ld library path anymore
 static char const * ar[] = {
-#ifdef MACOSX
-//mac version does not have a ld library path anymore
-#else
 "/bin",
 "/jre/bin",
 "/bin/classic",
@@ -102,13 +100,12 @@ char const* const* OtherInfo::getLibraryPaths(int* size)
 "/lib/" JFW_PLUGIN_ARCH "/jrockit",
 "/lib/" JFW_PLUGIN_ARCH "/native_threads",
 "/lib/" JFW_PLUGIN_ARCH
-#endif
 };
 
 *size = sizeof(ar) / sizeof (char*);
 return ar;
 #else
-size = 0;
+*size = 0;
 return NULL;
 #endif
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - i18npool/source

[Eike Rathke]

 i18npool/source/localedata/data/pt_PT.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f8c98efef78fc2f4c2e120af786604de420df30c
Author: Eike Rathke 
Date:   Thu Dec 8 12:56:29 2011 +0100

changed MinimalDaysInFirstWeek to 4 for correct week-of-year calculation
(cherry picked from commit ab7926e54ca4a3cddfeedf9cb7027a327d7a1432)

diff --git a/i18npool/source/localedata/data/pt_PT.xml 
b/i18npool/source/localedata/data/pt_PT.xml
index 0bdb50f..33e52f4 100644
--- a/i18npool/source/localedata/data/pt_PT.xml
+++ b/i18npool/source/localedata/data/pt_PT.xml
@@ -353,7 +353,7 @@
 
 mon
 
-1
+4
 
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

[Eike Rathke]

 i18npool/source/localedata/data/pt_PT.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab7926e54ca4a3cddfeedf9cb7027a327d7a1432
Author: Eike Rathke 
Date:   Thu Dec 8 12:56:29 2011 +0100

changed MinimalDaysInFirstWeek to 4 for correct week-of-year calculation

diff --git a/i18npool/source/localedata/data/pt_PT.xml 
b/i18npool/source/localedata/data/pt_PT.xml
index 0bdb50f..33e52f4 100644
--- a/i18npool/source/localedata/data/pt_PT.xml
+++ b/i18npool/source/localedata/data/pt_PT.xml
@@ -353,7 +353,7 @@
 
 mon
 
-1
+4
 
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Cédric Bosdonnat]

 sw/source/core/fields/reffld.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 2e2c804b20db136691dcd8a25ceccffceeefd280
Author: Cédric Bosdonnat 
Date:   Thu Dec 8 12:34:39 2011 +0100

fdo#43521: Don't shown the name of a reference field if it's empty

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index ff29f49..98111d0 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -276,10 +276,15 @@ String SwGetRefField::Expand() const
 
 String SwGetRefField::GetFieldName() const
 {
-String aStr(GetTyp()->GetName());
-aStr += ' ';
-aStr += sSetRefName;
-return aStr;
+if ( GetTyp()->GetName().Len() > 0 || sSetRefName.Len() > 0 )
+{
+String aStr(GetTyp()->GetName());
+aStr += ' ';
+aStr += sSetRefName;
+return aStr;
+}
+else
+return Expand();
 }
 
 // #i81002# - parameter  added
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in set_soenv.in solenv/gbuild

[Thorsten Behrens]

 configure.in|6 ++
 set_soenv.in|1 +
 solenv/gbuild/platform/IOS_ARM_GCC.mk   |   11 ---
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |   10 --
 solenv/gbuild/platform/com_GCC_defs.mk  |   29 +
 solenv/gbuild/platform/macosx.mk|   27 ---
 solenv/gbuild/platform/unxgcc.mk|   11 ---
 7 files changed, 36 insertions(+), 59 deletions(-)

New commits:
commit 06b2409631290e33007f87306c03ad6dc2545b9d
Author: Thorsten Behrens 
Date:   Thu Dec 8 12:03:38 2011 +0100

Rework yacc rule for gcc platforms.

Generalized the OSX ppc workaround for ancient bison versions,
factored out for all gcc platforms. Put bison version detection
into configure accordingly, to switch on that, and not on platform.

diff --git a/configure.in b/configure.in
index 9cd71ed..1c9a08d 100644
--- a/configure.in
+++ b/configure.in
@@ -6790,6 +6790,7 @@ dnl ***
 dnl Checking for bison and flex
 dnl ***
 AC_PATH_PROG(BISON, bison)
+ANCIENT_BISON="NO"
 if test -z "$BISON"; then
 AC_MSG_ERROR([no bison found in \$PATH, install it])
 else
@@ -6807,7 +6808,12 @@ else
 else
 AC_MSG_ERROR([failed ($BISON $_bison_version need 1.875+ (or 1.75 and 
older))])
 fi
+if test "$_bison_longver" -lt 2000; then
+ANCIENT_BISON="YES"
+fi
 fi
+AC_SUBST(ANCIENT_BISON)
+
 AC_PATH_PROG(FLEX, flex)
 if test -z "$FLEX"; then
 AC_MSG_ERROR([no flex found in \$PATH, install it])
diff --git a/set_soenv.in b/set_soenv.in
index b3ae895..f9d2013 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1654,6 +1654,7 @@ ToFile( "DPKG",  "@DPKG@",   "e" );
 ToFile( "PKGMK", "@PKGMK@",  "e" );
 ToFile( "GNUMAKE",   "@GNUMAKE@","e" );
 ToFile( "GNUTAR","@GNUTAR@", "e" );
+ToFile( "ANCIENT_BISON", "@ANCIENT_BISON@",  "e" );
 ToFile( "UPD",   $UPD,   "e" );
 ToFile( "WORK_STAMP",$WORK_STAMP,"e" );
 ToFile( "SOLARVER",  $SOLARVER,  "e" );
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index f8d4454..4a41bba 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -81,17 +81,6 @@ gb_LinkTarget_LDFLAGS := \
$(subst -L../lib , ,$(SOLARLIB)) \
 #man ld says: obsolete -Wl,-multiply_defined,suppress \
 
-# YaccTarget class
-
-define gb_YaccTarget__command
-$(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(3)) && \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
-
-endef
-
-
 # ObjCxxObject class
 
 define gb_ObjCxxObject__command
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 78ce3bd..c0739f4 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -124,16 +124,6 @@ define gb_Helper_convert_native
 $(1)
 endef
 
-# YaccTarget class
-
-define gb_YaccTarget__command
-$(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(3)) && \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
-
-endef
-
 # AsmObject class
 
 gb_AsmObject_get_source = $(1)/$(2).s
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index f91b58e..03ac2a8 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -25,6 +25,35 @@ gb_YACC := bison
 
 gb_CLASSPATHSEP := :
 
+# YaccTarget class
+
+ifeq ($(ANCIENT_BISON),YES)
+#
+# There are ancient versions of bison out there, which do not handle
+# well .cxx extensions, nor do they support --defines=. The
+# result is that the header is named .cxx.h instead of .hxx
+# so we queue a mv to rename the header accordingly.
+# One example is XCode versions 2.x, which are used on OSX ppc
+# machines.
+#
+define gb_YaccTarget__command
+$(call gb_Output_announce,$(2),$(true),YAC,3)
+$(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $(dir $(3)) && \
+   $(gb_YACC) $(T_YACCFLAGS) -d -o $(3) $(1) && mv $(3).h $(4) )
+
+endef
+
+else
+define gb_YaccTarget__command
+$(call gb_Output_announce,$(2),$(true),YAC,3)
+$(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $(dir $(3)) && \
+   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
+
+endef
+endif
+
 # use CC/CXX if they are nondefaults
 ifneq ($(origin CC),default)
 gb_CC := $(CC)
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 3beb093..5be5001 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -101,33 +101,6 @@ endif
 
 gb_COMPILERNOOPTFLAGS := -O0
 
-# YaccTarget class
-
-ifeq ($(CPUNAME),POWERPC)
-#
-# PowerPC mac version of bison 

[Libreoffice-commits] .: configure.in set_soenv.in solenv/gbuild

[Thorsten Behrens]

 configure.in|6 ++
 set_soenv.in|1 +
 solenv/gbuild/platform/IOS_ARM_GCC.mk   |   11 ---
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |   10 --
 solenv/gbuild/platform/com_GCC_defs.mk  |   29 +
 solenv/gbuild/platform/macosx.mk|   27 ---
 solenv/gbuild/platform/unxgcc.mk|   11 ---
 7 files changed, 36 insertions(+), 59 deletions(-)

New commits:
commit 456ec763d77a238967b866e2f90d1052626c2fdb
Author: Thorsten Behrens 
Date:   Thu Dec 8 12:03:38 2011 +0100

Rework yacc rule for gcc platforms.

Generalized the OSX ppc workaround for ancient bison versions,
factored out for all gcc platforms. Put bison version detection
into configure accordingly, to switch on that, and not on platform.

diff --git a/configure.in b/configure.in
index 9cd71ed..1c9a08d 100644
--- a/configure.in
+++ b/configure.in
@@ -6790,6 +6790,7 @@ dnl ***
 dnl Checking for bison and flex
 dnl ***
 AC_PATH_PROG(BISON, bison)
+ANCIENT_BISON="NO"
 if test -z "$BISON"; then
 AC_MSG_ERROR([no bison found in \$PATH, install it])
 else
@@ -6807,7 +6808,12 @@ else
 else
 AC_MSG_ERROR([failed ($BISON $_bison_version need 1.875+ (or 1.75 and 
older))])
 fi
+if test "$_bison_longver" -lt 2000; then
+ANCIENT_BISON="YES"
+fi
 fi
+AC_SUBST(ANCIENT_BISON)
+
 AC_PATH_PROG(FLEX, flex)
 if test -z "$FLEX"; then
 AC_MSG_ERROR([no flex found in \$PATH, install it])
diff --git a/set_soenv.in b/set_soenv.in
index 8248af8..d97560d 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1657,6 +1657,7 @@ ToFile( "DPKG",  "@DPKG@",   "e" );
 ToFile( "PKGMK", "@PKGMK@",  "e" );
 ToFile( "GNUMAKE",   "@GNUMAKE@","e" );
 ToFile( "GNUTAR","@GNUTAR@", "e" );
+ToFile( "ANCIENT_BISON", "@ANCIENT_BISON@",  "e" );
 ToFile( "UPD",   $UPD,   "e" );
 ToFile( "WORK_STAMP",$WORK_STAMP,"e" );
 ToFile( "SOLARVER",  $SOLARVER,  "e" );
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index f8d4454..4a41bba 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -81,17 +81,6 @@ gb_LinkTarget_LDFLAGS := \
$(subst -L../lib , ,$(SOLARLIB)) \
 #man ld says: obsolete -Wl,-multiply_defined,suppress \
 
-# YaccTarget class
-
-define gb_YaccTarget__command
-$(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(3)) && \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
-
-endef
-
-
 # ObjCxxObject class
 
 define gb_ObjCxxObject__command
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 78ce3bd..c0739f4 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -124,16 +124,6 @@ define gb_Helper_convert_native
 $(1)
 endef
 
-# YaccTarget class
-
-define gb_YaccTarget__command
-$(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(3)) && \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
-
-endef
-
 # AsmObject class
 
 gb_AsmObject_get_source = $(1)/$(2).s
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index f91b58e..03ac2a8 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -25,6 +25,35 @@ gb_YACC := bison
 
 gb_CLASSPATHSEP := :
 
+# YaccTarget class
+
+ifeq ($(ANCIENT_BISON),YES)
+#
+# There are ancient versions of bison out there, which do not handle
+# well .cxx extensions, nor do they support --defines=. The
+# result is that the header is named .cxx.h instead of .hxx
+# so we queue a mv to rename the header accordingly.
+# One example is XCode versions 2.x, which are used on OSX ppc
+# machines.
+#
+define gb_YaccTarget__command
+$(call gb_Output_announce,$(2),$(true),YAC,3)
+$(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $(dir $(3)) && \
+   $(gb_YACC) $(T_YACCFLAGS) -d -o $(3) $(1) && mv $(3).h $(4) )
+
+endef
+
+else
+define gb_YaccTarget__command
+$(call gb_Output_announce,$(2),$(true),YAC,3)
+$(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $(dir $(3)) && \
+   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
+
+endef
+endif
+
 # use CC/CXX if they are nondefaults
 ifneq ($(origin CC),default)
 gb_CC := $(CC)
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 3beb093..5be5001 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -101,33 +101,6 @@ endif
 
 gb_COMPILERNOOPTFLAGS := -O0
 
-# YaccTarget class
-
-ifeq ($(CPUNAME),POWERPC)
-#
-# PowerPC mac version of bison 

[Libreoffice-commits] .: oox/source svx/source

[Muthu Subramanian]

 oox/source/drawingml/shape.cxx|   22 --
 svx/source/customshapes/EnhancedCustomShapeEngine.cxx |   11 -
 2 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit 704ee5bc859499f5fe824f66f9607b554c135c66
Author: Muthu Subramanian 
Date:   Thu Dec 8 16:47:56 2011 +0530

n#719989: Rotation needs to be done post flipping.

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 2b81eac..d716823 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -509,18 +509,6 @@ Reference< XShape > Shape::createAndInsert(
 aFillProperties.pushToPropMap( aShapeProps, rGraphicHelper, 
mnRotation, nFillPhClr );
 aLineProperties.pushToPropMap( aShapeProps, rGraphicHelper, nLinePhClr 
);
 
-// Moved here because the properties like Flip needs to be applied 
before
-// applying the rotation property
-if( bIsCustomShape )
-{
-if ( mbFlipH )
-mpCustomShapePropertiesPtr->setMirroredX( sal_True );
-if ( mbFlipV )
-mpCustomShapePropertiesPtr->setMirroredY( sal_True );
-OSL_TRACE("==cscode== shape name: '%s'", 
rtl::OUStringToOString(msName, RTL_TEXTENCODING_UTF8 ).getStr());
-mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, 
mxShape );
-}
-
 // applying autogrowheight property before setting shape size, because
 // the shape size might be changed if currently autogrowheight is true
 // we must also check that the PropertySet supports the property.
@@ -534,6 +522,16 @@ Reference< XShape > Shape::createAndInsert(
 if( aServiceName != 
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape")) )
 PropertySet( xSet ).setProperties( aShapeProps );
 
+if( bIsCustomShape )
+{
+if ( mbFlipH )
+mpCustomShapePropertiesPtr->setMirroredX( sal_True );
+if ( mbFlipV )
+mpCustomShapePropertiesPtr->setMirroredY( sal_True );
+OSL_TRACE("==cscode== shape name: '%s'", 
rtl::OUStringToOString(msName, RTL_TEXTENCODING_UTF8 ).getStr());
+mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, 
mxShape );
+}
+
 // in some cases, we don't have any text body.
 if( getTextBody() )
 {
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx 
b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index de53ed6..a92a962 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -315,11 +315,6 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL 
EnhancedCustomShapeEngine::rende
 }
 pRenderedShape->Shear( 
pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, sal_False);
 }
-if( nRotateAngle )
-{
-double a = nRotateAngle * F_PI18000;
-pRenderedShape->NbcRotate( 
pSdrObjCustomShape->GetSnapRect().Center(), nRotateAngle, sin( a ), cos( a ) );
-}
 if ( bFlipV )
 {
 Point aLeft( aRect.Left(), ( aRect.Top() + aRect.Bottom() ) >> 
1 );
@@ -332,6 +327,12 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL 
EnhancedCustomShapeEngine::rende
 Point aBottom( aTop.X(), aTop.Y() + 1000 );
 pRenderedShape->NbcMirror( aTop, aBottom );
 }
+// Note that the rotation needs be done after flipping
+if( nRotateAngle )
+{
+double a = nRotateAngle * F_PI18000;
+pRenderedShape->NbcRotate( 
pSdrObjCustomShape->GetSnapRect().Center(), nRotateAngle, sin( a ), cos( a ) );
+}
 pRenderedShape->NbcSetStyleSheet( 
pSdrObjCustomShape->GetStyleSheet(), sal_True );
 pRenderedShape->RecalcSnapRect();
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - officecfg/registry

[Michael Meeks]

 officecfg/registry/data/org/openoffice/Office/Common.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 54844611201031a80cb16eda54a1584b1e12415c
Author: Michael Meeks 
Date:   Thu Dec 8 10:39:37 2011 +

re-enable the java fax wizard by using the correct ?start url

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 05377ae..215999a 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -404,7 +404,7 @@
   
   
 
-  service:com.sun.star.wizards.fax.CallWizard?insert
+  service:com.sun.star.wizards.fax.CallWizard?start
 
 
   ~Fax...
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: officecfg/registry

[Michael Meeks]

 officecfg/registry/data/org/openoffice/Office/Common.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2f964613aba557496e9721060a273e4ea6eea488
Author: Michael Meeks 
Date:   Thu Dec 8 10:39:37 2011 +

re-enable the java fax wizard by using the correct ?start url

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 05377ae..215999a 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -404,7 +404,7 @@
   
   
 
-  service:com.sun.star.wizards.fax.CallWizard?insert
+  service:com.sun.star.wizards.fax.CallWizard?start
 
 
   ~Fax...
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Michael Meeks]

 sc/source/ui/src/namedefdlg.src |2 +-
 sc/source/ui/src/namedlg.src|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2357cd3e95b46fb74e364cfd25f59fd5524d0c95
Author: Olivier Hallot 
Date:   Wed Dec 7 15:56:17 2011 -0200

Fix for bug fdo43586, need more room for localized string

This patch fixzex bug fdo43586, more room needed for localized strings in 
named range dialog.

diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
index 1a19f0b..42538dd 100644
--- a/sc/source/ui/src/namedefdlg.src
+++ b/sc/source/ui/src/namedefdlg.src
@@ -55,7 +55,7 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
 CheckBox BTN_MORE
 {
 Pos = MAP_APPFONT( 5, 82 );
-Size = MAP_APPFONT( 60, 15 );
+Size = MAP_APPFONT( 80, 15 );
 Text [en-US] = "Range Options";
 };
 FixedText FT_INFO
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index 3e2eb42..6c1c46a 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -128,7 +128,7 @@ ModelessDialog RID_SCDLG_NAMES
 {
 HelpID = "sc:MoreButton:RID_SCDLG_NAMES:BTN_MORE";
 Pos = MAP_APPFONT ( 5 , 185 ) ;
-Size = MAP_APPFONT ( 50 , 15 ) ;
+Size = MAP_APPFONT ( 80 , 15 ) ;
 Text [en-US] = "Range Options";
 };
 FixedLine FL_DIV
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - solenv/gbuild

[Petr Mladek]

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

New commits:
commit df2b14f11ef36d6d4ecb35e9e2b960e44be90f50
Author: Bjoern Michaelsen 
Date:   Thu Dec 8 00:18:46 2011 +0100

fix typo

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index f4c653f..5e11850 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -67,7 +67,7 @@ clean-host:
 clean-build:
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
rm -f solenv/*/bin/dmake*
-   $(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD),)rm -rf 
$(SRCDIR)/*/$(INPATH_FOR_BUILD))
+   $(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD)),rm -rf 
$(SRCDIR)/*/$(INPATH_FOR_BUILD))
 
 distclean: clean
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
commit 2ae7b690265f1c487e722bd189c94648f6e9e376
Author: Bjoern Michaelsen 
Date:   Wed Dec 7 23:50:07 2011 +0100

do not clean INPATH_FOR_BUILD on noncrosscompiles

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index ce4a5cb..f4c653f 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -67,7 +67,7 @@ clean-host:
 clean-build:
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
rm -f solenv/*/bin/dmake*
-   rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD)
+   $(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD),)rm -rf 
$(SRCDIR)/*/$(INPATH_FOR_BUILD))
 
 distclean: clean
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: chart2/source cppu/source dmake/tests framework/inc idlc/inc l10ntools/source linguistic/source odk/examples padmin/source qadevOOo/tests sfx2/source solenv/gbuild sw/source u

[Stefan Knorr]

 chart2/source/view/axes/VCartesianAxis.cxx 
 |2 +-
 cppu/source/threadpool/threadpool.hxx  
 |2 +-
 dmake/tests/recipes-9  
 |2 +-
 framework/inc/threadhelp/fairrwlock.hxx
 |4 ++--
 idlc/inc/idlc/errorhandler.hxx 
 |2 +-
 l10ntools/source/xmlparse.cxx  
 |2 +-
 linguistic/source/convdic.cxx  
 |2 +-
 
odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Thumbs.java
 |2 +-
 padmin/source/padialog.src 
 |2 +-
 qadevOOo/tests/java/ifc/frame/_XStorable.java  
 |4 ++--
 qadevOOo/tests/java/ifc/sheet/_XDatabaseRanges.java
 |2 +-
 qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java   
 |6 +++---
 sfx2/source/view/viewprn.cxx   
 |2 +-
 solenv/gbuild/Module.mk
 |2 +-
 sw/source/core/txtnode/thints.cxx  
 |2 +-
 sw/source/ui/uiview/view2.cxx  
 |2 +-
 udkapi/com/sun/star/test/XSimpleTest.idl   
 |2 +-
 wizards/com/sun/star/wizards/web/FTPDialog.java
 |2 +-
 xmerge/source/activesync/XMergeFilter.cpp  
 |2 +-
 19 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit ad2eb6c4ba3ca36e2302c721a106dac80d266325
Author: Stefan Knorr (astron) 
Date:   Thu Dec 8 09:05:20 2011 +0100

Less succes, more success

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index b345c47..2d73cb7 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -600,7 +600,7 @@ bool VCartesianAxis::createTextShapes(
  , TickFactory_2D* pTickFactory
  , sal_Int32 nScreenDistanceBetweenTicks )
 {
-//returns true if the text shapes have been created succesfully
+//returns true if the text shapes have been created successfully
 //otherwise false - in this case the AxisLabelProperties have changed
 //and contain new instructions for the next try for text shape creation
 
diff --git a/cppu/source/threadpool/threadpool.hxx 
b/cppu/source/threadpool/threadpool.hxx
index 273798c..498ea4a 100644
--- a/cppu/source/threadpool/threadpool.hxx
+++ b/cppu/source/threadpool/threadpool.hxx
@@ -120,7 +120,7 @@ namespace cppu_threadpool {
 void * enter( const ByteSequence &aThreadId, sal_Int64 nDisposeId );
 
 /
- * @return true, if queue could be succesfully revoked.
+ * @return true, if queue could be successfully revoked.
  /
 sal_Bool revokeQueue( const ByteSequence & aThreadId , sal_Bool 
bAsynchron );
 
diff --git a/dmake/tests/recipes-9 b/dmake/tests/recipes-9
index 409b6cb..fdc7853 100755
--- a/dmake/tests/recipes-9
+++ b/dmake/tests/recipes-9
@@ -83,7 +83,7 @@ else
 fi
 
 
-# Test 4 - Ignore a succesfully executed, but failing recipe.
+# Test 4 - Ignore a successfully executed, but failing recipe.
 cat > $file1 GetName();
-aErrorInformation.sMessage += String::CreateFromAscii( " parsed 
succesfully" );
+aErrorInformation.sMessage += String::CreateFromAscii( " parsed 
successfully" );
 }
 else
 aErrorInformation.sMessage = String::CreateFromAscii( "XML-File parsed 
successfully" );
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index a7b5ceb..4662a36 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -228,7 +228,7 @@ ConvDic::ConvDic(
 //! that could be found by the dictionary-list implementation
 // (Note: empty dictionaries are not just empty files!)
 Save();
-bIsReadonly = IsReadOnly( rMainURL );   // will be sal_False if 
Save was succesfull
+bIsReadonly = IsReadOnly( rMainURL );   // will be sal_False if 
Save was successful
 }
 }
 else
diff --git 
a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Thumbs.java
 
b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Thumbs.java
index 3ef79b8..d5dbaf4 100644
--- 
a/odk/examples/DevelopersGuide/Components/Thumbs/org/openo